Skip to content

split context#24623

Merged
jacob314 merged 3 commits intomainfrom
split_context
Apr 6, 2026
Merged

split context#24623
jacob314 merged 3 commits intomainfrom
split_context

Conversation

@jacob314
Copy link
Copy Markdown
Contributor

@jacob314 jacob314 commented Apr 3, 2026

Problem is we were using the same context object for the InputPrompt and the chat history resulting bad performance as every keystroke would cause React to invalidate the chat history. We had caching in place to help but wasn't enough.

  • Split up UIStateContext from InputContext to massively speed input prompt performance.

FIxes #24624

How to test:
Resume a long history.
Verify that typing in the input prompt feels fast rather than laggy.

@jacob314 jacob314 requested a review from a team as a code owner April 3, 2026 18:32
@gemini-cli
Copy link
Copy Markdown
Contributor

gemini-cli bot commented Apr 3, 2026

Hi @jacob314, thank you so much for your contribution to Gemini CLI! We really appreciate the time and effort you've put into this.

We're making some updates to our contribution process to improve how we track and review changes. Please take a moment to review our recent discussion post: Improving Our Contribution Process & Introducing New Guidelines.

Key Update: Starting January 26, 2026, the Gemini CLI project will require all pull requests to be associated with an existing issue. Any pull requests not linked to an issue by that date will be automatically closed.

Thank you for your understanding and for being a part of our community!

@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 refactors the application's state management by separating input-related state from the general UI state. This change is intended to optimize performance for input prompts by reducing unnecessary re-renders. Additionally, it introduces a fix to ensure that user-defined mouse mode settings are correctly preserved when transitioning out of expand mode.

Highlights

  • UIStateContext Refactoring: Split the UIStateContext into a dedicated InputContext to improve performance for input prompts.
  • Mouse Mode Preservation: Implemented logic to preserve user mouse mode toggles when exiting expand mode.
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 3, 2026

Size Change: +1.04 kB (0%)

Total Size: 34 MB

Filename Size Change
./bundle/chunk-DJ3KCY7M.js 0 B -14.8 MB (removed) 🏆
./bundle/chunk-I64H5SQM.js 0 B -3.15 MB (removed) 🏆
./bundle/core-5QYYRYFK.js 0 B -45.2 kB (removed) 🏆
./bundle/devtoolsService-I5PFXSEG.js 0 B -28.4 kB (removed) 🏆
./bundle/interactiveCli-RGAWM3SE.js 0 B -1.64 MB (removed) 🏆
./bundle/oauth2-provider-5PSMK5YW.js 0 B -9.16 kB (removed) 🏆
./bundle/chunk-CBL35XVH.js 14.8 MB +14.8 MB (new file) 🆕
./bundle/chunk-SWPVQ2QK.js 3.15 MB +3.15 MB (new file) 🆕
./bundle/core-CFZ2XWZ6.js 45.2 kB +45.2 kB (new file) 🆕
./bundle/devtoolsService-HPQORAH7.js 28.4 kB +28.4 kB (new file) 🆕
./bundle/interactiveCli-TLPXL2ZJ.js 1.64 MB +1.64 MB (new file) 🆕
./bundle/oauth2-provider-GA2VH6O5.js 9.16 kB +9.16 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size
./bundle/bundled/third_party/index.js 8 MB
./bundle/chunk-34MYV7JD.js 2.45 kB
./bundle/chunk-5AUYMPVF.js 858 B
./bundle/chunk-5PS3AYFU.js 1.18 kB
./bundle/chunk-664ZODQF.js 124 kB
./bundle/chunk-DAHVX5MI.js 206 kB
./bundle/chunk-GFUOVHXW.js 1.96 MB
./bundle/chunk-IUUIT4SU.js 56.5 kB
./bundle/chunk-RJTRUG2J.js 39.8 kB
./bundle/devtools-36NN55EP.js 696 kB
./bundle/dist-T73EYRDX.js 356 B
./bundle/events-XB7DADIJ.js 418 B
./bundle/gemini.js 552 kB
./bundle/getMachineId-bsd-TXG52NKR.js 1.55 kB
./bundle/getMachineId-darwin-7OE4DDZ6.js 1.55 kB
./bundle/getMachineId-linux-SHIFKOOX.js 1.34 kB
./bundle/getMachineId-unsupported-5U5DOEYY.js 1.06 kB
./bundle/getMachineId-win-6KLLGOI4.js 1.72 kB
./bundle/memoryDiscovery-ACCRGPX3.js 980 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 222 kB
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 229 kB
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 13.4 kB
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js 132 B
./bundle/sandbox-macos-permissive-open.sb 890 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB
./bundle/sandbox-macos-strict-open.sb 4.82 kB
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB
./bundle/src-QVCVGIUX.js 47 kB
./bundle/tree-sitter-7U6MW5PS.js 274 kB
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB

compressed-size-action

@jacob314 jacob314 enabled auto-merge April 3, 2026 18:39
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 introduces an InputContext to manage input-related state, such as the buffer, user messages, and shell mode, separately from the main UIStateContext. This refactoring improves performance by reducing unnecessary re-renders of the application. Additionally, the PR includes a fix for mouse mode state management in AppContainer and updates various components and tests to consume the new InputContext. I have identified two critical issues: the inclusion of redundant dependencies in the uiState memoization array, which negates the performance benefits of the context split, and a flaw in the mouse mode snapshot logic that causes manual user toggles to be discarded.

Note: Security Review did not run due to the size of the PR.

Comment thread packages/cli/src/ui/AppContainer.tsx Outdated
@gemini-cli gemini-cli bot added the area/core Issues related to User Interface, OS Support, Core Functionality label Apr 3, 2026
@google-gemini google-gemini deleted a comment from gemini-code-assist bot Apr 3, 2026
initError: string | null;
pendingGeminiHistoryItems: HistoryItemWithoutId[];
thought: ThoughtSummary | null;
shellModeActive: boolean;
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

critical part of this change. Remove these parameters from the UIStateContext depended on by ToolGroupMessage, etc.

};
};

function findLastIndex<T>(
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

These changes to VirtualizedList aren't directly related to spllitting the context and can be reverted if desired. They are part of the same effort to improve the efficiency of the main chat history area which is rendered as a VirtualizedList.

@jacob314 jacob314 added this pull request to the merge queue Apr 6, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 6, 2026
@jacob314 jacob314 added this pull request to the merge queue Apr 6, 2026
Merged via the queue into main with commit 70f6d6a Apr 6, 2026
27 checks passed
@jacob314 jacob314 deleted the split_context branch April 6, 2026 17:53
warrenzhu25 pushed a commit to warrenzhu25/gemini-cli that referenced this pull request Apr 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/core Issues related to User Interface, OS Support, Core Functionality

Projects

None yet

Development

Successfully merging this pull request may close these issues.

InputPrompt can be very slow when there is a large chat history

2 participants