fix(acp): rename --experimental-acp to --acp & remove Zed-specific refrences by skeshive · Pull Request #21171 · google-gemini/gemini-cli

skeshive · 2026-03-04T22:10:57Z

Related Issues

Fixes https://github.com/google-gemini/maintainers-gemini-cli/issues/1294

gemini-code-assist · 2026-03-04T22:11:37Z

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 streamlines the Agent Client Protocol (ACP) integration by renaming its primary CLI flag from --experimental-acp to --acp and deprecating the former. It also removes all specific references to 'Zed integration,' making the ACP implementation more generic and robust. The changes span across documentation, core configuration, application entry points, and various test files to ensure consistency and proper functionality with the updated naming convention.

Highlights

CLI Flag Renaming: The --experimental-acp CLI flag has been renamed to --acp to signify its transition from an experimental feature to a more stable one. The old flag is now deprecated.
Generalization of ACP: All Zed-specific references related to the Agent Client Protocol (ACP) integration have been removed, generalizing the ACP implementation across the codebase.
Codebase Refactoring: Internal code, including configuration, main application logic, and tests, has been refactored to consistently use acpMode and the new --acp flag.
Documentation Updates: The CLI reference documentation has been updated to reflect the new --acp flag, its deprecation of --experimental-acp, and the removal of --experimental-zed-integration.

Changelog

docs/cli/cli-reference.md
- Renamed --experimental-acp to --acp and marked the former as deprecated.
- Removed the --experimental-zed-integration flag entry.
integration-tests/acp-env-auth.test.ts
- Updated integration tests to use the new --acp flag.
integration-tests/acp-telemetry.test.ts
- Updated telemetry integration tests to use the new --acp flag.
packages/cli/src/config/config.ts
- Modified the CliArgs interface to include an optional acp property and made experimentalAcp optional.
- Added a new acp CLI option and marked experimental-acp as deprecated in argument parsing.
- Updated the interactive mode detection logic to consider the new acp flag.
- Added acpMode to the Config constructor parameters.
- Removed experimentalZedIntegration from the Config constructor parameters.
packages/cli/src/gemini.tsx
- Updated the import statement from runZedIntegration to runAcpClient.
- Modified the conditional logic to call runAcpClient based on config.getAcpMode().
packages/cli/src/gemini_cleanup.test.tsx
- Updated the mock configuration to use getAcpMode instead of getExperimentalZedIntegration.
packages/cli/src/test-utils/mockConfig.ts
- Updated the createMockConfig utility to use getAcpMode.
packages/cli/src/zed-integration/acpErrors.test.ts
- Renamed the file to packages/cli/src/acp/acpErrors.test.ts.
packages/cli/src/zed-integration/acpErrors.ts
- Renamed the file to packages/cli/src/acp/acpErrors.ts.
packages/cli/src/zed-integration/acpResume.test.ts
- Renamed the file to packages/cli/src/acp/acpResume.test.ts.
- Updated imports to reference acpClient.js.
packages/cli/src/zed-integration/commandHandler.test.ts
- Renamed the file to packages/cli/src/acp/commandHandler.test.ts.
packages/cli/src/zed-integration/commandHandler.ts
- Renamed the file to packages/cli/src/acp/commandHandler.ts.
packages/cli/src/zed-integration/commands/commandRegistry.ts
- Renamed the file to packages/cli/src/acp/commands/commandRegistry.ts.
packages/cli/src/zed-integration/commands/extensions.ts
- Renamed the file to packages/cli/src/acp/commands/extensions.ts.
packages/cli/src/zed-integration/commands/init.ts
- Renamed the file to packages/cli/src/acp/commands/init.ts.
packages/cli/src/zed-integration/commands/memory.ts
- Renamed the file to packages/cli/src/acp/commands/memory.ts.
packages/cli/src/zed-integration/commands/restore.ts
- Renamed the file to packages/cli/src/acp/commands/restore.ts.
packages/cli/src/zed-integration/commands/types.ts
- Renamed the file to packages/cli/src/acp/commands/types.ts.
packages/cli/src/zed-integration/fileSystemService.test.ts
- Renamed the file to packages/cli/src/acp/fileSystemService.test.ts.
packages/cli/src/zed-integration/fileSystemService.ts
- Renamed the file to packages/cli/src/acp/fileSystemService.ts.
packages/cli/src/zed-integration/zedIntegration.test.ts
- Renamed the file to packages/cli/src/acp/acpClient.test.ts.
- Updated imports to reference acpClient.js.
packages/cli/src/zed-integration/zedIntegration.ts
- Renamed the file to packages/cli/src/acp/acpClient.ts.
- Renamed the runZedIntegration function to runAcpClient.
packages/core/src/code_assist/oauth2.test.ts
- Updated the mock configuration for OAuth2 tests to use getAcpMode.
packages/core/src/code_assist/oauth2.ts
- Modified the OAuth2 initialization logic to check config.getAcpMode() for skipping interactive consent.
packages/core/src/config/config.ts
- Renamed the experimentalZedIntegration property to acpMode in ConfigParameters and the Config class.
- Updated the Config constructor to initialize acpMode.
- Modified the mcpInitializationPromise condition to use this.acpMode.
- Renamed the getExperimentalZedIntegration method to getAcpMode.

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.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

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

Code Review

This pull request refactors the Agent Client Protocol (ACP) mode activation by renaming the --experimental-acp flag to --acp and removing legacy Zed-specific references. The changes are applied consistently across the codebase, including configuration, application logic, tests, and documentation. Backward compatibility for the old flag is maintained. The refactoring improves naming consistency and clarity. I have reviewed the changes and found no issues.

github-actions · 2026-03-04T22:17:36Z

Size Change: -181 B (0%)

Total Size: 26 MB

ℹ️ View Unchanged

Filename	Size	Change
`./bundle/gemini.js`	25.5 MB	-181 B (0%)
`./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js`	221 kB	0 B
`./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js`	227 kB	0 B
`./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js`	11.5 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

_{compressed-size-action}

skeshive · 2026-03-05T22:30:03Z

/patch preview

github-actions · 2026-03-05T22:30:23Z

✅ Patch workflow(s) dispatched successfully!

📋 Details:

Channels: preview
Commit: 0135b03c8ace7092e9a00928d04cb308d4e5afa3
Workflows Created: 1

🔗 Track Progress:

…frences (#21171) # Conflicts: # packages/core/src/code_assist/oauth2.test.ts

github-actions · 2026-03-05T22:31:19Z

🚀 Patch PR Created!

📋 Patch Details:

Environment: prod
Channel: preview → will publish to npm tag preview
Commit: 0135b03c8ace7092e9a00928d04cb308d4e5afa3
Hotfix Branch: hotfix/v0.33.0-preview.2/0.33.0-preview.3/preview/cherry-pick-0135b03/pr-21171
Hotfix PR: #21336
⚠️ Status: Cherry-pick conflicts detected - manual resolution required

📝 Next Steps:

⚠️ Resolve conflicts in the hotfix PR first: #21336
Test your changes after resolving conflicts
Once merged, the patch release will automatically trigger
You'll receive updates here when the release completes

🔗 Track Progress:

View hotfix PR #21336

github-actions · 2026-03-05T23:26:55Z

🚀 Patch Release Started!

📋 Release Details:

Environment: prod
Channel: preview → publishing to npm tag preview
Version: v0.33.0-preview.2
Hotfix PR: Merged ✅
Release Branch: release/v0.33.0-preview.2-pr-21171

⏳ Status: The patch release is now running. You'll receive another update when it completes.

🔗 Track Progress:

View release workflow

github-actions · 2026-03-06T00:03:30Z

✅ Patch Release Complete!

📦 Release Details:

Version: 0.33.0-preview.3
NPM Tag: preview
Channel: preview
Dry Run: false

🎉 Status: Your patch has been successfully released and published to npm!

📝 What's Available:

GitHub Release: View release v0.33.0-preview.3
NPM Package: npm install @google/gemini-cli@preview

🔗 Links:

…frences (google-gemini#21171)

google-gemini/gemini-cli#21171 The old version was deprecated and the latest stable release supports this new flag instead.

…frences (google-gemini#21171)

fix(acp): rename --experimental-acp to --acp

25f1063

skeshive requested review from a team as code owners March 4, 2026 22:10

Merge branch 'main' into acp-fix-flags

c20a2b0

skeshive enabled auto-merge March 4, 2026 22:13

gemini-code-assist bot reviewed Mar 4, 2026

View reviewed changes

gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Mar 4, 2026

sehoon38 approved these changes Mar 4, 2026

View reviewed changes

skeshive added 2 commits March 5, 2026 09:59

Merge branch 'main' into acp-fix-flags

d1af419

Merge branch 'main' into acp-fix-flags

b41f8ac

google-gemini deleted a comment from chrstnb Mar 5, 2026

skeshive disabled auto-merge March 5, 2026 16:51

skeshive enabled auto-merge March 5, 2026 16:51

rm doc

ff16cf5

skeshive closed this Mar 5, 2026

auto-merge was automatically disabled March 5, 2026 17:10
Pull request was closed

skeshive reopened this Mar 5, 2026

Merge branch 'main' into acp-fix-flags

a17a615

skeshive enabled auto-merge March 5, 2026 18:00

skeshive added 4 commits March 5, 2026 14:33

skip

2a7f652

fix

2bc0fa8

undo

c67b76d

Merge branch 'main' into acp-fix-flags

cb8cb7a

skeshive added this pull request to the merge queue Mar 5, 2026

Merged via the queue into main with commit 0135b03 Mar 5, 2026
27 checks passed

skeshive deleted the acp-fix-flags branch March 5, 2026 20:10

github-actions bot pushed a commit that referenced this pull request Mar 5, 2026

fix(acp): rename --experimental-acp to --acp & remove Zed-specific re…

71d4ea5

…frences (#21171) # Conflicts: # packages/core/src/code_assist/oauth2.test.ts

github-actions bot mentioned this pull request Mar 6, 2026

📊 AI CLI 工具社区动态日报 2026-03-06 rollysys/agents-radar#42

Open

struckoff pushed a commit to struckoff/gemini-cli that referenced this pull request Mar 6, 2026

fix(acp): rename --experimental-acp to --acp & remove Zed-specific re…

f532932

…frences (google-gemini#21171)

gemini-code-assist bot mentioned this pull request Mar 11, 2026

Changelog for v0.34.0-preview.0 #21965

Merged

kunal-10-cloud pushed a commit to kunal-10-cloud/gemini-cli that referenced this pull request Mar 12, 2026

fix(acp): rename --experimental-acp to --acp & remove Zed-specific re…

9d46ea3

…frences (google-gemini#21171)

liamhelmer pushed a commit to badal-io/gemini-cli that referenced this pull request Mar 12, 2026

fix(acp): rename --experimental-acp to --acp & remove Zed-specific re…

08b2c0d

…frences (google-gemini#21171)

benbrandt added a commit to agentclientprotocol/registry that referenced this pull request Mar 16, 2026

Gemini: use --acp flag

97fbb72

google-gemini/gemini-cli#21171 The old version was deprecated and the latest stable release supports this new flag instead.

benbrandt mentioned this pull request Mar 16, 2026

Gemini: use --acp flag agentclientprotocol/registry#176

Merged

benbrandt added a commit to agentclientprotocol/registry that referenced this pull request Mar 16, 2026

Gemini: use --acp flag (#176)

987f22b

google-gemini/gemini-cli#21171 The old version was deprecated and the latest stable release supports this new flag instead.

yashodipmore pushed a commit to yashodipmore/geemi-cli that referenced this pull request Mar 21, 2026

fix(acp): rename --experimental-acp to --acp & remove Zed-specific re…

4beb24e

…frences (google-gemini#21171)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(acp): rename --experimental-acp to --acp & remove Zed-specific refrences#21171

fix(acp): rename --experimental-acp to --acp & remove Zed-specific refrences#21171
skeshive merged 10 commits intomainfrom
acp-fix-flags

skeshive commented Mar 4, 2026

Uh oh!

gemini-code-assist bot commented Mar 4, 2026

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

github-actions bot commented Mar 4, 2026 •

edited

Loading

Uh oh!

Uh oh!

skeshive commented Mar 5, 2026

Uh oh!

github-actions bot commented Mar 5, 2026

Uh oh!

github-actions bot commented Mar 5, 2026

Uh oh!

github-actions bot commented Mar 5, 2026

Uh oh!

github-actions bot commented Mar 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

skeshive commented Mar 4, 2026

Related Issues

Uh oh!

gemini-code-assist bot commented Mar 4, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

github-actions bot commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

skeshive commented Mar 5, 2026

Uh oh!

github-actions bot commented Mar 5, 2026

Uh oh!

github-actions bot commented Mar 5, 2026

Uh oh!

github-actions bot commented Mar 5, 2026

Uh oh!

github-actions bot commented Mar 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

github-actions bot commented Mar 4, 2026 •

edited

Loading