Skip to content

revert(core): support custom base URL via env vars#23976

Merged
spencer426 merged 2 commits intomainfrom
revert-custom-base-url
Mar 27, 2026
Merged

revert(core): support custom base URL via env vars#23976
spencer426 merged 2 commits intomainfrom
revert-custom-base-url

Conversation

@spencer426
Copy link
Copy Markdown
Contributor

@spencer426 spencer426 commented Mar 27, 2026

Summary

Reverts PR #21561. The @google/genai SDK inherently supports setting the baseUrl via the GOOGLE_GEMINI_BASE_URL and GOOGLE_VERTEX_BASE_URL environment variables. The custom environment variable parsing and validation logic introduced in PR #21561 is duplicative and overly restrictive (blocking valid enterprise proxies that use HTTP).

Details

Prior to PR #21561, the CLI's initialization pattern initialized the GoogleGenAI class without passing an explicit httpOptions.baseUrl (unless config.baseUrl was configured explicitly). Because no explicit URL was provided to the constructor, the SDK automatically inherited and applied these environment variables natively. Reverting this returns the CLI to rely on the SDK's native environment variable parsing.

Related Issues

Reverts #21561
Fixes #6746 (Historically)

How to Validate

  1. npm run build
  2. GOOGLE_GEMINI_BASE_URL=http://localhost:8080 GEMINI_API_KEY=test npm start
  3. The CLI should start and properly route requests to http://localhost:8080.

Pre-Merge Checklist

  • Updated relevant documentation and README (if needed)
  • Added/updated tests (if needed)
  • 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

@spencer426 spencer426 requested a review from a team as a code owner March 27, 2026 03:22
@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 reverts the changes introduced in PR #21561. The goal is to rely on the native support provided by the @google/genai SDK for configuring base URLs via environment variables. By removing the custom validation layer, the CLI becomes more flexible and compatible with various proxy configurations that were previously incorrectly restricted.

Highlights

  • Reversion of custom base URL validation: Removed the custom environment variable parsing and validation logic for base URLs, as the underlying SDK natively handles these environment variables.
  • Improved compatibility: Eliminated overly restrictive validation that previously blocked valid enterprise proxies using HTTP.
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.

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
Copy link
Copy Markdown

github-actions Bot commented Mar 27, 2026

Size Change: -778 B (0%)

Total Size: 26.4 MB

Filename Size Change
./bundle/chunk-IJJT6EZ3.js 0 B -14.7 MB (removed) 🏆
./bundle/chunk-UKE4GKE3.js 0 B -3.77 MB (removed) 🏆
./bundle/core-T45G2FP2.js 0 B -44.2 kB (removed) 🏆
./bundle/devtoolsService-XQHQ2GFM.js 0 B -27.7 kB (removed) 🏆
./bundle/interactiveCli-GZCKQFBR.js 0 B -1.63 MB (removed) 🏆
./bundle/oauth2-provider-6OFD4RWY.js 0 B -9.16 kB (removed) 🏆
./bundle/chunk-L5S57JYD.js 3.77 MB +3.77 MB (new file) 🆕
./bundle/chunk-PPHNDI32.js 14.7 MB +14.7 MB (new file) 🆕
./bundle/core-YLILNO32.js 44.1 kB +44.1 kB (new file) 🆕
./bundle/devtoolsService-FKECCVEG.js 27.7 kB +27.7 kB (new file) 🆕
./bundle/interactiveCli-F3SK7AYO.js 1.63 MB +1.63 MB (new file) 🆕
./bundle/oauth2-provider-7UGIMCL7.js 9.16 kB +9.16 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size
./bundle/chunk-34MYV7JD.js 2.45 kB
./bundle/chunk-5AUYMPVF.js 858 B
./bundle/chunk-664ZODQF.js 124 kB
./bundle/chunk-DAHVX5MI.js 206 kB
./bundle/chunk-IUUIT4SU.js 56.5 kB
./bundle/chunk-K7ASY5QY.js 1.96 MB
./bundle/chunk-RJTRUG2J.js 39.8 kB
./bundle/devtools-36NN55EP.js 696 kB
./bundle/dist-T73EYRDX.js 356 B
./bundle/gemini.js 531 kB
./bundle/getMachineId-bsd-TXG52NKR.js 1.55 kB
./bundle/getMachineId-darwin-7OE4DDZ6.js 1.55 kB
./bundle/getMachineId-linux-SHIFKOOX.js 1.34 kB
./bundle/getMachineId-unsupported-5U5DOEYY.js 1.06 kB
./bundle/getMachineId-win-6KLLGOI4.js 1.72 kB
./bundle/memoryDiscovery-3DVAQSAI.js 922 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB
./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
./bundle/src-QVCVGIUX.js 47 kB
./bundle/tree-sitter-7U6MW5PS.js 274 kB
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB

compressed-size-action

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 simplifies the content generator by removing the fallback logic for GOOGLE_GEMINI_BASE_URL and GOOGLE_VERTEX_BASE_URL environment variables, along with the validateBaseUrl utility and its associated tests. The createContentGenerator function now exclusively uses the baseUrl provided in the configuration object. I have no feedback to provide.

@spencer426 spencer426 closed this Mar 27, 2026
@spencer426 spencer426 reopened this Mar 27, 2026
@gemini-cli gemini-cli Bot added priority/p2 Important but can be addressed in a future release. area/core Issues related to User Interface, OS Support, Core Functionality help wanted We will accept PRs from all issues marked as "help wanted". Thanks for your support! labels Mar 27, 2026
@spencer426 spencer426 force-pushed the revert-custom-base-url branch from 4859b81 to b072b71 Compare March 27, 2026 04:06
@spencer426 spencer426 added this pull request to the merge queue Mar 27, 2026
Merged via the queue into main with commit f397739 Mar 27, 2026
28 checks passed
@spencer426 spencer426 deleted the revert-custom-base-url branch March 27, 2026 17:26
ProthamD pushed a commit to ProthamD/gemini-cli that referenced this pull request Mar 29, 2026
afanty2021 pushed a commit to afanty2021/gemini-cli that referenced this pull request Apr 4, 2026
@stevemk14ebr
Copy link
Copy Markdown
Contributor

allowing http on non-localhost was a good change, thanks! This is useful in container environments where you want to reach the proxy though a virtual network where the domain name is not always localhost.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/core Issues related to User Interface, OS Support, Core Functionality help wanted We will accept PRs from all issues marked as "help wanted". Thanks for your support! priority/p2 Important but can be addressed in a future release.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Support custom baseurl

3 participants