Use Claude Code, Codex, VSCode, Pi, and OpenCode (and 6 other harnesses) for free (1.3B+ free tokens) from your terminal, app, IDE, or phone, and now from the browser with native browser sessions (multi-harness + multi-model) like OpenClaw (voice supported + ToS friendly)
Python
minor: configure multiple API keys per provider (#2057)
Ali Khokhare8806fb608ac
diff --git a/README.md b/README.mdindex 551a1523..701325cb 100644--- a/README.md+++ b/README.md@@ -94,9 +94,9 @@ terminal open.1. Create an API key at [build.nvidia.com/settings/api-keys](https://build.nvidia.com/settings/api-keys).2. Open the Admin UI URL from the server log.-3. Paste the key into `NVIDIA_NIM_API_KEY`.+3. Open NVIDIA NIM in **Providers**, click **Add key**, paste the key, and click **Save**.4. Leave `MODEL` on the default `nvidia_nim/nvidia/nemotron-3-super-120b-a12b`, or search the model dropdown and select another model.-5. Click **Apply**.+5. Click **Apply** to save your model selection.To protect the local proxy with a bearer token, enable **Proxy Authentication**in Admin.@@ -187,7 +187,15 @@ Optional: add an ordered **Fallback Models** list under **Model Config**. Itapplies to every connected client. A failed request may reach and consume usagefrom more than one provider before succeeding.-For another API endpoint, open **Providers → Custom providers → Add provider**. Enter its API base URL, optional key, and API format. Leave **Model IDs** empty to discover models automatically, or enter one upstream model ID per line. Save, then select a model in **Model Config**.+Provider modals support numbered API keys. Use **Add key**, remove rows, or drag their handles to reorder them. FCC uses key 1. Saving checks every key, blocks confirmed invalid keys, and shows warnings for keys it cannot verify.++The same API key environment variable also accepts a JSON array:++```dotenv+NVIDIA_NIM_API_KEY='["your-first-key","your-second-key"]'+```++For another API endpoint, open **Providers → Custom providers → Add provider**. Enter its API base URL, optional keys, and API format. Leave **Model IDs** empty to discover models automatically, or enter one upstream model ID per line. Save, then select a model in **Model Config**.<details><summary><strong>Provider catalog</strong></summary>diff --git a/e2e/conftest.py b/e2e/conftest.pyindex 2ec74c85..4e0bf652 100644--- a/e2e/conftest.py+++ b/e2e/conftest.py@@ -38,6 +38,10 @@ from free_claude_code.harnesses import (vscode_chat_integration,)from free_claude_code.providers.base import BaseProvider, ProviderConfig+from free_claude_code.providers.credential_validation import (+ CredentialCheck,+ CredentialStatus,+)from free_claude_code.providers.runtime import ProviderRuntimefrom free_claude_code.runtime.application import ApplicationRuntimefrom free_claude_code.runtime.asgi import RuntimeASGIApp@@ -222,6 +226,23 @@ def admin_base_url(monkeypatch.setattr(env_migrations, "verified_checkout_env_path", lambda: None)clear_settings_cache()+ async def verified_credentials(settings, submissions):+ return tuple(+ CredentialCheck(+ submission.key,+ CredentialStatus.VERIFIED,+ "API key accepted.",+ index,+ submission.provider_id,+ )+ for submission in submissions+ for index, _ in enumerate(submission.credentials)+ )++ monkeypatch.setattr(+ "free_claude_code.runtime.application.check_credentials", verified_credentials+ )+store = ManagedConfigStore()store.initialize({})store.commit(diff --git a/e2e/provider_support.py b/e2e/provider_support.pyindex e5853f08..4e93faa4 100644--- a/e2e/provider_support.py+++ b/e2e/provider_support.py@@ -13,3 +13,11 @@ def open_provider(page: Page, provider_id: str) -> Locator:def close_provider(page: Page) -> None:page.locator("#closeProviderDialog").click()expect(page.locator("#providerDialog")).not_to_be_visible()+++def api_key_input(page: Page, key: str, index: int = 0) -> Locator:+ editor = page.locator(f".api-key-editor:has(#field-{key})")+ inputs = editor.locator(".api-key-row input")+ while inputs.count() <= index:+ editor.get_by_role("button", name="Add key", exact=True).click()+ return inputs.nth(index)diff --git a/e2e/test_admin_apply.py b/e2e/test_admin_apply.pyindex e2e9a8e3..5e968937 100644--- a/e2e/test_admin_apply.py+++ b/e2e/test_admin_apply.py@@ -3,7 +3,7 @@import pytestfrom playwright.sync_api import Page, Route, expect-from e2e.provider_support import close_provider, open_provider+from e2e.provider_support import api_key_input, close_provider, open_providerdef test_apply_is_the_only_config_action_and_retains_invalid_edits(@@ -57,13 +57,17 @@ def test_key_rejection_retains_edits_and_restores_focus(expect(page.locator("#applyButton")).to_be_disabled()submitted = route.request.post_data_jsonassert isinstance(submitted, dict)- assert submitted["values"] == {"MISTRAL_API_KEY": "bad-key"}+ assert set(submitted["values"]) == {"MISTRAL_API_KEY"}+ assert submitted["values"]["MISTRAL_API_KEY"]["entries"] == [+ {"value": "bad-key"}+ ]route.fulfill(json={"applied": False,"errors": ["Rejected key"],"credential_checks": [{+ "index": 0,"key": "MISTRAL_API_KEY","status": "rejected","message": "Check this API key.",@@ -80,13 +84,13 @@ def test_key_rejection_retains_edits_and_restores_focus(other.fill("open_router/other-edit")page.get_by_role("button", name="Providers", exact=True).click()open_provider(page, "mistral")- key = page.locator("#field-MISTRAL_API_KEY")+ key = api_key_input(page, "MISTRAL_API_KEY")key.fill("bad-key")with page.expect_response("**/admin/api/config/apply"):page.get_by_role("button", name="Save", exact=True).click()expect(key).to_be_focused()expect(key).to_have_attribute("aria-invalid", "true")- expect(page.locator("#field-MISTRAL_API_KEY-error")).to_have_text(+ expect(page.locator("#field-MISTRAL_API_KEY-1-result")).to_have_text("Check this API key.")assert request_count == 1@@ -94,7 +98,7 @@ def test_key_rejection_retains_edits_and_restores_focus(expect(other).to_have_value("open_router/other-edit")expect(page.locator("#dirtyState")).to_have_text("1 unsaved change")key.fill("corrected")- expect(page.locator("#field-MISTRAL_API_KEY-error")).to_have_count(0)+ expect(page.locator("#field-MISTRAL_API_KEY-1-result")).to_be_hidden()expect(page.locator("#saveProvider")).to_be_enabled()close_provider(page)open_provider(page, "open_router")@@ -123,6 +127,7 @@ def test_unverified_warning_survives_apply(},"credential_checks": [{+ "index": 0,"key": "NVIDIA_NIM_API_KEY","status": "unverified","message": "Verification unavailable.",@@ -140,7 +145,7 @@ def test_unverified_warning_survives_apply(page.goto(f"{admin_base_url}/admin")expect(page.locator("#messageArea")).to_have_text("")open_provider(page, "nvidia_nim")- page.locator("#field-NVIDIA_NIM_API_KEY").fill("new-key")+ api_key_input(page, "NVIDIA_NIM_API_KEY").fill("new-key")page.get_by_role("button", name="Save", exact=True).click()expect(page.locator("#messageArea")).to_contain_text("Verification unavailable.")expect(page.locator("#dirtyState")).to_have_text("No changes")@@ -182,13 +187,13 @@ def test_apply_network_error_unlocks_form_and_keeps_edits(page.goto(f"{admin_base_url}/admin")expect(page.locator("#messageArea")).to_have_text("")open_provider(page, "nvidia_nim")- key = page.locator("#field-NVIDIA_NIM_API_KEY")+ key = api_key_input(page, "NVIDIA_NIM_API_KEY")key.fill("unsaved-key")page.get_by_role("button", name="Save", exact=True).click()expect(page.locator("#messageArea")).to_contain_text("Could not apply settings")expect(key).to_have_value("unsaved-key")expect(key).to_be_editable()- expect(page.locator("#saveProvider")).to_be_enabled()+ expect(page.locator("#saveProvider")).to_be_disabled()def test_restart_waits_for_a_new_running_server(page: Page, admin_base_url: str):@@ -215,7 +220,7 @@ def test_restart_waits_for_a_new_running_server(page: Page, admin_base_url: str)page.wait_for_function("!state.startupRequest && !state.startupTimer")page.route(status_url, lambda route: route.fulfill(json=status))open_provider(page, "nvidia_nim")- page.locator("#field-NVIDIA_NIM_API_KEY").fill("new-key")+ api_key_input(page, "NVIDIA_NIM_API_KEY").fill("new-key")with page.expect_request("**/admin/api/status"):page.get_by_role("button", name="Save", exact=True).click()expect(page.locator("#applyButton")).to_have_text("Reconnecting…")@@ -241,10 +246,12 @@ def test_restart_timeout_can_reconnect_without_resubmitting_keys(page: Page, admin_base_url: str):ready = False- submissions: list[object] = []+ submissions: list[dict] = []def apply_result(route: Route):- submissions.append(route.request.post_data_json)+ payload = route.request.post_data_json+ assert isinstance(payload, dict)+ submissions.append(payload)route.fulfill(json={"applied": True,@@ -257,6 +264,7 @@ def test_restart_timeout_can_reconnect_without_resubmitting_keys(},"credential_checks": [{+ "index": 0,"key": "NVIDIA_NIM_API_KEY","status": "unverified","message": "Verification unavailable.",@@ -277,7 +285,7 @@ def test_restart_timeout_can_reconnect_without_resubmitting_keys(expect(page.locator("#messageArea")).to_have_text("")page.clock.install()open_provider(page, "nvidia_nim")- page.locator("#field-NVIDIA_NIM_API_KEY").fill("new-key")+ api_key_input(page, "NVIDIA_NIM_API_KEY").fill("new-key")with page.expect_request("**/admin/api/status"):page.get_by_role("button", name="Save", exact=True).click()expect(page.locator("#applyButton")).to_have_text("Reconnecting…")@@ -295,7 +303,11 @@ def test_restart_timeout_can_reconnect_without_resubmitting_keys(reconnect.click()expect(page.locator('[data-provider="nvidia_nim"]')).to_be_enabled()expect(page.locator("#messageArea")).to_contain_text("Verification unavailable.")- assert submissions == [{"values": {"NVIDIA_NIM_API_KEY": "new-key"}}]+ assert len(submissions) == 1+ assert set(submissions[0]["values"]) == {"NVIDIA_NIM_API_KEY"}+ assert submissions[0]["values"]["NVIDIA_NIM_API_KEY"]["entries"] == [+ {"value": "new-key"}+ ]def test_restart_to_another_local_origin_keeps_the_warning(@@ -316,6 +328,7 @@ def test_restart_to_another_local_origin_keeps_the_warning(},"credential_checks": [{+ "index": 0,"key": "NVIDIA_NIM_API_KEY","status": "unverified","message": "Verification unavailable.",@@ -334,7 +347,7 @@ def test_restart_to_another_local_origin_keeps_the_warning(page.goto(f"{admin_base_url}/admin")expect(page.locator("#messageArea")).to_have_text("")open_provider(page, "nvidia_nim")- page.locator("#field-NVIDIA_NIM_API_KEY").fill("new-key")+ api_key_input(page, "NVIDIA_NIM_API_KEY").fill("new-key")page.get_by_role("button", name="Save", exact=True).click()page.wait_for_url(target)expect(page.locator('[data-provider="nvidia_nim"]')).to_be_enabled()diff --git a/e2e/test_admin_assets.py b/e2e/test_admin_assets.pyindex 90f7a578..79c40ef5 100644--- a/e2e/test_admin_assets.py+++ b/e2e/test_admin_assets.py@@ -6,7 +6,7 @@ import pytestfrom playwright.sync_api import Error, Page, Request, expectfrom e2e.form_support import assert_autofill_opt_out-from e2e.provider_support import open_provider+from e2e.provider_support import api_key_input, open_providerfrom free_claude_code.core.version import package_version@@ -86,13 +86,13 @@ def test_settings_text_fields_opt_out_of_autofill(page, admin_base_url):page.get_by_role("button", name="Providers", exact=True).click()open_provider(page, "nvidia_nim")assert_autofill_opt_out(page)- key = page.locator("#field-NVIDIA_NIM_API_KEY")+ key = api_key_input(page, "NVIDIA_NIM_API_KEY")expect(key).to_have_value("")- expect(key).to_have_attribute("type", "text")+ expect(key).to_have_attribute("type", "password")expect(key).to_have_attribute("autocapitalize", "none")expect(key).to_have_attribute("spellcheck", "false")expect(key).to_have_attribute("autocorrect", "off")- expect(page.locator('.field input[type="password"]')).to_have_count(0)+ expect(page.locator('.field input[type="password"]')).to_have_count(1)key.fill("manually-entered-api-key")expect(key).to_have_value("manually-entered-api-key")expect(page.locator("#saveProvider")).to_be_enabled()diff --git a/e2e/test_admin_providers.py b/e2e/test_admin_providers.pyindex 80256d1b..f383ac65 100644--- a/e2e/test_admin_providers.py+++ b/e2e/test_admin_providers.py@@ -3,7 +3,7 @@import pytestfrom playwright.sync_api import ConsoleMessage, Page, Route, ViewportSize, expect-from e2e.provider_support import close_provider, open_provider+from e2e.provider_support import api_key_input, close_provider, open_provider@pytest.mark.parametrize(@@ -20,7 +20,7 @@ def test_retired_provider_is_absent_and_default_setup_remains_available("primary-button")card.locator("[data-provider-settings]").click()- expect(page.locator("#field-NVIDIA_NIM_API_KEY")).to_be_focused()+ expect(page.get_by_role("button", name="Add key", exact=True)).to_be_focused()close_provider(page)page.get_by_role("button", name="Model Config", exact=True).click()expect(page.locator("#field-MODEL")).to_have_value(@@ -54,7 +54,7 @@ def test_missing_provider_configuration_opens_modal_and_focuses_exact_field() -> None:_open_admin(page, admin_base_url, viewport)card = page.locator('[data-provider="nvidia_nim"]')- key_input = page.locator("#field-NVIDIA_NIM_API_KEY")+ key_input = page.get_by_role("button", name="Add key", exact=True)expect(card.get_by_role("button", name="Configure", exact=True)).to_have_class("primary-button"@@ -307,7 +307,7 @@ def test_admin_loading_finishes_before_local_availability_checks(page.route("**/admin/api/providers/*/local-status", hold)_open_admin(page, admin_base_url, {"width": 1280, "height": 720})open_provider(page, "nvidia_nim")- key = page.locator("#field-NVIDIA_NIM_API_KEY")+ key = api_key_input(page, "NVIDIA_NIM_API_KEY")key.fill("unsaved-key")expect(page.locator("#dirtyState")).to_have_text("No changes")expect(page.locator("#saveProvider")).to_be_enabled()@@ -351,7 +351,7 @@ def test_local_availability_failure_does_not_fail_admin_loading(with page.expect_request("**/admin/api/providers/lmstudio/local-status"):page.goto(f"{admin_base_url}/admin")open_provider(page, "nvidia_nim")- expect(page.locator("#field-NVIDIA_NIM_API_KEY")).to_be_editable()+ expect(api_key_input(page, "NVIDIA_NIM_API_KEY")).to_be_editable()close_provider(page)if failure == "http":pending.pop().fulfill(status=503, json={"detail": "private-diagnostic-marker"})@@ -443,10 +443,8 @@ def test_xkiro_uses_standard_provider_configuration(page: Page, admin_base_url:expect(card.get_by_role("button", name="Configure", exact=True)).to_be_visible()expect(card.locator('a[href="https://xkiro.com/"]')).to_be_visible()dialog = open_provider(page, "xkiro")- expect(dialog.locator("#field-XKIRO_API_KEY")).to_be_focused()- expect(dialog.locator("#field-XKIRO_API_KEY")).to_have_attribute(- "data-secret", "true"- )+ expect(dialog.get_by_role("button", name="Add key", exact=True)).to_be_focused()+ expect(api_key_input(page, "XKIRO_API_KEY")).to_have_attribute("type", "password")expect(dialog.locator("#field-XKIRO_PROXY")).to_be_visible()expect(dialog).to_contain_text("xkiro.com/dashboard/api/keys")close_provider(page)@@ -472,8 +470,8 @@ def test_anthropic_standard_modal_groups_key_workspace_and_proxy(card = page.locator('[data-provider="anthropic"]')expect(card.get_by_role("button", name="Configure", exact=True)).to_be_visible()dialog = open_provider(page, "anthropic")- key = dialog.locator("#field-ANTHROPIC_API_KEY")- expect(key).to_have_attribute("data-secret", "true")+ key = api_key_input(page, "ANTHROPIC_API_KEY")+ expect(key).to_have_attribute("type", "password")expect(key).to_be_focused()expect(dialog.locator("#field-ANTHROPIC_WORKSPACE_ID")).to_be_visible()expect(dialog.locator("#field-ANTHROPIC_PROXY")).to_be_visible()@@ -481,11 +479,12 @@ def test_anthropic_standard_modal_groups_key_workspace_and_proxy(dialog.locator("#field-ANTHROPIC_WORKSPACE_ID").fill("wrkspc_test")dialog.get_by_role("button", name="Save", exact=True).click()expect(dialog).not_to_be_visible()- assert submissions == [- {- "values": {- "ANTHROPIC_API_KEY": "test-api-key",- "ANTHROPIC_WORKSPACE_ID": "wrkspc_test",- }- }+ assert len(submissions) == 1+ assert set(submissions[0]["values"]) == {+ "ANTHROPIC_API_KEY",+ "ANTHROPIC_WORKSPACE_ID",+ }+ assert submissions[0]["values"]["ANTHROPIC_API_KEY"]["entries"] == [+ {"value": "test-api-key"}]+ assert submissions[0]["values"]["ANTHROPIC_WORKSPACE_ID"] == "wrkspc_test"diff --git a/e2e/test_api_key_lists.py b/e2e/test_api_key_lists.pynew file mode 100644index 00000000..9b445ba7--- /dev/null+++ b/e2e/test_api_key_lists.py@@ -0,0 +1,370 @@+"""Numbered secret rows keep their saved identity through edits and checks."""++import json++import pytest+from playwright.sync_api import Page, expect++from e2e.provider_support import close_provider, open_provider+from free_claude_code.config.env_files import dotenv_values_from_file+from free_claude_code.providers.credential_validation import (+ CredentialCheck,+ CredentialStatus,+)+++def add_key(dialog, value):+ dialog.get_by_role("button", name="Add key", exact=True).click()+ inputs = dialog.locator(".api-key-row input")+ inputs.last.fill(value)+++def test_keyboard_reorder_replace_remove_and_reopen_preserve_saved_keys(+ page: Page, admin_base_url: str, tmp_path+):+ page.goto(admin_base_url + "/admin")+ dialog = open_provider(page, "nvidia_nim")+ for value in ("first-secret", "second-secret", "third-secret"):+ add_key(dialog, value)+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog).not_to_be_visible()+ dialog = open_provider(page, "nvidia_nim")+ expect(dialog.locator(".api-key-row input")).to_have_count(3)+ for input in dialog.locator(".api-key-row input").all():+ expect(input).to_have_value("")+ assert input.get_attribute("type") == "password"+ handle = dialog.get_by_role("button", name="Move Key 3", exact=True)+ handle.focus()+ handle.press("Space")+ page.keyboard.press("ArrowUp")+ page.keyboard.press("ArrowUp")+ page.keyboard.press("Space")+ expect(dialog.locator(".api-key-number")).to_have_text(["1", "2", "3"])+ dialog.locator(".api-key-row input").nth(1).fill("replacement-secret")+ dialog.get_by_role("button", name="Remove Key 3", exact=True).click()+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog).not_to_be_visible()+ keys = json.loads(+ dotenv_values_from_file(tmp_path / ".fcc/.env")["NVIDIA_NIM_API_KEY"]+ )+ assert keys == ["third-secret", "replacement-secret"]+ page.reload()+ dialog = open_provider(page, "nvidia_nim")+ expect(dialog.locator(".api-key-row input")).to_have_count(2)+ dialog.get_by_role("button", name="Remove Key 1", exact=True).click()+ dialog.get_by_role("button", name="Remove Key 1", exact=True).click()+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog).not_to_be_visible()+ assert "NVIDIA_NIM_API_KEY" not in dotenv_values_from_file(tmp_path / ".fcc/.env")+++def test_adding_row_finishes_move_before_next_keyboard_cancel(+ page: Page, admin_base_url: str, tmp_path+):+ page.goto(admin_base_url + "/admin")+ dialog = open_provider(page, "nvidia_nim")+ add_key(dialog, "draft-first")+ add_key(dialog, "draft-second")+ handle = dialog.get_by_role("button", name="Move Key 1", exact=True)+ handle.press("Space")+ handle.press("ArrowDown")+ add_key(dialog, "draft-third")++ handle = dialog.get_by_role("button", name="Move Key 2", exact=True)+ handle.press("Space")+ handle.press("ArrowUp")+ page.keyboard.press("Escape")+ expect(dialog).to_be_visible()+ inputs = dialog.locator(".api-key-row input")+ expect(inputs).to_have_count(3)+ for input, value in zip(+ inputs.all(), ("draft-second", "draft-first", "draft-third"), strict=True+ ):+ expect(input).to_have_value(value)+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog).not_to_be_visible()+ assert json.loads(+ dotenv_values_from_file(tmp_path / ".fcc/.env")["NVIDIA_NIM_API_KEY"]+ ) == ["draft-second", "draft-first", "draft-third"]+ dialog = open_provider(page, "nvidia_nim")+ expect(dialog.locator(".api-key-row")).to_have_count(3)+ for input in dialog.locator(".api-key-row input").all():+ expect(input).to_have_value("")+++def test_actual_drag_reorders_without_exposing_saved_values(+ page: Page, admin_base_url: str, tmp_path+):+ page.goto(admin_base_url + "/admin")+ dialog = open_provider(page, "nvidia_nim")+ for value in ("drag-first", "drag-second", "drag-third"):+ add_key(dialog, value)+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog).not_to_be_visible()+ dialog = open_provider(page, "nvidia_nim")+ rows = dialog.locator(".api-key-row")+ icon = (+ dialog.get_by_role("button", name="Move Key 1", exact=True)+ .locator("svg")+ .bounding_box()+ )+ assert icon is not None and icon["width"] >= 12 and icon["height"] >= 12+ bounds = rows.last.bounding_box()+ assert bounds is not None+ dialog.get_by_role("button", name="Move Key 1", exact=True).drag_to(+ rows.last, target_position={"x": 10, "y": bounds["height"] - 5}+ )+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog).not_to_be_visible()+ assert json.loads(+ dotenv_values_from_file(tmp_path / ".fcc/.env")["NVIDIA_NIM_API_KEY"]+ ) == ["drag-second", "drag-third", "drag-first"]+++def test_blank_duplicates_and_cancel_preserve_the_whole_draft(+ page: Page, admin_base_url: str+):+ page.goto(admin_base_url + "/admin")+ dialog = open_provider(page, "nvidia_nim")+ add_key(dialog, "same-key")+ add_key(dialog, " same-key ")+ add_key(dialog, " ")+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog.locator('.api-key-row input[aria-invalid="true"]')).to_have_count(3)+ expect(dialog.locator(".api-key-row input").first).to_be_focused()+ close_provider(page)+ dialog = open_provider(page, "nvidia_nim")+ expect(dialog.locator(".api-key-row")).to_have_count(0)+ expect(page.locator("#saveProvider")).to_be_disabled()+++def test_warning_save_refreshes_masks_and_is_clean_then_rechecks_retained_rows(+ page: Page, admin_base_url: str, monkeypatch, tmp_path+):+ checked = []++ async def warnings(settings, submissions):+ checked.append([key.get_secret_value() for key in submissions[0].credentials])+ return tuple(+ CredentialCheck(+ submission.key,+ CredentialStatus.UNVERIFIED if index else CredentialStatus.VERIFIED,+ "Verification timed out." if index else "Accepted.",+ index,+ submission.provider_id,+ )+ for submission in submissions+ for index, _ in enumerate(submission.credentials)+ )++ monkeypatch.setattr(+ "free_claude_code.runtime.application.check_credentials", warnings+ )+ page.goto(admin_base_url + "/admin")+ page.locator("#field-HTTP_READ_TIMEOUT").fill("181")+ dialog = open_provider(page, "nvidia_nim")+ add_key(dialog, "warning-first")+ add_key(dialog, "warning-second")+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog.locator("#providerMessage")).to_contain_text("Saved")+ expect(dialog.locator(".api-key-result").nth(1)).to_contain_text("timed out")+ expect(page.locator("#saveProvider")).to_be_disabled()+ expect(dialog.locator(".api-key-row input").nth(1)).to_have_value("")+ dialog.locator("#field-NVIDIA_NIM_PROXY").fill("http://localhost:8888")+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(page.locator("#saveProvider")).to_be_disabled()+ assert checked == [+ ["warning-first", "warning-second"],+ ["warning-first", "warning-second"],+ ]+ expect(page.locator("#field-HTTP_READ_TIMEOUT")).to_have_value("181")+ assert "warning-second" not in page.locator("#providerMessage").inner_text()+++ "admin_base_url",+ [{"NVIDIA_NIM_API_KEY": '["locked-one","locked-two"]'}],+ indirect=True,+)+def test_process_owned_list_disables_all_editing_controls(+ page: Page, admin_base_url: str+):+ page.goto(admin_base_url + "/admin")+ dialog = open_provider(page, "nvidia_nim")+ expect(dialog.locator(".api-key-row input")).to_have_count(2)+ for control in dialog.locator(+ ".api-key-editor input, .api-key-editor button"+ ).all():+ expect(control).to_be_disabled()+++def test_conflict_preserves_draft_and_reopening_loads_fresh_references(+ page: Page, admin_base_url: str+):+ page.goto(admin_base_url + "/admin")+ dialog = open_provider(page, "nvidia_nim")+ add_key(dialog, "stale-draft")+ page.route(+ "**/admin/api/config/apply",+ lambda route: route.fulfill(+ status=409, json={"detail": "Configuration changed. Reopen the modal."}+ ),+ )+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog.locator("#providerMessage")).to_contain_text("Reopen")+ expect(dialog.locator(".api-key-row input")).to_have_value("stale-draft")+ expect(page.locator("#saveProvider")).to_be_disabled()+ close_provider(page)+ page.unroute("**/admin/api/config/apply")+ dialog = open_provider(page, "nvidia_nim")+ add_key(dialog, "fresh-draft")+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog).not_to_be_visible()+++ "provider_pair,key",+ [+ (("zai", "zai_api"), "ZAI_API_KEY"),+ (("opencode_zen", "opencode_go"), "OPENCODE_API_KEY"),+ ],+)+def test_either_shared_provider_edits_the_same_ordered_list(+ page: Page, admin_base_url: str, tmp_path, provider_pair, key+):+ page.goto(admin_base_url + "/admin")+ dialog = open_provider(page, provider_pair[0])+ add_key(dialog, "shared-first")+ add_key(dialog, "shared-second")+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog).not_to_be_visible()+ dialog = open_provider(page, provider_pair[1])+ expect(dialog.locator(".api-key-row")).to_have_count(2)+ handle = dialog.get_by_role("button", name="Move Key 2", exact=True)+ handle.press("Space")+ handle.press("ArrowUp")+ page.keyboard.press("Space")+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog).not_to_be_visible()+ assert json.loads(dotenv_values_from_file(tmp_path / ".fcc/.env")[key]) == [+ "shared-second",+ "shared-first",+ ]+++def test_long_list_scrolls_and_escape_cancels_only_the_keyboard_move(+ page: Page, admin_base_url: str, tmp_path+):+ page.set_viewport_size({"width": 1280, "height": 720})+ page.goto(admin_base_url + "/admin")+ dialog = open_provider(page, "nvidia_nim")+ for number in range(33):+ add_key(dialog, f"long-list-key-{number}")+ expect(dialog.locator(".api-key-number").last).to_have_text("33")+ assert dialog.evaluate("element => element.scrollHeight > element.clientHeight")+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog).not_to_be_visible()+ assert (+ len(+ json.loads(+ dotenv_values_from_file(tmp_path / ".fcc/.env")["NVIDIA_NIM_API_KEY"]+ )+ )+ == 33+ )+ dialog = open_provider(page, "nvidia_nim")+ handle = dialog.get_by_role("button", name="Move Key 33", exact=True)+ handle.press("Space")+ handle.press("ArrowUp")+ page.keyboard.press("Escape")+ expect(dialog).to_be_visible()+ expect(page.locator("#saveProvider")).to_be_disabled()+ dialog.get_by_role("button", name="Cancel", exact=True).scroll_into_view_if_needed()+ expect(dialog.get_by_role("button", name="Cancel", exact=True)).to_be_in_viewport()+++def test_custom_warning_save_and_rename_retain_masked_rows(+ page: Page, admin_base_url: str, monkeypatch, tmp_path+):+ async def unavailable(settings, submissions):+ return tuple(+ CredentialCheck(+ submission.key,+ CredentialStatus.UNVERIFIED,+ "Verification unavailable.",+ index,+ submission.provider_id,+ )+ for submission in submissions+ for index, _ in enumerate(submission.credentials)+ )++ monkeypatch.setattr(+ "free_claude_code.runtime.application.check_credentials", unavailable+ )+ page.goto(admin_base_url + "/admin")+ page.get_by_role("button", name="Add provider", exact=True).click()+ dialog = page.locator("#providerDialog")+ dialog.get_by_label("Name", exact=True).fill("Warning gateway")+ dialog.get_by_label("Base URL", exact=True).fill("https://gateway.example/v1")+ dialog.get_by_label("Model IDs", exact=True).fill("one")+ add_key(dialog, "custom-first")+ add_key(dialog, "custom-second")+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog.locator("#providerMessage")).to_contain_text("Saved")+ expect(dialog.locator(".api-key-result").last).to_contain_text("unavailable")+ expect(page.locator("#saveProvider")).to_be_disabled()+ dialog.get_by_label("Name", exact=True).fill("Renamed gateway")+ with page.expect_response("**/admin/api/config/apply") as saved:+ dialog.get_by_role("button", name="Save", exact=True).click()+ assert saved.value.json()["applied"] is True+ expect(dialog.locator("#providerMessage")).to_contain_text("Saved")+ expect(page.locator("#saveProvider")).to_be_disabled()+ expect(dialog).to_have_attribute("open", "")+ definitions = json.loads(+ dotenv_values_from_file(tmp_path / ".fcc/.env")["FCC_CUSTOM_PROVIDERS"]+ )+ assert definitions[0]["display_name"] == "Renamed gateway"+ assert definitions[0]["api_keys"] == ["custom-first", "custom-second"]+++def test_saved_warning_followed_by_reload_failure_requires_fresh_masks(+ page: Page, admin_base_url: str, monkeypatch+):+ async def unavailable(settings, submissions):+ return tuple(+ CredentialCheck(+ submission.key,+ CredentialStatus.UNVERIFIED,+ "Verification unavailable.",+ index,+ submission.provider_id,+ )+ for submission in submissions+ for index, _ in enumerate(submission.credentials)+ )++ monkeypatch.setattr(+ "free_claude_code.runtime.application.check_credentials", unavailable+ )+ page.goto(admin_base_url + "/admin")+ dialog = open_provider(page, "nvidia_nim")+ add_key(dialog, "saved-before-reload-failed")+ page.route(+ "**/admin/api/config",+ lambda route: route.fulfill(status=503, json={"detail": "Reload unavailable"}),+ )+ dialog.get_by_role("button", name="Save", exact=True).click()+ expect(dialog.locator("#providerMessage")).to_contain_text(+ "could not reload settings"+ )+ expect(page.locator("#saveProvider")).to_be_disabled()+ expect(dialog.locator(".api-key-row input")).to_have_value(+ "saved-before-reload-failed"+ )+ close_provider(page)+ page.unroute("**/admin/api/config")+ dialog = open_provider(page, "nvidia_nim")+ expect(dialog.locator(".api-key-row input")).to_have_count(1)+ expect(dialog.locator(".api-key-row input")).to_have_value("")+ expect(page.locator("#saveProvider")).to_be_disabled()diff --git a/e2e/test_code_sessions.py b/e2e/test_code_sessions.pyindex 02fd34f5..d4fddd22 100644--- a/e2e/test_code_sessions.py+++ b/e2e/test_code_sessions.py@@ -6,7 +6,7 @@ import pytestfrom playwright.sync_api import expectfrom e2e.form_support import assert_autofill_opt_out-from e2e.provider_support import open_provider+from e2e.provider_support import api_key_input, open_providerfrom free_claude_code.application.code_sessions.models import (HarnessEvent,PromptRequest,@@ -1521,7 +1521,7 @@ def test_hidden_code_removal_preserves_providers_and_deleted_history(providers_url = f"{admin_base_url}/admin"expect(page).to_have_url(providers_url)open_provider(page, "mistral")- field = page.locator("#field-MISTRAL_API_KEY")+ field = api_key_input(page, "MISTRAL_API_KEY")field.fill("Keep this provider edit")field.evaluate("input => input.setSelectionRange(2, 7)")history_length = page.evaluate("history.length")diff --git a/e2e/test_connected_accounts.py b/e2e/test_connected_accounts.pyindex b08c8b53..37a6df6d 100644--- a/e2e/test_connected_accounts.py+++ b/e2e/test_connected_accounts.py@@ -5,7 +5,7 @@ import timeimport pytestfrom playwright.sync_api import Dialog, Page, Route, expect-from e2e.provider_support import open_provider+from e2e.provider_support import api_key_input, open_providerfrom free_claude_code.application.connected_accounts import (ConnectedAccountLoginMode,ConnectedAccountState,@@ -298,7 +298,7 @@ def test_connected_counts_and_modes_survive_apply_and_disconnect_independently()_open(page, admin_base_url)open_provider(page, "nvidia_nim")- page.locator("#field-NVIDIA_NIM_API_KEY").fill("unused-test-key")+ api_key_input(page, "NVIDIA_NIM_API_KEY").fill("unused-test-key")page.get_by_role("button", name="Save", exact=True).click()expect(page.locator("#providerDialog")).not_to_be_visible()expect(page.locator("#messageArea")).to_have_text("Applied")@@ -458,6 +458,7 @@ def test_slow_initial_account_check_does_not_erase_a_later_save_warning("applied": True,"credential_checks": [{+ "index": 0,"key": "NVIDIA_NIM_API_KEY","status": "unverified","message": "Verification unavailable.",@@ -471,7 +472,7 @@ def test_slow_initial_account_check_does_not_erase_a_later_save_warning(pending = accounts.take_pending_status(page)assert not accounts.pending_statusaccounts.hold_status.clear()- dialog.locator("#field-NVIDIA_NIM_API_KEY").fill("new-key")+ api_key_input(page, "NVIDIA_NIM_API_KEY").fill("new-key")dialog.get_by_role("button", name="Save", exact=True).click()expect(page.locator("#messageArea")).to_contain_text("Verification unavailable.")with page.expect_response("**/admin/api/providers/github_copilot/auth") as response:diff --git a/e2e/test_custom_providers.py b/e2e/test_custom_providers.pyindex 3ef6fc3c..7f7e7530 100644--- a/e2e/test_custom_providers.py+++ b/e2e/test_custom_providers.py@@ -3,6 +3,8 @@import pytestfrom playwright.sync_api import Page, expect+from e2e.provider_support import api_key_input+@pytest.fixture(autouse=True)def no_page_errors(page: Page):@@ -17,7 +19,7 @@ def add_provider(page: Page, name: str) -> str:dialog = page.locator("#providerDialog")dialog.get_by_label("Name", exact=True).fill(name)dialog.get_by_label("Base URL", exact=True).fill("https://gateway.example/team/v1")- dialog.get_by_label("API key", exact=True).fill("example-custom-key")+ api_key_input(page, "api_keys").fill("example-custom-key")dialog.get_by_label("Model IDs", exact=True).fill("org/model-one\nmodel-two")page.locator("#saveProvider").click()expect(dialog).not_to_be_visible()@@ -43,7 +45,7 @@ def test_custom_provider_save_rename_and_remove_preserve_unrelated_draft(expect(card.locator(".provider-check-result")).to_have_text("2 models available")card.get_by_role("button", name="Edit", exact=True).click()dialog = page.locator("#providerDialog")- expect(dialog.get_by_label("API key", exact=True)).to_have_value("")+ expect(api_key_input(page, "api_keys")).to_have_value("")dialog.get_by_label("Name", exact=True).fill("Renamed gateway")page.locator("#saveProvider").click()expect(dialog).not_to_be_visible()diff --git a/e2e/test_progressive_startup.py b/e2e/test_progressive_startup.pyindex 5a3a6200..e65552c1 100644--- a/e2e/test_progressive_startup.py+++ b/e2e/test_progressive_startup.py@@ -1,6 +1,6 @@from playwright.sync_api import expect-from e2e.provider_support import close_provider, open_provider+from e2e.provider_support import api_key_input, close_provider, open_providerfrom e2e.test_code_sessions import create_session@@ -42,7 +42,7 @@ def test_provider_and_messaging_progress_preserve_settings(page, admin_base_url))page.get_by_role("button", name="Providers", exact=True).click()open_provider(page, "nvidia_nim")- key = page.locator("#field-NVIDIA_NIM_API_KEY")+ key = api_key_input(page, "NVIDIA_NIM_API_KEY")key.fill("unsaved-key")starting = Falsepage.wait_for_function("state.startup?.startup?.providers?.open_router === 'ready'")diff --git a/e2e/test_provider_modals.py b/e2e/test_provider_modals.pyindex 6f6c88eb..9eba7610 100644--- a/e2e/test_provider_modals.py+++ b/e2e/test_provider_modals.py@@ -3,7 +3,7 @@import pytestfrom playwright.sync_api import Page, Route, expect-from e2e.provider_support import close_provider, open_provider+from e2e.provider_support import api_key_input, close_provider, open_providerdef test_provider_titles_link_to_websites_and_every_logo_loads(@@ -137,10 +137,10 @@ def test_modal_groups_all_provider_fields_and_discards_cancelled_edits() -> None:page.goto(f"{admin_base_url}/admin")dialog = open_provider(page, "azure_openai")- for key in ("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_BASE_URL", "AZURE_OPENAI_PROXY"):+ for key in ("AZURE_OPENAI_BASE_URL", "AZURE_OPENAI_PROXY"):expect(dialog.locator(f"#field-{key}")).to_be_visible()expect(dialog.locator("#field-NVIDIA_NIM_API_KEY")).to_have_count(0)- dialog.locator("#field-AZURE_OPENAI_API_KEY").fill("cancelled-key")+ api_key_input(page, "AZURE_OPENAI_API_KEY").fill("cancelled-key")expect(page.locator("#saveProvider")).to_be_enabled()if dismiss == "close":close_provider(page)@@ -154,17 +154,19 @@ def test_modal_groups_all_provider_fields_and_discards_cancelled_edits().to_be_focused()expect(page.locator("#dirtyState")).to_have_text("No changes")dialog = open_provider(page, "azure_openai")- expect(dialog.locator("#field-AZURE_OPENAI_API_KEY")).to_have_value("")+ expect(dialog.locator(".api-key-row")).to_have_count(0)@pytest.mark.parametrize("restart", [False, True])def test_modal_save_applies_only_its_changes_and_preserves_other_page_edits(page: Page, admin_base_url: str, restart: bool) -> None:- submissions: list[object] = []+ submissions: list[dict] = []def save(route: Route) -> None:- submissions.append(route.request.post_data_json)+ payload = route.request.post_data_json+ assert isinstance(payload, dict)+ submissions.append(payload)route.fulfill(json={"applied": True,@@ -191,11 +193,15 @@ def test_modal_save_applies_only_its_changes_and_preserves_other_page_edits(model.fill("open_router/pending-model")page.get_by_role("button", name="Providers", exact=True).click()dialog = open_provider(page, "nvidia_nim")- dialog.locator("#field-NVIDIA_NIM_API_KEY").fill("new-key")+ api_key_input(page, "NVIDIA_NIM_API_KEY").fill("new-key")dialog.get_by_role("button", name="Save", exact=True).click()expect(dialog).not_to_be_visible()expect(page.locator("#messageArea")).to_have_text("Applied")- assert submissions == [{"values": {"NVIDIA_NIM_API_KEY": "new-key"}}]+ assert len(submissions) == 1+ assert set(submissions[0]["values"]) == {"NVIDIA_NIM_API_KEY"}+ assert submissions[0]["values"]["NVIDIA_NIM_API_KEY"]["entries"] == [+ {"value": "new-key"}+ ]expect(page.locator("#dirtyState")).to_have_text("1 unsaved change")page.get_by_role("button", name="Model Config", exact=True).click()expect(model).to_have_value("open_router/pending-model")diff --git a/smoke/lib/config.py b/smoke/lib/config.pyindex e5f7d6cf..9310a34d 100644--- a/smoke/lib/config.py+++ b/smoke/lib/config.py@@ -5,6 +5,7 @@ from collections.abc import Mappingfrom dataclasses import dataclassfrom pathlib import Path+from free_claude_code.config.api_keys import api_key_values, normalize_api_keysfrom free_claude_code.config.loader import clear_settings_cache, get_settingsfrom free_claude_code.config.model_refs import parse_model_name, parse_provider_typefrom free_claude_code.config.provider_catalog import (@@ -450,10 +451,27 @@ def redacted(value: str, env: Mapping[str, str] | None = None) -> str:return valuesource = env if env is not None else os.environ- result = value+ credential_keys = {+ descriptor.credential_env+ for descriptor in PROVIDER_CATALOG.values()+ if descriptor.credential_env+ }+ replacements: dict[str, str] = {}for key, secret in source.items():if not secret or len(secret) < 4:continueif any(part in key.upper() for part in SECRET_KEY_PARTS):- result = result.replace(secret, f"<redacted:{key}>")+ marker = f"<redacted:{key}>"+ replacements.setdefault(secret, marker)+ if key in credential_keys:+ try:+ entries = api_key_values(normalize_api_keys(secret))+ except ValueError:+ continue # Error reporting still masks the complete raw value.+ for entry in entries:+ if len(entry) >= 4:+ replacements.setdefault(entry, marker)+ result = value+ for secret in sorted(replacements, key=len, reverse=True):+ result = result.replace(secret, replacements[secret])return resultdiff --git a/smoke/prereq/test_voice_prereq_live.py b/smoke/prereq/test_voice_prereq_live.pyindex b5055bfd..b7bc0fab 100644--- a/smoke/prereq/test_voice_prereq_live.py+++ b/smoke/prereq/test_voice_prereq_live.py@@ -5,6 +5,7 @@ from pathlib import Pathimport pytest+from free_claude_code.config.api_keys import first_api_keyfrom free_claude_code.messaging.transcription import TranscriptionServicefrom free_claude_code.messaging.voice import Transcriberfrom free_claude_code.providers.nvidia_nim.voice import NvidiaNimTranscriber@@ -26,7 +27,7 @@ async def test_voice_transcription_backend_when_explicitly_enabled(_write_tone_wav(wav_path)transcriber: Transcriberif smoke_config.settings.whisper_device == "nvidia_nim":- api_key = smoke_config.settings.nvidia_nim_api_key+ api_key = first_api_key(smoke_config.settings.nvidia_nim_api_keys)if api_key is None:pytest.skip("NVIDIA_NIM_API_KEY is required")transcriber = NvidiaNimTranscriber(@@ -37,7 +38,9 @@ async def test_voice_transcription_backend_when_explicitly_enabled(transcriber = TranscriptionService(model=smoke_config.settings.whisper_model,device=smoke_config.settings.whisper_device,- huggingface_api_key=smoke_config.settings.huggingface_api_key,+ huggingface_api_key=first_api_key(+ smoke_config.settings.huggingface_api_keys+ ),)try:text = await transcriber.transcribe(wav_path)diff --git a/smoke/product/test_codex_modes_product_live.py b/smoke/product/test_codex_modes_product_live.pyindex 046c80d7..90f2f54f 100644--- a/smoke/product/test_codex_modes_product_live.py+++ b/smoke/product/test_codex_modes_product_live.py@@ -18,6 +18,7 @@ from typing import Anyimport httpximport pytest+from free_claude_code.config.api_keys import first_api_keyfrom free_claude_code.config.env_migrations import (atomic_write_managed_config,settings_env_keys,@@ -601,7 +602,7 @@ def test_codex_modes_free_provider_e2e()descriptor = PROVIDER_CATALOG[provider]assert descriptor.credential_attr and descriptor.credential_env- key = getattr(smoke_config.settings, descriptor.credential_attr)+ key = first_api_key(getattr(smoke_config.settings, descriptor.credential_attr))if not key:pytest.skip("missing_env: OpenRouter key is unavailable")env, unset = _environment(tmp_path, model)diff --git a/smoke/product/test_voice_product_live.py b/smoke/product/test_voice_product_live.pyindex e0feaf1c..f11820eb 100644--- a/smoke/product/test_voice_product_live.py+++ b/smoke/product/test_voice_product_live.py@@ -3,6 +3,7 @@ from pathlib import Pathimport pytest+from free_claude_code.config.api_keys import first_api_keyfrom free_claude_code.messaging.transcription import TranscriptionServicefrom free_claude_code.providers.nvidia_nim.voice import NvidiaNimTranscriberfrom smoke.lib.config import SmokeConfig@@ -28,7 +29,7 @@ async def test_voice_local_backend_e2e(transcriber = TranscriptionService(model=smoke_config.settings.whisper_model,device=smoke_config.settings.whisper_device,- huggingface_api_key=smoke_config.settings.huggingface_api_key,+ huggingface_api_key=first_api_key(smoke_config.settings.huggingface_api_keys),)try:text = await transcriber.transcribe(wav_path)@@ -50,7 +51,7 @@ async def test_voice_nim_backend_e2e(smoke_config: SmokeConfig, tmp_path: Path)pytest.skip("missing_env: set FCC_SMOKE_RUN_VOICE=1 to run voice product smoke")if smoke_config.settings.whisper_device != "nvidia_nim":pytest.skip("missing_env: WHISPER_DEVICE must be nvidia_nim")- api_key = smoke_config.settings.nvidia_nim_api_key+ api_key = first_api_key(smoke_config.settings.nvidia_nim_api_keys)if api_key is None:pytest.skip("missing_env: NVIDIA_NIM_API_KEY is required")diff --git a/src/free_claude_code/api/admin_routes.py b/src/free_claude_code/api/admin_routes.pyindex 1d2c6e66..fdb284ed 100644--- a/src/free_claude_code/api/admin_routes.py+++ b/src/free_claude_code/api/admin_routes.py@@ -23,6 +23,7 @@ from free_claude_code.application.model_catalog import read_model_catalogfrom free_claude_code.application.model_metadata import ProviderModelRefreshResultfrom free_claude_code.config.admin.custom_providers import CustomProviderMutationfrom free_claude_code.config.admin.manifest import FIELD_BY_KEY+from free_claude_code.config.errors import ConfigConflictErrorfrom free_claude_code.config.provider_catalog import (PROVIDER_CATALOG,ProviderAuthKind,@@ -56,6 +57,7 @@ _ADMIN_ASSET_FILENAMES = frozenset("session_layout.css","session_ui.js","model_combobox.js",+ "api_key_editor.js",*(f"providers/{provider.logo_filename}"for provider in PROVIDER_CATALOG.values()@@ -75,7 +77,7 @@ _LOCAL_PROVIDER_CHECK_FAILURE_MESSAGE = (class AdminConfigPayload(BaseModel):"""Partial config update submitted by the admin UI."""- values: JsonObject = Field(default_factory=dict)+ values: JsonObject = Field(default_factory=dict, repr=False)custom_provider: CustomProviderMutation | None = None@@ -137,12 +139,14 @@ async def apply_admin_config(services: ApiServices = Depends(get_services),):require_loopback_admin(request)- if payload.custom_provider is not None:- return await services.admin.apply_admin_config(- _filtered_values(payload.values), payload.custom_provider- )- result = await services.admin.apply_admin_config(_filtered_values(payload.values))- return result+ try:+ if payload.custom_provider is not None:+ return await services.admin.apply_admin_config(+ _filtered_values(payload.values), payload.custom_provider+ )+ return await services.admin.apply_admin_config(_filtered_values(payload.values))+ except ConfigConflictError as exc:+ raise HTTPException(status_code=409, detail=str(exc)) from None@router.get("/admin/api/status")diff --git a/src/free_claude_code/api/admin_static/admin.css b/src/free_claude_code/api/admin_static/admin.cssindex 8f2e1b26..ce57aa8d 100644--- a/src/free_claude_code/api/admin_static/admin.css+++ b/src/free_claude_code/api/admin_static/admin.css@@ -365,6 +365,19 @@ button.startup-busy::before,.provider-dialog .message-area:empty { display: none; }.provider-dialog-footer { display: flex; justify-content: flex-end; gap: 12px; margin-top: 24px; }+.api-key-editor { display: flex; flex-direction: column; gap: 12px; }+.api-key-rows { display: flex; flex-direction: column; gap: 12px; }+.api-key-row { display: grid; grid-template-columns: 32px 20px minmax(0, 1fr) auto; align-items: center; gap: 8px; }+.api-key-row .api-key-handle { cursor: grab; padding: 6px; }+.api-key-handle svg { display: block; flex-shrink: 0; width: 16px; height: 20px; }+.api-key-number { color: var(--muted); text-align: center; font-size: 13px; }+.api-key-row .api-key-remove { padding: 9px 12px; }+.api-key-row.dragging { opacity: .5; }+.api-key-add { align-self: flex-start; }+.api-key-result { grid-column: 3 / -1; font-size: 13px; line-height: 1.5; }+.field-warning { color: var(--warn); }+.api-key-editor .sr-only { position: absolute; width: 1px; height: 1px; overflow: hidden; clip-path: inset(50%); white-space: nowrap; }+.provider-title {display: flex;align-items: center;diff --git a/src/free_claude_code/api/admin_static/admin.js b/src/free_claude_code/api/admin_static/admin.jsindex b75bf4e0..4bc5c582 100644--- a/src/free_claude_code/api/admin_static/admin.js+++ b/src/free_claude_code/api/admin_static/admin.js@@ -12,6 +12,7 @@ const state = {providerChecks: new Map(),providerId: null,customProvider: null,+ configRefreshRequired: false,modelLabels: new Map(),localStatusRequest: null,startup: null,@@ -216,6 +217,7 @@ async function load({ providersOnly = false } = {}) {config.custom_providers ||= [];config.provider_status.push(...config.custom_providers.map((provider) => ({ ...provider, kind: "custom", status: "configured", settings_keys: [], missing_configuration_keys: [] })));state.config = config;+ state.configRefreshRequired = false;window.CodeSessions.setProviderNames(config.custom_providers);state.startup = null;state.fields = new Map(config.fields.map((field) => [field.key, field]));@@ -429,7 +431,14 @@ function updateProviderCard(provider) {renderProviderCheckResult(provider.provider_id);}-function openProviderDialog(providerId) {+async function refreshProviderConfig() {+ if (!state.configRefreshRequired) return true;+ try { await load({ providersOnly: true }); return true; }+ catch (error) { showMessage(`Could not reload settings: ${error.message}`, "error"); return false; }+}++async function openProviderDialog(providerId) {+ if (!await refreshProviderConfig()) return;if (connectedAccountDescriptor(providerId)?.kind === "custom") return openCustomProviderDialog(providerId);state.customProvider = null;state.providerId = providerId;@@ -454,9 +463,12 @@ function openProviderDialog(providerId) {});renderProviderDialogActions(provider);updateDirtyState();- byId("providerDialog").showModal();+ if (!byId("providerDialog").open) byId("providerDialog").showModal();const missing = provider.missing_configuration_keys?.[0];- const first = missing ? byId(`field-${missing}`) : fields.querySelector("input:not(:disabled), select:not(:disabled), textarea:not(:disabled)");+ const target = missing ? byId(`field-${missing}`) : null;+ const first = target?.dataset.fieldType === "api_key_list"+ ? target.closest(".api-key-editor").querySelector("input:not([type=hidden]):not(:disabled), button:not(:disabled)")+ : target || fields.querySelector("input:not([type=hidden]):not(:disabled), select:not(:disabled), textarea:not(:disabled), button:not(:disabled)");first?.focus();}@@ -466,9 +478,10 @@ const CUSTOM_LABELS = {native_responses: "Native reasoning", messages_manual: "Token-budget thinking", messages_adaptive: "Adaptive thinking",};-function openCustomProviderDialog(providerId = null) {+async function openCustomProviderDialog(providerId = null) {+ if (!await refreshProviderConfig()) return;const provider = state.config.custom_providers.find((item) => item.provider_id === providerId) || {- display_name: "", base_url: "", api_key: null, api_format: "openai_chat", reasoning_format: "provider_default", reasoning_history_format: "disabled", model_ids: [],+ display_name: "", base_url: "", api_keys: { revision: null, entries: [] }, api_format: "openai_chat", reasoning_format: "provider_default", reasoning_history_format: "disabled", model_ids: [],};state.providerId = providerId || "__custom_new__";state.customProvider = provider;@@ -481,7 +494,7 @@ function openCustomProviderDialog(providerId = null) {const definitions = [["display_name", "Name", "string", [], ""],["base_url", "Base URL", "string", [], "Include the API path, for example https://gateway.example/v1."],- ["api_key", "API key", "secret", [], "Optional for endpoints that do not require a key."],+ ["api_keys", "API keys", "api_key_list", [], "Key 1 is used. Leave the list empty for endpoints that do not require a key."],["api_format", "API format", "select", [["openai_chat", "Chat Completions"], ["openai_responses", "Responses"], ["anthropic_messages", "Anthropic Messages"]], "Select the API exposed by your endpoint."],["reasoning_format", "Reasoning format", "select", formats.map((value) => [value, CUSTOM_LABELS[value]]), "How FCC sends reasoning controls. Provider default leaves computation to the upstream."],["reasoning_history_format", "Reasoning history format", "select", [["disabled", "Text context"], ["reasoning_content", "reasoning_content"], ["reasoning", "reasoning"], ["think_tags", "Think tags"]], "How previous reasoning is sent to a Chat Completions endpoint."],@@ -489,8 +502,8 @@ function openCustomProviderDialog(providerId = null) {];for (const [key, label, type, options, description] of definitions) {fields.appendChild(renderField({ key, label, type, options: options.map(([value, label]) => ({value, label})), description,- value: key === "model_ids" ? provider.model_ids.join("\n") : provider[key], nullable: key === "api_key", secret: key === "api_key",- configured: key === "api_key" && !!provider.api_key, locked: !!state.config.custom_providers_locked, source: "managed_env" }));+ value: key === "model_ids" ? provider.model_ids.join("\n") : provider[key], nullable: key === "api_keys", secret: key === "api_keys",+ configured: key === "api_keys" && !!provider.api_keys?.entries.length, locked: !!state.config.custom_providers_locked, source: state.config.custom_providers_locked ? "process" : "managed_env" }));}const format = byId("field-api_format");const reasoning = byId("field-reasoning_format");@@ -518,7 +531,7 @@ function openCustomProviderDialog(providerId = null) {}byId("saveProvider").hidden = false;updateDirtyState();- byId("providerDialog").showModal();+ if (!byId("providerDialog").open) byId("providerDialog").showModal();byId("field-display_name").focus();}@@ -914,6 +927,20 @@ function renderField(field) {label.appendChild(sourceEl);}+ if (field.type === "api_key_list") {+ label.id = `field-${field.key}-label`;+ label.removeAttribute("for");+ const editor = new window.FccApiKeyEditor(field, updateDirtyState);+ wrapper.append(label, editor.element);+ if (field.description) {+ const description = document.createElement("div");+ description.className = "field-description";+ description.textContent = field.description;+ wrapper.appendChild(description);+ }+ return wrapper;+ }+const input = window.FccFormControls.configure(inputForField(field));input.id = `field-${field.key}`;input.dataset.key = field.key;@@ -929,6 +956,7 @@ function renderField(field) {input.addEventListener("input", () => {input.dataset.remove = "false";clearCredentialError(input);+ if (state.providerId) credentialEditors().forEach((editor) => editor.clearResults());});if (field.type === "optional_model") {input.addEventListener("blur", () => {@@ -1261,6 +1289,7 @@ function option(value, label) {}function readFieldValue(input) {+ if (input.dataset.fieldType === "api_key_list") return JSON.parse(input.value);if (input.type === "checkbox") return input.checked ? "true" : "false";if (input.dataset.remove === "true") return null;if (@@ -1277,6 +1306,7 @@ function readFieldValue(input) {}function comparableValue(value) {+ if (value !== null && typeof value === "object") return JSON.stringify(value);return value === null ? NULL_VALUE : String(value);}@@ -1297,7 +1327,7 @@ function updateDirtyState() {byId("dirtyState").textContent =state.restart ? "Changes saved" : count === 0 ? "No changes" : `${count} unsaved change${count === 1 ? "" : "s"}`;byId("applyButton").disabled = state.applying || (!state.restart && count === 0);- byId("saveProvider").disabled = state.applying || !!state.restart || !Object.keys(changedValues(byId("providerFields"))).length;+ byId("saveProvider").disabled = state.applying || !!state.restart || state.configRefreshRequired || !Object.keys(changedValues(byId("providerFields"))).length;}function clearCredentialError(input) {@@ -1306,9 +1336,21 @@ function clearCredentialError(input) {input.removeAttribute("aria-describedby");}-function showCredentialErrors(checks) {+function credentialEditors() {+ return [...byId("providerFields").querySelectorAll(".api-key-editor")].map((element) => element.apiKeyEditor);+}++function showCredentialErrors(checks, rowErrors = []) {let first = null;- checks.forEach((check) => {+ [...rowErrors.map((error) => ({ ...error, status: "rejected" })), ...checks].forEach((check) => {+ const editor = credentialEditors().find((editor) => editor.field.key === check.key);+ if (editor) {+ if (check.status === "rejected" || check.status === "unverified") {+ const input = editor.showResult(check.index, check.message, check.status === "rejected");+ if (check.status === "rejected") first ||= input;+ }+ return;+ }const input = byId(`field-${check.key}`);if (!input) return;clearCredentialError(input);@@ -1335,6 +1377,7 @@ function setApplying(applying) {byId("closeProviderDialog").disabled = applying;byId("cancelProviderDialog").disabled = applying;byId("saveProvider").textContent = applying ? "Saving…" : "Save";+ byId("saveProvider").classList.toggle("startup-busy", applying);byId("saveProvider").setAttribute("aria-busy", String(applying));byId("applyButton").textContent = state.restart? applying ? "Reconnecting…" : "Reconnect"@@ -1378,7 +1421,7 @@ async function reconnectAfterRestart() {state.startupRequest?.controller.abort();state.startupRequest = null;state.startupAgain = false;- const { restart, warnings, providersOnly } = state.restart;+ const { restart, warnings, providersOnly, providerId, checks } = state.restart;const target = new URL(restart.admin_url || "/admin", window.location.href);setApplying(true);showMessage(["Applied. Reconnecting to the server…", ...warnings].join("\n"), warnings.length ? "warn" : "ok");@@ -1386,7 +1429,7 @@ async function reconnectAfterRestart() {await waitForRestart(restart, target);if (target.origin !== window.location.origin) {// Carry only the safe warning text across an address change, never edits.- target.hash = new URLSearchParams({ "fcc-applied": JSON.stringify(warnings) }).toString();+ target.hash = new URLSearchParams({ "fcc-applied": JSON.stringify(warnings), ...(providerId ? { "fcc-provider": providerId, "fcc-checks": JSON.stringify(checks) } : {}) }).toString();window.location.replace(target.href);return;}@@ -1394,7 +1437,9 @@ async function reconnectAfterRestart() {state.restart = null;void refreshStartup();showMessage(["Applied", ...warnings].join("\n"), warnings.length ? "warn" : "ok");+ if (providerId) await restoreSavedProvider(providerId, checks);} catch (error) {+ state.configRefreshRequired = true;showMessage([`Settings were saved. ${error.message} Use Reconnect to try again.`, ...warnings].join("\n"), "warn");appendAdminLink(target);} finally {@@ -1402,44 +1447,71 @@ async function reconnectAfterRestart() {}}-function showRestartNotice() {+async function showRestartNotice() {const url = new URL(window.location.href);const fragment = new URLSearchParams(url.hash.slice(1));const notice = fragment.get("fcc-applied");if (notice === null) return;fragment.delete("fcc-applied");+ const providerId = fragment.get("fcc-provider");+ const checks = fragment.get("fcc-checks");+ fragment.delete("fcc-provider");+ fragment.delete("fcc-checks");url.hash = fragment.toString();window.history.replaceState(window.history.state, "", url);try {const warnings = JSON.parse(notice);if (Array.isArray(warnings) && warnings.every((warning) => typeof warning === "string")) {showMessage(["Applied", ...warnings].join("\n"), warnings.length ? "warn" : "ok");+ if (providerId && checks) {+ const parsed = JSON.parse(checks);+ if (Array.isArray(parsed) && parsed.every((check) => check && typeof check.key === "string" && Number.isInteger(check.index) && typeof check.message === "string" && check.status === "unverified")) await restoreSavedProvider(providerId, parsed);+ }}} catch {// A malformed navigation notice must not prevent normal Admin use.}}+async function restoreSavedProvider(providerId, checks) {+ if (!connectedAccountDescriptor(providerId)) return;+ await openProviderDialog(providerId);+ showCredentialErrors(checks);+ byId("providerMessage").textContent = "Saved. Some keys could not be verified.";+ byId("providerMessage").className = "message-area warn";+}+async function apply(providerId = null, customAction = null) {if (state.applying) return;if (state.restart) {await reconnectAfterRestart();return;}+ if (providerId && state.configRefreshRequired) return;const values = changedValues(providerId ? byId("providerFields") : byId("adminViews"));const custom = providerId && state.customProvider;+ const action = customAction || (custom?.provider_id ? "update" : "create");+ if (!Object.keys(values).length && !(custom && action === "delete")) return;+ if (providerId && action !== "delete") {+ let invalid = null;+ for (const editor of credentialEditors()) {+ const input = editor.validate();+ invalid ||= input;+ values[editor.field.key] = editor.payload();+ }+ if (invalid) {+ showMessage("Check the highlighted API key rows.", "error");+ invalid.focus();+ return;+ }+ }let mutation = null;if (custom) {- const action = customAction || (custom.provider_id ? "update" : "create");if ("model_ids" in values) values.model_ids = values.model_ids.split(/\r?\n/).map((id) => id.trim()).filter(Boolean);mutation = { action, values: action === "delete" ? {} : values };if (custom.provider_id) mutation.provider_id = custom.provider_id;}- if (!Object.keys(values).length && mutation?.action !== "delete") return;- const checkingKeys = Object.keys(values).some((key) => {- const field = state.fields.get(key);- return field?.secret && field.section === "providers" && values[key] !== null;- });+ const checkingKeys = credentialEditors().some((editor) => values[editor.field.key]?.entries.length);let rejectedField = null;let applied = false;setApplying(true);@@ -1451,29 +1523,39 @@ async function apply(providerId = null, customAction = null) {});const checks = result.credential_checks || [];if (!result.applied) {- rejectedField = showCredentialErrors(checks);- showMessage(rejectedField ? "Not applied. Check the highlighted API keys." : result.errors.join("; "), "error");+ rejectedField = showCredentialErrors(checks, result.credential_row_errors || []);+ showMessage(rejectedField ? "Not applied. Check the highlighted API keys." : (result.errors || []).join("; "), "error");return;}applied = true;- if (providerId) byId("providerDialog").close();- const warnings = checks.filter((check) => check.status === "unverified").map((check) =>- `${state.fields.get(check.key)?.label || check.key}: ${check.message}`+ const warningChecks = checks.filter((check) => check.status === "unverified");+ const warnings = warningChecks.map((check) =>+ `${state.fields.get(check.key)?.label || "API keys"}, Key ${check.index + 1}: ${check.message}`);+ const savedProviderId = warnings.length && providerId && mutation?.action !== "delete" ? result.custom_provider_id || providerId : null;+ if (providerId && !savedProviderId) byId("providerDialog").close();const restart = result.restart || {};if (restart.required && restart.automatic) {- state.restart = { restart, warnings, providersOnly: !!providerId };+ if (providerId) byId("providerDialog").close();+ state.restart = { restart, warnings, providersOnly: !!providerId, providerId: savedProviderId, checks: warningChecks };await reconnectAfterRestart();return;}const pending = restart.required ? restart.fields || [] : result.pending_fields || [];await load({ providersOnly: !!providerId });+ if (savedProviderId) await restoreSavedProvider(savedProviderId, warningChecks);const message = pending.length? `Applied. Restart fcc-server to use: ${pending.join(", ")}`: "Applied";showMessage([message, ...warnings].join("\n"), warnings.length ? "warn" : "ok");+ if (savedProviderId) {+ byId("providerMessage").textContent = `Saved${pending.length ? ". Restart required" : ""}. Some keys could not be verified.`;+ byId("providerMessage").className = "message-area warn";+ }} catch (error) {+ if (providerId && (applied || error.status === 409 || !error.status || error.status >= 500)) state.configRefreshRequired = true;showMessage(applied ? `Applied, but could not reload settings: ${error.message}` : `Could not apply settings: ${error.message}`, "error");+ if (providerId && state.configRefreshRequired) byId("providerMessage").append(" Close and reopen this modal to load saved settings before saving again.");} finally {setApplying(false);if (rejectedField) {@@ -1481,7 +1563,7 @@ async function apply(providerId = null, customAction = null) {rejectedField.closest(".settings-section")?.classList.add("show-advanced");rejectedField.scrollIntoView({ block: "center", behavior: "instant" });rejectedField.focus();- } else if (providerId && applied) {+ } else if (providerId && applied && !byId("providerDialog").open) {const focus = mutation && mutation.action !== "update"? byId("addCustomProvider"): document.querySelector(`[data-provider="${providerId}"] [data-provider-settings]`);diff --git a/src/free_claude_code/api/admin_static/api_key_editor.js b/src/free_claude_code/api/admin_static/api_key_editor.jsnew file mode 100644index 00000000..c2ac8472--- /dev/null+++ b/src/free_claude_code/api/admin_static/api_key_editor.js@@ -0,0 +1,216 @@+/* Ordered masked credentials. Saved references travel with rows, never positions. */+window.FccApiKeyEditor = class {+ constructor(field, onChange) {+ this.field = field;+ this.onChange = onChange;+ this.revision = field.value?.revision ?? null;+ this.entries = (field.value?.entries || []).map((entry) => ({ reference: entry.reference, value: "" }));+ this.dragged = null;+ this.picked = null;+ this.element = document.createElement("div");+ this.element.className = "api-key-editor";+ this.element.setAttribute("role", "group");+ this.element.setAttribute("aria-labelledby", `field-${field.key}-label`);+ this.element.apiKeyEditor = this;+ this.input = document.createElement("input");+ this.input.type = "hidden";+ this.input.id = `field-${field.key}`;+ this.input.dataset.key = field.key;+ this.input.dataset.fieldType = "api_key_list";+ this.input.disabled = field.locked;+ this.input.value = JSON.stringify(this.payload());+ this.input.dataset.original = this.input.value;+ this.rows = document.createElement("div");+ this.rows.className = "api-key-rows";+ this.rows.addEventListener("dragover", (event) => {+ if (!this.dragged || !this.editable()) return;+ event.preventDefault();+ event.dataTransfer.dropEffect = "move";+ });+ this.rows.addEventListener("drop", (event) => {+ if (!this.dragged || !this.editable()) return;+ event.preventDefault();+ const insertion = [...this.rows.children].findIndex((row) => {+ const bounds = row.getBoundingClientRect();+ return event.clientY < bounds.top + bounds.height / 2;+ });+ const source = this.entries.indexOf(this.dragged);+ const destination = insertion < 0 ? this.entries.length : insertion;+ this.move(this.dragged, destination - (source < destination ? 1 : 0));+ this.dragged = null;+ });+ this.empty = document.createElement("div");+ this.empty.className = "field-description";+ this.empty.textContent = "No keys configured.";+ this.add = this.button("Add key", "Add key", () => {+ if (!this.editable()) return;+ this.picked = null;+ this.entries.push({ value: "" });+ this.changed();+ this.render();+ this.rows.lastElementChild.querySelector("input").focus();+ });+ this.add.className = "secondary-button api-key-add";+ this.announcement = document.createElement("div");+ this.announcement.className = "sr-only";+ this.announcement.setAttribute("aria-live", "polite");+ this.element.append(this.input, this.rows, this.empty, this.add, this.announcement);+ this.render();+ }++ editable() { return !this.field.locked && !this.element.closest("[inert]"); }++ payload() {+ return { revision: this.revision, entries: this.entries.map((entry) =>+ entry.value.trim() || entry.reference === undefined ? { value: entry.value.trim() } : { retain: entry.reference },+ ) };+ }++ changed() {+ this.clearResults();+ this.input.value = JSON.stringify(this.payload());+ this.onChange();+ }++ clearResults() {+ this.rows.querySelectorAll(".api-key-result").forEach((result) => { result.textContent = ""; result.hidden = true; });+ this.rows.querySelectorAll("input").forEach((input) => {+ input.removeAttribute("aria-invalid");+ input.removeAttribute("aria-describedby");+ });+ }++ showResult(index, message, rejected = false) {+ const row = this.rows.children[index];+ if (!row) return null;+ const result = row.querySelector(".api-key-result");+ const input = row.querySelector("input");+ result.textContent = message;+ result.hidden = false;+ result.className = `api-key-result ${rejected ? "field-error" : "field-warning"}`;+ input.setAttribute("aria-describedby", result.id);+ if (rejected) input.setAttribute("aria-invalid", "true");+ return input;+ }++ validate() {+ this.clearResults();+ let first = null;+ const seen = new Map();+ this.entries.forEach((entry, index) => {+ const value = entry.value.trim();+ if (!value && entry.reference === undefined) {+ const input = this.showResult(index, "Enter a key or remove this row.", true);+ first ||= input;+ } else if (value) {+ if (seen.has(value)) {+ const previous = seen.get(value);+ const input = this.showResult(previous, `Duplicates Key ${index + 1}.`, true);+ first ||= input;+ this.showResult(index, `Duplicates Key ${previous + 1}.`, true);+ } else seen.set(value, index);+ }+ });+ return first;+ }++ move(entry, destination) {+ const source = this.entries.indexOf(entry);+ if (source === destination || source < 0) return;+ this.entries.splice(source, 1);+ this.entries.splice(destination, 0, entry);+ this.changed();+ this.render();+ this.rows.children[destination].querySelector(".api-key-handle").focus();+ this.announcement.textContent = `Key moved to position ${destination + 1} of ${this.entries.length}.`;+ }++ keyboard(event, entry) {+ if (!this.editable()) return;+ const index = this.entries.indexOf(entry);+ if (event.key === " " || event.key === "Enter") {+ event.preventDefault();+ if (this.picked) {+ this.picked = null;+ this.announcement.textContent = `Key dropped at position ${index + 1}.`;+ } else {+ this.picked = { entry, order: [...this.entries] };+ this.announcement.textContent = `Picked up Key ${index + 1}. Use arrow keys to move, Space to drop, or Escape to cancel.`;+ }+ } else if (this.picked?.entry === entry && ["ArrowUp", "ArrowDown", "Escape"].includes(event.key)) {+ event.preventDefault();+ event.stopPropagation();+ if (event.key === "Escape") {+ this.entries = this.picked.order;+ this.picked = null;+ this.changed();+ this.render();+ this.rows.children[this.entries.indexOf(entry)].querySelector(".api-key-handle").focus();+ this.announcement.textContent = "Move cancelled.";+ } else this.move(entry, Math.max(0, Math.min(this.entries.length - 1, index + (event.key === "ArrowUp" ? -1 : 1))));+ }+ }++ button(text, label, action) {+ const button = document.createElement("button");+ button.type = "button";+ button.className = "ghost-button";+ button.textContent = text;+ button.setAttribute("aria-label", label);+ button.disabled = !!this.field.locked;+ if (action) button.addEventListener("click", action);+ return button;+ }++ render() {+ this.rows.replaceChildren();+ this.empty.hidden = !!this.entries.length;+ this.entries.forEach((entry, index) => {+ const row = document.createElement("div");+ row.className = "api-key-row";+ const number = document.createElement("span");+ number.className = "api-key-number";+ number.textContent = index + 1;+ const handle = this.button("", `Move Key ${index + 1}`);+ handle.classList.add("api-key-handle");+ handle.innerHTML = '<svg viewBox="0 0 24 24" fill="currentColor" aria-hidden="true"><circle cx="8" cy="6" r="1.5"/><circle cx="16" cy="6" r="1.5"/><circle cx="8" cy="12" r="1.5"/><circle cx="16" cy="12" r="1.5"/><circle cx="8" cy="18" r="1.5"/><circle cx="16" cy="18" r="1.5"/></svg>';+ handle.draggable = !this.field.locked;+ handle.addEventListener("keydown", (event) => this.keyboard(event, entry));+ handle.addEventListener("dragstart", (event) => {+ if (!this.editable()) { event.preventDefault(); return; }+ this.dragged = entry;+ this.picked = null;+ event.dataTransfer.effectAllowed = "move";+ event.dataTransfer.setData("text/plain", "api-key-row");+ row.classList.add("dragging");+ });+ handle.addEventListener("dragend", () => { this.dragged = null; row.classList.remove("dragging"); });+ const input = window.FccFormControls.configure(document.createElement("input"));+ input.id = `field-${this.field.key}-${index + 1}`;+ input.type = "password";+ input.autocomplete = "off";+ input.setAttribute("autocapitalize", "none");+ input.setAttribute("autocorrect", "off");+ input.spellcheck = false;+ input.disabled = !!this.field.locked;+ input.setAttribute("aria-label", `Key ${index + 1}`);+ input.placeholder = entry.reference === undefined ? "Enter API key" : "Configured - enter a new key to replace";+ input.value = entry.value;+ input.addEventListener("input", () => { entry.value = input.value; this.changed(); });+ const remove = this.button("Remove", `Remove Key ${index + 1}`, () => {+ if (!this.editable()) return;+ this.picked = null;+ this.entries.splice(this.entries.indexOf(entry), 1);+ this.changed();+ this.render();+ });+ remove.className = "danger-button api-key-remove";+ const result = document.createElement("div");+ result.id = `${input.id}-result`;+ result.className = "api-key-result";+ result.hidden = true;+ row.append(handle, number, input, remove, result);+ this.rows.appendChild(row);+ });+ }+};diff --git a/src/free_claude_code/api/admin_static/index.html b/src/free_claude_code/api/admin_static/index.htmlindex aba54fe9..c8a3fe23 100644--- a/src/free_claude_code/api/admin_static/index.html+++ b/src/free_claude_code/api/admin_static/index.html@@ -269,6 +269,7 @@</dialog><script src="/admin/assets/__FCC_VERSION__/form_controls.js"></script><script src="/admin/assets/__FCC_VERSION__/model_combobox.js"></script>+ <script src="/admin/assets/__FCC_VERSION__/api_key_editor.js"></script><script src="/admin/assets/__FCC_VERSION__/session_ui.js"></script><script src="/admin/assets/__FCC_VERSION__/code_sessions.js"></script><script src="/admin/assets/__FCC_VERSION__/admin.js"></script>diff --git a/src/free_claude_code/api/app.py b/src/free_claude_code/api/app.pyindex 77c8c67c..f0e7fdb7 100644--- a/src/free_claude_code/api/app.py+++ b/src/free_claude_code/api/app.py@@ -95,6 +95,16 @@ def create_app(services: ApiServices) -> FastAPI:message_summary=message_summary,tool_names=tool_names,)+ if request.url.path == "/admin/api/config/apply":+ return JSONResponse(+ status_code=422,+ content={+ "detail": [+ {key: error[key] for key in ("loc", "msg", "type")}+ for error in exc.errors()+ ]+ },+ )return await request_validation_exception_handler(request, exc)@app.exception_handler(ApplicationError)diff --git a/src/free_claude_code/config/admin/credentials.py b/src/free_claude_code/config/admin/credentials.pynew file mode 100644index 00000000..f1af6f6b--- /dev/null+++ b/src/free_claude_code/config/admin/credentials.py@@ -0,0 +1,137 @@+"""Version-bound masked credential edits shared by both provider editors."""++import hashlib+import hmac+import json+from dataclasses import dataclass, field++from pydantic import SecretStr++from free_claude_code.config.api_keys import ApiKeyList, api_key_values+from free_claude_code.config.errors import ConfigConflictError+from free_claude_code.core.json_types import JsonObject, JsonValue+++@dataclass(frozen=True, slots=True)+class CredentialSubmission:+ key: str+ credentials: ApiKeyList = field(repr=False)+ provider_id: str | None = None+++@dataclass(frozen=True, slots=True)+class CredentialRowError:+ key: str+ index: int+ message: str+ provider_id: str | None = None++ def public(self) -> JsonObject:+ result: JsonObject = {+ "key": self.key,+ "index": self.index,+ "message": self.message,+ }+ if self.provider_id is not None:+ result["provider_id"] = self.provider_id+ return result+++class CredentialEditError(ValueError):+ def __init__(self, errors: list[CredentialRowError]) -> None:+ super().__init__("Check the highlighted API key rows.")+ self.row_errors = tuple(errors)+++def credential_revision(+ owner: str, keys: ApiKeyList, source: str, signing_key: bytes+) -> str:+ payload = json.dumps(+ ["fcc-api-keys-v1", owner, source, api_key_values(keys)],+ ensure_ascii=False,+ separators=(",", ":"),+ ).encode("utf-8")+ return hmac.new(signing_key, payload, hashlib.sha256).hexdigest()+++def credential_projection(+ owner: str, keys: ApiKeyList, source: str, signing_key: bytes+) -> JsonObject:+ return {+ "revision": credential_revision(owner, keys, source, signing_key),+ "entries": [{"reference": index} for index in range(len(keys))],+ }+++def resolve_credential_edit(+ owner: str,+ keys: ApiKeyList,+ source: str,+ submitted: JsonValue,+ signing_key: bytes,+ *,+ key: str,+ provider_id: str | None = None,+ new_owner: bool = False,+) -> ApiKeyList:+ if not isinstance(submitted, dict) or set(submitted) != {"revision", "entries"}:+ raise ValueError(f"{key}: submit an ordered key list with its revision")+ entries, revision = submitted["entries"], submitted["revision"]+ if not isinstance(entries, list):+ raise ValueError(f"{key}: entries must be an array")+ if new_owner:+ if revision is not None:+ raise ValueError(f"{key}: a new provider has no saved credential revision")+ elif not isinstance(revision, str) or not hmac.compare_digest(+ revision.encode("utf-8"),+ credential_revision(owner, keys, source, signing_key).encode("ascii"),+ ):+ raise ConfigConflictError(+ "The API key list changed. Reopen the modal before saving again."+ )+ if source == "process" and entries != [+ {"retain": index} for index in range(len(keys))+ ]:+ raise ValueError(f"{key}: API keys are managed by the process environment")++ errors: dict[int, CredentialRowError] = {}+ values: list[str] = []+ seen: dict[str, list[int]] = {}+ for index, entry in enumerate(entries):+ message = None+ text = ""+ if isinstance(entry, dict) and set(entry) == {"retain"}:+ reference = entry["retain"]+ if (+ new_owner+ or type(reference) is not int+ or not 0 <= reference < len(keys)+ ):+ message = "This saved key reference is invalid."+ else:+ text = keys[reference].get_secret_value()+ elif isinstance(entry, dict) and set(entry) == {"value"}:+ value = entry["value"]+ if not isinstance(value, str):+ message = "Enter an API key as text."+ elif not (text := value.strip()) or text == "********":+ message = "Enter a key or remove this row."+ else:+ message = "A row must retain a saved key or supply a new value."+ if message:+ errors[index] = CredentialRowError(key, index, message, provider_id)+ else:+ seen.setdefault(text, []).append(index)+ values.append(text)+ for positions in seen.values():+ if len(positions) > 1:+ for index in positions:+ errors[index] = CredentialRowError(+ key,+ index,+ "Duplicate API key. Remove one of these rows.",+ provider_id,+ )+ if errors:+ raise CredentialEditError([errors[index] for index in sorted(errors)])+ return tuple(SecretStr(value) for value in values)diff --git a/src/free_claude_code/config/admin/custom_providers.py b/src/free_claude_code/config/admin/custom_providers.pyindex 4486cdef..4de59261 100644--- a/src/free_claude_code/config/admin/custom_providers.py+++ b/src/free_claude_code/config/admin/custom_providers.py@@ -77,10 +77,8 @@ def merge_custom_provider(if "provider_id" in mutation.values:raise ValueError("Provider IDs cannot be edited")changes = dict(mutation.values)- if changes.get("api_key") == "********" or (- isinstance(changes.get("api_key"), str) and not str(changes["api_key"]).strip()- ):- changes.pop("api_key")+ if "api_key" in changes:+ raise ValueError("Use the ordered api_keys editor for credentials")try:definition = CustomProviderDefinition.model_validate(values | changes | {"provider_id": provider_id}diff --git a/src/free_claude_code/config/admin/persistence.py b/src/free_claude_code/config/admin/persistence.pyindex d582cf9c..af85a76f 100644--- a/src/free_claude_code/config/admin/persistence.py+++ b/src/free_claude_code/config/admin/persistence.py@@ -1,9 +1,10 @@"""Sparse managed-config validation, preview, and atomic persistence."""from collections.abc import Mapping-from dataclasses import dataclass+from dataclasses import dataclass, fieldfrom pathlib import Path+from free_claude_code.config.api_keys import ApiKeyList, api_key_values, first_api_keyfrom free_claude_code.config.env_files import (FCC_CONFIG_SCHEMA_ENV,)@@ -12,12 +13,19 @@ from free_claude_code.config.env_migrations import (recognized_env_keys,render_managed_config,)+from free_claude_code.config.errors import ConfigConflictErrorfrom free_claude_code.config.loader import ManagedConfigSnapshotfrom free_claude_code.config.model_refs import normalize_retired_model_settingsfrom free_claude_code.config.provider_proxies import invalid_provider_proxy_keysfrom free_claude_code.config.settings import Settingsfrom free_claude_code.core.json_types import JsonObject+from .credentials import (+ CredentialEditError,+ CredentialRowError,+ CredentialSubmission,+ resolve_credential_edit,+)from .custom_providers import CustomProviderMutation, merge_custom_providerfrom .manifest import FIELD_BY_KEY, FIELDSfrom .state import ConfigInputValue@@ -34,13 +42,16 @@ _PROVIDER_PROXY_ERROR = (class PreparedAdminUpdate:"""Validated Admin update ready for an atomic managed-file commit."""- target_values: dict[str, str]+ target_values: dict[str, str] = field(repr=False)settings: Settings | Noneerrors: tuple[str, ...]pending_fields: tuple[str, ...]path: Path+ expected: ManagedConfigSnapshot = field(repr=False)changed_keys: tuple[str, ...] = ()custom_provider_id: str | None = None+ credential_submissions: tuple[CredentialSubmission, ...] = ()+ credential_row_errors: tuple[CredentialRowError, ...] = ()@propertydef valid(self) -> bool:@@ -50,6 +61,9 @@ class PreparedAdminUpdate:return {"valid": self.valid,"errors": list(self.errors),+ "credential_row_errors": [+ error.public() for error in self.credential_row_errors+ ],"env_preview": render_managed_config(self.target_values,mask_secrets=True,@@ -114,18 +128,23 @@ def pending_restart_fields(active: Settings, prospective: Settings) -> tuple[str_active_voice_credential(active),_active_voice_credential(prospective),}- return tuple(- field.key- for field in FIELDS- if field.settings_attr is not None- and (- field.restart_required- or field.session_sensitive- or field.key in voice_credentials+ pending = []+ for spec in FIELDS:+ if spec.settings_attr is None or not (+ spec.restart_required+ or spec.session_sensitive+ or spec.key in voice_credentials+ ):+ continue+ before, after = (+ getattr(active, spec.settings_attr),+ getattr(prospective, spec.settings_attr),)- and getattr(active, field.settings_attr)- != getattr(prospective, field.settings_attr)- )+ if spec.field_type == "api_key_list":+ before, after = first_api_key(before), first_api_key(after)+ if before != after:+ pending.append(spec.key)+ return tuple(pending)def prepare_admin_update(@@ -133,17 +152,82 @@ def prepare_admin_update(snapshot: ManagedConfigSnapshot,active_settings: Settings,custom_provider: CustomProviderMutation | None = None,+ *,+ revision_key: bytes,) -> PreparedAdminUpdate:"""Validate an update and construct its prospective Settings snapshot."""- update_errors = _update_protocol_errors(updates)- target_values = target_values_with_updates(updates, snapshot)+ resolved = dict(updates)+ row_errors: list[CredentialRowError] = []+ credential_errors: list[str] = []+ submissions: list[CredentialSubmission] = []+ for key, submitted in updates.items():+ spec = FIELD_BY_KEY.get(key)+ if spec is None or spec.field_type != "api_key_list":+ continue+ assert spec.settings_attr is not None+ try:+ keys = resolve_credential_edit(+ key,+ getattr(snapshot.settings, spec.settings_attr),+ snapshot.sources[spec.settings_attr].value,+ submitted,+ revision_key,+ key=key,+ )+ except ConfigConflictError:+ raise+ except ValueError as exc:+ resolved.pop(key)+ credential_errors.append(str(exc))+ if isinstance(exc, CredentialEditError):+ row_errors.extend(exc.row_errors)+ else:+ resolved[key] = api_key_values(keys)+ submissions.append(CredentialSubmission(key, keys))++ custom_keys: ApiKeyList | None = None+ if (+ custom_provider is not None+ and custom_provider.action != "delete"+ and "api_keys" in custom_provider.values+ ):+ changes = dict(custom_provider.values)+ submitted = changes.pop("api_keys")+ definition = snapshot.settings.custom_provider(+ custom_provider.provider_id or ""+ )+ try:+ custom_keys = resolve_credential_edit(+ "custom:" + (custom_provider.provider_id or "new"),+ definition.api_keys if definition else (),+ snapshot.sources["custom_providers"].value,+ submitted,+ revision_key,+ key="api_keys",+ provider_id=custom_provider.provider_id,+ new_owner=custom_provider.action == "create",+ )+ except ConfigConflictError:+ raise+ except ValueError as exc:+ credential_errors.append(str(exc))+ if isinstance(exc, CredentialEditError):+ row_errors.extend(exc.row_errors)+ else:+ changes["api_keys"] = api_key_values(custom_keys)+ custom_provider = custom_provider.model_copy(update={"values": changes})++ update_errors = (*credential_errors, *_update_protocol_errors(resolved))+ target_values = target_values_with_updates(resolved, snapshot)custom_id = Noneif custom_provider is not None:try:custom_id = merge_custom_provider(target_values, snapshot, custom_provider)except ValueError as exc:update_errors = (*update_errors, str(exc))+ if custom_keys is not None:+ submissions.append(CredentialSubmission("api_keys", custom_keys, custom_id))settings, settings_errors = settings_from_values(target_values, snapshot.process)errors = (*update_errors,@@ -158,7 +242,7 @@ def prepare_admin_update(state = load_value_state(snapshot)changed_keys = tuple(key- for key, submitted in updates.items()+ for key, submitted in resolved.items()if key in FIELD_BY_KEYand not is_locked_source(state[key].source)and (value := normalize_for_env(submitted, key=key))@@ -173,8 +257,11 @@ def prepare_admin_update(errors=errors,pending_fields=pending_fields,path=snapshot.path,+ expected=snapshot,changed_keys=changed_keys,custom_provider_id=custom_id,+ credential_submissions=tuple(submissions),+ credential_row_errors=tuple(row_errors),)diff --git a/src/free_claude_code/config/admin/provider_manifest.py b/src/free_claude_code/config/admin/provider_manifest.pyindex 54ac1f5e..41fceea7 100644--- a/src/free_claude_code/config/admin/provider_manifest.py+++ b/src/free_claude_code/config/admin/provider_manifest.py@@ -22,7 +22,7 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {"description": "Anthropic API access with separate usage billing. Messages requests use Anthropic tools and client thinking controls. Native fallback uses other Anthropic models. FCC local web and prompt optimizations apply to compatibility routes.",},"OPENAI_API_KEY": {- "label": "OpenAI API Key",+ "label": "OpenAI API Keys","description": "API key for the OpenAI Platform. Separate from ChatGPT sign-in.",},"OPENAI_PROXY": {@@ -42,38 +42,38 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {),},"NVIDIA_NIM_API_KEY": {- "label": "NVIDIA NIM API Key",+ "label": "NVIDIA NIM API Keys","description": "Used by NVIDIA NIM chat and optional NIM voice transcription.",},"MISTRAL_API_KEY": {- "label": "Mistral API Key",+ "label": "Mistral API Keys","description": ("Mistral La Plateforme (api.mistral.ai); Experiment plan is free tier with rate limits."),},"CODESTRAL_API_KEY": {- "label": "Codestral API Key",+ "label": "Codestral API Keys","description": ("Mistral Codestral endpoint (codestral.mistral.ai); distinct from Mistral ""La Plateforme ``MISTRAL_API_KEY``. See Mistral docs for coding/FIM domains."),},"OPENCODE_API_KEY": {- "label": "OpenCode API Key",+ "label": "OpenCode API Keys","description": ("OpenCode Zen curated gateway (opencode.ai/zen/v1) and OpenCode Go subscription ""gateway (opencode.ai/zen/go/v1); single key from opencode.ai/auth."),},"AI_GATEWAY_API_KEY": {- "label": "Vercel AI Gateway API Key",+ "label": "Vercel AI Gateway API Keys","description": ("Vercel AI Gateway API key for the OpenAI-compatible endpoint at ""ai-gateway.vercel.sh/v1."),},"AWS_BEARER_TOKEN_BEDROCK": {- "label": "Amazon Bedrock API Key",+ "label": "Amazon Bedrock API Keys","description": ("Amazon Bedrock bearer API key for the region-specific Mantle ""OpenAI-compatible endpoint."@@ -86,18 +86,18 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {),},"HUGGINGFACE_API_KEY": {- "label": "Hugging Face API Key",+ "label": "Hugging Face API Keys","description": ("Hugging Face token with Inference Providers permission; also used ""for local Whisper model downloads when voice notes need gated models."),},"COHERE_API_KEY": {- "label": "Cohere API Key",+ "label": "Cohere API Keys","description": "Cohere API key for the OpenAI-compatible Compatibility API.",},"ZAI_API_KEY": {- "label": "Z.ai API Key",+ "label": "Z.ai API Keys","description": ("Shared Z.ai key for Coding Plan (zai/...) and the general API ""(zai_api/...). The selected model prefix chooses Coding Plan quota "@@ -105,39 +105,39 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {),},"FIREWORKS_API_KEY": {- "label": "Fireworks API Key",+ "label": "Fireworks API Keys","description": "Fireworks AI inference API key.",},"NOVITA_API_KEY": {- "label": "Novita AI API Key",+ "label": "Novita AI API Keys","description": ("Novita AI OpenAI-compatible API key (create at ""[novita.ai/settings/key-management](https://novita.ai/settings/key-management))."),},"MINIMAX_API_KEY": {- "label": "MiniMax API Key",+ "label": "MiniMax API Keys","description": ("MiniMax API key for the OpenAI-compatible Chat Completions API at ""free_claude_code.api.minimax.io/v1."),},"KIMI_CODE_API_KEY": {- "label": "Kimi Code API Key",+ "label": "Kimi Code API Keys","description": ("Personal Kimi Code subscription key from kimi.com/code/console; ""separate from KIMI_API_KEY credits on the Kimi API platform."),},"CLOUDFLARE_API_TOKEN": {- "label": "Cloudflare API Token",+ "label": "Cloudflare API Tokens","description": ("Cloudflare API token for account-scoped AI REST requests. ""Use with CLOUDFLARE_ACCOUNT_ID."),},"GEMINI_API_KEY": {- "label": "Gemini API Key",+ "label": "Gemini API Keys","description": ("Google AI Studio Gemini API key (Google AI Studio / Gemini API ""[OpenAI-compatible](https://ai.google.dev/gemini-api/docs/openai)); "@@ -146,7 +146,7 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {),},"GROQ_API_KEY": {- "label": "Groq API Key",+ "label": "Groq API Keys","description": ("GroqCloud OpenAI-compatible API key ([console.groq.com/keys](""https://console.groq.com/keys)); see Groq "@@ -154,7 +154,7 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {),},"CLINE_API_KEY": {- "label": "Cline API Key",+ "label": "Cline API Keys","description": ("Subscribe to ClinePass, then create a programmatic API key under ""Settings > API Keys at app.cline.bot. This is not the Cline CLI's "@@ -162,7 +162,7 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {),},"XAI_API_KEY": {- "label": "xAI API Key",+ "label": "xAI API Keys","description": ("xAI OpenAI-compatible API key for Grok chat and image-understanding ""models."@@ -182,7 +182,7 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {),},"QWENCLOUD_API_KEY": {- "label": "QwenCloud Token Plan API Key",+ "label": "QwenCloud Token Plan API Keys","description": ("Dedicated QwenCloud Token Plan key (sk-sp-...). Token Plan, Coding ""Plan, and pay-as-you-go keys use separate endpoints and cannot be "@@ -190,7 +190,7 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {),},"QWENCLOUD_CODING_API_KEY": {- "label": "QwenCloud Coding Plan API Key",+ "label": "QwenCloud Coding Plan API Keys","description": ("Dedicated QwenCloud Coding Plan key (sk-sp-...) for personal, ""interactive coding-agent use. Token Plan, Coding Plan, and "@@ -198,69 +198,69 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {),},"TOGETHER_API_KEY": {- "label": "Together AI API Key",+ "label": "Together AI API Keys","description": ("Together AI OpenAI-compatible API key for serverless and dedicated ""chat models."),},"DEEPINFRA_API_KEY": {- "label": "DeepInfra API Key",+ "label": "DeepInfra API Keys","description": ("DeepInfra API key for OpenAI-compatible chat and reasoning models."),},"SILICONFLOW_API_KEY": {- "label": "SiliconFlow API Key",+ "label": "SiliconFlow API Keys","description": ("SiliconFlow API key for OpenAI-compatible chat, reasoning, and ""vision models."),},"NEBIUS_API_KEY": {- "label": "Nebius Token Factory API Key",+ "label": "Nebius Token Factory API Keys","description": ("Nebius Token Factory API key for OpenAI-compatible chat, reasoning, ""and tool-capable models."),},"OPPER_API_KEY": {- "label": "Opper API Key",+ "label": "Opper API Keys","description": ("Opper gateway key for OpenAI-compatible chat, reasoning and ""tool-capable models across its EU-hosted model pools."),},"SCW_SECRET_KEY": {- "label": "Scaleway API Key",+ "label": "Scaleway API Keys","description": ("Scaleway Generative APIs secret key for OpenAI-compatible chat and ""tool-capable models."),},"CHUTES_API_KEY": {- "label": "Chutes API Key",+ "label": "Chutes API Keys","description": ("Chutes API key for OpenAI-compatible chat, reasoning, and ""tool-capable models."),},"FEATHERLESS_API_KEY": {- "label": "Featherless AI API Key",+ "label": "Featherless AI API Keys","description": ("Featherless AI API key for plan-available OpenAI-compatible chat, ""reasoning, and tool-capable models."),},"SAMBANOVA_API_KEY": {- "label": "SambaNova API Key",+ "label": "SambaNova API Keys","description": ("SambaNova Cloud OpenAI-compatible API key (create at ""[cloud.sambanova.ai/apis](https://cloud.sambanova.ai/apis))."),},"CEREBRAS_API_KEY": {- "label": "Cerebras API Key",+ "label": "Cerebras API Keys","description": ("Cerebras Inference API key (create in [Cloud Console](https://cloud.cerebras.ai)); ""see [Quickstart](https://inference-docs.cerebras.ai/quickstart) and "@@ -273,27 +273,27 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {),},"TOKENROUTER_API_KEY": {- "label": "TokenRouter API Key",+ "label": "TokenRouter API Keys","description": ("TokenRouter OpenAI-compatible gateway API key for api.tokenrouter.com/v1."),},"NARAROUTE_API_KEY": {- "label": "NaraRoute API Key",+ "label": "NaraRoute API Keys","description": ("NaraRoute OpenAI-compatible gateway API key for router.bynara.id/v1. ""Keys begin with sk-nry-; create one at router.bynara.id/keys."),},"LIGHTNING_API_KEY": {- "label": "Lightning AI API Key",+ "label": "Lightning AI API Keys","description": ("Lightning AI Model APIs key for the OpenAI-compatible endpoint at ""lightning.ai/api/v1. Create one on lightning.ai under Model APIs."),},"ORCAROUTER_API_KEY": {- "label": "OrcaRouter API Key",+ "label": "OrcaRouter API Keys","description": ("OrcaRouter OpenAI-compatible multi-provider gateway API key for ""api.orcarouter.ai/v1. Keys begin with sk-orca-; create one at "@@ -301,41 +301,41 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {),},"ATLASCLOUD_API_KEY": {- "label": "Atlas Cloud API Key",+ "label": "Atlas Cloud API Keys","description": ("Atlas Cloud OpenAI-compatible multi-provider gateway API key for ""api.atlascloud.ai/v1; create one at console.atlascloud.ai/api-keys."),},"XKIRO_API_KEY": {- "label": "xKiro API Key",+ "label": "xKiro API Keys","description": ("xKiro API key for api.xkiro.com/v1. ""Create one at xkiro.com/dashboard/api/keys."),},"AGNES_API_KEY": {- "label": "Agnes AI API Key",+ "label": "Agnes AI API Keys","description": ("Agnes AI OpenAI-compatible API key for apihub.agnes-ai.com/v1."),},"ZENMUX_API_KEY": {- "label": "ZenMux API Key",+ "label": "ZenMux API Keys","description": ("ZenMux OpenAI-compatible gateway API key for zenmux.ai/api/v1. ""Create one at zenmux.ai/platform/pay-as-you-go."),},"WANDB_API_KEY": {- "label": "W&B Inference API Key",+ "label": "W&B Inference API Keys","description": ("W&B API key for Serverless Inference at api.inference.wandb.ai/v1. ""Create one in [W&B User Settings](https://wandb.ai/settings)."),},"EXPLABS_API_KEY": {- "label": "Experiential Labs API Key",+ "label": "Experiential Labs API Keys","description": ("Experiential Labs OpenAI-compatible gateway API key for ""api.experientiallabs.ai/v1. Keys look like xpl_ followed by 40 "@@ -343,7 +343,7 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, ProviderFieldOverride] = {),},"CHEAPER_INFERENCE_API_KEY": {- "label": "Cheaper Inference API Key",+ "label": "Cheaper Inference API Keys","description": ("Cheaper Inference OpenAI-compatible gateway API key for ""api.cheaperinference.com/v1. "@@ -386,9 +386,9 @@ def _credential_field_specs() -> tuple[ConfigFieldSpec, ...]:_with_override(ConfigFieldSpec(key=descriptor.credential_env,- label=f"{descriptor.display_name} API Key",+ label=f"{descriptor.display_name} API Keys",section_id="providers",- field_type="secret",+ field_type="api_key_list",settings_attr=descriptor.credential_attr,provider_ids=tuple(provider.provider_iddiff --git a/src/free_claude_code/config/admin/specs.py b/src/free_claude_code/config/admin/specs.pyindex 41071b5a..6953917f 100644--- a/src/free_claude_code/config/admin/specs.py+++ b/src/free_claude_code/config/admin/specs.py@@ -9,6 +9,7 @@ from free_claude_code.config.settings import Settingstype FieldType = Literal["text","secret",+ "api_key_list","number","boolean","model",@@ -62,7 +63,7 @@ class ConfigFieldSpec:value = Settings.model_fields[self.settings_attr].get_default(call_default_factory=True)- if value is None:+ if value is None or self.field_type == "api_key_list":return Noneif isinstance(value, bool):return "true" if value else "false"diff --git a/src/free_claude_code/config/admin/values.py b/src/free_claude_code/config/admin/values.pyindex dfe91fa2..b734efbf 100644--- a/src/free_claude_code/config/admin/values.py+++ b/src/free_claude_code/config/admin/values.py@@ -3,17 +3,25 @@import jsonfrom enum import Enum+from free_claude_code.config.api_keys import encode_api_keys, normalize_api_keysfrom free_claude_code.config.custom_providers import REASONING_FORMATSfrom free_claude_code.config.loader import ConfigSource, ManagedConfigSnapshotfrom free_claude_code.config.model_refs import ModelFallback+from free_claude_code.config.provider_catalog import PROVIDER_CATALOGfrom free_claude_code.core.json_types import JsonObject+from .credentials import credential_projectionfrom .manifest import FIELDS, SECTIONSfrom .specs import ConfigFieldSpec, ConfigOptionSpecfrom .state import ConfigValueState, ValueStatefrom .status import provider_config_statusMASKED_SECRET = "********"+_CREDENTIAL_KEYS = frozenset(+ provider.credential_env+ for provider in PROVIDER_CATALOG.values()+ if provider.credential_env+)def normalize_for_env(value: object, *, key: str | None = None) -> str | None:@@ -21,6 +29,8 @@ def normalize_for_env(value: object, *, key: str | None = None) -> str | None:if value is None:return None+ if key in _CREDENTIAL_KEYS and isinstance(value, list | tuple):+ return encode_api_keys(normalize_api_keys(value))if key == "MODEL_FALLBACKS" and isinstance(value, list | tuple):return (json.dumps(@@ -83,7 +93,9 @@ def load_value_state(snapshot: ManagedConfigSnapshot) -> ValueState:return state-def load_config_response(snapshot: ManagedConfigSnapshot) -> JsonObject:+def load_config_response(+ snapshot: ManagedConfigSnapshot, *, revision_key: bytes+) -> JsonObject:"""Return manifest and current config values for the Admin UI."""state = load_value_state(snapshot)@@ -92,13 +104,22 @@ def load_config_response(snapshot: ManagedConfigSnapshot) -> JsonObject:entry = state[field.key]source = entry.sourceraw_value = entry.value+ value = display_value(field, raw_value)+ if field.field_type == "api_key_list":+ assert field.settings_attr is not None+ value = credential_projection(+ field.key,+ getattr(snapshot.settings, field.settings_attr),+ source,+ revision_key,+ )fields.append({"key": field.key,"label": field.label,"section": field.section_id,"type": field.field_type,- "value": display_value(field, raw_value),+ "value": value,"configured": raw_value is not None,"source": source,"locked": is_locked_source(source),@@ -134,7 +155,14 @@ def load_config_response(snapshot: ManagedConfigSnapshot) -> JsonObject:"provider_status": provider_config_status(state),"custom_providers": [item.model_dump(mode="json")- | {"api_key": MASKED_SECRET if item.api_key else None}+ | {+ "api_keys": credential_projection(+ "custom:" + item.provider_id,+ item.api_keys,+ snapshot.sources["custom_providers"].value,+ revision_key,+ )+ }for item in snapshot.settings.custom_providers],"custom_providers_locked": snapshot.sources["custom_providers"]diff --git a/src/free_claude_code/config/api_keys.py b/src/free_claude_code/config/api_keys.pynew file mode 100644index 00000000..5fa75a1e--- /dev/null+++ b/src/free_claude_code/config/api_keys.py@@ -0,0 +1,61 @@+"""Ordered secret credentials and the single credential used at runtime."""++import json+from typing import Annotated++from pydantic import BeforeValidator, SecretStr+++def normalize_api_keys(value: object) -> tuple[SecretStr, ...]:+ """Accept a single key or array without discarding invalid entries."""+ if value is None:+ return ()+ if isinstance(value, str):+ value = value.strip()+ if not value:+ return ()+ if value.startswith("["):+ try:+ value = json.loads(value)+ except ValueError:+ raise ValueError("API keys must be a valid JSON array") from None+ else:+ value = [value]+ if not isinstance(value, list | tuple):+ raise ValueError("API keys must be a key or an array of keys")+ keys: list[SecretStr] = []+ seen: dict[str, int] = {}+ for index, entry in enumerate(value):+ text = entry.get_secret_value() if isinstance(entry, SecretStr) else entry+ if not isinstance(text, str):+ raise ValueError(f"Key {index + 1} must be a string")+ text = text.strip()+ if not text:+ raise ValueError(f"Key {index + 1} cannot be blank")+ if text in seen:+ raise ValueError(f"Key {index + 1} duplicates Key {seen[text] + 1}")+ seen[text] = index+ keys.append(SecretStr(text))+ return tuple(keys)+++type ApiKeyList = Annotated[tuple[SecretStr, ...], BeforeValidator(normalize_api_keys)]+++def first_api_key(keys: ApiKeyList) -> str | None:+ """Select the only credential supplied to provider and voice resources."""+ return keys[0].get_secret_value() if keys else None+++def api_key_values(keys: ApiKeyList) -> list[str]:+ """Extract plaintext for explicit persistence and internal edit resolution."""+ return [key.get_secret_value() for key in keys]+++def encode_api_keys(keys: ApiKeyList) -> str | None:+ """Serialize a configured collection, leaving empty settings sparse."""+ return (+ json.dumps(api_key_values(keys), ensure_ascii=False, separators=(",", ":"))+ if keys+ else None+ )diff --git a/src/free_claude_code/config/custom_providers.py b/src/free_claude_code/config/custom_providers.pyindex eb2767a1..7f24d22e 100644--- a/src/free_claude_code/config/custom_providers.py+++ b/src/free_claude_code/config/custom_providers.py@@ -8,12 +8,13 @@ from pydantic import (BaseModel,ConfigDict,Field,- SecretStr,TypeAdapter,field_validator,model_validator,)+from .api_keys import ApiKeyList, api_key_values, first_api_key+CUSTOM_PROVIDERS_ENV = "FCC_CUSTOM_PROVIDERS"REASONING_FORMATS = {"openai_chat": (@@ -35,7 +36,7 @@ class CustomProviderDefinition(BaseModel):provider_id: str = Field(pattern=r"^custom_[0-9a-f]{32}$")display_name: str = Field(min_length=1)base_url: str- api_key: SecretStr | None = Field(default=None, repr=False)+ api_keys: ApiKeyList = Field(default=(), repr=False)api_format: Literal["openai_chat", "openai_responses", "anthropic_messages"] = ("openai_chat")@@ -68,10 +69,16 @@ class CustomProviderDefinition(BaseModel):)return str(url).rstrip("/")- @field_validator("api_key", mode="before")+ @model_validator(mode="before")@classmethod- def empty_key(cls, value: object) -> object:- return value.strip() or None if isinstance(value, str) else value+ def normalize_legacy_key(cls, value: object) -> object:+ if not isinstance(value, dict) or "api_key" not in value:+ return value+ if "api_keys" in value:+ raise ValueError("Supply api_keys only, not both credential forms")+ values = dict(value)+ values["api_keys"] = values.pop("api_key")+ return values@field_validator("model_ids")@classmethod@@ -93,13 +100,15 @@ class CustomProviderDefinition(BaseModel):def private_values(self) -> dict:return self.model_dump(mode="json") | {- "api_key": self.api_key.get_secret_value() if self.api_key else None,+ "api_keys": api_key_values(self.api_keys),}def same_inventory(self, other: CustomProviderDefinition) -> bool:- return self.model_dump(exclude={"display_name"}) == other.model_dump(- exclude={"display_name"}- )+ return self.model_dump(+ exclude={"display_name", "api_keys"}+ ) == other.model_dump(exclude={"display_name", "api_keys"}) and first_api_key(+ self.api_keys+ ) == first_api_key(other.api_keys)def decode_custom_providers(value: object) -> object:diff --git a/src/free_claude_code/config/env_migrations.py b/src/free_claude_code/config/env_migrations.pyindex e62d8a04..1525fa5e 100644--- a/src/free_claude_code/config/env_migrations.py+++ b/src/free_claude_code/config/env_migrations.py@@ -1,5 +1,6 @@"""One-time consolidation of legacy FCC dotenv state."""+import jsonimport osimport reimport uuid@@ -9,6 +10,11 @@ from pathlib import Pathfrom loguru import logger+from .api_keys import api_key_values, encode_api_keys, normalize_api_keys+from .custom_providers import (+ CUSTOM_PROVIDERS_ENV,+ decode_custom_providers,+)from .env_files import (ANTHROPIC_AUTH_TOKEN_ENV,FCC_CONFIG_SCHEMA_ENV,@@ -23,7 +29,7 @@ from .paths import legacy_env_paths, managed_env_pathfrom .provider_catalog import PROVIDER_CATALOGfrom .settings import Settings-CONFIG_SCHEMA_VERSION = "1"+CONFIG_SCHEMA_VERSION = "2"LEGACY_HUGGINGFACE_TOKEN_ENV = "HF_TOKEN"HUGGINGFACE_API_KEY_ENV = "HUGGINGFACE_API_KEY"LEGACY_OPENCODE_PROXY_ENV = "OPENCODE_PROXY"@@ -174,6 +180,11 @@ def secret_env_keys() -> frozenset[str]:if name.endswith(("_api_key", "_proxy", "_token"))}secret_attrs.update({"telegram_proxy_url", "proxy_auth_token", "custom_providers"})+ secret_attrs.update(+ descriptor.credential_attr+ for descriptor in PROVIDER_CATALOG.values()+ if descriptor.credential_attr is not None+ )return frozenset(str(Settings.model_fields[name].validation_alias) for name in secret_attrs)@@ -202,6 +213,15 @@ def consolidate_managed_config(atomic_write_managed_config(normalized, path=managed)_log_model_repairs(base_values, normalized)return ConfigMigrationResult(changed=True)+ if schema == "1":+ repaired = normalize_retired_model_settings(+ base_values, preserve_empty_overrides=False+ )+ normalized = _normalize_credential_lists(repaired, process)+ normalized[FCC_CONFIG_SCHEMA_ENV] = CONFIG_SCHEMA_VERSION+ atomic_write_managed_config(normalized, path=managed)+ _log_model_repairs(base_values, repaired)+ return ConfigMigrationResult(changed=True)if schema not in {None, ""}:raise ValueError(f"Managed config {managed} uses unsupported schema {schema!r}; "@@ -235,14 +255,58 @@ def consolidate_managed_config(if key in known and key != FCC_CONFIG_SCHEMA_ENV and not values[key].strip():values.pop(key)values[FCC_CONFIG_SCHEMA_ENV] = CONFIG_SCHEMA_VERSION- normalized = normalize_retired_model_settings(- values, preserve_empty_overrides=False+ normalized = _normalize_credential_lists(+ normalize_retired_model_settings(values, preserve_empty_overrides=False),+ process,)atomic_write_managed_config(normalized, path=managed)_log_model_repairs(values, normalized)return ConfigMigrationResult(changed=True, imported_from=tuple(imported))+def _normalize_credential_lists(+ values: Mapping[str, str], process: Mapping[str, str]+) -> dict[str, str]:+ normalized = dict(values)+ owners = {+ descriptor.credential_env+ for descriptor in PROVIDER_CATALOG.values()+ if descriptor.credential_env is not None+ }+ for key in owners & normalized.keys():+ try:+ encoded = encode_api_keys(normalize_api_keys(normalized[key]))+ except ValueError as exc:+ if key in process:+ continue+ raise ValueError(f"{key}: {exc}") from None+ if encoded is None:+ normalized.pop(key)+ else:+ normalized[key] = encoded+ if CUSTOM_PROVIDERS_ENV in normalized:+ try:+ decoded = decode_custom_providers(normalized[CUSTOM_PROVIDERS_ENV])+ if not isinstance(decoded, list):+ raise ValueError("Custom providers must be a JSON array")+ for definition in decoded:+ if not isinstance(definition, dict):+ continue+ if "api_key" in definition and "api_keys" in definition:+ continue # Effective Settings validation rejects this conflict.+ member = "api_key" if "api_key" in definition else "api_keys"+ if member in definition:+ keys = api_key_values(normalize_api_keys(definition.pop(member)))+ definition["api_keys"] = keys+ normalized[CUSTOM_PROVIDERS_ENV] = json.dumps(+ decoded, ensure_ascii=False, separators=(",", ":")+ )+ except ValueError:+ if CUSTOM_PROVIDERS_ENV not in process:+ raise+ return normalized++def _log_model_repairs(before: Mapping[str, str], after: Mapping[str, str]) -> None:changed = sorted(key for key in before if before[key] != after.get(key))if changed:diff --git a/src/free_claude_code/config/errors.py b/src/free_claude_code/config/errors.pynew file mode 100644index 00000000..29e50ad9--- /dev/null+++ b/src/free_claude_code/config/errors.py@@ -0,0 +1,5 @@+"""Configuration errors exposed across storage and application boundaries."""+++class ConfigConflictError(ValueError):+ """The saved configuration changed after an editor or transaction read it."""diff --git a/src/free_claude_code/config/loader.py b/src/free_claude_code/config/loader.pyindex 3a8e6240..dfb4589a 100644--- a/src/free_claude_code/config/loader.py+++ b/src/free_claude_code/config/loader.py@@ -4,6 +4,7 @@ import osfrom collections.abc import Iterator, Mappingfrom contextlib import contextmanagerfrom dataclasses import dataclass+from dataclasses import field as dataclass_fieldfrom enum import StrEnumfrom functools import lru_cachefrom pathlib import Path@@ -22,6 +23,7 @@ from .env_migrations import (consolidate_managed_config,settings_env_keys,)+from .errors import ConfigConflictErrorfrom .model_refs import normalize_retired_model_settingsfrom .paths import config_lock_path, managed_env_pathfrom .provider_proxies import invalid_provider_proxy_keys@@ -50,8 +52,8 @@ class ManagedConfigSnapshot:settings: Settingssources: Mapping[str, ConfigSource]- managed: Mapping[str, str]- process: Mapping[str, str]+ managed: Mapping[str, str] = dataclass_field(repr=False)+ process: Mapping[str, str] = dataclass_field(repr=False)path: Path@@ -106,9 +108,21 @@ class ManagedConfigStore:self.path,)- def commit(self, values: Mapping[str, str]) -> None:+ def commit(+ self,+ values: Mapping[str, str],+ expected: ManagedConfigSnapshot | None = None,+ ) -> None:with self._storage_lock():- self._read_managed() # Never overwrite a newer schema or missing storage.+ managed = self._read_managed()+ if expected is not None and (+ managed != expected.managed+ or _process_overrides(os.environ)+ != _process_overrides(expected.process)+ ):+ raise ConfigConflictError(+ "Configuration changed while saving. Reopen the modal before saving again."+ )atomic_write_managed_config(values, path=self.path)def repair_invalid_provider_proxies(@@ -169,6 +183,12 @@ def compose_settings_snapshot()+def _process_overrides(env: Mapping[str, str]) -> dict[str, str]:+ normalized = normalize_retired_model_settings(env, preserve_empty_overrides=True)+ keys = settings_env_keys() - {ANTHROPIC_AUTH_TOKEN_ENV}+ return {key: normalized[key] for key in keys & normalized.keys()}++@lru_cachedef get_settings() -> Settings:"""Return the process-wide cached settings model."""diff --git a/src/free_claude_code/config/provider_catalog.py b/src/free_claude_code/config/provider_catalog.pyindex 2ca27432..20383965 100644--- a/src/free_claude_code/config/provider_catalog.py+++ b/src/free_claude_code/config/provider_catalog.py@@ -151,7 +151,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="nvidia-color.svg",credential_env="NVIDIA_NIM_API_KEY",credential_url="https://build.nvidia.com/settings/api-keys",- credential_attr="nvidia_nim_api_key",+ credential_attr="nvidia_nim_api_keys",default_base_url=NVIDIA_NIM_DEFAULT_BASE,proxy_attr="nvidia_nim_proxy",),@@ -162,7 +162,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="openrouter.svg",credential_env="OPENROUTER_API_KEY",credential_url="https://openrouter.ai/keys",- credential_attr="open_router_api_key",+ credential_attr="open_router_api_keys",default_base_url=OPENROUTER_DEFAULT_BASE,proxy_attr="open_router_proxy",),@@ -173,7 +173,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="groq.svg",credential_env="GROQ_API_KEY",credential_url="https://console.groq.com/keys",- credential_attr="groq_api_key",+ credential_attr="groq_api_keys",default_base_url=GROQ_DEFAULT_BASE,proxy_attr="groq_proxy",),@@ -184,7 +184,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="cline.svg",credential_env="CLINE_API_KEY",credential_url="https://app.cline.bot",- credential_attr="cline_api_key",+ credential_attr="cline_api_keys",default_base_url=CLINE_DEFAULT_BASE,proxy_attr="cline_pass_proxy",),@@ -204,7 +204,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="openai.svg",credential_env="OPENAI_API_KEY",credential_url="https://platform.openai.com/api-keys",- credential_attr="openai_api_key",+ credential_attr="openai_api_keys",default_base_url="https://api.openai.com/v1",proxy_attr="openai_api_proxy",),@@ -214,7 +214,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {website_url="https://www.anthropic.com/",logo_filename="anthropic.svg",credential_env="ANTHROPIC_API_KEY",- credential_attr="anthropic_api_key",+ credential_attr="anthropic_api_keys",credential_url="https://platform.claude.com/settings/keys",default_base_url="https://api.anthropic.com/v1",proxy_attr="anthropic_proxy",@@ -235,7 +235,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="xai.svg",credential_env="XAI_API_KEY",credential_url="https://console.x.ai/team/default/api-keys",- credential_attr="xai_api_key",+ credential_attr="xai_api_keys",default_base_url=XAI_DEFAULT_BASE,proxy_attr="xai_proxy",),@@ -246,7 +246,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="alibabacloud-color.svg",credential_env="ALIBABA_CLOUD_API_KEY",credential_url="https://www.alibabacloud.com/help/en/model-studio/get-api-key",- credential_attr="alibaba_cloud_api_key",+ credential_attr="alibaba_cloud_api_keys",default_base_url=ALIBABA_CLOUD_DEFAULT_BASE,base_url_attr="alibaba_cloud_base_url",proxy_attr="alibaba_cloud_proxy",@@ -258,7 +258,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="qwen-color.svg",credential_env="QWENCLOUD_API_KEY",credential_url="https://home.qwencloud.com/api-keys",- credential_attr="qwencloud_api_key",+ credential_attr="qwencloud_api_keys",default_base_url=QWENCLOUD_DEFAULT_BASE,proxy_attr="qwencloud_proxy",),@@ -269,7 +269,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="qwen-color.svg",credential_env="QWENCLOUD_CODING_API_KEY",credential_url="https://home.qwencloud.com/api-keys",- credential_attr="qwencloud_coding_api_key",+ credential_attr="qwencloud_coding_api_keys",default_base_url=QWENCLOUD_CODING_DEFAULT_BASE,proxy_attr="qwencloud_coding_proxy",),@@ -280,7 +280,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="together-color.svg",credential_env="TOGETHER_API_KEY",credential_url="https://api.together.ai/settings/api-keys",- credential_attr="together_api_key",+ credential_attr="together_api_keys",default_base_url=TOGETHER_DEFAULT_BASE,proxy_attr="together_proxy",),@@ -291,7 +291,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="deepinfra-color.svg",credential_env="DEEPINFRA_API_KEY",credential_url="https://deepinfra.com/dash/api_keys",- credential_attr="deepinfra_api_key",+ credential_attr="deepinfra_api_keys",default_base_url=DEEPINFRA_DEFAULT_BASE,proxy_attr="deepinfra_proxy",),@@ -302,7 +302,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="siliconcloud-color.svg",credential_env="SILICONFLOW_API_KEY",credential_url="https://cloud.siliconflow.com/account/ak",- credential_attr="siliconflow_api_key",+ credential_attr="siliconflow_api_keys",default_base_url=SILICONFLOW_DEFAULT_BASE,proxy_attr="siliconflow_proxy",),@@ -313,7 +313,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="nebius.svg",credential_env="NEBIUS_API_KEY",credential_url="https://tokenfactory.nebius.com/project/api-keys",- credential_attr="nebius_api_key",+ credential_attr="nebius_api_keys",default_base_url=NEBIUS_DEFAULT_BASE,proxy_attr="nebius_proxy",),@@ -324,7 +324,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="chutes.png",credential_env="CHUTES_API_KEY",credential_url="https://chutes.ai/docs/getting-started/authentication",- credential_attr="chutes_api_key",+ credential_attr="chutes_api_keys",default_base_url=CHUTES_DEFAULT_BASE,proxy_attr="chutes_proxy",),@@ -335,7 +335,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="featherless-color.svg",credential_env="FEATHERLESS_API_KEY",credential_url="https://featherless.ai/account/api-keys",- credential_attr="featherless_api_key",+ credential_attr="featherless_api_keys",default_base_url=FEATHERLESS_DEFAULT_BASE,proxy_attr="featherless_proxy",),@@ -346,7 +346,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="agnesai.svg",credential_env="AGNES_API_KEY",credential_url="https://agnes-ai.com/",- credential_attr="agnes_api_key",+ credential_attr="agnes_api_keys",default_base_url=AGNES_DEFAULT_BASE,proxy_attr="agnes_proxy",),@@ -357,7 +357,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="zenmux.svg",credential_env="ZENMUX_API_KEY",credential_url="https://zenmux.ai/platform/pay-as-you-go",- credential_attr="zenmux_api_key",+ credential_attr="zenmux_api_keys",default_base_url=ZENMUX_DEFAULT_BASE,proxy_attr="zenmux_proxy",),@@ -368,7 +368,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="wandb.png",credential_env="WANDB_API_KEY",credential_url="https://wandb.ai/settings",- credential_attr="wandb_api_key",+ credential_attr="wandb_api_keys",default_base_url=WANDB_INFERENCE_DEFAULT_BASE,proxy_attr="wandb_proxy",),@@ -379,11 +379,11 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="azure-color.svg",credential_env="AZURE_OPENAI_API_KEY",credential_url="https://ai.azure.com/",- credential_attr="azure_openai_api_key",+ credential_attr="azure_openai_api_keys",base_url_attr="azure_openai_base_url",proxy_attr="azure_openai_proxy",required_settings_attrs=(- "azure_openai_api_key",+ "azure_openai_api_keys","azure_openai_base_url",),),@@ -394,7 +394,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="gemini-color.svg",credential_env="GEMINI_API_KEY",credential_url="https://aistudio.google.com/apikey",- credential_attr="gemini_api_key",+ credential_attr="gemini_api_keys",default_base_url=GEMINI_DEFAULT_BASE,proxy_attr="gemini_proxy",),@@ -418,7 +418,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="deepseek-color.svg",credential_env="DEEPSEEK_API_KEY",credential_url="https://platform.deepseek.com/api_keys",- credential_attr="deepseek_api_key",+ credential_attr="deepseek_api_keys",default_base_url=DEEPSEEK_DEFAULT_BASE,),"mistral": ProviderDescriptor(@@ -428,7 +428,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="mistral-color.svg",credential_env="MISTRAL_API_KEY",credential_url="https://console.mistral.ai/",- credential_attr="mistral_api_key",+ credential_attr="mistral_api_keys",default_base_url=MISTRAL_DEFAULT_BASE,proxy_attr="mistral_proxy",),@@ -439,7 +439,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="mistral-color.svg",credential_env="CODESTRAL_API_KEY",credential_url="https://console.mistral.ai/",- credential_attr="codestral_api_key",+ credential_attr="codestral_api_keys",default_base_url=CODESTRAL_DEFAULT_BASE,proxy_attr="codestral_proxy",),@@ -450,7 +450,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="opencode.svg",credential_env="OPENCODE_API_KEY",credential_url="https://opencode.ai/auth",- credential_attr="opencode_api_key",+ credential_attr="opencode_api_keys",default_base_url=OPENCODE_ZEN_DEFAULT_BASE,proxy_attr="opencode_zen_proxy",),@@ -461,7 +461,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="opencode.svg",credential_env="OPENCODE_API_KEY",credential_url="https://opencode.ai/auth",- credential_attr="opencode_api_key",+ credential_attr="opencode_api_keys",default_base_url=OPENCODE_GO_DEFAULT_BASE,proxy_attr="opencode_go_proxy",),@@ -472,7 +472,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="vercel.svg",credential_env="AI_GATEWAY_API_KEY",credential_url="https://vercel.com/docs/ai-gateway",- credential_attr="vercel_ai_gateway_api_key",+ credential_attr="vercel_ai_gateway_api_keys",default_base_url=VERCEL_AI_GATEWAY_DEFAULT_BASE,proxy_attr="vercel_ai_gateway_proxy",),@@ -483,7 +483,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="bedrock-color.svg",credential_env="AWS_BEARER_TOKEN_BEDROCK",credential_url="https://console.aws.amazon.com/bedrock/",- credential_attr="bedrock_api_key",+ credential_attr="bedrock_api_keys",default_base_url=BEDROCK_DEFAULT_BASE,base_url_attr="bedrock_base_url",proxy_attr="bedrock_proxy",@@ -495,7 +495,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="huggingface-color.svg",credential_env="HUGGINGFACE_API_KEY",credential_url="https://huggingface.co/settings/tokens",- credential_attr="huggingface_api_key",+ credential_attr="huggingface_api_keys",default_base_url=HUGGINGFACE_DEFAULT_BASE,proxy_attr="huggingface_proxy",),@@ -506,7 +506,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="cohere-color.svg",credential_env="COHERE_API_KEY",credential_url="https://dashboard.cohere.com/api-keys",- credential_attr="cohere_api_key",+ credential_attr="cohere_api_keys",default_base_url=COHERE_DEFAULT_BASE,proxy_attr="cohere_proxy",),@@ -517,7 +517,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="wafer.png",credential_env="WAFER_API_KEY",credential_url="https://www.wafer.ai/pass",- credential_attr="wafer_api_key",+ credential_attr="wafer_api_keys",default_base_url=WAFER_DEFAULT_BASE,proxy_attr="wafer_proxy",),@@ -528,7 +528,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="kimi-color.svg",credential_env="KIMI_API_KEY",credential_url="https://platform.moonshot.cn/console/api-keys",- credential_attr="kimi_api_key",+ credential_attr="kimi_api_keys",default_base_url=KIMI_DEFAULT_BASE,proxy_attr="kimi_proxy",),@@ -539,7 +539,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="kimi-color.svg",credential_env="KIMI_CODE_API_KEY",credential_url="https://www.kimi.com/code/console",- credential_attr="kimi_code_api_key",+ credential_attr="kimi_code_api_keys",default_base_url=KIMI_CODE_DEFAULT_BASE,proxy_attr="kimi_code_proxy",),@@ -550,7 +550,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="kilocode.svg",credential_env="KILO_API_KEY",credential_url="https://app.kilo.ai",- credential_attr="kilo_api_key",+ credential_attr="kilo_api_keys",default_base_url=KILO_DEFAULT_BASE,proxy_attr="kilo_proxy",),@@ -561,7 +561,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="minimax-color.svg",credential_env="MINIMAX_API_KEY",credential_url="https://platform.minimax.io/user-center/basic-information/interface-key",- credential_attr="minimax_api_key",+ credential_attr="minimax_api_keys",default_base_url=MINIMAX_DEFAULT_BASE,proxy_attr="minimax_proxy",),@@ -572,7 +572,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="cerebras-color.svg",credential_env="CEREBRAS_API_KEY",credential_url="https://cloud.cerebras.ai",- credential_attr="cerebras_api_key",+ credential_attr="cerebras_api_keys",default_base_url=CEREBRAS_DEFAULT_BASE,proxy_attr="cerebras_proxy",),@@ -583,7 +583,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="sambanova-color.svg",credential_env="SAMBANOVA_API_KEY",credential_url="https://cloud.sambanova.ai/apis",- credential_attr="sambanova_api_key",+ credential_attr="sambanova_api_keys",default_base_url=SAMBANOVA_DEFAULT_BASE,proxy_attr="sambanova_proxy",),@@ -594,7 +594,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="fireworks-color.svg",credential_env="FIREWORKS_API_KEY",credential_url="https://fireworks.ai/account/api-keys",- credential_attr="fireworks_api_key",+ credential_attr="fireworks_api_keys",default_base_url=FIREWORKS_DEFAULT_BASE,proxy_attr="fireworks_proxy",),@@ -605,7 +605,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="novita-color.svg",credential_env="NOVITA_API_KEY",credential_url="https://novita.ai/settings/key-management",- credential_attr="novita_api_key",+ credential_attr="novita_api_keys",default_base_url=NOVITA_DEFAULT_BASE,proxy_attr="novita_proxy",),@@ -616,11 +616,11 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="cloudflare-color.svg",credential_env="CLOUDFLARE_API_TOKEN",credential_url="https://dash.cloudflare.com/profile/api-tokens",- credential_attr="cloudflare_api_token",+ credential_attr="cloudflare_api_tokens",default_base_url=CLOUDFLARE_AI_REST_ROOT,proxy_attr="cloudflare_proxy",required_settings_attrs=(- "cloudflare_api_token",+ "cloudflare_api_tokens","cloudflare_account_id",),),@@ -631,7 +631,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="zai.svg",credential_env="ZAI_API_KEY",credential_url="https://z.ai/manage-apikey/apikey-list",- credential_attr="zai_api_key",+ credential_attr="zai_api_keys",default_base_url=ZAI_CODING_DEFAULT_BASE,proxy_attr="zai_proxy",),@@ -642,7 +642,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="zai.svg",credential_env="ZAI_API_KEY",credential_url="https://z.ai/manage-apikey/apikey-list",- credential_attr="zai_api_key",+ credential_attr="zai_api_keys",default_base_url=ZAI_API_DEFAULT_BASE,proxy_attr="zai_api_proxy",),@@ -653,7 +653,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="tokenrouter.png",credential_env="TOKENROUTER_API_KEY",credential_url="https://www.tokenrouter.com/",- credential_attr="tokenrouter_api_key",+ credential_attr="tokenrouter_api_keys",default_base_url=TOKENROUTER_DEFAULT_BASE,proxy_attr="tokenrouter_proxy",),@@ -664,7 +664,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="nararoute.png",credential_env="NARAROUTE_API_KEY",credential_url="https://router.bynara.id/keys",- credential_attr="nararoute_api_key",+ credential_attr="nararoute_api_keys",default_base_url=NARAROUTE_DEFAULT_BASE,proxy_attr="nararoute_proxy",),@@ -675,7 +675,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="poolside-color.svg",credential_env="POOLSIDE_API_KEY",credential_url="https://platform.poolside.ai/",- credential_attr="poolside_api_key",+ credential_attr="poolside_api_keys",default_base_url=POOLSIDE_DEFAULT_BASE,proxy_attr="poolside_proxy",),@@ -686,7 +686,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="llm7.png",credential_env="LLM7_API_KEY",credential_url="https://dash.llm7.io/",- credential_attr="llm7_api_key",+ credential_attr="llm7_api_keys",default_base_url=LLM7_DEFAULT_BASE,proxy_attr="llm7_proxy",),@@ -697,7 +697,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="scaleway.svg",credential_env="SCW_SECRET_KEY",credential_url="https://console.scaleway.com/iam/api-keys",- credential_attr="scw_secret_key",+ credential_attr="scw_secret_keys",default_base_url=SCALEWAY_DEFAULT_BASE,proxy_attr="scw_proxy",),@@ -708,7 +708,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="lightning.png",credential_env="LIGHTNING_API_KEY",credential_url="https://lightning.ai/lightning-ai/model-apis/models",- credential_attr="lightning_api_key",+ credential_attr="lightning_api_keys",default_base_url=LIGHTNING_DEFAULT_BASE,proxy_attr="lightning_proxy",),@@ -719,7 +719,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="experiential.svg",credential_env="EXPLABS_API_KEY",credential_url="https://platform.experientiallabs.ai/settings/api-keys",- credential_attr="experiential_api_key",+ credential_attr="experiential_api_keys",default_base_url=EXPERIENTIAL_DEFAULT_BASE,proxy_attr="experiential_proxy",),@@ -730,7 +730,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="cheaperinference.svg",credential_env="CHEAPER_INFERENCE_API_KEY",credential_url="https://cheaperinference.com/signup",- credential_attr="cheaperinference_api_key",+ credential_attr="cheaperinference_api_keys",default_base_url=CHEAPERINFERENCE_DEFAULT_BASE,proxy_attr="cheaperinference_proxy",),@@ -741,7 +741,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="orcarouter.png",credential_env="ORCAROUTER_API_KEY",credential_url="https://www.orcarouter.ai/console",- credential_attr="orcarouter_api_key",+ credential_attr="orcarouter_api_keys",default_base_url=ORCAROUTER_DEFAULT_BASE,proxy_attr="orcarouter_proxy",),@@ -752,7 +752,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="atlascloud.svg",credential_env="ATLASCLOUD_API_KEY",credential_url="https://console.atlascloud.ai/api-keys",- credential_attr="atlascloud_api_key",+ credential_attr="atlascloud_api_keys",default_base_url=ATLASCLOUD_DEFAULT_BASE,proxy_attr="atlascloud_proxy",),@@ -763,7 +763,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="xkiro.png",credential_env="XKIRO_API_KEY",credential_url="https://xkiro.com/dashboard/api/keys",- credential_attr="xkiro_api_key",+ credential_attr="xkiro_api_keys",default_base_url=XKIRO_DEFAULT_BASE,proxy_attr="xkiro_proxy",),@@ -774,7 +774,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="opper.svg",credential_env="OPPER_API_KEY",credential_url="https://platform.opper.ai/",- credential_attr="opper_api_key",+ credential_attr="opper_api_keys",default_base_url=OPPER_DEFAULT_BASE,proxy_attr="opper_proxy",),@@ -785,7 +785,7 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {logo_filename="ollama.svg",credential_env="OLLAMA_API_KEY",credential_url="https://ollama.com/settings/keys",- credential_attr="ollama_api_key",+ credential_attr="ollama_api_keys",default_base_url=OLLAMA_CLOUD_DEFAULT_BASE,proxy_attr="ollama_cloud_proxy",),diff --git a/src/free_claude_code/config/settings.py b/src/free_claude_code/config/settings.pyindex 76ec3436..06b01dd7 100644--- a/src/free_claude_code/config/settings.py+++ b/src/free_claude_code/config/settings.py@@ -12,6 +12,7 @@ from pydantic import (model_validator,)+from .api_keys import ApiKeyListfrom .constants import DEFAULT_MODEL, HTTP_CONNECT_TIMEOUT_DEFAULTfrom .custom_providers import CustomProviderDefinition, decode_custom_providersfrom .model_refs import ModelFallback, ModelFallbacks@@ -104,72 +105,62 @@ class Settings(BaseModel):return self# ==================== OpenAI Platform API ====================- openai_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="OPENAI_API_KEY"- )+ openai_api_keys: ApiKeyList = Field(default=(), validation_alias="OPENAI_API_KEY")# ==================== Azure OpenAI ====================- azure_openai_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="AZURE_OPENAI_API_KEY"+ azure_openai_api_keys: ApiKeyList = Field(+ default=(), validation_alias="AZURE_OPENAI_API_KEY")azure_openai_base_url: OptionalNonEmptyString = Field(default=None, validation_alias="AZURE_OPENAI_BASE_URL")# ==================== OpenRouter Config ====================- open_router_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="OPENROUTER_API_KEY"+ open_router_api_keys: ApiKeyList = Field(+ default=(), validation_alias="OPENROUTER_API_KEY")# ==================== Mistral La Plateforme ====================- mistral_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="MISTRAL_API_KEY"- )+ mistral_api_keys: ApiKeyList = Field(default=(), validation_alias="MISTRAL_API_KEY")# ==================== Mistral Codestral (codestral.mistral.ai) ====================- codestral_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="CODESTRAL_API_KEY"+ codestral_api_keys: ApiKeyList = Field(+ default=(), validation_alias="CODESTRAL_API_KEY")# ==================== DeepSeek Config ====================- deepseek_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="DEEPSEEK_API_KEY"+ deepseek_api_keys: ApiKeyList = Field(+ default=(), validation_alias="DEEPSEEK_API_KEY")# ==================== Kimi Config ====================- kimi_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="KIMI_API_KEY"- )+ kimi_api_keys: ApiKeyList = Field(default=(), validation_alias="KIMI_API_KEY")# ==================== Kimi Code Subscription ====================- kimi_code_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="KIMI_CODE_API_KEY"+ kimi_code_api_keys: ApiKeyList = Field(+ default=(), validation_alias="KIMI_CODE_API_KEY")# ==================== Wafer Config ====================- wafer_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="WAFER_API_KEY"- )+ wafer_api_keys: ApiKeyList = Field(default=(), validation_alias="WAFER_API_KEY")# ==================== MiniMax Config ====================- minimax_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="MINIMAX_API_KEY"- )+ minimax_api_keys: ApiKeyList = Field(default=(), validation_alias="MINIMAX_API_KEY")# ==================== OpenCode Zen / OpenCode Go ====================# Same key from opencode.ai/auth; Zen uses ``opencode_zen/``, Go uses ``opencode_go/``.- opencode_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="OPENCODE_API_KEY"+ opencode_api_keys: ApiKeyList = Field(+ default=(), validation_alias="OPENCODE_API_KEY")# ==================== Vercel AI Gateway ====================- vercel_ai_gateway_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="AI_GATEWAY_API_KEY"+ vercel_ai_gateway_api_keys: ApiKeyList = Field(+ default=(), validation_alias="AI_GATEWAY_API_KEY")# ==================== Amazon Bedrock Mantle ====================- bedrock_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="AWS_BEARER_TOKEN_BEDROCK"+ bedrock_api_keys: ApiKeyList = Field(+ default=(), validation_alias="AWS_BEARER_TOKEN_BEDROCK")bedrock_base_url: NonEmptyString = Field(default=BEDROCK_DEFAULT_BASE,@@ -177,107 +168,91 @@ class Settings(BaseModel):)# ==================== Hugging Face Inference Providers ====================- huggingface_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="HUGGINGFACE_API_KEY"+ huggingface_api_keys: ApiKeyList = Field(+ default=(), validation_alias="HUGGINGFACE_API_KEY")# ==================== Cohere Compatibility API ====================- cohere_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="COHERE_API_KEY"- )+ cohere_api_keys: ApiKeyList = Field(default=(), validation_alias="COHERE_API_KEY")# ==================== SambaNova Cloud ====================- sambanova_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="SAMBANOVA_API_KEY"+ sambanova_api_keys: ApiKeyList = Field(+ default=(), validation_alias="SAMBANOVA_API_KEY")# ==================== Kilo.ai Config ====================- kilo_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="KILO_API_KEY"- )+ kilo_api_keys: ApiKeyList = Field(default=(), validation_alias="KILO_API_KEY")# ==================== Z.ai Coding Plan / General API ====================- zai_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="ZAI_API_KEY"- )+ zai_api_keys: ApiKeyList = Field(default=(), validation_alias="ZAI_API_KEY")# ==================== TokenRouter Config ====================- tokenrouter_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="TOKENROUTER_API_KEY"+ tokenrouter_api_keys: ApiKeyList = Field(+ default=(), validation_alias="TOKENROUTER_API_KEY")# ==================== NaraRoute Config ====================- nararoute_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="NARAROUTE_API_KEY"+ nararoute_api_keys: ApiKeyList = Field(+ default=(), validation_alias="NARAROUTE_API_KEY")# ==================== Poolside AI (OpenAI-compatible) ====================- poolside_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="POOLSIDE_API_KEY"+ poolside_api_keys: ApiKeyList = Field(+ default=(), validation_alias="POOLSIDE_API_KEY")# ==================== LLM7.io (OpenAI-compatible) ====================- llm7_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="LLM7_API_KEY"- )+ llm7_api_keys: ApiKeyList = Field(default=(), validation_alias="LLM7_API_KEY")# ==================== Lightning AI (OpenAI-compatible) ====================- lightning_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="LIGHTNING_API_KEY"+ lightning_api_keys: ApiKeyList = Field(+ default=(), validation_alias="LIGHTNING_API_KEY")# ==================== Experiential Labs (OpenAI-compatible) ====================- experiential_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="EXPLABS_API_KEY"+ experiential_api_keys: ApiKeyList = Field(+ default=(), validation_alias="EXPLABS_API_KEY")# ==================== Cheaper Inference (OpenAI-compatible) ====================- cheaperinference_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="CHEAPER_INFERENCE_API_KEY"+ cheaperinference_api_keys: ApiKeyList = Field(+ default=(), validation_alias="CHEAPER_INFERENCE_API_KEY")# ==================== OrcaRouter (OpenAI-compatible gateway) ====================- orcarouter_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="ORCAROUTER_API_KEY"+ orcarouter_api_keys: ApiKeyList = Field(+ default=(), validation_alias="ORCAROUTER_API_KEY")# ==================== Atlas Cloud (OpenAI-compatible gateway) ====================- atlascloud_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="ATLASCLOUD_API_KEY"+ atlascloud_api_keys: ApiKeyList = Field(+ default=(), validation_alias="ATLASCLOUD_API_KEY")# ==================== xKiro (OpenAI-compatible gateway) ====================- xkiro_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="XKIRO_API_KEY"- )+ xkiro_api_keys: ApiKeyList = Field(default=(), validation_alias="XKIRO_API_KEY")# ==================== Opper (OpenAI-compatible) ====================- opper_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="OPPER_API_KEY"- )+ opper_api_keys: ApiKeyList = Field(default=(), validation_alias="OPPER_API_KEY")# ==================== Fireworks AI Config ====================- fireworks_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="FIREWORKS_API_KEY"+ fireworks_api_keys: ApiKeyList = Field(+ default=(), validation_alias="FIREWORKS_API_KEY")# ==================== Novita AI Config ====================- novita_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="NOVITA_API_KEY"- )+ novita_api_keys: ApiKeyList = Field(default=(), validation_alias="NOVITA_API_KEY")# ==================== Cloudflare Workers AI Config ====================- cloudflare_api_token: OptionalNonEmptyString = Field(- default=None, validation_alias="CLOUDFLARE_API_TOKEN"+ cloudflare_api_tokens: ApiKeyList = Field(+ default=(), validation_alias="CLOUDFLARE_API_TOKEN")cloudflare_account_id: OptionalNonEmptyString = Field(default=None, validation_alias="CLOUDFLARE_ACCOUNT_ID")# ==================== Google Gemini (Google AI Studio) ====================- gemini_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="GEMINI_API_KEY"- )+ gemini_api_keys: ApiKeyList = Field(default=(), validation_alias="GEMINI_API_KEY")# ==================== Google Vertex AI ====================vertex_project_id: OptionalNonEmptyString = Field(@@ -288,23 +263,17 @@ class Settings(BaseModel):)# ==================== Groq (OpenAI-compatible) ====================- groq_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="GROQ_API_KEY"- )+ groq_api_keys: ApiKeyList = Field(default=(), validation_alias="GROQ_API_KEY")# ==================== ClinePass (OpenAI-compatible) ====================- cline_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="CLINE_API_KEY"- )+ cline_api_keys: ApiKeyList = Field(default=(), validation_alias="CLINE_API_KEY")# ==================== xAI / Grok (OpenAI-compatible) ====================- xai_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="XAI_API_KEY"- )+ xai_api_keys: ApiKeyList = Field(default=(), validation_alias="XAI_API_KEY")# ==================== Alibaba Cloud Model Studio ====================- anthropic_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="ANTHROPIC_API_KEY"+ anthropic_api_keys: ApiKeyList = Field(+ default=(), validation_alias="ANTHROPIC_API_KEY")anthropic_workspace_id: OptionalNonEmptyString = Field(default=None, validation_alias="ANTHROPIC_WORKSPACE_ID"@@ -312,82 +281,68 @@ class Settings(BaseModel):anthropic_proxy: OptionalNonEmptyString = Field(default=None, validation_alias="ANTHROPIC_PROXY")- alibaba_cloud_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="ALIBABA_CLOUD_API_KEY"+ alibaba_cloud_api_keys: ApiKeyList = Field(+ default=(), validation_alias="ALIBABA_CLOUD_API_KEY")alibaba_cloud_base_url: OptionalNonEmptyString = Field(default=None, validation_alias="ALIBABA_CLOUD_BASE_URL")# ==================== QwenCloud Token Plan (OpenAI-compatible) ====================- qwencloud_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="QWENCLOUD_API_KEY"+ qwencloud_api_keys: ApiKeyList = Field(+ default=(), validation_alias="QWENCLOUD_API_KEY")# ==================== QwenCloud Coding Plan (OpenAI-compatible) ====================- qwencloud_coding_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="QWENCLOUD_CODING_API_KEY"+ qwencloud_coding_api_keys: ApiKeyList = Field(+ default=(), validation_alias="QWENCLOUD_CODING_API_KEY")# ==================== Together AI (OpenAI-compatible) ====================- together_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="TOGETHER_API_KEY"+ together_api_keys: ApiKeyList = Field(+ default=(), validation_alias="TOGETHER_API_KEY")# ==================== DeepInfra (OpenAI-compatible) ====================- deepinfra_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="DEEPINFRA_API_KEY"+ deepinfra_api_keys: ApiKeyList = Field(+ default=(), validation_alias="DEEPINFRA_API_KEY")# ==================== SiliconFlow (OpenAI-compatible) ====================- siliconflow_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="SILICONFLOW_API_KEY"+ siliconflow_api_keys: ApiKeyList = Field(+ default=(), validation_alias="SILICONFLOW_API_KEY")# ==================== Nebius Token Factory (OpenAI-compatible) ====================- nebius_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="NEBIUS_API_KEY"- )+ nebius_api_keys: ApiKeyList = Field(default=(), validation_alias="NEBIUS_API_KEY")# ==================== Chutes (OpenAI-compatible) ====================- chutes_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="CHUTES_API_KEY"- )+ chutes_api_keys: ApiKeyList = Field(default=(), validation_alias="CHUTES_API_KEY")# ==================== Featherless AI (OpenAI-compatible) ====================- featherless_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="FEATHERLESS_API_KEY"+ featherless_api_keys: ApiKeyList = Field(+ default=(), validation_alias="FEATHERLESS_API_KEY")# ==================== Agnes AI (OpenAI-compatible) ====================- agnes_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="AGNES_API_KEY"- )+ agnes_api_keys: ApiKeyList = Field(default=(), validation_alias="AGNES_API_KEY")# ==================== ZenMux (OpenAI-compatible) ====================- zenmux_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="ZENMUX_API_KEY"- )+ zenmux_api_keys: ApiKeyList = Field(default=(), validation_alias="ZENMUX_API_KEY")# ==================== W&B Inference (OpenAI-compatible) ====================- wandb_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="WANDB_API_KEY"- )+ wandb_api_keys: ApiKeyList = Field(default=(), validation_alias="WANDB_API_KEY")# ==================== Cerebras Inference (OpenAI-compatible) ====================- cerebras_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="CEREBRAS_API_KEY"+ cerebras_api_keys: ApiKeyList = Field(+ default=(), validation_alias="CEREBRAS_API_KEY")# ==================== Scaleway (OpenAI-compatible) ====================- scw_secret_key: OptionalNonEmptyString = Field(- default=None, validation_alias="SCW_SECRET_KEY"- )+ scw_secret_keys: ApiKeyList = Field(default=(), validation_alias="SCW_SECRET_KEY")# ==================== Ollama Cloud ====================- ollama_api_key: OptionalNonEmptyString = Field(- default=None, validation_alias="OLLAMA_API_KEY"- )+ ollama_api_keys: ApiKeyList = Field(default=(), validation_alias="OLLAMA_API_KEY")# ==================== Messaging Platform Selection ====================# Valid: "telegram" | "discord" | "none"@@ -402,8 +357,8 @@ class Settings(BaseModel):)# ==================== NVIDIA NIM Config ====================- nvidia_nim_api_key: OptionalNonEmptyString = Field(- default=None,+ nvidia_nim_api_keys: ApiKeyList = Field(+ default=(),validation_alias="NVIDIA_NIM_API_KEY",)@@ -901,7 +856,7 @@ class Settings(BaseModel):if (self.voice_note_enabledand self.whisper_device == "nvidia_nim"- and self.nvidia_nim_api_key is None+ and not self.nvidia_nim_api_keys):raise ValueError("NVIDIA_NIM_API_KEY is required when WHISPER_DEVICE is 'nvidia_nim'. "diff --git a/src/free_claude_code/core/trace.py b/src/free_claude_code/core/trace.pyindex 38077b57..8d2a2034 100644--- a/src/free_claude_code/core/trace.py+++ b/src/free_claude_code/core/trace.py@@ -26,12 +26,14 @@ _SECRET_VALUE_KEYS = frozenset("api-key","anthropic-auth-token","api_key",+ "api_keys","password","secret","token","bearer_token","openapi_token","nvidia-api-key",+ "aws_bearer_token_bedrock",))@@ -41,7 +43,17 @@ def sanitize_trace_value(obj: Any) -> Any:if isinstance(obj, Mapping):out: dict[str, Any] = {}for k, v in obj.items():- if str(k).lower() in _SECRET_VALUE_KEYS:+ name = str(k).lower()+ if name in _SECRET_VALUE_KEYS or name.replace("-", "_").endswith(+ (+ "_api_key",+ "_api_keys",+ "_api_token",+ "_api_tokens",+ "_secret_key",+ "_secret_keys",+ )+ ):out[str(k)] = "<redacted>"else:out[str(k)] = sanitize_trace_value(v)diff --git a/src/free_claude_code/providers/credential_validation.py b/src/free_claude_code/providers/credential_validation.pyindex 2b4d293e..cc332b0e 100644--- a/src/free_claude_code/providers/credential_validation.py+++ b/src/free_claude_code/providers/credential_validation.py@@ -7,18 +7,18 @@ Failure defaults to unverified; rejection requires provider-specific evidence.import asynciofrom collections.abc import Callable, Mapping-from dataclasses import dataclass+from dataclasses import dataclass, replacefrom enum import StrEnumimport httpx+from free_claude_code.config.admin.credentials import CredentialSubmissionfrom free_claude_code.config.provider_catalog import PROVIDER_CATALOGfrom free_claude_code.config.settings import Settingsfrom free_claude_code.core.json_types import JsonValuefrom free_claude_code.providers.runtime.config import string_settingREQUEST_TIMEOUT = 5.0-BATCH_TIMEOUT = 10.0MAX_CONCURRENCY = 8@@ -33,6 +33,8 @@ class CredentialCheck:key: strstatus: CredentialStatusmessage: str+ index: int = 0+ provider_id: str | None = Nonedef _field(payload: JsonValue, name: str) -> JsonValue:@@ -263,11 +265,10 @@ def _interpret(key: str, probe: _Probe, response: httpx.Response) -> CredentialC)-async def _check_one(settings: Settings, key: str, probe: _Probe) -> CredentialCheck:+async def _check_one(+ settings: Settings, key: str, probe: _Probe, credential: str+) -> CredentialCheck:descriptor = PROVIDER_CATALOG[probe.provider_id]- credential = string_setting(settings, descriptor.credential_attr)- if not credential:- return _unverified(key, "No API key to verify.")base = (string_setting(settings, descriptor.base_url_attr)or descriptor.default_base_url@@ -307,36 +308,42 @@ async def _check_one(settings: Settings, key: str, probe: _Probe) -> CredentialCasync def check_credentials(- settings: Settings, changed_keys: tuple[str, ...]+ settings: Settings, submissions: tuple[CredentialSubmission, ...]) -> tuple[CredentialCheck, ...]:- """Check distinct edited credentials without touching runtime or model state."""- credential_keys = {- descriptor.credential_env- for descriptor in PROVIDER_CATALOG.values()- if not descriptor.local and descriptor.credential_env is not None- }- keys = tuple(sorted(set(changed_keys) & credential_keys))- results = {- key: _unverified(- key,- "The key check timed out."- if key in _PROBE_BY_KEY- else "Automatic key verification is unavailable for this provider.",+ """Check every submitted entry with bounded workers and per-attempt timeouts."""+ entries = [+ (submission, index, credential)+ for submission in submissions+ for index, credential in enumerate(submission.credentials)+ ]+ results = [+ CredentialCheck(+ submission.key,+ CredentialStatus.UNVERIFIED,+ "Automatic key verification is unavailable for this provider.",+ index,+ submission.provider_id,)- for key in keys- }- semaphore = asyncio.Semaphore(MAX_CONCURRENCY)-- async def run(key: str, probe: _Probe) -> None:- async with semaphore:- results[key] = await _check_one(settings, key, probe)-- try:- async with asyncio.timeout(BATCH_TIMEOUT):- async with asyncio.TaskGroup() as group:- for key in keys:- if probe := _PROBE_BY_KEY.get(key):- group.create_task(run(key, probe))- except TimeoutError:- pass # Finished results survive; unfinished checks retain their warning.- return tuple(results[key] for key in keys)+ for submission, index, _ in entries+ ]+ pending = iter(enumerate(entries))++ async def run() -> None:+ for result_index, (submission, index, credential) in pending:+ probe = (+ _PROBE_BY_KEY.get(submission.key)+ if submission.provider_id is None+ else None+ )+ if probe is not None:+ check = await _check_one(+ settings, submission.key, probe, credential.get_secret_value()+ )+ results[result_index] = replace(+ check, index=index, provider_id=submission.provider_id+ )++ async with asyncio.TaskGroup() as group:+ for _ in range(min(MAX_CONCURRENCY, len(entries))):+ group.create_task(run())+ return tuple(results)diff --git a/src/free_claude_code/providers/runtime/config.py b/src/free_claude_code/providers/runtime/config.pyindex 0c6a3dd4..26abe475 100644--- a/src/free_claude_code/providers/runtime/config.py+++ b/src/free_claude_code/providers/runtime/config.py@@ -1,6 +1,7 @@"""Provider configuration construction from neutral catalog metadata."""from free_claude_code.application.errors import ApplicationUnavailableError+from free_claude_code.config.api_keys import first_api_keyfrom free_claude_code.config.custom_providers import CustomProviderDefinitionfrom free_claude_code.config.provider_catalog import ProviderDescriptorfrom free_claude_code.config.settings import Settings@@ -22,7 +23,7 @@ def provider_credential(if descriptor.static_credential is not None:return descriptor.static_credentialif descriptor.credential_attr:- return string_setting(settings, descriptor.credential_attr)+ return first_api_key(getattr(settings, descriptor.credential_attr))return None@@ -32,7 +33,12 @@ def has_provider_configuration("""Return whether all provider-defining settings are present."""attrs = descriptor.configuration_attrs()if attrs:- return all(string_setting(settings, attr) for attr in attrs)+ return all(+ provider_credential(descriptor, settings)+ if attr == descriptor.credential_attr+ else string_setting(settings, attr)+ for attr in attrs+ )return descriptor.static_credential is not None@@ -69,7 +75,11 @@ def build_provider_config(f"{env_name} is not set. Add it in the Admin UI.")for attr in descriptor.required_settings_attrs:- if string_setting(settings, attr) is not None:+ if (+ provider_credential(descriptor, settings)+ if attr == descriptor.credential_attr+ else string_setting(settings, attr)+ ) is not None:continuefield = Settings.model_fields[attr]env_name = field.validation_alias or attr@@ -93,7 +103,7 @@ def build_custom_provider_config(definition: CustomProviderDefinition, settings: Settings) -> ProviderConfig:return ProviderConfig(- api_key=definition.api_key.get_secret_value() if definition.api_key else None,+ api_key=first_api_key(definition.api_keys),base_url=definition.base_url,proxy=None,http_read_timeout=settings.http_read_timeout,diff --git a/src/free_claude_code/runtime/application.py b/src/free_claude_code/runtime/application.pyindex 3d4611a7..a3efcda4 100644--- a/src/free_claude_code/runtime/application.py+++ b/src/free_claude_code/runtime/application.py@@ -288,13 +288,21 @@ class ApplicationRuntime:return prepared.applied_response() | {"credential_checks": []}assert prepared.settings is not None- checks = await check_credentials(prepared.settings, prepared.changed_keys)+ checks = await check_credentials(+ prepared.settings, prepared.credential_submissions+ )check_response: list[JsonObject] = [{"key": check.key,+ "index": check.index,"status": check.status.value,"message": check.message,}+ | (+ {"provider_id": check.provider_id}+ if check.provider_id is not None+ else {}+ )for check in checks]rejected = [@@ -304,7 +312,10 @@ class ApplicationRuntime:return prepared.validation_response() | {"applied": False,"valid": False,- "errors": [f"{check.key}: {check.message}" for check in rejected],+ "errors": [+ f"{check.key} Key {check.index + 1}: {check.message}"+ for check in rejected+ ],"pending_fields": [],"credential_checks": check_response,}diff --git a/src/free_claude_code/runtime/bootstrap.py b/src/free_claude_code/runtime/bootstrap.pyindex abdf7d6b..42bc553a 100644--- a/src/free_claude_code/runtime/bootstrap.py+++ b/src/free_claude_code/runtime/bootstrap.py@@ -8,6 +8,7 @@ from typing import TYPE_CHECKINGfrom free_claude_code.api.app import create_appfrom free_claude_code.api.ports import ApiServicesfrom free_claude_code.application.code_sessions import CodeService+from free_claude_code.config.api_keys import first_api_keyfrom free_claude_code.config.loader import ManagedConfigStorefrom free_claude_code.config.logging_config import configure_loggingfrom free_claude_code.config.paths import (@@ -138,7 +139,9 @@ async def _create_transcriber(settings: Settings) -> Transcriber | None:return partial(NvidiaNimTranscriber,model=settings.whisper_model,- api_key=_required_voice_key(settings.nvidia_nim_api_key),+ api_key=_required_voice_key(+ first_api_key(settings.nvidia_nim_api_keys)+ ),)from free_claude_code.messaging.transcription import TranscriptionService@@ -146,7 +149,7 @@ async def _create_transcriber(settings: Settings) -> Transcriber | None:TranscriptionService,model=settings.whisper_model,device=settings.whisper_device,- huggingface_api_key=settings.huggingface_api_key,+ huggingface_api_key=first_api_key(settings.huggingface_api_keys),)constructor = await run_sync_owned(load)diff --git a/src/free_claude_code/runtime/configuration.py b/src/free_claude_code/runtime/configuration.pyindex 5592113a..be1668bd 100644--- a/src/free_claude_code/runtime/configuration.py+++ b/src/free_claude_code/runtime/configuration.py@@ -1,6 +1,7 @@"""Worker boundary for managed configuration; runtime state stays on the loop."""from collections.abc import Mapping+from secrets import token_bytesfrom anyio import CapacityLimiter, to_thread@@ -19,6 +20,7 @@ from free_claude_code.core.json_types import JsonObjectclass ConfigurationService:def __init__(self, store: ManagedConfigStore) -> None:self._store = store+ self._revision_key = token_bytes(32)# Storage is serialized; its waiters must not exhaust FastAPI's worker pool.self._worker_limiter = CapacityLimiter(1)@@ -29,7 +31,7 @@ class ConfigurationService:snapshot = await to_thread.run_sync(self._store.read, limiter=self._worker_limiter)- return load_config_response(snapshot)+ return load_config_response(snapshot, revision_key=self._revision_key)async def admin_values(self) -> ValueState:snapshot = await to_thread.run_sync(@@ -46,12 +48,21 @@ class ConfigurationService:snapshot = await to_thread.run_sync(self._store.read, limiter=self._worker_limiter)- return prepare_admin_update(updates, snapshot, active_settings, custom_provider)+ return prepare_admin_update(+ updates,+ snapshot,+ active_settings,+ custom_provider,+ revision_key=self._revision_key,+ )async def commit(self, prepared: PreparedAdminUpdate) -> JsonObject:if not prepared.valid:raise ValueError("Cannot commit an invalid Admin update")await to_thread.run_sync(- self._store.commit, prepared.target_values, limiter=self._worker_limiter+ self._store.commit,+ prepared.target_values,+ prepared.expected,+ limiter=self._worker_limiter,)return prepared.applied_response()diff --git a/src/free_claude_code/runtime/diagnostics.py b/src/free_claude_code/runtime/diagnostics.pyindex bcfe216d..ca119acc 100644--- a/src/free_claude_code/runtime/diagnostics.py+++ b/src/free_claude_code/runtime/diagnostics.py@@ -187,7 +187,7 @@ def settings_report(settings: Settings, accounts: dict[str, str]) -> dict[str, A"configured": True,"referenced": definition.provider_id in referenced,"base_url": _url_summary(definition.base_url),- "api_key_configured": bool(definition.api_key),+ "api_key_configured": bool(definition.api_keys),"api_format": definition.api_format,"reasoning_format": definition.reasoning_format,"reasoning_history_format": definition.reasoning_history_format,diff --git a/tests/api/support.py b/tests/api/support.pyindex c5543727..d729394f 100644--- a/tests/api/support.py+++ b/tests/api/support.py@@ -11,15 +11,34 @@ from free_claude_code.application.code_sessions import CodeApplicationPortfrom free_claude_code.application.connected_accounts import ConnectedAccountPortfrom free_claude_code.application.model_metadata import ProviderModelRefreshResultfrom free_claude_code.config.loader import ManagedConfigStore+from free_claude_code.config.provider_catalog import PROVIDER_CATALOGfrom free_claude_code.config.settings import Settingsfrom free_claude_code.providers.base import BaseProviderfrom free_claude_code.providers.runtime import ProviderRuntimefrom free_claude_code.runtime.application import ApplicationRuntime, RestartCallbackfrom free_claude_code.runtime.configuration import ConfigurationServicefrom free_claude_code.runtime.provider_manager import ProviderRuntimeManager+from tests.config.credential_support import credential_editfrom tests.web_tools_support import StubWebToolsClient+def post_config(client, path, *, json):+ values = json.get("values", {})+ credential_keys = {+ d.credential_env for d in PROVIDER_CATALOG.values() if d.credential_env+ }+ if credential_keys.intersection(values):+ config = client.get("/admin/api/config").json()+ fields = {field["key"]: field for field in config["fields"]}+ values = {+ key: credential_edit(fields[key]["value"], value)+ if key in credential_keys+ else value+ for key, value in values.items()+ }+ return client.post(path, json=json | {"values": values})++class ApiTestRuntime(ProviderRuntimeManager):"""API-only tests supply metadata explicitly; startup/discovery has separate tests."""diff --git a/tests/api/test_admin.py b/tests/api/test_admin.pyindex 26666b5b..507bf179 100644--- a/tests/api/test_admin.py+++ b/tests/api/test_admin.py@@ -1,3 +1,4 @@+import jsonimport mimetypesfrom dataclasses import replacefrom pathlib import Path@@ -17,13 +18,22 @@ from free_claude_code.application.model_metadata import (ProviderModelRefreshResult,)from free_claude_code.config.admin.values import MASKED_SECRET-from free_claude_code.config.env_files import dotenv_values_from_file+from free_claude_code.config.api_keys import normalize_api_keys+from free_claude_code.config.env_files import (+ dotenv_values_from_file,+ dotenv_values_from_text,+)from free_claude_code.config.model_refs import ModelFallback, decode_model_fallbacksfrom free_claude_code.config.provider_catalog import PROVIDER_CATALOGfrom free_claude_code.config.server_urls import local_admin_urlfrom free_claude_code.config.settings import Settingsfrom free_claude_code.core.version import package_version-from tests.api.support import create_test_app, provider_manager_for_app, runtime_for_app+from tests.api.support import (+ create_test_app,+ post_config,+ provider_manager_for_app,+ runtime_for_app,+)def _local_client(app):@@ -74,7 +84,8 @@ def test_admin_retirement_preview_apply_and_runtime_agree(monkeypatch, tmp_path)monkeypatch.setenv("MODEL_OPUS", "github_models/retired-process")app = create_test_app()client = _local_client(app)- body = client.post(+ body = post_config(+ client,"/admin/api/config/apply",json={"values": {@@ -845,7 +856,7 @@ def test_admin_models_include_configured_and_cached_canonical_slugs():settings = Settings()settings.model = "nvidia_nim/configured-model"settings.model_opus = "open_router/anthropic/configured-opus"- settings.open_router_api_key = "open-router-key"+ settings.open_router_api_keys = normalize_api_keys("open-router-key")app = create_test_app(settings)provider_manager_for_app(app).cache_model_infos("open_router",@@ -873,7 +884,7 @@ def test_admin_models_include_configured_and_cached_canonical_slugs():def test_admin_model_refresh_returns_the_updated_canonical_catalog():settings = Settings()settings.model = "deepseek/deepseek-chat"- settings.deepseek_api_key = "deepseek-key"+ settings.deepseek_api_keys = normalize_api_keys("deepseek-key")app = create_test_app(settings)runtime = app.state.services.admin@@ -943,7 +954,8 @@ def test_admin_apply_persists_open_browser_for_next_launch(monkeypatch, tmp_path_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"FCC_OPEN_BROWSER": False}},)@@ -967,7 +979,8 @@ def test_admin_apply_hot_publishes_provider_progress_timeout(monkeypatch, tmp_pa_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"PROVIDER_PROGRESS_TIMEOUT": 900}},)@@ -991,7 +1004,8 @@ def test_admin_apply_hot_publishes_ordered_model_fallbacks(monkeypatch, tmp_pathapp = create_test_app()value = "open_router/vendor/model-a,groq/vendor/model-b"- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"MODEL_FALLBACKS": value}},)@@ -1030,7 +1044,8 @@ def test_admin_apply_null_removes_model_fallbacks(monkeypatch, tmp_path):)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"MODEL_FALLBACKS": None}},)@@ -1049,7 +1064,8 @@ def test_admin_rejects_invalid_provider_progress_timeout_without_writing(_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"PROVIDER_PROGRESS_TIMEOUT": 0}},)@@ -1069,7 +1085,8 @@ def test_admin_apply_masks_telegram_proxy_credentials(monkeypatch, tmp_path):app = create_test_app()proxy_url = "https://user:[email protected]:8443"- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"TELEGRAM_PROXY_URL": proxy_url}},)@@ -1095,7 +1112,8 @@ def test_admin_apply_null_removes_optional_secret(monkeypatch, tmp_path):)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"TELEGRAM_PROXY_URL": None}},)@@ -1121,14 +1139,19 @@ def test_admin_apply_masked_or_blank_secret_is_unchanged()app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"OPENROUTER_API_KEY": submitted}},)assert response.status_code == 200assert response.json()["applied"] is True- assert "OPENROUTER_API_KEY=original-secret" in env_file.read_text(encoding="utf-8")+ assert json.loads(+ dotenv_values_from_text(env_file.read_text(encoding="utf-8"))[+ "OPENROUTER_API_KEY"+ ]+ ) == ["original-secret"]def test_admin_apply_rejects_bad_model_shape(monkeypatch, tmp_path):@@ -1136,7 +1159,8 @@ def test_admin_apply_rejects_bad_model_shape(monkeypatch, tmp_path):_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"MODEL": "missing-provider-prefix"}},)@@ -1154,7 +1178,8 @@ def test_admin_apply_rejects_duplicate_model_fallbacks(monkeypatch, tmp_path):app = create_test_app()duplicate = "groq/vendor/model,groq/vendor/model"- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"MODEL_FALLBACKS": duplicate}},)@@ -1176,7 +1201,8 @@ def test_admin_apply_rejects_invalid_catalog_provider_proxy(_clear_process_config(monkeypatch)invalid_proxy = "not-a-proxy://user:[email protected]:8080"- response = _local_client(create_test_app()).post(+ response = post_config(+ _local_client(create_test_app()),"/admin/api/config/apply",json={"values": {proxy_key: invalid_proxy}},)@@ -1209,7 +1235,8 @@ def test_admin_apply_accepts_httpx_provider_proxy(monkeypatch, tmp_path, proxy):_set_home(monkeypatch, tmp_path)_clear_process_config(monkeypatch)- response = _local_client(create_test_app()).post(+ response = post_config(+ _local_client(create_test_app()),"/admin/api/config/apply",json={"values": {"OPENAI_PROXY": proxy}},)@@ -1233,7 +1260,8 @@ def test_admin_apply_rejects_unusable_provider_proxy(monkeypatch, tmp_path, prox_set_home(monkeypatch, tmp_path)_clear_process_config(monkeypatch)- response = _local_client(create_test_app()).post(+ response = post_config(+ _local_client(create_test_app()),"/admin/api/config/apply",json={"values": {"OPENAI_PROXY": proxy}},)@@ -1266,7 +1294,8 @@ def test_admin_apply_rejects_invalid_provider_proxy_without_side_effects(baseline = env_file.read_bytes()invalid_proxy = "invalid://user:[email protected]:8080"- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"OPENAI_PROXY": invalid_proxy}},)@@ -1297,7 +1326,8 @@ def test_admin_apply_validates_retained_proxy_and_allows_removal(_local_client(app).get("/admin/api/config")baseline = env_file.read_bytes()- rejected = _local_client(app).post(+ rejected = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"MODEL": "open_router/test-model"}},)@@ -1306,7 +1336,8 @@ def test_admin_apply_validates_retained_proxy_and_allows_removal(assert rejected.json()["applied"] is Falseassert env_file.read_bytes() == baseline- removed = _local_client(app).post(+ removed = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"GROQ_PROXY": None}},)@@ -1331,7 +1362,8 @@ def test_admin_apply_preserves_valid_stored_proxy_secret(encoding="utf-8",)- response = _local_client(create_test_app()).post(+ response = post_config(+ _local_client(create_test_app()),"/admin/api/config/apply",json={"values": {"OPENAI_PROXY": submitted}},)@@ -1351,7 +1383,8 @@ def test_admin_apply_writes_complete_managed_env_and_masks_preview(_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {@@ -1368,7 +1401,9 @@ def test_admin_apply_writes_complete_managed_env_and_masks_preview(env_file = tmp_path / ".fcc" / ".env"text = env_file.read_text("utf-8")assert "MODEL=open_router/test-model" in text- assert "OPENROUTER_API_KEY=router-secret" in text+ assert json.loads(dotenv_values_from_text(text)["OPENROUTER_API_KEY"]) == [+ "router-secret"+ ]assert "ANTHROPIC_AUTH_TOKEN=" not in textassert "PROXY_AUTH_ENABLED=" not in textassert "HOST=" not in text@@ -1386,7 +1421,8 @@ def test_admin_apply_writes_fireworks_key_and_masks_preview(monkeypatch, tmp_pat_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {@@ -1403,7 +1439,9 @@ def test_admin_apply_writes_fireworks_key_and_masks_preview(monkeypatch, tmp_patenv_file = tmp_path / ".fcc" / ".env"text = env_file.read_text(encoding="utf-8")assert "MODEL=fireworks/test-model" in text- assert "FIREWORKS_API_KEY=fw-secret" in text+ assert json.loads(dotenv_values_from_text(text)["FIREWORKS_API_KEY"]) == [+ "fw-secret"+ ]def test_admin_apply_writes_gemini_key_and_masks_preview(monkeypatch, tmp_path):@@ -1411,7 +1449,8 @@ def test_admin_apply_writes_gemini_key_and_masks_preview(monkeypatch, tmp_path):_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {@@ -1428,7 +1467,7 @@ def test_admin_apply_writes_gemini_key_and_masks_preview(monkeypatch, tmp_path):env_file = tmp_path / ".fcc" / ".env"text = env_file.read_text(encoding="utf-8")assert "MODEL=gemini/models/gemini-3.1-flash-lite" in text- assert "GEMINI_API_KEY=gm-secret" in text+ assert json.loads(dotenv_values_from_text(text)["GEMINI_API_KEY"]) == ["gm-secret"]def test_admin_apply_writes_groq_key_and_masks_preview(monkeypatch, tmp_path):@@ -1436,7 +1475,8 @@ def test_admin_apply_writes_groq_key_and_masks_preview(monkeypatch, tmp_path):_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {@@ -1453,7 +1493,7 @@ def test_admin_apply_writes_groq_key_and_masks_preview(monkeypatch, tmp_path):env_file = tmp_path / ".fcc" / ".env"text = env_file.read_text(encoding="utf-8")assert "MODEL=groq/llama-3.3-70b-versatile" in text- assert "GROQ_API_KEY=gq-secret" in text+ assert json.loads(dotenv_values_from_text(text)["GROQ_API_KEY"]) == ["gq-secret"]def test_admin_apply_writes_sambanova_key_and_masks_preview(monkeypatch, tmp_path):@@ -1461,7 +1501,8 @@ def test_admin_apply_writes_sambanova_key_and_masks_preview(monkeypatch, tmp_pat_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {@@ -1478,7 +1519,9 @@ def test_admin_apply_writes_sambanova_key_and_masks_preview(monkeypatch, tmp_patenv_file = tmp_path / ".fcc" / ".env"text = env_file.read_text(encoding="utf-8")assert "MODEL=sambanova/Meta-Llama-3.3-70B-Instruct" in text- assert "SAMBANOVA_API_KEY=sn-secret" in text+ assert json.loads(dotenv_values_from_text(text)["SAMBANOVA_API_KEY"]) == [+ "sn-secret"+ ]def test_admin_apply_writes_cerebras_key_and_masks_preview(monkeypatch, tmp_path):@@ -1486,7 +1529,8 @@ def test_admin_apply_writes_cerebras_key_and_masks_preview(monkeypatch, tmp_path_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {@@ -1503,7 +1547,9 @@ def test_admin_apply_writes_cerebras_key_and_masks_preview(monkeypatch, tmp_pathenv_file = tmp_path / ".fcc" / ".env"text = env_file.read_text(encoding="utf-8")assert "MODEL=cerebras/llama3.1-8b" in text- assert "CEREBRAS_API_KEY=cb-secret" in text+ assert json.loads(dotenv_values_from_text(text)["CEREBRAS_API_KEY"]) == [+ "cb-secret"+ ]def test_admin_apply_writes_bedrock_region_config_and_masks_key(monkeypatch, tmp_path):@@ -1511,7 +1557,8 @@ def test_admin_apply_writes_bedrock_region_config_and_masks_key(monkeypatch, tmp_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {@@ -1529,7 +1576,9 @@ def test_admin_apply_writes_bedrock_region_config_and_masks_key(monkeypatch, tmpenv_file = tmp_path / ".fcc" / ".env"text = env_file.read_text(encoding="utf-8")assert "MODEL=bedrock/openai.gpt-oss-120b" in text- assert "AWS_BEARER_TOKEN_BEDROCK=bedrock-secret" in text+ assert json.loads(dotenv_values_from_text(text)["AWS_BEARER_TOKEN_BEDROCK"]) == [+ "bedrock-secret"+ ]assert "BEDROCK_BASE_URL=https://bedrock-mantle.us-west-2.api.aws/v1" in text@@ -1538,7 +1587,8 @@ def test_admin_apply_writes_cloudflare_fields_and_masks_preview(monkeypatch, tmp_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {@@ -1557,7 +1607,9 @@ def test_admin_apply_writes_cloudflare_fields_and_masks_preview(monkeypatch, tmpenv_file = tmp_path / ".fcc" / ".env"text = env_file.read_text(encoding="utf-8")assert "MODEL=cloudflare/@cf/moonshotai/kimi-k2.6" in text- assert "CLOUDFLARE_API_TOKEN=cf-secret" in text+ assert json.loads(dotenv_values_from_text(text)["CLOUDFLARE_API_TOKEN"]) == [+ "cf-secret"+ ]assert "CLOUDFLARE_ACCOUNT_ID=cf-account" in text@@ -1566,7 +1618,8 @@ def test_admin_apply_writes_huggingface_key_and_masks_preview(monkeypatch, tmp_p_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {@@ -1584,7 +1637,9 @@ def test_admin_apply_writes_huggingface_key_and_masks_preview(monkeypatch, tmp_penv_file = tmp_path / ".fcc" / ".env"text = env_file.read_text(encoding="utf-8")assert "MODEL=huggingface/openai/gpt-oss-120b:fastest" in text- assert "HUGGINGFACE_API_KEY=hf-secret" in text+ assert json.loads(dotenv_values_from_text(text)["HUGGINGFACE_API_KEY"]) == [+ "hf-secret"+ ]@pytest.mark.parametrize(@@ -1617,7 +1672,8 @@ def test_admin_key_change_requires_restart_for_active_voice_backend()app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {credential_key: "new-key"}},)@@ -1661,7 +1717,8 @@ def test_admin_constructor_captured_setting_requires_restart(env_file.write_text(f"{key}={initial}\n", encoding="utf-8")app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {key: updated}},)@@ -1683,7 +1740,8 @@ def test_admin_apply_writes_cohere_key_and_masks_preview(monkeypatch, tmp_path):_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {@@ -1700,7 +1758,9 @@ def test_admin_apply_writes_cohere_key_and_masks_preview(monkeypatch, tmp_path):env_file = tmp_path / ".fcc" / ".env"text = env_file.read_text(encoding="utf-8")assert "MODEL=cohere/command-a-plus-05-2026" in text- assert "COHERE_API_KEY=cohere-secret" in text+ assert json.loads(dotenv_values_from_text(text)["COHERE_API_KEY"]) == [+ "cohere-secret"+ ]def test_admin_apply_replaces_retired_model_and_ignores_retired_credential(@@ -1710,7 +1770,8 @@ def test_admin_apply_replaces_retired_model_and_ignores_retired_credential(_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {@@ -1750,7 +1811,8 @@ def test_admin_apply_preserves_hidden_diagnostics_and_smoke_values()app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"MODEL": "open_router/test-model"}},)@@ -1782,7 +1844,8 @@ def test_admin_apply_preserves_unrecognized_managed_zai_base_url(monkeypatch, tm)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"MODEL": "zai/glm-5.2"}},)@@ -1791,7 +1854,7 @@ def test_admin_apply_preserves_unrecognized_managed_zai_base_url(monkeypatch, tmbody = response.json()assert body["applied"] is Truetext = env_file.read_text("utf-8")- assert "ZAI_API_KEY=zai-secret" in text+ assert json.loads(dotenv_values_from_text(text)["ZAI_API_KEY"]) == ["zai-secret"]assert "ZAI_BASE_URL=https://custom.zai.invalid/v1" in text@@ -1813,7 +1876,8 @@ def test_admin_apply_preserves_unrecognized_managed_assignments(monkeypatch, tmp)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"MODEL": "open_router/test-model"}},)@@ -1838,7 +1902,8 @@ def test_admin_apply_restart_required_reports_automatic_restart(monkeypatch, tmpapp = create_test_app(restart_callback=restart_callback)instance_id = _local_client(app).get("/admin/api/status").json()["instance_id"]- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"PORT": "9090"}},)@@ -1886,7 +1951,8 @@ def test_admin_apply_restart_required_reports_manual_fallback(monkeypatch, tmp_p_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"PORT": "9091"}},)@@ -1915,7 +1981,9 @@ def test_restart_signal_failure_reports_saved_config_and_manual_restart(app = create_test_app(restart_callback=restart_callback)client = _local_client(app)original_port = client.get("/admin/api/status").json()["port"]- response = client.post("/admin/api/config/apply", json={"values": {"PORT": "9090"}})+ response = post_config(+ client, "/admin/api/config/apply", json={"values": {"PORT": "9090"}}+ )assert response.status_code == 200body = response.json()@@ -1958,10 +2026,12 @@ def test_pending_restart_survives_later_apply()app = create_test_app(settings, restart_callback=callback)client = _local_client(app)- assert client.post(- "/admin/api/config/apply", json={"values": {"PORT": "9090"}}+ assert post_config(+ client, "/admin/api/config/apply", json={"values": {"PORT": "9090"}}).json()["restart"]["required"]- result = client.post("/admin/api/config/apply", json={"values": followup}).json()+ result = post_config(+ client, "/admin/api/config/apply", json={"values": followup}+ ).json()fields = ["PORT", "LOG_LEVEL"] if "LOG_LEVEL" in followup else ["PORT"]assert result["applied"] is Trueassert result["restart"]["required"] is True@@ -1987,9 +2057,10 @@ def test_reverting_pending_restart_restores_hot_apply(monkeypatch, tmp_path):callback = MagicMock(side_effect=RuntimeError("restart failed"))app = create_test_app(settings, restart_callback=callback)client = _local_client(app)- client.post("/admin/api/config/apply", json={"values": {"PORT": "9090"}})+ post_config(client, "/admin/api/config/apply", json={"values": {"PORT": "9090"}})with patch.object(provider_manager_for_app(app), "_start_pass", MagicMock()):- result = client.post(+ result = post_config(+ client,"/admin/api/config/apply",json={"values": {"PORT": str(settings.port), "MODEL": "nvidia_nim/new"}},).json()@@ -2013,7 +2084,8 @@ def test_admin_process_env_values_are_locked_and_not_written(monkeypatch, tmp_paassert model_field["locked"] is Trueassert model_field["source"] == "process"- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"MODEL": "deepseek/managed-model"}},)@@ -2036,7 +2108,8 @@ def test_admin_process_model_fallbacks_are_locked_and_not_written(assert field["locked"] is Trueassert field["source"] == "process"- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"MODEL_FALLBACKS": "groq/managed-model"}},)@@ -2061,7 +2134,8 @@ def test_admin_never_reads_arbitrary_current_directory_env(monkeypatch, tmp_pathassert model_field["value"] == "nvidia_nim/nvidia/nemotron-3-super-120b-a12b"assert model_field["source"] == "default"- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {}},)@@ -2083,7 +2157,8 @@ def test_admin_migration_removes_blank_required_managed_values(monkeypatch, tmp_)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"NVIDIA_NIM_API_KEY": "nim-secret"}},)@@ -2091,7 +2166,9 @@ def test_admin_migration_removes_blank_required_managed_values(monkeypatch, tmp_assert response.status_code == 200assert response.json()["applied"] is Truemanaged_text = (tmp_path / ".fcc" / ".env").read_text("utf-8")- assert "NVIDIA_NIM_API_KEY=nim-secret" in managed_text+ assert json.loads(dotenv_values_from_text(managed_text)["NVIDIA_NIM_API_KEY"]) == [+ "nim-secret"+ ]assert "MESSAGING_PLATFORM=" not in managed_textassert "WHISPER_DEVICE=" not in managed_text@@ -2109,7 +2186,8 @@ def test_admin_migrates_empty_auth_token_to_explicit_disabled_state()app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"PROVIDER_RATE_LIMIT": "2"}},)@@ -2146,7 +2224,8 @@ def test_admin_apply_rejects_missing_required_value_without_writing(_local_client(app).get("/admin/api/config")baseline = env_file.read_bytes()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {"MESSAGING_PLATFORM": submitted}},)@@ -2164,7 +2243,8 @@ def test_admin_apply_preserves_false_and_numeric_zero(monkeypatch, tmp_path):_clear_process_config(monkeypatch)app = create_test_app()- response = _local_client(app).post(+ response = post_config(+ _local_client(app),"/admin/api/config/apply",json={"values": {diff --git a/tests/api/test_api_key_lists.py b/tests/api/test_api_key_lists.pynew file mode 100644index 00000000..9739088a--- /dev/null+++ b/tests/api/test_api_key_lists.py@@ -0,0 +1,161 @@+"""Apply checks explicit rows and commits only a fresh, entirely valid draft."""++import asyncio+import json+from unittest.mock import AsyncMock++import httpx+import pytest+from fastapi.testclient import TestClient++from free_claude_code.config.loader import ManagedConfigStore+from free_claude_code.providers.credential_validation import (+ CredentialCheck,+ CredentialStatus,+)+from tests.api.support import create_test_app, provider_manager_for_app, runtime_for_app+++def client_for(app):+ return TestClient(app, base_url="http://127.0.0.1", client=("127.0.0.1", 50000))+++def edit(client, key, entries):+ field = next(+ field+ for field in client.get("/admin/api/config").json()["fields"]+ if field["key"] == key+ )+ return {"revision": field["value"]["revision"], "entries": entries}+++def test_rejected_inactive_key_prevents_all_writes_and_checks_keep_row_identity(+ monkeypatch,+):+ app = create_test_app()+ client = client_for(app)+ store = ManagedConfigStore()+ before = store.path.read_bytes()+ checks = AsyncMock(+ return_value=(+ CredentialCheck("GROQ_API_KEY", CredentialStatus.VERIFIED, "Accepted", 0),+ CredentialCheck("GROQ_API_KEY", CredentialStatus.REJECTED, "Rejected", 1),+ )+ )+ monkeypatch.setattr(+ "free_claude_code.runtime.application.check_credentials", checks+ )+ payload = {+ "values": {+ "GROQ_API_KEY": edit(+ client,+ "GROQ_API_KEY",+ [{"value": "active-private"}, {"value": "inactive-private"}],+ ),+ "HTTP_READ_TIMEOUT": "181",+ }+ }+ response = client.post("/admin/api/config/apply", json=payload)+ assert response.status_code == 200+ body = response.json()+ assert not body["applied"]+ assert [check["index"] for check in body["credential_checks"]] == [0, 1]+ assert store.path.read_bytes() == before+ assert provider_manager_for_app(app).current_generation_id == 1+ assert checks.await_args is not None+ assert (+ checks.await_args.args[1][0].credentials[1].get_secret_value()+ == "inactive-private"+ )+ assert "active-private" not in response.text+ assert "inactive-private" not in response.text+++def test_stale_revision_returns_conflict_without_checking_or_writing(monkeypatch):+ app = create_test_app()+ client = client_for(app)+ checks = AsyncMock(return_value=())+ monkeypatch.setattr(+ "free_claude_code.runtime.application.check_credentials", checks+ )+ stale = edit(client, "OPENAI_API_KEY", [{"value": "old-draft-private"}])+ current = edit(client, "OPENAI_API_KEY", [{"value": "saved-private"}])+ assert client.post(+ "/admin/api/config/apply", json={"values": {"OPENAI_API_KEY": current}}+ ).json()["applied"]+ before = ManagedConfigStore().path.read_bytes()+ checks.reset_mock()+ response = client.post(+ "/admin/api/config/apply", json={"values": {"OPENAI_API_KEY": stale}}+ )+ assert response.status_code == 409+ checks.assert_not_awaited()+ assert ManagedConfigStore().path.read_bytes() == before+ assert "old-draft-private" not in response.text+++async def test_intervening_managed_write_during_probe_cannot_publish_or_overwrite(+ monkeypatch,+):+ app = create_test_app()+ store = ManagedConfigStore()+ started, release = asyncio.Event(), asyncio.Event()++ async def held_checks(settings, submissions):+ started.set()+ await release.wait()+ return ()++ monkeypatch.setattr(+ "free_claude_code.runtime.application.check_credentials", held_checks+ )+ async with httpx.AsyncClient(+ transport=httpx.ASGITransport(app), base_url="http://127.0.0.1"+ ) as client:+ field = next(+ field+ for field in (await client.get("/admin/api/config")).json()["fields"]+ if field["key"] == "OPENAI_API_KEY"+ )+ payload = {+ "values": {+ "OPENAI_API_KEY": {+ "revision": field["value"]["revision"],+ "entries": [{"value": "probe-private"}],+ }+ }+ }+ request = asyncio.create_task(+ client.post("/admin/api/config/apply", json=payload)+ )+ await asyncio.wait_for(started.wait(), 5)+ store.commit(dict(store.read().managed) | {"HTTP_READ_TIMEOUT": "199"})+ before = store.path.read_bytes()+ release.set()+ response = await request+ assert response.status_code == 409+ assert store.path.read_bytes() == before+ assert provider_manager_for_app(app).current_generation_id == 1+ assert "probe-private" not in response.text+ await runtime_for_app(app).close()+++def test_malformed_custom_edit_does_not_echo_nested_credential_inputs():+ app = create_test_app()+ response = client_for(app).post(+ "/admin/api/config/apply",+ json={+ "custom_provider": {+ "values": {+ "api_keys": {+ "revision": None,+ "entries": [{"value": "malformed-private-sentinel"}],+ }+ }+ }+ },+ )+ assert response.status_code == 422+ assert "malformed-private-sentinel" not in response.text+ assert "input" not in json.dumps(response.json())diff --git a/tests/api/test_app_lifespan_and_errors.py b/tests/api/test_app_lifespan_and_errors.pyindex 2604732f..c3993351 100644--- a/tests/api/test_app_lifespan_and_errors.py+++ b/tests/api/test_app_lifespan_and_errors.py@@ -15,6 +15,8 @@ from free_claude_code.application.errors import (InvalidRequestError,)from free_claude_code.application.model_metadata import ProviderModelInfo+from free_claude_code.config.api_keys import normalize_api_keys+from free_claude_code.config.provider_catalog import PROVIDER_CATALOGfrom free_claude_code.config.settings import Settingsfrom free_claude_code.core.async_tasks import run_sync_ownedfrom free_claude_code.core.version import package_version@@ -33,6 +35,13 @@ from tests.api.support import create_test_appdef _settings(**updates: object) -> Settings:+ credential_attrs = {+ d.credential_attr for d in PROVIDER_CATALOG.values() if d.credential_attr+ }+ updates = {+ key: normalize_api_keys(value) if key in credential_attrs else value+ for key, value in updates.items()+ }return Settings().model_copy(update=updates)@@ -444,7 +453,7 @@ async def test_bootstrap_constructs_isolated_runtime_resource_graphs() -> None:settings = _settings(model="nvidia_nim/test-model",- nvidia_nim_api_key="test-key",+ nvidia_nim_api_keys="test-key",voice_note_enabled=True,whisper_device="cpu",)@@ -491,10 +500,26 @@ async def test_bootstrap_selects_nvidia_transcriber_without_loading_riva() -> Novoice_note_enabled=True,whisper_device="nvidia_nim",whisper_model="openai/whisper-large-v3",- nvidia_nim_api_key="nvapi-test",+ nvidia_nim_api_keys=["nvapi-first", "nvapi-tail"],)- assert isinstance((await _create_transcriber(settings)), NvidiaNimTranscriber)+ transcriber = await _create_transcriber(settings)+ assert isinstance(transcriber, NvidiaNimTranscriber)+ assert transcriber._key == "nvapi-first"+ await transcriber.close()+++async def test_bootstrap_supplies_only_first_key_to_local_model_downloads():+ settings = _settings(+ voice_note_enabled=True,+ whisper_device="cpu",+ huggingface_api_keys=["hf-first", "hf-tail"],+ )+ transcriber = await _create_transcriber(settings)+ assert isinstance(transcriber, TranscriptionService)+ assert transcriber._huggingface_api_key == "hf-first"+ await transcriber.close()@pytest.mark.asynciodiff --git a/tests/api/test_mistral_affinity.py b/tests/api/test_mistral_affinity.pyindex f652a91e..fa14efea 100644--- a/tests/api/test_mistral_affinity.py+++ b/tests/api/test_mistral_affinity.py@@ -48,7 +48,7 @@ async def mistral_wire(handler=None):app = create_test_app(Settings(model="mistral/mistral-large-latest",- mistral_api_key="test-mistral-key",+ mistral_api_keys="test-mistral-key",proxy_auth_enabled=False,),providers={"mistral": provider},diff --git a/tests/api/test_model_listing.py b/tests/api/test_model_listing.pyindex f388df8e..c92c2e67 100644--- a/tests/api/test_model_listing.py+++ b/tests/api/test_model_listing.py@@ -5,6 +5,7 @@ import pytestfrom fastapi.testclient import TestClientfrom free_claude_code.application.model_metadata import ProviderModelInfo+from free_claude_code.config.api_keys import normalize_api_keysfrom free_claude_code.config.custom_providers import CustomProviderDefinitionfrom free_claude_code.config.model_refs import ModelFallbackfrom free_claude_code.config.settings import Settings@@ -29,9 +30,9 @@ def _settings(model_fallbacks=model_fallbacks,proxy_auth_enabled=False,proxy_auth_token="freecc",- deepseek_api_key="deepseek-key",- open_router_api_key="open-router-key",- wafer_api_key="wafer-key",+ deepseek_api_keys=normalize_api_keys("deepseek-key"),+ open_router_api_keys=normalize_api_keys("open-router-key"),+ wafer_api_keys=normalize_api_keys("wafer-key"),)diff --git a/tests/api/test_opencode_session_headers.py b/tests/api/test_opencode_session_headers.pyindex 8daa2018..f6cf6d7a 100644--- a/tests/api/test_opencode_session_headers.py+++ b/tests/api/test_opencode_session_headers.py@@ -86,7 +86,7 @@ async def wire_client(provider_id="opencode_zen", handler=None):app = create_test_app(Settings(model=f"{provider_id}/responses-selector",- opencode_api_key="test_opencode_key",+ opencode_api_keys="test_opencode_key",proxy_auth_enabled=True,proxy_auth_token="fcc-private-token",),diff --git a/tests/api/test_ordinary_error_phases.py b/tests/api/test_ordinary_error_phases.pyindex 9498830e..53bebaea 100644--- a/tests/api/test_ordinary_error_phases.py+++ b/tests/api/test_ordinary_error_phases.py@@ -151,7 +151,7 @@ def test_missing_provider_credential_is_protocol_specific_503_without_terminal_happ = create_test_app(_settings(model="open_router/test-model",- open_router_api_key="",+ open_router_api_keys="",))diff --git a/tests/cli/test_config_restart_lifecycle.py b/tests/cli/test_config_restart_lifecycle.pyindex d01ed8ab..a3868329 100644--- a/tests/cli/test_config_restart_lifecycle.py+++ b/tests/cli/test_config_restart_lifecycle.py@@ -77,10 +77,10 @@ def test_supervised_http_apply_finishes_and_reconnects(monkeypatch, stop_during_entered, release = threading.Event(), threading.Event()commit = ManagedConfigStore.commit- def blocked_commit(self, values):+ def blocked_commit(self, values, expected=None):entered.set()assert release.wait(10)- commit(self, values)+ commit(self, values, expected)def wait_status(client, old_id=None):deadline = time.monotonic() + 10diff --git a/tests/cli/test_entrypoints.py b/tests/cli/test_entrypoints.pyindex a922ff30..1389a822 100644--- a/tests/cli/test_entrypoints.py+++ b/tests/cli/test_entrypoints.py@@ -159,7 +159,7 @@ def test_server_startup_repairs_invalid_managed_provider_proxy(managed.write_text("\n".join((- "FCC_CONFIG_SCHEMA=1",+ "FCC_CONFIG_SCHEMA=2","MODEL=nvidia_nim/test-model",f"OPENAI_PROXY={invalid_proxy}","",@@ -270,7 +270,7 @@ def test_load_server_settings_leaves_process_owned_invalid_proxy_explicit(managed = managed_env_path()managed.parent.mkdir(parents=True)managed.write_text(- "FCC_CONFIG_SCHEMA=1\nOPENAI_PROXY=invalid://managed-proxy\n",+ "FCC_CONFIG_SCHEMA=2\nOPENAI_PROXY=invalid://managed-proxy\n",encoding="utf-8",)baseline = managed.read_bytes()diff --git a/tests/config/credential_support.py b/tests/config/credential_support.pynew file mode 100644index 00000000..129a5381--- /dev/null+++ b/tests/config/credential_support.py@@ -0,0 +1,16 @@+"""Build masked credential edits for existing configuration test fixtures."""+++def credential_edit(projection, value):+ if isinstance(value, dict):+ return value+ if value is None:+ entries = []+ elif isinstance(value, str) and (not value.strip() or value == "********"):+ entries = [{"retain": row["reference"]} for row in projection["entries"]]+ else:+ entries = [+ {"value": entry}+ for entry in (value if isinstance(value, list) else [value])+ ]+ return {"revision": projection["revision"], "entries": entries}diff --git a/tests/config/test_admin_api_keys.py b/tests/config/test_admin_api_keys.pynew file mode 100644index 00000000..01f74536--- /dev/null+++ b/tests/config/test_admin_api_keys.py@@ -0,0 +1,246 @@+"""Masked row references retain exact secrets and reject stale/invalid edits."""++import json++import pytest+from pydantic import SecretStr++from free_claude_code.config.admin.custom_providers import CustomProviderMutation+from free_claude_code.config.loader import ManagedConfigStore+from free_claude_code.config.provider_catalog import PROVIDER_CATALOG+from free_claude_code.runtime.configuration import ConfigurationService+++def service(monkeypatch):+ for descriptor in PROVIDER_CATALOG.values():+ if descriptor.credential_env:+ monkeypatch.delenv(descriptor.credential_env, raising=False)+ store = ManagedConfigStore()+ store.initialize()+ return ConfigurationService(store)+++async def key_edit(service, key, entries):+ public = await service.admin_config()+ field = next(item for item in public["fields"] if item["key"] == key)+ return {"revision": field["value"]["revision"], "entries": entries}+++async def save_keys(service, values):+ edit = await key_edit(+ service, "OPENAI_API_KEY", [{"value": value} for value in values]+ )+ prepared = await service.prepare(+ {"OPENAI_API_KEY": edit}, service._store.read().settings+ )+ assert prepared.valid+ await service.commit(prepared)+ assert "private-first" not in repr(service._store.read())+++async def test_reorder_replace_and_clear_masked_keys_round_trip(service):+ await save_keys(service, ["private-first", "private-second", "private-third"])+ edit = await key_edit(+ service,+ "OPENAI_API_KEY",+ [{"retain": 2}, {"value": "replacement"}, {"retain": 0}],+ )+ prepared = await service.prepare(+ {"OPENAI_API_KEY": edit}, service._store.read().settings+ )+ assert prepared.valid+ assert prepared.settings.openai_api_keys == tuple(+ map(SecretStr, ("private-third", "replacement", "private-first"))+ )+ await service.commit(prepared)+ public = await service.admin_config()+ assert "private-first" not in json.dumps(public)+ assert "private-third" not in json.dumps(public)+ assert "replacement" not in json.dumps(public)+ edit = await key_edit(service, "OPENAI_API_KEY", [])+ prepared = await service.prepare(+ {"OPENAI_API_KEY": edit}, service._store.read().settings+ )+ assert prepared.valid+ await service.commit(prepared)+ assert service._store.read().settings.openai_api_keys == ()+ assert "OPENAI_API_KEY" not in service._store.read().managed+++async def test_stale_masked_reference_cannot_replace_another_saved_key(service):+ await save_keys(service, ["one", "two"])+ stale = await key_edit(service, "OPENAI_API_KEY", [{"retain": 1}])+ await save_keys(service, ["new-one", "new-two"])+ before = service._store.path.read_bytes()+ with pytest.raises(ValueError, match="changed"):+ await service.prepare({"OPENAI_API_KEY": stale}, service._store.read().settings)+ assert service._store.path.read_bytes() == before+++async def test_references_are_bound_to_owner_and_server_lifetime(service):+ edit = await key_edit(service, "OPENAI_API_KEY", [{"value": "one"}])+ with pytest.raises(ValueError, match="changed"):+ await service.prepare({"GROQ_API_KEY": edit}, service._store.read().settings)+ replacement_service = ConfigurationService(service._store)+ with pytest.raises(ValueError, match="changed"):+ await replacement_service.prepare(+ {"OPENAI_API_KEY": edit}, service._store.read().settings+ )+++async def test_duplicate_retained_and_new_keys_highlights_both_rows(service):+ await save_keys(service, ["private-first"])+ edit = await key_edit(+ service,+ "OPENAI_API_KEY",+ [{"retain": 0}, {"value": " private-first "}, {"value": " "}],+ )+ prepared = await service.prepare(+ {"OPENAI_API_KEY": edit}, service._store.read().settings+ )+ assert not prepared.valid+ response = prepared.applied_response()+ assert {row["index"] for row in response["credential_row_errors"]} == {0, 1, 2}+ assert "private-first" not in json.dumps(response)+++ "entry",+ [+ {"retain": True},+ {"retain": -1},+ {"retain": 2},+ {"retain": 0, "value": "one"},+ {"value": 3},+ ],+)+async def test_invalid_entries_do_not_change_managed_credentials(service, entry):+ await save_keys(service, ["one"])+ edit = await key_edit(service, "OPENAI_API_KEY", [entry])+ before = service._store.path.read_bytes()+ prepared = await service.prepare(+ {"OPENAI_API_KEY": edit}, service._store.read().settings+ )+ assert not prepared.valid+ assert prepared.applied_response()["credential_row_errors"][0]["index"] == 0+ assert service._store.path.read_bytes() == before+++async def test_locked_lists_allow_check_submission_but_reject_mutation(+ service, monkeypatch+):+ monkeypatch.setenv("OPENAI_API_KEY", '["one","two"]')+ edit = await key_edit(service, "OPENAI_API_KEY", [{"retain": 0}, {"retain": 1}])+ prepared = await service.prepare(+ {"OPENAI_API_KEY": edit, "PORT": "8123"}, service._store.read().settings+ )+ assert prepared.valid+ assert "OPENAI_API_KEY" not in prepared.target_values+ assert prepared.credential_submissions[0].credentials == (+ SecretStr("one"),+ SecretStr("two"),+ )+ edit["entries"].reverse()+ rejected = await service.prepare(+ {"OPENAI_API_KEY": edit}, service._store.read().settings+ )+ assert not rejected.valid+++async def test_commit_rejects_other_prepared_write_and_preserves_newer_settings(+ service,+):+ active = service._store.read().settings+ first = await service.prepare({"PORT": "8123"}, active)+ second = await service.prepare({"HOST": "localhost"}, active)+ await service.commit(first)+ with pytest.raises(ValueError, match="changed"):+ await service.commit(second)+ assert service._store.read().settings.port == 8123+++async def test_commit_rejects_changed_process_ownership(service, monkeypatch):+ await save_keys(service, ["managed"])+ edit = await key_edit(service, "OPENAI_API_KEY", [{"value": "replacement"}])+ prepared = await service.prepare(+ {"OPENAI_API_KEY": edit}, service._store.read().settings+ )+ before = service._store.path.read_bytes()+ monkeypatch.setenv("OPENAI_API_KEY", "process")+ with pytest.raises(ValueError, match="changed"):+ await service.commit(prepared)+ assert service._store.path.read_bytes() == before+++async def test_custom_list_uses_same_masked_protocol(service):+ mutation = CustomProviderMutation(+ action="create",+ values={+ "display_name": "Custom",+ "base_url": "https://custom.example/v1",+ "api_keys": {+ "revision": None,+ "entries": [{"value": "custom-one"}, {"value": "custom-two"}],+ },+ },+ )+ prepared = await service.prepare({}, service._store.read().settings, mutation)+ assert prepared.valid+ await service.commit(prepared)+ public = await service.admin_config()+ definition = public["custom_providers"][0]+ assert "custom-one" not in json.dumps(public)+ edit = {+ "revision": definition["api_keys"]["revision"],+ "entries": [{"retain": 1}, {"retain": 0}],+ }+ prepared = await service.prepare(+ {},+ service._store.read().settings,+ CustomProviderMutation(+ action="update",+ provider_id=definition["provider_id"],+ values={"api_keys": edit},+ ),+ )+ assert prepared.valid+ assert prepared.settings.custom_providers[0].api_keys == (+ SecretStr("custom-two"),+ SecretStr("custom-one"),+ )+++ "device,key", [("nvidia_nim", "NVIDIA_NIM_API_KEY"), ("cpu", "HUGGINGFACE_API_KEY")]+)+async def test_voice_restart_uses_first_key_and_ignores_tail_edits(+ service, device, key+):+ edit = await key_edit(+ service, key, [{"value": "voice-first"}, {"value": "voice-tail"}]+ )+ prepared = await service.prepare(+ {key: edit, "VOICE_NOTE_ENABLED": "true", "WHISPER_DEVICE": device},+ service._store.read().settings,+ )+ assert prepared.valid+ await service.commit(prepared)+ active = service._store.read().settings+ edit = await key_edit(service, key, [{"retain": 0}, {"value": "new-tail"}])+ prepared = await service.prepare({key: edit}, active)+ assert prepared.valid and key not in prepared.pending_fields+ await service.commit(prepared)+ edit = await key_edit(service, key, [{"retain": 1}, {"retain": 0}])+ prepared = await service.prepare({key: edit}, active)+ assert prepared.valid and key in prepared.pending_fieldsdiff --git a/tests/config/test_admin_credential_changes.py b/tests/config/test_admin_credential_changes.pyindex 136fc4f0..4f3c6da9 100644--- a/tests/config/test_admin_credential_changes.py+++ b/tests/config/test_admin_credential_changes.py@@ -1,10 +1,29 @@-"""Only effective edits, against saved settings, request credential validation."""+"""Submitted lists request checks even when the stored credentials are unchanged."""++from pydantic import SecretStrfrom free_claude_code.config.admin.persistence import (prepare_admin_update,)-from free_claude_code.config.admin.values import MASKED_SECRET+from free_claude_code.config.admin.values import MASKED_SECRET, load_config_responsefrom free_claude_code.config.loader import ManagedConfigStore+from tests.config.credential_support import credential_edit+++def prepare(updates, snapshot, active):+ public = load_config_response(snapshot, revision_key=b"test-revision-key")+ rows = public["fields"]+ assert isinstance(rows, list)+ fields = {field["key"]: field for field in rows if isinstance(field, dict)}+ updates = {+ key: credential_edit(fields[key]["value"], value)+ if fields[key]["type"] == "api_key_list"+ else value+ for key, value in updates.items()+ }+ return prepare_admin_update(+ updates, snapshot, active, revision_key=b"test-revision-key"+ )def test_changed_keys_exclude_masks_noops_and_removals(monkeypatch):@@ -12,23 +31,23 @@ def test_changed_keys_exclude_masks_noops_and_removals(monkeypatch):store = ManagedConfigStore()store.initialize()active = store.read().settings- first = prepare_admin_update({"GROQ_API_KEY": " saved-key "}, store.read(), active)+ first = prepare({"GROQ_API_KEY": " saved-key "}, store.read(), active)assert first.validassert first.changed_keys == ("GROQ_API_KEY",)store.commit(first.target_values)# Compare to the saved value even if a running generation has not restarted.for value in ("saved-key", " saved-key ", MASKED_SECRET, "", " ", None):- prepared = prepare_admin_update({"GROQ_API_KEY": value}, store.read(), active)+ prepared = prepare({"GROQ_API_KEY": value}, store.read(), active)assert prepared.validassert prepared.changed_keys == ()- changed = prepare_admin_update(+ changed = prepare({"GROQ_API_KEY": "new-key", "GROQ_PROXY": "http://localhost:8080"},store.read(),active,)assert "GROQ_API_KEY" in changed.changed_keysassert changed.settings is not None- assert changed.settings.groq_api_key == "new-key"+ assert changed.settings.groq_api_keys == (SecretStr("new-key"),)assert changed.settings.groq_proxy == "http://localhost:8080"@@ -37,10 +56,9 @@ def test_process_locked_key_is_not_a_change(monkeypatch):store = ManagedConfigStore()store.initialize()active = store.read().settings- prepared = prepare_admin_update(- {"GROQ_API_KEY": "submitted-key"}, store.read(), active- )+ prepared = prepare({"GROQ_API_KEY": MASKED_SECRET}, store.read(), active)assert prepared.validassert prepared.changed_keys == ()assert prepared.settings is not None- assert prepared.settings.groq_api_key == "process-key"+ assert prepared.settings.groq_api_keys == (SecretStr("process-key"),)+ assert prepared.credential_submissions[0].credentials == (SecretStr("process-key"),)diff --git a/tests/config/test_api_keys.py b/tests/config/test_api_keys.pynew file mode 100644index 00000000..18effd52--- /dev/null+++ b/tests/config/test_api_keys.py@@ -0,0 +1,298 @@+"""Ordered credentials keep environment ownership and select only the first key."""++import json++import pytest+from pydantic import SecretStr, ValidationError++from free_claude_code.config.env_files import dotenv_values_from_file+from free_claude_code.config.env_migrations import quote_env_value+from free_claude_code.config.loader import (+ ConfigSource,+ ManagedConfigStore,+ compose_settings_snapshot,+)+from free_claude_code.config.provider_catalog import PROVIDER_CATALOG+from free_claude_code.config.settings import Settings+from free_claude_code.providers.runtime.config import (+ build_custom_provider_config,+ build_provider_config,+)+++ "descriptor",+ [provider for provider in PROVIDER_CATALOG.values() if provider.credential_env],+)+def test_every_catalog_owner_loads_an_ordered_secret_collection(descriptor):+ settings = Settings.model_validate(+ {descriptor.credential_env: '["primary", "extra"]'}+ )+ assert getattr(settings, descriptor.credential_attr) == (+ SecretStr("primary"),+ SecretStr("extra"),+ )++[email protected]("value", [" first ", '[" first "]'])+def test_single_key_input_normalizes_to_one_secret(value):+ settings = Settings(OPENAI_API_KEY=value)+ assert settings.openai_api_keys == (SecretStr("first"),)+ assert "first" not in repr(settings)+++def test_array_keeps_order_and_selects_only_first_at_provider_boundary():+ settings = Settings(OPENAI_API_KEY='["first", "second", "third"]')+ assert settings.openai_api_keys == tuple(+ map(SecretStr, ("first", "second", "third"))+ )+ assert (+ build_provider_config(PROVIDER_CATALOG["openai_api"], settings).api_key+ == "first"+ )+++ "value", ['["first", ""]', '["first", " first "]', '["first", 3]', '["first"']+)+def test_invalid_array_is_rejected_without_disclosing_inputs(value):+ with pytest.raises(ValidationError) as error:+ Settings(OPENAI_API_KEY=value)+ assert "first" not in str(error.value)++[email protected]("value", ["", "[]"])+def test_empty_process_collection_overrides_managed_keys(value):+ snapshot = compose_settings_snapshot(+ {"OPENAI_API_KEY": '["managed"]'}, {"OPENAI_API_KEY": value}+ )+ assert snapshot.settings.openai_api_keys == ()+ assert snapshot.sources["openai_api_keys"] is ConfigSource.PROCESS+++ "providers", [("zai", "zai_api"), ("opencode_zen", "opencode_go")]+)+def test_shared_providers_use_one_ordered_owner(providers):+ first, second = (PROVIDER_CATALOG[provider] for provider in providers)+ assert first.credential_env == second.credential_env+ settings = Settings.model_validate({first.credential_env: '["primary", "extra"]'})+ assert build_provider_config(first, settings).api_key == "primary"+ assert build_provider_config(second, settings).api_key == "primary"+++ "credential", [{"api_key": " first "}, {"api_keys": [" first ", "second"]}]+)+def test_custom_input_normalizes_and_uses_first(credential):+ settings = Settings(+ custom_providers=[+ {+ "provider_id": "custom_" + "1" * 32,+ "display_name": "Example",+ "base_url": "https://custom.example/v1",+ **credential,+ }+ ]+ )+ definition = settings.custom_providers[0]+ assert definition.api_keys[0] == SecretStr("first")+ assert build_custom_provider_config(definition, settings).api_key == "first"+ assert "api_key" not in definition.private_values()+ assert definition.private_values()["api_keys"][0] == "first"+++def test_schema_one_upgrade_preserves_custom_order_and_unknown_values():+ store = ManagedConfigStore()+ store.path.parent.mkdir(parents=True, exist_ok=True)+ custom = [+ {+ "provider_id": "custom_" + "1" * 32,+ "display_name": "Example",+ "base_url": "https://custom.example",+ "api_key": "custom-secret",+ }+ ]+ store.path.write_text(+ "FCC_CONFIG_SCHEMA=1\nOPENAI_API_KEY=old-secret\nUNKNOWN_PRIVATE=preserve-me\n"+ + "FCC_CUSTOM_PROVIDERS="+ + quote_env_value(json.dumps(custom))+ + "\n",+ encoding="utf-8",+ )+ store.initialize({})+ values = dotenv_values_from_file(store.path)+ assert values["FCC_CONFIG_SCHEMA"] == "2"+ assert json.loads(values["OPENAI_API_KEY"]) == ["old-secret"]+ assert json.loads(values["FCC_CUSTOM_PROVIDERS"])[0]["api_keys"] == [+ "custom-secret"+ ]+ assert values["UNKNOWN_PRIVATE"] == "preserve-me"+ before = store.path.read_bytes(), store.path.stat().st_mtime_ns+ store.initialize({})+ assert (store.path.read_bytes(), store.path.stat().st_mtime_ns) == before+++def _old_store(values, schema="1"):+ store = ManagedConfigStore()+ store.path.parent.mkdir(parents=True, exist_ok=True)+ lines = [f"FCC_CONFIG_SCHEMA={schema}"] if schema else []+ lines.extend(f"{key}={quote_env_value(value)}" for key, value in values.items())+ store.path.write_text("\n".join(lines) + "\n", encoding="utf-8")+ return store++[email protected]("schema", ["1", None])+ "stored", ['["saved", ""]', '["saved", "saved"]', '["saved", 3]', '["saved"']+)+ "override,expected",+ [+ ("", ()),+ ("[]", ()),+ (+ '["process-first","process-second"]',+ (SecretStr("process-first"), SecretStr("process-second")),+ ),+ ],+)+def test_upgrade_preserves_shadowed_invalid_credential_list(+ schema, stored, override, expected+):+ store = _old_store(+ {+ "OPENAI_API_KEY": stored,+ "GROQ_API_KEY": "managed-good",+ "UNKNOWN_PRIVATE": "preserved",+ },+ schema,+ )+ process = {"OPENAI_API_KEY": override}+ store.initialize(process)+ snapshot = store.read(process)+ assert snapshot.sources["openai_api_keys"] is ConfigSource.PROCESS+ assert snapshot.settings.openai_api_keys == expected+ assert snapshot.managed["OPENAI_API_KEY"] == stored+ assert json.loads(snapshot.managed["GROQ_API_KEY"]) == ["managed-good"]+ assert snapshot.managed["UNKNOWN_PRIVATE"] == "preserved"+ assert snapshot.managed["FCC_CONFIG_SCHEMA"] == "2"+ before = store.path.read_bytes(), store.path.stat().st_mtime_ns+ store.initialize(process)+ assert (store.path.read_bytes(), store.path.stat().st_mtime_ns) == before+ with pytest.raises(ValidationError):+ store.read({})+++ "saved,converted",+ [+ ([{}], [{}]),+ (+ [{"api_key": "managed-secret", "unknown": "preserved"}],+ [{"api_keys": ["managed-secret"], "unknown": "preserved"}],+ ),+ ],+)+def test_upgrade_converts_custom_credentials_before_effective_definition_validation(+ saved, converted+):+ store = _old_store({"FCC_CUSTOM_PROVIDERS": json.dumps(saved)})+ process = {"FCC_CUSTOM_PROVIDERS": "[]"}+ store.initialize(process)+ snapshot = store.read(process)+ assert snapshot.settings.custom_providers == ()+ assert snapshot.sources["custom_providers"] is ConfigSource.PROCESS+ assert json.loads(snapshot.managed["FCC_CUSTOM_PROVIDERS"]) == converted+ assert snapshot.managed["FCC_CONFIG_SCHEMA"] == "2"+ with pytest.raises(ValidationError):+ store.read({})+++def test_upgrade_preserves_custom_noncredential_members():+ store = _old_store(+ {+ "FCC_CUSTOM_PROVIDERS": json.dumps(+ [+ {+ "provider_id": "custom_" + "1" * 32,+ "display_name": " Name ",+ "base_url": "https://custom.example/v1/",+ "model_ids": [" raw ", " raw "],+ "api_key": " first ",+ }+ ]+ )+ }+ )+ store.initialize({})+ snapshot = store.read({})+ assert json.loads(snapshot.managed["FCC_CUSTOM_PROVIDERS"]) == [+ {+ "provider_id": "custom_" + "1" * 32,+ "display_name": " Name ",+ "base_url": "https://custom.example/v1/",+ "model_ids": [" raw ", " raw "],+ "api_keys": ["first"],+ }+ ]+ assert snapshot.settings.custom_providers[0].display_name == "Name"+ assert snapshot.settings.custom_providers[0].model_ids == ("raw",)+++def test_upgrade_preserves_conflicting_custom_credential_forms_for_validation():+ saved = [{"api_key": "old-secret", "api_keys": ["new-secret"]}]+ store = _old_store({"FCC_CUSTOM_PROVIDERS": json.dumps(saved)})+ process = {"FCC_CUSTOM_PROVIDERS": "[]"}+ store.initialize(process)+ snapshot = store.read(process)+ assert json.loads(snapshot.managed["FCC_CUSTOM_PROVIDERS"]) == saved+ assert snapshot.settings.custom_providers == ()+ with pytest.raises(ValidationError):+ store.read({})+++ "stored",+ [+ "{",+ '{"invalid":"root"}',+ '[{"api_key":3}]',+ '[{"api_keys":["duplicate","duplicate"]}]',+ ],+)+def test_upgrade_preserves_unconvertible_custom_owner_when_shadowed(stored):+ store = _old_store({"FCC_CUSTOM_PROVIDERS": stored})+ process = {"FCC_CUSTOM_PROVIDERS": "[]"}+ store.initialize(process)+ snapshot = store.read(process)+ assert snapshot.managed["FCC_CUSTOM_PROVIDERS"] == stored+ assert snapshot.settings.custom_providers == ()+ with pytest.raises(ValidationError):+ store.read({})+++ "key,value",+ [+ ("OPENAI_API_KEY", '["", "saved"]'),+ ("FCC_CUSTOM_PROVIDERS", "{"),+ ("FCC_CUSTOM_PROVIDERS", '[{"api_keys":[3]}]'),+ ],+)+def test_unshadowed_credential_conversion_failure_preserves_original_file(key, value):+ store = _old_store({key: value, "GROQ_API_KEY": "managed-good"})+ before = store.path.read_bytes()+ with pytest.raises(ValueError):+ store.initialize({})+ assert store.path.read_bytes() == before+ assert list(store.path.parent.glob("*.tmp")) == []+++def test_upgrade_converts_valid_stored_credential_even_when_shadowed():+ store = _old_store({"OPENAI_API_KEY": " managed-first "})+ process = {"OPENAI_API_KEY": "[]"}+ store.initialize(process)+ snapshot = store.read(process)+ assert json.loads(snapshot.managed["OPENAI_API_KEY"]) == ["managed-first"]+ assert snapshot.settings.openai_api_keys == ()diff --git a/tests/config/test_config.py b/tests/config/test_config.pyindex 134e9d2a..a8a79f6f 100644--- a/tests/config/test_config.py+++ b/tests/config/test_config.py@@ -5,7 +5,7 @@ from pathlib import Pathfrom unittest.mock import patchimport pytest-from pydantic import ValidationError+from pydantic import SecretStr, ValidationErrorfrom free_claude_code.application.routing import ModelRouterfrom free_claude_code.config import loader@@ -207,7 +207,7 @@ def test_direct_settings_construction_performs_no_environment_io(("HTTP_READ_TIMEOUT", "http_read_timeout", "600", 600.0),("FCC_OPEN_BROWSER", "open_admin_browser", "false", False),("REASONING_POLICY", "reasoning_policy", "off", ReasoningPreference.OFF),- ("GROQ_API_KEY", "groq_api_key", " secret ", "secret"),+ ("GROQ_API_KEY", "groq_api_keys", " secret ", (SecretStr("secret"),)),("OPENROUTER_PROXY", "open_router_proxy", " http://proxy ", "http://proxy"),],)@@ -266,7 +266,9 @@ def test_optional_blank_process_values_normalize_to_none(key: str) -> None:if field.validation_alias == key)- assert getattr(snapshot.settings, attribute) is None+ assert getattr(snapshot.settings, attribute) == (+ () if key == "GROQ_API_KEY" else None+ )def test_blank_required_process_value_is_rejected() -> None:@@ -333,7 +335,7 @@ def test_repair_invalid_managed_provider_proxies_removes_all_eligible_values() -managed = _write_managed_config("\n".join((- "FCC_CONFIG_SCHEMA=1",+ "FCC_CONFIG_SCHEMA=2","MODEL=nvidia_nim/test-model","OPENROUTER_PROXY=http://proxy.example:notaport","GROQ_PROXY=https://proxy.example:8443",@@ -359,7 +361,7 @@ def test_repair_invalid_managed_provider_proxies_removes_all_eligible_values() -def test_repair_valid_managed_provider_proxy_leaves_file_unchanged() -> None:managed = _write_managed_config("# Keep this exact text on a no-op.\n"- "FCC_CONFIG_SCHEMA=1\n"+ "FCC_CONFIG_SCHEMA=2\n""OPENAI_PROXY=https://proxy.example:8443\n")baseline = managed.read_bytes()@@ -381,7 +383,7 @@ def test_repair_preserves_process_owned_managed_proxy() -> None:invalid_openai = "invalid://managed-proxy"managed = _write_managed_config(- "FCC_CONFIG_SCHEMA=1\n"+ "FCC_CONFIG_SCHEMA=2\n"f"OPENAI_PROXY={invalid_openai}\n""OPENROUTER_PROXY=invalid://unshadowed\n")@@ -400,7 +402,7 @@ def test_repair_preserves_process_owned_managed_proxy(def test_repair_propagates_atomic_write_failure_without_changing_source() -> None:managed = _write_managed_config(- "FCC_CONFIG_SCHEMA=1\nOPENAI_PROXY=invalid://managed-proxy\n"+ "FCC_CONFIG_SCHEMA=2\nOPENAI_PROXY=invalid://managed-proxy\n")baseline = managed.read_bytes()@@ -419,7 +421,7 @@ def test_repair_propagates_atomic_write_failure_without_changing_source() -> Nondef test_repair_is_idempotent_and_writes_only_once() -> None:managed = _write_managed_config(- "FCC_CONFIG_SCHEMA=1\nOPENAI_PROXY=invalid://managed-proxy\n"+ "FCC_CONFIG_SCHEMA=2\nOPENAI_PROXY=invalid://managed-proxy\n")with patch.object(@@ -438,7 +440,7 @@ def test_repair_is_idempotent_and_writes_only_once() -> None:def test_repair_propagates_malformed_managed_config() -> None:- managed = _write_managed_config('FCC_CONFIG_SCHEMA=1\nOPENAI_PROXY="unterminated\n')+ managed = _write_managed_config('FCC_CONFIG_SCHEMA=2\nOPENAI_PROXY="unterminated\n')baseline = managed.read_bytes()with pytest.raises(ValueError, match="Could not parse configuration file"):@@ -451,7 +453,7 @@ def test_repair_propagates_config_lock_timeout(monkeypatch: pytest.MonkeyPatch,) -> None:managed = _write_managed_config(- "FCC_CONFIG_SCHEMA=1\nOPENAI_PROXY=invalid://managed-proxy\n"+ "FCC_CONFIG_SCHEMA=2\nOPENAI_PROXY=invalid://managed-proxy\n")baseline = managed.read_bytes()@@ -482,7 +484,7 @@ def test_optional_strings_share_one_normalization_rule() -> None:})- assert settings.groq_api_key == "key"+ assert settings.groq_api_keys == (SecretStr("key"),)assert settings.open_router_proxy is Noneassert settings.model_opus is Noneassert settings.allowed_dir is Nonediff --git a/tests/config/test_custom_provider_mutations.py b/tests/config/test_custom_provider_mutations.pyindex 25440208..3232d730 100644--- a/tests/config/test_custom_provider_mutations.py+++ b/tests/config/test_custom_provider_mutations.py@@ -12,6 +12,7 @@ from free_claude_code.config.loader import (compose_settings_snapshot,)from free_claude_code.runtime.diagnostics import settings_report+from tests.config.credential_support import credential_editdef snapshot(values=None, process=None):@@ -23,6 +24,23 @@ def snapshot(values=None, process=None):def mutate(state, action, provider_id=None, values=None, routes=None):+ values = dict(values or {})+ if "api_key" in values:+ public = load_config_response(state, revision_key=b"test-revision-key")+ rows = public["custom_providers"]+ assert isinstance(rows, list)+ existing = next(+ (+ item+ for item in rows+ if isinstance(item, dict) and item["provider_id"] == provider_id+ ),+ None,+ )+ projection = (+ existing["api_keys"] if existing else {"revision": None, "entries": []}+ )+ values["api_keys"] = credential_edit(projection, values.pop("api_key"))return prepare_admin_update(routes or {},state,@@ -30,6 +48,7 @@ def mutate(state, action, provider_id=None, values=None, routes=None):CustomProviderMutation(action=action, provider_id=provider_id, values=values or {}),+ revision_key=b"test-revision-key",)@@ -63,9 +82,9 @@ def test_mutations_preserve_other_providers_secrets_and_routing_identity():assert edited.valid and len(edited.settings.custom_providers) == 2original = edited.settings.custom_provider(first)assert original.display_name == "Renamed"- assert original.api_key.get_secret_value() == "private-api-key"+ assert original.api_keys[0].get_secret_value() == "private-api-key"cleared = mutate(snapshot(edited.target_values), "update", first, {"api_key": None})- assert cleared.settings.custom_provider(first).api_key is None+ assert cleared.settings.custom_provider(first).api_keys == ()def test_deletion_requires_reassignment_and_is_idempotent():@@ -124,10 +143,12 @@ def test_invalid_duplicate_or_locked_mutation_does_not_expose_keys():state.managed, {CUSTOM_PROVIDERS_ENV: state.managed[CUSTOM_PROVIDERS_ENV]})assert not mutate(locked, "delete", provider_id).valid- public = load_config_response(state)+ public = load_config_response(state, revision_key=b"test-revision-key")rows = public["custom_providers"]assert isinstance(rows, list) and isinstance(rows[0], dict)- assert rows[0]["api_key"] == "********"+ projection = rows[0]["api_keys"]+ assert isinstance(projection, dict)+ assert projection["entries"] == [{"reference": 0}]assert "private-api-key" not in json.dumps(public)doctor = json.dumps(settings_report(state.settings, {}))assert (diff --git a/tests/config/test_custom_providers.py b/tests/config/test_custom_providers.pyindex e90b1115..7468beec 100644--- a/tests/config/test_custom_providers.py+++ b/tests/config/test_custom_providers.py@@ -37,7 +37,7 @@ def test_private_storage_round_trip_and_routing():assert original.base_url == "https://gateway.example/api/v2"assert "private-key" not in repr(original)assert "private-key" not in original.model_dump_json()- assert json.loads(encoded)[0]["api_key"] == "private-key"+ assert json.loads(encoded)[0]["api_keys"] == ["private-key"]assert ModelRouter(settings).resolve(settings.model).primary.provider_id == IDdiff --git a/tests/config/test_env_migrations.py b/tests/config/test_env_migrations.pyindex 624857c5..723492f2 100644--- a/tests/config/test_env_migrations.py+++ b/tests/config/test_env_migrations.py@@ -136,7 +136,7 @@ def test_legacy_file_imports_only_recognized_values_and_is_untouched(assert result.imported_from == (legacy.resolve(),)assert values["MODEL"] == "deepseek/legacy"- assert values["HUGGINGFACE_API_KEY"] == "hf"+ assert values["HUGGINGFACE_API_KEY"] == '["hf"]'assert values["PROXY_AUTH_ENABLED"] == "false"assert "UNRELATED_SECRET" not in valuesassert legacy.read_text(encoding="utf-8") == original@@ -192,7 +192,7 @@ def test_canonical_setting_wins_and_retired_key_is_removed(consolidate_managed_config({})values = dotenv_values_from_file(managed)- assert values["HUGGINGFACE_API_KEY"] == "current-token"+ assert values["HUGGINGFACE_API_KEY"] == '["current-token"]'assert "HF_TOKEN" not in values@@ -224,7 +224,7 @@ def test_post_schema_invalid_explicit_path_is_never_dereferenced() -> None:managed, _legacy = _paths(monkeypatch, tmp_path)managed.parent.mkdir(parents=True)- managed.write_text("FCC_CONFIG_SCHEMA=1\n", encoding="utf-8")+ managed.write_text("FCC_CONFIG_SCHEMA=2\n", encoding="utf-8")result = consolidate_managed_config({"FCC_ENV_FILE": str(tmp_path / "missing.env")})@@ -336,7 +336,7 @@ def test_only_managed_schema_marker_is_trusted(consolidate_managed_config({"FCC_CONFIG_SCHEMA": "99"})values = dotenv_values_from_file(managed)- assert values["FCC_CONFIG_SCHEMA"] == "1"+ assert values["FCC_CONFIG_SCHEMA"] == "2"assert values["MODEL"] == "deepseek/imported"@@ -403,7 +403,7 @@ def test_concurrent_loaders_produce_one_valid_managed_file(assert {snapshot.settings.model for snapshot in snapshots} == {"deepseek/concurrent"}- assert dotenv_values_from_file(managed)["FCC_CONFIG_SCHEMA"] == "1"+ assert dotenv_values_from_file(managed)["FCC_CONFIG_SCHEMA"] == "2"assert list(managed.parent.glob("*.tmp")) == []@@ -442,7 +442,7 @@ def test_newer_managed_schema_fails_closed() -> None:managed, _legacy = _paths(monkeypatch, tmp_path)managed.parent.mkdir(parents=True)- managed.write_text("FCC_CONFIG_SCHEMA=2\n", encoding="utf-8")+ managed.write_text("FCC_CONFIG_SCHEMA=3\n", encoding="utf-8")with pytest.raises(ValueError, match="unsupported schema"):consolidate_managed_config({})diff --git a/tests/config/test_model_fallbacks.py b/tests/config/test_model_fallbacks.pyindex 9377cf01..52dee4f3 100644--- a/tests/config/test_model_fallbacks.py+++ b/tests/config/test_model_fallbacks.py@@ -27,7 +27,7 @@ def _snapshot(managed=None, process=None):def _fallback_field(state):- fields = load_config_response(state)["fields"]+ fields = load_config_response(state, revision_key=b"test-revision-key")["fields"]assert isinstance(fields, list)for field in fields:assert isinstance(field, dict)@@ -121,6 +121,7 @@ def test_admin_fallback_records_round_trip_without_restart_or_false_changes(as_j{"MODEL_FALLBACKS": json.dumps(entries) if as_json else entries},original,original.settings,+ revision_key=b"test-revision-key",)assert saved.valid, saved.errorsassert saved.pending_fields == ()@@ -147,7 +148,10 @@ def test_admin_fallback_records_round_trip_without_restart_or_false_changes(as_j"max",]unchanged = prepare_admin_update(- {"MODEL_FALLBACKS": field["value"]}, loaded, loaded.settings+ {"MODEL_FALLBACKS": field["value"]},+ loaded,+ loaded.settings,+ revision_key=b"test-revision-key",)assert unchanged.valid and unchanged.changed_keys == ()@@ -166,6 +170,7 @@ def test_empty_process_fallbacks_override_managed_records_and_remain_locked(empt{"MODEL_FALLBACKS": [{"model": "groq/two", "reasoning": "off"}]},state,state.settings,+ revision_key=b"test-revision-key",)assert result.valid and result.settings is not Noneassert result.settings.model_fallbacks is Nonediff --git a/tests/config/test_provider_catalog.py b/tests/config/test_provider_catalog.pyindex b86282a3..4a7878e3 100644--- a/tests/config/test_provider_catalog.py+++ b/tests/config/test_provider_catalog.py@@ -49,11 +49,11 @@ def test_ollama_cloud_is_remote_and_distinct_from_local_ollama() -> None:def test_provider_configuration_attrs_cover_multi_field_and_adc_providers() -> None:assert PROVIDER_CATALOG["azure_openai"].configuration_attrs() == (- "azure_openai_api_key",+ "azure_openai_api_keys","azure_openai_base_url",)assert PROVIDER_CATALOG["cloudflare"].configuration_attrs() == (- "cloudflare_api_token",+ "cloudflare_api_tokens","cloudflare_account_id",)assert PROVIDER_CATALOG["vertex"].configuration_attrs() == ("vertex_project_id",)@@ -83,7 +83,7 @@ def test_openai_api_is_a_separate_key_configured_provider() -> None:assert api.auth_kind is ProviderAuthKind.CONFIGURATIONassert api.credential_env == "OPENAI_API_KEY"- assert api.configuration_attrs() == ("openai_api_key",)+ assert api.configuration_attrs() == ("openai_api_keys",)assert api.proxy_attr == "openai_api_proxy"assert api.default_base_url == "https://api.openai.com/v1"assert subscription.auth_kind is ProviderAuthKind.CONNECTED_ACCOUNTdiff --git a/tests/contracts/test_admin_provider_manifest.py b/tests/contracts/test_admin_provider_manifest.pyindex fc25a35e..ec25c95a 100644--- a/tests/contracts/test_admin_provider_manifest.py+++ b/tests/contracts/test_admin_provider_manifest.py@@ -159,8 +159,8 @@ def test_vertex_project_and_location_are_admin_provider_fields() -> None:def test_qwencloud_coding_key_is_a_distinct_admin_provider_field() -> None:entry = FIELD_BY_KEY["QWENCLOUD_CODING_API_KEY"]- assert entry.label == "QwenCloud Coding Plan API Key"- assert entry.settings_attr == "qwencloud_coding_api_key"+ assert entry.label == "QwenCloud Coding Plan API Keys"+ assert entry.settings_attr == "qwencloud_coding_api_keys"assert entry.section_id == "providers"assert entry.secret is Trueassert "separate endpoints" in entry.description@@ -179,8 +179,8 @@ def test_cline_pass_admin_fields_use_programmatic_key_and_fixed_endpoint() -> Noif item["provider_id"] == "cline_pass")- assert key.label == "Cline API Key"- assert key.settings_attr == "cline_api_key"+ assert key.label == "Cline API Keys"+ assert key.settings_attr == "cline_api_keys"assert key.section_id == "providers"assert key.secret is Trueassert "Subscribe to ClinePass" in key.description@@ -205,7 +205,7 @@ def test_zai_shared_key_configures_both_distinct_provider_surfaces() -> None:}assert sum(field.key == "ZAI_API_KEY" for field in FIELDS) == 1- assert entry.settings_attr == "zai_api_key"+ assert entry.settings_attr == "zai_api_keys"assert "Coding Plan" in entry.descriptionassert "pay-as-you-go" in entry.descriptionassert statuses["zai"]["display_name"] == "Z.ai Coding Plan"diff --git a/tests/contracts/test_smoke_config.py b/tests/contracts/test_smoke_config.pyindex 65f520c4..64cce607 100644--- a/tests/contracts/test_smoke_config.py+++ b/tests/contracts/test_smoke_config.py@@ -1,6 +1,8 @@from pathlib import Pathfrom types import SimpleNamespace+from free_claude_code.config.api_keys import normalize_api_keys+from free_claude_code.config.provider_catalog import PROVIDER_CATALOGfrom smoke.conftest import (DISABLED_PROVIDER_MODEL,provider_model_params,@@ -28,61 +30,65 @@ def _settings(**overrides):"model_opus": None,"model_sonnet": None,"model_haiku": None,- "azure_openai_api_key": "",+ "azure_openai_api_keys": "","azure_openai_base_url": "",- "nvidia_nim_api_key": "",- "open_router_api_key": "",- "mistral_api_key": "",- "codestral_api_key": "",- "deepseek_api_key": "",- "kimi_api_key": "",- "kimi_code_api_key": "",- "wafer_api_key": "",- "minimax_api_key": "",- "opencode_api_key": "",- "vercel_ai_gateway_api_key": "",- "bedrock_api_key": "",+ "nvidia_nim_api_keys": "",+ "open_router_api_keys": "",+ "mistral_api_keys": "",+ "codestral_api_keys": "",+ "deepseek_api_keys": "",+ "kimi_api_keys": "",+ "kimi_code_api_keys": "",+ "wafer_api_keys": "",+ "minimax_api_keys": "",+ "opencode_api_keys": "",+ "vercel_ai_gateway_api_keys": "",+ "bedrock_api_keys": "","bedrock_base_url": "https://bedrock-mantle.us-east-1.api.aws/v1",- "huggingface_api_key": "",- "cohere_api_key": "",- "zai_api_key": "",- "kilo_api_key": "",- "gemini_api_key": "",+ "huggingface_api_keys": "",+ "cohere_api_keys": "",+ "zai_api_keys": "",+ "kilo_api_keys": "",+ "gemini_api_keys": "","vertex_project_id": "","vertex_location": "global",- "groq_api_key": "",- "cline_api_key": "",- "xai_api_key": "",- "qwencloud_api_key": "",- "qwencloud_coding_api_key": "",- "together_api_key": "",- "deepinfra_api_key": "",- "siliconflow_api_key": "",- "nebius_api_key": "",- "scw_secret_key": "",- "opper_api_key": "",- "chutes_api_key": "",- "featherless_api_key": "",- "wandb_api_key": "",- "sambanova_api_key": "",- "cerebras_api_key": "",- "ollama_api_key": "",- "poolside_api_key": "",- "llm7_api_key": "",- "lightning_api_key": "",- "experiential_api_key": "",- "cheaperinference_api_key": "",- "orcarouter_api_key": "",- "xkiro_api_key": "",- "fireworks_api_key": "",- "novita_api_key": "",- "cloudflare_api_token": "",+ "groq_api_keys": "",+ "cline_api_keys": "",+ "xai_api_keys": "",+ "qwencloud_api_keys": "",+ "qwencloud_coding_api_keys": "",+ "together_api_keys": "",+ "deepinfra_api_keys": "",+ "siliconflow_api_keys": "",+ "nebius_api_keys": "",+ "scw_secret_keys": "",+ "opper_api_keys": "",+ "chutes_api_keys": "",+ "featherless_api_keys": "",+ "wandb_api_keys": "",+ "sambanova_api_keys": "",+ "cerebras_api_keys": "",+ "ollama_api_keys": "",+ "poolside_api_keys": "",+ "llm7_api_keys": "",+ "lightning_api_keys": "",+ "experiential_api_keys": "",+ "cheaperinference_api_keys": "",+ "orcarouter_api_keys": "",+ "xkiro_api_keys": "",+ "fireworks_api_keys": "",+ "novita_api_keys": "",+ "cloudflare_api_tokens": "","cloudflare_account_id": "","lm_studio_base_url": "","llamacpp_base_url": "","ollama_base_url": "http://localhost:11434",}values.update(overrides)+ for attr in {+ d.credential_attr for d in PROVIDER_CATALOG.values() if d.credential_attr+ }:+ values[attr] = normalize_api_keys(values.get(attr))return SimpleNamespace(**values)@@ -143,7 +149,7 @@ def test_ollama_cloud_provider_configuration_uses_api_key(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- ollama_api_key="ollama-cloud-key",+ ollama_api_keys="ollama-cloud-key",))@@ -161,7 +167,7 @@ def test_provider_smoke_models_cover_configured_providers_independent_of_model_mconfig = _smoke_config(settings=_settings(model="ollama/llama3.1",- deepseek_api_key="deepseek-key",+ deepseek_api_keys="deepseek-key",ollama_base_url="",))@@ -181,7 +187,7 @@ def test_poolside_provider_configuration_uses_documented_default_model(settings=_settings(model="ollama/llama3.1",ollama_base_url="",- poolside_api_key="poolside-key",+ poolside_api_keys="poolside-key",))@@ -200,7 +206,7 @@ def test_llm7_provider_configuration_uses_stable_default_selector(settings=_settings(model="ollama/llama3.1",ollama_base_url="",- llm7_api_key="llm7-key",+ llm7_api_keys="llm7-key",))@@ -217,7 +223,7 @@ def test_llm7_smoke_override_accepts_selector_with_or_without_prefix(settings = _settings(model="ollama/llama3.1",ollama_base_url="",- llm7_api_key="llm7-key",+ llm7_api_keys="llm7-key",)for override in ("fast", "llm7/fast"):monkeypatch.setenv("FCC_SMOKE_MODEL_LLM7", override)@@ -232,7 +238,7 @@ def test_llm7_is_not_enabled_without_explicit_credential(monkeypatch) -> None:monkeypatch.delenv("FCC_SMOKE_MODEL_LLM7", raising=False)config = _smoke_config(provider_matrix=frozenset({"llm7"}),- settings=_settings(ollama_base_url="", llm7_api_key=""),+ settings=_settings(ollama_base_url="", llm7_api_keys=""),)assert not config.has_provider_configuration("llm7")@@ -247,7 +253,7 @@ def test_lightning_provider_configuration_uses_documented_default_model(settings=_settings(model="ollama/llama3.1",ollama_base_url="",- lightning_api_key="lightning-key",+ lightning_api_keys="lightning-key",))@@ -264,7 +270,7 @@ def test_lightning_smoke_override_accepts_model_with_or_without_prefix(settings = _settings(model="ollama/llama3.1",ollama_base_url="",- lightning_api_key="lightning-key",+ lightning_api_keys="lightning-key",)for override in ("lightning-ai/deepseek-v4-pro",@@ -282,7 +288,7 @@ def test_lightning_is_not_enabled_without_explicit_credential(monkeypatch) -> Nomonkeypatch.delenv("FCC_SMOKE_MODEL_LIGHTNING", raising=False)config = _smoke_config(provider_matrix=frozenset({"lightning"}),- settings=_settings(ollama_base_url="", lightning_api_key=""),+ settings=_settings(ollama_base_url="", lightning_api_keys=""),)assert not config.has_provider_configuration("lightning")@@ -297,7 +303,7 @@ def test_experiential_provider_configuration_uses_documented_free_model(settings=_settings(model="ollama/llama3.1",ollama_base_url="",- experiential_api_key="experiential-key",+ experiential_api_keys="experiential-key",))@@ -314,7 +320,7 @@ def test_experiential_smoke_override_accepts_model_with_or_without_prefix(settings = _settings(model="ollama/llama3.1",ollama_base_url="",- experiential_api_key="experiential-key",+ experiential_api_keys="experiential-key",)for override in ("deepseek-v4-flash",@@ -334,7 +340,7 @@ def test_experiential_is_not_enabled_without_explicit_credential(monkeypatch.delenv("FCC_SMOKE_MODEL_EXPERIENTIAL", raising=False)config = _smoke_config(provider_matrix=frozenset({"experiential"}),- settings=_settings(ollama_base_url="", experiential_api_key=""),+ settings=_settings(ollama_base_url="", experiential_api_keys=""),)assert not config.has_provider_configuration("experiential")@@ -349,7 +355,7 @@ def test_cheaperinference_provider_configuration_uses_default_model(settings=_settings(model="ollama/llama3.1",ollama_base_url="",- cheaperinference_api_key="ci_live_key",+ cheaperinference_api_keys="ci_live_key",))@@ -366,7 +372,7 @@ def test_cheaperinference_smoke_override_accepts_model_with_or_without_prefix(settings = _settings(model="ollama/llama3.1",ollama_base_url="",- cheaperinference_api_key="ci_live_key",+ cheaperinference_api_keys="ci_live_key",)for override in ("claude-sonnet-5",@@ -386,7 +392,7 @@ def test_cheaperinference_is_not_enabled_without_explicit_credential(monkeypatch.delenv("FCC_SMOKE_MODEL_CHEAPERINFERENCE", raising=False)config = _smoke_config(provider_matrix=frozenset({"cheaperinference"}),- settings=_settings(ollama_base_url="", cheaperinference_api_key=""),+ settings=_settings(ollama_base_url="", cheaperinference_api_keys=""),)assert not config.has_provider_configuration("cheaperinference")@@ -401,7 +407,7 @@ def test_orcarouter_provider_configuration_uses_documented_free_model(settings=_settings(model="ollama/llama3.1",ollama_base_url="",- orcarouter_api_key="orcarouter-key",+ orcarouter_api_keys="orcarouter-key",))@@ -418,7 +424,7 @@ def test_orcarouter_smoke_override_accepts_model_with_or_without_prefix(settings = _settings(model="ollama/llama3.1",ollama_base_url="",- orcarouter_api_key="orcarouter-key",+ orcarouter_api_keys="orcarouter-key",)for override in ("deepseek/deepseek-v4-pro-free",@@ -436,7 +442,7 @@ def test_orcarouter_is_not_enabled_without_explicit_credential(monkeypatch) -> Nmonkeypatch.delenv("FCC_SMOKE_MODEL_ORCAROUTER", raising=False)config = _smoke_config(provider_matrix=frozenset({"orcarouter"}),- settings=_settings(ollama_base_url="", orcarouter_api_key=""),+ settings=_settings(ollama_base_url="", orcarouter_api_keys=""),)assert not config.has_provider_configuration("orcarouter")@@ -449,7 +455,7 @@ def test_xai_provider_smoke_uses_current_grok_model(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- xai_api_key="xai-key",+ xai_api_keys="xai-key",))@@ -468,7 +474,7 @@ def test_cline_pass_provider_smoke_uses_low_cost_subscription_model(settings=_settings(model="ollama/llama3.1",ollama_base_url="",- cline_api_key="cline-key",+ cline_api_keys="cline-key",))@@ -485,7 +491,7 @@ def test_cline_pass_smoke_override_accepts_full_or_upstream_model_ref(settings = _settings(model="ollama/llama3.1",ollama_base_url="",- cline_api_key="cline-key",+ cline_api_keys="cline-key",)for override in ("cline_pass/cline-pass/kimi-k3",@@ -506,7 +512,7 @@ def test_zai_shared_key_enables_both_provider_smoke_surfaces(monkeypatch) -> Nonsettings=_settings(model="ollama/llama3.1",ollama_base_url="",- zai_api_key="shared-zai-key",+ zai_api_keys="shared-zai-key",))@@ -525,7 +531,7 @@ def test_zai_api_smoke_override_is_independent_from_coding_plan(monkeypatch) ->settings=_settings(model="ollama/llama3.1",ollama_base_url="",- zai_api_key="shared-zai-key",+ zai_api_keys="shared-zai-key",))@@ -543,7 +549,7 @@ def test_qwencloud_provider_smoke_uses_current_coding_model(monkeypatch) -> Nonesettings=_settings(model="ollama/llama3.1",ollama_base_url="",- qwencloud_api_key="qwencloud-key",+ qwencloud_api_keys="qwencloud-key",))@@ -560,7 +566,7 @@ def test_qwencloud_coding_provider_smoke_uses_recommended_model(monkeypatch) ->settings=_settings(model="ollama/llama3.1",ollama_base_url="",- qwencloud_coding_api_key="qwencloud-coding-key",+ qwencloud_coding_api_keys="qwencloud-coding-key",))@@ -583,8 +589,8 @@ def test_qwencloud_coding_smoke_override_is_independent_from_token_plan(settings=_settings(model="ollama/llama3.1",ollama_base_url="",- qwencloud_api_key="qwencloud-key",- qwencloud_coding_api_key="qwencloud-coding-key",+ qwencloud_api_keys="qwencloud-key",+ qwencloud_coding_api_keys="qwencloud-coding-key",))@@ -606,7 +612,7 @@ def test_together_provider_smoke_uses_current_coding_model(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- together_api_key="together-key",+ together_api_keys="together-key",))@@ -623,7 +629,7 @@ def test_deepinfra_provider_smoke_uses_current_coding_model(monkeypatch) -> Nonesettings=_settings(model="ollama/llama3.1",ollama_base_url="",- deepinfra_api_key="deepinfra-key",+ deepinfra_api_keys="deepinfra-key",))@@ -640,7 +646,7 @@ def test_siliconflow_provider_smoke_uses_documented_chat_model(monkeypatch) -> Nsettings=_settings(model="ollama/llama3.1",ollama_base_url="",- siliconflow_api_key="siliconflow-key",+ siliconflow_api_keys="siliconflow-key",))@@ -657,7 +663,7 @@ def test_nebius_provider_smoke_uses_documented_agent_model(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- nebius_api_key="nebius-key",+ nebius_api_keys="nebius-key",))@@ -674,7 +680,7 @@ def test_chutes_provider_smoke_uses_documented_agent_model(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- chutes_api_key="chutes-key",+ chutes_api_keys="chutes-key",))@@ -691,7 +697,7 @@ def test_scaleway_provider_smoke_uses_documented_agent_model(monkeypatch) -> Nonsettings=_settings(model="ollama/llama3.1",ollama_base_url="",- scw_secret_key="scw-key",+ scw_secret_keys="scw-key",))@@ -708,7 +714,7 @@ def test_opper_provider_smoke_uses_documented_agent_model(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- opper_api_key="opper-key",+ opper_api_keys="opper-key",))@@ -725,7 +731,7 @@ def test_featherless_provider_smoke_uses_documented_agent_model(monkeypatch) ->settings=_settings(model="ollama/llama3.1",ollama_base_url="",- featherless_api_key="featherless-key",+ featherless_api_keys="featherless-key",))@@ -742,7 +748,7 @@ def test_agnes_provider_smoke_uses_documented_model(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- agnes_api_key="agnes-key",+ agnes_api_keys="agnes-key",))@@ -759,7 +765,7 @@ def test_zenmux_provider_smoke_uses_current_free_model(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- zenmux_api_key="zenmux-key",+ zenmux_api_keys="zenmux-key",))@@ -776,7 +782,7 @@ def test_wandb_provider_smoke_uses_documented_tool_model(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- wandb_api_key="wandb-key",+ wandb_api_keys="wandb-key",))@@ -793,7 +799,7 @@ def test_wandb_provider_smoke_honors_model_override(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- wandb_api_key="wandb-key",+ wandb_api_keys="wandb-key",))@@ -831,7 +837,7 @@ def test_connected_account_provider_smoke_requires_explicit_model(def test_openrouter_provider_smoke_uses_concrete_free_model(monkeypatch) -> None:monkeypatch.delenv("FCC_SMOKE_MODEL_OPEN_ROUTER", raising=False)config = _smoke_config(- settings=_settings(open_router_api_key="openrouter-key", ollama_base_url="")+ settings=_settings(open_router_api_keys="openrouter-key", ollama_base_url=""))models = config.provider_smoke_models()@@ -844,7 +850,7 @@ def test_openrouter_provider_smoke_uses_concrete_free_model(monkeypatch) -> Nonedef test_kilo_provider_smoke_uses_concrete_free_model(monkeypatch) -> None:monkeypatch.delenv("FCC_SMOKE_MODEL_KILO", raising=False)config = _smoke_config(- settings=_settings(kilo_api_key="anonymous", ollama_base_url="")+ settings=_settings(kilo_api_keys="anonymous", ollama_base_url=""))models = config.provider_smoke_models()@@ -860,7 +866,7 @@ def test_bedrock_provider_configuration_uses_official_api_key(monkeypatch) -> Nosettings=_settings(model="ollama/llama3.1",ollama_base_url="",- bedrock_api_key="bedrock-key",+ bedrock_api_keys="bedrock-key",))@@ -879,7 +885,7 @@ def test_azure_openai_provider_configuration_requires_key_and_resource_url(settings=_settings(model="ollama/llama3.1",ollama_base_url="",- azure_openai_api_key="azure-key",+ azure_openai_api_keys="azure-key",azure_openai_base_url=("https://resource.openai.azure.com/openai/v1/"),))@@ -917,7 +923,7 @@ def test_wafer_provider_configuration_uses_api_key(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- wafer_api_key="wafer-key",+ wafer_api_keys="wafer-key",))@@ -933,7 +939,7 @@ def test_kimi_code_provider_configuration_uses_subscription_key(monkeypatch) ->settings=_settings(model="ollama/llama3.1",ollama_base_url="",- kimi_code_api_key="subscription-key",+ kimi_code_api_keys="subscription-key",))@@ -950,7 +956,7 @@ def test_minimax_provider_configuration_uses_api_key(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- minimax_api_key="minimax-key",+ minimax_api_keys="minimax-key",))@@ -968,7 +974,7 @@ def test_cloudflare_provider_configuration_requires_token_and_account(settings=_settings(model="ollama/llama3.1",ollama_base_url="",- cloudflare_api_token="cf-token",+ cloudflare_api_tokens="cf-token",cloudflare_account_id="cf-account",))@@ -983,7 +989,7 @@ def test_cloudflare_provider_configuration_missing_account_is_unconfigured() ->config = _smoke_config(settings=_settings(ollama_base_url="",- cloudflare_api_token="cf-token",+ cloudflare_api_tokens="cf-token",cloudflare_account_id="",))@@ -997,7 +1003,7 @@ def test_vercel_provider_configuration_uses_api_key(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- vercel_ai_gateway_api_key="vercel-key",+ vercel_ai_gateway_api_keys="vercel-key",))@@ -1013,7 +1019,7 @@ def test_huggingface_provider_configuration_uses_api_key(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- huggingface_api_key="hf-key",+ huggingface_api_keys="hf-key",))@@ -1029,7 +1035,7 @@ def test_cohere_provider_configuration_uses_api_key(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- cohere_api_key="cohere-key",+ cohere_api_keys="cohere-key",))@@ -1045,7 +1051,7 @@ def test_sambanova_provider_configuration_uses_api_key(monkeypatch) -> None:settings=_settings(model="ollama/llama3.1",ollama_base_url="",- sambanova_api_key="sambanova-key",+ sambanova_api_keys="sambanova-key",))@@ -1061,7 +1067,7 @@ def test_provider_smoke_model_override_accepts_model_name_without_prefix(monkeypatch.setenv("FCC_SMOKE_MODEL_DEEPSEEK", "deepseek-reasoner")config = _smoke_config(settings=_settings(- deepseek_api_key="deepseek-key",+ deepseek_api_keys="deepseek-key",ollama_base_url="",),provider_matrix=frozenset({"deepseek"}),@@ -1082,8 +1088,8 @@ def test_provider_smoke_model_override_accepts_owner_model_name(config = _smoke_config(settings=_settings(model="deepseek/deepseek-chat",- deepseek_api_key="",- nvidia_nim_api_key="nim-key",+ deepseek_api_keys="",+ nvidia_nim_api_keys="nim-key",ollama_base_url="",),provider_matrix=frozenset({"nvidia_nim"}),@@ -1101,7 +1107,7 @@ def test_provider_smoke_model_override_preserves_namespaced_upstream_model(monkeypatch.setenv("FCC_SMOKE_MODEL_DEEPSEEK", "ollama/llama3.1")config = _smoke_config(settings=_settings(- deepseek_api_key="deepseek-key",+ deepseek_api_keys="deepseek-key",ollama_base_url="",),provider_matrix=frozenset({"deepseek"}),@@ -1115,7 +1121,7 @@ def test_provider_smoke_model_override_preserves_namespaced_upstream_model(def test_mistral_reasoning_smoke_uses_reasoning_default(monkeypatch) -> None:monkeypatch.delenv("FCC_SMOKE_MODEL_MISTRAL_REASONING", raising=False)config = _smoke_config(- settings=_settings(mistral_api_key="mistral-key", ollama_base_url="")+ settings=_settings(mistral_api_keys="mistral-key", ollama_base_url=""))model = config.mistral_reasoning_smoke_model()@@ -1129,7 +1135,7 @@ def test_mistral_reasoning_smoke_uses_reasoning_default(monkeypatch) -> None:def test_mistral_reasoning_smoke_accepts_override(monkeypatch) -> None:monkeypatch.setenv("FCC_SMOKE_MODEL_MISTRAL_REASONING", "mistral-medium-3-5")config = _smoke_config(- settings=_settings(mistral_api_key="mistral-key", ollama_base_url="")+ settings=_settings(mistral_api_keys="mistral-key", ollama_base_url=""))model = config.mistral_reasoning_smoke_model()@@ -1142,7 +1148,7 @@ def test_mistral_reasoning_smoke_accepts_override(monkeypatch) -> None:def test_mistral_reasoning_smoke_respects_provider_matrix(monkeypatch) -> None:monkeypatch.delenv("FCC_SMOKE_MODEL_MISTRAL_REASONING", raising=False)config = _smoke_config(- settings=_settings(mistral_api_key="mistral-key", ollama_base_url=""),+ settings=_settings(mistral_api_keys="mistral-key", ollama_base_url=""),provider_matrix=frozenset({"deepseek"}),)@@ -1153,8 +1159,8 @@ def test_provider_smoke_matrix_filters_provider_catalog(monkeypatch) -> None:monkeypatch.delenv("FCC_SMOKE_MODEL_DEEPSEEK", raising=False)config = _smoke_config(settings=_settings(- deepseek_api_key="deepseek-key",- nvidia_nim_api_key="nim-key",+ deepseek_api_keys="deepseek-key",+ nvidia_nim_api_keys="nim-key",ollama_base_url="",),provider_matrix=frozenset({"nvidia_nim"}),@@ -1173,8 +1179,8 @@ def test_provider_smoke_collection_params_are_grouped_by_provider(config = _smoke_config(live=True,settings=_settings(- deepseek_api_key="deepseek-key",- nvidia_nim_api_key="nim-key",+ deepseek_api_keys="deepseek-key",+ nvidia_nim_api_keys="nim-key",ollama_base_url="",),)@@ -1270,7 +1276,7 @@ def test_smoke_config_returns_nvidia_nim_cli_provider_models(monkeypatch) -> Nonconfig = _smoke_config(settings=_settings(model="nvidia_nim/z-ai/glm-5.2",- nvidia_nim_api_key="nim-key",+ nvidia_nim_api_keys="nim-key",ollama_base_url="",))@@ -1362,7 +1368,7 @@ def test_smoke_config_returns_openrouter_free_cli_provider_models(monkeypatch) -config = _smoke_config(settings=_settings(model="open_router/poolside/laguna-s-2.1:free",- open_router_api_key="openrouter-key",+ open_router_api_keys="openrouter-key",ollama_base_url="",))@@ -1382,7 +1388,7 @@ def test_xkiro_provider_configuration_uses_documented_free_model(settings=_settings(model="ollama/llama3.1",ollama_base_url="",- xkiro_api_key="xkiro-key",+ xkiro_api_keys="xkiro-key",))@@ -1399,7 +1405,7 @@ def test_xkiro_smoke_override_accepts_model_with_or_without_prefix(settings = _settings(model="ollama/llama3.1",ollama_base_url="",- xkiro_api_key="xkiro-key",+ xkiro_api_keys="xkiro-key",)for override in ("qwen/other-model",@@ -1417,7 +1423,7 @@ def test_xkiro_is_not_enabled_without_explicit_credential(monkeypatch) -> None:monkeypatch.delenv("FCC_SMOKE_MODEL_XKIRO", raising=False)config = _smoke_config(provider_matrix=frozenset({"xkiro"}),- settings=_settings(ollama_base_url="", xkiro_api_key=""),+ settings=_settings(ollama_base_url="", xkiro_api_keys=""),)assert not config.has_provider_configuration("xkiro")diff --git a/tests/contracts/test_smoke_credentials.py b/tests/contracts/test_smoke_credentials.pynew file mode 100644index 00000000..c54b581b--- /dev/null+++ b/tests/contracts/test_smoke_credentials.py@@ -0,0 +1,122 @@+"""Smoke boundaries consume and protect ordered provider credentials."""++import json+import subprocess+from pathlib import Path++import httpx+import pytest++from free_claude_code.config.provider_catalog import PROVIDER_CATALOG+from free_claude_code.config.settings import Settings+from smoke.lib.config import SmokeConfig, redacted+from smoke.product import test_codex_modes_product_live as codex_smoke+++ "key",+ sorted(+ {+ descriptor.credential_env+ for descriptor in PROVIDER_CATALOG.values()+ if descriptor.credential_env+ }+ ),+)+def test_smoke_redaction_expands_every_catalog_credential_collection(key):+ first, second = "private-primary-key", "private-primary-key-with-suffix"+ encoded = json.dumps([first, second])+ message = f"{first}; {second}; {encoded}"+ assert redacted(message, {key: encoded}) == (+ f"<redacted:{key}>; <redacted:{key}>; <redacted:{key}>"+ )+++def test_smoke_redaction_masks_decoded_escaped_and_unicode_keys():+ encoded = json.dumps(['quoted-"secret"-key', "秘密-secret-key"])+ result = redacted(+ 'Credentials quoted-"secret"-key and 秘密-secret-key',+ {"OPENAI_API_KEY": encoded},+ )+ assert result == (+ "Credentials <redacted:OPENAI_API_KEY> and <redacted:OPENAI_API_KEY>"+ )+++def test_smoke_redaction_preserves_scalar_secret_handling():+ assert (+ redacted(+ "Bearer scalar-provider-secret, bot scalar-bot-secret",+ {+ "OPENAI_API_KEY": "scalar-provider-secret",+ "TELEGRAM_BOT_TOKEN": "scalar-bot-secret",+ },+ )+ == "Bearer <redacted:OPENAI_API_KEY>, bot <redacted:TELEGRAM_BOT_TOKEN>"+ )+++def test_smoke_redaction_does_not_fail_while_reporting_malformed_array_input():+ malformed = '["unfinished-private-key"'+ assert (+ redacted(f"Failed to parse {malformed}", {"OPENAI_API_KEY": malformed})+ == "Failed to parse <redacted:OPENAI_API_KEY>"+ )+++ "credential", ["synthetic-first", '["synthetic-first","synthetic-tail"]']+)+def test_live_codex_smoke_exports_first_key_as_subprocess_text(+ monkeypatch, tmp_path, credential+):+ monkeypatch.setenv("FCC_SMOKE_CODEX_FREE_MODEL", "open_router/synthetic/free:free")+ monkeypatch.setattr(+ codex_smoke.shutil, "which", lambda name: str(tmp_path / "bin" / "codex")+ )+ monkeypatch.setattr(+ codex_smoke,+ "run_captured_text",+ lambda *args, **kwargs: subprocess.CompletedProcess(+ ["codex", "--version"], 0, stdout="codex synthetic\n", stderr=""+ ),+ )+ response = httpx.Response(+ 200,+ request=httpx.Request("GET", "https://openrouter.ai/api/v1/models"),+ json={+ "data": [+ {+ "id": "synthetic/free:free",+ "pricing": {"prompt": "0", "completion": "0"},+ }+ ]+ },+ )+ monkeypatch.setattr(codex_smoke.httpx, "get", lambda *args, **kwargs: response)++ class CapturedLaunch(Exception):+ pass++ def capture(command, **kwargs):+ env = kwargs["env"]+ assert env["OPENROUTER_API_KEY"] == "synthetic-first"+ assert all(isinstance(value, str) for value in env.values())+ raise CapturedLaunch++ monkeypatch.setattr("smoke.lib.server.subprocess.Popen", capture)+ config = SmokeConfig(+ root=Path.cwd(),+ results_dir=tmp_path / "results",+ live=False,+ interactive=False,+ targets=frozenset(),+ provider_matrix=frozenset(),+ timeout_s=1,+ prompt="unused",+ claude_bin="unused",+ worker_id="test",+ settings=Settings(OPENROUTER_API_KEY=credential),+ )+ with pytest.raises(CapturedLaunch):+ codex_smoke.test_codex_modes_free_provider_e2e(config, tmp_path)diff --git a/tests/contracts/test_startup_import_boundaries.py b/tests/contracts/test_startup_import_boundaries.pyindex f76fd192..5d49696b 100644--- a/tests/contracts/test_startup_import_boundaries.py+++ b/tests/contracts/test_startup_import_boundaries.py@@ -56,7 +56,7 @@ async def main():assert threading.get_ident() == threadreturn providerreturn construct- assert await create_provider("groq", Settings(groq_api_key="test"), ProviderAdmissionRegistry(ProviderAdmissionLimits(1, 2, 2)), provider_loaders={"groq": load}) is provider+ assert await create_provider("groq", Settings(groq_api_keys="test"), ProviderAdmissionRegistry(ProviderAdmissionLimits(1, 2, 2)), provider_loaders={"groq": load}) is providerawait provider.cleanup()asyncio.run(main())diff --git a/tests/core/test_trace.py b/tests/core/test_trace.pyindex 5db339fb..46dbf8bf 100644--- a/tests/core/test_trace.py+++ b/tests/core/test_trace.py@@ -99,6 +99,39 @@ def test_sanitize_masks_nested_api_key_strings() -> None:assert out["outer"]["text"] == "visible"+def test_trace_redacts_credential_lists_and_all_catalog_aliases():+ from free_claude_code.config.provider_catalog import PROVIDER_CATALOG+ from free_claude_code.core.trace import sanitize_trace_value++ owners = {+ name+ for descriptor in PROVIDER_CATALOG.values()+ for name in (descriptor.credential_env, descriptor.credential_attr)+ if name+ }+ values = {+ name: ["trace-first-sentinel", "trace-inactive-sentinel"] for name in owners+ }+ payload = {+ "values": values,+ "custom_provider": {+ "values": {+ "api_keys": {"entries": [{"value": "custom-trace-sentinel"}]},+ "display_name": "Visible",+ }+ },+ }+ public = sanitize_trace_value(payload)+ encoded = json.dumps(public)+ for secret in (+ "trace-first-sentinel",+ "trace-inactive-sentinel",+ "custom-trace-sentinel",+ ):+ assert secret not in encoded+ assert public["custom_provider"]["values"]["display_name"] == "Visible"++@pytest.mark.parametrize("header", ["x-goog-api-key", "X-Goog-Api-Key", "api-key", "Api-Key"])diff --git a/tests/providers/test_alibaba_cloud.py b/tests/providers/test_alibaba_cloud.pyindex 3cba12dc..fdea4c91 100644--- a/tests/providers/test_alibaba_cloud.py+++ b/tests/providers/test_alibaba_cloud.py@@ -73,7 +73,7 @@ def test_configuration_defaults_and_region_override():config = build_provider_config(descriptor, settings)assert config.api_key == "key"assert config.base_url == BASE_URL- assert descriptor.configuration_attrs() == ("alibaba_cloud_api_key",)+ assert descriptor.configuration_attrs() == ("alibaba_cloud_api_keys",)settings = Settings(ALIBABA_CLOUD_API_KEY="regional-key",diff --git a/tests/providers/test_api_key_checks.py b/tests/providers/test_api_key_checks.pynew file mode 100644index 00000000..a374b3fd--- /dev/null+++ b/tests/providers/test_api_key_checks.py@@ -0,0 +1,129 @@+"""Save checks every submitted key with bounded work and stable row results."""++import asyncio++import httpx+import pytest+from pydantic import SecretStr++from free_claude_code.config.admin.credentials import CredentialSubmission+from free_claude_code.config.settings import Settings+from free_claude_code.providers import credential_validation as validation+++def mock_http(monkeypatch, respond):+ original = httpx.AsyncClient+ clients = []++ def create(**kwargs):+ client = original(transport=httpx.MockTransport(respond), **kwargs)+ clients.append(client)+ return client++ monkeypatch.setattr(validation.httpx, "AsyncClient", create)+ return clients+++async def test_all_rows_use_their_own_credential_and_keep_result_order(monkeypatch):+ seen = []++ async def respond(request):+ credential = request.headers["Authorization"].removeprefix("Bearer ")+ seen.append(credential)+ if credential == "key-0":+ await asyncio.sleep(0.01)+ status = 401 if credential == "key-9" else 200+ return httpx.Response(+ status, json={"error": "invalid"} if status == 401 else {"data": []}+ )++ clients = mock_http(monkeypatch, respond)+ credentials = tuple(SecretStr(f"key-{index}") for index in range(14))+ results = await validation.check_credentials(+ Settings(GROQ_API_KEY="runtime-primary"),+ (CredentialSubmission("GROQ_API_KEY", credentials),),+ )+ assert set(seen) == {f"key-{index}" for index in range(14)}+ assert [result.index for result in results] == list(range(14))+ assert [+ result.index+ for result in results+ if result.status == validation.CredentialStatus.REJECTED+ ] == [9]+ assert all(client.is_closed for client in clients)+++async def test_queued_rows_each_get_an_attempt_and_timeout(monkeypatch):+ active = peak = 0+ seen = []++ async def respond(request):+ nonlocal active, peak+ active += 1+ peak = max(peak, active)+ seen.append(request.headers["Authorization"])+ try:+ await asyncio.Event().wait()+ finally:+ active -= 1++ clients = mock_http(monkeypatch, respond)+ monkeypatch.setattr(validation, "MAX_CONCURRENCY", 2)+ monkeypatch.setattr(validation, "REQUEST_TIMEOUT", 0.03)+ credentials = tuple(SecretStr(f"key-{index}") for index in range(7))+ results = await validation.check_credentials(+ Settings(), (CredentialSubmission("GROQ_API_KEY", credentials),)+ )+ assert len(seen) == 7 and len(set(seen)) == 7+ assert peak <= 2 and active == 0+ assert len(results) == 7+ assert all(+ result.status == validation.CredentialStatus.UNVERIFIED for result in results+ )+ assert all(client.is_closed for client in clients)+++async def test_custom_keys_get_individual_unverified_rows_without_public_probe(+ monkeypatch,+):+ def unexpected(request):+ pytest.fail("A custom public model list cannot verify a key")++ mock_http(monkeypatch, unexpected)+ provider_id = "custom_" + "1" * 32+ submission = CredentialSubmission(+ "api_keys", (SecretStr("one"), SecretStr("two")), provider_id+ )+ results = await validation.check_credentials(Settings(), (submission,))+ assert [result.index for result in results] == [0, 1]+ assert all(result.provider_id == provider_id for result in results)+ assert all(+ result.status == validation.CredentialStatus.UNVERIFIED for result in results+ )+ assert "one" not in repr(results) and "two" not in repr(results)+++async def test_cancelled_batch_closes_every_active_probe(monkeypatch):+ started = asyncio.Event()++ async def respond(request):+ started.set()+ await asyncio.Event().wait()++ clients = mock_http(monkeypatch, respond)+ credentials = tuple(SecretStr(f"key-{index}") for index in range(20))+ task = asyncio.create_task(+ validation.check_credentials(+ Settings(), (CredentialSubmission("GROQ_API_KEY", credentials),)+ )+ )+ await asyncio.wait_for(started.wait(), 1)+ task.cancel()+ with pytest.raises(asyncio.CancelledError):+ await task+ assert clients and len(clients) <= validation.MAX_CONCURRENCY+ assert all(client.is_closed for client in clients)diff --git a/tests/providers/test_credential_validation.py b/tests/providers/test_credential_validation.pyindex 0412c109..24907bc6 100644--- a/tests/providers/test_credential_validation.py+++ b/tests/providers/test_credential_validation.py@@ -5,6 +5,7 @@ import asyncioimport httpximport pytest+from free_claude_code.config.admin.credentials import CredentialSubmissionfrom free_claude_code.config.provider_catalog import PROVIDER_CATALOGfrom free_claude_code.config.settings import Settingsfrom free_claude_code.providers import credential_validation as validation@@ -112,12 +113,26 @@ CASES = [def _settings(provider_id):descriptor = PROVIDER_CATALOG[provider_id]- assert descriptor.credential_attr is not None- return Settings.model_construct(- _fields_set=set(), **{descriptor.credential_attr: "secret-not-a-known-format"}+ assert descriptor.credential_env is not None+ return Settings.model_validate(+ {descriptor.credential_env: "secret-not-a-known-format"})+async def _check_credentials(settings, keys):+ owners = {+ d.credential_env: d.credential_attr+ for d in PROVIDER_CATALOG.values()+ if d.credential_env and d.credential_attr+ }+ submissions = tuple(+ CredentialSubmission(key, getattr(settings, owners[key]))+ for key in dict.fromkeys(keys)+ if key in owners+ )+ return await validation.check_credentials(settings, submissions)++def _mock_http(monkeypatch, handler):clients = []real_client = httpx.AsyncClient@@ -158,7 +173,7 @@ async def test_documented_probe_acceptance_and_rejection(clients = _mock_http(monkeypatch, respond)key = PROVIDER_CATALOG[provider_id].credential_envassert key is not None- result = await validation.check_credentials(_settings(provider_id), (key, key))+ result = await _check_credentials(_settings(provider_id), (key, key))assert result[0].status == validation.CredentialStatus.VERIFIEDassert len(requests) == 1assert all(client.is_closed for client in clients)@@ -169,7 +184,7 @@ async def test_documented_probe_acceptance_and_rejection(body = {"error": {"details": [{"reason": "API_KEY_INVALID"}]}}if provider_id == "siliconflow":body = "Invalid token" # The documented StringData error body.- result = await validation.check_credentials(_settings(provider_id), (key,))+ result = await _check_credentials(_settings(provider_id), (key,))assert result[0].status == (validation.CredentialStatus.REJECTEDif rejection@@ -195,7 +210,7 @@ async def test_ambiguous_errors_warn_without_retry(_mock_http(monkeypatch, respond)key = PROVIDER_CATALOG[provider_id].credential_envassert key is not None- result = await validation.check_credentials(_settings(provider_id), (key,))+ result = await _check_credentials(_settings(provider_id), (key,))assert result[0].status == validation.CredentialStatus.UNVERIFIEDassert len(requests) == 1assert "secret-not-a-known-format" not in caplog.text@@ -217,7 +232,7 @@ async def test_non_api_responses_do_not_verify_or_reject()key = PROVIDER_CATALOG[provider_id].credential_envassert key is not None- result = await validation.check_credentials(_settings(provider_id), (key,))+ result = await _check_credentials(_settings(provider_id), (key,))assert result[0].status == validation.CredentialStatus.UNVERIFIED@@ -231,8 +246,8 @@ async def test_unsupported_shared_credentials_never_send_http(monkeypatch):all_keys = {d.credential_env for d in PROVIDER_CATALOG.values() if d.credential_env}keys = tuple(all_keys - supported)assert "OPENAI_API_KEY" in keys- result = await validation.check_credentials(- Settings.model_construct(), (*keys, "OPENCODE_API_KEY", "MODEL")+ result = await _check_credentials(+ Settings.model_validate(dict.fromkeys(keys, "unverified-key")), keys)assert len(result) == len(keys)assert all(@@ -241,7 +256,7 @@ async def test_unsupported_shared_credentials_never_send_http(monkeypatch):@pytest.mark.asyncio-async def test_batch_timeout_preserves_finished_rejection_and_closes_clients(+async def test_probe_timeout_preserves_finished_rejection_and_closes_clients(monkeypatch,):async def respond(request):@@ -252,11 +267,9 @@ async def test_batch_timeout_preserves_finished_rejection_and_closes_clients(clients = _mock_http(monkeypatch, respond)monkeypatch.setattr(validation, "MAX_CONCURRENCY", 1)- monkeypatch.setattr(validation, "BATCH_TIMEOUT", 0.1)- settings = Settings.model_construct(groq_api_key="key", open_router_api_key="key")- results = await validation.check_credentials(- settings, ("GROQ_API_KEY", "OPENROUTER_API_KEY")- )+ monkeypatch.setattr(validation, "REQUEST_TIMEOUT", 0.1)+ settings = Settings(GROQ_API_KEY="key", OPENROUTER_API_KEY="key")+ results = await _check_credentials(settings, ("GROQ_API_KEY", "OPENROUTER_API_KEY"))assert [r.status for r in results] == [validation.CredentialStatus.REJECTED,validation.CredentialStatus.UNVERIFIED,@@ -275,9 +288,7 @@ async def test_external_cancellation_propagates_and_closes_clients(monkeypatch):raise AssertionError("unreachable")clients = _mock_http(monkeypatch, respond)- task = asyncio.create_task(- validation.check_credentials(_settings("groq"), ("GROQ_API_KEY",))- )+ task = asyncio.create_task(_check_credentials(_settings("groq"), ("GROQ_API_KEY",)))await started.wait()task.cancel()with pytest.raises(asyncio.CancelledError):@@ -295,7 +306,7 @@ async def test_connection_failure_is_safe_and_does_not_retry(monkeypatch):raise httpx.ConnectError("secret-not-a-known-format", request=request)clients = _mock_http(monkeypatch, respond)- results = await validation.check_credentials(_settings("groq"), ("GROQ_API_KEY",))+ results = await _check_credentials(_settings("groq"), ("GROQ_API_KEY",))assert results[0].status == validation.CredentialStatus.UNVERIFIEDassert "secret-not-a-known-format" not in repr(results)assert calls == 1@@ -316,7 +327,7 @@ async def test_recognized_restricted_key_warns_instead_of_rejecting(_mock_http(monkeypatch, lambda request: httpx.Response(200, json=payload))key = PROVIDER_CATALOG[provider_id].credential_envassert key is not None- result = await validation.check_credentials(_settings(provider_id), (key,))+ result = await _check_credentials(_settings(provider_id), (key,))assert result[0].status == validation.CredentialStatus.UNVERIFIEDassert "recognized" in result[0].message@@ -329,7 +340,7 @@ async def test_checks_are_concurrent_but_bounded(monkeypatch):peak = 0started = []- async def check(settings, key, probe):+ async def check(settings, key, probe, credential):nonlocal active, peakactive += 1peak = max(peak, active)@@ -345,12 +356,14 @@ async def test_checks_are_concurrent_but_bounded(monkeypatch):monkeypatch.setattr(validation, "_check_one", check)monkeypatch.setattr(validation, "MAX_CONCURRENCY", 2)task = asyncio.create_task(- validation.check_credentials(- Settings.model_construct(),+ _check_credentials(+ Settings(+ GROQ_API_KEY="one", MISTRAL_API_KEY="two", OPENROUTER_API_KEY="three"+ ),("GROQ_API_KEY", "MISTRAL_API_KEY", "OPENROUTER_API_KEY"),))- await first_wave.wait()+ await asyncio.wait_for(first_wave.wait(), 5)assert len(started) == 2release.set()results = await task@@ -365,7 +378,7 @@ async def test_programming_errors_do_not_become_permission_to_save(monkeypatch):clients = _mock_http(monkeypatch, broken)with pytest.raises(ExceptionGroup) as error:- await validation.check_credentials(_settings("groq"), ("GROQ_API_KEY",))+ await _check_credentials(_settings("groq"), ("GROQ_API_KEY",))assert isinstance(error.value.exceptions[0], RuntimeError)assert all(client.is_closed for client in clients)@@ -381,7 +394,7 @@ async def test_programming_errors_do_not_become_permission_to_save(monkeypatch):)async def test_xkiro_unexpected_usage_remains_unverified(monkeypatch, payload):_mock_http(monkeypatch, lambda request: httpx.Response(200, json=payload))- result = await validation.check_credentials(_settings("xkiro"), ("XKIRO_API_KEY",))+ result = await _check_credentials(_settings("xkiro"), ("XKIRO_API_KEY",))assert result[0].status == validation.CredentialStatus.UNVERIFIED@@ -401,7 +414,7 @@ async def test_anthropic_probe_uses_workspace_and_version_without_inference(ANTHROPIC_AUTH_TOKEN="local-token",ANTHROPIC_WORKSPACE_ID="wrkspc_test",)- checks = await validation.check_credentials(settings, ("ANTHROPIC_API_KEY",))+ checks = await _check_credentials(settings, ("ANTHROPIC_API_KEY",))assert checks[0].status is validation.CredentialStatus.VERIFIEDassert len(requests) == 1request = requests[0]diff --git a/tests/providers/test_custom_provider.py b/tests/providers/test_custom_provider.pyindex abebde99..b037c4d3 100644--- a/tests/providers/test_custom_provider.py+++ b/tests/providers/test_custom_provider.py@@ -21,6 +21,51 @@ from free_claude_code.providers.runtime.config import build_custom_provider_confpytestmark = pytest.mark.asyncio+ "api_format", ["openai_chat", "openai_responses", "anthropic_messages"]+)+async def test_custom_requests_use_first_key_in_each_protocol(api_format):+ requests = []++ def reply(request):+ requests.append(request)+ response = (+ httpx.Response if api_format == "anthropic_messages" else httpx2.Response+ )+ return response(+ 200,+ text=completion(api_format),+ headers={"content-type": "text/event-stream"},+ )++ instance = provider(+ definition(+ api_format=api_format,+ api_keys=["custom-runtime-first", "custom-runtime-tail"],+ ),+ openai_handler=reply,+ messages_handler=reply,+ )+ try:+ stream = instance.stream_messages(+ MessagesRequest(+ model="m",+ max_tokens=64,+ messages=[{"role": "user", "content": "Hello"}],+ )+ )+ assert [event async for event in stream]+ finally:+ await instance.cleanup()+ assert len(requests) == 1+ header = "x-api-key" if api_format == "anthropic_messages" else "authorization"+ assert requests[0].headers[header] == (+ "custom-runtime-first"+ if api_format == "anthropic_messages"+ else "Bearer custom-runtime-first"+ )++@pytest.mark.parametrize("thinking",[diff --git a/tests/providers/test_model_discovery.py b/tests/providers/test_model_discovery.pyindex 1b621517..43f49dbc 100644--- a/tests/providers/test_model_discovery.py+++ b/tests/providers/test_model_discovery.py@@ -7,6 +7,7 @@ from unittest.mock import AsyncMock, patchimport pytestfrom free_claude_code.application.model_metadata import ProviderModelInfo+from free_claude_code.config.api_keys import normalize_api_keysfrom free_claude_code.config.model_refs import ModelFallbackfrom free_claude_code.config.nim import NimSettingsfrom free_claude_code.config.provider_catalog import (@@ -42,12 +43,12 @@ def _settings(model_sonnet: str | None = None,model_haiku: str | None = None,model_fallbacks: tuple[ModelFallback, ...] | None = None,- nvidia_nim_api_key: str = "",- open_router_api_key: str = "",- deepseek_api_key: str = "",- wafer_api_key: str = "",- opencode_api_key: str = "",- zai_api_key: str = "",+ nvidia_nim_api_keys: str = "",+ open_router_api_keys: str = "",+ deepseek_api_keys: str = "",+ wafer_api_keys: str = "",+ opencode_api_keys: str = "",+ zai_api_keys: str = "",vertex_project_id: str = "",) -> Settings:return Settings.model_construct(@@ -57,12 +58,12 @@ def _settings(model_sonnet=model_sonnet,model_haiku=model_haiku,model_fallbacks=model_fallbacks,- nvidia_nim_api_key=nvidia_nim_api_key,- open_router_api_key=open_router_api_key,- deepseek_api_key=deepseek_api_key,- wafer_api_key=wafer_api_key,- opencode_api_key=opencode_api_key,- zai_api_key=zai_api_key,+ nvidia_nim_api_keys=normalize_api_keys(nvidia_nim_api_keys),+ open_router_api_keys=normalize_api_keys(open_router_api_keys),+ deepseek_api_keys=normalize_api_keys(deepseek_api_keys),+ wafer_api_keys=normalize_api_keys(wafer_api_keys),+ opencode_api_keys=normalize_api_keys(opencode_api_keys),+ zai_api_keys=normalize_api_keys(zai_api_keys),vertex_project_id=vertex_project_id,log_api_error_tracebacks=False,)@@ -409,8 +410,8 @@ class FakeProvider(BaseProvider):async def test_runtime_warm_caches_all_referenced_provider_models() -> None:settings = _settings(model_fallbacks=(ModelFallback(model="open_router/anthropic/claude-opus"),),- nvidia_nim_api_key="nim-key",- open_router_api_key="open-router-key",+ nvidia_nim_api_keys="nim-key",+ open_router_api_keys="open-router-key",)nim = FakeProvider(_infos("nim-model"))router = FakeProvider(_infos("anthropic/claude-opus"))@@ -438,7 +439,7 @@ async def test_runtime_warm_caches_all_referenced_provider_models() -> None:async def test_runtime_warm_treats_model_lists_as_discovery_metadata() -> None:settings = _settings(model_sonnet="nvidia_nim/nim-model",- nvidia_nim_api_key="nim-key",+ nvidia_nim_api_keys="nim-key",)runtime = _manager(settings,@@ -456,8 +457,8 @@ async def test_runtime_warm_treats_model_lists_as_discovery_metadata() -> None:async def test_runtime_warm_reports_query_failures_without_blocking() -> None:settings = _settings(model_opus="open_router/anthropic/claude-opus",- nvidia_nim_api_key="nim-key",- open_router_api_key="open-router-key",+ nvidia_nim_api_keys="nim-key",+ open_router_api_keys="open-router-key",)runtime = _manager(settings,@@ -507,8 +508,8 @@ async def test_runtime_warm_queries_referenced_providers_concurrently() -> None:@pytest.mark.asyncioasync def test_startup_discovery_queries_each_successful_provider_once() -> None:settings = _settings(- nvidia_nim_api_key="nim-key",- open_router_api_key="open-router-key",+ nvidia_nim_api_keys="nim-key",+ open_router_api_keys="open-router-key",)nim = FakeProvider(_infos("nim-model"))router = FakeProvider(_infos("anthropic/claude-sonnet"))@@ -533,7 +534,7 @@ async def test_startup_discovery_queries_each_successful_provider_once() -> None@pytest.mark.asyncioasync def test_failed_startup_discovery_remains_eligible_for_explicit_refresh() -> None:- settings = _settings(nvidia_nim_api_key="nim-key")+ settings = _settings(nvidia_nim_api_keys="nim-key")nim = FakeProvider(error=RuntimeError("upstream unavailable"))runtime = _manager(settings, {"nvidia_nim": nim})@@ -551,7 +552,7 @@ async def test_runtime_refresh_model_list_cache_uses_configured_remote_keys_and_):settings = _settings(model="lmstudio/local-qwen",- open_router_api_key="open-router-key",+ open_router_api_keys="open-router-key",)runtime = _manager(settings,@@ -598,7 +599,7 @@ async def test_runtime_refresh_model_list_cache_treats_vertex_project_as_configuasync def test_runtime_refresh_model_list_cache_keeps_prior_cache_on_failure() -> None:settings = _settings(model="nvidia_nim/cached-model",- nvidia_nim_api_key="nim-key",+ nvidia_nim_api_keys="nim-key",)runtime = _manager(settings,diff --git a/tests/providers/test_openai_api_provider.py b/tests/providers/test_openai_api_provider.pyindex 03b27493..34e17557 100644--- a/tests/providers/test_openai_api_provider.py+++ b/tests/providers/test_openai_api_provider.py@@ -8,13 +8,17 @@ import httpx2import pytestfrom free_claude_code.application.model_metadata import ProviderModelInfo+from free_claude_code.config.provider_catalog import PROVIDER_CATALOG+from free_claude_code.config.settings import Settingsfrom free_claude_code.core.anthropic.models import MessagesRequestfrom free_claude_code.core.anthropic.stream_contracts import (parse_sse_text,text_content,)+from free_claude_code.core.failures import ExecutionFailurefrom free_claude_code.core.openai_responses import OpenAIResponsesRequestfrom free_claude_code.providers.openai_api.provider import OpenAIAPIProvider+from free_claude_code.providers.runtime.config import build_provider_configfrom tests.providers.support import immediate_admission, make_provider_config@@ -63,6 +67,75 @@ async def _collect(stream: AsyncIterator[str]) -> str:return "".join([chunk async for chunk in stream])[email protected]("ingress", ["messages", "responses"])+async def test_key_one_authenticates_discovery_and_failure_never_tries_later_keys(+ ingress,+):+ requests = []++ def reply(request):+ requests.append(request)+ if request.url.path == "/v1/models":+ return httpx2.Response(+ 200,+ json={+ "object": "list",+ "data": [+ {+ "id": "gpt-test",+ "object": "model",+ "created": 0,+ "owned_by": "test",+ }+ ],+ },+ )+ return httpx2.Response(+ 401,+ json={+ "error": {+ "message": "Invalid API key",+ "type": "authentication_error",+ "code": "invalid_api_key",+ }+ },+ )++ settings = Settings(OPENAI_API_KEY=["runtime-first", "runtime-inactive"])+ provider = OpenAIAPIProvider(+ build_provider_config(PROVIDER_CATALOG["openai_api"], settings),+ admission=immediate_admission(provider_name="openai_api", max_attempts=1),+ transport=httpx2.MockTransport(reply),+ )+ try:+ assert {model.model_id for model in await provider.list_model_infos()} == {+ "gpt-test"+ }+ with pytest.raises(ExecutionFailure):+ stream = (+ provider.stream_messages(+ MessagesRequest(+ model="gpt-test",+ max_tokens=64,+ messages=[{"role": "user", "content": "Hello"}],+ )+ )+ if ingress == "messages"+ else provider.stream_responses(+ OpenAIResponsesRequest(model="gpt-test", input="Hello")+ )+ )+ await _collect(stream)+ finally:+ await provider.cleanup()+ assert [request.url.path for request in requests] == ["/v1/models", "/v1/responses"]+ assert [request.headers["authorization"] for request in requests] == [+ "Bearer runtime-first",+ "Bearer runtime-first",+ ]++@pytest.mark.asyncio@pytest.mark.parametrize("ingress", ["messages", "responses"])async def test_api_key_provider_uses_public_responses_endpoint(diff --git a/tests/providers/test_provider_client_tool_discovery.py b/tests/providers/test_provider_client_tool_discovery.pyindex 67eb0dea..f31dd82c 100644--- a/tests/providers/test_provider_client_tool_discovery.py+++ b/tests/providers/test_provider_client_tool_discovery.py@@ -247,10 +247,10 @@ async def test_provider_discovery_call_and_result_round_trip(await create_provider(provider_id,Settings(- open_router_api_key="test",- nvidia_nim_api_key="test",- groq_api_key="test",- mistral_api_key="test",+ open_router_api_keys="test",+ nvidia_nim_api_keys="test",+ groq_api_keys="test",+ mistral_api_keys="test",),ProviderAdmissionRegistry(ProviderAdmissionLimits(diff --git a/tests/providers/test_provider_runtime.py b/tests/providers/test_provider_runtime.pyindex 9a5b43ff..e7b9185c 100644--- a/tests/providers/test_provider_runtime.py+++ b/tests/providers/test_provider_runtime.py@@ -10,6 +10,7 @@ from free_claude_code.application.errors import (ApplicationUnavailableError,UnknownProviderError,)+from free_claude_code.config.api_keys import normalize_api_keysfrom free_claude_code.config.nim import NimSettingsfrom free_claude_code.config.provider_catalog import (AGNES_DEFAULT_BASE,@@ -83,57 +84,57 @@ def _make_settings(**overrides):mock.model_opus = Nonemock.model_sonnet = Nonemock.model_haiku = None- mock.openai_api_key = "test_openai_api_key"- mock.azure_openai_api_key = "test_azure_openai_key"+ mock.openai_api_keys = "test_openai_api_key"+ mock.azure_openai_api_keys = "test_azure_openai_key"mock.azure_openai_base_url = "https://test-resource.openai.azure.com/openai/v1/"- mock.nvidia_nim_api_key = "test_key"- mock.open_router_api_key = "test_openrouter_key"- mock.xai_api_key = "test_xai_key"- mock.anthropic_api_key = "test_anthropic_key"+ mock.nvidia_nim_api_keys = "test_key"+ mock.open_router_api_keys = "test_openrouter_key"+ mock.xai_api_keys = "test_xai_key"+ mock.anthropic_api_keys = "test_anthropic_key"mock.anthropic_workspace_id = "workspace"mock.anthropic_proxy = None- mock.alibaba_cloud_api_key = "test_alibaba_key"+ mock.alibaba_cloud_api_keys = "test_alibaba_key"mock.alibaba_cloud_base_url = Nonemock.alibaba_cloud_proxy = None- mock.qwencloud_api_key = "test_qwencloud_key"- mock.qwencloud_coding_api_key = "test_qwencloud_coding_key"- mock.together_api_key = "test_together_key"- mock.deepinfra_api_key = "test_deepinfra_key"- mock.siliconflow_api_key = "test_siliconflow_key"- mock.nebius_api_key = "test_nebius_key"- mock.scw_secret_key = "test_scw_key"- mock.opper_api_key = "test_opper_key"- mock.chutes_api_key = "test_chutes_key"- mock.featherless_api_key = "test_featherless_key"- mock.mistral_api_key = "test_mistral_key"- mock.codestral_api_key = "test_codestral_key"- mock.deepseek_api_key = "test_deepseek_key"- mock.wafer_api_key = "test_wafer_key"- mock.minimax_api_key = "test_minimax_key"- mock.opencode_api_key = "test_opencode_key"- mock.vercel_ai_gateway_api_key = "test_vercel_key"- mock.bedrock_api_key = "test_bedrock_key"+ mock.qwencloud_api_keys = "test_qwencloud_key"+ mock.qwencloud_coding_api_keys = "test_qwencloud_coding_key"+ mock.together_api_keys = "test_together_key"+ mock.deepinfra_api_keys = "test_deepinfra_key"+ mock.siliconflow_api_keys = "test_siliconflow_key"+ mock.nebius_api_keys = "test_nebius_key"+ mock.scw_secret_keys = "test_scw_key"+ mock.opper_api_keys = "test_opper_key"+ mock.chutes_api_keys = "test_chutes_key"+ mock.featherless_api_keys = "test_featherless_key"+ mock.mistral_api_keys = "test_mistral_key"+ mock.codestral_api_keys = "test_codestral_key"+ mock.deepseek_api_keys = "test_deepseek_key"+ mock.wafer_api_keys = "test_wafer_key"+ mock.minimax_api_keys = "test_minimax_key"+ mock.opencode_api_keys = "test_opencode_key"+ mock.vercel_ai_gateway_api_keys = "test_vercel_key"+ mock.bedrock_api_keys = "test_bedrock_key"mock.bedrock_base_url = BEDROCK_DEFAULT_BASE- mock.huggingface_api_key = "test_huggingface_key"- mock.cohere_api_key = "test_cohere_key"- mock.zai_api_key = "test_zai_key"- mock.tokenrouter_api_key = "test_tokenrouter_key"- mock.nararoute_api_key = "test_nararoute_key"- mock.agnes_api_key = "test_agnes_key"- mock.zenmux_api_key = "test_zenmux_key"- mock.wandb_api_key = "test_wandb_key"+ mock.huggingface_api_keys = "test_huggingface_key"+ mock.cohere_api_keys = "test_cohere_key"+ mock.zai_api_keys = "test_zai_key"+ mock.tokenrouter_api_keys = "test_tokenrouter_key"+ mock.nararoute_api_keys = "test_nararoute_key"+ mock.agnes_api_keys = "test_agnes_key"+ mock.zenmux_api_keys = "test_zenmux_key"+ mock.wandb_api_keys = "test_wandb_key"mock.lm_studio_base_url = "http://localhost:1234/v1"mock.llamacpp_base_url = "http://localhost:8080/v1"mock.ollama_base_url = "http://localhost:11434"- mock.ollama_api_key = "test_ollama_cloud_key"- mock.poolside_api_key = "test_poolside_key"- mock.llm7_api_key = "test_llm7_key"- mock.lightning_api_key = "test_lightning_key"- mock.experiential_api_key = "test_experiential_key"- mock.cheaperinference_api_key = "test_cheaperinference_key"- mock.orcarouter_api_key = "test_orcarouter_key"- mock.atlascloud_api_key = "test_atlascloud_key"- mock.xkiro_api_key = "test_xkiro_key"+ mock.ollama_api_keys = "test_ollama_cloud_key"+ mock.poolside_api_keys = "test_poolside_key"+ mock.llm7_api_keys = "test_llm7_key"+ mock.lightning_api_keys = "test_lightning_key"+ mock.experiential_api_keys = "test_experiential_key"+ mock.cheaperinference_api_keys = "test_cheaperinference_key"+ mock.orcarouter_api_keys = "test_orcarouter_key"+ mock.atlascloud_api_keys = "test_atlascloud_key"+ mock.xkiro_api_keys = "test_xkiro_key"mock.nvidia_nim_proxy = Nonemock.open_router_proxy = Nonemock.lmstudio_proxy = None@@ -141,9 +142,9 @@ def _make_settings(**overrides):mock.mistral_proxy = Nonemock.codestral_proxy = Nonemock.kimi_proxy = None- mock.kimi_api_key = "test_kimi_key"+ mock.kimi_api_keys = "test_kimi_key"mock.kimi_code_proxy = None- mock.kimi_code_api_key = "test_kimi_code_key"+ mock.kimi_code_api_keys = "test_kimi_code_key"mock.wafer_proxy = Nonemock.minimax_proxy = Nonemock.opencode_zen_proxy = None@@ -160,22 +161,22 @@ def _make_settings(**overrides):mock.zenmux_proxy = Nonemock.wandb_proxy = Nonemock.fireworks_proxy = None- mock.fireworks_api_key = "test_fireworks_key"+ mock.fireworks_api_keys = "test_fireworks_key"mock.novita_proxy = None- mock.novita_api_key = "test_novita_key"- mock.cloudflare_api_token = "test_cloudflare_token"+ mock.novita_api_keys = "test_novita_key"+ mock.cloudflare_api_tokens = "test_cloudflare_token"mock.cloudflare_account_id = "test_cloudflare_account"mock.cloudflare_proxy = None- mock.gemini_api_key = ""+ mock.gemini_api_keys = ""mock.gemini_proxy = Nonemock.vertex_project_id = "test-vertex-project"mock.vertex_location = "global"mock.vertex_proxy = None- mock.groq_api_key = ""+ mock.groq_api_keys = ""mock.groq_proxy = None- mock.cline_api_key = ""+ mock.cline_api_keys = ""mock.cline_pass_proxy = None- mock.cerebras_api_key = ""+ mock.cerebras_api_keys = ""mock.cerebras_proxy = Nonemock.ollama_cloud_proxy = Nonemock.poolside_proxy = None@@ -186,7 +187,7 @@ def _make_settings(**overrides):mock.orcarouter_proxy = Nonemock.atlascloud_proxy = Nonemock.xkiro_proxy = None- mock.kilo_api_key = "test_kilo_key"+ mock.kilo_api_keys = "test_kilo_key"mock.kilo_proxy = Nonemock.openai_proxy = Nonemock.openai_api_proxy = None@@ -213,6 +214,10 @@ def _make_settings(**overrides):mock.nim = NimSettings()for key, value in overrides.items():setattr(mock, key, value)+ for attr in {+ d.credential_attr for d in PROVIDER_CATALOG.values() if d.credential_attr+ }:+ setattr(mock, attr, normalize_api_keys(mock.__dict__.get(attr)))return mock@@ -251,7 +256,7 @@ def test_ollama_cloud_descriptor_uses_direct_authenticated_endpoint():assert descriptor.default_base_url == OLLAMA_CLOUD_DEFAULT_BASEassert descriptor.credential_env == "OLLAMA_API_KEY"- assert descriptor.credential_attr == "ollama_api_key"+ assert descriptor.credential_attr == "ollama_api_keys"assert descriptor.base_url_attr is Noneassert descriptor.local is False@@ -259,7 +264,7 @@ def test_ollama_cloud_descriptor_uses_direct_authenticated_endpoint():def test_ollama_cloud_provider_config_uses_key_and_proxy():descriptor = PROVIDER_CATALOG["ollama_cloud"]settings = _make_settings(- ollama_api_key="ollama-cloud-token",+ ollama_api_keys="ollama-cloud-token",ollama_cloud_proxy="http://proxy.test:8080",)@@ -274,7 +279,7 @@ def test_ollama_cloud_provider_config_uses_key_and_proxy():async def test_poolside_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["poolside"]settings = _make_settings(- poolside_api_key="poolside-token",+ poolside_api_keys="poolside-token",poolside_proxy="http://proxy.test:8080",)@@ -288,7 +293,7 @@ async def test_poolside_provider_config_uses_key_base_and_proxy() -> None:assert descriptor.display_name == "Poolside AI"assert descriptor.credential_env == "POOLSIDE_API_KEY"- assert descriptor.credential_attr == "poolside_api_key"+ assert descriptor.credential_attr == "poolside_api_keys"assert descriptor.credential_url == "https://platform.poolside.ai/"assert descriptor.default_base_url == POOLSIDE_DEFAULT_BASEassert descriptor.base_url_attr is None@@ -303,7 +308,7 @@ async def test_poolside_provider_config_uses_key_base_and_proxy() -> None:async def test_llm7_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["llm7"]settings = _make_settings(- llm7_api_key="llm7-token",+ llm7_api_keys="llm7-token",llm7_proxy="http://proxy.test:8080",)@@ -317,7 +322,7 @@ async def test_llm7_provider_config_uses_key_base_and_proxy() -> None:assert descriptor.display_name == "LLM7.io"assert descriptor.credential_env == "LLM7_API_KEY"- assert descriptor.credential_attr == "llm7_api_key"+ assert descriptor.credential_attr == "llm7_api_keys"assert descriptor.credential_url == "https://dash.llm7.io/"assert descriptor.default_base_url == LLM7_DEFAULT_BASEassert descriptor.base_url_attr is None@@ -332,7 +337,7 @@ async def test_llm7_provider_config_uses_key_base_and_proxy() -> None:async def test_experiential_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["experiential"]settings = _make_settings(- experiential_api_key="experiential-token",+ experiential_api_keys="experiential-token",experiential_proxy="http://proxy.test:8080",)@@ -346,7 +351,7 @@ async def test_experiential_provider_config_uses_key_base_and_proxy() -> None:assert descriptor.display_name == "Experiential Labs"assert descriptor.credential_env == "EXPLABS_API_KEY"- assert descriptor.credential_attr == "experiential_api_key"+ assert descriptor.credential_attr == "experiential_api_keys"assert (descriptor.credential_url== "https://platform.experientiallabs.ai/settings/api-keys"@@ -364,7 +369,7 @@ async def test_experiential_provider_config_uses_key_base_and_proxy() -> None:async def test_cheaperinference_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["cheaperinference"]settings = _make_settings(- cheaperinference_api_key="ci_live_token",+ cheaperinference_api_keys="ci_live_token",cheaperinference_proxy="http://proxy.test:8080",)@@ -378,7 +383,7 @@ async def test_cheaperinference_provider_config_uses_key_base_and_proxy() -> Nonassert descriptor.display_name == "Cheaper Inference"assert descriptor.credential_env == "CHEAPER_INFERENCE_API_KEY"- assert descriptor.credential_attr == "cheaperinference_api_key"+ assert descriptor.credential_attr == "cheaperinference_api_keys"assert descriptor.credential_url == "https://cheaperinference.com/signup"assert descriptor.default_base_url == CHEAPERINFERENCE_DEFAULT_BASEassert descriptor.base_url_attr is None@@ -393,7 +398,7 @@ async def test_cheaperinference_provider_config_uses_key_base_and_proxy() -> Nonasync def test_orcarouter_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["orcarouter"]settings = _make_settings(- orcarouter_api_key="orcarouter-token",+ orcarouter_api_keys="orcarouter-token",orcarouter_base_url="https://unused.example/v1",orcarouter_proxy="http://proxy.test:8080",)@@ -408,7 +413,7 @@ async def test_orcarouter_provider_config_uses_key_base_and_proxy() -> None:assert descriptor.display_name == "OrcaRouter"assert descriptor.credential_env == "ORCAROUTER_API_KEY"- assert descriptor.credential_attr == "orcarouter_api_key"+ assert descriptor.credential_attr == "orcarouter_api_keys"assert descriptor.credential_url == "https://www.orcarouter.ai/console"assert descriptor.default_base_url == ORCAROUTER_DEFAULT_BASEassert descriptor.base_url_attr is None@@ -423,7 +428,7 @@ async def test_orcarouter_provider_config_uses_key_base_and_proxy() -> None:async def test_atlascloud_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["atlascloud"]settings = _make_settings(- atlascloud_api_key="atlascloud-token",+ atlascloud_api_keys="atlascloud-token",atlascloud_base_url="https://unused.example/v1",atlascloud_proxy="http://proxy.test:8080",)@@ -438,7 +443,7 @@ async def test_atlascloud_provider_config_uses_key_base_and_proxy() -> None:assert descriptor.display_name == "Atlas Cloud"assert descriptor.credential_env == "ATLASCLOUD_API_KEY"- assert descriptor.credential_attr == "atlascloud_api_key"+ assert descriptor.credential_attr == "atlascloud_api_keys"assert descriptor.credential_url == "https://console.atlascloud.ai/api-keys"assert descriptor.default_base_url == ATLASCLOUD_DEFAULT_BASEassert descriptor.base_url_attr is None@@ -453,7 +458,7 @@ async def test_atlascloud_provider_config_uses_key_base_and_proxy() -> None:async def test_xai_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["xai"]settings = _make_settings(- xai_api_key="xai-token",+ xai_api_keys="xai-token",xai_proxy="http://proxy.test:8080",)@@ -477,7 +482,7 @@ async def test_xai_provider_config_uses_key_base_and_proxy() -> None:async def test_qwencloud_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["qwencloud"]settings = _make_settings(- qwencloud_api_key="qwencloud-token",+ qwencloud_api_keys="qwencloud-token",qwencloud_proxy="http://proxy.test:8080",)@@ -501,7 +506,7 @@ async def test_qwencloud_provider_config_uses_key_base_and_proxy() -> None:async def test_cline_pass_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["cline_pass"]settings = _make_settings(- cline_api_key="cline-programmatic-token",+ cline_api_keys="cline-programmatic-token",cline_pass_proxy="http://proxy.test:8080",)@@ -515,7 +520,7 @@ async def test_cline_pass_provider_config_uses_key_base_and_proxy() -> None:assert descriptor.display_name == "ClinePass"assert descriptor.credential_env == "CLINE_API_KEY"- assert descriptor.credential_attr == "cline_api_key"+ assert descriptor.credential_attr == "cline_api_keys"assert descriptor.credential_url == "https://app.cline.bot"assert descriptor.base_url_attr is Noneassert config.api_key == "cline-programmatic-token"@@ -529,7 +534,7 @@ async def test_cline_pass_provider_config_uses_key_base_and_proxy() -> None:async def test_qwencloud_coding_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["qwencloud_coding"]settings = _make_settings(- qwencloud_coding_api_key="qwencloud-coding-token",+ qwencloud_coding_api_keys="qwencloud-coding-token",qwencloud_coding_proxy="http://proxy.test:8080",)@@ -553,7 +558,7 @@ async def test_qwencloud_coding_provider_config_uses_key_base_and_proxy() -> Nonasync def test_together_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["together"]settings = _make_settings(- together_api_key="together-token",+ together_api_keys="together-token",together_proxy="http://proxy.test:8080",)@@ -577,7 +582,7 @@ async def test_together_provider_config_uses_key_base_and_proxy() -> None:async def test_deepinfra_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["deepinfra"]settings = _make_settings(- deepinfra_api_key="deepinfra-token",+ deepinfra_api_keys="deepinfra-token",deepinfra_proxy="http://proxy.test:8080",)@@ -601,7 +606,7 @@ async def test_deepinfra_provider_config_uses_key_base_and_proxy() -> None:async def test_siliconflow_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["siliconflow"]settings = _make_settings(- siliconflow_api_key="siliconflow-token",+ siliconflow_api_keys="siliconflow-token",siliconflow_proxy="http://proxy.test:8080",)@@ -626,7 +631,7 @@ async def test_siliconflow_provider_config_uses_key_base_and_proxy() -> None:async def test_nebius_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["nebius"]settings = _make_settings(- nebius_api_key="nebius-token",+ nebius_api_keys="nebius-token",nebius_proxy="http://proxy.test:8080",)@@ -654,7 +659,7 @@ async def test_nebius_provider_config_uses_key_base_and_proxy() -> None:async def test_scaleway_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["scaleway"]settings = _make_settings(- scw_secret_key="scw-token",+ scw_secret_keys="scw-token",scw_proxy="http://proxy.test:8080",)@@ -680,7 +685,7 @@ async def test_scaleway_provider_config_uses_key_base_and_proxy() -> None:async def test_opper_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["opper"]settings = _make_settings(- opper_api_key="opper-token",+ opper_api_keys="opper-token",opper_proxy="http://proxy.test:8080",)@@ -706,7 +711,7 @@ async def test_opper_provider_config_uses_key_base_and_proxy() -> None:async def test_chutes_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["chutes"]settings = _make_settings(- chutes_api_key="chutes-token",+ chutes_api_keys="chutes-token",chutes_proxy="http://proxy.test:8080",)@@ -734,7 +739,7 @@ async def test_chutes_provider_config_uses_key_base_and_proxy() -> None:async def test_featherless_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["featherless"]settings = _make_settings(- featherless_api_key="featherless-token",+ featherless_api_keys="featherless-token",featherless_proxy="http://proxy.test:8080",)@@ -760,7 +765,7 @@ async def test_featherless_provider_config_uses_key_base_and_proxy() -> None:async def test_agnes_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["agnes"]settings = _make_settings(- agnes_api_key="agnes-token",+ agnes_api_keys="agnes-token",agnes_proxy="http://proxy.test:8080",)@@ -785,7 +790,7 @@ async def test_agnes_provider_config_uses_key_base_and_proxy() -> None:async def test_zenmux_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["zenmux"]settings = _make_settings(- zenmux_api_key="zenmux-token",+ zenmux_api_keys="zenmux-token",zenmux_proxy="http://proxy.test:8080",)@@ -810,7 +815,7 @@ async def test_zenmux_provider_config_uses_key_base_and_proxy() -> None:async def test_wandb_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["wandb"]settings = _make_settings(- wandb_api_key="wandb-token",+ wandb_api_keys="wandb-token",wandb_proxy="http://proxy.test:8080",)@@ -835,7 +840,7 @@ async def test_wandb_provider_config_uses_key_base_and_proxy() -> None:def test_bedrock_provider_config_uses_regional_base_key_and_proxy() -> None:descriptor = PROVIDER_CATALOG["bedrock"]settings = _make_settings(- bedrock_api_key="bedrock-token",+ bedrock_api_keys="bedrock-token",bedrock_base_url="https://bedrock-mantle.eu-west-1.api.aws/v1",bedrock_proxy="http://proxy.test:8080",)@@ -852,7 +857,7 @@ def test_bedrock_provider_config_uses_regional_base_key_and_proxy() -> None:def test_azure_openai_provider_config_uses_resource_base_key_and_proxy() -> None:descriptor = PROVIDER_CATALOG["azure_openai"]settings = _make_settings(- azure_openai_api_key="azure-token",+ azure_openai_api_keys="azure-token",azure_openai_base_url=("https://resource.openai.azure.com/openai/v1/"),azure_openai_proxy="http://proxy.test:8080",)@@ -861,7 +866,7 @@ def test_azure_openai_provider_config_uses_resource_base_key_and_proxy() -> Noneassert descriptor.default_base_url is Noneassert descriptor.configuration_attrs() == (- "azure_openai_api_key",+ "azure_openai_api_keys","azure_openai_base_url",)assert config.api_key == "azure-token"@@ -879,7 +884,7 @@ def test_azure_openai_provider_config_reports_missing_resource_url() -> None:build_provider_config(descriptor,_make_settings(- azure_openai_api_key="azure-token",+ azure_openai_api_keys="azure-token",azure_openai_base_url="",),)@@ -937,7 +942,7 @@ def test_zai_provider_config_ignores_stale_base_url_setting():async def test_zai_api_provider_config_uses_shared_key_general_base_and_own_proxy():descriptor = PROVIDER_CATALOG["zai_api"]settings = _make_settings(- zai_api_key="shared-zai-key",+ zai_api_keys="shared-zai-key",zai_api_proxy="http://proxy.test:8080",)@@ -951,7 +956,7 @@ async def test_zai_api_provider_config_uses_shared_key_general_base_and_own_proxassert descriptor.display_name == "Z.ai API"assert descriptor.credential_env == "ZAI_API_KEY"- assert descriptor.credential_attr == "zai_api_key"+ assert descriptor.credential_attr == "zai_api_keys"assert descriptor.default_base_url == ZAI_API_DEFAULT_BASEassert descriptor.base_url_attr is Noneassert descriptor.proxy_attr == "zai_api_proxy"@@ -972,7 +977,7 @@ def test_minimax_descriptor_uses_expected_endpoint_and_credential():def test_kimi_code_provider_config_uses_subscription_key_and_proxy() -> None:descriptor = PROVIDER_CATALOG["kimi_code"]settings = _make_settings(- kimi_code_api_key="subscription-token",+ kimi_code_api_keys="subscription-token",kimi_code_proxy="http://proxy.test:8080",)@@ -994,7 +999,7 @@ def test_cloudflare_descriptor_uses_api_root_not_account_url():@pytest.mark.asyncioasync def test_create_cloudflare_provider_uses_account_scoped_base_url():settings = _make_settings(- cloudflare_api_token="test_cloudflare_token",+ cloudflare_api_tokens="test_cloudflare_token",cloudflare_account_id="test-account",)@@ -1051,12 +1056,12 @@ def test_opencode_go_catalog_uses_opencode_api_key() -> None:desc = PROVIDER_CATALOG["opencode_go"]assert desc.credential_env == "OPENCODE_API_KEY"- assert desc.credential_attr == "opencode_api_key"+ assert desc.credential_attr == "opencode_api_keys"def test_build_provider_config_opencode_go_uses_opencode_api_key() -> None:descriptor = PROVIDER_CATALOG["opencode_go"]- settings = _make_settings(opencode_api_key="shared-opencode-token")+ settings = _make_settings(opencode_api_keys="shared-opencode-token")config = build_provider_config(descriptor, settings)@@ -1090,7 +1095,7 @@ def test_cohere_descriptor_uses_openai_chat_compatibility_api() -> None:def test_build_provider_config_vercel_uses_gateway_key_and_proxy() -> None:descriptor = PROVIDER_CATALOG["vercel"]settings = _make_settings(- vercel_ai_gateway_api_key="vercel-token",+ vercel_ai_gateway_api_keys="vercel-token",vercel_ai_gateway_proxy="http://proxy.test:8080",)@@ -1103,7 +1108,7 @@ def test_build_provider_config_vercel_uses_gateway_key_and_proxy() -> None:def test_build_provider_config_huggingface_uses_api_key_and_proxy() -> None:descriptor = PROVIDER_CATALOG["huggingface"]settings = _make_settings(- huggingface_api_key="hf-token",+ huggingface_api_keys="hf-token",huggingface_proxy="http://proxy.test:8080",)@@ -1116,7 +1121,7 @@ def test_build_provider_config_huggingface_uses_api_key_and_proxy() -> None:def test_build_provider_config_cohere_uses_api_key_and_proxy() -> None:descriptor = PROVIDER_CATALOG["cohere"]settings = _make_settings(- cohere_api_key="cohere-token",+ cohere_api_keys="cohere-token",cohere_proxy="http://proxy.test:8080",)@@ -1143,25 +1148,25 @@ async def test_create_provider_uses_openai_chat_openrouter_by_default():@pytest.mark.asyncioasync def test_create_provider_instantiates_each_builtin():settings = _make_settings(- gemini_api_key="test_gemini_key",+ gemini_api_keys="test_gemini_key",vertex_project_id="test-vertex-project",- groq_api_key="test_groq_key",- cline_api_key="test_cline_key",- cerebras_api_key="test_cerebras_key",- fireworks_api_key="test_fireworks_key",- novita_api_key="test_novita_key",- cloudflare_api_token="test_cloudflare_token",+ groq_api_keys="test_groq_key",+ cline_api_keys="test_cline_key",+ cerebras_api_keys="test_cerebras_key",+ fireworks_api_keys="test_fireworks_key",+ novita_api_keys="test_novita_key",+ cloudflare_api_tokens="test_cloudflare_token",cloudflare_account_id="test_cloudflare_account",- vercel_ai_gateway_api_key="test_vercel_key",- bedrock_api_key="test_bedrock_key",- huggingface_api_key="test_huggingface_key",- cohere_api_key="test_cohere_key",- kimi_api_key="test_kimi_key",- kimi_code_api_key="test_kimi_code_key",+ vercel_ai_gateway_api_keys="test_vercel_key",+ bedrock_api_keys="test_bedrock_key",+ huggingface_api_keys="test_huggingface_key",+ cohere_api_keys="test_cohere_key",+ kimi_api_keys="test_kimi_key",+ kimi_code_api_keys="test_kimi_code_key",provider_rate_limit=7,provider_rate_window=11,provider_max_concurrency=3,- sambanova_api_key="test_sambanova_key",+ sambanova_api_keys="test_sambanova_key",)cases = {"nvidia_nim": NvidiaNimProvider,@@ -1705,7 +1710,7 @@ async def test_provider_runtime_cleanup_exceptiongroup_on_multiple_failures() ->async def test_xkiro_provider_config_uses_key_base_and_proxy() -> None:descriptor = PROVIDER_CATALOG["xkiro"]settings = _make_settings(- xkiro_api_key="xkiro-token",+ xkiro_api_keys="xkiro-token",xkiro_base_url="https://unused.example/v1",xkiro_proxy="http://proxy.test:8080",)@@ -1720,7 +1725,7 @@ async def test_xkiro_provider_config_uses_key_base_and_proxy() -> None:assert descriptor.display_name == "xKiro"assert descriptor.credential_env == "XKIRO_API_KEY"- assert descriptor.credential_attr == "xkiro_api_key"+ assert descriptor.credential_attr == "xkiro_api_keys"assert descriptor.credential_url == "https://xkiro.com/dashboard/api/keys"assert descriptor.default_base_url == XKIRO_DEFAULT_BASEassert descriptor.base_url_attr is None@@ -1734,5 +1739,5 @@ async def test_xkiro_provider_config_uses_key_base_and_proxy() -> None:def test_xkiro_requires_key_despite_public_catalog():with pytest.raises(ApplicationUnavailableError, match="XKIRO_API_KEY is not set"):build_provider_config(- PROVIDER_CATALOG["xkiro"], _make_settings(xkiro_api_key=None)+ PROVIDER_CATALOG["xkiro"], _make_settings(xkiro_api_keys=None))diff --git a/tests/runtime/test_anthropic_provider_lifecycle.py b/tests/runtime/test_anthropic_provider_lifecycle.pyindex a1f70304..60b27732 100644--- a/tests/runtime/test_anthropic_provider_lifecycle.py+++ b/tests/runtime/test_anthropic_provider_lifecycle.py@@ -3,6 +3,7 @@import httpximport pytest+from free_claude_code.config.api_keys import normalize_api_keysfrom free_claude_code.config.provider_catalog import PROVIDER_CATALOGfrom free_claude_code.config.settings import Settingsfrom free_claude_code.providers.anthropic import AnthropicProvider@@ -44,7 +45,7 @@ async def test_workspace_replacement_retires_http_and_capabilities_with_lease():settings = Settings(MODEL="anthropic/same-model",- NVIDIA_NIM_API_KEY=None,+ NVIDIA_NIM_API_KEY=(),ANTHROPIC_API_KEY="old-key",ANTHROPIC_WORKSPACE_ID="old",)@@ -57,7 +58,10 @@ async def test_workspace_replacement_retires_http_and_capabilities_with_lease():record = await old.model_record("same-model")await manager.replace(settings.model_copy(- update={"anthropic_api_key": "new-key", "anthropic_workspace_id": "new"}+ update={+ "anthropic_api_keys": normalize_api_keys("new-key"),+ "anthropic_workspace_id": "new",+ }),commit=commit,)diff --git a/tests/runtime/test_application_runtime.py b/tests/runtime/test_application_runtime.pyindex 509ec0e0..58b0984a 100644--- a/tests/runtime/test_application_runtime.py+++ b/tests/runtime/test_application_runtime.py@@ -13,7 +13,10 @@ from free_claude_code.application.connected_accounts import ()from free_claude_code.application.errors import ApplicationUnavailableErrorfrom free_claude_code.application.model_metadata import ProviderModelInfo+from free_claude_code.config.admin.credentials import CredentialSubmissionfrom free_claude_code.config.admin.persistence import PreparedAdminUpdate+from free_claude_code.config.api_keys import normalize_api_keys+from free_claude_code.config.loader import ManagedConfigSnapshotfrom free_claude_code.config.settings import Settingsfrom free_claude_code.core.anthropic.models import MessagesRequestfrom free_claude_code.core.openai_responses import OpenAIResponsesRequest@@ -214,6 +217,7 @@ def _prepared(errors=(),pending_fields=pending_fields,path=tmp_path / ".env",+ expected=ManagedConfigSnapshot(settings, {}, {}, {}, tmp_path / ".env"),)@@ -232,7 +236,7 @@ def _runtime_with_admin_provider(provider: BaseProvider,) -> tuple[ApplicationRuntime, ProviderRuntimeManager]:settings = _settings("nvidia_nim/fallback").model_copy(- update={"nvidia_nim_api_key": "test-key"}+ update={"nvidia_nim_api_keys": normalize_api_keys("test-key")})manager = ProviderRuntimeManager(settings,@@ -523,6 +527,9 @@ async def test_credential_checks_gate_both_apply_paths(tmp_path, pending, statusprepared = replace(_prepared(_settings("nvidia_nim/new"), tmp_path, pending_fields=pending),changed_keys=("GROQ_API_KEY",),+ credential_submissions=(+ CredentialSubmission("GROQ_API_KEY", normalize_api_keys("new")),+ ),)checks = (CredentialCheck("GROQ_API_KEY", status, "Safe result"),@@ -545,9 +552,14 @@ async def test_credential_checks_gate_both_apply_paths(tmp_path, pending, status) as commit,):result = await runtime.apply_admin_config({"GROQ_API_KEY": "new"})- check.assert_awaited_once_with(prepared.settings, prepared.changed_keys)+ check.assert_awaited_once_with(prepared.settings, prepared.credential_submissions)assert result["credential_checks"] == [- {"key": check.key, "status": check.status.value, "message": check.message}+ {+ "key": check.key,+ "index": check.index,+ "status": check.status.value,+ "message": check.message,+ }for check in checks]if status == CredentialStatus.REJECTED:diff --git a/tests/runtime/test_config_transactions.py b/tests/runtime/test_config_transactions.pyindex 46a3d3a0..14a3917d 100644--- a/tests/runtime/test_config_transactions.py+++ b/tests/runtime/test_config_transactions.py@@ -284,11 +284,11 @@ async def test_worker_commit_retains_ownership_against_queued_apply(original = store.commitwrites = []- def blocked_commit(values):+ def blocked_commit(values, expected=None):entered.set()assert release.wait(5)writes.append(values["LOG_LEVEL"])- original(values)+ original(values, expected)async def wait_for_commit():while not entered.is_set():diff --git a/tests/runtime/test_configuration.py b/tests/runtime/test_configuration.pyindex ef6fcc7d..d15dc42f 100644--- a/tests/runtime/test_configuration.py+++ b/tests/runtime/test_configuration.py@@ -45,7 +45,9 @@ def test_preparation_uses_captured_disk_and_process_state(monkeypatch):snapshot = store.read({"PORT": "8123"})monkeypatch.setenv("PORT", "9999")store.path.unlink()- prepared = prepare_admin_update({"PORT": "8124"}, snapshot, snapshot.settings)+ prepared = prepare_admin_update(+ {"PORT": "8124"}, snapshot, snapshot.settings, revision_key=b"test-revision-key"+ )assert prepared.settings is not Noneassert prepared.settings.port == 8123assert "PORT" not in prepared.target_valuesdiff --git a/tests/runtime/test_integration_startup.py b/tests/runtime/test_integration_startup.pyindex aa75d68b..7f2b5214 100644--- a/tests/runtime/test_integration_startup.py+++ b/tests/runtime/test_integration_startup.py@@ -11,6 +11,7 @@ from free_claude_code.api.app import create_appfrom free_claude_code.api.ports import ApiServicesfrom free_claude_code.application.model_metadata import ProviderModelInfofrom free_claude_code.application.readiness import InitializationWait+from free_claude_code.config.api_keys import normalize_api_keysfrom free_claude_code.config.loader import ManagedConfigStorefrom free_claude_code.config.paths import claude_desktop_disconnect_pathfrom free_claude_code.config.settings import Settings@@ -43,7 +44,7 @@ def runtime():"proxy_auth_token": TOKEN,"messaging_platform": "none","model": "nvidia_nim/one",- "nvidia_nim_api_key": "test",+ "nvidia_nim_api_keys": normalize_api_keys("test"),})provider = MagicMock(spec=BaseProvider)diff --git a/tests/runtime/test_progressive_startup.py b/tests/runtime/test_progressive_startup.pyindex ede123bb..69a9e2aa 100644--- a/tests/runtime/test_progressive_startup.py+++ b/tests/runtime/test_progressive_startup.py@@ -12,6 +12,7 @@ from free_claude_code.api.ports import ApiServicesfrom free_claude_code.application.errors import ApplicationUnavailableErrorfrom free_claude_code.application.model_metadata import ProviderModelInfofrom free_claude_code.application.readiness import InitializationWait+from free_claude_code.config.api_keys import normalize_api_keysfrom free_claude_code.config.loader import ManagedConfigStorefrom free_claude_code.config.settings import Settingsfrom free_claude_code.core.async_tasks import run_sync_owned@@ -28,8 +29,8 @@ def _settings():return Settings().model_copy(update={"model": "nvidia_nim/one",- "nvidia_nim_api_key": "test",- "groq_api_key": "test",+ "nvidia_nim_api_keys": normalize_api_keys("test"),+ "groq_api_keys": normalize_api_keys("test"),"messaging_platform": "none",})diff --git a/tests/runtime/test_provider_manager.py b/tests/runtime/test_provider_manager.pyindex 5270b67a..58921de1 100644--- a/tests/runtime/test_provider_manager.py+++ b/tests/runtime/test_provider_manager.py@@ -7,6 +7,7 @@ import pytestfrom free_claude_code.application.errors import ApplicationUnavailableErrorfrom free_claude_code.application.model_metadata import ProviderModelInfofrom free_claude_code.application.ports import ModelCatalogPort+from free_claude_code.config.api_keys import normalize_api_keysfrom free_claude_code.config.settings import Settingsfrom free_claude_code.providers.base import BaseProviderfrom free_claude_code.providers.nvidia_nim import NvidiaNimProvider@@ -73,7 +74,7 @@ class RecordingModelCatalogPublisher:def _settings(model: str) -> Settings:return Settings().model_copy(- update={"model": model, "nvidia_nim_api_key": "test-key"}+ update={"model": model, "nvidia_nim_api_keys": normalize_api_keys("test-key")})@@ -100,6 +101,54 @@ async def test_startup_generation_lease_and_shutdown_close_exactly_once() -> Nonawait manager.acquire()+async def test_custom_tail_edit_preserves_metadata_and_first_key_change_evicts_it():+ provider_id = "custom_" + "c" * 32+ definition = {+ "provider_id": provider_id,+ "display_name": "Gateway",+ "base_url": "https://gateway.example/v1",+ "api_keys": ["catalog-first", "catalog-tail"],+ }++ def settings(keys):+ return Settings.model_validate(+ {+ "FCC_CUSTOM_PROVIDERS": [{**definition, "api_keys": keys}],+ "MODEL": f"{provider_id}/one",+ }+ )++ async def held_models():+ await asyncio.Event().wait()++ def factory(config, registry):+ runtime = FakeRuntime(config)+ runtime.provider.list_model_infos = AsyncMock(side_effect=held_models)+ return runtime++ manager = ProviderRuntimeManager(+ settings(["catalog-first", "catalog-tail"]), runtime_factory=factory+ )+ manager.cache_model_infos(+ provider_id, {ProviderModelInfo("one", context_window_tokens=1234)}+ )+ try:+ await manager.replace(+ settings(["catalog-first", "new-tail"]), commit=AsyncMock()+ )+ cached = manager.cached_prefixed_model_infos()+ assert [(info.model_id, info.context_window_tokens) for info in cached] == [+ (f"{provider_id}/one", 1234)+ ]+ await manager.replace(+ settings(["new-tail", "catalog-first"]), commit=AsyncMock()+ )+ assert not manager.cached_prefixed_model_infos()+ finally:+ await manager.close()++@pytest.mark.asyncioasync def test_connected_provider_refresh_and_eviction_are_targeted() -> None:factory = RuntimeFactory()@@ -791,7 +840,7 @@ async def test_application_catalog_survives_generation_replacement() -> None:async def test_generation_lease_keeps_its_model_metadata_after_replacement() -> None:factory = RuntimeFactory()first_settings = _settings("open_router/one").model_copy(- update={"open_router_api_key": "open-router-key"}+ update={"open_router_api_keys": normalize_api_keys("open-router-key")})manager = ProviderRuntimeManager(first_settings, runtime_factory=factory)manager.cache_model_infos(@@ -841,7 +890,7 @@ async def test_generation_lease_keeps_its_model_metadata_after_replacement() ->async def test_replacement_prunes_and_rejects_removed_remote_provider_cache() -> None:factory = RuntimeFactory()first_settings = _settings("open_router/one").model_copy(- update={"open_router_api_key": "open-router-key"}+ update={"open_router_api_keys": normalize_api_keys("open-router-key")})manager = ProviderRuntimeManager(first_settings, runtime_factory=factory)manager.cache_model_infos("open_router", {ProviderModelInfo("old-model")})diff --git a/tests/runtime/test_shared_provider_admission.py b/tests/runtime/test_shared_provider_admission.pyindex 8c623159..4e83170c 100644--- a/tests/runtime/test_shared_provider_admission.py+++ b/tests/runtime/test_shared_provider_admission.py@@ -20,7 +20,7 @@ from tests.runtime.test_provider_manager import RuntimeFactory@pytest.mark.parametrize("protection", ["concurrency", "rate", "recovery"])async def test_replacement_cannot_bypass_existing_protection(protection: str) -> None:settings = Settings(- nvidia_nim_api_key="test-key",+ nvidia_nim_api_keys="test-key",provider_rate_limit=1 if protection == "rate" else 1000,provider_rate_window=60,provider_max_concurrency=1,@@ -163,7 +163,7 @@ async def test_blocked_publication_keeps_old_limits_until_generation_switch():@pytest.mark.asyncioasync def test_old_lazy_construction_uses_current_limits_and_survives_retirement():settings = Settings(- nvidia_nim_api_key="test", provider_rate_limit=1000, provider_max_concurrency=1+ nvidia_nim_api_keys="test", provider_rate_limit=1000, provider_max_concurrency=1)manager = ProviderRuntimeManager(settings)old_lease = await manager.acquire()diff --git a/tests/runtime/test_vscode_chat_sync.py b/tests/runtime/test_vscode_chat_sync.pyindex 68f71803..3457566d 100644--- a/tests/runtime/test_vscode_chat_sync.py+++ b/tests/runtime/test_vscode_chat_sync.py@@ -21,7 +21,7 @@ from free_claude_code.runtime.provider_manager import ProviderRuntimeManagerasync def runtime(request):settings = Settings(model="nvidia_nim/one",- nvidia_nim_api_key="test",+ nvidia_nim_api_keys="test",proxy_auth_token="managed",messaging_platform="none",)