feat(acp): add set models interface by skeshive · Pull Request #20991 · google-gemini/gemini-cli

skeshive · 2026-03-03T17:03:28Z

Summary

Propagates available models & implements setModel so users using ACP integration can change models

Related Issues

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

gemini-cli · 2026-03-03T17:03:40Z

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

gemini-code-assist · 2026-03-03T17:03:48Z

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 significantly enhances the Agent Client Protocol (ACP) integration by providing users with greater control and visibility over the AI models used within their sessions. It enables the programmatic selection of models and ensures that session initialization and loading responses include comprehensive information about available models, adapting to user access and feature flags.

Highlights

New Model Management API: Introduced an unstable_setSessionModel API within the GeminiAgent to allow users to programmatically change the active model for a given session.
Model Information in Session Responses: The newSession and loadSession methods now include a models object in their responses, providing a list of availableModels and the currentModelId.
Dynamic Model Availability: A new utility function, buildAvailableModels, was added to dynamically determine and list available models based on configuration settings, including support for preview models and Gemini 3.1.
Comprehensive Testing: Added new test cases to validate the model listing functionality, including scenarios with preview models, and to ensure the setModel API correctly delegates to the session and handles non-existent sessions.

Changelog

packages/cli/src/zed-integration/zedIntegration.test.ts
- Added mocks for getGemini31LaunchedSync and getHasAccessToPreviewModel in mockConfig.
- Updated newSession and loadSession test expectations to include model information.
- Introduced new test cases for preview model availability.
- Added tests for unstable_setSessionModel to verify model setting and error handling.
- Included a mock for setModel in mockConfig for session tests.
- Added a test to confirm session.setModel delegates to mockConfig.setModel.
packages/cli/src/zed-integration/zedIntegration.ts
- Imported various model-related constants and utility functions.
- Modified newSession and loadSession methods to return models object containing availableModels and currentModelId.
- Implemented unstable_setSessionModel method in GeminiAgent to allow changing session models.
- Added setModel method to the Session class, which calls config.setModel.
- Created buildAvailableModels helper function to construct the list of available models based on configuration and settings.

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 adds an interface for clients using the Agent Client Protocol (ACP) to get the list of available models and set the current model. The implementation looks mostly correct, but there's a significant maintainability concern with the new buildAvailableModels function. It duplicates complex logic for determining model availability, which should be centralized to avoid future inconsistencies. I've left a comment with a suggestion to refactor this into a shared utility.

github-actions · 2026-03-03T17:09:28Z

Size Change: +2.94 kB (+0.01%)

Total Size: 25.9 MB

Filename	Size	Change
`./bundle/gemini.js`	25.4 MB	+2.94 kB (+0.01%)

ℹ️ View Unchanged

Filename	Size
`./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js`	221 kB
`./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js`	227 kB
`./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js`	11.5 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

_{compressed-size-action}

sehoon38 · 2026-03-03T20:57:15Z

+  const useCustomToolModel =
+    useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
+
+  const mainOptions = [


we can refactor these to share what we have in ModelDialog.

feat(acp): add set models interface

a9b2480

skeshive requested a review from a team as a code owner March 3, 2026 17:03

skeshive mentioned this pull request Mar 3, 2026

Support set_model interface from ACP #18301

Closed

18 tasks

Merge branch 'main' into skeshive/acp/model

2170b8c

skeshive enabled auto-merge March 3, 2026 17:04

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

gemini-code-assist Bot reviewed Mar 3, 2026

View reviewed changes

Comment thread packages/cli/src/zed-integration/zedIntegration.ts

skeshive added 5 commits March 3, 2026 12:28

fix

056b565

add curr model id

90378e1

fix

638feda

fix

1ff6a73

lint

a884e9b

sehoon38 reviewed Mar 3, 2026

View reviewed changes

sehoon38 approved these changes Mar 3, 2026

View reviewed changes

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

github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Mar 3, 2026

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

skeshive removed this pull request from the merge queue due to a manual request Mar 3, 2026

skeshive added 2 commits March 3, 2026 16:53

merge

a9f7a8c

rm dup

dffde64

skeshive enabled auto-merge March 3, 2026 22:05

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

Merged via the queue into main with commit 34f0c15 Mar 3, 2026
46 of 47 checks passed

skeshive deleted the skeshive/acp/model branch March 3, 2026 22:42

gemini-code-assist Bot mentioned this pull request Mar 3, 2026

Changelog for v0.33.0-preview.0 #21030

Merged

carlos-algms mentioned this pull request Mar 4, 2026

Add model switcher for providers which support it carlos-algms/agentic.nvim#47

Closed

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

feat(acp): add set models interface (google-gemini#20991)

930fc29

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

feat(acp): add set models interface (google-gemini#20991)

632bb39

6112 mentioned this pull request Mar 10, 2026

Add support for set_model in ACP #18084

Closed

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

feat(acp): add set models interface (google-gemini#20991)

b60286f

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

feat(acp): add set models interface (google-gemini#20991)

fa680ad

warrenzhu25 pushed a commit to warrenzhu25/gemini-cli that referenced this pull request Apr 9, 2026

feat(acp): add set models interface (google-gemini#20991)

fe70ee5

cocosheng-g pushed a commit that referenced this pull request May 6, 2026

feat(acp): add set models interface (#20991)

9b8b866

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(acp): add set models interface#20991

feat(acp): add set models interface#20991
skeshive merged 9 commits intomainfrom
skeshive/acp/model

skeshive commented Mar 3, 2026

Uh oh!

gemini-cli Bot commented Mar 3, 2026

Uh oh!

gemini-code-assist Bot commented Mar 3, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

Uh oh!

github-actions Bot commented Mar 3, 2026 •

edited

Loading

Uh oh!

sehoon38 Mar 3, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

skeshive commented Mar 3, 2026

Summary

Related Issues

Uh oh!

gemini-cli Bot commented Mar 3, 2026

Uh oh!

gemini-code-assist Bot commented Mar 3, 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!

Uh oh!

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

Uh oh!

Uh oh!

sehoon38 Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

github-actions Bot commented Mar 3, 2026 •

edited

Loading