clawdie/zot
1
0
Fork 0
mirror of https://github.com/patriceckhart/zot.git synced 2026-06-26 21:36:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into pr-11

Browse source
This commit is contained in:
patriceckhart 2026-06-08 15:23:22 +02:00
commit 956b0a24e2
2 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/agent/build.go
View file

@ -317,8 +317,15 @@ func Resolve(args Args, requireCred bool) (Resolved, error) {
// never shows a "not logged in" banner.
userPickedProvider := args.Provider != ""
if credErr != nil && !userPickedProvider && provName != "ollama" {
for _, other := range []string{"anthropic", "openai", "openai-codex", "kimi", "deepseek", "google"} {
if other == provName {
// Scan every known provider (not a hardcoded subset) so any
// env-based credential is discovered, e.g. an env-only
// amazon-bedrock setup (AWS_BEARER_TOKEN_BEDROCK / AWS_PROFILE /
// IAM keys) when no config.json pins the provider, such as after
// pointing ZOT_HOME at a fresh home dir. Iteration order of
// knownProviders defines fallback priority. ollama is skipped:
// it has no credential and would always "match".
for _, other := range knownProviders {
if other == provName || other == "ollama" {
continue
}
if c, m, a, err := ResolveCredentialFull(other, args.APIKey); err == nil {

31
packages/agent/build_test.go
View file

@ -111,6 +111,37 @@ func TestResolveExplicitFlagStaleDoesNotRepairConfig(t *testing.T) {
}
}
// TestResolveEnvOnlyBedrockDiscoveredWithoutConfig reproduces issue
// #15: pointing ZOT_HOME at a fresh dir drops the persisted
// config.json (which pinned provider=amazon-bedrock). Resolve must
// still discover bedrock from the AWS env vars instead of falling back
// to anthropic and reporting "not logged in".
func TestResolveEnvOnlyBedrockDiscoveredWithoutConfig(t *testing.T) {
t.Setenv("ZOT_HOME", t.TempDir()) // fresh home: no config.json
// Disable the Kimi CLI token fallback so a developer machine with a
// real Kimi CLI login doesn't pre-empt bedrock in the scan.
if err := SetKimiCLIFallbackDisabled(true); err != nil {
t.Fatal(err)
}
t.Setenv("AWS_BEARER_TOKEN_BEDROCK", "test-bedrock-token")
t.Setenv("AWS_REGION", "us-east-1")
// Make sure no other provider's env credential pre-empts bedrock.
for _, k := range []string{"ANTHROPIC_API_KEY", "ANTHROPIC_OAUTH_TOKEN", "OPENAI_API_KEY", "GEMINI_API_KEY", "GOOGLE_API_KEY", "DEEPSEEK_API_KEY", "KIMI_API_KEY", "MOONSHOT_API_KEY"} {
t.Setenv(k, "")
}
r, err := Resolve(Args{}, true)
if err != nil {
t.Fatalf("Resolve errored with env-only bedrock: %v", err)
}
if r.Provider != "amazon-bedrock" {
t.Fatalf("provider = %q, want amazon-bedrock", r.Provider)
}
if !r.HasCredential() {
t.Fatalf("bedrock credential not resolved from env")
}
}
func TestResolveOllamaUsesModelBaseURLBeforeDefault(t *testing.T) {
t.Setenv("ZOT_HOME", t.TempDir())
provider.SetLiveModels(nil)