feat: only disable parallel tool calls when injectable tools are present by dannykopping · Pull Request #211 · coder/aibridge

dannykopping · 2026-03-11T08:27:16Z

This PR refines when parallel tool calls are disabled. Previously, the system disabled parallel tool calls whenever any tools were present in a request; now it only disables them when injectable MCP tools are present.

This table describes what happens to the parallel tool call setting across all 3 interceptor types:

  ┌────────────────────────────────┬─────────────────┬─────────────────┬─────────────────┐
  │           Dimension            │    Anthropic    │ ChatCompletions │    Responses    │
  ├────────────────────────────────┼─────────────────┼─────────────────┼─────────────────┤
  │ injected+builtin, set=enabled  │ forced disabled │ forced disabled │ forced disabled │
  ├────────────────────────────────┼─────────────────┼─────────────────┼─────────────────┤
  │ injected+builtin, set=disabled │ forced disabled │ forced disabled │ forced disabled │
  ├────────────────────────────────┼─────────────────┼─────────────────┼─────────────────┤
  │ injected+builtin, unset        │ forced disabled │ forced disabled │ forced disabled │
  ├────────────────────────────────┼─────────────────┼─────────────────┼─────────────────┤
  │ injected only, set=enabled     │ forced disabled │ forced disabled │ forced disabled │
  ├────────────────────────────────┼─────────────────┼─────────────────┼─────────────────┤
  │ injected only, set=disabled    │ forced disabled │ forced disabled │ forced disabled │
  ├────────────────────────────────┼─────────────────┼─────────────────┼─────────────────┤
  │ injected only, unset           │ forced disabled │ forced disabled │ forced disabled │
  ├────────────────────────────────┼─────────────────┼─────────────────┼─────────────────┤
  │ builtin only, set=enabled      │ preserved       │ preserved       │ preserved       │
  ├────────────────────────────────┼─────────────────┼─────────────────┼─────────────────┤
  │ builtin only, set=disabled     │ preserved       │ preserved       │ preserved       │
  ├────────────────────────────────┼─────────────────┼─────────────────┼─────────────────┤
  │ builtin only, unset            │ absent          │ absent          │ absent          │
  ├────────────────────────────────┼─────────────────┼─────────────────┼─────────────────┤
  │ no tools, set=enabled          │ preserved       │ preserved       │ preserved       │
  ├────────────────────────────────┼─────────────────┼─────────────────┼─────────────────┤
  │ no tools, set=disabled         │ preserved       │ preserved       │ preserved       │
  ├────────────────────────────────┼─────────────────┼─────────────────┼─────────────────┤
  │ no tools, unset                │ absent          │ absent          │ absent          │
  └────────────────────────────────┴─────────────────┴─────────────────┴─────────────────┘

(builtin tools mean tools defined in the initial request)

dannykopping · 2026-03-11T08:27:30Z

feat: record model thoughts #203
feat: only disable parallel tool calls when injectable tools are present #211 👈 (View in Graphite)
main

This stack of pull requests is managed by Graphite. Learn more about stacking.

Signed-off-by: Danny Kopping <danny@coder.com>

dannykopping · 2026-03-11T12:29:39Z

intercept/chatcompletions/base.go

 		return
 	}

+	// Disable parallel tool calls when injectable tools are present to simplify the inner agentic loop.


This was somehow missed previously; we weren't setting parallel tool calls to disabled in blocking mode :thinking_face:

ssncferreira

Nice change overall. But I think there's an edge case where parallel_tool_calls isn't disabled when the client sends no tools but MCP has tools to inject. Might not be a frequent scenario, but we should still handle it.

intercept/chatcompletions/base.go

intercept/responses/injected_tools.go

internal/integrationtest/bridge_test.go

…y if injected tools provided Signed-off-by: Danny Kopping <danny@coder.com>

…jected tools provided Signed-off-by: Danny Kopping <danny@coder.com>

Signed-off-by: Danny Kopping <danny@coder.com>

dannykopping

@ssncferreira thanks for the review! This made me realize there were several shortcomings in both the implementation and the tests. They're now all aligned, and I've updated the description to reflect the desired behaviour.

intercept/chatcompletions/base.go

fixtures/anthropic/single_builtin_tool.txtar

ssncferreira

LGTM 🌟 super clean, and really like the table in the PR description 🚀
I think we are missing 2 tests from anthropic for:

injected+builtin, set=enabled
injected+builtin, set=disabled

But non-blocking

ssncferreira · 2026-03-12T12:49:23Z

internal/integrationtest/bridge_test.go

+			expectDisableParallel:         utils.PtrTo(true),
+			expectToolChoiceTypeInRequest: toolChoiceAuto,
+		},
+		// Request already has disable_parallel_tool_use set - without injected tools it should be preserved.


Nit: I think we might be missing cases for injected+builtin tools with disable_parallel_tool_use explicitly set to true/false. The injected-only and builtin-only cases cover it, but the combination isn't tested.

Signed-off-by: Danny Kopping <danny@coder.com>

dannykopping · 2026-03-12T13:48:34Z

Merge activity

Mar 12, 1:48 PM UTC: A user started a stack merge that includes this pull request via Graphite.
Mar 12, 1:48 PM UTC: @dannykopping merged this pull request with Graphite.

dannykopping mentioned this pull request Mar 11, 2026

feat: record model thoughts #203

Open

dannykopping changed the title ~~fix: only disable parallel tool calls when injectable tools are present~~ feat: only disable parallel tool calls when injectable tools are present Mar 11, 2026

dannykopping force-pushed the dk/parallel-tool-calls branch from a0e150e to b2e4f03 Compare March 11, 2026 12:15

fix: only disable parallel tool calls when injectable tools are present

732f3d2

Signed-off-by: Danny Kopping <danny@coder.com>

dannykopping force-pushed the dk/parallel-tool-calls branch from b2e4f03 to 732f3d2 Compare March 11, 2026 12:27

dannykopping marked this pull request as ready for review March 11, 2026 12:30

dannykopping commented Mar 11, 2026

View reviewed changes

dannykopping requested a review from ssncferreira March 11, 2026 12:30

ssncferreira reviewed Mar 11, 2026

View reviewed changes

intercept/chatcompletions/base.go Outdated Show resolved Hide resolved

intercept/responses/injected_tools.go Outdated Show resolved Hide resolved

internal/integrationtest/bridge_test.go Show resolved Hide resolved

dannykopping added 4 commits March 11, 2026 17:16

fix(chatcompletions): only modify parallel_tool_calls if set, and onl…

930f09a

…y if injected tools provided Signed-off-by: Danny Kopping <danny@coder.com>

fix(messages): only modify parallel_tool_calls if set, and only if in…

90f5067

…jected tools provided Signed-off-by: Danny Kopping <danny@coder.com>

chore: unify logic & tests

116f02f

Signed-off-by: Danny Kopping <danny@coder.com>

chore: unifying logic, removing HasInjectableTools from interface

d3f67ba

Signed-off-by: Danny Kopping <danny@coder.com>

dannykopping commented Mar 12, 2026

View reviewed changes

intercept/chatcompletions/base.go Outdated Show resolved Hide resolved

fixtures/anthropic/single_builtin_tool.txtar Show resolved Hide resolved

dannykopping requested a review from ssncferreira March 12, 2026 09:48

ssncferreira approved these changes Mar 12, 2026

View reviewed changes

chore: add missing test cases

3466ab6

Signed-off-by: Danny Kopping <danny@coder.com>

dannykopping merged commit 4fd7ded into main Mar 12, 2026
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: only disable parallel tool calls when injectable tools are present#211

feat: only disable parallel tool calls when injectable tools are present#211
dannykopping merged 6 commits intomainfrom
dk/parallel-tool-calls

dannykopping commented Mar 11, 2026 •

edited

Loading

Uh oh!

dannykopping commented Mar 11, 2026

Uh oh!

dannykopping Mar 11, 2026

Uh oh!

ssncferreira left a comment •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dannykopping left a comment

Uh oh!

Uh oh!

Uh oh!

ssncferreira left a comment

Uh oh!

ssncferreira Mar 12, 2026

Uh oh!

dannykopping commented Mar 12, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

dannykopping commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dannykopping commented Mar 11, 2026

Uh oh!

dannykopping Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

ssncferreira left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dannykopping left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ssncferreira left a comment

Choose a reason for hiding this comment

Uh oh!

ssncferreira Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

dannykopping commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge activity

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

dannykopping commented Mar 11, 2026 •

edited

Loading

ssncferreira left a comment •

edited

Loading

dannykopping commented Mar 12, 2026 •

edited

Loading