Skip to content

Revert "fix(cli): validate --model argument at startup"#22378

Merged
sehoon38 merged 1 commit intomainfrom
revert-21393-fix/validate-model-flag
Mar 13, 2026
Merged

Revert "fix(cli): validate --model argument at startup"#22378
sehoon38 merged 1 commit intomainfrom
revert-21393-fix/validate-model-flag

Conversation

@sehoon38
Copy link
Copy Markdown
Contributor

Reverts #21393

@sehoon38 sehoon38 requested a review from a team as a code owner March 13, 2026 21:09
@gemini-cli
Copy link
Copy Markdown
Contributor

gemini-cli bot commented Mar 13, 2026

Hi @sehoon38, 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
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 rolls back a previous change that introduced client-side validation for the --model argument during the CLI's initialization phase. The primary impact is that the CLI will no longer preemptively check the validity of the specified model, allowing for potentially undefined models to be passed at startup without immediate error, or deferring validation to a later stage in the application lifecycle.

Highlights

  • Reverted Model Validation: The pull request reverts the functionality that validated the --model argument at the CLI startup, removing the early check for valid model names or aliases.
  • Removed Validation Logic: The isValidModelOrAlias function, getValidModelsAndAliases function, and the VALID_ALIASES constant have been removed from the core configuration module.
  • Updated Test Cases: Associated test cases for model validation were removed, and existing tests for model selection were updated to use gemini-2.5-flash-preview.
Changelog
  • packages/cli/src/config/config.test.ts
    • Updated test cases to reference 'gemini-2.5-flash-preview' instead of 'gemini-2.5-flash' for model selection.
  • packages/cli/src/config/config.ts
    • Removed imports for isValidModelOrAlias and getValidModelsAndAliases.
    • Removed the conditional block that performed startup validation of the specifiedModel argument.
  • packages/core/src/config/models.test.ts
    • Removed imports for GEMINI_MODEL_ALIAS_FLASH_LITE, isValidModelOrAlias, getValidModelsAndAliases, VALID_GEMINI_MODELS, and VALID_ALIASES.
    • Deleted the describe blocks containing tests for isValidModelOrAlias and getValidModelsAndAliases.
  • packages/core/src/config/models.ts
    • Removed the VALID_ALIASES constant.
    • Deleted the isValidModelOrAlias and getValidModelsAndAliases utility functions.
Activity
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.

@sehoon38 sehoon38 enabled auto-merge March 13, 2026 21:12
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 reverts the startup validation for the --model argument. The removal of the validation logic in config.ts and the corresponding cleanup in models.ts and test files are consistent with the revert.

However, I've noticed a change in config.test.ts that seems unrelated to the revert and potentially introduces a typo for a model name. My review includes a comment with a suggestion to address this.


it('always prefers model from argv', async () => {
process.argv = ['node', 'script.js', '--model', 'gemini-2.5-flash'];
process.argv = ['node', 'script.js', '--model', 'gemini-2.5-flash-preview'];
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The model name gemini-2.5-flash-preview appears to be a typo, as it's not a defined model constant in packages/core/src/config/models.ts. This change seems to have been made as part of the revert, but it introduces a potentially invalid model name into the tests. It's better to use a known valid model, like the previous value gemini-2.5-flash which corresponds to the DEFAULT_GEMINI_FLASH_MODEL constant. This improves clarity and ensures tests are using valid data. This applies to the other occurrences of gemini-2.5-flash-preview in this file as well.

Suggested change
process.argv = ['node', 'script.js', '--model', 'gemini-2.5-flash-preview'];
process.argv = ['node', 'script.js', '--model', 'gemini-2.5-flash'];

@github-actions
Copy link
Copy Markdown

Size Change: -356 B (0%)

Total Size: 26.1 MB

Filename Size Change
./bundle/chunk-5Q3GACO5.js 0 B -1.95 MB (removed) 🏆
./bundle/chunk-EYBGNXC4.js 0 B -3.62 MB (removed) 🏆
./bundle/chunk-VRDYZ75D.js 0 B -13.4 MB (removed) 🏆
./bundle/core-DQQ2YWIU.js 0 B -40.3 kB (removed) 🏆
./bundle/devtoolsService-W4PEZ27W.js 0 B -27.7 kB (removed) 🏆
./bundle/interactiveCli-ODMQGCUH.js 0 B -1.59 MB (removed) 🏆
./bundle/oauth2-provider-7ZWQGLWV.js 0 B -9.19 kB (removed) 🏆
./bundle/chunk-7J7OCUET.js 13.4 MB +13.4 MB (new file) 🆕
./bundle/chunk-IQDXRRSP.js 3.62 MB +3.62 MB (new file) 🆕
./bundle/chunk-KGAM5TK4.js 1.95 MB +1.95 MB (new file) 🆕
./bundle/core-ODY4QWCJ.js 40.1 kB +40.1 kB (new file) 🆕
./bundle/devtoolsService-NQSFA2KO.js 27.7 kB +27.7 kB (new file) 🆕
./bundle/interactiveCli-K55KOE4Y.js 1.59 MB +1.59 MB (new file) 🆕
./bundle/oauth2-provider-XJZQIMAA.js 9.19 kB +9.19 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./bundle/chunk-34MYV7JD.js 2.45 kB 0 B
./bundle/chunk-37ZTTFQF.js 966 kB 0 B
./bundle/chunk-5AUYMPVF.js 858 B 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/devtools-36NN55EP.js 696 kB 0 B
./bundle/dist-T73EYRDX.js 356 B 0 B
./bundle/gemini.js 694 kB -441 B (-0.06%)
./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-RQEFN44F.js 0 B -922 B (removed) 🏆
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB 0 B
./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
./bundle/src-QVCVGIUX.js 47 kB 0 B
./bundle/tree-sitter-7U6MW5PS.js 274 kB 0 B
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB 0 B
./bundle/undici-4X2YZID5.js 360 B 0 B
./bundle/keychain-token-storage-G5HO7O4O.js 518 B +518 B (new file) 🆕
./bundle/memoryDiscovery-7JIZT7ZF.js 922 B +922 B (new file) 🆕

compressed-size-action

@gemini-cli gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Mar 13, 2026
@sehoon38 sehoon38 added this pull request to the merge queue Mar 13, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 13, 2026
@sehoon38 sehoon38 added this pull request to the merge queue Mar 13, 2026
Merged via the queue into main with commit 8d68ece Mar 13, 2026
30 checks passed
@sehoon38 sehoon38 deleted the revert-21393-fix/validate-model-flag branch March 13, 2026 23:32
kunal-10-cloud pushed a commit to kunal-10-cloud/gemini-cli that referenced this pull request Mar 21, 2026
SUNDRAM07 pushed a commit to SUNDRAM07/gemini-cli that referenced this pull request Mar 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/need-issue Pull requests that need to have an associated issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants