fix(patch): cherry-pick 0135b03 to release/v0.33.0-preview.2-pr-21171 [CONFLICTS]

[gemini-cli-robot]

This PR automatically cherry-picks commit 0135b03 to patch version v0.33.0-preview.2 in the preview release to create version 0.33.0-preview.3.

⚠️ Merge Conflicts Detected

This cherry-pick resulted in merge conflicts that need manual resolution.

🔧 Next Steps:

1. Review the conflicts: Check out this branch and review the conflict markers
2. Resolve conflicts: Edit the affected files to resolve the conflicts
3. Test the changes: Ensure the patch works correctly after resolution
4. Update this PR: Push your conflict resolution

📋 Files with conflicts:

The commit has been created with conflict markers for easier manual resolution.

🚨 Important:

• Do not merge this PR until conflicts are resolved
• The automated patch release will trigger once this PR is merged

[gemini-code-assist]

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 is an automated cherry-pick aimed at standardizing the naming for the Agent-Client Protocol (ACP) mode. It renames the command-line flag from an experimental prefix to a more concise one and refactors the corresponding codebase structure. The change improves clarity and consistency in how ACP features are invoked and organized within the project. Note that this PR has merge conflicts that require manual resolution before it can be merged.

Highlights

• Command-line Flag Renaming: The command-line flag for activating Agent-Client Protocol (ACP) mode has been renamed from --experimental-acp to --acp. The old flag is now deprecated but still supported, with a recommendation to use the new flag.
• Codebase Refactoring: The zed-integration directory and its associated files have been refactored and renamed to acp, standardizing the naming convention for ACP-related components. This includes updates to file paths, imports, and function names.
• Configuration Updates: The internal Config class and command-line argument parsing logic have been updated to reflect the new --acp flag and the acpMode property, ensuring consistent behavior across the application.
• Integration Test Adjustments: Integration tests for ACP environment and telemetry have been updated to utilize the newly introduced --acp flag, aligning them with the updated command-line interface.

Changelog

• integration-tests/acp-env-auth.test.ts
  • Updated the spawn command to use the new --acp flag instead of --experimental-acp.
• integration-tests/acp-telemetry.test.ts
  • Modified the spawn command to use the --acp flag for enabling ACP telemetry.
• packages/cli/src/config/config.ts
  • Updated CliArgs interface to include an optional acp boolean and make experimentalAcp optional.
  • Added a new --acp command-line option and marked --experimental-acp as deprecated.
  • Modified the interactive mode detection logic to consider the new argv.acp flag.
  • Updated the Config constructor to set acpMode based on argv.acp or argv.experimentalAcp.
  • Removed the experimentalZedIntegration property from ConfigParameters.
• packages/cli/src/gemini.tsx
  • Updated the import statement for the ACP client from zed-integration to acp.
  • Modified the conditional logic to use config.getAcpMode() and call runAcpClient.
• packages/cli/src/gemini_cleanup.test.tsx
  • Skipped a test case related to cleanupExpiredSessions.
  • Updated the mock configuration to use getAcpMode() instead of getExperimentalZedIntegration().
• packages/cli/src/test-utils/mockConfig.ts
  • Updated createMockConfig to mock getAcpMode instead of getExperimentalZedIntegration.
• packages/cli/src/zed-integration/acpErrors.test.ts
  • Renamed to packages/cli/src/acp/acpErrors.test.ts.
• packages/cli/src/zed-integration/acpErrors.ts
  • Renamed to packages/cli/src/acp/acpErrors.ts.
• packages/cli/src/zed-integration/acpResume.test.ts
  • Renamed to packages/cli/src/acp/acpResume.test.ts.
  • Updated import path for GeminiAgent to acpClient.js.
• packages/cli/src/zed-integration/commandHandler.test.ts
  • Renamed to packages/cli/src/acp/commandHandler.test.ts.
• packages/cli/src/zed-integration/commandHandler.ts
  • Renamed to packages/cli/src/acp/commandHandler.ts.
• packages/cli/src/zed-integration/commands/commandRegistry.ts
  • Renamed to packages/cli/src/acp/commands/commandRegistry.ts.
• packages/cli/src/zed-integration/commands/extensions.ts
  • Renamed to packages/cli/src/acp/commands/extensions.ts.
• packages/cli/src/zed-integration/commands/init.ts
  • Renamed to packages/cli/src/acp/commands/init.ts.
• packages/cli/src/zed-integration/commands/memory.ts
  • Renamed to packages/cli/src/acp/commands/memory.ts.
• packages/cli/src/zed-integration/commands/restore.ts
  • Renamed to packages/cli/src/acp/commands/restore.ts.
• packages/cli/src/zed-integration/commands/types.ts
  • Renamed to packages/cli/src/acp/commands/types.ts.
• packages/cli/src/zed-integration/fileSystemService.test.ts
  • Renamed to packages/cli/src/acp/fileSystemService.test.ts.
• packages/cli/src/zed-integration/fileSystemService.ts
  • Renamed to packages/cli/src/acp/fileSystemService.ts.
• packages/cli/src/zed-integration/zedIntegration.test.ts
  • Renamed to packages/cli/src/acp/acpClient.test.ts.
  • Updated import paths for GeminiAgent and Session to reflect the new acpClient.js location.
• packages/cli/src/zed-integration/zedIntegration.ts
  • Renamed to packages/cli/src/acp/acpClient.ts.
  • Renamed the exported function runZedIntegration to runAcpClient.
• packages/core/src/code_assist/oauth2.test.ts
  • Updated the mock Config object to include getAcpMode and isInteractive properties.
• packages/core/src/code_assist/oauth2.ts
  • Modified the conditional check for interactive consent to use config.getAcpMode().
• packages/core/src/config/config.ts
  • Renamed the experimentalZedIntegration property to acpMode in ConfigParameters.
  • Renamed the private experimentalZedIntegration field to acpMode within the Config class.
  • Updated the Config constructor to initialize acpMode.
  • Modified the init method's conditional logic to use this.acpMode.
  • Renamed the getter method getExperimentalZedIntegration() to getAcpMode().

Activity

• This pull request was automatically generated as a cherry-pick of commit 0135b03c8ace7092e9a00928d04cb308d4e5afa3 to the release/v0.33.0-preview.2-pr-21171 branch.
• Merge conflicts were detected during the automated cherry-pick process, requiring manual resolution.
• Instructions have been provided for reviewing and resolving the conflicts, testing the changes, and updating the PR.

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.

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. ↩

[github-actions]

Size Change: -181 B (0%)

Total Size: 25.9 MB

ℹ️ View Unchanged

Filename	Size	Change
./bundle/gemini.js	25.4 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}

[gemini-code-assist]

Code Review

This pull request appears to be a cherry-pick that renames the --experimental-acp flag to --acp and refactors related code by renaming zed-integration to acp. The changes are mostly straightforward renames and updates to support the new flag while deprecating the old one. The critical issue of an unresolved merge conflict in one of the test files still needs to be addressed.

_{Note: Security Review is unavailable for this PR.}

I am having trouble creating individual review comments. Click here to see my feedback.

packages/core/src/code_assist/oauth2.test.ts (98-103)

This file contains unresolved merge conflict markers (<<<<<<<, =======, >>>>>>>). This will cause syntax errors and prevent the code from compiling or running. Please resolve the conflict.

  getAcpMode: () => false,
  isInteractive: () => true,