diff --git a/scripts/dev-api.js b/scripts/dev-api.js index e6291a2..ce1648d 100644 --- a/scripts/dev-api.js +++ b/scripts/dev-api.js @@ -4679,6 +4679,17 @@ function normalizeHermesModelConfigString(value, key, required = false) { return text } +function normalizeHermesXSearchModel(value, strict = false) { + const text = String(value ?? '').trim() + if (!text) { + if (strict) throw new Error('x_search.model 不能为空') + return 'grok-4.20-reasoning' + } + if (/^[a-zA-Z0-9_.:/-]+$/.test(text)) return text + if (strict) throw new Error('x_search.model 只能包含字母、数字、下划线、点、斜杠、冒号和短横线') + return 'grok-4.20-reasoning' +} + function normalizeHermesOptionalModelInteger(value, key) { const raw = String(value ?? '').trim() if (!raw) return '' @@ -4726,6 +4737,31 @@ export function mergeHermesModelConfig(config = {}, form = {}) { return next } +export function buildHermesXSearchConfigValues(config = {}) { + const root = config && typeof config === 'object' && !Array.isArray(config) ? config : {} + const xSearch = root.x_search && typeof root.x_search === 'object' && !Array.isArray(root.x_search) + ? root.x_search + : {} + return { + xSearchModel: normalizeHermesXSearchModel(xSearch.model, false), + xSearchTimeoutSeconds: parseHermesInteger(xSearch.timeout_seconds, 'x_search.timeout_seconds', 180, 30, 3600, false), + xSearchRetries: parseHermesInteger(xSearch.retries, 'x_search.retries', 2, 0, 20, false), + } +} + +export function mergeHermesXSearchConfig(config = {}, form = {}) { + const next = mergeConfigsPreservingFields({}, config && typeof config === 'object' && !Array.isArray(config) ? config : {}) + const currentValues = buildHermesXSearchConfigValues(next) + const xSearch = next.x_search && typeof next.x_search === 'object' && !Array.isArray(next.x_search) + ? mergeConfigsPreservingFields(next.x_search, {}) + : {} + xSearch.model = normalizeHermesXSearchModel(Object.hasOwn(form, 'xSearchModel') ? form.xSearchModel : currentValues.xSearchModel, true) + xSearch.timeout_seconds = parseHermesInteger(Object.hasOwn(form, 'xSearchTimeoutSeconds') ? form.xSearchTimeoutSeconds : currentValues.xSearchTimeoutSeconds, 'x_search.timeout_seconds', 180, 30, 3600, true) + xSearch.retries = parseHermesInteger(Object.hasOwn(form, 'xSearchRetries') ? form.xSearchRetries : currentValues.xSearchRetries, 'x_search.retries', 2, 0, 20, true) + next.x_search = xSearch + return next +} + function isHermesModelAliasName(value) { return /^[a-zA-Z0-9_.-]+$/.test(String(value || '').trim()) } @@ -12462,6 +12498,27 @@ const handlers = { } }, + hermes_x_search_config_read() { + const { configPath, exists, config } = readHermesConfigYamlObject() + return { + exists, + configPath, + values: buildHermesXSearchConfigValues(config), + } + }, + + hermes_x_search_config_save({ form } = {}) { + const { configPath, config } = readHermesConfigYamlObject() + const next = mergeHermesXSearchConfig(config, form || {}) + const backup = writeHermesConfigYamlObject(configPath, next) + return { + ok: true, + configPath, + backup, + values: buildHermesXSearchConfigValues(next), + } + }, + hermes_model_aliases_config_read() { const { configPath, exists, config } = readHermesConfigYamlObject() return { diff --git a/src-tauri/src/commands/hermes.rs b/src-tauri/src/commands/hermes.rs index 8f5ce04..95304ac 100644 --- a/src-tauri/src/commands/hermes.rs +++ b/src-tauri/src/commands/hermes.rs @@ -8724,6 +8724,100 @@ fn merge_hermes_model_catalog_config( Ok(()) } +fn normalize_hermes_x_search_model(value: Option, strict: bool) -> Result { + let text = value.unwrap_or_default().trim().to_string(); + if text.is_empty() { + if strict { + return Err("x_search.model 不能为空".to_string()); + } + return Ok("grok-4.20-reasoning".to_string()); + } + if text + .chars() + .all(|ch| ch.is_ascii_alphanumeric() || matches!(ch, '_' | '.' | ':' | '/' | '-')) + { + return Ok(text); + } + if strict { + return Err( + "x_search.model 只能包含字母、数字、下划线、点、斜杠、冒号和短横线".to_string(), + ); + } + Ok("grok-4.20-reasoning".to_string()) +} + +fn build_hermes_x_search_config_values(config: &serde_yaml::Value) -> Value { + let root = config.as_mapping(); + let x_search = root.and_then(|map| yaml_get_mapping(map, "x_search")); + let model = normalize_hermes_x_search_model( + x_search.and_then(|map| yaml_string_field(map, "model")), + false, + ) + .unwrap_or_else(|_| "grok-4.20-reasoning".to_string()); + let timeout_seconds = x_search + .map(|map| bounded_hermes_i64(yaml_i64_field(map, "timeout_seconds"), 180, 30, 3600)) + .unwrap_or(180); + let retries = x_search + .map(|map| bounded_hermes_i64(yaml_i64_field(map, "retries"), 2, 0, 20)) + .unwrap_or(2); + + serde_json::json!({ + "xSearchModel": model, + "xSearchTimeoutSeconds": timeout_seconds, + "xSearchRetries": retries, + }) +} + +fn merge_hermes_x_search_config( + config: &mut serde_yaml::Value, + form: &Value, +) -> Result<(), String> { + let current = build_hermes_x_search_config_values(config); + let model = normalize_hermes_x_search_model( + if form.get("xSearchModel").is_some() { + form_string(form, "xSearchModel") + } else { + current["xSearchModel"].as_str().map(ToString::to_string) + }, + true, + )?; + let timeout_seconds = validate_hermes_i64( + if form.get("xSearchTimeoutSeconds").is_some() { + form_i64(form, "xSearchTimeoutSeconds") + } else { + current["xSearchTimeoutSeconds"].as_i64() + }, + "x_search.timeout_seconds", + 180, + 30, + 3600, + )?; + let retries = validate_hermes_i64( + if form.get("xSearchRetries").is_some() { + form_i64(form, "xSearchRetries") + } else { + current["xSearchRetries"].as_i64() + }, + "x_search.retries", + 2, + 0, + 20, + )?; + + let root = ensure_yaml_object(config)?; + let x_search = yaml_child_object(root, "x_search")?; + x_search.insert(yaml_key("model"), serde_yaml::Value::String(model)); + x_search.insert( + yaml_key("timeout_seconds"), + serde_yaml::Value::Number(serde_yaml::Number::from(timeout_seconds)), + ); + x_search.insert( + yaml_key("retries"), + serde_yaml::Value::Number(serde_yaml::Number::from(retries)), + ); + Ok(()) +} + fn build_hermes_lsp_config_values(config: &serde_yaml::Value) -> Value { let root = config.as_mapping(); let lsp = root.and_then(|map| yaml_get_mapping(map, "lsp")); @@ -11505,6 +11599,30 @@ pub fn hermes_model_catalog_config_save(form: Value) -> Result { })) } +#[tauri::command] +pub fn hermes_x_search_config_read() -> Result { + let (config_path, exists, config) = read_hermes_channel_yaml_config()?; + ensure_yaml_object(&mut config.clone())?; + Ok(serde_json::json!({ + "exists": exists, + "configPath": config_path.to_string_lossy(), + "values": build_hermes_x_search_config_values(&config), + })) +} + +#[tauri::command] +pub fn hermes_x_search_config_save(form: Value) -> Result { + let (config_path, _exists, mut config) = read_hermes_channel_yaml_config()?; + merge_hermes_x_search_config(&mut config, &form)?; + let backup = write_hermes_yaml_config(&config_path, &config)?; + Ok(serde_json::json!({ + "ok": true, + "configPath": config_path.to_string_lossy(), + "backup": backup, + "values": build_hermes_x_search_config_values(&config), + })) +} + #[tauri::command] pub fn hermes_stt_config_read() -> Result { let (config_path, exists, config) = read_hermes_channel_yaml_config()?; @@ -18276,6 +18394,101 @@ streaming: } } +#[cfg(test)] +mod hermes_x_search_config_tests { + use super::{build_hermes_x_search_config_values, merge_hermes_x_search_config}; + use serde_json::json; + + #[test] + fn x_search_values_have_upstream_defaults() { + let config: serde_yaml::Value = serde_yaml::from_str("{}").unwrap(); + let values = build_hermes_x_search_config_values(&config); + assert_eq!(values["xSearchModel"], "grok-4.20-reasoning"); + assert_eq!(values["xSearchTimeoutSeconds"], 180); + assert_eq!(values["xSearchRetries"], 2); + } + + #[test] + fn x_search_values_read_yaml_fields() { + let config: serde_yaml::Value = serde_yaml::from_str( + r#" +x_search: + model: grok-4.20-fast + timeout_seconds: 90 + retries: 4 +"#, + ) + .unwrap(); + let values = build_hermes_x_search_config_values(&config); + assert_eq!(values["xSearchModel"], "grok-4.20-fast"); + assert_eq!(values["xSearchTimeoutSeconds"], 90); + assert_eq!(values["xSearchRetries"], 4); + } + + #[test] + fn merge_x_search_config_preserves_unknown_fields() { + let mut config: serde_yaml::Value = serde_yaml::from_str( + r#" +model: + provider: xai +x_search: + model: old-grok + timeout_seconds: 60 + retries: 1 + custom_flag: keep-x-search +streaming: + enabled: true +"#, + ) + .unwrap(); + + merge_hermes_x_search_config( + &mut config, + &json!({ + "xSearchModel": "grok-4.20-reasoning", + "xSearchTimeoutSeconds": 240, + "xSearchRetries": 3, + }), + ) + .unwrap(); + + assert_eq!(config["model"]["provider"].as_str(), Some("xai")); + assert_eq!(config["streaming"]["enabled"].as_bool(), Some(true)); + assert_eq!( + config["x_search"]["model"].as_str(), + Some("grok-4.20-reasoning") + ); + assert_eq!(config["x_search"]["timeout_seconds"].as_i64(), Some(240)); + assert_eq!(config["x_search"]["retries"].as_i64(), Some(3)); + assert_eq!( + config["x_search"]["custom_flag"].as_str(), + Some("keep-x-search") + ); + } + + #[test] + fn merge_x_search_config_rejects_invalid_values() { + let mut config = serde_yaml::Value::Mapping(serde_yaml::Mapping::new()); + let err = + merge_hermes_x_search_config(&mut config, &json!({ "xSearchModel": "" })).unwrap_err(); + assert!(err.contains("x_search.model")); + let err = + merge_hermes_x_search_config(&mut config, &json!({ "xSearchModel": "bad model" })) + .unwrap_err(); + assert!(err.contains("x_search.model")); + let err = + merge_hermes_x_search_config(&mut config, &json!({ "xSearchTimeoutSeconds": 29 })) + .unwrap_err(); + assert!(err.contains("x_search.timeout_seconds")); + let err = merge_hermes_x_search_config(&mut config, &json!({ "xSearchRetries": -1 })) + .unwrap_err(); + assert!(err.contains("x_search.retries")); + let err = merge_hermes_x_search_config(&mut config, &json!({ "xSearchRetries": 21 })) + .unwrap_err(); + assert!(err.contains("x_search.retries")); + } +} + #[cfg(test)] mod hermes_lsp_config_tests { use super::{build_hermes_lsp_config_values, merge_hermes_lsp_config}; diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 10cde10..9b67a14 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -333,6 +333,8 @@ pub fn run() { hermes::hermes_lsp_config_save, hermes::hermes_model_catalog_config_read, hermes::hermes_model_catalog_config_save, + hermes::hermes_x_search_config_read, + hermes::hermes_x_search_config_save, hermes::hermes_stt_config_read, hermes::hermes_stt_config_save, hermes::hermes_tts_voice_config_read, diff --git a/src/engines/hermes/pages/config.js b/src/engines/hermes/pages/config.js index 7d73d10..ed1c5f3 100644 --- a/src/engines/hermes/pages/config.js +++ b/src/engines/hermes/pages/config.js @@ -126,6 +126,12 @@ const MODEL_CATALOG_DEFAULTS = { modelCatalogProvidersJson: '{}', } +const X_SEARCH_DEFAULTS = { + xSearchModel: 'grok-4.20-reasoning', + xSearchTimeoutSeconds: 180, + xSearchRetries: 2, +} + const MODEL_ALIASES_DEFAULTS = { modelAliasesJson: '{}', } @@ -429,6 +435,7 @@ export function render() { let quickCommandsValues = { ...QUICK_COMMANDS_DEFAULTS } let modelValues = { ...MODEL_DEFAULTS } let modelCatalogValues = { ...MODEL_CATALOG_DEFAULTS } + let xSearchValues = { ...X_SEARCH_DEFAULTS } let modelAliasesValues = { ...MODEL_ALIASES_DEFAULTS } let hooksValues = { ...HOOKS_DEFAULTS } let providerOverridesValues = { ...PROVIDER_OVERRIDES_DEFAULTS } @@ -471,6 +478,7 @@ export function render() { let quickCommandsLoading = true let modelLoading = true let modelCatalogLoading = true + let xSearchLoading = true let modelAliasesLoading = true let hooksLoading = true let providerOverridesLoading = true @@ -513,6 +521,7 @@ export function render() { let quickCommandsSaving = false let modelSaving = false let modelCatalogSaving = false + let xSearchSaving = false let modelAliasesSaving = false let hooksSaving = false let providerOverridesSaving = false @@ -555,6 +564,7 @@ export function render() { let quickCommandsError = null let modelError = null let modelCatalogError = null + let xSearchError = null let modelAliasesError = null let hooksError = null let providerOverridesError = null @@ -591,7 +601,7 @@ export function render() { } function isBusy() { - return loading || runtimeLoading || sessionsMaintenanceLoading || updatesLoading || compressionLoading || promptCachingLoading || openrouterCacheLoading || providerRoutingLoading || auxiliaryLoading || toolGuardrailsLoading || memoryLoading || skillsLoading || curatorLoading || quickCommandsLoading || modelLoading || modelCatalogLoading || modelAliasesLoading || hooksLoading || providerOverridesLoading || mcpServersLoading || agentToolsetsLoading || platformToolsetsLoading || agentRuntimeLoading || unauthorizedDmLoading || securityLoading || displayLoading || humanDelayLoading || kanbanLoading || streamingLoading || executionLimitsLoading || ioSafetyLoading || checkpointsLoading || cronLoading || loggingLoading || approvalsLoading || privacyLoading || browserLoading || webLoading || lspLoading || sttLoading || ttsVoiceLoading || terminalLoading || saving || runtimeSaving || sessionsMaintenanceSaving || updatesSaving || compressionSaving || promptCachingSaving || openrouterCacheSaving || providerRoutingSaving || auxiliarySaving || toolGuardrailsSaving || memorySaving || skillsSaving || curatorSaving || quickCommandsSaving || modelSaving || modelCatalogSaving || modelAliasesSaving || hooksSaving || providerOverridesSaving || mcpServersSaving || agentToolsetsSaving || platformToolsetsSaving || agentRuntimeSaving || unauthorizedDmSaving || securitySaving || displaySaving || humanDelaySaving || kanbanSaving || streamingSaving || executionLimitsSaving || ioSafetySaving || checkpointsSaving || cronSaving || loggingSaving || approvalsSaving || privacySaving || browserSaving || webSaving || lspSaving || sttSaving || ttsVoiceSaving || terminalSaving + return loading || runtimeLoading || sessionsMaintenanceLoading || updatesLoading || compressionLoading || promptCachingLoading || openrouterCacheLoading || providerRoutingLoading || auxiliaryLoading || toolGuardrailsLoading || memoryLoading || skillsLoading || curatorLoading || quickCommandsLoading || modelLoading || modelCatalogLoading || xSearchLoading || modelAliasesLoading || hooksLoading || providerOverridesLoading || mcpServersLoading || agentToolsetsLoading || platformToolsetsLoading || agentRuntimeLoading || unauthorizedDmLoading || securityLoading || displayLoading || humanDelayLoading || kanbanLoading || streamingLoading || executionLimitsLoading || ioSafetyLoading || checkpointsLoading || cronLoading || loggingLoading || approvalsLoading || privacyLoading || browserLoading || webLoading || lspLoading || sttLoading || ttsVoiceLoading || terminalLoading || saving || runtimeSaving || sessionsMaintenanceSaving || updatesSaving || compressionSaving || promptCachingSaving || openrouterCacheSaving || providerRoutingSaving || auxiliarySaving || toolGuardrailsSaving || memorySaving || skillsSaving || curatorSaving || quickCommandsSaving || modelSaving || modelCatalogSaving || xSearchSaving || modelAliasesSaving || hooksSaving || providerOverridesSaving || mcpServersSaving || agentToolsetsSaving || platformToolsetsSaving || agentRuntimeSaving || unauthorizedDmSaving || securitySaving || displaySaving || humanDelaySaving || kanbanSaving || streamingSaving || executionLimitsSaving || ioSafetySaving || checkpointsSaving || cronSaving || loggingSaving || approvalsSaving || privacySaving || browserSaving || webSaving || lspSaving || sttSaving || ttsVoiceSaving || terminalSaving } function option(labelKey, value, selected) { @@ -1209,7 +1219,7 @@ export function render() { } function renderQuickCommandsConfigPanel() { - const disabled = loading || saving || quickCommandsLoading || quickCommandsSaving || modelSaving || modelAliasesSaving || hooksSaving || providerOverridesSaving || mcpServersSaving || agentToolsetsSaving || agentRuntimeSaving || runtimeSaving || compressionSaving || promptCachingSaving || openrouterCacheSaving || providerRoutingSaving || auxiliarySaving || toolGuardrailsSaving || memorySaving || skillsSaving || streamingSaving || executionLimitsSaving || checkpointsSaving || cronSaving || loggingSaving || approvalsSaving || terminalSaving + const disabled = loading || saving || quickCommandsLoading || quickCommandsSaving || modelSaving || xSearchSaving || modelAliasesSaving || hooksSaving || providerOverridesSaving || mcpServersSaving || agentToolsetsSaving || agentRuntimeSaving || runtimeSaving || compressionSaving || promptCachingSaving || openrouterCacheSaving || providerRoutingSaving || auxiliarySaving || toolGuardrailsSaving || memorySaving || skillsSaving || streamingSaving || executionLimitsSaving || checkpointsSaving || cronSaving || loggingSaving || approvalsSaving || terminalSaving return `
@@ -1235,7 +1245,7 @@ export function render() { } function renderModelConfigPanel() { - const disabled = loading || saving || modelLoading || modelSaving || modelCatalogSaving || quickCommandsSaving || modelAliasesSaving || hooksSaving || providerOverridesSaving || mcpServersSaving || agentToolsetsSaving || agentRuntimeSaving || runtimeSaving || compressionSaving || promptCachingSaving || openrouterCacheSaving || providerRoutingSaving || auxiliarySaving || toolGuardrailsSaving || memorySaving || skillsSaving || streamingSaving || executionLimitsSaving || checkpointsSaving || cronSaving || loggingSaving || approvalsSaving || terminalSaving + const disabled = loading || saving || modelLoading || modelSaving || modelCatalogSaving || xSearchSaving || quickCommandsSaving || modelAliasesSaving || hooksSaving || providerOverridesSaving || mcpServersSaving || agentToolsetsSaving || agentRuntimeSaving || runtimeSaving || compressionSaving || promptCachingSaving || openrouterCacheSaving || providerRoutingSaving || auxiliarySaving || toolGuardrailsSaving || memorySaving || skillsSaving || streamingSaving || executionLimitsSaving || checkpointsSaving || cronSaving || loggingSaving || approvalsSaving || terminalSaving return `
@@ -1279,7 +1289,7 @@ export function render() { } function renderModelCatalogConfigPanel() { - const disabled = loading || saving || modelCatalogLoading || modelCatalogSaving || modelSaving || quickCommandsSaving || modelAliasesSaving || hooksSaving || providerOverridesSaving || mcpServersSaving || agentToolsetsSaving || agentRuntimeSaving || runtimeSaving || compressionSaving || promptCachingSaving || openrouterCacheSaving || providerRoutingSaving || auxiliarySaving || toolGuardrailsSaving || memorySaving || skillsSaving || streamingSaving || executionLimitsSaving || checkpointsSaving || cronSaving || loggingSaving || approvalsSaving || terminalSaving + const disabled = loading || saving || modelCatalogLoading || modelCatalogSaving || modelSaving || xSearchSaving || quickCommandsSaving || modelAliasesSaving || hooksSaving || providerOverridesSaving || mcpServersSaving || agentToolsetsSaving || agentRuntimeSaving || runtimeSaving || compressionSaving || promptCachingSaving || openrouterCacheSaving || providerRoutingSaving || auxiliarySaving || toolGuardrailsSaving || memorySaving || skillsSaving || streamingSaving || executionLimitsSaving || checkpointsSaving || cronSaving || loggingSaving || approvalsSaving || terminalSaving return `
@@ -1320,8 +1330,44 @@ export function render() { ` } + function renderXSearchConfigPanel() { + const disabled = loading || saving || xSearchLoading || xSearchSaving || modelSaving || modelCatalogSaving || quickCommandsSaving || modelAliasesSaving || hooksSaving || providerOverridesSaving || mcpServersSaving || agentToolsetsSaving || agentRuntimeSaving || runtimeSaving || compressionSaving || promptCachingSaving || openrouterCacheSaving || providerRoutingSaving || auxiliarySaving || toolGuardrailsSaving || memorySaving || skillsSaving || streamingSaving || executionLimitsSaving || checkpointsSaving || cronSaving || loggingSaving || approvalsSaving || terminalSaving + return ` +
+
+
+
${t('engine.hermesXSearchConfigTitle')}
+
${t('engine.hermesXSearchConfigDesc')}
+
+
+ ${xSearchSaving ? t('engine.hermesConfigStatusSaving') : xSearchLoading ? t('engine.hermesConfigStatusLoading') : t('engine.hermesXSearchConfigStatusReady')} + +
+
+
+ ${renderError(xSearchError)} +
+ + + +
+
${t('engine.hermesXSearchConfigFootnote')}
+
+
+ ` + } + function renderModelAliasesConfigPanel() { - const disabled = loading || saving || modelAliasesLoading || modelAliasesSaving || quickCommandsSaving || modelSaving || modelCatalogSaving || hooksSaving || providerOverridesSaving || mcpServersSaving || agentToolsetsSaving || agentRuntimeSaving || runtimeSaving || compressionSaving || promptCachingSaving || openrouterCacheSaving || providerRoutingSaving || auxiliarySaving || toolGuardrailsSaving || memorySaving || skillsSaving || streamingSaving || executionLimitsSaving || checkpointsSaving || cronSaving || loggingSaving || approvalsSaving || terminalSaving + const disabled = loading || saving || modelAliasesLoading || modelAliasesSaving || quickCommandsSaving || modelSaving || modelCatalogSaving || xSearchSaving || hooksSaving || providerOverridesSaving || mcpServersSaving || agentToolsetsSaving || agentRuntimeSaving || runtimeSaving || compressionSaving || promptCachingSaving || openrouterCacheSaving || providerRoutingSaving || auxiliarySaving || toolGuardrailsSaving || memorySaving || skillsSaving || streamingSaving || executionLimitsSaving || checkpointsSaving || cronSaving || loggingSaving || approvalsSaving || terminalSaving return `
@@ -2755,6 +2801,7 @@ export function render() { ${renderQuickCommandsConfigPanel()} ${renderModelConfigPanel()} ${renderModelCatalogConfigPanel()} + ${renderXSearchConfigPanel()} ${renderModelAliasesConfigPanel()} ${renderHooksConfigPanel()} ${renderProviderOverridesConfigPanel()} @@ -2801,6 +2848,7 @@ export function render() { el.querySelector('#hm-quick-commands-save')?.addEventListener('click', saveQuickCommandsConfig) el.querySelector('#hm-model-config-save')?.addEventListener('click', saveModelConfig) el.querySelector('#hm-model-catalog-save')?.addEventListener('click', saveModelCatalogConfig) + el.querySelector('#hm-x-search-save')?.addEventListener('click', saveXSearchConfig) el.querySelector('#hm-model-aliases-save')?.addEventListener('click', saveModelAliasesConfig) el.querySelector('#hm-hooks-save')?.addEventListener('click', saveHooksConfig) el.querySelector('#hm-provider-overrides-save')?.addEventListener('click', saveProviderOverridesConfig) @@ -2909,6 +2957,11 @@ export function render() { modelCatalogValues = { ...MODEL_CATALOG_DEFAULTS, ...(data?.values || {}) } } + async function loadXSearchConfig() { + const data = await api.hermesXSearchConfigRead() + xSearchValues = { ...X_SEARCH_DEFAULTS, ...(data?.values || {}) } + } + async function loadModelAliasesConfig() { const data = await api.hermesModelAliasesConfigRead() modelAliasesValues = { ...MODEL_ALIASES_DEFAULTS, ...(data?.values || {}) } @@ -3056,6 +3109,7 @@ export function render() { quickCommandsLoading = true modelLoading = true modelCatalogLoading = true + xSearchLoading = true modelAliasesLoading = true hooksLoading = true providerOverridesLoading = true @@ -3098,6 +3152,7 @@ export function render() { quickCommandsError = null modelError = null modelCatalogError = null + xSearchError = null modelAliasesError = null hooksError = null providerOverridesError = null @@ -3363,6 +3418,14 @@ export function render() { modelCatalogLoading = false draw() } + try { + await loadXSearchConfig() + } catch (err) { + xSearchError = humanizeError(err, t('engine.hermesXSearchConfigLoadFailed') || 'Load X search config failed') + } finally { + xSearchLoading = false + draw() + } try { await loadModelAliasesConfig() } catch (err) { @@ -4029,6 +4092,33 @@ export function render() { } } + async function saveXSearchConfig() { + const form = { + xSearchModel: el.querySelector('#hm-x-search-model')?.value || X_SEARCH_DEFAULTS.xSearchModel, + xSearchTimeoutSeconds: el.querySelector('#hm-x-search-timeout-seconds')?.value || String(X_SEARCH_DEFAULTS.xSearchTimeoutSeconds), + xSearchRetries: el.querySelector('#hm-x-search-retries')?.value || String(X_SEARCH_DEFAULTS.xSearchRetries), + } + xSearchSaving = true + xSearchError = null + draw() + try { + const result = await api.hermesXSearchConfigSave(form) + xSearchValues = { ...X_SEARCH_DEFAULTS, ...(result?.values || form) } + await refreshRawAfterStructuredSave() + const backup = result?.backup || '' + toast({ + message: t('engine.hermesXSearchConfigSaveSuccess'), + hint: backup ? t('engine.hermesConfigBackupHint', { path: backup }) : '', + }, 'success') + } catch (err) { + xSearchError = humanizeError(err, t('engine.hermesXSearchConfigSaveFailed') || 'Save X search config failed') + toast(xSearchError, 'error') + } finally { + xSearchSaving = false + draw() + } + } + async function saveModelAliasesConfig() { const form = { modelAliasesJson: el.querySelector('#hm-model-aliases-json')?.value || '{}', diff --git a/src/lib/tauri-api.js b/src/lib/tauri-api.js index 9f8b378..cc110aa 100644 --- a/src/lib/tauri-api.js +++ b/src/lib/tauri-api.js @@ -585,6 +585,8 @@ export const api = { hermesLspConfigSave: (form) => invoke('hermes_lsp_config_save', { form }), hermesModelCatalogConfigRead: () => invoke('hermes_model_catalog_config_read'), hermesModelCatalogConfigSave: (form) => invoke('hermes_model_catalog_config_save', { form }), + hermesXSearchConfigRead: () => invoke('hermes_x_search_config_read'), + hermesXSearchConfigSave: (form) => invoke('hermes_x_search_config_save', { form }), hermesSttConfigRead: () => invoke('hermes_stt_config_read'), hermesSttConfigSave: (form) => invoke('hermes_stt_config_save', { form }), hermesTtsVoiceConfigRead: () => invoke('hermes_tts_voice_config_read'), diff --git a/src/locales/modules/engine.js b/src/locales/modules/engine.js index 3296a89..0a3b33a 100644 --- a/src/locales/modules/engine.js +++ b/src/locales/modules/engine.js @@ -751,6 +751,17 @@ export default { hermesModelCatalogConfigTtlHours: _('缓存小时数', 'Cache TTL hours', '快取小時數'), hermesModelCatalogConfigProvidersJson: _('Provider 目录覆盖 JSON', 'Provider catalog override JSON', 'Provider 目錄覆蓋 JSON'), hermesModelCatalogConfigFootnote: _('这里写入 model_catalog.enabled、model_catalog.url、model_catalog.ttl_hours 和 model_catalog.providers。providers 必须是 JSON object，provider 名称只能包含字母、数字、下划线、点和短横线；每个 provider 的 url 必须是 http 或 https。未知 model_catalog 子字段会保留在 raw YAML 中。', 'This writes model_catalog.enabled, model_catalog.url, model_catalog.ttl_hours, and model_catalog.providers. providers must be a JSON object, provider names may contain letters, numbers, underscores, dots, and hyphens only, and each provider url must use http or https. Unknown model_catalog fields stay in raw YAML.', '這裡寫入 model_catalog.enabled、model_catalog.url、model_catalog.ttl_hours 和 model_catalog.providers。providers 必須是 JSON object，provider 名稱只能包含字母、數字、底線、點和短橫線；每個 provider 的 url 必須是 http 或 https。未知 model_catalog 子欄位會保留在 raw YAML 中。'), + hermesXSearchConfigTitle: _('X 搜索', 'X Search', 'X 搜尋'), + hermesXSearchConfigDesc: _('控制 Hermes x_search 工具的模型、超时和重试次数，只管理运行参数，不保存 xAI 凭证。', 'Control the Hermes x_search tool model, timeout, and retry count. This manages runtime parameters only and does not store xAI credentials.', '控制 Hermes x_search 工具的模型、逾時和重試次數，只管理執行參數，不儲存 xAI 憑證。'), + hermesXSearchConfigStatusReady: _('结构化配置', 'structured settings', '結構化設定'), + hermesXSearchConfigSave: _('保存 X 搜索配置', 'Save X Search settings', '儲存 X 搜尋設定'), + hermesXSearchConfigSaveSuccess: _('X 搜索配置已保存，建议重启 Hermes Gateway 生效', 'X Search settings saved. Restart Hermes Gateway to take effect.', 'X 搜尋設定已儲存，建議重啟 Hermes Gateway 生效'), + hermesXSearchConfigLoadFailed: _('加载 X 搜索配置失败', 'Load X Search settings failed', '載入 X 搜尋設定失敗'), + hermesXSearchConfigSaveFailed: _('保存 X 搜索配置失败', 'Save X Search settings failed', '儲存 X 搜尋設定失敗'), + hermesXSearchConfigModel: _('搜索模型', 'Search model', '搜尋模型'), + hermesXSearchConfigTimeoutSeconds: _('超时秒数', 'Timeout seconds', '逾時秒數'), + hermesXSearchConfigRetries: _('重试次数', 'Retry count', '重試次數'), + hermesXSearchConfigFootnote: _('这里写入 x_search.model、x_search.timeout_seconds 和 x_search.retries。xAI OAuth 或 XAI_API_KEY 仍由 Hermes 运行时读取；需要启用 x_search toolset 后才会调用该工具。未知 x_search 子字段会保留在 raw YAML 中。', 'This writes x_search.model, x_search.timeout_seconds, and x_search.retries. xAI OAuth or XAI_API_KEY is still read by the Hermes runtime; the x_search toolset must be enabled before the tool is called. Unknown x_search fields stay in raw YAML.', '這裡寫入 x_search.model、x_search.timeout_seconds 和 x_search.retries。xAI OAuth 或 XAI_API_KEY 仍由 Hermes 執行時讀取；需要啟用 x_search toolset 後才會呼叫該工具。未知 x_search 子欄位會保留在 raw YAML 中。'), hermesLspConfigTitle: _('LSP 语义诊断', 'LSP semantic diagnostics', 'LSP 語意診斷'), hermesLspConfigDesc: _('控制写文件和补丁后的语言服务器诊断等待、工作区扫描和缺失服务器自动安装策略。', 'Control language-server diagnostic waits, workspace scans, and missing-server install strategy after file writes and patches.', '控制寫檔和補丁後的語言伺服器診斷等待、工作區掃描和缺失伺服器自動安裝策略。'), hermesLspConfigStatusReady: _('结构化配置', 'structured settings', '結構化設定'), diff --git a/tests/hermes-config-page-ui.test.js b/tests/hermes-config-page-ui.test.js index a0ceff5..e8781ef 100644 --- a/tests/hermes-config-page-ui.test.js +++ b/tests/hermes-config-page-ui.test.js @@ -139,6 +139,17 @@ test('Hermes 配置页会暴露模型目录结构化配置字段', () => { } }) +test('Hermes 配置页会暴露 X 搜索结构化配置字段', () => { + for (const id of [ + 'hm-x-search-save', + 'hm-x-search-model', + 'hm-x-search-timeout-seconds', + 'hm-x-search-retries', + ]) { + assert.match(source, new RegExp(`id="${id}"`), `缺少 ${id}`) + } +}) + test('Hermes 配置页会暴露 provider 超时覆盖结构化配置字段', () => { for (const id of [ 'hm-provider-overrides-save', diff --git a/tests/hermes-x-search-config.test.js b/tests/hermes-x-search-config.test.js new file mode 100644 index 0000000..5c6c6a0 --- /dev/null +++ b/tests/hermes-x-search-config.test.js @@ -0,0 +1,78 @@ +import test from 'node:test' +import assert from 'node:assert/strict' + +import { + buildHermesXSearchConfigValues, + mergeHermesXSearchConfig, +} from '../scripts/dev-api.js' + +test('Hermes X 搜索配置读取会提供上游默认值', () => { + const values = buildHermesXSearchConfigValues({}) + + assert.deepEqual(values, { + xSearchModel: 'grok-4.20-reasoning', + xSearchTimeoutSeconds: 180, + xSearchRetries: 2, + }) +}) + +test('Hermes X 搜索配置读取会回显 YAML 字段', () => { + const values = buildHermesXSearchConfigValues({ + x_search: { + model: 'grok-4.20-fast', + timeout_seconds: 90, + retries: 4, + }, + }) + + assert.equal(values.xSearchModel, 'grok-4.20-fast') + assert.equal(values.xSearchTimeoutSeconds, 90) + assert.equal(values.xSearchRetries, 4) +}) + +test('Hermes X 搜索配置保存会保留未知字段并写入上游结构', () => { + const next = mergeHermesXSearchConfig({ + model: { provider: 'xai' }, + x_search: { + model: 'old-grok', + timeout_seconds: 60, + retries: 1, + custom_flag: 'keep-x-search', + }, + streaming: { enabled: true }, + }, { + xSearchModel: 'grok-4.20-reasoning', + xSearchTimeoutSeconds: 240, + xSearchRetries: 3, + }) + + assert.deepEqual(next.model, { provider: 'xai' }) + assert.deepEqual(next.streaming, { enabled: true }) + assert.equal(next.x_search.model, 'grok-4.20-reasoning') + assert.equal(next.x_search.timeout_seconds, 240) + assert.equal(next.x_search.retries, 3) + assert.equal(next.x_search.custom_flag, 'keep-x-search') +}) + +test('Hermes X 搜索配置保存会拒绝非法模型、超时和重试次数', () => { + assert.throws( + () => mergeHermesXSearchConfig({}, { xSearchModel: '' }), + /x_search\.model/, + ) + assert.throws( + () => mergeHermesXSearchConfig({}, { xSearchModel: 'bad model' }), + /x_search\.model/, + ) + assert.throws( + () => mergeHermesXSearchConfig({}, { xSearchTimeoutSeconds: 29 }), + /x_search\.timeout_seconds/, + ) + assert.throws( + () => mergeHermesXSearchConfig({}, { xSearchRetries: -1 }), + /x_search\.retries/, + ) + assert.throws( + () => mergeHermesXSearchConfig({}, { xSearchRetries: 21 }), + /x_search\.retries/, + ) +})