tiennm99/ccs
1
0
Fork 0
mirror of https://github.com/tiennm99/ccs.git synced 2026-07-17 04:17:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(websearch): preserve opencode and grok in mergeWithDefaults

Browse Source 
The mergeWithDefaults() function was only merging gemini provider config,
completely ignoring opencode and grok providers. This caused:
1. OpenCode enabled=true in config.yaml being reset to false
2. Dashboard showing OpenCode toggled off after reload
3. "Disabled in config" message when only OpenCode was enabled

Fixed by adding opencode and grok to the mergeWithDefaults() function
and updating getWebSearchConfig() to check if ANY provider is enabled.
This commit is contained in:
kaitranntt
2025-12-16 22:18:05 -05:00
parent 4959928a8e
commit 110925e72e
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/unified-config-loader.ts
+29 -4
View File
@@ -142,6 +142,15 @@ function mergeWithDefaults(partial: Partial<UnifiedConfig>): UnifiedConfig {
partial.websearch?.gemini?.timeout ?? // Legacy fallback
55,
},
opencode: {
enabled: partial.websearch?.providers?.opencode?.enabled ?? false,
model: partial.websearch?.providers?.opencode?.model ?? 'opencode/gpt-5-nano',
timeout: partial.websearch?.providers?.opencode?.timeout ?? 60,
},
grok: {
enabled: partial.websearch?.providers?.grok?.enabled ?? false,
timeout: partial.websearch?.providers?.grok?.timeout ?? 55,
},
},
// Legacy fields (keep for backwards compatibility during read)
gemini: partial.websearch?.gemini,
@@ -359,19 +368,21 @@ export interface GeminiWebSearchInfo {
/**
* Get websearch configuration.
* Returns defaults if not configured.
* Simplified: Gemini CLI only (future CLI tools can be added).
* Supports Gemini CLI, OpenCode, and Grok CLI providers.
*/
export function getWebSearchConfig(): {
enabled: boolean;
providers?: {
gemini?: GeminiWebSearchInfo;
opencode?: { enabled?: boolean; model?: string; timeout?: number };
grok?: { enabled?: boolean; timeout?: number };
};
// Legacy fields (deprecated)
gemini?: { enabled?: boolean; timeout?: number };
} {
const config = loadOrCreateUnifiedConfig();
// Build provider config from new format or legacy fallbacks
// Build provider configs
const geminiConfig: GeminiWebSearchInfo = {
enabled:
config.websearch?.providers?.gemini?.enabled ?? config.websearch?.gemini?.enabled ?? true,
@@ -379,13 +390,27 @@ export function getWebSearchConfig(): {
config.websearch?.providers?.gemini?.timeout ?? config.websearch?.gemini?.timeout ?? 55,
};
// Auto-disable master switch if Gemini is not enabled
const enabled = geminiConfig.enabled && (config.websearch?.enabled ?? true);
const opencodeConfig = {
enabled: config.websearch?.providers?.opencode?.enabled ?? false,
model: config.websearch?.providers?.opencode?.model ?? 'opencode/gpt-5-nano',
timeout: config.websearch?.providers?.opencode?.timeout ?? 60,
};
const grokConfig = {
enabled: config.websearch?.providers?.grok?.enabled ?? false,
timeout: config.websearch?.providers?.grok?.timeout ?? 55,
};
// Auto-enable master switch if ANY provider is enabled
const anyProviderEnabled = geminiConfig.enabled || opencodeConfig.enabled || grokConfig.enabled;
const enabled = anyProviderEnabled && (config.websearch?.enabled ?? true);
return {
enabled,
providers: {
gemini: geminiConfig,
opencode: opencodeConfig,
grok: grokConfig,
},
// Legacy field for backwards compatibility
gemini: config.websearch?.gemini,