feat(grokbuild): add Grok Official provider with official-state import

Add a "Grok Official" preset and seed (grokbuild-official) whose empty
config represents the official login state: no custom [model.*] tables
are written, so Grok CLI falls back to its built-in xAI OAuth login and
cc-switch never touches those credentials.

Backend:
- Seed entry in OFFICIAL_SEEDS plus ensure_grokbuild_official_provider
  command for on-demand repair (the one-shot master seeding flag is
  already set for existing databases).
- Split validation into syntax-only (empty allowed) for live reads,
  writes and official snapshots, keeping the full custom-model shape
  check for non-official provider writes and imports. Backup/restore
  can now round-trip an official-state live file.
- Manual import (command layer only) recognizes an official-state live
  config and imports it as the official entry set as current, matching
  the Codex official-login import outcome. Startup auto-import keeps
  rejecting official-state live so a deleted official entry is never
  resurrected on launch: startup import only captures real user data
  as "default" and never manufactures official entries.
- Manual import also ensures the official entry before importing
  (claude-desktop precedent) and after a successful custom import, so
  first-time users end up with default + official like other apps.
- Proxy takeover guards skip or reject official-state live configs in
  all three takeover paths, consistent with the official-provider
  takeover ban.

Frontend:
- Grok Official preset entry in the GrokBuild form: official category
  hides connection fields and passes the raw config through untouched.
- Filter managed-OAuth presets out of the GrokBuild preset list; they
  were never wired for this app and produced keyless broken configs.

Tests cover seed presence, official round-trip, ensure-after-deletion,
and the four import scenarios including startup non-resurrection.
This commit is contained in:
Jason
2026-07-21 15:31:27 +08:00
parent a5aa1fd82b
commit f733def452
16 changed files with 700 additions and 144 deletions
+51
View File
@@ -117,6 +117,46 @@ pub async fn switch_provider(
}
fn import_default_config_internal(state: &AppState, app_type: AppType) -> Result<bool, AppError> {
if matches!(app_type, AppType::GrokBuild) {
// 官方登录态(live 语法合法且无自定义模型表)+ 用户手动导入:
// 导入的正确结果是让 Grok Official 成为当前供应商,而非报错。
// 只挂在命令层 = 只有手动动作可达;启动自动导入走 service 层、
// 官方态照旧报错静默跳过,删掉的官方条目不会被重启复活
//(全项目惯例:启动自动导入只产出 default,从不产出官方条目)。
if let Ok(settings) = crate::grok_config::read_grok_live_settings() {
let config = settings
.get("config")
.and_then(serde_json::Value::as_str)
.unwrap_or_default();
if crate::grok_config::is_official_live_config(config) {
state.db.ensure_official_seed_by_id(
crate::database::GROKBUILD_OFFICIAL_PROVIDER_ID,
AppType::GrokBuild,
)?;
state.db.set_current_provider(
app_type.as_str(),
crate::database::GROKBUILD_OFFICIAL_PROVIDER_ID,
)?;
crate::settings::set_current_provider(
&app_type,
Some(crate::database::GROKBUILD_OFFICIAL_PROVIDER_ID),
)?;
return Ok(true);
}
}
// Safety net: 与 claude-desktop 导入同语义 —— 用户主动点导入是"重新
// 整理该表"的隐式信号,把官方入口补回来。覆盖导入必然失败的场景
//live 文件缺失 / TOML 语法错误 / 残缺的自定义配置),避免
// "报错 + 空列表"死胡同。失败只 warn,不影响导入主流程。
if let Err(e) = state.db.ensure_official_seed_by_id(
crate::database::GROKBUILD_OFFICIAL_PROVIDER_ID,
AppType::GrokBuild,
) {
log::warn!("Failed to ensure grokbuild-official seed during import: {e}");
}
}
let imported = ProviderService::import_default_config(state, app_type.clone())?;
if imported {
@@ -246,6 +286,17 @@ pub fn ensure_codex_official_provider(state: State<'_, AppState>) -> Result<bool
.map_err(|e| e.to_string())
}
#[tauri::command]
pub fn ensure_grokbuild_official_provider(state: State<'_, AppState>) -> Result<bool, String> {
state
.db
.ensure_official_seed_by_id(
crate::database::GROKBUILD_OFFICIAL_PROVIDER_ID,
AppType::GrokBuild,
)
.map_err(|e| e.to_string())
}
fn claude_provider_models_are_claude_safe(provider: &Provider) -> bool {
let Some(env) = provider
.settings_config