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

package/dist/a2a-server.mjs

@@ -220988,8 +220988,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "eaa30429a";
-    CLI_VERSION = "0.57.0-preview.0";
+    GIT_COMMIT_INFO = "3910b2093";
+    CLI_VERSION = "0.57.0-preview.1";
   }
 });
 
@@ -336720,7 +336720,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.57.0-preview.0";
+    return "0.57.0-preview.1";
   })();
   return versionPromise;
 }
@@ -339243,8 +339243,8 @@ function getErrorReplaceResult(params, occurrences, finalOldString, finalNewStri
   let error2 = void 0;
   if (occurrences === 0) {
     error2 = {
-      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) {
@@ -339447,6 +339447,20 @@ var init_edit = __esm({
         };
       }
       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);
@@ -339785,7 +339799,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(" ");
@@ -366341,6 +366355,44 @@ function extractCuratedHistory2(comprehensiveHistory) {
   }
   return curatedHistory;
 }
+function applyRetryNudge(contents, nudgeMessage) {
+  if (!nudgeMessage) {
+    return contents;
+  }
+  const lastTurn = contents[contents.length - 1];
+  const hasNudge = lastTurn?.parts?.some((p2) => p2.text?.includes(nudgeMessage));
+  if (hasNudge) {
+    return contents;
+  }
+  const cloned = contents.map((c2) => ({
+    ...c2,
+    parts: c2.parts ? [...c2.parts] : []
+  }));
+  const clonedLastTurn = cloned[cloned.length - 1];
+  const hasFunctionResponse = clonedLastTurn?.parts?.some((p2) => p2.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;
+}
 function isSchemaDepthError(errorMessage) {
   return errorMessage.includes("maximum schema depth exceeded");
 }
@@ -366348,9 +366400,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;
@@ -366374,9 +366425,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 = [];
@@ -366431,7 +366496,7 @@ function stripThoughts2(history) {
     };
   }).filter((turn) => !turn.content.parts || turn.content.parts.length > 0);
 }
-var StreamEventType, MID_STREAM_RETRY_OPTIONS, SYNTHETIC_THOUGHT_SIGNATURE2, INTERRUPTED_RESPONSE_PLACEHOLDER, InvalidStreamError, AgentExecutionStoppedError, AgentExecutionBlockedError, GeminiChat;
+var StreamEventType, MID_STREAM_RETRY_OPTIONS, SYNTHETIC_THOUGHT_SIGNATURE2, INTERRUPTED_RESPONSE_PLACEHOLDER, THINKING_ONLY_NUDGE_MESSAGE, NO_RESPONSE_TEXT_NUDGE_MESSAGE, InvalidStreamError, AgentExecutionStoppedError, AgentExecutionBlockedError, GeminiChat;
 var init_geminiChat = __esm({
   "packages/core/dist/src/core/geminiChat.js"() {
     "use strict";
@@ -366468,6 +366533,8 @@ var init_geminiChat = __esm({
     };
     SYNTHETIC_THOUGHT_SIGNATURE2 = "skip_thought_signature_validator";
     INTERRUPTED_RESPONSE_PLACEHOLDER = "[The previous response was interrupted before it completed.]";
+    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.]";
+    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.]";
     InvalidStreamError = class extends Error {
       type;
       constructor(message, type2) {
@@ -366856,23 +366923,19 @@ var init_geminiChat = __esm({
             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({
@@ -366896,12 +366959,18 @@ var init_geminiChat = __esm({
               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,