[codex] fix declarative provider auth updates and Ollama Cloud model selection#8499
[codex] fix declarative provider auth updates and Ollama Cloud model selection#8499AiRC-ai wants to merge 5 commits intoaaif-goose:mainfrom
Conversation
Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
Signed-off-by: Ryan Cox <ryancox@GoDSyNcs-MBP.godsync.com>
Signed-off-by: Ryan Cox <ryancox@GoDSyNcs-MBP.godsync.com>
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 0aea068501
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| if custom_file.exists() { | ||
| std::fs::remove_file(custom_file)?; | ||
| } | ||
| None |
There was a problem hiding this comment.
When requires_auth is turned off for a non-editable declarative provider, this path removes the shadow file and writes no replacement override, so the setting is not persisted. On the next reload, load_provider falls back to the bundled fixed config (which is requires_auth: true for providers like ollama_cloud), so users cannot actually keep auth disabled and the checkbox state snaps back after refresh.
Useful? React with 👍 / 👎.
Signed-off-by: Ryan Cox <ryancox@GoDSyNcs-MBP.godsync.com>
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: fac75a343d
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| let (shadows, true_custom): (Vec<_>, Vec<_>) = custom_providers | ||
| .into_iter() | ||
| .partition(|c| fixed_names.contains(c.name.as_str())); |
There was a problem hiding this comment.
This partition now reclassifies any custom provider whose name matches a fixed provider into the shadow path, where only requires_auth/api_key_env are applied and all other custom settings are discarded. Because generate_id creates IDs like custom_{display_name}, creating a provider named DeepSeek or Tensorix collides with bundled fixed IDs (custom_deepseek, custom_tensorix), so the saved custom api_url/models are ignored and the provider effectively becomes non-editable fixed config after refresh.
Useful? React with 👍 / 👎.
|
Thanks for the contribution, @AiRC-ai! We noticed you have 3 open PRs (#8497, #8499, #8500) opened around the same time — per our contribution guidelines we'd suggest focusing on one at a time so we can give it proper review. There are also a couple of unaddressed Codex review comments on this PR (one flags a real regression where custom providers whose name collides with a fixed provider would have their settings silently dropped). We're going to close this one for now — please feel free to reopen your top-priority PR with the Codex feedback addressed, and we'll take a look! |
3 participants
Summary
This stacks the declarative-provider auth update flow with two follow-up fixes needed to make the Ollama Cloud configuration path work end to end.
Changes included:
ollama_cloudso the full live cloud model list is shown instead of an over-filtered subsetRoot cause
There were two separate issues in the provider flow:
Impact
This makes the Ollama Cloud provider flow usable from the desktop settings UI:
Update Providerpersists the API key for the fixed declarative providerValidation
source bin/activate-hermit && cd ui/desktop && pnpm run typecheckjust package-uiNotes
The first two commits are the
#8191-equivalent declarative-provider fixes on top ofmain; the last commit is the follow-up for the refreshed model picker and Ollama Cloud model list behavior.