feat: add web_search docs

packages/cli/src/config/config.ts

@@ -43,6 +43,7 @@ import { mcpCommand } from '../commands/mcp.js';
 
 import { isWorkspaceTrusted } from './trustedFolders.js';
 import type { ExtensionEnablementManager } from './extensions/extensionEnablement.js';
+import { buildWebSearchConfig } from './webSearch.js';
 
 // Simple console logger for now - replace with actual logger if available
 const logger = {
@@ -117,6 +118,9 @@ export interface CliArgs {
   proxy: string | undefined;
   includeDirectories: string[] | undefined;
   tavilyApiKey: string | undefined;
+  googleApiKey: string | undefined;
+  googleSearchEngineId: string | undefined;
+  webSearchDefault: string | undefined;
   screenReader: boolean | undefined;
   vlmSwitchMode: string | undefined;
   useSmartEdit: boolean | undefined;
@@ -325,7 +329,20 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
         })
         .option('tavily-api-key', {
           type: 'string',
-          description: 'Tavily API key for web search functionality',
+          description: 'Tavily API key for web search',
+        })
+        .option('google-api-key', {
+          type: 'string',
+          description: 'Google Custom Search API key',
+        })
+        .option('google-search-engine-id', {
+          type: 'string',
+          description: 'Google Custom Search Engine ID',
+        })
+        .option('web-search-default', {
+          type: 'string',
+          description:
+            'Default web search provider (dashscope, tavily, google)',
         })
         .option('screen-reader', {
           type: 'boolean',
@@ -747,10 +764,7 @@ export async function loadCliConfig(
           : argv.openaiLogging) ?? false,
     },
     cliVersion: await getCliVersion(),
-    tavilyApiKey:
-      argv.tavilyApiKey ||
-      settings.advanced?.tavilyApiKey ||
-      process.env['TAVILY_API_KEY'],
+    webSearch: buildWebSearchConfig(argv, settings),
     summarizeToolOutput: settings.model?.summarizeToolOutput,
     ideMode,
     chatCompression: settings.model?.chatCompression,
@@ -771,7 +785,6 @@ export async function loadCliConfig(
     output: {
       format: (argv.outputFormat ?? settings.output?.format) as OutputFormat,
     },
-    webSearch: settings.webSearch,
   });
 }
 

packages/cli/src/config/settingsSchema.ts

@@ -1044,12 +1044,12 @@ const SETTINGS_SCHEMA = {
       },
       tavilyApiKey: {
         type: 'string',
-        label: 'Tavily API Key',
+        label: 'Tavily API Key (Deprecated)',
         category: 'Advanced',
         requiresRestart: false,
         default: undefined as string | undefined,
         description:
-          'The API key for the Tavily API. Required to enable the web_search tool functionality.',
+          '⚠️ DEPRECATED: Please use webSearch.provider configuration instead. Legacy API key for the Tavily API.',
         showInDialog: false,
       },
     },

packages/cli/src/config/webSearch.ts

@@ -0,0 +1,91 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { WebSearchProviderConfig } from '@qwen-code/qwen-code-core';
+import type { Settings } from './settings.js';
+
+/**
+ * CLI arguments related to web search configuration
+ */
+export interface WebSearchCliArgs {
+  tavilyApiKey?: string;
+  googleApiKey?: string;
+  googleSearchEngineId?: string;
+  webSearchDefault?: string;
+}
+
+/**
+ * Web search configuration structure
+ */
+export interface WebSearchConfig {
+  provider: WebSearchProviderConfig[];
+  default: string;
+}
+
+/**
+ * Build webSearch configuration from multiple sources with priority:
+ * 1. settings.json (new format) - highest priority
+ * 2. Command line args + environment variables
+ * 3. Legacy tavilyApiKey (backward compatibility)
+ *
+ * @param argv - Command line arguments
+ * @param settings - User settings from settings.json
+ * @returns WebSearch configuration or undefined if no providers available
+ */
+export function buildWebSearchConfig(
+  argv: WebSearchCliArgs,
+  settings: Settings,
+): WebSearchConfig | undefined {
+  // Priority 1: Use settings.json webSearch config if present
+  if (settings.webSearch) {
+    return settings.webSearch;
+  }
+
+  // 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);
+  }
+
+  // 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
+  if (providers.length === 0) {
+    return undefined;
+  }
+
+  // Determine default provider
+  // Priority: CLI arg > has Tavily key > DashScope (fallback)
+  const defaultProvider =
+    argv.webSearchDefault || (tavilyKey ? 'tavily' : 'dashscope');
+
+  return {
+    provider: providers,
+    default: defaultProvider,
+  };
+}

packages/cli/src/gemini.test.tsx

@@ -330,6 +330,9 @@ describe('gemini.tsx main function kitty protocol', () => {
       proxy: undefined,
       includeDirectories: undefined,
       tavilyApiKey: undefined,
+      googleApiKey: undefined,
+      googleSearchEngineId: undefined,
+      webSearchDefault: undefined,
       screenReader: undefined,
       vlmSwitchMode: undefined,
       useSmartEdit: undefined,