Skip to content

fix(cli): prevent sub-agent tool calls from leaking into UI#20580

Merged
abhipatel12 merged 1 commit intomainfrom
abhi/parallel-agents.3
Feb 27, 2026
Merged

fix(cli): prevent sub-agent tool calls from leaking into UI#20580
abhipatel12 merged 1 commit intomainfrom
abhi/parallel-agents.3

Conversation

@abhipatel12
Copy link
Collaborator

Summary

Filters tool call updates in the CLI UI to only process those from the root scheduler. This prevents internal sub-agent tool calls from leaking into the main UI.

Details

  • Modified useToolScheduler.ts to only process events where schedulerId matches ROOT_SCHEDULER_ID.
  • Updated unit tests in useToolScheduler.test.ts to ensure non-root updates are ignored and existing root tools are preserved correctly.

Related Issues

N/A

How to Validate

Run the unit tests for the tool scheduler:

npm test -w @google/gemini-cli-cli -- src/ui/hooks/useToolScheduler.test.ts

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
      • npx
      • Docker
      • Podman
      • Seatbelt
    • Windows
      • npm run
      • npx
      • Docker
    • Linux
      • npm run
      • npx
      • Docker

@abhipatel12 abhipatel12 requested a review from a team as a code owner February 27, 2026 17:28
@gemini-code-assist
Copy link
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 refines the display of tool calls within the CLI user interface by introducing a filter that ensures only relevant updates from the primary scheduler are presented. This change improves user experience by preventing internal sub-agent operations, which are not intended for direct user interaction, from cluttering the main UI.

Highlights

  • UI Filtering for Tool Calls: Implemented a mechanism to filter TOOL_CALLS_UPDATE messages, ensuring that only tool calls originating from the root scheduler are processed and displayed in the CLI UI. This prevents internal sub-agent tool calls from being shown to the user.
  • Unit Test Updates: Updated existing unit tests and added new assertions in useToolScheduler.test.ts to validate that non-root scheduler tool calls are correctly ignored and that root scheduler tool calls are preserved as expected.
Changelog
  • packages/cli/src/ui/hooks/useToolScheduler.test.ts
    • Modified test cases to assert that only tool calls from the ROOT_SCHEDULER_ID are counted and displayed.
    • Added a new test case to explicitly verify that TOOL_CALLS_UPDATE messages from non-root schedulers are ignored.
  • packages/cli/src/ui/hooks/useToolScheduler.ts
    • Added a conditional check within the useEffect hook to filter incoming ToolCallsUpdateMessage events, processing only those where schedulerId matches ROOT_SCHEDULER_ID.
Activity
  • The author, abhipatel12, has added/updated tests to cover the new filtering logic.
  • The author has validated the changes on MacOS using npm run.
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.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

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.

Copy link
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

The pull request effectively addresses the issue of sub-agent tool calls leaking into the UI by implementing a clear filtering mechanism based on the ROOT_SCHEDULER_ID. The changes in useToolScheduler.ts correctly ensure that only updates from the root scheduler are processed, preventing internal sub-agent activities from being displayed. The accompanying updates in useToolScheduler.test.ts are thorough, reflecting the new behavior and including a dedicated test case to validate that non-root scheduler updates are ignored. This ensures the UI remains focused on relevant tool calls and maintains a clean user experience.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Size Change: +169 B (0%)

Total Size: 25.7 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 25.2 MB +169 B (0%)
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 221 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 227 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 11.5 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

compressed-size-action

@gemini-cli gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Feb 27, 2026
Copy link
Contributor

@jacob314 jacob314 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 Feb 27, 2026
Merged via the queue into main with commit c914fd0 Feb 27, 2026
30 checks passed
@abhipatel12 abhipatel12 deleted the abhi/parallel-agents.3 branch February 27, 2026 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/need-issue Pull requests that need to have an associated issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants