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

package/bundle/{chunk-2UICYJMD.js → chunk-G65GW52B.js}

@@ -282559,7 +282559,7 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "eaa30429a";
+var GIT_COMMIT_INFO = "3910b2093";
 var CLI_VERSION = "0.57.0-preview.0";
 
 // packages/core/dist/src/ide/detect-ide.js
@@ -305854,7 +305854,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.57.0-preview.0";
+    return "0.57.0-preview.1";
   })();
   return versionPromise;
 }
@@ -308120,8 +308120,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: ToolErrorType.EDIT_NO_OCCURRENCE_FOUND
     };
   } else if (!params.allow_multiple && occurrences !== 1) {
@@ -308197,6 +308197,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: ToolErrorType.INVALID_TOOL_PARAMS
+        },
+        originalLineEnding
+      };
+    }
     let errorForLlmEditFixer = initialError.raw;
     let contentForLlmEditFixer = currentContent;
     const initialContentHash = hashContent(currentContent);
@@ -308535,7 +308549,7 @@ ${snippet2}`);
         llmSuccessMessageParts.push(fuzzyFeedback);
       }
       if (this.params.modified_by_user) {
-        llmSuccessMessageParts.push(`User modified the \`new_string\` content to be: ${this.params.new_string}.`);
+        llmSuccessMessageParts.push(`The confirmation step modified the \`new_string\` content to be: ${this.params.new_string}.`);
       }
       const jitContext = await discoverJitContext(this.config, this.resolvedPath);
       let llmContent = llmSuccessMessageParts.join(" ");
@@ -330568,6 +330582,46 @@ 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) {
@@ -330956,23 +331010,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({
@@ -330996,12 +331046,18 @@ var GeminiChat = class {
           modelToUse = resolveModel(beforeModelResult.modifiedModel, useGemini3_1, false, hasAccessToPreview, this.context.config, this.context.config.hasGemini35FlashGAAccess?.() ?? false);
           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,
@@ -331473,9 +331529,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;
@@ -331499,9 +331554,23 @@ 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 = [];
@@ -338716,7 +338785,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-BKNKX6FS.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-ZT4OFVMK.js");
         const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
         await provider.initialize();
         return provider;
@@ -387316,6 +387385,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) {
@@ -387328,6 +387398,7 @@ var LegacyAgentProtocol = class {
       }
       const toolCallRequests = [];
       let finishedReason = void 0;
+      let hasVisibleText = false;
       const responseStream = this._client.sendMessageStream(currentParts, this._abortController.signal, this._promptId, void 0, currentDisplayContent);
       currentDisplayContent = void 0;
       for await (const event of responseStream) {
@@ -387338,6 +387409,11 @@ var LegacyAgentProtocol = class {
         if (event.type === GeminiEventType.ToolCallRequest) {
           toolCallRequests.push(event.value);
         }
+        if (event.type === GeminiEventType.Content) {
+          if (typeof event.value === "string" && event.value.trim() !== "") {
+            hasVisibleText = true;
+          }
+        }
         this._emit(translateEvent(event, this._translationState));
         switch (event.type) {
           case GeminiEventType.Error:
@@ -387362,6 +387438,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 {
@@ -387419,6 +387501,7 @@ var LegacyAgentProtocol = class {
         return;
       }
       currentParts = toolResponseParts;
+      isAfterToolResponse = completedToolCalls.length > 0;
     }
   }
   _emit(events) {
@@ -396547,6 +396630,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-WH63Z45A.js → chunk-GK7NUJ35.js}

@@ -1,6 +1,9 @@
 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 {
   AuthProviderType,
+  AuthType,
+  CoreEvent,
+  CoreToolCallStatus,
   DEFAULT_MODEL_CONFIGS,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
   EDITOR_OPTIONS,
@@ -28,7 +31,7 @@ import {
   partListUnionToString,
   require_strip_json_comments,
   sanitizeFilenamePart
-} from "./chunk-R3JDAZVL.js";
+} from "./chunk-G65GW52B.js";
 import {
   __commonJS,
   __require,
@@ -10225,7 +10228,7 @@ function convertSessionToHistoryFormats(messages) {
           args: tool.args,
           description: tool.description || "",
           renderOutputAsMarkdown: tool.renderOutputAsMarkdown ?? true,
-          status: tool.status === "success" ? "success" /* Success */ : "error" /* Error */,
+          status: tool.status === "success" ? CoreToolCallStatus.Success : CoreToolCallStatus.Error,
           resultDisplay: tool.resultDisplay,
           confirmationDetails: void 0
         }))
@@ -16289,8 +16292,8 @@ var LoadedSettings = class {
   // React will pass a listener fn into this subscribe fn
   // that listener fn will perform an object identity check on the snapshot and trigger a React re render if the snapshot has changed
   subscribe(listener) {
-    coreEvents.on("settings-changed" /* SettingsChanged */, listener);
-    return () => coreEvents.off("settings-changed" /* SettingsChanged */, listener);
+    coreEvents.on(CoreEvent.SettingsChanged, listener);
+    return () => coreEvents.off(CoreEvent.SettingsChanged, listener);
   }
   getSnapshot() {
     return this._snapshot;
@@ -16434,7 +16437,7 @@ function setUpCloudShellEnvironment(envFilePath, isTrusted, isSandboxed, selecte
     }
   }
   let value = "cloudshell-gca";
-  if (selectedAuthType === "vertex-ai" /* USE_VERTEX_AI */) {
+  if (selectedAuthType === AuthType.USE_VERTEX_AI) {
     value = process2.env[USER_GCP_PROJECT];
   }
   if (envFilePath && fs4.existsSync(envFilePath)) {

package/bundle/{chunk-SHIJDXMN.js → chunk-GMQ6QNZB.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   CoreToolCallStatus,
   checkExhaustive
-} from "./chunk-2UICYJMD.js";
+} from "./chunk-WDFSF5L4.js";
 import {
   __commonJS,
   __toESM