Skip to content

Prefer global provider credentials / 优先使用全局模型服务凭据#4671

Merged
SivanCola merged 2 commits into
esengine:main-v2from
SivanCola:fix/global-provider-config-priority
Jun 17, 2026
Merged

Prefer global provider credentials / 优先使用全局模型服务凭据#4671
SivanCola merged 2 commits into
esengine:main-v2from
SivanCola:fix/global-provider-config-priority

Conversation

@SivanCola

@SivanCola SivanCola commented Jun 17, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • prefer user-global provider entries over same-named project provider entries, while preserving shadowed project providers when project configs are saved
  • use global-first credential resolution for provider keys, with existing process env first and project/home .env as fallbacks
  • keep desktop Settings credential display side-effect free so opening Settings does not mutate runtime environment variables
  • avoid canonicalizing custom provider aliases unless the matching provider is an official endpoint

Related

Testing

  • go test ./internal/config
  • go test . from desktop/
  • go test ./...

@SivanCola SivanCola requested a review from esengine as a code owner June 17, 2026 04:23
@github-actions github-actions Bot added v2 Go rewrite (1.x) — main-v2 branch, active development desktop Wails desktop app (desktop/**) config Configuration & setup (internal/config) labels Jun 17, 2026
@SivanCola SivanCola force-pushed the fix/global-provider-config-priority branch from 123ace7 to ca0ee6e Compare June 17, 2026 04:27
@SivanCola

Copy link
Copy Markdown
Collaborator Author

Resolved the merge conflict by rebasing this PR onto the latest main-v2.

Verification:

  • go test ./internal/config
  • go test . from desktop/

Current head: ca0ee6e93e55a4ffb6d97bcbcf0c7acc7607f968

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 123ace72d2

ℹ️ 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".

Comment thread internal/config/config.go
Comment thread desktop/settings_app.go Outdated
Comment thread desktop/settings_app.go Outdated
@SivanCola SivanCola merged commit e3924bc into esengine:main-v2 Jun 17, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

config Configuration & setup (internal/config) desktop Wails desktop app (desktop/**) v2 Go rewrite (1.x) — main-v2 branch, active development

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant