Skip to content

fix(core): add missing oauth fields support in subagent parsing#26141

Merged
abhipatel12 merged 2 commits intomainfrom
abhi/add-auth-subagents
Apr 28, 2026
Merged

fix(core): add missing oauth fields support in subagent parsing#26141
abhipatel12 merged 2 commits intomainfrom
abhi/add-auth-subagents

Conversation

@abhipatel12
Copy link
Copy Markdown
Contributor

Summary

Add support for missing OAuth fields in subagent parsing in agentLoader.ts to match the full MCPOAuthConfig schema.

Details

The current subagent parsing logic was only supporting a subset of fields for oauth auth type. This PR adds support for issuer, audiences, redirect_uri, token_param_name, and registration_url in mcpServerSchema and maps them correctly in markdownToAgentDefinition.

Related Issues

Resolves #24836

How to Validate

Run the tests in agentLoader.test.ts:

npm test -w @google/gemini-cli-core -- src/agents/agentLoader.test.ts

Verify that the new test case should convert mcp_servers with auth block in local agent (oauth with full fields) passes.

Pre-Merge Checklist

  • Updated relevant documentation and README (if needed)
  • Added/updated tests (if needed)
  • Noted breaking changes (if any)
  • Validated on required platforms/methods:
    • MacOS
      • npm run

@abhipatel12 abhipatel12 requested a review from a team as a code owner April 28, 2026 20:21
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request enhances the subagent parsing logic to support a more comprehensive set of OAuth configuration fields. By updating both the schema validation and the mapping logic, the system now correctly handles advanced OAuth parameters, ensuring better compatibility with the full MCPOAuthConfig specification.

Highlights

  • Schema Update: Updated the mcpServerSchema to include missing OAuth fields such as issuer, audiences, redirect_uri, token_param_name, and registration_url.
  • Mapping Logic: Updated the markdownToAgentDefinition function to correctly map the newly added OAuth fields from the configuration to the agent definition.
  • Test Coverage: Added a new test case in agentLoader.test.ts to verify that OAuth configurations with full fields are correctly parsed and converted.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 28, 2026

Size Change: +1.14 kB (0%)

Total Size: 33.9 MB

Filename Size Change
./bundle/chunk-3WWD2YVG.js 0 B -14.7 MB (removed) 🏆
./bundle/chunk-55Q5PIJY.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-FIAQX5SB.js 0 B -674 kB (removed) 🏆
./bundle/chunk-PUP7SDL2.js 0 B -2.73 MB (removed) 🏆
./bundle/chunk-RDT7FI4T.js 0 B -49.2 kB (removed) 🏆
./bundle/chunk-X5ZQSZRV.js 0 B -3.8 kB (removed) 🏆
./bundle/core-UN4TSF6D.js 0 B -48.2 kB (removed) 🏆
./bundle/devtoolsService-N7BY3L5K.js 0 B -28 kB (removed) 🏆
./bundle/gemini-CYO23BKI.js 0 B -575 kB (removed) 🏆
./bundle/interactiveCli-3YOQQN62.js 0 B -1.31 MB (removed) 🏆
./bundle/liteRtServerManager-BZTDW25G.js 0 B -2.08 kB (removed) 🏆
./bundle/oauth2-provider-CGNGRGCW.js 0 B -9.16 kB (removed) 🏆
./bundle/chunk-2RAWTUXU.js 674 kB +674 kB (new file) 🆕
./bundle/chunk-E4F3ZBNF.js 2.73 MB +2.73 MB (new file) 🆕
./bundle/chunk-F565YEOL.js 14.7 MB +14.7 MB (new file) 🆕
./bundle/chunk-JQQECAH7.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/chunk-VFBQFBC7.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/chunk-VKQYG7OV.js 3.8 kB +3.8 kB (new file) 🆕
./bundle/core-PUI64FQ3.js 48.2 kB +48.2 kB (new file) 🆕
./bundle/devtoolsService-GWYKFQW2.js 28 kB +28 kB (new file) 🆕
./bundle/gemini-6N3V3JPF.js 575 kB +575 kB (new file) 🆕
./bundle/interactiveCli-NYAUXLPY.js 1.31 MB +1.31 MB (new file) 🆕
./bundle/liteRtServerManager-FG6SXD22.js 2.08 kB +2.08 kB (new file) 🆕
./bundle/oauth2-provider-KKIS77DI.js 9.16 kB +9.16 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./bundle/bundled/third_party/index.js 8 MB 0 B
./bundle/chunk-34MYV7JD.js 2.45 kB 0 B
./bundle/chunk-5AUYMPVF.js 858 B 0 B
./bundle/chunk-5PS3AYFU.js 1.18 kB 0 B
./bundle/chunk-664ZODQF.js 124 kB 0 B
./bundle/chunk-DAHVX5MI.js 206 kB 0 B
./bundle/chunk-IUUIT4SU.js 56.5 kB 0 B
./bundle/chunk-RJTRUG2J.js 39.8 kB 0 B
./bundle/chunk-XRLFHCHC.js 1.97 MB 0 B
./bundle/cleanup-FAKIFL72.js 0 B -932 B (removed) 🏆
./bundle/devtools-36NN55EP.js 696 kB 0 B
./bundle/dist-T73EYRDX.js 356 B 0 B
./bundle/events-XB7DADIJ.js 418 B 0 B
./bundle/examples/hooks/scripts/on-start.js 188 B 0 B
./bundle/examples/mcp-server/example.js 1.43 kB 0 B
./bundle/gemini.js 4.97 kB 0 B
./bundle/getMachineId-bsd-TXG52NKR.js 1.55 kB 0 B
./bundle/getMachineId-darwin-7OE4DDZ6.js 1.55 kB 0 B
./bundle/getMachineId-linux-SHIFKOOX.js 1.34 kB 0 B
./bundle/getMachineId-unsupported-5U5DOEYY.js 1.06 kB 0 B
./bundle/getMachineId-win-6KLLGOI4.js 1.72 kB 0 B
./bundle/memoryDiscovery-FN3IAPBT.js 980 B 0 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 222 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 229 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 13.4 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js 132 B 0 B
./bundle/sandbox-macos-permissive-open.sb 890 B 0 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB 0 B
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.82 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB 0 B
./bundle/src-QVCVGIUX.js 47 kB 0 B
./bundle/start-EFOTKDES.js 0 B -622 B (removed) 🏆
./bundle/tree-sitter-7U6MW5PS.js 274 kB 0 B
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB 0 B
./bundle/cleanup-HWEDK4DX.js 932 B +932 B (new file) 🆕
./bundle/start-7UW3H652.js 622 B +622 B (new file) 🆕

compressed-size-action

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request expands the OAuth configuration for MCP servers by adding fields such as issuer, audiences, and redirect_uri to the mcpServerSchema and updating the markdownToAgentDefinition function. The review feedback recommends adding URL validation to the new schema fields to ensure robustness and highlights the need to update oauth2AuthSchema and its mapping for remote agents to maintain consistency across the codebase.

Comment thread packages/core/src/agents/agentLoader.ts Outdated
Comment thread packages/core/src/agents/agentLoader.ts Outdated
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 28, 2026

55 tests passed successfully on gemini-3-flash-preview.

🧠 Model Steering Guidance

This PR modifies files that affect the model's behavior (prompts, tools, or instructions).

  • ⚠️ Consider adding Evals: No behavioral evaluations (evals/*.eval.ts) were added or updated in this PR. Consider adding a test case to verify the new behavior and prevent regressions.
  • 🚀 Maintainer Reminder: Please ensure that these changes do not regress results on benchmark evals before merging.

This is an automated guidance message triggered by steering logic signatures.

@gemini-cli gemini-cli Bot added the area/agent Issues related to Core Agent, Tools, Memory, Sub-Agents, Hooks, Agent Quality label Apr 28, 2026
@abhipatel12
Copy link
Copy Markdown
Contributor Author

/gemini review

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request expands the OAuth2 configuration for MCP servers by adding support for several new optional fields, including issuer, audiences, redirect_uri, token_param_name, and registration_url. These changes are reflected in the TypeScript interfaces, Zod validation schemas, and the logic for converting markdown frontmatter to agent definitions. Additionally, the test suite has been updated to verify the correct parsing and mapping of these new fields. I have no feedback to provide.

Copy link
Copy Markdown
Contributor

@adamfweidman adamfweidman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@abhipatel12 abhipatel12 added this pull request to the merge queue Apr 28, 2026
Merged via the queue into main with commit fbd8aaa Apr 28, 2026
29 checks passed
@abhipatel12 abhipatel12 deleted the abhi/add-auth-subagents branch April 28, 2026 22:11
TirthNaik-99 pushed a commit to TirthNaik-99/gemini-cli that referenced this pull request May 4, 2026
kimjune01 pushed a commit to kimjune01/gemini-cli-claude that referenced this pull request May 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/agent Issues related to Core Agent, Tools, Memory, Sub-Agents, Hooks, Agent Quality

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Subagent parsing is missing support for oauth fields

2 participants