fix(claude): preserve parallel tool call stream indexes - #4730
Open
ghostg00 wants to merge 1 commit into
Open
Conversation
Anthropic content block indexes count every content block, including text and thinking blocks, while OpenAI streaming tool_call indexes count only tool calls. The previous conversion subtracted one from the content_block index, which collapsed tool blocks 0 and 1 into OpenAI index 0 when Claude emitted parallel tool calls without an earlier text block. This keeps a per-stream content_block.index to tool_call.index map and reuses it for subsequent input_json_delta chunks. Constraint: Existing StreamResponseClaude2OpenAI signature is kept for compatibility. Rejected: Use content_block.index - 1 | fails when tool_use starts at content block 0 or follows more than one non-tool block Confidence: high Scope-risk: narrow Tested: mise x go@1.25.1 -- go test ./relay/channel/claude -run TestStreamResponseClaude2OpenAIMapsParallelToolUseIndexes -count=1 -v Tested: mise x go@1.25.1 -- go test ./relay/channel/claude -run 'TestFormatClaudeResponseInfo|TestBuildOpenAIStyleUsageFromClaudeUsage' -count=1 Not-tested: Full ./relay/channel/claude package passes; existing file-content conversion tests fail on current main
Contributor
WalkthroughThis PR refactors tool-call index computation in Claude-to-OpenAI streaming response conversion. The public ChangesClaude-to-OpenAI Tool-Call Index Mapping
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~22 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Tip 💬 Introducing Slack Agent: The best way for teams to turn conversations into code.Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.
Built for teams:
One agent for your entire SDLC. Right inside Slack. Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@relay/channel/claude/relay-claude.go`:
- Around line 528-534: The nil-state fallback in
ClaudeResponseInfo.getOpenAIToolCallIndex currently maps multiple
contentBlockIndex values (e.g., 0 and 1) to the same tool index by returning
contentBlockIndex-1; change the fallback so it preserves uniqueness: when c ==
nil, return contentBlockIndex (with a guard to clamp negative values to 0)
instead of contentBlockIndex-1 so distinct parallel tool blocks map to distinct
indices. Ensure the updated logic handles contentBlockIndex < 0 by returning 0.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: e2356989-dca5-4dd8-a5ce-11166ed7a04e
📒 Files selected for processing (2)
relay/channel/claude/relay-claude.gorelay/channel/claude/relay_claude_test.go
Comment on lines
+528
to
+534
| func (c *ClaudeResponseInfo) getOpenAIToolCallIndex(contentBlockIndex int) int { | ||
| if c == nil { | ||
| if contentBlockIndex <= 0 { | ||
| return 0 | ||
| } | ||
| return contentBlockIndex - 1 | ||
| } |
Contributor
There was a problem hiding this comment.
Nil-state fallback still allows tool-call index collisions.
When claudeInfo is nil, Line 533 returns contentBlockIndex - 1; parallel tool blocks at indexes 0 and 1 both map to index 0. Since Line 438 uses this path in the exported wrapper, direct callers can still merge distinct tool arguments incorrectly.
Suggested fix
func (c *ClaudeResponseInfo) getOpenAIToolCallIndex(contentBlockIndex int) int {
if c == nil {
- if contentBlockIndex <= 0 {
+ if contentBlockIndex < 0 {
return 0
}
- return contentBlockIndex - 1
+ // Stateless fallback: keep indices unique to avoid collisions.
+ return contentBlockIndex
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| func (c *ClaudeResponseInfo) getOpenAIToolCallIndex(contentBlockIndex int) int { | |
| if c == nil { | |
| if contentBlockIndex <= 0 { | |
| return 0 | |
| } | |
| return contentBlockIndex - 1 | |
| } | |
| func (c *ClaudeResponseInfo) getOpenAIToolCallIndex(contentBlockIndex int) int { | |
| if c == nil { | |
| if contentBlockIndex < 0 { | |
| return 0 | |
| } | |
| // Stateless fallback: keep indices unique to avoid collisions. | |
| return contentBlockIndex | |
| } |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@relay/channel/claude/relay-claude.go` around lines 528 - 534, The nil-state
fallback in ClaudeResponseInfo.getOpenAIToolCallIndex currently maps multiple
contentBlockIndex values (e.g., 0 and 1) to the same tool index by returning
contentBlockIndex-1; change the fallback so it preserves uniqueness: when c ==
nil, return contentBlockIndex (with a guard to clamp negative values to 0)
instead of contentBlockIndex-1 so distinct parallel tool blocks map to distinct
indices. Ensure the updated logic handles contentBlockIndex < 0 by returning 0.
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Fixes Claude/Anthropic streaming conversion to OpenAI chat-completions chunks when multiple tool_use content blocks are emitted in parallel. Anthropic content_block.index counts every content block, while OpenAI tool_calls[].index counts only tool calls. The previous
index - 1conversion can collapse content blocks 0 and 1 into OpenAI tool_call index 0, which causes clients to merge tool arguments into the wrong call.This PR keeps the existing
StreamResponseClaude2OpenAIsignature and adds per-stream state insideClaudeResponseInfosocontent_block.indexmaps stably to OpenAItool_calls[].indexacrosscontent_block_startand laterinput_json_deltachunks.Tests
mise x go@1.25.1 -- go test ./relay/channel/claude -run TestStreamResponseClaude2OpenAIMapsParallelToolUseIndexes -count=1 -vmise x go@1.25.1 -- go test ./relay/channel/claude -run 'TestFormatClaudeResponseInfo|TestBuildOpenAIStyleUsageFromClaudeUsage' -count=1\n\n## Notes\n\nmise x go@1.25.1 -- go test ./relay/channel/claudecurrently fails on unrelated existing file-content conversion tests (TestRequestOpenAI2ClaudeMessage_*FileContent). The new regression test and adjacent Claude response formatting/usage tests pass.Summary by CodeRabbit
Bug Fixes
Tests