Skip to content

Commit d0b489b

Browse files
sync(acli): provider/key wizards no longer dead-end on a stale provider
Mirrors agenticCLI 1acdd7b. A provider persisted from a directory that had a custom-extensions.toml (e.g. zhipu) cannot be built elsewhere, and both entry points mishandled it: startup demanded an API key for a provider with no definition and suggested an env var nothing reads, and /provider offered that unbuildable name as the Enter default so a bare Enter returned "Unknown provider: zhipu; cancelled".
1 parent b38859d commit d0b489b

2 files changed

Lines changed: 31 additions & 5 deletions

File tree

‎dashscope/acli/cli/handlers_key.py‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,25 @@ def ensure_provider_key(config: Config, agent) -> bool:
8181
ext = find_provider(config.provider)
8282
targets = all_key_targets(config)
8383
key_info = targets.get(config.provider)
84+
if ext is None and key_info is None:
85+
# Neither a built-in nor a loaded extension: this directory cannot
86+
# build that provider, so collecting a key is a dead end — and the
87+
# "<PROVIDER>_API_KEY" env var we would suggest is read by nothing.
88+
console.print(
89+
f"\n[yellow]Configured provider '{config.provider}' is not "
90+
"available here (no built-in or loaded extension by that "
91+
"name), so an API key alone will not make it work.[/yellow]"
92+
)
93+
console.print(
94+
"[dim]Starting anyway; run /provider to pick an available "
95+
"provider.[/dim]"
96+
)
97+
return True
98+
8499
if key_info:
85100
env_name = key_info.get("env") or ""
86-
elif ext is not None:
87-
env_name = ext.api_key_env or ""
88101
else:
89-
env_name = f"{config.provider.upper()}_API_KEY"
102+
env_name = ext.api_key_env or ""
90103

91104
console.print(
92105
f"\n[yellow]No API Key detected for " f"{config.provider}[/yellow]",

‎dashscope/acli/cli/handlers_provider.py‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,24 @@ def _provider_wizard(agent: Agent, config: Config) -> bool:
168168
for err in loaded.errors:
169169
console.print(f"[yellow]custom-extensions.toml: {err}[/yellow]")
170170

171-
# 1) Provider — Enter keeps the current one.
171+
# 1) Provider — Enter keeps the current one, but only when it is
172+
# loadable. A persisted extension provider whose custom-extensions.toml
173+
# is not present here is absent from `names`, so offering it as the
174+
# default turns a bare Enter into "Unknown provider; cancelled".
172175
names = list(PROVIDER_MODELS) + [
173176
p.name for p in loaded.providers if p.name not in PROVIDER_MODELS
174177
]
175-
provider = _numbered_pick("Available providers", names, config.provider)
178+
current = config.provider if config.provider in names else ""
179+
if config.provider and not current:
180+
console.print(
181+
f"[yellow]Configured provider '{config.provider}' is not "
182+
"available here (no built-in or loaded extension by that "
183+
"name), so Enter cannot keep it — pick one below.[/yellow]"
184+
)
185+
provider = _numbered_pick("Available providers", names, current)
186+
if not provider:
187+
console.print("[dim]No provider chosen; cancelled[/dim]")
188+
return True
176189
if provider not in names:
177190
console.print(f"[red]Unknown provider: {provider}; cancelled[/red]")
178191
return True

0 commit comments

Comments
 (0)