Support passing dynamic header from response api to mcp servers by TingtingZhou7 · Pull Request #1082 · smg-project/smg

TingtingZhou7 · 2026-04-09T19:32:29Z

duplicate of #1084

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

…ting

…ls output Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

coderabbitai · 2026-04-09T19:32:44Z

Warning

Rate limit exceeded

@TingtingZhou7 has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 24 minutes and 25 seconds before requesting another review.

Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 24 minutes and 25 seconds.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro

Run ID: 7cdc5263-70c4-4565-b71e-3a7111af499f

📥 Commits

Reviewing files that changed from the base of the PR and between 91bf8ea and ae482d3.

📒 Files selected for processing (6)

crates/mcp/src/core/orchestrator.rs
model_gateway/src/routers/anthropic/router.rs
model_gateway/src/routers/grpc/common/responses/utils.rs
model_gateway/src/routers/mcp_utils.rs
model_gateway/src/routers/openai/responses/non_streaming.rs
model_gateway/src/routers/openai/responses/streaming.rs

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

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.

❤️ Share

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

mergify · 2026-04-09T19:33:07Z

Hi @TingtingZhou7, the DCO sign-off check has failed. All commits must include a Signed-off-by line.

To fix existing commits:

# Sign off the last N commits (replace N with the number of unsigned commits)
git rebase HEAD~N --signoff
git push --force-with-lease

To sign off future commits automatically:

Use git commit -s every time, or
VSCode: enable Git: Always Sign Off in Settings
PyCharm: enable Sign-off commit in the Commit tool window

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 768f121b41

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-04-09T19:38:01Z

+                        .is_some_and(|cfg| {
+                            cfg.response_format != ResponseFormatConfig::Passthrough


Treat any tool config as explicit builtin override

In the new dynamic-connection path, this check only considers a tool override “explicit” when response_format != Passthrough, so a config that intentionally sets Passthrough gets overwritten by builtin_type.response_format(). That changes the emitted output item type for builtin-routed tools (for example from mcp_call to web_search_call) and breaks parity with the static path (apply_builtin_response_format), which preserves any explicit tool entry regardless of value.

Useful? React with 👍 / 👎.

gemini-code-assist

Code Review

This pull request introduces support for forwarding request headers to MCP servers and adds configuration for tool response formats and argument mapping. It also updates the MCP orchestrator to handle built-in tool routing and refactors the tool loop to remove redundant MCP list tool injections. I have identified two high-severity issues: the dynamic server configuration logic potentially misapplying built-in tool capabilities, and the removal of MCP list tool injections in the non-streaming response path, which breaks consistency.

I am having trouble creating individual review comments. Click here to see my feedback.

crates/mcp/src/core/orchestrator.rs (1607-1650)

The implementation for applying tool configurations to dynamic servers appears to treat them similarly to built-in tools. However, in the MCP orchestrator, built-in tool functionality is restricted to static servers, and dynamic servers are not intended to be configured this way. Please ensure this logic does not introduce built-in tool capabilities for dynamic servers.

References

In the MCP orchestrator, dynamic servers are not intended to be configured as built-in tools; built-in tool functionality is restricted to static servers.

model_gateway/src/routers/openai/mcp/tool_loop.rs (833-839)

Similar to the issue in inject_mcp_metadata_streaming, removing the mcp_list_tools injection here breaks the non-streaming path. Since build_incomplete_response is called for non-streaming responses when the tool loop terminates early, the mcp_list_tools items should be included in the incomplete response to ensure consistency between execution paths.

References

To maintain consistency, changes to a feature on one execution path (e.g., streaming) should align with its behavior on related paths (e.g., non-streaming).

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

…in routing Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

… path Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

mergify · 2026-04-10T00:03:33Z

Hi @TingtingZhou7, this PR has merge conflicts that must be resolved before it can be merged. Please rebase your branch:

git fetch origin main
git rebase origin/main
# resolve any conflicts, then:
git push --force-with-lease

mergify · 2026-04-10T00:04:07Z

Hi @TingtingZhou7, the DCO sign-off check has failed. All commits must include a Signed-off-by line.

To fix existing commits:

# Sign off the last N commits (replace N with the number of unsigned commits)
git rebase HEAD~N --signoff
git push --force-with-lease

To sign off future commits automatically:

Use git commit -s every time, or
VSCode: enable Git: Always Sign Off in Settings
PyCharm: enable Sign-off commit in the Commit tool window

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ae482d3dda

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-04-10T00:13:30Z

+                inputs.push(McpServerInput {
+                    label: server_name,
+                    url: Some(url),
+                    authorization: token,
+                    headers,


Key forwarded-header MCP calls by full pool key

This new builtin path creates dynamic MCP inputs with per-request forwarded headers, but downstream execution still addresses dynamic servers by URL-only server_key. When two requests hit the same MCP URL with different forwarded header values, they produce distinct pooled connections but tool execution can select the wrong one via URL lookup, causing calls to run under another request’s header context. In practice this can misroute compartment-scoped calls and break tenant/request isolation for header-authenticated MCP backends.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-10T00:13:30Z

+    if !builtin_types.is_empty() {
+        for builtin_type in &builtin_types {
+            let Some((server_name, _, _, server_cfg)) =
+                mcp_orchestrator.find_builtin_server(*builtin_type)
+            else {


Skip static builtin fallback when dynamic header route exists

After adding dynamic builtin inputs for resolved forwarded headers, the same builtin type is still processed by static fallback logic, so a single builtin server can be represented twice (URL key + static name). That exposes duplicate function tools for the same underlying builtin and allows execution to land on the static binding that lacks forwarded headers, which is exactly the failure mode this change is trying to avoid for header-required tools.

Useful? React with 👍 / 👎.

TingtingZhou7 · 2026-04-10T00:28:35Z

duplicate of #1084

TingtingZhou7 added 6 commits April 9, 2026 09:47

feat(image): consolidate image-tool and transform updates

5df7002

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

feat(mcp): wire request headers into response->MCP client setup

e02306f

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

feat(mcp): forward configured request headers for builtin MCP routing

9d875c7

fix(mcp): preserve builtin image tool format on forwarded dynamic rou…

515d2f2

…ting

fix(mcp): preserve builtin routing metadata and suppress mcp_list_too…

8086643

…ls output Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

Merge branch 'lightseekorg:main' into support-compartment-id

768f121

TingtingZhou7 requested review from CatherineSue, key4ng and slin1237 as code owners April 9, 2026 19:32

github-actions Bot added grpc gRPC client and router changes mcp MCP related changes model-gateway Model gateway crate changes openai OpenAI router changes anthropic Anthropic router changes labels Apr 9, 2026

TingtingZhou7 marked this pull request as draft April 9, 2026 19:33

revert(mcp): restore tool_loop behavior from 515d2f2

6782a85

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

chatgpt-codex-connector Bot reviewed Apr 9, 2026

View reviewed changes

gemini-code-assist Bot reviewed Apr 9, 2026

View reviewed changes

TingtingZhou7 added 5 commits April 9, 2026 12:46

refactor(mcp): simplify dynamic tool config and builtin routing handling

547d323

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

fix(mcp): restore dynamic response-format mapping and stabilize built…

5212b8d

…in routing Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

fix(mcp): keep dynamic builtin override semantics aligned with static…

50179ac

… path Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

fix(mcp): only use dynamic routing when forwarded headers are resolved

13a6cff

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

fix(mcp): dedupe builtin routing by server_key only

35fcb16

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

coderabbitai Bot approved these changes Apr 9, 2026

View reviewed changes

TingtingZhou7 changed the title ~~Support compartment~~ Support passing dynamic header from response api to mcp servers Apr 9, 2026

github-actions Bot added documentation Improvements or additions to documentation tokenizer Tokenizer related changes python-bindings Python bindings changes labels Apr 9, 2026

TingtingZhou7 requested a review from whybeyoung as a code owner April 10, 2026 00:02

mergify Bot added the needs-rebase PR has merge conflicts that need to be resolved label Apr 10, 2026

mergify Bot removed the needs-rebase PR has merge conflicts that need to be resolved label Apr 10, 2026

TingtingZhou7 added 2 commits April 9, 2026 17:05

style: run rustfmt for builtin lookup refactor changes

a6cc177

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

chore(mcp): remove temporary static/dynamic client path debug logs

ae482d3

Signed-off-by: TingtingZhou7 <zhoutt96@gmail.com>

chatgpt-codex-connector Bot reviewed Apr 10, 2026

View reviewed changes

mergify Bot mentioned this pull request Apr 10, 2026

feat(dynamicheaders): Support passing dynamic header from response api to mcp servers #1082 #1084

Closed

4 tasks

TingtingZhou7 closed this Apr 10, 2026

CatherineSue mentioned this pull request Apr 14, 2026

ci: move branch naming check from Mergify to GitHub Actions #1131

Merged

2 of 4 tasks

Navigation Menu

Repository navigation

Support passing dynamic header from response api to mcp servers - #1082

Support passing dynamic header from response api to mcp servers #1082
TingtingZhou7 wants to merge 20 commits into
smg-project:mainfrom
TingtingZhou7:support-compartment-id

TingtingZhou7 commented Apr 9, 2026 •

edited

Loading

Uh oh!

coderabbitai Bot commented Apr 9, 2026 •

edited

Loading

Rate limit exceeded

Uh oh!

mergify Bot commented Apr 9, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot Apr 9, 2026

Uh oh!

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

mergify Bot commented Apr 10, 2026

Uh oh!

mergify Bot commented Apr 10, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot Apr 10, 2026

Uh oh!

chatgpt-codex-connector Bot Apr 10, 2026

Uh oh!

TingtingZhou7 commented Apr 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

		.is_some_and(\|cfg\| {
		cfg.response_format != ResponseFormatConfig::Passthrough

Conversation

TingtingZhou7 commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai Bot commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Rate limit exceeded

Uh oh!

mergify Bot commented Apr 9, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

crates/mcp/src/core/orchestrator.rs (1607-1650)

model_gateway/src/routers/openai/mcp/tool_loop.rs (833-839)

Uh oh!

mergify Bot commented Apr 10, 2026

Uh oh!

mergify Bot commented Apr 10, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 10, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Apr 10, 2026

Choose a reason for hiding this comment

Uh oh!

TingtingZhou7 commented Apr 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

TingtingZhou7 commented Apr 9, 2026 •

edited

Loading

coderabbitai Bot commented Apr 9, 2026 •

edited

Loading