feat: update code

packages/cli/src/config/config.ts

@@ -766,7 +766,11 @@ export async function loadCliConfig(
           : argv.openaiLogging) ?? false,
     },
     cliVersion: await getCliVersion(),
-    webSearch: buildWebSearchConfig(argv, settings),
+    webSearch: buildWebSearchConfig(
+      argv,
+      settings,
+      settings.security?.auth?.selectedType,
+    ),
     summarizeToolOutput: settings.model?.summarizeToolOutput,
     ideMode,
     chatCompression: settings.model?.chatCompression,

packages/cli/src/config/webSearch.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { AuthType } from '@qwen-code/qwen-code-core';
 import type { WebSearchProviderConfig } from '@qwen-code/qwen-code-core';
 import type { Settings } from './settings.js';
 
@@ -33,56 +34,85 @@ export interface WebSearchConfig {
  *
  * @param argv - Command line arguments
  * @param settings - User settings from settings.json
+ * @param authType - Authentication type (e.g., 'qwen-oauth')
  * @returns WebSearch configuration or undefined if no providers available
  */
 export function buildWebSearchConfig(
   argv: WebSearchCliArgs,
   settings: Settings,
+  authType?: string,
 ): WebSearchConfig | undefined {
-  // Priority 1: Use settings.json webSearch config if present
+  const isQwenOAuth = authType === AuthType.QWEN_OAUTH;
+
+  // Step 1: Collect providers from settings or command line/env
+  let providers: WebSearchProviderConfig[] = [];
+  let userDefault: string | undefined;
+
   if (settings.webSearch) {
-    return settings.webSearch;
+    // Use providers from settings.json
+    providers = [...settings.webSearch.provider];
+    userDefault = settings.webSearch.default;
+  } else {
+    // Build providers from command line args and environment variables
+    const tavilyKey =
+      argv.tavilyApiKey ||
+      settings.advanced?.tavilyApiKey ||
+      process.env['TAVILY_API_KEY'];
+    if (tavilyKey) {
+      providers.push({
+        type: 'tavily',
+        apiKey: tavilyKey,
+      } as WebSearchProviderConfig);
+    }
+
+    const googleKey = argv.googleApiKey || process.env['GOOGLE_API_KEY'];
+    const googleEngineId =
+      argv.googleSearchEngineId || process.env['GOOGLE_SEARCH_ENGINE_ID'];
+    if (googleKey && googleEngineId) {
+      providers.push({
+        type: 'google',
+        apiKey: googleKey,
+        searchEngineId: googleEngineId,
+      } as WebSearchProviderConfig);
+    }
   }
 
-  // Priority 2: Build from command line args and environment variables
-  const providers: WebSearchProviderConfig[] = [];
-
-  // DashScope is always available (official, free)
-  providers.push({ type: 'dashscope' } as WebSearchProviderConfig);
-
-  // Tavily from args/env/legacy settings
-  const tavilyKey =
-    argv.tavilyApiKey ||
-    settings.advanced?.tavilyApiKey ||
-    process.env['TAVILY_API_KEY'];
-  if (tavilyKey) {
-    providers.push({
-      type: 'tavily',
-      apiKey: tavilyKey,
-    } as WebSearchProviderConfig);
+  // Step 2: Ensure dashscope is available for qwen-oauth users
+  if (isQwenOAuth) {
+    const hasDashscope = providers.some((p) => p.type === 'dashscope');
+    if (!hasDashscope) {
+      providers.push({ type: 'dashscope' } as WebSearchProviderConfig);
+    }
   }
 
-  // Google from args/env
-  const googleKey = argv.googleApiKey || process.env['GOOGLE_API_KEY'];
-  const googleEngineId =
-    argv.googleSearchEngineId || process.env['GOOGLE_SEARCH_ENGINE_ID'];
-  if (googleKey && googleEngineId) {
-    providers.push({
-      type: 'google',
-      apiKey: googleKey,
-      searchEngineId: googleEngineId,
-    } as WebSearchProviderConfig);
-  }
-
-  // If no providers configured, return undefined
+  // Step 3: If no providers available, return undefined
   if (providers.length === 0) {
     return undefined;
   }
 
-  // Determine default provider
-  // Priority: CLI arg > has Tavily key > DashScope (fallback)
-  const defaultProvider =
-    argv.webSearchDefault || (tavilyKey ? 'tavily' : 'dashscope');
+  // Step 4: Determine default provider
+  // Priority: user explicit config > CLI arg > first available provider (tavily > google > dashscope)
+  const providerPriority: Array<'tavily' | 'google' | 'dashscope'> = [
+    'tavily',
+    'google',
+    'dashscope',
+  ];
+
+  // Determine default provider based on availability
+  let defaultProvider = userDefault || argv.webSearchDefault;
+  if (!defaultProvider) {
+    // Find first available provider by priority order
+    for (const providerType of providerPriority) {
+      if (providers.some((p) => p.type === providerType)) {
+        defaultProvider = providerType;
+        break;
+      }
+    }
+    // Fallback to first available provider if none found in priority list
+    if (!defaultProvider) {
+      defaultProvider = providers[0]?.type || 'dashscope';
+    }
+  }
 
   return {
     provider: providers,

packages/core/src/config/config.ts

@@ -1166,12 +1166,10 @@ export class Config {
     registerCoreTool(TodoWriteTool, this);
     registerCoreTool(ExitPlanModeTool, this);
     registerCoreTool(WebFetchTool, this);
-    // Conditionally register web search tool if any web search provider is configured
-    // or if using qwen-oauth authentication
-    if (
-      this.getWebSearchConfig() ||
-      this.getAuthType() === AuthType.QWEN_OAUTH
-    ) {
+    // Conditionally register web search tool if web search provider is configured
+    // buildWebSearchConfig ensures qwen-oauth users get dashscope provider, so
+    // if tool is registered, config must exist
+    if (this.getWebSearchConfig()) {
       registerCoreTool(WebSearchTool, this);
     }
 

packages/core/src/tools/web-search/index.ts

@@ -17,7 +17,6 @@ import { ToolErrorType } from '../tool-error.js';
 
 import type { Config } from '../../config/config.js';
 import { ApprovalMode } from '../../config/config.js';
-import { AuthType } from '../../core/contentGenerator.js';
 import { getErrorMessage } from '../../utils/errors.js';
 import { buildContentWithSources } from './utils.js';
 import { TavilyProvider } from './providers/tavily-provider.js';
@@ -44,16 +43,9 @@ class WebSearchToolInvocation extends BaseToolInvocation<
   }
 
   override getDescription(): string {
-    const webSearchConfig = this.config.getWebSearchConfig();
-    const authType = this.config.getAuthType();
-    let defaultProvider = webSearchConfig?.default;
-
-    // If auth type is QWEN_OAUTH, prefer dashscope as default
-    if (authType === AuthType.QWEN_OAUTH && !defaultProvider) {
-      defaultProvider = 'dashscope';
-    }
-
-    const provider = this.params.provider || defaultProvider;
+    // If tool is registered, config must exist with a default provider
+    const webSearchConfig = this.config.getWebSearchConfig()!;
+    const provider = this.params.provider || webSearchConfig.default;
     return ` (Searching the web via ${provider})`;
   }
 
@@ -217,21 +209,8 @@ class WebSearchToolInvocation extends BaseToolInvocation<
   }
 
   async execute(signal: AbortSignal): Promise<WebSearchToolResult> {
-    // Guard: Check configuration exists
-    const webSearchConfig = this.config.getWebSearchConfig();
-    if (!webSearchConfig) {
-      const message =
-        'Web search is disabled. Please configure web search providers in settings.json.';
-      return {
-        llmContent: message,
-        returnDisplay:
-          'Web search disabled. Configure providers to enable search.',
-        error: {
-          message,
-          type: ToolErrorType.EXECUTION_FAILED,
-        },
-      };
-    }
+    // If tool is registered, config must exist with providers and default
+    const webSearchConfig = this.config.getWebSearchConfig()!;
 
     try {
       // Create and select provider