refactor(cli): consolidate useToolScheduler and delete legacy implementation

[abhipatel12]

Summary

This PR consolidates the tool scheduling logic in the CLI package by removing the legacy useReactToolScheduler and renaming the modern implementation to useToolScheduler. This significantly simplifies the hook architecture and removes the need for a facade layer.

Details

• Consolidation: Deleted the legacy useReactToolScheduler.ts and its associated unit tests.
• Renaming: Renamed packages/cli/src/ui/hooks/useToolExecutionScheduler.ts to packages/cli/src/ui/hooks/useToolScheduler.ts.
• Simplification: Removed the facade layer in useToolScheduler.ts that previously toggled between legacy and modern engines.
• Import Cleanup: Updated all CLI hooks and components (useGeminiStream, useTurnActivityMonitor, useShellInactivityStatus, etc.) to import types and the main hook from the unified useToolScheduler.js.
• Test Refactoring: Updated App.test.tsx and useGeminiStream.test.tsx to remove redundant feature flag mocks and spies.

Note: A follow-up PR will address the removal of the remaining onConfirm adapter logic within the hook, as it is now redundant with the MessageBus based confirmation flow.

Related Issues

Significant progress on the legacy scheduler cleanup in the CLI package.

How to Validate

1. Run npm run preflight to ensure all tests pass and the build is stable.
2. Verify that packages/cli/src/ui/hooks/useReactToolScheduler.ts no longer exists in the codebase.
3. Confirm that all imports in the CLI correctly point to the renamed useToolScheduler.js.

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

[gemini-code-assist]

Summary of Changes

Hello @abhipatel12, I'm Gemini Code Assist¹! 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 significantly refactors the tool scheduling logic within the CLI package. By removing the outdated useReactToolScheduler and directly integrating the modern event-driven implementation under the new useToolScheduler name, the architecture is streamlined. This change eliminates a facade layer, simplifies configuration, and cleans up various UI components and tests that previously managed compatibility between the two scheduling approaches. The overall impact is a more maintainable and less complex codebase for tool execution.

Highlights

• Scheduler Consolidation: The legacy useReactToolScheduler and its associated unit tests have been removed, streamlining the tool scheduling logic.
• Renaming and Simplification: The modern tool scheduling implementation, previously useToolExecutionScheduler, has been renamed to useToolScheduler. The facade layer that previously toggled between legacy and modern engines has been eliminated, simplifying the hook architecture.
• Import Updates: All relevant CLI hooks and components (useGeminiStream, useTurnActivityMonitor, useShellInactivityStatus, etc.) now import types and the main hook directly from the unified useToolScheduler.js.
• Test Refactoring: App.test.tsx and useGeminiStream.test.tsx have been updated to remove redundant feature flag mocks and spies, reflecting the removal of the legacy scheduler. Additionally, ToolGroupMessage.test.tsx and related snapshots were updated to remove tests specific to the legacy confirmation handling.
• UI Component Cleanup: UI components like AlternateBufferQuittingDisplay.tsx, MainContent.tsx, and ToolGroupMessage.tsx have been refactored to remove conditional logic and imports related to the isEventDrivenSchedulerEnabled flag and the legacy confirmation flow.

Changelog

• packages/cli/src/test-utils/mockConfig.ts
  • Removed isEventDrivenSchedulerEnabled from mock configuration.
• packages/cli/src/ui/App.test.tsx
  • Removed a vi.spyOn call for isEventDrivenSchedulerEnabled.
• packages/cli/src/ui/AppContainer.test.tsx
  • Updated import of TrackedToolCall type from useReactToolScheduler.js to useToolScheduler.js.
• packages/cli/src/ui/components/AlternateBufferQuittingDisplay.tsx
  • Removed useConfig import and conditional logic based on isEventDrivenSchedulerEnabled.
• packages/cli/src/ui/components/MainContent.tsx
  • Removed useConfig import and conditional logic based on isEventDrivenSchedulerEnabled.
• packages/cli/src/ui/components/messages/ToolConfirmationMessageOverflow.test.tsx
  • Deleted file, as its functionality is no longer relevant with the removal of legacy confirmation handling.
• packages/cli/src/ui/components/messages/ToolGroupMessage.test.tsx
  • Removed createMockSettings import and enableEventDrivenScheduler from mock config.
  • Removed several test cases related to confirmation handling and event-driven scheduler behavior.
  • Updated snapshots to reflect changes in test logic and removed components.
• packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
  • Removed imports for ToolConfirmationMessage and useConfig.
  • Eliminated logic related to isEventDriven and toolAwaitingApproval for inline confirmations.
  • Removed isFocused prop from component signature.
• packages/cli/src/ui/components/messages/snapshots/ToolGroupMessage.test.tsx.snap
  • Updated to reflect changes in ToolGroupMessage.test.tsx.
• packages/cli/src/ui/hooks/snapshots/useToolScheduler.test.ts.snap
  • Deleted file.
• packages/cli/src/ui/hooks/useGeminiStream.test.tsx
  • Removed isEventDrivenSchedulerEnabled mock from config.
• packages/cli/src/ui/hooks/useGeminiStream.ts
  • Removed the isEventDriven variable and associated conditional logic for filtering tool calls.
• packages/cli/src/ui/hooks/useReactToolScheduler.test.ts
  • Deleted file.
• packages/cli/src/ui/hooks/useReactToolScheduler.ts
  • Deleted file, removing the legacy scheduler implementation.
• packages/cli/src/ui/hooks/useShellInactivityStatus.ts
  • Updated import of TrackedToolCall type from useReactToolScheduler.js to useToolScheduler.js.
• packages/cli/src/ui/hooks/useToolExecutionScheduler.test.ts
  • Deleted file.
• packages/cli/src/ui/hooks/useToolExecutionScheduler.ts
  • Deleted file, as its implementation has been moved and renamed.
• packages/cli/src/ui/hooks/useToolScheduler.test.ts
  • Updated to reflect the new useToolScheduler implementation directly, removing facade-specific tests.
• packages/cli/src/ui/hooks/useToolScheduler.ts
  • Refactored to directly implement the modern event-driven scheduler logic, removing the facade pattern and the conditional loading of useReactToolScheduler or useToolExecutionScheduler.
• packages/cli/src/ui/hooks/useToolSchedulerFacade.test.ts
  • Deleted file.
• packages/cli/src/ui/hooks/useTurnActivityMonitor.test.ts
  • Updated import of TrackedToolCall type from useReactToolScheduler.js to useToolScheduler.js.
• packages/cli/src/ui/hooks/useTurnActivityMonitor.ts
  • Updated import of TrackedToolCall type from useReactToolScheduler.js to useToolScheduler.js.

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. ↩

[gemini-code-assist]

Code Review

This pull request is an excellent refactoring that consolidates the tool scheduling logic by removing the legacy useReactToolScheduler and its associated feature flag. The modern, event-driven useToolExecutionScheduler has been correctly renamed to useToolScheduler and is now the single implementation, which significantly simplifies the hook architecture and improves maintainability. All related imports, components, and tests have been updated consistently to reflect this change. The test suite has been particularly well-refactored to remove the now-obsolete branching logic and focus on the unified behavior. The changes are clean, well-executed, and align perfectly with the goal of simplifying the codebase. I found no issues with this refactoring.

[github-actions]

Size Change: -354 B (0%)

Total Size: 24.3 MB

ℹ️ View Unchanged

Filename	Size	Change
./bundle/gemini.js	24.3 MB	-354 B (0%)
./bundle/sandbox-macos-permissive-closed.sb	1.03 kB	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-closed.sb	3.29 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

_{compressed-size-action}

[jacob314]