diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 63a955d3c..7f5f55219 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,39 +1,48 @@
-## Lime v1.0.1
+## Lime v1.1.0
 
 ### ✨ 主要更新
 
-- **主工作台与 Agent Chat 持续收敛**：Home Shell、Workspace、Decision Panel、Markdown 渲染、Service Skill 入口与 Workbench 交互继续围绕当前主链统一，减少入口分叉与状态散落
-- **Artifact Document 与工作区运行时继续加固**：Artifact 文档渲染、校验、输出 schema、操作服务、Canvas / A2UI / Preview / Workflow 链路同步整理，让文档型产物、工作台画布和会话侧的连接更稳定
-- **Team / Subagent / MCP 协作链路补强**：Aster Agent 命令运行时、请求元数据、子代理工具、MCP 命令面板与相关测试继续补齐，围绕团队协作和工具编排做进一步收口
-- **历史创作分支继续清退**：`content-creator`、`novel`、`poster`、`music` 等旧主题、旧命令、旧资源与相关接口进一步删除或下沉，治理目录、命令文档与路线图同步更新，减少长期并行 surface
+- **Lime 版本切换到 `v1.1.0` 稳定版**：应用版本与发布说明统一升级，发布产物、Tauri 配置和前端包版本保持一致
+- **Aster Agent Framework 对齐 `aster-rust v0.25.0`**：Lime 声明的远端 `aster-core` / `aster-models` 依赖 tag 已同步提升，和当前本地联调的 `aster-rust` 版本保持一致
+- **设置页与 Provider Pool 体验收口**：设置页重复标题移除，背景氛围层与小屏 Provider 排版整理，让设置主路径更接近当前设计语言
+- **运行时与桥接稳定性补强**：补了浏览器运行时审计测试隔离、图片资源入库测试边界和相关工作台发送/模型列表回归，减少统一校验里的不稳定因素
 
 ### ⚠️ 发布与兼容性说明
 
-- 本次发布 tag 为 `v1.0.1`，应用内版本号保持为 `1.0.1`；`.github/workflows/release.yml` 会按稳定版语义创建 GitHub Release
+- 本次发布 tag 为 `v1.1.0`，应用内版本号保持为 `1.1.0`；`.github/workflows/release.yml` 会按稳定版语义创建 GitHub Release
 - Homebrew Tap 更新工作流不会再把本次发布视为 prerelease；Release 发布后会继续走稳定通道同步
-- 当前仓库声明的 `aster-rust` 依赖已提升到 `v0.24.0`
-- 本地如果启用了 `.cargo/config.toml` 的 Aster 覆盖，请确认它指向干净的 `v0.24.0` 仓库；GitHub Release runner 不会带本地绝对路径覆盖
+- 当前仓库声明的 `aster-rust` 依赖已提升到 `v0.25.0`
+- 本地如果启用了 `.cargo/config.toml` 的 Aster 覆盖，请确认它指向干净的 `v0.25.0` 仓库；GitHub Release runner 不会带本地绝对路径覆盖
 
 ### 🔗 依赖与版本同步
 
-- 应用版本已同步提升到 `1.0.1`，覆盖 `package.json`、`package-lock.json`、`src-tauri/Cargo.toml`、`src-tauri/tauri.conf.json`、`src-tauri/tauri.conf.headless.json`
-- `src-tauri/Cargo.lock` 会随本次 Rust 校验刷新，确保工作区 crate 的版本快照与 `1.0.1` 对齐
-- `aster-core` / `aster-models` 的 git tag 已同步切换到 `v0.24.0`
+- 应用版本已同步提升到 `1.1.0`，覆盖 `package.json`、`package-lock.json`、`src-tauri/Cargo.toml`、`src-tauri/tauri.conf.json`、`src-tauri/tauri.conf.headless.json`
+- `src-tauri/Cargo.lock` 会随本次 Rust 校验刷新，确保工作区 crate 的版本快照与 `1.1.0` 对齐
+- `aster-core` / `aster-models` 的 git tag 已同步切换到 `v0.25.0`
 
 ### 🧪 发布前校验
 
 - `cargo fmt --manifest-path src-tauri/Cargo.toml --all`
 - `cargo test --manifest-path src-tauri/Cargo.toml`
-- `cargo clippy --manifest-path src-tauri/Cargo.toml`
+- `cargo clippy --manifest-path src-tauri/Cargo.toml --all-targets -- -D warnings`
 - `npm run lint`
 - `npm run verify:app-version`
-- 当前结果：`npm run verify:app-version` 与 `npm run lint` 已通过；`cargo test` 已通过（`739` 个单测通过，`2` 个集成测试通过，另有 `2` 个真实联网测试保持 `ignored`）；`cargo clippy` 已完成，但仍有若干既有 warning（如 `lime-browser-runtime` 的 `unnecessary_map_or`、`lime-agent` 的 `large_enum_variant` / `too_many_arguments`、主 crate 的未使用常量）
+- `npm run test:contracts`
+- `npm run verify:gui-smoke -- --reuse-running`
+- 当前结果：
+  - `cargo fmt --manifest-path src-tauri/Cargo.toml --all`：通过
+  - `CARGO_TARGET_DIR=target-version-check cargo test --manifest-path src-tauri/Cargo.toml`：通过，`745 passed`，额外集成测试 `2 passed`，真实联网测试 `2 ignored`
+  - `CARGO_TARGET_DIR=target-version-check cargo clippy --manifest-path src-tauri/Cargo.toml --all-targets -- -D warnings`：通过
+  - `npm run lint`：通过
+  - `npm run verify:app-version`：通过
+  - `npm run test:contracts`：通过
+  - `npm run verify:gui-smoke -- --reuse-running`：通过
 
 ### 📝 文档同步
 
-- 发布说明已切换到当前这次 `v1.0.1` 稳定版发布内容，供 GitHub Release 直接读取
+- 发布说明已切换到当前这次 `v1.1.0` 稳定版发布内容，供 GitHub Release 直接读取
 - 命令边界、质量流程、路线图与工作区相关文档会随当前主线收敛继续同步
 
 ---
 
-**完整变更**: `v1.0.0-beta` -> `v1.0.1`
+**完整变更**: `v1.0.1` -> `v1.1.0`
diff --git a/docs/aiprompts/commands.md b/docs/aiprompts/commands.md
index deb3f186c..69dcac35a 100644
--- a/docs/aiprompts/commands.md
+++ b/docs/aiprompts/commands.md
@@ -52,12 +52,47 @@
 
 旧 `poster_material_*` 命名只允许停留在 schema 迁移与治理守卫中，不应重新出现在前端网关、Rust 命令模块或运行时代码里。
 
+模型 Provider 真相集同样遵循单一事实源。当前前端入口为 `src/lib/api/modelRegistry.ts` 中的：
+
+- `get_model_registry_provider_ids`
+
+它只允许读取 `src-tauri/resources/models/index.json` 的 `providers` 列表。无论是正式 Tauri 命令还是 DevBridge 开发链路，都不应再回退数据库或其它运行态缓存去“猜” provider 集合；资源异常时必须直接暴露错误，避免把索引损坏伪装成“只是没有模型”。
+
 文档导出链路同样遵循这条路径。当前主入口为 `src/lib/api/document-export.ts`，统一承接：
 
 - `save_exported_document`
 
 `Artifact Workbench`、文档工作台与其他导出入口如需把内容落到用户选择的本地路径，应继续复用这条主链，不要在业务组件里重新扩散 `Blob + a.download` 式浏览器旁路。
 
+自动化设置链路同样遵循这条路径。当前主入口为 `src/lib/api/automation.ts`，统一承接：
+
+- `get_automation_scheduler_config`
+- `update_automation_scheduler_config`
+- `get_automation_status`
+- `get_automation_jobs`
+- `get_automation_job`
+- `create_automation_job`
+- `update_automation_job`
+- `delete_automation_job`
+- `run_automation_job_now`
+- `get_automation_health`
+- `get_automation_run_history`
+- `preview_automation_schedule`
+- `validate_automation_schedule`
+
+这些命令属于当前 `设置 -> 系统 -> 自动化` 主路径。浏览器模式下如已接通 DevBridge，应优先走真实后端；不要因为 dispatcher 漏接而长期依赖 mock 掩盖设置页报错。
+
+Companion 桌宠链路同样遵循这条路径。当前主入口为 `src/lib/api/companion.ts`，统一承接：
+
+- `companion_get_pet_status`
+- `companion_launch_pet`
+- `companion_send_pet_command`
+
+Lime 主应用会在本地维护 `ws://127.0.0.1:45554/companion/pet` 的桌宠 companion 入口。前端如需感知桌宠连接状态，应继续通过 `companion-pet-status` 事件监听统一状态，不要在页面或 Hook 里自行直连本地 `WebSocket`。
+
+如果 companion 协议继续扩展，也应优先延续“Lime 做宿主、桌宠只收脱敏派生状态”的边界。例如 provider 凭证池相关能力，允许 Lime 通过 `companion_send_pet_command` 下发诸如 `pet.provider_overview` 这类脱敏摘要，并允许桌宠通过 `pet.open_provider_settings` 之类事件请求 Lime 聚焦主窗口并跳到 `设置 -> AI 服务商`；但不允许桌宠直接读取凭证文件、数据库或内部 `/v1/credentials/*` 完整凭证接口。
+
+
 ## 命令契约的五个事实源
 
 命令边界不是单文件事实，至少要同时看下面五处：
@@ -183,6 +218,7 @@ npm run verify:local
 
 - `agent_runtime_submit_turn.turn_config` 新增或调整 `approval_policy / sandbox_policy`
 - `agent_runtime_submit_turn.request_metadata.harness.team_memory_shadow` 新增或调整 repo-scoped Team 协作记忆注入
+- `agent_runtime_spawn_subagent` 的 current request 字段新增或调整 `name / teamName / cwd`，或修改 spawn 后的 Team 成员写回、child `working_dir` 与父子会话上下文投影
 - `agent_runtime_update_session` 新增或调整 `provider_name / model_name / execution_strategy / recent_access_mode / recent_preferences / recent_team_selection`
 - `getSession/listSessions` 的 `execution_runtime` 新增或调整 `recent_access_mode / recent_theme / recent_session_mode / recent_gate_key / recent_run_title / recent_content_id`
 - 话题切换时的 provider/model、权限 accessMode、工具偏好、Team 选择，或 `theme / session_mode / gate_key / run_title / content_id` 恢复从本地 fallback 向 `execution_runtime` 收敛
@@ -227,6 +263,7 @@ npm run verify:local
 以下是仓库当前已经明确收敛的几个方向：
 
 - **Agent / Codex 主命令**：继续收敛到 `agent_runtime_*`
+- **子代理运行时主链**：继续收敛到 `agent_runtime_spawn_subagent`；当前 request surface 使用 `name / teamName / cwd` 等字段，其中 `teamName` 需要与 `name` 搭配并依附现有 Team 上下文，`cwd` 必须是绝对目录，并稳定投影到 child session 的 `working_dir` 与 Team 成员展示
 - **会话状态回写主链**：继续收敛到 `agent_runtime_update_session`，用于名称、执行策略、session provider/model、`recent_access_mode`、`recent_preferences` 以及 `recent_team_selection` 的轻量持久化回写
 - **会话权限主链**：`agent_runtime_submit_turn.turn_config.approval_policy / sandbox_policy` 是正式 turn context 权限协议；`getSession` 返回的 `execution_runtime.recent_access_mode` 负责承接会话最近一次 accessMode。当前端已命中同一 steady-state 权限时，不应继续依赖 `harness.access_mode` 作为唯一事实源
 - **运行时交接导出主链**：继续收敛到 `agent_runtime_export_handoff_bundle`；前端统一通过 `src/lib/api/agentRuntime.ts` 网关进入，当前 GUI 入口位于 `HarnessStatusPanel`
diff --git a/docs/aiprompts/playwright-e2e.md b/docs/aiprompts/playwright-e2e.md
index b899169a8..b9e8a8fab 100644
--- a/docs/aiprompts/playwright-e2e.md
+++ b/docs/aiprompts/playwright-e2e.md
@@ -26,6 +26,8 @@
 - 浏览器模式默认首页从 `http://127.0.0.1:1420/` 进入
 - 能走真实后端就走真实后端；浏览器模式暂不支持或尚未桥接的能力，允许走 mock
 - `verify:gui-smoke` 内部的 browser runtime 校验默认走无界面浏览器会话；它只证明主链可启动，不替代后续真实页面交互验证
+- `lime-pet` 原生桌宠属于独立仓库与原生窗口壳，不纳入当前 WebView Playwright 的直接操控范围；在 Lime 主仓里只验证 `companion_*` API、状态事件与主窗口唤起链路，桌宠窗口移动、点击命中与原生层动画仍需额外手工 smoke
+- 如果 companion 协议新增了 provider 摘要或桌宠回跳设置等事件，Playwright 续测只覆盖 Lime 主仓内的“状态事件是否触发”“是否跳到 `设置 -> AI 服务商`”和“主窗口是否被唤起”，不在 WebView 层尝试直接操控原生桌宠 UI
 - 共享网关控制页已下线，托盘也不再展示网关状态或地址；共享网关 `/v1/routes` 与 selector HTTP 路由也已下线，不再对“启动/停止网关、复制网关地址、路由/curl 示例、selector 路由、托盘运行态文案”做 GUI 续测；server 验证只关注标准 `/v1/messages` 与 `/v1/chat/completions` 主链，如需看运行时状态，走开发者页或实验页的诊断面板
 - 项目排版模板与品牌人设扩展旧链路已下线，不再对相关弹窗、模板列表、默认模板、人设扩展表单做 GUI 续测；项目与工作台回归只围绕当前 `Claw` / `workspace` / 现役 `persona` 主链
 - 如果只是模块级代码修改、并不需要真实页面交互，优先跑最小单测或 `verify:local`
@@ -122,6 +124,15 @@ npm run test:contracts
 3. 验证主导航可见，例如“首页”“社媒内容”“设置”
 4. 检查控制台 error 是否为 0
 
+### AI 服务商页拆分后验证
+
+1. 进入 `设置 -> AI 服务商`
+2. 确认默认落在 `服务商设置`，左侧能看到 Provider 列表，右侧是当前 Provider 配置
+3. 确认首屏不会默认混入 OEM Offer、套餐或云端模型目录
+4. 点击 `云端服务`
+5. 确认 OEM 会话、Offer 卡片、默认来源和模型目录改为在该页单独展示
+6. 如当前环境故意破坏了 `models/index.json`，确认 Provider 模型区会提示“模型真相源异常”，而不是静默显示空态
+
 ### 社媒内容工作流
 
 1. 点击 `社媒内容`
@@ -178,6 +189,13 @@ npm run test:contracts
 8. 如当前环境已有 observer 连接，再确认“断开已连接扩展”能把页面状态回退到等待连接
 9. 如当前环境接通真实后端，再确认“打开 Chrome 扩展页”与“打开远程调试页”可成功唤起对应 Chrome 页面
 
+### 自动化设置页验证
+
+1. 进入 `设置 -> 系统 -> 自动化`
+2. 确认调度状态、任务列表、健康面板能正常加载
+3. 打开控制台，确认浏览器模式接通 DevBridge 时不再出现 `get_automation_jobs`、`get_automation_health` 或 `get_automation_run_history` 的 unknown command 报错
+4. 如当前环境允许创建或编辑任务，再确认提交后列表能刷新，而不是只靠 web mock 静态回显
+
 ### 话题模型恢复验证
 
 1. 进入同一工作区中的两个话题
@@ -212,6 +230,14 @@ npm run test:contracts
 5. 对 custom Team 额外确认：切回后 label / description / roles 没丢；如果本轮是从 fallback 回填，继续切换一次确认第二次开始已优先走 runtime 恢复
 6. 如果当前项目已有子代理或父会话上下文，再发送一条新消息，确认 Team Workbench 的 shadow 卡片与当前 Team 恢复一致，不会退回到全局 theme fallback；本轮如涉及 `harness.team_memory_shadow`，这里就是最小 GUI 续测锚点
 
+### 子代理 current 字段验证
+
+1. 准备一个带 Team 或父子会话上下文的工作区，并触发一次子代理创建
+2. 如果当前入口支持显式名称或工作目录，优先带上 `name` 与绝对 `cwd`；如果 UI 暂无显式入口，至少复用现有 flow 创建一个 child session，并在详情区观察其展示名与工作目录
+3. 验证 child session / Team Workbench 优先显示显式 `name`，而不是退回 `agent_type`、profile label 或 task summary fallback
+4. 如果本轮涉及 `teamName`，确认 child 会回挂到当前 Team，上下文里能按该名字识别，不会出现重复成员或错挂到其它 Team
+5. 验证 child 的 `working_dir` 与详情展示反映请求的绝对 `cwd`；如果请求非法相对路径，前端应看到明确失败，而不是静默回退父目录
+
 ### 上下文压缩链路验证
 
 1. 准备一个长线程，确保能够稳定接近上下文上限
diff --git a/docs/aiprompts/quality-workflow.md b/docs/aiprompts/quality-workflow.md
index 92a591a98..31f811051 100644
--- a/docs/aiprompts/quality-workflow.md
+++ b/docs/aiprompts/quality-workflow.md
@@ -72,6 +72,8 @@
 
 如果本轮是在清退旧图库素材命名，`create_poster_metadata` / `get_poster_metadata` / `get_poster_material` / `update_poster_metadata` / `delete_poster_metadata` / `list_by_*`，以及 `PosterMaterial*` / `poster_material_*` 表名与模块名也必须同步从前端网关、Rust 注册、DAO 与治理目录册中撤掉；如需保留历史数据，只允许在 schema 迁移中短暂停留旧表名。最低校验至少包含 `npm run test:contracts` 与 `npm run governance:legacy-report`。
 
+如果本轮涉及 `companion_*` 桌宠命令族，还要同步检查本地 companion `WebSocket` 入口、前端 `src/lib/api/companion.ts` 网关、Rust 注册、治理目录册以及浏览器模式 mock 返回形态；浏览器模式下这组命令默认也要保持可 mock，不要让桌宠接入把默认页面渲染链路卡死。
+
 ### 3. 用户可见 UI 改动必须补稳定回归
 
 - 优先补现有 `*.test.tsx` 的关键文案、状态与交互断言
@@ -176,17 +178,26 @@ npm run bridge:health -- --timeout-ms 120000
 - 修改 `src/lib/api/document-export.ts`、`save_exported_document`，或把新的 GUI 导出入口接到本地文件保存主链
 - 修改 `agent_runtime_submit_turn.turn_config.approval_policy / sandbox_policy`
 - 修改 `agent_runtime_submit_turn.request_metadata.harness.team_memory_shadow`
+- 修改 `agent_runtime_spawn_subagent` 的 `name / teamName / cwd`、spawn 后 Team 成员写回，或 child `working_dir` / 父子上下文投影语义
 - 修改 `agent_runtime_update_session` 或会话 provider/model / recent_access_mode / recent_preferences / recent_team_selection 恢复语义
 - 修改 `execution_runtime.recent_access_mode / recent_theme / recent_session_mode / recent_gate_key / recent_run_title / recent_content_id` 恢复语义，或前端 `harness.access_mode / harness.theme / harness.session_mode / harness.gate_key / harness.run_title / harness.content_id` steady-state 去重逻辑
 - 修改首页 / 工作区进入 `Claw` 时的首条自动发送上下文，例如 `initialUserPrompt`、`initialAutoSendRequestMetadata`、`harness.service_skill_launch`
 - 修改 `site_*` 站点适配器命令族，例如 `site_recommend_adapters`、`site_get_adapter_launch_readiness`、`site_import_adapter_yaml_bundle`、`site_run_adapter`
+- 修改 `companion_get_pet_status`、`companion_launch_pet`、`companion_send_pet_command`，或调整 Lime 与独立桌宠之间的本地 companion 协议
+- 修改自动化设置命令族，例如 `get_automation_jobs`、`create_automation_job`、`update_automation_job`、`get_automation_health` 或 `get_automation_run_history`，尤其是它们在浏览器模式 DevBridge 与 mock 间的分流
 - 修改浏览器资料 / 环境预设命令族，或调整它们在 `mockPriorityCommands` 里的优先级
 - 修改浏览器连接器命令族，例如安装目录、启用状态、系统连接器、浏览器动作配置、扩展安装状态、打开 Chrome 扩展 / 远程调试页，或主动断开扩展连接
+- 修改 `get_model_registry_provider_ids`、Provider 模型映射或 `src-tauri/resources/models/index.json` 真相源读取语义
 - 修改 `src/lib/dev-bridge/`
 - 修改 `src/lib/tauri-mock/`
 - 修改 `src-tauri/src/app/runner.rs`
 - 修改 `src-tauri/src/dev_bridge/`
 
+如果本轮修改了 Provider 模型真相源或设置页中的“支持的模型”展示逻辑，还应额外确认：
+
+- 资源索引损坏时，GUI 会明确提示“模型真相源异常”
+- 不会再静默回退数据库或把错误伪装成空模型列表
+
 ### Layer 4：交互型 E2E
 
 入口：
@@ -233,6 +244,10 @@ npm run bridge:health -- --timeout-ms 120000
 - 如果这次改动影响 `harness.team_memory_shadow` 这类 repo-scoped Team 协作上下文，除了契约检查之外，还应补：
   - 前端发送边界回归，确认 `team_memory_shadow` 能随当前请求进入 `agent_runtime_submit_turn`
   - Rust `prompt_context` 定向测试，确认 shadow 只作为低优先级协作参考，不覆盖显式 `selected_team_*` 或 `recent_team_selection`
+- 如果这次改动影响 `agent_runtime_spawn_subagent` 的 current request surface，除了契约检查之外，还应补：
+  - Rust 定向测试，确认显式 `name` 会覆盖 child session 展示名 / role hint 的 fallback
+  - Rust 或前端回归，确认 `teamName` 必须与 `name` 搭配，并且只在现有 Team 上下文内写回成员关系
+  - 定向验证，确认绝对 `cwd` 会投影到 child `working_dir`，相对路径会在边界被拒绝
 - 如果这次改动把 `accessMode` steady-state 从“只写 harness metadata”收敛到正式 turn context 与 `session/runtime`，除了契约检查之外，还应补 Hook/UI 回归，证明：
   - turn 提交始终携带正式 `approval_policy / sandbox_policy`
   - session 已有 `execution_runtime.recent_access_mode` 时，切换话题会恢复对应 accessMode，而不是回退到工作区默认值
diff --git a/docs/aiprompts/skill-standard.md b/docs/aiprompts/skill-standard.md
index fd94ff4a6..6068331ad 100644
--- a/docs/aiprompts/skill-standard.md
+++ b/docs/aiprompts/skill-standard.md
@@ -75,6 +75,79 @@
 - 再造一个平级的 `site skill` 协议
 - 再造一个平级的 `prompt package` 协议
 
+## 第二原则
+
+**Skill 是 bundle，不是单一 Markdown。**
+
+Lime 在工程上必须明确接受这一点：
+
+- Skill 可以有主说明文件
+- 但 Skill 的价值不应只存在于主说明文件
+- references、examples、assets、templates、scripts、data、config、memory 都可以是 Skill 的组成部分
+
+也就是说，Skill 不只是“告诉模型做什么”，还应当有能力承载：
+
+- 领域知识
+- 模板与示例
+- 可执行脚本
+- 验证步骤
+- gotchas
+- setup 信息
+- 长期记忆
+
+如果一个 Skill 只有一段说明文字，没有任何额外知识、资产、脚本、验证或渐进披露结构，那么它更接近提示词说明，而不是强 Skill。
+
+## 设计原则补充
+
+除了分层边界，Lime Skill 在设计上还应遵守下面几条补充原则。
+
+### 1. 不要重复模型默认知道的常识
+
+Skill 最有价值的内容，是把模型从默认思路里“推出来”。
+
+应该优先写：
+
+- 组织独有规则
+- 项目独有约束
+- 常见踩坑点
+- 质量判断标准
+
+### 2. 高信号内容优先写成 gotchas
+
+如果某个 Skill 经常失败，先补 gotchas，而不是先补更长的背景介绍。
+
+### 3. 优先使用渐进披露
+
+主文件负责：
+
+- 触发
+- 路由
+- 总规则
+
+详细内容优先拆到：
+
+- `references/`
+- `examples/`
+- `templates/`
+- `scripts/`
+
+不要把所有内容都塞进单一说明文件。
+
+### 4. 能用脚本和模板解决的，不要全靠自然语言重复描述
+
+给 Skill 提供脚本、模板、示例，通常比在说明中反复描述更稳。
+
+### 5. 需要长期使用的 Skill，应考虑 setup、memory 与 hooks
+
+高价值 Skill 往往不是一次性调用。
+
+设计时要考虑：
+
+- 是否需要用户配置
+- 是否需要项目级配置
+- 是否要记录历史执行结果
+- 是否存在只在调用期间启用的 hooks
+
 ## 标准分层
 
 Lime 的技能标准必须分成四层：
diff --git a/package.json b/package.json
index a7e3c0fe2..3a66e68d9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "lime",
   "private": true,
-  "version": "1.0.1",
+  "version": "1.1.0",
   "type": "module",
   "engines": {
     "node": ">=22.0.0"
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 71203df14..ae8f4afeb 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -378,7 +378,7 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "aster-core"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "ahash",
  "anyhow",
@@ -470,7 +470,7 @@ dependencies = [
 
 [[package]]
 name = "aster-models"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "serde",
  "serde_json",
@@ -2417,7 +2417,7 @@ dependencies = [
  "dtoa-short",
  "itoa",
  "matches",
- "phf 0.10.1",
+ "phf 0.8.0",
  "proc-macro2",
  "quote",
  "smallvec",
@@ -2433,7 +2433,7 @@ dependencies = [
  "cssparser-macros",
  "dtoa-short",
  "itoa",
- "phf 0.11.3",
+ "phf 0.8.0",
  "smallvec",
 ]
 
@@ -4374,7 +4374,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.57.0",
+ "windows-core 0.56.0",
 ]
 
 [[package]]
@@ -5101,7 +5101,7 @@ dependencies = [
 
 [[package]]
 name = "lime"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "anyhow",
  "arboard",
@@ -5205,7 +5205,7 @@ dependencies = [
 
 [[package]]
 name = "lime-agent"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "anyhow",
  "aster-core",
@@ -5234,7 +5234,7 @@ dependencies = [
 
 [[package]]
 name = "lime-browser-runtime"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "chrono",
  "futures",
@@ -5251,7 +5251,7 @@ dependencies = [
 
 [[package]]
 name = "lime-config"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "async-trait",
  "lime-core",
@@ -5267,7 +5267,7 @@ dependencies = [
 
 [[package]]
 name = "lime-core"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "aster-models",
  "async-trait",
@@ -5307,7 +5307,7 @@ dependencies = [
 
 [[package]]
 name = "lime-credential"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "axum 0.7.9",
  "base64 0.22.1",
@@ -5342,7 +5342,7 @@ dependencies = [
 
 [[package]]
 name = "lime-gateway"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "aes",
  "axum 0.7.9",
@@ -5372,7 +5372,7 @@ dependencies = [
 
 [[package]]
 name = "lime-infra"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "chrono",
  "dashmap 5.5.3",
@@ -5392,7 +5392,7 @@ dependencies = [
 
 [[package]]
 name = "lime-mcp"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "async-trait",
  "dirs 5.0.1",
@@ -5424,7 +5424,7 @@ dependencies = [
 
 [[package]]
 name = "lime-processor"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "async-trait",
  "lime-core",
@@ -5443,7 +5443,7 @@ dependencies = [
 
 [[package]]
 name = "lime-providers"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -5498,7 +5498,7 @@ dependencies = [
 
 [[package]]
 name = "lime-server"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "aster-core",
  "async-stream",
@@ -5543,7 +5543,7 @@ dependencies = [
 
 [[package]]
 name = "lime-server-utils"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "axum 0.7.9",
  "futures",
@@ -5558,7 +5558,7 @@ dependencies = [
 
 [[package]]
 name = "lime-services"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "anyhow",
  "aster-core",
@@ -5600,7 +5600,7 @@ dependencies = [
 
 [[package]]
 name = "lime-skills"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "async-trait",
  "dirs 5.0.1",
@@ -5618,7 +5618,7 @@ dependencies = [
 
 [[package]]
 name = "lime-terminal"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -5645,7 +5645,7 @@ dependencies = [
 
 [[package]]
 name = "lime-websocket"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "axum 0.7.9",
  "chrono",
@@ -6324,7 +6324,7 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
 dependencies = [
- "proc-macro-crate 2.0.2",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -7077,7 +7077,9 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
 dependencies = [
+ "phf_macros 0.8.0",
  "phf_shared 0.8.0",
+ "proc-macro-hack",
 ]
 
 [[package]]
@@ -7086,9 +7088,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
 dependencies = [
- "phf_macros 0.10.0",
  "phf_shared 0.10.0",
- "proc-macro-hack",
 ]
 
 [[package]]
@@ -7192,12 +7192,12 @@ dependencies = [
 
 [[package]]
 name = "phf_macros"
-version = "0.10.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
+checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
 dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
@@ -7609,7 +7609,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.14.0",
+ "itertools 0.12.1",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -9108,7 +9108,7 @@ version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb"
 dependencies = [
- "dirs 6.0.0",
+ "dirs 4.0.0",
 ]
 
 [[package]]
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 365f84c2a..355bbac1a 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "1.0.1"
+version = "1.1.0"
 edition = "2021"
 authors = ["coso"]
 repository = "https://github.com/aiclientproxy/lime"
@@ -127,8 +127,8 @@ enigo = "0.3"
 # 如需联调本地 aster-rust，请运行：
 #   npm run setup:local-aster -- /path/to/aster-rust
 # 脚本会在仓库根 .cargo/config.toml 写入本地 patch 覆盖；该文件已被 .gitignore 忽略。
-aster = { package = "aster-core", git = "https://github.com/astercloud/aster-rust", tag = "v0.24.0" }
-aster-models = { git = "https://github.com/astercloud/aster-rust", tag = "v0.24.0" }
+aster = { package = "aster-core", git = "https://github.com/astercloud/aster-rust", tag = "v0.25.0" }
+aster-models = { git = "https://github.com/astercloud/aster-rust", tag = "v0.25.0" }
 
 # MCP (Model Context Protocol)
 rmcp = { version = "0.12.0", features = ["client", "transport-io", "transport-child-process"] }
@@ -192,7 +192,7 @@ version = "2.4"
 
 [package]
 name = "lime"
-version = "1.0.1"
+version = "1.1.0"
 description = "AI API Proxy Desktop App"
 authors = ["you"]
 edition = "2021"
diff --git a/src-tauri/crates/agent/src/protocol.rs b/src-tauri/crates/agent/src/protocol.rs
index 9ebb302e6..82c6ded4c 100644
--- a/src-tauri/crates/agent/src/protocol.rs
+++ b/src-tauri/crates/agent/src/protocol.rs
@@ -317,6 +317,7 @@ pub struct AgentUserInputOp {
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 #[serde(tag = "type", rename_all = "snake_case")]
+#[allow(clippy::large_enum_variant)]
 pub enum AgentOp {
     UserInput(AgentUserInputOp),
     Interrupt {
diff --git a/src-tauri/crates/agent/src/request_tool_policy.rs b/src-tauri/crates/agent/src/request_tool_policy.rs
index 346dfef88..65b019da4 100644
--- a/src-tauri/crates/agent/src/request_tool_policy.rs
+++ b/src-tauri/crates/agent/src/request_tool_policy.rs
@@ -1179,7 +1179,7 @@ async fn stream_agent_reply_once<F>(
 where
     F: FnMut(&RuntimeAgentEvent),
 {
-    let mut auto_compaction_projection = AutoCompactionProjectionState::default();
+    let mut auto_compaction_projection = AutoCompactionProjectionState;
     let mut stream = agent
         .reply(user_message, session_config, cancel_token)
         .await
diff --git a/src-tauri/crates/agent/src/session_execution_runtime.rs b/src-tauri/crates/agent/src/session_execution_runtime.rs
index 18ad84fa1..d2dfa1d63 100644
--- a/src-tauri/crates/agent/src/session_execution_runtime.rs
+++ b/src-tauri/crates/agent/src/session_execution_runtime.rs
@@ -91,14 +91,14 @@ impl SessionExecutionRuntimeAccessMode {
         Self::from_extension_data(&session.extension_data)
     }
 
-    fn to_extension_data(&self, extension_data: &mut ExtensionData) -> Result<(), String> {
-        <Self as ExtensionState>::to_extension_data(self, extension_data)
+    fn write_extension_data(self, extension_data: &mut ExtensionData) -> Result<(), String> {
+        <Self as ExtensionState>::to_extension_data(&self, extension_data)
             .map_err(|error| error.to_string())
     }
 
     fn into_updated_extension_data(self, session: &Session) -> Result<ExtensionData, String> {
         let mut extension_data = session.extension_data.clone();
-        self.to_extension_data(&mut extension_data)?;
+        self.write_extension_data(&mut extension_data)?;
         Ok(extension_data)
     }
 
diff --git a/src-tauri/crates/agent/src/session_store.rs b/src-tauri/crates/agent/src/session_store.rs
index b38cb395a..420714f09 100644
--- a/src-tauri/crates/agent/src/session_store.rs
+++ b/src-tauri/crates/agent/src/session_store.rs
@@ -4,11 +4,9 @@
 //! 数据事实源收敛到 lime_core::database::agent_session_repository + Lime 数据库。
 
 use aster::model::ModelConfig;
-use aster::session::extension_data::{
-    resolve_todo_list_state, ExtensionState, TodoListItem, TodoListItemStatus,
-};
 use aster::session::{
-    resolve_subagent_session_metadata, Session as AsterSession, SessionRuntimeSnapshot,
+    resolve_subagent_session_metadata, resolve_task_board_state, ExtensionState,
+    Session as AsterSession, SessionRuntimeSnapshot, TaskBoardItem, TaskBoardItemStatus,
 };
 use chrono::Utc;
 use lime_core::agent::types::{AgentMessage, AgentSession, ContentPart, MessageContent};
@@ -150,6 +148,7 @@ pub struct ChildSubagentSession {
 }
 
 impl ChildSubagentSession {
+    #[allow(clippy::too_many_arguments)]
     fn new_base(
         id: String,
         name: String,
@@ -329,21 +328,21 @@ fn resolve_session_provider_selector(session: &AsterSession) -> Option<String> {
         .and_then(|state| normalize_optional_text(Some(state.provider_selector)))
 }
 
-fn map_session_todo_status(status: TodoListItemStatus) -> SessionTodoStatus {
+fn map_session_todo_status(status: TaskBoardItemStatus) -> SessionTodoStatus {
     match status {
-        TodoListItemStatus::Pending => SessionTodoStatus::Pending,
-        TodoListItemStatus::InProgress => SessionTodoStatus::InProgress,
-        TodoListItemStatus::Completed => SessionTodoStatus::Completed,
+        TaskBoardItemStatus::Pending => SessionTodoStatus::Pending,
+        TaskBoardItemStatus::InProgress => SessionTodoStatus::InProgress,
+        TaskBoardItemStatus::Completed => SessionTodoStatus::Completed,
     }
 }
 
-fn map_session_todo_item(item: TodoListItem) -> Option<SessionTodoItem> {
-    let content = item.content.trim().to_string();
+fn map_session_todo_item(item: TaskBoardItem) -> Option<SessionTodoItem> {
+    let content = item.subject.trim().to_string();
     if content.is_empty() {
         return None;
     }
 
-    let active_form = normalize_optional_nonempty_body(Some(item.active_form));
+    let active_form = normalize_optional_nonempty_body(item.active_form);
     Some(SessionTodoItem {
         content,
         status: map_session_todo_status(item.status),
@@ -367,9 +366,9 @@ fn load_session_todo_items_from_conn(
         }
     };
 
-    resolve_todo_list_state(&extension_data)
-        .map(|todo_list| {
-            todo_list
+    resolve_task_board_state(&extension_data)
+        .map(|task_board| {
+            task_board
                 .items
                 .into_iter()
                 .filter_map(map_session_todo_item)
diff --git a/src-tauri/crates/agent/src/tool_permissions.rs b/src-tauri/crates/agent/src/tool_permissions.rs
index d23ab2684..a37ab4c8c 100644
--- a/src-tauri/crates/agent/src/tool_permissions.rs
+++ b/src-tauri/crates/agent/src/tool_permissions.rs
@@ -17,7 +17,7 @@ pub enum ToolRiskLevel {
     Destructive,
 }
 
-/// 权限检查结果（对标 Claude Code 的 allow/deny/ask）
+/// 权限检查结果（统一到当前工具面的 allow/deny/ask 语义）
 #[derive(Debug, Clone, PartialEq)]
 pub enum PermissionBehavior {
     Allow,
diff --git a/src-tauri/crates/browser-runtime/src/action.rs b/src-tauri/crates/browser-runtime/src/action.rs
index fc62e217c..c7fb9589c 100644
--- a/src-tauri/crates/browser-runtime/src/action.rs
+++ b/src-tauri/crates/browser-runtime/src/action.rs
@@ -397,7 +397,7 @@ fn page_info_from_event(event: &BrowserEvent) -> Option<BrowserPageInfo> {
 async fn capture_and_sync_page_info(session: &CdpSessionHandle) -> Option<BrowserPageInfo> {
     let page_info = session.capture_page_info().await.ok()?;
     let current_page_info = session.state().await.last_page_info;
-    let should_update = current_page_info.as_ref().map_or(true, |current| {
+    let should_update = current_page_info.as_ref().is_none_or(|current| {
         current.url != page_info.url
             || current.title != page_info.title
             || current.markdown != page_info.markdown
diff --git a/src-tauri/crates/services/src/model_registry_service.rs b/src-tauri/crates/services/src/model_registry_service.rs
index c9f2d4364..3d2bb9c85 100644
--- a/src-tauri/crates/services/src/model_registry_service.rs
+++ b/src-tauri/crates/services/src/model_registry_service.rs
@@ -103,6 +103,22 @@ struct HostAliasRule {
     providers: Vec<String>,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum ModelFetchProtocol {
+    OpenAiCompatible,
+    Anthropic,
+    Gemini,
+    Ollama,
+    Unsupported,
+}
+
+#[derive(Debug, Clone)]
+struct PreparedModelFetchRequest {
+    protocol: ModelFetchProtocol,
+    url: String,
+    headers: Vec<(String, String)>,
+}
+
 /// 模型注册服务
 pub struct ModelRegistryService {
     /// 数据库连接
@@ -860,6 +876,28 @@ impl ModelRegistryService {
 
     // ========== 从 Provider API 获取模型 ==========
 
+    pub fn requires_api_key_for_model_fetch(
+        provider_id: &str,
+        api_host: &str,
+        provider_type: ApiProviderType,
+    ) -> bool {
+        match provider_type {
+            ApiProviderType::Ollama => false,
+            ApiProviderType::Openai
+            | ApiProviderType::OpenaiResponse
+            | ApiProviderType::Codex
+            | ApiProviderType::NewApi
+            | ApiProviderType::Gateway
+            | ApiProviderType::Fal => !Self::is_keyless_openai_like_provider(provider_id, api_host),
+            ApiProviderType::Anthropic
+            | ApiProviderType::AnthropicCompatible
+            | ApiProviderType::Gemini
+            | ApiProviderType::AzureOpenai
+            | ApiProviderType::Vertexai
+            | ApiProviderType::AwsBedrock => true,
+        }
+    }
+
     /// 从 Provider API 获取模型列表
     ///
     /// 调用 Provider 的 /v1/models 端点获取模型列表，
@@ -902,14 +940,20 @@ impl ModelRegistryService {
             api_host
         );
 
-        // 构建 API URL
-        let api_url = Self::build_models_api_url(api_host);
-        tracing::info!("[ModelRegistry] API URL: {}", api_url);
-        let diagnostic_hint = Self::build_models_api_hint(provider_id, api_host, &api_url);
+        let api_url = Self::build_diagnostic_models_api_url(provider_id, api_host, provider_type);
+        if let Some(url) = api_url.as_ref() {
+            tracing::info!("[ModelRegistry] API URL: {}", url);
+        }
+        let diagnostic_hint = api_url
+            .as_ref()
+            .and_then(|url| Self::build_models_api_hint(provider_id, api_host, url));
 
         // 尝试从 API 获取
-        match self.call_models_api(&api_url, api_key).await {
-            Ok(api_models) => {
+        match self
+            .call_models_api(provider_id, api_host, api_key, provider_type)
+            .await
+        {
+            Ok((api_models, request_url)) => {
                 tracing::info!("[ModelRegistry] 从 API 获取到 {} 个模型", api_models.len());
 
                 // 转换为内部格式
@@ -923,7 +967,7 @@ impl ModelRegistryService {
                     models,
                     source: ModelFetchSource::Api,
                     error: None,
-                    request_url: Some(api_url),
+                    request_url: Some(request_url),
                     diagnostic_hint: None,
                     error_kind: None,
                     should_prompt_error: false,
@@ -950,7 +994,7 @@ impl ModelRegistryService {
                         models: vec![],
                         source: ModelFetchSource::LocalFallback,
                         error: Some(format!("API 获取失败: {}, 本地也无数据", api_error.message)),
-                        request_url: Some(api_url),
+                        request_url: api_url.clone(),
                         diagnostic_hint,
                         error_kind: Some(api_error.kind.clone()),
                         should_prompt_error: Self::should_prompt_model_fetch_error(&api_error.kind),
@@ -963,7 +1007,7 @@ impl ModelRegistryService {
                             "API 获取失败: {}, 已使用本地数据",
                             api_error.message
                         )),
-                        request_url: Some(api_url),
+                        request_url: api_url,
                         diagnostic_hint,
                         error_kind: Some(api_error.kind.clone()),
                         should_prompt_error: Self::should_prompt_model_fetch_error(&api_error.kind),
@@ -1299,7 +1343,74 @@ impl ModelRegistryService {
         }
     }
 
-    /// 构建 /v1/models API URL
+    fn is_keyless_openai_like_provider(provider_id: &str, api_host: &str) -> bool {
+        let normalized_provider_id = provider_id.trim().to_lowercase();
+        if matches!(
+            normalized_provider_id.as_str(),
+            "ollama" | "lmstudio" | "gpustack" | "ovms"
+        ) {
+            return true;
+        }
+
+        let normalized_host = api_host.trim().to_lowercase();
+        matches!(
+            normalized_host.as_str(),
+            host if host.contains("://localhost")
+                || host.contains("://127.0.0.1")
+                || host.contains("://0.0.0.0")
+                || host.contains("://host.docker.internal")
+        )
+    }
+
+    fn resolve_model_fetch_protocol(
+        provider_id: &str,
+        api_host: &str,
+        provider_type: Option<ApiProviderType>,
+    ) -> ModelFetchProtocol {
+        if let Some(provider_type) = provider_type {
+            return match provider_type {
+                ApiProviderType::Openai
+                | ApiProviderType::OpenaiResponse
+                | ApiProviderType::Codex
+                | ApiProviderType::NewApi
+                | ApiProviderType::Gateway
+                | ApiProviderType::Fal => ModelFetchProtocol::OpenAiCompatible,
+                ApiProviderType::Anthropic | ApiProviderType::AnthropicCompatible => {
+                    ModelFetchProtocol::Anthropic
+                }
+                ApiProviderType::Gemini => ModelFetchProtocol::Gemini,
+                ApiProviderType::Ollama => ModelFetchProtocol::Ollama,
+                ApiProviderType::AzureOpenai
+                | ApiProviderType::Vertexai
+                | ApiProviderType::AwsBedrock => ModelFetchProtocol::Unsupported,
+            };
+        }
+
+        let normalized_provider = provider_id.trim().to_lowercase();
+        let normalized_host = api_host.trim().to_lowercase();
+
+        if normalized_provider == "ollama"
+            || normalized_host.contains("ollama")
+            || normalized_host.contains("://localhost:11434")
+        {
+            return ModelFetchProtocol::Ollama;
+        }
+
+        if normalized_provider.contains("gemini")
+            || normalized_provider == "google"
+            || normalized_host.contains("generativelanguage.googleapis.com")
+        {
+            return ModelFetchProtocol::Gemini;
+        }
+
+        if normalized_provider.contains("anthropic") || normalized_host.contains("anthropic.com") {
+            return ModelFetchProtocol::Anthropic;
+        }
+
+        ModelFetchProtocol::OpenAiCompatible
+    }
+
+    /// 构建模型枚举 API URL
     fn build_models_api_url(api_host: &str) -> String {
         let host = api_host.trim_end_matches('/');
 
@@ -1320,6 +1431,60 @@ impl ModelRegistryService {
         }
     }
 
+    fn build_gemini_models_api_url(api_host: &str) -> String {
+        let host = api_host.trim_end_matches('/');
+
+        if host.ends_with("/models") {
+            return host.to_string();
+        }
+
+        if host.ends_with("/v1beta") || host.ends_with("/v1") {
+            return format!("{host}/models");
+        }
+
+        if host.contains("/v1beta/") || host.contains("/v1/") {
+            return format!("{}/models", host.trim_end_matches('/'));
+        }
+
+        format!("{host}/v1beta/models")
+    }
+
+    fn build_ollama_models_api_url(api_host: &str) -> String {
+        let host = api_host.trim_end_matches('/');
+
+        if host.ends_with("/api/tags") {
+            return host.to_string();
+        }
+
+        if host.ends_with("/api") {
+            return format!("{host}/tags");
+        }
+
+        format!("{host}/api/tags")
+    }
+
+    fn build_diagnostic_models_api_url(
+        provider_id: &str,
+        api_host: &str,
+        provider_type: Option<ApiProviderType>,
+    ) -> Option<String> {
+        let host = api_host.trim();
+        if host.is_empty() {
+            return None;
+        }
+
+        let url = match Self::resolve_model_fetch_protocol(provider_id, api_host, provider_type) {
+            ModelFetchProtocol::Gemini => Self::build_gemini_models_api_url(host),
+            ModelFetchProtocol::Ollama => Self::build_ollama_models_api_url(host),
+            ModelFetchProtocol::Anthropic | ModelFetchProtocol::OpenAiCompatible => {
+                Self::build_models_api_url(host)
+            }
+            ModelFetchProtocol::Unsupported => host.trim_end_matches('/').to_string(),
+        };
+
+        Some(url)
+    }
+
     fn has_versioned_api_suffix(api_host: &str) -> bool {
         let path = api_host
             .split_once("://")
@@ -1333,14 +1498,12 @@ impl ModelRegistryService {
             .split('/')
             .filter(|segment| !segment.is_empty())
             .collect();
-        if segments.len() < 2 {
+        if segments.is_empty() {
             return false;
         }
 
         let version = segments[segments.len() - 1];
-        let api_segment = segments[segments.len() - 2];
-        api_segment.eq_ignore_ascii_case("api")
-            && version.starts_with('v')
+        version.starts_with('v')
             && version
                 .strip_prefix('v')
                 .map(|suffix| !suffix.is_empty() && suffix.chars().all(|ch| ch.is_ascii_digit()))
@@ -1361,6 +1524,12 @@ impl ModelRegistryService {
             ));
         }
 
+        if provider.contains("zhipu") || host.contains("bigmodel.cn/api/paas") {
+            return Some(format!(
+                "智谱 GLM 官方 OpenAI 兼容 Base URL 通常应使用 `https://open.bigmodel.cn/api/paas/v4`。当前模型列表请求为 `{api_url}`，如果出现 404，请优先检查 Base URL 是否保留 `/api/paas/v4`，不要再额外改成 `/v1` 风格地址。"
+            ));
+        }
+
         None
     }
 
@@ -1373,12 +1542,78 @@ impl ModelRegistryService {
         )
     }
 
-    /// 调用 /v1/models API
+    fn prepare_model_fetch_request(
+        provider_id: &str,
+        api_host: &str,
+        api_key: &str,
+        provider_type: Option<ApiProviderType>,
+    ) -> Result<PreparedModelFetchRequest, ModelsApiError> {
+        let protocol = Self::resolve_model_fetch_protocol(provider_id, api_host, provider_type);
+        let normalized_host = api_host.trim();
+
+        if normalized_host.is_empty() {
+            return Err(ModelsApiError::new(
+                ModelFetchErrorKind::Other,
+                "Provider 没有配置 API Host".to_string(),
+            ));
+        }
+
+        if protocol == ModelFetchProtocol::Unsupported {
+            return Err(ModelsApiError::new(
+                ModelFetchErrorKind::Other,
+                "当前协议暂不支持自动获取最新模型".to_string(),
+            ));
+        }
+
+        let request_type = provider_type.unwrap_or(match protocol {
+            ModelFetchProtocol::Anthropic => ApiProviderType::Anthropic,
+            ModelFetchProtocol::Gemini => ApiProviderType::Gemini,
+            ModelFetchProtocol::Ollama => ApiProviderType::Ollama,
+            ModelFetchProtocol::OpenAiCompatible | ModelFetchProtocol::Unsupported => {
+                ApiProviderType::Openai
+            }
+        });
+
+        let url = match protocol {
+            ModelFetchProtocol::OpenAiCompatible | ModelFetchProtocol::Anthropic => {
+                Self::build_models_api_url(normalized_host)
+            }
+            ModelFetchProtocol::Gemini => Self::build_gemini_models_api_url(normalized_host),
+            ModelFetchProtocol::Ollama => Self::build_ollama_models_api_url(normalized_host),
+            ModelFetchProtocol::Unsupported => unreachable!(),
+        };
+
+        let mut headers = vec![("Content-Type".to_string(), "application/json".to_string())];
+        let runtime_spec = request_type.runtime_spec();
+        if !api_key.trim().is_empty() {
+            let auth_value = runtime_spec
+                .auth_prefix
+                .map(|prefix| format!("{prefix} {api_key}"))
+                .unwrap_or_else(|| api_key.to_string());
+            headers.push((runtime_spec.auth_header.to_string(), auth_value));
+        }
+
+        for (name, value) in runtime_spec.extra_headers {
+            headers.push(((*name).to_string(), (*value).to_string()));
+        }
+
+        Ok(PreparedModelFetchRequest {
+            protocol,
+            url,
+            headers,
+        })
+    }
+
     async fn call_models_api(
         &self,
-        url: &str,
+        provider_id: &str,
+        api_host: &str,
         api_key: &str,
-    ) -> Result<Vec<ApiModelResponse>, ModelsApiError> {
+        provider_type: Option<ApiProviderType>,
+    ) -> Result<(Vec<ApiModelResponse>, String), ModelsApiError> {
+        let request =
+            Self::prepare_model_fetch_request(provider_id, api_host, api_key, provider_type)?;
+
         let client = reqwest::Client::builder()
             .timeout(std::time::Duration::from_secs(30))
             .build()
@@ -1389,15 +1624,42 @@ impl ModelRegistryService {
                 )
             })?;
 
-        let response = client
-            .get(url)
-            .header("Authorization", format!("Bearer {api_key}"))
-            .header("Content-Type", "application/json")
-            .send()
-            .await
-            .map_err(|e| {
-                ModelsApiError::new(ModelFetchErrorKind::Network, format!("请求失败: {e}"))
-            })?;
+        let models = match request.protocol {
+            ModelFetchProtocol::OpenAiCompatible => {
+                let body =
+                    Self::send_models_api_request(&client, &request.url, &request.headers).await?;
+                Self::parse_openai_models_response(&body)?
+            }
+            ModelFetchProtocol::Anthropic => {
+                Self::call_anthropic_models_api(&client, &request.url, &request.headers).await?
+            }
+            ModelFetchProtocol::Gemini => {
+                Self::call_gemini_models_api(&client, &request.url, &request.headers).await?
+            }
+            ModelFetchProtocol::Ollama => {
+                let body =
+                    Self::send_models_api_request(&client, &request.url, &request.headers).await?;
+                Self::parse_ollama_models_response(&body)?
+            }
+            ModelFetchProtocol::Unsupported => unreachable!(),
+        };
+
+        Ok((models, request.url))
+    }
+
+    async fn send_models_api_request(
+        client: &reqwest::Client,
+        url: &str,
+        headers: &[(String, String)],
+    ) -> Result<String, ModelsApiError> {
+        let mut request_builder = client.get(url);
+        for (name, value) in headers {
+            request_builder = request_builder.header(name, value);
+        }
+
+        let response = request_builder.send().await.map_err(|e| {
+            ModelsApiError::new(ModelFetchErrorKind::Network, format!("请求失败: {e}"))
+        })?;
 
         if !response.status().is_success() {
             let status = response.status();
@@ -1426,15 +1688,16 @@ impl ModelRegistryService {
             ));
         }
 
-        let body = response.text().await.map_err(|e| {
+        response.text().await.map_err(|e| {
             ModelsApiError::new(
                 ModelFetchErrorKind::InvalidResponse,
                 format!("读取响应失败: {e}"),
             )
-        })?;
+        })
+    }
 
-        // 解析 OpenAI 格式的响应
-        let api_response: ApiModelsResponse = serde_json::from_str(&body).map_err(|e| {
+    fn parse_openai_models_response(body: &str) -> Result<Vec<ApiModelResponse>, ModelsApiError> {
+        let api_response: ApiModelsResponse = serde_json::from_str(body).map_err(|e| {
             ModelsApiError::new(
                 ModelFetchErrorKind::InvalidResponse,
                 format!("解析响应失败: {e}"),
@@ -1444,6 +1707,172 @@ impl ModelRegistryService {
         Ok(api_response.data)
     }
 
+    async fn call_anthropic_models_api(
+        client: &reqwest::Client,
+        base_url: &str,
+        headers: &[(String, String)],
+    ) -> Result<Vec<ApiModelResponse>, ModelsApiError> {
+        let mut models = Vec::new();
+        let mut after_id: Option<String> = None;
+
+        loop {
+            let mut request_url = reqwest::Url::parse(base_url).map_err(|e| {
+                ModelsApiError::new(
+                    ModelFetchErrorKind::Other,
+                    format!("无效的 Anthropic 模型地址: {e}"),
+                )
+            })?;
+            request_url.query_pairs_mut().append_pair("limit", "1000");
+            if let Some(after) = after_id.as_deref() {
+                request_url.query_pairs_mut().append_pair("after_id", after);
+            }
+
+            let body = Self::send_models_api_request(client, request_url.as_ref(), headers).await?;
+            let response = Self::parse_anthropic_models_response(&body)?;
+            models.extend(response.models);
+
+            if !response.has_more {
+                break;
+            }
+
+            let Some(next_after_id) = response.last_id else {
+                break;
+            };
+            if next_after_id.trim().is_empty() {
+                break;
+            }
+            after_id = Some(next_after_id);
+        }
+
+        Ok(models)
+    }
+
+    fn parse_anthropic_models_response(
+        body: &str,
+    ) -> Result<AnthropicModelsResponse, ModelsApiError> {
+        let response: RawAnthropicModelsResponse = serde_json::from_str(body).map_err(|e| {
+            ModelsApiError::new(
+                ModelFetchErrorKind::InvalidResponse,
+                format!("解析 Anthropic 响应失败: {e}"),
+            )
+        })?;
+
+        let models = response
+            .data
+            .into_iter()
+            .map(|model| ApiModelResponse {
+                id: model.id.clone(),
+                display_name: model.display_name,
+                provider_name: None,
+                family: None,
+                context_length: None,
+            })
+            .collect();
+
+        Ok(AnthropicModelsResponse {
+            models,
+            has_more: response.has_more,
+            last_id: response.last_id,
+        })
+    }
+
+    async fn call_gemini_models_api(
+        client: &reqwest::Client,
+        base_url: &str,
+        headers: &[(String, String)],
+    ) -> Result<Vec<ApiModelResponse>, ModelsApiError> {
+        let mut models = Vec::new();
+        let mut next_page_token: Option<String> = None;
+
+        loop {
+            let mut request_url = reqwest::Url::parse(base_url).map_err(|e| {
+                ModelsApiError::new(
+                    ModelFetchErrorKind::Other,
+                    format!("无效的 Gemini 模型地址: {e}"),
+                )
+            })?;
+            request_url
+                .query_pairs_mut()
+                .append_pair("pageSize", "1000");
+            if let Some(page_token) = next_page_token.as_deref() {
+                request_url
+                    .query_pairs_mut()
+                    .append_pair("pageToken", page_token);
+            }
+
+            let body = Self::send_models_api_request(client, request_url.as_ref(), headers).await?;
+            let response = Self::parse_gemini_models_response(&body)?;
+            models.extend(response.models);
+
+            let Some(page_token) = response.next_page_token else {
+                break;
+            };
+            if page_token.trim().is_empty() {
+                break;
+            }
+            next_page_token = Some(page_token);
+        }
+
+        Ok(models)
+    }
+
+    fn parse_gemini_models_response(body: &str) -> Result<GeminiModelsResponse, ModelsApiError> {
+        let response: RawGeminiModelsResponse = serde_json::from_str(body).map_err(|e| {
+            ModelsApiError::new(
+                ModelFetchErrorKind::InvalidResponse,
+                format!("解析 Gemini 响应失败: {e}"),
+            )
+        })?;
+
+        let models = response
+            .models
+            .into_iter()
+            .filter(|model| {
+                model
+                    .supported_generation_methods
+                    .as_ref()
+                    .is_none_or(|methods| {
+                        methods
+                            .iter()
+                            .any(|method| method.eq_ignore_ascii_case("generateContent"))
+                    })
+            })
+            .map(|model| ApiModelResponse {
+                id: model.name.trim_start_matches("models/").to_string(),
+                display_name: model.display_name,
+                provider_name: None,
+                family: None,
+                context_length: model.input_token_limit,
+            })
+            .collect();
+
+        Ok(GeminiModelsResponse {
+            models,
+            next_page_token: response.next_page_token,
+        })
+    }
+
+    fn parse_ollama_models_response(body: &str) -> Result<Vec<ApiModelResponse>, ModelsApiError> {
+        let response: OllamaModelsResponse = serde_json::from_str(body).map_err(|e| {
+            ModelsApiError::new(
+                ModelFetchErrorKind::InvalidResponse,
+                format!("解析 Ollama 响应失败: {e}"),
+            )
+        })?;
+
+        Ok(response
+            .models
+            .into_iter()
+            .map(|model| ApiModelResponse {
+                id: model.name.clone(),
+                display_name: Some(model.name),
+                provider_name: None,
+                family: model.details.and_then(|details| details.family),
+                context_length: None,
+            })
+            .collect())
+    }
+
     /// 转换 API 模型格式为内部格式
     fn convert_api_model(
         &self,
@@ -1451,20 +1880,23 @@ impl ModelRegistryService {
         provider_id: &str,
         now: i64,
     ) -> EnhancedModelMetadata {
-        // 从 model id 推断显示名称
-        let display_name = model
-            .id
-            .split('/')
-            .next_back()
-            .unwrap_or(&model.id)
-            .to_string();
+        let display_name = model.display_name.unwrap_or_else(|| {
+            model
+                .id
+                .split('/')
+                .next_back()
+                .unwrap_or(&model.id)
+                .to_string()
+        });
 
         EnhancedModelMetadata {
             id: model.id.clone(),
             display_name,
             provider_id: provider_id.to_string(),
-            provider_name: model.owned_by.unwrap_or_else(|| provider_id.to_string()),
-            family: None,
+            provider_name: model
+                .provider_name
+                .unwrap_or_else(|| provider_id.to_string()),
+            family: model.family,
             tier: ModelTier::Pro,
             capabilities: ModelCapabilities {
                 vision: false,
@@ -1519,11 +1951,85 @@ struct ApiModelsResponse {
 struct ApiModelResponse {
     id: String,
     #[serde(default)]
-    owned_by: Option<String>,
+    display_name: Option<String>,
+    #[serde(default, alias = "owned_by")]
+    provider_name: Option<String>,
+    #[serde(default)]
+    family: Option<String>,
     #[serde(default)]
     context_length: Option<u32>,
 }
 
+#[derive(Debug)]
+struct AnthropicModelsResponse {
+    models: Vec<ApiModelResponse>,
+    has_more: bool,
+    last_id: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+struct RawAnthropicModelsResponse {
+    #[serde(default)]
+    data: Vec<RawAnthropicModelResponse>,
+    #[serde(default)]
+    has_more: bool,
+    #[serde(default)]
+    last_id: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+struct RawAnthropicModelResponse {
+    id: String,
+    #[serde(default)]
+    display_name: Option<String>,
+}
+
+#[derive(Debug)]
+struct GeminiModelsResponse {
+    models: Vec<ApiModelResponse>,
+    next_page_token: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct RawGeminiModelsResponse {
+    #[serde(default)]
+    models: Vec<RawGeminiModelResponse>,
+    #[serde(default)]
+    next_page_token: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct RawGeminiModelResponse {
+    name: String,
+    #[serde(default)]
+    display_name: Option<String>,
+    #[serde(default)]
+    input_token_limit: Option<u32>,
+    #[serde(default)]
+    supported_generation_methods: Option<Vec<String>>,
+}
+
+#[derive(Debug, Deserialize)]
+struct OllamaModelsResponse {
+    #[serde(default)]
+    models: Vec<OllamaModelResponse>,
+}
+
+#[derive(Debug, Deserialize)]
+struct OllamaModelResponse {
+    name: String,
+    #[serde(default)]
+    details: Option<OllamaModelDetails>,
+}
+
+#[derive(Debug, Deserialize)]
+struct OllamaModelDetails {
+    #[serde(default)]
+    family: Option<String>,
+}
+
 /// 模型获取来源
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum ModelFetchSource {
@@ -1566,7 +2072,7 @@ pub struct FetchModelsResult {
 
 #[cfg(test)]
 mod tests {
-    use super::{HostAliasRule, ModelRegistryService};
+    use super::{HostAliasRule, ModelFetchProtocol, ModelRegistryService};
     use lime_core::database::dao::api_key_provider::ApiProviderType;
     use lime_core::database::DbConnection;
     use rusqlite::Connection;
@@ -1587,6 +2093,10 @@ mod tests {
             ModelRegistryService::build_models_api_url("https://open.bigmodel.cn/api/anthropic"),
             "https://open.bigmodel.cn/api/anthropic/v1/models"
         );
+        assert_eq!(
+            ModelRegistryService::build_models_api_url("https://open.bigmodel.cn/api/paas/v4/"),
+            "https://open.bigmodel.cn/api/paas/v4/models"
+        );
         assert_eq!(
             ModelRegistryService::build_models_api_url("https://ark.cn-beijing.volces.com/api/v3/"),
             "https://ark.cn-beijing.volces.com/api/v3/models"
@@ -1597,6 +2107,34 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_build_gemini_models_api_url() {
+        assert_eq!(
+            ModelRegistryService::build_gemini_models_api_url(
+                "https://generativelanguage.googleapis.com"
+            ),
+            "https://generativelanguage.googleapis.com/v1beta/models"
+        );
+        assert_eq!(
+            ModelRegistryService::build_gemini_models_api_url(
+                "https://generativelanguage.googleapis.com/v1beta"
+            ),
+            "https://generativelanguage.googleapis.com/v1beta/models"
+        );
+    }
+
+    #[test]
+    fn test_build_ollama_models_api_url() {
+        assert_eq!(
+            ModelRegistryService::build_ollama_models_api_url("http://localhost:11434"),
+            "http://localhost:11434/api/tags"
+        );
+        assert_eq!(
+            ModelRegistryService::build_ollama_models_api_url("http://localhost:11434/api"),
+            "http://localhost:11434/api/tags"
+        );
+    }
+
     #[test]
     fn test_build_models_api_hint_for_doubao() {
         let hint = ModelRegistryService::build_models_api_hint(
@@ -1611,6 +2149,20 @@ mod tests {
             .contains("https://ark.cn-beijing.volces.com/api/v3"));
     }
 
+    #[test]
+    fn test_build_models_api_hint_for_zhipu() {
+        let hint = ModelRegistryService::build_models_api_hint(
+            "zhipu",
+            "https://open.bigmodel.cn/api/paas/v4",
+            "https://open.bigmodel.cn/api/paas/v4/models",
+        );
+
+        assert!(hint.is_some());
+        assert!(hint
+            .unwrap()
+            .contains("https://open.bigmodel.cn/api/paas/v4"));
+    }
+
     fn create_service_with_resource_dir(resource_dir: std::path::PathBuf) -> ModelRegistryService {
         let conn = Connection::open_in_memory().expect("in-memory db");
         let db: DbConnection = Arc::new(Mutex::new(conn));
@@ -1710,4 +2262,118 @@ mod tests {
             ["google"]
         );
     }
+
+    #[test]
+    fn test_requires_api_key_for_model_fetch() {
+        assert!(ModelRegistryService::requires_api_key_for_model_fetch(
+            "openai",
+            "https://api.openai.com",
+            ApiProviderType::Openai
+        ));
+        assert!(!ModelRegistryService::requires_api_key_for_model_fetch(
+            "ollama",
+            "http://localhost:11434",
+            ApiProviderType::Ollama
+        ));
+        assert!(!ModelRegistryService::requires_api_key_for_model_fetch(
+            "lmstudio",
+            "http://127.0.0.1:1234/v1",
+            ApiProviderType::Openai
+        ));
+    }
+
+    #[test]
+    fn test_resolve_model_fetch_protocol() {
+        assert_eq!(
+            ModelRegistryService::resolve_model_fetch_protocol(
+                "google",
+                "https://generativelanguage.googleapis.com",
+                Some(ApiProviderType::Gemini)
+            ),
+            ModelFetchProtocol::Gemini
+        );
+        assert_eq!(
+            ModelRegistryService::resolve_model_fetch_protocol(
+                "anthropic",
+                "https://api.anthropic.com",
+                Some(ApiProviderType::Anthropic)
+            ),
+            ModelFetchProtocol::Anthropic
+        );
+        assert_eq!(
+            ModelRegistryService::resolve_model_fetch_protocol(
+                "azure-openai",
+                "https://example.openai.azure.com",
+                Some(ApiProviderType::AzureOpenai)
+            ),
+            ModelFetchProtocol::Unsupported
+        );
+    }
+
+    #[test]
+    fn test_parse_anthropic_models_response() {
+        let response = ModelRegistryService::parse_anthropic_models_response(
+            r#"{
+              "data": [
+                { "id": "claude-sonnet-4-5", "display_name": "Claude Sonnet 4.5" }
+              ],
+              "has_more": false,
+              "last_id": "claude-sonnet-4-5"
+            }"#,
+        )
+        .expect("parse anthropic response");
+
+        assert_eq!(response.models.len(), 1);
+        assert_eq!(response.models[0].id, "claude-sonnet-4-5");
+        assert_eq!(
+            response.models[0].display_name.as_deref(),
+            Some("Claude Sonnet 4.5")
+        );
+    }
+
+    #[test]
+    fn test_parse_gemini_models_response() {
+        let response = ModelRegistryService::parse_gemini_models_response(
+            r#"{
+              "models": [
+                {
+                  "name": "models/gemini-2.5-pro",
+                  "displayName": "Gemini 2.5 Pro",
+                  "inputTokenLimit": 1048576,
+                  "supportedGenerationMethods": ["generateContent"]
+                },
+                {
+                  "name": "models/text-embedding-004",
+                  "displayName": "Embedding",
+                  "supportedGenerationMethods": ["embedContent"]
+                }
+              ],
+              "nextPageToken": "next-page"
+            }"#,
+        )
+        .expect("parse gemini response");
+
+        assert_eq!(response.models.len(), 1);
+        assert_eq!(response.models[0].id, "gemini-2.5-pro");
+        assert_eq!(response.next_page_token.as_deref(), Some("next-page"));
+    }
+
+    #[test]
+    fn test_parse_ollama_models_response() {
+        let models = ModelRegistryService::parse_ollama_models_response(
+            r#"{
+              "models": [
+                {
+                  "name": "qwen3:14b",
+                  "details": { "family": "qwen3" }
+                }
+              ]
+            }"#,
+        )
+        .expect("parse ollama response");
+
+        assert_eq!(models.len(), 1);
+        assert_eq!(models[0].id, "qwen3:14b");
+        assert_eq!(models[0].family.as_deref(), Some("qwen3"));
+    }
 }
diff --git a/src-tauri/resources/models/aliases/codex.json b/src-tauri/resources/models/aliases/codex.json
index a40ce2812..7ae999243 100644
--- a/src-tauri/resources/models/aliases/codex.json
+++ b/src-tauri/resources/models/aliases/codex.json
@@ -4,29 +4,20 @@
   "description": "OpenAI Codex CLI 支持的模型",
   "models": [
     "gpt-5.3-codex",
-    "gpt-5.2-codex",
-    "gpt-5.1-codex-max",
-    "gpt-5.1-codex-mini",
-    "gpt-5.2"
+    "gpt-5.4"
   ],
   "aliases": {
+    "gpt-5.4": {
+      "actual": "gpt-5.4",
+      "internal_name": "gpt-5.4",
+      "provider": "openai",
+      "description": "最新前沿模型，跨知识、推理和编码的全面提升"
+    },
     "gpt-5.3-codex": {
       "actual": "gpt-5.3-codex",
       "internal_name": "gpt-5.3-codex",
       "provider": "openai",
       "description": "Codex 最新一代模型，编码与推理能力增强"
-    },
-    "gpt-5.2-codex": {
-      "actual": "gpt-5.2-codex",
-      "internal_name": "gpt-5.2-codex",
-      "provider": "openai",
-      "description": "最新前沿模型，跨知识、推理和编码的全面提升"
-    },
-    "gpt-5.2": {
-      "actual": "gpt-5.2",
-      "internal_name": "gpt-5.2",
-      "provider": "openai",
-      "description": "最新前沿模型，跨知识、推理和编码的全面提升"
     }
   },
   "updated_at": "2026-02-11T00:00:00Z"
diff --git a/src-tauri/src/app/runner.rs b/src-tauri/src/app/runner.rs
index 2445e26c1..9db9cc27e 100644
--- a/src-tauri/src/app/runner.rs
+++ b/src-tauri/src/app/runner.rs
@@ -235,6 +235,7 @@ pub fn run() {
         .manage(automation_service_state)
         .manage(commands::subagent_cmd::SubAgentSchedulerState::default())
         .manage(commands::websocket_cmd::WsServiceState::default())
+        .manage(crate::services::companion_service::CompanionServiceState::default())
         .manage(lime_gateway::telegram::TelegramGatewayState::default())
         .manage(lime_gateway::discord::DiscordGatewayState::default())
         .manage(lime_gateway::feishu::FeishuGatewayState::default())
@@ -444,6 +445,23 @@ pub fn run() {
                 });
             }
 
+            {
+                let app_handle = app.handle().clone();
+                let companion_state = app
+                    .state::<crate::services::companion_service::CompanionServiceState>()
+                    .inner()
+                    .clone();
+
+                tauri::async_runtime::spawn(async move {
+                    match companion_state.start(app_handle).await {
+                        Ok(()) => tracing::info!("[启动] Companion Pet 服务已启动"),
+                        Err(error) => {
+                            tracing::warn!("[启动] Companion Pet 服务启动失败: {}", error)
+                        }
+                    }
+                });
+            }
+
             #[cfg(debug_assertions)]
             {
                 let app_handle = app.handle().clone();
@@ -1129,6 +1147,10 @@ pub fn run() {
             // Path utility commands
             commands::config_cmd::expand_path,
             commands::config_cmd::open_auth_dir,
+            // Companion commands
+            commands::companion_cmd::companion_get_pet_status,
+            commands::companion_cmd::companion_launch_pet,
+            commands::companion_cmd::companion_send_pet_command,
             // OpenClaw commands
             commands::openclaw_cmd::openclaw_check_installed,
             commands::openclaw_cmd::openclaw_get_environment_status,
diff --git a/src-tauri/src/commands/aster_agent_cmd/dto.rs b/src-tauri/src/commands/aster_agent_cmd/dto.rs
index c5e217655..76326a8dc 100644
--- a/src-tauri/src/commands/aster_agent_cmd/dto.rs
+++ b/src-tauri/src/commands/aster_agent_cmd/dto.rs
@@ -1469,6 +1469,10 @@ pub struct AgentRuntimeSpawnSubagentRequest {
     #[serde(alias = "parentSessionId")]
     pub parent_session_id: String,
     pub message: String,
+    #[serde(default)]
+    pub name: Option<String>,
+    #[serde(default, alias = "teamName")]
+    pub team_name: Option<String>,
     #[serde(default, alias = "agentType")]
     pub agent_type: Option<String>,
     #[serde(default)]
@@ -1499,6 +1503,8 @@ pub struct AgentRuntimeSpawnSubagentRequest {
     pub system_overlay: Option<String>,
     #[serde(default, alias = "outputContract")]
     pub output_contract: Option<String>,
+    #[serde(default)]
+    pub cwd: Option<String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -1731,6 +1737,26 @@ mod tests {
         (Utc::now() - Duration::seconds(seconds)).to_rfc3339()
     }
 
+    #[test]
+    fn spawn_subagent_request_should_parse_current_fields() {
+        let request: AgentRuntimeSpawnSubagentRequest = serde_json::from_value(serde_json::json!({
+            "parentSessionId": "parent-1",
+            "message": "检查当前工具面对齐情况",
+            "name": "verifier",
+            "teamName": "delivery-team",
+            "agentType": "explorer",
+            "cwd": "/tmp/workspace"
+        }))
+        .expect("spawn subagent request should deserialize");
+
+        assert_eq!(request.parent_session_id, "parent-1");
+        assert_eq!(request.message, "检查当前工具面对齐情况");
+        assert_eq!(request.name.as_deref(), Some("verifier"));
+        assert_eq!(request.team_name.as_deref(), Some("delivery-team"));
+        assert_eq!(request.agent_type.as_deref(), Some("explorer"));
+        assert_eq!(request.cwd.as_deref(), Some("/tmp/workspace"));
+    }
+
     #[test]
     fn thread_read_should_expose_pending_request_and_waiting_incident() {
         let detail = build_session_detail(
diff --git a/src-tauri/src/commands/aster_agent_cmd/mod.rs b/src-tauri/src/commands/aster_agent_cmd/mod.rs
index c403e65b4..d2f6f905e 100644
--- a/src-tauri/src/commands/aster_agent_cmd/mod.rs
+++ b/src-tauri/src/commands/aster_agent_cmd/mod.rs
@@ -377,6 +377,7 @@ pub(crate) use session_runtime::{
     resolve_session_recent_runtime_context, SessionRecentHarnessContext,
     SessionRecentRuntimeContext,
 };
+#[allow(unused_imports)]
 pub(crate) use subagent_runtime::{
     agent_runtime_close_subagent_internal, agent_runtime_resume_subagent_internal,
     agent_runtime_send_subagent_input_internal, agent_runtime_spawn_subagent_internal,
diff --git a/src-tauri/src/commands/aster_agent_cmd/prompt_context.rs b/src-tauri/src/commands/aster_agent_cmd/prompt_context.rs
index f6bae2f12..28e25d6a8 100644
--- a/src-tauri/src/commands/aster_agent_cmd/prompt_context.rs
+++ b/src-tauri/src/commands/aster_agent_cmd/prompt_context.rs
@@ -769,7 +769,7 @@ pub(crate) fn build_team_preference_system_prompt(
     }
 
     lines.push(
-        "- spawn_agent 支持这些结构化字段：blueprintRoleId、blueprintRoleLabel、teamPresetId、profileId、profileName、roleKey、skillIds、skillDirectories、theme、systemOverlay、outputContract。"
+        "- spawn_agent 支持这些结构化字段：name、teamName、cwd、blueprintRoleId、blueprintRoleLabel、teamPresetId、profileId、profileName、roleKey、skillIds、skillDirectories、theme、systemOverlay、outputContract。teamName 需要与 name 搭配，并依附现有 team 上下文。"
             .to_string(),
     );
     lines.push(
diff --git a/src-tauri/src/commands/aster_agent_cmd/subagent_runtime.rs b/src-tauri/src/commands/aster_agent_cmd/subagent_runtime.rs
index 3e1dbb16f..93129619b 100644
--- a/src-tauri/src/commands/aster_agent_cmd/subagent_runtime.rs
+++ b/src-tauri/src/commands/aster_agent_cmd/subagent_runtime.rs
@@ -9,6 +9,25 @@ const DEFAULT_WAIT_AGENT_TIMEOUT_MS: i64 = 30_000;
 const MIN_WAIT_AGENT_TIMEOUT_MS: i64 = 1_000;
 const MAX_WAIT_AGENT_TIMEOUT_MS: i64 = 300_000;
 
+fn resolve_spawn_working_dir(
+    parent_working_dir: &std::path::Path,
+    requested_cwd: Option<String>,
+) -> Result<std::path::PathBuf, String> {
+    let Some(cwd) = normalize_optional_text(requested_cwd) else {
+        return Ok(parent_working_dir.to_path_buf());
+    };
+
+    let path = std::path::PathBuf::from(&cwd);
+    if !path.is_absolute() {
+        return Err("cwd 必须是绝对路径".to_string());
+    }
+    if !path.is_dir() {
+        return Err(format!("cwd 不是有效目录: {cwd}"));
+    }
+
+    Ok(path)
+}
+
 #[derive(Debug, Clone, Serialize)]
 struct SubagentStatusChangedEvent {
     #[serde(rename = "type")]
@@ -153,12 +172,14 @@ fn normalize_optional_vec(values: &[String]) -> Vec<String> {
 }
 
 fn build_subagent_session_name(
+    explicit_name: Option<&str>,
     message: &str,
     agent_type: Option<&str>,
     blueprint_role_label: Option<&str>,
     profile_name: Option<&str>,
 ) -> String {
-    normalize_optional_text(agent_type.map(ToString::to_string))
+    normalize_optional_text(explicit_name.map(ToString::to_string))
+        .or_else(|| normalize_optional_text(agent_type.map(ToString::to_string)))
         .or_else(|| normalize_optional_text(blueprint_role_label.map(ToString::to_string)))
         .or_else(|| normalize_optional_text(profile_name.map(ToString::to_string)))
         .or_else(|| build_subagent_task_summary(message))
@@ -169,12 +190,60 @@ fn resolve_subagent_role_hint(
     request: &AgentRuntimeSpawnSubagentRequest,
     customization: Option<&SubagentCustomizationState>,
 ) -> Option<String> {
-    normalize_optional_text(request.agent_type.clone())
+    normalize_optional_text(request.name.clone())
+        .or_else(|| normalize_optional_text(request.agent_type.clone()))
         .or_else(|| customization.and_then(|state| state.blueprint_role_label.clone()))
         .or_else(|| customization.and_then(|state| state.profile_name.clone()))
         .or_else(|| customization.and_then(|state| state.role_key.clone()))
 }
 
+async fn register_spawned_teammate(
+    parent_session_id: &str,
+    child_session_id: &str,
+    team_name: String,
+    teammate_name: String,
+    agent_type: Option<String>,
+) -> Result<(), String> {
+    let parent_session = read_session(parent_session_id, false, "读取父会话失败").await?;
+    let Some(mut team_state) = aster::session::TeamSessionState::from_session(&parent_session)
+    else {
+        return Err("当前 session 还没有 team 上下文，请先建立 team".to_string());
+    };
+
+    if team_state.team_name != team_name {
+        return Err(format!(
+            "team_name 不匹配：当前 team 为 {}，但请求的是 {}",
+            team_state.team_name, team_name
+        ));
+    }
+    if team_state.find_member_by_name(&teammate_name).is_some() {
+        return Err(format!("team 中已存在名为 {teammate_name} 的成员"));
+    }
+
+    team_state.add_or_update_member(aster::session::TeamMember::teammate(
+        child_session_id.to_string(),
+        teammate_name.clone(),
+        agent_type.clone(),
+    ));
+    aster::session::save_team_state(parent_session_id, Some(team_state))
+        .await
+        .map_err(|error| format!("更新 team 状态失败: {error}"))?;
+    aster::session::save_team_membership(
+        child_session_id,
+        Some(aster::session::TeamMembershipState {
+            team_name,
+            lead_session_id: parent_session_id.to_string(),
+            agent_id: child_session_id.to_string(),
+            name: teammate_name,
+            agent_type,
+        }),
+    )
+    .await
+    .map_err(|error| format!("保存 team 成员信息失败: {error}"))?;
+
+    Ok(())
+}
+
 fn build_local_subagent_skill_payload(
     directory: &str,
 ) -> Result<(SubagentSkillSummary, SubagentSkillPromptBlock), String> {
@@ -558,6 +627,11 @@ async fn create_runtime_subagent_session(
     let parent_session_id =
         normalize_required_text(&request.parent_session_id, "parent_session_id")?;
     let message = normalize_required_text(&request.message, "message")?;
+    let teammate_name = normalize_optional_text(request.name.clone());
+    let team_name = normalize_optional_text(request.team_name.clone());
+    if team_name.is_some() && teammate_name.is_none() {
+        return Err("team_name 需要同时提供 name".to_string());
+    }
     enforce_team_spawn_limits(&parent_session_id).await?;
     let parent_session = read_session(&parent_session_id, false, "读取父会话失败").await?;
     let customization = build_subagent_customization_state(request)?;
@@ -566,10 +640,13 @@ async fn create_runtime_subagent_session(
         .as_ref()
         .and_then(|state| state.profile_name.as_deref());
     let role_hint = resolve_subagent_role_hint(request, customization.as_ref());
+    let working_dir =
+        resolve_spawn_working_dir(parent_session.working_dir.as_path(), request.cwd.clone())?;
 
     let session = create_subagent_session(
-        parent_session.working_dir.clone(),
+        working_dir,
         build_subagent_session_name(
+            teammate_name.as_deref(),
             &message,
             request.agent_type.as_deref(),
             customization
@@ -614,6 +691,16 @@ async fn create_runtime_subagent_session(
         "写入 subagent session metadata",
     )
     .await?;
+    if let (Some(team_name), Some(teammate_name)) = (team_name, teammate_name.clone()) {
+        register_spawned_teammate(
+            &parent_session_id,
+            &session.id,
+            team_name,
+            teammate_name,
+            normalize_optional_text(request.agent_type.clone()),
+        )
+        .await?;
+    }
 
     inherit_subagent_provider(
         runtime,
@@ -694,9 +781,12 @@ pub(crate) async fn agent_runtime_spawn_subagent_internal(
             metadata: Some(serde_json::json!({
                 "subagent": {
                     "parent_session_id": request.parent_session_id,
+                    "name": request.name,
+                    "team_name": request.team_name,
                     "agent_type": request.agent_type,
                     "reasoning_effort": request.reasoning_effort,
                     "fork_context": request.fork_context,
+                    "cwd": request.cwd,
                     "origin_tool": "spawn_agent",
                     "blueprint_role_id": customization.as_ref().and_then(|state| state.blueprint_role_id.clone()),
                     "blueprint_role_label": customization.as_ref().and_then(|state| state.blueprint_role_label.clone()),
@@ -958,3 +1048,64 @@ pub(crate) async fn agent_runtime_close_subagent_internal(
         changed_session_ids: changed_ids,
     })
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_build_subagent_session_name_prefers_explicit_name() {
+        let name = build_subagent_session_name(
+            Some("verifier"),
+            "检查当前 team runtime 差异",
+            Some("explorer"),
+            Some("分析"),
+            Some("代码分析员"),
+        );
+
+        assert_eq!(name, "verifier");
+    }
+
+    #[test]
+    fn test_resolve_subagent_role_hint_prefers_explicit_name() {
+        let request = AgentRuntimeSpawnSubagentRequest {
+            parent_session_id: "parent-1".to_string(),
+            message: "定位当前 team runtime 差异".to_string(),
+            name: Some("verifier".to_string()),
+            team_name: Some("delivery-team".to_string()),
+            agent_type: Some("explorer".to_string()),
+            model: None,
+            reasoning_effort: None,
+            fork_context: false,
+            blueprint_role_id: None,
+            blueprint_role_label: Some("分析".to_string()),
+            profile_id: None,
+            profile_name: Some("代码分析员".to_string()),
+            role_key: Some("explorer".to_string()),
+            skill_ids: Vec::new(),
+            skill_directories: Vec::new(),
+            team_preset_id: None,
+            theme: None,
+            system_overlay: None,
+            output_contract: None,
+            cwd: None,
+        };
+
+        assert_eq!(
+            resolve_subagent_role_hint(&request, None).as_deref(),
+            Some("verifier")
+        );
+    }
+
+    #[test]
+    fn test_resolve_spawn_working_dir_uses_requested_absolute_directory() {
+        let parent = tempfile::tempdir().expect("parent tempdir");
+        let child = tempfile::tempdir().expect("child tempdir");
+
+        let resolved =
+            resolve_spawn_working_dir(parent.path(), Some(child.path().display().to_string()))
+                .expect("cwd override should resolve");
+
+        assert_eq!(resolved, child.path());
+    }
+}
diff --git a/src-tauri/src/commands/aster_agent_cmd/tests.rs b/src-tauri/src/commands/aster_agent_cmd/tests.rs
index 0f551df77..d3bfb86bc 100644
--- a/src-tauri/src/commands/aster_agent_cmd/tests.rs
+++ b/src-tauri/src/commands/aster_agent_cmd/tests.rs
@@ -2604,6 +2604,8 @@ mod tests {
         let customization = build_subagent_customization_state(&AgentRuntimeSpawnSubagentRequest {
             parent_session_id: "parent-1".to_string(),
             message: "定位当前 team runtime 差异".to_string(),
+            name: None,
+            team_name: None,
             agent_type: Some("Image #1".to_string()),
             model: None,
             reasoning_effort: None,
@@ -2619,6 +2621,7 @@ mod tests {
             theme: None,
             system_overlay: None,
             output_contract: None,
+            cwd: None,
         })
         .expect("build customization state")
         .expect("customization should exist");
diff --git a/src-tauri/src/commands/aster_agent_cmd/tool_runtime/subagent_tools.rs b/src-tauri/src/commands/aster_agent_cmd/tool_runtime/subagent_tools.rs
index 8da766675..d9d69094a 100644
--- a/src-tauri/src/commands/aster_agent_cmd/tool_runtime/subagent_tools.rs
+++ b/src-tauri/src/commands/aster_agent_cmd/tool_runtime/subagent_tools.rs
@@ -408,6 +408,8 @@ impl Tool for SubAgentTaskTool {
             AgentRuntimeSpawnSubagentRequest {
                 parent_session_id,
                 message: build_subagent_task_runtime_message(&input, &task, role),
+                name: None,
+                team_name: None,
                 agent_type: Some(role.to_string()),
                 model: input.model.clone(),
                 reasoning_effort: None,
@@ -423,6 +425,7 @@ impl Tool for SubAgentTaskTool {
                 theme: None,
                 system_overlay: None,
                 output_contract: None,
+                cwd: None,
             },
         )
         .await
@@ -517,10 +520,7 @@ fn build_agent_control_tool_config(
     runtime: SubagentControlRuntime,
 ) -> aster::tools::AgentControlToolConfig {
     let spawn_runtime = runtime.clone();
-    let send_runtime = runtime.clone();
-    let wait_runtime = runtime.clone();
-    let resume_runtime = runtime.clone();
-    let close_runtime = runtime;
+    let send_runtime = runtime;
 
     aster::tools::AgentControlToolConfig::new()
         .with_spawn_agent_callback(Arc::new(move |request| {
@@ -531,6 +531,8 @@ fn build_agent_control_tool_config(
                     AgentRuntimeSpawnSubagentRequest {
                         parent_session_id: request.parent_session_id,
                         message: request.message,
+                        name: request.name,
+                        team_name: request.team_name,
                         agent_type: request.agent_type,
                         model: request.model,
                         reasoning_effort: request.reasoning_effort,
@@ -546,6 +548,7 @@ fn build_agent_control_tool_config(
                         theme: request.theme,
                         system_overlay: request.system_overlay,
                         output_contract: request.output_contract,
+                        cwd: request.cwd,
                     },
                 )
                 .await?;
@@ -576,80 +579,6 @@ fn build_agent_control_tool_config(
                 })
             })
         }))
-        .with_wait_agent_callback(Arc::new(move |request| {
-            let runtime = wait_runtime.clone();
-            Box::pin(async move {
-                let response = agent_runtime_wait_subagents_internal(
-                    &runtime,
-                    AgentRuntimeWaitSubagentsRequest {
-                        ids: request.ids,
-                        timeout_ms: request.timeout_ms,
-                    },
-                )
-                .await?;
-                let status = response
-                    .status
-                    .into_iter()
-                    .map(|(id, status)| {
-                        serde_json::to_value(status)
-                            .map(|value| (id, value))
-                            .map_err(|error| format!("wait_agent 状态序列化失败: {error}"))
-                    })
-                    .collect::<Result<std::collections::BTreeMap<_, _>, _>>()?;
-
-                Ok(aster::tools::WaitAgentResponse {
-                    status,
-                    timed_out: response.timed_out,
-                    extra: std::collections::BTreeMap::new(),
-                })
-            })
-        }))
-        .with_resume_agent_callback(Arc::new(move |request| {
-            let runtime = resume_runtime.clone();
-            Box::pin(async move {
-                let response = agent_runtime_resume_subagent_internal(
-                    &runtime,
-                    AgentRuntimeResumeSubagentRequest { id: request.id },
-                )
-                .await?;
-                let mut extra = std::collections::BTreeMap::new();
-                extra.insert(
-                    "cascade_session_ids".to_string(),
-                    serde_json::to_value(response.cascade_session_ids)
-                        .map_err(|error| format!("resume_agent 级联会话序列化失败: {error}"))?,
-                );
-
-                Ok(aster::tools::ResumeAgentResponse {
-                    status: serde_json::to_value(response.status)
-                        .map_err(|error| format!("resume_agent 状态序列化失败: {error}"))?,
-                    changed_session_ids: response.changed_session_ids,
-                    extra,
-                })
-            })
-        }))
-        .with_close_agent_callback(Arc::new(move |request| {
-            let runtime = close_runtime.clone();
-            Box::pin(async move {
-                let response = agent_runtime_close_subagent_internal(
-                    &runtime,
-                    AgentRuntimeCloseSubagentRequest { id: request.id },
-                )
-                .await?;
-                let mut extra = std::collections::BTreeMap::new();
-                extra.insert(
-                    "cascade_session_ids".to_string(),
-                    serde_json::to_value(response.cascade_session_ids)
-                        .map_err(|error| format!("close_agent 级联会话序列化失败: {error}"))?,
-                );
-
-                Ok(aster::tools::CloseAgentResponse {
-                    previous_status: serde_json::to_value(response.previous_status)
-                        .map_err(|error| format!("close_agent 状态序列化失败: {error}"))?,
-                    changed_session_ids: response.changed_session_ids,
-                    extra,
-                })
-            })
-        }))
 }
 
 pub(super) fn register_subagent_runtime_tools(
diff --git a/src-tauri/src/commands/companion_cmd.rs b/src-tauri/src/commands/companion_cmd.rs
new file mode 100644
index 000000000..a321fa945
--- /dev/null
+++ b/src-tauri/src/commands/companion_cmd.rs
@@ -0,0 +1,28 @@
+use crate::services::companion_service::{
+    self, CompanionLaunchPetRequest, CompanionLaunchPetResult, CompanionPetCommandRequest,
+    CompanionPetSendResult, CompanionPetStatus, CompanionServiceState,
+};
+use tauri::State;
+
+#[tauri::command]
+pub async fn companion_get_pet_status(
+    companion_state: State<'_, CompanionServiceState>,
+) -> Result<CompanionPetStatus, String> {
+    companion_service::get_pet_status_global(companion_state.inner()).await
+}
+
+#[tauri::command]
+pub async fn companion_launch_pet(
+    companion_state: State<'_, CompanionServiceState>,
+    request: Option<CompanionLaunchPetRequest>,
+) -> Result<CompanionLaunchPetResult, String> {
+    companion_service::launch_pet_global(companion_state.inner(), request.unwrap_or_default()).await
+}
+
+#[tauri::command]
+pub async fn companion_send_pet_command(
+    companion_state: State<'_, CompanionServiceState>,
+    request: CompanionPetCommandRequest,
+) -> Result<CompanionPetSendResult, String> {
+    companion_service::send_pet_command_global(companion_state.inner(), request).await
+}
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 391d632bf..d58893e04 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -11,6 +11,7 @@ pub mod browser_profile_cmd;
 pub mod browser_runtime_cmd;
 pub mod channels_cmd;
 pub mod claw_solution_cmd;
+pub mod companion_cmd;
 pub mod config_cmd;
 pub mod connect_cmd;
 pub mod connection_cmd;
diff --git a/src-tauri/src/commands/model_registry_cmd.rs b/src-tauri/src/commands/model_registry_cmd.rs
index caeb1c360..27e1c7629 100644
--- a/src-tauri/src/commands/model_registry_cmd.rs
+++ b/src-tauri/src/commands/model_registry_cmd.rs
@@ -5,9 +5,9 @@
 use crate::models::model_registry::{
     EnhancedModelMetadata, ModelSyncState, ModelTier, ProviderAliasConfig, UserModelPreference,
 };
+use lime_server_utils::load_model_registry_provider_ids_from_resources;
 use lime_services::model_registry_service::{FetchModelsResult, ModelRegistryService};
 use serde::Serialize;
-use std::collections::BTreeSet;
 use std::sync::Arc;
 use tauri::State;
 use tokio::sync::RwLock;
@@ -36,20 +36,12 @@ pub async fn get_model_registry(
 
 /// 获取模型注册表中所有 provider_id（去重且有序）
 ///
-/// provider_id 来源于 `src-tauri/resources/models/providers/*.json` 加载结果。
+/// provider_id 以 `src-tauri/resources/models/index.json` 的 providers 列表为唯一真相源。
 #[tauri::command]
 pub async fn get_model_registry_provider_ids(
-    state: State<'_, ModelRegistryState>,
+    _state: State<'_, ModelRegistryState>,
 ) -> Result<Vec<String>, String> {
-    let guard = state.read().await;
-    let service = guard
-        .as_ref()
-        .ok_or_else(|| "模型注册服务未初始化".to_string())?;
-
-    let models = service.get_all_models().await;
-    let provider_ids: BTreeSet<String> = models.into_iter().map(|m| m.provider_id).collect();
-
-    Ok(provider_ids.into_iter().collect())
+    load_model_registry_provider_ids_from_resources()
 }
 
 /// 搜索模型
@@ -272,18 +264,32 @@ pub async fn fetch_provider_models_auto(
         .get_provider(&db, &provider_id)?
         .ok_or_else(|| format!("Provider 不存在: {provider_id}"))?;
 
-    // 获取 API Key
-    let api_key = api_key_service
-        .0
-        .get_next_api_key(&db, &provider_id)?
-        .ok_or_else(|| format!("Provider {provider_id} 没有可用的 API Key"))?;
-
     // 获取 API Host
     let api_host = provider.provider.api_host.clone();
     if api_host.is_empty() {
         return Err("Provider 没有配置 API Host".to_string());
     }
 
+    let provider_type = provider.provider.provider_type;
+    let requires_api_key = ModelRegistryService::requires_api_key_for_model_fetch(
+        &provider_id,
+        &api_host,
+        provider_type,
+    );
+
+    // 获取 API Key（支持本地免 Key 渠道）
+    let api_key = if requires_api_key {
+        api_key_service
+            .0
+            .get_next_api_key(&db, &provider_id)?
+            .ok_or_else(|| format!("Provider {provider_id} 没有可用的 API Key"))?
+    } else {
+        api_key_service
+            .0
+            .get_next_api_key(&db, &provider_id)?
+            .unwrap_or_default()
+    };
+
     // 调用模型注册服务
     let guard = state.read().await;
     let service = guard
@@ -295,7 +301,7 @@ pub async fn fetch_provider_models_auto(
             &provider_id,
             &api_host,
             &api_key,
-            Some(provider.provider.provider_type),
+            Some(provider_type),
             &provider.provider.custom_models,
         )
         .await
diff --git a/src-tauri/src/commands/webview_cmd.rs b/src-tauri/src/commands/webview_cmd.rs
index 4a368f8b8..7361142f8 100644
--- a/src-tauri/src/commands/webview_cmd.rs
+++ b/src-tauri/src/commands/webview_cmd.rs
@@ -3684,6 +3684,10 @@ mod tests {
     use crate::services::browser_profile_service::sanitize_browser_profile_key;
     use rusqlite::Connection;
     use std::sync::{Arc, Mutex};
+    use tokio::sync::Mutex as AsyncMutex;
+
+    static BROWSER_RUNTIME_AUDIT_TEST_LOCK: Lazy<AsyncMutex<()>> =
+        Lazy::new(|| AsyncMutex::new(()));
 
     fn setup_db() -> DbConnection {
         let conn = Connection::open_in_memory().unwrap();
@@ -3995,6 +3999,7 @@ mod tests {
 
     #[tokio::test]
     async fn browser_runtime_audit_should_store_launch_metadata() {
+        let _guard = BROWSER_RUNTIME_AUDIT_TEST_LOCK.lock().await;
         BROWSER_RUNTIME_AUDIT_LOGS.lock().await.clear();
 
         append_browser_runtime_launch_audit(BrowserRuntimeLaunchAuditInput {
@@ -4018,7 +4023,10 @@ mod tests {
         let logs = get_browser_action_audit_logs(Some(5))
             .await
             .expect("audit logs should be readable");
-        let record = logs.first().expect("launch audit must exist");
+        let record = logs
+            .iter()
+            .find(|record| matches!(record.kind, BrowserRuntimeAuditKind::Launch))
+            .expect("launch audit must exist");
         assert!(matches!(record.kind, BrowserRuntimeAuditKind::Launch));
         assert_eq!(
             record.profile_key.as_deref(),
@@ -4041,6 +4049,7 @@ mod tests {
 
     #[tokio::test]
     async fn browser_runtime_audit_should_store_action_session_keys() {
+        let _guard = BROWSER_RUNTIME_AUDIT_TEST_LOCK.lock().await;
         BROWSER_RUNTIME_AUDIT_LOGS.lock().await.clear();
 
         append_browser_runtime_audit(BrowserRuntimeAuditRecord::action(
@@ -4064,7 +4073,13 @@ mod tests {
         let logs = get_browser_action_audit_logs(Some(5))
             .await
             .expect("audit logs should be readable");
-        let record = logs.first().expect("action audit must exist");
+        let record = logs
+            .iter()
+            .find(|record| {
+                matches!(record.kind, BrowserRuntimeAuditKind::Action)
+                    && record.id == "browser-action-1"
+            })
+            .expect("action audit must exist");
         assert!(matches!(record.kind, BrowserRuntimeAuditKind::Action));
         assert_eq!(record.id, "browser-action-1");
         assert_eq!(record.session_id.as_deref(), Some("session-42"));
diff --git a/src-tauri/src/dev_bridge/dispatcher.rs b/src-tauri/src/dev_bridge/dispatcher.rs
index 77bd2f526..258c0f0de 100644
--- a/src-tauri/src/dev_bridge/dispatcher.rs
+++ b/src-tauri/src/dev_bridge/dispatcher.rs
@@ -4,7 +4,9 @@
 
 mod agent_sessions;
 mod app_runtime;
+mod automation;
 mod browser;
+mod companion;
 mod content;
 mod logs;
 mod memory;
@@ -90,6 +92,14 @@ pub async fn handle_command(
         return Ok(result);
     }
 
+    if let Some(result) = companion::try_handle(state, cmd, args.as_ref()).await? {
+        return Ok(result);
+    }
+
+    if let Some(result) = automation::try_handle(state, cmd, args.as_ref()).await? {
+        return Ok(result);
+    }
+
     if let Some(result) = logs::try_handle(state, cmd, args.as_ref()).await? {
         return Ok(result);
     }
diff --git a/src-tauri/src/dev_bridge/dispatcher/automation.rs b/src-tauri/src/dev_bridge/dispatcher/automation.rs
new file mode 100644
index 000000000..1de459833
--- /dev/null
+++ b/src-tauri/src/dev_bridge/dispatcher/automation.rs
@@ -0,0 +1,158 @@
+use super::{
+    args_or_default, get_string_arg, parse_nested_arg, parse_optional_nested_arg,
+    require_app_handle,
+};
+use crate::dev_bridge::DevBridgeState;
+use serde_json::Value as JsonValue;
+use tauri::Manager;
+
+type DynError = Box<dyn std::error::Error>;
+
+pub(super) async fn try_handle(
+    state: &DevBridgeState,
+    cmd: &str,
+    args: Option<&JsonValue>,
+) -> Result<Option<JsonValue>, DynError> {
+    if !matches!(
+        cmd,
+        "get_automation_scheduler_config"
+            | "update_automation_scheduler_config"
+            | "get_automation_status"
+            | "get_automation_jobs"
+            | "get_automation_job"
+            | "create_automation_job"
+            | "update_automation_job"
+            | "delete_automation_job"
+            | "run_automation_job_now"
+            | "get_automation_health"
+            | "get_automation_run_history"
+            | "preview_automation_schedule"
+            | "validate_automation_schedule"
+    ) {
+        return Ok(None);
+    }
+
+    let app_handle = require_app_handle(state)?;
+    let app_state = app_handle.state::<crate::app::AppState>();
+    let automation_state =
+        app_handle.state::<crate::services::automation_service::AutomationServiceState>();
+
+    let result = match cmd {
+        "get_automation_scheduler_config" => serde_json::to_value(
+            crate::commands::automation_cmd::get_automation_scheduler_config(app_state).await?,
+        )?,
+        "update_automation_scheduler_config" => {
+            let config = parse_nested_arg::<
+                crate::commands::automation_cmd::AutomationSchedulerConfigResponse,
+            >(&args_or_default(args), "config")?;
+            crate::commands::automation_cmd::update_automation_scheduler_config(
+                app_state,
+                automation_state,
+                config,
+                app_handle.clone(),
+            )
+            .await?;
+            JsonValue::Null
+        }
+        "get_automation_status" => serde_json::to_value(
+            crate::commands::automation_cmd::get_automation_status(automation_state).await?,
+        )?,
+        "get_automation_jobs" => serde_json::to_value(
+            crate::commands::automation_cmd::get_automation_jobs(automation_state).await?,
+        )?,
+        "get_automation_job" => {
+            let args = args_or_default(args);
+            let id = get_string_arg(&args, "id", "id")?;
+            serde_json::to_value(
+                crate::commands::automation_cmd::get_automation_job(automation_state, id).await?,
+            )?
+        }
+        "create_automation_job" => {
+            let request = parse_nested_arg::<crate::commands::automation_cmd::AutomationJobRequest>(
+                &args_or_default(args),
+                "request",
+            )?;
+            serde_json::to_value(
+                crate::commands::automation_cmd::create_automation_job(automation_state, request)
+                    .await?,
+            )?
+        }
+        "update_automation_job" => {
+            let args = args_or_default(args);
+            let id = get_string_arg(&args, "id", "id")?;
+            let request = parse_nested_arg::<
+                crate::commands::automation_cmd::UpdateAutomationJobRequest,
+            >(&args, "request")?;
+            serde_json::to_value(
+                crate::commands::automation_cmd::update_automation_job(
+                    automation_state,
+                    id,
+                    request,
+                )
+                .await?,
+            )?
+        }
+        "delete_automation_job" => {
+            let args = args_or_default(args);
+            let id = get_string_arg(&args, "id", "id")?;
+            serde_json::to_value(
+                crate::commands::automation_cmd::delete_automation_job(automation_state, id)
+                    .await?,
+            )?
+        }
+        "run_automation_job_now" => {
+            let args = args_or_default(args);
+            let id = get_string_arg(&args, "id", "id")?;
+            serde_json::to_value(
+                crate::commands::automation_cmd::run_automation_job_now(automation_state, id)
+                    .await?,
+            )?
+        }
+        "get_automation_health" => {
+            let query = parse_optional_nested_arg::<
+                crate::services::automation_service::health::AutomationHealthQuery,
+            >(&args_or_default(args), "query")?;
+            serde_json::to_value(
+                crate::commands::automation_cmd::get_automation_health(automation_state, query)
+                    .await?,
+            )?
+        }
+        "get_automation_run_history" => {
+            let args = args_or_default(args);
+            let id = get_string_arg(&args, "id", "id")?;
+            let limit = args
+                .get("limit")
+                .and_then(|value| value.as_u64())
+                .map(|value| value as usize);
+            serde_json::to_value(
+                crate::commands::automation_cmd::get_automation_run_history(
+                    automation_state,
+                    id,
+                    limit,
+                )
+                .await?,
+            )?
+        }
+        "preview_automation_schedule" => {
+            let schedule = parse_nested_arg::<lime_core::config::TaskSchedule>(
+                &args_or_default(args),
+                "schedule",
+            )?;
+            serde_json::to_value(
+                crate::commands::automation_cmd::preview_automation_schedule(schedule).await?,
+            )?
+        }
+        "validate_automation_schedule" => {
+            let schedule = parse_nested_arg::<lime_core::config::TaskSchedule>(
+                &args_or_default(args),
+                "schedule",
+            )?;
+            serde_json::to_value(
+                crate::commands::automation_cmd::validate_automation_schedule(schedule).await?,
+            )?
+        }
+        _ => unreachable!("已通过前置 matches! 过滤 automation 命令"),
+    };
+
+    Ok(Some(result))
+}
diff --git a/src-tauri/src/dev_bridge/dispatcher/companion.rs b/src-tauri/src/dev_bridge/dispatcher/companion.rs
new file mode 100644
index 000000000..f3ae94965
--- /dev/null
+++ b/src-tauri/src/dev_bridge/dispatcher/companion.rs
@@ -0,0 +1,51 @@
+use super::{args_or_default, parse_nested_arg, parse_optional_nested_arg, require_app_handle};
+use crate::dev_bridge::DevBridgeState;
+use serde_json::Value as JsonValue;
+use tauri::Manager;
+
+type DynError = Box<dyn std::error::Error>;
+
+pub(super) async fn try_handle(
+    state: &DevBridgeState,
+    cmd: &str,
+    args: Option<&JsonValue>,
+) -> Result<Option<JsonValue>, DynError> {
+    let app_handle = match cmd {
+        "companion_get_pet_status" | "companion_launch_pet" | "companion_send_pet_command" => {
+            require_app_handle(state)?
+        }
+        _ => return Ok(None),
+    };
+
+    let companion_state =
+        app_handle.state::<crate::services::companion_service::CompanionServiceState>();
+    let result = match cmd {
+        "companion_get_pet_status" => serde_json::to_value(
+            crate::services::companion_service::get_pet_status_global(&companion_state).await?,
+        )?,
+        "companion_launch_pet" => {
+            let request = parse_optional_nested_arg::<
+                crate::services::companion_service::CompanionLaunchPetRequest,
+            >(&args_or_default(args), "request")?
+            .unwrap_or_default();
+            serde_json::to_value(
+                crate::services::companion_service::launch_pet_global(&companion_state, request)
+                    .await?,
+            )?
+        }
+        "companion_send_pet_command" => {
+            let request: crate::services::companion_service::CompanionPetCommandRequest =
+                parse_nested_arg(&args_or_default(args), "request")?;
+            serde_json::to_value(
+                crate::services::companion_service::send_pet_command_global(
+                    &companion_state,
+                    request,
+                )
+                .await?,
+            )?
+        }
+        _ => unreachable!("已通过前置判断过滤 companion 命令"),
+    };
+
+    Ok(Some(result))
+}
diff --git a/src-tauri/src/dev_bridge/dispatcher/models.rs b/src-tauri/src/dev_bridge/dispatcher/models.rs
index eb8395353..b6af514b4 100644
--- a/src-tauri/src/dev_bridge/dispatcher/models.rs
+++ b/src-tauri/src/dev_bridge/dispatcher/models.rs
@@ -4,32 +4,11 @@ use serde_json::Value as JsonValue;
 
 type DynError = Box<dyn std::error::Error>;
 
-fn load_model_registry_provider_ids_from_db(
-    state: &DevBridgeState,
-) -> Result<Vec<String>, DynError> {
-    let Some(db) = &state.db else {
-        return Ok(vec![]);
-    };
-
-    let conn = db.lock().map_err(|e| format!("数据库锁定失败: {e}"))?;
-    let mut stmt = conn.prepare(
-        "SELECT DISTINCT provider_id FROM model_registry WHERE provider_id IS NOT NULL ORDER BY provider_id",
-    )?;
-
-    let rows = stmt.query_map([], |row| row.get::<_, String>(0))?;
-    let mut provider_ids = Vec::new();
-    for row in rows {
-        provider_ids.push(row?);
-    }
-
-    Ok(provider_ids)
-}
-
 pub(super) async fn try_handle(
     state: &DevBridgeState,
     cmd: &str,
 ) -> Result<Option<JsonValue>, DynError> {
-    let result = match cmd {
+    let result: JsonValue = match cmd {
         "get_models" => serde_json::json!({
             "data": [
                 {"id": "claude-sonnet-4-20250514", "object": "model", "owned_by": "anthropic"},
@@ -75,19 +54,7 @@ pub(super) async fn try_handle(
             serde_json::json!(service.force_reload().await?)
         }
         "get_model_registry_provider_ids" => {
-            match load_model_registry_provider_ids_from_resources() {
-                Ok(provider_ids) => serde_json::to_value(provider_ids)?,
-                Err(resource_error) => {
-                    let fallback = load_model_registry_provider_ids_from_db(state)?;
-                    if fallback.is_empty() {
-                        return Err(format!(
-                        "获取模型 Provider ID 失败（resources 与数据库均不可用）: {resource_error}"
-                    )
-                        .into());
-                    }
-                    serde_json::to_value(fallback)?
-                }
-            }
+            serde_json::to_value(load_model_registry_provider_ids_from_resources()?)?
         }
         _ => return Ok(None),
     };
diff --git a/src-tauri/src/services/companion_service.rs b/src-tauri/src/services/companion_service.rs
new file mode 100644
index 000000000..dc3d471e4
--- /dev/null
+++ b/src-tauri/src/services/companion_service.rs
@@ -0,0 +1,782 @@
+use axum::{
+    extract::{
+        ws::{Message, WebSocket, WebSocketUpgrade},
+        State,
+    },
+    response::IntoResponse,
+    routing::get,
+    Router,
+};
+use futures::{SinkExt, StreamExt};
+use serde::{Deserialize, Serialize};
+use serde_json::{Map, Value};
+use std::{path::PathBuf, process::Command, sync::Arc};
+use tauri::{AppHandle, Emitter, Manager};
+use tokio::sync::{mpsc, Mutex, RwLock};
+use uuid::Uuid;
+
+const DEFAULT_COMPANION_HOST: &str = "127.0.0.1";
+const DEFAULT_COMPANION_PORT: u16 = 45554;
+const DEFAULT_COMPANION_PATH: &str = "/companion/pet";
+const DEFAULT_CLIENT_ID: &str = "lime";
+const DEFAULT_PROTOCOL_VERSION: u32 = 1;
+const COMPANION_ENV_APP_PATH: &str = "LIME_PET_APP_PATH";
+#[cfg(target_os = "macos")]
+const MACOS_PET_APP_NAME: &str = "Lime Pet";
+#[cfg(target_os = "windows")]
+const WINDOWS_PET_EXE_NAME: &str = "Lime Pet.exe";
+
+pub const COMPANION_PET_STATUS_EVENT: &str = "companion-pet-status";
+pub const COMPANION_OPEN_PROVIDER_SETTINGS_EVENT: &str = "companion-open-provider-settings";
+
+fn default_companion_endpoint() -> String {
+    format!("ws://{DEFAULT_COMPANION_HOST}:{DEFAULT_COMPANION_PORT}{DEFAULT_COMPANION_PATH}")
+}
+
+fn empty_payload() -> Value {
+    Value::Object(Map::new())
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum CompanionPetVisualState {
+    Hidden,
+    Idle,
+    Walking,
+    Thinking,
+    Done,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CompanionPetStatus {
+    pub endpoint: String,
+    pub server_listening: bool,
+    pub connected: bool,
+    pub client_id: Option<String>,
+    pub platform: Option<String>,
+    pub capabilities: Vec<String>,
+    pub last_event: Option<String>,
+    pub last_error: Option<String>,
+    pub last_state: Option<CompanionPetVisualState>,
+}
+
+impl Default for CompanionPetStatus {
+    fn default() -> Self {
+        Self {
+            endpoint: default_companion_endpoint(),
+            server_listening: false,
+            connected: false,
+            client_id: None,
+            platform: None,
+            capabilities: Vec::new(),
+            last_event: None,
+            last_error: None,
+            last_state: None,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct CompanionLaunchPetRequest {
+    pub app_path: Option<String>,
+    pub endpoint: Option<String>,
+    pub client_id: Option<String>,
+    pub protocol_version: Option<u32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CompanionLaunchPetResult {
+    pub launched: bool,
+    pub resolved_path: Option<String>,
+    pub endpoint: String,
+    pub message: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CompanionPetCommandRequest {
+    pub event: String,
+    #[serde(default = "empty_payload")]
+    pub payload: Value,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CompanionPetSendResult {
+    pub delivered: bool,
+    pub connected: bool,
+}
+
+#[derive(Debug, Clone, Serialize)]
+struct CompanionEnvelope {
+    protocol_version: u32,
+    event: String,
+    payload: Value,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+struct CompanionIncomingEnvelope {
+    protocol_version: u32,
+    event: String,
+    #[serde(default = "empty_payload")]
+    payload: Value,
+}
+
+#[derive(Debug, Clone, Deserialize, Default)]
+struct CompanionReadyPayload {
+    client_id: Option<String>,
+    platform: Option<String>,
+    #[serde(default)]
+    capabilities: Vec<String>,
+}
+
+#[derive(Debug, Clone)]
+struct ActivePetSender {
+    connection_id: String,
+    tx: mpsc::UnboundedSender<String>,
+}
+
+#[derive(Debug, Clone, Default)]
+struct CompanionRuntime {
+    status: CompanionPetStatus,
+    active_connection_id: Option<String>,
+}
+
+#[derive(Clone)]
+struct CompanionRouterState {
+    app_handle: AppHandle,
+    service: CompanionServiceState,
+}
+
+#[derive(Clone)]
+pub struct CompanionServiceState {
+    app_handle: Arc<RwLock<Option<AppHandle>>>,
+    runtime: Arc<RwLock<CompanionRuntime>>,
+    sender: Arc<Mutex<Option<ActivePetSender>>>,
+    start_lock: Arc<Mutex<()>>,
+}
+
+impl Default for CompanionServiceState {
+    fn default() -> Self {
+        Self {
+            app_handle: Arc::new(RwLock::new(None)),
+            runtime: Arc::new(RwLock::new(CompanionRuntime {
+                status: CompanionPetStatus::default(),
+                active_connection_id: None,
+            })),
+            sender: Arc::new(Mutex::new(None)),
+            start_lock: Arc::new(Mutex::new(())),
+        }
+    }
+}
+
+impl CompanionServiceState {
+    pub async fn start(&self, app_handle: AppHandle) -> Result<(), String> {
+        self.set_app_handle(app_handle.clone()).await;
+
+        let _guard = self.start_lock.lock().await;
+        if self.snapshot().await.server_listening {
+            return Ok(());
+        }
+
+        let bind_addr = format!("{DEFAULT_COMPANION_HOST}:{DEFAULT_COMPANION_PORT}");
+        let listener = match tokio::net::TcpListener::bind(&bind_addr).await {
+            Ok(listener) => listener,
+            Err(error) => {
+                self.update_runtime(|runtime| {
+                    runtime.status.server_listening = false;
+                    runtime.status.last_error = Some(format!("Companion 服务监听失败: {error}"));
+                })
+                .await;
+                return Err(format!("Companion 服务监听失败: {error}"));
+            }
+        };
+
+        self.update_runtime(|runtime| {
+            runtime.status.server_listening = true;
+            runtime.status.last_error = None;
+            runtime.status.endpoint = default_companion_endpoint();
+        })
+        .await;
+
+        let service = self.clone();
+        let router = Router::new()
+            .route(DEFAULT_COMPANION_PATH, get(companion_pet_ws))
+            .with_state(CompanionRouterState {
+                app_handle,
+                service: self.clone(),
+            });
+
+        tokio::spawn(async move {
+            if let Err(error) = axum::serve(listener, router).await {
+                tracing::error!("[Companion] 服务运行失败: {}", error);
+                service
+                    .mark_server_stopped(Some(format!("Companion 服务运行失败: {error}")))
+                    .await;
+            }
+        });
+
+        tracing::info!(
+            "[Companion] 已监听桌宠入口: {}",
+            default_companion_endpoint()
+        );
+        Ok(())
+    }
+
+    pub async fn snapshot(&self) -> CompanionPetStatus {
+        self.runtime.read().await.status.clone()
+    }
+
+    pub async fn launch_pet(
+        &self,
+        request: CompanionLaunchPetRequest,
+    ) -> Result<CompanionLaunchPetResult, String> {
+        let endpoint = request
+            .endpoint
+            .filter(|value| !value.trim().is_empty())
+            .unwrap_or_else(default_companion_endpoint);
+        let client_id = request
+            .client_id
+            .filter(|value| !value.trim().is_empty())
+            .unwrap_or_else(|| DEFAULT_CLIENT_ID.to_string());
+        let protocol_version = request.protocol_version.unwrap_or(DEFAULT_PROTOCOL_VERSION);
+
+        let Some(target) = resolve_launch_target(request.app_path.as_deref()) else {
+            return Ok(CompanionLaunchPetResult {
+                launched: false,
+                resolved_path: None,
+                endpoint,
+                message: Some(
+                    "未找到 Lime Pet 可执行产物，请先安装桌宠应用或通过 app_path 显式指定。"
+                        .to_string(),
+                ),
+            });
+        };
+
+        let mut command = Command::new(&target.exec_path);
+        command
+            .arg("--connect")
+            .arg(&endpoint)
+            .arg("--client-id")
+            .arg(&client_id)
+            .arg("--protocol-version")
+            .arg(protocol_version.to_string());
+
+        match command.spawn() {
+            Ok(_) => Ok(CompanionLaunchPetResult {
+                launched: true,
+                resolved_path: Some(target.exec_path.to_string_lossy().to_string()),
+                endpoint,
+                message: None,
+            }),
+            Err(error) => Ok(CompanionLaunchPetResult {
+                launched: false,
+                resolved_path: Some(target.exec_path.to_string_lossy().to_string()),
+                endpoint,
+                message: Some(format!("启动 Lime Pet 失败: {error}")),
+            }),
+        }
+    }
+
+    pub async fn send_pet_command(
+        &self,
+        request: CompanionPetCommandRequest,
+    ) -> Result<CompanionPetSendResult, String> {
+        let payload = CompanionEnvelope {
+            protocol_version: DEFAULT_PROTOCOL_VERSION,
+            event: request.event.clone(),
+            payload: request.payload.clone(),
+        };
+        let serialized = serde_json::to_string(&payload).map_err(|e| e.to_string())?;
+
+        let active_sender = self.sender.lock().await.clone();
+        let Some(active_sender) = active_sender else {
+            return Ok(CompanionPetSendResult {
+                delivered: false,
+                connected: false,
+            });
+        };
+
+        if active_sender.tx.send(serialized).is_err() {
+            self.mark_connection_closed(
+                &active_sender.connection_id,
+                "桌宠连接不可用，命令未送达".to_string(),
+            )
+            .await;
+            return Ok(CompanionPetSendResult {
+                delivered: false,
+                connected: false,
+            });
+        }
+
+        self.record_outbound_command(&request.event, &request.payload)
+            .await;
+
+        Ok(CompanionPetSendResult {
+            delivered: true,
+            connected: true,
+        })
+    }
+
+    async fn set_app_handle(&self, app_handle: AppHandle) {
+        let mut guard = self.app_handle.write().await;
+        *guard = Some(app_handle);
+    }
+
+    async fn emit_status(&self, status: CompanionPetStatus) {
+        let app_handle = self.app_handle.read().await.clone();
+        if let Some(app_handle) = app_handle {
+            if let Err(error) = app_handle.emit(COMPANION_PET_STATUS_EVENT, &status) {
+                tracing::warn!("[Companion] 发送状态事件失败: {}", error);
+            }
+        }
+    }
+
+    async fn update_runtime<F>(&self, mutate: F)
+    where
+        F: FnOnce(&mut CompanionRuntime),
+    {
+        let snapshot = {
+            let mut runtime = self.runtime.write().await;
+            mutate(&mut runtime);
+            runtime.status.clone()
+        };
+        self.emit_status(snapshot).await;
+    }
+
+    async fn mark_server_stopped(&self, reason: Option<String>) {
+        let mut sender = self.sender.lock().await;
+        sender.take();
+        drop(sender);
+
+        self.update_runtime(|runtime| {
+            runtime.status.server_listening = false;
+            runtime.status.connected = false;
+            runtime.status.client_id = None;
+            runtime.status.platform = None;
+            runtime.status.capabilities.clear();
+            runtime.status.last_error = reason;
+            runtime.active_connection_id = None;
+        })
+        .await;
+    }
+
+    async fn attach_sender(&self, connection_id: String, tx: mpsc::UnboundedSender<String>) {
+        let mut guard = self.sender.lock().await;
+        *guard = Some(ActivePetSender { connection_id, tx });
+    }
+
+    async fn mark_connection_open(&self, connection_id: String) {
+        self.update_runtime(|runtime| {
+            runtime.active_connection_id = Some(connection_id);
+            runtime.status.connected = true;
+            runtime.status.client_id = None;
+            runtime.status.platform = None;
+            runtime.status.capabilities.clear();
+            runtime.status.last_event = Some("pet.connected".to_string());
+            runtime.status.last_error = None;
+        })
+        .await;
+    }
+
+    async fn mark_connection_ready(&self, connection_id: &str, payload: CompanionReadyPayload) {
+        self.update_runtime(|runtime| {
+            if runtime.active_connection_id.as_deref() != Some(connection_id) {
+                return;
+            }
+            runtime.status.connected = true;
+            runtime.status.client_id = payload.client_id;
+            runtime.status.platform = payload.platform;
+            runtime.status.capabilities = payload.capabilities;
+            runtime.status.last_event = Some("pet.ready".to_string());
+            runtime.status.last_error = None;
+        })
+        .await;
+    }
+
+    async fn mark_connection_closed(&self, connection_id: &str, reason: String) {
+        {
+            let mut sender = self.sender.lock().await;
+            if sender.as_ref().map(|active| active.connection_id.as_str()) == Some(connection_id) {
+                sender.take();
+            }
+        }
+
+        self.update_runtime(|runtime| {
+            if runtime.active_connection_id.as_deref() != Some(connection_id) {
+                return;
+            }
+            runtime.active_connection_id = None;
+            runtime.status.connected = false;
+            runtime.status.client_id = None;
+            runtime.status.platform = None;
+            runtime.status.capabilities.clear();
+            runtime.status.last_event = Some("pet.disconnected".to_string());
+            runtime.status.last_error = Some(reason);
+        })
+        .await;
+    }
+
+    async fn handle_incoming_message(
+        &self,
+        app_handle: &AppHandle,
+        connection_id: &str,
+        text: &str,
+    ) {
+        let envelope = match serde_json::from_str::<CompanionIncomingEnvelope>(text) {
+            Ok(envelope) => envelope,
+            Err(error) => {
+                tracing::warn!("[Companion] 忽略无法解析的桌宠消息: {}", error);
+                return;
+            }
+        };
+
+        if envelope.protocol_version != DEFAULT_PROTOCOL_VERSION {
+            self.update_runtime(|runtime| {
+                if runtime.active_connection_id.as_deref() != Some(connection_id) {
+                    return;
+                }
+                runtime.status.last_error =
+                    Some(format!("桌宠协议版本不兼容: {}", envelope.protocol_version));
+            })
+            .await;
+            return;
+        }
+
+        let should_focus_main_window = matches!(
+            envelope.event.as_str(),
+            "pet.clicked" | "pet.open_chat" | "pet.open_provider_settings"
+        );
+
+        self.update_runtime(|runtime| {
+            if runtime.active_connection_id.as_deref() != Some(connection_id) {
+                return;
+            }
+            runtime.status.last_event = Some(envelope.event.clone());
+            runtime.status.last_error = None;
+        })
+        .await;
+
+        if envelope.event == "pet.ready" {
+            match serde_json::from_value::<CompanionReadyPayload>(envelope.payload.clone()) {
+                Ok(payload) => {
+                    self.mark_connection_ready(connection_id, payload).await;
+                }
+                Err(error) => {
+                    self.update_runtime(|runtime| {
+                        if runtime.active_connection_id.as_deref() != Some(connection_id) {
+                            return;
+                        }
+                        runtime.status.last_error =
+                            Some(format!("桌宠 ready 负载解析失败: {error}"));
+                    })
+                    .await;
+                }
+            }
+        }
+
+        if should_focus_main_window {
+            reveal_main_window(app_handle);
+        }
+
+        if envelope.event == "pet.open_provider_settings" {
+            if let Err(error) = app_handle.emit(COMPANION_OPEN_PROVIDER_SETTINGS_EVENT, ()) {
+                tracing::warn!("[Companion] 发送服务商设置跳转事件失败: {}", error);
+            }
+        }
+    }
+
+    async fn record_outbound_command(&self, event: &str, payload: &Value) {
+        let event_name = event.to_string();
+        let next_state = match event {
+            "pet.hide" => Some(CompanionPetVisualState::Hidden),
+            "pet.show" => Some(CompanionPetVisualState::Walking),
+            "pet.state_changed" => payload
+                .get("state")
+                .and_then(Value::as_str)
+                .and_then(parse_visual_state),
+            _ => None,
+        };
+
+        self.update_runtime(|runtime| {
+            runtime.status.last_event = Some(event_name);
+            runtime.status.last_error = None;
+            if let Some(next_state) = next_state {
+                runtime.status.last_state = Some(next_state);
+            }
+        })
+        .await;
+    }
+}
+
+fn parse_visual_state(value: &str) -> Option<CompanionPetVisualState> {
+    match value.trim() {
+        "hidden" => Some(CompanionPetVisualState::Hidden),
+        "idle" => Some(CompanionPetVisualState::Idle),
+        "walking" => Some(CompanionPetVisualState::Walking),
+        "thinking" => Some(CompanionPetVisualState::Thinking),
+        "done" => Some(CompanionPetVisualState::Done),
+        _ => None,
+    }
+}
+
+fn reveal_main_window(app_handle: &AppHandle) {
+    let Some(window) = app_handle.get_webview_window("main") else {
+        tracing::warn!("[Companion] 未找到主窗口，无法响应桌宠点击");
+        return;
+    };
+
+    if let Err(error) = window.unminimize() {
+        tracing::warn!("[Companion] 主窗口取消最小化失败: {}", error);
+    }
+    if let Err(error) = window.show() {
+        tracing::warn!("[Companion] 主窗口显示失败: {}", error);
+    }
+    if let Err(error) = window.set_focus() {
+        tracing::warn!("[Companion] 主窗口聚焦失败: {}", error);
+    }
+}
+
+#[derive(Debug)]
+struct LaunchTarget {
+    exec_path: PathBuf,
+}
+
+fn resolve_launch_target(explicit_path: Option<&str>) -> Option<LaunchTarget> {
+    let mut candidates = Vec::new();
+
+    if let Some(explicit_path) = explicit_path
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+    {
+        candidates.push(expand_user_path(explicit_path));
+    }
+
+    if let Ok(env_path) = std::env::var(COMPANION_ENV_APP_PATH) {
+        let env_path = env_path.trim();
+        if !env_path.is_empty() {
+            candidates.push(expand_user_path(env_path));
+        }
+    }
+
+    candidates.extend(default_launch_candidates());
+
+    candidates.into_iter().find_map(normalize_launch_target)
+}
+
+fn expand_user_path(value: &str) -> PathBuf {
+    if value == "~" {
+        return dirs::home_dir().unwrap_or_else(|| PathBuf::from(value));
+    }
+
+    if let Some(suffix) = value.strip_prefix("~/") {
+        if let Some(home_dir) = dirs::home_dir() {
+            return home_dir.join(suffix);
+        }
+    }
+
+    PathBuf::from(value)
+}
+
+#[cfg(target_os = "macos")]
+fn default_launch_candidates() -> Vec<PathBuf> {
+    let mut candidates = Vec::new();
+    if let Some(home_dir) = dirs::home_dir() {
+        candidates.push(home_dir.join("Applications/Lime Pet.app"));
+    }
+    candidates.push(PathBuf::from("/Applications/Lime Pet.app"));
+    candidates
+}
+
+#[cfg(target_os = "windows")]
+fn default_launch_candidates() -> Vec<PathBuf> {
+    let mut candidates = Vec::new();
+    if let Some(local_dir) = dirs::data_local_dir() {
+        candidates.push(
+            local_dir
+                .join("Programs")
+                .join("Lime Pet")
+                .join(WINDOWS_PET_EXE_NAME),
+        );
+    }
+    candidates
+}
+
+#[cfg(not(any(target_os = "macos", target_os = "windows")))]
+fn default_launch_candidates() -> Vec<PathBuf> {
+    Vec::new()
+}
+
+#[cfg(target_os = "macos")]
+fn normalize_launch_target(path: PathBuf) -> Option<LaunchTarget> {
+    if path
+        .extension()
+        .and_then(|value| value.to_str())
+        .is_some_and(|value| value.eq_ignore_ascii_case("app"))
+    {
+        let exec_path = path.join("Contents").join("MacOS").join(MACOS_PET_APP_NAME);
+        return exec_path.exists().then_some(LaunchTarget { exec_path });
+    }
+
+    path.exists().then_some(LaunchTarget { exec_path: path })
+}
+
+#[cfg(target_os = "windows")]
+fn normalize_launch_target(path: PathBuf) -> Option<LaunchTarget> {
+    path.exists().then_some(LaunchTarget { exec_path: path })
+}
+
+#[cfg(not(any(target_os = "macos", target_os = "windows")))]
+fn normalize_launch_target(path: PathBuf) -> Option<LaunchTarget> {
+    path.exists().then_some(LaunchTarget { exec_path: path })
+}
+
+async fn companion_pet_ws(
+    ws: WebSocketUpgrade,
+    State(router_state): State<CompanionRouterState>,
+) -> impl IntoResponse {
+    ws.on_upgrade(move |socket| handle_companion_socket(router_state, socket))
+}
+
+async fn handle_companion_socket(router_state: CompanionRouterState, socket: WebSocket) {
+    let connection_id = Uuid::new_v4().to_string();
+    let (mut writer, mut reader) = socket.split();
+    let (tx, mut rx) = mpsc::unbounded_channel::<String>();
+
+    router_state
+        .service
+        .attach_sender(connection_id.clone(), tx)
+        .await;
+    router_state
+        .service
+        .mark_connection_open(connection_id.clone())
+        .await;
+
+    let writer_service = router_state.service.clone();
+    let writer_connection_id = connection_id.clone();
+    let writer_task = tokio::spawn(async move {
+        while let Some(message) = rx.recv().await {
+            if writer.send(Message::Text(message.into())).await.is_err() {
+                break;
+            }
+        }
+
+        writer_service
+            .mark_connection_closed(&writer_connection_id, "桌宠连接写入通道已关闭".to_string())
+            .await;
+    });
+
+    while let Some(message) = reader.next().await {
+        match message {
+            Ok(Message::Text(text)) => {
+                router_state
+                    .service
+                    .handle_incoming_message(&router_state.app_handle, &connection_id, &text)
+                    .await;
+            }
+            Ok(Message::Binary(_)) => {}
+            Ok(Message::Ping(_)) => {}
+            Ok(Message::Pong(_)) => {}
+            Ok(Message::Close(_)) => {
+                break;
+            }
+            Err(error) => {
+                router_state
+                    .service
+                    .mark_connection_closed(&connection_id, format!("桌宠连接读取失败: {error}"))
+                    .await;
+                writer_task.abort();
+                return;
+            }
+        }
+    }
+
+    writer_task.abort();
+    router_state
+        .service
+        .mark_connection_closed(&connection_id, "桌宠连接已关闭".to_string())
+        .await;
+}
+
+pub async fn get_pet_status_global(
+    state: &CompanionServiceState,
+) -> Result<CompanionPetStatus, String> {
+    Ok(state.snapshot().await)
+}
+
+pub async fn launch_pet_global(
+    state: &CompanionServiceState,
+    request: CompanionLaunchPetRequest,
+) -> Result<CompanionLaunchPetResult, String> {
+    state.launch_pet(request).await
+}
+
+pub async fn send_pet_command_global(
+    state: &CompanionServiceState,
+    request: CompanionPetCommandRequest,
+) -> Result<CompanionPetSendResult, String> {
+    state.send_pet_command(request).await
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+    use tokio::sync::mpsc;
+
+    #[tokio::test]
+    async fn send_pet_command_without_active_sender_returns_not_delivered() {
+        let state = CompanionServiceState::default();
+
+        let result = state
+            .send_pet_command(CompanionPetCommandRequest {
+                event: "pet.provider_overview".to_string(),
+                payload: json!({
+                    "total_provider_count": 2
+                }),
+            })
+            .await
+            .unwrap();
+
+        assert!(!result.delivered);
+        assert!(!result.connected);
+    }
+
+    #[tokio::test]
+    async fn send_pet_command_serializes_envelope_and_updates_visual_state() {
+        let state = CompanionServiceState::default();
+        let (tx, mut rx) = mpsc::unbounded_channel::<String>();
+        let connection_id = "conn-1".to_string();
+
+        state.attach_sender(connection_id.clone(), tx).await;
+        state.mark_connection_open(connection_id).await;
+
+        let result = state
+            .send_pet_command(CompanionPetCommandRequest {
+                event: "pet.state_changed".to_string(),
+                payload: json!({
+                    "state": "thinking",
+                    "total_provider_count": 3
+                }),
+            })
+            .await
+            .unwrap();
+
+        assert!(result.delivered);
+        assert!(result.connected);
+
+        let outbound = rx.recv().await.expect("应收到发送给桌宠的消息");
+        let envelope: serde_json::Value = serde_json::from_str(&outbound).expect("应输出合法 JSON");
+
+        assert_eq!(
+            envelope["protocol_version"],
+            json!(DEFAULT_PROTOCOL_VERSION)
+        );
+        assert_eq!(envelope["event"], json!("pet.state_changed"));
+        assert_eq!(envelope["payload"]["state"], json!("thinking"));
+        assert_eq!(envelope["payload"]["total_provider_count"], json!(3));
+
+        let snapshot = state.snapshot().await;
+        assert_eq!(snapshot.last_event.as_deref(), Some("pet.state_changed"));
+        assert_eq!(snapshot.last_state, Some(CompanionPetVisualState::Thinking));
+        assert!(snapshot.connected);
+    }
+}
diff --git a/src-tauri/src/services/mod.rs b/src-tauri/src/services/mod.rs
index 7ded91dd7..264313057 100644
--- a/src-tauri/src/services/mod.rs
+++ b/src-tauri/src/services/mod.rs
@@ -20,6 +20,7 @@ pub mod browser_profile_service;
 pub mod browser_runtime_window;
 pub mod chat_history_service;
 pub mod claw_solution_service;
+pub mod companion_service;
 pub mod conversation_statistics_service;
 pub mod environment_service;
 pub mod execution_tracker_service;
diff --git a/src-tauri/src/skills/default_skills.rs b/src-tauri/src/skills/default_skills.rs
index 514b55f88..24d8e1978 100644
--- a/src-tauri/src/skills/default_skills.rs
+++ b/src-tauri/src/skills/default_skills.rs
@@ -42,6 +42,7 @@ const SITE_SEARCH_SKILL_CONTENT: &str =
 const SITE_SEARCH_ADAPTER_CATALOG_CONTENT: &str =
     include_str!("../../resources/default-skills/site_search/references/adapter-catalog.md");
 
+#[cfg(test)]
 const BUNDLED_SITE_ADAPTER_INDEX_CONTENT: &str =
     include_str!("../../resources/site-adapters/bundled/index.json");
 
diff --git a/src-tauri/tauri.conf.headless.json b/src-tauri/tauri.conf.headless.json
index 9694f1bb4..9b10320b4 100644
--- a/src-tauri/tauri.conf.headless.json
+++ b/src-tauri/tauri.conf.headless.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Lime",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "identifier": "com.lime.app",
   "build": {
     "beforeDevCommand": "npm run dev:web-bridge",
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 532bac66d..e67064347 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Lime",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "identifier": "com.lime.app",
   "build": {
     "beforeDevCommand": "npm run dev",
diff --git a/src/App.tsx b/src/App.tsx
index de3f59a99..fe9b80250 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -34,6 +34,7 @@ import { useSiteAdapterCatalogBootstrap } from "./hooks/useSiteAdapterCatalogBoo
 import { useAppNavigation } from "./hooks/useAppNavigation";
 import { useAppShellLayout } from "./hooks/useAppShellLayout";
 import { useAppStartupEffects } from "./hooks/useAppStartupEffects";
+import { useCompanionProviderBridge } from "./hooks/useCompanionProviderBridge";
 import { useGlobalTrayModelSync } from "./hooks/useGlobalTrayModelSync";
 import { useOemLimeHubProviderSync } from "./hooks/useOemLimeHubProviderSync";
 import { ComponentDebugProvider } from "./contexts/ComponentDebugContext";
@@ -121,6 +122,9 @@ function AppContent() {
     currentPage,
     pageParams,
   });
+  useCompanionProviderBridge({
+    onNavigate: handleNavigate,
+  });
 
   const _handleRequestRecommendation = useCallback(
     (shortLabel: string, fullPrompt: string, currentTheme: string) => {
diff --git a/src/components/agent/chat/AgentChatHomeShell.test.tsx b/src/components/agent/chat/AgentChatHomeShell.test.tsx
index 6ec4a2acb..28ed4c110 100644
--- a/src/components/agent/chat/AgentChatHomeShell.test.tsx
+++ b/src/components/agent/chat/AgentChatHomeShell.test.tsx
@@ -48,6 +48,20 @@ const {
   mockServiceSkills,
 } = vi.hoisted(() => {
   const mockClawSolutions = [
+    {
+      id: "web-research-brief",
+      title: "网页研究简报",
+      summary: "快速整理研究目标、关键来源与结论框架。",
+      outputHint: "研究提纲 + 结论简报",
+      recommendedCapabilities: ["模型", "研究"],
+      readiness: "ready",
+      readinessMessage: "可直接开始",
+      badge: "研究方案",
+      recentUsedAt: null,
+      isRecent: false,
+      readinessLabel: "可直接开始",
+      readinessTone: "emerald",
+    },
     {
       id: "social-post-starter",
       title: "社媒主稿生成",
@@ -878,7 +892,8 @@ beforeEach(() => {
     domain: "github.com",
     profile_key: "attached-github",
     target_id: "tab-github",
-    message: "已检测到 github.com 的真实浏览器页面，Claw 可以直接复用当前会话执行。",
+    message:
+      "已检测到 github.com 的真实浏览器页面，Claw 可以直接复用当前会话执行。",
   });
   mockIsTerminalServiceSkillRunStatus.mockImplementation((status: string) =>
     ["success", "failed", "canceled", "timeout"].includes(status),
@@ -1110,6 +1125,61 @@ describe("AgentChatHomeShell", () => {
     );
   });
 
+  it("点击网页研究简报时应开启联网研究偏好并进入工作区", async () => {
+    const onEnterWorkspace = vi.fn();
+    mockPrepareClawSolution.mockResolvedValueOnce({
+      solutionId: "web-research-brief",
+      actionType: "fill_input",
+      prompt: "请围绕这个主题先给我做一版网页研究简报",
+      shouldLaunchBrowserAssist: false,
+      shouldEnableTeamMode: false,
+      readiness: "ready",
+      readinessMessage: "可直接开始",
+    });
+
+    const { container } = renderShell({
+      onNavigate: undefined,
+      onEnterWorkspace,
+    });
+
+    await flushEffects();
+
+    const researchSolutionButton = container.querySelector(
+      '[data-testid="home-shell-solution-web-research-brief"]',
+    ) as HTMLButtonElement | null;
+
+    expect(researchSolutionButton).toBeTruthy();
+
+    act(() => {
+      researchSolutionButton?.click();
+    });
+
+    await flushEffects();
+
+    expect(mockSaveChatToolPreferences).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        webSearch: true,
+        thinking: false,
+        task: false,
+        subagent: false,
+      }),
+      "general",
+    );
+    expect(onEnterWorkspace).toHaveBeenCalledWith(
+      expect.objectContaining({
+        projectId: "project-1",
+        theme: "general",
+        initialCreationMode: "guided",
+        initialUserPrompt: "请围绕这个主题先给我做一版网页研究简报",
+      }),
+    );
+    expect(mockRecordClawSolutionUsage).toHaveBeenCalledWith({
+      solutionId: "web-research-brief",
+      actionType: "fill_input",
+      themeTarget: null,
+    });
+  });
+
   it("最近 session runtime 的工具偏好应先回灌首页壳，再参与 team 推荐", async () => {
     mockHomeShellRecentExecutionRuntime.current = {
       recent_preferences: {
@@ -1228,7 +1298,9 @@ describe("AgentChatHomeShell", () => {
 
     const snapshot = readTeamMemorySnapshot(localStorage, "/tmp/project-1");
     expect(
-      snapshot?.entries["team.selection"]?.content.includes("Team：首页协作团队"),
+      snapshot?.entries["team.selection"]?.content.includes(
+        "Team：首页协作团队",
+      ),
     ).toBe(true);
     expect(
       container.querySelector('[data-testid="home-shell-selected-team"]')
@@ -1282,9 +1354,8 @@ describe("AgentChatHomeShell", () => {
           harness: expect.objectContaining({
             selected_team_label: "研究协作团队",
             selected_team_source: "custom",
-            selected_team_summary: expect.stringContaining(
-              "负责调研、归纳与验证。",
-            ),
+            selected_team_summary:
+              expect.stringContaining("负责调研、归纳与验证。"),
           }),
         },
       }),
@@ -1602,8 +1673,7 @@ describe("AgentChatHomeShell", () => {
             workbench_surface: "right_panel",
           },
         },
-        initialUserPrompt:
-          expect.stringContaining("[技能任务] 复制短视频脚本"),
+        initialUserPrompt: expect.stringContaining("[技能任务] 复制短视频脚本"),
       }),
     );
     expect(onEnterWorkspace).toHaveBeenCalledWith(
@@ -1696,14 +1766,14 @@ describe("AgentChatHomeShell", () => {
         theme: "general",
         initialCreationMode: "guided",
         autoRunInitialPromptOnMount: true,
-        initialUserPrompt: "你帮我在 GitHub 找一下和“browser assist mcp”相关的项目。",
+        initialUserPrompt:
+          "你帮我在 GitHub 找一下和“browser assist mcp”相关的项目。",
         initialRequestMetadata: undefined,
         initialAutoSendRequestMetadata: {
           harness: {
             browser_requirement: "required",
-            browser_requirement_reason: expect.stringContaining(
-              "真实浏览器页面",
-            ),
+            browser_requirement_reason:
+              expect.stringContaining("真实浏览器页面"),
             browser_assist: {
               enabled: true,
               profile_key: "attached-github",
@@ -1739,9 +1809,9 @@ describe("AgentChatHomeShell", () => {
     expect(firstSiteSkillLaunchPayload?.initialUserPrompt).not.toContain(
       "adapter_name",
     );
-    expect(firstSiteSkillLaunchPayload?.initialAutoSendRequestMetadata).not.toHaveProperty(
-      "artifact",
-    );
+    expect(
+      firstSiteSkillLaunchPayload?.initialAutoSendRequestMetadata,
+    ).not.toHaveProperty("artifact");
     expect(onEnterWorkspace).not.toHaveBeenCalled();
     expect(mockRecordServiceSkillUsage).toHaveBeenCalledWith({
       skillId: "github-repo-radar",
@@ -1835,10 +1905,7 @@ describe("AgentChatHomeShell", () => {
 
     await flushEffects();
 
-    expect(onNavigate).not.toHaveBeenCalledWith(
-      "agent",
-      expect.anything(),
-    );
+    expect(onNavigate).not.toHaveBeenCalledWith("agent", expect.anything());
     expect(onEnterWorkspace).not.toHaveBeenCalled();
     expect(mockToastInfo).toHaveBeenCalledWith(
       expect.stringContaining("请先去浏览器工作台连接真实浏览器"),
diff --git a/src/components/agent/chat/AgentChatWorkspace.tsx b/src/components/agent/chat/AgentChatWorkspace.tsx
index 5ff45cc11..8e6946856 100644
--- a/src/components/agent/chat/AgentChatWorkspace.tsx
+++ b/src/components/agent/chat/AgentChatWorkspace.tsx
@@ -1142,6 +1142,9 @@ export function AgentChatWorkspace({
     }),
     [syncSessionRecentTeamSelection],
   );
+  const shouldAllowPersistedTeamFallback =
+    !persistedTeamMemoryShadowSnapshot &&
+    !executionRuntime?.recent_team_selection;
 
   const {
     selectedTeam,
@@ -1154,7 +1157,7 @@ export function AgentChatWorkspace({
     runtimeSelection: executionRuntime?.recent_team_selection ?? null,
     shadowSnapshot: persistedTeamMemoryShadowSnapshot,
     sessionSync: selectedTeamSessionSync,
-    allowPersistedThemeFallback: !projectId,
+    allowPersistedThemeFallback: shouldAllowPersistedTeamFallback,
   });
   const teamMemoryShadowSnapshot = useTeamMemoryShadowSync({
     repoScope: project?.rootPath || null,
@@ -2130,6 +2133,7 @@ export function AgentChatWorkspace({
     handleRecommendationClick,
     handleSendRef,
     webSearchPreferenceRef,
+    submissionPreview,
   } = useWorkspaceSendActions({
     input,
     setInput,
@@ -2276,6 +2280,7 @@ export function AgentChatWorkspace({
     pendingActionCount: pendingActions.length,
     queuedTurnCount: queuedTurns.length,
     runtimeTeamDispatchPreview,
+    submissionPreview,
     sessionId,
     updateTopicSnapshot,
     workspaceError: Boolean(workspacePathMissing || workspaceHealthError),
diff --git a/src/components/agent/chat/claw-solutions/actionDispatcher.test.ts b/src/components/agent/chat/claw-solutions/actionDispatcher.test.ts
index f9ac59ca1..e3d6b1442 100644
--- a/src/components/agent/chat/claw-solutions/actionDispatcher.test.ts
+++ b/src/components/agent/chat/claw-solutions/actionDispatcher.test.ts
@@ -70,6 +70,45 @@ describe("claw solution action dispatcher", () => {
     });
   });
 
+  it("网页研究简报应在进入工作区前开启联网研究偏好", () => {
+    const preparation: ClawSolutionPreparation = {
+      solutionId: "web-research-brief",
+      actionType: "fill_input",
+      prompt: "请围绕这个主题先给我做一版网页研究简报",
+      shouldLaunchBrowserAssist: false,
+      shouldEnableTeamMode: false,
+      readiness: "ready",
+      readinessMessage: "可直接开始",
+    };
+
+    expect(resolveClawSolutionLaunch(preparation, defaultPreferences)).toEqual({
+      nextToolPreferences: {
+        webSearch: true,
+        thinking: false,
+        task: false,
+        subagent: false,
+      },
+      preferencesChanged: true,
+      shouldStartBrowserAssistLoading: false,
+      enterWorkspacePayload: {
+        prompt: "请围绕这个主题先给我做一版网页研究简报",
+        openBrowserAssistOnMount: false,
+        toolPreferences: {
+          webSearch: true,
+          thinking: false,
+          task: false,
+          subagent: false,
+        },
+        themeOverride: undefined,
+      },
+      usageRecord: {
+        solutionId: "web-research-brief",
+        actionType: "fill_input",
+        themeTarget: null,
+      },
+    });
+  });
+
   it("应把多代理方案转换为开启 team 模式的载荷", () => {
     const preparation: ClawSolutionPreparation = {
       solutionId: "team-breakdown",
@@ -110,9 +149,9 @@ describe("claw solution action dispatcher", () => {
   });
 
   it("应把未就绪方案映射到对应配置入口", () => {
-    expect(
-      resolveClawSolutionSetupTarget("needs_setup", "missing_model"),
-    ).toBe(SettingsTabs.Providers);
+    expect(resolveClawSolutionSetupTarget("needs_setup", "missing_model")).toBe(
+      SettingsTabs.Providers,
+    );
     expect(
       resolveClawSolutionSetupTarget(
         "needs_capability",
diff --git a/src/components/agent/chat/claw-solutions/actionDispatcher.ts b/src/components/agent/chat/claw-solutions/actionDispatcher.ts
index 43ee7e5d5..478aa099c 100644
--- a/src/components/agent/chat/claw-solutions/actionDispatcher.ts
+++ b/src/components/agent/chat/claw-solutions/actionDispatcher.ts
@@ -65,16 +65,56 @@ export function enableSubagentPreference(preferences: ChatToolPreferences): {
   };
 }
 
+function applyClawSolutionPreferencePreset(
+  preferences: ChatToolPreferences,
+  preset: Partial<ChatToolPreferences>,
+): {
+  nextToolPreferences: ChatToolPreferences;
+  changed: boolean;
+} {
+  let changed = false;
+  const nextPreferences = { ...preferences };
+
+  for (const [key, value] of Object.entries(preset) as Array<
+    [keyof ChatToolPreferences, boolean | undefined]
+  >) {
+    if (!value || nextPreferences[key]) {
+      continue;
+    }
+    nextPreferences[key] = true;
+    changed = true;
+  }
+
+  return {
+    nextToolPreferences: changed ? nextPreferences : preferences,
+    changed,
+  };
+}
+
+function resolveClawSolutionPreferencePreset(
+  preparation: ClawSolutionPreparation,
+): Partial<ChatToolPreferences> {
+  const preset: Partial<ChatToolPreferences> = {};
+
+  if (preparation.solutionId === "web-research-brief") {
+    preset.webSearch = true;
+  }
+
+  if (preparation.shouldEnableTeamMode) {
+    preset.subagent = true;
+  }
+
+  return preset;
+}
+
 export function resolveClawSolutionLaunch(
   preparation: ClawSolutionPreparation,
   currentToolPreferences: ChatToolPreferences,
 ): ResolvedClawSolutionLaunch {
-  const { nextToolPreferences, changed } = preparation.shouldEnableTeamMode
-    ? enableSubagentPreference(currentToolPreferences)
-    : {
-        nextToolPreferences: currentToolPreferences,
-        changed: false,
-      };
+  const { nextToolPreferences, changed } = applyClawSolutionPreferencePreset(
+    currentToolPreferences,
+    resolveClawSolutionPreferencePreset(preparation),
+  );
 
   return {
     nextToolPreferences,
diff --git a/src/components/agent/chat/components/EmptyStateComposerPanel.test.tsx b/src/components/agent/chat/components/EmptyStateComposerPanel.test.tsx
index f2b382d0d..eb450fc08 100644
--- a/src/components/agent/chat/components/EmptyStateComposerPanel.test.tsx
+++ b/src/components/agent/chat/components/EmptyStateComposerPanel.test.tsx
@@ -7,10 +7,6 @@ import {
   createSkillSelectionProps,
   type SkillSelectionProps,
 } from "./Inputbar/components/skillSelectionBindings";
-import {
-  resetStableProcessingNoticeMemoryForTest,
-  STABLE_PROCESSING_NOTICE_AUTO_HIDE_MS,
-} from "../hooks/useStableProcessingNotice";
 
 vi.mock("./ChatModelSelector", () => ({
   ChatModelSelector: () => <div data-testid="empty-state-model-selector" />,
@@ -115,7 +111,6 @@ afterEach(() => {
     mounted.container.remove();
   }
   vi.useRealTimers();
-  resetStableProcessingNoticeMemoryForTest();
   vi.clearAllMocks();
 });
 
@@ -482,41 +477,18 @@ describe("EmptyStateComposerPanel", () => {
     ).toBeTruthy();
   });
 
-  it("命中稳妥模式模型时应短暂提示后自动收起且不再重复提醒", () => {
-    vi.useFakeTimers();
+  it("命中稳妥模式模型时不应再展示额外横幅", () => {
     const container = renderPanel({
       providerType: "openai",
       model: "glm-4.7",
     });
 
-    expect(
-      container.querySelector(
-        '[data-testid="empty-state-stable-processing-notice"]',
-      ),
-    ).toBeTruthy();
-    expect(container.textContent).toContain("稳妥模式");
-    expect(container.textContent).toContain("依次开始同类请求");
-
-    act(() => {
-      vi.advanceTimersByTime(STABLE_PROCESSING_NOTICE_AUTO_HIDE_MS + 1);
-    });
-
     expect(
       container.querySelector(
         '[data-testid="empty-state-stable-processing-notice"]',
       ),
     ).toBeNull();
-
-    const nextContainer = renderPanel({
-      providerType: "openai",
-      model: "glm-4.7",
-    });
-
-    expect(
-      nextContainer.querySelector(
-        '[data-testid="empty-state-stable-processing-notice"]',
-      ),
-    ).toBeNull();
+    expect(container.textContent).not.toContain("稳妥模式");
   });
 
   it("点击多代理图标后应自动透传 Team 配置面板打开令牌", async () => {
diff --git a/src/components/agent/chat/components/EmptyStateComposerPanel.tsx b/src/components/agent/chat/components/EmptyStateComposerPanel.tsx
index 2ad809ba6..74f4553ec 100644
--- a/src/components/agent/chat/components/EmptyStateComposerPanel.tsx
+++ b/src/components/agent/chat/components/EmptyStateComposerPanel.tsx
@@ -22,7 +22,6 @@ import { InputbarModelExtra } from "./Inputbar/components/InputbarModelExtra";
 import { SkillBadge } from "./Inputbar/components/SkillBadge";
 import { SkillSelector } from "./Inputbar/components/SkillSelector";
 import { TeamSelector } from "./Inputbar/components/TeamSelector";
-import { StableProcessingNotice } from "./StableProcessingNotice";
 import type { WorkspaceSettings } from "@/types/workspace";
 import { CREATION_MODE_CONFIG } from "./constants";
 import type {
@@ -47,7 +46,6 @@ import {
 } from "./emptyStateSurfaceTokens";
 import type { ModelSelectorProps } from "@/components/input-kit";
 import { getTeamSuggestion } from "../utils/teamSuggestion";
-import { useStableProcessingNotice } from "../hooks/useStableProcessingNotice";
 import {
   buildSkillSelectionBindings,
   type SkillSelectionProps,
@@ -247,10 +245,6 @@ export function EmptyStateComposerPanel({
   const [teamSelectorAutoOpenToken, setTeamSelectorAutoOpenToken] = useState<
     number | null
   >(null);
-  const shouldShowStableNotice = useStableProcessingNotice({
-    providerType,
-    model,
-  });
   const activeSkill = skillSelection.activeSkill ?? null;
   const clearActiveSkill = skillSelection.onClearSkill;
   const { mentionProps: mentionSkillProps, selectorProps: skillSelectorProps } =
@@ -315,8 +309,7 @@ export function EmptyStateComposerPanel({
   const topExtra =
     isEntryTheme ||
     Boolean(activeSkill) ||
-    shouldShowTeamSuggestion ||
-    shouldShowStableNotice ? (
+    shouldShowTeamSuggestion ? (
       <>
         {isEntryTheme ? (
           <EntryTaskContainer>
@@ -388,14 +381,6 @@ export function EmptyStateComposerPanel({
             onContinueSingleAgent={handleContinueSingleAgent}
           />
         ) : null}
-
-        {shouldShowStableNotice ? (
-          <StableProcessingNotice
-            scope={subagentEnabled ? "team" : "request"}
-            className="mx-3 mb-2"
-            testId="empty-state-stable-processing-notice"
-          />
-        ) : null}
       </>
     ) : undefined;
 
diff --git a/src/components/agent/chat/components/Inputbar/components/InputbarComposerSection.tsx b/src/components/agent/chat/components/Inputbar/components/InputbarComposerSection.tsx
index 2127cc35e..7a2125dda 100644
--- a/src/components/agent/chat/components/Inputbar/components/InputbarComposerSection.tsx
+++ b/src/components/agent/chat/components/Inputbar/components/InputbarComposerSection.tsx
@@ -16,11 +16,9 @@ import { InputbarModelExtra } from "./InputbarModelExtra";
 import { InputbarVisionCapabilityNotice } from "./InputbarVisionCapabilityNotice";
 import { InputbarExecutionStrategySelect } from "./InputbarExecutionStrategySelect";
 import { InputbarAccessModeSelect } from "./InputbarAccessModeSelect";
-import { StableProcessingNotice } from "../../StableProcessingNotice";
 import { isGeneralResearchTheme } from "../../../utils/generalAgentPrompt";
 import type { TeamDefinition } from "../../../utils/teamDefinitions";
 import type { WorkspaceSettings } from "@/types/workspace";
-import { useStableProcessingNotice } from "../../../hooks/useStableProcessingNotice";
 import {
   buildSkillSelectionBindings,
   type SkillSelectionProps,
@@ -130,27 +128,14 @@ export const InputbarComposerSection: React.FC<
     buildSkillSelectionBindings(skillSelection);
   const resolvedProviderType = inputAdapter.model?.providerType;
   const resolvedModel = inputAdapter.model?.model;
-  const shouldShowStableNotice = useStableProcessingNotice({
-    providerType: resolvedProviderType,
-    model: resolvedModel,
-  });
-  const showStableNotice =
-    !isThemeWorkbenchVariant && shouldShowStableNotice;
   const shouldShowVisionNotice =
     currentPendingImages.length > 0 &&
     Boolean(resolvedProviderType?.trim()) &&
     Boolean(resolvedModel?.trim());
   const resolvedTopExtra =
-    topExtra || showStableNotice || shouldShowVisionNotice ? (
+    topExtra || shouldShowVisionNotice ? (
       <>
         {topExtra}
-        {showStableNotice ? (
-          <StableProcessingNotice
-            scope={activeTools["subagent_mode"] ? "team" : "request"}
-            className="mx-3 mb-2"
-            testId="inputbar-stable-processing-notice"
-          />
-        ) : null}
         {shouldShowVisionNotice ? (
           <InputbarVisionCapabilityNotice
             providerType={resolvedProviderType}
diff --git a/src/components/agent/chat/components/Inputbar/components/InputbarVisionCapabilityNotice.test.tsx b/src/components/agent/chat/components/Inputbar/components/InputbarVisionCapabilityNotice.test.tsx
index 6c2360fe7..cc3a15e9a 100644
--- a/src/components/agent/chat/components/Inputbar/components/InputbarVisionCapabilityNotice.test.tsx
+++ b/src/components/agent/chat/components/Inputbar/components/InputbarVisionCapabilityNotice.test.tsx
@@ -36,6 +36,8 @@ beforeEach(() => {
         label: "OpenAI",
         registryId: "openai",
         type: "openai",
+        providerId: "openai",
+        apiHost: "https://api.openai.com/v1",
       },
     ],
     loading: false,
@@ -87,6 +89,20 @@ function renderNotice(
 }
 
 describe("InputbarVisionCapabilityNotice", () => {
+  it("受管 API Key Provider 应按真实模型目录检查多模态能力", () => {
+    renderNotice();
+
+    expect(mockUseProviderModels).toHaveBeenCalledWith(
+      expect.objectContaining({ key: "openai" }),
+      expect.objectContaining({
+        returnFullMetadata: true,
+        autoLoad: true,
+        liveFetchOnly: true,
+        hasApiKey: true,
+      }),
+    );
+  });
+
   it("当前模型支持多模态时不应展示提示", () => {
     const container = renderNotice();
 
diff --git a/src/components/agent/chat/components/Inputbar/components/InputbarVisionCapabilityNotice.tsx b/src/components/agent/chat/components/Inputbar/components/InputbarVisionCapabilityNotice.tsx
index 9fca52b68..8ab921ab5 100644
--- a/src/components/agent/chat/components/Inputbar/components/InputbarVisionCapabilityNotice.tsx
+++ b/src/components/agent/chat/components/Inputbar/components/InputbarVisionCapabilityNotice.tsx
@@ -3,6 +3,7 @@ import { AlertCircle } from "lucide-react";
 import { useConfiguredProviders } from "@/hooks/useConfiguredProviders";
 import { useProviderModels } from "@/hooks/useProviderModels";
 import { resolveVisionModel } from "@/lib/model/visionModelResolver";
+import { resolveProviderModelLoadOptions } from "@/lib/model/providerModelLoadOptions";
 
 interface InputbarVisionCapabilityNoticeProps {
   providerType?: string;
@@ -26,12 +27,22 @@ export const InputbarVisionCapabilityNotice: React.FC<
     () => providers.find((item) => item.key === providerType),
     [providerType, providers],
   );
+  const providerModelLoadOptions = useMemo(
+    () =>
+      resolveProviderModelLoadOptions({
+        providerId: selectedProvider?.providerId,
+        providerType: selectedProvider?.type,
+        apiHost: selectedProvider?.apiHost,
+      }),
+    [selectedProvider?.apiHost, selectedProvider?.providerId, selectedProvider?.type],
+  );
 
   const { models, loading: modelsLoading } = useProviderModels(
     selectedProvider,
     {
       returnFullMetadata: true,
       autoLoad: shouldInspectCapability && Boolean(selectedProvider),
+      ...providerModelLoadOptions,
     },
   );
 
diff --git a/src/components/agent/chat/components/Inputbar/components/TeamSelectorPanel.test.tsx b/src/components/agent/chat/components/Inputbar/components/TeamSelectorPanel.test.tsx
index 424dccb0d..05a63161c 100644
--- a/src/components/agent/chat/components/Inputbar/components/TeamSelectorPanel.test.tsx
+++ b/src/components/agent/chat/components/Inputbar/components/TeamSelectorPanel.test.tsx
@@ -3,10 +3,6 @@ import { createRoot, type Root } from "react-dom/client";
 import type { WorkspaceSettings } from "@/types/workspace";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { TeamSelectorPanel } from "./TeamSelectorPanel";
-import {
-  resetStableProcessingNoticeMemoryForTest,
-  STABLE_PROCESSING_NOTICE_AUTO_HIDE_MS,
-} from "../../../hooks/useStableProcessingNotice";
 import {
   createTeamDefinitionFromPreset,
   type TeamDefinition,
@@ -96,7 +92,6 @@ describe("TeamSelectorPanel", () => {
     }
     localStorage.clear();
     vi.useRealTimers();
-    resetStableProcessingNoticeMemoryForTest();
     vi.clearAllMocks();
   });
 
@@ -222,8 +217,7 @@ describe("TeamSelectorPanel", () => {
     expect(mockToast.success).toHaveBeenCalled();
   });
 
-  it("命中稳妥模式模型时应短暂提示 Team 会依次开始后自动收起", async () => {
-    vi.useFakeTimers();
+  it("命中稳妥模式模型时不应再展示 Team 横幅提示", async () => {
     const { container } = renderPanel({
       providerType: "openai",
       model: "glm-4.7",
@@ -231,34 +225,11 @@ describe("TeamSelectorPanel", () => {
 
     await flushEffects();
 
-    expect(
-      container.querySelector(
-        '[data-testid="team-selector-stable-processing-notice"]',
-      ),
-    ).toBeTruthy();
-    expect(container.textContent).toContain("稳妥模式");
-    expect(container.textContent).toContain("协作成员");
-    expect(container.textContent).toContain("依次开始");
-
-    act(() => {
-      vi.advanceTimersByTime(STABLE_PROCESSING_NOTICE_AUTO_HIDE_MS + 1);
-    });
-
     expect(
       container.querySelector(
         '[data-testid="team-selector-stable-processing-notice"]',
       ),
     ).toBeNull();
-
-    const nextRender = renderPanel({
-      providerType: "openai",
-      model: "glm-4.7",
-    });
-
-    expect(
-      nextRender.container.querySelector(
-        '[data-testid="team-selector-stable-processing-notice"]',
-      ),
-    ).toBeNull();
+    expect(container.textContent).not.toContain("稳妥模式");
   });
 });
diff --git a/src/components/agent/chat/components/Inputbar/components/TeamSelectorPanel.tsx b/src/components/agent/chat/components/Inputbar/components/TeamSelectorPanel.tsx
index 3c6e9c71b..7af466efc 100644
--- a/src/components/agent/chat/components/Inputbar/components/TeamSelectorPanel.tsx
+++ b/src/components/agent/chat/components/Inputbar/components/TeamSelectorPanel.tsx
@@ -17,8 +17,6 @@ import { Textarea } from "@/components/ui/textarea";
 import { cn } from "@/lib/utils";
 import type { WorkspaceSettings } from "@/types/workspace";
 import { toast } from "sonner";
-import { StableProcessingNotice } from "../../StableProcessingNotice";
-import { useStableProcessingNotice } from "../../../hooks/useStableProcessingNotice";
 import {
   BUILTIN_TEAM_PROFILE_OPTIONS,
   BUILTIN_TEAM_SKILL_OPTIONS,
@@ -301,8 +299,8 @@ export const TeamSelectorPanel: React.FC<TeamSelectorPanelProps> = ({
   activeTheme,
   input,
   workspaceId: _workspaceId,
-  providerType,
-  model,
+  providerType: _providerType,
+  model: _model,
   executionStrategy: _executionStrategy,
   selectedTeam = null,
   onSelectTeam,
@@ -317,10 +315,6 @@ export const TeamSelectorPanel: React.FC<TeamSelectorPanelProps> = ({
   const isProjectScopedCustomTeam = Boolean(
     workspaceSettings && onPersistCustomTeams,
   );
-  const shouldShowStableNotice = useStableProcessingNotice({
-    providerType,
-    model,
-  });
 
   useEffect(() => {
     setCustomTeams(resolveCustomTeams(workspaceSettings));
@@ -1032,13 +1026,6 @@ export const TeamSelectorPanel: React.FC<TeamSelectorPanelProps> = ({
             </button>
           ) : null}
         </div>
-        {shouldShowStableNotice ? (
-          <StableProcessingNotice
-            scope="team"
-            className="mt-3"
-            testId="team-selector-stable-processing-notice"
-          />
-        ) : null}
         {selectedTeam ? (
           <div
             className="mt-3 rounded-2xl border border-slate-200 bg-slate-50 px-3 py-2.5"
diff --git a/src/components/agent/chat/utils/clawWorkspaceProviderSelection.test.ts b/src/components/agent/chat/utils/clawWorkspaceProviderSelection.test.ts
index ed7ed4159..a2f944235 100644
--- a/src/components/agent/chat/utils/clawWorkspaceProviderSelection.test.ts
+++ b/src/components/agent/chat/utils/clawWorkspaceProviderSelection.test.ts
@@ -133,7 +133,10 @@ describe("resolveClawWorkspaceProviderSelection", () => {
 
   it("本地注册表无模型时应回退到后端 provider API 结果", async () => {
     mockLoadConfiguredProviders.mockResolvedValueOnce([
-      createProvider(),
+      createProvider({
+        providerId: "managed-social-provider",
+        apiHost: "https://api.example.com/v1",
+      }),
     ]);
     mockFetchProviderModelsAuto.mockResolvedValueOnce({
       models: [
@@ -157,7 +160,7 @@ describe("resolveClawWorkspaceProviderSelection", () => {
       model: "social-model-api",
     });
     expect(mockFetchProviderModelsAuto).toHaveBeenCalledWith(
-      "custom-social-provider",
+      "managed-social-provider",
     );
   });
 });
diff --git a/src/components/agent/chat/utils/clawWorkspaceProviderSelection.ts b/src/components/agent/chat/utils/clawWorkspaceProviderSelection.ts
index 83c6b9457..95da58270 100644
--- a/src/components/agent/chat/utils/clawWorkspaceProviderSelection.ts
+++ b/src/components/agent/chat/utils/clawWorkspaceProviderSelection.ts
@@ -2,12 +2,8 @@ import {
   loadConfiguredProviders,
   type ConfiguredProvider,
 } from "@/hooks/useConfiguredProviders";
-import { modelRegistryApi } from "@/lib/api/modelRegistry";
-import {
-  getAliasConfigKey,
-  isAliasProvider,
-} from "@/lib/constants/providerMappings";
-import { buildProviderModelsFromRegistry } from "@/lib/model/providerModelsCatalog";
+import { loadProviderModels } from "@/hooks/useProviderModels";
+import { resolveProviderModelLoadOptions } from "@/lib/model/providerModelLoadOptions";
 import { type EnhancedModelMetadata } from "@/lib/types/modelRegistry";
 import { filterModelsByTheme } from "./modelThemePolicy";
 import { resolveProviderModelCompatibility } from "./providerModelCompatibility";
@@ -88,52 +84,6 @@ function resolvePreferredModelId(
   return candidateModels[0]?.id ?? null;
 }
 
-async function loadProviderModelsForSelection(
-  provider: ConfiguredProvider,
-): Promise<EnhancedModelMetadata[]> {
-  const aliasConfigPromise = isAliasProvider(provider.key)
-    ? modelRegistryApi.getProviderAliasConfig(getAliasConfigKey(provider.key))
-    : Promise.resolve(null);
-  const [registryModels, aliasConfig] = await Promise.all([
-    modelRegistryApi.getModelRegistry(),
-    aliasConfigPromise,
-  ]);
-  const localResult = buildProviderModelsFromRegistry(
-    provider,
-    registryModels,
-    aliasConfig,
-  );
-
-  if (localResult.models.length > 0 || isAliasProvider(provider.key)) {
-    return localResult.models;
-  }
-
-  try {
-    const apiResult = await modelRegistryApi.fetchProviderModelsAuto(provider.key);
-    if (!apiResult.models.length) {
-      return localResult.models;
-    }
-
-    const existingModelIds = new Set(
-      localResult.models.map((model) => normalizeValue(model.id)),
-    );
-
-    return [
-      ...localResult.models,
-      ...apiResult.models.filter((model) => {
-        const normalizedModelId = normalizeValue(model.id);
-        if (existingModelIds.has(normalizedModelId)) {
-          return false;
-        }
-        existingModelIds.add(normalizedModelId);
-        return true;
-      }),
-    ];
-  } catch {
-    return localResult.models;
-  }
-}
-
 export async function resolveClawWorkspaceProviderSelection(
   input: ResolveClawWorkspaceProviderSelectionInput,
 ): Promise<ClawWorkspaceProviderSelection | null> {
@@ -157,7 +107,14 @@ export async function resolveClawWorkspaceProviderSelection(
     : configuredProviders;
 
   for (const provider of orderedProviders) {
-    const providerModels = await loadProviderModelsForSelection(provider);
+    const providerModels = await loadProviderModels(
+      provider,
+      resolveProviderModelLoadOptions({
+        providerId: provider.providerId,
+        providerType: provider.type,
+        apiHost: provider.apiHost,
+      }),
+    );
     const preferredModel = resolvePreferredModelId(
       provider,
       providerModels,
diff --git a/src/components/agent/chat/workspace/submissionPreview.ts b/src/components/agent/chat/workspace/submissionPreview.ts
new file mode 100644
index 000000000..41e64e2c3
--- /dev/null
+++ b/src/components/agent/chat/workspace/submissionPreview.ts
@@ -0,0 +1,66 @@
+import type { AsterExecutionStrategy } from "@/lib/api/agentRuntime";
+import type { Message, MessageImage } from "../types";
+import {
+  buildWaitingAgentRuntimeStatus,
+  formatAgentRuntimeStatusSummary,
+} from "../utils/agentRuntimeStatus";
+
+export interface SubmissionPreviewSnapshot {
+  key: string;
+  prompt: string;
+  images: MessageImage[];
+  createdAt: number;
+  runtimeStatus: NonNullable<Message["runtimeStatus"]>;
+}
+
+interface CreateSubmissionPreviewSnapshotOptions {
+  key: string;
+  prompt: string;
+  images: MessageImage[];
+  executionStrategy: AsterExecutionStrategy;
+  webSearch?: boolean;
+  thinking?: boolean;
+}
+
+export function createSubmissionPreviewSnapshot(
+  options: CreateSubmissionPreviewSnapshotOptions,
+): SubmissionPreviewSnapshot {
+  const { key, prompt, images, executionStrategy, webSearch, thinking } =
+    options;
+
+  return {
+    key,
+    prompt,
+    images,
+    createdAt: Date.now(),
+    runtimeStatus: buildWaitingAgentRuntimeStatus({
+      executionStrategy,
+      webSearch,
+      thinking,
+    }),
+  };
+}
+
+export function buildSubmissionPreviewMessages(
+  snapshot: SubmissionPreviewSnapshot,
+): Message[] {
+  const timestamp = new Date(snapshot.createdAt);
+
+  return [
+    {
+      id: `submission-preview:${snapshot.key}:user`,
+      role: "user",
+      content: snapshot.prompt,
+      images: snapshot.images.length > 0 ? snapshot.images : undefined,
+      timestamp,
+    },
+    {
+      id: `submission-preview:${snapshot.key}:assistant`,
+      role: "assistant",
+      content: formatAgentRuntimeStatusSummary(snapshot.runtimeStatus),
+      timestamp: new Date(timestamp.getTime() + 1),
+      isThinking: true,
+      runtimeStatus: snapshot.runtimeStatus,
+    },
+  ];
+}
diff --git a/src/components/agent/chat/workspace/useWorkspaceDisplayMessagesRuntime.ts b/src/components/agent/chat/workspace/useWorkspaceDisplayMessagesRuntime.ts
index 2aae34954..a4cb5650f 100644
--- a/src/components/agent/chat/workspace/useWorkspaceDisplayMessagesRuntime.ts
+++ b/src/components/agent/chat/workspace/useWorkspaceDisplayMessagesRuntime.ts
@@ -4,6 +4,10 @@ import type { BrowserTaskPreflight } from "../hooks/handleSendTypes";
 import { buildLegacyQuestionnaireA2UI } from "../utils/legacyQuestionnaireA2UI";
 import { buildRuntimeTeamDispatchPreviewMessages } from "./runtimeTeamPreview";
 import type { RuntimeTeamDispatchPreviewSnapshot } from "./runtimeTeamPreview";
+import {
+  buildSubmissionPreviewMessages,
+  type SubmissionPreviewSnapshot,
+} from "./submissionPreview";
 import type { Message } from "../types";
 
 interface UseWorkspaceDisplayMessagesRuntimeParams {
@@ -14,6 +18,7 @@ interface UseWorkspaceDisplayMessagesRuntimeParams {
   pendingActionCount: number;
   queuedTurnCount: number;
   runtimeTeamDispatchPreview: RuntimeTeamDispatchPreviewSnapshot | null;
+  submissionPreview: SubmissionPreviewSnapshot | null;
   sessionId?: string | null;
   updateTopicSnapshot: (
     sessionId: string,
@@ -98,6 +103,7 @@ export function useWorkspaceDisplayMessagesRuntime({
   pendingActionCount,
   queuedTurnCount,
   runtimeTeamDispatchPreview,
+  submissionPreview,
   sessionId,
   updateTopicSnapshot,
   workspaceError,
@@ -107,11 +113,19 @@ export function useWorkspaceDisplayMessagesRuntime({
     const runtimeTeamDispatchPreviewMessages = runtimeTeamDispatchPreview
       ? buildRuntimeTeamDispatchPreviewMessages(runtimeTeamDispatchPreview)
       : [];
+    const submissionPreviewMessages =
+      collapsedMessages.length === 0 && submissionPreview
+        ? buildSubmissionPreviewMessages(submissionPreview)
+        : [];
 
     if (runtimeTeamDispatchPreviewMessages.length > 0) {
       return [...collapsedMessages, ...runtimeTeamDispatchPreviewMessages];
     }
 
+    if (submissionPreviewMessages.length > 0) {
+      return submissionPreviewMessages;
+    }
+
     if (collapsedMessages.length === 0 && browserTaskPreflight) {
       return buildBrowserTaskPreflightPreviewMessages(browserTaskPreflight);
     }
@@ -129,6 +143,7 @@ export function useWorkspaceDisplayMessagesRuntime({
     bootstrapDispatchPreviewMessages,
     messages,
     runtimeTeamDispatchPreview,
+    submissionPreview,
   ]);
 
   useEffect(() => {
diff --git a/src/components/agent/chat/workspace/useWorkspaceSendActions.test.tsx b/src/components/agent/chat/workspace/useWorkspaceSendActions.test.tsx
index fd942b709..4a24e3c95 100644
--- a/src/components/agent/chat/workspace/useWorkspaceSendActions.test.tsx
+++ b/src/components/agent/chat/workspace/useWorkspaceSendActions.test.tsx
@@ -33,6 +33,16 @@ const mockEnsureBrowserAssistCanvas = vi.fn(async () => true);
 const mockHandleAutoLaunchMatchedSiteSkill = vi.fn(async () => undefined);
 const mockHandleImageWorkbenchCommand = vi.fn(async () => false);
 
+function createDeferred<T>() {
+  let resolve!: (value: T | PromiseLike<T>) => void;
+  let reject!: (reason?: unknown) => void;
+  const promise = new Promise<T>((nextResolve, nextReject) => {
+    resolve = nextResolve;
+    reject = nextReject;
+  });
+  return { promise, resolve, reject };
+}
+
 function createGithubSiteSkill(): ServiceSkillHomeItem {
   return {
     id: "github-repo-radar",
@@ -315,6 +325,83 @@ describe("useWorkspaceSendActions", () => {
     }
   });
 
+  it("发送准备阶段应立即暴露 submission preview，并在真实提交接管后清理", async () => {
+    const deferredSend = createDeferred<void>();
+    mockSendMessage.mockImplementationOnce(async () => deferredSend.promise);
+    const harness = mountHook({
+      input: "帮我找一下今天的新闻",
+    });
+
+    let sendPromise: Promise<boolean> | null = null;
+
+    try {
+      await act(async () => {
+        sendPromise = harness.getValue().handleSend();
+        await Promise.resolve();
+      });
+
+      expect(harness.getValue().submissionPreview).toMatchObject({
+        prompt: "帮我找一下今天的新闻",
+        runtimeStatus: expect.objectContaining({
+          title: "正在启动处理流程",
+        }),
+      });
+
+      await act(async () => {
+        deferredSend.resolve();
+        await sendPromise;
+      });
+
+      expect(harness.getValue().submissionPreview).toBeNull();
+    } finally {
+      harness.unmount();
+    }
+  });
+
+  it("准备活动上下文较慢时，也应先展示 submission preview", async () => {
+    const deferredContext = createDeferred<string>();
+    const deferredSend = createDeferred<void>();
+    mockSendMessage.mockImplementationOnce(async () => deferredSend.promise);
+    const harness = mountHook({
+      input: "帮我整理一下今天的重要新闻",
+      contextWorkspace: {
+        enabled: true,
+        activeContextPrompt: "",
+        prepareActiveContextPrompt: async () => deferredContext.promise,
+      },
+    });
+
+    let sendPromise: Promise<boolean> | null = null;
+
+    try {
+      await act(async () => {
+        sendPromise = harness.getValue().handleSend();
+        await Promise.resolve();
+      });
+
+      expect(harness.getValue().submissionPreview).toMatchObject({
+        prompt: "帮我整理一下今天的重要新闻",
+        runtimeStatus: expect.objectContaining({
+          title: "正在启动处理流程",
+        }),
+      });
+
+      await act(async () => {
+        deferredContext.resolve("[上下文]\n今天关注科技与国际新闻。");
+        await Promise.resolve();
+      });
+
+      await act(async () => {
+        deferredSend.resolve();
+        await sendPromise;
+      });
+
+      expect(harness.getValue().submissionPreview).toBeNull();
+    } finally {
+      harness.unmount();
+    }
+  });
+
   it("普通自然句命中站点 service skill 时应直接走自动启动链", async () => {
     const harness = mountHook({
       input: "请帮我使用 GitHub 查一下 AI Agent 项目",
diff --git a/src/components/agent/chat/workspace/useWorkspaceSendActions.ts b/src/components/agent/chat/workspace/useWorkspaceSendActions.ts
index 14cac65b1..1436f4fe3 100644
--- a/src/components/agent/chat/workspace/useWorkspaceSendActions.ts
+++ b/src/components/agent/chat/workspace/useWorkspaceSendActions.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
 import type { Dispatch, SetStateAction } from "react";
 import type { AutoContinueRequestPayload } from "@/lib/api/agentRuntime";
@@ -29,6 +29,10 @@ import {
   type ContextWorkspaceSummary,
   type EnsureBrowserAssistCanvasOptions,
 } from "./workspaceSendHelpers";
+import {
+  createSubmissionPreviewSnapshot,
+  type SubmissionPreviewSnapshot,
+} from "./submissionPreview";
 import type { Character } from "@/lib/api/memory";
 import type { TeamMemorySnapshot } from "@/lib/teamMemorySync";
 import type { ThemeType } from "@/lib/workspace/workbenchContract";
@@ -112,6 +116,7 @@ interface WorkspaceResolvedSendState {
   effectiveToolPreferences: ChatToolPreferences;
   effectiveWebSearch?: boolean;
   effectiveThinking?: boolean;
+  submissionPreviewKey: string;
 }
 
 interface WorkspaceSendPlan extends WorkspaceResolvedSendState {
@@ -181,6 +186,9 @@ export function useWorkspaceSendActions({
   handleAutoLaunchMatchedSiteSkill,
   handleImageWorkbenchCommand,
 }: UseWorkspaceSendActionsParams) {
+  const [submissionPreview, setSubmissionPreview] =
+    useState<SubmissionPreviewSnapshot | null>(null);
+
   const resolveSendExecutionPlan = useCallback(
     async (
       images?: MessageImage[],
@@ -283,12 +291,32 @@ export function useWorkspaceSendActions({
         });
       }
 
-      const text = await buildWorkspaceSendText({
-        sourceText,
-        contextWorkspace,
-        mentionedCharacters,
-        sendOptions,
-      });
+      const submissionPreviewKey = crypto.randomUUID();
+      setSubmissionPreview(
+        createSubmissionPreviewSnapshot({
+          key: submissionPreviewKey,
+          prompt: sourceText,
+          images: images || [],
+          executionStrategy: sendExecutionStrategy ?? executionStrategy,
+          webSearch: effectiveWebSearch,
+          thinking: effectiveThinking,
+        }),
+      );
+
+      let text: string;
+      try {
+        text = await buildWorkspaceSendText({
+          sourceText,
+          contextWorkspace,
+          mentionedCharacters,
+          sendOptions,
+        });
+      } catch (error) {
+        setSubmissionPreview((current) =>
+          current?.key === submissionPreviewKey ? null : current,
+        );
+        throw error;
+      }
 
       return {
         kind: "ready",
@@ -300,6 +328,7 @@ export function useWorkspaceSendActions({
           effectiveToolPreferences,
           effectiveWebSearch,
           effectiveThinking,
+          submissionPreviewKey,
           sendExecutionStrategy,
           autoContinuePayload,
           sendOptions,
@@ -311,6 +340,7 @@ export function useWorkspaceSendActions({
       chatToolPreferences,
       contextWorkspace,
       ensureBrowserAssistCanvas,
+      executionStrategy,
       handleAutoLaunchMatchedSiteSkill,
       handleImageWorkbenchCommand,
       input,
@@ -333,12 +363,15 @@ export function useWorkspaceSendActions({
         effectiveToolPreferences,
         effectiveWebSearch,
         effectiveThinking,
+        submissionPreviewKey,
         sendExecutionStrategy,
         autoContinuePayload,
         sendOptions,
       } = plan;
 
       setRuntimeTeamDispatchPreview(null);
+      setInput("");
+      setMentionedCharacters([]);
 
       try {
         const preparedRuntimeTeamState = await _prepareRuntimeTeamBeforeSend({
@@ -357,9 +390,6 @@ export function useWorkspaceSendActions({
           );
         }
 
-        setInput("");
-        setMentionedCharacters([]);
-
         const nextRequestMetadata = buildWorkspaceRequestMetadata({
           workspaceRequestMetadataBase,
           sendOptions: {
@@ -420,6 +450,10 @@ export function useWorkspaceSendActions({
         toast.error(`发送失败: ${errorMessage}`);
         setInput(sourceText);
         return false;
+      } finally {
+        setSubmissionPreview((current) =>
+          current?.key === submissionPreviewKey ? null : current,
+        );
       }
     },
     [
@@ -536,5 +570,6 @@ export function useWorkspaceSendActions({
     handleRecommendationClick,
     handleSendRef,
     webSearchPreferenceRef,
+    submissionPreview,
   };
 }
diff --git a/src/components/image-gen/useImageGen.resource.test.tsx b/src/components/image-gen/useImageGen.resource.test.tsx
index 486b4c613..38fc1c0cc 100644
--- a/src/components/image-gen/useImageGen.resource.test.tsx
+++ b/src/components/image-gen/useImageGen.resource.test.tsx
@@ -46,6 +46,10 @@ vi.mock("@/lib/api/apiKeyProvider", () => ({
   },
 }));
 
+vi.mock("@/lib/dev-bridge", () => ({
+  safeInvoke: mockInvoke,
+}));
+
 vi.mock("@tauri-apps/api/core", () => ({
   invoke: mockInvoke,
 }));
diff --git a/src/components/input-kit/ModelSelector.test.tsx b/src/components/input-kit/ModelSelector.test.tsx
index 71480aa8e..5244a6b73 100644
--- a/src/components/input-kit/ModelSelector.test.tsx
+++ b/src/components/input-kit/ModelSelector.test.tsx
@@ -76,6 +76,8 @@ beforeEach(() => {
         registryId: "custom-codex",
         fallbackRegistryId: "codex",
         type: "codex",
+        providerId: "custom-codex",
+        apiHost: "https://api.openai.com/v1",
       },
     ],
     loading: false,
@@ -144,6 +146,8 @@ describe("ModelSelector", () => {
       expect.objectContaining({
         returnFullMetadata: true,
         autoLoad: false,
+        liveFetchOnly: true,
+        hasApiKey: true,
       }),
     );
   });
diff --git a/src/components/input-kit/ModelSelector.tsx b/src/components/input-kit/ModelSelector.tsx
index 34b5dbb99..ad690a55b 100644
--- a/src/components/input-kit/ModelSelector.tsx
+++ b/src/components/input-kit/ModelSelector.tsx
@@ -24,6 +24,7 @@ import { getProviderLabel } from "@/lib/constants/providerMappings";
 import { ModelCapabilityBadges } from "@/components/model/ModelCapabilityBadges";
 import { resolveOemCloudRuntimeContext } from "@/lib/api/oemCloudRuntime";
 import { resolveOemLimeHubProviderName } from "@/lib/oemLimeHubProvider";
+import { resolveProviderModelLoadOptions } from "@/lib/model/providerModelLoadOptions";
 
 const compactTriggerClassName =
   "h-8 min-w-[104px] max-w-[168px] justify-start gap-1.5 rounded-full border-slate-200/80 bg-white/92 px-2.5 text-slate-600 shadow-none transition-colors hover:border-slate-300 hover:bg-white hover:text-slate-800";
@@ -135,10 +136,23 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
       (provider) => provider.key === providerType,
     );
   }, [configuredProviders, providerType]);
+  const providerModelLoadOptions = useMemo(
+    () =>
+      resolveProviderModelLoadOptions({
+        providerId: selectedProvider?.providerId,
+        providerType: selectedProvider?.type,
+        apiHost: selectedProvider?.apiHost,
+      }),
+    [selectedProvider?.apiHost, selectedProvider?.providerId, selectedProvider?.type],
+  );
 
   const { models: providerModels, loading: modelsLoading } = useProviderModels(
     selectedProvider,
-    { returnFullMetadata: true, autoLoad: shouldLoadModels },
+    {
+      returnFullMetadata: true,
+      autoLoad: shouldLoadModels,
+      ...providerModelLoadOptions,
+    },
   );
 
   const filteredResult = useMemo(() => {
diff --git a/src/components/model-selector/ProviderModelSelector.test.tsx b/src/components/model-selector/ProviderModelSelector.test.tsx
index b3a7b9ee6..be7bd6a8f 100644
--- a/src/components/model-selector/ProviderModelSelector.test.tsx
+++ b/src/components/model-selector/ProviderModelSelector.test.tsx
@@ -66,6 +66,8 @@ beforeEach(() => {
         registryId: "custom-codex",
         fallbackRegistryId: "codex",
         type: "codex",
+        providerId: "custom-codex",
+        apiHost: "https://api.openai.com/v1",
       },
     ],
     loading: false,
@@ -117,6 +119,19 @@ afterEach(() => {
 });
 
 describe("ProviderModelSelector", () => {
+  it("支持实时拉取的 API Key Provider 应使用真实模型目录", () => {
+    renderSelector();
+
+    expect(mockUseProviderModels).toHaveBeenCalledWith(
+      expect.objectContaining({ key: "custom-codex" }),
+      expect.objectContaining({
+        returnFullMetadata: true,
+        liveFetchOnly: true,
+        hasApiKey: true,
+      }),
+    );
+  });
+
   it("应隐藏 codex 不兼容模型并展示兼容提示", () => {
     const { container } = renderSelector();
 
diff --git a/src/components/model-selector/ProviderModelSelector.tsx b/src/components/model-selector/ProviderModelSelector.tsx
index 9636ece02..635c46bcb 100644
--- a/src/components/model-selector/ProviderModelSelector.tsx
+++ b/src/components/model-selector/ProviderModelSelector.tsx
@@ -23,6 +23,7 @@ import { useProviderModels } from "@/hooks/useProviderModels";
 import { getProviderLabel } from "@/lib/constants/providerMappings";
 import type { EnhancedModelMetadata } from "@/lib/types/modelRegistry";
 import { getProviderModelCompatibilityIssue } from "@/components/agent/chat/utils/providerModelCompatibility";
+import { resolveProviderModelLoadOptions } from "@/lib/model/providerModelLoadOptions";
 
 // ============================================================================
 // 类型定义
@@ -180,13 +181,25 @@ export const ProviderModelSelector: React.FC<ProviderModelSelectorProps> = ({
   const selectedProvider = useMemo(() => {
     return configuredProviders.find((p) => p.key === selectedProviderId);
   }, [configuredProviders, selectedProviderId]);
+  const providerModelLoadOptions = useMemo(
+    () =>
+      resolveProviderModelLoadOptions({
+        providerId: selectedProvider?.providerId,
+        providerType: selectedProvider?.type,
+        apiHost: selectedProvider?.apiHost,
+      }),
+    [selectedProvider?.apiHost, selectedProvider?.providerId, selectedProvider?.type],
+  );
 
   // 获取模型列表（使用共享 hook，返回完整元数据）
   const {
     models: filteredModels,
     loading: modelsLoading,
     error: modelsError,
-  } = useProviderModels(selectedProvider, { returnFullMetadata: true });
+  } = useProviderModels(selectedProvider, {
+    returnFullMetadata: true,
+    ...providerModelLoadOptions,
+  });
 
   const compatibleModels = useMemo(
     () =>
diff --git a/src/components/provider-pool/ProviderPoolPage.tsx b/src/components/provider-pool/ProviderPoolPage.tsx
index 670a24036..50d553b16 100644
--- a/src/components/provider-pool/ProviderPoolPage.tsx
+++ b/src/components/provider-pool/ProviderPoolPage.tsx
@@ -349,14 +349,15 @@ export const ProviderPoolPage = forwardRef<
   const currentCredentials = currentPool?.credentials || [];
 
   return (
-    <div className="space-y-6">
+    <div className="space-y-4">
       {!hideHeader && (
-        <div className="flex items-center justify-between">
+        <div className="rounded-[24px] border border-slate-200/80 bg-white p-5 shadow-sm shadow-slate-950/5">
           <div>
-            <h2 className="text-2xl font-bold">凭证池</h2>
-            <p className="text-muted-foreground text-sm">
-              管理多个 AI 服务凭证，自动轮询负载均衡，并为本机默认 Provider
-              提供稳定的凭证来源
+            <h2 className="text-xl font-semibold text-slate-900">
+              Provider 与凭证
+            </h2>
+            <p className="mt-2 text-sm leading-6 text-slate-600">
+              默认先管理 API Key Provider。OAuth、语音和中转服务保留在同一入口，但不再和日常 Provider 配置抢同一视觉焦点。
             </p>
           </div>
         </div>
@@ -369,42 +370,42 @@ export const ProviderPoolPage = forwardRef<
       )}
 
       {/* Category Tabs - 第一行：分类选择 */}
-      <div className="flex gap-1 mb-2">
+      <div className="flex flex-wrap gap-2">
         <button
           onClick={() => {
             setActiveCategory("apikey");
           }}
-          className={`px-4 py-2 text-sm font-medium rounded-lg border transition-colors ${
+          className={`rounded-xl border px-4 py-2 text-sm font-medium transition-colors ${
             activeCategory === "apikey"
-              ? "border-primary bg-primary/10 text-primary"
-              : "border-border bg-card text-muted-foreground hover:text-foreground hover:bg-muted"
+              ? "border-slate-300 bg-white text-slate-950 shadow-sm"
+              : "border-slate-200 bg-slate-50 text-slate-600 hover:border-slate-300 hover:bg-white hover:text-slate-900"
           }`}
           data-testid="apikey-category-tab"
         >
-          API Key
+          服务商
         </button>
         <button
           onClick={() => {
             setActiveCategory("connect");
             setActiveTab("connect");
           }}
-          className={`px-4 py-2 text-sm font-medium rounded-lg border transition-colors ${
+          className={`rounded-xl border px-4 py-2 text-sm font-medium transition-colors ${
             activeCategory === "connect"
-              ? "border-primary bg-primary/10 text-primary"
-              : "border-border bg-card text-muted-foreground hover:text-foreground hover:bg-muted"
+              ? "border-slate-300 bg-white text-slate-950 shadow-sm"
+              : "border-slate-200 bg-slate-50 text-slate-600 hover:border-slate-300 hover:bg-white hover:text-slate-900"
           }`}
           data-testid="connect-category-tab"
         >
-          Connect
+          中转服务
         </button>
         <button
           onClick={() => {
             setActiveCategory("voice");
           }}
-          className={`px-4 py-2 text-sm font-medium rounded-lg border transition-colors ${
+          className={`rounded-xl border px-4 py-2 text-sm font-medium transition-colors ${
             activeCategory === "voice"
-              ? "border-primary bg-primary/10 text-primary"
-              : "border-border bg-card text-muted-foreground hover:text-foreground hover:bg-muted"
+              ? "border-slate-300 bg-white text-slate-950 shadow-sm"
+              : "border-slate-200 bg-slate-50 text-slate-600 hover:border-slate-300 hover:bg-white hover:text-slate-900"
           }`}
           data-testid="voice-category-tab"
         >
@@ -415,10 +416,10 @@ export const ProviderPoolPage = forwardRef<
             setActiveCategory("oauth");
             setActiveTab(oauthProviderTypes[0]);
           }}
-          className={`px-4 py-2 text-sm font-medium rounded-lg border transition-colors ${
+          className={`rounded-xl border px-4 py-2 text-sm font-medium transition-colors ${
             activeCategory === "oauth"
-              ? "border-primary bg-primary/10 text-primary"
-              : "border-border bg-card text-muted-foreground hover:text-foreground hover:bg-muted"
+              ? "border-slate-300 bg-white text-slate-950 shadow-sm"
+              : "border-slate-200 bg-slate-50 text-slate-600 hover:border-slate-300 hover:bg-white hover:text-slate-900"
           }`}
           data-testid="oauth-category-tab"
         >
@@ -435,12 +436,12 @@ export const ProviderPoolPage = forwardRef<
             return (
               <button
                 key={providerType}
-                onClick={() => setActiveTab(providerType)}
-                title={providerLabels[providerType]}
-                className={`group relative flex items-center justify-center gap-2 min-w-[120px] px-3 py-2 rounded-lg border transition-all ${
+              onClick={() => setActiveTab(providerType)}
+              title={providerLabels[providerType]}
+                className={`group relative flex min-w-[120px] items-center justify-center gap-2 rounded-xl border px-3 py-2 transition-all ${
                   isActive
-                    ? "border-primary bg-primary/10 text-primary shadow-sm"
-                    : "border-border bg-card hover:border-primary/50 hover:bg-muted text-muted-foreground hover:text-foreground"
+                    ? "border-slate-300 bg-white text-slate-950 shadow-sm"
+                    : "border-slate-200 bg-slate-50 text-slate-600 hover:border-slate-300 hover:bg-white hover:text-slate-900"
                 }`}
                 data-testid={`oauth-provider-${providerType}`}
               >
@@ -476,7 +477,7 @@ export const ProviderPoolPage = forwardRef<
       {/* API Key 分类 - 左右分栏布局 */}
       {activeCategory === "apikey" && (
         <div
-          className="h-[calc(100vh-280px)] min-h-[400px]"
+          className="h-[calc(100vh-240px)] min-h-[620px]"
           data-testid="apikey-section"
         >
           <ApiKeyProviderSection
diff --git a/src/components/provider-pool/api-key/AddCustomProviderModal.tsx b/src/components/provider-pool/api-key/AddCustomProviderModal.tsx
index 776123a79..3b8a355db 100644
--- a/src/components/provider-pool/api-key/AddCustomProviderModal.tsx
+++ b/src/components/provider-pool/api-key/AddCustomProviderModal.tsx
@@ -7,16 +7,11 @@
  * **Validates: Requirements 6.1, 6.2**
  */
 
-import React, {
-  useState,
-  useCallback,
-  useMemo,
-  useRef,
-  useEffect,
-} from "react";
+import React, { useState, useCallback, useMemo, useEffect } from "react";
 import { cn } from "@/lib/utils";
 import { Modal, ModalHeader, ModalBody, ModalFooter } from "@/components/Modal";
 import { Button } from "@/components/ui/button";
+import { Badge } from "@/components/ui/badge";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import {
@@ -25,7 +20,15 @@ import {
   SelectItem,
   SelectTrigger,
 } from "@/components/ui/select";
-import { Search, X } from "lucide-react";
+import {
+  Globe,
+  KeyRound,
+  Layers3,
+  Search,
+  SlidersHorizontal,
+  Sparkles,
+  X,
+} from "lucide-react";
 import { useModelRegistry } from "@/hooks/useModelRegistry";
 import type { ProviderType } from "@/lib/types/provider";
 import {
@@ -35,6 +38,7 @@ import {
 } from "@/lib/api/apiKeyProvider";
 import {
   getProviderTypeLabel,
+  getSpecialProtocolHint,
   isSupportedProviderType,
   PROVIDER_TYPE_FIELDS,
   PROVIDER_TYPE_OPTIONS,
@@ -53,6 +57,35 @@ interface KnownProvider {
   keywords?: string[];
 }
 
+function dedupeKeywords(keywords: Array<string | undefined>): string[] | undefined {
+  const seen = new Set<string>();
+  const result: string[] = [];
+
+  for (const keyword of keywords) {
+    const normalized = keyword?.trim();
+    if (!normalized) {
+      continue;
+    }
+
+    const key = normalized.toLowerCase();
+    if (seen.has(key)) {
+      continue;
+    }
+
+    seen.add(key);
+    result.push(normalized);
+  }
+
+  return result.length > 0 ? result : undefined;
+}
+
+function normalizeKnownProvider(provider: KnownProvider): KnownProvider {
+  return {
+    ...provider,
+    keywords: dedupeKeywords([provider.id, ...(provider.keywords ?? [])]),
+  };
+}
+
 /** 已知厂商列表（用于快速填充） */
 const FALLBACK_KNOWN_PROVIDERS: KnownProvider[] = [
   {
@@ -95,7 +128,7 @@ const FALLBACK_KNOWN_PROVIDERS: KnownProvider[] = [
     id: "zhipu",
     name: "智谱 AI",
     type: "openai",
-    apiHost: "https://open.bigmodel.cn/api/paas",
+    apiHost: "https://open.bigmodel.cn/api/paas/v4/",
   },
   {
     id: "baichuan",
@@ -159,6 +192,33 @@ const FALLBACK_KNOWN_PROVIDERS: KnownProvider[] = [
   },
 ];
 
+const SPECIAL_PROTOCOL_PROVIDER_SEEDS = [
+  {
+    id: "codex-cli",
+    name: "Codex CLI",
+    type: "codex",
+    apiHost: "https://api.openai.com",
+    keywords: ["codex", "openai", "codex-cli"],
+  },
+  {
+    id: "gemini-cli",
+    name: "Gemini CLI",
+    type: "gemini",
+    apiHost: "https://cloudcode-pa.googleapis.com",
+    keywords: ["gemini", "google", "gemini-cli", "cloud code assist"],
+  },
+  {
+    id: "claude-code",
+    name: "Claude Code",
+    type: "anthropic",
+    apiHost: "https://api.anthropic.com",
+    keywords: ["claude", "anthropic", "claude-code", "claude code"],
+  },
+] satisfies KnownProvider[];
+
+const SPECIAL_PROTOCOL_KNOWN_PROVIDERS: KnownProvider[] =
+  SPECIAL_PROTOCOL_PROVIDER_SEEDS.map(normalizeKnownProvider);
+
 /** 将 Catalog 返回的 provider type 收敛到前端 ProviderType */
 function normalizeCatalogProviderType(providerType: string): ProviderType {
   return isSupportedProviderType(providerType) ? providerType : "openai";
@@ -167,31 +227,43 @@ function normalizeCatalogProviderType(providerType: string): ProviderType {
 function buildKnownProvidersFromCatalog(
   catalog: SystemProviderCatalogItem[],
 ): KnownProvider[] {
-  const providers: KnownProvider[] = [];
-
-  for (const item of catalog) {
-    const normalizedType = normalizeCatalogProviderType(item.type);
-
-    providers.push({
+  return catalog.map((item) =>
+    normalizeKnownProvider({
       id: item.id,
       name: item.name,
-      type: normalizedType,
+      type: normalizeCatalogProviderType(item.type),
       apiHost: item.api_host,
-      keywords: item.legacy_ids,
-    });
+      keywords: [item.id, item.type, ...item.legacy_ids],
+    }),
+  );
+}
 
-    for (const legacyId of item.legacy_ids) {
-      providers.push({
-        id: legacyId,
-        name: item.name,
-        type: normalizedType,
-        apiHost: item.api_host,
-        keywords: [item.id, ...item.legacy_ids.filter((id) => id !== legacyId)],
+function mergeKnownProviders(
+  ...groups: KnownProvider[][]
+): KnownProvider[] {
+  const providerMap = new Map<string, KnownProvider>();
+
+  for (const group of groups) {
+    for (const provider of group) {
+      const normalized = normalizeKnownProvider(provider);
+      const existing = providerMap.get(normalized.id);
+
+      if (!existing) {
+        providerMap.set(normalized.id, normalized);
+        continue;
+      }
+
+      providerMap.set(normalized.id, {
+        ...normalized,
+        keywords: dedupeKeywords([
+          ...(existing.keywords ?? []),
+          ...(normalized.keywords ?? []),
+        ]),
       });
     }
   }
 
-  return providers;
+  return Array.from(providerMap.values());
 }
 
 // ============================================================================
@@ -351,11 +423,8 @@ export const AddCustomProviderModal: React.FC<AddCustomProviderModalProps> = ({
 
   // 厂商搜索状态
   const [providerSearch, setProviderSearch] = useState("");
-  const [showProviderDropdown, setShowProviderDropdown] = useState(false);
   const [selectedKnownProvider, setSelectedKnownProvider] =
     useState<KnownProvider | null>(null);
-  const searchInputRef = useRef<HTMLInputElement>(null);
-  const dropdownRef = useRef<HTMLDivElement>(null);
 
   // 从 model_registry 获取额外的 Provider 信息
   const { groupedByProvider } = useModelRegistry({ autoLoad: true });
@@ -399,29 +468,30 @@ export const AddCustomProviderModal: React.FC<AddCustomProviderModalProps> = ({
     const baseProviders =
       catalogKnownProviders && catalogKnownProviders.length > 0
         ? catalogKnownProviders
-        : FALLBACK_KNOWN_PROVIDERS;
+        : FALLBACK_KNOWN_PROVIDERS.map(normalizeKnownProvider);
 
-    const providerMap = new Map<string, KnownProvider>();
-
-    for (const provider of baseProviders) {
-      if (!providerMap.has(provider.id)) {
-        providerMap.set(provider.id, provider);
-      }
-    }
+    const registryProviders: KnownProvider[] = [];
 
     // 从 model_registry 添加额外的厂商
     groupedByProvider.forEach((models, providerId) => {
-      if (!providerMap.has(providerId) && models.length > 0) {
+      if (models.length > 0) {
         const firstModel = models[0];
-        providerMap.set(providerId, {
-          id: providerId,
-          name: firstModel.provider_name,
-          type: "openai" as ProviderType, // 默认使用 OpenAI 兼容
-        });
+        registryProviders.push(
+          normalizeKnownProvider({
+            id: providerId,
+            name: firstModel.provider_name,
+            type: "openai" as ProviderType, // 默认使用 OpenAI 兼容
+            keywords: [firstModel.provider_name],
+          }),
+        );
       }
     });
 
-    return Array.from(providerMap.values());
+    return mergeKnownProviders(
+      SPECIAL_PROTOCOL_KNOWN_PROVIDERS,
+      baseProviders,
+      registryProviders,
+    );
   }, [catalogKnownProviders, groupedByProvider]);
 
   // 过滤厂商列表
@@ -439,28 +509,10 @@ export const AddCustomProviderModal: React.FC<AddCustomProviderModalProps> = ({
     );
   }, [allProviders, providerSearch]);
 
-  // 点击外部关闭下拉框
-  useEffect(() => {
-    const handleClickOutside = (event: MouseEvent) => {
-      if (
-        dropdownRef.current &&
-        !dropdownRef.current.contains(event.target as Node) &&
-        searchInputRef.current &&
-        !searchInputRef.current.contains(event.target as Node)
-      ) {
-        setShowProviderDropdown(false);
-      }
-    };
-
-    document.addEventListener("mousedown", handleClickOutside);
-    return () => document.removeEventListener("mousedown", handleClickOutside);
-  }, []);
-
   // 选择已知厂商
   const handleSelectKnownProvider = useCallback((provider: KnownProvider) => {
     setSelectedKnownProvider(provider);
     setProviderSearch(provider.name);
-    setShowProviderDropdown(false);
 
     // 自动填充表单
     setFormState((prev) => ({
@@ -490,7 +542,6 @@ export const AddCustomProviderModal: React.FC<AddCustomProviderModalProps> = ({
     setSubmitError(null);
     setProviderSearch("");
     setSelectedKnownProvider(null);
-    setShowProviderDropdown(false);
   }, []);
 
   // 关闭模态框
@@ -575,272 +626,504 @@ export const AddCustomProviderModal: React.FC<AddCustomProviderModalProps> = ({
     }
   }, [formState, onAdd, onAddApiKey, handleClose]);
 
+  const typeOption = useMemo(
+    () => PROVIDER_TYPE_OPTIONS.find((item) => item.value === formState.type),
+    [formState.type],
+  );
+
+  const specialProtocolHint = useMemo(
+    () => getSpecialProtocolHint(formState.type),
+    [formState.type],
+  );
+
+  const visibleProviders = useMemo(
+    () => filteredProviders.slice(0, 18),
+    [filteredProviders],
+  );
+
+  const summaryCards = [
+    {
+      icon: Globe,
+      title: "接入地址",
+      value: formState.apiHost || "待填写",
+      hint: selectedKnownProvider?.apiHost
+        ? "已根据模板预填"
+        : "支持自定义 Base URL",
+    },
+    {
+      icon: Layers3,
+      title: "协议类型",
+      value: getProviderTypeLabel(formState.type),
+      hint: specialProtocolHint ? "包含专属协议兼容" : "普通兼容协议",
+    },
+    {
+      icon: KeyRound,
+      title: "鉴权状态",
+      value: formState.apiKey.trim() ? "已填写" : "待填写",
+      hint: "保存后会立即创建首个 API Key",
+    },
+  ];
+
+  const extraFieldConfigs = extraFields.map((field) => {
+    switch (field) {
+      case "apiVersion":
+        return {
+          id: "api-version",
+          field,
+          label: "API Version",
+          placeholder: "2024-02-15-preview",
+          value: formState.apiVersion,
+          testId: "api-version-input",
+        };
+      case "project":
+        return {
+          id: "project",
+          field,
+          label: "Project ID",
+          placeholder: "your-project-id",
+          value: formState.project,
+          testId: "project-input",
+        };
+      case "location":
+        return {
+          id: "location",
+          field,
+          label: "Location",
+          placeholder: "us-central1",
+          value: formState.location,
+          testId: "location-input",
+        };
+      case "region":
+        return {
+          id: "region",
+          field,
+          label: "Region",
+          placeholder: "us-east-1",
+          value: formState.region,
+          testId: "region-input",
+        };
+      default:
+        return null;
+    }
+  });
+
   return (
     <Modal
       isOpen={isOpen}
       onClose={handleClose}
-      maxWidth="max-w-md"
-      className={className}
+      maxWidth="max-w-6xl"
+      className={cn("border border-slate-200/80 bg-white", className)}
     >
-      <ModalHeader>添加自定义 Provider</ModalHeader>
+      <ModalHeader>新增服务商</ModalHeader>
 
-      <ModalBody className="space-y-4">
-        {/* 搜索厂商（可选） */}
-        <div className="space-y-1.5">
-          <Label className="text-sm font-medium">
-            快速选择厂商{" "}
-            <span className="text-muted-foreground text-xs">(可选)</span>
-          </Label>
-          <div className="relative">
-            <div className="relative">
-              <Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-              <Input
-                ref={searchInputRef}
-                type="text"
-                value={providerSearch}
-                onChange={(e) => {
-                  setProviderSearch(e.target.value);
-                  setShowProviderDropdown(true);
-                  if (selectedKnownProvider) {
-                    setSelectedKnownProvider(null);
-                  }
-                }}
-                onFocus={() => setShowProviderDropdown(true)}
-                placeholder="搜索厂商名称..."
-                disabled={isSubmitting}
-                className="pl-10 pr-8"
-                data-testid="provider-search-input"
-              />
-              {(providerSearch || selectedKnownProvider) && (
-                <button
-                  type="button"
-                  onClick={handleClearKnownProvider}
-                  className="absolute right-3 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
+      <ModalBody className="p-0">
+        <div className="grid min-h-[680px] gap-0 lg:grid-cols-[320px_minmax(0,1fr)]">
+          <aside className="border-b border-slate-200/80 bg-slate-50/80 lg:border-b-0 lg:border-r">
+            <div className="space-y-5 p-5">
+              <div className="rounded-[24px] border border-slate-200/80 bg-white p-4 shadow-sm shadow-slate-950/5">
+                <div className="flex items-start justify-between gap-3">
+                  <div>
+                    <p className="text-sm font-semibold text-slate-900">
+                      选择模板
+                    </p>
+                    <p className="mt-1 text-xs leading-5 text-slate-500">
+                      先选厂商模板，再补充鉴权与协议细节。没有模板也可以完全手动创建。
+                    </p>
+                  </div>
+                  <Badge
+                    variant="outline"
+                    className="border-slate-200 bg-slate-50 text-slate-600"
+                  >
+                    DeepChat 风格
+                  </Badge>
+                </div>
+
+                <div className="relative mt-4">
+                  <Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-slate-400" />
+                  <Input
+                    type="text"
+                    value={providerSearch}
+                    onChange={(e) => {
+                      setProviderSearch(e.target.value);
+                      if (
+                        selectedKnownProvider &&
+                        e.target.value !== selectedKnownProvider.name
+                      ) {
+                        setSelectedKnownProvider(null);
+                      }
+                    }}
+                    placeholder="搜索厂商、别名或协议"
+                    disabled={isSubmitting}
+                    className="border-slate-200 bg-white pl-10 pr-9"
+                    data-testid="provider-search-input"
+                  />
+                  {(providerSearch || selectedKnownProvider) && (
+                    <button
+                      type="button"
+                      onClick={handleClearKnownProvider}
+                      className="absolute right-3 top-1/2 -translate-y-1/2 text-slate-400 transition-colors hover:text-slate-700"
+                      aria-label="清空模板选择"
+                    >
+                      <X className="h-4 w-4" />
+                    </button>
+                  )}
+                </div>
+              </div>
+
+              <div className="space-y-2" data-testid="provider-template-list">
+                {visibleProviders.length > 0 ? (
+                  visibleProviders.map((provider) => {
+                    const isActive = selectedKnownProvider?.id === provider.id;
+                    return (
+                      <button
+                        key={provider.id}
+                        type="button"
+                        onClick={() => handleSelectKnownProvider(provider)}
+                        className={cn(
+                          "w-full rounded-[20px] border px-4 py-3 text-left transition-all",
+                          isActive
+                            ? "border-slate-900 bg-slate-900 text-white shadow-lg shadow-slate-950/10"
+                            : "border-slate-200/80 bg-white text-slate-900 hover:border-slate-300 hover:bg-slate-100/80",
+                        )}
+                        data-testid={`known-provider-item-${provider.id}`}
+                      >
+                        <div className="flex items-start justify-between gap-3">
+                          <div className="min-w-0">
+                            <p className="truncate text-sm font-semibold">
+                              {provider.name}
+                            </p>
+                            <p
+                              className={cn(
+                                "mt-1 truncate text-xs",
+                                isActive ? "text-slate-200" : "text-slate-500",
+                              )}
+                            >
+                              {provider.apiHost || "手动填写 API Host"}
+                            </p>
+                          </div>
+                          <Badge
+                            variant="outline"
+                            className={cn(
+                              "shrink-0 border-current/20 px-2 py-0.5 text-[11px]",
+                              isActive
+                                ? "bg-white/10 text-white"
+                                : "bg-slate-50 text-slate-600",
+                            )}
+                          >
+                            {getProviderTypeLabel(provider.type)}
+                          </Badge>
+                        </div>
+                      </button>
+                    );
+                  })
+                ) : (
+                  <div className="rounded-[20px] border border-dashed border-slate-200 bg-white px-4 py-8 text-center">
+                    <p className="text-sm font-medium text-slate-900">
+                      没有匹配的模板
+                    </p>
+                    <p className="mt-1 text-xs text-slate-500">
+                      继续在右侧手动填写，也可以换个关键词再搜。
+                    </p>
+                  </div>
+                )}
+              </div>
+            </div>
+          </aside>
+
+          <div className="bg-white">
+            <div className="space-y-6 p-5 lg:p-6">
+              <section
+                className="rounded-[28px] border border-slate-200/80 bg-slate-950 px-5 py-5 text-white shadow-lg shadow-slate-950/10"
+                data-testid="selected-provider-card"
+              >
+                <div className="flex flex-col gap-4 xl:flex-row xl:items-start xl:justify-between">
+                  <div className="space-y-2">
+                    <div className="flex items-center gap-2">
+                      <Sparkles className="h-4 w-4 text-sky-300" />
+                      <p className="text-sm font-medium text-sky-100">
+                        当前接入方案
+                      </p>
+                    </div>
+                    <h3 className="text-2xl font-semibold tracking-tight">
+                      {formState.name ||
+                        selectedKnownProvider?.name ||
+                        "手动创建新 Provider"}
+                    </h3>
+                    <p className="max-w-3xl text-sm leading-6 text-slate-300">
+                      {selectedKnownProvider
+                        ? "已按模板预填协议类型与接口地址，你只需要确认鉴权和附加参数。"
+                        : "适合接入未内置的厂商、私有部署网关，或需要兼容 OpenAI / Anthropic / Gemini 协议的第三方服务。"}
+                    </p>
+                  </div>
+
+                  <div className="flex flex-wrap gap-2">
+                    <Badge className="border border-white/10 bg-white/10 text-white hover:bg-white/10">
+                      {typeOption?.label ??
+                        getProviderTypeLabel(formState.type)}
+                    </Badge>
+                    {selectedKnownProvider ? (
+                      <Badge className="border border-emerald-300/20 bg-emerald-400/10 text-emerald-100 hover:bg-emerald-400/10">
+                        已套用模板
+                      </Badge>
+                    ) : (
+                      <Badge className="border border-amber-300/20 bg-amber-400/10 text-amber-100 hover:bg-amber-400/10">
+                        手动配置
+                      </Badge>
+                    )}
+                  </div>
+                </div>
+
+                <div className="mt-5 grid gap-3 sm:grid-cols-2 xl:grid-cols-3">
+                  {summaryCards.map((item) => {
+                    const Icon = item.icon;
+                    return (
+                      <div
+                        key={item.title}
+                        className="rounded-[20px] border border-white/10 bg-white/5 p-4"
+                      >
+                        <div className="flex items-center gap-2 text-xs text-slate-300">
+                          <Icon className="h-3.5 w-3.5" />
+                          <span>{item.title}</span>
+                        </div>
+                        <p className="mt-3 break-all text-sm font-semibold text-white">
+                          {item.value}
+                        </p>
+                        <p className="mt-2 text-xs leading-5 text-slate-300">
+                          {item.hint}
+                        </p>
+                      </div>
+                    );
+                  })}
+                </div>
+              </section>
+
+              <section className="rounded-[24px] border border-slate-200/80 bg-white p-5 shadow-sm shadow-slate-950/5">
+                <div className="mb-4">
+                  <div className="flex items-center gap-2 text-slate-900">
+                    <Globe className="h-4 w-4" />
+                    <h3 className="text-base font-semibold">基础接入信息</h3>
+                  </div>
+                  <p className="mt-1 text-sm text-slate-500">
+                    这里决定 Provider 的名称、接口地址和首个 API
+                    Key，是最关键的一步。
+                  </p>
+                </div>
+
+                <div className="grid gap-4 lg:grid-cols-2">
+                  <div className="space-y-1.5">
+                    <Label
+                      htmlFor="provider-name"
+                      className="text-sm font-medium"
+                    >
+                      Provider 名称 <span className="text-red-500">*</span>
+                    </Label>
+                    <Input
+                      id="provider-name"
+                      type="text"
+                      value={formState.name}
+                      onChange={(e) => updateField("name", e.target.value)}
+                      placeholder="例如：My Custom API"
+                      disabled={isSubmitting}
+                      className={cn(
+                        "border-slate-200 bg-white",
+                        errors.name && "border-red-500",
+                      )}
+                      data-testid="provider-name-input"
+                    />
+                    {errors.name ? (
+                      <p
+                        className="text-xs text-red-500"
+                        data-testid="name-error"
+                      >
+                        {errors.name}
+                      </p>
+                    ) : (
+                      <p className="text-xs text-slate-500">
+                        建议用厂商或网关名称，便于后续在左侧列表快速识别。
+                      </p>
+                    )}
+                  </div>
+
+                  <div className="space-y-1.5">
+                    <Label htmlFor="api-host" className="text-sm font-medium">
+                      API Host <span className="text-red-500">*</span>
+                    </Label>
+                    <Input
+                      id="api-host"
+                      type="text"
+                      value={formState.apiHost}
+                      onChange={(e) => updateField("apiHost", e.target.value)}
+                      placeholder="https://api.example.com"
+                      disabled={isSubmitting}
+                      className={cn(
+                        "border-slate-200 bg-white",
+                        errors.apiHost && "border-red-500",
+                      )}
+                      data-testid="api-host-input"
+                    />
+                    {errors.apiHost ? (
+                      <p
+                        className="text-xs text-red-500"
+                        data-testid="api-host-error"
+                      >
+                        {errors.apiHost}
+                      </p>
+                    ) : (
+                      <p className="text-xs text-slate-500">
+                        可以填写官方接口、代理网关或企业内部统一中转地址。
+                      </p>
+                    )}
+                  </div>
+                </div>
+
+                <div className="mt-4 space-y-1.5">
+                  <Label htmlFor="api-key" className="text-sm font-medium">
+                    API Key <span className="text-red-500">*</span>
+                  </Label>
+                  <Input
+                    id="api-key"
+                    type="password"
+                    value={formState.apiKey}
+                    onChange={(e) => updateField("apiKey", e.target.value)}
+                    placeholder="sk-..."
+                    disabled={isSubmitting}
+                    className={cn(
+                      "border-slate-200 bg-white",
+                      errors.apiKey && "border-red-500",
+                    )}
+                    data-testid="api-key-input"
+                  />
+                  {errors.apiKey ? (
+                    <p
+                      className="text-xs text-red-500"
+                      data-testid="api-key-error"
+                    >
+                      {errors.apiKey}
+                    </p>
+                  ) : (
+                    <p className="text-xs text-slate-500">
+                      保存后会自动为新 Provider
+                      创建第一把密钥，后续可在详情页继续追加多把 Key。
+                    </p>
+                  )}
+                </div>
+              </section>
+
+              <section className="rounded-[24px] border border-slate-200/80 bg-slate-50/70 p-5">
+                <div className="mb-4">
+                  <div className="flex items-center gap-2 text-slate-900">
+                    <SlidersHorizontal className="h-4 w-4" />
+                    <h3 className="text-base font-semibold">协议与附加参数</h3>
+                  </div>
+                  <p className="mt-1 text-sm text-slate-500">
+                    普通第三方 Provider 推荐保持与 DeepChat
+                    一致的兼容协议；Codex、Gemini、Anthropic 继续保留 Lime
+                    的专属兼容语义。
+                  </p>
+                </div>
+
+                <div className="grid gap-4 lg:grid-cols-2">
+                  <div className="space-y-1.5">
+                    <Label
+                      htmlFor="provider-type"
+                      className="text-sm font-medium"
+                    >
+                      Provider 类型
+                    </Label>
+                    <Select
+                      value={formState.type}
+                      onValueChange={(value) =>
+                        updateField("type", value as ProviderType)
+                      }
+                      disabled={isSubmitting}
+                    >
+                      <SelectTrigger
+                        id="provider-type"
+                        className="border-slate-200 bg-white"
+                        data-testid="provider-type-select"
+                      >
+                        <span>{getProviderTypeLabel(formState.type)}</span>
+                      </SelectTrigger>
+                      <SelectContent>
+                        {PROVIDER_TYPE_OPTIONS.map((type) => (
+                          <SelectItem key={type.value} value={type.value}>
+                            {type.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                    <p className="text-xs text-slate-500">
+                      大多数第三方服务使用 OpenAI
+                      兼容格式；只有特例协议才需要切换。
+                    </p>
+                  </div>
+
+                  <div className="rounded-[20px] border border-slate-200/80 bg-white p-4">
+                    <p className="text-sm font-semibold text-slate-900">
+                      接入提示
+                    </p>
+                    <p className="mt-2 text-xs leading-6 text-slate-500">
+                      若你接入的是 OEM
+                      或商业化统一网关，优先保持外部配置简单，把品牌、套餐和模型目录放在独立云端控制面管理。
+                    </p>
+                  </div>
+                </div>
+
+                {specialProtocolHint ? (
+                  <div
+                    className="mt-4 rounded-[20px] border border-sky-200 bg-sky-50 px-4 py-3 text-sm text-sky-900"
+                    data-testid="protocol-special-hint"
+                  >
+                    <p className="font-semibold">协议特例保留</p>
+                    <p className="mt-1 leading-6">{specialProtocolHint}</p>
+                  </div>
+                ) : null}
+
+                {extraFieldConfigs.some(Boolean) ? (
+                  <div className="mt-4 grid gap-4 lg:grid-cols-2">
+                    {extraFieldConfigs.map((config) => {
+                      if (!config) {
+                        return null;
+                      }
+
+                      return (
+                        <div key={config.field} className="space-y-1.5">
+                          <Label
+                            htmlFor={config.id}
+                            className="text-sm font-medium"
+                          >
+                            {config.label}
+                          </Label>
+                          <Input
+                            id={config.id}
+                            type="text"
+                            value={config.value}
+                            onChange={(e) =>
+                              updateField(config.field, e.target.value)
+                            }
+                            placeholder={config.placeholder}
+                            disabled={isSubmitting}
+                            className="border-slate-200 bg-white"
+                            data-testid={config.testId}
+                          />
+                        </div>
+                      );
+                    })}
+                  </div>
+                ) : null}
+              </section>
+
+              {submitError && (
+                <div
+                  className="rounded-[20px] border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700"
+                  data-testid="submit-error"
                 >
-                  <X className="h-4 w-4" />
-                </button>
+                  {submitError}
+                </div>
               )}
             </div>
-
-            {/* 下拉列表 */}
-            {showProviderDropdown && filteredProviders.length > 0 && (
-              <div
-                ref={dropdownRef}
-                className="absolute left-0 right-0 top-full z-[9999] mt-1 max-h-48 overflow-y-auto rounded-md border bg-background shadow-lg"
-                data-testid="provider-dropdown"
-              >
-                {filteredProviders.map((provider) => (
-                  <button
-                    key={provider.id}
-                    type="button"
-                    onClick={() => handleSelectKnownProvider(provider)}
-                    className={cn(
-                      "w-full px-3 py-2 text-left text-sm hover:bg-muted transition-colors",
-                      selectedKnownProvider?.id === provider.id && "bg-muted",
-                    )}
-                  >
-                    <div className="font-medium">{provider.name}</div>
-                    {provider.apiHost && (
-                      <div className="text-xs text-muted-foreground truncate">
-                        {provider.apiHost}
-                      </div>
-                    )}
-                  </button>
-                ))}
-              </div>
-            )}
           </div>
-          <p className="text-xs text-muted-foreground">
-            选择已知厂商可自动填充配置，或直接手动填写下方表单
-          </p>
         </div>
-
-        <div className="border-t border-border" />
-
-        {/* Provider 名称 */}
-        <div className="space-y-1.5">
-          <Label htmlFor="provider-name" className="text-sm font-medium">
-            Provider 名称 <span className="text-red-500">*</span>
-          </Label>
-          <Input
-            id="provider-name"
-            type="text"
-            value={formState.name}
-            onChange={(e) => updateField("name", e.target.value)}
-            placeholder="例如：My Custom API"
-            disabled={isSubmitting}
-            className={cn(errors.name && "border-red-500")}
-            data-testid="provider-name-input"
-          />
-          {errors.name && (
-            <p className="text-xs text-red-500" data-testid="name-error">
-              {errors.name}
-            </p>
-          )}
-        </div>
-
-        {/* Provider 类型 */}
-        <div className="space-y-1.5">
-          <Label htmlFor="provider-type" className="text-sm font-medium">
-            Provider 类型
-          </Label>
-          <Select
-            value={formState.type}
-            onValueChange={(value) =>
-              updateField("type", value as ProviderType)
-            }
-            disabled={isSubmitting}
-          >
-            <SelectTrigger id="provider-type" data-testid="provider-type-select">
-              <span>{getProviderTypeLabel(formState.type)}</span>
-            </SelectTrigger>
-            <SelectContent>
-              {PROVIDER_TYPE_OPTIONS.map((type) => (
-                <SelectItem key={type.value} value={type.value}>
-                  {type.label}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-          <p className="text-xs text-muted-foreground">
-            大多数第三方 API 服务使用 OpenAI 兼容格式
-          </p>
-        </div>
-
-        {/* API Host */}
-        <div className="space-y-1.5">
-          <Label htmlFor="api-host" className="text-sm font-medium">
-            API Host <span className="text-red-500">*</span>
-          </Label>
-          <Input
-            id="api-host"
-            type="text"
-            value={formState.apiHost}
-            onChange={(e) => updateField("apiHost", e.target.value)}
-            placeholder="https://api.example.com"
-            disabled={isSubmitting}
-            className={cn(errors.apiHost && "border-red-500")}
-            data-testid="api-host-input"
-          />
-          {errors.apiHost && (
-            <p className="text-xs text-red-500" data-testid="api-host-error">
-              {errors.apiHost}
-            </p>
-          )}
-        </div>
-
-        {/* API Key */}
-        <div className="space-y-1.5">
-          <Label htmlFor="api-key" className="text-sm font-medium">
-            API Key <span className="text-red-500">*</span>
-          </Label>
-          <Input
-            id="api-key"
-            type="password"
-            value={formState.apiKey}
-            onChange={(e) => updateField("apiKey", e.target.value)}
-            placeholder="sk-..."
-            disabled={isSubmitting}
-            className={cn(errors.apiKey && "border-red-500")}
-            data-testid="api-key-input"
-          />
-          {errors.apiKey && (
-            <p className="text-xs text-red-500" data-testid="api-key-error">
-              {errors.apiKey}
-            </p>
-          )}
-        </div>
-
-        {/* Azure OpenAI: API Version */}
-        {extraFields.includes("apiVersion") && (
-          <div className="space-y-1.5">
-            <Label htmlFor="api-version" className="text-sm font-medium">
-              API Version
-            </Label>
-            <Input
-              id="api-version"
-              type="text"
-              value={formState.apiVersion}
-              onChange={(e) => updateField("apiVersion", e.target.value)}
-              placeholder="2024-02-15-preview"
-              disabled={isSubmitting}
-              className={cn(errors.apiVersion && "border-red-500")}
-              data-testid="api-version-input"
-            />
-            {errors.apiVersion && (
-              <p
-                className="text-xs text-red-500"
-                data-testid="api-version-error"
-              >
-                {errors.apiVersion}
-              </p>
-            )}
-          </div>
-        )}
-
-        {/* VertexAI: Project */}
-        {extraFields.includes("project") && (
-          <div className="space-y-1.5">
-            <Label htmlFor="project" className="text-sm font-medium">
-              Project ID
-            </Label>
-            <Input
-              id="project"
-              type="text"
-              value={formState.project}
-              onChange={(e) => updateField("project", e.target.value)}
-              placeholder="your-project-id"
-              disabled={isSubmitting}
-              data-testid="project-input"
-            />
-          </div>
-        )}
-
-        {/* VertexAI: Location */}
-        {extraFields.includes("location") && (
-          <div className="space-y-1.5">
-            <Label htmlFor="location" className="text-sm font-medium">
-              Location
-            </Label>
-            <Input
-              id="location"
-              type="text"
-              value={formState.location}
-              onChange={(e) => updateField("location", e.target.value)}
-              placeholder="us-central1"
-              disabled={isSubmitting}
-              data-testid="location-input"
-            />
-          </div>
-        )}
-
-        {/* AWS Bedrock: Region */}
-        {extraFields.includes("region") && (
-          <div className="space-y-1.5">
-            <Label htmlFor="region" className="text-sm font-medium">
-              Region
-            </Label>
-            <Input
-              id="region"
-              type="text"
-              value={formState.region}
-              onChange={(e) => updateField("region", e.target.value)}
-              placeholder="us-east-1"
-              disabled={isSubmitting}
-              data-testid="region-input"
-            />
-          </div>
-        )}
-
-        {/* 提交错误 */}
-        {submitError && (
-          <div
-            className="p-3 rounded-lg bg-red-50 text-red-600 text-sm"
-            data-testid="submit-error"
-          >
-            {submitError}
-          </div>
-        )}
       </ModalBody>
 
       <ModalFooter>
diff --git a/src/components/provider-pool/api-key/AddCustomProviderModal.ui.test.tsx b/src/components/provider-pool/api-key/AddCustomProviderModal.ui.test.tsx
new file mode 100644
index 000000000..17ca4b825
--- /dev/null
+++ b/src/components/provider-pool/api-key/AddCustomProviderModal.ui.test.tsx
@@ -0,0 +1,222 @@
+import { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const { mockUseModelRegistry } = vi.hoisted(() => ({
+  mockUseModelRegistry: vi.fn(),
+}));
+
+const { mockGetSystemProviderCatalog } = vi.hoisted(() => ({
+  mockGetSystemProviderCatalog: vi.fn(),
+}));
+
+vi.mock("@/hooks/useModelRegistry", () => ({
+  useModelRegistry: () => mockUseModelRegistry(),
+}));
+
+vi.mock("@/lib/api/apiKeyProvider", () => ({
+  apiKeyProviderApi: {
+    getSystemProviderCatalog: mockGetSystemProviderCatalog,
+  },
+}));
+
+import { AddCustomProviderModal } from "./AddCustomProviderModal";
+
+interface MountedRoot {
+  container: HTMLDivElement;
+  root: Root;
+}
+
+const mountedRoots: MountedRoot[] = [];
+
+function renderModal() {
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  const root = createRoot(container);
+
+  act(() => {
+    root.render(
+      <AddCustomProviderModal
+        isOpen
+        onClose={vi.fn()}
+        onAdd={vi.fn().mockResolvedValue({ id: "provider-001" })}
+        onAddApiKey={vi.fn().mockResolvedValue(undefined)}
+      />,
+    );
+  });
+
+  mountedRoots.push({ container, root });
+}
+
+async function settleModal() {
+  await act(async () => {
+    await Promise.resolve();
+    await Promise.resolve();
+  });
+}
+
+function findByTestId<T extends Element>(testId: string): T {
+  const element = document.querySelector<T>(`[data-testid="${testId}"]`);
+  if (!element) {
+    throw new Error(`未找到节点: ${testId}`);
+  }
+  return element;
+}
+
+beforeEach(() => {
+  (
+    globalThis as typeof globalThis & {
+      IS_REACT_ACT_ENVIRONMENT?: boolean;
+    }
+  ).IS_REACT_ACT_ENVIRONMENT = true;
+
+  mockUseModelRegistry.mockReturnValue({
+    groupedByProvider: new Map(),
+  });
+
+  mockGetSystemProviderCatalog.mockResolvedValue([
+    {
+      id: "google",
+      name: "Google (Gemini)",
+      type: "gemini",
+      api_host: "https://generativelanguage.googleapis.com",
+      group: "cloud",
+      sort_order: 1,
+      api_version: null,
+      legacy_ids: ["gemini"],
+    },
+    {
+      id: "deepseek",
+      name: "DeepSeek",
+      type: "openai",
+      api_host: "https://api.deepseek.com",
+      group: "mainstream",
+      sort_order: 2,
+      api_version: null,
+      legacy_ids: [],
+    },
+    {
+      id: "zhipu",
+      name: "智谱 AI",
+      type: "openai",
+      api_host: "https://open.bigmodel.cn/api/paas/v4/",
+      group: "chinese",
+      sort_order: 3,
+      api_version: null,
+      legacy_ids: ["zhipuai"],
+    },
+  ]);
+});
+
+afterEach(() => {
+  vi.clearAllMocks();
+
+  while (mountedRoots.length > 0) {
+    const mounted = mountedRoots.pop();
+    if (!mounted) {
+      break;
+    }
+
+    act(() => {
+      mounted.root.unmount();
+    });
+    mounted.container.remove();
+  }
+});
+
+describe("AddCustomProviderModal", () => {
+  it("应展示双栏模板选择布局", async () => {
+    renderModal();
+
+    await settleModal();
+
+    expect(document.body.textContent ?? "").toContain("新增服务商");
+    expect(document.body.textContent ?? "").toContain("选择模板");
+    expect(document.body.textContent ?? "").toContain("基础接入信息");
+    expect(document.body.textContent ?? "").toContain("协议与附加参数");
+  });
+
+  it("选择 Gemini 模板后应预填并展示特例协议提示", async () => {
+    renderModal();
+
+    await settleModal();
+
+    await act(async () => {
+      findByTestId<HTMLButtonElement>("known-provider-item-google").click();
+    });
+
+    const nameInput = findByTestId<HTMLInputElement>("provider-name-input");
+    const hostInput = findByTestId<HTMLInputElement>("api-host-input");
+
+    expect(nameInput.value).toBe("Google (Gemini)");
+    expect(hostInput.value).toBe("https://generativelanguage.googleapis.com");
+    expect(document.body.textContent ?? "").toContain("协议特例保留");
+    expect(document.body.textContent ?? "").toContain(
+      "Gemini 保留原生协议能力",
+    );
+  });
+
+  it("选择智谱模板后应预填正确的 GLM Base URL", async () => {
+    renderModal();
+
+    await settleModal();
+
+    await act(async () => {
+      findByTestId<HTMLButtonElement>("known-provider-item-zhipu").click();
+    });
+
+    const nameInput = findByTestId<HTMLInputElement>("provider-name-input");
+    const hostInput = findByTestId<HTMLInputElement>("api-host-input");
+
+    expect(nameInput.value).toBe("智谱 AI");
+    expect(hostInput.value).toBe("https://open.bigmodel.cn/api/paas/v4/");
+  });
+
+  it("应注入 Codex CLI、Gemini CLI 与 Claude Code 特例模板", async () => {
+    renderModal();
+
+    await settleModal();
+
+    expect(
+      document.querySelector('[data-testid="known-provider-item-codex-cli"]'),
+    ).not.toBeNull();
+    expect(
+      document.querySelector('[data-testid="known-provider-item-gemini-cli"]'),
+    ).not.toBeNull();
+    expect(
+      document.querySelector('[data-testid="known-provider-item-claude-code"]'),
+    ).not.toBeNull();
+  });
+
+  it("选择 Codex CLI 模板后应预填专属协议与地址", async () => {
+    renderModal();
+
+    await settleModal();
+
+    await act(async () => {
+      findByTestId<HTMLButtonElement>("known-provider-item-codex-cli").click();
+    });
+
+    const nameInput = findByTestId<HTMLInputElement>("provider-name-input");
+    const hostInput = findByTestId<HTMLInputElement>("api-host-input");
+    const providerTypeSelect = findByTestId<HTMLElement>("provider-type-select");
+
+    expect(nameInput.value).toBe("Codex CLI");
+    expect(hostInput.value).toBe("https://api.openai.com");
+    expect(providerTypeSelect.textContent ?? "").toContain("Codex CLI");
+    expect(document.body.textContent ?? "").toContain("Codex 保留 Lime 的专属协议");
+  });
+
+  it("legacy 别名只应参与搜索，不应重复渲染模板卡片", async () => {
+    renderModal();
+
+    await settleModal();
+
+    expect(
+      document.querySelector('[data-testid="known-provider-item-gemini"]'),
+    ).toBeNull();
+    expect(
+      document.querySelector('[data-testid="known-provider-item-zhipuai"]'),
+    ).toBeNull();
+  });
+});
diff --git a/src/components/provider-pool/api-key/ApiKeyList.tsx b/src/components/provider-pool/api-key/ApiKeyList.tsx
index b65020d67..27a015c3a 100644
--- a/src/components/provider-pool/api-key/ApiKeyList.tsx
+++ b/src/components/provider-pool/api-key/ApiKeyList.tsx
@@ -7,13 +7,15 @@
  * **Validates: Requirements 7.1**
  */
 
-import React, { useState } from "react";
+import React, { useMemo, useState } from "react";
 import { cn } from "@/lib/utils";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { ApiKeyItem } from "./ApiKeyItem";
 import type { ApiKeyDisplay } from "@/lib/api/apiKeyProvider";
+import { getProviderAccessHelp } from "@/lib/provider/providerAccessHelp";
+import { SectionInfoButton } from "./SectionInfoButton";
 
 // ============================================================================
 // 图标组件
@@ -71,6 +73,10 @@ export interface ApiKeyListProps {
   apiKeys: ApiKeyDisplay[];
   /** Provider ID */
   providerId: string;
+  /** Provider 显示名称 */
+  providerName?: string;
+  /** Provider API Host */
+  apiHost?: string;
   /** 添加 API Key 回调 */
   onAdd?: (providerId: string, apiKey: string, alias?: string) => Promise<void>;
   /** 切换 API Key 启用状态回调 */
@@ -106,6 +112,8 @@ export interface ApiKeyListProps {
 export const ApiKeyList: React.FC<ApiKeyListProps> = ({
   apiKeys,
   providerId,
+  providerName,
+  apiHost,
   onAdd,
   onToggle,
   onDelete,
@@ -119,22 +127,47 @@ export const ApiKeyList: React.FC<ApiKeyListProps> = ({
   const [isAdding, setIsAdding] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
-  // 监听 apiKeys 变化，用于调试
-  React.useEffect(() => {
-    console.log(
-      `[ApiKeyList] 组件更新: providerId=${providerId}, apiKeys.length=${apiKeys.length}`,
-    );
-    apiKeys.forEach((k, i) => {
-      console.log(
-        `[ApiKeyList]   [${i}] id=${k.id}, masked=${k.api_key_masked}`,
-      );
-    });
-  }, [apiKeys, providerId]);
+  const enabledCount = useMemo(
+    () => apiKeys.filter((item) => item.enabled).length,
+    [apiKeys],
+  );
 
-  // 监听 providerId 变化
-  React.useEffect(() => {
-    console.log(`[ApiKeyList] providerId 变化: ${providerId}`);
-  }, [providerId]);
+  const errorCount = useMemo(
+    () => apiKeys.reduce((sum, item) => sum + item.error_count, 0),
+    [apiKeys],
+  );
+
+  const latestUsedLabel = useMemo(() => {
+    const latestUsedAt = apiKeys
+      .map((item) => item.last_used_at)
+      .filter((value): value is string => Boolean(value))
+      .sort((a, b) => new Date(b).getTime() - new Date(a).getTime())[0];
+
+    if (!latestUsedAt) {
+      return "暂无调用";
+    }
+
+    const diffMs = Date.now() - new Date(latestUsedAt).getTime();
+    const diffMins = Math.floor(diffMs / 60000);
+    const diffHours = Math.floor(diffMs / 3600000);
+    const diffDays = Math.floor(diffMs / 86400000);
+
+    if (diffMins < 1) return "刚刚";
+    if (diffMins < 60) return `${diffMins} 分钟前`;
+    if (diffHours < 24) return `${diffHours} 小时前`;
+    if (diffDays < 30) return `${diffDays} 天前`;
+    return new Date(latestUsedAt).toLocaleDateString("zh-CN");
+  }, [apiKeys]);
+
+  const providerAccessHelp = useMemo(
+    () =>
+      getProviderAccessHelp({
+        providerId,
+        providerName,
+        apiHost,
+      }),
+    [apiHost, providerId, providerName],
+  );
 
   const handleAdd = async () => {
     if (!newApiKey.trim()) {
@@ -146,24 +179,12 @@ export const ApiKeyList: React.FC<ApiKeyListProps> = ({
     setError(null);
 
     try {
-      console.log("[ApiKeyList] 开始添加 API Key:", {
-        providerId,
-        alias: newAlias.trim() || undefined,
-        apiKeyLength: newApiKey.trim().length,
-      });
       await onAdd?.(providerId, newApiKey.trim(), newAlias.trim() || undefined);
-      console.log(
-        "[ApiKeyList] API Key 添加成功，当前 apiKeys:",
-        apiKeys.length,
-      );
-
-      // 重置表单
       setNewApiKey("");
       setNewAlias("");
       setShowAddForm(false);
       setShowApiKey(false);
     } catch (e) {
-      console.error("[ApiKeyList] API Key 添加失败:", e);
       setError(e instanceof Error ? e.message : "添加失败");
     } finally {
       setIsAdding(false);
@@ -179,130 +200,183 @@ export const ApiKeyList: React.FC<ApiKeyListProps> = ({
   };
 
   return (
-    <div className={cn("space-y-3", className)} data-testid="api-key-list">
-      {/* 标题和添加按钮 */}
-      <div className="flex items-center justify-between">
-        <h4 className="text-sm font-medium text-foreground">
-          API Keys ({apiKeys.length})
-        </h4>
-        {!showAddForm && (
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={() => setShowAddForm(true)}
-            disabled={loading}
-            data-testid="add-api-key-button"
-          >
-            <PlusIcon className="mr-1" />
-            添加
-          </Button>
-        )}
+    <div
+      className={cn(
+        "rounded-[24px] border border-slate-200/80 bg-white p-4 shadow-sm shadow-slate-950/5",
+        className,
+      )}
+      data-testid="api-key-list"
+    >
+      <div className="flex flex-wrap items-start justify-between gap-3">
+        <div className="flex items-center gap-2">
+          <h4 className="text-base font-semibold text-slate-900">API Key</h4>
+          {providerAccessHelp.helpText || providerAccessHelp.keylessHint ? (
+            <SectionInfoButton
+              label="查看 API Key 获取说明"
+              triggerTestId="provider-api-key-info-button"
+              contentTestId="provider-api-key-info-content"
+            >
+              <p
+                data-testid={
+                  providerAccessHelp.keylessHint
+                    ? "provider-api-key-keyless-hint"
+                    : "provider-api-key-help-text"
+                }
+              >
+                {providerAccessHelp.keylessHint ?? providerAccessHelp.helpText}
+              </p>
+              {providerAccessHelp.url ? (
+                <a
+                  href={providerAccessHelp.url}
+                  target="_blank"
+                  rel="noreferrer"
+                  className="mt-2 inline-flex font-semibold text-slate-900 underline underline-offset-4"
+                  data-testid="provider-api-key-help-link"
+                >
+                  前往获取
+                </a>
+              ) : null}
+            </SectionInfoButton>
+          ) : null}
+        </div>
+
+        <div className="flex flex-wrap items-center gap-2">
+          <span className="inline-flex rounded-full border border-slate-200 bg-slate-50 px-3 py-1 text-xs text-slate-600">
+            已启用 {enabledCount}
+          </span>
+          {apiKeys.length > 0 ? (
+            <span className="inline-flex rounded-full border border-slate-200 bg-slate-50 px-3 py-1 text-xs text-slate-600">
+              最近调用 {latestUsedLabel}
+            </span>
+          ) : null}
+          {errorCount > 0 ? (
+            <span className="inline-flex rounded-full border border-rose-200 bg-rose-50 px-3 py-1 text-xs text-rose-700">
+              错误 {errorCount}
+            </span>
+          ) : null}
+          {!showAddForm && (
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => setShowAddForm(true)}
+              disabled={loading}
+              className="shrink-0 whitespace-nowrap border-slate-200 bg-white px-3"
+              data-testid="add-api-key-button"
+            >
+              <PlusIcon className="mr-1" />
+              新增 API Key
+            </Button>
+          )}
+        </div>
       </div>
 
-      {/* 添加表单 */}
-      {showAddForm && (
-        <div
-          className="p-3 rounded-lg border border-border bg-muted/20 space-y-3"
-          data-testid="add-api-key-form"
-        >
-          {/* API Key 输入 */}
-          <div className="space-y-1.5">
-            <Label htmlFor="new-api-key" className="text-xs">
-              API Key <span className="text-red-500">*</span>
-            </Label>
-            <div className="relative">
-              <Input
-                id="new-api-key"
-                type={showApiKey ? "text" : "password"}
-                value={newApiKey}
-                onChange={(e) => setNewApiKey(e.target.value)}
-                placeholder="输入 API Key"
-                className="pr-10"
+        {showAddForm ? (
+          <div
+            className="mt-4 rounded-[20px] border border-slate-200 bg-slate-50/80 p-4"
+            data-testid="add-api-key-form"
+          >
+            <div
+              className="space-y-4"
+              data-testid="add-api-key-fields-stack"
+            >
+              <div className="min-w-0 space-y-1.5">
+                <Label htmlFor="new-api-key" className="text-xs font-medium">
+                  API Key <span className="text-red-500">*</span>
+                </Label>
+                <div className="relative">
+                  <Input
+                    id="new-api-key"
+                    type={showApiKey ? "text" : "password"}
+                    value={newApiKey}
+                    onChange={(e) => setNewApiKey(e.target.value)}
+                    placeholder="输入 API Key"
+                    className="border-slate-200 bg-white pr-10"
+                    disabled={isAdding}
+                    autoComplete="new-password"
+                    data-testid="new-api-key-input"
+                  />
+                  <button
+                    type="button"
+                    className="absolute right-2 top-1/2 -translate-y-1/2 text-slate-400 hover:text-slate-900"
+                    onClick={() => setShowApiKey(!showApiKey)}
+                    tabIndex={-1}
+                  >
+                    {showApiKey ? <EyeSlashIcon /> : <EyeIcon />}
+                  </button>
+                </div>
+              </div>
+
+              <div className="min-w-0 space-y-1.5">
+                <Label htmlFor="new-alias" className="text-xs font-medium">
+                  别名（可选）
+                </Label>
+                <Input
+                  id="new-alias"
+                  type="text"
+                  value={newAlias}
+                  onChange={(e) => setNewAlias(e.target.value)}
+                  placeholder="例如：生产主账号"
+                  disabled={isAdding}
+                  className="border-slate-200 bg-white"
+                  autoComplete="off"
+                  data-testid="new-alias-input"
+                />
+              </div>
+            </div>
+
+            {error ? (
+              <p className="mt-3 text-xs text-red-500" data-testid="add-error">
+                {error}
+              </p>
+            ) : null}
+
+            <div className="mt-4 flex justify-end gap-2">
+              <Button
+                variant="ghost"
+                size="sm"
+                onClick={handleCancel}
                 disabled={isAdding}
-                data-testid="new-api-key-input"
-              />
-              <button
-                type="button"
-                className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
-                onClick={() => setShowApiKey(!showApiKey)}
-                tabIndex={-1}
               >
-                {showApiKey ? <EyeSlashIcon /> : <EyeIcon />}
-              </button>
+                取消
+              </Button>
+              <Button
+                size="sm"
+                onClick={handleAdd}
+                disabled={isAdding || !newApiKey.trim()}
+                data-testid="confirm-add-button"
+              >
+                {isAdding ? "添加中..." : "确认添加"}
+              </Button>
             </div>
           </div>
+        ) : null}
 
-          {/* 别名输入 */}
-          <div className="space-y-1.5">
-            <Label htmlFor="new-alias" className="text-xs">
-              别名（可选）
-            </Label>
-            <Input
-              id="new-alias"
-              type="text"
-              value={newAlias}
-              onChange={(e) => setNewAlias(e.target.value)}
-              placeholder="例如：主账号、测试账号"
-              disabled={isAdding}
-              data-testid="new-alias-input"
-            />
+        {apiKeys.length > 0 ? (
+          <div className="mt-4 space-y-3" data-testid="api-key-items">
+            {apiKeys.map((apiKey) => (
+              <ApiKeyItem
+                key={apiKey.id}
+                apiKey={apiKey}
+                onToggle={onToggle}
+                onDelete={onDelete}
+                loading={loading}
+                className="rounded-[18px] border border-slate-200/80 bg-slate-50 px-4 py-3 hover:bg-slate-100/80"
+              />
+            ))}
           </div>
-
-          {/* 错误提示 */}
-          {error && (
-            <p className="text-xs text-red-500" data-testid="add-error">
-              {error}
-            </p>
-          )}
-
-          {/* 操作按钮 */}
-          <div className="flex justify-end gap-2">
-            <Button
-              variant="ghost"
-              size="sm"
-              onClick={handleCancel}
-              disabled={isAdding}
+        ) : (
+          !showAddForm && (
+            <div
+              className="mt-4 rounded-[20px] border border-dashed border-slate-200 bg-slate-50/60 px-4 py-10 text-center"
+              data-testid="empty-state"
             >
-              取消
-            </Button>
-            <Button
-              size="sm"
-              onClick={handleAdd}
-              disabled={isAdding || !newApiKey.trim()}
-              data-testid="confirm-add-button"
-            >
-              {isAdding ? "添加中..." : "确认添加"}
-            </Button>
-          </div>
-        </div>
-      )}
-
-      {/* API Key 列表 */}
-      {apiKeys.length > 0 ? (
-        <div className="space-y-2" data-testid="api-key-items">
-          {apiKeys.map((apiKey) => (
-            <ApiKeyItem
-              key={apiKey.id}
-              apiKey={apiKey}
-              onToggle={onToggle}
-              onDelete={onDelete}
-              loading={loading}
-            />
-          ))}
-        </div>
-      ) : (
-        !showAddForm && (
-          <div
-            className="py-8 text-center text-sm text-muted-foreground"
-            data-testid="empty-state"
-          >
-            <p>暂无 API Key</p>
-            <p className="mt-1 text-xs">
-              点击上方「添加」按钮添加第一个 API Key
-            </p>
-          </div>
-        )
-      )}
+              <p className="text-sm font-medium text-slate-900">暂无 API Key</p>
+              <p className="mt-1 text-xs text-slate-500">
+                先新增第一把 Key，之后再做连接测试与模型刷新
+              </p>
+            </div>
+          )
+        )}
     </div>
   );
 };
diff --git a/src/components/provider-pool/api-key/ApiKeyList.ui.test.tsx b/src/components/provider-pool/api-key/ApiKeyList.ui.test.tsx
new file mode 100644
index 000000000..9c2f2db32
--- /dev/null
+++ b/src/components/provider-pool/api-key/ApiKeyList.ui.test.tsx
@@ -0,0 +1,133 @@
+import { act, type ComponentProps } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+
+import type { ApiKeyDisplay } from "@/lib/api/apiKeyProvider";
+import { ApiKeyList } from "./ApiKeyList";
+
+interface MountedRoot {
+  container: HTMLDivElement;
+  root: Root;
+}
+
+const mountedRoots: MountedRoot[] = [];
+
+function createApiKey(overrides: Partial<ApiKeyDisplay> = {}): ApiKeyDisplay {
+  return {
+    id: "key-001",
+    provider_id: "openai",
+    api_key_masked: "sk-****1234",
+    alias: "默认账号",
+    enabled: true,
+    usage_count: 3,
+    error_count: 0,
+    last_used_at: new Date("2026-03-30T08:00:00.000Z").toISOString(),
+    created_at: new Date("2026-03-29T00:00:00.000Z").toISOString(),
+    ...overrides,
+  };
+}
+
+function renderList(
+  props: Partial<ComponentProps<typeof ApiKeyList>> = {},
+) {
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  const root = createRoot(container);
+
+  const mergedProps: ComponentProps<typeof ApiKeyList> = {
+    apiKeys: [],
+    providerId: "zhipu",
+    providerName: "智谱 AI",
+    apiHost: "https://open.bigmodel.cn/api/paas/v4/",
+    ...props,
+  };
+
+  act(() => {
+    root.render(<ApiKeyList {...mergedProps} />);
+  });
+
+  mountedRoots.push({ container, root });
+  return container;
+}
+
+beforeEach(() => {
+  (
+    globalThis as typeof globalThis & {
+      IS_REACT_ACT_ENVIRONMENT?: boolean;
+    }
+  ).IS_REACT_ACT_ENVIRONMENT = true;
+});
+
+afterEach(() => {
+  while (mountedRoots.length > 0) {
+    const mounted = mountedRoots.pop();
+    if (!mounted) {
+      break;
+    }
+
+    act(() => {
+      mounted.root.unmount();
+    });
+    mounted.container.remove();
+  }
+});
+
+describe("ApiKeyList", () => {
+  it("应通过说明按钮展示 API Key 获取入口", () => {
+    const container = renderList();
+
+    const infoButton = container.querySelector<HTMLButtonElement>(
+      '[data-testid="provider-api-key-info-button"]',
+    );
+
+    expect(infoButton).not.toBeNull();
+
+    act(() => {
+      infoButton?.click();
+    });
+
+    const helpLink = document.querySelector<HTMLAnchorElement>(
+      '[data-testid="provider-api-key-help-link"]',
+    );
+
+    expect(document.body.textContent ?? "").toContain("如何获取 API Key");
+    expect(helpLink).not.toBeNull();
+    expect(helpLink?.href).toContain("open.bigmodel.cn/usercenter/apikeys");
+  });
+
+  it("本地渠道应在说明按钮内展示通常无需 API Key 的提示", () => {
+    const container = renderList({
+      providerId: "ollama",
+      providerName: "Ollama",
+      apiHost: "http://localhost:11434",
+    });
+
+    const infoButton = container.querySelector<HTMLButtonElement>(
+      '[data-testid="provider-api-key-info-button"]',
+    );
+    expect(infoButton).not.toBeNull();
+
+    act(() => {
+      infoButton?.click();
+    });
+
+    const hint = document.querySelector(
+      '[data-testid="provider-api-key-keyless-hint"]',
+    );
+
+    expect(hint?.textContent ?? "").toContain("通常无需 API Key");
+  });
+
+  it("新增 API Key 按钮应保持单行显示", () => {
+    const container = renderList({
+      apiKeys: [createApiKey()],
+    });
+
+    const button = container.querySelector<HTMLButtonElement>(
+      '[data-testid="add-api-key-button"]',
+    );
+
+    expect(button).not.toBeNull();
+    expect(button?.className).toContain("whitespace-nowrap");
+  });
+});
diff --git a/src/components/provider-pool/api-key/ApiKeyProviderSection.tsx b/src/components/provider-pool/api-key/ApiKeyProviderSection.tsx
index d5b1823d1..fb526f02c 100644
--- a/src/components/provider-pool/api-key/ApiKeyProviderSection.tsx
+++ b/src/components/provider-pool/api-key/ApiKeyProviderSection.tsx
@@ -247,14 +247,11 @@ export const ApiKeyProviderSection = forwardRef<
   return (
     <div
       className={cn(
-        "relative flex h-full overflow-hidden rounded-[28px] border border-emerald-200/70 bg-[linear-gradient(135deg,rgba(244,251,248,0.96)_0%,rgba(248,250,252,0.98)_42%,rgba(241,246,255,0.96)_100%)] shadow-sm shadow-slate-950/5",
+        "relative flex h-full overflow-hidden rounded-[24px] border border-slate-200/80 bg-white shadow-sm shadow-slate-950/5",
         className,
       )}
       data-testid="api-key-provider-section"
     >
-      <div className="pointer-events-none absolute left-[240px] top-[-84px] h-64 w-64 rounded-full bg-emerald-200/25 blur-3xl" />
-      <div className="pointer-events-none absolute right-[-72px] top-[-32px] h-72 w-72 rounded-full bg-sky-200/22 blur-3xl" />
-
       {/* 左侧：Provider 列表 */}
       <ProviderList
         providersByGroup={providersByGroup}
@@ -266,12 +263,11 @@ export const ApiKeyProviderSection = forwardRef<
         onToggleGroup={toggleGroup}
         onAddCustomProvider={onAddCustomProvider}
         onImportExport={() => setShowImportExportDialog(true)}
-        className="flex-shrink-0 bg-card"
+        className="flex-shrink-0 bg-slate-50/80"
       />
 
       {/* 右侧：Provider 设置面板 */}
-      <div className="relative flex-1 min-w-0 overflow-hidden bg-[linear-gradient(180deg,rgba(248,250,252,0.78),rgba(241,245,249,0.42))]">
-        <div className="pointer-events-none absolute inset-0 bg-[linear-gradient(to_right,rgba(148,163,184,0.06)_1px,transparent_1px),linear-gradient(to_bottom,rgba(148,163,184,0.06)_1px,transparent_1px)] bg-[size:26px_26px] opacity-70" />
+      <div className="relative flex-1 min-w-0 overflow-hidden bg-white">
         <ProviderSetting
           provider={selectedProvider}
           onUpdate={handleUpdateProvider}
diff --git a/src/components/provider-pool/api-key/ProviderConfigForm.tsx b/src/components/provider-pool/api-key/ProviderConfigForm.tsx
index 37428da77..41c1223d1 100644
--- a/src/components/provider-pool/api-key/ProviderConfigForm.tsx
+++ b/src/components/provider-pool/api-key/ProviderConfigForm.tsx
@@ -36,16 +36,19 @@ import type { EnhancedModelMetadata } from "@/lib/types/modelRegistry";
 import type { ConfiguredProvider } from "@/hooks/useConfiguredProviders";
 import { useProviderModels } from "@/hooks/useProviderModels";
 import { resolveRegistryProviderId } from "./providerTypeMapping";
+import { getProviderModelAutoFetchCapability } from "@/lib/model/providerModelFetchSupport";
 import {
   dedupeModelIds,
-  getProviderTypeLabel,
+  getSpecialProtocolHint,
   getLatestSelectableModel,
+  getProviderTypeLabel,
   parseCustomModelsValue,
   PROVIDER_TYPE_FIELDS,
   PROVIDER_TYPE_OPTIONS,
   serializeCustomModels,
 } from "./ProviderConfigForm.utils";
-import { Plus, Star, X } from "lucide-react";
+import { Plus, Save, Star, X } from "lucide-react";
+import { SectionInfoButton } from "./SectionInfoButton";
 
 // ============================================================================
 // 常量
@@ -72,15 +75,6 @@ const FIELD_PLACEHOLDERS: Record<string, string> = {
   region: "us-east-1",
 };
 
-/** 字段帮助文本映射 */
-const FIELD_HELP_TEXT: Record<string, string> = {
-  apiHost: "API 服务的基础 URL",
-  apiVersion: "Azure OpenAI API 版本",
-  project: "Google Cloud 项目 ID",
-  location: "VertexAI 服务位置",
-  region: "AWS Bedrock 区域",
-};
-
 // ============================================================================
 // 类型定义
 // ============================================================================
@@ -108,6 +102,7 @@ export interface ProviderConfigFormRef {
 }
 
 interface FormState {
+  providerName: string;
   providerType: ProviderType;
   apiHost: string;
   apiVersion: string;
@@ -162,6 +157,7 @@ export const ProviderConfigForm = forwardRef<
   ) => {
     // 表单状态
     const [formState, setFormState] = useState<FormState>({
+      providerName: provider.name || "",
       providerType: (provider.type as ProviderType) || "openai",
       apiHost: provider.api_host || "",
       apiVersion: provider.api_version || "",
@@ -184,6 +180,10 @@ export const ProviderConfigForm = forwardRef<
       () => parseCustomModelsValue(formState.customModels),
       [formState.customModels],
     );
+    const enabledApiKeyCount = useMemo(
+      () => provider.api_keys.filter((apiKey) => apiKey.enabled).length,
+      [provider.api_keys],
+    );
 
     const configuredProvider = useMemo<ConfiguredProvider>(
       () => ({
@@ -195,10 +195,31 @@ export const ProviderConfigForm = forwardRef<
         }),
         type: formState.providerType,
         providerId: provider.id,
+        apiHost: formState.apiHost,
         customModels: selectedModels,
       }),
-      [formState.providerType, provider.id, provider.name, selectedModels],
+      [
+        formState.apiHost,
+        formState.providerType,
+        provider.id,
+        provider.name,
+        selectedModels,
+      ],
     );
+    const modelAutoFetchCapability = useMemo(
+      () =>
+        getProviderModelAutoFetchCapability({
+          providerId: provider.id,
+          providerType: formState.providerType,
+          apiHost: formState.apiHost,
+        }),
+      [formState.apiHost, formState.providerType, provider.id],
+    );
+    const requiresLiveModelTruth = modelAutoFetchCapability.supported;
+    const canReadLiveModels =
+      !requiresLiveModelTruth ||
+      !modelAutoFetchCapability.requiresApiKey ||
+      enabledApiKeyCount > 0;
 
     const {
       models: localCandidateModels,
@@ -206,7 +227,20 @@ export const ProviderConfigForm = forwardRef<
       error: localModelsError,
     } = useProviderModels(configuredProvider, {
       returnFullMetadata: true,
+      liveFetchOnly: requiresLiveModelTruth,
+      hasApiKey: enabledApiKeyCount > 0,
     });
+    const hasResolvedLiveModelDirectory =
+      !requiresLiveModelTruth || localCandidateModels.length > 0;
+    const shouldHideSavedModels =
+      requiresLiveModelTruth && !hasResolvedLiveModelDirectory;
+    const hiddenSelectedModelCount = shouldHideSavedModels
+      ? selectedModels.length
+      : 0;
+    const visibleSelectedModels = shouldHideSavedModels ? [] : selectedModels;
+    const shouldLockModelEditor =
+      requiresLiveModelTruth &&
+      (!canReadLiveModels || localModelsLoading || localCandidateModels.length === 0);
 
     const latestLocalModel = useMemo(() => {
       const localModelsWithMetadata = localCandidateModels.filter(
@@ -216,6 +250,10 @@ export const ProviderConfigForm = forwardRef<
     }, [localCandidateModels]);
 
     const recommendedLatestModel = useMemo(() => {
+      if (!hasResolvedLiveModelDirectory) {
+        return null;
+      }
+
       if (latestLocalModel) {
         return latestLocalModel;
       }
@@ -225,11 +263,56 @@ export const ProviderConfigForm = forwardRef<
       }
 
       return getLatestSelectableModel(localCandidateModels);
-    }, [latestLocalModel, localCandidateModels, localModelsLoading]);
+    }, [
+      hasResolvedLiveModelDirectory,
+      latestLocalModel,
+      localCandidateModels,
+      localModelsLoading,
+    ]);
+    const modelTruthNotice = useMemo(() => {
+      if (!requiresLiveModelTruth) {
+        return null;
+      }
+
+      if (!canReadLiveModels) {
+        return {
+          tone: "amber" as const,
+          title: "先补一把可用 API Key",
+          description:
+            "当前渠道会直接读取真实模型目录。为了避免继续展示旧缓存或错误模型，未配置可用 API Key 前暂不展示已选模型，也不开放手动输入。",
+        };
+      }
+
+      if (localModelsLoading) {
+        return {
+          tone: "slate" as const,
+          title: "正在读取真实模型目录",
+          description:
+            "读取完成前先不展示旧模型配置与推荐最新模型，避免把历史缓存误认为当前可用模型。",
+        };
+      }
+
+      if (localCandidateModels.length === 0) {
+        return {
+          tone: "amber" as const,
+          title: "当前未读取到真实模型目录",
+          description:
+            "这次没有拿到最新模型列表。为避免错误模型输出，页面不会继续展示旧模型或推荐模型，请先检查鉴权、Base URL 或接口兼容性。",
+        };
+      }
+
+      return null;
+    }, [
+      canReadLiveModels,
+      localCandidateModels.length,
+      localModelsLoading,
+      requiresLiveModelTruth,
+    ]);
 
     // 当 provider 变化时，重置表单状态
     useEffect(() => {
       setFormState({
+        providerName: provider.name || "",
         providerType: (provider.type as ProviderType) || "openai",
         apiHost: provider.api_host || "",
         apiVersion: provider.api_version || "",
@@ -242,6 +325,7 @@ export const ProviderConfigForm = forwardRef<
       setModelDraft("");
     }, [
       provider.id,
+      provider.name,
       provider.type,
       provider.api_host,
       provider.api_version,
@@ -268,14 +352,23 @@ export const ProviderConfigForm = forwardRef<
 
           const request: UpdateProviderRequest = {
             type: state.providerType,
-            api_host: state.apiHost || undefined,
-            api_version: state.apiVersion || undefined,
-            project: state.project || undefined,
-            location: state.location || undefined,
-            region: state.region || undefined,
-            custom_models: customModels.length > 0 ? customModels : undefined,
+            api_host: state.apiHost,
+            api_version: state.apiVersion,
+            project: state.project,
+            location: state.location,
+            region: state.region,
+            custom_models: customModels,
           };
 
+          const trimmedName = state.providerName.trim();
+          if (
+            !provider.is_system &&
+            trimmedName &&
+            trimmedName !== provider.name
+          ) {
+            request.name = trimmedName;
+          }
+
           await onUpdate(provider.id, request);
           setLastSaved(new Date());
         } catch (e) {
@@ -284,7 +377,7 @@ export const ProviderConfigForm = forwardRef<
           setIsSaving(false);
         }
       },
-      [provider.id, onUpdate],
+      [onUpdate, provider.id, provider.is_system, provider.name],
     );
 
     // 防抖保存
@@ -390,12 +483,21 @@ export const ProviderConfigForm = forwardRef<
     );
 
     useEffect(() => {
-      if (selectedModels.length > 0 || !recommendedLatestModel) {
+      if (
+        selectedModels.length > 0 ||
+        !recommendedLatestModel ||
+        shouldLockModelEditor
+      ) {
         return;
       }
 
       applyCustomModels([recommendedLatestModel.id]);
-    }, [applyCustomModels, recommendedLatestModel, selectedModels.length]);
+    }, [
+      applyCustomModels,
+      recommendedLatestModel,
+      selectedModels.length,
+      shouldLockModelEditor,
+    ]);
 
     useEffect(() => {
       onModelsChange?.(selectedModels);
@@ -405,11 +507,53 @@ export const ProviderConfigForm = forwardRef<
       onRecommendedLatestModelChange?.(recommendedLatestModel?.id ?? null);
     }, [onRecommendedLatestModelChange, recommendedLatestModel]);
 
-    // 获取当前 Provider 类型需要显示的额外字段
-    // 使用 formState 中的 providerType，这样修改类型后会立即更新显示的字段
     const extraFields = PROVIDER_TYPE_FIELDS[formState.providerType] || [];
+    const specialProtocolHint = getSpecialProtocolHint(formState.providerType);
+    const defaultModelId =
+      visibleSelectedModels[0] ?? recommendedLatestModel?.id ?? null;
+    const extraFieldConfigs = extraFields.map((field) => {
+      switch (field) {
+        case "apiVersion":
+          return {
+            field,
+            id: "api-version",
+            label: FIELD_LABELS.apiVersion,
+            placeholder: FIELD_PLACEHOLDERS.apiVersion,
+            value: formState.apiVersion,
+            testId: "api-version-input",
+          };
+        case "project":
+          return {
+            field,
+            id: "project",
+            label: FIELD_LABELS.project,
+            placeholder: FIELD_PLACEHOLDERS.project,
+            value: formState.project,
+            testId: "project-input",
+          };
+        case "location":
+          return {
+            field,
+            id: "location",
+            label: FIELD_LABELS.location,
+            placeholder: FIELD_PLACEHOLDERS.location,
+            value: formState.location,
+            testId: "location-input",
+          };
+        case "region":
+          return {
+            field,
+            id: "region",
+            label: FIELD_LABELS.region,
+            placeholder: FIELD_PLACEHOLDERS.region,
+            value: formState.region,
+            testId: "region-input",
+          };
+        default:
+          return null;
+      }
+    });
 
-    // 格式化最后保存时间
     const formatLastSaved = (date: Date | null): string => {
       if (!date) return "";
       return `已保存于 ${date.toLocaleTimeString("zh-CN")}`;
@@ -417,291 +561,332 @@ export const ProviderConfigForm = forwardRef<
 
     return (
       <div
-        className={cn("space-y-5", className)}
+        className={cn(
+          "rounded-[24px] border border-slate-200/80 bg-white p-4 shadow-sm shadow-slate-950/5",
+          className,
+        )}
         data-testid="provider-config-form"
       >
-        <div className="space-y-1.5">
-          <Label htmlFor="provider-type" className="text-sm font-medium">
-            Provider 类型
-          </Label>
-          <Select
-            value={formState.providerType}
-            onValueChange={(value) =>
-              handleFieldChange("providerType", value as ProviderType)
-            }
-            disabled={loading || isSaving}
-          >
-            <SelectTrigger id="provider-type" data-testid="provider-type-select">
-              <span>{getProviderTypeLabel(formState.providerType)}</span>
-            </SelectTrigger>
-            <SelectContent>
-              {PROVIDER_TYPE_OPTIONS.map((type) => (
-                <SelectItem key={type.value} value={type.value}>
-                  {type.label}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-          <p className="text-xs text-muted-foreground">
-            选择 API 协议类型，不同类型使用不同的请求格式
-          </p>
-        </div>
-
-        {/* API Host 字段（所有 Provider 都有） */}
-        <div className="space-y-1.5">
-          <Label htmlFor="api-host" className="text-sm font-medium">
-            {FIELD_LABELS.apiHost}
-          </Label>
-          <Input
-            id="api-host"
-            type="text"
-            value={formState.apiHost}
-            onChange={(e) => handleFieldChange("apiHost", e.target.value)}
-            placeholder={FIELD_PLACEHOLDERS.apiHost}
-            disabled={loading || isSaving}
-            data-testid="api-host-input"
-          />
-          <p className="text-xs text-muted-foreground">
-            {FIELD_HELP_TEXT.apiHost}
-          </p>
-        </div>
-
-        {/* Azure OpenAI: API Version */}
-        {extraFields.includes("apiVersion") && (
-          <div className="space-y-1.5">
-            <Label htmlFor="api-version" className="text-sm font-medium">
-              {FIELD_LABELS.apiVersion}
-            </Label>
-            <Input
-              id="api-version"
-              type="text"
-              value={formState.apiVersion}
-              onChange={(e) => handleFieldChange("apiVersion", e.target.value)}
-              placeholder={FIELD_PLACEHOLDERS.apiVersion}
-              disabled={loading || isSaving}
-              data-testid="api-version-input"
-            />
-            <p className="text-xs text-muted-foreground">
-              {FIELD_HELP_TEXT.apiVersion}
+        <div className="flex flex-wrap items-start justify-between gap-3">
+          <div className="flex items-center gap-2">
+            <p className="text-base font-semibold text-slate-900">
+              协议与默认模型
             </p>
-          </div>
-        )}
-
-        {/* VertexAI: Project */}
-        {extraFields.includes("project") && (
-          <div className="space-y-1.5">
-            <Label htmlFor="project" className="text-sm font-medium">
-              {FIELD_LABELS.project}
-            </Label>
-            <Input
-              id="project"
-              type="text"
-              value={formState.project}
-              onChange={(e) => handleFieldChange("project", e.target.value)}
-              placeholder={FIELD_PLACEHOLDERS.project}
-              disabled={loading || isSaving}
-              data-testid="project-input"
-            />
-            <p className="text-xs text-muted-foreground">
-              {FIELD_HELP_TEXT.project}
-            </p>
-          </div>
-        )}
-
-        {/* VertexAI: Location */}
-        {extraFields.includes("location") && (
-          <div className="space-y-1.5">
-            <Label htmlFor="location" className="text-sm font-medium">
-              {FIELD_LABELS.location}
-            </Label>
-            <Input
-              id="location"
-              type="text"
-              value={formState.location}
-              onChange={(e) => handleFieldChange("location", e.target.value)}
-              placeholder={FIELD_PLACEHOLDERS.location}
-              disabled={loading || isSaving}
-              data-testid="location-input"
-            />
-            <p className="text-xs text-muted-foreground">
-              {FIELD_HELP_TEXT.location}
-            </p>
-          </div>
-        )}
-
-        {/* AWS Bedrock: Region */}
-        {extraFields.includes("region") && (
-          <div className="space-y-1.5">
-            <Label htmlFor="region" className="text-sm font-medium">
-              {FIELD_LABELS.region}
-            </Label>
-            <Input
-              id="region"
-              type="text"
-              value={formState.region}
-              onChange={(e) => handleFieldChange("region", e.target.value)}
-              placeholder={FIELD_PLACEHOLDERS.region}
-              disabled={loading || isSaving}
-              data-testid="region-input"
-            />
-            <p className="text-xs text-muted-foreground">
-              {FIELD_HELP_TEXT.region}
-            </p>
-          </div>
-        )}
-
-        {/* 自定义模型列表 */}
-        <div className="rounded-2xl border border-border/80 bg-card p-4 shadow-sm">
-          <div className="space-y-4">
-            <div className="flex flex-col gap-3 xl:flex-row xl:items-start xl:justify-between">
-              <div className="space-y-1">
-                <Label
-                  htmlFor="custom-model-draft"
-                  className="text-sm font-medium"
-                >
-                  自定义模型
-                </Label>
-                <p className="text-xs text-muted-foreground">
-                  手动添加模型后会保留在这里；默认模型请在右侧“模型能力”列表中点击选择。
+            <SectionInfoButton
+              label="查看协议与默认模型说明"
+              triggerTestId="provider-config-info-button"
+            >
+              <p>
+                这里维护服务商名称、接口地址、协议类型和默认模型，保存会自动防抖提交。
+              </p>
+              <p className="mt-2">
+                {provider.is_system
+                  ? "官方供应商固定使用原生协议。"
+                  : "兼容协议主要用于自定义接入；官方供应商继续保持各自原生协议。"}
+              </p>
+              {specialProtocolHint ? (
+                <p className="mt-2" data-testid="protocol-special-hint">
+                  {specialProtocolHint}
                 </p>
-              </div>
-            </div>
+              ) : null}
+            </SectionInfoButton>
+          </div>
+          <div className="inline-flex items-center gap-2 rounded-full border border-slate-200 bg-slate-50 px-3 py-1 text-xs text-slate-600">
+            <Save className="h-3.5 w-3.5" />
+            <span>
+              {isSaving
+                ? "保存中..."
+                : saveError
+                  ? "保存失败"
+                  : lastSaved
+                    ? formatLastSaved(lastSaved)
+                    : "修改后自动保存"}
+            </span>
+          </div>
+        </div>
 
-            <input
-              id="custom-models"
-              type="hidden"
-              value={formState.customModels}
-              readOnly
-            />
-
-            <div className="rounded-xl border border-border/70 bg-muted/20 p-3">
-              <div className="flex min-h-[56px] flex-wrap gap-2">
-                {selectedModels.length > 0 ? (
-                  selectedModels.map((modelId, index) => {
-                    const isLatest = recommendedLatestModel?.id === modelId;
-                    return (
-                      <div
-                        key={modelId}
-                        className="inline-flex items-center gap-1.5 rounded-full border border-border/70 bg-background px-2 py-1 text-xs normal-case"
-                      >
-                        <span className="max-w-[220px] truncate normal-case">
-                          {modelId}
-                        </span>
-                        {index === 0 ? (
-                          <Badge variant="secondary">默认</Badge>
-                        ) : null}
-                        {isLatest ? (
-                          <Badge variant="outline">最新</Badge>
-                        ) : null}
-                        {index > 0 ? (
-                          <Button
-                            type="button"
-                            variant="ghost"
-                            size="icon"
-                            className="h-5 w-5 rounded-full"
-                            onClick={() => setDefaultModel(modelId)}
-                            title="设为默认模型"
-                          >
-                            <Star className="h-3 w-3" />
-                          </Button>
-                        ) : null}
-                        <Button
-                          type="button"
-                          variant="ghost"
-                          size="icon"
-                          className="h-5 w-5 rounded-full"
-                          onClick={() => handleRemoveModel(modelId)}
-                          title="移除模型"
-                        >
-                          <X className="h-3 w-3" />
-                        </Button>
-                      </div>
-                    );
-                  })
-                ) : (
-                  <p className="text-xs text-muted-foreground">
-                    尚未选择模型。检测到可用模型后，系统会默认填入最新模型。
-                  </p>
-                )}
-              </div>
-            </div>
-
-            <div className="flex flex-col gap-2 sm:flex-row">
+        <div className="mt-4 grid gap-3 lg:grid-cols-2">
+          {!provider.is_system ? (
+            <div className="space-y-1.5">
+              <Label htmlFor="provider-name" className="text-sm font-medium">
+                Provider 名称
+              </Label>
               <Input
-                id="custom-model-draft"
-                type="text"
-                className="normal-case bg-background"
-                value={modelDraft}
-                onChange={(e) => setModelDraft(e.target.value)}
-                onKeyDown={(e) => {
-                  if (e.key === "Enter" || e.key === ",") {
-                    e.preventDefault();
-                    handleAddModelDraft();
-                  }
-                }}
-                placeholder="手动输入模型 ID，按 Enter 添加"
-                autoCapitalize="none"
-                autoCorrect="off"
-                spellCheck={false}
+                id="provider-name"
+                value={formState.providerName}
+                onChange={(e) =>
+                  handleFieldChange("providerName", e.target.value)
+                }
+                placeholder="输入服务商名称"
                 disabled={loading || isSaving}
-                data-testid="custom-models-input"
+                className="border-slate-200 bg-white"
+                data-testid="provider-name-input"
               />
-              <Button
-                type="button"
-                variant="outline"
-                onClick={handleAddModelDraft}
-                disabled={loading || isSaving || !modelDraft.trim()}
-                className="sm:min-w-[88px]"
-              >
-                <Plus className="mr-1 h-4 w-4" />
-                添加
-              </Button>
             </div>
+          ) : null}
 
-            <div className="flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
-              <span>
-                第一个模型会作为默认模型，用于测试与默认请求；若未显式选择，则自动使用最新模型。
-              </span>
+          {!provider.is_system ? (
+            <div className="space-y-1.5">
+              <Label htmlFor="provider-type" className="text-sm font-medium">
+                Provider 类型
+              </Label>
+              <Select
+                value={formState.providerType}
+                onValueChange={(value) =>
+                  handleFieldChange("providerType", value as ProviderType)
+                }
+                disabled={loading || isSaving}
+              >
+                <SelectTrigger
+                  id="provider-type"
+                  className="border-slate-200 bg-white"
+                  data-testid="provider-type-select"
+                >
+                  <span>{getProviderTypeLabel(formState.providerType)}</span>
+                </SelectTrigger>
+                <SelectContent>
+                  {PROVIDER_TYPE_OPTIONS.map((type) => (
+                    <SelectItem key={type.value} value={type.value}>
+                      {type.label}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+          ) : (
+            <div className="space-y-1.5">
+              <Label className="text-sm font-medium">Provider 类型</Label>
+              <div className="rounded-[16px] border border-slate-200 bg-slate-50 px-4 py-3 text-sm text-slate-700">
+                {getProviderTypeLabel(formState.providerType)}
+              </div>
+            </div>
+          )}
+
+          <div
+            className={cn(
+              "space-y-1.5",
+              provider.is_system ? "lg:col-span-2" : "",
+            )}
+          >
+            <Label htmlFor="api-host" className="text-sm font-medium">
+              {FIELD_LABELS.apiHost}
+            </Label>
+            <Input
+              id="api-host"
+              type="text"
+              value={formState.apiHost}
+              onChange={(e) => handleFieldChange("apiHost", e.target.value)}
+              placeholder={FIELD_PLACEHOLDERS.apiHost}
+              disabled={loading || isSaving}
+              className="border-slate-200 bg-white"
+              data-testid="api-host-input"
+            />
+          </div>
+
+          {extraFieldConfigs.map((config) => {
+            if (!config) {
+              return null;
+            }
+
+            return (
+              <div key={config.field} className="space-y-1.5">
+                <Label htmlFor={config.id} className="text-sm font-medium">
+                  {config.label}
+                </Label>
+                <Input
+                  id={config.id}
+                  type="text"
+                  value={config.value}
+                  onChange={(e) =>
+                    handleFieldChange(config.field, e.target.value)
+                  }
+                  placeholder={config.placeholder}
+                  disabled={loading || isSaving}
+                  className="border-slate-200 bg-white"
+                  data-testid={config.testId}
+                />
+              </div>
+            );
+          })}
+        </div>
+
+        <div className="mt-5 border-t border-slate-200 pt-4">
+          <div className="flex flex-wrap items-start justify-between gap-3">
+            <div className="flex items-center gap-2">
+              <p className="text-sm font-semibold text-slate-900">默认模型</p>
+              <SectionInfoButton
+                label="查看默认模型说明"
+                triggerTestId="provider-default-model-info-button"
+              >
+                <p>
+                  第一个模型会被视为默认模型。支持实时拉取的渠道，只有在拿到真实模型目录后才会展示当前模型与推荐最新模型。
+                </p>
+              </SectionInfoButton>
+            </div>
+            <div className="flex flex-wrap gap-2">
+              <Badge
+                variant="outline"
+                className="border-slate-200 bg-slate-50 text-slate-600"
+              >
+                当前：
+                {defaultModelId ??
+                  (requiresLiveModelTruth ? "待读取真实目录" : "待指定")}
+              </Badge>
               {recommendedLatestModel ? (
-                <span>
-                  当前推荐最新模型：
-                  <span className="font-medium normal-case">
-                    {recommendedLatestModel.id}
-                  </span>
-                </span>
+                <Badge
+                  variant="outline"
+                  className="border-sky-200 bg-sky-50 text-sky-700"
+                >
+                  推荐最新：{recommendedLatestModel.id}
+                </Badge>
               ) : null}
             </div>
-            {localModelsError ? (
-              <p className="text-xs text-amber-600">{localModelsError}</p>
-            ) : null}
-            {localModelsLoading ? (
-              <p className="text-xs text-muted-foreground">
-                正在加载模型列表...
-              </p>
-            ) : null}
           </div>
-        </div>
 
-        {/* 保存状态指示 */}
-        <div className="flex items-center justify-between text-xs">
+          <input
+            id="custom-models"
+            type="hidden"
+            value={formState.customModels}
+            readOnly
+          />
+
+          {modelTruthNotice ? (
+            <div
+              className={cn(
+                "mt-4 rounded-[18px] border px-4 py-3 text-sm leading-6",
+                modelTruthNotice.tone === "amber"
+                  ? "border-amber-200 bg-amber-50 text-amber-900"
+                  : "border-slate-200 bg-slate-50 text-slate-700",
+              )}
+              data-testid="provider-model-truth-notice"
+            >
+              <p className="font-semibold">{modelTruthNotice.title}</p>
+              <p className="mt-1">{modelTruthNotice.description}</p>
+            </div>
+          ) : null}
+
+          <div className="mt-4 flex min-h-[64px] flex-wrap gap-2">
+            {visibleSelectedModels.length > 0 ? (
+              visibleSelectedModels.map((modelId, index) => {
+                const isLatest = recommendedLatestModel?.id === modelId;
+                return (
+                  <div
+                    key={modelId}
+                    className="inline-flex items-center gap-2 rounded-full border border-slate-200 bg-slate-50 px-3 py-1.5 text-xs"
+                  >
+                    <span className="max-w-[220px] truncate normal-case text-slate-900">
+                      {modelId}
+                    </span>
+                    {index === 0 ? (
+                      <Badge className="bg-slate-900 text-white hover:bg-slate-900">
+                        默认
+                      </Badge>
+                    ) : null}
+                    {isLatest ? <Badge variant="outline">最新</Badge> : null}
+                    {index > 0 ? (
+                      <Button
+                        type="button"
+                        variant="ghost"
+                        size="icon"
+                        className="h-5 w-5 rounded-full text-slate-500 hover:text-slate-900"
+                        onClick={() => setDefaultModel(modelId)}
+                        title="设为默认模型"
+                      >
+                        <Star className="h-3 w-3" />
+                      </Button>
+                    ) : null}
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="icon"
+                      className="h-5 w-5 rounded-full text-slate-500 hover:text-slate-900"
+                      onClick={() => handleRemoveModel(modelId)}
+                      title="移除模型"
+                    >
+                      <X className="h-3 w-3" />
+                    </Button>
+                  </div>
+                );
+              })
+            ) : (
+              <div className="rounded-[18px] border border-dashed border-slate-200 bg-slate-50 px-4 py-4 text-sm text-slate-500">
+                {hiddenSelectedModelCount > 0
+                  ? `已保存 ${hiddenSelectedModelCount} 个模型配置，待读取真实模型目录后再展示。`
+                  : requiresLiveModelTruth
+                    ? "读取到真实模型目录后，才会展示当前模型与推荐最新模型。"
+                    : "尚未指定模型。读取到模型目录后会自动填入推荐最新模型。"}
+              </div>
+            )}
+          </div>
+
+          <div className="mt-4 flex flex-col gap-2 sm:flex-row">
+            <Input
+              id="custom-model-draft"
+              type="text"
+              className="normal-case border-slate-200 bg-white"
+              value={modelDraft}
+              onChange={(e) => setModelDraft(e.target.value)}
+              onKeyDown={(e) => {
+                if (e.key === "Enter" || e.key === ",") {
+                  e.preventDefault();
+                  handleAddModelDraft();
+                }
+              }}
+              placeholder={
+                shouldLockModelEditor
+                  ? "先读取真实模型目录，再补充模型 ID"
+                  : "手动输入模型 ID，按 Enter 添加"
+              }
+              autoCapitalize="none"
+              autoCorrect="off"
+              spellCheck={false}
+              disabled={loading || isSaving || shouldLockModelEditor}
+              data-testid="custom-models-input"
+            />
+            <Button
+              type="button"
+              variant="outline"
+              onClick={handleAddModelDraft}
+              disabled={
+                loading ||
+                isSaving ||
+                shouldLockModelEditor ||
+                !modelDraft.trim()
+              }
+              className="border-slate-200 bg-white sm:min-w-[112px]"
+            >
+              <Plus className="mr-1 h-4 w-4" />
+              添加模型
+            </Button>
+          </div>
+
+          {localModelsError ? (
+            <p className="mt-3 text-xs text-amber-600">{localModelsError}</p>
+          ) : null}
+          {localModelsLoading ? (
+            <p className="mt-3 text-xs text-slate-500">正在加载模型列表...</p>
+          ) : null}
+          {saveError ? (
+            <p className="mt-3 text-xs text-red-500" data-testid="save-error">
+              {saveError}
+            </p>
+          ) : null}
+          {lastSaved && !isSaving && !saveError ? (
+            <p
+              className="mt-3 text-xs text-emerald-600"
+              data-testid="save-success"
+            >
+              {formatLastSaved(lastSaved)}
+            </p>
+          ) : null}
           {isSaving ? (
-            <span
-              className="text-muted-foreground"
+            <p
+              className="mt-3 text-xs text-slate-500"
               data-testid="saving-indicator"
             >
               保存中...
-            </span>
-          ) : saveError ? (
-            <span className="text-red-500" data-testid="save-error">
-              {saveError}
-            </span>
-          ) : lastSaved ? (
-            <span className="text-green-600" data-testid="save-success">
-              {formatLastSaved(lastSaved)}
-            </span>
-          ) : (
-            <span />
-          )}
+            </p>
+          ) : null}
         </div>
       </div>
     );
diff --git a/src/components/provider-pool/api-key/ProviderConfigForm.ui.test.tsx b/src/components/provider-pool/api-key/ProviderConfigForm.ui.test.tsx
index f2e176d52..3629886e4 100644
--- a/src/components/provider-pool/api-key/ProviderConfigForm.ui.test.tsx
+++ b/src/components/provider-pool/api-key/ProviderConfigForm.ui.test.tsx
@@ -3,12 +3,12 @@ import { createRoot, type Root } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { ProviderWithKeysDisplay } from "@/lib/api/apiKeyProvider";
 
+const { mockUseProviderModels } = vi.hoisted(() => ({
+  mockUseProviderModels: vi.fn(),
+}));
+
 vi.mock("@/hooks/useProviderModels", () => ({
-  useProviderModels: () => ({
-    models: [],
-    loading: false,
-    error: null,
-  }),
+  useProviderModels: mockUseProviderModels,
 }));
 
 import { ProviderConfigForm } from "./ProviderConfigForm";
@@ -77,6 +77,11 @@ beforeEach(() => {
     }
   ).IS_REACT_ACT_ENVIRONMENT = true;
   vi.useFakeTimers();
+  mockUseProviderModels.mockReturnValue({
+    models: [],
+    loading: false,
+    error: null,
+  });
 });
 
 afterEach(() => {
@@ -94,8 +99,41 @@ afterEach(() => {
 });
 
 describe("ProviderConfigForm", () => {
-  it("系统 Provider 应显示协议选择并保存协议变更", async () => {
+  it("系统 Provider 应固定原生协议，不展示兼容协议切换", () => {
     const provider = createProvider();
+    const { container } = renderForm(provider);
+
+    const trigger = container.querySelector<HTMLButtonElement>(
+      '[data-testid="provider-type-select"]',
+    );
+    expect(trigger).toBeNull();
+    expect(container.textContent ?? "").toContain("OpenAI Responses API");
+    expect(
+      container.querySelector('[data-testid="provider-config-info-button"]'),
+    ).not.toBeNull();
+  });
+
+  it("实时拉模型渠道在未读取到真实目录时不应继续展示旧模型", () => {
+    const provider = createProvider({
+      custom_models: ["gpt-4.1"],
+      api_keys: [],
+    });
+    const { container } = renderForm(provider);
+
+    expect(container.textContent ?? "").toContain("先补一把可用 API Key");
+    expect(container.textContent ?? "").toContain("已保存 1 个模型配置");
+    expect(container.textContent ?? "").not.toContain("推荐最新模型：gpt-4.1");
+    expect(container.textContent ?? "").not.toContain(">gpt-4.1<");
+    expect(container.textContent ?? "").not.toContain("当前默认模型：gpt-4.1");
+  });
+
+  it("自定义 Provider 应允许切换兼容协议并保存", async () => {
+    const provider = createProvider({
+      id: "custom-openai",
+      name: "自定义 OpenAI",
+      is_system: false,
+      type: "openai-response",
+    });
     const { container, onUpdate } = renderForm(provider);
 
     const trigger = container.querySelector<HTMLButtonElement>(
@@ -119,7 +157,7 @@ describe("ProviderConfigForm", () => {
 
     expect(onUpdate).toHaveBeenCalledTimes(1);
     expect(onUpdate).toHaveBeenCalledWith(
-      "openai",
+      "custom-openai",
       expect.objectContaining({
         type: "openai",
       }),
diff --git a/src/components/provider-pool/api-key/ProviderConfigForm.utils.ts b/src/components/provider-pool/api-key/ProviderConfigForm.utils.ts
index bf805c772..fe89f4592 100644
--- a/src/components/provider-pool/api-key/ProviderConfigForm.utils.ts
+++ b/src/components/provider-pool/api-key/ProviderConfigForm.utils.ts
@@ -46,6 +46,17 @@ export const PROVIDER_TYPE_FIELDS: Record<ProviderType, string[]> = {
   gateway: [],
 };
 
+const SPECIAL_PROVIDER_PROTOCOL_HINTS: Partial<Record<ProviderType, string>> = {
+  codex:
+    "Codex 保留 Lime 的专属协议与模型别名能力，会继续使用独立的 Codex 模型映射与鉴权链路。",
+  anthropic:
+    "Anthropic 继续使用原生协议，不会被收敛到普通 OpenAI 兼容请求格式。",
+  "anthropic-compatible":
+    "Anthropic 兼容用于接入实现 Anthropic wire format 的第三方服务，仍按 Anthropic 语义处理请求与模型映射。",
+  gemini:
+    "Gemini 保留原生协议能力与专属模型映射，不按普通 OpenAI 兼容 Provider 处理。",
+};
+
 export function isSupportedProviderType(
   providerType: string,
 ): providerType is ProviderType {
@@ -59,6 +70,16 @@ export function getProviderTypeLabel(providerType: string): string {
   );
 }
 
+export function isSpecialProtocolProviderType(type: ProviderType): boolean {
+  return getSpecialProtocolHint(type) !== null;
+}
+
+export function getSpecialProtocolHint(
+  type: ProviderType,
+): string | null {
+  return SPECIAL_PROVIDER_PROTOCOL_HINTS[type] ?? null;
+}
+
 export function dedupeModelIds(modelIds: string[]): string[] {
   const seen = new Set<string>();
   const result: string[] = [];
diff --git a/src/components/provider-pool/api-key/ProviderList.tsx b/src/components/provider-pool/api-key/ProviderList.tsx
index 1add1db64..6e16e88ee 100644
--- a/src/components/provider-pool/api-key/ProviderList.tsx
+++ b/src/components/provider-pool/api-key/ProviderList.tsx
@@ -108,25 +108,30 @@ export const ProviderList: React.FC<ProviderListProps> = ({
   return (
     <div
       className={cn(
-        "flex flex-col h-full w-60 border-r border-border bg-background",
+        "flex h-full w-[280px] flex-col border-r border-slate-200/80 bg-slate-50/80",
         className,
       )}
       data-testid="provider-list"
     >
       {/* 搜索框 */}
-      <div className="p-3 border-b border-border">
+      <div className="border-b border-slate-200/80 px-4 py-4">
+        <div className="mb-3">
+          <p className="text-sm font-semibold text-slate-900">服务商列表</p>
+          <p className="text-xs text-slate-500">
+            已加载 {totalProviders} 个 Provider
+          </p>
+        </div>
         <div className="relative">
-          <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+          <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-slate-400" />
           <input
             type="text"
-            placeholder="搜索 Provider..."
+            placeholder="搜索服务商或协议..."
             value={searchQuery}
             onChange={(e) => onSearchChange?.(e.target.value)}
             className={cn(
-              "w-full pl-9 pr-3 py-2 text-sm rounded-lg",
-              "bg-muted/50 border border-transparent",
-              "placeholder:text-muted-foreground/60",
-              "focus:outline-none focus:border-primary/30 focus:bg-background",
+              "w-full rounded-xl border border-slate-200 bg-white py-2 pl-9 pr-3 text-sm",
+              "placeholder:text-slate-400",
+              "focus:border-slate-300 focus:outline-none",
               "transition-colors",
             )}
             data-testid="provider-search-input"
@@ -136,11 +141,11 @@ export const ProviderList: React.FC<ProviderListProps> = ({
 
       {/* Provider 分组列表 */}
       <div
-        className="flex-1 overflow-y-auto p-2"
+        className="flex-1 overflow-y-auto px-3 py-3"
         data-testid="provider-groups-container"
       >
         {totalProviders === 0 ? (
-          <div className="flex flex-col items-center justify-center h-32 text-muted-foreground text-sm">
+          <div className="flex h-32 flex-col items-center justify-center text-sm text-slate-500">
             <p>未找到 Provider</p>
             {searchQuery && <p className="text-xs mt-1">尝试其他搜索词</p>}
           </div>
@@ -166,17 +171,17 @@ export const ProviderList: React.FC<ProviderListProps> = ({
 
       {/* 添加自定义 Provider 按钮 */}
       {(onAddCustomProvider || onImportExport) && (
-        <div className="p-3 border-t border-border space-y-2">
+        <div className="space-y-2 border-t border-slate-200/80 px-4 py-4">
           {onAddCustomProvider && (
             <button
               type="button"
               onClick={onAddCustomProvider}
               className={cn(
-                "flex items-center justify-center gap-2 w-full px-3 py-2 rounded-lg",
-                "text-sm font-medium text-primary",
-                "bg-primary/10 hover:bg-primary/20",
+                "flex w-full items-center justify-center gap-2 rounded-xl px-3 py-2",
+                "text-sm font-medium text-slate-900",
+                "bg-white hover:bg-slate-100 border border-slate-200",
                 "transition-colors",
-                "focus:outline-none focus:ring-2 focus:ring-primary/20",
+                "focus:outline-none focus:ring-2 focus:ring-slate-200",
               )}
               data-testid="add-custom-provider-button"
             >
@@ -189,11 +194,11 @@ export const ProviderList: React.FC<ProviderListProps> = ({
               type="button"
               onClick={onImportExport}
               className={cn(
-                "flex items-center justify-center gap-2 w-full px-3 py-2 rounded-lg",
-                "text-sm font-medium text-muted-foreground",
-                "bg-muted/50 hover:bg-muted",
+                "flex w-full items-center justify-center gap-2 rounded-xl px-3 py-2",
+                "text-sm font-medium text-slate-600",
+                "bg-slate-100 hover:bg-slate-200",
                 "transition-colors",
-                "focus:outline-none focus:ring-2 focus:ring-muted/20",
+                "focus:outline-none focus:ring-2 focus:ring-slate-200",
               )}
               data-testid="import-export-button"
             >
diff --git a/src/components/provider-pool/api-key/ProviderModelList.test.tsx b/src/components/provider-pool/api-key/ProviderModelList.test.tsx
index 0652ba1c2..05e9f9831 100644
--- a/src/components/provider-pool/api-key/ProviderModelList.test.tsx
+++ b/src/components/provider-pool/api-key/ProviderModelList.test.tsx
@@ -6,20 +6,29 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 const { mockUseModelRegistry } = vi.hoisted(() => ({
   mockUseModelRegistry: vi.fn(),
 }));
+const { mockGetSystemProviderCatalog, mockGetModelRegistryProviderIds } =
+  vi.hoisted(() => ({
+    mockGetSystemProviderCatalog: vi.fn(async () => []),
+    mockGetModelRegistryProviderIds: vi.fn(async () => ["openai"]),
+  }));
+const { mockFetchProviderModelsAuto } = vi.hoisted(() => ({
+  mockFetchProviderModelsAuto: vi.fn(),
+}));
 
 vi.mock("@/hooks/useModelRegistry", () => ({
-  useModelRegistry: (...args: unknown[]) => mockUseModelRegistry(...args),
+  useModelRegistry: mockUseModelRegistry,
 }));
 
 vi.mock("@/lib/api/apiKeyProvider", () => ({
   apiKeyProviderApi: {
-    getSystemProviderCatalog: vi.fn(async () => []),
+    getSystemProviderCatalog: mockGetSystemProviderCatalog,
   },
 }));
 
 vi.mock("@/lib/api/modelRegistry", () => ({
+  fetchProviderModelsAuto: mockFetchProviderModelsAuto,
   modelRegistryApi: {
-    getModelRegistryProviderIds: vi.fn(async () => ["openai"]),
+    getModelRegistryProviderIds: mockGetModelRegistryProviderIds,
   },
 }));
 
@@ -27,7 +36,10 @@ vi.mock("@tauri-apps/api/core", () => ({
   invoke: vi.fn(),
 }));
 
-import { ProviderModelList } from "./ProviderModelList";
+import {
+  ProviderModelList,
+} from "./ProviderModelList";
+import { isProviderModelsCacheExpired } from "./providerModelListCache";
 
 interface MountedRoot {
   root: Root;
@@ -100,6 +112,13 @@ beforeEach(() => {
     loading: false,
     error: null,
   });
+  mockGetSystemProviderCatalog.mockResolvedValue([]);
+  mockGetModelRegistryProviderIds.mockResolvedValue(["openai"]);
+  mockFetchProviderModelsAuto.mockResolvedValue({
+    models: [],
+    source: "Api",
+    error: null,
+  });
 });
 
 afterEach(() => {
@@ -116,7 +135,10 @@ afterEach(() => {
 
 describe("ProviderModelList", () => {
   it("应展示思考与多模态能力标签", async () => {
-    const container = renderProviderModelList();
+    const container = renderProviderModelList({
+      providerId: "openai",
+      providerType: "azure-openai",
+    });
     await act(async () => {
       await Promise.resolve();
     });
@@ -124,4 +146,147 @@ describe("ProviderModelList", () => {
     expect(container.textContent).toContain("无思考");
     expect(container.textContent).toContain("支持多模态");
   });
+
+  it("官方供应商即使未配置 Key 也应显式展示获取最新模型按钮", async () => {
+    const container = renderProviderModelList({
+      providerId: "gemini",
+      providerType: "gemini",
+      hasApiKey: false,
+    });
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    const button = Array.from(container.querySelectorAll("button")).find(
+      (item) => item.textContent?.includes("获取最新模型"),
+    );
+
+    expect(button).not.toBeUndefined();
+    expect((button as HTMLButtonElement).disabled).toBe(true);
+  });
+
+  it("支持实时拉模型的渠道在无 Key 时不应展示 registry 旧模型", async () => {
+    const container = renderProviderModelList({
+      providerId: "openai",
+      providerType: "openai",
+      hasApiKey: false,
+    });
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(container.textContent ?? "").toContain("请先添加可用 API Key");
+    expect(container.textContent ?? "").not.toContain("GPT-4.1");
+  });
+
+  it("Ollama 在未配置 Key 时也应允许直接获取最新模型", async () => {
+    const container = renderProviderModelList({
+      providerId: "ollama",
+      providerType: "ollama",
+      hasApiKey: false,
+      apiHost: "http://localhost:11434",
+    });
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    const button = Array.from(container.querySelectorAll("button")).find(
+      (item) => item.textContent?.includes("获取最新模型"),
+    );
+
+    expect(button).not.toBeUndefined();
+    expect((button as HTMLButtonElement).disabled).toBe(false);
+  });
+
+  it("获取最新模型按钮应保持单行，避免被工具栏挤压换行", async () => {
+    const container = renderProviderModelList({
+      providerId: "deepseek",
+      providerType: "openai",
+      hasApiKey: true,
+    });
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    const button = Array.from(container.querySelectorAll("button")).find(
+      (item) => item.textContent?.includes("获取最新模型"),
+    ) as HTMLButtonElement | undefined;
+
+    expect(button).not.toBeUndefined();
+    expect(button?.className).toContain("whitespace-nowrap");
+    expect(button?.className).toContain("shrink-0");
+  });
+
+  it("窄容器时工具栏应默认纵向堆叠，避免标题被压成逐字换行", async () => {
+    const container = renderProviderModelList({
+      providerId: "openai",
+      providerType: "azure-openai",
+      hasApiKey: true,
+    });
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    const toolbar = container.querySelector<HTMLElement>(
+      '[data-testid="provider-model-list-toolbar"]',
+    );
+    const actions = container.querySelector<HTMLElement>(
+      '[data-testid="provider-model-list-actions"]',
+    );
+
+    expect(toolbar?.className).toContain("flex-col");
+    expect(toolbar?.className).toContain("2xl:flex-row");
+    expect(actions?.className).toContain("w-full");
+    expect(actions?.className).toContain("2xl:min-w-[360px]");
+  });
+
+  it("暂不支持自动获取的云端协议不应再展示获取最新模型按钮", async () => {
+    const container = renderProviderModelList({
+      providerId: "azure-openai",
+      providerType: "azure-openai",
+      hasApiKey: true,
+    });
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    const button = Array.from(container.querySelectorAll("button")).find(
+      (item) => item.textContent?.includes("获取最新模型"),
+    );
+
+    expect(button).toBeUndefined();
+    expect(container.textContent).toContain("当前不展示自动获取入口");
+  });
+
+  it("模型真相源异常时应显式展示错误，不再伪装成正常空态", async () => {
+    mockGetModelRegistryProviderIds.mockRejectedValueOnce(
+      new Error("未找到 models index.json"),
+    );
+
+    const container = renderProviderModelList();
+
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(container.textContent).toContain("模型真相源异常");
+    expect(container.textContent).toContain("未找到 models index.json");
+  });
+
+  it("Provider 模型缓存应在 TTL 后过期", () => {
+    expect(isProviderModelsCacheExpired(1_000, 1_000)).toBe(false);
+    expect(
+      isProviderModelsCacheExpired(1_000, 1_000 + 5 * 60 * 1000 - 1),
+    ).toBe(false);
+    expect(
+      isProviderModelsCacheExpired(1_000, 1_000 + 5 * 60 * 1000),
+    ).toBe(true);
+  });
 });
diff --git a/src/components/provider-pool/api-key/ProviderModelList.tsx b/src/components/provider-pool/api-key/ProviderModelList.tsx
index 01a1d9e6d..88b18cfc4 100644
--- a/src/components/provider-pool/api-key/ProviderModelList.tsx
+++ b/src/components/provider-pool/api-key/ProviderModelList.tsx
@@ -10,13 +10,16 @@ import { useModelRegistry } from "@/hooks/useModelRegistry";
 import {
   Sparkles,
   Check,
+  AlertCircle,
   Loader2,
   RefreshCw,
   Cloud,
   HardDrive,
+  Search,
 } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
+import { Input } from "@/components/ui/input";
 import {
   Tooltip,
   TooltipContent,
@@ -36,6 +39,11 @@ import {
   resolveRegistryProviderId,
 } from "./providerTypeMapping";
 import { getLatestSelectableModel } from "./ProviderConfigForm.utils";
+import { getProviderModelAutoFetchCapability } from "@/lib/model/providerModelFetchSupport";
+import {
+  buildProviderModelsCacheKey,
+  isProviderModelsCacheExpired,
+} from "./providerModelListCache";
 
 // ============================================================================
 // 类型定义
@@ -56,6 +64,8 @@ export interface ProviderModelListProps {
   onLatestModelResolved?: (modelId: string | null) => void;
   /** 是否有可用的 API Key（用于显示刷新按钮） */
   hasApiKey?: boolean;
+  /** 当前 Provider 的 API Host */
+  apiHost?: string;
   /** 额外的 CSS 类名 */
   className?: string;
   /** 最大显示数量，默认显示全部 */
@@ -73,6 +83,7 @@ interface CachedProviderModels {
   requestUrl: string | null;
   diagnosticHint: string | null;
   shouldPromptError: boolean;
+  cachedAt: number;
 }
 
 const providerModelsCache = new Map<string, CachedProviderModels>();
@@ -122,11 +133,13 @@ const ModelItem: React.FC<ModelItemProps> = ({
   return (
     <div
       className={cn(
-        "flex items-start justify-between gap-3 rounded-lg border px-3 py-2 transition-colors",
-        onSelect ? "cursor-pointer hover:bg-muted/50" : "hover:bg-muted/50",
+        "group flex items-start justify-between gap-3 rounded-[18px] border px-4 py-3 transition-colors",
+        onSelect
+          ? "cursor-pointer hover:border-slate-300 hover:bg-slate-50"
+          : "hover:bg-slate-50",
         isDefault
-          ? "border-primary/30 bg-primary/5"
-          : "border-transparent bg-transparent",
+          ? "border-slate-900 bg-slate-900/[0.03]"
+          : "border-slate-200/80 bg-white",
       )}
       onClick={onSelect ? () => onSelect(model.id) : undefined}
       role={onSelect ? "button" : undefined}
@@ -145,21 +158,33 @@ const ModelItem: React.FC<ModelItemProps> = ({
     >
       <div className="flex-1 min-w-0">
         <div className="flex items-center gap-2">
-          <span className="text-sm font-medium truncate">
+          <span className="truncate text-sm font-medium">
             {model.display_name}
           </span>
           {isLatest ? <Badge variant="outline">最新</Badge> : null}
           {isDefault ? <Badge variant="secondary">默认</Badge> : null}
         </div>
-        <div className="text-xs text-muted-foreground truncate">{model.id}</div>
+        <div className="truncate text-xs text-muted-foreground">{model.id}</div>
         <ModelCapabilityBadges
           capabilities={model.capabilities}
           className="mt-2"
         />
       </div>
 
-      <div className="flex items-center gap-1.5 pt-1">
-        {isDefault ? <Check className="h-3.5 w-3.5 text-primary" /> : null}
+      <div className="flex shrink-0 items-center gap-2 pt-1">
+        {isDefault ? <Check className="h-3.5 w-3.5 text-slate-900" /> : null}
+        {onSelect ? (
+          <span
+            className={cn(
+              "rounded-full border px-2.5 py-1 text-[11px] font-medium transition-colors",
+              isDefault
+                ? "border-slate-900 bg-slate-900 text-white"
+                : "border-slate-200 bg-white text-slate-600 group-hover:border-slate-300 group-hover:text-slate-900",
+            )}
+          >
+            {isDefault ? "当前默认" : "设为默认"}
+          </span>
+        ) : null}
       </div>
     </div>
   );
@@ -187,15 +212,38 @@ export const ProviderModelList: React.FC<ProviderModelListProps> = ({
   onSelectModel,
   onLatestModelResolved,
   hasApiKey = false,
+  apiHost,
   className,
   maxItems,
 }) => {
+  const autoFetchCapability = useMemo(
+    () =>
+      getProviderModelAutoFetchCapability({
+        providerId,
+        providerType,
+        apiHost,
+      }),
+    [apiHost, providerId, providerType],
+  );
+  const canRefreshFromApi =
+    autoFetchCapability.supported &&
+    (!autoFetchCapability.requiresApiKey || hasApiKey);
+  const refreshTooltipText = autoFetchCapability.supported
+    ? autoFetchCapability.requiresApiKey && !hasApiKey
+      ? "先配置可用 API Key 后才能获取最新模型"
+      : "自动获取最新模型列表"
+    : (autoFetchCapability.unsupportedReason ??
+      "当前协议暂不支持自动获取最新模型");
+  const [searchQuery, setSearchQuery] = useState("");
   const [catalogAliasMap, setCatalogAliasMap] = useState<Record<
     string,
     string
   > | null>(null);
   const [validRegistryProviderIds, setValidRegistryProviderIds] =
     useState<Set<string> | null>(null);
+  const [registryTruthError, setRegistryTruthError] = useState<string | null>(
+    null,
+  );
 
   useEffect(() => {
     let cancelled = false;
@@ -234,10 +282,15 @@ export const ProviderModelList: React.FC<ProviderModelListProps> = ({
         }
 
         setValidRegistryProviderIds(new Set(providerIds));
-      } catch {
+        setRegistryTruthError(null);
+      } catch (error) {
         if (cancelled) {
           return;
         }
+
+        setRegistryTruthError(
+          error instanceof Error ? error.message : String(error),
+        );
         setValidRegistryProviderIds(null);
       }
     };
@@ -278,7 +331,11 @@ export const ProviderModelList: React.FC<ProviderModelListProps> = ({
     null,
   );
   const [apiShouldPromptError, setApiShouldPromptError] = useState(false);
-  const cacheKey = `${providerId}:${providerType}`;
+  const cacheKey = buildProviderModelsCacheKey({
+    providerId,
+    providerType,
+    apiHost,
+  });
 
   useEffect(() => {
     const cached = providerModelsCache.get(cacheKey);
@@ -292,16 +349,34 @@ export const ProviderModelList: React.FC<ProviderModelListProps> = ({
       return;
     }
 
+    if (
+      isProviderModelsCacheExpired(cached.cachedAt) ||
+      (autoFetchCapability.requiresApiKey && !hasApiKey)
+    ) {
+      providerModelsCache.delete(cacheKey);
+      setApiModels(null);
+      setApiSource(null);
+      setApiError(null);
+      setApiRequestUrl(null);
+      setApiDiagnosticHint(null);
+      setApiShouldPromptError(false);
+      return;
+    }
+
     setApiModels(cached.models);
     setApiSource(cached.source);
     setApiError(cached.error);
     setApiRequestUrl(cached.requestUrl);
     setApiDiagnosticHint(cached.diagnosticHint);
     setApiShouldPromptError(cached.shouldPromptError);
-  }, [cacheKey]);
+  }, [autoFetchCapability.requiresApiKey, cacheKey, hasApiKey]);
 
   // 从 API 获取模型列表（自动获取 API Key）
   const handleRefreshFromApi = useCallback(async () => {
+    if (!autoFetchCapability.supported) {
+      return;
+    }
+
     setRefreshing(true);
     setApiError(null);
     setApiRequestUrl(null);
@@ -313,8 +388,12 @@ export const ProviderModelList: React.FC<ProviderModelListProps> = ({
         await fetchProviderModelsAuto(providerId);
 
       if (result && result.models) {
-        setApiModels(result.models);
-        setApiSource(result.source);
+        const shouldDisplayFetchedModels =
+          result.source === "Api" && result.models.length > 0;
+        const nextModels = shouldDisplayFetchedModels ? result.models : [];
+
+        setApiModels(nextModels);
+        setApiSource(shouldDisplayFetchedModels ? "Api" : null);
         setApiRequestUrl(result.request_url ?? null);
         setApiDiagnosticHint(result.diagnostic_hint ?? null);
         setApiShouldPromptError(Boolean(result.should_prompt_error));
@@ -324,41 +403,73 @@ export const ProviderModelList: React.FC<ProviderModelListProps> = ({
           setApiError(null);
         }
 
-        providerModelsCache.set(cacheKey, {
-          models: result.models,
-          source: result.source ?? null,
-          error: result.error ?? null,
-          requestUrl: result.request_url ?? null,
-          diagnosticHint: result.diagnostic_hint ?? null,
-          shouldPromptError: Boolean(result.should_prompt_error),
-        });
+        if (shouldDisplayFetchedModels) {
+          providerModelsCache.set(cacheKey, {
+            models: nextModels,
+            source: "Api",
+            error: result.error ?? null,
+            requestUrl: result.request_url ?? null,
+            diagnosticHint: result.diagnostic_hint ?? null,
+            shouldPromptError: Boolean(result.should_prompt_error),
+            cachedAt: Date.now(),
+          });
+        } else {
+          providerModelsCache.delete(cacheKey);
+        }
       } else {
         setApiError("返回结果格式错误");
       }
     } catch (err) {
       setApiError(err instanceof Error ? err.message : String(err));
+      providerModelsCache.delete(cacheKey);
     } finally {
       setRefreshing(false);
     }
-  }, [cacheKey, providerId]);
+  }, [autoFetchCapability.supported, cacheKey, providerId]);
 
   // 使用 API 模型或本地模型
-  const displayModelsSource = apiModels ?? models;
+  const displayModelsSource = useMemo(
+    () =>
+      autoFetchCapability.supported
+        ? (apiModels ?? [])
+        : registryTruthError
+          ? []
+          : models,
+    [apiModels, autoFetchCapability.supported, models, registryTruthError],
+  );
+  const filteredModelsSource = useMemo(() => {
+    if (!searchQuery.trim()) {
+      return displayModelsSource;
+    }
+
+    const query = searchQuery.trim().toLowerCase();
+    return displayModelsSource.filter(
+      (model) =>
+        model.display_name.toLowerCase().includes(query) ||
+        model.id.toLowerCase().includes(query),
+    );
+  }, [displayModelsSource, searchQuery]);
   const apiDiagnosticLines = buildApiDiagnosticLines({
     error: apiError,
     request_url: apiRequestUrl,
     diagnostic_hint: apiDiagnosticHint,
   });
+  const registryDiagnosticLines = registryTruthError
+    ? [
+        "模型真相源异常：无法校验当前 Provider 是否存在于内置 registry。",
+        registryTruthError,
+      ]
+    : [];
 
   // 限制显示数量
   const displayModels = useMemo(() => {
     if (maxItems && maxItems > 0) {
-      return displayModelsSource.slice(0, maxItems);
+      return filteredModelsSource.slice(0, maxItems);
     }
-    return displayModelsSource;
-  }, [displayModelsSource, maxItems]);
+    return filteredModelsSource;
+  }, [filteredModelsSource, maxItems]);
 
-  const hasMore = maxItems && displayModelsSource.length > maxItems;
+  const hasMore = maxItems && filteredModelsSource.length > maxItems;
   const resolvedLatestModelId =
     latestModelId ?? getLatestSelectableModel(displayModelsSource)?.id ?? null;
   const effectiveDefaultModelId = selectedModelId ?? resolvedLatestModelId;
@@ -402,9 +513,12 @@ export const ProviderModelList: React.FC<ProviderModelListProps> = ({
   if (displayModelsSource.length === 0) {
     return (
       <div className={cn("space-y-2", className)}>
-        <div className="flex items-center justify-between mb-2">
-          <div className="space-y-1">
-            <h4 className="text-sm font-medium text-foreground flex items-center gap-2">
+        <div
+          className="mb-2 flex flex-col gap-3 2xl:flex-row 2xl:items-center 2xl:justify-between"
+          data-testid="provider-model-list-empty-toolbar"
+        >
+          <div className="min-w-0 space-y-1">
+            <h4 className="flex flex-wrap items-center gap-2 text-sm font-medium text-foreground">
               <Sparkles className="h-4 w-4 text-muted-foreground" />
               支持的模型
             </h4>
@@ -414,46 +528,93 @@ export const ProviderModelList: React.FC<ProviderModelListProps> = ({
               </p>
             ) : null}
           </div>
-          {hasApiKey && (
-            <TooltipProvider>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    onClick={handleRefreshFromApi}
-                    disabled={refreshing}
-                    className="h-7 px-2"
-                  >
-                    {refreshing ? (
-                      <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                    ) : (
-                      <RefreshCw className="h-3.5 w-3.5" />
-                    )}
-                  </Button>
-                </TooltipTrigger>
-                <TooltipContent>从 API 获取模型列表</TooltipContent>
-              </Tooltip>
-            </TooltipProvider>
-          )}
+          <div className="flex w-full min-w-0 flex-col gap-2 sm:flex-row sm:items-center 2xl:w-auto 2xl:min-w-[320px]">
+            <div className="relative min-w-0 flex-1 sm:min-w-[200px]">
+              <Search className="absolute left-3 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-slate-400" />
+              <Input
+                value={searchQuery}
+                onChange={(event) => setSearchQuery(event.target.value)}
+                placeholder="搜索模型"
+                className="h-8 border-slate-200 bg-white pl-8 text-xs"
+              />
+            </div>
+            {autoFetchCapability.supported ? (
+              <TooltipProvider>
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <Button
+                      variant="ghost"
+                      size="sm"
+                      onClick={handleRefreshFromApi}
+                      disabled={refreshing || !canRefreshFromApi}
+                      className="h-8 shrink-0 whitespace-nowrap border border-slate-200 bg-white px-3"
+                    >
+                      {refreshing ? (
+                        <Loader2 className="h-3.5 w-3.5 animate-spin" />
+                      ) : (
+                        <RefreshCw className="mr-1 h-3.5 w-3.5" />
+                      )}
+                      获取最新模型
+                    </Button>
+                  </TooltipTrigger>
+                  <TooltipContent>{refreshTooltipText}</TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            ) : null}
+          </div>
         </div>
         <div
           className="py-4 text-center text-sm text-muted-foreground"
           data-testid="provider-model-list-empty"
         >
-          暂无模型数据
-          {hasApiKey && (
+          {registryTruthError
+            ? "模型真相源异常"
+            : autoFetchCapability.supported
+              ? autoFetchCapability.requiresApiKey && !hasApiKey
+                ? "请先添加可用 API Key"
+                : apiError
+                  ? "当前未读取到可用模型"
+                  : "尚未获取模型目录"
+              : "暂无模型数据"}
+          {!registryTruthError && autoFetchCapability.supported && (
             <Button
               variant="ghost"
               size="sm"
               onClick={handleRefreshFromApi}
-              disabled={refreshing}
-              className="ml-1 h-auto p-0 text-primary underline-offset-4 hover:underline"
+              disabled={refreshing || !canRefreshFromApi}
+              className="ml-1 h-auto p-0 text-primary underline-offset-4 hover:underline disabled:pointer-events-auto disabled:cursor-not-allowed disabled:opacity-60"
             >
-              点击从 API 获取
+              {canRefreshFromApi
+                ? "点击获取最新模型"
+                : autoFetchCapability.requiresApiKey
+                  ? "配置 API Key 后可获取最新模型"
+                  : "当前暂不可自动获取最新模型"}
             </Button>
           )}
         </div>
+        {!registryTruthError &&
+        !autoFetchCapability.supported &&
+        autoFetchCapability.unsupportedReason ? (
+          <div className="rounded-md border border-slate-200 bg-slate-50 px-3 py-2 text-left text-xs text-slate-600">
+            {autoFetchCapability.unsupportedReason}
+          </div>
+        ) : null}
+        {registryTruthError && (
+          <div
+            className="rounded-md border border-rose-200 bg-rose-50/90 px-3 py-2 text-left text-xs text-rose-700"
+            data-testid="provider-model-list-registry-error"
+          >
+            <div className="mb-1 flex items-center gap-1.5 font-semibold">
+              <AlertCircle className="h-3.5 w-3.5" />
+              <span>请先修复内置模型索引</span>
+            </div>
+            {registryDiagnosticLines.map((line) => (
+              <div key={line} className="break-all leading-5">
+                {line}
+              </div>
+            ))}
+          </div>
+        )}
         {apiError && (
           <div className="rounded-md border border-amber-200 bg-amber-50/80 px-3 py-2 text-left text-xs text-amber-700 dark:border-amber-900/60 dark:bg-amber-950/20 dark:text-amber-300">
             {apiShouldPromptError ? (
@@ -474,75 +635,96 @@ export const ProviderModelList: React.FC<ProviderModelListProps> = ({
 
   return (
     <div
-      className={cn("space-y-1", className)}
+      className={cn("space-y-3", className)}
       data-testid="provider-model-list"
     >
-      {/* 标题 */}
-      <div className="flex items-center justify-between mb-2">
-        <h4 className="text-sm font-medium text-foreground flex items-center gap-2">
-          <Sparkles className="h-4 w-4 text-muted-foreground" />
-          支持的模型
-          <span className="text-xs text-muted-foreground font-normal">
-            ({displayModelsSource.length})
-          </span>
-          {/* 数据来源标识 */}
-          {apiSource && (
+      <div
+        className="flex flex-col gap-3 2xl:flex-row 2xl:items-start 2xl:justify-between"
+        data-testid="provider-model-list-toolbar"
+      >
+        <div className="min-w-0 space-y-1">
+          <h4 className="flex flex-wrap items-center gap-2 text-sm font-medium text-foreground">
+            <Sparkles className="h-4 w-4 text-muted-foreground" />
+            支持的模型
+            <span className="text-xs font-normal text-muted-foreground">
+              ({filteredModelsSource.length})
+            </span>
+            {apiSource && (
+              <TooltipProvider>
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <span
+                      className={cn(
+                        "inline-flex items-center gap-1 rounded-full px-2 py-0.5 text-xs",
+                        apiSource === "Api"
+                          ? "bg-emerald-100 text-emerald-700"
+                          : "bg-amber-100 text-amber-700",
+                      )}
+                    >
+                      {apiSource === "Api" ? (
+                        <>
+                          <Cloud className="h-3 w-3" />
+                          API
+                        </>
+                      ) : (
+                        <>
+                          <HardDrive className="h-3 w-3" />
+                          本地
+                        </>
+                      )}
+                    </span>
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    {apiSource === "Api"
+                      ? "数据来自 Provider API"
+                      : "API 获取失败，使用本地数据"}
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            )}
+          </h4>
+          <p className="text-xs text-muted-foreground">
+            支持搜索、刷新模型目录，并直接把任一模型设为默认模型。
+          </p>
+        </div>
+
+        <div
+          className="flex w-full min-w-0 flex-col gap-2 sm:flex-row sm:items-center 2xl:w-auto 2xl:min-w-[360px]"
+          data-testid="provider-model-list-actions"
+        >
+          <div className="relative min-w-0 flex-1 sm:min-w-[220px] 2xl:w-[280px]">
+            <Search className="absolute left-3 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-slate-400" />
+            <Input
+              value={searchQuery}
+              onChange={(event) => setSearchQuery(event.target.value)}
+              placeholder="搜索模型名称或 ID"
+              className="h-8 border-slate-200 bg-white pl-8 text-xs"
+            />
+          </div>
+          {autoFetchCapability.supported ? (
             <TooltipProvider>
               <Tooltip>
                 <TooltipTrigger asChild>
-                  <span
-                    className={cn(
-                      "inline-flex items-center gap-1 text-xs px-1.5 py-0.5 rounded",
-                      apiSource === "Api"
-                        ? "bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-400"
-                        : "bg-amber-100 text-amber-700 dark:bg-amber-900/30 dark:text-amber-400",
-                    )}
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    onClick={handleRefreshFromApi}
+                    disabled={refreshing || !canRefreshFromApi}
+                    className="h-8 shrink-0 whitespace-nowrap border-slate-200 bg-white px-3"
                   >
-                    {apiSource === "Api" ? (
-                      <>
-                        <Cloud className="h-3 w-3" />
-                        API
-                      </>
+                    {refreshing ? (
+                      <Loader2 className="mr-1 h-3.5 w-3.5 animate-spin" />
                     ) : (
-                      <>
-                        <HardDrive className="h-3 w-3" />
-                        本地
-                      </>
+                      <RefreshCw className="mr-1 h-3.5 w-3.5" />
                     )}
-                  </span>
+                    获取最新模型
+                  </Button>
                 </TooltipTrigger>
-                <TooltipContent>
-                  {apiSource === "Api"
-                    ? "数据来自 Provider API"
-                    : "API 获取失败，使用本地数据"}
-                </TooltipContent>
+                <TooltipContent>{refreshTooltipText}</TooltipContent>
               </Tooltip>
             </TooltipProvider>
-          )}
-        </h4>
-        {/* 刷新按钮 */}
-        {hasApiKey && (
-          <TooltipProvider>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  variant="ghost"
-                  size="sm"
-                  onClick={handleRefreshFromApi}
-                  disabled={refreshing}
-                  className="h-7 px-2"
-                >
-                  {refreshing ? (
-                    <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                  ) : (
-                    <RefreshCw className="h-3.5 w-3.5" />
-                  )}
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent>从 API 获取最新模型列表</TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-        )}
+          ) : null}
+        </div>
       </div>
 
       {/* API 错误提示 */}
@@ -561,23 +743,52 @@ export const ProviderModelList: React.FC<ProviderModelListProps> = ({
         </div>
       )}
 
-      {/* 模型列表 */}
-      <div className="border rounded-md divide-y divide-border">
-        {displayModels.map((model) => (
-          <ModelItem
-            key={model.id}
-            model={model}
-            isDefault={effectiveDefaultModelKey === model.id.toLowerCase()}
-            isLatest={resolvedLatestModelKey === model.id.toLowerCase()}
-            onSelect={onSelectModel}
-          />
-        ))}
-      </div>
+      {registryTruthError ? (
+        <div
+          className="mb-2 rounded-md border border-rose-200 bg-rose-50/90 px-3 py-2 text-xs text-rose-700"
+          data-testid="provider-model-list-registry-error"
+        >
+          <div className="mb-1 flex items-center gap-1.5 font-semibold">
+            <AlertCircle className="h-3.5 w-3.5" />
+            <span>模型真相源异常</span>
+          </div>
+          {registryDiagnosticLines.map((line) => (
+            <div key={line} className="break-all leading-5">
+              {line}
+            </div>
+          ))}
+        </div>
+      ) : null}
+
+      {!autoFetchCapability.supported &&
+      autoFetchCapability.unsupportedReason ? (
+        <div className="rounded-md border border-slate-200 bg-slate-50 px-3 py-2 text-xs text-slate-600">
+          {autoFetchCapability.unsupportedReason}
+        </div>
+      ) : null}
+
+      {filteredModelsSource.length === 0 ? (
+        <div className="rounded-[20px] border border-dashed border-slate-200 bg-slate-50 px-4 py-10 text-center text-sm text-slate-500">
+          {searchQuery ? "没有匹配的模型" : "暂无模型数据"}
+        </div>
+      ) : (
+        <div className="space-y-3">
+          {displayModels.map((model) => (
+            <ModelItem
+              key={model.id}
+              model={model}
+              isDefault={effectiveDefaultModelKey === model.id.toLowerCase()}
+              isLatest={resolvedLatestModelKey === model.id.toLowerCase()}
+              onSelect={onSelectModel}
+            />
+          ))}
+        </div>
+      )}
 
       {/* 显示更多提示 */}
       {hasMore && (
         <p className="text-xs text-muted-foreground text-center pt-2">
-          还有 {displayModelsSource.length - maxItems!} 个模型未显示
+          还有 {filteredModelsSource.length - maxItems!} 个模型未显示
         </p>
       )}
     </div>
diff --git a/src/components/provider-pool/api-key/ProviderSetting.tsx b/src/components/provider-pool/api-key/ProviderSetting.tsx
index 2ee43e303..01d6bc003 100644
--- a/src/components/provider-pool/api-key/ProviderSetting.tsx
+++ b/src/components/provider-pool/api-key/ProviderSetting.tsx
@@ -21,7 +21,12 @@ import {
   DialogFooter,
 } from "@/components/ui/dialog";
 import { Textarea } from "@/components/ui/textarea";
-import { Trash2 } from "lucide-react";
+import {
+  Bot,
+  ShieldCheck,
+  Sparkles,
+  Trash2,
+} from "lucide-react";
 import { ProviderIcon } from "@/icons/providers";
 import { ApiKeyList } from "./ApiKeyList";
 import {
@@ -34,6 +39,8 @@ import {
 } from "./ConnectionTestButton";
 import { ProviderModelList } from "./ProviderModelList";
 import { getProviderTypeLabel } from "./ProviderConfigForm.utils";
+import { getProviderModelAutoFetchCapability } from "@/lib/model/providerModelFetchSupport";
+import { SectionInfoButton } from "./SectionInfoButton";
 import type {
   ChatTestResult,
   ProviderWithKeysDisplay,
@@ -121,7 +128,6 @@ export const ProviderSetting: React.FC<ProviderSettingProps> = ({
   >(null);
   const enabledApiKeyCount =
     provider?.api_keys?.filter((apiKey) => apiKey.enabled).length ?? 0;
-  const defaultModel = draftCustomModels[0] ?? recommendedLatestModelId ?? null;
 
   useEffect(() => {
     setDraftCustomModels(provider?.custom_models ?? []);
@@ -179,17 +185,18 @@ export const ProviderSetting: React.FC<ProviderSettingProps> = ({
     return (
       <div
         className={cn(
-          "flex h-full items-center justify-center bg-[linear-gradient(180deg,rgba(248,250,252,0.78),rgba(241,245,249,0.42))] px-6",
+          "flex h-full items-center justify-center bg-slate-50/60 px-6",
           className,
         )}
         data-testid="provider-setting-empty"
       >
-        <div className="w-full max-w-xl rounded-[28px] border border-emerald-200/70 bg-[linear-gradient(135deg,rgba(244,251,248,0.98)_0%,rgba(248,250,252,0.98)_48%,rgba(241,246,255,0.96)_100%)] p-8 text-center shadow-sm shadow-slate-950/5">
-          <p className="text-base font-semibold text-foreground">
-            请从左侧列表选择一个 Provider
-          </p>
-          <p className="mt-2 text-sm text-muted-foreground">
-            选择后可在此处集中管理 API Key、模型、连接测试与支持模型信息。
+        <div className="w-full max-w-2xl rounded-[28px] border border-slate-200/80 bg-white p-8 shadow-sm shadow-slate-950/5">
+          <div className="flex items-center gap-3 text-slate-900">
+            <Sparkles className="h-5 w-5" />
+            <p className="text-lg font-semibold">服务商配置工作台</p>
+          </div>
+          <p className="mt-3 text-sm leading-6 text-slate-500">
+            选择一个服务商后，这里只保留模型、密钥和必要配置，不再铺满整页说明。
           </p>
         </div>
       </div>
@@ -204,35 +211,35 @@ export const ProviderSetting: React.FC<ProviderSettingProps> = ({
       return provider.api_host;
     }
   })();
-
-  const summaryItems = [
-    {
-      label: "可用密钥",
-      value: `${enabledApiKeyCount}`,
-      hint: `共 ${provider.api_keys?.length ?? 0} 个 API Key`,
-      compact: false,
-    },
-    {
-      label: "默认模型",
-      value: defaultModel ?? "未设置",
-      hint: defaultModel
-        ? "第一个模型用于默认请求与测试"
-        : "可在下方配置中指定",
-      compact: true,
-    },
-    {
-      label: "协议类型",
-      value: getProviderTypeLabel(provider.type),
-      hint: `${provider.type} · ${provider.is_system ? "系统预设 Provider" : "自定义 Provider"}`,
-      compact: true,
-    },
-    {
-      label: "接口地址",
-      value: providerHostLabel,
-      hint: provider.api_host,
-      compact: true,
-    },
-  ];
+  const modelAutoFetchCapability = getProviderModelAutoFetchCapability({
+    providerId: provider.id,
+    providerType: provider.type,
+    apiHost: provider.api_host,
+  });
+  const requiresLiveModelTruth = modelAutoFetchCapability.supported;
+  const hasRequiredApiAccess =
+    !modelAutoFetchCapability.requiresApiKey || enabledApiKeyCount > 0;
+  const hasResolvedLiveModelDirectory =
+    !requiresLiveModelTruth || Boolean(recommendedLatestModelId);
+  const showVerifiedModelState =
+    !requiresLiveModelTruth || hasResolvedLiveModelDirectory;
+  const defaultModel = showVerifiedModelState
+    ? draftCustomModels[0] ?? recommendedLatestModelId ?? null
+    : null;
+  const connectionReady =
+    provider.enabled && hasRequiredApiAccess && hasResolvedLiveModelDirectory;
+  const connectionBlockHint = !provider.enabled
+    ? "请先启用当前 Provider，再进行连通性验证。"
+    : !hasRequiredApiAccess
+      ? "先添加并启用至少一把 API Key，再进行连通性验证。"
+      : !hasResolvedLiveModelDirectory
+        ? "先读取真实模型目录，再进行连接测试与默认模型验证。"
+        : null;
+  const modelStatusNotice = !hasRequiredApiAccess
+    ? "先添加并启用 API Key，才能读取真实模型目录。"
+    : !hasResolvedLiveModelDirectory
+      ? "读取真实模型目录前，不展示旧模型，避免把历史缓存误认为当前可用模型。"
+      : null;
 
   // 处理启用/禁用切换
   const handleToggleEnabled = async (enabled: boolean) => {
@@ -248,55 +255,76 @@ export const ProviderSetting: React.FC<ProviderSettingProps> = ({
       data-provider-id={provider.id}
     >
       <div className="flex-1 overflow-y-auto">
-        <div className="mx-auto flex w-full max-w-6xl flex-col gap-6 p-5 lg:p-6">
-          {/* Provider 头部 */}
+        <div className="mx-auto flex w-full max-w-[1440px] flex-col gap-5 p-4 lg:p-6">
           <section
-            className="relative overflow-hidden rounded-[28px] border border-emerald-200/70 bg-[linear-gradient(135deg,rgba(244,251,248,0.98)_0%,rgba(248,250,252,0.98)_45%,rgba(241,246,255,0.96)_100%)] p-5 shadow-sm shadow-slate-950/5"
+            className="rounded-[26px] border border-slate-200/80 bg-white px-5 py-5 shadow-sm shadow-slate-950/5"
             data-testid="provider-header"
           >
-            <div className="pointer-events-none absolute -left-16 top-[-64px] h-48 w-48 rounded-full bg-emerald-200/30 blur-3xl" />
-            <div className="pointer-events-none absolute right-[-52px] top-[-24px] h-48 w-48 rounded-full bg-sky-200/25 blur-3xl" />
-            <div className="flex flex-col gap-5 lg:flex-row lg:items-start lg:justify-between">
-              <div className="flex min-w-0 items-start gap-4">
+            <div className="flex flex-col gap-5 xl:flex-row xl:items-center xl:justify-between">
+              <div className="flex min-w-0 items-center gap-4">
                 <ProviderIcon
                   providerType={provider.id}
                   fallbackText={provider.name}
-                  size={44}
+                  size={52}
                   className="flex-shrink-0"
                   data-testid="provider-icon"
                 />
 
-                <div className="min-w-0 flex-1 space-y-2">
+                <div className="min-w-0 space-y-2">
                   <div className="flex flex-wrap items-center gap-2">
                     <h3
-                      className="min-w-0 truncate text-2xl font-semibold text-foreground"
+                      className="min-w-0 truncate text-2xl font-semibold tracking-tight text-slate-900"
                       data-testid="provider-name"
                     >
                       {provider.name}
                     </h3>
-                    <Badge variant="outline">
+                    <Badge
+                      variant="outline"
+                      className="border-slate-200 bg-slate-50 text-slate-600"
+                    >
                       {provider.is_system ? "系统预设" : "自定义 Provider"}
                     </Badge>
-                    <Badge variant={provider.enabled ? "secondary" : "outline"}>
-                      {provider.enabled ? "已启用" : "已禁用"}
+                    <Badge
+                      variant="outline"
+                      className={cn(
+                        "border",
+                        provider.enabled
+                          ? "border-emerald-200 bg-emerald-50 text-emerald-700"
+                          : "border-slate-200 bg-slate-50 text-slate-500",
+                      )}
+                    >
+                      {provider.enabled ? "运行中" : "已停用"}
                     </Badge>
                   </div>
-                  <p
-                    className="text-sm text-muted-foreground"
+                  <div
+                    className="flex flex-wrap items-center gap-2 text-sm text-slate-500"
                     data-testid="provider-type"
                   >
-                    类型: {getProviderTypeLabel(provider.type)}
-                  </p>
-                  <p className="break-all text-sm text-muted-foreground">
-                    {provider.api_host}
-                  </p>
+                    <span>{getProviderTypeLabel(provider.type)}</span>
+                    <span className="text-slate-300">/</span>
+                    <span className="break-all">{providerHostLabel}</span>
+                  </div>
                 </div>
               </div>
 
               <div className="flex flex-wrap items-center gap-3">
-                <div className="inline-flex items-center gap-3 rounded-xl border border-border/70 bg-muted/30 px-3 py-2">
-                  <span className="text-sm text-muted-foreground">
-                    {provider.enabled ? "已启用" : "已禁用"}
+                <Badge
+                  variant="outline"
+                  className="border-slate-200 bg-slate-50 text-slate-600"
+                >
+                  密钥 {enabledApiKeyCount}
+                </Badge>
+                <Badge
+                  variant="outline"
+                  className="max-w-[240px] truncate border-slate-200 bg-slate-50 text-slate-600"
+                >
+                  默认
+                  {defaultModel ??
+                    (requiresLiveModelTruth ? "模型待同步" : "未设置")}
+                </Badge>
+                <div className="inline-flex items-center gap-3 rounded-full border border-slate-200 bg-slate-50 px-4 py-2">
+                  <span className="text-sm text-slate-600">
+                    {provider.enabled ? "已启用" : "已停用"}
                   </span>
                   <Switch
                     checked={provider.enabled}
@@ -312,62 +340,90 @@ export const ProviderSetting: React.FC<ProviderSettingProps> = ({
                     size="sm"
                     onClick={() => onDeleteProvider(provider.id)}
                     disabled={loading}
-                    className="border-red-200 text-red-600 hover:bg-red-50 hover:text-red-700"
+                    className="border-red-200 bg-white text-red-600 hover:bg-red-50 hover:text-red-700"
                     title="删除此 Provider"
                     data-testid="delete-provider-button"
                   >
                     <Trash2 className="mr-1.5 h-4 w-4" />
-                    删除
+                    删除 Provider
                   </Button>
                 )}
               </div>
             </div>
-
-            <div className="mt-5 grid gap-3 sm:grid-cols-2 xl:grid-cols-4">
-              {summaryItems.map((item) => (
-                <div
-                  key={item.label}
-                  className="rounded-[22px] border border-white/90 bg-white/85 p-4 shadow-sm shadow-slate-950/5"
-                >
-                  <p className="text-[11px] font-medium text-slate-500">
-                    {item.label}
-                  </p>
-                  <p
-                    className={cn(
-                      "mt-2 font-semibold text-slate-900",
-                      item.compact
-                        ? "break-all text-sm leading-5"
-                        : "text-2xl leading-none",
-                    )}
-                  >
-                    {item.value}
-                  </p>
-                  <p className="mt-2 line-clamp-2 text-xs text-slate-500">
-                    {item.hint}
-                  </p>
-                </div>
-              ))}
-            </div>
           </section>
 
-          <div className="grid gap-6 xl:grid-cols-[minmax(0,1.15fr)_minmax(320px,0.85fr)]">
-            <div className="space-y-6">
-              <section
-                className="rounded-2xl border border-border/80 bg-card p-5 shadow-sm"
-                data-testid="api-key-section"
+          <div
+            className="grid gap-5 xl:grid-cols-[minmax(0,1.7fr)_minmax(300px,340px)]"
+            data-testid="provider-setting-workbench-grid"
+          >
+            <section
+              className="rounded-[26px] border border-slate-200/80 bg-white p-5 shadow-sm shadow-slate-950/5"
+              data-testid="supported-models-section"
+            >
+              <div
+                className="mb-4 flex flex-wrap items-start justify-between gap-3"
+                data-testid="supported-models-header"
               >
-                <div className="mb-4 space-y-1">
-                  <h4 className="text-sm font-semibold text-foreground">
-                    访问凭证
-                  </h4>
-                  <p className="text-xs text-muted-foreground">
-                    管理当前 Provider 的 API Key、别名与启用状态。
-                  </p>
+                <div className="flex min-w-0 items-center gap-2 text-slate-900">
+                  <Bot className="h-4 w-4" />
+                  <h4 className="text-base font-semibold">模型设置</h4>
+                  <SectionInfoButton
+                    label="查看模型设置说明"
+                    triggerTestId="provider-models-info-button"
+                  >
+                    <p>
+                      模型区只展示当前真实可用的目录。支持自动拉取的渠道会优先读取最新模型；读取失败前不会继续展示旧模型。
+                    </p>
+                  </SectionInfoButton>
                 </div>
+                <div className="flex flex-wrap gap-2">
+                  <Badge
+                    variant="outline"
+                    className="border-slate-200 bg-slate-50 text-slate-600"
+                  >
+                    默认：
+                    {defaultModel ??
+                      (requiresLiveModelTruth ? "待读取" : "未设置")}
+                  </Badge>
+                  {showVerifiedModelState && recommendedLatestModelId ? (
+                    <Badge
+                      variant="outline"
+                      className="border-sky-200 bg-sky-50 text-sky-700"
+                    >
+                      推荐最新：{recommendedLatestModelId}
+                    </Badge>
+                  ) : null}
+                </div>
+              </div>
+
+              {modelStatusNotice ? (
+                <div className="mb-4 rounded-[18px] border border-amber-200 bg-amber-50 px-4 py-3 text-sm text-amber-900">
+                  {modelStatusNotice}
+                </div>
+              ) : null}
+
+              <div className="rounded-[22px] border border-slate-200/80 bg-slate-50/60 p-4">
+                <ProviderModelList
+                  providerId={provider.id}
+                  providerType={provider.type}
+                  selectedModelId={draftCustomModels[0] ?? null}
+                  latestModelId={recommendedLatestModelId}
+                  onSelectModel={handleSelectDefaultModel}
+                  onLatestModelResolved={handleRecommendedLatestModelChange}
+                  hasApiKey={enabledApiKeyCount > 0}
+                  apiHost={provider.api_host}
+                />
+              </div>
+            </section>
+
+            <div className="space-y-5">
+              <section data-testid="api-key-section">
                 <ApiKeyList
                   key={`${provider.id}-${provider.api_keys?.length || 0}`}
                   apiKeys={provider.api_keys || []}
                   providerId={provider.id}
+                  providerName={provider.name}
+                  apiHost={provider.api_host}
                   onAdd={onAddApiKey}
                   onToggle={onToggleApiKey}
                   onDelete={onDeleteApiKey}
@@ -375,18 +431,7 @@ export const ProviderSetting: React.FC<ProviderSettingProps> = ({
                 />
               </section>
 
-              <section
-                className="rounded-2xl border border-border/80 bg-card p-5 shadow-sm"
-                data-testid="config-section"
-              >
-                <div className="mb-4 space-y-1">
-                  <h4 className="text-sm font-semibold text-foreground">
-                    请求配置
-                  </h4>
-                  <p className="text-xs text-muted-foreground">
-                    配置 API Host、协议类型与默认模型，表单会自动保存。
-                  </p>
-                </div>
+              <section data-testid="config-section">
                 <ProviderConfigForm
                   ref={providerConfigFormRef}
                   provider={provider}
@@ -398,83 +443,68 @@ export const ProviderSetting: React.FC<ProviderSettingProps> = ({
                   loading={loading}
                 />
               </section>
-            </div>
 
-            <div className="space-y-6">
               <section
-                className="rounded-2xl border border-border/80 bg-card p-5 shadow-sm"
+                className="rounded-[24px] border border-slate-200/80 bg-white p-4 shadow-sm shadow-slate-950/5"
                 data-testid="connection-test-section"
               >
-                <div className="mb-4 space-y-1">
-                  <h4 className="text-sm font-semibold text-foreground">
-                    连接测试
-                  </h4>
-                  <p className="text-xs text-muted-foreground">
-                    使用当前默认模型检查连接、鉴权与基础对话可用性。
-                  </p>
+                <div className="flex flex-wrap items-center justify-between gap-3">
+                  <div className="flex items-center gap-2 text-slate-900">
+                    <ShieldCheck className="h-4 w-4" />
+                    <h4 className="text-base font-semibold">连接验证</h4>
+                    <SectionInfoButton
+                      label="查看连接验证说明"
+                      triggerTestId="provider-connection-info-button"
+                    >
+                      <p>
+                        连接验证会用当前默认模型检查鉴权、路由和最小对话是否可用。未启用 Provider、缺少可用 Key 或模型目录尚未同步时不会放行测试。
+                      </p>
+                    </SectionInfoButton>
+                  </div>
+                  <Badge
+                    variant="outline"
+                    className={cn(
+                      "border",
+                      connectionReady
+                        ? "border-emerald-200 bg-emerald-50 text-emerald-700"
+                        : "border-slate-200 bg-slate-50 text-slate-500",
+                    )}
+                  >
+                    {connectionReady ? "可测试" : "待就绪"}
+                  </Badge>
                 </div>
 
-                <div className="rounded-xl border border-border/70 bg-muted/20 p-3 text-xs text-muted-foreground">
-                  当前默认模型：
-                  <span className="ml-1 font-medium text-foreground">
-                    {defaultModel ?? "未设置"}
+                <div className="mt-4 rounded-[18px] border border-slate-200/80 bg-slate-50 px-4 py-3 text-sm text-slate-600">
+                  默认模型：
+                  <span className="ml-1 font-semibold text-slate-900">
+                    {defaultModel ??
+                      (requiresLiveModelTruth ? "待读取真实目录" : "未设置")}
                   </span>
                 </div>
 
-                <div className="mt-4 flex flex-col gap-3 sm:flex-row">
+                <div className="mt-4 flex flex-col gap-3">
                   <ConnectionTestButton
                     providerId={provider.id}
                     onTest={onTestConnection}
-                    disabled={
-                      loading ||
-                      !provider.enabled ||
-                      (provider.api_keys?.length ?? 0) === 0
-                    }
-                    className="flex-1"
+                    disabled={loading || !connectionReady}
+                    className="w-full"
                   />
                   <Button
                     variant="outline"
                     size="sm"
-                    className="sm:self-start"
-                    disabled={
-                      loading ||
-                      !provider.enabled ||
-                      (provider.api_keys?.length ?? 0) === 0 ||
-                      !onTestChat
-                    }
+                    className="border-slate-200 bg-white"
+                    disabled={loading || !connectionReady || !onTestChat}
                     onClick={() => setChatDialogOpen(true)}
                   >
                     对话测试
                   </Button>
                 </div>
-                {(provider.api_keys?.length ?? 0) === 0 && (
-                  <p className="mt-3 text-xs text-muted-foreground">
-                    请先添加 API Key 后再进行连接测试。
-                  </p>
-                )}
-              </section>
 
-              <section
-                className="rounded-2xl border border-border/80 bg-card p-5 shadow-sm"
-                data-testid="supported-models-section"
-              >
-                <div className="mb-4 space-y-1">
-                  <h4 className="text-sm font-semibold text-foreground">
-                    模型能力
-                  </h4>
-                  <p className="text-xs text-muted-foreground">
-                    展示当前 Provider 支持的模型，并支持从 API 主动刷新。
+                {connectionBlockHint ? (
+                  <p className="mt-3 text-xs text-slate-500">
+                    {connectionBlockHint}
                   </p>
-                </div>
-                <ProviderModelList
-                  providerId={provider.id}
-                  providerType={provider.type}
-                  selectedModelId={draftCustomModels[0] ?? null}
-                  latestModelId={recommendedLatestModelId}
-                  onSelectModel={handleSelectDefaultModel}
-                  onLatestModelResolved={handleRecommendedLatestModelChange}
-                  hasApiKey={enabledApiKeyCount > 0}
-                />
+                ) : null}
               </section>
             </div>
           </div>
diff --git a/src/components/provider-pool/api-key/ProviderSetting.ui.test.tsx b/src/components/provider-pool/api-key/ProviderSetting.ui.test.tsx
new file mode 100644
index 000000000..561deeaf6
--- /dev/null
+++ b/src/components/provider-pool/api-key/ProviderSetting.ui.test.tsx
@@ -0,0 +1,150 @@
+import React from "react";
+import { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { ProviderWithKeysDisplay } from "@/lib/api/apiKeyProvider";
+
+vi.mock("./ProviderConfigForm", () => ({
+  ProviderConfigForm: React.forwardRef((_props, _ref) => (
+    <div data-testid="provider-config-form-stub">协议配置表单</div>
+  )),
+}));
+
+vi.mock("./ProviderModelList", () => ({
+  ProviderModelList: () => (
+    <div data-testid="provider-model-list-stub">模型列表</div>
+  ),
+}));
+
+vi.mock("./ConnectionTestButton", () => ({
+  ConnectionTestButton: () => (
+    <div data-testid="connection-test-button-stub">连接测试按钮</div>
+  ),
+}));
+
+import { ProviderSetting } from "./ProviderSetting";
+
+interface MountedRoot {
+  container: HTMLDivElement;
+  root: Root;
+}
+
+const mountedRoots: MountedRoot[] = [];
+
+function createProvider(
+  overrides: Partial<ProviderWithKeysDisplay> = {},
+): ProviderWithKeysDisplay {
+  return {
+    id: "deepseek",
+    name: "DeepSeek",
+    type: "openai",
+    api_host: "https://api.deepseek.com",
+    is_system: false,
+    group: "mainstream",
+    enabled: true,
+    sort_order: 1,
+    api_key_count: 1,
+    custom_models: ["deepseek-chat"],
+    created_at: new Date("2026-03-15T00:00:00.000Z").toISOString(),
+    updated_at: new Date("2026-03-15T00:00:00.000Z").toISOString(),
+    api_keys: [
+      {
+        id: "key-001",
+        provider_id: "deepseek",
+        api_key_masked: "sk-****1234",
+        alias: "生产账号",
+        enabled: true,
+        usage_count: 12,
+        error_count: 0,
+        last_used_at: new Date("2026-03-15T08:00:00.000Z").toISOString(),
+        created_at: new Date("2026-03-14T00:00:00.000Z").toISOString(),
+      },
+    ],
+    ...overrides,
+  };
+}
+
+function renderSetting(provider: ProviderWithKeysDisplay | null) {
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  const root = createRoot(container);
+
+  act(() => {
+    root.render(
+      <ProviderSetting provider={provider} onDeleteProvider={vi.fn()} />,
+    );
+  });
+
+  mountedRoots.push({ container, root });
+  return container;
+}
+
+beforeEach(() => {
+  (
+    globalThis as typeof globalThis & {
+      IS_REACT_ACT_ENVIRONMENT?: boolean;
+    }
+  ).IS_REACT_ACT_ENVIRONMENT = true;
+});
+
+afterEach(() => {
+  vi.clearAllMocks();
+
+  while (mountedRoots.length > 0) {
+    const mounted = mountedRoots.pop();
+    if (!mounted) {
+      break;
+    }
+
+    act(() => {
+      mounted.root.unmount();
+    });
+    mounted.container.remove();
+  }
+});
+
+describe("ProviderSetting", () => {
+  it("空状态应提示进入服务商配置工作台", () => {
+    const container = renderSetting(null);
+
+    expect(container.textContent ?? "").toContain("服务商配置工作台");
+    expect(container.textContent ?? "").toContain("模型、密钥和必要配置");
+  });
+
+  it("应展示新的分区式编辑工作台", () => {
+    const container = renderSetting(createProvider());
+    const text = container.textContent ?? "";
+
+    expect(text).toContain("模型设置");
+    expect(text).toContain("API Key");
+    expect(text).toContain("协议配置表单");
+    expect(text).toContain("连接验证");
+    expect(text).toContain("读取真实模型目录前，不展示旧模型");
+    expect(text).toContain("默认：待读取");
+    expect(
+      container.querySelector('[data-testid="provider-models-info-button"]'),
+    ).not.toBeNull();
+    expect(
+      container.querySelector('[data-testid="provider-connection-info-button"]'),
+    ).not.toBeNull();
+    expect(
+      container.querySelector('[data-testid="delete-provider-button"]'),
+    ).not.toBeNull();
+  });
+
+  it("服务商工作台应保留原分栏，并允许模型区头部自然换行", () => {
+    const container = renderSetting(createProvider());
+    const workbenchGrid = container.querySelector<HTMLElement>(
+      '[data-testid="provider-setting-workbench-grid"]',
+    );
+    const modelsHeader = container.querySelector<HTMLElement>(
+      '[data-testid="supported-models-header"]',
+    );
+
+    expect(workbenchGrid?.className).toContain(
+      "xl:grid-cols-[minmax(0,1.7fr)_minmax(300px,340px)]",
+    );
+    expect(modelsHeader?.className).toContain("flex-wrap");
+    expect(modelsHeader?.className).toContain("justify-between");
+  });
+});
diff --git a/src/components/provider-pool/api-key/README.md b/src/components/provider-pool/api-key/README.md
index 3f469af26..df2053363 100644
--- a/src/components/provider-pool/api-key/README.md
+++ b/src/components/provider-pool/api-key/README.md
@@ -108,7 +108,8 @@ function ApiKeySection() {
 
 2. **应用后端层（Lime Tauri）**
    - `get_system_provider_catalog` 作为 Provider 元信息入口（含 `legacy_ids`）；
-   - `get_model_registry_provider_ids` 从 `src-tauri/resources/models/index.json` 提供模型 Provider 真相集。
+   - `get_model_registry_provider_ids` 从 `src-tauri/resources/models/index.json` 提供模型 Provider 真相集；
+   - 真相源读取失败时直接报错，不再静默回退数据库。
 
 3. **应用前端层（UI）**
    - `ProviderModelList` 先用 Catalog 归一 provider，再用模型 Provider 真相集校验；
diff --git a/src/components/provider-pool/api-key/SectionInfoButton.tsx b/src/components/provider-pool/api-key/SectionInfoButton.tsx
new file mode 100644
index 000000000..4ed1a0de3
--- /dev/null
+++ b/src/components/provider-pool/api-key/SectionInfoButton.tsx
@@ -0,0 +1,52 @@
+import type { ReactNode } from "react";
+import { CircleHelp } from "lucide-react";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { cn } from "@/lib/utils";
+
+interface SectionInfoButtonProps {
+  label: string;
+  children: ReactNode;
+  className?: string;
+  contentClassName?: string;
+  contentTestId?: string;
+  triggerTestId?: string;
+}
+
+export function SectionInfoButton({
+  label,
+  children,
+  className,
+  contentClassName,
+  contentTestId,
+  triggerTestId,
+}: SectionInfoButtonProps) {
+  return (
+    <Popover>
+      <PopoverTrigger asChild>
+        <button
+          type="button"
+          aria-label={label}
+          className={cn(
+            "inline-flex h-7 w-7 items-center justify-center rounded-full border border-slate-200 bg-white text-slate-400 transition hover:border-slate-300 hover:text-slate-700",
+            className,
+          )}
+          data-testid={triggerTestId}
+        >
+          <CircleHelp className="h-3.5 w-3.5" />
+        </button>
+      </PopoverTrigger>
+      <PopoverContent
+        align="end"
+        className={cn(
+          "w-[280px] rounded-[18px] border-slate-200 bg-white p-3 text-sm leading-6 text-slate-600 shadow-lg shadow-slate-950/8",
+          contentClassName,
+        )}
+        data-testid={contentTestId}
+      >
+        {children}
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+export default SectionInfoButton;
diff --git a/src/components/provider-pool/api-key/providerModelListCache.ts b/src/components/provider-pool/api-key/providerModelListCache.ts
new file mode 100644
index 000000000..0d0080143
--- /dev/null
+++ b/src/components/provider-pool/api-key/providerModelListCache.ts
@@ -0,0 +1,24 @@
+export const PROVIDER_MODELS_CACHE_TTL_MS = 5 * 60 * 1000;
+
+export function isProviderModelsCacheExpired(
+  cachedAt: number,
+  now: number = Date.now(),
+): boolean {
+  return now - cachedAt >= PROVIDER_MODELS_CACHE_TTL_MS;
+}
+
+function normalizeCacheSegment(value?: string | null): string {
+  return (value || "").trim().toLowerCase();
+}
+
+export function buildProviderModelsCacheKey(input: {
+  providerId?: string | null;
+  providerType?: string | null;
+  apiHost?: string | null;
+}): string {
+  return [
+    normalizeCacheSegment(input.providerId),
+    normalizeCacheSegment(input.providerType),
+    normalizeCacheSegment(input.apiHost),
+  ].join(":");
+}
diff --git a/src/components/settings-v2/_layout/index.test.tsx b/src/components/settings-v2/_layout/index.test.tsx
index 20bc7c456..77df8473c 100644
--- a/src/components/settings-v2/_layout/index.test.tsx
+++ b/src/components/settings-v2/_layout/index.test.tsx
@@ -92,9 +92,6 @@ vi.mock("../system/web-search", () => ({
 vi.mock("../system/chrome-relay", () => ({
   ChromeRelaySettings: () => <div>chrome-relay</div>,
 }));
-vi.mock("../features/SettingHeader", () => ({
-  SettingHeader: ({ title }: { title: string }) => <div>{title}</div>,
-}));
 vi.mock("../home", () => ({
   SettingsHomePage: () => <div>home</div>,
 }));
@@ -171,26 +168,26 @@ afterEach(() => {
 });
 
 describe("SettingsLayoutV2 Profile Tab", () => {
-  it("OEM 运行时下只展示统一账户页，不再渲染本地资料编辑器", async () => {
+  it("OEM 运行时下只展示统一账户页，不再渲染本地资料编辑器，也不再注入壳层标题", async () => {
     const container = renderComponent(SettingsTabs.Profile);
     await flushEffects();
     const text = container.textContent ?? "";
 
-    expect(text).toContain("账号与资料");
     expect(text).toContain("USER_CENTER_SESSION");
     expect(text).not.toContain("PROFILE_SETTINGS");
+    expect(text).not.toContain("账号与资料");
   });
 
-  it("非 OEM 运行时下仍保留本地资料编辑器", async () => {
+  it("非 OEM 运行时下仍保留本地资料编辑器，但不再显示重复页头", async () => {
     mockResolveOemCloudRuntimeContext.mockReturnValue(null);
 
     const container = renderComponent(SettingsTabs.Profile);
     await flushEffects();
     const text = container.textContent ?? "";
 
-    expect(text).toContain("个人资料");
     expect(text).toContain("USER_CENTER_SESSION");
     expect(text).toContain("PROFILE_SETTINGS");
+    expect(text).not.toContain("个人资料");
   });
 });
 
@@ -206,24 +203,33 @@ describe("SettingsLayoutV2 Channels Redirect", () => {
 });
 
 describe("SettingsLayoutV2 Experimental Tab", () => {
-  it("实验功能页应复用标准设置页标题", async () => {
+  it("实验功能页应直接展示内容，不再复用壳层设置页标题", async () => {
     const container = renderComponent(SettingsTabs.Experimental);
     await flushEffects();
     const text = container.textContent ?? "";
 
-    expect(text).toContain("实验功能");
     expect(text).toContain("experimental");
+    expect(text).not.toContain("实验功能");
   });
 });
 
 describe("SettingsLayoutV2 Developer Tab", () => {
-  it("开发者页应复用标准设置页标题", async () => {
+  it("开发者页应直接展示内容，不再复用壳层设置页标题", async () => {
     const container = renderComponent(SettingsTabs.Developer);
     await flushEffects();
     const text = container.textContent ?? "";
 
-    expect(text).toContain("开发者");
     expect(text).toContain("developer");
+    expect(text).not.toContain("开发者");
+  });
+
+  it("设置内容区应挂载统一氛围层，避免页面背景过于单调", async () => {
+    const container = renderComponent(SettingsTabs.Providers);
+    await flushEffects();
+
+    expect(
+      container.querySelector('[data-testid="settings-content-atmosphere"]'),
+    ).not.toBeNull();
   });
 
   it("预取开发者页时应连同延迟区块一起预热", async () => {
diff --git a/src/components/settings-v2/_layout/index.tsx b/src/components/settings-v2/_layout/index.tsx
index 3ba7e443b..ea7c33631 100644
--- a/src/components/settings-v2/_layout/index.tsx
+++ b/src/components/settings-v2/_layout/index.tsx
@@ -20,8 +20,6 @@ import { SettingsTabs } from "@/types/settings";
 import { Page, PageParams } from "@/types/page";
 import { buildHomeAgentParams } from "@/lib/workspace/navigation";
 import { CanvasBreadcrumbHeader } from "@/lib/workspace/workbenchUi";
-
-import { SettingHeader } from "../features/SettingHeader";
 import { SettingsHomePage } from "../home";
 import { resolveOemCloudRuntimeContext } from "@/lib/api/oemCloudRuntime";
 
@@ -147,8 +145,15 @@ const HeaderBar = styled.div`
 const ContentContainer = styled.main`
   flex: 1;
   min-width: 0;
+  position: relative;
+  isolation: isolate;
   overflow-y: auto;
   padding: 24px 32px;
+  background: linear-gradient(
+    180deg,
+    rgba(248, 250, 252, 0.96) 0%,
+    rgba(244, 249, 247, 0.92) 100%
+  );
 
   &::-webkit-scrollbar {
     width: 6px;
@@ -173,11 +178,45 @@ const ContentContainer = styled.main`
 `;
 
 const ContentWrapper = styled.div<{ $wide: boolean }>`
+  position: relative;
+  z-index: 1;
   width: 100%;
   min-width: 0;
   max-width: ${({ $wide }) => ($wide ? "1440px" : "800px")};
 `;
 
+const ContentAtmosphere = styled.div`
+  position: absolute;
+  inset: 0;
+  pointer-events: none;
+  z-index: 0;
+  background:
+    radial-gradient(
+      circle at 8% 0%,
+      rgba(16, 185, 129, 0.1) 0%,
+      rgba(16, 185, 129, 0) 34%
+    ),
+    radial-gradient(
+      circle at 92% 4%,
+      rgba(56, 189, 248, 0.1) 0%,
+      rgba(56, 189, 248, 0) 30%
+    );
+
+  @media (max-width: 640px) {
+    background:
+      radial-gradient(
+        circle at 10% 0%,
+        rgba(16, 185, 129, 0.08) 0%,
+        rgba(16, 185, 129, 0) 36%
+      ),
+      radial-gradient(
+        circle at 92% 2%,
+        rgba(56, 189, 248, 0.08) 0%,
+        rgba(56, 189, 248, 0) 32%
+      );
+  }
+`;
+
 const PlaceholderPage = styled.div`
   display: flex;
   flex-direction: column;
@@ -323,86 +362,53 @@ function renderSettingsContent(
     // 账号组
     case SettingsTabs.Profile:
       return (
-        <>
-          <SettingHeader title={hasManagedAccountProfile ? "账号与资料" : "个人资料"} />
-          {withSettingsContentFallback(
-            <>
-              <UserCenterSessionSettings />
-              {!hasManagedAccountProfile ? <ProfileSettings /> : null}
-            </>,
-            "正在加载账号资料...",
-          )}
-        </>
+        withSettingsContentFallback(
+          <>
+            <UserCenterSessionSettings />
+            {!hasManagedAccountProfile ? <ProfileSettings /> : null}
+          </>,
+          "正在加载账号资料...",
+        )
       );
 
     case SettingsTabs.Stats:
-      return (
-        <>
-          <SettingHeader title="数据统计" />
-          {withSettingsContentFallback(
-            <StatsSettings />,
-            "正在加载数据统计...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <StatsSettings />,
+        "正在加载数据统计...",
       );
 
     // 通用组
     case SettingsTabs.Appearance:
-      return (
-        <>
-          <SettingHeader title="外观" />
-          {withSettingsContentFallback(
-            <AppearanceSettings />,
-            "正在加载外观设置...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <AppearanceSettings />,
+        "正在加载外观设置...",
       );
 
     case SettingsTabs.Hotkeys:
-      return (
-        <>
-          <SettingHeader title="快捷键" />
-          {withSettingsContentFallback(
-            <HotkeysSettings />,
-            "正在加载快捷键设置...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <HotkeysSettings />,
+        "正在加载快捷键设置...",
       );
 
     case SettingsTabs.Memory:
-      return (
-        <>
-          <SettingHeader title="记忆" />
-          {withSettingsContentFallback(
-            <MemorySettings />,
-            "正在加载记忆设置...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <MemorySettings />,
+        "正在加载记忆设置...",
       );
 
     // 智能体组
     case SettingsTabs.Providers:
-      return (
-        <>
-          <SettingHeader title="AI 服务商" />
-          {withSettingsContentFallback(
-            <CloudProviderSettings
-              onOpenProfile={() => onTabChange(SettingsTabs.Profile)}
-            />,
-            "正在加载 AI 服务商设置...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <CloudProviderSettings
+          onOpenProfile={() => onTabChange(SettingsTabs.Profile)}
+        />,
+        "正在加载 AI 服务商设置...",
       );
 
     case SettingsTabs.Skills:
-      return (
-        <>
-          <SettingHeader title="技能管理" />
-          {withSettingsContentFallback(
-            <ExtensionsSettings />,
-            "正在加载技能管理...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <ExtensionsSettings />,
+        "正在加载技能管理...",
       );
 
     case SettingsTabs.MediaServices:
@@ -413,61 +419,36 @@ function renderSettingsContent(
 
     // 系统组
     case SettingsTabs.McpServer:
-      return (
-        <>
-          <SettingHeader title="MCP 服务器" />
-          {withSettingsContentFallback(
-            <McpPanel hideHeader />,
-            "正在加载 MCP 服务器...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <McpPanel hideHeader />,
+        "正在加载 MCP 服务器...",
       );
 
     case SettingsTabs.Channels:
       return <SettingsChannelsRedirect onNavigate={onNavigate} />;
 
     case SettingsTabs.WebSearch:
-      return (
-        <>
-          <SettingHeader title="网络搜索" />
-          {withSettingsContentFallback(
-            <WebSearchSettings />,
-            "正在加载网络搜索设置...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <WebSearchSettings />,
+        "正在加载网络搜索设置...",
       );
 
     case SettingsTabs.Environment:
-      return (
-        <>
-          <SettingHeader title="环境变量" />
-          {withSettingsContentFallback(
-            <EnvironmentSettings />,
-            "正在加载环境变量...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <EnvironmentSettings />,
+        "正在加载环境变量...",
       );
 
     case SettingsTabs.ChromeRelay:
-      return (
-        <>
-          <SettingHeader title="连接器" />
-          {withSettingsContentFallback(
-            <ChromeRelaySettings />,
-            "正在加载连接器设置...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <ChromeRelaySettings />,
+        "正在加载连接器设置...",
       );
 
     case SettingsTabs.SecurityPerformance:
-      return (
-        <>
-          <SettingHeader title="安全与性能" />
-          {withSettingsContentFallback(
-            <SecurityPerformanceSettings />,
-            "正在加载安全与性能设置...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <SecurityPerformanceSettings />,
+        "正在加载安全与性能设置...",
       );
 
     case SettingsTabs.Automation:
@@ -486,25 +467,15 @@ function renderSettingsContent(
       );
 
     case SettingsTabs.Experimental:
-      return (
-        <>
-          <SettingHeader title="实验功能" />
-          {withSettingsContentFallback(
-            <ExperimentalSettings />,
-            "正在加载实验功能...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <ExperimentalSettings />,
+        "正在加载实验功能...",
       );
 
     case SettingsTabs.Developer:
-      return (
-        <>
-          <SettingHeader title="开发者" />
-          {withSettingsContentFallback(
-            <DeveloperSettings />,
-            "正在加载开发者工具...",
-          )}
-        </>
+      return withSettingsContentFallback(
+        <DeveloperSettings />,
+        "正在加载开发者工具...",
       );
 
     case SettingsTabs.About:
@@ -611,6 +582,7 @@ export function SettingsLayoutV2({
           onTabPrefetch={handleTabPrefetch}
         />
         <ContentContainer ref={contentContainerRef}>
+          <ContentAtmosphere data-testid="settings-content-atmosphere" />
           <ContentWrapper $wide={WIDE_CONTENT_TABS.has(activeTab)}>
             {renderSettingsContent(
               activeTab,
diff --git a/src/components/settings-v2/agent/providers/index.test.tsx b/src/components/settings-v2/agent/providers/index.test.tsx
index 7b10b3e40..5b978ec15 100644
--- a/src/components/settings-v2/agent/providers/index.test.tsx
+++ b/src/components/settings-v2/agent/providers/index.test.tsx
@@ -2,15 +2,50 @@ import { act } from "react";
 import { createRoot, type Root } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
-const { mockUseOemCloudAccess, mockFormatOemCloudDateTime } = vi.hoisted(() => ({
+const {
+  mockUseOemCloudAccess,
+  mockFormatOemCloudDateTime,
+  mockGetCompanionPetStatus,
+  mockLaunchCompanionPet,
+  mockListenCompanionPetStatus,
+  mockSendCompanionPetCommand,
+  mockProviderPoolGetOverview,
+  mockSubscribeProviderDataChanged,
+} = vi.hoisted(() => ({
   mockUseOemCloudAccess: vi.fn(),
   mockFormatOemCloudDateTime: vi.fn((value?: string) => `fmt:${value ?? ""}`),
+  mockGetCompanionPetStatus: vi.fn(),
+  mockLaunchCompanionPet: vi.fn(),
+  mockListenCompanionPetStatus: vi.fn(),
+  mockSendCompanionPetCommand: vi.fn(),
+  mockProviderPoolGetOverview: vi.fn(),
+  mockSubscribeProviderDataChanged: vi.fn(),
 }));
 
 vi.mock("@/components/provider-pool", () => ({
   ProviderPoolPage: () => <div data-testid="provider-pool-stub">凭证池占位</div>,
 }));
 
+vi.mock("@/lib/api/companion", () => ({
+  getCompanionPetStatus: () => mockGetCompanionPetStatus(),
+  launchCompanionPet: () => mockLaunchCompanionPet(),
+  listenCompanionPetStatus: (...args: unknown[]) =>
+    mockListenCompanionPetStatus(...args),
+  sendCompanionPetCommand: (...args: unknown[]) =>
+    mockSendCompanionPetCommand(...args),
+}));
+
+vi.mock("@/lib/api/providerPool", () => ({
+  providerPoolApi: {
+    getOverview: (...args: unknown[]) => mockProviderPoolGetOverview(...args),
+  },
+}));
+
+vi.mock("@/lib/providerDataEvents", () => ({
+  subscribeProviderDataChanged: (...args: unknown[]) =>
+    mockSubscribeProviderDataChanged(...args),
+}));
+
 vi.mock("@/hooks/useOemCloudAccess", () => ({
   useOemCloudAccess: () => mockUseOemCloudAccess(),
   formatOemCloudDateTime: (value?: string) =>
@@ -107,13 +142,59 @@ function createAccessState(overrides: Record<string, unknown> = {}) {
   };
 }
 
-function renderPage(props: { onOpenProfile?: () => void } = {}) {
+function createPetStatus(overrides: Record<string, unknown> = {}) {
+  return {
+    endpoint: "ws://127.0.0.1:45554/companion/pet",
+    server_listening: true,
+    connected: false,
+    client_id: null,
+    platform: null,
+    capabilities: [],
+    last_event: null,
+    last_error: null,
+    last_state: "idle",
+    ...overrides,
+  };
+}
+
+function createProviderOverview() {
+  return [
+    {
+      provider_type: "openai",
+      stats: {
+        total: 2,
+        healthy: 1,
+        unhealthy: 1,
+        disabled: 0,
+        total_usage: 6,
+        total_errors: 1,
+      },
+      credentials: [],
+    },
+    {
+      provider_type: "codex",
+      stats: {
+        total: 1,
+        healthy: 1,
+        unhealthy: 0,
+        disabled: 0,
+        total_usage: 3,
+        total_errors: 0,
+      },
+      credentials: [],
+    },
+  ];
+}
+
+async function renderPage(props: { onOpenProfile?: () => void } = {}) {
   const container = document.createElement("div");
   document.body.appendChild(container);
   const root = createRoot(container);
 
-  act(() => {
+  await act(async () => {
     root.render(<CloudProviderSettings {...props} />);
+    await Promise.resolve();
+    await Promise.resolve();
   });
 
   const page = { container, root };
@@ -140,6 +221,20 @@ beforeEach(() => {
   ).IS_REACT_ACT_ENVIRONMENT = true;
 
   mockUseOemCloudAccess.mockReturnValue(createAccessState());
+  mockGetCompanionPetStatus.mockResolvedValue(createPetStatus());
+  mockLaunchCompanionPet.mockResolvedValue({
+    launched: true,
+    resolved_path: "/Applications/Lime Pet.app/Contents/MacOS/Lime Pet",
+    endpoint: "ws://127.0.0.1:45554/companion/pet",
+    message: null,
+  });
+  mockListenCompanionPetStatus.mockResolvedValue(vi.fn());
+  mockSendCompanionPetCommand.mockResolvedValue({
+    delivered: true,
+    connected: true,
+  });
+  mockProviderPoolGetOverview.mockResolvedValue(createProviderOverview());
+  mockSubscribeProviderDataChanged.mockReturnValue(vi.fn());
 });
 
 afterEach(() => {
@@ -159,7 +254,7 @@ afterEach(() => {
 });
 
 describe("CloudProviderSettings", () => {
-  it("未配置运行时信息时应展示配置提示，并通过单独视图承接本地 Provider", async () => {
+  it("默认应直接进入本地 Provider 主区，并保持切换器激活态清晰", async () => {
     mockUseOemCloudAccess.mockReturnValue(
       createAccessState({
         runtime: null,
@@ -167,27 +262,50 @@ describe("CloudProviderSettings", () => {
       }),
     );
 
-    const { container } = renderPage();
+    const { container } = await renderPage();
     const text = container.textContent ?? "";
+    const settingsTab = container.querySelector(
+      '[data-testid="provider-workspace-tab-settings"]',
+    );
+    const cloudTab = container.querySelector(
+      '[data-testid="provider-workspace-tab-cloud"]',
+    );
 
-    expect(text).toContain("云端接入");
-    expect(text).toContain("public/oem-runtime-config.js");
-    expect(text).toContain("按任务阶段看 AI 服务商");
-    expect(text).not.toContain("凭证池占位");
+    expect(
+      container.querySelector('[data-testid="provider-workspace-switcher"]'),
+    ).not.toBeNull();
+    expect(
+      container.querySelectorAll('[data-testid="provider-workspace-switcher"]')
+        .length,
+    ).toBe(1);
+    expect(text).toContain("凭证池占位");
+    expect(text).not.toContain("把本地 Provider 配置和 OEM 云端服务拆开管理");
+    expect(text).not.toContain("默认先进入“服务商设置”处理 Provider");
+    expect(text).not.toContain("public/oem-runtime-config.js");
+    expect(settingsTab?.getAttribute("data-state")).toBe("active");
+    expect(cloudTab?.getAttribute("data-state")).toBe("inactive");
 
     await act(async () => {
-      findButton(container, "本地 Provider").dispatchEvent(
+      findButton(container, "云端服务").dispatchEvent(
         new MouseEvent("click", { bubbles: true }),
       );
     });
 
-    expect(container.textContent ?? "").toContain("本地 / 其它开发者 Provider");
-    expect(container.textContent ?? "").toContain("凭证池占位");
+    expect(container.textContent ?? "").toContain("先配置 OEM 云端运行时");
+    expect(container.textContent ?? "").toContain("public/oem-runtime-config.js");
+    expect(settingsTab?.getAttribute("data-state")).toBe("inactive");
+    expect(cloudTab?.getAttribute("data-state")).toBe("active");
   });
 
   it("未登录时应提示前往个人中心登录", async () => {
     const onOpenProfile = vi.fn();
-    const { container } = renderPage({ onOpenProfile });
+    const { container } = await renderPage({ onOpenProfile });
+
+    await act(async () => {
+      findButton(container, "云端服务").dispatchEvent(
+        new MouseEvent("click", { bubbles: true }),
+      );
+    });
 
     expect(container.textContent ?? "").toContain("去个人中心登录");
 
@@ -200,7 +318,7 @@ describe("CloudProviderSettings", () => {
     expect(onOpenProfile).toHaveBeenCalledTimes(1);
   });
 
-  it("已登录时应通过分视图展示云端来源目录与模型详情", async () => {
+  it("已登录时应在云端页展示 OEM 来源目录与模型详情", async () => {
     const handleRefresh = vi.fn();
     const handleSetDefault = vi.fn();
     const selectedOffer = {
@@ -250,10 +368,13 @@ describe("CloudProviderSettings", () => {
       }),
     );
 
-    const { container } = renderPage();
-    expect(container.textContent ?? "").toContain("Demo Operator");
-    expect(container.textContent ?? "").toContain("治理摘要与下一步");
-    expect(container.textContent ?? "").toContain("fmt:2026-03-25T08:00:00.000Z");
+    const { container } = await renderPage();
+
+    await act(async () => {
+      findButton(container, "云端服务").dispatchEvent(
+        new MouseEvent("click", { bubbles: true }),
+      );
+    });
 
     await act(async () => {
       findButton(container, "刷新云端状态").dispatchEvent(
@@ -261,13 +382,10 @@ describe("CloudProviderSettings", () => {
       );
     });
 
-    await act(async () => {
-      findButton(container, "云端目录").dispatchEvent(
-        new MouseEvent("click", { bubbles: true }),
-      );
-    });
-
     const text = container.textContent ?? "";
+    expect(text).toContain("Demo Operator");
+    expect(text).toContain("当前云端摘要");
+    expect(text).toContain("fmt:2026-03-25T08:00:00.000Z");
     expect(text).toContain("Lime Hub 主服务");
     expect(text).toContain("GPT-5.2 Pro");
 
@@ -334,10 +452,10 @@ describe("CloudProviderSettings", () => {
       }),
     );
 
-    const { container } = renderPage();
+    const { container } = await renderPage();
 
     await act(async () => {
-      findButton(container, "云端目录").dispatchEvent(
+      findButton(container, "云端服务").dispatchEvent(
         new MouseEvent("click", { bubbles: true }),
       );
     });
@@ -381,17 +499,150 @@ describe("CloudProviderSettings", () => {
       }),
     );
 
-    const { container } = renderPage();
-    act(() => {
-      findButton(container, "云端目录").dispatchEvent(
-        new MouseEvent("click", { bubbles: true }),
+    return renderPage().then(({ container }) => {
+      act(() => {
+        findButton(container, "云端服务").dispatchEvent(
+          new MouseEvent("click", { bubbles: true }),
+        );
+      });
+      const offerGrid = container.querySelector(
+        '[data-testid="oem-cloud-offer-grid"]',
       );
+
+      expect(offerGrid).not.toBeNull();
+      expect(offerGrid?.className).not.toContain("lg:grid-cols-2");
     });
-    const offerGrid = container.querySelector(
-      '[data-testid="oem-cloud-offer-grid"]',
+  });
+
+  it("服务商设置页应展示桌宠桥接卡片和脱敏边界说明", async () => {
+    mockGetCompanionPetStatus.mockResolvedValue(
+      createPetStatus({
+        connected: true,
+        client_id: "lime-pet",
+        platform: "macos",
+        capabilities: ["provider-overview"],
+        last_event: "pet.ready",
+        last_state: "walking",
+      }),
     );
 
-    expect(offerGrid).not.toBeNull();
-    expect(offerGrid?.className).not.toContain("lg:grid-cols-2");
+    const { container } = await renderPage();
+    const text = container.textContent ?? "";
+
+    expect(
+      container.querySelector('[data-testid="companion-provider-card"]'),
+    ).not.toBeNull();
+    expect(text).toContain("Lime Pet Companion");
+    expect(text).toContain("桌宠通过本地 Companion 通道复用 Lime 的 AI 服务商状态");
+    expect(text).toContain("不会直接读取 API Key、OAuth 凭证或本地凭证文件");
+    expect(text).toContain("桌宠已连接");
+    expect(text).toContain("Provider 概览");
+    expect(text).toContain("桌宠视角预览");
+    expect(text).toContain("OpenAI");
+    expect(text).toContain("Codex");
+    expect(text).toContain("可用 2");
+    expect(text).toContain("需关注 1");
+    expect(text).toContain("接入检查");
+    expect(text).toContain("当前链路已就绪，可以直接点击“立即同步到桌宠”。");
+  });
+
+  it("点击启动桌宠后应调用 launch 接口并展示启动反馈", async () => {
+    mockGetCompanionPetStatus
+      .mockResolvedValueOnce(createPetStatus())
+      .mockResolvedValueOnce(
+        createPetStatus({
+          server_listening: true,
+          connected: false,
+          last_event: "pet.launch_requested",
+        }),
+      );
+
+    const { container } = await renderPage();
+
+    await act(async () => {
+      findButton(container, "启动 Lime Pet").dispatchEvent(
+        new MouseEvent("click", { bubbles: true }),
+      );
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(mockLaunchCompanionPet).toHaveBeenCalledTimes(1);
+    expect(container.textContent ?? "").toContain("已请求启动 Lime Pet");
+  });
+
+  it("桌宠已连接且支持 provider 概览时，应允许手动同步摘要", async () => {
+    mockGetCompanionPetStatus.mockResolvedValue(
+      createPetStatus({
+        connected: true,
+        capabilities: ["provider-overview"],
+        last_event: "pet.ready",
+      }),
+    );
+
+    const { container } = await renderPage();
+
+    await act(async () => {
+      findButton(container, "立即同步到桌宠").dispatchEvent(
+        new MouseEvent("click", { bubbles: true }),
+      );
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(mockSendCompanionPetCommand).toHaveBeenCalledWith({
+      event: "pet.provider_overview",
+      payload: {
+        providers: [
+          {
+            provider_type: "codex",
+            display_name: "Codex",
+            total_count: 1,
+            healthy_count: 1,
+            available: true,
+            needs_attention: false,
+          },
+          {
+            provider_type: "openai",
+            display_name: "OpenAI",
+            total_count: 2,
+            healthy_count: 1,
+            available: true,
+            needs_attention: true,
+          },
+        ],
+        total_provider_count: 2,
+        available_provider_count: 2,
+        needs_attention_provider_count: 1,
+      },
+    });
+    expect(container.textContent ?? "").toContain("已同步 2 个服务商摘要到桌宠");
+    expect(container.textContent ?? "").toContain(
+      "当前链路已就绪，可以直接点击“立即同步到桌宠”。",
+    );
+  });
+
+  it("桌宠已连接但未声明 provider 概览能力时，应展示诊断并禁用手动同步", async () => {
+    mockGetCompanionPetStatus.mockResolvedValue(
+      createPetStatus({
+        connected: true,
+        client_id: "lime-pet",
+        platform: "windows",
+        capabilities: [],
+        last_event: "pet.ready",
+      }),
+    );
+
+    const { container } = await renderPage();
+    const syncButton = container.querySelector(
+      '[data-testid="companion-sync-preview"]',
+    ) as HTMLButtonElement | null;
+    const text = container.textContent ?? "";
+
+    expect(syncButton).not.toBeNull();
+    expect(syncButton?.disabled).toBe(true);
+    expect(text).toContain("能力未声明");
+    expect(text).toContain("当前桌宠已连接，但尚未声明 Provider 概览能力");
+    expect(text).toContain("平台：Windows");
   });
 });
diff --git a/src/components/settings-v2/agent/providers/index.tsx b/src/components/settings-v2/agent/providers/index.tsx
index 46cd1db78..0b570e428 100644
--- a/src/components/settings-v2/agent/providers/index.tsx
+++ b/src/components/settings-v2/agent/providers/index.tsx
@@ -1,9 +1,9 @@
 import { useEffect, useMemo, useState, type ReactNode } from "react";
 import {
   AlertCircle,
+  Bot,
   CheckCircle2,
   Cloud,
-  Database,
   ExternalLink,
   KeyRound,
   Layers3,
@@ -27,10 +27,24 @@ import type {
   OemCloudProviderOfferState,
   OemCloudProviderOfferSummary,
 } from "@/lib/api/oemCloudControlPlane";
+import {
+  getCompanionPetStatus,
+  launchCompanionPet,
+  listenCompanionPetStatus,
+  sendCompanionPetCommand,
+  type CompanionPetStatus,
+} from "@/lib/api/companion";
+import { providerPoolApi } from "@/lib/api/providerPool";
+import { subscribeProviderDataChanged } from "@/lib/providerDataEvents";
+import {
+  buildCompanionProviderOverview,
+  type CompanionProviderOverviewPayload,
+} from "@/lib/provider/companionProviderOverview";
 import { cn } from "@/lib/utils";
 
 const SURFACE_CLASS_NAME =
-  "rounded-[26px] border border-slate-200/80 bg-white p-5 shadow-sm shadow-slate-950/5";
+  "rounded-[24px] border border-slate-200/80 bg-white p-5 shadow-sm shadow-slate-950/5";
+const DEFAULT_COMPANION_ENDPOINT = "ws://127.0.0.1:45554/companion/pet";
 
 function SessionValueCard(props: {
   label: string;
@@ -39,15 +53,15 @@ function SessionValueCard(props: {
   icon?: ReactNode;
 }) {
   return (
-    <div className="rounded-[22px] border border-slate-200/80 bg-white p-4 shadow-sm shadow-slate-950/5">
-      <div className="flex items-center gap-2 text-[11px] font-medium uppercase tracking-[0.14em] text-slate-500">
+    <div className="rounded-[18px] border border-slate-200/80 bg-slate-50 px-4 py-3">
+      <div className="flex items-center gap-2 text-xs font-medium text-slate-500">
         {props.icon ? <span className="text-slate-400">{props.icon}</span> : null}
         <span>{props.label}</span>
       </div>
       <p className="mt-2 break-all text-sm font-semibold text-slate-900">
         {props.value}
       </p>
-      <p className="mt-2 text-xs leading-5 text-slate-500">{props.hint}</p>
+      <p className="mt-1 text-xs leading-5 text-slate-500">{props.hint}</p>
     </div>
   );
 }
@@ -59,7 +73,7 @@ function NoticeBar(props: {
   return (
     <div
       className={cn(
-        "flex items-center gap-3 rounded-[20px] border px-4 py-3 text-sm shadow-sm shadow-slate-950/5",
+        "flex items-center gap-3 rounded-[18px] border px-4 py-3 text-sm shadow-sm shadow-slate-950/5",
         props.tone === "success"
           ? "border-emerald-200 bg-emerald-50 text-emerald-700"
           : "border-rose-200 bg-rose-50 text-rose-700",
@@ -75,7 +89,10 @@ function NoticeBar(props: {
   );
 }
 
-function InfoPill(props: { label: string; tone?: "slate" | "emerald" | "amber" }) {
+function InfoPill(props: {
+  label: string;
+  tone?: "slate" | "emerald" | "amber";
+}) {
   return (
     <span
       className={cn(
@@ -98,10 +115,8 @@ function RuntimeSummaryItem(props: {
   hint?: string;
 }) {
   return (
-    <div className="rounded-[18px] border border-slate-200/80 bg-white/90 px-4 py-3 shadow-sm shadow-slate-950/5">
-      <p className="text-[11px] font-medium uppercase tracking-[0.14em] text-slate-500">
-        {props.label}
-      </p>
+    <div className="rounded-[18px] border border-slate-200/80 bg-slate-50 px-4 py-3">
+      <p className="text-xs font-medium text-slate-500">{props.label}</p>
       <p className="mt-1 text-sm font-semibold leading-6 text-slate-900">
         {props.value}
       </p>
@@ -112,9 +127,704 @@ function RuntimeSummaryItem(props: {
   );
 }
 
-function resolveOfferTone(
-  state: string,
-): "slate" | "emerald" | "amber" {
+function formatCompanionError(error: unknown): string {
+  if (error instanceof Error && error.message) {
+    return error.message;
+  }
+  if (typeof error === "string" && error.trim()) {
+    return error;
+  }
+  return "未知错误";
+}
+
+function formatCompanionCapabilityLabel(capability: string): string {
+  switch (capability) {
+    case "provider-overview":
+      return "Provider 概览";
+    default:
+      return capability;
+  }
+}
+
+function formatCompanionVisualStateLabel(
+  state: CompanionPetStatus["last_state"],
+): string {
+  switch (state) {
+    case "hidden":
+      return "隐藏";
+    case "walking":
+      return "游走";
+    case "thinking":
+      return "思考中";
+    case "done":
+      return "完成";
+    case "idle":
+    default:
+      return "待命";
+  }
+}
+
+function formatCompanionPlatformLabel(platform: string | null | undefined): string {
+  switch (platform) {
+    case "macos":
+      return "macOS";
+    case "windows":
+      return "Windows";
+    case "linux":
+      return "Linux";
+    default:
+      return platform?.trim() || "未上报平台";
+  }
+}
+
+function formatCompanionDateTime(value: Date | null): string {
+  if (!value) {
+    return "尚未同步";
+  }
+
+  return new Intl.DateTimeFormat("zh-CN", {
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hour12: false,
+  }).format(value);
+}
+
+function CompanionProviderBridgeCard() {
+  const [status, setStatus] = useState<CompanionPetStatus | null>(null);
+  const [loadingStatus, setLoadingStatus] = useState(true);
+  const [refreshingStatus, setRefreshingStatus] = useState(false);
+  const [launchingPet, setLaunchingPet] = useState(false);
+  const [syncingPreview, setSyncingPreview] = useState(false);
+  const [previewLoading, setPreviewLoading] = useState(true);
+  const [previewError, setPreviewError] = useState<string | null>(null);
+  const [providerOverviewPreview, setProviderOverviewPreview] =
+    useState<CompanionProviderOverviewPayload | null>(null);
+  const [lastManualSyncAt, setLastManualSyncAt] = useState<Date | null>(null);
+  const [actionFeedback, setActionFeedback] = useState<{
+    tone: "error" | "success";
+    message: string;
+  } | null>(null);
+
+  useEffect(() => {
+    let cancelled = false;
+    let statusUnlisten: (() => void) | null = null;
+    let unsubscribeProviderData: (() => void) | null = null;
+
+    const applyStatus = (nextStatus: CompanionPetStatus) => {
+      if (cancelled) {
+        return;
+      }
+      setStatus(nextStatus);
+    };
+
+    const loadProviderPreview = async (forceRefresh = false) => {
+      if (!cancelled) {
+        setPreviewLoading(true);
+        setPreviewError(null);
+      }
+
+      try {
+        const overview = await providerPoolApi.getOverview(
+          forceRefresh ? { forceRefresh: true } : undefined,
+        );
+        if (cancelled) {
+          return;
+        }
+        setProviderOverviewPreview(buildCompanionProviderOverview(overview));
+      } catch (error) {
+        if (!cancelled) {
+          setPreviewError(`读取桌宠摘要预览失败：${formatCompanionError(error)}`);
+        }
+      } finally {
+        if (!cancelled) {
+          setPreviewLoading(false);
+        }
+      }
+    };
+
+    const loadStatus = async (initial = false) => {
+      if (initial) {
+        setLoadingStatus(true);
+      } else {
+        setRefreshingStatus(true);
+      }
+
+      try {
+        const nextStatus = await getCompanionPetStatus();
+        applyStatus(nextStatus);
+      } catch (error) {
+        if (!cancelled) {
+          setActionFeedback({
+            tone: "error",
+            message: `读取桌宠状态失败：${formatCompanionError(error)}`,
+          });
+        }
+      } finally {
+        if (!cancelled) {
+          setLoadingStatus(false);
+          setRefreshingStatus(false);
+        }
+      }
+    };
+
+    void loadStatus(true);
+    void loadProviderPreview();
+
+    void listenCompanionPetStatus((nextStatus) => {
+      applyStatus(nextStatus);
+    })
+      .then((unlisten) => {
+        if (cancelled) {
+          void unlisten();
+          return;
+        }
+        statusUnlisten = unlisten;
+      })
+      .catch((error) => {
+        if (!cancelled) {
+          setActionFeedback({
+            tone: "error",
+            message: `监听桌宠状态失败：${formatCompanionError(error)}`,
+          });
+        }
+      });
+
+    unsubscribeProviderData = subscribeProviderDataChanged(() => {
+      void loadProviderPreview(true);
+    });
+
+    return () => {
+      cancelled = true;
+      if (statusUnlisten) {
+        statusUnlisten();
+      }
+      if (unsubscribeProviderData) {
+        unsubscribeProviderData();
+      }
+    };
+  }, []);
+
+  const refreshStatus = async () => {
+    setActionFeedback(null);
+    setRefreshingStatus(true);
+    setPreviewLoading(true);
+    try {
+      const [nextStatus] = await Promise.all([
+        getCompanionPetStatus(),
+        providerPoolApi
+          .getOverview({ forceRefresh: true })
+          .then((overview) => {
+            setProviderOverviewPreview(buildCompanionProviderOverview(overview));
+            setPreviewError(null);
+          })
+          .catch((error) => {
+            setPreviewError(
+              `读取桌宠摘要预览失败：${formatCompanionError(error)}`,
+            );
+          })
+          .finally(() => {
+            setPreviewLoading(false);
+          }),
+      ]);
+      setStatus(nextStatus);
+    } catch (error) {
+      setActionFeedback({
+        tone: "error",
+        message: `刷新桌宠状态失败：${formatCompanionError(error)}`,
+      });
+    } finally {
+      setRefreshingStatus(false);
+    }
+  };
+
+  const handleLaunchPet = async () => {
+    setActionFeedback(null);
+    setLaunchingPet(true);
+    try {
+      const result = await launchCompanionPet();
+      if (result.launched) {
+        setActionFeedback({
+          tone: "success",
+          message: result.message || "已请求启动 Lime Pet，请等待桌宠建立连接。",
+        });
+      } else {
+        setActionFeedback({
+          tone: "error",
+          message:
+            result.message ||
+            "当前没有可用的 Lime Pet 可执行产物，请先安装桌宠应用。",
+        });
+      }
+
+      const nextStatus = await getCompanionPetStatus();
+      setStatus(nextStatus);
+    } catch (error) {
+      setActionFeedback({
+        tone: "error",
+        message: `启动桌宠失败：${formatCompanionError(error)}`,
+      });
+    } finally {
+      setLaunchingPet(false);
+    }
+  };
+
+  const handleSyncPreview = async () => {
+    setActionFeedback(null);
+
+    if (!providerOverviewPreview) {
+      setActionFeedback({
+        tone: "error",
+        message: "桌宠摘要预览尚未准备完成，请稍后再试。",
+      });
+      return;
+    }
+
+    if (!connected) {
+      setActionFeedback({
+        tone: "error",
+        message: "桌宠尚未连接，暂时无法同步摘要。",
+      });
+      return;
+    }
+
+    if (!supportsProviderOverview) {
+      setActionFeedback({
+        tone: "error",
+        message: "当前桌宠未声明 Provider 概览能力，暂时无法接收摘要。",
+      });
+      return;
+    }
+
+    setSyncingPreview(true);
+    try {
+      const result = await sendCompanionPetCommand({
+        event: "pet.provider_overview",
+        payload: providerOverviewPreview,
+      });
+
+      if (!result.delivered) {
+        setActionFeedback({
+          tone: "error",
+          message: "桌宠连接存在但本次摘要未送达，请检查 Companion 连接状态。",
+        });
+        return;
+      }
+
+      setActionFeedback({
+        tone: "success",
+        message: `已同步 ${providerOverviewPreview.total_provider_count} 个服务商摘要到桌宠。`,
+      });
+      setLastManualSyncAt(new Date());
+    } catch (error) {
+      setActionFeedback({
+        tone: "error",
+        message: `同步桌宠摘要失败：${formatCompanionError(error)}`,
+      });
+    } finally {
+      setSyncingPreview(false);
+    }
+  };
+
+  const connected = Boolean(status?.connected);
+  const serverListening = Boolean(status?.server_listening);
+  const supportsProviderOverview = Boolean(
+    status?.capabilities.includes("provider-overview"),
+  );
+  const endpoint = status?.endpoint || DEFAULT_COMPANION_ENDPOINT;
+  const lastState = formatCompanionVisualStateLabel(status?.last_state || "idle");
+  const capabilityText =
+    status && status.capabilities.length > 0
+      ? status.capabilities.map(formatCompanionCapabilityLabel).join(" / ")
+      : "未声明";
+  const previewProviders = providerOverviewPreview?.providers || [];
+  const petIdentity = status?.client_id?.trim() || "等待桌宠上报";
+  const syncDiagnostic = (() => {
+    if (previewLoading) {
+      return {
+        label: "整理摘要中",
+        hint: "正在从本地 Provider 真相源整理桌宠预览。",
+      };
+    }
+    if (previewError) {
+      return {
+        label: "预览异常",
+        hint: previewError,
+      };
+    }
+    if (!serverListening) {
+      return {
+        label: "宿主未监听",
+        hint: "Companion 服务尚未监听，本地桌宠暂时无法接入。",
+      };
+    }
+    if (!connected) {
+      return {
+        label: "等待桌宠连接",
+        hint: "Companion 已监听，可点击“启动 Lime Pet”或检查桌宠是否已连上本地入口。",
+      };
+    }
+    if (!supportsProviderOverview) {
+      return {
+        label: "能力未声明",
+        hint: "当前桌宠已连接，但尚未声明 Provider 概览能力，Lime 不会强行下发摘要。",
+      };
+    }
+    if (syncingPreview) {
+      return {
+        label: "同步中",
+        hint: "正在把当前脱敏摘要发送给桌宠。",
+      };
+    }
+    return {
+      label: "可立即同步",
+      hint: "桌宠已连接且已声明 Provider 概览能力，可以手动下发当前摘要。",
+    };
+  })();
+  const readinessChecks = [
+    {
+      key: "host",
+      label: "Companion 宿主已监听",
+      done: serverListening,
+      pending: false,
+      detail: serverListening
+        ? "Lime 已监听本地桌宠入口。"
+        : "当前还没有可用的本地桌宠入口。",
+    },
+    {
+      key: "connection",
+      label: "桌宠已建立连接",
+      done: connected,
+      pending: false,
+      detail: connected
+        ? "桌宠已经接入 Lime Companion。"
+        : "需要启动桌宠，或检查它是否连到了本地入口。",
+    },
+    {
+      key: "capability",
+      label: "桌宠声明 Provider 概览能力",
+      done: supportsProviderOverview,
+      pending: connected && !supportsProviderOverview,
+      detail: supportsProviderOverview
+        ? "桌宠已声明可接收 provider-overview 摘要。"
+        : connected
+          ? "当前桌宠已连接，但尚未声明 provider-overview 能力。"
+          : "桌宠连接建立后，Lime 会等待能力声明。",
+    },
+    {
+      key: "preview",
+      label: "脱敏摘要已准备完成",
+      done:
+        !previewLoading &&
+        !previewError &&
+        providerOverviewPreview !== null &&
+        previewProviders.length >= 0,
+      pending: previewLoading,
+      detail: previewLoading
+        ? "正在从本地 Provider 真相源整理脱敏摘要。"
+        : previewError
+          ? previewError
+          : `当前已准备 ${providerOverviewPreview?.total_provider_count ?? 0} 个服务商摘要。`,
+    },
+  ] as const;
+  const nextAction = (() => {
+    if (!serverListening) {
+      return "先让 Lime 完整启动 Companion 宿主，再连接桌宠。";
+    }
+    if (!connected) {
+      return "点击“启动 Lime Pet”，或检查桌宠是否已连接到本地 Companion 地址。";
+    }
+    if (!supportsProviderOverview) {
+      return "先让桌宠在 ready 事件里声明 provider-overview 能力，再尝试同步摘要。";
+    }
+    if (previewLoading) {
+      return "等待 Lime 整理完当前 Provider 脱敏摘要。";
+    }
+    if (previewError) {
+      return "先修复摘要预览异常，再把脱敏摘要发送给桌宠。";
+    }
+    return "当前链路已就绪，可以直接点击“立即同步到桌宠”。";
+  })();
+
+  return (
+    <article className={SURFACE_CLASS_NAME} data-testid="companion-provider-card">
+      <div className="flex flex-col gap-4 xl:flex-row xl:items-start xl:justify-between">
+        <div className="space-y-4">
+          <div className="flex items-start gap-4">
+            <div className="flex h-12 w-12 items-center justify-center rounded-2xl border border-emerald-200 bg-emerald-50 text-emerald-700">
+              <Bot className="h-5 w-5" />
+            </div>
+            <div className="space-y-2">
+              <div className="flex flex-wrap items-center gap-2">
+                <h3 className="text-lg font-semibold text-slate-900">
+                  Lime Pet Companion
+                </h3>
+                <InfoPill
+                  label={
+                    connected
+                      ? "桌宠已连接"
+                      : serverListening
+                        ? "等待桌宠连接"
+                        : "本地 Companion 未监听"
+                  }
+                  tone={connected ? "emerald" : serverListening ? "amber" : "slate"}
+                />
+                <InfoPill
+                  label={
+                    supportsProviderOverview
+                      ? "自动同步 Provider 概览"
+                      : "未声明 Provider 概览"
+                  }
+                  tone={supportsProviderOverview ? "emerald" : "slate"}
+                />
+              </div>
+              <p className="text-sm leading-6 text-slate-600">
+                桌宠通过本地 Companion 通道复用 Lime 的 AI 服务商状态，只接收脱敏后的可用性摘要，不会直接读取 API Key、OAuth 凭证或本地凭证文件。
+              </p>
+            </div>
+          </div>
+
+          <div className="grid gap-3 md:grid-cols-2 xl:grid-cols-4">
+            <RuntimeSummaryItem
+              label="桥接状态"
+              value={
+                connected
+                  ? "已接通"
+                  : serverListening
+                    ? "等待连接"
+                    : "未监听"
+              }
+              hint="Lime 负责本地 Companion 宿主，桌宠作为独立原生壳接入。"
+            />
+            <RuntimeSummaryItem
+              label="最近状态"
+              value={lastState}
+              hint={status?.last_event ? `最近事件：${status.last_event}` : "尚未收到桌宠事件"}
+            />
+            <RuntimeSummaryItem
+              label="能力"
+              value={capabilityText}
+              hint="能力由桌宠在 ready 事件里声明，Lime 只按声明下发脱敏数据。"
+            />
+            <RuntimeSummaryItem
+              label="桌宠身份"
+              value={petIdentity}
+              hint={`平台：${formatCompanionPlatformLabel(status?.platform)}`}
+            />
+            <RuntimeSummaryItem
+              label="同步诊断"
+              value={syncDiagnostic.label}
+              hint={syncDiagnostic.hint}
+            />
+          </div>
+
+          <div className="rounded-[18px] border border-slate-200/80 bg-slate-50 px-4 py-4">
+            <div className="flex flex-col gap-3 lg:flex-row lg:items-start lg:justify-between">
+              <div className="space-y-1">
+                <p className="text-sm font-semibold text-slate-900">接入检查</p>
+                <p className="text-xs leading-5 text-slate-500">
+                  按“宿主监听、桌宠连接、能力声明、摘要准备”这四步排查桌宠接入状态。
+                </p>
+              </div>
+              <div className="rounded-[14px] border border-slate-200/80 bg-white px-3 py-2 text-xs text-slate-600">
+                当前建议：<span className="font-medium text-slate-800">{nextAction}</span>
+              </div>
+            </div>
+
+            <div
+              className="mt-4 grid gap-3 md:grid-cols-2"
+              data-testid="companion-readiness-grid"
+            >
+              {readinessChecks.map((item) => (
+                <div
+                  key={item.key}
+                  className="rounded-[16px] border border-white bg-white px-4 py-3 shadow-sm shadow-slate-950/5"
+                >
+                  <div className="flex items-start gap-3">
+                    <span
+                      className={cn(
+                        "mt-0.5 flex h-6 w-6 items-center justify-center rounded-full border",
+                        item.done
+                          ? "border-emerald-200 bg-emerald-50 text-emerald-700"
+                          : item.pending
+                            ? "border-amber-200 bg-amber-50 text-amber-700"
+                            : "border-slate-200 bg-slate-50 text-slate-500",
+                      )}
+                    >
+                      {item.done ? (
+                        <CheckCircle2 className="h-3.5 w-3.5" />
+                      ) : item.pending ? (
+                        <LoaderCircle className="h-3.5 w-3.5 animate-spin" />
+                      ) : (
+                        <AlertCircle className="h-3.5 w-3.5" />
+                      )}
+                    </span>
+                    <div className="space-y-1">
+                      <p className="text-sm font-medium text-slate-900">{item.label}</p>
+                      <p className="text-xs leading-5 text-slate-500">{item.detail}</p>
+                    </div>
+                  </div>
+                </div>
+              ))}
+            </div>
+          </div>
+
+          <div className="rounded-[18px] border border-slate-200/80 bg-slate-50 px-4 py-4">
+            <div className="flex flex-col gap-3 lg:flex-row lg:items-start lg:justify-between">
+              <div className="space-y-1">
+                <p className="text-sm font-semibold text-slate-900">
+                  桌宠视角预览
+                </p>
+                <p className="text-xs leading-5 text-slate-500">
+                  这里展示 Lime 准备发给桌宠的 Provider 脱敏摘要，便于确认 Companion 边界没有把原始凭证带出去。
+                </p>
+              </div>
+              <div className="flex flex-wrap items-center gap-2">
+                <InfoPill
+                  label={`服务商 ${providerOverviewPreview?.total_provider_count ?? 0}`}
+                />
+                <InfoPill
+                  label={`可用 ${providerOverviewPreview?.available_provider_count ?? 0}`}
+                  tone="emerald"
+                />
+                <InfoPill
+                  label={`需关注 ${providerOverviewPreview?.needs_attention_provider_count ?? 0}`}
+                  tone="amber"
+                />
+                <InfoPill label={`最近同步 ${formatCompanionDateTime(lastManualSyncAt)}`} />
+                <button
+                  type="button"
+                  onClick={() => void handleSyncPreview()}
+                  disabled={
+                    previewLoading ||
+                    syncingPreview ||
+                    !providerOverviewPreview ||
+                    !connected ||
+                    !supportsProviderOverview
+                  }
+                  className="inline-flex items-center justify-center gap-2 rounded-[14px] border border-slate-200 bg-white px-3 py-1.5 text-xs font-medium text-slate-700 transition hover:border-slate-300 hover:bg-slate-50 disabled:cursor-not-allowed disabled:opacity-60"
+                  data-testid="companion-sync-preview"
+                >
+                  {syncingPreview ? (
+                    <LoaderCircle className="h-3.5 w-3.5 animate-spin" />
+                  ) : (
+                    <RefreshCw className="h-3.5 w-3.5" />
+                  )}
+                  立即同步到桌宠
+                </button>
+              </div>
+            </div>
+
+            <div className="mt-3 rounded-[14px] border border-slate-200/80 bg-white px-3 py-2 text-xs text-slate-500">
+              Companion 地址：<span className="font-medium text-slate-700">{endpoint}</span>
+            </div>
+
+            {previewLoading ? (
+              <div className="mt-4 flex items-center gap-2 text-sm text-slate-500">
+                <LoaderCircle className="h-4 w-4 animate-spin" />
+                正在整理桌宠摘要预览...
+              </div>
+            ) : previewProviders.length > 0 ? (
+              <div
+                className="mt-4 grid gap-3 md:grid-cols-2 xl:grid-cols-3"
+                data-testid="companion-provider-preview-grid"
+              >
+                {previewProviders.map((provider) => (
+                  <div
+                    key={provider.provider_type}
+                    className="rounded-[16px] border border-white bg-white px-4 py-3 shadow-sm shadow-slate-950/5"
+                  >
+                    <div className="flex items-start justify-between gap-3">
+                      <div>
+                        <p className="text-sm font-semibold text-slate-900">
+                          {provider.display_name}
+                        </p>
+                        <p className="mt-1 text-xs text-slate-500">
+                          {provider.provider_type}
+                        </p>
+                      </div>
+                      <InfoPill
+                        label={provider.available ? "可用" : "不可用"}
+                        tone={provider.available ? "emerald" : "amber"}
+                      />
+                    </div>
+                    <div className="mt-3 flex flex-wrap gap-2 text-xs text-slate-500">
+                      <span>配置 {provider.total_count}</span>
+                      <span>健康 {provider.healthy_count}</span>
+                      {provider.needs_attention ? (
+                        <span className="text-amber-700">需要关注</span>
+                      ) : (
+                        <span className="text-emerald-700">状态稳定</span>
+                      )}
+                    </div>
+                  </div>
+                ))}
+              </div>
+            ) : (
+              <div className="mt-4 rounded-[16px] border border-dashed border-slate-300 bg-white px-4 py-3 text-sm text-slate-500">
+                当前还没有可供桌宠消费的 Provider 摘要。配置任一服务商后，这里会显示脱敏后的可用性信息。
+              </div>
+            )}
+          </div>
+
+          {status?.last_error ? (
+            <NoticeBar
+              tone="error"
+              message={`桌宠最近一次错误：${status.last_error}`}
+            />
+          ) : null}
+
+          {previewError ? (
+            <NoticeBar tone="error" message={previewError} />
+          ) : null}
+
+          {actionFeedback ? (
+            <NoticeBar
+              tone={actionFeedback.tone}
+              message={actionFeedback.message}
+            />
+          ) : null}
+        </div>
+
+        <div className="flex flex-col gap-2 xl:min-w-[220px]">
+          <button
+            type="button"
+            onClick={() => void refreshStatus()}
+            disabled={loadingStatus || refreshingStatus}
+            className="inline-flex items-center justify-center gap-2 rounded-[16px] border border-slate-200 bg-white px-4 py-2.5 text-sm font-medium text-slate-700 transition hover:border-slate-300 hover:bg-slate-50 disabled:opacity-60"
+            data-testid="companion-refresh"
+          >
+            <RefreshCw
+              className={cn(
+                "h-4 w-4",
+                (loadingStatus || refreshingStatus) && "animate-spin",
+              )}
+            />
+            {loadingStatus ? "读取状态中" : "刷新桌宠状态"}
+          </button>
+          <button
+            type="button"
+            onClick={() => void handleLaunchPet()}
+            disabled={launchingPet}
+            className="inline-flex items-center justify-center gap-2 rounded-[16px] bg-slate-900 px-4 py-2.5 text-sm font-medium text-white transition hover:bg-slate-800 disabled:opacity-60"
+            data-testid="companion-launch"
+          >
+            {launchingPet ? (
+              <LoaderCircle className="h-4 w-4 animate-spin" />
+            ) : (
+              <Bot className="h-4 w-4" />
+            )}
+            {connected ? "重新打开桌宠" : "启动 Lime Pet"}
+          </button>
+        </div>
+      </div>
+    </article>
+  );
+}
+
+function resolveOfferTone(state: string): "slate" | "emerald" | "amber" {
   switch (state) {
     case "available_ready":
       return "emerald";
@@ -174,45 +884,41 @@ function resolveDisplayOfferState(
   return "available_subscribe_required";
 }
 
-type ProviderWorkspaceView = "overview" | "cloud" | "providers";
+type ProviderWorkspaceView = "settings" | "cloud";
 
 const PROVIDER_WORKSPACE_VIEW_META: Array<{
   value: ProviderWorkspaceView;
   label: string;
-  caption: string;
-  description: string;
-  icon: typeof Cloud;
+  summary: string;
+  icon: typeof KeyRound;
 }> = [
   {
-    value: "overview",
-    label: "概览",
-    caption: "默认来源 / 会话 / 治理",
-    description: "适合先确认当前租户到底在走哪条云端路径。",
-    icon: Database,
+    value: "settings",
+    label: "服务商设置",
+    summary: "Provider / API Key / 模型",
+    icon: KeyRound,
   },
   {
     value: "cloud",
-    label: "云端目录",
-    caption: "Offer / 模型目录 / 消费态",
-    description: "云端服务目录单独展示，避免和开发者配置混在一起。",
+    label: "云端服务",
+    summary: "Offer / 目录 / 会话",
     icon: Cloud,
   },
-  {
-    value: "providers",
-    label: "本地 Provider",
-    caption: "本地模型 / 第三方 / API Key",
-    description: "开发者配置独立出来，避免被云端消费信息淹没。",
-    icon: KeyRound,
-  },
 ];
 
+function isLimeBrandedHub(hubProviderName: string | null | undefined): boolean {
+  if (typeof hubProviderName !== "string") {
+    return false;
+  }
+
+  return hubProviderName.trim().toLowerCase().includes("lime");
+}
+
 export interface CloudProviderSettingsProps {
   onOpenProfile?: () => void;
 }
 
 export function CloudProviderSettings(props: CloudProviderSettingsProps) {
-  const [activeView, setActiveView] =
-    useState<ProviderWorkspaceView>("overview");
   const {
     runtime,
     configuredTarget,
@@ -236,13 +942,45 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
     activeConfigModeLabel,
     activeModelsSourceLabel,
     activeDeveloperAccessEnabled,
-    activeDeveloperAccessLabel,
     handleRefresh,
     openOfferDetail,
     handleSetDefault,
     openUserCenter,
   } = useOemCloudAccess();
 
+  const isOemRuntime = Boolean(runtime);
+  const isLimeBrand = isLimeBrandedHub(hubProviderName);
+  const showProviderSettingsEntry =
+    !isOemRuntime || isLimeBrand || activeDeveloperAccessEnabled;
+  const workspaceViews = useMemo(() => {
+    const orderedViews: ProviderWorkspaceView[] = [];
+
+    if (isOemRuntime && !isLimeBrand) {
+      orderedViews.push("cloud");
+    }
+
+    if (showProviderSettingsEntry) {
+      orderedViews.push("settings");
+    }
+
+    if (!orderedViews.includes("cloud")) {
+      orderedViews.push("cloud");
+    }
+
+    return orderedViews.map(
+      (view) =>
+        PROVIDER_WORKSPACE_VIEW_META.find((item) => item.value === view)!,
+    );
+  }, [isLimeBrand, isOemRuntime, showProviderSettingsEntry]);
+  const defaultView = workspaceViews[0]?.value ?? "cloud";
+  const [activeView, setActiveView] = useState<ProviderWorkspaceView>(defaultView);
+
+  useEffect(() => {
+    if (!workspaceViews.some((item) => item.value === activeView)) {
+      setActiveView(defaultView);
+    }
+  }, [activeView, defaultView, workspaceViews]);
+
   useEffect(() => {
     if (!session || selectedOffer || loadingDetail || offers.length === 0) {
       return;
@@ -261,42 +999,35 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
     session,
   ]);
 
-  const selectedOfferKey = selectedOffer?.providerKey ?? defaultCloudOffer?.providerKey;
+  const selectedOfferKey =
+    selectedOffer?.providerKey ?? defaultCloudOffer?.providerKey;
   const displayedSelectedOfferState = resolveDisplayOfferState(
     session,
     selectedOffer,
   );
 
-  const localProviderHint = useMemo(() => {
-    if (!activeCloudOffer) {
-      return "这里管理你自带的 API Key、第三方平台和本地模型。云端入口已经单独收口，不再和本地 Provider 混在一起。";
-    }
-
-    if (activeDeveloperAccessEnabled) {
-      return "当前云端服务已开放开发者入口。你可以继续在这里管理自带 API Key 或第三方 Provider，作为云端服务之外的补充能力。";
-    }
-
-    return "当前云端服务未开放开发者 API Key 模式，这不会影响你在这里管理其它第三方 Provider 或本地模型。";
-  }, [activeCloudOffer, activeDeveloperAccessEnabled]);
-
   const offerGridClassName = useMemo(
     () => cn("grid gap-4", offers.length > 1 && "lg:grid-cols-2"),
     [offers.length],
   );
 
-  const overviewContent = !runtime ? (
-    <article className={SURFACE_CLASS_NAME}>
-      <div className="space-y-3">
-        <h3 className="text-lg font-semibold text-slate-900">先配置运行时入口</h3>
-        <p className="text-sm leading-6 text-slate-600">
-          当前没有可用的运行时配置。请先在
-          <span className="mx-1 rounded bg-slate-100 px-1.5 py-0.5 text-xs text-slate-700">
-            public/oem-runtime-config.js
-          </span>
-          中配置域名、网关地址和租户信息，再继续接入云端服务。
-        </p>
-      </div>
-    </article>
+  const cloudDirectoryContent = !runtime ? (
+    <section className="space-y-4">
+      <article className={SURFACE_CLASS_NAME}>
+        <div className="space-y-2">
+          <h3 className="text-lg font-semibold text-slate-900">
+            先配置 OEM 云端运行时
+          </h3>
+          <p className="text-sm leading-6 text-slate-600">
+            当前没有可用的云端运行时配置。请先在
+            <span className="mx-1 rounded bg-slate-100 px-1.5 py-0.5 text-xs text-slate-700">
+              public/oem-runtime-config.js
+            </span>
+            中配置域名、网关地址和租户信息，再继续接入云端服务。
+          </p>
+        </div>
+      </article>
+    </section>
   ) : initializing ? (
     <article className={SURFACE_CLASS_NAME}>
       <div className="flex items-center gap-3 text-sm text-slate-600">
@@ -304,26 +1035,74 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
         正在恢复个人中心会话...
       </div>
     </article>
-  ) : session ? (
-    <div className="space-y-4">
+  ) : !session ? (
+    <section className="space-y-4">
+      <article className={SURFACE_CLASS_NAME}>
+        <div className="flex flex-col gap-4 lg:flex-row lg:items-center lg:justify-between">
+          <div className="space-y-2">
+            <h3 className="text-lg font-semibold text-slate-900">
+              登录后查看云端目录
+            </h3>
+            <p className="text-sm leading-6 text-slate-600">
+              当前还没有可用的个人中心会话。登录后，云端默认来源、模型目录和服务技能目录会自动同步到本地。
+            </p>
+          </div>
+          <div className="flex flex-col gap-2">
+            <button
+              type="button"
+              onClick={() => props.onOpenProfile?.()}
+              className="inline-flex items-center justify-center gap-2 rounded-[16px] bg-slate-900 px-4 py-2.5 text-sm font-medium text-white transition hover:bg-slate-800"
+              data-testid="open-profile-login"
+            >
+              <LogIn className="h-4 w-4" />
+              去个人中心登录
+            </button>
+            <button
+              type="button"
+              onClick={() => void openUserCenter(runtime?.loginPath || "/login")}
+              className="inline-flex items-center justify-center gap-2 rounded-[16px] border border-slate-200 bg-white px-4 py-2.5 text-sm font-medium text-slate-700 transition hover:border-slate-300 hover:bg-slate-50"
+            >
+              <ExternalLink className="h-4 w-4" />
+              在浏览器打开登录页
+            </button>
+          </div>
+        </div>
+      </article>
+
+      <article className={SURFACE_CLASS_NAME}>
+        <div className="space-y-2">
+          <h3 className="text-base font-semibold text-slate-900">
+            云端页面承接什么
+          </h3>
+          <p className="text-sm leading-6 text-slate-600">
+            这里保留 OEM 商业化相关的 Offer、套餐、模型目录、默认来源和会话状态，不再和本地 Provider 配置共用一个长页。
+          </p>
+        </div>
+      </article>
+    </section>
+  ) : (
+    <section className="space-y-4">
       <div
         className="grid gap-4 xl:grid-cols-[minmax(0,2fr)_minmax(320px,1fr)]"
         data-testid="oem-cloud-session-summary"
       >
         <article className={SURFACE_CLASS_NAME}>
           <div className="flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
-            <div className="space-y-3">
-              <div className="flex items-center gap-3">
-                <div className="flex h-12 w-12 items-center justify-center rounded-2xl border border-slate-200 bg-slate-100 text-slate-700">
+            <div className="space-y-4">
+              <div className="flex items-start gap-4">
+                <div className="flex h-12 w-12 items-center justify-center rounded-2xl border border-slate-200 bg-slate-50 text-slate-700">
                   <Cloud className="h-5 w-5" />
                 </div>
-                <div>
+                <div className="space-y-1">
                   <p className="text-lg font-semibold text-slate-900">
                     {session.user.displayName || session.user.email || "已登录"}
                   </p>
                   <p className="text-sm text-slate-500">
                     {session.user.email || session.user.username || session.user.id}
                   </p>
+                  <p className="text-sm leading-6 text-slate-600">
+                    当前云端会话将驱动 OEM Offer、模型目录和默认来源。商业化套餐、可用模型和是否开放开发者入口都以服务端治理结果为准。
+                  </p>
                 </div>
               </div>
 
@@ -351,7 +1130,7 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
                 type="button"
                 onClick={() => void handleRefresh()}
                 disabled={refreshing}
-                className="inline-flex items-center justify-center gap-2 rounded-[18px] border border-slate-200 bg-white px-4 py-2.5 text-sm font-medium text-slate-700 transition hover:border-slate-300 hover:bg-slate-50 disabled:opacity-60"
+                className="inline-flex items-center justify-center gap-2 rounded-[16px] border border-slate-200 bg-white px-4 py-2.5 text-sm font-medium text-slate-700 transition hover:border-slate-300 hover:bg-slate-50 disabled:opacity-60"
                 data-testid="oem-cloud-refresh"
               >
                 <RefreshCw
@@ -362,7 +1141,7 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
               <button
                 type="button"
                 onClick={() => props.onOpenProfile?.()}
-                className="inline-flex items-center justify-center gap-2 rounded-[18px] border border-slate-200 bg-white px-4 py-2.5 text-sm font-medium text-slate-700 transition hover:border-slate-300 hover:bg-slate-50"
+                className="inline-flex items-center justify-center gap-2 rounded-[16px] border border-slate-200 bg-white px-4 py-2.5 text-sm font-medium text-slate-700 transition hover:border-slate-300 hover:bg-slate-50"
               >
                 <LogIn className="h-4 w-4" />
                 前往个人中心管理会话
@@ -370,7 +1149,7 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
               <button
                 type="button"
                 onClick={() => void openUserCenter("")}
-                className="inline-flex items-center justify-center gap-2 rounded-[18px] bg-slate-900 px-4 py-2.5 text-sm font-medium text-white transition hover:bg-slate-800"
+                className="inline-flex items-center justify-center gap-2 rounded-[16px] bg-slate-900 px-4 py-2.5 text-sm font-medium text-white transition hover:bg-slate-800"
               >
                 <ExternalLink className="h-4 w-4" />
                 打开用户中心
@@ -382,14 +1161,11 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
         <article className={SURFACE_CLASS_NAME}>
           <div className="space-y-4">
             <div className="space-y-2">
-              <p className="text-xs font-semibold tracking-[0.14em] text-slate-500">
-                OVERVIEW
-              </p>
-              <h3 className="text-lg font-semibold tracking-tight text-slate-900">
-                治理摘要与下一步
+              <h3 className="text-lg font-semibold text-slate-900">
+                当前云端摘要
               </h3>
               <p className="text-sm leading-6 text-slate-600">
-                先确认当前租户到底走哪条云端路径，再决定是进入服务端 Offer 目录，还是继续管理本地 / 第三方 Provider。
+                这里只展示 OEM 云端的最终接入态，方便快速确认默认来源、模型目录和开发者入口是否符合当前租户策略。
               </p>
             </div>
 
@@ -409,139 +1185,24 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
                 value={activeDeveloperAccessEnabled ? "已开放" : "未开放"}
                 hint={
                   activeDeveloperAccessEnabled
-                    ? "可继续管理第三方 API Key"
-                    : "云端服务不会伪装成本地 Provider"
+                    ? "本地 Provider 可作为云端之外的补充能力"
+                    : "云端默认只走会话与后台治理"
                 }
               />
               <RuntimeSummaryItem
-                label="建议动作"
-                value={offers.length > 0 ? "查看云端目录" : "先去个人中心登录"}
-                hint={
-                  offers.length > 0
-                    ? "核对 Offer、模型目录和默认来源"
-                    : "完成登录后同步目录与技能"
-                }
+                label="控制面"
+                value={configuredTarget?.baseUrl || "未配置"}
+                hint="登录入口与控制面地址"
               />
             </div>
-
-            <div className="rounded-[20px] border border-slate-200/80 bg-slate-50/80 px-4 py-3">
-              <p className="text-sm font-medium text-slate-800">下一步建议</p>
-              <p className="mt-1 text-sm leading-6 text-slate-600">
-                需要核对服务端可见来源、模型目录和套餐状态时，进入“云端目录”；需要配置第三方 API Key、本地模型或其他开发者能力时，进入“本地 Provider”。
-              </p>
-            </div>
-
-            <div className="flex flex-wrap gap-2">
-              <button
-                type="button"
-                onClick={() => setActiveView("cloud")}
-                className="inline-flex items-center justify-center gap-2 rounded-[18px] border border-slate-200 bg-white px-4 py-2.5 text-sm font-medium text-slate-700 transition hover:border-slate-300 hover:bg-slate-50"
-              >
-                <Layers3 className="h-4 w-4" />
-                查看云端目录
-              </button>
-              <button
-                type="button"
-                onClick={() => setActiveView("providers")}
-                className="inline-flex items-center justify-center gap-2 rounded-[18px] bg-slate-900 px-4 py-2.5 text-sm font-medium text-white transition hover:bg-slate-800"
-              >
-                <KeyRound className="h-4 w-4" />
-                管理本地 Provider
-              </button>
-            </div>
           </div>
         </article>
       </div>
-    </div>
-  ) : (
-    <div className="grid gap-4 xl:grid-cols-[minmax(0,2fr)_minmax(280px,0.95fr)]">
-      <article className={SURFACE_CLASS_NAME}>
-        <div className="flex flex-col gap-4 lg:flex-row lg:items-center lg:justify-between">
-          <div className="space-y-2">
-            <h3 className="text-lg font-semibold text-slate-900">
-              先在个人中心登录
-            </h3>
-            <p className="text-sm leading-6 text-slate-600">
-              当前还没有可用的个人中心会话。登录后，云端默认来源、模型目录和服务技能目录会自动同步到本地。
-            </p>
-          </div>
-          <div className="flex flex-col gap-2">
-            <button
-              type="button"
-              onClick={() => props.onOpenProfile?.()}
-              className="inline-flex items-center justify-center gap-2 rounded-[18px] bg-slate-900 px-4 py-2.5 text-sm font-medium text-white transition hover:bg-slate-800"
-              data-testid="open-profile-login"
-            >
-              <LogIn className="h-4 w-4" />
-              去个人中心登录
-            </button>
-            <button
-              type="button"
-              onClick={() => void openUserCenter(runtime?.loginPath || "/login")}
-              className="inline-flex items-center justify-center gap-2 rounded-[18px] border border-slate-200 bg-white px-4 py-2.5 text-sm font-medium text-slate-700 transition hover:border-slate-300 hover:bg-slate-50"
-            >
-              <ExternalLink className="h-4 w-4" />
-              在浏览器打开登录页
-            </button>
-          </div>
-        </div>
-      </article>
 
-      <article className={SURFACE_CLASS_NAME}>
-        <div className="space-y-3">
-          <h3 className="text-base font-semibold text-slate-900">接入说明</h3>
-          <p className="text-sm leading-6 text-slate-600">
-            云端服务默认通过登录会话消费。是否开放开发者 API Key 模式、是否允许租户覆盖，都由后台统一治理并在这里展示最终态。
-          </p>
-        </div>
-      </article>
-    </div>
-  );
-
-  const cloudDirectoryContent = !runtime ? (
-    <article className={SURFACE_CLASS_NAME}>
-      <p className="text-sm leading-6 text-slate-600">
-        当前没有可用的运行时配置。请先在
-        <span className="mx-1 rounded bg-slate-100 px-1.5 py-0.5 text-xs text-slate-700">
-          public/oem-runtime-config.js
-        </span>
-        中配置域名、网关地址和租户信息，再继续接入云端服务。
-      </p>
-    </article>
-  ) : initializing ? (
-    <article className={SURFACE_CLASS_NAME}>
-      <div className="flex items-center gap-3 text-sm text-slate-600">
-        <LoaderCircle className="h-4 w-4 animate-spin" />
-        正在恢复个人中心会话...
-      </div>
-    </article>
-  ) : !session ? (
-    <article className={SURFACE_CLASS_NAME}>
-      <div className="flex flex-col gap-4 lg:flex-row lg:items-center lg:justify-between">
-        <div className="space-y-2">
-          <h3 className="text-lg font-semibold text-slate-900">
-            登录后查看云端目录
-          </h3>
-          <p className="text-sm leading-6 text-slate-600">
-            当前没有可用的个人中心会话。登录后，云端默认来源、模型目录和服务技能目录会自动同步到本地。
-          </p>
-        </div>
-        <button
-          type="button"
-          onClick={() => props.onOpenProfile?.()}
-          className="inline-flex items-center justify-center gap-2 rounded-[18px] bg-slate-900 px-4 py-2.5 text-sm font-medium text-white transition hover:bg-slate-800"
-        >
-          <LogIn className="h-4 w-4" />
-          去个人中心登录
-        </button>
-      </div>
-    </article>
-  ) : (
-    <section className="space-y-4">
-      <div className="flex flex-col gap-2">
+      <div className="space-y-2">
         <h3 className="text-lg font-semibold text-slate-900">云端服务目录</h3>
         <p className="text-sm leading-6 text-slate-600">
-          卡片以服务端返回为主，并结合当前桌面会话做展示归一。是否允许 API Key 模式、当前模型来源、租户覆盖是否生效，都以服务端治理结果为准。
+          卡片以服务端返回为主，并结合当前桌面会话做状态归一。是否允许 API Key 模式、当前模型来源、租户覆盖是否生效，都以服务端治理结果为准。
         </p>
       </div>
 
@@ -566,7 +1227,9 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
                 session,
                 offer,
               );
-              const stateTone = resolveOfferTone(displayedOfferState ?? offer.state);
+              const stateTone = resolveOfferTone(
+                displayedOfferState ?? offer.state,
+              );
 
               return (
                 <article
@@ -647,7 +1310,7 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
                         type="button"
                         onClick={() => void openOfferDetail(offer.providerKey)}
                         disabled={loadingDetail && isFocused}
-                        className="inline-flex items-center justify-center gap-2 rounded-[18px] border border-slate-200 bg-white px-4 py-2.5 text-sm font-medium text-slate-700 transition hover:border-slate-300 hover:bg-slate-50 disabled:opacity-60"
+                        className="inline-flex items-center justify-center gap-2 rounded-[16px] border border-slate-200 bg-white px-4 py-2.5 text-sm font-medium text-slate-700 transition hover:border-slate-300 hover:bg-slate-50 disabled:opacity-60"
                       >
                         {loadingDetail && isFocused ? (
                           <LoaderCircle className="h-4 w-4 animate-spin" />
@@ -660,7 +1323,7 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
                         type="button"
                         onClick={() => void handleSetDefault(offer)}
                         disabled={savingDefault === offer.providerKey}
-                        className="inline-flex items-center justify-center gap-2 rounded-[18px] bg-slate-900 px-4 py-2.5 text-sm font-medium text-white transition hover:bg-slate-800 disabled:opacity-60"
+                        className="inline-flex items-center justify-center gap-2 rounded-[16px] bg-slate-900 px-4 py-2.5 text-sm font-medium text-white transition hover:bg-slate-800 disabled:opacity-60"
                       >
                         {savingDefault === offer.providerKey ? (
                           <LoaderCircle className="h-4 w-4 animate-spin" />
@@ -759,11 +1422,11 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
                       正在加载模型目录...
                     </div>
                   ) : selectedModels.length > 0 ? (
-                    <div className="space-y-2 rounded-[22px] border border-slate-200/80 bg-slate-50/70 p-3">
+                    <div className="space-y-2 rounded-[20px] border border-slate-200/80 bg-slate-50 p-3">
                       {selectedModels.map((model) => (
                         <div
                           key={model.id}
-                          className="rounded-[18px] border border-slate-200/80 bg-white px-3 py-3"
+                          className="rounded-[16px] border border-slate-200/80 bg-white px-3 py-3"
                         >
                           <div className="flex items-center justify-between gap-3">
                             <div>
@@ -794,7 +1457,7 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
                 </div>
               </div>
             ) : (
-              <div className="flex h-full flex-col items-center justify-center rounded-[22px] border border-dashed border-slate-300 bg-slate-50 px-5 py-8 text-center">
+              <div className="flex h-full flex-col items-center justify-center rounded-[20px] border border-dashed border-slate-300 bg-slate-50 px-5 py-8 text-center">
                 <Layers3 className="h-8 w-8 text-slate-400" />
                 <p className="mt-3 text-sm font-medium text-slate-700">
                   选择一个云端来源查看详情
@@ -811,195 +1474,65 @@ export function CloudProviderSettings(props: CloudProviderSettingsProps) {
   );
 
   const localProviderContent = (
-    <section id="local-provider-management" className="space-y-4">
-      <article className={SURFACE_CLASS_NAME}>
-        <div className="flex flex-col gap-3 lg:flex-row lg:items-start lg:justify-between">
-          <div className="space-y-2">
-            <h3 className="text-lg font-semibold text-slate-900">
-              本地 / 其它开发者 Provider
-            </h3>
-            <p className="max-w-3xl text-sm leading-6 text-slate-600">
-              {localProviderHint}
-            </p>
-          </div>
-
-          <InfoPill
-            label={
-              activeDeveloperAccessEnabled
-                ? "云端开发者入口已开放"
-                : "云端开发者入口未开放"
-            }
-            tone={activeDeveloperAccessEnabled ? "emerald" : "slate"}
-          />
-        </div>
-      </article>
-
+    <div className="space-y-4">
+      <CompanionProviderBridgeCard />
       <ProviderPoolPage hideHeader />
-    </section>
+    </div>
   );
 
   return (
-    <div className="space-y-6">
-      <section className="relative overflow-hidden rounded-[30px] border border-emerald-200/70 bg-[linear-gradient(135deg,rgba(245,250,248,0.98)_0%,rgba(255,255,255,0.98)_56%,rgba(242,247,255,0.96)_100%)] shadow-sm shadow-slate-950/5">
-        <div className="pointer-events-none absolute -left-20 top-[-72px] h-52 w-52 rounded-full bg-emerald-200/25 blur-3xl" />
-        <div className="pointer-events-none absolute right-[-68px] top-[-24px] h-52 w-52 rounded-full bg-sky-200/30 blur-3xl" />
+    <div className="space-y-4">
+      {errorMessage ? <NoticeBar tone="error" message={errorMessage} /> : null}
+      {infoMessage ? <NoticeBar tone="success" message={infoMessage} /> : null}
 
-        <div className="relative flex flex-col gap-6 p-6 lg:p-7">
-          <div className="flex flex-col gap-6 xl:flex-row xl:items-start xl:justify-between">
-            <div className="max-w-3xl space-y-3">
-              <span className="inline-flex items-center rounded-full border border-emerald-200 bg-white px-3 py-1 text-xs font-semibold tracking-[0.16em] text-emerald-700 shadow-sm">
-                CLOUD ACCESS
-              </span>
-              <div className="space-y-2">
-                <h2 className="text-3xl font-semibold tracking-tight text-slate-900">
-                  {hubProviderName} 云端接入
-                </h2>
-                <p className="max-w-2xl text-sm leading-6 text-slate-600">
-                  这页现在拆成概览、云端目录和本地 Provider 三个视图。云端消费态与开发者配置不再堆在一个长页里，而是按工作流分开展示。
-                </p>
-              </div>
-            </div>
-
-            <article className="rounded-[24px] border border-white/90 bg-white/82 p-4 shadow-sm shadow-slate-950/5 xl:w-[420px]">
-              <div className="flex items-center justify-between gap-3">
-                <div>
-                  <p className="text-xs font-semibold tracking-[0.14em] text-slate-500">
-                    运行时摘要
-                  </p>
-                  <h3 className="mt-1 text-lg font-semibold tracking-tight text-slate-900">
-                    当前接入快照
-                  </h3>
-                </div>
-                <div className="flex flex-wrap justify-end gap-2">
-                  <InfoPill label={`来源 · ${defaultProviderSourceLabel}`} />
-                  <InfoPill
-                    label={`开发者入口 · ${activeDeveloperAccessLabel}`}
-                    tone={activeDeveloperAccessEnabled ? "emerald" : "slate"}
-                  />
-                </div>
-              </div>
-
-              <div className="mt-4 grid gap-3 sm:grid-cols-2">
-                <RuntimeSummaryItem
-                  label="用户中心"
-                  value={configuredTarget?.baseUrl || "未配置"}
-                  hint="控制面与登录入口"
-                />
-                <RuntimeSummaryItem
-                  label="Gateway"
-                  value={runtime?.gatewayBaseUrl || "未配置"}
-                  hint="OpenAI 兼容调用入口"
-                />
-                <RuntimeSummaryItem
-                  label="默认来源"
-                  value={defaultProviderSummary || "未设定"}
-                  hint="当前默认消费路径"
-                />
-                <RuntimeSummaryItem
-                  label="治理模式"
-                  value={`${activeAccessModeLabel} / ${activeConfigModeLabel}`}
-                  hint="由服务端最终态决定"
-                />
-              </div>
-            </article>
-          </div>
-
-          {errorMessage ? <NoticeBar tone="error" message={errorMessage} /> : null}
-          {infoMessage ? <NoticeBar tone="success" message={infoMessage} /> : null}
-
-          <Tabs
-            value={activeView}
-            onValueChange={(value) =>
-              setActiveView(value as ProviderWorkspaceView)
-            }
-            className="space-y-5"
+      <Tabs
+        value={activeView}
+        onValueChange={(value) =>
+          setActiveView(value as ProviderWorkspaceView)
+        }
+        className="space-y-4"
+      >
+        {workspaceViews.length > 1 ? (
+          <TabsList
+            className={cn(
+              "grid h-auto w-full gap-2 rounded-[22px] border border-slate-200/80 bg-slate-100 p-1.5 shadow-sm md:max-w-[460px]",
+              workspaceViews.length === 1 ? "grid-cols-1" : "grid-cols-2",
+            )}
+            data-testid="provider-workspace-switcher"
           >
-            <section className="rounded-[26px] border border-white/90 bg-white/82 p-4 shadow-sm shadow-slate-950/5">
-              <div className="flex flex-col gap-4 lg:flex-row lg:items-end lg:justify-between">
-                <div className="max-w-2xl">
-                  <p className="text-xs font-semibold tracking-[0.14em] text-slate-500">
-                    视图切换
-                  </p>
-                  <h3 className="mt-2 text-xl font-semibold tracking-tight text-slate-900">
-                    按任务阶段看 AI 服务商
-                  </h3>
-                  <p className="mt-2 text-sm leading-6 text-slate-600">
-                    概览负责判断当前在用哪条云端路径，云端目录只看 Offer 和模型，本地 Provider 只做开发者配置，避免一个页面同时承担三类认知任务。
-                  </p>
-                </div>
+            {workspaceViews.map((item) => {
+              const ItemIcon = item.icon;
 
-                <TabsList className="grid h-auto w-full max-w-[820px] grid-cols-1 gap-2 rounded-[24px] border border-slate-200/80 bg-slate-50/85 p-2 shadow-sm md:grid-cols-2 xl:grid-cols-3">
-                  {PROVIDER_WORKSPACE_VIEW_META.map((item) => {
-                    const ItemIcon = item.icon;
-                    const active = item.value === activeView;
+              return (
+                <TabsTrigger
+                  key={item.value}
+                  value={item.value}
+                  className={cn(
+                    "h-auto min-h-[60px] items-center justify-start gap-2 rounded-[18px] border border-transparent bg-transparent px-4 py-3 text-left text-slate-600 shadow-none",
+                    "data-[state=active]:border-slate-900 data-[state=active]:bg-slate-900 data-[state=active]:text-white data-[state=active]:shadow-sm",
+                  )}
+                  data-testid={`provider-workspace-tab-${item.value}`}
+                >
+                  <span className="flex h-8 w-8 items-center justify-center rounded-2xl border border-current/15 bg-white/70 text-current data-[state=active]:border-white/15 data-[state=active]:bg-white/10">
+                    <ItemIcon className="h-4 w-4" />
+                  </span>
+                  <span className="text-sm font-semibold">{item.label}</span>
+                </TabsTrigger>
+              );
+            })}
+          </TabsList>
+        ) : null}
 
-                    return (
-                      <TabsTrigger
-                        key={item.value}
-                        value={item.value}
-                        className={cn(
-                          "h-auto min-h-[112px] w-full whitespace-normal flex-col items-start justify-start gap-3 rounded-[18px] border px-4 py-4 text-left",
-                          active
-                            ? "border-emerald-300 bg-[linear-gradient(135deg,rgba(255,255,255,0.98)_0%,rgba(240,253,248,0.98)_100%)] text-slate-950 shadow-md shadow-emerald-100/70 ring-1 ring-emerald-200/70"
-                            : "border-transparent bg-transparent text-slate-600 hover:border-slate-200 hover:bg-white/90 hover:text-slate-900",
-                        )}
-                      >
-                        <div className="flex w-full items-center justify-between gap-3">
-                          <div className="flex items-center gap-2">
-                            <span
-                              className={cn(
-                                "flex h-9 w-9 shrink-0 items-center justify-center rounded-2xl border",
-                                active
-                                  ? "border-emerald-200 bg-emerald-50 text-emerald-700"
-                                  : "border-slate-200 bg-white text-slate-500",
-                              )}
-                            >
-                              <ItemIcon className="h-4 w-4" />
-                            </span>
-                            <span className="text-base font-semibold">{item.label}</span>
-                          </div>
+        {showProviderSettingsEntry ? (
+          <TabsContent value="settings" className="mt-0">
+            {localProviderContent}
+          </TabsContent>
+        ) : null}
 
-                          {active ? (
-                            <span className="rounded-full border border-emerald-200 bg-emerald-50 px-2.5 py-1 text-[11px] font-semibold text-emerald-700">
-                              当前
-                            </span>
-                          ) : null}
-                        </div>
-
-                        <div className="space-y-1">
-                          <span
-                            className={cn(
-                              "block text-sm font-medium leading-5",
-                              active ? "text-slate-800" : "text-slate-700",
-                            )}
-                          >
-                            {item.caption}
-                          </span>
-                          <span className="block text-xs leading-5 text-slate-500">
-                            {item.description}
-                          </span>
-                        </div>
-                      </TabsTrigger>
-                    );
-                  })}
-                </TabsList>
-              </div>
-            </section>
-
-            <TabsContent value="overview" className="mt-0 space-y-4">
-              {overviewContent}
-            </TabsContent>
-
-            <TabsContent value="cloud" className="mt-0 space-y-4">
-              {cloudDirectoryContent}
-            </TabsContent>
-
-            <TabsContent value="providers" className="mt-0 space-y-4">
-              {localProviderContent}
-            </TabsContent>
-          </Tabs>
-        </div>
-      </section>
+        <TabsContent value="cloud" className="mt-0">
+          {cloudDirectoryContent}
+        </TabsContent>
+      </Tabs>
     </div>
   );
 }
diff --git a/src/components/ui/tabs.tsx b/src/components/ui/tabs.tsx
index bf3afa7ac..8bb647a4d 100644
--- a/src/components/ui/tabs.tsx
+++ b/src/components/ui/tabs.tsx
@@ -37,17 +37,23 @@ const Tabs: React.FC<TabsProps> = ({
   );
 };
 
-interface TabsListProps {
+interface TabsListProps extends React.HTMLAttributes<HTMLDivElement> {
   className?: string;
   children: React.ReactNode;
 }
 
-const TabsList: React.FC<TabsListProps> = ({ className, children }) => (
+const TabsList: React.FC<TabsListProps> = ({
+  className,
+  children,
+  ...props
+}) => (
   <div
+    role="tablist"
     className={cn(
       "inline-flex h-10 items-center justify-center rounded-md bg-gray-100 p-1 text-gray-500",
       className,
     )}
+    {...props}
   >
     {children}
   </div>
@@ -77,6 +83,9 @@ const TabsTrigger: React.FC<TabsTriggerProps> = ({
   return (
     <button
       type="button"
+      role="tab"
+      aria-selected={isActive}
+      data-state={isActive ? "active" : "inactive"}
       className={cn(
         "inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
         isActive
@@ -116,6 +125,8 @@ const TabsContent: React.FC<TabsContentProps> = ({
 
   return (
     <div
+      role="tabpanel"
+      data-state="active"
       className={cn(
         "mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2",
         className,
diff --git a/src/hooks/subAgentSummary.test.ts b/src/hooks/subAgentSummary.test.ts
index a6db425cb..abcec2f8e 100644
--- a/src/hooks/subAgentSummary.test.ts
+++ b/src/hooks/subAgentSummary.test.ts
@@ -41,12 +41,8 @@ describe("subAgentSummary", () => {
         total: 3,
         completed: 1,
         failed: 0,
-        running: 1,
-        pending: 1,
         skipped: 0,
-        cancelled: false,
         currentTasks: ["task-b"],
-        percentage: 33,
       }),
     ).toBe("正在执行：task-b");
   });
@@ -56,16 +52,9 @@ describe("subAgentSummary", () => {
       summarizeSubAgentResult(
         {
           success: true,
-          results: [],
-          totalDurationMs: 1200,
           successfulCount: 2,
           failedCount: 1,
           skippedCount: 0,
-          totalTokenUsage: {
-            inputTokens: 0,
-            outputTokens: 0,
-            totalTokens: 0,
-          },
         },
         [
           {
@@ -83,16 +72,9 @@ describe("subAgentSummary", () => {
       summarizeSubAgentResult(
         {
           success: true,
-          results: [],
-          totalDurationMs: 1200,
           successfulCount: 0,
           failedCount: 0,
           skippedCount: 0,
-          totalTokenUsage: {
-            inputTokens: 0,
-            outputTokens: 0,
-            totalTokens: 0,
-          },
         },
         [
           {
diff --git a/src/hooks/subAgentSummary.ts b/src/hooks/subAgentSummary.ts
index e1f972452..60805f6e3 100644
--- a/src/hooks/subAgentSummary.ts
+++ b/src/hooks/subAgentSummary.ts
@@ -1,8 +1,25 @@
-import type {
-  SchedulerExecutionResult,
-  SchedulerProgress,
-  SubAgentTask,
-} from "@/lib/api/subAgentScheduler";
+type SubAgentTaskSummary = {
+  id: string;
+  taskType?: string | null;
+  prompt?: string | null;
+  description?: string | null;
+};
+
+type SchedulerProgressSummary = {
+  total: number;
+  completed: number;
+  failed: number;
+  skipped: number;
+  currentTasks: string[];
+};
+
+type SchedulerExecutionResultSummary = {
+  success?: boolean;
+  mergedSummary?: string | null;
+  successfulCount: number;
+  failedCount: number;
+  skippedCount: number;
+};
 
 function normalizeText(value?: string | null): string | null {
   if (typeof value !== "string") {
@@ -20,7 +37,7 @@ function truncateSummary(value: string, maxLength = 56): string {
   return `${value.slice(0, maxLength - 1).trimEnd()}…`;
 }
 
-export function summarizeSubAgentTask(task: SubAgentTask): string {
+export function summarizeSubAgentTask(task: SubAgentTaskSummary): string {
   return truncateSummary(
     normalizeText(task.description) ||
       normalizeText(task.prompt) ||
@@ -29,7 +46,9 @@ export function summarizeSubAgentTask(task: SubAgentTask): string {
   );
 }
 
-export function summarizeSubAgentTaskBatch(tasks: SubAgentTask[]): string | null {
+export function summarizeSubAgentTaskBatch(
+  tasks: SubAgentTaskSummary[],
+): string | null {
   if (tasks.length === 0) {
     return null;
   }
@@ -48,7 +67,7 @@ export function summarizeSubAgentTaskBatch(tasks: SubAgentTask[]): string | null
 }
 
 export function summarizeSubAgentProgress(
-  progress: SchedulerProgress,
+  progress: SchedulerProgressSummary,
 ): string | null {
   if (progress.currentTasks.length > 0) {
     return `正在执行：${progress.currentTasks.join("、")}`;
@@ -59,8 +78,8 @@ export function summarizeSubAgentProgress(
 }
 
 export function summarizeSubAgentResult(
-  result: SchedulerExecutionResult,
-  tasks: SubAgentTask[],
+  result: SchedulerExecutionResultSummary,
+  tasks: SubAgentTaskSummary[],
 ): string | null {
   const mergedSummary = normalizeText(result.mergedSummary);
   if (mergedSummary) {
diff --git a/src/hooks/useCompanionProviderBridge.test.tsx b/src/hooks/useCompanionProviderBridge.test.tsx
new file mode 100644
index 000000000..38e14adf3
--- /dev/null
+++ b/src/hooks/useCompanionProviderBridge.test.tsx
@@ -0,0 +1,202 @@
+import React from "react";
+import { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { useCompanionProviderBridge } from "./useCompanionProviderBridge";
+import {
+  COMPANION_OPEN_PROVIDER_SETTINGS_EVENT,
+  type CompanionPetStatus,
+  getCompanionPetStatus,
+  listenCompanionPetStatus,
+  sendCompanionPetCommand,
+} from "@/lib/api/companion";
+import { safeListen } from "@/lib/dev-bridge";
+import { providerPoolApi } from "@/lib/api/providerPool";
+import { subscribeProviderDataChanged } from "@/lib/providerDataEvents";
+import { SettingsTabs } from "@/types/settings";
+
+vi.mock("@/lib/api/companion", () => ({
+  COMPANION_OPEN_PROVIDER_SETTINGS_EVENT: "companion-open-provider-settings",
+  COMPANION_PROVIDER_OVERVIEW_CAPABILITY: "provider-overview",
+  getCompanionPetStatus: vi.fn(),
+  listenCompanionPetStatus: vi.fn(),
+  sendCompanionPetCommand: vi.fn(),
+}));
+
+vi.mock("@/lib/dev-bridge", () => ({
+  safeListen: vi.fn(),
+}));
+
+vi.mock("@/lib/api/providerPool", () => ({
+  providerPoolApi: {
+    getOverview: vi.fn(),
+  },
+}));
+
+vi.mock("@/lib/providerDataEvents", () => ({
+  subscribeProviderDataChanged: vi.fn(),
+}));
+
+type HookProps = Parameters<typeof useCompanionProviderBridge>[0];
+
+const mountedRoots: Array<{ root: Root; container: HTMLDivElement }> = [];
+
+function createConnectedStatus(
+  overrides: Partial<CompanionPetStatus> = {},
+): CompanionPetStatus {
+  return {
+    endpoint: "ws://127.0.0.1:45554/companion/pet",
+    server_listening: true,
+    connected: true,
+    client_id: "lime",
+    platform: "macos",
+    capabilities: ["provider-overview"],
+    last_event: "pet.ready",
+    last_error: null,
+    last_state: "walking",
+    ...overrides,
+  };
+}
+
+function renderHook(props?: Partial<HookProps>) {
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  const root = createRoot(container);
+
+  function Probe(currentProps: HookProps) {
+    useCompanionProviderBridge(currentProps);
+    return null;
+  }
+
+  const defaultProps: HookProps = {
+    onNavigate: vi.fn(),
+  };
+
+  const render = async (nextProps?: Partial<HookProps>) => {
+    await act(async () => {
+      root.render(<Probe {...defaultProps} {...props} {...nextProps} />);
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+  };
+
+  mountedRoots.push({ root, container });
+
+  return {
+    render,
+    defaultProps: {
+      ...defaultProps,
+      ...props,
+    },
+  };
+}
+
+describe("useCompanionProviderBridge", () => {
+  beforeEach(() => {
+    (
+      globalThis as typeof globalThis & {
+        IS_REACT_ACT_ENVIRONMENT?: boolean;
+      }
+    ).IS_REACT_ACT_ENVIRONMENT = true;
+
+    vi.mocked(getCompanionPetStatus).mockResolvedValue(createConnectedStatus());
+    vi.mocked(listenCompanionPetStatus).mockResolvedValue(vi.fn());
+    vi.mocked(sendCompanionPetCommand).mockResolvedValue({
+      delivered: true,
+      connected: true,
+    });
+    vi.mocked(providerPoolApi.getOverview).mockResolvedValue([
+      {
+        provider_type: "openai",
+        stats: {
+          total: 1,
+          healthy: 1,
+          unhealthy: 0,
+          disabled: 0,
+          total_usage: 3,
+          total_errors: 0,
+        },
+        credentials: [],
+      },
+    ]);
+    vi.mocked(subscribeProviderDataChanged).mockReturnValue(vi.fn());
+    vi.mocked(safeListen).mockResolvedValue(vi.fn());
+  });
+
+  afterEach(() => {
+    while (mountedRoots.length > 0) {
+      const mounted = mountedRoots.pop();
+      if (!mounted) {
+        break;
+      }
+      act(() => {
+        mounted.root.unmount();
+      });
+      mounted.container.remove();
+    }
+
+    vi.clearAllMocks();
+  });
+
+  it("桌宠已连接且支持 provider 概览时，应下发脱敏摘要", async () => {
+    const { render } = renderHook();
+
+    await render();
+
+    expect(sendCompanionPetCommand).toHaveBeenCalledWith({
+      event: "pet.provider_overview",
+      payload: {
+        providers: [
+          {
+            provider_type: "openai",
+            display_name: "OpenAI",
+            total_count: 1,
+            healthy_count: 1,
+            available: true,
+            needs_attention: false,
+          },
+        ],
+        total_provider_count: 1,
+        available_provider_count: 1,
+        needs_attention_provider_count: 0,
+      },
+    });
+  });
+
+  it("收到打开服务商设置事件时，应导航到 Providers 标签页", async () => {
+    const onNavigate = vi.fn();
+    let openSettingsHandler: (() => void) | null = null;
+
+    vi.mocked(safeListen).mockImplementation(async (event, handler) => {
+      if (event === COMPANION_OPEN_PROVIDER_SETTINGS_EVENT) {
+        openSettingsHandler = handler as () => void;
+      }
+      return vi.fn();
+    });
+
+    const { render } = renderHook({ onNavigate });
+    await render();
+
+    await act(async () => {
+      openSettingsHandler?.();
+      await Promise.resolve();
+    });
+
+    expect(onNavigate).toHaveBeenCalledWith("settings", {
+      tab: SettingsTabs.Providers,
+    });
+  });
+
+  it("桌宠未声明 provider 能力时，不应下发摘要", async () => {
+    vi.mocked(getCompanionPetStatus).mockResolvedValue(
+      createConnectedStatus({
+        capabilities: [],
+      }),
+    );
+
+    const { render } = renderHook();
+    await render();
+
+    expect(sendCompanionPetCommand).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/hooks/useCompanionProviderBridge.ts b/src/hooks/useCompanionProviderBridge.ts
new file mode 100644
index 000000000..9773789cc
--- /dev/null
+++ b/src/hooks/useCompanionProviderBridge.ts
@@ -0,0 +1,163 @@
+import { useEffect, useRef } from "react";
+import type { UnlistenFn } from "@tauri-apps/api/event";
+import {
+  COMPANION_OPEN_PROVIDER_SETTINGS_EVENT,
+  COMPANION_PROVIDER_OVERVIEW_CAPABILITY,
+  getCompanionPetStatus,
+  listenCompanionPetStatus,
+  sendCompanionPetCommand,
+  type CompanionPetStatus,
+} from "@/lib/api/companion";
+import { safeListen } from "@/lib/dev-bridge";
+import { providerPoolApi } from "@/lib/api/providerPool";
+import { subscribeProviderDataChanged } from "@/lib/providerDataEvents";
+import { buildCompanionProviderOverview } from "@/lib/provider/companionProviderOverview";
+import type { Page, PageParams } from "@/types/page";
+import { SettingsTabs } from "@/types/settings";
+
+interface UseCompanionProviderBridgeOptions {
+  onNavigate: (page: Page, params?: PageParams) => void;
+}
+
+function supportsProviderOverview(
+  status: CompanionPetStatus | null | undefined,
+): boolean {
+  return Boolean(
+    status?.connected &&
+      status.capabilities.includes(COMPANION_PROVIDER_OVERVIEW_CAPABILITY),
+  );
+}
+
+export function useCompanionProviderBridge({
+  onNavigate,
+}: UseCompanionProviderBridgeOptions): void {
+  const statusRef = useRef<CompanionPetStatus | null>(null);
+  const lastFingerprintRef = useRef<string | null>(null);
+  const syncRequestIdRef = useRef(0);
+
+  useEffect(() => {
+    let cancelled = false;
+    let statusUnlisten: UnlistenFn | null = null;
+    let openSettingsUnlisten: UnlistenFn | null = null;
+
+    const syncProviderOverview = async (forceRefresh = false) => {
+      if (!supportsProviderOverview(statusRef.current)) {
+        return;
+      }
+
+      const requestId = ++syncRequestIdRef.current;
+
+      try {
+        const overview = await providerPoolApi.getOverview(
+          forceRefresh ? { forceRefresh: true } : undefined,
+        );
+        if (cancelled || requestId !== syncRequestIdRef.current) {
+          return;
+        }
+
+        const payload = buildCompanionProviderOverview(overview);
+        const fingerprint = JSON.stringify(payload);
+        if (fingerprint === lastFingerprintRef.current) {
+          return;
+        }
+
+        const result = await sendCompanionPetCommand({
+          event: "pet.provider_overview",
+          payload,
+        });
+
+        if (
+          !cancelled &&
+          requestId === syncRequestIdRef.current &&
+          result.delivered
+        ) {
+          lastFingerprintRef.current = fingerprint;
+        }
+      } catch (error) {
+        if (!cancelled) {
+          console.warn("[Companion] 同步桌宠 provider 摘要失败:", error);
+        }
+      }
+    };
+
+    const applyStatus = (status: CompanionPetStatus) => {
+      const previousStatus = statusRef.current;
+      statusRef.current = status;
+
+      if (!status.connected) {
+        lastFingerprintRef.current = null;
+        return;
+      }
+
+      const becameProviderAware =
+        supportsProviderOverview(status) &&
+        (!previousStatus?.connected || !supportsProviderOverview(previousStatus));
+
+      if (becameProviderAware) {
+        void syncProviderOverview(true);
+      }
+    };
+
+    void getCompanionPetStatus()
+      .then((status) => {
+        if (!cancelled) {
+          applyStatus(status);
+        }
+      })
+      .catch((error) => {
+        if (!cancelled) {
+          console.warn("[Companion] 读取桌宠状态失败:", error);
+        }
+      });
+
+    void listenCompanionPetStatus(applyStatus)
+      .then((unlisten) => {
+        if (cancelled) {
+          void unlisten();
+          return;
+        }
+        statusUnlisten = unlisten;
+      })
+      .catch((error) => {
+        console.warn("[Companion] 监听桌宠状态失败:", error);
+      });
+
+    const unsubscribeProviderData = subscribeProviderDataChanged(() => {
+      void syncProviderOverview(true);
+    });
+
+    const handleWindowFocus = () => {
+      void syncProviderOverview(true);
+    };
+
+    window.addEventListener("focus", handleWindowFocus);
+
+    void safeListen(COMPANION_OPEN_PROVIDER_SETTINGS_EVENT, () => {
+      onNavigate("settings", {
+        tab: SettingsTabs.Providers,
+      });
+    })
+      .then((unlisten) => {
+        if (cancelled) {
+          void unlisten();
+          return;
+        }
+        openSettingsUnlisten = unlisten;
+      })
+      .catch((error) => {
+        console.warn("[Companion] 监听桌宠设置跳转失败:", error);
+      });
+
+    return () => {
+      cancelled = true;
+      unsubscribeProviderData();
+      window.removeEventListener("focus", handleWindowFocus);
+      if (statusUnlisten) {
+        statusUnlisten();
+      }
+      if (openSettingsUnlisten) {
+        openSettingsUnlisten();
+      }
+    };
+  }, [onNavigate]);
+}
diff --git a/src/hooks/useConfiguredProviders.test.ts b/src/hooks/useConfiguredProviders.test.ts
new file mode 100644
index 000000000..2ad50e6c5
--- /dev/null
+++ b/src/hooks/useConfiguredProviders.test.ts
@@ -0,0 +1,118 @@
+import { describe, expect, it } from "vitest";
+import type { ProviderWithKeysDisplay } from "@/lib/api/apiKeyProvider";
+import type { ProviderPoolOverview } from "@/lib/api/providerPool";
+import { buildConfiguredProviders } from "./useConfiguredProviders";
+
+function createProviderPoolOverview(
+  overrides: Partial<ProviderPoolOverview> = {},
+): ProviderPoolOverview {
+  return {
+    provider_type: "openai",
+    stats: {
+      total: 0,
+      healthy: 0,
+      unhealthy: 0,
+      disabled: 0,
+      total_usage: 0,
+      total_errors: 0,
+    },
+    credentials: [],
+    ...overrides,
+  };
+}
+
+function createApiKeyProvider(
+  overrides: Partial<ProviderWithKeysDisplay> = {},
+): ProviderWithKeysDisplay {
+  return {
+    id: "openai",
+    name: "OpenAI",
+    type: "openai",
+    api_host: "https://api.openai.com/v1",
+    is_system: true,
+    group: "cloud",
+    enabled: true,
+    sort_order: 0,
+    custom_models: [],
+    api_key_count: 0,
+    api_keys: [],
+    created_at: "2026-04-01T00:00:00Z",
+    updated_at: "2026-04-01T00:00:00Z",
+    ...overrides,
+  };
+}
+
+describe("buildConfiguredProviders", () => {
+  it("应将无 Key 但已启用且地址有效的 Ollama 视为已配置渠道", () => {
+    const providers = buildConfiguredProviders(
+      [createProviderPoolOverview()],
+      [
+        createApiKeyProvider({
+          id: "ollama",
+          name: "Ollama (本地)",
+          type: "ollama",
+          api_host: "http://localhost:11434",
+          api_key_count: 0,
+        }),
+      ],
+    );
+
+    expect(providers).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          key: "ollama",
+          providerId: "ollama",
+          type: "ollama",
+          apiHost: "http://localhost:11434",
+        }),
+      ]),
+    );
+  });
+
+  it("不应误把其他无 Key 云渠道当成已配置", () => {
+    const providers = buildConfiguredProviders(
+      [],
+      [
+        createApiKeyProvider({
+          id: "openai",
+          name: "OpenAI",
+          type: "openai",
+          api_key_count: 0,
+        }),
+      ],
+    );
+
+    expect(providers).toEqual([]);
+  });
+
+  it("无 Key 的 Ollama 缺少地址或被禁用时不应展示", () => {
+    const missingHostProviders = buildConfiguredProviders(
+      [],
+      [
+        createApiKeyProvider({
+          id: "ollama",
+          name: "Ollama (本地)",
+          type: "ollama",
+          api_host: "   ",
+          api_key_count: 0,
+        }),
+      ],
+    );
+    const disabledProviders = buildConfiguredProviders(
+      [],
+      [
+        createApiKeyProvider({
+          id: "ollama",
+          name: "Ollama (本地)",
+          type: "ollama",
+          api_host: "http://localhost:11434",
+          enabled: false,
+          api_key_count: 0,
+        }),
+      ],
+    );
+
+    expect(missingHostProviders).toEqual([]);
+    expect(disabledProviders).toEqual([]);
+  });
+});
diff --git a/src/hooks/useConfiguredProviders.ts b/src/hooks/useConfiguredProviders.ts
index 98ffa1797..fe33623ce 100644
--- a/src/hooks/useConfiguredProviders.ts
+++ b/src/hooks/useConfiguredProviders.ts
@@ -40,6 +40,8 @@ export interface ConfiguredProvider {
   credentialType?: string;
   /** Provider ID（用于 API Key Provider） */
   providerId?: string;
+  /** Provider API Host */
+  apiHost?: string;
   /** 自定义模型列表（用于 API Key Provider） */
   customModels?: string[];
 }
@@ -59,6 +61,29 @@ interface LoadConfiguredProvidersOptions {
   forceRefresh?: boolean;
 }
 
+function normalizeProviderType(value?: string | null): string {
+  return (value || "").trim().toLowerCase();
+}
+
+function hasConfiguredKeylessAccess(
+  provider: ProviderWithKeysDisplay,
+): boolean {
+  return (
+    normalizeProviderType(provider.type) === "ollama" &&
+    provider.enabled &&
+    provider.api_host.trim().length > 0
+  );
+}
+
+function isConfiguredApiKeyProvider(
+  provider: ProviderWithKeysDisplay,
+): boolean {
+  return provider.enabled && (
+    provider.api_key_count > 0 ||
+    hasConfiguredKeylessAccess(provider)
+  );
+}
+
 export function buildConfiguredProviders(
   oauthCredentials: ProviderPoolOverview[],
   apiKeyProviders: ProviderWithKeysDisplay[],
@@ -90,7 +115,7 @@ export function buildConfiguredProviders(
   });
 
   safeApiKeyProviders
-    .filter((p) => p.api_key_count > 0 && p.enabled)
+    .filter(isConfiguredApiKeyProvider)
     .forEach((provider) => {
       let key = provider.id;
       let label = provider.name;
@@ -109,6 +134,7 @@ export function buildConfiguredProviders(
           type: provider.type,
           credentialType: `${provider.type}_key`,
           providerId: provider.id,
+          apiHost: provider.api_host,
           customModels: provider.custom_models,
         });
       }
diff --git a/src/hooks/useProviderModels.test.ts b/src/hooks/useProviderModels.test.ts
new file mode 100644
index 000000000..2101fbefb
--- /dev/null
+++ b/src/hooks/useProviderModels.test.ts
@@ -0,0 +1,142 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { ConfiguredProvider } from "./useConfiguredProviders";
+import { loadProviderModels } from "./useProviderModels";
+
+const {
+  mockGetModelRegistry,
+  mockGetProviderAliasConfig,
+  mockFetchProviderModelsAuto,
+} = vi.hoisted(() => ({
+  mockGetModelRegistry: vi.fn(),
+  mockGetProviderAliasConfig: vi.fn(),
+  mockFetchProviderModelsAuto: vi.fn(),
+}));
+
+vi.mock("@/lib/api/modelRegistry", () => ({
+  modelRegistryApi: {
+    getModelRegistry: mockGetModelRegistry,
+    getProviderAliasConfig: mockGetProviderAliasConfig,
+    fetchProviderModelsAuto: mockFetchProviderModelsAuto,
+  },
+}));
+
+function createProvider(
+  overrides: Partial<ConfiguredProvider> = {},
+): ConfiguredProvider {
+  return {
+    key: "openai_api_key",
+    label: "OpenAI API Key",
+    registryId: "openai",
+    fallbackRegistryId: "openai",
+    type: "openai",
+    providerId: "openai",
+    apiHost: "https://api.openai.com/v1",
+    ...overrides,
+  };
+}
+
+describe("loadProviderModels", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockGetModelRegistry.mockResolvedValue([]);
+    mockGetProviderAliasConfig.mockResolvedValue(null);
+    mockFetchProviderModelsAuto.mockResolvedValue({
+      models: [],
+      source: "Api",
+      error: null,
+    });
+  });
+
+  it("实时拉取时应优先使用真实 providerId，而不是前端去重后的 key", async () => {
+    mockFetchProviderModelsAuto.mockResolvedValueOnce({
+      models: [
+        {
+          id: "gpt-5.1",
+          display_name: "GPT-5.1",
+          provider_id: "openai",
+          provider_name: "OpenAI",
+          family: null,
+          tier: "pro",
+          capabilities: {
+            vision: true,
+            tools: true,
+            streaming: true,
+            json_mode: true,
+            function_calling: true,
+            reasoning: true,
+          },
+          pricing: null,
+          limits: {
+            context_length: null,
+            max_output_tokens: null,
+            requests_per_minute: null,
+            tokens_per_minute: null,
+          },
+          status: "active",
+          release_date: null,
+          is_latest: true,
+          description: null,
+          source: "custom",
+          created_at: 0,
+          updated_at: 0,
+        },
+      ],
+      source: "Api",
+      error: null,
+    });
+
+    const models = await loadProviderModels(createProvider(), {
+      liveFetchOnly: true,
+      hasApiKey: true,
+    });
+
+    expect(models.map((model) => model.id)).toEqual(["gpt-5.1"]);
+    expect(mockFetchProviderModelsAuto).toHaveBeenCalledWith("openai");
+  });
+
+  it("实时目录读取失败并回退到 LocalFallback 时，不应继续把旧模型当成最新模型展示", async () => {
+    mockFetchProviderModelsAuto.mockResolvedValueOnce({
+      models: [
+        {
+          id: "gpt-4.1",
+          display_name: "GPT-4.1",
+          provider_id: "openai",
+          provider_name: "OpenAI",
+          family: null,
+          tier: "pro",
+          capabilities: {
+            vision: true,
+            tools: true,
+            streaming: true,
+            json_mode: true,
+            function_calling: true,
+            reasoning: true,
+          },
+          pricing: null,
+          limits: {
+            context_length: null,
+            max_output_tokens: null,
+            requests_per_minute: null,
+            tokens_per_minute: null,
+          },
+          status: "active",
+          release_date: null,
+          is_latest: true,
+          description: null,
+          source: "local",
+          created_at: 0,
+          updated_at: 0,
+        },
+      ],
+      source: "LocalFallback",
+      error: "401 Unauthorized",
+    });
+
+    const models = await loadProviderModels(createProvider(), {
+      liveFetchOnly: true,
+      hasApiKey: true,
+    });
+
+    expect(models).toEqual([]);
+  });
+});
diff --git a/src/hooks/useProviderModels.ts b/src/hooks/useProviderModels.ts
index 9d76773df..f244f1758 100644
--- a/src/hooks/useProviderModels.ts
+++ b/src/hooks/useProviderModels.ts
@@ -11,8 +11,12 @@ import {
 } from "@/lib/api/modelRegistry";
 import { useModelRegistry } from "./useModelRegistry";
 import { useAliasConfig } from "./useAliasConfig";
-import { getAliasConfigKey, isAliasProvider } from "@/lib/constants/providerMappings";
+import {
+  getAliasConfigKey,
+  isAliasProvider,
+} from "@/lib/constants/providerMappings";
 import { buildProviderModelsFromRegistry } from "@/lib/model/providerModelsCatalog";
+import { getProviderModelAutoFetchCapability } from "@/lib/model/providerModelFetchSupport";
 import type { ConfiguredProvider } from "./useConfiguredProviders";
 import type { EnhancedModelMetadata } from "@/lib/types/modelRegistry";
 
@@ -25,6 +29,10 @@ export interface UseProviderModelsOptions {
   returnFullMetadata?: boolean;
   /** 是否自动加载模型注册表 */
   autoLoad?: boolean;
+  /** 对支持实时拉取模型的 Provider，仅接受实时模型目录 */
+  liveFetchOnly?: boolean;
+  /** 当前 Provider 是否有可用 API Key */
+  hasApiKey?: boolean;
 }
 
 export interface UseProviderModelsResult {
@@ -40,16 +48,39 @@ export interface UseProviderModelsResult {
 
 interface LoadProviderModelsOptions {
   forceRefresh?: boolean;
+  liveFetchOnly?: boolean;
+  hasApiKey?: boolean;
+}
+
+function getProviderAutoFetchCapability(
+  selectedProvider: ConfiguredProvider,
+) {
+  return getProviderModelAutoFetchCapability({
+    providerId: selectedProvider.providerId ?? selectedProvider.key,
+    providerType: selectedProvider.type,
+    apiHost: selectedProvider.apiHost,
+  });
 }
 
 async function fetchProviderModelsFromApi(
   selectedProvider: ConfiguredProvider,
 ): Promise<EnhancedModelMetadata[]> {
+  if (!getProviderAutoFetchCapability(selectedProvider).supported) {
+    return [];
+  }
+
   try {
     const result: FetchProviderModelsResult =
-      await modelRegistryApi.fetchProviderModelsAuto(selectedProvider.key);
+      await modelRegistryApi.fetchProviderModelsAuto(
+        selectedProvider.providerId ?? selectedProvider.key,
+      );
 
-    if (result && result.models && result.models.length > 0) {
+    if (
+      result &&
+      result.source === "Api" &&
+      result.models &&
+      result.models.length > 0
+    ) {
       return result.models;
     }
   } catch {
@@ -67,7 +98,9 @@ export async function loadProviderModels(
     return [];
   }
 
-  const sourceOptions = options.forceRefresh ? { forceRefresh: true } : undefined;
+  const sourceOptions = options.forceRefresh
+    ? { forceRefresh: true }
+    : undefined;
   const aliasConfigPromise = isAliasProvider(selectedProvider.key)
     ? modelRegistryApi.getProviderAliasConfig(
         getAliasConfigKey(selectedProvider.key),
@@ -79,12 +112,27 @@ export async function loadProviderModels(
     modelRegistryApi.getModelRegistry(sourceOptions),
     aliasConfigPromise,
   ]);
+  const autoFetchCapability = getProviderAutoFetchCapability(selectedProvider);
+  const useLiveFetchTruthOnly =
+    options.liveFetchOnly && autoFetchCapability.supported;
+
+  if (
+    useLiveFetchTruthOnly &&
+    autoFetchCapability.requiresApiKey &&
+    !options.hasApiKey
+  ) {
+    return [];
+  }
 
   const localResult = buildProviderModelsFromRegistry(
     selectedProvider,
     registryModels,
     aliasConfig,
   );
+  if (useLiveFetchTruthOnly) {
+    return fetchProviderModelsFromApi(selectedProvider);
+  }
+
   if (localResult.hasLocalModels || localResult.models.length > 0) {
     return localResult.models;
   }
@@ -93,6 +141,10 @@ export async function loadProviderModels(
     return localResult.models;
   }
 
+  if (!autoFetchCapability.supported) {
+    return localResult.models;
+  }
+
   const apiModels = await fetchProviderModelsFromApi(selectedProvider);
   if (apiModels.length === 0) {
     return localResult.models;
@@ -144,7 +196,12 @@ export function useProviderModels(
   selectedProvider: ConfiguredProvider | undefined | null,
   options: UseProviderModelsOptions = {},
 ): UseProviderModelsResult {
-  const { returnFullMetadata = false, autoLoad = true } = options;
+  const {
+    returnFullMetadata = false,
+    autoLoad = true,
+    liveFetchOnly = false,
+    hasApiKey = false,
+  } = options;
 
   // 获取模型注册表数据
   const {
@@ -154,8 +211,10 @@ export function useProviderModels(
   } = useModelRegistry({ autoLoad });
 
   // 获取别名配置
-  const { aliasConfig, loading: aliasLoading } =
-    useAliasConfig(selectedProvider, { autoLoad });
+  const { aliasConfig, loading: aliasLoading } = useAliasConfig(
+    selectedProvider,
+    { autoLoad },
+  );
 
   // API 获取的模型缓存
   const [apiModels, setApiModels] = useState<EnhancedModelMetadata[]>([]);
@@ -172,11 +231,26 @@ export function useProviderModels(
       ),
     [selectedProvider, registryModels, aliasConfig],
   );
+  const autoFetchCapability = useMemo(
+    () =>
+      selectedProvider ? getProviderAutoFetchCapability(selectedProvider) : null,
+    [selectedProvider],
+  );
+  const useLiveFetchTruthOnly = Boolean(
+    liveFetchOnly && autoFetchCapability?.supported,
+  );
+  const canReadLiveModels = Boolean(
+    !useLiveFetchTruthOnly ||
+      !autoFetchCapability?.requiresApiKey ||
+      hasApiKey,
+  );
 
   // 当本地没有模型时，从 API 获取
   useEffect(() => {
     if (!selectedProvider) {
       setApiModels([]);
+      setApiLoading(false);
+      setApiError(null);
       return;
     }
 
@@ -189,11 +263,28 @@ export function useProviderModels(
 
     // 如果是别名 Provider，不从 API 获取
     if (isAliasProvider(selectedProvider.key)) {
+      setApiModels([]);
+      setApiLoading(false);
+      setApiError(null);
+      return;
+    }
+
+    if (!autoFetchCapability?.supported) {
+      setApiModels([]);
+      setApiLoading(false);
+      setApiError(null);
+      return;
+    }
+
+    if (!canReadLiveModels) {
+      setApiModels([]);
+      setApiLoading(false);
+      setApiError(null);
       return;
     }
 
     // 如果本地有模型，不需要从 API 获取
-    if (localResult.hasLocalModels) {
+    if (!useLiveFetchTruthOnly && localResult.hasLocalModels) {
       setApiModels([]);
       return;
     }
@@ -222,14 +313,23 @@ export function useProviderModels(
   }, [
     selectedProvider,
     autoLoad,
+    autoFetchCapability,
+    canReadLiveModels,
+    useLiveFetchTruthOnly,
     localResult.hasLocalModels,
     registryLoading,
     aliasLoading,
-    registryModels,
   ]);
 
   // 合并本地模型和 API 模型
   const finalResult = useMemo(() => {
+    if (useLiveFetchTruthOnly) {
+      return {
+        modelIds: apiModels.map((model) => model.id),
+        models: returnFullMetadata ? apiModels : [],
+      };
+    }
+
     // 如果有本地模型，使用本地模型
     if (localResult.hasLocalModels || localResult.models.length > 0) {
       return {
@@ -266,7 +366,7 @@ export function useProviderModels(
       modelIds: localResult.modelIds,
       models: returnFullMetadata ? localResult.models : [],
     };
-  }, [localResult, apiModels, returnFullMetadata]);
+  }, [apiModels, localResult, returnFullMetadata, useLiveFetchTruthOnly]);
 
   // 计算加载状态
   const loading = registryLoading || aliasLoading || apiLoading;
diff --git a/src/icons/providers/abacus.ico b/src/icons/providers/abacus.ico
new file mode 100644
index 000000000..69b805029
Binary files /dev/null and b/src/icons/providers/abacus.ico differ
diff --git a/src/icons/providers/ai21.svg b/src/icons/providers/ai21.svg
new file mode 100644
index 000000000..e6b8301be
--- /dev/null
+++ b/src/icons/providers/ai21.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>AI21</title><path d="M6.47 17l-.367-1.189H2.718L2.35 17H0l3.398-9.789h2.026L8.864 17H6.47zm-2.052-6.993l-1.17 4.028H5.56l-1.142-4.028zm4.707-2.796h2.23V17h-2.23V7.211zM11.955 15c.1-.483.277-.946.524-1.37.214-.359.482-.68.795-.951.32-.273.658-.52 1.013-.741.28-.168.54-.33.781-.483.222-.14.433-.296.632-.468.172-.148.317-.325.428-.525.107-.199.16-.423.157-.65 0-.392-.104-.674-.313-.846a1.176 1.176 0 00-.775-.259 1.207 1.207 0 00-.863.329c-.231.219-.347.585-.347 1.098H11.8a3.387 3.387 0 01.224-1.245c.146-.377.371-.716.66-.993.306-.29.667-.514 1.06-.657A4.04 4.04 0 0115.183 7c.42-.002.84.057 1.244.175.376.107.73.287 1.04.531.305.246.55.562.714.923.185.419.275.875.265 1.335.005.39-.084.774-.259 1.12-.167.328-.38.63-.632.894-.246.259-.517.49-.808.693-.29.2-.554.37-.789.51-.326.224-.596.417-.809.58a3.872 3.872 0 00-.51.455 1.229 1.229 0 00-.265.434 1.633 1.633 0 00-.074.517h4.078V17h-6.606a9.24 9.24 0 01.183-2zM18.8 8.93a5.05 5.05 0 001.135-.105c.25-.049.484-.156.686-.314.163-.139.28-.324.34-.532.068-.25.1-.51.095-.77H23V17h-2.243v-6.475H18.8V8.93z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/baichuan.svg b/src/icons/providers/baichuan.svg
index dc597b58d..32dc15564 100644
--- a/src/icons/providers/baichuan.svg
+++ b/src/icons/providers/baichuan.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>百川 (Baichuan)</title><path d="M12 2L4 6v12l8 4 8-4V6l-8-4zm0 2.5L18 8v8l-6 3-6-3V8l6-3.5zm0 3.5l-4 2v4l4 2 4-2v-4l-4-2z"/></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Baichuan</title><defs><linearGradient id="lobe-icons-baichuan-fill" x1="17.764%" x2="100%" y1="8.678%" y2="91.322%"><stop offset="0%" stop-color="#FEC13E"></stop><stop offset="100%" stop-color="#FF6933"></stop></linearGradient></defs><path d="M7.333 2h-3.2l-2 4.333V17.8L0 22h5.2l2.028-4.2L7.333 2zm7.334 0h-5.2v20h5.2V2zM16.8 7.733H22V22h-5.2V7.733zM22 2h-5.2v4.133H22V2z" fill="url(#lobe-icons-baichuan-fill)" fill-rule="nonzero"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/baidu.svg b/src/icons/providers/baidu.svg
index 40565efc0..79a032e99 100644
--- a/src/icons/providers/baidu.svg
+++ b/src/icons/providers/baidu.svg
@@ -1 +1 @@
-<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>BaiduCloud</title><path d="M21.715 5.61l-3.983 2.31a.903.903 0 01-.896 0L12.44 5.384a.903.903 0 00-.897 0L7.156 7.92a.903.903 0 01-.896 0L2.276 5.617 12.002 0l9.713 5.61z" fill="#5BCA87"></path><path d="M18.641 9.467a.89.89 0 00-.438.77v5.072a.896.896 0 01-.445.77l-4.428 2.51a.884.884 0 00-.445.777v4.607l4.429-2.536 5.31-3.047V7.157l-3.983 2.31z" fill="#EC5D3E"></path><path d="M10.98 18.941a.936.936 0 00-.305-.352l-4.429-2.516a.903.903 0 01-.431-.764v-5.078a.89.89 0 00-.452-.757l-.451-.26L1.38 7.158V18.39l5.311 3.047L11.126 24v-4.608a.881.881 0 00-.146-.45z" fill="#2464F5"></path></svg>
\ No newline at end of file
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Baidu</title><path d="M8.859 11.735c1.017-1.71 4.059-3.083 6.202.286 1.579 2.284 4.284 4.397 4.284 4.397s2.027 1.601.73 4.684c-1.24 2.956-5.64 1.607-6.005 1.49l-.024-.009s-1.746-.568-3.776-.112c-2.026.458-3.773.286-3.773.286l-.045-.001c-.328-.01-2.38-.187-3.001-2.968-.675-3.028 2.365-4.687 2.592-4.968.226-.288 1.802-1.37 2.816-3.085zm.986 1.738v2.032h-1.64s-1.64.138-2.213 2.014c-.2 1.252.177 1.99.242 2.148.067.157.596 1.073 1.927 1.342h3.078v-7.514l-1.394-.022zm3.588 2.191l-1.44.024v3.956s.064.985 1.44 1.344h3.541v-5.3h-1.528v3.979h-1.46s-.466-.068-.553-.447v-3.556zM9.82 16.715v3.06H8.58s-.863-.045-1.126-1.049c-.136-.445.02-.959.088-1.16.063-.203.353-.671.951-.85H9.82zm9.525-9.036c2.086 0 2.646 2.06 2.646 2.742 0 .688.284 3.597-2.309 3.655-2.595.057-2.704-1.77-2.704-3.08 0-1.374.277-3.317 2.367-3.317zM4.24 6.08c1.523-.135 2.645 1.55 2.762 2.513.07.625.393 3.486-1.975 4-2.364.515-3.244-2.249-2.984-3.544 0 0 .28-2.797 2.197-2.969zm8.847-1.483c.14-1.31 1.69-3.316 2.931-3.028 1.236.285 2.367 1.944 2.137 3.37-.224 1.428-1.345 3.313-3.095 3.082-1.748-.226-2.143-1.823-1.973-3.424zM9.425 1c1.307 0 2.364 1.519 2.364 3.398 0 1.879-1.057 3.4-2.364 3.4s-2.367-1.521-2.367-3.4C7.058 2.518 8.118 1 9.425 1z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/baseten.ico b/src/icons/providers/baseten.ico
new file mode 100644
index 000000000..7e299a4ed
Binary files /dev/null and b/src/icons/providers/baseten.ico differ
diff --git a/src/icons/providers/bedrock.svg b/src/icons/providers/bedrock.svg
index b2d5e413a..a56493992 100644
--- a/src/icons/providers/bedrock.svg
+++ b/src/icons/providers/bedrock.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>AWS Bedrock</title><path d="M12 2L2 7v10l10 5 10-5V7L12 2zm0 2.18l7.09 3.54L12 11.27 4.91 7.72 12 4.18zM4 9.27l7 3.5v7.05l-7-3.5V9.27zm9 10.55v-7.05l7-3.5v7.05l-7 3.5z"/></svg>
\ No newline at end of file
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Bedrock</title><path d="M13.05 15.513h3.08c.214 0 .389.177.389.394v1.82a1.704 1.704 0 011.296 1.661c0 .943-.755 1.708-1.685 1.708-.931 0-1.686-.765-1.686-1.708 0-.807.554-1.484 1.297-1.662v-1.425h-2.69v4.663a.395.395 0 01-.188.338l-2.69 1.641a.385.385 0 01-.405-.002l-4.926-3.086a.395.395 0 01-.185-.336V16.3L2.196 14.87A.395.395 0 012 14.555L2 14.528V9.406c0-.14.073-.27.192-.34l2.465-1.462V4.448c0-.129.062-.249.165-.322l.021-.014L9.77 1.058a.385.385 0 01.407 0l2.69 1.675a.395.395 0 01.185.336V7.6h3.856V5.683a1.704 1.704 0 01-1.296-1.662c0-.943.755-1.708 1.685-1.708.931 0 1.685.765 1.685 1.708 0 .807-.553 1.484-1.296 1.662v2.311a.391.391 0 01-.389.394h-4.245v1.806h6.624a1.69 1.69 0 011.64-1.313c.93 0 1.685.764 1.685 1.707 0 .943-.754 1.708-1.685 1.708a1.69 1.69 0 01-1.64-1.314H13.05v1.937h4.953l.915 1.18a1.66 1.66 0 01.84-.227c.931 0 1.685.764 1.685 1.707 0 .943-.754 1.708-1.685 1.708-.93 0-1.685-.765-1.685-1.708 0-.346.102-.668.276-.937l-.724-.935H13.05v1.806zM9.973 1.856L7.93 3.122V6.09h-.778V3.604L5.435 4.669v2.945l2.11 1.36L9.712 7.61V5.334h.778V7.83c0 .136-.07.263-.184.335L7.963 9.638v2.081l1.422 1.009-.446.646-1.406-.998-1.53 1.005-.423-.66 1.605-1.055v-1.99L5.038 8.29l-2.26 1.34v1.676l1.972-1.189.398.677-2.37 1.429V14.3l2.166 1.258 2.27-1.368.397.677-2.176 1.311V19.3l1.876 1.175 2.365-1.426.398.678-2.017 1.216 1.918 1.201 2.298-1.403v-5.78l-4.758 2.893-.4-.675 5.158-3.136V3.289L9.972 1.856zM16.13 18.47a.913.913 0 00-.908.92c0 .507.406.918.908.918a.913.913 0 00.907-.919.913.913 0 00-.907-.92zm3.63-3.81a.913.913 0 00-.908.92c0 .508.406.92.907.92a.913.913 0 00.908-.92.913.913 0 00-.908-.92zm1.555-4.99a.913.913 0 00-.908.92c0 .507.407.918.908.918a.913.913 0 00.907-.919.913.913 0 00-.907-.92zM17.296 3.1a.913.913 0 00-.907.92c0 .508.406.92.907.92a.913.913 0 00.908-.92.913.913 0 00-.908-.92z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/chutes.png b/src/icons/providers/chutes.png
new file mode 100644
index 000000000..c3578c0ff
Binary files /dev/null and b/src/icons/providers/chutes.png differ
diff --git a/src/icons/providers/cloudflare.svg b/src/icons/providers/cloudflare.svg
new file mode 100644
index 000000000..394375a77
--- /dev/null
+++ b/src/icons/providers/cloudflare.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Cloudflare</title><g><path d="M16.493 17.4c.135-.52.08-.983-.161-1.338-.215-.328-.592-.519-1.05-.519l-8.663-.109a.148.148 0 01-.135-.082c-.027-.054-.027-.109-.027-.163.027-.082.108-.164.189-.164l8.744-.11c1.05-.054 2.153-.9 2.556-1.937l.511-1.31c.027-.055.027-.11.027-.164C17.92 8.91 15.66 7 12.942 7c-2.503 0-4.628 1.638-5.381 3.903a2.432 2.432 0 00-1.803-.491c-1.21.109-2.153 1.092-2.287 2.32-.027.328 0 .628.054.9C1.56 13.688 0 15.326 0 17.319c0 .19.027.355.027.545 0 .082.08.137.161.137h15.983c.08 0 .188-.055.215-.164l.107-.437"></path><path d="M19.238 11.75h-.242c-.054 0-.108.054-.135.109l-.35 1.2c-.134.52-.08.983.162 1.338.215.328.592.518 1.05.518l1.855.11c.054 0 .108.027.135.082.027.054.027.109.027.163-.027.082-.108.164-.188.164l-1.91.11c-1.05.054-2.153.9-2.557 1.937l-.134.355c-.027.055.026.137.107.137h6.592c.081 0 .162-.055.162-.137.107-.41.188-.846.188-1.31-.027-2.62-2.153-4.777-4.762-4.777"></path></g></svg>
\ No newline at end of file
diff --git a/src/icons/providers/cohere.svg b/src/icons/providers/cohere.svg
index 75fa5486c..94bcb82cf 100644
--- a/src/icons/providers/cohere.svg
+++ b/src/icons/providers/cohere.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Cohere</title><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Cohere</title><path clip-rule="evenodd" d="M8.128 14.099c.592 0 1.77-.033 3.398-.703 1.897-.781 5.672-2.2 8.395-3.656 1.905-1.018 2.74-2.366 2.74-4.18A4.56 4.56 0 0018.1 1H7.549A6.55 6.55 0 001 7.55c0 3.617 2.745 6.549 7.128 6.549z" fill="#39594D" fill-rule="evenodd"></path><path clip-rule="evenodd" d="M9.912 18.61a4.387 4.387 0 012.705-4.052l3.323-1.38c3.361-1.394 7.06 1.076 7.06 4.715a5.104 5.104 0 01-5.105 5.104l-3.597-.001a4.386 4.386 0 01-4.386-4.387z" fill="#D18EE2" fill-rule="evenodd"></path><path d="M4.776 14.962A3.775 3.775 0 001 18.738v.489a3.776 3.776 0 007.551 0v-.49a3.775 3.775 0 00-3.775-3.775z" fill="#FF7759"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/comfyui.svg b/src/icons/providers/comfyui.svg
new file mode 100644
index 000000000..388f51890
--- /dev/null
+++ b/src/icons/providers/comfyui.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>ComfyUI</title><path d="M10.311 16.46L8.495 8.078a.398.398 0 01.575-.437l7.29 3.843a.375.375 0 01-.064.69l-3.346 1.033a.493.493 0 00-.29.24l-1.65 3.11a.375.375 0 01-.699-.097z"></path><path d="M17.087 1.153C13.825-.336 10.665-.148 8.72.414c1.008.13 2.602.375 3.692.868.905.408 4.102 2.12 4.876 2.484.773.363 3.035 1.196 3.867 1.64.666.357 1.442 1.173 1.746 1.536-.613-1.238-2.191-4.137-5.813-5.79z"></path><circle cx="8.438" cy="2.578" r="1.57"></circle><circle cx="21.939" cy="13.384" r=".633"></circle><circle cx="20.275" cy="11.532" r=".492"></circle><circle cx="18.47" cy="16.619" r="1.219"></circle><circle cx="14.579" cy="18.447" r=".797"></circle><circle cx="15.341" cy="21.506" r="1.113"></circle><circle cx="4.278" cy="14.966" r="1.254"></circle><circle cx="4.981" cy="8.895" r="1.629"></circle><path d="M16.795 16.82l-.974.604-.175.108-.18.112a1.195 1.195 0 11-1.996 1.247c-.268.17-.498.319-.672.435-1.389.93-2.817 1.858-4.676 1.945-2.42.114-5.91-2.203-6.446-7.676-.41-4.196 2.836-8.122 5.098-9.587l.112-.07a2.055 2.055 0 01-.51-1.36c0-.478.162-.918.435-1.267-.567.098-.952.362-1.615.843C3.239 3.572 2.126 4.45.613 8.27c-1.512 3.82.047 8.392 1.7 10.9 1.652 2.508 5.485 4.078 6.375 4.313.891.234 3.505.796 4.583.117.352-.222.641-.536.894-.901a1.676 1.676 0 011.443-2.849c.315-.589.672-1.09 1.155-1.372.247-.144.517-.291.797-.439a1.687 1.687 0 01-.765-1.22z"></path><path d="M10.468 2.56c0 .338-.081.657-.225.938.998.246 2.006.598 3.612 1.606.414.26 1.346.727 2.195 1.153.449.225.874.438 1.186.603.898.386 1.854.797 2.596 1.15 2.14 1.02 2.693 2.605 2.442 4.448a.985.985 0 11-.718 1.833c-.488.498-1.212.836-1.926 1.116a1.683 1.683 0 01.487 1.359l.118-.055.026-.012a29.518 29.518 0 001.08-.514l.015-.008c.21-.11.533-.281.882-.548-.14.354-.6 1.222-1.312 1.86-.89.796-1.57.972-2.485 1.16-.715.147-1.728 1.016-2.174 1.46a1.674 1.674 0 01.47 2.323c-.029.113-.064.22-.1.327a5.074 5.074 0 00-.094.308l.136-.04c.601-.177 1.772-.52 4.247-3.089 2.678-2.78 2.945-6.016 3.059-7.723.199-2.743-1.588-4.48-2.444-5.101-.445-.323-1.685-.866-2.905-1.4l-.2-.089-.775-.335c-.773-.332-1.473-.633-1.88-.869l-.041-.024c-1.197-.692-3.07-1.775-4.63-2.264a3.4 3.4 0 00-.376-.073 3.005 3.005 0 01-.345-.068c.051.18.079.371.079.569z"></path><path clip-rule="evenodd" d="M13.886 6.476c-1.426-.827-3.247-1.882-5.075-1.882-1.334 0-2.826.919-4.033 2.213a2.095 2.095 0 011.914.875c.23-.375.496-.762.773-1.025.554-.525 1.329-.75 1.594-.75 1.149 0 2.591.75 4.692 2.086.636.404 1.26.735 1.83 1.038 1.482.787 2.6 1.38 2.6 2.548 0 1.324-.473 1.711-1.105 2.074-.123.07-.336.199-.615.366-.887.533-2.433 1.461-3.78 2.166a17.9 17.9 0 00-1.076.628c-1.353.833-2.638 1.625-4.089.602-1.828-1.289-1.621-3.574-1.176-4.781.13-.35.274-.678.408-.981.328-.743.59-1.335.39-1.727a1.475 1.475 0 00-.197-.281 2.1 2.1 0 01-1.628 1.322c-.162.635-.299 1.252-.34 1.667-.023.23-.052.465-.084.696a1.747 1.747 0 11-1.643 3.045c.587 1.302 1.401 2.36 2.236 2.892 1.897 1.21 3.818.56 4.415.358h.001a8.28 8.28 0 01.087-.03c.404-.131 2.473-1.508 4.235-2.681l.814-.542c1.468-.974 3.315-1.747 4.156-2.099.22-.092.372-.156.429-.186l.014-.007c.399-.213 1.496-.798 1.612-2.466.102-1.467-1.478-2.244-2.325-2.66-.127-.063-.238-.117-.323-.164-.27-.15-.744-.363-1.326-.626-.653-.296-1.444-.653-2.237-1.05-.342-.171-.728-.395-1.148-.638zm6.39 5.783a.727.727 0 100-1.453.727.727 0 000 1.453z"></path><path d="M4.082 11.684a6.337 6.337 0 00-.046 1.552 1.748 1.748 0 00-1.431 1.228c-.316-1.383-.345-2.869.088-4.221.078-.245.172-.491.28-.736a2.103 2.103 0 001.314 1.368c-.09.248-.161.518-.205.81z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/cortecs.ico b/src/icons/providers/cortecs.ico
new file mode 100644
index 000000000..edf09522d
Binary files /dev/null and b/src/icons/providers/cortecs.ico differ
diff --git a/src/icons/providers/dashscope.png b/src/icons/providers/dashscope.png
new file mode 100644
index 000000000..912be7305
Binary files /dev/null and b/src/icons/providers/dashscope.png differ
diff --git a/src/icons/providers/deepinfra.png b/src/icons/providers/deepinfra.png
new file mode 100644
index 000000000..70294bb97
Binary files /dev/null and b/src/icons/providers/deepinfra.png differ
diff --git a/src/icons/providers/doubao.svg b/src/icons/providers/doubao.svg
index 4109e2a22..e2511454c 100644
--- a/src/icons/providers/doubao.svg
+++ b/src/icons/providers/doubao.svg
@@ -1 +1 @@
-<svg height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><path d="M5.31 15.756c.172-3.75 1.883-5.999 2.549-6.739-3.26 2.058-5.425 5.658-6.358 8.308v1.12C1.501 21.513 4.226 24 7.59 24a6.59 6.59 0 002.2-.375c.353-.12.7-.248 1.039-.378.913-.899 1.65-1.91 2.243-2.992-4.877 2.431-7.974.072-7.763-4.5l.002.001z" fill="#1E37FC"></path><path d="M22.57 10.283c-1.212-.901-4.109-2.404-7.397-2.8.295 3.792.093 8.766-2.1 12.773a12.782 12.782 0 01-2.244 2.992c3.764-1.448 6.746-3.457 8.596-5.219 2.82-2.683 3.353-5.178 3.361-6.66a2.737 2.737 0 00-.216-1.084v-.002z" fill="#37E1BE"></path><path d="M14.303 1.867C12.955.7 11.248 0 9.39 0 7.532 0 5.883.677 4.545 1.807 2.791 3.29 1.627 5.557 1.5 8.125v9.201c.932-2.65 3.097-6.25 6.357-8.307.5-.318 1.025-.595 1.569-.829 1.883-.801 3.878-.932 5.746-.706-.222-2.83-.718-5.002-.87-5.617h.001z" fill="#A569FF"></path><path d="M17.305 4.961a199.47 199.47 0 01-1.08-1.094c-.202-.213-.398-.419-.586-.622l-1.333-1.378c.151.615.648 2.786.869 5.617 3.288.395 6.185 1.898 7.396 2.8-1.306-1.275-3.475-3.487-5.266-5.323z" fill="#1E37FC"></path></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Doubao</title><path d="M5.31 15.756c.172-3.75 1.883-5.999 2.549-6.739-3.26 2.058-5.425 5.658-6.358 8.308v1.12C1.501 21.513 4.226 24 7.59 24a6.59 6.59 0 002.2-.375c.353-.12.7-.248 1.039-.378.913-.899 1.65-1.91 2.243-2.992-4.877 2.431-7.974.072-7.763-4.5l.002.001z" fill="#1E37FC"></path><path d="M22.57 10.283c-1.212-.901-4.109-2.404-7.397-2.8.295 3.792.093 8.766-2.1 12.773a12.782 12.782 0 01-2.244 2.992c3.764-1.448 6.746-3.457 8.596-5.219 2.82-2.683 3.353-5.178 3.361-6.66a2.737 2.737 0 00-.216-1.084v-.002z" fill="#37E1BE"></path><path d="M14.303 1.867C12.955.7 11.248 0 9.39 0 7.532 0 5.883.677 4.545 1.807 2.791 3.29 1.627 5.557 1.5 8.125v9.201c.932-2.65 3.097-6.25 6.357-8.307.5-.318 1.025-.595 1.569-.829 1.883-.801 3.878-.932 5.746-.706-.222-2.83-.718-5.002-.87-5.617h.001z" fill="#A569FF"></path><path d="M17.305 4.961a199.47 199.47 0 01-1.08-1.094c-.202-.213-.398-.419-.586-.622l-1.333-1.378c.151.615.648 2.786.869 5.617 3.288.395 6.185 1.898 7.396 2.8-1.306-1.275-3.475-3.487-5.266-5.323z" fill="#1E37FC"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/fal.svg b/src/icons/providers/fal.svg
new file mode 100644
index 000000000..c41076f91
--- /dev/null
+++ b/src/icons/providers/fal.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Fal</title><path clip-rule="evenodd" d="M15.477 0c.415 0 .749.338.788.752a7.775 7.775 0 006.985 6.984c.413.04.752.373.752.788v6.952c0 .415-.338.748-.752.788a7.775 7.775 0 00-6.985 6.984c-.04.414-.373.752-.788.752H8.525c-.416 0-.749-.338-.789-.752a7.775 7.775 0 00-6.984-6.984c-.414-.04-.752-.373-.752-.788V8.524c0-.415.338-.748.752-.788A7.775 7.775 0 007.736.752C7.776.338 8.11 0 8.526 0h6.95zM4.819 11.98a7.226 7.226 0 007.223 7.23 7.226 7.226 0 007.223-7.23c0-3.994-3.234-7.23-7.223-7.23a7.227 7.227 0 00-7.223 7.23z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/fastrouter.svg b/src/icons/providers/fastrouter.svg
new file mode 100644
index 000000000..b42c7ce7a
--- /dev/null
+++ b/src/icons/providers/fastrouter.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="24" viewBox="0 0 18 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.881 9.65149L17.7843 4.80635L17.7855 4.80752L14.8822 0V2.56832L7.60623 2.56127V2.56832H4.47017L0 15.6086H6.54011C6.71173 15.6015 6.87629 15.6744 6.98678 15.8049C7.09257 15.9401 7.13371 16.1128 7.09962 16.2809L5.47752 24L13.8901 11.1067H7.65795C7.45342 11.1078 7.26183 11.0021 7.15486 10.8269C7.06553 10.6483 7.07611 10.4367 7.1819 10.2674L9.05907 7.0385H14.881V9.65149Z" fill="#2E52E5"/>
+</svg>
diff --git a/src/icons/providers/friendli.svg b/src/icons/providers/friendli.svg
new file mode 100644
index 000000000..e6689f84d
--- /dev/null
+++ b/src/icons/providers/friendli.svg
@@ -0,0 +1,41 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g clip-path="url(#clip0_14926_20134)">
+    <path
+      d="M427.633 0H84.3666C37.7722 0 0 37.7722 0 84.3666V427.633C0 474.228 37.7722 512 84.3666 512H427.633C474.228 512 512 474.228 512 427.633V84.3666C512 37.7722 474.228 0 427.633 0Z"
+      fill="#1D4CB3" />
+    <g clip-path="url(#clip1_14926_20134)">
+      <path
+        d="M149.551 196.988C175.591 196.988 196.701 175.813 196.701 149.694C196.701 123.574 175.591 102.4 149.551 102.4C123.51 102.4 102.4 123.574 102.4 149.694C102.4 175.813 123.51 196.988 149.551 196.988Z"
+        fill="white" />
+      <path
+        d="M149.551 409.6C175.591 409.6 196.701 388.426 196.701 362.306C196.701 336.186 175.591 315.012 149.551 315.012C123.51 315.012 102.4 336.186 102.4 362.306C102.4 388.426 123.51 409.6 149.551 409.6Z"
+        fill="white" />
+      <path
+        d="M243.851 106.228H275.735C290.816 106.228 303.104 118.507 303.104 133.68V165.661C303.104 180.787 290.862 193.113 275.735 193.113H239.941C227.002 193.113 216.482 182.561 216.482 169.582V133.68C216.482 118.554 228.724 106.228 243.851 106.228Z"
+        fill="white" />
+      <path
+        d="M166.214 299.465H133.586C118.458 299.465 106.217 287.187 106.217 272.014V240.033C106.217 224.86 118.458 212.581 133.586 212.581H158.999L177.478 213.888C192.093 213.888 193.583 248.623 193.583 248.623V272.06C193.583 287.14 181.248 299.512 166.214 299.512V299.465Z"
+        fill="white" />
+      <path
+        d="M158.953 212.534C158.953 212.534 176.501 213.235 187.718 206.325C196.515 200.909 206.429 191.712 211.037 180.787C216.995 166.641 216.437 152.355 216.437 152.355L253.906 193.113C253.906 193.113 236.731 192.132 225.606 197.921C212.667 204.691 207.407 211.787 201.915 220.378C193.536 233.497 193.536 252.452 193.536 252.452L158.953 212.534Z"
+        fill="white" />
+      <path
+        d="M383.115 107.489H349.463C334.836 107.489 322.979 119.382 322.979 134.054V167.808C322.979 182.48 334.836 194.373 349.463 194.373H383.115C397.742 194.373 409.6 182.48 409.6 167.808V134.054C409.6 119.382 397.742 107.489 383.115 107.489Z"
+        fill="white" />
+      <path
+        d="M277.412 300.726H243.76C229.144 300.726 217.275 288.821 217.275 274.161V240.406C217.275 225.747 229.144 213.842 243.76 213.842H270.011L285.046 215.569C299.661 215.569 303.896 225.747 303.896 240.406V274.161C303.896 288.821 292.027 300.726 277.412 300.726Z"
+        fill="white" />
+      <path
+        d="M263.4 213.842C263.4 213.842 282.484 214.869 294.213 210.013C304.453 205.765 315.857 193.906 319.115 184.102C322.979 172.337 322.979 156.51 322.979 156.51L361.518 194.466C361.518 194.466 350.254 193.719 338.478 199.882C327.4 205.671 316.136 217.203 311.482 226.307C305.571 237.839 303.941 262.022 303.941 262.022L263.447 213.888L263.4 213.842Z"
+        fill="white" />
+    </g>
+  </g>
+  <defs>
+    <clipPath id="clip0_14926_20134">
+      <rect width="512" height="512" fill="white" />
+    </clipPath>
+    <clipPath id="clip1_14926_20134">
+      <rect width="307.2" height="307.2" fill="white" transform="translate(102.4 102.4)" />
+    </clipPath>
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/src/icons/providers/grok.svg b/src/icons/providers/grok.svg
index 34ed894fd..536e71390 100644
--- a/src/icons/providers/grok.svg
+++ b/src/icons/providers/grok.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Grok (xAI)</title><path d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"/></svg>
\ No newline at end of file
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Grok</title><path d="M6.469 8.776L16.512 23h-4.464L2.005 8.776H6.47zm-.004 7.9l2.233 3.164L6.467 23H2l4.465-6.324zM22 2.582V23h-3.659V7.764L22 2.582zM22 1l-9.952 14.095-2.233-3.163L17.533 1H22z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/groq.png b/src/icons/providers/groq.png
new file mode 100644
index 000000000..a6f5c4d34
Binary files /dev/null and b/src/icons/providers/groq.png differ
diff --git a/src/icons/providers/helicone.webp b/src/icons/providers/helicone.webp
new file mode 100644
index 000000000..112ac5e7d
Binary files /dev/null and b/src/icons/providers/helicone.webp differ
diff --git a/src/icons/providers/higress.svg b/src/icons/providers/higress.svg
new file mode 100644
index 000000000..a5e3a2254
--- /dev/null
+++ b/src/icons/providers/higress.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Higress</title><path d="M11.853 15.257c-.318.069-.648.101-.99.101H7.933a7.89 7.89 0 01-4.072-1.132 8.15 8.15 0 01-.616-.406 8.033 8.033 0 01-2.541-3.154c-.1-.23-.19-.46-.274-.7a8.007 8.007 0 01-.407-2.522V1H3.27v6.444c0 .153.004.298.025.443.016.214.048.415.1.616a4.681 4.681 0 002.223 2.985 4.667 4.667 0 002.296.616h.024a4.043 4.043 0 013.919 3.153h-.004z"></path><path d="M3.246 14.557v8.039H0v-12.24c.105.39.274.834.362 1.007a8.474 8.474 0 002.884 3.198v-.004z"></path><path d="M15.824 16.151v6.445h-3.246V16.15a3.26 3.26 0 00-.024-.447 4.683 4.683 0 00-2.32-3.6 4.706 4.706 0 00-2.3-.616H7.91a4.047 4.047 0 01-3.919-3.146c.318-.068.649-.1.991-.1H7.91a7.89 7.89 0 014.072 1.131c.213.125.419.262.616.407a7.959 7.959 0 012.537 3.154 7.849 7.849 0 01.689 3.218z"></path><path d="M19.904 3.868c0-.552.201-1.027.6-1.426.399-.403.882-.6 1.442-.6.56 0 1.055.201 1.454.6.403.39.6.874.6 1.442s-.201 1.055-.6 1.454c-.39.402-.87.6-1.442.6a1.979 1.979 0 01-1.454-.6c-.403-.403-.6-.89-.6-1.47zm3.73 5.107v13.62h-3.36V8.972h3.36v.004z"></path><path d="M12.578 9.039V1h3.246v12.24a6.393 6.393 0 00-.362-1.007 8.474 8.474 0 00-2.884-3.198v.004z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/hunyuan.svg b/src/icons/providers/hunyuan.svg
index 5df4be09c..496722404 100644
--- a/src/icons/providers/hunyuan.svg
+++ b/src/icons/providers/hunyuan.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>腾讯混元 (Hunyuan)</title><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-1 17.93c-3.95-.49-7-3.85-7-7.93 0-.62.08-1.21.21-1.79L9 15v1c0 1.1.9 2 2 2v1.93zm6.9-2.54c-.26-.81-1-1.39-1.9-1.39h-1v-3c0-.55-.45-1-1-1H8v-2h2c.55 0 1-.45 1-1V7h2c1.1 0 2-.9 2-2v-.41c2.93 1.19 5 4.06 5 7.41 0 2.08-.8 3.97-2.1 5.39z"/></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Hunyuan</title><g fill="none" fill-rule="evenodd"><circle cx="12" cy="12" fill="#0055E9" r="12"></circle><path d="M12 0c.518 0 1.028.033 1.528.096A6.188 6.188 0 0112.12 12.28l-.12.001c-2.99 0-5.242 2.179-5.554 5.11-.223 2.086.353 4.412 2.242 6.146C3.672 22.1 0 17.479 0 12 0 5.373 5.373 0 12 0z" fill="#A8DFF5"></path><path d="M5.286 5a2.438 2.438 0 01.682 3.38c-3.962 5.966-3.215 10.743 2.648 15.136C3.636 22.056 0 17.452 0 12c0-1.787.39-3.482 1.09-5.006.253-.435.525-.872.817-1.311A2.438 2.438 0 015.286 5z" fill="#0055E9"></path><path d="M12.98.04c.272.021.543.053.81.093.583.106 1.117.254 1.538.44 6.638 2.927 8.07 10.052 1.748 15.642a4.125 4.125 0 01-5.822-.358c-1.51-1.706-1.3-4.184.357-5.822.858-.848 3.108-1.223 4.045-2.441 1.257-1.634 2.122-6.009-2.523-7.506L12.98.039z" fill="#00BCFF"></path><path d="M13.528.096A6.187 6.187 0 0112 12.281a5.75 5.75 0 00-1.71.255c.147-.905.595-1.784 1.321-2.501.858-.848 3.108-1.223 4.045-2.441 1.27-1.651 2.14-6.104-2.676-7.554.184.014.367.033.548.056z" fill="#ECECEE"></path></g></svg>
\ No newline at end of file
diff --git a/src/icons/providers/inception.png b/src/icons/providers/inception.png
new file mode 100644
index 000000000..1954695be
Binary files /dev/null and b/src/icons/providers/inception.png differ
diff --git a/src/icons/providers/index.tsx b/src/icons/providers/index.tsx
index 256e42f4f..02b0fdbd8 100644
--- a/src/icons/providers/index.tsx
+++ b/src/icons/providers/index.tsx
@@ -19,12 +19,38 @@ import { providerTypeToIcon } from "./utils";
 import AwsIcon from "./aws.svg?react";
 import GeminiIcon from "./gemini.svg?react";
 import AnthropicIcon from "./anthropic.svg?react";
+import abacusIconUrl from "./abacus.ico?url";
+import Ai21Icon from "./ai21.svg?react";
 import ClaudeIcon from "./claude.svg?react";
+import basetenIconUrl from "./baseten.ico?url";
+import CloudflareIcon from "./cloudflare.svg?react";
+import chutesIconUrl from "./chutes.png?url";
+import ComfyuiIcon from "./comfyui.svg?react";
+import cortecsIconUrl from "./cortecs.ico?url";
 import QwenIcon from "./qwen.svg?react";
+import deepinfraIconUrl from "./deepinfra.png?url";
 import GoogleIcon from "./google.svg?react";
+import FalIcon from "./fal.svg?react";
+import FastrouterIcon from "./fastrouter.svg?react";
+import FriendliIcon from "./friendli.svg?react";
+import HigressIcon from "./higress.svg?react";
+import heliconeIconUrl from "./helicone.webp?url";
+import InferenceIcon from "./inference.svg?react";
+import inceptionIconUrl from "./inception.png?url";
+import ioNetIconUrl from "./io-net.png?url";
+import lucidqueryIconUrl from "./lucidquery.png?url";
+import NebiusIcon from "./nebius.svg?react";
+import nanoGptIconUrl from "./nano-gpt.png?url";
+import MorphIcon from "./morph.svg?react";
 import OpenaiIcon from "./openai.svg?react";
+import opencodeIconUrl from "./opencode.png?url";
+import OvhcloudIcon from "./ovhcloud.svg?react";
 import AlibabaIcon from "./alibaba.svg?react";
 import CopilotIcon from "./copilot.svg?react";
+import requestyIconUrl from "./requesty.ico?url";
+import SapAiCoreIcon from "./sap-ai-core.svg?react";
+import ScalewayIcon from "./scaleway.svg?react";
+import submodelIconUrl from "./submodel.ico?url";
 import AmpIcon from "./amp.svg?react";
 import KiroIcon from "./kiro.svg?react";
 import DeepseekIcon from "./deepseek.svg?react";
@@ -36,14 +62,18 @@ import AzureIcon from "./azure.svg?react";
 import antigravityIconUrl from "./antigravity.svg?url";
 import LimeIcon from "./lime.svg?react";
 import LimeHubIcon from "./lime-hub.svg?react";
+import MetaIcon from "./meta.svg?react";
+import UpstageIcon from "./upstage.svg?react";
+import V0Icon from "./v0.svg?react";
+import ZaiIcon from "./zai.svg?react";
 
 // 新增图标 - 主流 AI
 import PerplexityIcon from "./perplexity.svg?react";
 import MoonshotIcon from "./moonshot.svg?react";
 import GrokIcon from "./grok.svg?react";
-import GroqIcon from "./groq.svg?react";
 import MistralIcon from "./mistral.svg?react";
 import CohereIcon from "./cohere.svg?react";
+import groqIconUrl from "./groq.png?url";
 
 // 新增图标 - 国内 AI
 import BaiduIcon from "./baidu.svg?react";
@@ -57,7 +87,7 @@ import XirangIcon from "./xirang.svg?react";
 import MimoIcon from "./mimo.svg?react";
 import ModelscopeIcon from "./modelscope.svg?react";
 import ZhinaoIcon from "./zhinao.svg?react";
-import DashscopeIcon from "./dashscope.svg?react";
+import dashscopeIconUrl from "./dashscope.png?url";
 
 // 新增图标 - 云服务
 import VertexaiIcon from "./vertexai.svg?react";
@@ -86,17 +116,25 @@ import DmxapiIcon from "./dmxapi.svg?react";
 import LongcatIcon from "./longcat.svg?react";
 import AlayanewIcon from "./alayanew.svg?react";
 import AionlyIcon from "./aionly.svg?react";
+import NovitaIcon from "./novita.svg?react";
 import OcoolaiIcon from "./ocoolai.svg?react";
+import ReplicateIcon from "./replicate.svg?react";
 import VercelIcon from "./vercel.svg?react";
+import ZenmuxIcon from "./zenmux.svg?react";
 import PoeIcon from "./poe.svg?react";
 import HuggingfaceIcon from "./huggingface.svg?react";
+import SyntheticIcon from "./synthetic.svg?react";
+import veniceIconUrl from "./venice.png?url";
+import VultrIcon from "./vultr.svg?react";
+import WandbIcon from "./wandb.svg?react";
 
 // 新增图标 - 本地服务
 import OllamaIcon from "./ollama.svg?react";
 import LmstudioIcon from "./lmstudio.svg?react";
-import NewapiIcon from "./newapi.svg?react";
 import GpustackIcon from "./gpustack.svg?react";
 import OvmsIcon from "./ovms.svg?react";
+import VllmIcon from "./vllm.svg?react";
+import newapiIconUrl from "./newapi.png?url";
 
 // 新增图标 - 专用服务
 import JinaIcon from "./jina.svg?react";
@@ -106,22 +144,63 @@ import CherryinIcon from "./cherryin.svg?react";
 // 自定义 Provider 图标
 import CustomIcon from "./custom.svg?react";
 
-const AntigravityIcon: React.FC<SVGProps<SVGSVGElement>> = ({
-  width = "1em",
-  height = "1em",
-}) => {
-  const widthValue = typeof width === "number" ? `${width}px` : width;
-  const heightValue = typeof height === "number" ? `${height}px` : height;
+const createImageIconComponent = (
+  iconUrl: string,
+  alt: string,
+): React.FC<SVGProps<SVGSVGElement>> => {
+  const ImageIcon: React.FC<SVGProps<SVGSVGElement>> = ({
+    width = "1em",
+    height = "1em",
+    className,
+    style,
+  }) => {
+    const widthValue = typeof width === "number" ? `${width}px` : width;
+    const heightValue = typeof height === "number" ? `${height}px` : height;
 
-  return (
-    <img
-      src={antigravityIconUrl}
-      alt="Antigravity"
-      style={{ width: widthValue, height: heightValue, display: "block" }}
-    />
-  );
+    return (
+      <img
+        src={iconUrl}
+        alt={alt}
+        className={className}
+        style={{
+          width: widthValue,
+          height: heightValue,
+          display: "block",
+          objectFit: "contain",
+          ...(style as React.CSSProperties),
+        }}
+      />
+    );
+  };
+
+  return ImageIcon;
 };
 
+const AntigravityIcon = createImageIconComponent(
+  antigravityIconUrl,
+  "Antigravity",
+);
+const AbacusIcon = createImageIconComponent(abacusIconUrl, "Abacus");
+const BasetenIcon = createImageIconComponent(basetenIconUrl, "Baseten");
+const ChutesIcon = createImageIconComponent(chutesIconUrl, "Chutes");
+const CortecsIcon = createImageIconComponent(cortecsIconUrl, "Cortecs");
+const DeepinfraIcon = createImageIconComponent(deepinfraIconUrl, "DeepInfra");
+const GroqIcon = createImageIconComponent(groqIconUrl, "Groq");
+const DashscopeIcon = createImageIconComponent(dashscopeIconUrl, "Dashscope");
+const HeliconeIcon = createImageIconComponent(heliconeIconUrl, "Helicone");
+const InceptionIcon = createImageIconComponent(inceptionIconUrl, "Inception");
+const LucidqueryIcon = createImageIconComponent(
+  lucidqueryIconUrl,
+  "LucidQuery",
+);
+const IoNetIcon = createImageIconComponent(ioNetIconUrl, "IO.net");
+const NanoGptIcon = createImageIconComponent(nanoGptIconUrl, "NanoGPT");
+const NewapiIcon = createImageIconComponent(newapiIconUrl, "New API");
+const OpencodeIcon = createImageIconComponent(opencodeIconUrl, "OpenCode");
+const RequestyIcon = createImageIconComponent(requestyIconUrl, "Requesty");
+const SubmodelIcon = createImageIconComponent(submodelIconUrl, "Submodel");
+const VeniceIcon = createImageIconComponent(veniceIconUrl, "Venice");
+
 // ============================================================================
 // 图标组件映射
 // ============================================================================
@@ -135,12 +214,37 @@ const iconComponents: Record<string, ComponentType<SVGProps<SVGSVGElement>>> = {
   aws: AwsIcon,
   gemini: GeminiIcon,
   anthropic: AnthropicIcon,
+  abacus: AbacusIcon,
+  ai21: Ai21Icon,
   claude: ClaudeIcon,
+  baseten: BasetenIcon,
+  chutes: ChutesIcon,
+  comfyui: ComfyuiIcon,
+  cortecs: CortecsIcon,
   qwen: QwenIcon,
+  deepinfra: DeepinfraIcon,
   google: GoogleIcon,
+  fal: FalIcon,
+  fastrouter: FastrouterIcon,
+  friendli: FriendliIcon,
+  higress: HigressIcon,
+  helicone: HeliconeIcon,
+  inference: InferenceIcon,
+  inception: InceptionIcon,
+  "io-net": IoNetIcon,
+  lucidquery: LucidqueryIcon,
+  morph: MorphIcon,
+  nebius: NebiusIcon,
+  "nano-gpt": NanoGptIcon,
   openai: OpenaiIcon,
+  opencode: OpencodeIcon,
+  ovhcloud: OvhcloudIcon,
   alibaba: AlibabaIcon,
   copilot: CopilotIcon,
+  requesty: RequestyIcon,
+  "sap-ai-core": SapAiCoreIcon,
+  scaleway: ScalewayIcon,
+  submodel: SubmodelIcon,
   amp: AmpIcon,
   kiro: KiroIcon,
   deepseek: DeepseekIcon,
@@ -149,9 +253,14 @@ const iconComponents: Record<string, ComponentType<SVGProps<SVGSVGElement>>> = {
   minimax: MinimaxIcon,
   doubao: DoubaoIcon,
   azure: AzureIcon,
+  cloudflare: CloudflareIcon,
   antigravity: AntigravityIcon,
   lime: LimeIcon,
   "lime-hub": LimeHubIcon,
+  meta: MetaIcon,
+  upstage: UpstageIcon,
+  v0: V0Icon,
+  zai: ZaiIcon,
 
   // 主流 AI
   perplexity: PerplexityIcon,
@@ -202,10 +311,17 @@ const iconComponents: Record<string, ComponentType<SVGProps<SVGSVGElement>>> = {
   longcat: LongcatIcon,
   alayanew: AlayanewIcon,
   aionly: AionlyIcon,
+  novita: NovitaIcon,
   ocoolai: OcoolaiIcon,
+  replicate: ReplicateIcon,
   vercel: VercelIcon,
+  zenmux: ZenmuxIcon,
   poe: PoeIcon,
   huggingface: HuggingfaceIcon,
+  synthetic: SyntheticIcon,
+  venice: VeniceIcon,
+  vultr: VultrIcon,
+  wandb: WandbIcon,
 
   // 本地服务
   ollama: OllamaIcon,
@@ -213,6 +329,7 @@ const iconComponents: Record<string, ComponentType<SVGProps<SVGSVGElement>>> = {
   newapi: NewapiIcon,
   gpustack: GpustackIcon,
   ovms: OvmsIcon,
+  vllm: VllmIcon,
 
   // 专用服务
   jina: JinaIcon,
diff --git a/src/icons/providers/inference.svg b/src/icons/providers/inference.svg
new file mode 100644
index 000000000..1961c1a01
--- /dev/null
+++ b/src/icons/providers/inference.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.dev/svgjs" width="640" height="640" viewBox="0 0 640 640"><image width="640" height="640" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAoAAAAKACAYAAAAMzckjAAAUhUlEQVR4Ae3dPW9kVZ7H8VM1qx4cgItsMswroCdiRILJyGAitBE92WTbI5KZqCGayRpeAU2KkGgyNhqTzUaYV4BHSGizLWduAtee09xqCrcfynaVXff+Ph+p+tZTo24jxFf/c8+9o8Izk6oedhYerxwfH09Go1F7PukepfsMANgM05OP+v/ug3r8d32048F0Ot0vPDMqobrY262Pu7PZ7LV2LMIOAIasReBBjcPv6nGvva5hOC2BYgKwC7536+O1GnztuFMAgHT7tQv2x+PxV+XnIDwoAQYdgLX5dusS7pu19HfLz9M+AIDz7NVuaDG4N+Rl48EFYI2+nRp979d/efeKKR8AcHVtufhxPX4ytMngIAKwW969V0e47xSTPgBg9dpk8LMago/KAPQ6ABemfffLLzt0AQDW5aAOnPbG4/FHfZ4K9jIA27l99Yf/oJj2AQC3pLbIo76GYK8CUPgBAJumjyHYiwBsS731h/tpEX4AwIbqUwhudAC2zR3Hx8cPunP8AAA2Xh9C8DdlQ7300kv/VQ+Pu2v4AQD0Qm2Xdnexd7e2tg6Pjo428lqCGzcBrEO/dmu2h8VyLwDQf+1agm9t2jRwXDZInfo9qPH3bRF/AMAwtH0M37fGKRtkIyaA3SaPL+vTuwUAYJg2Zhp46xPAdq5fN/UTfwDAkLWB17d18HXrm1tvbRNI2+F7586dv9cS/rC+fKEAAAxfa563f/vb3062trb+56gqt+BWloAt+QIA3N6S8I0vAXd387DkCwCkawOxf7YroJQbdqMB+OKLL77f/qL16aQAAHAr5wXe2DmAbfvzeDz+uAAAcFI7L7A8efLkm3IDbiQAW/x1mz0AADhFu/vZTUXg2gOwxt/D+hf6awEA4Fw3FYFrDcAaf5/Wv8ifCwAAS+kicKdG4FdlTdYWgN2y761f6BAAoG9qQ91t1wqsEfjfZQ3WEoDO+QMAuJ7aUn9Y13LwygNQ/AEArMa6zglcaQC2+/rWP+g/CgAAK9Ei8M6dOwc//fTTd2VFVnYruHYV6+4OHwAArFh327i9sgIrCcDu3r7tDh87BQCAdZjWCPz9Ku4dfO0ArPE36SZ/OwUAgHXa7yaB03IN1z4HsK5J/73+Qd4uAACs2+/q4O2F614e5loB2G36+LAAAHAj2uVhtra2Do+Ojv5VrujKS8DdeX9t6XdSAAC4Sdc6H3Bcrqjb9CH+AABuXtuD8WW5oistAXcXe363AABwW35Xl4JHdSl4r1zSpZeAu6Xf7wsAALeuWwrev8zvufQScLf0CwDABqht9rBc0qWWgOv071493CsAAGyKncvuCl56CdjdPgAANlbbFfzqsheIvswS8IMi/gAANtHk+Pj4wbJfXmoCaOMHAMDm66aABxd9b9kJ4NJFCQDA7agDu0+X+d6FE0DTPwCA/qhTwLfqFHDvvO8sMwE0/QMA6Ik6uLuw3c6dAJr+AQD0z0VTwIsmgKZ/AAA9c9EU8MwJoOkfAEB/nbcj+LwJoOkfAEB/3TvrgzMngNvb2236t1MAAOijM+8OcuoEsLvn704BAKCvJuWMKeCpATibzd4vAAD0Wm26d057/7klYJs/AACG47TNIKdNAO8XAACG4t7JN54LwLNGhQAA9M9pp/b9KgDr8u/dYvMHAMCQ7NTG21184+QEcLcAADA0u4svfhWAln8BAIanNt6bi6+f7QK2+xcAYLhGo9HL84tCL04A7xYAAIbq3fmTxQC0/AsAMFzPhn3PArAu/5oAAgAM1OJej6fnAE6q+ub/FQAABmt+HuB8Amj6BwAwfLvtl/HiCwAABu3p0G8egK8VAACG7pcAnM1mOwUAgEGrzfd06Pd0E8j29vasAAAweG0jyHgymdgAAgCQY6ctAe8UAABSCEAAgDACEAAgzNMAfKUAABDh+Ph4ezybzSYFAIAI4/H46QRQAAIAhGjDv/FoNBKAAAA5JpaAAQDCjNwFBAAgy7gAABBFAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYf6jwJK++OKL8sYbb5RN8Prrr5cffvihbLIff/yx9Fn7+bafcx988MEHTx+p+vDfw0nvvfdeefjwYWG97t+/Xz7//PMCJ5kAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQRgACAIQRgAAAYQQgAEAYAQgAEEYAAgCEEYAAAGEEIABAGAEIABBGAAIAhBGAAABhBCAAQBgBCAAQZrS9vT0rAADEMAEEAAgjAAEAwghAAIAwAhAAIIwABAAIIwABAMIIQACAMAIQACCMAAQACCMAAQDCCEAAgDACEAAgjAAEAAgjAAEAwghAAIAwAhAAIIwABAAIIwABAMIIQACAMAIQACCMAAQACCMAAQDCCEAAgDACEAAgjAAEAAgjAAEAwghAAIAwAhAAIIwABAAIIwABAMIIQACAMAIQACCMAAQACCMAAQDCCEAAgDACEAAgjAAEAAgjAAEAwghAAIAwAhAAIIwABAAIIwABAMIIQACAMAIQACCMAAQACCMAAQDCCEAAgDACEAAgjAAEAAgjAAEAwghAAIAwAhAAIIwABAAIIwABAMIIQACAMAIQACCMAAQACCMAAQDCCEAAgDACEAAgjAAEAAgjAAEAwghAAIAwAhAAIIwABAAIIwABAMIIQACAMAIQACCMAAQACCMAAQDCCEAAgDACEAAgzHg0Gh0UAABSTE0AAQCyTMez2WxaAABI8XQCKAABAEKMRqNpOwfw3wUAgBSHJoAAAFkOWgAeFAAAUghAAIAwAhAAIIwABABIMp1O98f1l6m7gQAARNhvv4wXXwAAMFzzy//NA/C7AgDA0JkAAgCE2Wu/jBdfAAAwaL9MAG0EAQAYvP3WfO3JeOHNrwoAAIM0m82enfK3GIDOAwQAGKjxePxs2LcYgI8LAABD9fwEsFsT3isAAAzKaDTaq6l3MH89PvHhNwUAgKH51V6P8YkP9woAAEOzt/hidPLTyWTy/Ww22ykAAAzBweHh4auLb4xP+dJnBQCAQRiNRs9d6u+0AHxUAAAYio9PvvFcAHY7RPYKAAC9dnL379z4jC+7KwgAQP+demrf6LQ3J9VsNvu+PS0AAPTRc5s/5k6dALaLQtcp4CcFAIBeqsO8vbM+G5/z+x4VAAB6aTwef3TmZ2d9YDMIAEA/1enfo9M2f8ydNwFsm0E+KgAA9Mp507+nn5/3YS3HvWIKCADQGxdN/5pzA7AxBQQA6I+Lpn9Pv3PRF0wBAQD6YZnpXzMqS5hMJjvddQEBANhQdeX21WUC8MIJYNP+Qa4LCACwuZad/jVLTQAbdwcBANhYbVj31rIB+JuypKNqa2vrSX36dgEAYGPU+PtLt29jue+XS9re3v5nPewWAAA2wZn3/D3LUucALmqFWQAA2Aht6bdc0tJLwHN1Jfh/61JwmxzuFgAAbk27XnNd+n1cLunSS8BzdSn423q4WwAAuA2XXvqdu/QS8Fwtzj/Ww7QAAHDTpldZ+p279BLwXF0KntoVDABw82r8/a0u/X5drujKAdjUCPxXjcCX69M/FAAA1q7dnKPG34flGq58DuBcd4HodmkY5wMCAKxXu+Dz72sAXus0vGsHYNPdK7htCnGXEACA9bjU3T7Os5IAbGoE7naTQAAAVqyb/O2XFbjyLuCT2u1H6h/sTwUAgJXqbvW2kvhrrrUJ5KSjo6N9F4kGAFid7mLP/ygrtNIAbGoE7olAAIDr6+Lvw7JiKw/ApotAl4cBALiidcVfs5YAbGoEfl0jsN2exOVhAAAuocbfZzX+7pc1WVsANjUCH1sOBgBYXneh5z+XNVprADbOCQQAWE637PvXsmZrD8BGBAIAnG+d5/yddCMB2HQReFifvl0AAHimXUu5xt/H5Yas7E4gy5pMJndns9mX9elOAQDINq3x98d2Q41yg248AJvu3sHttnE7BQAg034Xfwflhq3sVnCX0f6i7X52bZdLAQAI0xqoPt66jfhrbuwcwJOOfvZ1d15gu2D0CwUAYNjaku/f2maPFkLlltzKEvBJloQBgAC3tuR70q1NABfVAJ4+efLkE5eKAQCGqF3i5fDw8D9b85QNsBETwEWmgQDAUNTw26uHv9Sp337ZIBsXgHM1BO/VEHxQhCAA0D/T7sLON3Ztv8vYiCXg09QR6X5dEv6q/vBeri/vFgCAHuh2+N74tf0uY2MngIvasnA9fFgngu8XAIAN1C33/mkTNnlcpBcBOCcEAYBN04XfR5s88TupVwE4JwQBgNvWx/Cb62UAzi2E4JvFZhEAYP2m3Z3MHvVhqfcsvQ7ARW3XcD28X2NwtwAArFA37fuq/Bx+G3Etv+sYTADOdVPB+zUE3ymmggDAFdXoO6iHz0rPp32nGVwALqox2C4fs1sf75gMAgAX6SZ939THXh/P7VvWoANwUTcZbEH4bn28VoPQtQUBIFw35WtLu+1OHY+HsLy7jJgAPKkG4aT8HIS79fFafeyIQgAYri72Wuh91x33UoLvpNgAPEu3bLyz8HilvT1/1EicPwcANkAXds20e7TXh93x2SM19k7z/9cQ/J5rlnhhAAAAAElFTkSuQmCC"></image><style>@media (prefers-color-scheme: light) { :root { filter: none; } }
+@media (prefers-color-scheme: dark) { :root { filter: none; } }
+</style></svg>
\ No newline at end of file
diff --git a/src/icons/providers/io-net.png b/src/icons/providers/io-net.png
new file mode 100644
index 000000000..dc00d66ea
Binary files /dev/null and b/src/icons/providers/io-net.png differ
diff --git a/src/icons/providers/jina.svg b/src/icons/providers/jina.svg
index 48e319205..d2fa4a5ea 100644
--- a/src/icons/providers/jina.svg
+++ b/src/icons/providers/jina.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Jina (Embedding/Rerank)</title><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c3.86 0 7 3.14 7 7s-3.14 7-7 7-7-3.14-7-7 3.14-7 7-7z"/></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Jina</title><path d="M1.80913 16.9737C2.65296 16.9737 3.33701 16.2897 3.33701 15.4459C3.33701 14.602 2.65296 13.918 1.80913 13.918C0.965306 13.918 0.28125 14.602 0.28125 15.4459C0.28125 16.2897 0.965306 16.9737 1.80913 16.9737Z" fill="#EB6161"></path><path d="M6.62248 10.6329C6.82221 10.6329 6.98198 10.7927 6.98198 10.9924L6.96201 13.9184C6.96201 15.5861 5.62387 16.9442 3.95618 16.9741H3.90625V13.9284H3.91624L3.92622 11.0024C3.92622 10.8027 4.086 10.6429 4.28572 10.6429H6.62248V10.6329ZM11.316 10.6329C11.5157 10.6329 11.6755 10.7927 11.6755 10.9924V15.0868C11.6755 15.2865 11.5157 15.4463 11.316 15.4463H8.97922C8.77949 15.4463 8.61971 15.2865 8.61971 15.0868V10.9924C8.61971 10.7927 8.77949 10.6329 8.97922 10.6329H11.316ZM14.9909 10.623H15.0408C16.5387 10.6429 17.757 11.8512 17.797 13.3492V15.0768C17.797 15.2765 17.6372 15.4363 17.4375 15.4363H13.6627C13.463 15.4363 13.3032 15.2765 13.3032 15.0768V10.9825C13.3032 10.7827 13.463 10.623 13.6627 10.623H14.9909ZM21.1723 15.3963C19.9141 15.3164 18.9055 14.2679 18.9055 12.9897C18.9055 11.6615 19.984 10.583 21.3121 10.583C22.5903 10.583 23.6389 11.5816 23.7188 12.8499V15.0368C23.7188 15.2366 23.559 15.3963 23.3593 15.3963H21.1723Z" fill="#009191"></path><path d="M10.1426 10.0636C10.9865 10.0636 11.6705 9.37952 11.6705 8.53569C11.6705 7.69187 10.9865 7.00781 10.1426 7.00781C9.2988 7.00781 8.61475 7.69187 8.61475 8.53569C8.61475 9.37952 9.2988 10.0636 10.1426 10.0636Z" fill="#FBCB67"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/kimi.svg b/src/icons/providers/kimi.svg
index dfc0f4507..ec5db53a4 100644
--- a/src/icons/providers/kimi.svg
+++ b/src/icons/providers/kimi.svg
@@ -1 +1 @@
-<svg fill="currentColor" fill-rule="evenodd" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><path d="M19.738 5.776c.163-.209.306-.4.457-.585.07-.087.064-.153-.004-.244-.655-.861-.717-1.817-.34-2.787.283-.73.909-1.072 1.674-1.145.477-.045.945.004 1.379.236.57.305.902.77 1.01 1.412.086.512.07 1.012-.075 1.508-.257.878-.888 1.333-1.753 1.448-.718.096-1.446.108-2.17.157-.056.004-.113 0-.178 0z" fill="#027AFF"></path><path d="M17.962 1.844h-4.326l-3.425 7.81H5.369V1.878H1.5V22h3.87v-8.477h6.824a3.025 3.025 0 002.743-1.75V22h3.87v-8.477a3.87 3.87 0 00-3.588-3.86v-.01h-2.125a3.94 3.94 0 002.323-2.12l2.545-5.689z"></path></svg>
\ No newline at end of file
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Kimi</title><path d="M19.738 5.776c.163-.209.306-.4.457-.585.07-.087.064-.153-.004-.244-.655-.861-.717-1.817-.34-2.787.283-.73.909-1.072 1.674-1.145.477-.045.945.004 1.379.236.57.305.902.77 1.01 1.412.086.512.07 1.012-.075 1.508-.257.878-.888 1.333-1.753 1.448-.718.096-1.446.108-2.17.157-.056.004-.113 0-.178 0z" fill="#027AFF"></path><path d="M17.962 1.844h-4.326l-3.425 7.81H5.369V1.878H1.5V22h3.87v-8.477h6.824a3.025 3.025 0 002.743-1.75V22h3.87v-8.477a3.87 3.87 0 00-3.588-3.86v-.01h-2.125a3.94 3.94 0 002.323-2.12l2.545-5.689z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/lmstudio.svg b/src/icons/providers/lmstudio.svg
index a688d0cff..ea0816b63 100644
--- a/src/icons/providers/lmstudio.svg
+++ b/src/icons/providers/lmstudio.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>LM Studio</title><path d="M12 2L2 7v10l10 5 10-5V7L12 2zm0 2.18l7.09 3.54L12 11.27 4.91 7.72 12 4.18zM4 9.27l7 3.5v7.05l-7-3.5V9.27zm9 10.55v-7.05l7-3.5v7.05l-7 3.5z"/></svg>
\ No newline at end of file
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>LM Studio</title><path d="M2.84 2a1.273 1.273 0 100 2.547h14.107a1.273 1.273 0 100-2.547H2.84zM7.935 5.33a1.273 1.273 0 000 2.548H22.04a1.274 1.274 0 000-2.547H7.935zM3.624 9.935c0-.704.57-1.274 1.274-1.274h14.106a1.274 1.274 0 010 2.547H4.898c-.703 0-1.274-.57-1.274-1.273zM1.273 12.188a1.273 1.273 0 100 2.547H15.38a1.274 1.274 0 000-2.547H1.273zM3.624 16.792c0-.704.57-1.274 1.274-1.274h14.106a1.273 1.273 0 110 2.547H4.898c-.703 0-1.274-.57-1.274-1.273zM13.029 18.849a1.273 1.273 0 100 2.547h9.698a1.273 1.273 0 100-2.547h-9.698z" fill-opacity=".3"></path><path d="M2.84 2a1.273 1.273 0 100 2.547h10.287a1.274 1.274 0 000-2.547H2.84zM7.935 5.33a1.273 1.273 0 000 2.548H18.22a1.274 1.274 0 000-2.547H7.935zM3.624 9.935c0-.704.57-1.274 1.274-1.274h10.286a1.273 1.273 0 010 2.547H4.898c-.703 0-1.274-.57-1.274-1.273zM1.273 12.188a1.273 1.273 0 100 2.547H11.56a1.274 1.274 0 000-2.547H1.273zM3.624 16.792c0-.704.57-1.274 1.274-1.274h10.286a1.273 1.273 0 110 2.547H4.898c-.703 0-1.274-.57-1.274-1.273zM13.029 18.849a1.273 1.273 0 100 2.547h5.78a1.273 1.273 0 100-2.547h-5.78z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/lucidquery.png b/src/icons/providers/lucidquery.png
new file mode 100644
index 000000000..cd6da0562
Binary files /dev/null and b/src/icons/providers/lucidquery.png differ
diff --git a/src/icons/providers/meta.svg b/src/icons/providers/meta.svg
new file mode 100644
index 000000000..7daf2ebad
--- /dev/null
+++ b/src/icons/providers/meta.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Meta</title><path d="M6.897 4c1.915 0 3.516.932 5.43 3.376l.282-.373c.19-.246.383-.484.58-.71l.313-.35C14.588 4.788 15.792 4 17.225 4c1.273 0 2.469.557 3.491 1.516l.218.213c1.73 1.765 2.917 4.71 3.053 8.026l.011.392.002.25c0 1.501-.28 2.759-.818 3.7l-.14.23-.108.153c-.301.42-.664.758-1.086 1.009l-.265.142-.087.04a3.493 3.493 0 01-.302.118 4.117 4.117 0 01-1.33.208c-.524 0-.996-.067-1.438-.215-.614-.204-1.163-.56-1.726-1.116l-.227-.235c-.753-.812-1.534-1.976-2.493-3.586l-1.43-2.41-.544-.895-1.766 3.13-.343.592C7.597 19.156 6.227 20 4.356 20c-1.21 0-2.205-.42-2.936-1.182l-.168-.184c-.484-.573-.837-1.311-1.043-2.189l-.067-.32a8.69 8.69 0 01-.136-1.288L0 14.468c.002-.745.06-1.49.174-2.23l.1-.573c.298-1.53.828-2.958 1.536-4.157l.209-.34c1.177-1.83 2.789-3.053 4.615-3.16L6.897 4zm-.033 2.615l-.201.01c-.83.083-1.606.673-2.252 1.577l-.138.199-.01.018c-.67 1.017-1.185 2.378-1.456 3.845l-.004.022a12.591 12.591 0 00-.207 2.254l.002.188c.004.18.017.36.04.54l.043.291c.092.503.257.908.486 1.208l.117.137c.303.323.698.492 1.17.492 1.1 0 1.796-.676 3.696-3.641l2.175-3.4.454-.701-.139-.198C9.11 7.3 8.084 6.616 6.864 6.616zm10.196-.552l-.176.007c-.635.048-1.223.359-1.82.933l-.196.198c-.439.462-.887 1.064-1.367 1.807l.266.398c.18.274.362.56.55.858l.293.475 1.396 2.335.695 1.114c.583.926 1.03 1.6 1.408 2.082l.213.262c.282.326.529.54.777.673l.102.05c.227.1.457.138.718.138.176.002.35-.023.518-.073.338-.104.61-.32.813-.637l.095-.163.077-.162c.194-.459.29-1.06.29-1.785l-.006-.449c-.08-2.871-.938-5.372-2.2-6.798l-.176-.189c-.67-.683-1.444-1.074-2.27-1.074z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/minimax.svg b/src/icons/providers/minimax.svg
index 5490590e8..2a60bd473 100644
--- a/src/icons/providers/minimax.svg
+++ b/src/icons/providers/minimax.svg
@@ -1 +1 @@
-<svg height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="minimax-gradient" x1="0%" y1="50%" x2="100%" y2="50%"><stop offset="0%" style="stop-color:#E2167E;stop-opacity:1" /><stop offset="100%" style="stop-color:#FE603C;stop-opacity:1" /></linearGradient></defs><path d="M16.278 2c1.156 0 2.093.927 2.093 2.07v12.501a.74.74 0 00.744.709.74.74 0 00.743-.709V9.099a2.06 2.06 0 012.071-2.049A2.06 2.06 0 0124 9.1v6.561a.649.649 0 01-.652.645.649.649 0 01-.653-.645V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v7.472a2.037 2.037 0 01-2.048 2.026 2.037 2.037 0 01-2.048-2.026v-12.5a.785.785 0 00-.788-.753.785.785 0 00-.789.752l-.001 15.904A2.037 2.037 0 0113.441 22a2.037 2.037 0 01-2.048-2.026V18.04c0-.356.292-.645.652-.645.36 0 .652.289.652.645v1.934c0 .263.142.506.372.638.23.131.514.131.744 0a.734.734 0 00.372-.638V4.07c0-1.143.937-2.07 2.093-2.07zm-5.674 0c1.156 0 2.093.927 2.093 2.07v11.523a.648.648 0 01-.652.645.648.648 0 01-.652-.645V4.07a.785.785 0 00-.789-.78.785.785 0 00-.789.78v14.013a2.06 2.06 0 01-2.07 2.048 2.06 2.06 0 01-2.071-2.048V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v3.8a2.06 2.06 0 01-2.071 2.049A2.06 2.06 0 010 12.9v-1.378c0-.357.292-.646.652-.646.36 0 .653.29.653.646V12.9c0 .418.343.757.766.757s.766-.339.766-.757V9.099a2.06 2.06 0 012.07-2.048 2.06 2.06 0 012.071 2.048v8.984c0 .419.343.758.767.758.423 0 .766-.339.766-.758V4.07c0-1.143.937-2.07 2.093-2.07z" fill="url(#minimax-gradient)" fill-rule="nonzero"></path></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Minimax</title><defs><linearGradient id="lobe-icons-minimax-fill" x1="0%" x2="100.182%" y1="50.057%" y2="50.057%"><stop offset="0%" stop-color="#E2167E"></stop><stop offset="100%" stop-color="#FE603C"></stop></linearGradient></defs><path d="M16.278 2c1.156 0 2.093.927 2.093 2.07v12.501a.74.74 0 00.744.709.74.74 0 00.743-.709V9.099a2.06 2.06 0 012.071-2.049A2.06 2.06 0 0124 9.1v6.561a.649.649 0 01-.652.645.649.649 0 01-.653-.645V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v7.472a2.037 2.037 0 01-2.048 2.026 2.037 2.037 0 01-2.048-2.026v-12.5a.785.785 0 00-.788-.753.785.785 0 00-.789.752l-.001 15.904A2.037 2.037 0 0113.441 22a2.037 2.037 0 01-2.048-2.026V18.04c0-.356.292-.645.652-.645.36 0 .652.289.652.645v1.934c0 .263.142.506.372.638.23.131.514.131.744 0a.734.734 0 00.372-.638V4.07c0-1.143.937-2.07 2.093-2.07zm-5.674 0c1.156 0 2.093.927 2.093 2.07v11.523a.648.648 0 01-.652.645.648.648 0 01-.652-.645V4.07a.785.785 0 00-.789-.78.785.785 0 00-.789.78v14.013a2.06 2.06 0 01-2.07 2.048 2.06 2.06 0 01-2.071-2.048V9.1a.762.762 0 00-.766-.758.762.762 0 00-.766.758v3.8a2.06 2.06 0 01-2.071 2.049A2.06 2.06 0 010 12.9v-1.378c0-.357.292-.646.652-.646.36 0 .653.29.653.646V12.9c0 .418.343.757.766.757s.766-.339.766-.757V9.099a2.06 2.06 0 012.07-2.048 2.06 2.06 0 012.071 2.048v8.984c0 .419.343.758.767.758.423 0 .766-.339.766-.758V4.07c0-1.143.937-2.07 2.093-2.07z" fill="url(#lobe-icons-minimax-fill)" fill-rule="nonzero"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/mistral.svg b/src/icons/providers/mistral.svg
index a2a805261..b411a52d7 100644
--- a/src/icons/providers/mistral.svg
+++ b/src/icons/providers/mistral.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Mistral</title><rect x="2" y="2" width="4" height="4"/><rect x="10" y="2" width="4" height="4"/><rect x="18" y="2" width="4" height="4"/><rect x="2" y="6" width="4" height="4"/><rect x="6" y="6" width="4" height="4"/><rect x="10" y="6" width="4" height="4"/><rect x="14" y="6" width="4" height="4"/><rect x="18" y="6" width="4" height="4"/><rect x="2" y="10" width="4" height="4"/><rect x="10" y="10" width="4" height="4"/><rect x="18" y="10" width="4" height="4"/><rect x="2" y="14" width="4" height="4"/><rect x="6" y="14" width="4" height="4"/><rect x="10" y="14" width="4" height="4"/><rect x="14" y="14" width="4" height="4"/><rect x="18" y="14" width="4" height="4"/><rect x="2" y="18" width="4" height="4"/><rect x="10" y="18" width="4" height="4"/><rect x="18" y="18" width="4" height="4"/></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Mistral</title><g fill="none" fill-rule="nonzero"><path d="M15 6v4h-2V6h2zm4-4v4h-2V2h2zM3 2H1h2zM1 2h2v20H1V2zm8 12h2v4H9v-4zm8 0h2v8h-2v-8z" fill="#000"></path><path d="M19 2h4v4h-4V2zM3 2h4v4H3V2z" fill="#F7D046"></path><path d="M15 10V6h8v4h-8zM3 10V6h8v4H3z" fill="#F2A73B"></path><path d="M3 14v-4h20v4z" fill="#EE792F"></path><path d="M11 14h4v4h-4v-4zm8 0h4v4h-4v-4zM3 14h4v4H3v-4z" fill="#EB5829"></path><path d="M19 18h4v4h-4v-4zM3 18h4v4H3v-4z" fill="#EA3326"></path></g></svg>
\ No newline at end of file
diff --git a/src/icons/providers/modelscope.svg b/src/icons/providers/modelscope.svg
index 617f88e10..afbaa171a 100644
--- a/src/icons/providers/modelscope.svg
+++ b/src/icons/providers/modelscope.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>魔搭 (ModelScope)</title><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>ModelScope</title><path d="M0 7.967h2.667v2.667H0zM8 10.633h2.667V13.3H8z" fill="#36CED0"></path><path d="M0 10.633h2.667V13.3H0zM2.667 13.3h2.666v2.667H8v2.666H2.667V13.3zM2.667 5.3H8v2.667H5.333v2.666H2.667V5.3zM10.667 13.3h2.667v2.667h-2.667z" fill="#624AFF"></path><path d="M24 7.967h-2.667v2.667H24zM16 10.633h-2.667V13.3H16z" fill="#36CED0"></path><path d="M24 10.633h-2.667V13.3H24zM21.333 13.3h-2.666v2.667H16v2.666h5.333V13.3zM21.333 5.3H16v2.667h2.667v2.666h2.666V5.3z" fill="#624AFF"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/moonshot.svg b/src/icons/providers/moonshot.svg
index 932720fd3..fb56ac106 100644
--- a/src/icons/providers/moonshot.svg
+++ b/src/icons/providers/moonshot.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Moonshot</title><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.41 0 8 3.59 8 8 0 1.85-.63 3.55-1.69 4.9z"/></svg>
\ No newline at end of file
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>MoonshotAI</title><path d="M1.052 16.916l9.539 2.552a21.007 21.007 0 00.06 2.033l5.956 1.593a11.997 11.997 0 01-5.586.865l-.18-.016-.044-.004-.084-.009-.094-.01a11.605 11.605 0 01-.157-.02l-.107-.014-.11-.016a11.962 11.962 0 01-.32-.051l-.042-.008-.075-.013-.107-.02-.07-.015-.093-.019-.075-.016-.095-.02-.097-.023-.094-.022-.068-.017-.088-.022-.09-.024-.095-.025-.082-.023-.109-.03-.062-.02-.084-.025-.093-.028-.105-.034-.058-.019-.08-.026-.09-.031-.066-.024a6.293 6.293 0 01-.044-.015l-.068-.025-.101-.037-.057-.022-.08-.03-.087-.035-.088-.035-.079-.032-.095-.04-.063-.028-.063-.027a5.655 5.655 0 01-.041-.018l-.066-.03-.103-.047-.052-.024-.096-.046-.062-.03-.084-.04-.086-.044-.093-.047-.052-.027-.103-.055-.057-.03-.058-.032a6.49 6.49 0 01-.046-.026l-.094-.053-.06-.034-.051-.03-.072-.041-.082-.05-.093-.056-.052-.032-.084-.053-.061-.039-.079-.05-.07-.047-.053-.035a7.785 7.785 0 01-.054-.036l-.044-.03-.044-.03a6.066 6.066 0 01-.04-.028l-.057-.04-.076-.054-.069-.05-.074-.054-.056-.042-.076-.057-.076-.059-.086-.067-.045-.035-.064-.052-.074-.06-.089-.073-.046-.039-.046-.039a7.516 7.516 0 01-.043-.037l-.045-.04-.061-.053-.07-.062-.068-.06-.062-.058-.067-.062-.053-.05-.088-.084a13.28 13.28 0 01-.099-.097l-.029-.028-.041-.042-.069-.07-.05-.051-.05-.053a6.457 6.457 0 01-.168-.179l-.08-.088-.062-.07-.071-.08-.042-.049-.053-.062-.058-.068-.046-.056a7.175 7.175 0 01-.027-.033l-.045-.055-.066-.082-.041-.052-.05-.064-.02-.025a11.99 11.99 0 01-1.44-2.402zm-1.02-5.794l11.353 3.037a20.468 20.468 0 00-.469 2.011l10.817 2.894a12.076 12.076 0 01-1.845 2.005L.657 15.923l-.016-.046-.035-.104a11.965 11.965 0 01-.05-.153l-.007-.023a11.896 11.896 0 01-.207-.741l-.03-.126-.018-.08-.021-.097-.018-.081-.018-.09-.017-.084-.018-.094c-.026-.141-.05-.283-.071-.426l-.017-.118-.011-.083-.013-.102a12.01 12.01 0 01-.019-.161l-.005-.047a12.12 12.12 0 01-.034-2.145zm1.593-5.15l11.948 3.196c-.368.605-.705 1.231-1.01 1.875l11.295 3.022c-.142.82-.368 1.612-.668 2.365l-11.55-3.09L.124 10.26l.015-.1.008-.049.01-.067.015-.087.018-.098c.026-.148.056-.295.088-.442l.028-.124.02-.085.024-.097c.022-.09.045-.18.07-.268l.028-.102.023-.083.03-.1.025-.082.03-.096.026-.082.031-.095a11.896 11.896 0 011.01-2.232zm4.442-4.4L17.352 4.59a20.77 20.77 0 00-1.688 1.721l7.823 2.093c.267.852.442 1.744.513 2.665L2.106 5.213l.045-.065.027-.04.04-.055.046-.065.055-.076.054-.072.064-.086.05-.065.057-.073.055-.07.06-.074.055-.069.065-.077.054-.066.066-.077.053-.06.072-.082.053-.06.067-.074.054-.058.073-.078.058-.06.063-.067.168-.17.1-.098.059-.056.076-.071a12.084 12.084 0 012.272-1.677zM12.017 0h.097l.082.001.069.001.054.002.068.002.046.001.076.003.047.002.06.003.054.002.087.005.105.007.144.011.088.007.044.004.077.008.082.008.047.005.102.012.05.006.108.014.081.01.042.006.065.01.207.032.07.012.065.011.14.026.092.018.11.022.046.01.075.016.041.01L14.7.3l.042.01.065.015.049.012.071.017.096.024.112.03.113.03.113.032.05.015.07.02.078.024.073.023.05.016.05.016.076.025.099.033.102.036.048.017.064.023.093.034.11.041.116.045.1.04.047.02.06.024.041.018.063.026.04.018.057.025.11.048.1.046.074.035.075.036.06.028.092.046.091.045.102.052.053.028.049.026.046.024.06.033.041.022.052.029.088.05.106.06.087.051.057.034.053.032.096.059.088.055.098.062.036.024.064.041.084.056.04.027.062.042.062.043.023.017c.054.037.108.075.161.114l.083.06.065.048.056.043.086.065.082.064.04.03.05.041.086.069.079.065.085.071c.712.6 1.353 1.283 1.909 2.031L7.222.994l.062-.027.065-.028.081-.034.086-.035c.113-.045.227-.09.341-.131l.096-.035.093-.033.084-.03.096-.031c.087-.03.176-.058.264-.085l.091-.027.086-.025.102-.03.085-.023.1-.026L9.04.37l.09-.023.091-.022.095-.022.09-.02.098-.021.091-.02.095-.018.092-.018.1-.018.091-.016.098-.017.092-.014.097-.015.092-.013.102-.013.091-.012.105-.012.09-.01.105-.01c.093-.01.186-.018.28-.024l.106-.008.09-.005.11-.006.093-.004.1-.004.097-.002.099-.002.197-.002z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/morph.svg b/src/icons/providers/morph.svg
new file mode 100644
index 000000000..2652fc29a
--- /dev/null
+++ b/src/icons/providers/morph.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.5586 6C17.4193 6.00005 18.1838 6.55068 18.4561 7.36719L19.5439 10.6328C19.8162 11.4493 20.5807 12 21.4414 12H26.5586C27.4193 12 28.1838 11.4493 28.4561 10.6328L29.5439 7.36719C29.8162 6.55068 30.5807 6.00005 31.4414 6H34.5586C35.4193 6.00005 36.1838 6.55068 36.4561 7.36719L37.6523 10.958C37.8686 11.6067 38.402 12.1008 39.0654 12.2666L44.4854 13.6211C45.3756 13.8438 46 14.6439 46 15.5615V32.4385C46 33.3561 45.3756 34.1562 44.4854 34.3789L39.0654 35.7334C38.402 35.8992 37.8686 36.3933 37.6523 37.042L36.4561 40.6328C36.1838 41.4493 35.4193 42 34.5586 42H31.4414C30.5807 42 29.8162 41.4493 29.5439 40.6328L28.8779 38.6328C28.4463 37.3379 29.4095 36.0003 30.7744 36H36C37.1046 36 38 35.1046 38 34V14C38 12.8954 37.1046 12 36 12H30C28.8954 12 28 12.8954 28 14V28C28 29.1046 27.1046 30 26 30H22C20.8954 30 20 29.1046 20 28V14C20 12.8954 19.1046 12 18 12H12C10.8954 12 10 12.8954 10 14V34C10 35.1046 10.8954 36 12 36H17.2256C18.5905 36.0003 19.5537 37.3379 19.1221 38.6328L18.4561 40.6328C18.1838 41.4493 17.4193 42 16.5586 42H13.4414C12.5807 42 11.8162 41.4493 11.5439 40.6328L10.3477 37.042C10.1314 36.3933 9.59795 35.8992 8.93457 35.7334L3.51465 34.3789C2.62444 34.1562 2.00001 33.3561 2 32.4385V15.5615C2.00001 14.6439 2.62444 13.8438 3.51465 13.6211L8.93457 12.2666C9.59795 12.1008 10.1314 11.6067 10.3477 10.958L11.5439 7.36719C11.8162 6.55068 12.5807 6.00005 13.4414 6H16.5586Z" fill="#99D52A"/>
+</svg>
diff --git a/src/icons/providers/nano-gpt.png b/src/icons/providers/nano-gpt.png
new file mode 100644
index 000000000..8607f2052
Binary files /dev/null and b/src/icons/providers/nano-gpt.png differ
diff --git a/src/icons/providers/nebius.svg b/src/icons/providers/nebius.svg
new file mode 100644
index 000000000..4d55b7bf0
--- /dev/null
+++ b/src/icons/providers/nebius.svg
@@ -0,0 +1 @@
+<svg fill="none" height="96" viewBox="0 0 96 96" width="96" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="a"><path d="m0 0h96v96h-96z"/></clipPath><mask id="b" height="96" maskUnits="userSpaceOnUse" width="96" x="0" y="0"><path d="m96 0h-96v96h96z" fill="#fff"/></mask><g clip-path="url(#a)"><g mask="url(#b)"><path d="m96 0h-96v96h96z" fill="#daff33"/><path clip-rule="evenodd" d="m46.3331 27.4668 12.243 33.8335c4.0549 9.1563 9.2098 6.3939 9.2098 6.3939 0 4.0685-3.2659 7.8683-8.0338 7.8683-4.7678 0-7.4679-2.9684-9.5229-7.5796l-12.2487-33.8336c-4.0536-8.8496-9.7663-6.0873-9.8787-6.032.0607-.0018.0929-.0018.0929-.0018l.0083 44.5261h-10.0072l-.0083-34.6309c0-9.3288 8.8962-9.8628 9.9143-9.8934.0004-4.068 3.2587-7.8673 8.0321-7.8673 4.7737 0 8.1385 2.5999 10.1992 7.2168zm21.464-4.2986.0082 44.526s10.0072 0 10.0072-9.8951l-.0082-34.6309z" fill="#052b42" fill-rule="evenodd"/></g></g></svg>
\ No newline at end of file
diff --git a/src/icons/providers/newapi.png b/src/icons/providers/newapi.png
new file mode 100644
index 000000000..f62bfd57f
Binary files /dev/null and b/src/icons/providers/newapi.png differ
diff --git a/src/icons/providers/novita.svg b/src/icons/providers/novita.svg
new file mode 100644
index 000000000..353f00777
--- /dev/null
+++ b/src/icons/providers/novita.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Novita AI</title><path clip-rule="evenodd" d="M9.167 4.17v5.665L0 19.003h9.167v-5.666l5.666 5.666H24L9.167 4.17z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/ollama.svg b/src/icons/providers/ollama.svg
index b168cafa5..cc887e3dc 100644
--- a/src/icons/providers/ollama.svg
+++ b/src/icons/providers/ollama.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Ollama</title><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c3.86 0 7 3.14 7 7s-3.14 7-7 7-7-3.14-7-7 3.14-7 7-7zm0 2.5a4.5 4.5 0 100 9 4.5 4.5 0 000-9z"/></svg>
\ No newline at end of file
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Ollama</title><path d="M7.905 1.09c.216.085.411.225.588.41.295.306.544.744.734 1.263.191.522.315 1.1.362 1.68a5.054 5.054 0 012.049-.636l.051-.004c.87-.07 1.73.087 2.48.474.101.053.2.11.297.17.05-.569.172-1.134.36-1.644.19-.52.439-.957.733-1.264a1.67 1.67 0 01.589-.41c.257-.1.53-.118.796-.042.401.114.745.368 1.016.737.248.337.434.769.561 1.287.23.934.27 2.163.115 3.645l.053.04.026.019c.757.576 1.284 1.397 1.563 2.35.435 1.487.216 3.155-.534 4.088l-.018.021.002.003c.417.762.67 1.567.724 2.4l.002.03c.064 1.065-.2 2.137-.814 3.19l-.007.01.01.024c.472 1.157.62 2.322.438 3.486l-.006.039a.651.651 0 01-.747.536.648.648 0 01-.54-.742c.167-1.033.01-2.069-.48-3.123a.643.643 0 01.04-.617l.004-.006c.604-.924.854-1.83.8-2.72-.046-.779-.325-1.544-.8-2.273a.644.644 0 01.18-.886l.009-.006c.243-.159.467-.565.58-1.12a4.229 4.229 0 00-.095-1.974c-.205-.7-.58-1.284-1.105-1.683-.595-.454-1.383-.673-2.38-.61a.653.653 0 01-.632-.371c-.314-.665-.772-1.141-1.343-1.436a3.288 3.288 0 00-1.772-.332c-1.245.099-2.343.801-2.67 1.686a.652.652 0 01-.61.425c-1.067.002-1.893.252-2.497.703-.522.39-.878.935-1.066 1.588a4.07 4.07 0 00-.068 1.886c.112.558.331 1.02.582 1.269l.008.007c.212.207.257.53.109.785-.36.622-.629 1.549-.673 2.44-.05 1.018.186 1.902.719 2.536l.016.019a.643.643 0 01.095.69c-.576 1.236-.753 2.252-.562 3.052a.652.652 0 01-1.269.298c-.243-1.018-.078-2.184.473-3.498l.014-.035-.008-.012a4.339 4.339 0 01-.598-1.309l-.005-.019a5.764 5.764 0 01-.177-1.785c.044-.91.278-1.842.622-2.59l.012-.026-.002-.002c-.293-.418-.51-.953-.63-1.545l-.005-.024a5.352 5.352 0 01.093-2.49c.262-.915.777-1.701 1.536-2.269.06-.045.123-.09.186-.132-.159-1.493-.119-2.73.112-3.67.127-.518.314-.95.562-1.287.27-.368.614-.622 1.015-.737.266-.076.54-.059.797.042zm4.116 9.09c.936 0 1.8.313 2.446.855.63.527 1.005 1.235 1.005 1.94 0 .888-.406 1.58-1.133 2.022-.62.375-1.451.557-2.403.557-1.009 0-1.871-.259-2.493-.734-.617-.47-.963-1.13-.963-1.845 0-.707.398-1.417 1.056-1.946.668-.537 1.55-.849 2.485-.849zm0 .896a3.07 3.07 0 00-1.916.65c-.461.37-.722.835-.722 1.25 0 .428.21.829.61 1.134.455.347 1.124.548 1.943.548.799 0 1.473-.147 1.932-.426.463-.28.7-.686.7-1.257 0-.423-.246-.89-.683-1.256-.484-.405-1.14-.643-1.864-.643zm.662 1.21l.004.004c.12.151.095.37-.056.49l-.292.23v.446a.375.375 0 01-.376.373.375.375 0 01-.376-.373v-.46l-.271-.218a.347.347 0 01-.052-.49.353.353 0 01.494-.051l.215.172.22-.174a.353.353 0 01.49.051zm-5.04-1.919c.478 0 .867.39.867.871a.87.87 0 01-.868.871.87.87 0 01-.867-.87.87.87 0 01.867-.872zm8.706 0c.48 0 .868.39.868.871a.87.87 0 01-.868.871.87.87 0 01-.867-.87.87.87 0 01.867-.872zM7.44 2.3l-.003.002a.659.659 0 00-.285.238l-.005.006c-.138.189-.258.467-.348.832-.17.692-.216 1.631-.124 2.782.43-.128.899-.208 1.404-.237l.01-.001.019-.034c.046-.082.095-.161.148-.239.123-.771.022-1.692-.253-2.444-.134-.364-.297-.65-.453-.813a.628.628 0 00-.107-.09L7.44 2.3zm9.174.04l-.002.001a.628.628 0 00-.107.09c-.156.163-.32.45-.453.814-.29.794-.387 1.776-.23 2.572l.058.097.008.014h.03a5.184 5.184 0 011.466.212c.086-1.124.038-2.043-.128-2.722-.09-.365-.21-.643-.349-.832l-.004-.006a.659.659 0 00-.285-.239h-.004z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/opencode.png b/src/icons/providers/opencode.png
new file mode 100644
index 000000000..15266d28f
Binary files /dev/null and b/src/icons/providers/opencode.png differ
diff --git a/src/icons/providers/ovhcloud.svg b/src/icons/providers/ovhcloud.svg
new file mode 100644
index 000000000..8e80d0eb8
--- /dev/null
+++ b/src/icons/providers/ovhcloud.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>OVH</title><path d="M19.881 10.095l2.563-4.45C23.434 7.389 24 9.404 24 11.555c0 2.88-1.017 5.523-2.71 7.594h-6.62l2.04-3.541h-2.696l3.176-5.513h2.691zm-2.32-5.243L9.333 19.14l.003.009H2.709C1.014 17.077 0 14.435 0 11.555c0-2.152.57-4.17 1.561-5.918L5.855 13.1 10.6 4.852h6.961z"/></svg>
\ No newline at end of file
diff --git a/src/icons/providers/perplexity.svg b/src/icons/providers/perplexity.svg
index 0cf14ee4f..5f5a5ab5c 100644
--- a/src/icons/providers/perplexity.svg
+++ b/src/icons/providers/perplexity.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Perplexity</title><path d="M12 2L2 7v10l10 5 10-5V7L12 2zm0 2.18l7.09 3.54L12 11.27 4.91 7.72 12 4.18zM4 9.27l7 3.5v7.05l-7-3.5V9.27zm9 10.55v-7.05l7-3.5v7.05l-7 3.5z"/></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Perplexity</title><path d="M19.785 0v7.272H22.5V17.62h-2.935V24l-7.037-6.194v6.145h-1.091v-6.152L4.392 24v-6.465H1.5V7.188h2.884V0l7.053 6.494V.19h1.09v6.49L19.786 0zm-7.257 9.044v7.319l5.946 5.234V14.44l-5.946-5.397zm-1.099-.08l-5.946 5.398v7.235l5.946-5.234V8.965zm8.136 7.58h1.844V8.349H13.46l6.105 5.54v2.655zm-8.982-8.28H2.59v8.195h1.8v-2.576l6.192-5.62zM5.475 2.476v4.71h5.115l-5.115-4.71zm13.219 0l-5.115 4.71h5.115v-4.71z" fill="#22B8CD" fill-rule="nonzero"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/ppio.svg b/src/icons/providers/ppio.svg
index 5d964bfc6..988fc6e86 100644
--- a/src/icons/providers/ppio.svg
+++ b/src/icons/providers/ppio.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>PPIO</title><path d="M12 2L2 7v10l10 5 10-5V7L12 2zm0 2.18l7.09 3.54L12 11.27 4.91 7.72 12 4.18z"/></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>PPIO</title><path clip-rule="evenodd" d="M12.002 0C5.377 0 0 5.37 0 11.994c0 3.266 1.309 6.232 3.43 8.395v-8.383c0-2.288.893-4.447 2.51-6.063a8.513 8.513 0 016.066-2.509h.07l-.074.008c4.735 0 8.575 3.84 8.575 8.571 0 .413-.03.818-.087 1.219l-4.844-4.86A5.12 5.12 0 0012.01 6.87a5.126 5.126 0 00-3.637 1.503 5.107 5.107 0 00-1.507 3.641c0 1.376.536 2.666 1.507 3.64a5.12 5.12 0 003.637 1.504 5.126 5.126 0 003.637-1.503 5.114 5.114 0 001.496-3.348l2.842 2.853c-1.256 3.18-4.353 5.433-7.978 5.433-1.879 0-3.671-.6-5.145-1.714v3.967c1.56.742 3.3 1.155 5.137 1.155C18.623 24 24 18.63 24 12.006 24.008 5.373 18.635.004 12.006.004L12.002 0z" fill="#2874FF" fill-rule="evenodd"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/providers-icons.test.ts b/src/icons/providers/providers-icons.test.ts
index cc4d4e3b7..f784ed9e4 100644
--- a/src/icons/providers/providers-icons.test.ts
+++ b/src/icons/providers/providers-icons.test.ts
@@ -10,6 +10,9 @@
 import { describe, expect } from "vitest";
 import { test } from "@fast-check/vitest";
 import * as fc from "fast-check";
+import fs from "node:fs";
+import path from "node:path";
+import process from "node:process";
 import { getSystemProviderIds } from "@/lib/config/providers";
 import type { SystemProviderId } from "@/lib/types/provider";
 import {
@@ -21,6 +24,11 @@ import {
 import { iconComponents } from "./index";
 
 describe("Provider 图标系统", () => {
+  const resourceProviderIds = fs
+    .readdirSync(path.join(process.cwd(), "src-tauri/resources/models/providers"))
+    .filter((fileName) => fileName.endsWith(".json"))
+    .map((fileName) => fileName.replace(/\.json$/, ""));
+
   /**
    * Property 19: Provider 图标完整性
    *
@@ -72,6 +80,27 @@ describe("Provider 图标系统", () => {
     );
   });
 
+  describe("模型资源 Provider 图标完整性", () => {
+    test.prop([fc.constantFrom(...resourceProviderIds)])(
+      "每个模型资源 Provider 应有图标映射",
+      (providerId: string) => {
+        const iconName = providerTypeToIcon[providerId];
+
+        expect(iconName).toBeDefined();
+        expect((availableIcons as readonly string[]).includes(iconName)).toBe(
+          true,
+        );
+      },
+    );
+
+    test.prop([fc.constantFrom(...resourceProviderIds)])(
+      "每个模型资源 Provider 应命中可渲染图标",
+      (providerId: string) => {
+        expect(hasProviderIcon(providerId)).toBe(true);
+      },
+    );
+  });
+
   describe("图标映射一致性", () => {
     test("所有可用图标应有对应的组件", () => {
       for (const iconName of availableIcons) {
diff --git a/src/icons/providers/qwen.svg b/src/icons/providers/qwen.svg
index e08c13e02..e1199f828 100644
--- a/src/icons/providers/qwen.svg
+++ b/src/icons/providers/qwen.svg
@@ -1 +1 @@
-<svg height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><path d="M12.604 1.34c.393.69.784 1.382 1.174 2.075a.18.18 0 00.157.091h5.552c.174 0 .322.11.446.327l1.454 2.57c.19.337.24.478.024.837-.26.43-.513.864-.76 1.3l-.367.658c-.106.196-.223.28-.04.512l2.652 4.637c.172.301.111.494-.043.77-.437.785-.882 1.564-1.335 2.34-.159.272-.352.375-.68.37-.777-.016-1.552-.01-2.327.016a.099.099 0 00-.081.05 575.097 575.097 0 01-2.705 4.74c-.169.293-.38.363-.725.364-.997.003-2.002.004-3.017.002a.537.537 0 01-.465-.271l-1.335-2.323a.09.09 0 00-.083-.049H4.982c-.285.03-.553-.001-.805-.092l-1.603-2.77a.543.543 0 01-.002-.54l1.207-2.12a.198.198 0 000-.197 550.951 550.951 0 01-1.875-3.272l-.79-1.395c-.16-.31-.173-.496.095-.965.465-.813.927-1.625 1.387-2.436.132-.234.304-.334.584-.335a338.3 338.3 0 012.589-.001.124.124 0 00.107-.063l2.806-4.895a.488.488 0 01.422-.246c.524-.001 1.053 0 1.583-.006L11.704 1c.341-.003.724.032.9.34zm-3.432.403a.06.06 0 00-.052.03L6.254 6.788a.157.157 0 01-.135.078H3.253c-.056 0-.07.025-.041.074l5.81 10.156c.025.042.013.062-.034.063l-2.795.015a.218.218 0 00-.2.116l-1.32 2.31c-.044.078-.021.118.068.118l5.716.008c.046 0 .08.02.104.061l1.403 2.454c.046.081.092.082.139 0l5.006-8.76.783-1.382a.055.055 0 01.096 0l1.424 2.53a.122.122 0 00.107.062l2.763-.02a.04.04 0 00.035-.02.041.041 0 000-.04l-2.9-5.086a.108.108 0 010-.113l.293-.507 1.12-1.977c.024-.041.012-.062-.035-.062H9.2c-.059 0-.073-.026-.043-.077l1.434-2.505a.107.107 0 000-.114L9.225 1.774a.06.06 0 00-.053-.031zm6.29 8.02c.046 0 .058.02.034.06l-.832 1.465-2.613 4.585a.056.056 0 01-.05.029.058.058 0 01-.05-.029L8.498 9.841c-.02-.034-.01-.052.028-.054l.216-.012 6.722-.012z" fill="url(#qwen-fill)" fill-rule="nonzero"></path><defs><linearGradient id="qwen-fill" x1="0%" x2="100%" y1="0%" y2="0%"><stop offset="0%" stop-color="#6336E7" stop-opacity=".84"></stop><stop offset="100%" stop-color="#6F69F7" stop-opacity=".84"></stop></linearGradient></defs></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Qwen</title><defs><linearGradient id="lobe-icons-qwen-fill" x1="0%" x2="100%" y1="0%" y2="0%"><stop offset="0%" stop-color="#00055F" stop-opacity=".84"></stop><stop offset="100%" stop-color="#6F69F7" stop-opacity=".84"></stop></linearGradient></defs><path d="M12.604 1.34c.393.69.784 1.382 1.174 2.075a.18.18 0 00.157.091h5.552c.174 0 .322.11.446.327l1.454 2.57c.19.337.24.478.024.837-.26.43-.513.864-.76 1.3l-.367.658c-.106.196-.223.28-.04.512l2.652 4.637c.172.301.111.494-.043.77-.437.785-.882 1.564-1.335 2.34-.159.272-.352.375-.68.37-.777-.016-1.552-.01-2.327.016a.099.099 0 00-.081.05 575.097 575.097 0 01-2.705 4.74c-.169.293-.38.363-.725.364-.997.003-2.002.004-3.017.002a.537.537 0 01-.465-.271l-1.335-2.323a.09.09 0 00-.083-.049H4.982c-.285.03-.553-.001-.805-.092l-1.603-2.77a.543.543 0 01-.002-.54l1.207-2.12a.198.198 0 000-.197 550.951 550.951 0 01-1.875-3.272l-.79-1.395c-.16-.31-.173-.496.095-.965.465-.813.927-1.625 1.387-2.436.132-.234.304-.334.584-.335a338.3 338.3 0 012.589-.001.124.124 0 00.107-.063l2.806-4.895a.488.488 0 01.422-.246c.524-.001 1.053 0 1.583-.006L11.704 1c.341-.003.724.032.9.34zm-3.432.403a.06.06 0 00-.052.03L6.254 6.788a.157.157 0 01-.135.078H3.253c-.056 0-.07.025-.041.074l5.81 10.156c.025.042.013.062-.034.063l-2.795.015a.218.218 0 00-.2.116l-1.32 2.31c-.044.078-.021.118.068.118l5.716.008c.046 0 .08.02.104.061l1.403 2.454c.046.081.092.082.139 0l5.006-8.76.783-1.382a.055.055 0 01.096 0l1.424 2.53a.122.122 0 00.107.062l2.763-.02a.04.04 0 00.035-.02.041.041 0 000-.04l-2.9-5.086a.108.108 0 010-.113l.293-.507 1.12-1.977c.024-.041.012-.062-.035-.062H9.2c-.059 0-.073-.026-.043-.077l1.434-2.505a.107.107 0 000-.114L9.225 1.774a.06.06 0 00-.053-.031zm6.29 8.02c.046 0 .058.02.034.06l-.832 1.465-2.613 4.585a.056.056 0 01-.05.029.058.058 0 01-.05-.029L8.498 9.841c-.02-.034-.01-.052.028-.054l.216-.012 6.722-.012z" fill="url(#lobe-icons-qwen-fill)" fill-rule="nonzero"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/replicate.svg b/src/icons/providers/replicate.svg
new file mode 100644
index 000000000..48f148af2
--- /dev/null
+++ b/src/icons/providers/replicate.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Replicate</title><path d="M22 10.552v2.26h-7.932V22H11.54V10.552H22zM22 2v2.264H4.528V22H2V2h20zm0 4.276V8.54H9.296V22H6.768V6.276H22z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/requesty.ico b/src/icons/providers/requesty.ico
new file mode 100644
index 000000000..21bdef0da
Binary files /dev/null and b/src/icons/providers/requesty.ico differ
diff --git a/src/icons/providers/sap-ai-core.svg b/src/icons/providers/sap-ai-core.svg
new file mode 100644
index 000000000..9b032ccc6
--- /dev/null
+++ b/src/icons/providers/sap-ai-core.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>SAP</title><path d="M0 6.064v11.872h12.13L24 6.064zm3.264 2.208h.005c.863.001 1.915.245 2.676.633l-.82 1.43c-.835-.404-1.255-.442-1.73-.467-.708-.038-1.064.215-1.069.488-.007.332.669.633 1.305.838.964.306 2.19.715 2.377 1.9L7.77 8.437h2.046l2.064 5.576-.007-5.575h2.37c2.257 0 3.318.764 3.318 2.519 0 1.575-1.09 2.514-2.936 2.514h-.763l-.01 2.094-3.588-.003-.25-.908c-.37.122-.787.189-1.23.189-.456 0-.885-.071-1.263-.2l-.358.919-2 .006.09-.462c-.029.025-.057.05-.087.074-.535.43-1.208.629-2.037.644l-.213.002a5.075 5.075 0 0 1-2.581-.675l.73-1.448c.79.467 1.286.572 1.956.558.347-.007.598-.07.761-.239a.557.557 0 0 0 .156-.369c.007-.376-.53-.553-1.185-.756-.531-.164-1.135-.389-1.606-.735-.559-.41-.825-.924-.812-1.65a1.99 1.99 0 0 1 .566-1.377c.519-.537 1.357-.863 2.363-.863zm10.597 1.67v1.904h.521c.694 0 1.247-.23 1.248-.964 0-.709-.554-.94-1.248-.94zm-5.087.767l-.748 2.362c.223.085.481.133.757.133.268 0 .52-.047.742-.126l-.736-2.37z"/></svg>
\ No newline at end of file
diff --git a/src/icons/providers/scaleway.svg b/src/icons/providers/scaleway.svg
new file mode 100644
index 000000000..054f2c010
--- /dev/null
+++ b/src/icons/providers/scaleway.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Scaleway</title><path d="M16.605 11.11v5.72a1.77 1.77 0 01-1.54 1.69h-4a1.43 1.43 0 01-1.31-1.22 1.09 1.09 0 010-.18 1.37 1.37 0 011.37-1.36h1.74a1 1 0 001-1v-3.62a1.4 1.4 0 011.18-1.39h.17a1.37 1.37 0 011.39 1.36zm-6.46 1.74V9.26a1 1 0 011-1h1.85a1.37 1.37 0 001.37-1.37 1 1 0 000-.17 1.45 1.45 0 00-1.41-1.2h-3.96a1.81 1.81 0 00-1.58 1.66v5.7a1.37 1.37 0 001.37 1.37h.21a1.4 1.4 0 001.15-1.4zm12-4.29V20a4.53 4.53 0 01-4.15 4h-7.58a8.57 8.57 0 01-8.56-8.57V4.54A4.54 4.54 0 016.395 0h7.18a8.56 8.56 0 018.56 8.56zm-2.74 0a5.83 5.83 0 00-5.82-5.82h-7.19a1.79 1.79 0 00-1.8 1.8v10.89a5.83 5.83 0 005.82 5.8h7.44a1.79 1.79 0 001.54-1.48z"/></svg>
\ No newline at end of file
diff --git a/src/icons/providers/stepfun.svg b/src/icons/providers/stepfun.svg
index cfb4786a5..70989521a 100644
--- a/src/icons/providers/stepfun.svg
+++ b/src/icons/providers/stepfun.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>阶跃星辰 (StepFun)</title><path d="M12 2l2.4 7.2H22l-6 4.8 2.4 7.2L12 16.4l-6.4 4.8 2.4-7.2-6-4.8h7.6L12 2z"/></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Stepfun</title><path d="M22.012 0h1.032v.927H24v.968h-.956V3.78h-1.032V1.896h-1.878v-.97h1.878V0zM2.6 12.371V1.87h.969v10.502h-.97zm10.423.66h10.95v.918h-6.208v9.579h-4.742V13.03zM5.629 3.333v12.356H0v4.51h10.386V8L20.859 8l-.003-4.668-15.227.001z" fill="url(#lobe-icons-stepfun-fill)" fill-rule="evenodd"></path><defs><linearGradient gradientUnits="userSpaceOnUse" id="lobe-icons-stepfun-fill" x1="1.646" x2="18.342" y1="1.916" y2="22.091"><stop stop-color="#01A9FF"></stop><stop offset="1" stop-color="#0160FF"></stop></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/src/icons/providers/submodel.ico b/src/icons/providers/submodel.ico
new file mode 100644
index 000000000..d2cab1ca7
Binary files /dev/null and b/src/icons/providers/submodel.ico differ
diff --git a/src/icons/providers/synthetic.svg b/src/icons/providers/synthetic.svg
new file mode 100644
index 000000000..66071fe20
--- /dev/null
+++ b/src/icons/providers/synthetic.svg
@@ -0,0 +1,23 @@
+<svg width="270" height="270" viewBox="-27 -27 324 324" fill="none" xmlns="http://www.w3.org/2000/svg">
+<style>
+  path { fill: #1F1F1B; }
+  @media (prefers-color-scheme: dark) { path { fill: #FFFFFF; } }
+</style>
+<g clip-path="url(#clip0_242_32)">
+<path d="M148.962 46.5513H270V37.2434H148.962V27.9355H0V46.5513H148.962Z"/>
+<path d="M139.654 148.962H111.718V158.282H139.654H146.57H270V139.654H139.654V148.962Z"/>
+<path d="M139.654 176.897H83.7947V186.205H139.654H148.358H270V167.589H139.654V176.897Z"/>
+<path d="M93.1026 65.1671V55.8593H0V74.4869H83.7947H93.1026H270V65.1671H93.1026Z"/>
+<path d="M204.821 18.6158H270V9.30789H204.821V0H0V18.6158H186.205H204.821Z"/>
+<path d="M121.038 232.757H0V242.065H121.038H270V223.449H121.038V232.757Z"/>
+<path d="M176.897 204.833H0V214.141H176.897H270V195.513H176.897V204.833Z"/>
+<path d="M65.1671 260.692H0V270H65.1671H83.7947H270V251.384H65.1671V260.692Z"/>
+<path d="M130.346 102.41H158.27V93.1026H130.346V83.7947H0V102.41H130.346Z"/>
+<path d="M130.346 130.346H186.205V121.038H130.346V111.718H0V130.346H130.346Z"/>
+</g>
+<defs>
+<clipPath id="clip0_242_32">
+<rect width="270" height="270" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/icons/providers/together.svg b/src/icons/providers/together.svg
index 7fae344e4..a853e78af 100644
--- a/src/icons/providers/together.svg
+++ b/src/icons/providers/together.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Together</title><path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"/></svg>
\ No newline at end of file
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>together.ai</title><g><path d="M17.385 11.23a4.615 4.615 0 100-9.23 4.615 4.615 0 000 9.23zm0 10.77a4.615 4.615 0 100-9.23 4.615 4.615 0 000 9.23zm-10.77 0a4.615 4.615 0 100-9.23 4.615 4.615 0 000 9.23z" opacity=".2"></path><circle cx="6.615" cy="6.615" fill="#0F6FFF" r="4.615"></circle></g></svg>
\ No newline at end of file
diff --git a/src/icons/providers/upstage.svg b/src/icons/providers/upstage.svg
new file mode 100644
index 000000000..fbe5b229f
--- /dev/null
+++ b/src/icons/providers/upstage.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Upsate</title><path d="M19.763 0l-.373 1.297h2.594L22.354 0h-2.591z"></path><path d="M16.192 2.27l-.376 1.298h5.52l.37-1.298h-5.514z"></path><path d="M12.897 4.54l-.377 1.298h8.167l.37-1.297h-8.16z"></path><path d="M2.85 6.81l-.377 1.298h17.565l.37-1.297H2.85z"></path><path d="M3.884 9.081l-.376 1.297H19.39l.37-1.297H3.883z"></path><path d="M4.088 24l.376-1.297H1.866L1.5 24h2.588z"></path><path d="M7.662 21.73l.376-1.298H2.515L2.15 21.73h5.513z"></path><path d="M10.957 19.46l.377-1.298h-8.17l-.367 1.297h8.16z"></path><path d="M21.005 17.19l.376-1.298H3.812l-.366 1.297h17.559z"></path><path d="M19.967 14.919l.376-1.297H4.461l-.366 1.297h15.872z"></path><path d="M18.787 12.649l.376-1.298H4.26l-.366 1.298h14.893z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/utils.ts b/src/icons/providers/utils.ts
index 642e6c96a..56003d60c 100644
--- a/src/icons/providers/utils.ts
+++ b/src/icons/providers/utils.ts
@@ -15,19 +15,43 @@ import type { SystemProviderId } from "@/lib/types/provider";
 
 /**
  * 可用的图标名称列表
- * 这些图标在 providers 目录下有对应的 SVG 文件
+ * 这些图标在 providers 目录下有对应的资源文件
  */
 export const availableIcons = [
   // 现有图标
   "aws",
   "gemini",
   "anthropic",
+  "abacus",
+  "ai21",
   "claude",
+  "baseten",
+  "chutes",
+  "comfyui",
+  "cortecs",
   "qwen",
+  "deepinfra",
   "google",
+  "fal",
+  "fastrouter",
+  "friendli",
+  "higress",
+  "helicone",
+  "inference",
+  "inception",
+  "io-net",
+  "lucidquery",
+  "morph",
+  "nebius",
+  "nano-gpt",
   "openai",
+  "opencode",
+  "ovhcloud",
   "alibaba",
   "copilot",
+  "requesty",
+  "sap-ai-core",
+  "scaleway",
   "amp",
   "kiro",
   "deepseek",
@@ -36,9 +60,14 @@ export const availableIcons = [
   "minimax",
   "doubao",
   "azure",
+  "cloudflare",
   "antigravity",
   "lime",
   "lime-hub",
+  "meta",
+  "upstage",
+  "v0",
+  "zai",
   // 新增图标
   "perplexity",
   "moonshot",
@@ -81,13 +110,22 @@ export const availableIcons = [
   "longcat",
   "alayanew",
   "aionly",
+  "novita",
   "ocoolai",
   "vercel",
   "poe",
+  "replicate",
+  "submodel",
+  "zenmux",
   "newapi",
   "huggingface",
+  "synthetic",
+  "venice",
+  "vultr",
+  "wandb",
   "lmstudio",
   "ollama",
+  "vllm",
   "dashscope",
   "jina",
   "gpustack",
@@ -117,14 +155,16 @@ export const providerTypeToIcon: Record<string, string> = {
   antigravity: "antigravity",
   openai: "openai",
   claude: "claude",
-  anthropic: "claude",
-  "anthropic-compatible": "claude", // Anthropic 兼容格式使用 Claude 图标
+  anthropic: "anthropic",
+  "anthropic-compatible": "anthropic",
   codex: "openai",
   claude_oauth: "claude",
   iflow: "alibaba",
+  iflowcn: "alibaba",
   amp: "amp",
   google: "google",
   alibaba: "alibaba",
+  "alibaba-cn": "alibaba",
   copilot: "copilot",
   aws: "aws",
   lime: "lime",
@@ -135,6 +175,7 @@ export const providerTypeToIcon: Record<string, string> = {
   deepseek: "deepseek",
   moonshot: "moonshot",
   moonshotai: "moonshot",
+  "moonshotai-cn": "moonshot",
   groq: "groq",
   grok: "grok",
   xai: "grok",
@@ -151,6 +192,7 @@ export const providerTypeToIcon: Record<string, string> = {
   doubao: "doubao",
   volcengine: "doubao",
   minimax: "minimax",
+  "minimax-cn": "minimax",
   yi: "yi",
   zeroone: "yi",
   hunyuan: "hunyuan",
@@ -167,6 +209,10 @@ export const providerTypeToIcon: Record<string, string> = {
   xiaomimimo: "mimo",
   zhinao: "zhinao",
   ai360: "zhinao",
+  bailing: "custom",
+  zai: "zai",
+  "zai-coding-plan": "zai",
+  "zhipuai-coding-plan": "zhipu",
   giteeai: "dashscope",
   internlm: "dashscope",
   sensenova: "dashscope",
@@ -177,14 +223,23 @@ export const providerTypeToIcon: Record<string, string> = {
   "azure-openai": "azure",
   azure: "azure",
   azureai: "azure",
+  "azure-cognitive-services": "azure",
   vertexai: "vertexai",
   "google-vertex": "vertexai",
+  "google-vertex-anthropic": "vertexai",
   "aws-bedrock": "bedrock",
   "amazon-bedrock": "bedrock",
   github: "github",
   "github-models": "github",
   "github-copilot": "copilot",
-  cloudflare: "vercel",
+  cloudflare: "cloudflare",
+  "cloudflare-ai-gateway": "cloudflare",
+  "cloudflare-workers-ai": "cloudflare",
+  vercel: "vercel",
+  v0: "v0",
+  upstage: "upstage",
+  meta: "meta",
+  llama: "meta",
 
   // ===== API 聚合服务 =====
   silicon: "silicon",
@@ -220,31 +275,55 @@ export const providerTypeToIcon: Record<string, string> = {
   huggingface: "huggingface",
   "vercel-gateway": "vercel",
   vercelaigateway: "vercel",
-  ai21: "openai",
-  akashchat: "openai",
-  bfl: "openai",
-  cometapi: "openai",
-  fal: "openai",
-  nebius: "openai",
-  novita: "openai",
-  replicate: "openai",
-  sambanova: "openai",
-  search1api: "openai",
-  upstage: "openai",
-  v0: "vercel",
-  zenmux: "openai",
+  abacus: "abacus",
+  ai21: "ai21",
+  akashchat: "custom",
+  baseten: "baseten",
+  bfl: "custom",
+  chutes: "chutes",
+  cometapi: "custom",
+  cortecs: "cortecs",
+  deepinfra: "deepinfra",
+  fal: "fal",
+  fastrouter: "fastrouter",
+  friendli: "friendli",
+  helicone: "helicone",
+  inception: "inception",
+  inference: "inference",
+  "io-net": "io-net",
+  "kimi-for-coding": "kimi",
+  lucidquery: "lucidquery",
+  morph: "morph",
+  "nano-gpt": "nano-gpt",
+  nebius: "nebius",
+  novita: "novita",
+  opencode: "opencode",
+  ovhcloud: "ovhcloud",
+  requesty: "requesty",
+  replicate: "replicate",
+  "sap-ai-core": "sap-ai-core",
+  sambanova: "custom",
+  scaleway: "scaleway",
+  search1api: "custom",
+  submodel: "submodel",
+  synthetic: "synthetic",
+  venice: "venice",
+  vultr: "vultr",
+  wandb: "wandb",
+  zenmux: "zenmux",
 
   // ===== 本地服务 Provider =====
   ollama: "ollama",
   ollamacloud: "ollama",
+  "ollama-cloud": "ollama",
   lmstudio: "lmstudio",
   "new-api": "newapi",
   newapi: "newapi",
   gpustack: "gpustack",
   ovms: "ovms",
-  comfyui: "custom",
-  higress: "custom",
-  vllm: "custom",
+  comfyui: "comfyui",
+  higress: "higress",
+  vllm: "vllm",
   xinference: "custom",
 
   // ===== 专用服务 Provider =====
diff --git a/src/icons/providers/v0.svg b/src/icons/providers/v0.svg
new file mode 100644
index 000000000..97b812928
--- /dev/null
+++ b/src/icons/providers/v0.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>V0</title><path clip-rule="evenodd" d="M14.252 8.25h5.624c.088 0 .176.006.26.018l-5.87 5.87a1.889 1.889 0 01-.019-.265V8.25h-2.25v5.623a4.124 4.124 0 004.125 4.125h5.624v-2.25h-5.624c-.09 0-.179-.006-.265-.018l5.874-5.875a1.9 1.9 0 01.02.27v5.623H24v-5.624A4.124 4.124 0 0019.876 6h-5.624v2.25zM0 7.5v.006l7.686 9.788c.924 1.176 2.813.523 2.813-.973V7.5H8.25v6.87L2.856 7.5H0z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/venice.png b/src/icons/providers/venice.png
new file mode 100644
index 000000000..6843e5fe2
Binary files /dev/null and b/src/icons/providers/venice.png differ
diff --git a/src/icons/providers/vllm.svg b/src/icons/providers/vllm.svg
new file mode 100644
index 000000000..24eb15911
--- /dev/null
+++ b/src/icons/providers/vllm.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>vLLM</title><path d="M0 4.973h9.324V23L0 4.973z"></path><path d="M13.986 4.351L22.378 0l-6.216 23H9.324l4.662-18.649z"></path></svg>
\ No newline at end of file
diff --git a/src/icons/providers/vultr.svg b/src/icons/providers/vultr.svg
new file mode 100644
index 000000000..3748088d0
--- /dev/null
+++ b/src/icons/providers/vultr.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Vultr</title><path d="M8.36 2.172A1.194 1.194 0 007.348 1.6H1.2A1.2 1.2 0 000 2.8a1.211 1.211 0 00.182.64l11.6 18.4a1.206 1.206 0 002.035 0l3.075-4.874a1.229 1.229 0 00.182-.64 1.211 1.211 0 00-.182-.642zm10.349 8.68a1.206 1.206 0 002.035 0L21.8 9.178l2.017-3.2a1.211 1.211 0 00.183-.64 1.229 1.229 0 00-.183-.64l-1.6-2.526a1.206 1.206 0 00-1.016-.571h-6.148a1.2 1.2 0 00-1.201 1.2 1.143 1.143 0 00.188.64z"/></svg>
\ No newline at end of file
diff --git a/src/icons/providers/wandb.svg b/src/icons/providers/wandb.svg
new file mode 100644
index 000000000..4f42a27c7
--- /dev/null
+++ b/src/icons/providers/wandb.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Weights &amp; Biases</title><path d="M2.48 0a1.55 1.55 0 1 0 0 3.1 1.55 1.55 0 0 0 0-3.1zm19.04 0a1.55 1.55 0 1 0 0 3.101 1.55 1.55 0 0 0 0-3.101zM12 2.295a1.55 1.55 0 1 0 0 3.1 1.55 1.55 0 0 0 0-3.1zM2.48 5.272a2.48 2.48 0 1 0 0 4.96 2.48 2.48 0 0 0 0-4.96zm19.04 0a2.48 2.48 0 1 0 0 4.96 2.48 2.48 0 0 0 0-4.96zM12 8.496a1.55 1.55 0 1 0 0 3.1 1.55 1.55 0 0 0 0-3.1zm-9.52 3.907a1.55 1.55 0 1 0 0 3.1 1.55 1.55 0 0 0 0-3.1zm19.04 0a1.55 1.55 0 1 0 0 3.102 1.55 1.55 0 0 0 0-3.102zM12 13.767a2.48 2.48 0 1 0 0 4.962 2.48 2.48 0 0 0 0-4.962zm-9.52 3.907a2.48 2.48 0 1 0 .001 4.962 2.48 2.48 0 0 0 0-4.962zm19.04.93a1.55 1.55 0 1 0 0 3.102 1.55 1.55 0 0 0 0-3.101zM12 20.9a1.55 1.55 0 1 0 0 3.1 1.55 1.55 0 0 0 0-3.1Z"/></svg>
\ No newline at end of file
diff --git a/src/icons/providers/yi.svg b/src/icons/providers/yi.svg
index 5495e123a..c73b642db 100644
--- a/src/icons/providers/yi.svg
+++ b/src/icons/providers/yi.svg
@@ -1 +1 @@
-<svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>零一万物 (Yi)</title><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5 0-4.71-1.28-6-3.22.03-1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08-1.29 1.94-3.5 3.22-6 3.22z"/></svg>
\ No newline at end of file
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Yi</title><g><path d="M18.62 13.927c.611 0 1.107.505 1.107 1.128v5.817c0 .623-.496 1.128-1.108 1.128a1.118 1.118 0 01-1.108-1.128v-5.817c0-.623.496-1.128 1.108-1.128zM16.59 3.052a1.094 1.094 0 011.562-.129c.466.404.522 1.116.126 1.59l-5.938 7.111v9.147c0 .624-.496 1.129-1.108 1.129a1.118 1.118 0 01-1.108-1.129v-9.477l.003-.088.01-.087c.015-.232.102-.462.261-.654l6.192-7.413zM2.906 2.256a1.094 1.094 0 011.559.157l4.387 5.45a1.142 1.142 0 01-.155 1.587 1.094 1.094 0 01-1.559-.157l-4.387-5.45a1.144 1.144 0 01.06-1.498l.095-.09z"></path><ellipse cx="20.146" cy="10.692" fill="#00FF25" rx="1.354" ry="1.379"></ellipse></g></svg>
\ No newline at end of file
diff --git a/src/icons/providers/zai.svg b/src/icons/providers/zai.svg
new file mode 100644
index 000000000..24ea3f064
--- /dev/null
+++ b/src/icons/providers/zai.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+  <style>
+    .bg { fill: #2D2D2D; }
+    .fg { fill: #FFFFFF; }
+  </style>
+  <path class="bg" d="M30,30H0V0h30V30z"/>
+  <path class="fg" d="M15.47,7.1l-1.3,1.85c-0.2,0.29-0.54,0.47-0.9,0.47h-7.1V7.09C6.16,7.1,15.47,7.1,15.47,7.1z"/>
+  <polygon class="fg" points="24.3,7.1 13.14,22.91 5.7,22.91 16.86,7.1"/>
+  <path class="fg" d="M14.53,22.91l1.31-1.86c0.2-0.29,0.54-0.47,0.9-0.47h7.09v2.33H14.53z"/>
+</svg>
diff --git a/src/icons/providers/zenmux.svg b/src/icons/providers/zenmux.svg
new file mode 100644
index 000000000..dc7f7edfb
--- /dev/null
+++ b/src/icons/providers/zenmux.svg
@@ -0,0 +1,5 @@
+<svg width="160" height="160" xmlns="http://www.w3.org/2000/svg" fill="none">
+ <g>
+  <path stroke="null" id="svg_1" fill="black" d="m77.77641,0.42146c8.25008,-0.31709 24.94679,0.77406 38.30399,12.76765c10.95668,9.83841 14.73253,28.07814 12.17937,42.22111c-2.34107,12.96444 -7.85766,23.57181 -5.69622,33.3933c2.16028,9.82161 7.65832,14.66392 12.33467,16.69671c4.51873,1.96441 8.88564,1.37451 8.05468,5.10748c-0.83212,3.73181 -6.48199,5.10748 -10.60784,5.10748c-2.26226,0 -9.10352,-0.5899 -12.1388,-2.55432c-3.58694,-2.32137 -4.38661,-4.40168 -5.75185,-6.07404c-0.23179,-0.28394 -0.6409,-0.08692 -0.58643,0.27583c0.62235,4.1131 2.33759,11.09459 5.12023,15.42326c2.25183,3.5035 3.18247,6.05781 8.34094,10.37952c5.15963,4.32055 7.56908,8.24938 2.55316,11.03201c-4.45615,2.47087 -14.14262,-2.58561 -19.83884,-8.83928c-5.12753,-5.629 -8.69708,-12.57225 -10.10891,-17.08982c-0.75471,-2.41524 -1.5108,-6.57007 -2.26586,-9.96926c-0.09921,-0.44619 -0.71113,-0.37434 -0.72434,0.08344c-0.25068,8.64922 -1.61024,16.90903 -3.59795,25.76454c-1.43118,6.37536 -4.91092,14.14262 -8.05375,18.85722c-3.83229,5.74837 -9.52132,7.54242 -13.75009,5.97089c-3.38204,-1.25746 -0.98209,-5.53165 0,-9.23217c0.98221,-3.69936 2.94708,-11.4388 4.27025,-19.91765c1.19766,-7.67454 1.51463,-15.27144 0.98128,-22.46965c-0.03303,-0.43924 -0.70765,-0.50646 -0.84429,-0.08808c-1.10227,3.37601 -3.18003,8.97256 -4.69582,12.37639c-3.16149,7.09855 -5.50106,10.21379 -11.98339,17.67741c-5.82962,6.71378 -22.59621,16.20671 -24.74976,6.87603c-0.58932,-2.55316 2.49811,-3.67154 5.34541,-5.89324c4.27999,-3.33892 7.85661,-9.26462 11.24769,-16.49992c3.0449,-6.49705 4.59256,-12.78202 4.82933,-16.79429c0.02237,-0.38709 -0.46335,-0.53312 -0.68134,-0.21325c-1.40951,2.06756 -3.48507,4.86526 -5.77097,7.18547c-3.81861,3.87668 -8.05398,7.86693 -12.96571,9.82207c-7.89718,3.14306 -15.95046,0.98163 -15.36172,-4.71459c0.49209,-4.75748 5.80412,-3.77237 12.41684,-10.98681c6.4821,-7.07154 8.64215,-12.5726 9.03503,-18.66205c0.31384,-4.87163 -4.45186,-16.43398 -6.87452,-21.60682c-3.86312,-8.25019 -6.71795,-31.66462 4.9108,-46.75062c14.53551,-18.85687 32.01705,-18.46573 37.12476,-18.66193zm-22.67525,32.97562c-5.40822,0 -8.11251,4.15123 -8.11262,9.27157c0,5.12057 3.00468,9.27157 8.11262,9.27157c5.10794,0 8.11262,-4.151 8.11262,-9.27157c-0.00012,-5.12034 -2.7044,-9.27157 -8.11262,-9.27157zm44.03996,0c-5.40822,0 -8.11251,4.15123 -8.11262,9.27157c0,5.12057 3.00468,9.27157 8.11262,9.27157c5.10794,0 8.11274,-4.151 8.11274,-9.27157c0,-5.12034 -2.70452,-9.27157 -8.11274,-9.27157z" clip-rule="evenodd" fill-rule="evenodd"/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/providers/zhipu.svg b/src/icons/providers/zhipu.svg
index 36564d733..0c6e61cea 100644
--- a/src/icons/providers/zhipu.svg
+++ b/src/icons/providers/zhipu.svg
@@ -1 +1 @@
-<svg height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><path d="M11.991 23.503a.24.24 0 00-.244.248.24.24 0 00.244.249.24.24 0 00.245-.249.24.24 0 00-.22-.247l-.025-.001zM9.671 5.365a1.697 1.697 0 011.099 2.132l-.071.172-.016.04-.018.054c-.07.16-.104.32-.104.498-.035.71.47 1.279 1.186 1.314h.366c1.309.053 2.338 1.173 2.286 2.523-.052 1.332-1.152 2.38-2.478 2.327h-.174c-.715.018-1.274.64-1.239 1.368 0 .124.018.23.053.337.209.373.54.658.96.8.75.23 1.517-.125 1.9-.782l.018-.035c.402-.64 1.17-.96 1.92-.711.854.284 1.378 1.226 1.099 2.167a1.661 1.661 0 01-2.077 1.102 1.711 1.711 0 01-.907-.711l-.017-.035c-.2-.323-.463-.58-.851-.711l-.056-.018a1.646 1.646 0 00-1.954.746 1.66 1.66 0 01-1.065.764 1.677 1.677 0 01-1.989-1.279c-.209-.906.332-1.83 1.257-2.043a1.51 1.51 0 01.296-.035h.018c.68-.071 1.151-.622 1.116-1.333a1.307 1.307 0 00-.227-.693 2.515 2.515 0 01-.366-1.403 2.39 2.39 0 01.366-1.208c.14-.195.21-.444.227-.693.018-.71-.506-1.261-1.186-1.332l-.07-.018a1.43 1.43 0 01-.299-.07l-.05-.019a1.7 1.7 0 01-1.047-2.114 1.68 1.68 0 012.094-1.101zm-5.575 10.11c.26-.264.639-.367.994-.27.355.096.633.379.728.74.095.362-.007.748-.267 1.013-.402.41-1.053.41-1.455 0a1.062 1.062 0 010-1.482zm14.845-.294c.359-.09.738.024.992.297.254.274.344.665.237 1.025-.107.36-.396.634-.756.718-.551.128-1.1-.22-1.23-.781a1.05 1.05 0 01.757-1.26zm-.064-4.39c.314.32.49.753.49 1.206 0 .452-.176.886-.49 1.206-.315.32-.74.5-1.185.5-.444 0-.87-.18-1.184-.5a1.727 1.727 0 010-2.412 1.654 1.654 0 012.369 0zm-11.243.163c.364.484.447 1.128.218 1.691a1.665 1.665 0 01-2.188.923c-.855-.36-1.26-1.358-.907-2.228a1.68 1.68 0 011.33-1.038c.593-.08 1.183.169 1.547.652zm11.545-4.221c.368 0 .708.2.892.524.184.324.184.724 0 1.048a1.026 1.026 0 01-.892.524c-.568 0-1.03-.47-1.03-1.048 0-.579.462-1.048 1.03-1.048zm-14.358 0c.368 0 .707.2.891.524.184.324.184.724 0 1.048a1.026 1.026 0 01-.891.524c-.569 0-1.03-.47-1.03-1.048 0-.579.461-1.048 1.03-1.048zm10.031-1.475c.925 0 1.675.764 1.675 1.706s-.75 1.705-1.675 1.705-1.674-.763-1.674-1.705c0-.942.75-1.706 1.674-1.706zm-2.626-.684c.362-.082.653-.356.761-.718a1.062 1.062 0 00-.238-1.028 1.017 1.017 0 00-.996-.294c-.547.14-.881.7-.752 1.257.13.558.675.907 1.225.783zm0 16.876c.359-.087.644-.36.75-.72a1.062 1.062 0 00-.237-1.019 1.018 1.018 0 00-.985-.301 1.037 1.037 0 00-.762.717c-.108.361-.017.754.239 1.028.245.263.606.377.953.305l.043-.01zM17.19 3.5a.631.631 0 00.628-.64c0-.355-.279-.64-.628-.64a.631.631 0 00-.628.64c0 .355.28.64.628.64zm-10.38 0a.631.631 0 00.628-.64c0-.355-.28-.64-.628-.64a.631.631 0 00-.628.64c0 .355.279.64.628.64zm-5.182 7.852a.631.631 0 00-.628.64c0 .354.28.639.628.639a.63.63 0 00.627-.606l.001-.034a.62.62 0 00-.628-.64zm5.182 9.13a.631.631 0 00-.628.64c0 .355.279.64.628.64a.631.631 0 00.628-.64c0-.355-.28-.64-.628-.64zm10.38.018a.631.631 0 00-.628.64c0 .355.28.64.628.64a.631.631 0 00.628-.64c0-.355-.279-.64-.628-.64zm5.182-9.148a.631.631 0 00-.628.64c0 .354.279.639.628.639a.631.631 0 00.628-.64c0-.355-.28-.64-.628-.64zm-.384-4.992a.24.24 0 00.244-.249.24.24 0 00-.244-.249.24.24 0 00-.244.249c0 .142.122.249.244.249zM11.991.497a.24.24 0 00.245-.248A.24.24 0 0011.99 0a.24.24 0 00-.244.249c0 .133.108.236.223.247l.021.001zM2.011 6.36a.24.24 0 00.245-.249.24.24 0 00-.244-.249.24.24 0 00-.244.249.24.24 0 00.244.249zm0 11.263a.24.24 0 00-.243.248.24.24 0 00.244.249.24.24 0 00.244-.249.252.252 0 00-.244-.248zm19.995-.018a.24.24 0 00-.245.248.24.24 0 00.245.25.24.24 0 00.244-.25.252.252 0 00-.244-.248z" fill="#3859FF" fill-rule="nonzero"></path></svg>
\ No newline at end of file
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Zhipu</title><path d="M11.991 23.503a.24.24 0 00-.244.248.24.24 0 00.244.249.24.24 0 00.245-.249.24.24 0 00-.22-.247l-.025-.001zM9.671 5.365a1.697 1.697 0 011.099 2.132l-.071.172-.016.04-.018.054c-.07.16-.104.32-.104.498-.035.71.47 1.279 1.186 1.314h.366c1.309.053 2.338 1.173 2.286 2.523-.052 1.332-1.152 2.38-2.478 2.327h-.174c-.715.018-1.274.64-1.239 1.368 0 .124.018.23.053.337.209.373.54.658.96.8.75.23 1.517-.125 1.9-.782l.018-.035c.402-.64 1.17-.96 1.92-.711.854.284 1.378 1.226 1.099 2.167a1.661 1.661 0 01-2.077 1.102 1.711 1.711 0 01-.907-.711l-.017-.035c-.2-.323-.463-.58-.851-.711l-.056-.018a1.646 1.646 0 00-1.954.746 1.66 1.66 0 01-1.065.764 1.677 1.677 0 01-1.989-1.279c-.209-.906.332-1.83 1.257-2.043a1.51 1.51 0 01.296-.035h.018c.68-.071 1.151-.622 1.116-1.333a1.307 1.307 0 00-.227-.693 2.515 2.515 0 01-.366-1.403 2.39 2.39 0 01.366-1.208c.14-.195.21-.444.227-.693.018-.71-.506-1.261-1.186-1.332l-.07-.018a1.43 1.43 0 01-.299-.07l-.05-.019a1.7 1.7 0 01-1.047-2.114 1.68 1.68 0 012.094-1.101zm-5.575 10.11c.26-.264.639-.367.994-.27.355.096.633.379.728.74.095.362-.007.748-.267 1.013-.402.41-1.053.41-1.455 0a1.062 1.062 0 010-1.482zm14.845-.294c.359-.09.738.024.992.297.254.274.344.665.237 1.025-.107.36-.396.634-.756.718-.551.128-1.1-.22-1.23-.781a1.05 1.05 0 01.757-1.26zm-.064-4.39c.314.32.49.753.49 1.206 0 .452-.176.886-.49 1.206-.315.32-.74.5-1.185.5-.444 0-.87-.18-1.184-.5a1.727 1.727 0 010-2.412 1.654 1.654 0 012.369 0zm-11.243.163c.364.484.447 1.128.218 1.691a1.665 1.665 0 01-2.188.923c-.855-.36-1.26-1.358-.907-2.228a1.68 1.68 0 011.33-1.038c.593-.08 1.183.169 1.547.652zm11.545-4.221c.368 0 .708.2.892.524.184.324.184.724 0 1.048a1.026 1.026 0 01-.892.524c-.568 0-1.03-.47-1.03-1.048 0-.579.462-1.048 1.03-1.048zm-14.358 0c.368 0 .707.2.891.524.184.324.184.724 0 1.048a1.026 1.026 0 01-.891.524c-.569 0-1.03-.47-1.03-1.048 0-.579.461-1.048 1.03-1.048zm10.031-1.475c.925 0 1.675.764 1.675 1.706s-.75 1.705-1.675 1.705-1.674-.763-1.674-1.705c0-.942.75-1.706 1.674-1.706zm-2.626-.684c.362-.082.653-.356.761-.718a1.062 1.062 0 00-.238-1.028 1.017 1.017 0 00-.996-.294c-.547.14-.881.7-.752 1.257.13.558.675.907 1.225.783zm0 16.876c.359-.087.644-.36.75-.72a1.062 1.062 0 00-.237-1.019 1.018 1.018 0 00-.985-.301 1.037 1.037 0 00-.762.717c-.108.361-.017.754.239 1.028.245.263.606.377.953.305l.043-.01zM17.19 3.5a.631.631 0 00.628-.64c0-.355-.279-.64-.628-.64a.631.631 0 00-.628.64c0 .355.28.64.628.64zm-10.38 0a.631.631 0 00.628-.64c0-.355-.28-.64-.628-.64a.631.631 0 00-.628.64c0 .355.279.64.628.64zm-5.182 7.852a.631.631 0 00-.628.64c0 .354.28.639.628.639a.63.63 0 00.627-.606l.001-.034a.62.62 0 00-.628-.64zm5.182 9.13a.631.631 0 00-.628.64c0 .355.279.64.628.64a.631.631 0 00.628-.64c0-.355-.28-.64-.628-.64zm10.38.018a.631.631 0 00-.628.64c0 .355.28.64.628.64a.631.631 0 00.628-.64c0-.355-.279-.64-.628-.64zm5.182-9.148a.631.631 0 00-.628.64c0 .354.279.639.628.639a.631.631 0 00.628-.64c0-.355-.28-.64-.628-.64zm-.384-4.992a.24.24 0 00.244-.249.24.24 0 00-.244-.249.24.24 0 00-.244.249c0 .142.122.249.244.249zM11.991.497a.24.24 0 00.245-.248A.24.24 0 0011.99 0a.24.24 0 00-.244.249c0 .133.108.236.223.247l.021.001zM2.011 6.36a.24.24 0 00.245-.249.24.24 0 00-.244-.249.24.24 0 00-.244.249.24.24 0 00.244.249zm0 11.263a.24.24 0 00-.243.248.24.24 0 00.244.249.24.24 0 00.244-.249.252.252 0 00-.244-.248zm19.995-.018a.24.24 0 00-.245.248.24.24 0 00.245.25.24.24 0 00.244-.25.252.252 0 00-.244-.248z" fill="#3859FF" fill-rule="nonzero"></path></svg>
\ No newline at end of file
diff --git a/src/lib/api/companion.test.ts b/src/lib/api/companion.test.ts
new file mode 100644
index 000000000..f30884ae9
--- /dev/null
+++ b/src/lib/api/companion.test.ts
@@ -0,0 +1,89 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { safeInvoke, safeListen } from "@/lib/dev-bridge";
+import {
+  getCompanionPetStatus,
+  launchCompanionPet,
+  listenCompanionPetStatus,
+  sendCompanionPetCommand,
+} from "./companion";
+
+vi.mock("@/lib/dev-bridge", () => ({
+  safeInvoke: vi.fn(),
+  safeListen: vi.fn(),
+}));
+
+describe("companion API", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("应读取桌宠状态并代理命令", async () => {
+    vi.mocked(safeInvoke)
+      .mockResolvedValueOnce({
+        endpoint: "ws://127.0.0.1:45554/companion/pet",
+        server_listening: true,
+        connected: true,
+        client_id: "lime",
+        platform: "macos",
+        capabilities: ["bubble", "movement"],
+        last_event: "pet.ready",
+        last_error: null,
+        last_state: "walking",
+      })
+      .mockResolvedValueOnce({
+        launched: true,
+        resolved_path: "/Applications/Lime Pet.app/Contents/MacOS/Lime Pet",
+        endpoint: "ws://127.0.0.1:45554/companion/pet",
+        message: null,
+      })
+      .mockResolvedValueOnce({
+        delivered: true,
+        connected: true,
+      });
+
+    await expect(getCompanionPetStatus()).resolves.toEqual(
+      expect.objectContaining({
+        connected: true,
+        client_id: "lime",
+      }),
+    );
+    await expect(
+      launchCompanionPet({ app_path: "/Applications/Lime Pet.app" }),
+    ).resolves.toEqual(expect.objectContaining({ launched: true }));
+    await expect(
+      sendCompanionPetCommand({
+        event: "pet.show_bubble",
+        payload: { text: "你好" },
+      }),
+    ).resolves.toEqual({ delivered: true, connected: true });
+  });
+
+  it("应代理桌宠状态监听", async () => {
+    vi.mocked(safeListen).mockImplementationOnce(async (_event, handler) => {
+      handler({
+        payload: {
+          endpoint: "ws://127.0.0.1:45554/companion/pet",
+          server_listening: true,
+          connected: false,
+          client_id: null,
+          platform: null,
+          capabilities: [],
+          last_event: "pet.disconnected",
+          last_error: "桌宠连接已关闭",
+          last_state: null,
+        },
+      });
+      return vi.fn();
+    });
+
+    const handler = vi.fn();
+    await listenCompanionPetStatus(handler);
+
+    expect(handler).toHaveBeenCalledWith(
+      expect.objectContaining({
+        connected: false,
+        last_event: "pet.disconnected",
+      }),
+    );
+  });
+});
diff --git a/src/lib/api/companion.ts b/src/lib/api/companion.ts
new file mode 100644
index 000000000..feaa30135
--- /dev/null
+++ b/src/lib/api/companion.ts
@@ -0,0 +1,82 @@
+import { safeInvoke, safeListen } from "@/lib/dev-bridge";
+import type { UnlistenFn } from "@tauri-apps/api/event";
+
+export const COMPANION_PET_STATUS_EVENT = "companion-pet-status";
+export const COMPANION_OPEN_PROVIDER_SETTINGS_EVENT =
+  "companion-open-provider-settings";
+export const COMPANION_PROVIDER_OVERVIEW_CAPABILITY = "provider-overview";
+
+export type CompanionPetVisualState =
+  | "hidden"
+  | "idle"
+  | "walking"
+  | "thinking"
+  | "done";
+
+export interface CompanionPetStatus {
+  endpoint: string;
+  server_listening: boolean;
+  connected: boolean;
+  client_id: string | null;
+  platform: string | null;
+  capabilities: string[];
+  last_event: string | null;
+  last_error: string | null;
+  last_state: CompanionPetVisualState | null;
+}
+
+export interface CompanionLaunchPetRequest {
+  app_path?: string | null;
+  endpoint?: string | null;
+  client_id?: string | null;
+  protocol_version?: number | null;
+}
+
+export interface CompanionLaunchPetResult {
+  launched: boolean;
+  resolved_path: string | null;
+  endpoint: string;
+  message: string | null;
+}
+
+export interface CompanionPetCommandRequest<
+  TPayload = Record<string, unknown>,
+> {
+  event: string;
+  payload?: TPayload | null;
+}
+
+export interface CompanionPetSendResult {
+  delivered: boolean;
+  connected: boolean;
+}
+
+export async function getCompanionPetStatus(): Promise<CompanionPetStatus> {
+  return safeInvoke<CompanionPetStatus>("companion_get_pet_status");
+}
+
+export async function launchCompanionPet(
+  request: CompanionLaunchPetRequest = {},
+): Promise<CompanionLaunchPetResult> {
+  return safeInvoke<CompanionLaunchPetResult>("companion_launch_pet", {
+    request,
+  });
+}
+
+export async function sendCompanionPetCommand<
+  TPayload = Record<string, unknown>,
+>(
+  request: CompanionPetCommandRequest<TPayload>,
+): Promise<CompanionPetSendResult> {
+  return safeInvoke<CompanionPetSendResult>("companion_send_pet_command", {
+    request,
+  });
+}
+
+export async function listenCompanionPetStatus(
+  handler: (status: CompanionPetStatus) => void,
+): Promise<UnlistenFn> {
+  return safeListen<CompanionPetStatus>(COMPANION_PET_STATUS_EVENT, (event) => {
+    handler(event.payload);
+  });
+}
diff --git a/src/lib/api/modelRegistry.test.ts b/src/lib/api/modelRegistry.test.ts
index ae7dee690..6d6bd15dd 100644
--- a/src/lib/api/modelRegistry.test.ts
+++ b/src/lib/api/modelRegistry.test.ts
@@ -3,6 +3,7 @@ import { safeInvoke } from "@/lib/dev-bridge";
 import {
   getAllAliasConfigs,
   getModelRegistry,
+  getModelRegistryProviderIds,
   getProviderAliasConfig,
   invalidateModelRegistryCache,
   refreshModelRegistry,
@@ -92,4 +93,16 @@ describe("modelRegistry API", () => {
 
     expect(vi.mocked(safeInvoke)).toHaveBeenCalledTimes(3);
   });
+
+  it("getModelRegistryProviderIds 应直接透传命令结果", async () => {
+    vi.mocked(safeInvoke).mockResolvedValueOnce(["openai", "codex"]);
+
+    await expect(getModelRegistryProviderIds()).resolves.toEqual([
+      "openai",
+      "codex",
+    ]);
+    expect(vi.mocked(safeInvoke)).toHaveBeenCalledWith(
+      "get_model_registry_provider_ids",
+    );
+  });
 });
diff --git a/src/lib/dev-bridge/explicitMockFallback.ts b/src/lib/dev-bridge/explicitMockFallback.ts
new file mode 100644
index 000000000..e30721ee6
--- /dev/null
+++ b/src/lib/dev-bridge/explicitMockFallback.ts
@@ -0,0 +1,36 @@
+import type { UnlistenFn } from "@tauri-apps/api/event";
+
+let mockCoreModulePromise:
+  | Promise<typeof import("../tauri-mock/core")>
+  | null = null;
+let mockEventModulePromise:
+  | Promise<typeof import("../tauri-mock/event")>
+  | null = null;
+
+function loadMockCoreModule() {
+  mockCoreModulePromise ??= import("../tauri-mock/core");
+  return mockCoreModulePromise;
+}
+
+function loadMockEventModule() {
+  mockEventModulePromise ??= import("../tauri-mock/event");
+  return mockEventModulePromise;
+}
+
+export async function invokeExplicitMock<T>(
+  cmd: string,
+  args?: Record<string, unknown>,
+): Promise<T> {
+  const { invoke } = await loadMockCoreModule();
+  return invoke<T>(cmd, args);
+}
+
+export async function listenExplicitMock<T>(
+  event: string,
+  handler: (event: { payload: T }) => void,
+): Promise<UnlistenFn> {
+  const { listen } = await loadMockEventModule();
+  return listen<T>(event, (payload) => {
+    handler({ payload });
+  });
+}
diff --git a/src/lib/dev-bridge/mockPriorityCommands.test.ts b/src/lib/dev-bridge/mockPriorityCommands.test.ts
index 366fc752f..52b40d29d 100644
--- a/src/lib/dev-bridge/mockPriorityCommands.test.ts
+++ b/src/lib/dev-bridge/mockPriorityCommands.test.ts
@@ -8,6 +8,9 @@ describe("mockPriorityCommands", () => {
       shouldPreferMockInBrowser("execution_run_get_theme_workbench_state"),
     ).toBe(true);
     expect(shouldPreferMockInBrowser("get_hint_routes")).toBe(true);
+    expect(shouldPreferMockInBrowser("agent_runtime_get_tool_inventory")).toBe(
+      false,
+    );
     expect(shouldPreferMockInBrowser("content_workflow_get_by_content")).toBe(
       false,
     );
diff --git a/src/lib/dev-bridge/mockPriorityCommands.ts b/src/lib/dev-bridge/mockPriorityCommands.ts
index 0babef97a..3e99332bd 100644
--- a/src/lib/dev-bridge/mockPriorityCommands.ts
+++ b/src/lib/dev-bridge/mockPriorityCommands.ts
@@ -13,8 +13,10 @@ const mockPriorityCommands = new Set<string>([
   "agent_runtime_export_review_decision_template",
   "agent_runtime_save_review_decision",
   "agent_runtime_export_replay_case",
-  "agent_runtime_get_tool_inventory",
   "connection_list",
+  "companion_get_pet_status",
+  "companion_launch_pet",
+  "companion_send_pet_command",
   "terminal_create_session",
   "list_dir",
   "get_plugin_status",
diff --git a/src/lib/dev-bridge/safeInvoke.test.ts b/src/lib/dev-bridge/safeInvoke.test.ts
index ce1358057..a6ddc81fa 100644
--- a/src/lib/dev-bridge/safeInvoke.test.ts
+++ b/src/lib/dev-bridge/safeInvoke.test.ts
@@ -5,6 +5,8 @@ const mocks = vi.hoisted(() => ({
   baseInvoke: vi.fn(),
   baseListen: vi.fn(),
   baseEmit: vi.fn(),
+  explicitMockInvoke: vi.fn(),
+  explicitMockListen: vi.fn(),
   listenViaHttpEvent: vi.fn(),
   hasDevBridgeEventListenerCapability: vi.fn(),
   invokeViaHttp: vi.fn(),
@@ -26,6 +28,11 @@ vi.mock("@tauri-apps/api/event", () => ({
   emit: mocks.baseEmit,
 }));
 
+vi.mock("./explicitMockFallback", () => ({
+  invokeExplicitMock: mocks.explicitMockInvoke,
+  listenExplicitMock: mocks.explicitMockListen,
+}));
+
 vi.mock("./http-client", () => ({
   hasDevBridgeEventListenerCapability:
     mocks.hasDevBridgeEventListenerCapability,
@@ -121,12 +128,53 @@ describe("safeInvoke", () => {
   it("HTTP bridge 与 mock 都失败时抛出 bridge 错误", async () => {
     mocks.invokeViaHttp.mockRejectedValueOnce(new Error("Failed to fetch"));
     mocks.baseInvoke.mockRejectedValueOnce(new Error("mock failed"));
+    mocks.explicitMockInvoke.mockRejectedValueOnce(new Error("mock failed"));
 
     await expect(safeInvoke("workspace_list")).rejects.toThrow(
       "[workspace_list] Failed to fetch",
     );
   });
 
+  it("浏览器直开 tauri dev 页面时会从真实 invoke 退回显式 mock", async () => {
+    vi.mocked(shouldPreferMockInBrowser).mockReturnValueOnce(true);
+    mocks.baseInvoke.mockRejectedValueOnce(
+      new TypeError("Cannot read properties of undefined (reading 'invoke')"),
+    );
+    mocks.explicitMockInvoke.mockResolvedValueOnce({ connected: false });
+
+    await expect(safeInvoke("companion_get_pet_status")).resolves.toEqual({
+      connected: false,
+    });
+
+    expect(mocks.baseInvoke).toHaveBeenCalledWith(
+      "companion_get_pet_status",
+      undefined,
+    );
+    expect(mocks.explicitMockInvoke).toHaveBeenCalledWith(
+      "companion_get_pet_status",
+      undefined,
+    );
+  });
+
+  it("HTTP bridge 失败且真实 invoke 缺失时会退回显式 mock", async () => {
+    mocks.invokeViaHttp.mockRejectedValueOnce(new Error("Failed to fetch"));
+    mocks.baseInvoke.mockRejectedValueOnce(
+      new TypeError("Cannot read properties of undefined (reading 'invoke')"),
+    );
+    mocks.explicitMockInvoke.mockResolvedValueOnce([]);
+
+    await expect(safeInvoke("get_provider_pool_overview")).resolves.toEqual([]);
+
+    expect(mocks.invokeViaHttp).toHaveBeenCalledWith(
+      "get_provider_pool_overview",
+      undefined,
+    );
+    expect(mocks.explicitMockInvoke).toHaveBeenCalledWith(
+      "get_provider_pool_overview",
+      undefined,
+    );
+  });
+
   it("事件 internals 已就绪时 safeListen 走原生 event API", async () => {
     const unlisten = vi.fn();
     (window as any).__TAURI_INTERNALS__ = {
@@ -156,6 +204,22 @@ describe("safeInvoke", () => {
     expect(mocks.baseListen).not.toHaveBeenCalled();
   });
 
+  it("事件桥失败且没有 Tauri 标记时会退回显式 mock 监听", async () => {
+    const unlisten = vi.fn();
+    mocks.hasDevBridgeEventListenerCapability.mockReturnValue(true);
+    mocks.listenViaHttpEvent.mockRejectedValueOnce(new Error("connection failed"));
+    mocks.explicitMockListen.mockResolvedValueOnce(unlisten);
+
+    await expect(safeListen("companion-pet-status", vi.fn())).resolves.toBe(
+      unlisten,
+    );
+
+    expect(mocks.explicitMockListen).toHaveBeenCalledWith(
+      "companion-pet-status",
+      expect.any(Function),
+    );
+  });
+
   it("Tauri 运行时存在但事件桥缺失时 safeListen 返回空清理函数", async () => {
     const consoleWarnSpy = vi
       .spyOn(console, "warn")
diff --git a/src/lib/dev-bridge/safeInvoke.ts b/src/lib/dev-bridge/safeInvoke.ts
index 153d126fe..4c335d716 100644
--- a/src/lib/dev-bridge/safeInvoke.ts
+++ b/src/lib/dev-bridge/safeInvoke.ts
@@ -18,6 +18,10 @@ import {
   listenViaHttpEvent,
   normalizeDevBridgeError,
 } from "./http-client";
+import {
+  invokeExplicitMock,
+  listenExplicitMock,
+} from "./explicitMockFallback";
 import { shouldPreferMockInBrowser } from "./mockPriorityCommands";
 import {
   getTauriGlobal,
@@ -125,6 +129,38 @@ function sanitizeTimingLabel(input: string): string {
   return normalized || "invoke";
 }
 
+function canUseExplicitBrowserMockFallback(): boolean {
+  return typeof window !== "undefined" && !hasTauriRuntimeMarkers();
+}
+
+async function invokeFallbackTransport<T>(
+  cmd: string,
+  args?: Record<string, unknown>,
+): Promise<T> {
+  try {
+    return (await baseInvoke(cmd, args)) as T;
+  } catch (error) {
+    if (!canUseExplicitBrowserMockFallback()) {
+      throw error;
+    }
+    return invokeExplicitMock<T>(cmd, args);
+  }
+}
+
+async function listenFallbackTransport<T>(
+  event: string,
+  handler: (event: { payload: T }) => void,
+): Promise<UnlistenFn> {
+  try {
+    return await baseListen(event, handler);
+  } catch (error) {
+    if (!canUseExplicitBrowserMockFallback()) {
+      throw error;
+    }
+    return listenExplicitMock(event, handler);
+  }
+}
+
 function startInvokeTiming(command: string): string | null {
   if (!supportsUserTiming()) {
     return null;
@@ -403,7 +439,7 @@ export async function safeInvoke<T = any>(
   // 2. 浏览器开发模式下，部分原生/非关键命令直接优先走 mock。
   if (isDevBridgeAvailable() && shouldPreferMockInBrowser(cmd)) {
     try {
-      const result = (await baseInvoke(cmd, args)) as T;
+      const result = await invokeFallbackTransport<T>(cmd, args);
       recordInvokeTrace(cmd, args, "fallback-invoke", "success", startedAt);
       finishInvokeTiming(timingId, cmd, "fallback-invoke", "success");
       return result;
@@ -442,7 +478,7 @@ export async function safeInvoke<T = any>(
       );
 
       try {
-        const result = (await baseInvoke(cmd, args)) as T;
+        const result = await invokeFallbackTransport<T>(cmd, args);
         recordInvokeTrace(cmd, args, "fallback-invoke", "success", startedAt);
         finishInvokeTiming(timingId, cmd, "fallback-invoke", "success");
         return result;
@@ -464,7 +500,7 @@ export async function safeInvoke<T = any>(
 
   // 4. Fallback 到 mock（Vite alias 会替换 @tauri-apps 导入）
   try {
-    const result = (await baseInvoke(cmd, args)) as T;
+    const result = await invokeFallbackTransport<T>(cmd, args);
     recordInvokeTrace(cmd, args, "fallback-invoke", "success", startedAt);
     finishInvokeTiming(timingId, cmd, "fallback-invoke", "success");
     return result;
@@ -501,6 +537,9 @@ export async function safeListen<T = any>(
     try {
       return await listenViaHttpEvent(event, handler);
     } catch (error) {
+      if (!hasTauriRuntimeMarkers()) {
+        return listenExplicitMock(event, handler);
+      }
       console.warn(`[safeListen] DevBridge 事件流调用失败，跳过监听: ${event}`, error);
       return () => {};
     }
@@ -511,7 +550,7 @@ export async function safeListen<T = any>(
     return () => {};
   }
 
-  return baseListen(event, handler);
+  return listenFallbackTransport(event, handler);
 }
 
 export function hasNativeTauriEventSupport(): boolean {
diff --git a/src/lib/governance/agentCommandCatalog.json b/src/lib/governance/agentCommandCatalog.json
index 25728562e..65bc5e69b 100644
--- a/src/lib/governance/agentCommandCatalog.json
+++ b/src/lib/governance/agentCommandCatalog.json
@@ -44,6 +44,11 @@
     "site_debug_run_adapter",
     "site_save_adapter_result"
   ],
+  "desktopCompanionCommands": [
+    "companion_get_pet_status",
+    "companion_launch_pet",
+    "companion_send_pet_command"
+  ],
   "deprecatedCommandReplacements": {
     "get_agent_process_status": "agent_get_process_status",
     "list_agent_sessions": "agent_runtime_list_sessions",
diff --git a/src/lib/model/providerModelFetchSupport.test.ts b/src/lib/model/providerModelFetchSupport.test.ts
new file mode 100644
index 000000000..fee518c49
--- /dev/null
+++ b/src/lib/model/providerModelFetchSupport.test.ts
@@ -0,0 +1,81 @@
+import { describe, expect, it } from "vitest";
+
+import { getProviderModelAutoFetchCapability } from "./providerModelFetchSupport";
+
+describe("providerModelFetchSupport", () => {
+  it("OpenAI 官方协议应支持自动获取且需要 API Key", () => {
+    expect(
+      getProviderModelAutoFetchCapability({
+        providerId: "openai",
+        providerType: "openai-response",
+        apiHost: "https://api.openai.com",
+      }),
+    ).toEqual({
+      supported: true,
+      requiresApiKey: true,
+    });
+  });
+
+  it("Anthropic 官方协议应支持自动获取且需要 API Key", () => {
+    expect(
+      getProviderModelAutoFetchCapability({
+        providerId: "anthropic",
+        providerType: "anthropic",
+        apiHost: "https://api.anthropic.com",
+      }),
+    ).toEqual({
+      supported: true,
+      requiresApiKey: true,
+    });
+  });
+
+  it("Gemini 官方协议应支持自动获取且需要 API Key", () => {
+    expect(
+      getProviderModelAutoFetchCapability({
+        providerId: "google",
+        providerType: "gemini",
+        apiHost: "https://generativelanguage.googleapis.com",
+      }),
+    ).toEqual({
+      supported: true,
+      requiresApiKey: true,
+    });
+  });
+
+  it("Ollama 应支持自动获取且不要求 API Key", () => {
+    expect(
+      getProviderModelAutoFetchCapability({
+        providerId: "ollama",
+        providerType: "ollama",
+        apiHost: "http://localhost:11434",
+      }),
+    ).toEqual({
+      supported: true,
+      requiresApiKey: false,
+    });
+  });
+
+  it("本地 OpenAI 兼容地址应允许免 Key 获取模型", () => {
+    expect(
+      getProviderModelAutoFetchCapability({
+        providerId: "custom-local-openai",
+        providerType: "openai",
+        apiHost: "http://127.0.0.1:1234/v1",
+      }),
+    ).toEqual({
+      supported: true,
+      requiresApiKey: false,
+    });
+  });
+
+  it("Azure OpenAI 当前不应展示自动获取入口", () => {
+    const capability = getProviderModelAutoFetchCapability({
+      providerId: "azure-openai",
+      providerType: "azure-openai",
+      apiHost: "https://example.openai.azure.com",
+    });
+
+    expect(capability.supported).toBe(false);
+    expect(capability.unsupportedReason).toContain("当前不展示自动获取入口");
+  });
+});
diff --git a/src/lib/model/providerModelFetchSupport.ts b/src/lib/model/providerModelFetchSupport.ts
new file mode 100644
index 000000000..05e033424
--- /dev/null
+++ b/src/lib/model/providerModelFetchSupport.ts
@@ -0,0 +1,103 @@
+import type { ProviderType } from "@/lib/types/provider";
+
+const LOCAL_OPENAI_LIKE_PROVIDER_IDS = new Set([
+  "ollama",
+  "lmstudio",
+  "gpustack",
+  "ovms",
+]);
+
+function normalize(value?: string | null): string {
+  return (value || "").trim().toLowerCase();
+}
+
+function isLikelyLocalHost(apiHost?: string | null): boolean {
+  const host = normalize(apiHost);
+  if (!host) {
+    return false;
+  }
+
+  return (
+    host.includes("://localhost") ||
+    host.includes("://127.0.0.1") ||
+    host.includes("://0.0.0.0") ||
+    host.includes("://host.docker.internal")
+  );
+}
+
+export interface ProviderModelAutoFetchCapability {
+  supported: boolean;
+  requiresApiKey: boolean;
+  unsupportedReason?: string;
+}
+
+export function getProviderModelAutoFetchCapability(input: {
+  providerId?: string | null;
+  providerType?: string | null;
+  apiHost?: string | null;
+}): ProviderModelAutoFetchCapability {
+  const providerId = normalize(input.providerId);
+  const providerType = normalize(input.providerType) as ProviderType | "";
+  const localHost = isLikelyLocalHost(input.apiHost);
+
+  switch (providerType) {
+    case "openai":
+    case "openai-response":
+    case "codex":
+    case "new-api":
+    case "gateway":
+    case "fal":
+      return {
+        supported: true,
+        requiresApiKey:
+          !LOCAL_OPENAI_LIKE_PROVIDER_IDS.has(providerId) && !localHost,
+      };
+    case "anthropic":
+    case "anthropic-compatible":
+    case "gemini":
+      return {
+        supported: true,
+        requiresApiKey: true,
+      };
+    case "ollama":
+      return {
+        supported: true,
+        requiresApiKey: false,
+      };
+    case "azure-openai":
+      return {
+        supported: false,
+        requiresApiKey: true,
+        unsupportedReason:
+          "Azure OpenAI 的模型枚举仍需单独适配资源端点与 API Version，当前不展示自动获取入口。",
+      };
+    case "vertexai":
+      return {
+        supported: false,
+        requiresApiKey: false,
+        unsupportedReason:
+          "Vertex AI 需要单独的云端认证与项目上下文，当前不展示自动获取入口。",
+      };
+    case "aws-bedrock":
+      return {
+        supported: false,
+        requiresApiKey: false,
+        unsupportedReason:
+          "AWS Bedrock 需要专门的云凭证签名流程，当前不展示自动获取入口。",
+      };
+    default:
+      return {
+        supported: false,
+        requiresApiKey: true,
+        unsupportedReason: "当前协议暂不支持自动获取最新模型。",
+      };
+  }
+}
+
+export function supportsProviderModelAutoFetch(input: {
+  providerId?: string | null;
+  providerType?: string | null;
+  apiHost?: string | null;
+}): boolean {
+  return getProviderModelAutoFetchCapability(input).supported;
+}
diff --git a/src/lib/model/providerModelLoadOptions.ts b/src/lib/model/providerModelLoadOptions.ts
new file mode 100644
index 000000000..920186ca1
--- /dev/null
+++ b/src/lib/model/providerModelLoadOptions.ts
@@ -0,0 +1,39 @@
+import { getProviderModelAutoFetchCapability } from "./providerModelFetchSupport";
+
+export interface ProviderModelLoadOptionInput {
+  providerId?: string | null;
+  providerType?: string | null;
+  apiHost?: string | null;
+}
+
+export interface ProviderModelLoadOptions {
+  liveFetchOnly: boolean;
+  hasApiKey: boolean;
+}
+
+function hasManagedProviderId(providerId?: string | null): boolean {
+  return (providerId || "").trim().length > 0;
+}
+
+export function resolveProviderModelLoadOptions(
+  input?: ProviderModelLoadOptionInput | null,
+): ProviderModelLoadOptions {
+  if (!input) {
+    return {
+      liveFetchOnly: false,
+      hasApiKey: false,
+    };
+  }
+
+  const managedProvider = hasManagedProviderId(input.providerId);
+  const capability = getProviderModelAutoFetchCapability({
+    providerId: input.providerId,
+    providerType: input.providerType,
+    apiHost: input.apiHost,
+  });
+
+  return {
+    liveFetchOnly: managedProvider && capability.supported,
+    hasApiKey: managedProvider,
+  };
+}
diff --git a/src/lib/navigation/sidebarNav.ts b/src/lib/navigation/sidebarNav.ts
index ebfc03a99..42c2fa04d 100644
--- a/src/lib/navigation/sidebarNav.ts
+++ b/src/lib/navigation/sidebarNav.ts
@@ -7,6 +7,7 @@ import {
   Library,
   MessageSquare,
   Plus,
+  Send,
   Settings,
   Sparkles,
   Terminal,
@@ -101,7 +102,7 @@ const CAPABILITY_SIDEBAR_NAV_ITEMS: SidebarNavItemDefinition[] = [
   {
     id: "channels",
     label: "IM 配置",
-    icon: MessageSquare,
+    icon: Send,
     page: "channels",
     isActive: (currentPage) => currentPage === "channels",
     configurable: false,
diff --git a/src/lib/provider/companionProviderOverview.test.ts b/src/lib/provider/companionProviderOverview.test.ts
new file mode 100644
index 000000000..50333d535
--- /dev/null
+++ b/src/lib/provider/companionProviderOverview.test.ts
@@ -0,0 +1,160 @@
+import { describe, expect, it } from "vitest";
+import { buildCompanionProviderOverview } from "./companionProviderOverview";
+
+describe("buildCompanionProviderOverview", () => {
+  it("应过滤未配置 provider，并输出脱敏摘要", () => {
+    expect(
+      buildCompanionProviderOverview([
+        {
+          provider_type: "openai",
+          stats: {
+            total: 2,
+            healthy: 1,
+            unhealthy: 1,
+            disabled: 0,
+            total_usage: 12,
+            total_errors: 1,
+          },
+          credentials: [],
+        },
+        {
+          provider_type: "claude",
+          stats: {
+            total: 0,
+            healthy: 0,
+            unhealthy: 0,
+            disabled: 0,
+            total_usage: 0,
+            total_errors: 0,
+          },
+          credentials: [],
+        },
+        {
+          provider_type: "codex",
+          stats: {
+            total: 1,
+            healthy: 1,
+            unhealthy: 0,
+            disabled: 0,
+            total_usage: 3,
+            total_errors: 0,
+          },
+          credentials: [],
+        },
+      ]),
+    ).toEqual({
+      providers: [
+        {
+          provider_type: "codex",
+          display_name: "Codex",
+          total_count: 1,
+          healthy_count: 1,
+          available: true,
+          needs_attention: false,
+        },
+        {
+          provider_type: "openai",
+          display_name: "OpenAI",
+          total_count: 2,
+          healthy_count: 1,
+          available: true,
+          needs_attention: true,
+        },
+      ],
+      total_provider_count: 2,
+      available_provider_count: 2,
+      needs_attention_provider_count: 1,
+    });
+  });
+
+  it("当所有 provider 都不可用时，应标记为需要关注", () => {
+    expect(
+      buildCompanionProviderOverview([
+        {
+          provider_type: "gemini",
+          stats: {
+            total: 1,
+            healthy: 0,
+            unhealthy: 1,
+            disabled: 0,
+            total_usage: 0,
+            total_errors: 2,
+          },
+          credentials: [],
+        },
+      ]),
+    ).toEqual({
+      providers: [
+        {
+          provider_type: "gemini",
+          display_name: "Gemini OAuth",
+          total_count: 1,
+          healthy_count: 0,
+          available: false,
+          needs_attention: true,
+        },
+      ],
+      total_provider_count: 1,
+      available_provider_count: 0,
+      needs_attention_provider_count: 1,
+    });
+  });
+
+  it("不应把原始凭证字段泄露给桌宠摘要", () => {
+    const result = buildCompanionProviderOverview([
+      {
+        provider_type: "openai",
+        stats: {
+          total: 1,
+          healthy: 1,
+          unhealthy: 0,
+          disabled: 0,
+          total_usage: 7,
+          total_errors: 0,
+        },
+        credentials: [
+          {
+            uuid: "cred-1",
+            provider_type: "openai",
+            credential_type: "openai_key",
+            name: "主 OpenAI Key",
+            display_credential: "sk-***abcd",
+            is_healthy: true,
+            is_disabled: false,
+            check_health: true,
+            not_supported_models: [],
+            usage_count: 7,
+            error_count: 0,
+            created_at: "2026-04-02T00:00:00Z",
+            updated_at: "2026-04-02T00:00:00Z",
+            source: "manual",
+            api_key: "sk-live-super-secret",
+            base_url: "https://api.openai.com/v1",
+          },
+        ],
+      },
+    ]);
+
+    expect(result).toEqual({
+      providers: [
+        {
+          provider_type: "openai",
+          display_name: "OpenAI",
+          total_count: 1,
+          healthy_count: 1,
+          available: true,
+          needs_attention: false,
+        },
+      ],
+      total_provider_count: 1,
+      available_provider_count: 1,
+      needs_attention_provider_count: 0,
+    });
+
+    const serialized = JSON.stringify(result);
+    expect(serialized).not.toContain("sk-live-super-secret");
+    expect(serialized).not.toContain("cred-1");
+    expect(serialized).not.toContain("base_url");
+    expect(serialized).not.toContain("display_credential");
+  });
+});
diff --git a/src/lib/provider/companionProviderOverview.ts b/src/lib/provider/companionProviderOverview.ts
new file mode 100644
index 000000000..4a43cb400
--- /dev/null
+++ b/src/lib/provider/companionProviderOverview.ts
@@ -0,0 +1,56 @@
+import type { ProviderPoolOverview } from "@/lib/api/providerPool";
+import { getProviderLabel } from "@/lib/constants/providerMappings";
+
+export interface CompanionProviderSummary {
+  provider_type: string;
+  display_name: string;
+  total_count: number;
+  healthy_count: number;
+  available: boolean;
+  needs_attention: boolean;
+}
+
+export interface CompanionProviderOverviewPayload {
+  providers: CompanionProviderSummary[];
+  total_provider_count: number;
+  available_provider_count: number;
+  needs_attention_provider_count: number;
+}
+
+function buildProviderSummary(
+  pool: ProviderPoolOverview,
+): CompanionProviderSummary {
+  const totalCount = pool.stats.total;
+  const healthyCount = pool.stats.healthy;
+  const hasUnhealthyCredential = pool.stats.unhealthy > 0;
+  const hasDisabledCredential = pool.stats.disabled > 0;
+
+  return {
+    provider_type: pool.provider_type,
+    display_name: getProviderLabel(pool.provider_type),
+    total_count: totalCount,
+    healthy_count: healthyCount,
+    available: healthyCount > 0,
+    needs_attention:
+      totalCount > 0 &&
+      (healthyCount === 0 || hasUnhealthyCredential || hasDisabledCredential),
+  };
+}
+
+export function buildCompanionProviderOverview(
+  overview: ProviderPoolOverview[],
+): CompanionProviderOverviewPayload {
+  const providers = overview
+    .filter((pool) => pool.stats.total > 0)
+    .sort((left, right) => left.provider_type.localeCompare(right.provider_type))
+    .map(buildProviderSummary);
+
+  return {
+    providers,
+    total_provider_count: providers.length,
+    available_provider_count: providers.filter((pool) => pool.available).length,
+    needs_attention_provider_count: providers.filter(
+      (pool) => pool.needs_attention,
+    ).length,
+  };
+}
diff --git a/src/lib/provider/providerAccessHelp.ts b/src/lib/provider/providerAccessHelp.ts
new file mode 100644
index 000000000..294be3f20
--- /dev/null
+++ b/src/lib/provider/providerAccessHelp.ts
@@ -0,0 +1,144 @@
+const LOCAL_KEYLESS_PROVIDER_IDS = new Set([
+  "ollama",
+  "lmstudio",
+  "gpustack",
+  "ovms",
+]);
+
+const PROVIDER_ACCESS_URLS: Record<string, string> = {
+  openai: "https://platform.openai.com/api-keys",
+  anthropic: "https://console.anthropic.com/settings/keys",
+  gemini: "https://aistudio.google.com/app/apikey",
+  google: "https://aistudio.google.com/app/apikey",
+  deepseek: "https://platform.deepseek.com/api_keys",
+  moonshot: "https://platform.moonshot.cn/console/api-keys",
+  groq: "https://console.groq.com/keys",
+  grok: "https://console.x.ai/",
+  mistral: "https://console.mistral.ai/api-keys/",
+  perplexity: "https://www.perplexity.ai/settings/api",
+  cohere: "https://dashboard.cohere.com/api-keys",
+  zhipu: "https://open.bigmodel.cn/usercenter/apikeys",
+  zhipuai: "https://open.bigmodel.cn/usercenter/apikeys",
+  baichuan: "https://platform.baichuan-ai.com/console/key",
+  dashscope: "https://bailian.console.aliyun.com/?apiKey=1#/api-key",
+  stepfun: "https://platform.stepfun.com/",
+  doubao: "https://console.volcengine.com/ark",
+  minimax:
+    "https://platform.minimaxi.com/user-center/basic-information/interface-key",
+  yi: "https://platform.lingyiwanwu.com/",
+  hunyuan: "https://console.cloud.tencent.com/hunyuan",
+  "tencent-cloud-ti": "https://console.cloud.tencent.com/ti",
+  "baidu-cloud": "https://console.bce.baidu.com/qianfan/overview",
+  infini: "https://cloud.infini-ai.com/",
+  modelscope: "https://modelscope.cn/my/myaccesstoken",
+  xirang: "https://xirang.aliyun.com/",
+  mimo: "https://platform.xiaomi.com/",
+  zhinao: "https://ai.360.com/",
+  "azure-openai": "https://portal.azure.com/",
+  vertexai: "https://console.cloud.google.com/vertex-ai",
+  "aws-bedrock": "https://console.aws.amazon.com/bedrock/",
+  github: "https://github.com/settings/tokens",
+  copilot: "https://github.com/settings/copilot",
+  silicon: "https://cloud.siliconflow.cn/account/ak",
+  openrouter: "https://openrouter.ai/keys",
+  aihubmix: "https://aihubmix.com/",
+  "302ai": "https://302.ai/",
+  together: "https://api.together.xyz/settings/api-keys",
+  fireworks: "https://fireworks.ai/account/api-keys",
+  nvidia: "https://build.nvidia.com/",
+  hyperbolic: "https://app.hyperbolic.xyz/settings/api-keys",
+  cerebras: "https://cloud.cerebras.ai/",
+  ppio: "https://ppinfra.com/settings/key-management",
+  qiniu: "https://developer.qiniu.com/aitokenapi/12884/how-to-get-api-key",
+  tokenflux: "https://tokenflux.ai/dashboard/api-keys",
+  cephalon: "https://cephalon.cloud/",
+  lanyun: "https://lanyun.net/",
+  ph8: "https://ph8.com/",
+  sophnet: "https://sophnet.com/",
+  ocoolai: "https://ocoolai.com/",
+  dmxapi: "https://dmxapi.com/",
+  aionly: "https://aionly.com/",
+  burncloud: "https://ai.burncloud.com/api/usage/token/",
+  alayanew: "https://www.alayanew.com/",
+  longcat: "https://longcat.chat/",
+  poe: "https://poe.com/api_key",
+  huggingface: "https://huggingface.co/settings/tokens",
+  "vercel-gateway": "https://vercel.com/account/tokens",
+  "new-api": "https://docs.newapi.pro/",
+  jina: "https://jina.ai/",
+  voyageai: "https://dash.voyageai.com/api-keys",
+  cherryin: "https://open.cherryin.ai/console",
+  fal: "https://fal.ai/dashboard/keys",
+};
+
+function normalize(value?: string | null): string {
+  return (value || "").trim().toLowerCase();
+}
+
+function isLikelyLocalHost(apiHost?: string | null): boolean {
+  const host = normalize(apiHost);
+  if (!host) {
+    return false;
+  }
+
+  return (
+    host.includes("://localhost") ||
+    host.includes("://127.0.0.1") ||
+    host.includes("://0.0.0.0") ||
+    host.includes("://host.docker.internal")
+  );
+}
+
+function resolveFallbackOrigin(apiHost?: string | null): string | null {
+  const host = (apiHost || "").trim();
+  if (!host) {
+    return null;
+  }
+
+  try {
+    return new URL(host).origin;
+  } catch {
+    return null;
+  }
+}
+
+export interface ProviderAccessHelp {
+  helpText: string | null;
+  keylessHint: string | null;
+  url: string | null;
+}
+
+export function getProviderAccessHelp(input: {
+  providerId?: string | null;
+  providerName?: string | null;
+  apiHost?: string | null;
+}): ProviderAccessHelp {
+  const providerId = normalize(input.providerId);
+  const providerName = (input.providerName || "").trim() || providerId || "当前渠道";
+
+  if (
+    LOCAL_KEYLESS_PROVIDER_IDS.has(providerId) ||
+    isLikelyLocalHost(input.apiHost)
+  ) {
+    return {
+      helpText: null,
+      keylessHint:
+        "当前渠道通常支持本地直连，通常无需 API Key；如果网关额外开启了鉴权，再按需填写。",
+      url: null,
+    };
+  }
+
+  const url =
+    PROVIDER_ACCESS_URLS[providerId] ?? resolveFallbackOrigin(input.apiHost);
+  const helpText = url
+    ? `如何获取 API Key：前往 ${providerName} 的控制台或开发者页面`
+    : input.apiHost
+      ? `如何获取 API Key：请查看 ${providerName} 的控制台、文档或网关管理页`
+      : `如何获取 API Key：先填写 ${providerName} 的 API Host，再前往对应控制台创建密钥`;
+
+  return {
+    helpText,
+    keylessHint: null,
+    url,
+  };
+}
diff --git a/src/lib/tauri-mock/core.test.ts b/src/lib/tauri-mock/core.test.ts
index 214c5738a..60802a06d 100644
--- a/src/lib/tauri-mock/core.test.ts
+++ b/src/lib/tauri-mock/core.test.ts
@@ -47,13 +47,65 @@ describe("tauri-mock/core invoke", () => {
   it("mock 优先命令直接返回默认 mock，不访问 bridge", async () => {
     vi.mocked(shouldPreferMockInBrowser).mockReturnValueOnce(true);
 
-    await expect(invoke("list_plugin_tasks", { taskState: null, limit: 300 })).resolves.toEqual([]);
+    await expect(
+      invoke("list_plugin_tasks", { taskState: null, limit: 300 }),
+    ).resolves.toEqual([]);
 
     expect(mocks.invokeViaHttp).not.toHaveBeenCalled();
   });
 
+  it("工具库存 fallback mock 不应再返回空壳清单", async () => {
+    mocks.invokeViaHttp.mockRejectedValueOnce(new Error("Failed to fetch"));
+    const consoleWarnSpy = vi
+      .spyOn(console, "warn")
+      .mockImplementation(() => {});
+
+    try {
+      await expect(
+        invoke("agent_runtime_get_tool_inventory", {
+          request: {
+            caller: "assistant",
+            browserAssist: true,
+          },
+        }),
+      ).resolves.toEqual(
+        expect.objectContaining({
+          request: expect.objectContaining({
+            caller: "assistant",
+            surface: expect.objectContaining({
+              browser_assist: true,
+            }),
+          }),
+          default_allowed_tools: expect.arrayContaining([
+            "ToolSearch",
+            "WebSearch",
+            "ask",
+          ]),
+          counts: expect.objectContaining({
+            catalog_total: expect.any(Number),
+            registry_visible_total: expect.any(Number),
+          }),
+          catalog_tools: expect.arrayContaining([
+            expect.objectContaining({ name: "ToolSearch" }),
+            expect.objectContaining({ name: "WebSearch" }),
+          ]),
+          registry_tools: expect.arrayContaining([
+            expect.objectContaining({ name: "ask" }),
+          ]),
+          mcp_tools: expect.arrayContaining([
+            expect.objectContaining({ name: "mcp__lime-browser__navigate" }),
+          ]),
+        }),
+      );
+    } finally {
+      consoleWarnSpy.mockRestore();
+    }
+  });
+
   it("bridge 失败且命令存在 mock 时回退默认 mock 数据", async () => {
-    const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+    const consoleWarnSpy = vi
+      .spyOn(console, "warn")
+      .mockImplementation(() => {});
     mocks.invokeViaHttp.mockRejectedValueOnce(new Error("Failed to fetch"));
 
     try {
@@ -66,7 +118,9 @@ describe("tauri-mock/core invoke", () => {
   });
 
   it("OpenClaw 环境状态命令在 bridge 失败时回退默认 mock", async () => {
-    const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+    const consoleWarnSpy = vi
+      .spyOn(console, "warn")
+      .mockImplementation(() => {});
     mocks.invokeViaHttp.mockRejectedValueOnce(new Error("Failed to fetch"));
 
     try {
diff --git a/src/lib/tauri-mock/core.ts b/src/lib/tauri-mock/core.ts
index 2e950bd79..6ff9cd4ab 100644
--- a/src/lib/tauri-mock/core.ts
+++ b/src/lib/tauri-mock/core.ts
@@ -3,6 +3,7 @@
  */
 
 import type { AutomationJobRecord } from "../api/automation";
+import type { CompanionPetStatus } from "../api/companion";
 import type { AgentRun } from "../api/executionRun";
 
 import {
@@ -1202,8 +1203,354 @@ function buildMockClawSolutionPrompt(
   return `${basePrompt}\n\n补充上下文：${userInput}`;
 }
 
+function buildMockAgentRuntimeToolInventory(request?: {
+  caller?: string;
+  workbench?: boolean;
+  browserAssist?: boolean;
+}) {
+  const caller = request?.caller?.trim() || "assistant";
+  const surface = {
+    workbench: request?.workbench === true,
+    browser_assist: request?.browserAssist === true,
+  };
+
+  const catalogTools = [
+    {
+      name: "ToolSearch",
+      profiles: ["core"],
+      capabilities: ["web_search"],
+      lifecycle: "current",
+      source: "lime_injected",
+      permission_plane: "session_allowlist",
+      workspace_default_allow: true,
+      execution_warning_policy: "none",
+      execution_warning_policy_source: "default",
+      execution_restriction_profile: "none",
+      execution_restriction_profile_source: "default",
+      execution_sandbox_profile: "none",
+      execution_sandbox_profile_source: "default",
+    },
+    {
+      name: "WebSearch",
+      profiles: ["core"],
+      capabilities: ["web_search"],
+      lifecycle: "current",
+      source: "aster_builtin",
+      permission_plane: "session_allowlist",
+      workspace_default_allow: true,
+      execution_warning_policy: "none",
+      execution_warning_policy_source: "default",
+      execution_restriction_profile: "safe_https_url_required",
+      execution_restriction_profile_source: "default",
+      execution_sandbox_profile: "none",
+      execution_sandbox_profile_source: "default",
+    },
+    {
+      name: "ask",
+      profiles: ["core"],
+      capabilities: ["planning"],
+      lifecycle: "current",
+      source: "aster_builtin",
+      permission_plane: "session_allowlist",
+      workspace_default_allow: true,
+      execution_warning_policy: "none",
+      execution_warning_policy_source: "default",
+      execution_restriction_profile: "none",
+      execution_restriction_profile_source: "default",
+      execution_sandbox_profile: "none",
+      execution_sandbox_profile_source: "default",
+    },
+    {
+      name: "spawn_agent",
+      profiles: ["core"],
+      capabilities: ["delegation"],
+      lifecycle: "current",
+      source: "lime_injected",
+      permission_plane: "session_allowlist",
+      workspace_default_allow: true,
+      execution_warning_policy: "none",
+      execution_warning_policy_source: "default",
+      execution_restriction_profile: "none",
+      execution_restriction_profile_source: "default",
+      execution_sandbox_profile: "none",
+      execution_sandbox_profile_source: "default",
+    },
+  ];
+
+  const registryTools = [
+    {
+      name: "ToolSearch",
+      description: "搜索当前会话可用工具与能力清单。",
+      catalog_entry_name: "ToolSearch",
+      catalog_source: "lime_injected",
+      catalog_lifecycle: "current",
+      catalog_permission_plane: "session_allowlist",
+      catalog_workspace_default_allow: true,
+      catalog_execution_warning_policy: "none",
+      catalog_execution_warning_policy_source: "default",
+      catalog_execution_restriction_profile: "none",
+      catalog_execution_restriction_profile_source: "default",
+      catalog_execution_sandbox_profile: "none",
+      catalog_execution_sandbox_profile_source: "default",
+      deferred_loading: false,
+      always_visible: true,
+      allowed_callers: [caller],
+      tags: ["search"],
+      input_examples_count: 1,
+      caller_allowed: true,
+      visible_in_context: true,
+    },
+    {
+      name: "WebSearch",
+      description: "联网检索公开网页信息。",
+      catalog_entry_name: "WebSearch",
+      catalog_source: "aster_builtin",
+      catalog_lifecycle: "current",
+      catalog_permission_plane: "session_allowlist",
+      catalog_workspace_default_allow: true,
+      catalog_execution_warning_policy: "none",
+      catalog_execution_warning_policy_source: "default",
+      catalog_execution_restriction_profile: "safe_https_url_required",
+      catalog_execution_restriction_profile_source: "default",
+      catalog_execution_sandbox_profile: "none",
+      catalog_execution_sandbox_profile_source: "default",
+      deferred_loading: false,
+      always_visible: true,
+      allowed_callers: [caller],
+      tags: ["research"],
+      input_examples_count: 2,
+      caller_allowed: true,
+      visible_in_context: true,
+    },
+    {
+      name: "ask",
+      description: "向用户发起单轮最小必要澄清。",
+      catalog_entry_name: "ask",
+      catalog_source: "aster_builtin",
+      catalog_lifecycle: "current",
+      catalog_permission_plane: "session_allowlist",
+      catalog_workspace_default_allow: true,
+      catalog_execution_warning_policy: "none",
+      catalog_execution_warning_policy_source: "default",
+      catalog_execution_restriction_profile: "none",
+      catalog_execution_restriction_profile_source: "default",
+      catalog_execution_sandbox_profile: "none",
+      catalog_execution_sandbox_profile_source: "default",
+      deferred_loading: false,
+      always_visible: true,
+      allowed_callers: [caller],
+      tags: ["clarify"],
+      input_examples_count: 1,
+      caller_allowed: true,
+      visible_in_context: true,
+    },
+    {
+      name: "spawn_agent",
+      description: "在需要并行处理时派生子代理。",
+      catalog_entry_name: "spawn_agent",
+      catalog_source: "lime_injected",
+      catalog_lifecycle: "current",
+      catalog_permission_plane: "session_allowlist",
+      catalog_workspace_default_allow: true,
+      catalog_execution_warning_policy: "none",
+      catalog_execution_warning_policy_source: "default",
+      catalog_execution_restriction_profile: "none",
+      catalog_execution_restriction_profile_source: "default",
+      catalog_execution_sandbox_profile: "none",
+      catalog_execution_sandbox_profile_source: "default",
+      deferred_loading: false,
+      always_visible: true,
+      allowed_callers: [caller],
+      tags: ["delegation"],
+      input_examples_count: 1,
+      caller_allowed: true,
+      visible_in_context: true,
+    },
+  ];
+
+  const extensionSurfaces = surface.browser_assist
+    ? [
+        {
+          extension_name: "lime-browser",
+          description: "浏览器协助桥接工具集。",
+          source_kind: "mcp_bridge",
+          deferred_loading: false,
+          allowed_caller: caller,
+          available_tools: ["mcp__lime-browser__navigate"],
+          always_expose_tools: ["mcp__lime-browser__navigate"],
+          loaded_tools: ["mcp__lime-browser__navigate"],
+          searchable_tools: ["mcp__lime-browser__navigate"],
+        },
+      ]
+    : [];
+  const extensionTools = surface.browser_assist
+    ? [
+        {
+          name: "mcp__lime-browser__navigate",
+          description: "导航到目标网页。",
+          extension_name: "lime-browser",
+          source_kind: "mcp_bridge",
+          deferred_loading: false,
+          allowed_caller: caller,
+          status: "loaded",
+          caller_allowed: true,
+          visible_in_context: true,
+        },
+      ]
+    : [];
+  const mcpTools = surface.browser_assist
+    ? [
+        {
+          server_name: "lime-browser",
+          name: "mcp__lime-browser__navigate",
+          description: "导航到目标网页。",
+          deferred_loading: false,
+          always_visible: true,
+          allowed_callers: [caller],
+          tags: ["browser"],
+          input_examples_count: 1,
+          caller_allowed: true,
+          visible_in_context: true,
+        },
+      ]
+    : [];
+
+  const defaultAllowedTools = registryTools
+    .filter((entry) => entry.catalog_workspace_default_allow)
+    .map((entry) => entry.name);
+
+  return {
+    request: {
+      caller,
+      surface,
+    },
+    agent_initialized: false,
+    warnings: [
+      "当前展示的是浏览器 fallback mock 工具库存；如需完整运行时状态，请保持 DevBridge 后端在线。",
+    ],
+    mcp_servers: surface.browser_assist ? ["lime-browser"] : [],
+    default_allowed_tools: defaultAllowedTools,
+    counts: {
+      catalog_total: catalogTools.length,
+      catalog_current_total: catalogTools.length,
+      catalog_compat_total: 0,
+      catalog_deprecated_total: 0,
+      default_allowed_total: defaultAllowedTools.length,
+      registry_total: registryTools.length,
+      registry_visible_total: registryTools.filter(
+        (entry) => entry.visible_in_context,
+      ).length,
+      registry_catalog_unmapped_total: 0,
+      extension_surface_total: extensionSurfaces.length,
+      extension_mcp_bridge_total: extensionSurfaces.length,
+      extension_runtime_total: 0,
+      extension_tool_total: extensionTools.length,
+      extension_tool_visible_total: extensionTools.filter(
+        (entry) => entry.visible_in_context,
+      ).length,
+      mcp_server_total: surface.browser_assist ? 1 : 0,
+      mcp_tool_total: mcpTools.length,
+      mcp_tool_visible_total: mcpTools.filter(
+        (entry) => entry.visible_in_context,
+      ).length,
+    },
+    catalog_tools: catalogTools,
+    registry_tools: registryTools,
+    extension_surfaces: extensionSurfaces,
+    extension_tools: extensionTools,
+    mcp_tools: mcpTools,
+  };
+}
+
+function createDefaultCompanionPetStatus(): CompanionPetStatus {
+  return {
+    endpoint: "ws://127.0.0.1:45554/companion/pet",
+    server_listening: true,
+    connected: false,
+    client_id: null,
+    platform: null,
+    capabilities: [] as string[],
+    last_event: null,
+    last_error: null,
+    last_state: null as
+      | "hidden"
+      | "idle"
+      | "walking"
+      | "thinking"
+      | "done"
+      | null,
+  };
+}
+
+let mockCompanionPetStatus = createDefaultCompanionPetStatus();
+
 // 默认 mock 数据
 const defaultMocks: Record<string, any> = {
+  companion_get_pet_status: () => ({
+    ...mockCompanionPetStatus,
+    capabilities: [...mockCompanionPetStatus.capabilities],
+  }),
+  companion_launch_pet: (args?: Record<string, unknown>) => {
+    const request =
+      (args?.request as Record<string, unknown> | undefined) ?? args ?? {};
+    const endpoint =
+      typeof request.endpoint === "string" && request.endpoint.trim()
+        ? request.endpoint
+        : mockCompanionPetStatus.endpoint;
+
+    mockCompanionPetStatus = {
+      ...mockCompanionPetStatus,
+      endpoint,
+      server_listening: true,
+      last_event: "pet.launch_requested",
+      last_error: null,
+    };
+
+    return {
+      launched: true,
+      resolved_path:
+        typeof request.app_path === "string" ? request.app_path : null,
+      endpoint,
+      message: null,
+    };
+  },
+  companion_send_pet_command: (args?: Record<string, unknown>) => {
+    const request =
+      (args?.request as Record<string, unknown> | undefined) ?? args ?? {};
+    const event =
+      typeof request.event === "string" ? request.event : "pet.show_bubble";
+    const payload =
+      (request.payload as Record<string, unknown> | undefined) ?? {};
+
+    let lastState = mockCompanionPetStatus.last_state;
+    if (event === "pet.hide") {
+      lastState = "hidden";
+    } else if (event === "pet.show") {
+      lastState = "walking";
+    } else if (
+      event === "pet.state_changed" &&
+      typeof payload.state === "string"
+    ) {
+      lastState = payload.state as
+        | "hidden"
+        | "idle"
+        | "walking"
+        | "thinking"
+        | "done";
+    }
+
+    mockCompanionPetStatus = {
+      ...mockCompanionPetStatus,
+      last_event: event,
+      last_error: null,
+      last_state: lastState,
+    };
+
+    return {
+      delivered: true,
+      connected: mockCompanionPetStatus.connected,
+    };
+  },
   // 配置相关
   get_config: () => ({
     server: {
@@ -2795,39 +3142,13 @@ const defaultMocks: Record<string, any> = {
       },
     ],
   }),
-  agent_runtime_get_tool_inventory: () => ({
-    request: {
-      caller: "assistant",
-      surface: { workbench: false, browser_assist: false },
-    },
-    agent_initialized: false,
-    warnings: [],
-    mcp_servers: [],
-    default_allowed_tools: ["ToolSearch"],
-    counts: {
-      catalog_total: 0,
-      catalog_current_total: 0,
-      catalog_compat_total: 0,
-      catalog_deprecated_total: 0,
-      default_allowed_total: 1,
-      registry_total: 0,
-      registry_visible_total: 0,
-      registry_catalog_unmapped_total: 0,
-      extension_surface_total: 0,
-      extension_mcp_bridge_total: 0,
-      extension_runtime_total: 0,
-      extension_tool_total: 0,
-      extension_tool_visible_total: 0,
-      mcp_server_total: 0,
-      mcp_tool_total: 0,
-      mcp_tool_visible_total: 0,
-    },
-    catalog_tools: [],
-    registry_tools: [],
-    extension_surfaces: [],
-    extension_tools: [],
-    mcp_tools: [],
-  }),
+  agent_runtime_get_tool_inventory: (args?: {
+    request?: {
+      caller?: string;
+      workbench?: boolean;
+      browserAssist?: boolean;
+    };
+  }) => buildMockAgentRuntimeToolInventory(args?.request),
   agent_runtime_spawn_subagent: () => ({
     agent_id: "mock-subagent-session",
     nickname: "Mock Subagent",
@@ -2861,7 +3182,6 @@ const defaultMocks: Record<string, any> = {
   terminal_close: () => ({}),
   read_terminal_output: () => [],
   list_terminal_sessions: () => [],
-
   // 技能相关
   get_all_skills: () => [],
   get_skills_for_app: () => [],
@@ -3231,7 +3551,16 @@ const defaultMocks: Record<string, any> = {
 
   // 模型相关
   get_model_registry: () => [],
-  get_model_registry_provider_ids: () => [],
+  get_model_registry_provider_ids: () => [
+    "openai",
+    "anthropic",
+    "google",
+    "codex",
+    "azure",
+    "google-vertex",
+    "amazon-bedrock",
+    "ollama-cloud",
+  ],
   refresh_model_registry: () => ({ success: true }),
   search_models: () => [],
   get_all_provider_models: () => ({}),