refactor(acp): modularize monolithic acpClient into specialized files by sripasg · Pull Request #26143 · google-gemini/gemini-cli

sripasg · 2026-04-28T20:57:42Z

Summary

Decomposed the massive acpClient.ts and its test file into smaller, focused modules to improve maintainability and isolate concerns. This completes Phase 1 of the ACP refactoring plan. Additionally, all files in the acp folder have been renamed to share the acp prefix for better consistency.

Details

Source Code Restructuring:
- Extracted runAcpClient to acpStdioTransport.ts for handling raw I/O.
- Extracted GeminiAgent to acpRpcDispatcher.ts to act as pure RPC handler.
- Created acpSessionManager.ts to manage concurrent user sessions.
- Extracted Session class to acpSession.ts to manage individual chat turns.
- Moved shared helpers and schemas to acpUtils.ts.
File Renaming: Renamed all files in the acp directory to share the acp prefix (e.g., commandHandler.ts -> acpCommandHandler.ts, fileSystemService.ts -> acpFileSystemService.ts) to avoid name collisions and improve organization.
Test Split: Decomposed the massive acpClient.test.ts into corresponding test files: acpRpcDispatcher.test.ts, acpSessionManager.test.ts, and acpSession.test.ts.
Integrations: Updated imports in gemini.tsx and acpResume.test.ts to use the new file paths.
Verification: Verified that all tests pass and the full build (npm run build) succeeds after resolving initial linting and compilation errors.

Related Issues

maintainers-gemini-cli#1604

How to Validate

Cherry-pick over latest main or checkout this change from this branch
npm run clean
npm install
npm run build
npm run bundle
Attach the gemini cli via Jetbrains or Zed and run through the list of test cases manually.

Pre-Merge Checklist

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

gemini-code-assist · 2026-04-28T20:57:55Z

Summary of Changes

Hello, 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 completes Phase 1 of the Agent Client Protocol (ACP) refactoring plan. The primary goal was to break down the monolithic acpClient.ts into smaller, specialized modules to enhance code maintainability and separation of concerns. Additionally, the file structure within the acp directory has been standardized with a consistent prefix, and the test suite has been reorganized to align with the new modular architecture.

Highlights

Modularization of acpClient: Decomposed the monolithic acpClient.ts into specialized modules (acpStdioTransport.ts, acpRpcDispatcher.ts, acpSessionManager.ts, acpSession.ts, acpUtils.ts) to improve maintainability and isolate concerns.
Consistent Naming Convention: Renamed all files within the acp directory to include the acp prefix (e.g., commandHandler.ts to acpCommandHandler.ts) to ensure consistency and prevent potential name collisions.
Test Suite Refactoring: Split the large acpClient.test.ts file into smaller, focused test files corresponding to the new modules, facilitating easier testing and debugging.

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.

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-cli · 2026-04-28T20:57:57Z

Hi @sripasg, 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!

github-actions · 2026-04-28T21:01:45Z

Size Change: +1.5 kB (0%)

Total Size: 33.9 MB

Filename	Size	Change
`./bundle/chunk-4UJU45TR.js`	0 B	-19.5 kB (removed)	🏆
`./bundle/chunk-AT44T6KS.js`	0 B	-49.2 kB (removed)	🏆
`./bundle/chunk-BPJZ7W2I.js`	0 B	-655 kB (removed)	🏆
`./bundle/chunk-EAU4D2S2.js`	0 B	-12.6 kB (removed)	🏆
`./bundle/chunk-EPBKX5P6.js`	0 B	-14.7 MB (removed)	🏆
`./bundle/chunk-MWFRG2YP.js`	0 B	-3.8 kB (removed)	🏆
`./bundle/chunk-OIHPO2K7.js`	0 B	-3.43 kB (removed)	🏆
`./bundle/chunk-SOUZ5IAO.js`	0 B	-2.72 MB (removed)	🏆
`./bundle/core-GZI5SCTX.js`	0 B	-48.2 kB (removed)	🏆
`./bundle/devtoolsService-6CALMC3Q.js`	0 B	-28 kB (removed)	🏆
`./bundle/gemini-4QJGBG2W.js`	0 B	-575 kB (removed)	🏆
`./bundle/interactiveCli-G7C3RIG4.js`	0 B	-1.31 MB (removed)	🏆
`./bundle/liteRtServerManager-WFJLJ3S3.js`	0 B	-2.11 kB (removed)	🏆
`./bundle/oauth2-provider-S2OE2IAS.js`	0 B	-9.16 kB (removed)	🏆
`./bundle/chunk-HQEJKOR7.js`	14.7 MB	+14.7 MB (new file)	🆕
`./bundle/chunk-L5MM7MJU.js`	655 kB	+655 kB (new file)	🆕
`./bundle/chunk-LHJX55HD.js`	3.43 kB	+3.43 kB (new file)	🆕
`./bundle/chunk-MLDED34Q.js`	2.72 MB	+2.72 MB (new file)	🆕
`./bundle/chunk-QQJRMREG.js`	12.6 kB	+12.6 kB (new file)	🆕
`./bundle/chunk-SDHYWWTP.js`	49.2 kB	+49.2 kB (new file)	🆕
`./bundle/chunk-UPKA5FQV.js`	19.5 kB	+19.5 kB (new file)	🆕
`./bundle/chunk-XGJQZAX4.js`	3.8 kB	+3.8 kB (new file)	🆕
`./bundle/core-O43CXTCH.js`	48.2 kB	+48.2 kB (new file)	🆕
`./bundle/devtoolsService-74M6L5XM.js`	28 kB	+28 kB (new file)	🆕
`./bundle/gemini-PGZNLQES.js`	576 kB	+576 kB (new file)	🆕
`./bundle/interactiveCli-CPCENEYL.js`	1.31 MB	+1.31 MB (new file)	🆕
`./bundle/liteRtServerManager-MYG5UXVB.js`	2.11 kB	+2.11 kB (new file)	🆕
`./bundle/oauth2-provider-WNJF5SRV.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-XRLFHCHC.js`	1.97 MB	0 B
`./bundle/cleanup-WGWYJAFV.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-FN3IAPBT.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-763RWBA5.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-35FPTN35.js`	932 B	+932 B (new file)	🆕
`./bundle/start-CV7SEPUT.js`	652 B	+652 B (new file)	🆕

_{compressed-size-action}

gemini-code-assist

Code Review

This pull request modularizes the Agent Client Protocol (ACP) implementation by refactoring the monolithic acpClient.ts into specialized modules for RPC dispatching, session management, and transport. The changes include the addition of a comprehensive README and updated test suites. Feedback focuses on aligning error handling with JSON-RPC standards by using acp.RequestError for invalid session parameters and moving module-level state, specifically the callIdCounter, to instance-scoped properties to ensure thread safety in concurrent environments.

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

Decomposed the massive `acpClient.ts` and its test file into smaller, focused modules to improve maintainability and isolate concerns. This completes Phase 1 of the ACP refactoring plan. Additionally, all files in the `acp` folder have been renamed to share the `acp` prefix for better consistency. - **Source Code Restructuring**: - Extracted `runAcpClient` to `acpStdioTransport.ts` for handling raw I/O. - Extracted `GeminiAgent` to `acpRpcDispatcher.ts` to act as pure RPC handler. - Created `acpSessionManager.ts` to manage concurrent user sessions. - Extracted `Session` class to `acpSession.ts` to manage individual chat turns. - Moved shared helpers and schemas to `acpUtils.ts`. - **File Renaming**: Renamed all files in the `acp` directory to share the `acp` prefix (e.g., `commandHandler.ts` -> `acpCommandHandler.ts`, `fileSystemService.ts` -> `acpFileSystemService.ts`) to avoid name collisions and improve organization. - **Test Split**: Decomposed the massive `acpClient.test.ts` into corresponding test files: `acpRpcDispatcher.test.ts`, `acpSessionManager.test.ts`, and `acpSession.test.ts`. - **Integrations**: Updated imports in `gemini.tsx` and `acpResume.test.ts` to use the new file paths. - **Verification**: Verified that all tests pass and the full build (`npm run build`) succeeds after resolving initial linting and compilation errors.

…google-gemini#26143)

sripasg requested a review from a team as a code owner April 28, 2026 20:57

gemini-code-assist Bot reviewed Apr 28, 2026

View reviewed changes

Comment thread packages/cli/src/acp/acpRpcDispatcher.ts

Comment thread packages/cli/src/acp/acpRpcDispatcher.ts

Comment thread packages/cli/src/acp/acpRpcDispatcher.ts

Comment thread packages/cli/src/acp/acpUtils.ts Outdated

sripasg self-assigned this Apr 28, 2026

sripasg added 🔒 maintainer only ⛔ Do not contribute. Internal roadmap item. ACP labels Apr 28, 2026

gemini-cli Bot added the status/need-issue Pull requests that need to have an associated issue. label Apr 28, 2026

sripasg force-pushed the sripas_acp_refactor_phase1 branch from 19b1f37 to 5f81d45 Compare April 28, 2026 23:44

sripasg force-pushed the sripas_acp_refactor_phase1 branch from 5f81d45 to 0c6bee0 Compare April 28, 2026 23:58

ruomengz approved these changes Apr 29, 2026

View reviewed changes

This was referenced Apr 29, 2026

📊 AI CLI 工具社区动态日报 2026-04-29 gsscsd/big_model_radar#261

Open

📊 AI CLI 工具社区动态日报 2026-04-29 borq168/big_model_radar#67

Open

📊 AI CLI Tools Digest 2026-04-29 borq168/big_model_radar#70

Open

sripasg added this pull request to the merge queue Apr 29, 2026

Merged via the queue into main with commit c2e5b28 Apr 29, 2026
27 checks passed

sripasg deleted the sripas_acp_refactor_phase1 branch April 29, 2026 15:35

TirthNaik-99 pushed a commit to TirthNaik-99/gemini-cli that referenced this pull request May 4, 2026

refactor(acp): modularize monolithic acpClient into specialized files (…

25f4ce9

…google-gemini#26143)

github-actions Bot mentioned this pull request May 5, 2026

📊 AI CLI 工具社区动态日报 2026-05-05 gsscsd/big_model_radar#295

Open

kimjune01 pushed a commit to kimjune01/gemini-cli-claude that referenced this pull request May 6, 2026

refactor(acp): modularize monolithic acpClient into specialized files (…

45bdcdd

…google-gemini#26143)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(acp): modularize monolithic acpClient into specialized files#26143

refactor(acp): modularize monolithic acpClient into specialized files#26143
sripasg merged 1 commit intomainfrom
sripas_acp_refactor_phase1

sripasg commented Apr 28, 2026

Uh oh!

gemini-code-assist Bot commented Apr 28, 2026

Uh oh!

gemini-cli Bot commented Apr 28, 2026

Uh oh!

github-actions Bot commented Apr 28, 2026 •

edited

Loading

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

sripasg commented Apr 28, 2026

Summary

Details

Related Issues

How to Validate

Pre-Merge Checklist

Uh oh!

gemini-code-assist Bot commented Apr 28, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-cli Bot commented Apr 28, 2026

Uh oh!

github-actions Bot commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

github-actions Bot commented Apr 28, 2026 •

edited

Loading