fix: emit server tool results when mixed with client tools in same turn#323
Merged
AlemTuzlak merged 2 commits intomainfrom Feb 27, 2026
Merged
fix: emit server tool results when mixed with client tools in same turn#323AlemTuzlak merged 2 commits intomainfrom
AlemTuzlak merged 2 commits intomainfrom
Conversation
Contributor
📝 WalkthroughWalkthroughThis PR fixes a chat stall that occurs when both server-side and client-side tools are requested in the same turn. It emits server tool results before waiting for client tool approval, preventing data loss. The changeset also aligns test fixtures and harness code with a property rename from data to value for CUSTOM events introduced in a related PR. Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches
🧪 Generate unit tests (beta)
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 |
|
View your CI Pipeline Execution ↗ for commit 5701235
☁️ Nx Cloud last updated this comment at |
@tanstack/ai
@tanstack/ai-anthropic
@tanstack/ai-client
@tanstack/ai-devtools-core
@tanstack/ai-fal
@tanstack/ai-gemini
@tanstack/ai-grok
@tanstack/ai-ollama
@tanstack/ai-openai
@tanstack/ai-openrouter
@tanstack/ai-preact
@tanstack/ai-react
@tanstack/ai-react-ui
@tanstack/ai-solid
@tanstack/ai-solid-ui
@tanstack/ai-svelte
@tanstack/ai-vue
@tanstack/ai-vue-ui
@tanstack/preact-ai-devtools
@tanstack/react-ai-devtools
@tanstack/solid-ai-devtools
commit: |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
🧹 Nitpick comments (1)
packages/typescript/ai/tests/chat.test.ts (1)
520-537: Add explicit ordering assertions to lock in “server result before wait signal” behavior.Right now these tests verify both events exist, but not their relative order.
Proposed test hardening
@@ const toolEndWithResult = chunks.filter( (c) => c.type === 'TOOL_CALL_END' && (c as any).toolName === 'searchTools' && 'result' in c && (c as any).result, ) expect(toolEndWithResult).toHaveLength(1) + const toolEndIndex = chunks.findIndex( + (c) => c.type === 'TOOL_CALL_END' && (c as any).toolName === 'searchTools', + ) + const inputAvailableIndex = chunks.findIndex( + (c) => c.type === 'CUSTOM' && (c as any).name === 'tool-input-available', + ) + expect(toolEndIndex).toBeGreaterThanOrEqual(0) + expect(inputAvailableIndex).toBeGreaterThanOrEqual(0) + expect(toolEndIndex).toBeLessThan(inputAvailableIndex) @@ const toolEndWithResult = chunks.filter( (c) => c.type === 'TOOL_CALL_END' && (c as any).toolName === 'getWeather' && 'result' in c && (c as any).result, ) expect(toolEndWithResult).toHaveLength(1) + const toolEndIndex = chunks.findIndex( + (c) => c.type === 'TOOL_CALL_END' && (c as any).toolName === 'getWeather', + ) + const inputAvailableIndex = chunks.findIndex( + (c) => c.type === 'CUSTOM' && (c as any).name === 'tool-input-available', + ) + expect(toolEndIndex).toBeGreaterThanOrEqual(0) + expect(inputAvailableIndex).toBeGreaterThanOrEqual(0) + expect(toolEndIndex).toBeLessThan(inputAvailableIndex)Also applies to: 588-604
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@packages/typescript/ai/tests/chat.test.ts` around lines 520 - 537, The test currently checks presence of a server TOOL_CALL_END with result (filtered into toolEndWithResult) and a CLIENT CUSTOM 'tool-input-available' (customChunks) but not their ordering; update the assertions to assert that the TOOL_CALL_END event for toolName 'searchTools' with a result appears before the CUSTOM event named 'tool-input-available' for toolName 'showNotification' (e.g., compare their indices in the chunks array or use findIndex on chunks for the specific event predicates), and apply the same ordering assertion for the analogous assertions around the block referenced at lines 588-604 to lock in "server result before wait signal" behavior.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@packages/typescript/ai/tests/chat.test.ts`:
- Around line 520-537: The test currently checks presence of a server
TOOL_CALL_END with result (filtered into toolEndWithResult) and a CLIENT CUSTOM
'tool-input-available' (customChunks) but not their ordering; update the
assertions to assert that the TOOL_CALL_END event for toolName 'searchTools'
with a result appears before the CUSTOM event named 'tool-input-available' for
toolName 'showNotification' (e.g., compare their indices in the chunks array or
use findIndex on chunks for the specific event predicates), and apply the same
ordering assertion for the analogous assertions around the block referenced at
lines 588-604 to lock in "server result before wait signal" behavior.
ℹ️ Review info
Configuration used: defaults
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (8)
.changeset/fix-mixed-server-client-tool-stall.mdpackages/typescript/ai/src/activities/chat/index.tspackages/typescript/ai/tests/chat.test.tspackages/typescript/smoke-tests/adapters/src/adapters/index.tspackages/typescript/smoke-tests/adapters/src/harness.tspackages/typescript/smoke-tests/adapters/src/tests/tools/approval.test.tspackages/typescript/smoke-tests/adapters/src/tests/tools/client-tool.test.tspackages/typescript/smoke-tests/adapters/src/tests/tools/sequences.test.ts
AlemTuzlak
approved these changes
Feb 27, 2026
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
2 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.
Summary
processToolCallsandcheckForPendingToolCallsboth had an earlyreturnto wait for client tool execution, which skippedemitToolResultsentirely — causing the session to stall indefinitely waiting for a result that would never arrive.chunk.valueinstead ofchunk.datafor CUSTOM events, following the rename introduced in refactor: change CustomEvent property from 'data' to 'value' for AG-UI #307 that was missed in the smoke tests — this was causing the APR (approval flow) smoke test to always report 0 approvals.Test plan
cd packages/typescript/ai && pnpm test:libtsx src/cli.ts run --adapters ollama --tests APRtsx src/cli.ts run --adapters ollamachat.test.ts)🤖 Generated with Claude Code
Summary by CodeRabbit
Bug Fixes
Tests
Chores