mpd-llm-cli 0.1.11 → 0.1.13

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);
@@ -140140,7 +140148,9 @@ Make sure it is available in the sandbox`;
     return;
   }
   mcpClient.onerror = (error) => {
-    console.error(`MCP ERROR (${mcpServerName}):`, error.toString());
+    if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+      console.error(`MCP ERROR (${mcpServerName}):`, error.toString());
+    }
     updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
   };
   if (transport instanceof StdioClientTransport && transport.stderr) {
@@ -140190,8 +140200,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 +149815,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 +150072,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 +150131,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 +150182,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 +150228,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 +157124,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 +157151,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 +164833,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 +164873,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.13";
   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);
@@ -140136,7 +140144,9 @@ Make sure it is available in the sandbox`;
     return;
   }
   mcpClient.onerror = (error) => {
-    console.error(`MCP ERROR (${mcpServerName}):`, error.toString());
+    if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+      console.error(`MCP ERROR (${mcpServerName}):`, error.toString());
+    }
     updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
   };
   if (transport instanceof StdioClientTransport && transport.stderr) {
@@ -140186,8 +140196,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 +149811,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 +150068,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 +150127,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 +150178,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 +150224,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 +157120,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 +157147,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 +164829,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 +164869,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 +165364,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.11";
+  return "0.1.13";
 }
 
 // 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.13";
   const httpOptions = {
     headers: {
       "User-Agent": `GeminiCLI/${version3} (${process.platform}; ${process.arch})`
@@ -149312,7 +149312,7 @@ var require_homedir = __commonJS({
   "node_modules/resolve/lib/homedir.js"(exports2, module2) {
     "use strict";
     var os23 = __require("os");
-    module2.exports = os23.homedir || function homedir14() {
+    module2.exports = os23.homedir || function homedir15() {
       var home = process.env.HOME;
       var user = process.env.LOGNAME || process.env.USER || process.env.LNAME || process.env.USERNAME;
       if (process.platform === "win32") {
@@ -149793,11 +149793,11 @@ var require_async2 = __commonJS({
     var normalizeOptions = require_normalize_options();
     var isCore = require_is_core_module();
     var realpathFS = process.platform !== "win32" && fs51.realpath && typeof fs51.realpath.native === "function" ? fs51.realpath.native : fs51.realpath;
-    var homedir14 = getHomedir();
+    var homedir15 = getHomedir();
     var defaultPaths = function() {
       return [
-        path53.join(homedir14, ".node_modules"),
-        path53.join(homedir14, ".node_libraries")
+        path53.join(homedir15, ".node_modules"),
+        path53.join(homedir15, ".node_libraries")
       ];
     };
     var defaultIsFile = function isFile(file, cb) {
@@ -150283,11 +150283,11 @@ var require_sync = __commonJS({
     var nodeModulesPaths = require_node_modules_paths();
     var normalizeOptions = require_normalize_options();
     var realpathFS = process.platform !== "win32" && fs51.realpathSync && typeof fs51.realpathSync.native === "function" ? fs51.realpathSync.native : fs51.realpathSync;
-    var homedir14 = getHomedir();
+    var homedir15 = getHomedir();
     var defaultPaths = function() {
       return [
-        path53.join(homedir14, ".node_modules"),
-        path53.join(homedir14, ".node_libraries")
+        path53.join(homedir15, ".node_modules"),
+        path53.join(homedir15, ".node_libraries")
       ];
     };
     var defaultIsFile = function isFile(file) {
@@ -190619,7 +190619,7 @@ var require_require_directory = __commonJS({
   "node_modules/require-directory/index.js"(exports2, module2) {
     "use strict";
     var fs51 = __require("fs");
-    var join22 = __require("path").join;
+    var join23 = __require("path").join;
     var resolve18 = __require("path").resolve;
     var dirname11 = __require("path").dirname;
     var defaultOptions2 = {
@@ -190656,7 +190656,7 @@ var require_require_directory = __commonJS({
       }
       path53 = !path53 ? dirname11(m.filename) : resolve18(dirname11(m.filename), path53);
       fs51.readdirSync(path53).forEach(function(filename) {
-        var joined = join22(path53, filename), files, key, obj;
+        var joined = join23(path53, filename), files, key, obj;
         if (fs51.statSync(joined).isDirectory() && options.recurse) {
           files = requireDirectory(m, joined, options);
           if (Object.keys(files).length) {
@@ -194426,7 +194426,7 @@ var require_minimist = __commonJS({
 var require_rc = __commonJS({
   "node_modules/rc/index.js"(exports2, module2) {
     var cc = require_utils13();
-    var join22 = __require("path").join;
+    var join23 = __require("path").join;
     var deepExtend = require_deep_extend();
     var etc = "/etc";
     var win = process.platform === "win32";
@@ -194451,15 +194451,15 @@ var require_rc = __commonJS({
       }
       if (!win)
         [
-          join22(etc, name2, "config"),
-          join22(etc, name2 + "rc")
+          join23(etc, name2, "config"),
+          join23(etc, name2 + "rc")
         ].forEach(addConfigFile);
       if (home)
         [
-          join22(home, ".config", name2, "config"),
-          join22(home, ".config", name2),
-          join22(home, "." + name2, "config"),
-          join22(home, "." + name2 + "rc")
+          join23(home, ".config", name2, "config"),
+          join23(home, ".config", name2),
+          join23(home, "." + name2, "config"),
+          join23(home, "." + name2 + "rc")
         ].forEach(addConfigFile);
       addConfigFile(cc.find("." + name2 + "rc"));
       if (env6.config) addConfigFile(env6.config);
@@ -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);
@@ -213713,7 +213721,9 @@ Make sure it is available in the sandbox`;
     return;
   }
   mcpClient.onerror = (error) => {
-    console.error(`MCP ERROR (${mcpServerName}):`, error.toString());
+    if (process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true") {
+      console.error(`MCP ERROR (${mcpServerName}):`, error.toString());
+    }
     updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
   };
   if (transport instanceof StdioClientTransport && transport.stderr) {
@@ -213763,8 +213773,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 +223405,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 +223662,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 +223721,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 +223772,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 +223818,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 {
@@ -225232,8 +225281,8 @@ function many(p) {
 function many1(p) {
   return ab(p, many(p), (head, tail) => [head, ...tail]);
 }
-function ab(pa, pb, join22) {
-  return (data, i) => mapOuter(pa(data, i), (ma) => mapInner(pb(data, ma.position), (vb, j) => join22(ma.value, vb, data, i, j)));
+function ab(pa, pb, join23) {
+  return (data, i) => mapOuter(pa(data, i), (ma) => mapInner(pb(data, ma.position), (vb, j) => join23(ma.value, vb, data, i, j)));
 }
 function left(pa, pb) {
   return ab(pa, pb, (va) => va);
@@ -225241,8 +225290,8 @@ function left(pa, pb) {
 function right(pa, pb) {
   return ab(pa, pb, (va, vb) => vb);
 }
-function abc(pa, pb, pc, join22) {
-  return (data, i) => mapOuter(pa(data, i), (ma) => mapOuter(pb(data, ma.position), (mb) => mapInner(pc(data, mb.position), (vc, j) => join22(ma.value, mb.value, vc, data, i, j))));
+function abc(pa, pb, pc, join23) {
+  return (data, i) => mapOuter(pa(data, i), (ma) => mapOuter(pb(data, ma.position), (mb) => mapInner(pc(data, mb.position), (vc, j) => join23(ma.value, mb.value, vc, data, i, j))));
 }
 function middle(pa, pb, pc) {
   return abc(pa, pb, pc, (ra, rb) => rb);
@@ -230644,12 +230693,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 +230720,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 +238684,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 +238724,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 +243944,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.13", "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 +244975,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.13",
         start_time: (/* @__PURE__ */ new Date()).toISOString(),
         session_id: this.sessionId
       };
@@ -244951,7 +245045,7 @@ var LangfuseIntegration = class {
         error,
         metadata: {
           session_id: this.sessionId,
-          cli_version: "0.1.11",
+          cli_version: "0.1.13",
           auth_type: this.config.getContentGeneratorConfig()?.authType
         }
       });
@@ -248677,7 +248771,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 = "a4e2bd1 (local modifications)";
 
 // node_modules/read-package-up/index.js
 import path35 from "node:path";
@@ -248890,7 +248984,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.11";
+  return "0.1.13";
 }
 
 // packages/cli/src/ui/commands/memoryCommand.ts
@@ -249007,11 +249101,76 @@ var clearCommand = {
   }
 };
 
+// packages/cli/src/ui/commands/logoutCommand.ts
+import { existsSync as existsSync7, unlinkSync } from "fs";
+import { join as join12 } from "path";
+import { homedir as homedir7 } from "os";
+var logoutCommand = {
+  name: "logout",
+  description: "logout and clear user credentials and settings, then exit",
+  action: async (context2, _args) => {
+    const now = /* @__PURE__ */ new Date();
+    const { sessionStartTime } = context2.session.stats;
+    const wallDuration = now.getTime() - sessionStartTime.getTime();
+    const userJsonPath = join12(homedir7(), ".gemini", "user.json");
+    if (existsSync7(userJsonPath)) {
+      try {
+        unlinkSync(userJsonPath);
+        context2.ui.addItem({
+          type: "info" /* INFO */,
+          text: "\u2705 User credentials cleared"
+        }, now.getTime());
+      } catch (error) {
+        context2.ui.addItem({
+          type: "error" /* ERROR */,
+          text: `\u274C Failed to clear user credentials: ${error}`
+        }, now.getTime());
+      }
+    }
+    const userSettingsPath = join12(homedir7(), ".gemini", "settings.json");
+    if (existsSync7(userSettingsPath)) {
+      try {
+        unlinkSync(userSettingsPath);
+        context2.ui.addItem({
+          type: "info" /* INFO */,
+          text: "\u2705 User settings cleared"
+        }, now.getTime());
+      } catch (error) {
+        context2.ui.addItem({
+          type: "error" /* ERROR */,
+          text: `\u274C Failed to clear user settings: ${error}`
+        }, now.getTime());
+      }
+    }
+    setTimeout(() => {
+      process.exit(0);
+    }, 100);
+    return {
+      type: "message",
+      messageType: "info",
+      content: `\u{1F44B} Logging out... Session duration: ${formatDuration2(wallDuration)}`
+    };
+  }
+};
+function formatDuration2(milliseconds) {
+  const seconds = Math.floor(milliseconds / 1e3);
+  const minutes = Math.floor(seconds / 60);
+  const hours = Math.floor(minutes / 60);
+  if (hours > 0) {
+    return `${hours}h ${minutes % 60}m ${seconds % 60}s`;
+  } else if (minutes > 0) {
+    return `${minutes}m ${seconds % 60}s`;
+  } else {
+    return `${seconds}s`;
+  }
+}
+
 // packages/cli/src/services/CommandService.ts
 var loadBuiltInCommands = async () => [
   clearCommand,
   helpCommand,
-  memoryCommand
+  memoryCommand,
+  logoutCommand
 ];
 var CommandService = class {
   constructor(commandLoader = loadBuiltInCommands) {
@@ -266116,10 +266275,10 @@ var getLanguageFromExtension = (extension) => {
 var dotenv = __toESM(require_main(), 1);
 import * as fs36 from "fs";
 import * as path40 from "path";
-import { homedir as homedir7 } from "os";
+import { homedir as homedir8 } from "os";
 var import_strip_json_comments = __toESM(require_strip_json_comments(), 1);
 var SETTINGS_DIRECTORY_NAME = ".gemini";
-var USER_SETTINGS_DIR = path40.join(homedir7(), SETTINGS_DIRECTORY_NAME);
+var USER_SETTINGS_DIR = path40.join(homedir8(), SETTINGS_DIRECTORY_NAME);
 var USER_SETTINGS_PATH = path40.join(USER_SETTINGS_DIR, "settings.json");
 var LoadedSettings = class {
   constructor(user, workspace, errors) {
@@ -266202,11 +266361,11 @@ function findEnvFile(startDir) {
     }
     const parentDir = path40.dirname(currentDir);
     if (parentDir === currentDir || !parentDir) {
-      const homeGeminiEnvPath = path40.join(homedir7(), GEMINI_CONFIG_DIR, ".env");
+      const homeGeminiEnvPath = path40.join(homedir8(), GEMINI_CONFIG_DIR, ".env");
       if (fs36.existsSync(homeGeminiEnvPath)) {
         return homeGeminiEnvPath;
       }
-      const homeEnvPath = path40.join(homedir7(), ".env");
+      const homeEnvPath = path40.join(homedir8(), ".env");
       if (fs36.existsSync(homeEnvPath)) {
         return homeEnvPath;
       }
@@ -269733,7 +269892,7 @@ var import_react62 = __toESM(require_react(), 1);
 // packages/cli/src/telemetry/dataCollector.ts
 import { execSync as execSync2 } from "child_process";
 import { promises as fs38 } from "fs";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 var DataCollector = class {
   langfuseClient;
   constructor() {
@@ -269843,7 +270002,7 @@ var DataCollector = class {
   // 提取元数据
   extractMetadata(data) {
     return {
-      cli_version: "0.1.11",
+      cli_version: "0.1.13",
       model: process.env.CUSTOM_LLM_MODEL_NAME || "gemini",
       auth_type: process.env.USE_CUSTOM_LLM ? "custom_llm" : "google_oauth",
       project_path: data.projectPath,
@@ -270060,7 +270219,7 @@ var DataCollector = class {
       const walkDir = async (dir) => {
         const entries = await fs38.readdir(dir, { withFileTypes: true });
         for (const entry of entries) {
-          const fullPath = join16(dir, entry.name);
+          const fullPath = join17(dir, entry.name);
           if (entry.isDirectory()) {
             dirCount++;
             await walkDir(fullPath);
@@ -270350,6 +270509,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}"?`;
@@ -277013,10 +277176,10 @@ async function runNonInteractive(config2, input) {
 
 // packages/cli/src/utils/cleanup.ts
 import { promises as fs49 } from "fs";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 async function cleanupCheckpoints() {
   const tempDir = getProjectTempDir(process.cwd());
-  const checkpointsDir = join17(tempDir, "checkpoints");
+  const checkpointsDir = join18(tempDir, "checkpoints");
   try {
     await fs49.rm(checkpointsDir, { recursive: true, force: true });
   } catch {
@@ -277024,14 +277187,14 @@ async function cleanupCheckpoints() {
 }
 
 // packages/cli/src/services/AuthService.ts
-import { readFileSync as readFileSync13, writeFileSync as writeFileSync5, existsSync as existsSync11, mkdirSync as mkdirSync4 } from "fs";
-import { join as join19 } from "path";
-import { homedir as homedir11 } from "os";
+import { readFileSync as readFileSync13, writeFileSync as writeFileSync5, existsSync as existsSync12, mkdirSync as mkdirSync4 } from "fs";
+import { join as join20 } from "path";
+import { homedir as homedir12 } from "os";
 
 // packages/cli/src/config/mpdaiConfig.ts
-import { readFileSync as readFileSync12, existsSync as existsSync10 } from "fs";
-import { join as join18 } from "path";
-import { homedir as homedir10 } from "os";
+import { readFileSync as readFileSync12, existsSync as existsSync11 } from "fs";
+import { join as join19 } from "path";
+import { homedir as homedir11 } from "os";
 var MpdaiConfigManager = class _MpdaiConfigManager {
   static instance;
   config = null;
@@ -277048,14 +277211,14 @@ var MpdaiConfigManager = class _MpdaiConfigManager {
       return this.config;
     }
     try {
-      const userConfigPath = join18(homedir10(), ".gemini", "config.json");
-      if (existsSync10(userConfigPath)) {
+      const userConfigPath = join19(homedir11(), ".gemini", "config.json");
+      if (existsSync11(userConfigPath)) {
         const configContent = readFileSync12(userConfigPath, "utf-8");
         this.config = JSON.parse(configContent);
         return this.config;
       }
-      const projectConfigPath = join18(process.cwd(), ".mpdai", "config.json");
-      if (existsSync10(projectConfigPath)) {
+      const projectConfigPath = join19(process.cwd(), ".mpdai", "config.json");
+      if (existsSync11(projectConfigPath)) {
         const configContent = readFileSync12(projectConfigPath, "utf-8");
         this.config = JSON.parse(configContent);
         return this.config;
@@ -277111,13 +277274,13 @@ var AuthService = class {
   constructor(authApiUrl) {
     this.mpdaiConfig = MpdaiConfigManager.getInstance();
     this.authApiUrl = authApiUrl || this.mpdaiConfig.getAuthUrl();
-    this.userJsonPath = join19(homedir11(), ".gemini", "user.json");
+    this.userJsonPath = join20(homedir12(), ".gemini", "user.json");
   }
   /**
    * 检查本地是否存在用户凭据文件
    */
   hasLocalCredentials() {
-    return existsSync11(this.userJsonPath);
+    return existsSync12(this.userJsonPath);
   }
   /**
    * 从本地文件读取用户凭据
@@ -277139,8 +277302,8 @@ var AuthService = class {
    */
   saveCredentials(credentials) {
     try {
-      const dir = join19(homedir11(), ".gemini");
-      if (!existsSync11(dir)) {
+      const dir = join20(homedir12(), ".gemini");
+      if (!existsSync12(dir)) {
         mkdirSync4(dir, { recursive: true });
       }
       writeFileSync5(this.userJsonPath, JSON.stringify(credentials, null, 2), "utf-8");
@@ -277280,9 +277443,9 @@ var AuthService = class {
 };
 
 // packages/cli/src/services/EnvConfigManager.ts
-import { readFileSync as readFileSync14, writeFileSync as writeFileSync6, existsSync as existsSync12, mkdirSync as mkdirSync5 } from "fs";
-import { join as join20, dirname as dirname10 } from "path";
-import { homedir as homedir12 } from "os";
+import { readFileSync as readFileSync14, writeFileSync as writeFileSync6, existsSync as existsSync13, mkdirSync as mkdirSync5 } from "fs";
+import { join as join21, dirname as dirname10 } from "path";
+import { homedir as homedir13 } from "os";
 var EnvConfigManager = class {
   envPaths;
   constructor() {
@@ -277300,17 +277463,17 @@ var EnvConfigManager = class {
     let currentDir = startDir;
     while (true) {
       for (const envPath of this.envPaths) {
-        const fullPath = join20(currentDir, envPath);
-        if (existsSync12(fullPath)) {
+        const fullPath = join21(currentDir, envPath);
+        if (existsSync13(fullPath)) {
           return fullPath;
         }
       }
-      const parentDir = join20(currentDir, "..");
+      const parentDir = join21(currentDir, "..");
       if (parentDir === currentDir) {
-        const homeDir2 = homedir12();
+        const homeDir2 = homedir13();
         for (const envPath of this.envPaths) {
-          const fullPath = join20(homeDir2, envPath);
-          if (existsSync12(fullPath)) {
+          const fullPath = join21(homeDir2, envPath);
+          if (existsSync13(fullPath)) {
             return fullPath;
           }
         }
@@ -277369,7 +277532,7 @@ var EnvConfigManager = class {
   writeEnvFile(envConfig, envPath) {
     try {
       const dir = dirname10(envPath);
-      if (!existsSync12(dir)) {
+      if (!existsSync13(dir)) {
         mkdirSync5(dir, { recursive: true });
       }
       const envContent = Object.entries(envConfig).map(([key, value]) => `${key}=${value}`).join("\n") + "\n";
@@ -277384,8 +277547,8 @@ var EnvConfigManager = class {
    * 更新或创建.env文件
    */
   updateEnvFile(model, targetPath) {
-    const envPath = targetPath || this.findEnvFile(process.cwd()) || join20(process.cwd(), ".gemini", ".env");
-    const existingConfig = existsSync12(envPath) ? this.readEnvFile(envPath) : {};
+    const envPath = targetPath || this.findEnvFile(process.cwd()) || join21(process.cwd(), ".gemini", ".env");
+    const existingConfig = existsSync13(envPath) ? this.readEnvFile(envPath) : {};
     const newConfig = this.generateEnvConfig(model, existingConfig);
     this.writeEnvFile(newConfig, envPath);
     return envPath;
@@ -277408,9 +277571,9 @@ var EnvConfigManager = class {
 // packages/cli/src/config/startup.ts
 import * as fs50 from "fs";
 import * as path52 from "path";
-import { homedir as homedir13 } from "os";
+import { homedir as homedir14 } from "os";
 function initializeLangfuseConfig() {
-  const langfuseDir = path52.join(homedir13(), ".gemini");
+  const langfuseDir = path52.join(homedir14(), ".gemini");
   const settingsFile = path52.join(langfuseDir, "settings.conf");
   try {
     if (!fs50.existsSync(langfuseDir)) {
@@ -277505,8 +277668,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.13",
   "engines": {
     "node": ">=20.0.0"
   },