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
Add Amazon Bedrock Mantle support (#1192)
Ali Khokharaf658287bde9
diff --git a/.env.example b/.env.exampleindex 1081ee32..a9935e0e 100644--- a/.env.example+++ b/.env.example@@ -42,6 +42,11 @@ OPENCODE_API_KEY=""AI_GATEWAY_API_KEY=""+# Amazon Bedrock Mantle (region-specific OpenAI-compatible Chat Completions)+AWS_BEARER_TOKEN_BEDROCK=""+BEDROCK_BASE_URL="https://bedrock-mantle.us-east-1.api.aws/v1"++# Hugging Face Inference Providers Config (OpenAI-compatible Chat Completions at router.huggingface.co/v1)HUGGINGFACE_API_KEY=""@@ -101,7 +106,7 @@ OLLAMA_BASE_URL="http://localhost:11434"# All Claude model requests are mapped to these models, plain model is fallback# Format: provider_type/model/name-# Valid providers: "nvidia_nim" | "open_router" | "gemini" | "deepseek" | "mistral" | "mistral_codestral" | "opencode" | "opencode_go" | "vercel" | "huggingface" | "cohere" | "github_models" | "wafer" | "kimi" | "kimi_code" | "minimax" | "cerebras" | "groq" | "sambanova" | "fireworks" | "cloudflare" | "zai" | "ollama_cloud" | "lmstudio" | "llamacpp" | "ollama"+# Valid providers: "nvidia_nim" | "open_router" | "gemini" | "deepseek" | "mistral" | "mistral_codestral" | "opencode" | "opencode_go" | "vercel" | "bedrock" | "huggingface" | "cohere" | "github_models" | "wafer" | "kimi" | "kimi_code" | "minimax" | "cerebras" | "groq" | "sambanova" | "fireworks" | "cloudflare" | "zai" | "ollama_cloud" | "lmstudio" | "llamacpp" | "ollama"MODEL_FABLE=MODEL_OPUS=MODEL_SONNET=@@ -128,6 +133,7 @@ FCC_SMOKE_MODEL_MINIMAX=FCC_SMOKE_MODEL_OPENCODE=FCC_SMOKE_MODEL_OPENCODE_GO=FCC_SMOKE_MODEL_VERCEL=+FCC_SMOKE_MODEL_BEDROCK=FCC_SMOKE_MODEL_HUGGINGFACE=FCC_SMOKE_MODEL_COHERE=FCC_SMOKE_MODEL_GITHUB_MODELS=@@ -170,6 +176,7 @@ MINIMAX_PROXY=""OPENCODE_PROXY=""OPENCODE_GO_PROXY=""VERCEL_AI_GATEWAY_PROXY=""+BEDROCK_PROXY=""HUGGINGFACE_PROXY=""COHERE_PROXY=""GITHUB_MODELS_PROXY=""diff --git a/ARCHITECTURE.md b/ARCHITECTURE.mdindex 528da51a..999f13b4 100644--- a/ARCHITECTURE.md+++ b/ARCHITECTURE.md@@ -327,7 +327,7 @@ parsing and configured `MODEL*` inventory. API routing and provider validationdepend on those helpers instead of adding behavior methods to Settings.[config/admin/](src/free_claude_code/config/admin/) owns the Admin UI config manifest and-managed env writes. Provider credential, local URL, proxy, and display-name+managed env writes. Provider credential, configurable base URL, proxy, and display-namemetadata is generated from [config/provider_catalog.py](src/free_claude_code/config/provider_catalog.py);admin-only help text stays beside the admin manifest. The package splits sourceloading, value presentation, validation, persistence, and provider status into@@ -593,7 +593,10 @@ account-scoped Workers AI OpenAI-compatible Chat Completions endpoint for`@cf/...` model IDs, while account ID composition, model search, andCloudflare-specific reasoning deltas stay in the Cloudflare provider client.OpenRouter remains specialized for model filtering and reasoning-detail stream-events. Wafer, Kimi API, Kimi Code, MiniMax, Fireworks, and Z.ai use ordinary+events. Amazon Bedrock Mantle uses an ordinary profile with a region-specific,+configurable OpenAI base URL and bearer API key; AWS SigV4 and native+Converse/Invoke transports are outside that provider contract. Wafer, Kimi API,+Kimi Code, MiniMax, Fireworks, and Z.ai use ordinarydeclarative profiles for their thinking, token, and `extra_body` policy. KimiCode remains distinct from Kimi API because its subscription key and base URLare a separate customer contract; its profile maps provider-neutral reasoning@@ -675,7 +678,7 @@ usage quirks such as DeepSeek prompt-cache counters.1. Add provider metadata to [config/provider_catalog.py](src/free_claude_code/config/provider_catalog.py).2. Add credentials and related settings to [config/settings.py](src/free_claude_code/config/settings.py)and [.env.example](.env.example) when user configurable.-3. Let Admin UI provider credential, local URL, and proxy fields come from the+3. Let Admin UI provider credential, configurable base URL, and proxy fields come from thecatalog. Add admin-only help text or provider-specific fields under[config/admin/](src/free_claude_code/config/admin/) only when the generated manifest isinsufficient.@@ -1332,7 +1335,7 @@ when maintainers want branch-level assurance.1. Add or expose the setting in [config/settings.py](src/free_claude_code/config/settings.py).2. Add the template key to [.env.example](.env.example) if users configure it.3. Add a `ConfigFieldSpec` under [config/admin/](src/free_claude_code/config/admin/), or add- provider catalog metadata when the setting is provider credential, local URL,+ provider catalog metadata when the setting is provider credential, configurable base URL,proxy, or display-name metadata.4. Mark `restart_required` or `session_sensitive` when runtime state cannot beupdated in place.diff --git a/README.md b/README.mdindex 26e59ae0..438720fd 100644--- a/README.md+++ b/README.md@@ -146,6 +146,7 @@ Enter the listed setting in the Admin UI, open **Model Config**, then search the| [OpenCode Zen](https://opencode.ai/auth) | `OPENCODE_API_KEY` | `opencode/gpt-5.3-codex` || [OpenCode Go](https://opencode.ai/auth) | `OPENCODE_API_KEY` | `opencode_go/minimax-m2.7` || [Vercel AI Gateway](https://vercel.com/docs/ai-gateway/models-and-providers) | `AI_GATEWAY_API_KEY` | `vercel/openai/gpt-5.5` |+| [Amazon Bedrock](https://console.aws.amazon.com/bedrock/) | `AWS_BEARER_TOKEN_BEDROCK` | `bedrock/openai.gpt-oss-120b` || [Hugging Face Inference Providers](https://huggingface.co/settings/tokens) | `HUGGINGFACE_API_KEY` | `huggingface/Qwen/Qwen3-Coder-480B-A35B-Instruct:fastest` || [Cohere](https://dashboard.cohere.com/api-keys) | `COHERE_API_KEY` | `cohere/command-a-plus-05-2026` || [GitHub Models](https://github.com/marketplace?type=models) | `GITHUB_MODELS_TOKEN` | `github_models/openai/gpt-4.1` |@@ -171,6 +172,9 @@ Important provider notes:`kimi/`. Kimi Code plans are for personal interactive coding-agent use under[Kimi's community guidelines](https://www.kimi.com/code/docs/en/kimi-code/community-guidelines.html).- OpenCode Zen and OpenCode Go share `OPENCODE_API_KEY` but use different model prefixes.+- Amazon Bedrock uses its Mantle OpenAI-compatible endpoint. Set+ `BEDROCK_BASE_URL` to the endpoint for the same region as the API key and+ select one of the models returned by FCC's model picker.- Cloudflare requires both its API token and account ID.- Ollama Cloud connects directly to `ollama.com`; use the exact model IDs shownby FCC's model picker. Local Ollama remains available through the separatediff --git a/pyproject.toml b/pyproject.tomlindex c9ef7860..39723aab 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -4,7 +4,7 @@ build-backend = "hatchling.build"[project]name = "free-claude-code"-version = "4.9.0"+version = "4.10.0"description = "Local proxy connecting coding agents to OpenAI-compatible AI providers"readme = "README.md"requires-python = ">=3.14.0"diff --git a/smoke/README.md b/smoke/README.mdindex 5fbe8077..5a6d2c96 100644--- a/smoke/README.md+++ b/smoke/README.md@@ -133,6 +133,7 @@ uv run pytest smoke/product -n 0 -s --tb=short`FCC_SMOKE_MODEL_KIMI_CODE`,`FCC_SMOKE_MODEL_WAFER`, `FCC_SMOKE_MODEL_MINIMAX`,`FCC_SMOKE_MODEL_OPENCODE`, `FCC_SMOKE_MODEL_OPENCODE_GO`,+ `FCC_SMOKE_MODEL_BEDROCK`,`FCC_SMOKE_MODEL_ZAI`, `FCC_SMOKE_MODEL_FIREWORKS`, `FCC_SMOKE_MODEL_CLOUDFLARE`,`FCC_SMOKE_MODEL_GEMINI`, `FCC_SMOKE_MODEL_GROQ`, `FCC_SMOKE_MODEL_CEREBRAS`,`FCC_SMOKE_MODEL_OLLAMA_CLOUD`, `FCC_SMOKE_MODEL_LMSTUDIO`,diff --git a/smoke/lib/config.py b/smoke/lib/config.pyindex bc8b46c1..8a66123c 100644--- a/smoke/lib/config.py+++ b/smoke/lib/config.py@@ -59,6 +59,7 @@ PROVIDER_SMOKE_DEFAULT_MODELS: dict[str, str] = {"opencode": "opencode/gpt-5.3-codex","opencode_go": "opencode_go/minimax-m2.7","vercel": "vercel/openai/gpt-5.5",+ "bedrock": "bedrock/openai.gpt-oss-120b","huggingface": "huggingface/openai/gpt-oss-120b:fastest","cohere": "cohere/command-a-plus-05-2026","github_models": "github_models/openai/gpt-4.1",@@ -251,62 +252,21 @@ class SmokeConfig:return bool(os.getenv(f"FCC_SMOKE_MODEL_{provider.upper()}"))def has_provider_configuration(self, provider: str) -> bool:- if provider == "nvidia_nim":- return bool(self.settings.nvidia_nim_api_key.strip())- if provider == "open_router":- return bool(self.settings.open_router_api_key.strip())- if provider == "mistral":- return bool(self.settings.mistral_api_key.strip())- if provider == "mistral_codestral":- return bool(self.settings.codestral_api_key.strip())- if provider == "deepseek":- return bool(self.settings.deepseek_api_key.strip())- if provider == "ollama_cloud":- return bool(self.settings.ollama_api_key.strip())- if provider == "kimi":- return bool(self.settings.kimi_api_key.strip())- if provider == "kimi_code":- return bool(self.settings.kimi_code_api_key.strip())- if provider == "lmstudio":- return bool(self.settings.lm_studio_base_url.strip())- if provider == "llamacpp":- return bool(self.settings.llamacpp_base_url.strip())- if provider == "ollama":- return bool(self.settings.ollama_base_url.strip())- if provider == "wafer":- return bool(self.settings.wafer_api_key.strip())- if provider == "minimax":- return bool(self.settings.minimax_api_key.strip())- if provider == "fireworks":- return bool(self.settings.fireworks_api_key.strip())- if provider == "opencode":- return bool(self.settings.opencode_api_key.strip())- if provider == "opencode_go":- return bool(self.settings.opencode_api_key.strip())- if provider == "vercel":- return bool(self.settings.vercel_ai_gateway_api_key.strip())- if provider == "huggingface":- return bool(self.settings.huggingface_api_key.strip())- if provider == "cohere":- return bool(self.settings.cohere_api_key.strip())- if provider == "github_models":- return bool(self.settings.github_models_token.strip())- if provider == "zai":- return bool(self.settings.zai_api_key.strip())- if provider == "gemini":- return bool(self.settings.gemini_api_key.strip())- if provider == "groq":- return bool(self.settings.groq_api_key.strip())- if provider == "sambanova":- return bool(self.settings.sambanova_api_key.strip())- if provider == "cerebras":- return bool(self.settings.cerebras_api_key.strip())if provider == "cloudflare":return bool(self.settings.cloudflare_api_token.strip()and self.settings.cloudflare_account_id.strip())- return False+ descriptor = PROVIDER_CATALOG.get(provider)+ if descriptor is None:+ return False+ if descriptor.credential_attr:+ credential = getattr(self.settings, descriptor.credential_attr, "")+ return isinstance(credential, str) and bool(credential.strip())+ if descriptor.base_url_attr:+ base_url = getattr(self.settings, descriptor.base_url_attr, "")+ return isinstance(base_url, str) and bool(base_url.strip())+ return descriptor.static_credential is not Nonedef _parse_csv(raw: str | None) -> frozenset[str]:diff --git a/src/free_claude_code/config/admin/manifest.py b/src/free_claude_code/config/admin/manifest.pyindex 0a8a9dcd..2f5c9830 100644--- a/src/free_claude_code/config/admin/manifest.py+++ b/src/free_claude_code/config/admin/manifest.py@@ -657,6 +657,12 @@ _NON_PROVIDER_FIELDS: tuple[ConfigFieldSpec, ...] = ("smoke",advanced=True,),+ ConfigFieldSpec(+ "FCC_SMOKE_MODEL_BEDROCK",+ "Smoke Amazon Bedrock Model",+ "smoke",+ advanced=True,+ ),ConfigFieldSpec("FCC_SMOKE_MODEL_HUGGINGFACE","Smoke Hugging Face Model",diff --git a/src/free_claude_code/config/admin/provider_manifest.py b/src/free_claude_code/config/admin/provider_manifest.pyindex c055bfe8..b917746f 100644--- a/src/free_claude_code/config/admin/provider_manifest.py+++ b/src/free_claude_code/config/admin/provider_manifest.py@@ -37,6 +37,19 @@ _PROVIDER_FIELD_OVERRIDES: dict[str, dict[str, Any]] = {"ai-gateway.vercel.sh/v1."),},+ "AWS_BEARER_TOKEN_BEDROCK": {+ "label": "Amazon Bedrock API Key",+ "description": (+ "Amazon Bedrock bearer API key for the region-specific Mantle "+ "OpenAI-compatible endpoint."+ ),+ },+ "BEDROCK_BASE_URL": {+ "description": (+ "Amazon Bedrock Mantle OpenAI base URL for the same region as the "+ "API key and selected models."+ ),+ },"HUGGINGFACE_API_KEY": {"label": "Hugging Face API Key","description": (@@ -130,7 +143,7 @@ def provider_field_specs() -> tuple[dict[str, Any], ...]:return (*_credential_field_specs(),*_cloudflare_account_field_specs(),- *_local_base_url_field_specs(),+ *_base_url_field_specs(),*_proxy_field_specs(),)@@ -157,20 +170,21 @@ def _credential_field_specs() -> tuple[dict[str, Any], ...]:return tuple(specs)-def _local_base_url_field_specs() -> tuple[dict[str, Any], ...]:+def _base_url_field_specs() -> tuple[dict[str, Any], ...]:specs: list[dict[str, Any]] = []for descriptor in PROVIDER_CATALOG.values():if descriptor.base_url_attr is None:continue- specs.append(- {- "key": _settings_env_key(descriptor.base_url_attr),- "label": f"{descriptor.display_name} Base URL",- "section_id": "providers",- "settings_attr": descriptor.base_url_attr,- "default": descriptor.default_base_url or "",- }- )+ key = _settings_env_key(descriptor.base_url_attr)+ spec = {+ "key": key,+ "label": f"{descriptor.display_name} Base URL",+ "section_id": "providers",+ "settings_attr": descriptor.base_url_attr,+ "default": descriptor.default_base_url or "",+ }+ spec.update(_PROVIDER_FIELD_OVERRIDES.get(key, {}))+ specs.append(spec)return tuple(specs)diff --git a/src/free_claude_code/config/provider_catalog.py b/src/free_claude_code/config/provider_catalog.pyindex ccb9d257..9765aa7c 100644--- a/src/free_claude_code/config/provider_catalog.py+++ b/src/free_claude_code/config/provider_catalog.py@@ -30,6 +30,9 @@ OLLAMA_CLOUD_DEFAULT_BASE = "https://ollama.com/v1"OPENCODE_DEFAULT_BASE = "https://opencode.ai/zen/v1"OPENCODE_GO_DEFAULT_BASE = "https://opencode.ai/zen/go/v1"VERCEL_AI_GATEWAY_DEFAULT_BASE = "https://ai-gateway.vercel.sh/v1"+# Amazon Bedrock Mantle OpenAI-compatible endpoint. The base URL remains+# configurable because API keys and model availability are region-scoped.+BEDROCK_DEFAULT_BASE = "https://bedrock-mantle.us-east-1.api.aws/v1"HUGGINGFACE_DEFAULT_BASE = "https://router.huggingface.co/v1"COHERE_DEFAULT_BASE = "https://api.cohere.ai/compatibility/v1"GITHUB_MODELS_DEFAULT_BASE = "https://models.github.ai/inference"@@ -139,6 +142,16 @@ PROVIDER_CATALOG: dict[str, ProviderDescriptor] = {default_base_url=VERCEL_AI_GATEWAY_DEFAULT_BASE,proxy_attr="vercel_ai_gateway_proxy",),+ "bedrock": ProviderDescriptor(+ provider_id="bedrock",+ display_name="Amazon Bedrock",+ credential_env="AWS_BEARER_TOKEN_BEDROCK",+ credential_url="https://console.aws.amazon.com/bedrock/",+ credential_attr="bedrock_api_key",+ default_base_url=BEDROCK_DEFAULT_BASE,+ base_url_attr="bedrock_base_url",+ proxy_attr="bedrock_proxy",+ ),"huggingface": ProviderDescriptor(provider_id="huggingface",display_name="Hugging Face",diff --git a/src/free_claude_code/config/settings.py b/src/free_claude_code/config/settings.pyindex 1d5c6262..9953f0df 100644--- a/src/free_claude_code/config/settings.py+++ b/src/free_claude_code/config/settings.py@@ -13,7 +13,7 @@ from .env_files import (settings_env_files,)from .nim import NimSettings-from .provider_catalog import SUPPORTED_PROVIDER_IDS+from .provider_catalog import BEDROCK_DEFAULT_BASE, SUPPORTED_PROVIDER_IDSfrom .reasoning import ReasoningPreference@@ -53,6 +53,15 @@ class Settings(BaseSettings):default="", validation_alias="AI_GATEWAY_API_KEY")+ # ==================== Amazon Bedrock Mantle ====================+ bedrock_api_key: str = Field(+ default="", validation_alias="AWS_BEARER_TOKEN_BEDROCK"+ )+ bedrock_base_url: str = Field(+ default=BEDROCK_DEFAULT_BASE,+ validation_alias="BEDROCK_BASE_URL",+ )+# ==================== Hugging Face Inference Providers ====================huggingface_api_key: str = Field(default="", validation_alias="HUGGINGFACE_API_KEY")@@ -152,6 +161,7 @@ class Settings(BaseSettings):vercel_ai_gateway_proxy: str = Field(default="", validation_alias="VERCEL_AI_GATEWAY_PROXY")+ bedrock_proxy: str = Field(default="", validation_alias="BEDROCK_PROXY")huggingface_proxy: str = Field(default="", validation_alias="HUGGINGFACE_PROXY")cohere_proxy: str = Field(default="", validation_alias="COHERE_PROXY")github_models_proxy: str = Field(default="", validation_alias="GITHUB_MODELS_PROXY")diff --git a/src/free_claude_code/providers/openai_chat/profiles.py b/src/free_claude_code/providers/openai_chat/profiles.pyindex 10e75f30..9404e5b9 100644--- a/src/free_claude_code/providers/openai_chat/profiles.py+++ b/src/free_claude_code/providers/openai_chat/profiles.py@@ -158,6 +158,11 @@ OPENAI_CHAT_PROFILES: dict[str, OpenAIChatProfile] = {),ReasoningObject(_ALL_EFFORTS),),+ "bedrock": OpenAIChatProfile(+ _policy("BEDROCK", ReasoningReplayMode.THINK_TAGS),+ NO_REASONING,+ normalize_base_url=True,+ ),"huggingface": OpenAIChatProfile(_policy("HUGGINGFACE",diff --git a/tests/api/test_admin.py b/tests/api/test_admin.pyindex d7f6247e..8a8e36cd 100644--- a/tests/api/test_admin.py+++ b/tests/api/test_admin.py@@ -31,6 +31,9 @@ def _clear_process_config(monkeypatch) -> None:"NVIDIA_NIM_API_KEY","HUGGINGFACE_API_KEY","OPENROUTER_API_KEY",+ "AWS_BEARER_TOKEN_BEDROCK",+ "BEDROCK_BASE_URL",+ "BEDROCK_PROXY","OLLAMA_API_KEY","ANTHROPIC_AUTH_TOKEN","TELEGRAM_PROXY_URL",@@ -259,6 +262,8 @@ def test_admin_config_masks_secrets_and_exposes_manifest(monkeypatch, tmp_path):assert "REASONING_FABLE" in keysassert "ANTHROPIC_AUTH_TOKEN" in keysassert "OPENROUTER_API_KEY" in keys+ assert "AWS_BEARER_TOKEN_BEDROCK" in keys+ assert "BEDROCK_BASE_URL" in keysassert "FIREWORKS_API_KEY" in keysassert "CLOUDFLARE_API_TOKEN" in keysassert "CLOUDFLARE_ACCOUNT_ID" in keys@@ -651,6 +656,33 @@ def test_admin_apply_writes_cerebras_key_and_masks_preview(monkeypatch, tmp_pathassert "CEREBRAS_API_KEY=cb-secret" in text+def test_admin_apply_writes_bedrock_region_config_and_masks_key(monkeypatch, tmp_path):+ _set_home(monkeypatch, tmp_path)+ _clear_process_config(monkeypatch)+ app = create_test_app()++ response = _local_client(app).post(+ "/admin/api/config/apply",+ json={+ "values": {+ "MODEL": "bedrock/openai.gpt-oss-120b",+ "AWS_BEARER_TOKEN_BEDROCK": "bedrock-secret",+ "BEDROCK_BASE_URL": ("https://bedrock-mantle.us-west-2.api.aws/v1"),+ }+ },+ )++ assert response.status_code == 200+ body = response.json()+ assert body["applied"] is True+ assert "AWS_BEARER_TOKEN_BEDROCK=********" in body["env_preview"]+ env_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 "BEDROCK_BASE_URL=https://bedrock-mantle.us-west-2.api.aws/v1" in text++def test_admin_apply_writes_cloudflare_fields_and_masks_preview(monkeypatch, tmp_path):_set_home(monkeypatch, tmp_path)_clear_process_config(monkeypatch)diff --git a/tests/config/test_config.py b/tests/config/test_config.pyindex 95c03b80..8173dc3c 100644--- a/tests/config/test_config.py+++ b/tests/config/test_config.py@@ -347,6 +347,23 @@ class TestSettings:assert settings.vercel_ai_gateway_api_key == "vercel-key"assert settings.vercel_ai_gateway_proxy == "http://proxy.test:8080"+ def test_bedrock_settings_from_official_environment(self, monkeypatch):+ """Bedrock key, regional base URL, and proxy load into settings."""+ from free_claude_code.config.settings import Settings++ monkeypatch.setenv("AWS_BEARER_TOKEN_BEDROCK", "bedrock-key")+ monkeypatch.setenv(+ "BEDROCK_BASE_URL", "https://bedrock-mantle.us-west-2.api.aws/v1"+ )+ monkeypatch.setenv("BEDROCK_PROXY", "http://proxy.test:8080")+ settings = Settings()++ assert settings.bedrock_api_key == "bedrock-key"+ assert settings.bedrock_base_url == (+ "https://bedrock-mantle.us-west-2.api.aws/v1"+ )+ assert settings.bedrock_proxy == "http://proxy.test:8080"+def test_huggingface_settings_from_env(self, monkeypatch):"""Hugging Face key and proxy env vars load into settings."""from free_claude_code.config.settings import Settingsdiff --git a/tests/contracts/test_admin_provider_manifest.py b/tests/contracts/test_admin_provider_manifest.pyindex 36ba118a..98635028 100644--- a/tests/contracts/test_admin_provider_manifest.py+++ b/tests/contracts/test_admin_provider_manifest.py@@ -33,7 +33,7 @@ def test_provider_catalog_remote_credentials_in_admin_manifest() -> None:assert not missing and not wrong_attr, "\n".join(missing + wrong_attr)-def test_provider_catalog_local_base_urls_in_admin_manifest() -> None:+def test_provider_catalog_base_urls_in_admin_manifest() -> None:missing_key: list[str] = []wrong_attr: list[str] = []diff --git a/tests/contracts/test_provider_catalog_order.py b/tests/contracts/test_provider_catalog_order.pyindex cd41dca2..24d36781 100644--- a/tests/contracts/test_provider_catalog_order.py+++ b/tests/contracts/test_provider_catalog_order.py@@ -15,6 +15,7 @@ _EXPECTED_PROVIDER_ORDER: tuple[str, ...] = ("opencode","opencode_go","vercel",+ "bedrock","huggingface","cohere","github_models",diff --git a/tests/contracts/test_smoke_config.py b/tests/contracts/test_smoke_config.pyindex f65dea59..7d6331ec 100644--- a/tests/contracts/test_smoke_config.py+++ b/tests/contracts/test_smoke_config.py@@ -39,6 +39,8 @@ def _settings(**overrides):"minimax_api_key": "","opencode_api_key": "","vercel_ai_gateway_api_key": "",+ "bedrock_api_key": "",+ "bedrock_base_url": "https://bedrock-mantle.us-east-1.api.aws/v1","huggingface_api_key": "","cohere_api_key": "","github_models_token": "",@@ -155,6 +157,23 @@ def test_openrouter_provider_smoke_uses_concrete_free_model(monkeypatch) -> Noneassert models[0].source == "provider_default"+def test_bedrock_provider_configuration_uses_official_api_key(monkeypatch) -> None:+ monkeypatch.delenv("FCC_SMOKE_MODEL_BEDROCK", raising=False)+ config = _smoke_config(+ settings=_settings(+ model="ollama/llama3.1",+ ollama_base_url="",+ bedrock_api_key="bedrock-key",+ )+ )++ assert config.has_provider_configuration("bedrock")+ models = config.provider_smoke_models()+ assert [model.provider for model in models] == ["bedrock"]+ assert models[0].full_model == "bedrock/openai.gpt-oss-120b"+ assert models[0].source == "provider_default"++def test_wafer_provider_configuration_uses_api_key(monkeypatch) -> None:monkeypatch.delenv("FCC_SMOKE_MODEL_WAFER", raising=False)config = _smoke_config(diff --git a/tests/providers/test_bedrock.py b/tests/providers/test_bedrock.pynew file mode 100644index 00000000..32d7c821--- /dev/null+++ b/tests/providers/test_bedrock.py@@ -0,0 +1,143 @@+"""Tests for the Amazon Bedrock Mantle provider profile."""++from types import SimpleNamespace+from unittest.mock import AsyncMock, patch++import pytest++from free_claude_code.config.provider_catalog import BEDROCK_DEFAULT_BASE+from free_claude_code.providers.base import ProviderConfig+from free_claude_code.providers.openai_chat import OpenAIChatProvider+from tests.providers.request_factory import make_messages_request+from tests.providers.support import passthrough_rate_limiter, profiled_provider++BEDROCK_MODEL = "openai.gpt-oss-120b"+++def _provider(base_url: str = BEDROCK_DEFAULT_BASE) -> OpenAIChatProvider:+ return profiled_provider(+ "bedrock",+ ProviderConfig(api_key="bedrock-key", base_url=base_url),+ rate_limiter=passthrough_rate_limiter(),+ )+++ ("configured", "expected"),+ [+ (+ "https://bedrock-mantle.us-west-2.api.aws",+ "https://bedrock-mantle.us-west-2.api.aws/v1",+ ),+ (+ "https://bedrock-mantle.us-west-2.api.aws/",+ "https://bedrock-mantle.us-west-2.api.aws/v1",+ ),+ (+ "https://bedrock-mantle.us-west-2.api.aws/v1",+ "https://bedrock-mantle.us-west-2.api.aws/v1",+ ),+ ],+)+def test_init_uses_bearer_key_and_normalizes_regional_openai_base(+ configured: str, expected: str+) -> None:+ with patch(+ "free_claude_code.providers.openai_chat.provider.AsyncOpenAI"+ ) as openai_client:+ provider = _provider(configured)++ assert provider._provider_name == "BEDROCK"+ assert provider._api_key == "bedrock-key"+ assert provider._base_url == expected+ assert openai_client.call_args.kwargs["api_key"] == "bedrock-key"+ assert openai_client.call_args.kwargs["base_url"] == expected+++def test_request_uses_portable_chat_fields_without_invented_reasoning() -> None:+ request = make_messages_request(+ BEDROCK_MODEL,+ output_config={"effort": "high"},+ tools=[+ {+ "name": "read_file",+ "description": "Read one file",+ "input_schema": {+ "type": "object",+ "properties": {"path": {"type": "string"}},+ "required": ["path"],+ },+ }+ ],+ )++ body = _provider()._build_request_body(request)++ assert body["model"] == BEDROCK_MODEL+ assert body["messages"][0] == {"role": "system", "content": "System prompt"}+ assert body["max_tokens"] == 100+ assert body["tools"][0]["function"]["name"] == "read_file"+ assert "reasoning_effort" not in body+ assert "reasoning" not in body+ assert "thinking" not in body+++def test_reasoning_history_replays_as_portable_think_tags() -> None:+ request = make_messages_request(+ BEDROCK_MODEL,+ messages=[+ {+ "role": "assistant",+ "content": [+ {"type": "thinking", "thinking": "Inspect the repository."},+ {"type": "text", "text": "I found the file."},+ {+ "type": "tool_use",+ "id": "call_1",+ "name": "read_file",+ "input": {"path": "README.md"},+ },+ ],+ },+ {+ "role": "user",+ "content": [+ {+ "type": "tool_result",+ "tool_use_id": "call_1",+ "content": "contents",+ }+ ],+ },+ ],+ )++ body = _provider()._build_request_body(request)+ assistant = next(+ message for message in body["messages"] if message["role"] == "assistant"+ )++ assert assistant["content"] == (+ "<think>\nInspect the repository.\n</think>\n\nI found the file."+ )+ assert assistant["tool_calls"][0]["id"] == "call_1"+ assert "reasoning_content" not in assistant+ assert "reasoning" not in assistant+++async def test_model_discovery_uses_mantle_openai_models_endpoint() -> None:+ provider = _provider()+ provider._client.models.list = AsyncMock(+ return_value=SimpleNamespace(+ data=[+ SimpleNamespace(id="openai.gpt-oss-120b"),+ SimpleNamespace(id="amazon.nova-pro-v1:0"),+ ]+ )+ )++ assert await provider.list_model_ids() == frozenset(+ {"openai.gpt-oss-120b", "amazon.nova-pro-v1:0"}+ )+ provider._client.models.list.assert_awaited_once_with()diff --git a/tests/providers/test_provider_runtime.py b/tests/providers/test_provider_runtime.pyindex f45554bb..d861b143 100644--- a/tests/providers/test_provider_runtime.py+++ b/tests/providers/test_provider_runtime.py@@ -8,6 +8,7 @@ import pytestfrom free_claude_code.application.errors import UnknownProviderErrorfrom free_claude_code.config.nim import NimSettingsfrom free_claude_code.config.provider_catalog import (+ BEDROCK_DEFAULT_BASE,COHERE_DEFAULT_BASE,GITHUB_MODELS_DEFAULT_BASE,HUGGINGFACE_DEFAULT_BASE,@@ -55,6 +56,8 @@ def _make_settings(**overrides):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.bedrock_base_url = BEDROCK_DEFAULT_BASEmock.huggingface_api_key = "test_huggingface_key"mock.cohere_api_key = "test_cohere_key"mock.github_models_token = "test_github_models_token"@@ -78,6 +81,7 @@ def _make_settings(**overrides):mock.opencode_proxy = ""mock.opencode_go_proxy = ""mock.vercel_ai_gateway_proxy = ""+ mock.bedrock_proxy = ""mock.huggingface_proxy = ""mock.cohere_proxy = ""mock.github_models_proxy = ""@@ -162,6 +166,23 @@ def test_ollama_cloud_provider_config_uses_key_and_proxy():assert config.proxy == "http://proxy.test:8080"+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_base_url="https://bedrock-mantle.eu-west-1.api.aws/v1",+ bedrock_proxy="http://proxy.test:8080",+ )++ config = build_provider_config(descriptor, settings)++ assert descriptor.credential_env == "AWS_BEARER_TOKEN_BEDROCK"+ assert descriptor.default_base_url == BEDROCK_DEFAULT_BASE+ assert config.api_key == "bedrock-token"+ assert config.base_url == "https://bedrock-mantle.eu-west-1.api.aws/v1"+ assert config.proxy == "http://proxy.test:8080"++@pytest.mark.parametrize(("provider_id", "expected_api_key"),[@@ -374,6 +395,7 @@ def test_create_provider_instantiates_each_builtin():cloudflare_api_token="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",github_models_token="test_github_models_token",@@ -403,6 +425,7 @@ def test_create_provider_instantiates_each_builtin():"opencode": OpenAIChatProvider,"opencode_go": OpenAIChatProvider,"vercel": OpenAIChatProvider,+ "bedrock": OpenAIChatProvider,"huggingface": OpenAIChatProvider,"cohere": OpenAIChatProvider,"github_models": GitHubModelsProvider,diff --git a/uv.lock b/uv.lockindex 1a94b431..65b57c8a 100644--- a/uv.lock+++ b/uv.lock@@ -570,7 +570,7 @@ wheels = [[[package]]name = "free-claude-code"-version = "4.9.0"+version = "4.10.0"source = { editable = "." }dependencies = [{ name = "aiohttp" },