@google/gemini-cli 0.57.0-preview.0 → 0.57.0-preview.1

package/bundle/{chunk-QB46S6FV.js → chunk-NQ4RH42O.js}

@@ -1,7 +1,8 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
+  CoreToolCallStatus,
   checkExhaustive
-} from "./chunk-R3JDAZVL.js";
+} from "./chunk-NPOI4K6X.js";
 import {
   __commonJS,
   __toESM
@@ -464,19 +465,19 @@ var require_react = __commonJS({
 var import_react = __toESM(require_react(), 1);
 function mapCoreStatusToDisplayStatus(coreStatus) {
   switch (coreStatus) {
-    case "validating" /* Validating */:
+    case CoreToolCallStatus.Validating:
       return "Pending" /* Pending */;
-    case "awaiting_approval" /* AwaitingApproval */:
+    case CoreToolCallStatus.AwaitingApproval:
       return "Confirming" /* Confirming */;
-    case "executing" /* Executing */:
+    case CoreToolCallStatus.Executing:
       return "Executing" /* Executing */;
-    case "success" /* Success */:
+    case CoreToolCallStatus.Success:
       return "Success" /* Success */;
-    case "cancelled" /* Cancelled */:
+    case CoreToolCallStatus.Cancelled:
       return "Canceled" /* Canceled */;
-    case "error" /* Error */:
+    case CoreToolCallStatus.Error:
       return "Error" /* Error */;
-    case "scheduled" /* Scheduled */:
+    case CoreToolCallStatus.Scheduled:
       return "Pending" /* Pending */;
     default:
       return checkExhaustive(coreStatus);

package/bundle/{chunk-FWGOOSQK.js → chunk-O7SBKM7M.js}

@@ -282830,7 +282830,7 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "eaa30429a";
+var GIT_COMMIT_INFO = "3910b2093";
 var CLI_VERSION = "0.57.0-preview.0";
 
 // packages/core/src/ide/detect-ide.ts
@@ -309081,8 +309081,8 @@ function getErrorReplaceResult(params, occurrences, finalOldString, finalNewStri
   let error40 = void 0;
   if (occurrences === 0) {
     error40 = {
-      display: `Failed to edit, could not find the string to replace.`,
-      raw: `Failed to edit, 0 occurrences found for old_string in ${params.file_path}. Ensure you're not escaping content incorrectly and check whitespace, indentation, and context. Use ${READ_FILE_TOOL_NAME} tool to verify.`,
+      display: `Could not find an exact match for old_string in '${params.file_path}'.`,
+      raw: `Could not find an exact match for 'old_string' in '${params.file_path}'. If previous edits modified the file or you are modifying lines outside your recent read window, please use ReadFile to inspect the target lines before retrying with an exact 'old_string'.`,
       type: "edit_no_occurrence_found" /* EDIT_NO_OCCURRENCE_FOUND */
     };
   } else if (!params.allow_multiple && occurrences !== 1) {
@@ -309181,6 +309181,20 @@ var EditToolInvocation = class extends BaseToolInvocation {
     };
   }
   async attemptSelfCorrection(params, currentContent, initialError, abortSignal, originalLineEnding) {
+    if (!params.old_string || params.old_string.trim() === "") {
+      return {
+        currentContent,
+        newContent: currentContent,
+        occurrences: 0,
+        isNewFile: false,
+        error: {
+          display: "Edit failed: 'old_string' cannot be empty.",
+          raw: "The 'old_string' parameter is required. The Edit tool performs localized search-and-replace. If you are modifying a section of the file you have not viewed recently, call ReadFile on the target line range to inspect the current code, then provide the exact matching lines in 'old_string'.",
+          type: "invalid_tool_params" /* INVALID_TOOL_PARAMS */
+        },
+        originalLineEnding
+      };
+    }
     let errorForLlmEditFixer = initialError.raw;
     let contentForLlmEditFixer = currentContent;
     const initialContentHash = hashContent(currentContent);
@@ -309565,7 +309579,7 @@ ${snippet2}`);
       }
       if (this.params.modified_by_user) {
         llmSuccessMessageParts.push(
-          `User modified the \`new_string\` content to be: ${this.params.new_string}.`
+          `The confirmation step modified the \`new_string\` content to be: ${this.params.new_string}.`
         );
       }
       const jitContext = await discoverJitContext(
@@ -332839,6 +332853,48 @@ function extractCuratedHistory2(comprehensiveHistory) {
   }
   return curatedHistory;
 }
+var THINKING_ONLY_NUDGE_MESSAGE = "[System: You previously generated thoughts but failed to provide a final user-facing response. Please ensure you provide your final answer or call a tool now.]";
+var NO_RESPONSE_TEXT_NUDGE_MESSAGE = "[System: You previously returned an empty response with no text or thoughts. Please ensure you provide your final answer or call a tool now.]";
+function applyRetryNudge(contents, nudgeMessage) {
+  if (!nudgeMessage) {
+    return contents;
+  }
+  const lastTurn = contents[contents.length - 1];
+  const hasNudge = lastTurn?.parts?.some((p) => p.text?.includes(nudgeMessage));
+  if (hasNudge) {
+    return contents;
+  }
+  const cloned = contents.map((c4) => ({
+    ...c4,
+    parts: c4.parts ? [...c4.parts] : []
+  }));
+  const clonedLastTurn = cloned[cloned.length - 1];
+  const hasFunctionResponse = clonedLastTurn?.parts?.some(
+    (p) => p.functionResponse
+  );
+  if (clonedLastTurn?.role === "user" && hasFunctionResponse) {
+    cloned.push({
+      role: "model",
+      parts: [{ text: "[Tool execution completed.]" }]
+    });
+    cloned.push({
+      role: "user",
+      parts: [{ text: nudgeMessage }]
+    });
+  } else if (clonedLastTurn?.role === "user") {
+    if (!clonedLastTurn.parts) {
+      clonedLastTurn.parts = [];
+    }
+    clonedLastTurn.parts.push({ text: `
+${nudgeMessage}` });
+  } else {
+    cloned.push({
+      role: "user",
+      parts: [{ text: nudgeMessage }]
+    });
+  }
+  return cloned;
+}
 var InvalidStreamError = class extends Error {
   type;
   constructor(message, type2) {
@@ -333288,23 +333344,19 @@ var GeminiChat = class {
         tools: this.tools,
         abortSignal
       };
+      let nudgeMessage = "";
       if (modelConfigKey.isRetry && modelConfigKey.lastStreamError instanceof InvalidStreamError) {
         const lastError = modelConfigKey.lastStreamError;
-        let nudgeMessage = "";
         if (lastError.type === "THINKING_ONLY_RESPONSE") {
-          nudgeMessage = "\n[System: You previously generated thoughts but failed to provide a final user-facing response. Please ensure you provide your final answer or call a tool now.]";
+          nudgeMessage = THINKING_ONLY_NUDGE_MESSAGE;
         } else if (lastError.type === "NO_RESPONSE_TEXT") {
-          nudgeMessage = "\n[System: You previously returned an empty response with no text or thoughts. Please ensure you provide your final answer or call a tool now.]";
-        }
-        if (nudgeMessage) {
-          if (typeof config2.systemInstruction === "string") {
-            config2.systemInstruction += nudgeMessage;
-          } else if (config2.systemInstruction === void 0) {
-            config2.systemInstruction = nudgeMessage;
-          }
+          nudgeMessage = NO_RESPONSE_TEXT_NUDGE_MESSAGE;
         }
       }
       let contentsToUse = supportsModernFeatures(modelToUse) || isGemini2Model(modelToUse) ? [...contentsForPreviewModel] : [...requestContents];
+      if (nudgeMessage) {
+        contentsToUse = applyRetryNudge(contentsToUse, nudgeMessage);
+      }
       const hookSystem = this.context.config.getHookSystem();
       if (hookSystem) {
         const beforeModelResult = await hookSystem.fireBeforeModelEvent({
@@ -333340,12 +333392,18 @@ var GeminiChat = class {
           );
           lastModelToUse = modelToUse;
           contentsToUse = supportsModernFeatures(modelToUse) || isGemini2Model(modelToUse) ? [...contentsForPreviewModel] : [...requestContents];
+          if (nudgeMessage) {
+            contentsToUse = applyRetryNudge(contentsToUse, nudgeMessage);
+          }
         }
         if (beforeModelResult.modifiedConfig) {
           Object.assign(config2, beforeModelResult.modifiedConfig);
         }
         if (beforeModelResult.modifiedContents && Array.isArray(beforeModelResult.modifiedContents)) {
           contentsToUse = beforeModelResult.modifiedContents;
+          if (nudgeMessage) {
+            contentsToUse = applyRetryNudge(contentsToUse, nudgeMessage);
+          }
         }
         const toolSelectionResult = await hookSystem.fireBeforeToolSelectionEvent({
           model: modelToUse,
@@ -333885,9 +333943,8 @@ function isInvalidArgumentError(errorMessage) {
   return errorMessage.includes("Request contains an invalid argument");
 }
 function stripToolCallIdPrefixes(contents) {
-  return contents.map((content) => ({
-    ...content,
-    parts: (content.parts || []).map((part) => {
+  return contents.map((content) => {
+    const parts2 = (content.parts || []).map((part) => {
       const newPart = { ...part };
       if (newPart.functionCall) {
         const fc = newPart.functionCall;
@@ -333911,9 +333968,27 @@ function stripToolCallIdPrefixes(contents) {
           };
         }
       }
+      const hasOtherKeys = Object.keys(newPart).some(
+        (key) => key !== "text" && key !== "thought" && key !== "callIndex" && newPart[key] !== void 0
+      );
+      if (newPart.text !== void 0 && newPart.text === "" && hasOtherKeys) {
+        delete newPart.text;
+      }
       return newPart;
-    })
-  }));
+    }).filter((part) => {
+      const hasOtherKeys = Object.keys(part).some(
+        (key) => key !== "text" && key !== "thought" && key !== "callIndex" && part[key] !== void 0
+      );
+      if (part.text !== void 0 && part.text === "" && !hasOtherKeys) {
+        return false;
+      }
+      return true;
+    });
+    return {
+      ...content,
+      parts: parts2
+    };
+  });
 }
 function coalesceConsecutiveRoles(history) {
   const result2 = [];
@@ -341420,7 +341495,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-FWKP5A4D.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-KSRLPOK3.js");
         const provider = new OAuth2AuthProvider(
           authConfig,
           options.agentName ?? "unknown",
@@ -393858,6 +393933,7 @@ var LegacyAgentProtocol = class {
     let currentDisplayContent = initialDisplayContent;
     let turnCount = 0;
     const maxTurns = this._config.getMaxSessionTurns();
+    let isAfterToolResponse = false;
     while (true) {
       turnCount++;
       if (maxTurns >= 0 && turnCount > maxTurns) {
@@ -393870,6 +393946,7 @@ var LegacyAgentProtocol = class {
       }
       const toolCallRequests = [];
       let finishedReason = void 0;
+      let hasVisibleText = false;
       const responseStream = this._client.sendMessageStream(
         currentParts,
         this._abortController.signal,
@@ -393886,6 +393963,11 @@ var LegacyAgentProtocol = class {
         if (event.type === "tool_call_request" /* ToolCallRequest */) {
           toolCallRequests.push(event.value);
         }
+        if (event.type === "content" /* Content */) {
+          if (typeof event.value === "string" && event.value.trim() !== "") {
+            hasVisibleText = true;
+          }
+        }
         this._emit(translateEvent(event, this._translationState));
         switch (event.type) {
           case "error" /* Error */:
@@ -393910,6 +393992,12 @@ var LegacyAgentProtocol = class {
         return;
       }
       if (toolCallRequests.length === 0) {
+        if (isAfterToolResponse && !hasVisibleText) {
+          const nudgeMessage = "[System: You successfully executed a tool but returned an empty response. Please analyze the tool output and explain your progress or final answer.]";
+          currentParts = [{ text: nudgeMessage }];
+          isAfterToolResponse = false;
+          continue;
+        }
         if (finishedReason !== void 0) {
           this._finishStream(mapFinishReason(finishedReason));
         } else {
@@ -393976,6 +394064,7 @@ var LegacyAgentProtocol = class {
         return;
       }
       currentParts = toolResponseParts;
+      isAfterToolResponse = completedToolCalls.length > 0;
     }
   }
   _emit(events) {
@@ -403225,6 +403314,9 @@ export {
   SYNTHETIC_THOUGHT_SIGNATURE2 as SYNTHETIC_THOUGHT_SIGNATURE,
   INTERRUPTED_RESPONSE_PLACEHOLDER,
   isValidNonThoughtTextPart,
+  THINKING_ONLY_NUDGE_MESSAGE,
+  NO_RESPONSE_TEXT_NUDGE_MESSAGE,
+  applyRetryNudge,
   InvalidStreamError,
   AgentExecutionStoppedError,
   AgentExecutionBlockedError,

package/bundle/{chunk-M6E5CLIH.js → chunk-Q73BPF7A.js}

@@ -5,7 +5,7 @@ import {
   isTelemetrySdkInitialized,
   resetBrowserSession,
   shutdownTelemetry
-} from "./chunk-2UICYJMD.js";
+} from "./chunk-O7SBKM7M.js";
 
 // packages/cli/src/utils/cleanup.ts
 import { promises as fs } from "node:fs";

package/bundle/{chunk-XDJMDRLM.js → chunk-QJP6CMLN.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-XZF4EZOQ.js";
+} from "./chunk-RLDNUS35.js";
 import {
   DEFAULT_PORT,
   SERVER_START_WAIT_MS,
@@ -14,10 +14,10 @@ import {
   isServerRunning,
   resolveGemmaConfig,
   writeServerProcessInfo
-} from "./chunk-QVDXZMEX.js";
+} from "./chunk-LNXGFWGZ.js";
 import {
   debugLogger
-} from "./chunk-2UICYJMD.js";
+} from "./chunk-WDFSF5L4.js";
 import {
   __toESM
 } from "./chunk-34MYV7JD.js";

package/bundle/{chunk-EBKNEOAO.js → chunk-RLDNUS35.js}

@@ -1,7 +1,7 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-OFFEM74O.js";
+} from "./chunk-EAK33LFP.js";
 import {
   __commonJS,
   __require

package/bundle/{chunk-H2URGA7U.js → chunk-S5UX3QS5.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-ACDZS2RE.js";
+} from "./chunk-SCBVGZXH.js";
 import {
   DEFAULT_PORT,
   SERVER_START_WAIT_MS,
@@ -14,10 +14,10 @@ import {
   isServerRunning,
   resolveGemmaConfig,
   writeServerProcessInfo
-} from "./chunk-WH63Z45A.js";
+} from "./chunk-ALVDOQNA.js";
 import {
   debugLogger
-} from "./chunk-R3JDAZVL.js";
+} from "./chunk-O7SBKM7M.js";
 import {
   __toESM
 } from "./chunk-34MYV7JD.js";

package/bundle/{chunk-XZF4EZOQ.js → chunk-SCBVGZXH.js}

@@ -1,7 +1,7 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-M6E5CLIH.js";
+} from "./chunk-Q73BPF7A.js";
 import {
   __commonJS,
   __require