refactor: remove OMO common config two-layer merge system

Each OMO provider now stores its complete configuration directly in settings_config.otherFields instead of relying on a shared OmoGlobalConfig merged at write time. This simplifies the data flow from a 4-tuple (agents, categories, otherFields, useCommonConfig) to a 3-tuple and eliminates an entire DB table, two Tauri commands, and ~1700 lines of merge/sync code across frontend and backend. Backend: - Delete database/dao/omo.rs (OmoGlobalConfig struct + get/save methods) - Remove get/set_config_snippet from settings DAO - Remove get/set_common_config_snippet Tauri commands - Replace merge_config() with build_config() in services/omo.rs - Simplify OmoVariant (remove config_key, known_keys) - Simplify import_from_local and build_local_file_data - Rewrite all OMO service tests Frontend: - Delete OmoCommonConfigEditor.tsx and OmoGlobalConfigFields.tsx - Delete src/lib/api/config.ts - Remove OmoGlobalConfig type and merge preview functions - Remove useGlobalConfig/useSaveGlobalConfig query hooks - Simplify useOmoDraftState (remove all common config state) - Replace OmoCommonConfigEditor with read-only JsonEditor preview - Clean i18n keys (zh/en/ja)
2026-05-13 15:51:44 +08:00 · 2026-02-26 19:31:43 +08:00
parent 3e9815f5d2
commit e7766d4d22
21 changed files with 74 additions and 1733 deletions
@@ -7,7 +7,6 @@ use tauri_plugin_opener::OpenerExt;
 use crate::app_config::AppType;
 use crate::codex_config;
 use crate::config::{self, get_claude_settings_path, ConfigStatus};
-use crate::settings;

 #[tauri::command]
 pub async fn get_claude_config_status() -> Result<ConfigStatus, String> {
@@ -16,18 +15,6 @@ pub async fn get_claude_config_status() -> Result<ConfigStatus, String> {

 use std::str::FromStr;

-fn invalid_json_format_error(error: serde_json::Error) -> String {
-    let lang = settings::get_settings()
-        .language
-        .unwrap_or_else(|| "zh".to_string());
-
-    match lang.as_str() {
-        "en" => format!("Invalid JSON format: {error}"),
-        "ja" => format!("JSON形式が無効です: {error}"),
-        _ => format!("无效的 JSON 格式: {error}"),
-    }
-}
-
 #[tauri::command]
 pub async fn get_config_status(app: String) -> Result<ConfigStatus, String> {
    match AppType::from_str(&app).map_err(|e| e.to_string())? {
@@ -163,71 +150,3 @@ pub async fn open_app_config_folder(handle: AppHandle) -> Result<bool, String> {

    Ok(true)
 }
-
-#[tauri::command]
-pub async fn get_common_config_snippet(
-    app_type: String,
-    state: tauri::State<'_, crate::store::AppState>,
-) -> Result<Option<String>, String> {
-    state
-        .db
-        .get_config_snippet(&app_type)
-        .map_err(|e| e.to_string())
-}
-
-#[tauri::command]
-pub async fn set_common_config_snippet(
-    app_type: String,
-    snippet: String,
-    state: tauri::State<'_, crate::store::AppState>,
-) -> Result<(), String> {
-    if !snippet.trim().is_empty() {
-        match app_type.as_str() {
-            "claude" | "gemini" | "omo" | "omo-slim" => {
-                serde_json::from_str::<serde_json::Value>(&snippet)
-                    .map_err(invalid_json_format_error)?;
-            }
-            "codex" => {}
-            _ => {}
-        }
-    }
-
-    let value = if snippet.trim().is_empty() {
-        None
-    } else {
-        Some(snippet)
-    };
-
-    state
-        .db
-        .set_config_snippet(&app_type, value)
-        .map_err(|e| e.to_string())?;
-
-    if app_type == "omo"
-        && state
-            .db
-            .get_current_omo_provider("opencode", "omo")
-            .map_err(|e| e.to_string())?
-            .is_some()
-    {
-        crate::services::OmoService::write_config_to_file(
-            state.inner(),
-            &crate::services::omo::STANDARD,
-        )
-        .map_err(|e| e.to_string())?;
-    }
-    if app_type == "omo-slim"
-        && state
-            .db
-            .get_current_omo_provider("opencode", "omo-slim")
-            .map_err(|e| e.to_string())?
-            .is_some()
-    {
-        crate::services::OmoService::write_config_to_file(
-            state.inner(),
-            &crate::services::omo::SLIM,
-        )
-        .map_err(|e| e.to_string())?;
-    }
-    Ok(())
-}
@@ -4,7 +4,6 @@

 pub mod failover;
 pub mod mcp;
-pub mod omo;
 pub mod prompts;
 pub mod providers;
 pub mod proxy;
@@ -16,4 +15,3 @@ pub mod universal_providers;
 // 所有 DAO 方法都通过 Database impl 提供，无需单独导出
 // 导出 FailoverQueueItem 供外部使用
 pub use failover::FailoverQueueItem;
-pub use omo::OmoGlobalConfig;
@@ -1,77 +0,0 @@
-use crate::database::Database;
-use crate::error::AppError;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct OmoGlobalConfig {
-    pub id: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub schema_url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub sisyphus_agent: Option<serde_json::Value>,
-    #[serde(default)]
-    pub disabled_agents: Vec<String>,
-    #[serde(default)]
-    pub disabled_mcps: Vec<String>,
-    #[serde(default)]
-    pub disabled_hooks: Vec<String>,
-    #[serde(default)]
-    pub disabled_skills: Vec<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub lsp: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub experimental: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub background_task: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub browser_automation_engine: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub claude_code: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub other_fields: Option<serde_json::Value>,
-    pub updated_at: String,
-}
-
-impl Default for OmoGlobalConfig {
-    fn default() -> Self {
-        Self {
-            id: "global".to_string(),
-            schema_url: None,
-            sisyphus_agent: None,
-            disabled_agents: vec![],
-            disabled_mcps: vec![],
-            disabled_hooks: vec![],
-            disabled_skills: vec![],
-            lsp: None,
-            experimental: None,
-            background_task: None,
-            browser_automation_engine: None,
-            claude_code: None,
-            other_fields: None,
-            updated_at: chrono::Utc::now().to_rfc3339(),
-        }
-    }
-}
-
-impl Database {
-    pub fn get_omo_global_config(&self, key: &str) -> Result<OmoGlobalConfig, AppError> {
-        let json_str = self.get_setting(key)?;
-        match json_str {
-            Some(s) => serde_json::from_str::<OmoGlobalConfig>(&s)
-                .map_err(|e| AppError::Config(format!("Failed to parse {key}: {e}"))),
-            None => Ok(OmoGlobalConfig::default()),
-        }
-    }
-
-    pub fn save_omo_global_config(
-        &self,
-        key: &str,
-        config: &OmoGlobalConfig,
-    ) -> Result<(), AppError> {
-        let json_str = serde_json::to_string(config)
-            .map_err(|e| AppError::Config(format!("JSON serialization failed: {e}")))?;
-        self.set_setting(key, &json_str)?;
-        Ok(())
-    }
-}
@@ -38,31 +38,6 @@ impl Database {
        Ok(())
    }

-    // --- Config Snippets 辅助方法 ---
-
-    /// 获取通用配置片段
-    pub fn get_config_snippet(&self, app_type: &str) -> Result<Option<String>, AppError> {
-        self.get_setting(&format!("common_config_{app_type}"))
-    }
-
-    /// 设置通用配置片段
-    pub fn set_config_snippet(
-        &self,
-        app_type: &str,
-        snippet: Option<String>,
-    ) -> Result<(), AppError> {
-        let key = format!("common_config_{app_type}");
-        if let Some(value) = snippet {
-            self.set_setting(&key, &value)
-        } else {
-            // 如果为 None 则删除
-            let conn = lock_conn!(self.conn);
-            conn.execute("DELETE FROM settings WHERE key = ?1", params![key])
-                .map_err(|e| AppError::Database(e.to_string()))?;
-            Ok(())
-        }
-    }
-
    // --- 全局出站代理 ---

    /// 全局代理 URL 的存储键名
@@ -33,7 +33,6 @@ mod tests;

 // DAO 类型导出供外部使用
 pub use dao::FailoverQueueItem;
-pub use dao::OmoGlobalConfig;

 use crate::config::get_app_config_dir;
 use crate::error::AppError;
@@ -845,8 +845,6 @@ pub fn run() {
            commands::get_skills_migration_result,
            commands::get_app_config_path,
            commands::open_app_config_folder,
-            commands::get_common_config_snippet,
-            commands::set_common_config_snippet,
            commands::read_live_provider_settings,
            commands::patch_claude_live_settings,
            commands::get_settings,
@@ -1,5 +1,4 @@
 use crate::config::write_json_file;
-use crate::database::OmoGlobalConfig;
 use crate::error::AppError;
 use crate::opencode_config::get_opencode_dir;
 use crate::store::AppState;
@@ -13,12 +12,11 @@ pub struct OmoLocalFileData {
    pub agents: Option<Value>,
    pub categories: Option<Value>,
    pub other_fields: Option<Value>,
-    pub global: OmoGlobalConfig,
    pub file_path: String,
    pub last_modified: Option<String>,
 }

-type OmoProfileData = (Option<Value>, Option<Value>, Option<Value>, bool);
+type OmoProfileData = (Option<Value>, Option<Value>, Option<Value>);

 // ── Variant descriptor ─────────────────────────────────────────

@@ -28,9 +26,7 @@ pub struct OmoVariant {
    pub provider_prefix: &'static str,
    pub plugin_name: &'static str,
    pub plugin_prefix: &'static str,
-    pub known_keys: &'static [&'static str],
    pub has_categories: bool,
-    pub config_key: &'static str,
    pub label: &'static str,
    pub import_label: &'static str,
 }
@@ -41,23 +37,7 @@ pub const STANDARD: OmoVariant = OmoVariant {
    provider_prefix: "omo-",
    plugin_name: "oh-my-opencode@latest",
    plugin_prefix: "oh-my-opencode",
-    known_keys: &[
-        "$schema",
-        "agents",
-        "categories",
-        "sisyphus_agent",
-        "disabled_agents",
-        "disabled_mcps",
-        "disabled_hooks",
-        "disabled_skills",
-        "lsp",
-        "experimental",
-        "background_task",
-        "browser_automation_engine",
-        "claude_code",
-    ],
    has_categories: true,
-    config_key: "common_config_omo",
    label: "OMO",
    import_label: "Imported",
 };
@@ -68,18 +48,7 @@ pub const SLIM: OmoVariant = OmoVariant {
    provider_prefix: "omo-slim-",
    plugin_name: "oh-my-opencode-slim@latest",
    plugin_prefix: "oh-my-opencode-slim",
-    known_keys: &[
-        "$schema",
-        "agents",
-        "sisyphus_agent",
-        "disabled_agents",
-        "disabled_mcps",
-        "disabled_hooks",
-        "lsp",
-        "experimental",
-    ],
    has_categories: false,
-    config_key: "common_config_omo_slim",
    label: "OMO Slim",
    import_label: "Imported Slim",
 };
@@ -135,47 +104,6 @@ impl OmoService {
        other
    }

-    fn extract_string_array(val: &Value) -> Vec<String> {
-        val.as_array()
-            .map(|arr| {
-                arr.iter()
-                    .filter_map(|v| v.as_str().map(String::from))
-                    .collect()
-            })
-            .unwrap_or_default()
-    }
-
-    fn merge_global_from_obj(obj: &Map<String, Value>, global: &mut OmoGlobalConfig) {
-        if let Some(v) = obj.get("$schema") {
-            global.schema_url = v.as_str().map(|s| s.to_string());
-        }
-        for (key, target) in [
-            ("disabled_agents", &mut global.disabled_agents),
-            ("disabled_mcps", &mut global.disabled_mcps),
-            ("disabled_hooks", &mut global.disabled_hooks),
-            ("disabled_skills", &mut global.disabled_skills),
-        ] {
-            if let Some(v) = obj.get(key) {
-                *target = Self::extract_string_array(v);
-            }
-        }
-        for (key, target) in [
-            ("sisyphus_agent", &mut global.sisyphus_agent),
-            ("lsp", &mut global.lsp),
-            ("experimental", &mut global.experimental),
-            ("background_task", &mut global.background_task),
-            (
-                "browser_automation_engine",
-                &mut global.browser_automation_engine,
-            ),
-            ("claude_code", &mut global.claude_code),
-        ] {
-            if let Some(v) = obj.get(key) {
-                *target = Some(v.clone());
-            }
-        }
-    }
-
    // ── Merge helpers ──────────────────────────────────────

    fn insert_opt_value(result: &mut Map<String, Value>, key: &str, value: &Option<Value>) {
@@ -184,15 +112,6 @@ impl OmoService {
        }
    }

-    fn insert_string_array(result: &mut Map<String, Value>, key: &str, values: &[String]) {
-        if !values.is_empty() {
-            result.insert(
-                key.to_string(),
-                serde_json::to_value(values).unwrap_or(Value::Array(vec![])),
-            );
-        }
-    }
-
    fn insert_object_entries(result: &mut Map<String, Value>, value: Option<&Value>) {
        if let Some(Value::Object(map)) = value {
            for (k, v) in map {
@@ -214,9 +133,7 @@ impl OmoService {
    }

    pub fn write_config_to_file(state: &AppState, v: &OmoVariant) -> Result<(), AppError> {
-        let global = state.db.get_omo_global_config(v.config_key)?;
        let current_omo = state.db.get_current_omo_provider("opencode", v.category)?;
-
        let profile_data = current_omo.as_ref().map(|p| {
            let agents = p.settings_config.get("agents").cloned();
            let categories = if v.has_categories {
@@ -225,15 +142,10 @@ impl OmoService {
                None
            };
            let other_fields = p.settings_config.get("otherFields").cloned();
-            let use_common_config = p
-                .settings_config
-                .get("useCommonConfig")
-                .and_then(|val| val.as_bool())
-                .unwrap_or(true);
-            (agents, categories, other_fields, use_common_config)
+            (agents, categories, other_fields)
        });

-        let merged = Self::merge_config(v, &global, profile_data.as_ref());
+        let merged = Self::build_config(v, profile_data.as_ref());
        let config_path = Self::config_path(v);

        if let Some(parent) = config_path.parent() {
@@ -241,56 +153,20 @@ impl OmoService {
        }

        write_json_file(&config_path, &merged)?;
-
        crate::opencode_config::add_plugin(v.plugin_name)?;
-
        log::info!("{} config written to {config_path:?}", v.label);
        Ok(())
    }

-    fn merge_config(
-        v: &OmoVariant,
-        global: &OmoGlobalConfig,
-        profile_data: Option<&OmoProfileData>,
-    ) -> Value {
+    fn build_config(v: &OmoVariant, profile_data: Option<&OmoProfileData>) -> Value {
        let mut result = Map::new();
-        let use_common_config = profile_data.map(|(_, _, _, uc)| *uc).unwrap_or(true);
-
-        if use_common_config {
-            if let Some(url) = &global.schema_url {
-                result.insert("$schema".to_string(), Value::String(url.clone()));
-            }
-
-            Self::insert_opt_value(&mut result, "sisyphus_agent", &global.sisyphus_agent);
-            Self::insert_string_array(&mut result, "disabled_agents", &global.disabled_agents);
-            Self::insert_string_array(&mut result, "disabled_mcps", &global.disabled_mcps);
-            Self::insert_string_array(&mut result, "disabled_hooks", &global.disabled_hooks);
-
-            if v.has_categories {
-                Self::insert_string_array(&mut result, "disabled_skills", &global.disabled_skills);
-                Self::insert_opt_value(&mut result, "background_task", &global.background_task);
-                Self::insert_opt_value(
-                    &mut result,
-                    "browser_automation_engine",
-                    &global.browser_automation_engine,
-                );
-                Self::insert_opt_value(&mut result, "claude_code", &global.claude_code);
-            }
-
-            Self::insert_opt_value(&mut result, "lsp", &global.lsp);
-            Self::insert_opt_value(&mut result, "experimental", &global.experimental);
-
-            Self::insert_object_entries(&mut result, global.other_fields.as_ref());
-        }
-
-        if let Some((agents, categories, other_fields, _)) = profile_data {
+        if let Some((agents, categories, other_fields)) = profile_data {
+            Self::insert_object_entries(&mut result, other_fields.as_ref());
            Self::insert_opt_value(&mut result, "agents", agents);
            if v.has_categories {
                Self::insert_opt_value(&mut result, "categories", categories);
            }
-            Self::insert_object_entries(&mut result, other_fields.as_ref());
        }
-
        Value::Object(result)
    }

@@ -310,18 +186,12 @@ impl OmoService {
                settings.insert("categories".to_string(), categories.clone());
            }
        }
-        settings.insert("useCommonConfig".to_string(), Value::Bool(true));

-        let other = Self::extract_other_fields_with_keys(&obj, v.known_keys);
+        let other = Self::extract_other_fields_with_keys(&obj, &["agents", "categories"]);
        if !other.is_empty() {
            settings.insert("otherFields".to_string(), Value::Object(other));
        }

-        let mut global = state.db.get_omo_global_config(v.config_key)?;
-        Self::merge_global_from_obj(&obj, &mut global);
-        global.updated_at = chrono::Utc::now().to_rfc3339();
-        state.db.save_omo_global_config(v.config_key, &global)?;
-
        let provider_id = format!("{}{}", v.provider_prefix, uuid::Uuid::new_v4());
        let name = format!(
            "{} {}",
@@ -384,22 +254,17 @@ impl OmoService {
            None
        };

-        let other = Self::extract_other_fields_with_keys(obj, v.known_keys);
+        let other = Self::extract_other_fields_with_keys(obj, &["agents", "categories"]);
        let other_fields = if other.is_empty() {
            None
        } else {
            Some(Value::Object(other))
        };

-        let mut global = OmoGlobalConfig::default();
-        Self::merge_global_from_obj(obj, &mut global);
-        global.other_fields = other_fields.clone();
-
        OmoLocalFileData {
            agents,
            categories,
            other_fields,
-            global,
            file_path,
            last_modified,
        }
@@ -482,26 +347,24 @@ mod tests {
    }

    #[test]
-    fn test_merge_config_empty() {
-        let global = OmoGlobalConfig::default();
-        let merged = OmoService::merge_config(&STANDARD, &global, None);
+    fn test_build_config_empty() {
+        let merged = OmoService::build_config(&STANDARD, None);
        assert!(merged.is_object());
+        assert!(merged.as_object().unwrap().is_empty());
    }

    #[test]
-    fn test_merge_config_with_profile() {
-        let global = OmoGlobalConfig {
-            schema_url: Some("https://example.com/schema.json".to_string()),
-            disabled_agents: vec!["explore".to_string()],
-            ..Default::default()
-        };
+    fn test_build_config_with_profile() {
        let agents = Some(serde_json::json!({
            "sisyphus": { "model": "claude-opus-4-5" }
        }));
        let categories = None;
-        let other_fields = None;
-        let profile_data = (agents, categories, other_fields, true);
-        let merged = OmoService::merge_config(&STANDARD, &global, Some(&profile_data));
+        let other_fields = Some(serde_json::json!({
+            "$schema": "https://example.com/schema.json",
+            "disabled_agents": ["explore"]
+        }));
+        let profile_data = (agents, categories, other_fields);
+        let merged = OmoService::build_config(&STANDARD, Some(&profile_data));
        let obj = merged.as_object().unwrap();

        assert_eq!(obj["$schema"], "https://example.com/schema.json");
@@ -511,28 +374,7 @@ mod tests {
    }

    #[test]
-    fn test_merge_config_without_common_config() {
-        let global = OmoGlobalConfig {
-            schema_url: Some("https://example.com/schema.json".to_string()),
-            disabled_agents: vec!["explore".to_string()],
-            ..Default::default()
-        };
-        let agents = Some(serde_json::json!({
-            "sisyphus": { "model": "claude-opus-4-5" }
-        }));
-        let categories = None;
-        let other_fields = None;
-        let profile_data = (agents, categories, other_fields, false);
-        let merged = OmoService::merge_config(&STANDARD, &global, Some(&profile_data));
-        let obj = merged.as_object().unwrap();
-
-        assert!(!obj.contains_key("$schema"));
-        assert!(!obj.contains_key("disabled_agents"));
-        assert!(obj.contains_key("agents"));
-    }
-
-    #[test]
-    fn test_build_local_file_data_keeps_unknown_top_level_fields_in_global() {
+    fn test_build_local_file_data_keeps_all_non_agent_category_fields_in_other() {
        let obj = serde_json::json!({
            "$schema": "https://example.com/schema.json",
            "disabled_agents": ["oracle"],
@@ -555,64 +397,53 @@ mod tests {
            None,
        );

+        // All non-agents/categories fields should be in other_fields
+        let other = data.other_fields.unwrap();
+        let other_obj = other.as_object().unwrap();
        assert_eq!(
-            data.global.schema_url.as_deref(),
-            Some("https://example.com/schema.json")
+            other_obj.get("$schema").unwrap(),
+            "https://example.com/schema.json"
        );
-        assert_eq!(data.global.disabled_agents, vec!["oracle".to_string()]);
-
        assert_eq!(
-            data.other_fields,
-            Some(serde_json::json!({
-                "custom_top_level": { "enabled": true }
-            }))
+            other_obj.get("disabled_agents").unwrap(),
+            &serde_json::json!(["oracle"])
        );
-        assert_eq!(data.global.other_fields, data.other_fields);
+        assert_eq!(
+            other_obj.get("custom_top_level").unwrap(),
+            &serde_json::json!({"enabled": true})
+        );
+        // agents and categories should NOT be in other_fields
+        assert!(!other_obj.contains_key("agents"));
+        assert!(!other_obj.contains_key("categories"));
    }

    #[test]
-    fn test_merge_config_ignores_non_object_other_fields() {
-        let global = OmoGlobalConfig {
-            other_fields: Some(serde_json::json!(["global_non_object"])),
-            ..Default::default()
-        };
+    fn test_build_config_ignores_non_object_other_fields() {
        let agents = None;
        let categories = None;
        let other_fields = Some(serde_json::json!("profile_non_object"));
-        let profile_data = (agents, categories, other_fields, true);
+        let profile_data = (agents, categories, other_fields);

-        let merged = OmoService::merge_config(&STANDARD, &global, Some(&profile_data));
+        let merged = OmoService::build_config(&STANDARD, Some(&profile_data));
        let obj = merged.as_object().unwrap();

-        assert!(!obj.contains_key("0"));
-        assert!(!obj.contains_key("global_non_object"));
        assert!(!obj.contains_key("profile_non_object"));
    }

    #[test]
-    fn test_merge_config_slim_excludes_categories_and_extra_fields() {
-        let global = OmoGlobalConfig {
-            schema_url: Some("https://slim.schema".to_string()),
-            disabled_agents: vec!["oracle".to_string()],
-            disabled_skills: vec!["playwright".to_string()],
-            background_task: Some(serde_json::json!({"key": "val"})),
-            browser_automation_engine: Some(serde_json::json!({"provider": "pw"})),
-            claude_code: Some(serde_json::json!({"mcp": true})),
-            ..Default::default()
-        };
+    fn test_build_config_slim_excludes_categories() {
        let agents = Some(serde_json::json!({"orchestrator": {"model": "k2"}}));
        let categories = Some(serde_json::json!({"code": {"model": "gpt"}}));
-        let other_fields = None;
-        let profile_data = (agents, categories, other_fields, true);
+        let other_fields = Some(serde_json::json!({
+            "$schema": "https://slim.schema",
+            "disabled_agents": ["oracle"]
+        }));
+        let profile_data = (agents, categories, other_fields);

-        let merged = OmoService::merge_config(&SLIM, &global, Some(&profile_data));
+        let merged = OmoService::build_config(&SLIM, Some(&profile_data));
        let obj = merged.as_object().unwrap();

-        // Slim should NOT include these
-        assert!(!obj.contains_key("disabled_skills"));
-        assert!(!obj.contains_key("background_task"));
-        assert!(!obj.contains_key("browser_automation_engine"));
-        assert!(!obj.contains_key("claude_code"));
+        // Slim should NOT include categories
        assert!(!obj.contains_key("categories"));

        // Slim SHOULD include these
@@ -525,9 +525,8 @@ impl ProviderService {
                .set_omo_provider_current(app_type.as_str(), id, "omo-slim")?;
            crate::services::OmoService::write_config_to_file(state, &crate::services::omo::SLIM)?;
            // OMO ↔ OMO Slim mutually exclusive: remove Standard config
-            let _ = crate::services::OmoService::delete_config_file(
-                &crate::services::omo::STANDARD,
-            );
+            let _ =
+                crate::services::OmoService::delete_config_file(&crate::services::omo::STANDARD);
            return Ok(SwitchResult::default());
        }

@@ -1,164 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { useEffect, useState } from "react";
-import { FullScreenPanel } from "@/components/common/FullScreenPanel";
-import { Label } from "@/components/ui/label";
-import { Button } from "@/components/ui/button";
-import { Save, FolderInput, Loader2 } from "lucide-react";
-import JsonEditor from "@/components/JsonEditor";
-import {
-  OmoGlobalConfigFields,
-  type OmoGlobalConfigFieldsRef,
-} from "./OmoGlobalConfigFields";
-import type { OmoGlobalConfig } from "@/types/omo";
-
-interface OmoCommonConfigEditorProps {
-  previewValue: string;
-  useCommonConfig: boolean;
-  onCommonConfigToggle: (checked: boolean) => void;
-  isModalOpen: boolean;
-  onEditClick: () => void;
-  onModalClose: () => void;
-  onSave: () => Promise<void>;
-  isSaving: boolean;
-  onGlobalConfigStateChange: (config: OmoGlobalConfig) => void;
-  globalConfigRef: React.RefObject<OmoGlobalConfigFieldsRef | null>;
-  fieldsKey: number;
-  isSlim?: boolean;
-}
-
-export function OmoCommonConfigEditor({
-  previewValue,
-  useCommonConfig,
-  onCommonConfigToggle,
-  isModalOpen,
-  onEditClick,
-  onModalClose,
-  onSave,
-  isSaving,
-  onGlobalConfigStateChange,
-  globalConfigRef,
-  fieldsKey,
-  isSlim = false,
-}: OmoCommonConfigEditorProps) {
-  const { t } = useTranslation();
-  const [isDarkMode, setIsDarkMode] = useState(false);
-  const [isImporting, setIsImporting] = useState(false);
-  useEffect(() => {
-    const syncDarkMode = () =>
-      setIsDarkMode(document.documentElement.classList.contains("dark"));
-    syncDarkMode();
-    const observer = new MutationObserver(syncDarkMode);
-    observer.observe(document.documentElement, {
-      attributes: true,
-      attributeFilter: ["class"],
-    });
-    return () => observer.disconnect();
-  }, []);
-  const handleImportLocal = async () => {
-    if (!globalConfigRef.current) return;
-    setIsImporting(true);
-    try {
-      await globalConfigRef.current.importFromLocal();
-    } finally {
-      setIsImporting(false);
-    }
-  };
-  return (
-    <>
-      <div className="space-y-2">
-        <div className="flex items-center justify-between">
-          <Label>{t("provider.configJson")}</Label>
-          <div className="flex items-center gap-2">
-            <label className="inline-flex items-center gap-2 text-sm text-muted-foreground cursor-pointer">
-              <input
-                type="checkbox"
-                checked={useCommonConfig}
-                onChange={(e) => onCommonConfigToggle(e.target.checked)}
-                className="w-4 h-4 text-blue-500 bg-white dark:bg-gray-800 border-border-default rounded focus:ring-blue-500 dark:focus:ring-blue-400 focus:ring-2"
-              />
-              <span>
-                {t("omo.writeCommonConfig", {
-                  defaultValue: "Write to common config",
-                })}
-              </span>
-            </label>
-          </div>
-        </div>
-        <div className="flex items-center justify-end">
-          <button
-            type="button"
-            onClick={onEditClick}
-            className="text-xs text-blue-400 dark:text-blue-500 hover:text-blue-500 dark:hover:text-blue-400 transition-colors"
-          >
-            {t("omo.editCommonConfig", { defaultValue: "Edit common config" })}
-          </button>
-        </div>
-        <JsonEditor
-          value={previewValue}
-          onChange={() => {}}
-          darkMode={isDarkMode}
-          rows={14}
-          showValidation={false}
-          language="json"
-        />
-      </div>
-      <FullScreenPanel
-        isOpen={isModalOpen}
-        title={t("omo.editCommonConfigTitle", {
-          defaultValue: "Edit OMO Common Config",
-        })}
-        onClose={onModalClose}
-        footer={
-          <>
-            <Button
-              type="button"
-              variant="outline"
-              onClick={handleImportLocal}
-              disabled={isImporting}
-              className="gap-2"
-            >
-              {isImporting ? (
-                <Loader2 className="w-4 h-4 animate-spin" />
-              ) : (
-                <FolderInput className="w-4 h-4" />
-              )}
-              {t("common.import", { defaultValue: "Import" })}
-            </Button>
-            <Button type="button" variant="outline" onClick={onModalClose}>
-              {t("common.cancel")}
-            </Button>
-            <Button
-              type="button"
-              onClick={onSave}
-              disabled={isSaving}
-              className="gap-2"
-            >
-              {isSaving ? (
-                <Loader2 className="w-4 h-4 animate-spin" />
-              ) : (
-                <Save className="w-4 h-4" />
-              )}
-              {t("common.save")}
-            </Button>
-          </>
-        }
-      >
-        <div className="space-y-4">
-          <p className="text-sm text-muted-foreground">
-            {t("omo.commonConfigHint", {
-              defaultValue:
-                "OMO common config will be merged into all OMO configs that enable it",
-            })}
-          </p>
-          <OmoGlobalConfigFields
-            key={fieldsKey}
-            ref={globalConfigRef as React.Ref<OmoGlobalConfigFieldsRef>}
-            onStateChange={onGlobalConfigStateChange}
-            hideSaveButtons
-            isSlim={isSlim}
-          />
-        </div>
-      </FullScreenPanel>
-    </>
-  );
-}
@@ -1,773 +0,0 @@
-import {
-  useState,
-  useEffect,
-  useCallback,
-  forwardRef,
-  useImperativeHandle,
-} from "react";
-import { useTranslation } from "react-i18next";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Textarea } from "@/components/ui/textarea";
-import {
-  DropdownMenu,
-  DropdownMenuCheckboxItem,
-  DropdownMenuContent,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import {
-  Save,
-  Loader2,
-  X,
-  FolderInput,
-  RotateCcw,
-  ChevronsUpDown,
-} from "lucide-react";
-import { cn } from "@/lib/utils";
-import { toast } from "sonner";
-import type { OmoGlobalConfig } from "@/types/omo";
-import {
-  OMO_DISABLEABLE_AGENTS,
-  OMO_DISABLEABLE_MCPS,
-  OMO_DISABLEABLE_HOOKS,
-  OMO_DISABLEABLE_SKILLS,
-  OMO_DEFAULT_SCHEMA_URL,
-  OMO_SISYPHUS_AGENT_PLACEHOLDER,
-  OMO_LSP_PLACEHOLDER,
-  OMO_EXPERIMENTAL_PLACEHOLDER,
-  OMO_BACKGROUND_TASK_PLACEHOLDER,
-  OMO_BROWSER_AUTOMATION_PLACEHOLDER,
-  OMO_CLAUDE_CODE_PLACEHOLDER,
-  OMO_SLIM_DISABLEABLE_AGENTS,
-  OMO_SLIM_DISABLEABLE_MCPS,
-  OMO_SLIM_DISABLEABLE_HOOKS,
-  OMO_SLIM_DEFAULT_SCHEMA_URL,
-} from "@/types/omo";
-import {
-  useOmoGlobalConfig,
-  useSaveOmoGlobalConfig,
-  useReadOmoLocalFile,
-  useOmoSlimGlobalConfig,
-  useSaveOmoSlimGlobalConfig,
-  useReadOmoSlimLocalFile,
-} from "@/lib/query/omo";
-
-interface PresetOption {
-  readonly value: string;
-  readonly label: string;
-}
-
-export interface OmoGlobalConfigFieldsRef {
-  buildCurrentConfig: () => OmoGlobalConfig;
-  buildCurrentConfigStrict: () => OmoGlobalConfig;
-  importFromLocal: () => Promise<void>;
-}
-
-interface OmoGlobalConfigFieldsProps {
-  onStateChange?: (config: OmoGlobalConfig) => void;
-  hideSaveButtons?: boolean;
-  isSlim?: boolean;
-}
-
-type OmoAdvancedFieldKey =
-  | "lspStr"
-  | "experimentalStr"
-  | "backgroundTaskStr"
-  | "browserStr"
-  | "claudeCodeStr";
-
-const OMO_ADVANCED_JSON_FIELDS: ReadonlyArray<{
-  key: OmoAdvancedFieldKey;
-  labelKey: string;
-  defaultLabel: string;
-  placeholder: string;
-  minHeight: string;
-}> = [
-  {
-    key: "lspStr",
-    labelKey: "omo.advancedLsp",
-    defaultLabel: "LSP Config",
-    placeholder: OMO_LSP_PLACEHOLDER,
-    minHeight: "200px",
-  },
-  {
-    key: "experimentalStr",
-    labelKey: "omo.advancedExperimental",
-    defaultLabel: "Experimental Features",
-    placeholder: OMO_EXPERIMENTAL_PLACEHOLDER,
-    minHeight: "120px",
-  },
-  {
-    key: "backgroundTaskStr",
-    labelKey: "omo.advancedBackgroundTask",
-    defaultLabel: "Background Tasks",
-    placeholder: OMO_BACKGROUND_TASK_PLACEHOLDER,
-    minHeight: "250px",
-  },
-  {
-    key: "browserStr",
-    labelKey: "omo.advancedBrowserAutomation",
-    defaultLabel: "Browser Automation",
-    placeholder: OMO_BROWSER_AUTOMATION_PLACEHOLDER,
-    minHeight: "80px",
-  },
-  {
-    key: "claudeCodeStr",
-    labelKey: "omo.advancedClaudeCode",
-    defaultLabel: "Claude Code",
-    placeholder: OMO_CLAUDE_CODE_PLACEHOLDER,
-    minHeight: "180px",
-  },
-];
-
-const OMO_SLIM_ADVANCED_KEYS: ReadonlySet<OmoAdvancedFieldKey> = new Set([
-  "lspStr",
-  "experimentalStr",
-]);
-
-function TagListEditor({
-  label,
-  values,
-  onChange,
-  placeholder,
-  presets,
-}: {
-  label: string;
-  values: string[];
-  onChange: (values: string[]) => void;
-  placeholder?: string;
-  presets?: readonly PresetOption[];
-}) {
-  const { t } = useTranslation();
-  const [open, setOpen] = useState(false);
-  const [search, setSearch] = useState("");
-
-  const toggleValue = (v: string) => {
-    if (values.includes(v)) {
-      onChange(values.filter((x) => x !== v));
-    } else {
-      onChange([...values, v]);
-    }
-  };
-  const customValue = search.trim();
-  const canAddCustom = customValue.length > 0 && !values.includes(customValue);
-  const triggerText =
-    values.length === 0
-      ? placeholder || t("omo.selectPlaceholder", { defaultValue: "Select..." })
-      : values.length === 1
-        ? values[0]
-        : `${values[0]} +${values.length - 1}`;
-
-  const availablePresets = presets?.filter(
-    (p) =>
-      !search.trim() ||
-      p.label.toLowerCase().includes(search.toLowerCase()) ||
-      p.value.toLowerCase().includes(search.toLowerCase()),
-  );
-
-  return (
-    <div className="space-y-1.5">
-      <div className="flex items-center justify-between">
-        <Label className="text-sm">{label}</Label>
-        {values.length > 0 && (
-          <Button
-            type="button"
-            variant="ghost"
-            size="sm"
-            className="h-6 px-1.5 text-xs text-muted-foreground"
-            onClick={() => onChange([])}
-          >
-            {t("omo.clear", { defaultValue: "Clear" })}
-          </Button>
-        )}
-      </div>
-      {values.length > 0 && (
-        <div className="flex flex-wrap gap-1">
-          {values.map((v, i) => (
-            <Badge
-              key={`${v}-${i}`}
-              variant="secondary"
-              className="text-xs gap-1"
-            >
-              {v}
-              <button
-                type="button"
-                onClick={() => onChange(values.filter((_, idx) => idx !== i))}
-                className="hover:text-destructive"
-              >
-                <X className="h-3 w-3" />
-              </button>
-            </Badge>
-          ))}
-        </div>
-      )}
-      <DropdownMenu open={open} onOpenChange={setOpen} modal={false}>
-        <DropdownMenuTrigger asChild>
-          <button
-            type="button"
-            className={cn(
-              "flex items-center justify-between w-full h-8 px-3 rounded-md border border-input bg-background text-sm",
-              "hover:bg-accent hover:text-accent-foreground transition-colors",
-              open && "ring-2 ring-ring",
-            )}
-            aria-expanded={open}
-          >
-            <span
-              className={cn(
-                "truncate",
-                values.length > 0 ? "text-foreground" : "text-muted-foreground",
-              )}
-            >
-              {triggerText}
-            </span>
-            <ChevronsUpDown className="h-4 w-4 shrink-0 text-muted-foreground" />
-          </button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent
-          align="start"
-          sideOffset={6}
-          className="w-[var(--radix-dropdown-menu-trigger-width)] p-0 z-[120]"
-        >
-          <div className="p-1.5 border-b border-border/30">
-            <Input
-              value={search}
-              onChange={(e) => setSearch(e.target.value)}
-              onKeyDown={(e) => {
-                e.stopPropagation();
-                if (e.key === "Enter" && canAddCustom) {
-                  e.preventDefault();
-                  onChange([...values, customValue]);
-                  setSearch("");
-                }
-              }}
-              placeholder={
-                placeholder ||
-                t("omo.searchOrType", {
-                  defaultValue: "Search or type custom value...",
-                })
-              }
-              className="h-7 text-sm"
-              autoFocus
-            />
-          </div>
-          {canAddCustom && (
-            <button
-              type="button"
-              className="w-full px-2.5 py-1.5 text-left text-sm border-b border-border/30 hover:bg-accent"
-              onMouseDown={(e) => e.preventDefault()}
-              onClick={() => {
-                onChange([...values, customValue]);
-                setSearch("");
-              }}
-            >
-              + {customValue}
-            </button>
-          )}
-          <div className="max-h-48 overflow-auto py-1">
-            {availablePresets && availablePresets.length > 0 ? (
-              availablePresets.map((p) => {
-                const checked = values.includes(p.value);
-                return (
-                  <DropdownMenuCheckboxItem
-                    key={p.value}
-                    checked={checked}
-                    onSelect={(e) => e.preventDefault()}
-                    onCheckedChange={() => toggleValue(p.value)}
-                    className="text-sm"
-                  >
-                    {p.label}
-                  </DropdownMenuCheckboxItem>
-                );
-              })
-            ) : (
-              <div className="px-2.5 py-2 text-sm text-muted-foreground">
-                {t("omo.noMatches", { defaultValue: "No matches" })}
-              </div>
-            )}
-          </div>
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </div>
-  );
-}
-
-function JsonTextareaField({
-  label,
-  value,
-  onChange,
-  placeholder,
-  minHeight,
-}: {
-  label: string;
-  value: string;
-  onChange: (value: string) => void;
-  placeholder?: string;
-  minHeight?: string;
-}) {
-  return (
-    <div className="space-y-1.5">
-      <Label className="text-sm">{label}</Label>
-      <Textarea
-        value={value}
-        onChange={(e) => onChange(e.target.value)}
-        placeholder={placeholder || "{}"}
-        className="font-mono text-sm"
-        style={{ minHeight: minHeight || "100px" }}
-      />
-    </div>
-  );
-}
-
-export const OmoGlobalConfigFields = forwardRef<
-  OmoGlobalConfigFieldsRef,
-  OmoGlobalConfigFieldsProps
->(function OmoGlobalConfigFields(
-  { onStateChange, hideSaveButtons, isSlim = false },
-  ref,
-) {
-  const { t } = useTranslation();
-  const { data: standardConfig } = useOmoGlobalConfig(!isSlim);
-  const { data: slimConfig } = useOmoSlimGlobalConfig(isSlim);
-  const config = isSlim ? slimConfig : standardConfig;
-  const standardSaveMutation = useSaveOmoGlobalConfig();
-  const slimSaveMutation = useSaveOmoSlimGlobalConfig();
-  const saveMutation = isSlim ? slimSaveMutation : standardSaveMutation;
-  const standardReadLocal = useReadOmoLocalFile();
-  const slimReadLocal = useReadOmoSlimLocalFile();
-
-  const defaultSchemaUrl = isSlim
-    ? OMO_SLIM_DEFAULT_SCHEMA_URL
-    : OMO_DEFAULT_SCHEMA_URL;
-
-  const [schemaUrl, setSchemaUrl] = useState(defaultSchemaUrl);
-  const [sisyphusAgentStr, setSisyphusAgentStr] = useState("");
-  const [disabledAgents, setDisabledAgents] = useState<string[]>([]);
-  const [disabledMcps, setDisabledMcps] = useState<string[]>([]);
-  const [disabledHooks, setDisabledHooks] = useState<string[]>([]);
-  const [disabledSkills, setDisabledSkills] = useState<string[]>([]);
-  const [lspStr, setLspStr] = useState("");
-  const [experimentalStr, setExperimentalStr] = useState("");
-  const [backgroundTaskStr, setBackgroundTaskStr] = useState("");
-  const [browserStr, setBrowserStr] = useState("");
-  const [claudeCodeStr, setClaudeCodeStr] = useState("");
-  const [otherFieldsStr, setOtherFieldsStr] = useState("");
-  const [loaded, setLoaded] = useState(false);
-
-  const applyGlobalState = useCallback((global: OmoGlobalConfig) => {
-    setSchemaUrl(global.schemaUrl || defaultSchemaUrl);
-    setSisyphusAgentStr(
-      global.sisyphusAgent ? JSON.stringify(global.sisyphusAgent, null, 2) : "",
-    );
-    setDisabledAgents(global.disabledAgents || []);
-    setDisabledMcps(global.disabledMcps || []);
-    setDisabledHooks(global.disabledHooks || []);
-    setDisabledSkills(global.disabledSkills || []);
-    setLspStr(global.lsp ? JSON.stringify(global.lsp, null, 2) : "");
-    setExperimentalStr(
-      global.experimental ? JSON.stringify(global.experimental, null, 2) : "",
-    );
-    setBackgroundTaskStr(
-      global.backgroundTask
-        ? JSON.stringify(global.backgroundTask, null, 2)
-        : "",
-    );
-    setBrowserStr(
-      global.browserAutomationEngine
-        ? JSON.stringify(global.browserAutomationEngine, null, 2)
-        : "",
-    );
-    setClaudeCodeStr(
-      global.claudeCode ? JSON.stringify(global.claudeCode, null, 2) : "",
-    );
-    setOtherFieldsStr(
-      global.otherFields ? JSON.stringify(global.otherFields, null, 2) : "",
-    );
-  }, []);
-
-  useEffect(() => {
-    if (config && !loaded) {
-      applyGlobalState(config);
-      setLoaded(true);
-    }
-  }, [config, loaded, applyGlobalState]);
-
-  const parseJsonField = useCallback(
-    (
-      fieldName: string,
-      raw: string,
-      strict: boolean,
-    ): Record<string, unknown> | undefined => {
-      if (!raw.trim()) return undefined;
-      try {
-        const parsed: unknown = JSON.parse(raw);
-        if (
-          typeof parsed !== "object" ||
-          parsed === null ||
-          Array.isArray(parsed)
-        ) {
-          if (strict) {
-            throw new Error(
-              t("omo.jsonMustBeObject", {
-                field: fieldName,
-                defaultValue: "{{field}} must be a JSON object",
-              }),
-            );
-          }
-          return undefined;
-        }
-        return parsed as Record<string, unknown>;
-      } catch (error) {
-        if (strict) {
-          if (error instanceof Error) {
-            throw error;
-          }
-          throw new Error(
-            t("omo.jsonInvalid", {
-              field: fieldName,
-              defaultValue: "{{field}} contains invalid JSON",
-            }),
-          );
-        }
-        return undefined;
-      }
-    },
-    [t],
-  );
-
-  const buildCurrentConfigInternal = useCallback(
-    (strict: boolean): OmoGlobalConfig => {
-      return {
-        id: "global",
-        schemaUrl: schemaUrl || undefined,
-        sisyphusAgent: parseJsonField(
-          t("omo.sisyphusAgentConfig", {
-            defaultValue: "Sisyphus Agent",
-          }),
-          sisyphusAgentStr,
-          strict,
-        ),
-        disabledAgents,
-        disabledMcps,
-        disabledHooks,
-        disabledSkills,
-        lsp: parseJsonField(
-          t("omo.advancedLsp", { defaultValue: "LSP" }),
-          lspStr,
-          strict,
-        ),
-        experimental: parseJsonField(
-          t("omo.advancedExperimental", { defaultValue: "Experimental" }),
-          experimentalStr,
-          strict,
-        ),
-        backgroundTask: parseJsonField(
-          t("omo.advancedBackgroundTask", {
-            defaultValue: "Background Task",
-          }),
-          backgroundTaskStr,
-          strict,
-        ),
-        browserAutomationEngine: parseJsonField(
-          t("omo.advancedBrowserAutomation", {
-            defaultValue: "Browser Automation",
-          }),
-          browserStr,
-          strict,
-        ),
-        claudeCode: parseJsonField(
-          t("omo.advancedClaudeCode", { defaultValue: "Claude Code" }),
-          claudeCodeStr,
-          strict,
-        ),
-        otherFields: parseJsonField(
-          t("omo.otherFields", {
-            defaultValue: "Other Config",
-          }),
-          otherFieldsStr,
-          strict,
-        ),
-        updatedAt: new Date().toISOString(),
-      };
-    },
-    [
-      schemaUrl,
-      sisyphusAgentStr,
-      disabledAgents,
-      disabledMcps,
-      disabledHooks,
-      disabledSkills,
-      lspStr,
-      experimentalStr,
-      backgroundTaskStr,
-      browserStr,
-      claudeCodeStr,
-      otherFieldsStr,
-      parseJsonField,
-    ],
-  );
-
-  const buildCurrentConfig = useCallback(
-    () => buildCurrentConfigInternal(false),
-    [buildCurrentConfigInternal],
-  );
-
-  const buildCurrentConfigStrict = useCallback(
-    () => buildCurrentConfigInternal(true),
-    [buildCurrentConfigInternal],
-  );
-
-  useEffect(() => {
-    if (loaded && onStateChange) {
-      onStateChange(buildCurrentConfig());
-    }
-  }, [loaded, onStateChange, buildCurrentConfig]);
-
-  const handleSaveGlobal = useCallback(async () => {
-    try {
-      const result = buildCurrentConfigStrict();
-      await saveMutation.mutateAsync(result);
-      toast.success(
-        t("omo.globalConfigSaved", {
-          defaultValue: "Global config saved",
-        }),
-      );
-    } catch (err) {
-      toast.error(String(err));
-    }
-  }, [buildCurrentConfigStrict, saveMutation, t]);
-
-  const disabledCount =
-    disabledAgents.length +
-    disabledMcps.length +
-    disabledHooks.length +
-    disabledSkills.length;
-  const advancedFieldValues: Record<OmoAdvancedFieldKey, string> = {
-    lspStr,
-    experimentalStr,
-    backgroundTaskStr,
-    browserStr,
-    claudeCodeStr,
-  };
-
-  const advancedFieldSetters: Record<
-    OmoAdvancedFieldKey,
-    (value: string) => void
-  > = {
-    lspStr: setLspStr,
-    experimentalStr: setExperimentalStr,
-    backgroundTaskStr: setBackgroundTaskStr,
-    browserStr: setBrowserStr,
-    claudeCodeStr: setClaudeCodeStr,
-  };
-
-  const disabledEditorConfigs = [
-    {
-      key: "agents",
-      label: t("omo.disabledAgents", { defaultValue: "Agents" }),
-      values: disabledAgents,
-      onChange: setDisabledAgents,
-      placeholder: t("omo.disabledAgentsPlaceholder", {
-        defaultValue: "Disabled Agents",
-      }),
-      presets: isSlim ? OMO_SLIM_DISABLEABLE_AGENTS : OMO_DISABLEABLE_AGENTS,
-    },
-    {
-      key: "mcps",
-      label: t("omo.disabledMcps", { defaultValue: "MCPs" }),
-      values: disabledMcps,
-      onChange: setDisabledMcps,
-      placeholder: t("omo.disabledMcpsPlaceholder", {
-        defaultValue: "Disabled MCPs",
-      }),
-      presets: isSlim ? OMO_SLIM_DISABLEABLE_MCPS : OMO_DISABLEABLE_MCPS,
-    },
-    {
-      key: "hooks",
-      label: t("omo.disabledHooks", { defaultValue: "Hooks" }),
-      values: disabledHooks,
-      onChange: setDisabledHooks,
-      placeholder: t("omo.disabledHooksPlaceholder", {
-        defaultValue: "Disabled Hooks",
-      }),
-      presets: isSlim ? OMO_SLIM_DISABLEABLE_HOOKS : OMO_DISABLEABLE_HOOKS,
-    },
-    ...(!isSlim
-      ? [
-          {
-            key: "skills" as const,
-            label: t("omo.disabledSkills", { defaultValue: "Skills" }),
-            values: disabledSkills,
-            onChange: setDisabledSkills,
-            placeholder: t("omo.disabledSkillsPlaceholder", {
-              defaultValue: "Disabled Skills",
-            }),
-            presets: OMO_DISABLEABLE_SKILLS,
-          },
-        ]
-      : []),
-  ];
-
-  const readLocalFile = isSlim ? slimReadLocal : standardReadLocal;
-
-  const handleImportGlobalFromLocal = useCallback(async () => {
-    try {
-      const data = await readLocalFile.mutateAsync();
-      applyGlobalState(data.global);
-      toast.success(
-        t("omo.importGlobalSuccess", {
-          defaultValue: "Imported global config from local file (unsaved)",
-        }),
-      );
-    } catch (err) {
-      toast.error(
-        t("omo.importGlobalFailed", {
-          error: String(err),
-          defaultValue: "Failed to read local file: {{error}}",
-        }),
-      );
-    }
-  }, [readLocalFile, applyGlobalState, t]);
-
-  useImperativeHandle(
-    ref,
-    () => ({
-      buildCurrentConfig,
-      buildCurrentConfigStrict,
-      importFromLocal: handleImportGlobalFromLocal,
-    }),
-    [buildCurrentConfig, buildCurrentConfigStrict, handleImportGlobalFromLocal],
-  );
-
-  return (
-    <div className="space-y-4">
-      {!hideSaveButtons && (
-        <div className="flex items-center justify-end gap-1.5">
-          <Button
-            type="button"
-            variant="ghost"
-            size="sm"
-            className="h-7 text-xs"
-            disabled={readLocalFile.isPending}
-            onClick={handleImportGlobalFromLocal}
-          >
-            {readLocalFile.isPending ? (
-              <Loader2 className="h-3.5 w-3.5 mr-1 animate-spin" />
-            ) : (
-              <FolderInput className="h-3.5 w-3.5 mr-1" />
-            )}
-            {t("omo.importLocal", { defaultValue: "Import Local" })}
-          </Button>
-          <Button
-            type="button"
-            variant="outline"
-            size="sm"
-            className="h-7 text-xs"
-            disabled={saveMutation.isPending}
-            onClick={handleSaveGlobal}
-          >
-            {saveMutation.isPending ? (
-              <Loader2 className="h-3.5 w-3.5 mr-1 animate-spin" />
-            ) : (
-              <Save className="h-3.5 w-3.5 mr-1" />
-            )}
-            {t("omo.saveGlobalConfig", { defaultValue: "Save Global Config" })}
-          </Button>
-        </div>
-      )}
-
-      <div className="space-y-1.5">
-        <div className="flex items-center justify-between">
-          <Label className="text-sm">
-            {t("omo.schemaUrl", { defaultValue: "$schema" })}
-          </Label>
-          {schemaUrl !== OMO_DEFAULT_SCHEMA_URL && (
-            <Button
-              type="button"
-              variant="ghost"
-              size="sm"
-              className="h-6 text-xs px-1.5"
-              onClick={() => setSchemaUrl(OMO_DEFAULT_SCHEMA_URL)}
-            >
-              <RotateCcw className="h-3 w-3 mr-0.5" />
-              {t("omo.resetDefault", { defaultValue: "Reset" })}
-            </Button>
-          )}
-        </div>
-        <Input
-          value={schemaUrl}
-          onChange={(e) => setSchemaUrl(e.target.value)}
-          placeholder={defaultSchemaUrl}
-          className="text-sm h-8"
-        />
-      </div>
-
-      {!isSlim && (
-        <div className="rounded-md border border-border/40 bg-muted/10 p-2 space-y-2">
-          <Label className="text-sm font-semibold">
-            {t("omo.sisyphusAgentConfig", {
-              defaultValue: "Sisyphus Agent",
-            })}
-          </Label>
-          <Textarea
-            value={sisyphusAgentStr}
-            onChange={(e) => setSisyphusAgentStr(e.target.value)}
-            placeholder={OMO_SISYPHUS_AGENT_PLACEHOLDER}
-            className="font-mono text-sm"
-            style={{ minHeight: "140px" }}
-          />
-        </div>
-      )}
-
-      <div className="rounded-md border border-border/40 bg-muted/10 p-2 space-y-3">
-        <div className="flex items-center gap-2">
-          <Label className="text-sm font-semibold">
-            {t("omo.disabledItems", { defaultValue: "Disabled Items" })}
-          </Label>
-          {disabledCount > 0 && (
-            <Badge variant="secondary" className="text-xs h-5">
-              {disabledCount}
-            </Badge>
-          )}
-        </div>
-        {disabledEditorConfigs.map((editor) => (
-          <TagListEditor
-            key={editor.key}
-            label={editor.label}
-            values={editor.values}
-            onChange={editor.onChange}
-            placeholder={editor.placeholder}
-            presets={editor.presets}
-          />
-        ))}
-      </div>
-
-      <div className="rounded-md border border-border/40 bg-muted/10 p-2 space-y-2">
-        <Label className="text-sm font-semibold">
-          {t("omo.advanced", { defaultValue: "Advanced Settings" })}
-        </Label>
-        {OMO_ADVANCED_JSON_FIELDS.filter(
-          (field) => !isSlim || OMO_SLIM_ADVANCED_KEYS.has(field.key),
-        ).map((field) => (
-          <JsonTextareaField
-            key={field.key}
-            label={t(field.labelKey, { defaultValue: field.defaultLabel })}
-            value={advancedFieldValues[field.key]}
-            onChange={advancedFieldSetters[field.key]}
-            placeholder={field.placeholder}
-            minHeight={field.minHeight}
-          />
-        ))}
-
-        <JsonTextareaField
-          label={t("omo.otherFields", {
-            defaultValue: "Other Config",
-          })}
-          value={otherFieldsStr}
-          onChange={setOtherFieldsStr}
-        />
-      </div>
-    </div>
-  );
-});
@@ -57,7 +57,6 @@ import { ClaudeFormFields } from "./ClaudeFormFields";
 import { CodexFormFields } from "./CodexFormFields";
 import { GeminiFormFields } from "./GeminiFormFields";
 import { OmoFormFields } from "./OmoFormFields";
-import { OmoCommonConfigEditor } from "./OmoCommonConfigEditor";
 import { parseOmoOtherFieldsObject } from "@/types/omo";
 import {
  ProviderAdvancedConfig,
@@ -79,7 +78,6 @@ import {
  useOmoDraftState,
  useOpenclawFormState,
 } from "./hooks";
-import { useOmoGlobalConfig, useOmoSlimGlobalConfig } from "@/lib/query/omo";
 import {
  CLAUDE_DEFAULT_CONFIG,
  CODEX_DEFAULT_CONFIG,
@@ -189,13 +187,6 @@ export function ProviderForm({
  const isOmoCategory = appId === "opencode" && category === "omo";
  const isOmoSlimCategory = appId === "opencode" && category === "omo-slim";
  const isAnyOmoCategory = isOmoCategory || isOmoSlimCategory;
-  const { data: queriedStandardOmoGlobalConfig } =
-    useOmoGlobalConfig(isOmoCategory);
-  const { data: queriedSlimOmoGlobalConfig } =
-    useOmoSlimGlobalConfig(isOmoSlimCategory);
-  const queriedOmoGlobalConfig = isOmoSlimCategory
-    ? queriedSlimOmoGlobalConfig
-    : queriedStandardOmoGlobalConfig;

  useEffect(() => {
    setSelectedPresetId(initialData ? null : "custom");
@@ -516,7 +507,6 @@ export function ProviderForm({

  const omoDraft = useOmoDraftState({
    initialOmoSettings,
-    queriedOmoGlobalConfig,
    isEditMode,
    appId,
    category,
@@ -685,7 +675,6 @@ export function ProviderForm({
      (category === "omo" || category === "omo-slim")
    ) {
      const omoConfig: Record<string, unknown> = {};
-      omoConfig.useCommonConfig = omoDraft.useOmoCommonConfig;
      if (Object.keys(omoDraft.omoAgents).length > 0) {
        omoConfig.agents = omoDraft.omoAgents;
      }
@@ -1423,20 +1412,16 @@ export function ProviderForm({
          </>
        ) : appId === "opencode" &&
          (category === "omo" || category === "omo-slim") ? (
-          <OmoCommonConfigEditor
-            previewValue={omoDraft.mergedOmoJsonPreview}
-            useCommonConfig={omoDraft.useOmoCommonConfig}
-            onCommonConfigToggle={omoDraft.setUseOmoCommonConfig}
-            isModalOpen={omoDraft.isOmoConfigModalOpen}
-            onEditClick={omoDraft.handleOmoEditClick}
-            onModalClose={() => omoDraft.setIsOmoConfigModalOpen(false)}
-            onSave={omoDraft.handleOmoGlobalConfigSave}
-            isSaving={omoDraft.isOmoSaving}
-            onGlobalConfigStateChange={omoDraft.setOmoGlobalState}
-            globalConfigRef={omoDraft.omoGlobalConfigRef}
-            fieldsKey={omoDraft.omoFieldsKey}
-            isSlim={category === "omo-slim"}
-          />
+          <div className="space-y-2">
+            <Label>{t("provider.configJson")}</Label>
+            <JsonEditor
+              value={omoDraft.mergedOmoJsonPreview}
+              onChange={() => {}}
+              rows={14}
+              showValidation={false}
+              language="json"
+            />
+          </div>
        ) : appId === "opencode" &&
          category !== "omo" &&
          category !== "omo-slim" ? (
@@ -1,5 +1,4 @@
 import type { OpenCodeModel, OpenCodeProviderConfig } from "@/types";
-import type { OmoGlobalConfig } from "@/types/omo";
 import type { PricingModelSourceOption } from "../ProviderAdvancedConfig";

 // ── Default configs ──────────────────────────────────────────────────
@@ -52,15 +51,6 @@ export const OPENCLAW_DEFAULT_CONFIG = JSON.stringify(
  2,
 );

-export const EMPTY_OMO_GLOBAL_CONFIG: OmoGlobalConfig = {
-  id: "global",
-  disabledAgents: [],
-  disabledMcps: [],
-  disabledHooks: [],
-  disabledSkills: [],
-  updatedAt: "",
-};
-
 // ── Pure functions ───────────────────────────────────────────────────

 export function isKnownOpencodeOptionKey(key: string): boolean {
@@ -1,22 +1,11 @@
-import { useState, useCallback, useEffect, useRef, useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
-import type { OmoGlobalConfig } from "@/types/omo";
+import { useState, useCallback, useMemo } from "react";
 import {
-  mergeOmoConfigPreview,
-  mergeOmoSlimConfigPreview,
  buildOmoSlimProfilePreview,
-} from "@/types/omo";
-import { type OmoGlobalConfigFieldsRef } from "../OmoGlobalConfigFields";
-import * as configApi from "@/lib/api/config";
-import {
-  EMPTY_OMO_GLOBAL_CONFIG,
  buildOmoProfilePreview,
-} from "../helpers/opencodeFormUtils";
+} from "@/types/omo";

 interface UseOmoDraftStateParams {
  initialOmoSettings: Record<string, unknown> | undefined;
-  queriedOmoGlobalConfig: OmoGlobalConfig | undefined;
  isEditMode: boolean;
  appId: string;
  category?: string;
@@ -33,33 +22,15 @@ export interface OmoDraftState {
  >;
  omoOtherFieldsStr: string;
  setOmoOtherFieldsStr: React.Dispatch<React.SetStateAction<string>>;
-  useOmoCommonConfig: boolean;
-  setUseOmoCommonConfig: React.Dispatch<React.SetStateAction<boolean>>;
-  isOmoConfigModalOpen: boolean;
-  setIsOmoConfigModalOpen: React.Dispatch<React.SetStateAction<boolean>>;
-  isOmoSaving: boolean;
-  omoGlobalConfigRef: React.RefObject<OmoGlobalConfigFieldsRef | null>;
-  omoFieldsKey: number;
-  effectiveOmoGlobalConfig: OmoGlobalConfig;
  mergedOmoJsonPreview: string;
-  handleOmoGlobalConfigSave: () => Promise<void>;
-  handleOmoEditClick: () => void;
-  resetOmoDraftState: (useCommonConfig?: boolean) => void;
-  setOmoGlobalState: React.Dispatch<
-    React.SetStateAction<OmoGlobalConfig | null>
-  >;
+  resetOmoDraftState: () => void;
 }

 export function useOmoDraftState({
  initialOmoSettings,
-  queriedOmoGlobalConfig,
-  isEditMode,
-  appId,
  category,
 }: UseOmoDraftStateParams): OmoDraftState {
-  const { t } = useTranslation();
  const isSlim = category === "omo-slim";
-  const commonConfigKey = isSlim ? "omo_slim" : "omo";

  const [omoAgents, setOmoAgents] = useState<
    Record<string, Record<string, unknown>>
@@ -82,118 +53,25 @@ export function useOmoDraftState({
    return otherFields ? JSON.stringify(otherFields, null, 2) : "";
  });

-  const [omoGlobalState, setOmoGlobalState] = useState<OmoGlobalConfig | null>(
-    null,
-  );
-
-  const [isOmoConfigModalOpen, setIsOmoConfigModalOpen] = useState(false);
-  const [useOmoCommonConfig, setUseOmoCommonConfig] = useState(() => {
-    const raw = initialOmoSettings?.useCommonConfig;
-    return typeof raw === "boolean" ? raw : true;
-  });
-  const [isOmoSaving, setIsOmoSaving] = useState(false);
-  const omoGlobalConfigRef = useRef<OmoGlobalConfigFieldsRef>(null);
-  const [omoFieldsKey, setOmoFieldsKey] = useState(0);
-  const effectiveOmoGlobalConfig =
-    omoGlobalState ?? queriedOmoGlobalConfig ?? EMPTY_OMO_GLOBAL_CONFIG;
-
  const mergedOmoJsonPreview = useMemo(() => {
-    if (useOmoCommonConfig) {
-      if (isSlim) {
-        const merged = mergeOmoSlimConfigPreview(
-          effectiveOmoGlobalConfig,
-          omoAgents,
-          omoOtherFieldsStr,
-        );
-        return JSON.stringify(merged, null, 2);
-      }
-      const merged = mergeOmoConfigPreview(
-        effectiveOmoGlobalConfig,
-        omoAgents,
-        omoCategories,
-        omoOtherFieldsStr,
-      );
-      return JSON.stringify(merged, null, 2);
-    } else {
-      if (isSlim) {
-        return JSON.stringify(
-          buildOmoSlimProfilePreview(omoAgents, omoOtherFieldsStr),
-          null,
-          2,
-        );
-      }
+    if (isSlim) {
      return JSON.stringify(
-        buildOmoProfilePreview(omoAgents, omoCategories, omoOtherFieldsStr),
+        buildOmoSlimProfilePreview(omoAgents, omoOtherFieldsStr),
        null,
        2,
      );
    }
-  }, [
-    useOmoCommonConfig,
-    effectiveOmoGlobalConfig,
-    omoAgents,
-    omoCategories,
-    omoOtherFieldsStr,
-    isSlim,
-  ]);
+    return JSON.stringify(
+      buildOmoProfilePreview(omoAgents, omoCategories, omoOtherFieldsStr),
+      null,
+      2,
+    );
+  }, [omoAgents, omoCategories, omoOtherFieldsStr, isSlim]);

-  // Auto-detect whether common config has content for new OMO/OMO Slim profiles
-  useEffect(() => {
-    if (
-      appId !== "opencode" ||
-      (category !== "omo" && category !== "omo-slim") ||
-      isEditMode
-    )
-      return;
-    let active = true;
-    (async () => {
-      let next = false;
-      try {
-        const raw = await configApi.getCommonConfigSnippet(commonConfigKey);
-        if (raw) {
-          const parsed = JSON.parse(raw) as Record<string, unknown>;
-          next = Object.keys(parsed).some(
-            (k) => k !== "id" && k !== "updatedAt",
-          );
-        }
-      } catch {}
-      if (active) setUseOmoCommonConfig(next);
-    })();
-    return () => {
-      active = false;
-    };
-  }, [appId, category, isEditMode, commonConfigKey]);
-
-  const handleOmoGlobalConfigSave = useCallback(async () => {
-    if (!omoGlobalConfigRef.current) return;
-    setIsOmoSaving(true);
-    try {
-      const config = omoGlobalConfigRef.current.buildCurrentConfigStrict();
-      await configApi.setCommonConfigSnippet(
-        commonConfigKey,
-        JSON.stringify(config),
-      );
-      setIsOmoConfigModalOpen(false);
-      toast.success(
-        t("omo.globalConfigSaved", { defaultValue: "Global config saved" }),
-      );
-    } catch (err) {
-      toast.error(String(err));
-    } finally {
-      setIsOmoSaving(false);
-    }
-  }, [t, commonConfigKey]);
-
-  const handleOmoEditClick = useCallback(() => {
-    setOmoFieldsKey((k) => k + 1);
-    setIsOmoConfigModalOpen(true);
-  }, []);
-
-  const resetOmoDraftState = useCallback((useCommonConfig = true) => {
+  const resetOmoDraftState = useCallback(() => {
    setOmoAgents({});
    setOmoCategories({});
    setOmoOtherFieldsStr("");
-    setUseOmoCommonConfig(useCommonConfig);
  }, []);

  return {
@@ -203,18 +81,7 @@ export function useOmoDraftState({
    setOmoCategories,
    omoOtherFieldsStr,
    setOmoOtherFieldsStr,
-    useOmoCommonConfig,
-    setUseOmoCommonConfig,
-    isOmoConfigModalOpen,
-    setIsOmoConfigModalOpen,
-    isOmoSaving,
-    omoGlobalConfigRef,
-    omoFieldsKey,
-    effectiveOmoGlobalConfig,
    mergedOmoJsonPreview,
-    handleOmoGlobalConfigSave,
-    handleOmoEditClick,
    resetOmoDraftState,
-    setOmoGlobalState,
  };
 }
@@ -1807,10 +1807,6 @@
    "enabled": "Enabled",
    "disabled": "OMO disabled",
    "disableFailed": "Failed to disable OMO: {{error}}",
-    "writeCommonConfig": "Write to common config",
-    "editCommonConfig": "Edit common config",
-    "editCommonConfigTitle": "Common Config",
-    "commonConfigHint": "OMO common config will be merged into all OMO configs that enable it",
    "selectPlaceholder": "Select...",
    "clear": "Clear",
    "clearWrapped": "(Clear)",
@@ -1807,10 +1807,6 @@
    "enabled": "有効中",
    "disabled": "OMO を無効化しました",
    "disableFailed": "OMO の無効化に失敗しました: {{error}}",
-    "writeCommonConfig": "共通設定に書き込む",
-    "editCommonConfig": "共通設定を編集",
-    "editCommonConfigTitle": "共通設定",
-    "commonConfigHint": "OMO 共通設定は有効にしたすべての OMO 設定に統合されます",
    "selectPlaceholder": "選択してください...",
    "clear": "クリア",
    "clearWrapped": "(クリア)",
@@ -1807,10 +1807,6 @@
    "enabled": "启用中",
    "disabled": "OMO 已停用",
    "disableFailed": "停用 OMO 失败: {{error}}",
-    "writeCommonConfig": "写入通用配置",
-    "editCommonConfig": "编辑通用配置",
-    "editCommonConfigTitle": "通用配置",
-    "commonConfigHint": "OMO 通用配置将合并到所有启用它的 OMO 配置中",
    "selectPlaceholder": "请选择...",
    "clear": "清空",
    "clearWrapped": "（清空）",
@@ -1,28 +0,0 @@
-// 配置相关 API
-import { invoke } from "@tauri-apps/api/core";
-
-export type AppType = "claude" | "codex" | "gemini" | "omo" | "omo_slim";
-
-/**
- * 获取通用配置片段（统一接口）
- * @param appType - 应用类型（claude/codex/gemini）
- * @returns 通用配置片段（原始字符串），如果不存在则返回 null
- */
-export async function getCommonConfigSnippet(
-  appType: AppType,
-): Promise<string | null> {
-  return invoke<string | null>("get_common_config_snippet", { appType });
-}
-
-/**
- * 设置通用配置片段（统一接口）
- * @param appType - 应用类型（claude/codex/gemini）
- * @param snippet - 通用配置片段（原始字符串）
- * @throws 如果格式无效（Claude/Gemini 验证 JSON，Codex 暂不验证）
- */
-export async function setCommonConfigSnippet(
-  appType: AppType,
-  snippet: string,
-): Promise<void> {
-  return invoke("set_common_config_snippet", { appType, snippet });
-}
@@ -11,6 +11,5 @@ export { proxyApi } from "./proxy";
 export { openclawApi } from "./openclaw";
 export { sessionsApi } from "./sessions";
 export { workspaceApi } from "./workspace";
-export * as configApi from "./config";
 export type { ProviderSwitchEvent } from "./providers";
 export type { Prompt } from "./prompts";
@@ -1,14 +1,11 @@
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import { omoApi, omoSlimApi } from "@/lib/api/omo";
-import * as configApi from "@/lib/api/config";
-import type { OmoGlobalConfig } from "@/types/omo";

 // ── Factory ────────────────────────────────────────────────────

 function createOmoQueryKeys(prefix: string) {
  return {
    all: [prefix] as const,
-    globalConfig: () => [prefix, "global-config"] as const,
    currentProviderId: () => [prefix, "current-provider-id"] as const,
    providerCount: () => [prefix, "provider-count"] as const,
  };
@@ -19,51 +16,13 @@ function createOmoQueryHooks(
  api: typeof omoApi | typeof omoSlimApi,
 ) {
  const keys = createOmoQueryKeys(variant);
-  const snippetKey = variant === "omo" ? "omo" : "omo_slim";

  function invalidateAll(queryClient: ReturnType<typeof useQueryClient>) {
-    queryClient.invalidateQueries({ queryKey: keys.globalConfig() });
    queryClient.invalidateQueries({ queryKey: ["providers"] });
    queryClient.invalidateQueries({ queryKey: keys.currentProviderId() });
    queryClient.invalidateQueries({ queryKey: keys.providerCount() });
  }

-  function useGlobalConfig(enabled = true) {
-    return useQuery({
-      queryKey: keys.globalConfig(),
-      enabled,
-      queryFn: async (): Promise<OmoGlobalConfig> => {
-        const raw = await configApi.getCommonConfigSnippet(snippetKey);
-        if (!raw) {
-          return {
-            id: "global",
-            disabledAgents: [],
-            disabledMcps: [],
-            disabledHooks: [],
-            disabledSkills: [],
-            updatedAt: new Date().toISOString(),
-          };
-        }
-        try {
-          return JSON.parse(raw) as OmoGlobalConfig;
-        } catch (error) {
-          console.warn(
-            `[${variant}] invalid global config json, fallback to defaults`,
-            error,
-          );
-          return {
-            id: "global",
-            disabledAgents: [],
-            disabledMcps: [],
-            disabledHooks: [],
-            disabledSkills: [],
-            updatedAt: new Date().toISOString(),
-          };
-        }
-      },
-    });
-  }
-
  function useCurrentProviderId(enabled = true) {
    return useQuery({
      queryKey: keys.currentProviderId(),
@@ -86,17 +45,6 @@ function createOmoQueryHooks(
    });
  }

-  function useSaveGlobalConfig() {
-    const queryClient = useQueryClient();
-    return useMutation({
-      mutationFn: async (input: OmoGlobalConfig) => {
-        const jsonStr = JSON.stringify(input);
-        await configApi.setCommonConfigSnippet(snippetKey, jsonStr);
-      },
-      onSuccess: () => invalidateAll(queryClient),
-    });
-  }
-
  function useReadLocalFile() {
    return useMutation({
      mutationFn: () => api.readLocalFile(),
@@ -116,10 +64,8 @@ function createOmoQueryHooks(

  return {
    keys,
-    useGlobalConfig,
    useCurrentProviderId,
    useProviderCount,
-    useSaveGlobalConfig,
    useReadLocalFile,
    useDisableCurrent,
  };
@@ -135,16 +81,12 @@ const omoSlimHooks = createOmoQueryHooks("omo-slim", omoSlimApi);
 export const omoKeys = omoHooks.keys;
 export const omoSlimKeys = omoSlimHooks.keys;

-export const useOmoGlobalConfig = omoHooks.useGlobalConfig;
 export const useCurrentOmoProviderId = omoHooks.useCurrentProviderId;
 export const useOmoProviderCount = omoHooks.useProviderCount;
-export const useSaveOmoGlobalConfig = omoHooks.useSaveGlobalConfig;
 export const useReadOmoLocalFile = omoHooks.useReadLocalFile;
 export const useDisableCurrentOmo = omoHooks.useDisableCurrent;

-export const useOmoSlimGlobalConfig = omoSlimHooks.useGlobalConfig;
 export const useCurrentOmoSlimProviderId = omoSlimHooks.useCurrentProviderId;
 export const useOmoSlimProviderCount = omoSlimHooks.useProviderCount;
-export const useSaveOmoSlimGlobalConfig = omoSlimHooks.useSaveGlobalConfig;
 export const useReadOmoSlimLocalFile = omoSlimHooks.useReadLocalFile;
 export const useDisableCurrentOmoSlim = omoSlimHooks.useDisableCurrent;
@@ -1,25 +1,7 @@
-export interface OmoGlobalConfig {
-  id: string;
-  schemaUrl?: string;
-  sisyphusAgent?: Record<string, unknown>;
-  disabledAgents: string[];
-  disabledMcps: string[];
-  disabledHooks: string[];
-  disabledSkills: string[];
-  lsp?: Record<string, unknown>;
-  experimental?: Record<string, unknown>;
-  backgroundTask?: Record<string, unknown>;
-  browserAutomationEngine?: Record<string, unknown>;
-  claudeCode?: Record<string, unknown>;
-  otherFields?: Record<string, unknown>;
-  updatedAt: string;
-}
-
 export interface OmoLocalFileData {
  agents?: Record<string, Record<string, unknown>>;
  categories?: Record<string, Record<string, unknown>>;
  otherFields?: Record<string, unknown>;
-  global: OmoGlobalConfig;
  filePath: string;
  lastModified?: string;
 }
@@ -406,75 +388,6 @@ export const OMO_SLIM_DISABLEABLE_HOOKS = [
 export const OMO_SLIM_DEFAULT_SCHEMA_URL =
  "https://raw.githubusercontent.com/alvinunreal/oh-my-opencode-slim/master/assets/oh-my-opencode-slim.schema.json";

-export function mergeOmoConfigPreview(
-  global: OmoGlobalConfig | undefined,
-  agents: Record<string, Record<string, unknown>>,
-  categories: Record<string, Record<string, unknown>> | undefined,
-  otherFieldsStr: string,
-  options?: { slim?: boolean },
-): Record<string, unknown> {
-  const result: Record<string, unknown> = {};
-  const isSlim = options?.slim ?? false;
-
-  if (global) {
-    if (global.schemaUrl) result["$schema"] = global.schemaUrl;
-
-    if (!isSlim) {
-      if (global.sisyphusAgent) result["sisyphus_agent"] = global.sisyphusAgent;
-    }
-    if (global.disabledAgents?.length)
-      result["disabled_agents"] = global.disabledAgents;
-    if (global.disabledMcps?.length)
-      result["disabled_mcps"] = global.disabledMcps;
-    if (global.disabledHooks?.length)
-      result["disabled_hooks"] = global.disabledHooks;
-
-    if (!isSlim) {
-      if (global.disabledSkills?.length)
-        result["disabled_skills"] = global.disabledSkills;
-      if (global.lsp) result["lsp"] = global.lsp;
-      if (global.experimental) result["experimental"] = global.experimental;
-      if (global.backgroundTask)
-        result["background_task"] = global.backgroundTask;
-      if (global.browserAutomationEngine)
-        result["browser_automation_engine"] = global.browserAutomationEngine;
-      if (global.claudeCode) result["claude_code"] = global.claudeCode;
-    }
-
-    if (global.otherFields) {
-      for (const [k, v] of Object.entries(global.otherFields)) {
-        result[k] = v;
-      }
-    }
-  }
-
-  if (Object.keys(agents).length > 0) result["agents"] = agents;
-  if (!isSlim && categories && Object.keys(categories).length > 0)
-    result["categories"] = categories;
-
-  try {
-    const other = parseOmoOtherFieldsObject(otherFieldsStr);
-    if (other) {
-      for (const [k, v] of Object.entries(other)) {
-        result[k] = v;
-      }
-    }
-  } catch {}
-
-  return result;
-}
-
-/** @deprecated Use mergeOmoConfigPreview with options.slim=true */
-export function mergeOmoSlimConfigPreview(
-  global: OmoGlobalConfig | undefined,
-  agents: Record<string, Record<string, unknown>>,
-  otherFieldsStr: string,
-): Record<string, unknown> {
-  return mergeOmoConfigPreview(global, agents, undefined, otherFieldsStr, {
-    slim: true,
-  });
-}
-
 export function buildOmoProfilePreview(
  agents: Record<string, Record<string, unknown>>,
  categories: Record<string, Record<string, unknown>> | undefined,
@@ -1,19 +1,9 @@
 import { describe, expect, it } from "vitest";
 import {
-  mergeOmoConfigPreview,
+  buildOmoProfilePreview,
  parseOmoOtherFieldsObject,
-  type OmoGlobalConfig,
 } from "@/types/omo";

-const EMPTY_GLOBAL: OmoGlobalConfig = {
-  id: "global",
-  disabledAgents: [],
-  disabledMcps: [],
-  disabledHooks: [],
-  disabledSkills: [],
-  updatedAt: "2026-01-01T00:00:00.000Z",
-};
-
 describe("parseOmoOtherFieldsObject", () => {
  it("解析对象 JSON", () => {
    expect(parseOmoOtherFieldsObject('{ "foo": 1 }')).toEqual({ foo: 1 });
@@ -29,22 +19,12 @@ describe("parseOmoOtherFieldsObject", () => {
  });
 });

-describe("mergeOmoConfigPreview", () => {
+describe("buildOmoProfilePreview", () => {
  it("只合并 otherFields 的对象值，忽略数组", () => {
-    const mergedFromArray = mergeOmoConfigPreview(
-      EMPTY_GLOBAL,
-      {},
-      {},
-      '["a", "b"]',
-    );
-    expect(mergedFromArray).toEqual({});
+    const fromArray = buildOmoProfilePreview({}, {}, '["a", "b"]');
+    expect(fromArray).toEqual({});

-    const mergedFromObject = mergeOmoConfigPreview(
-      EMPTY_GLOBAL,
-      {},
-      {},
-      '{ "foo": "bar" }',
-    );
-    expect(mergedFromObject).toEqual({ foo: "bar" });
+    const fromObject = buildOmoProfilePreview({}, {}, '{ "foo": "bar" }');
+    expect(fromObject).toEqual({ foo: "bar" });
  });
 });