Use Gemini subscription OAuth accounts only #29
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,58 +64,43 @@ func runGeminiCommand(ctx context.Context, args []string, stdout io.Writer, stde | |
| if err != nil { | ||
| return err | ||
| } | ||
| accounts, err := client.List(ctx, "gemini") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| selectedAccount, err := selectGeminiAccount(account, accounts) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return runGemini(ctx, client.BaseURL, client.Token, selectedAccount, withDefaultGeminiModel(passthrough), os.Stdin, stdout, stderr) | ||
| } | ||
|
|
||
| func selectGeminiAccount(selector string, accounts []api.Credential) (string, error) { | ||
| if selector != "" { | ||
| matches := make([]string, 0, 1) | ||
| for _, account := range accounts { | ||
| if account.ID == selector || account.Name == selector { | ||
| matches = append(matches, account.ID) | ||
| } | ||
| } | ||
| if len(matches) == 0 { | ||
| return "", fmt.Errorf("Gemini subscription account %q is not registered", selector) | ||
| } | ||
| if len(matches) > 1 { | ||
| return "", fmt.Errorf("Gemini subscription account %q is ambiguous; use its credential ID", selector) | ||
| } | ||
| return matches[0], nil | ||
| } | ||
| if len(accounts) == 0 { | ||
| return "", errors.New("no Gemini subscription accounts are registered; run 'prism gemini auth login'") | ||
| } | ||
| return rotateProviderAccount("gemini", accounts) | ||
|
There was a problem hiding this comment. Suggestion: Default execution now invokes the shared file-backed rotation routine for every Gemini launch. That routine performs an unlocked read, increment, and rename, so concurrent Severity Level: Major
|
||
| } | ||
|
|
||
| func runGemini( | ||
| ctx context.Context, | ||
| prismURL string, | ||
| prismCredential string, | ||
| account string, | ||
| args []string, | ||
| stdin io.Reader, | ||
|
|
@@ -126,7 +111,7 @@ func runGemini( | |
| if err != nil { | ||
| return err | ||
| } | ||
| bridge, err := startGeminiBridge(prismURL, prismCredential, account, stderr) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -191,7 +176,7 @@ func withDefaultGeminiModel(args []string) []string { | |
| return append([]string{"--model", defaultGeminiModel}, args...) | ||
| } | ||
|
|
||
| func startGeminiBridge(prismURL string, prismCredential string, account string, stderr io.Writer) (*geminiBridge, error) { | ||
| target, err := url.Parse(prismURL) | ||
| if err != nil || (target.Scheme != "https" && target.Scheme != "http") || target.Host == "" { | ||
| return nil, errors.New("Prism URL is invalid") | ||
|
|
@@ -202,9 +187,6 @@ func startGeminiBridge(prismURL string, prismCredential string, provider string, | |
| if strings.TrimSpace(account) == "" || strings.ContainsAny(account, "\r\n") { | ||
| return nil, errors.New("Gemini account selector is invalid") | ||
| } | ||
| credentialBytes := make([]byte, 32) | ||
| if _, err := rand.Read(credentialBytes); err != nil { | ||
| return nil, errors.New("could not create a local Gemini credential") | ||
|
|
@@ -223,7 +205,6 @@ func startGeminiBridge(prismURL string, prismCredential string, provider string, | |
| request.Header.Del("X-Prism-Gemini-Provider") | ||
| request.Header.Set("Authorization", "Bearer "+prismCredential) | ||
| request.Header.Set("X-Prism-Gemini-Account", "b64:"+base64.RawURLEncoding.EncodeToString([]byte(account))) | ||
| } | ||
| proxy.ErrorLog = log.New(stderr, "prism: ", 0) | ||
| proxy.ErrorHandler = func(response http.ResponseWriter, _ *http.Request, _ error) { | ||
|
|
@@ -297,8 +278,8 @@ func printGeminiHelp(output io.Writer) { | |
| prism gemini [--account <alias-or-id>] [Gemini CLI arguments...] | ||
|
|
||
| Runs the official Gemini CLI through Prism's Vault-backed Google accounts. | ||
| Only fixed-price Gemini subscription and Code Assist OAuth accounts are used; | ||
| AI Studio API keys are intentionally unsupported to prevent usage-based charges. | ||
| The default model is gemini-3.7-flash; use --model gemini-3.1-pro-preview for | ||
| hard software-engineering and multi-step tool-use work. | ||
| Run 'gemini --help' for Gemini CLI options.`) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion: Commands that do not need an account, such as
prism gemini --version, now perform a network-backed credential listing before the Gemini CLI is invoked. This makes local CLI metadata commands fail when Prism is unavailable or credentials are invalid; handle local-only CLI commands before listing accounts or only list accounts when an authenticated execution is required. [api mismatch]Severity Level: Major⚠️
Prompt for AI Agent 🤖