Skip to content

feat(core): wire up the new ContextManager and AgentChatHistory#25409

Merged
joshualitt merged 19 commits intomainfrom
jl/cm-part-2
Apr 27, 2026
Merged

feat(core): wire up the new ContextManager and AgentChatHistory#25409
joshualitt merged 19 commits intomainfrom
jl/cm-part-2

Conversation

@joshualitt
Copy link
Copy Markdown
Contributor

@joshualitt joshualitt commented Apr 14, 2026

fixes #25408

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 14, 2026 •
edited
Loading

Size Change: +84.9 kB (+0.25%)

Total Size: 33.9 MB

Filename Size Change
./bundle/chunk-277F3ETD.js 0 B -2.73 MB (removed) 🏆
./bundle/chunk-E3QQILYR.js 0 B -3.8 kB (removed) 🏆
./bundle/chunk-F4XSFFH6.js 0 B -14.6 MB (removed) 🏆
./bundle/chunk-HD3RHPQG.js 0 B -672 kB (removed) 🏆
./bundle/chunk-LKDYKQY5.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-WHYVLK6G.js 0 B -49.2 kB (removed) 🏆
./bundle/core-SILBHRJT.js 0 B -48 kB (removed) 🏆
./bundle/devtoolsService-E6M3SJXR.js 0 B -27.8 kB (removed) 🏆
./bundle/gemini-WJ3FW6E6.js 0 B -573 kB (removed) 🏆
./bundle/interactiveCli-ZXPWUQMT.js 0 B -1.31 MB (removed) 🏆
./bundle/liteRtServerManager-L44Y3LMF.js 0 B -2.08 kB (removed) 🏆
./bundle/oauth2-provider-QZ6LXW7K.js 0 B -9.16 kB (removed) 🏆
./bundle/chunk-7ZW2MZU4.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/chunk-DIEVH76D.js 14.7 MB +14.7 MB (new file) 🆕
./bundle/chunk-MQTB3ZNP.js 3.8 kB +3.8 kB (new file) 🆕
./bundle/chunk-TPOWIC3F.js 2.73 MB +2.73 MB (new file) 🆕
./bundle/chunk-UMZFY4RS.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/chunk-WKV4G4PF.js 673 kB +673 kB (new file) 🆕
./bundle/core-DAZWFWYE.js 48.1 kB +48.1 kB (new file) 🆕
./bundle/devtoolsService-R4PCZ54I.js 27.8 kB +27.8 kB (new file) 🆕
./bundle/gemini-7W4BS5IB.js 573 kB +573 kB (new file) 🆕
./bundle/interactiveCli-BM5AV45Y.js 1.31 MB +1.31 MB (new file) 🆕
./bundle/liteRtServerManager-77MWWEO4.js 2.08 kB +2.08 kB (new file) 🆕
./bundle/oauth2-provider-GUENZVRQ.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-MTD736U4.js 1.97 MB 0 B
./bundle/chunk-RJTRUG2J.js 39.8 kB 0 B
./bundle/cleanup-45LFF2KS.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-NSOLCG4U.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-GM42SN4R.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-YBATZSWS.js 932 B +932 B (new file) 🆕
./bundle/start-NUWYUJRQ.js 622 B +622 B (new file) 🆕

compressed-size-action

@gemini-cli gemini-cli Bot added the area/agent Issues related to Core Agent, Tools, Memory, Sub-Agents, Hooks, Agent Quality label Apr 14, 2026
@joshualitt joshualitt force-pushed the jl/cm-part-2 branch 2 times, most recently from 074ad4a to b2e0030 Compare April 16, 2026 00:09
joshualitt
joshualitt commented Apr 16, 2026
View reviewed changes
Comment thread packages/cli/src/config/config.ts
@github-actions github-actions Bot mentioned this pull request Apr 16, 2026
Open
@joshualitt joshualitt marked this pull request as ready for review April 16, 2026 18:55
@joshualitt joshualitt requested review from a team as code owners April 16, 2026 18:55
@gemini-code-assist
Copy link
Copy Markdown
Contributor

gemini-code-assist Bot commented Apr 16, 2026

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 introduces significant architectural improvements to the context management system. By transitioning to a more robust event-driven approach with the new ContextManager and AgentChatHistory, the system gains better control over chat history lifecycles. Additionally, it adds testing capabilities through a new stress test profile and improves the precision of token estimation, ensuring more reliable context management behavior.

Highlights

  • Context Management Integration: Wired up the new ContextManager and AgentChatHistory to improve context handling and lifecycle management.
  • Experimental Stress Test Profile: Added an experimental stress test profile that aggressively triggers context management, useful for testing garbage collection and distillation.
  • Refactored Context Graph Builder: Refactored the graph building logic into a class-based structure to better handle history events and state updates.
  • Improved Token Estimation: Enhanced token estimation logic with caching and configurable character-per-token ratios for better accuracy.
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. ↩

gemini-code-assist[bot]
gemini-code-assist Bot reviewed Apr 16, 2026
View reviewed changes
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 experimental stressTestProfile to the context management system, enabling more aggressive testing of garbage collection and distillation. Key refactorings include the introduction of ContextGraphBuilder for incremental graph updates, the AgentChatHistory class for managing chat history, and a centralized initializeContextManager utility. Additionally, ContextTokenCalculator now utilizes a WeakMap cache for improved performance. A review comment suggests optimizing the node insertion logic in ContextWorkingBuffer to prevent potential stack overflow issues with large arrays.

Comment thread packages/core/src/context/pipeline/contextWorkingBuffer.ts Outdated
@joshualitt joshualitt force-pushed the jl/cm-part-2 branch 2 times, most recently from 3598fe0 to 6d7aa49 Compare April 20, 2026 17:49
@joshualitt joshualitt requested a review from gundermanc April 20, 2026 19:22
@joshualitt joshualitt force-pushed the jl/cm-part-2 branch 3 times, most recently from d750bd8 to 7cf8a1d Compare April 21, 2026 22:54
@github-actions github-actions Bot mentioned this pull request Apr 22, 2026
Open
@github-actions github-actions Bot mentioned this pull request Apr 23, 2026
Open
@github-actions github-actions Bot mentioned this pull request Apr 24, 2026
Open
@joshualitt joshualitt force-pushed the jl/cm-part-2 branch 2 times, most recently from ea46a7a to 21ff0f0 Compare April 27, 2026 16:08
@joshualitt joshualitt added this pull request to the merge queue Apr 27, 2026
@joshualitt joshualitt removed this pull request from the merge queue due to a manual request Apr 27, 2026
@joshualitt joshualitt added this pull request to the merge queue Apr 27, 2026
@joshualitt joshualitt removed this pull request from the merge queue due to a manual request Apr 27, 2026
@joshualitt joshualitt added this pull request to the merge queue Apr 27, 2026
@joshualitt joshualitt removed this pull request from the merge queue due to a manual request Apr 27, 2026
@joshualitt joshualitt added this pull request to the merge queue Apr 27, 2026
Merged via the queue into main with commit 71f313b Apr 27, 2026
26 of 27 checks passed
@joshualitt joshualitt deleted the jl/cm-part-2 branch April 27, 2026 19:03
TirthNaik-99 pushed a commit to TirthNaik-99/gemini-cli that referenced this pull request May 4, 2026
@joshualitt
feat(core): wire up the new ContextManager and AgentChatHistory (goog…
6c39c16 
…le-gemini#25409)
kimjune01 pushed a commit to kimjune01/gemini-cli-claude that referenced this pull request May 6, 2026
@joshualitt @kimjune01
feat(core): wire up the new ContextManager and AgentChatHistory (goog…
721dcf8 
…le-gemini#25409)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SandyTao520 SandyTao520 SandyTao520 approved these changes

@gundermanc gundermanc Awaiting requested review from gundermanc

+1 more reviewer

@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Create initial context manager experiment

2 participants

@joshualitt @SandyTao520