mpd-llm-cli 0.1.11 → 0.1.12

package/bundle/api.cjs

@@ -139956,7 +139956,13 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseTool {
     this.timeout = timeout;
     this.trust = trust;
   }
-  async shouldConfirmExecute(_params, _abortSignal) {
+  async shouldConfirmExecute(params, _abortSignal) {
+    if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+      console.error(`[MCP DEBUG] shouldConfirmExecute called for tool: ${this.name}`);
+      console.error(`[MCP DEBUG] Received params:`, JSON.stringify(params, null, 2));
+      console.error(`[MCP DEBUG] Params type:`, typeof params);
+      console.error(`[MCP DEBUG] Params keys:`, Object.keys(params));
+    }
     const serverAllowListKey = this.serverName;
     const toolAllowListKey = `${this.serverName}.${this.serverToolName}`;
     if (process.env.YOLO) {
@@ -139976,6 +139982,8 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseTool {
       // Display original tool name in confirmation
       toolDisplayName: this.name,
       // Display global registry name exposed to model and user
+      args: params,
+      // Include the parameters
       onConfirm: async (outcome) => {
         if (outcome === ToolConfirmationOutcome.ProceedAlwaysServer) {
           _DiscoveredMCPTool.allowlist.add(serverAllowListKey);
@@ -140190,8 +140198,15 @@ Make sure it is available in the sandbox`;
       if (toolNameForModel.length > 63) {
         toolNameForModel = toolNameForModel.slice(0, 28) + "___" + toolNameForModel.slice(-32);
       }
-      sanitizeParameters(funcDecl.parameters);
-      toolRegistry.registerTool(new DiscoveredMCPTool(mcpCallableTool, mcpServerName, toolNameForModel, funcDecl.description ?? "", funcDecl.parameters ?? { type: import_genai4.Type.OBJECT, properties: {} }, funcDecl.name, mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC, mcpServerConfig.trust));
+      if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+        console.error(`[MCP DEBUG] Registering tool: ${toolNameForModel} (server: ${mcpServerName}, original: ${funcDecl.name})`);
+        console.error(`[MCP DEBUG] Tool parameters:`, JSON.stringify(funcDecl.parameters, null, 2));
+        console.error(`[MCP DEBUG] Tool parametersJsonSchema:`, JSON.stringify(funcDecl.parametersJsonSchema, null, 2));
+        console.error(`[MCP DEBUG] Tool description:`, funcDecl.description);
+      }
+      const parametersSchema = funcDecl.parameters || funcDecl.parametersJsonSchema || { type: import_genai4.Type.OBJECT, properties: {} };
+      sanitizeParameters(parametersSchema);
+      toolRegistry.registerTool(new DiscoveredMCPTool(mcpCallableTool, mcpServerName, toolNameForModel, funcDecl.description ?? "", parametersSchema, funcDecl.name, mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC, mcpServerConfig.trust));
     }
   } catch (error) {
     console.error(`Failed to list or register tools for MCP server '${mcpServerName}': ${error}`);
@@ -149798,6 +149813,34 @@ function isFunctionCall(content) {
 
 // packages/core/dist/src/utils/editCorrector.js
 var fs13 = __toESM(require("fs"), 1);
+function filterIncompleteToolCalls(contents) {
+  const toolCallIds = /* @__PURE__ */ new Set();
+  const toolResponseIds = /* @__PURE__ */ new Set();
+  for (const message of contents) {
+    if (message.parts) {
+      for (const part of message.parts) {
+        if (part.functionCall?.id) {
+          toolCallIds.add(part.functionCall.id);
+        }
+        if (part.functionResponse?.id) {
+          toolResponseIds.add(part.functionResponse.id);
+        }
+      }
+    }
+  }
+  return contents.filter((message) => {
+    if (!message.parts)
+      return true;
+    for (const part of message.parts) {
+      if (part.functionCall?.id) {
+        if (!toolResponseIds.has(part.functionCall.id)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  });
+}
 var EditModel = DEFAULT_GEMINI_FLASH_MODEL;
 var EditConfig = {
   thinkingConfig: {
@@ -150027,8 +150070,9 @@ If the differences are only in whitespace or formatting, apply similar whitespac
 Return ONLY the corrected target snippet in the specified JSON format with the key 'corrected_target_snippet'. If no clear, unique match can be found, return an empty string for 'corrected_target_snippet'.
 `.trim();
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
+  const filteredContents = filterIncompleteToolCalls(contents);
   try {
-    const result = await geminiClient.generateJson(contents, OLD_STRING_CORRECTION_SCHEMA, abortSignal, EditModel, EditConfig);
+    const result = await geminiClient.generateJson(filteredContents, OLD_STRING_CORRECTION_SCHEMA, abortSignal, EditModel, EditConfig);
     if (result && typeof result.corrected_target_snippet === "string" && result.corrected_target_snippet.length > 0) {
       return result.corrected_target_snippet;
     } else {
@@ -150085,8 +150129,9 @@ If the differences are only in whitespace or formatting, apply similar whitespac
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_new_string'. If no adjustment is deemed necessary or possible, return the original_new_string.
   `.trim();
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
+  const filteredContents = filterIncompleteToolCalls(contents);
   try {
-    const result = await geminiClient.generateJson(contents, NEW_STRING_CORRECTION_SCHEMA, abortSignal, EditModel, EditConfig);
+    const result = await geminiClient.generateJson(filteredContents, NEW_STRING_CORRECTION_SCHEMA, abortSignal, EditModel, EditConfig);
     if (result && typeof result.corrected_new_string === "string" && result.corrected_new_string.length > 0) {
       return result.corrected_new_string;
     } else {
@@ -150135,8 +150180,9 @@ If potentially_problematic_new_string is console.log(\\"Hello World\\"), it shou
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_new_string_escaping'. If no escaping correction is needed, return the original potentially_problematic_new_string.
   `.trim();
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
+  const filteredContents = filterIncompleteToolCalls(contents);
   try {
-    const result = await geminiClient.generateJson(contents, CORRECT_NEW_STRING_ESCAPING_SCHEMA, abortSignal, EditModel, EditConfig);
+    const result = await geminiClient.generateJson(filteredContents, CORRECT_NEW_STRING_ESCAPING_SCHEMA, abortSignal, EditModel, EditConfig);
     if (result && typeof result.corrected_new_string_escaping === "string" && result.corrected_new_string_escaping.length > 0) {
       return result.corrected_new_string_escaping;
     } else {
@@ -150180,8 +150226,9 @@ If potentially_problematic_string is console.log(\\"Hello World\\"), it should b
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_string_escaping'. If no escaping correction is needed, return the original potentially_problematic_string.
   `.trim();
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
+  const filteredContents = filterIncompleteToolCalls(contents);
   try {
-    const result = await client.generateJson(contents, CORRECT_STRING_ESCAPING_SCHEMA, abortSignal, EditModel, EditConfig);
+    const result = await client.generateJson(filteredContents, CORRECT_STRING_ESCAPING_SCHEMA, abortSignal, EditModel, EditConfig);
     if (result && typeof result.corrected_string_escaping === "string" && result.corrected_string_escaping.length > 0) {
       return result.corrected_string_escaping;
     } else {
@@ -157075,12 +157122,24 @@ async function checkNextSpeaker(chat, geminiClient, abortSignal) {
   if (!lastMessage || lastMessage.role !== "model") {
     return null;
   }
+  const hasIncompleteToolCalls = checkForIncompleteToolCalls(curatedHistory);
+  if (hasIncompleteToolCalls) {
+    return {
+      reasoning: "There are pending tool calls that need to be processed, so the model should speak next.",
+      next_speaker: "model"
+    };
+  }
   const contents = [
     ...curatedHistory,
     { role: "user", parts: [{ text: CHECK_PROMPT }] }
   ];
+  const filteredContents = checkForIncompleteToolCalls(contents) ? contents.filter((message) => {
+    if (!message.parts)
+      return true;
+    return !message.parts.some((part) => part.functionCall?.id);
+  }) : contents;
   try {
-    const parsedResponse = await geminiClient.generateJson(contents, RESPONSE_SCHEMA, abortSignal);
+    const parsedResponse = await geminiClient.generateJson(filteredContents, RESPONSE_SCHEMA, abortSignal);
     if (parsedResponse && parsedResponse.next_speaker && ["user", "model"].includes(parsedResponse.next_speaker)) {
       return parsedResponse;
     }
@@ -157090,6 +157149,28 @@ async function checkNextSpeaker(chat, geminiClient, abortSignal) {
     return null;
   }
 }
+function checkForIncompleteToolCalls(history) {
+  const toolCallIds = /* @__PURE__ */ new Set();
+  const toolResponseIds = /* @__PURE__ */ new Set();
+  for (const message of history) {
+    if (message.parts) {
+      for (const part of message.parts) {
+        if (part.functionCall?.id) {
+          toolCallIds.add(part.functionCall.id);
+        }
+        if (part.functionResponse?.id) {
+          toolResponseIds.add(part.functionResponse.id);
+        }
+      }
+    }
+  }
+  for (const callId of toolCallIds) {
+    if (!toolResponseIds.has(callId)) {
+      return true;
+    }
+  }
+  return false;
+}
 
 // packages/core/dist/src/core/geminiChat.js
 var import_genai19 = require("@google/genai");
@@ -164750,12 +164831,19 @@ var CoreToolScheduler = class {
     return this.toolCalls.some((call) => call.status === "executing" || call.status === "awaiting_approval");
   }
   async schedule(request2, signal) {
+    if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+      console.error(`[MCP DEBUG] CoreToolScheduler.schedule called`);
+      console.error(`[MCP DEBUG] Request:`, JSON.stringify(request2, null, 2));
+    }
     if (this.isRunning()) {
       throw new Error("Cannot schedule new tool calls while other tool calls are actively running (executing or awaiting approval).");
     }
     const requestsToProcess = Array.isArray(request2) ? request2 : [request2];
     const toolRegistry = await this.toolRegistry;
     const newToolCalls = requestsToProcess.map((reqInfo) => {
+      if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+        console.error(`[MCP DEBUG] Processing request:`, JSON.stringify(reqInfo, null, 2));
+      }
       const toolInstance = toolRegistry.getTool(reqInfo.name);
       if (!toolInstance) {
         return {
@@ -164783,6 +164871,10 @@ var CoreToolScheduler = class {
         if (this.approvalMode === ApprovalMode.YOLO || process.env.YOLO) {
           this.setStatusInternal(reqInfo.callId, "scheduled");
         } else {
+          if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+            console.error(`[MCP DEBUG] CoreToolScheduler calling shouldConfirmExecute for: ${reqInfo.name}`);
+            console.error(`[MCP DEBUG] Request args:`, JSON.stringify(reqInfo.args, null, 2));
+          }
           const confirmationDetails = await toolInstance.shouldConfirmExecute(reqInfo.args, signal);
           if (confirmationDetails) {
             const originalOnConfirm = confirmationDetails.onConfirm;

package/bundle/api.js

@@ -27717,7 +27717,7 @@ async function createContentGeneratorConfig(model, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config2, sessionId2) {
-  const version2 = "0.1.11";
+  const version2 = "0.1.12";
   const httpOptions = {
     headers: {
       "User-Agent": `GeminiCLI/${version2} (${process.platform}; ${process.arch})`
@@ -139952,7 +139952,13 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseTool {
     this.timeout = timeout;
     this.trust = trust;
   }
-  async shouldConfirmExecute(_params, _abortSignal) {
+  async shouldConfirmExecute(params, _abortSignal) {
+    if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+      console.error(`[MCP DEBUG] shouldConfirmExecute called for tool: ${this.name}`);
+      console.error(`[MCP DEBUG] Received params:`, JSON.stringify(params, null, 2));
+      console.error(`[MCP DEBUG] Params type:`, typeof params);
+      console.error(`[MCP DEBUG] Params keys:`, Object.keys(params));
+    }
     const serverAllowListKey = this.serverName;
     const toolAllowListKey = `${this.serverName}.${this.serverToolName}`;
     if (process.env.YOLO) {
@@ -139972,6 +139978,8 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseTool {
       // Display original tool name in confirmation
       toolDisplayName: this.name,
       // Display global registry name exposed to model and user
+      args: params,
+      // Include the parameters
       onConfirm: async (outcome) => {
         if (outcome === ToolConfirmationOutcome.ProceedAlwaysServer) {
           _DiscoveredMCPTool.allowlist.add(serverAllowListKey);
@@ -140186,8 +140194,15 @@ Make sure it is available in the sandbox`;
       if (toolNameForModel.length > 63) {
         toolNameForModel = toolNameForModel.slice(0, 28) + "___" + toolNameForModel.slice(-32);
       }
-      sanitizeParameters(funcDecl.parameters);
-      toolRegistry.registerTool(new DiscoveredMCPTool(mcpCallableTool, mcpServerName, toolNameForModel, funcDecl.description ?? "", funcDecl.parameters ?? { type: Type.OBJECT, properties: {} }, funcDecl.name, mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC, mcpServerConfig.trust));
+      if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+        console.error(`[MCP DEBUG] Registering tool: ${toolNameForModel} (server: ${mcpServerName}, original: ${funcDecl.name})`);
+        console.error(`[MCP DEBUG] Tool parameters:`, JSON.stringify(funcDecl.parameters, null, 2));
+        console.error(`[MCP DEBUG] Tool parametersJsonSchema:`, JSON.stringify(funcDecl.parametersJsonSchema, null, 2));
+        console.error(`[MCP DEBUG] Tool description:`, funcDecl.description);
+      }
+      const parametersSchema = funcDecl.parameters || funcDecl.parametersJsonSchema || { type: Type.OBJECT, properties: {} };
+      sanitizeParameters(parametersSchema);
+      toolRegistry.registerTool(new DiscoveredMCPTool(mcpCallableTool, mcpServerName, toolNameForModel, funcDecl.description ?? "", parametersSchema, funcDecl.name, mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC, mcpServerConfig.trust));
     }
   } catch (error) {
     console.error(`Failed to list or register tools for MCP server '${mcpServerName}': ${error}`);
@@ -149794,6 +149809,34 @@ function isFunctionCall(content) {
 
 // packages/core/dist/src/utils/editCorrector.js
 import * as fs13 from "fs";
+function filterIncompleteToolCalls(contents) {
+  const toolCallIds = /* @__PURE__ */ new Set();
+  const toolResponseIds = /* @__PURE__ */ new Set();
+  for (const message of contents) {
+    if (message.parts) {
+      for (const part of message.parts) {
+        if (part.functionCall?.id) {
+          toolCallIds.add(part.functionCall.id);
+        }
+        if (part.functionResponse?.id) {
+          toolResponseIds.add(part.functionResponse.id);
+        }
+      }
+    }
+  }
+  return contents.filter((message) => {
+    if (!message.parts)
+      return true;
+    for (const part of message.parts) {
+      if (part.functionCall?.id) {
+        if (!toolResponseIds.has(part.functionCall.id)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  });
+}
 var EditModel = DEFAULT_GEMINI_FLASH_MODEL;
 var EditConfig = {
   thinkingConfig: {
@@ -150023,8 +150066,9 @@ If the differences are only in whitespace or formatting, apply similar whitespac
 Return ONLY the corrected target snippet in the specified JSON format with the key 'corrected_target_snippet'. If no clear, unique match can be found, return an empty string for 'corrected_target_snippet'.
 `.trim();
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
+  const filteredContents = filterIncompleteToolCalls(contents);
   try {
-    const result = await geminiClient.generateJson(contents, OLD_STRING_CORRECTION_SCHEMA, abortSignal, EditModel, EditConfig);
+    const result = await geminiClient.generateJson(filteredContents, OLD_STRING_CORRECTION_SCHEMA, abortSignal, EditModel, EditConfig);
     if (result && typeof result.corrected_target_snippet === "string" && result.corrected_target_snippet.length > 0) {
       return result.corrected_target_snippet;
     } else {
@@ -150081,8 +150125,9 @@ If the differences are only in whitespace or formatting, apply similar whitespac
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_new_string'. If no adjustment is deemed necessary or possible, return the original_new_string.
   `.trim();
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
+  const filteredContents = filterIncompleteToolCalls(contents);
   try {
-    const result = await geminiClient.generateJson(contents, NEW_STRING_CORRECTION_SCHEMA, abortSignal, EditModel, EditConfig);
+    const result = await geminiClient.generateJson(filteredContents, NEW_STRING_CORRECTION_SCHEMA, abortSignal, EditModel, EditConfig);
     if (result && typeof result.corrected_new_string === "string" && result.corrected_new_string.length > 0) {
       return result.corrected_new_string;
     } else {
@@ -150131,8 +150176,9 @@ If potentially_problematic_new_string is console.log(\\"Hello World\\"), it shou
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_new_string_escaping'. If no escaping correction is needed, return the original potentially_problematic_new_string.
   `.trim();
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
+  const filteredContents = filterIncompleteToolCalls(contents);
   try {
-    const result = await geminiClient.generateJson(contents, CORRECT_NEW_STRING_ESCAPING_SCHEMA, abortSignal, EditModel, EditConfig);
+    const result = await geminiClient.generateJson(filteredContents, CORRECT_NEW_STRING_ESCAPING_SCHEMA, abortSignal, EditModel, EditConfig);
     if (result && typeof result.corrected_new_string_escaping === "string" && result.corrected_new_string_escaping.length > 0) {
       return result.corrected_new_string_escaping;
     } else {
@@ -150176,8 +150222,9 @@ If potentially_problematic_string is console.log(\\"Hello World\\"), it should b
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_string_escaping'. If no escaping correction is needed, return the original potentially_problematic_string.
   `.trim();
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
+  const filteredContents = filterIncompleteToolCalls(contents);
   try {
-    const result = await client.generateJson(contents, CORRECT_STRING_ESCAPING_SCHEMA, abortSignal, EditModel, EditConfig);
+    const result = await client.generateJson(filteredContents, CORRECT_STRING_ESCAPING_SCHEMA, abortSignal, EditModel, EditConfig);
     if (result && typeof result.corrected_string_escaping === "string" && result.corrected_string_escaping.length > 0) {
       return result.corrected_string_escaping;
     } else {
@@ -157071,12 +157118,24 @@ async function checkNextSpeaker(chat, geminiClient, abortSignal) {
   if (!lastMessage || lastMessage.role !== "model") {
     return null;
   }
+  const hasIncompleteToolCalls = checkForIncompleteToolCalls(curatedHistory);
+  if (hasIncompleteToolCalls) {
+    return {
+      reasoning: "There are pending tool calls that need to be processed, so the model should speak next.",
+      next_speaker: "model"
+    };
+  }
   const contents = [
     ...curatedHistory,
     { role: "user", parts: [{ text: CHECK_PROMPT }] }
   ];
+  const filteredContents = checkForIncompleteToolCalls(contents) ? contents.filter((message) => {
+    if (!message.parts)
+      return true;
+    return !message.parts.some((part) => part.functionCall?.id);
+  }) : contents;
   try {
-    const parsedResponse = await geminiClient.generateJson(contents, RESPONSE_SCHEMA, abortSignal);
+    const parsedResponse = await geminiClient.generateJson(filteredContents, RESPONSE_SCHEMA, abortSignal);
     if (parsedResponse && parsedResponse.next_speaker && ["user", "model"].includes(parsedResponse.next_speaker)) {
       return parsedResponse;
     }
@@ -157086,6 +157145,28 @@ async function checkNextSpeaker(chat, geminiClient, abortSignal) {
     return null;
   }
 }
+function checkForIncompleteToolCalls(history) {
+  const toolCallIds = /* @__PURE__ */ new Set();
+  const toolResponseIds = /* @__PURE__ */ new Set();
+  for (const message of history) {
+    if (message.parts) {
+      for (const part of message.parts) {
+        if (part.functionCall?.id) {
+          toolCallIds.add(part.functionCall.id);
+        }
+        if (part.functionResponse?.id) {
+          toolResponseIds.add(part.functionResponse.id);
+        }
+      }
+    }
+  }
+  for (const callId of toolCallIds) {
+    if (!toolResponseIds.has(callId)) {
+      return true;
+    }
+  }
+  return false;
+}
 
 // packages/core/dist/src/core/geminiChat.js
 import { createUserContent } from "@google/genai";
@@ -164746,12 +164827,19 @@ var CoreToolScheduler = class {
     return this.toolCalls.some((call) => call.status === "executing" || call.status === "awaiting_approval");
   }
   async schedule(request2, signal) {
+    if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+      console.error(`[MCP DEBUG] CoreToolScheduler.schedule called`);
+      console.error(`[MCP DEBUG] Request:`, JSON.stringify(request2, null, 2));
+    }
     if (this.isRunning()) {
       throw new Error("Cannot schedule new tool calls while other tool calls are actively running (executing or awaiting approval).");
     }
     const requestsToProcess = Array.isArray(request2) ? request2 : [request2];
     const toolRegistry = await this.toolRegistry;
     const newToolCalls = requestsToProcess.map((reqInfo) => {
+      if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+        console.error(`[MCP DEBUG] Processing request:`, JSON.stringify(reqInfo, null, 2));
+      }
       const toolInstance = toolRegistry.getTool(reqInfo.name);
       if (!toolInstance) {
         return {
@@ -164779,6 +164867,10 @@ var CoreToolScheduler = class {
         if (this.approvalMode === ApprovalMode.YOLO || process.env.YOLO) {
           this.setStatusInternal(reqInfo.callId, "scheduled");
         } else {
+          if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+            console.error(`[MCP DEBUG] CoreToolScheduler calling shouldConfirmExecute for: ${reqInfo.name}`);
+            console.error(`[MCP DEBUG] Request args:`, JSON.stringify(reqInfo.args, null, 2));
+          }
           const confirmationDetails = await toolInstance.shouldConfirmExecute(reqInfo.args, signal);
           if (confirmationDetails) {
             const originalOnConfirm = confirmationDetails.onConfirm;
@@ -165270,7 +165362,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.11";
+  return "0.1.12";
 }
 
 // packages/cli/src/config/sandboxConfig.ts

package/bundle/gemini.js

@@ -78252,7 +78252,7 @@ async function createContentGeneratorConfig(model, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config2, sessionId2) {
-  const version3 = "0.1.11";
+  const version3 = "0.1.12";
   const httpOptions = {
     headers: {
       "User-Agent": `GeminiCLI/${version3} (${process.platform}; ${process.arch})`
@@ -213523,7 +213523,13 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseTool {
     this.timeout = timeout2;
     this.trust = trust;
   }
-  async shouldConfirmExecute(_params, _abortSignal) {
+  async shouldConfirmExecute(params, _abortSignal) {
+    if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+      console.error(`[MCP DEBUG] shouldConfirmExecute called for tool: ${this.name}`);
+      console.error(`[MCP DEBUG] Received params:`, JSON.stringify(params, null, 2));
+      console.error(`[MCP DEBUG] Params type:`, typeof params);
+      console.error(`[MCP DEBUG] Params keys:`, Object.keys(params));
+    }
     const serverAllowListKey = this.serverName;
     const toolAllowListKey = `${this.serverName}.${this.serverToolName}`;
     if (process.env.YOLO) {
@@ -213543,6 +213549,8 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseTool {
       // Display original tool name in confirmation
       toolDisplayName: this.name,
       // Display global registry name exposed to model and user
+      args: params,
+      // Include the parameters
       onConfirm: async (outcome) => {
         if (outcome === ToolConfirmationOutcome.ProceedAlwaysServer) {
           _DiscoveredMCPTool.allowlist.add(serverAllowListKey);
@@ -213763,8 +213771,15 @@ Make sure it is available in the sandbox`;
       if (toolNameForModel.length > 63) {
         toolNameForModel = toolNameForModel.slice(0, 28) + "___" + toolNameForModel.slice(-32);
       }
-      sanitizeParameters(funcDecl.parameters);
-      toolRegistry.registerTool(new DiscoveredMCPTool(mcpCallableTool, mcpServerName, toolNameForModel, funcDecl.description ?? "", funcDecl.parameters ?? { type: Type.OBJECT, properties: {} }, funcDecl.name, mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC, mcpServerConfig.trust));
+      if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+        console.error(`[MCP DEBUG] Registering tool: ${toolNameForModel} (server: ${mcpServerName}, original: ${funcDecl.name})`);
+        console.error(`[MCP DEBUG] Tool parameters:`, JSON.stringify(funcDecl.parameters, null, 2));
+        console.error(`[MCP DEBUG] Tool parametersJsonSchema:`, JSON.stringify(funcDecl.parametersJsonSchema, null, 2));
+        console.error(`[MCP DEBUG] Tool description:`, funcDecl.description);
+      }
+      const parametersSchema = funcDecl.parameters || funcDecl.parametersJsonSchema || { type: Type.OBJECT, properties: {} };
+      sanitizeParameters(parametersSchema);
+      toolRegistry.registerTool(new DiscoveredMCPTool(mcpCallableTool, mcpServerName, toolNameForModel, funcDecl.description ?? "", parametersSchema, funcDecl.name, mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC, mcpServerConfig.trust));
     }
   } catch (error) {
     console.error(`Failed to list or register tools for MCP server '${mcpServerName}': ${error}`);
@@ -223388,6 +223403,34 @@ function isFunctionCall(content) {
 
 // packages/core/dist/src/utils/editCorrector.js
 import * as fs15 from "fs";
+function filterIncompleteToolCalls(contents) {
+  const toolCallIds = /* @__PURE__ */ new Set();
+  const toolResponseIds = /* @__PURE__ */ new Set();
+  for (const message of contents) {
+    if (message.parts) {
+      for (const part of message.parts) {
+        if (part.functionCall?.id) {
+          toolCallIds.add(part.functionCall.id);
+        }
+        if (part.functionResponse?.id) {
+          toolResponseIds.add(part.functionResponse.id);
+        }
+      }
+    }
+  }
+  return contents.filter((message) => {
+    if (!message.parts)
+      return true;
+    for (const part of message.parts) {
+      if (part.functionCall?.id) {
+        if (!toolResponseIds.has(part.functionCall.id)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  });
+}
 var EditModel = DEFAULT_GEMINI_FLASH_MODEL;
 var EditConfig = {
   thinkingConfig: {
@@ -223617,8 +223660,9 @@ If the differences are only in whitespace or formatting, apply similar whitespac
 Return ONLY the corrected target snippet in the specified JSON format with the key 'corrected_target_snippet'. If no clear, unique match can be found, return an empty string for 'corrected_target_snippet'.
 `.trim();
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
+  const filteredContents = filterIncompleteToolCalls(contents);
   try {
-    const result = await geminiClient.generateJson(contents, OLD_STRING_CORRECTION_SCHEMA, abortSignal, EditModel, EditConfig);
+    const result = await geminiClient.generateJson(filteredContents, OLD_STRING_CORRECTION_SCHEMA, abortSignal, EditModel, EditConfig);
     if (result && typeof result.corrected_target_snippet === "string" && result.corrected_target_snippet.length > 0) {
       return result.corrected_target_snippet;
     } else {
@@ -223675,8 +223719,9 @@ If the differences are only in whitespace or formatting, apply similar whitespac
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_new_string'. If no adjustment is deemed necessary or possible, return the original_new_string.
   `.trim();
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
+  const filteredContents = filterIncompleteToolCalls(contents);
   try {
-    const result = await geminiClient.generateJson(contents, NEW_STRING_CORRECTION_SCHEMA, abortSignal, EditModel, EditConfig);
+    const result = await geminiClient.generateJson(filteredContents, NEW_STRING_CORRECTION_SCHEMA, abortSignal, EditModel, EditConfig);
     if (result && typeof result.corrected_new_string === "string" && result.corrected_new_string.length > 0) {
       return result.corrected_new_string;
     } else {
@@ -223725,8 +223770,9 @@ If potentially_problematic_new_string is console.log(\\"Hello World\\"), it shou
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_new_string_escaping'. If no escaping correction is needed, return the original potentially_problematic_new_string.
   `.trim();
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
+  const filteredContents = filterIncompleteToolCalls(contents);
   try {
-    const result = await geminiClient.generateJson(contents, CORRECT_NEW_STRING_ESCAPING_SCHEMA, abortSignal, EditModel, EditConfig);
+    const result = await geminiClient.generateJson(filteredContents, CORRECT_NEW_STRING_ESCAPING_SCHEMA, abortSignal, EditModel, EditConfig);
     if (result && typeof result.corrected_new_string_escaping === "string" && result.corrected_new_string_escaping.length > 0) {
       return result.corrected_new_string_escaping;
     } else {
@@ -223770,8 +223816,9 @@ If potentially_problematic_string is console.log(\\"Hello World\\"), it should b
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_string_escaping'. If no escaping correction is needed, return the original potentially_problematic_string.
   `.trim();
   const contents = [{ role: "user", parts: [{ text: prompt }] }];
+  const filteredContents = filterIncompleteToolCalls(contents);
   try {
-    const result = await client.generateJson(contents, CORRECT_STRING_ESCAPING_SCHEMA, abortSignal, EditModel, EditConfig);
+    const result = await client.generateJson(filteredContents, CORRECT_STRING_ESCAPING_SCHEMA, abortSignal, EditModel, EditConfig);
     if (result && typeof result.corrected_string_escaping === "string" && result.corrected_string_escaping.length > 0) {
       return result.corrected_string_escaping;
     } else {
@@ -230644,12 +230691,24 @@ async function checkNextSpeaker(chat, geminiClient, abortSignal) {
   if (!lastMessage || lastMessage.role !== "model") {
     return null;
   }
+  const hasIncompleteToolCalls = checkForIncompleteToolCalls(curatedHistory);
+  if (hasIncompleteToolCalls) {
+    return {
+      reasoning: "There are pending tool calls that need to be processed, so the model should speak next.",
+      next_speaker: "model"
+    };
+  }
   const contents = [
     ...curatedHistory,
     { role: "user", parts: [{ text: CHECK_PROMPT }] }
   ];
+  const filteredContents = checkForIncompleteToolCalls(contents) ? contents.filter((message) => {
+    if (!message.parts)
+      return true;
+    return !message.parts.some((part) => part.functionCall?.id);
+  }) : contents;
   try {
-    const parsedResponse = await geminiClient.generateJson(contents, RESPONSE_SCHEMA, abortSignal);
+    const parsedResponse = await geminiClient.generateJson(filteredContents, RESPONSE_SCHEMA, abortSignal);
     if (parsedResponse && parsedResponse.next_speaker && ["user", "model"].includes(parsedResponse.next_speaker)) {
       return parsedResponse;
     }
@@ -230659,6 +230718,28 @@ async function checkNextSpeaker(chat, geminiClient, abortSignal) {
     return null;
   }
 }
+function checkForIncompleteToolCalls(history) {
+  const toolCallIds = /* @__PURE__ */ new Set();
+  const toolResponseIds = /* @__PURE__ */ new Set();
+  for (const message of history) {
+    if (message.parts) {
+      for (const part of message.parts) {
+        if (part.functionCall?.id) {
+          toolCallIds.add(part.functionCall.id);
+        }
+        if (part.functionResponse?.id) {
+          toolResponseIds.add(part.functionResponse.id);
+        }
+      }
+    }
+  }
+  for (const callId of toolCallIds) {
+    if (!toolResponseIds.has(callId)) {
+      return true;
+    }
+  }
+  return false;
+}
 
 // packages/core/dist/src/core/geminiChat.js
 init_node();
@@ -238601,12 +238682,19 @@ var CoreToolScheduler = class {
     return this.toolCalls.some((call) => call.status === "executing" || call.status === "awaiting_approval");
   }
   async schedule(request2, signal) {
+    if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+      console.error(`[MCP DEBUG] CoreToolScheduler.schedule called`);
+      console.error(`[MCP DEBUG] Request:`, JSON.stringify(request2, null, 2));
+    }
     if (this.isRunning()) {
       throw new Error("Cannot schedule new tool calls while other tool calls are actively running (executing or awaiting approval).");
     }
     const requestsToProcess = Array.isArray(request2) ? request2 : [request2];
     const toolRegistry = await this.toolRegistry;
     const newToolCalls = requestsToProcess.map((reqInfo) => {
+      if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+        console.error(`[MCP DEBUG] Processing request:`, JSON.stringify(reqInfo, null, 2));
+      }
       const toolInstance = toolRegistry.getTool(reqInfo.name);
       if (!toolInstance) {
         return {
@@ -238634,6 +238722,10 @@ var CoreToolScheduler = class {
         if (this.approvalMode === ApprovalMode.YOLO || process.env.YOLO) {
           this.setStatusInternal(reqInfo.callId, "scheduled");
         } else {
+          if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+            console.error(`[MCP DEBUG] CoreToolScheduler calling shouldConfirmExecute for: ${reqInfo.name}`);
+            console.error(`[MCP DEBUG] Request args:`, JSON.stringify(reqInfo.args, null, 2));
+          }
           const confirmationDetails = await toolInstance.shouldConfirmExecute(reqInfo.args, signal);
           if (confirmationDetails) {
             const originalOnConfirm = confirmationDetails.onConfirm;
@@ -243850,7 +243942,7 @@ var LangfuseClient = class {
         name: "MPD LLM CLI Session",
         metadata: {
           ...safeMetadata,
-          cli_version: this.safeString("0.1.11", "unknown"),
+          cli_version: this.safeString("0.1.12", "unknown"),
           model: this.safeString(process.env.CUSTOM_LLM_MODEL_NAME, "gemini"),
           auth_type: process.env.USE_CUSTOM_LLM ? "custom_llm" : "google_oauth",
           environment: this.safeString(this.configManager.getConfig()?.environment, "unknown")
@@ -244881,7 +244973,7 @@ var LangfuseIntegration = class {
       const metadata = {
         model: this.config.getModel(),
         auth_type: this.config.getContentGeneratorConfig()?.authType,
-        cli_version: "0.1.11",
+        cli_version: "0.1.12",
         start_time: (/* @__PURE__ */ new Date()).toISOString(),
         session_id: this.sessionId
       };
@@ -244951,7 +245043,7 @@ var LangfuseIntegration = class {
         error,
         metadata: {
           session_id: this.sessionId,
-          cli_version: "0.1.11",
+          cli_version: "0.1.12",
           auth_type: this.config.getContentGeneratorConfig()?.authType
         }
       });
@@ -248677,7 +248769,7 @@ import { promises as fs33 } from "fs";
 import path37 from "path";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "8163082 (local modifications)";
+var GIT_COMMIT_INFO = "ed0acae (local modifications)";
 
 // node_modules/read-package-up/index.js
 import path35 from "node:path";
@@ -248890,7 +248982,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.11";
+  return "0.1.12";
 }
 
 // packages/cli/src/ui/commands/memoryCommand.ts
@@ -269843,7 +269935,7 @@ var DataCollector = class {
   // 提取元数据
   extractMetadata(data) {
     return {
-      cli_version: "0.1.11",
+      cli_version: "0.1.12",
       model: process.env.CUSTOM_LLM_MODEL_NAME || "gemini",
       auth_type: process.env.USE_CUSTOM_LLM ? "custom_llm" : "google_oauth",
       project_path: data.projectPath,
@@ -270350,6 +270442,10 @@ var ToolConfirmationMessage = ({
       /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Text, { color: Colors.AccentCyan, children: [
         "Tool: ",
         mcpProps.toolName
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: Colors.Foreground, children: "Parameters:" }),
+        /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { marginLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: Colors.Gray, children: mcpProps.args ? JSON.stringify(mcpProps.args, null, 2) : "No parameters" }) })
       ] })
     ] });
     question = `Allow execution of MCP tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"?`;
@@ -277505,8 +277601,9 @@ async function relaunchWithAdditionalArgs(additionalArgs) {
 async function main() {
   loadStartupConfig();
   const workspaceRoot = process.cwd();
-  const settings = loadSettings(workspaceRoot);
+  let settings = loadSettings(workspaceRoot);
   await performUserAuthentication();
+  settings = loadSettings(workspaceRoot);
   await cleanupCheckpoints();
   if (settings.errors.length > 0) {
     for (const error of settings.errors) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mpd-llm-cli",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "engines": {
     "node": ">=20.0.0"
   },