Skip to content

fix(acp): move tool explanation from thought stream to tool call content#26554

Merged
sripasg merged 1 commit intomainfrom
sripas_fix_1659
May 6, 2026
Merged

fix(acp): move tool explanation from thought stream to tool call content#26554
sripasg merged 1 commit intomainfrom
sripas_fix_1659

Conversation

@sripasg
Copy link
Copy Markdown
Contributor

@sripasg sripasg commented May 6, 2026

Summary

Address an issue where raw input parameters for MCP tools were emitted as JSON strings in the agent's thought stream, creating noise in the chat UI.

Details:

  • Stop sending invocation.getExplanation() as an agent_thought_chunk in acpSession.ts.
  • Include the explanation in the content field of the toolCall payload in both RequestPermissionRequest and tool_call (in_progress) updates, provided the content is not already populated (e.g., by a diff).
  • This ensures that tool parameters remain visible to the client (e.g., JetBrains or Xcode) in the structured payload without cluttering the chat stream or breaking the title field, thus avoiding regression for issue maintainers-gemini-cli#1572.
  • Add unit tests in acpSession.test.ts to verify that the explanation is correctly placed in the content and not emitted as a thought chunk.

Related Issues

google-gemini/maintainers-gemini-cli#1659

How to Validate

Ensure no regressions. Issue testing is being done by an external team.

The PR that introduced this issue was meant for JB - as the explanation was appearing as part of the command run before original fix. Checked that - it's still not part of the actual run command tool box. The slight change is that it's no longer part of the thinking. It is shown in the main message area. (not part of the commmand run) as shown below:

image

Pre-Merge Checklist

  • [NA] Updated relevant documentation and README (if needed)
  • Added/updated tests (if needed)
  • [NA] 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

Address an issue where raw input parameters for MCP tools were emitted as JSON strings in the agent's thought stream, creating noise in the chat UI.

Details:
- Stop sending `invocation.getExplanation()` as an `agent_thought_chunk` in `acpSession.ts`.
- Include the explanation in the `content` field of the `toolCall` payload in both `RequestPermissionRequest` and `tool_call` (in_progress) updates, provided the content is not already populated (e.g., by a diff).
- This ensures that tool parameters remain visible to the client (e.g., JetBrains or Xcode) in the structured payload without cluttering the chat stream or breaking the title field, thus avoiding regression for issue #1572.
- Add unit tests in `acpSession.test.ts` to verify that the explanation is correctly placed in the content and not emitted as a thought chunk.
@sripasg sripasg self-assigned this May 6, 2026
@sripasg sripasg requested a review from a team as a code owner May 6, 2026 00:10
@sripasg sripasg added the ACP label May 6, 2026
@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 improves the MCP tool invocation experience by cleaning up the agent's thought stream. By moving tool explanations from raw thought chunks into the structured tool call content, the changes ensure that critical information remains accessible to clients like JetBrains or Xcode while significantly reducing visual clutter in the chat interface. This approach maintains backward compatibility and prevents regressions for structured tool data handling.

Highlights

  • Refactored Tool Explanation Handling: Removed the emission of tool explanations as 'agent_thought_chunk' events to reduce chat UI noise.
  • Structured Payload Integration: Integrated tool explanations directly into the 'content' field of 'toolCall' payloads, ensuring visibility in structured client interfaces without cluttering the chat stream.
  • Regression Testing: Added comprehensive unit tests in 'acpSession.test.ts' to verify that explanations are correctly routed to the tool call content rather than the thought stream.
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 the 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 counterproductive. 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.

@sripasg sripasg added the 🔒 maintainer only ⛔ Do not contribute. Internal roadmap item. label May 6, 2026
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 handling of tool execution explanations in acpSession.ts. Explanations are no longer sent as separate agent_thought_chunk updates; instead, they are now included within the tool_call content or the permission request content when the content array is empty. Corresponding unit tests have been added to acpSession.test.ts to ensure correct behavior in both permission-required and automatic execution scenarios. I have no feedback to provide as there were no review comments to evaluate.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 6, 2026

Size Change: +167 B (0%)

Total Size: 34 MB

Filename Size Change
./bundle/chunk-74IZV5TA.js 0 B -14.8 MB (removed) 🏆
./bundle/chunk-CHMIWLTM.js 0 B -49.2 kB (removed) 🏆
./bundle/chunk-FPTF7LFA.js 0 B -12.5 kB (removed) 🏆
./bundle/chunk-NSWZS5JX.js 0 B -3.8 kB (removed) 🏆
./bundle/chunk-V65PRWYI.js 0 B -19.5 kB (removed) 🏆
./bundle/chunk-WZ5QGM3Z.js 0 B -2.78 MB (removed) 🏆
./bundle/chunk-XFP5HC4U.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-YKGAFKOA.js 0 B -658 kB (removed) 🏆
./bundle/core-DBTIX2PN.js 0 B -48.8 kB (removed) 🏆
./bundle/devtoolsService-NYYGGDNF.js 0 B -28 kB (removed) 🏆
./bundle/gemini-SFZLVZEG.js 0 B -583 kB (removed) 🏆
./bundle/interactiveCli-7WGUCDU3.js 0 B -1.29 MB (removed) 🏆
./bundle/liteRtServerManager-IPC3OOTE.js 0 B -2.11 kB (removed) 🏆
./bundle/oauth2-provider-74GRRLS6.js 0 B -9.16 kB (removed) 🏆
./bundle/chunk-45VZKHIZ.js 14.8 MB +14.8 MB (new file) 🆕
./bundle/chunk-5UBYCIN5.js 658 kB +658 kB (new file) 🆕
./bundle/chunk-AVOJIB5P.js 19.5 kB +19.5 kB (new file) 🆕
./bundle/chunk-CEMUQLNC.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/chunk-FGS3P5TB.js 2.78 MB +2.78 MB (new file) 🆕
./bundle/chunk-NDOJ2PTG.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/chunk-UDIMVLR6.js 12.5 kB +12.5 kB (new file) 🆕
./bundle/chunk-ZHANAYDT.js 3.8 kB +3.8 kB (new file) 🆕
./bundle/core-5CCEBZYW.js 48.8 kB +48.8 kB (new file) 🆕
./bundle/devtoolsService-JBOAP74U.js 28 kB +28 kB (new file) 🆕
./bundle/gemini-JSYDYALP.js 583 kB +583 kB (new file) 🆕
./bundle/interactiveCli-HZDWIWO6.js 1.29 MB +1.29 MB (new file) 🆕
./bundle/liteRtServerManager-D7KY4G2Z.js 2.11 kB +2.11 kB (new file) 🆕
./bundle/oauth2-provider-LMLDAITN.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-RJTRUG2J.js 39.8 kB 0 B
./bundle/chunk-VJSUVOZ4.js 1.97 MB 0 B
./bundle/cleanup-NFESTZGA.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 5.1 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-NGHTMHWQ.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-7MFZQVVL.js 0 B -652 B (removed) 🏆
./bundle/tree-sitter-7U6MW5PS.js 274 kB 0 B
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB 0 B
./bundle/cleanup-OKP2VTUL.js 932 B +932 B (new file) 🆕
./bundle/start-IGAVDKCB.js 652 B +652 B (new file) 🆕

compressed-size-action

@sripasg sripasg added this pull request to the merge queue May 6, 2026
Merged via the queue into main with commit 97a2bd7 May 6, 2026
28 checks passed
@sripasg sripasg deleted the sripas_fix_1659 branch May 6, 2026 16:10
@sripasg sripasg removed the status/need-issue Pull requests that need to have an associated issue. label May 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ACP 🔒 maintainer only ⛔ Do not contribute. Internal roadmap item.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants