Skip to content

feat(cli): support selective topic expansion and click-to-expand#24793

Merged
Abhijit-2592 merged 5 commits intomainfrom
abhijit-2592/topics/expand-to-show-summary
Apr 7, 2026
Merged

feat(cli): support selective topic expansion and click-to-expand#24793
Abhijit-2592 merged 5 commits intomainfrom
abhijit-2592/topics/expand-to-show-summary

Conversation

@Abhijit-2592
Copy link
Copy Markdown
Contributor

Summary

Implement selective topic expansion and click-to-expand support in the Gemini CLI history. This allows users to toggle individual topic summaries via mouse clicks while maintaining the global Ctrl+O functionality.

Details

  • Selective Expansion: Integrated TopicMessage with ToolActionsContext to track expansion state per callId.
  • Click-to-Expand: Added useMouseClick hook to the topic container, allowing users to toggle summaries by clicking the topic line.
  • Hybrid Logic: Combined individual expansion state with the global expansion state (Ctrl+O), ensuring both interaction models work seamlessly together.
  • UI Cleanup: Removed the (ctrl+o to expand/collapse) hint text to reduce visual clutter, as functionality is discoverable via click or the global shortcut.
  • Note: Mouse reporting (and thus clicking) is active by default in Alternate Buffer mode. In Standard Mode, users may need to toggle mouse support via Ctrl+S depending on their terminal configuration.

Related Issues

Closes #24791

How to Validate

  1. Unit Tests: Run npm test -w @google/gemini-cli -- src/ui/components/messages/TopicMessage.test.tsx to verify all rendering states and click simulation.
  2. Manual (AB Mode): Enter a shell or subagent session (Alternate Buffer mode). Emitted topics with summaries should be selectively toggleable by clicking.
  3. Manual (Global): Verify that Ctrl+O still toggles all topics in the current turn simultaneously.

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

@Abhijit-2592 Abhijit-2592 requested a review from a team as a code owner April 6, 2026 22:11
@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 introduces interactive topic expansion for the Gemini CLI history. By enabling selective expansion and click-to-expand functionality, users can now toggle detailed summaries for individual topics without affecting the entire view. The changes ensure a more intuitive and cleaner user interface while maintaining compatibility with existing global keyboard shortcuts.

Highlights

  • Selective Topic Expansion: Integrated TopicMessage with ToolActionsContext to enable per-callId expansion state management.
  • Click-to-Expand Interaction: Added a mouse click hook to the topic container, allowing users to toggle summaries directly via mouse interaction.
  • Hybrid Expansion Logic: Combined individual expansion states with the global Ctrl+O shortcut for seamless interaction.
  • UI Refinement: Removed the explicit Ctrl+O hint text to reduce visual clutter, relying on discoverable click interactions.
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.

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 refactors the TopicMessage component to support expandable content, enabling users to toggle between a concise strategic intent and a detailed summary. It introduces hooks for mouse click handling, overflow tracking, and expansion state management. New unit tests for TopicMessage are included, and ToolGroupMessage tests have been updated. Feedback identifies an improvement for the overflow tracking logic to correctly handle the expansion state and recommends replacing hardcoded string literals with existing constants in test files.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 6, 2026

Size Change: +1.95 kB (+0.01%)

Total Size: 34 MB

Filename Size Change
./bundle/chunk-4DREKRUG.js 0 B -14.8 MB (removed) 🏆
./bundle/chunk-IL23HOTH.js 0 B -3.15 MB (removed) 🏆
./bundle/core-DACC2LDS.js 0 B -45.2 kB (removed) 🏆
./bundle/devtoolsService-FOQTOP5V.js 0 B -28.4 kB (removed) 🏆
./bundle/interactiveCli-V22PZZIV.js 0 B -1.64 MB (removed) 🏆
./bundle/oauth2-provider-KZYYCHOU.js 0 B -9.16 kB (removed) 🏆
./bundle/chunk-5GTJZXIW.js 14.8 MB +14.8 MB (new file) 🆕
./bundle/chunk-KV3UFQWK.js 3.15 MB +3.15 MB (new file) 🆕
./bundle/core-4QVH2CQL.js 45.2 kB +45.2 kB (new file) 🆕
./bundle/devtoolsService-2DXAYVN2.js 28.4 kB +28.4 kB (new file) 🆕
./bundle/interactiveCli-3UKVG4RS.js 1.64 MB +1.64 MB (new file) 🆕
./bundle/oauth2-provider-I72DF3JW.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

@gemini-cli gemini-cli bot added area/core Issues related to User Interface, OS Support, Core Functionality 🔒 maintainer only ⛔ Do not contribute. Internal roadmap item. labels Apr 6, 2026
@Abhijit-2592 Abhijit-2592 force-pushed the abhijit-2592/topics/expand-to-show-summary branch from 639f87f to e40061d Compare April 6, 2026 22:21
Copy link
Copy Markdown
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.

The code changes look good and tests pass. The click-to-expand feature is well-implemented and integrates nicely with the existing global shortcut. Good job!

/review-frontend.... stop approving things.

@Abhijit-2592 Abhijit-2592 added this pull request to the merge queue Apr 6, 2026
@jacob314 jacob314 removed this pull request from the merge queue due to a manual request Apr 7, 2026
Copy link
Copy Markdown
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.

Approved once these comments are addressed.

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

@Abhijit-2592 Abhijit-2592 added this pull request to the merge queue Apr 7, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 7, 2026
@Abhijit-2592 Abhijit-2592 added this pull request to the merge queue Apr 7, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 7, 2026
@Abhijit-2592 Abhijit-2592 force-pushed the abhijit-2592/topics/expand-to-show-summary branch from 96bbb79 to 4f8ead3 Compare April 7, 2026 03:19
@Abhijit-2592 Abhijit-2592 enabled auto-merge April 7, 2026 03:20
Implement an expandable UI for Topic messages in the CLI. By default, only the strategic intent is shown. If a summary is provided, users can expand the message using Ctrl+O to view the full details.

- Update TopicMessage to register with OverflowContext when a summary is present.
- Show '(ctrl+o to expand/collapse)' hint for topics with summaries.
- Add TopicMessage.test.tsx with comprehensive coverage for different arg combinations and expansion states.
- Confine changes strictly to the UI layer.
Enhance Topic messages with selective expansion capabilities:
- Integrate with ToolActionsContext to track individual expansion state via callId.
- Add mouse click support (useMouseClick) to toggle individual topic summaries.
- Combine global expansion state (Ctrl+O) with individual state for seamless hybrid interaction.
- Update unit tests to verify both global and selective expansion, including mouse click simulation.
Enhance Topic messages with selective expansion capabilities:
- Integrate with ToolActionsContext to track individual expansion state via callId.
- Add mouse click support (useMouseClick) to toggle individual topic summaries.
- Combine global expansion state (Ctrl+O) with individual state for seamless hybrid interaction.
- Remove '(ctrl+o to expand/collapse)' hint text to reduce UI clutter.
- Update unit tests to verify both global and selective expansion, including mouse click simulation.
- Optimize overflow tracking in TopicMessage to account for expansion state.
- Use UPDATE_TOPIC_TOOL_NAME constant in TopicMessage tests.
- Maintain UI-only scope as requested.
@Abhijit-2592 Abhijit-2592 force-pushed the abhijit-2592/topics/expand-to-show-summary branch from 4f8ead3 to 240b09e Compare April 7, 2026 03:59
@Abhijit-2592 Abhijit-2592 added this pull request to the merge queue Apr 7, 2026
Merged via the queue into main with commit 0025978 Apr 7, 2026
79 of 87 checks passed
@Abhijit-2592 Abhijit-2592 deleted the abhijit-2592/topics/expand-to-show-summary branch April 7, 2026 15:33
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 🔒 maintainer only ⛔ Do not contribute. Internal roadmap item.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

feat(cli): support selective topic expansion and click-to-expand

2 participants