Merge branch 'main' into chore/sync-gemini-cli-v0.1.21

packages/core/src/core/client.ts

@@ -509,7 +509,20 @@ export class GeminiClient {
       }
     }
 
-    if (this.config.getIdeMode()) {
+    // Prevent context updates from being sent while a tool call is
+    // waiting for a response. The Qwen API requires that a functionResponse
+    // part from the user immediately follows a functionCall part from the model
+    // in the conversation history . The IDE context is not discarded; it will
+    // be included in the next regular message sent to the model.
+    const history = this.getHistory();
+    const lastMessage =
+      history.length > 0 ? history[history.length - 1] : undefined;
+    const hasPendingToolCall =
+      !!lastMessage &&
+      lastMessage.role === 'model' &&
+      (lastMessage.parts?.some((p) => 'functionCall' in p) || false);
+
+    if (this.config.getIdeMode() && !hasPendingToolCall) {
       const { contextParts, newIdeContext } = this.getIdeContextParts(
         this.forceFullIdeContext || this.getHistory().length === 0,
       );

packages/core/src/core/openaiContentGenerator.ts

@@ -129,6 +129,7 @@ export class OpenAIContentGenerator implements ContentGenerator {
         : isDashScopeProvider
           ? {
               'X-DashScope-CacheControl': 'enable',
+              'X-DashScope-UserAgent': userAgent,
             }
           : {}),
     };

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

@@ -5,7 +5,6 @@
  */
 
 import { BaseTool, Kind, ToolResult } from './tools.js';
-import { Type } from '@google/genai';
 import { SchemaValidator } from '../utils/schemaValidator.js';
 import { getErrorMessage } from '../utils/errors.js';
 import { Config } from '../config/config.js';
@@ -57,10 +56,10 @@ export class WebSearchTool extends BaseTool<
       'Performs a web search using the Tavily API and returns a concise answer with sources. Requires the TAVILY_API_KEY environment variable.',
       Kind.Search,
       {
-        type: Type.OBJECT,
+        type: 'object',
         properties: {
           query: {
-            type: Type.STRING,
+            type: 'string',
             description: 'The search query to find information on the web.',
           },
         },