@google/gemini-cli-a2a-server 0.51.0-nightly.20260706.gf7af4e518 → 0.51.0-preview.0

package/dist/a2a-server.mjs

@@ -216165,8 +216165,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 = "f7af4e518";
-    CLI_VERSION = "0.51.0-nightly.20260706.gf7af4e518";
+    GIT_COMMIT_INFO = "27a3da3e8";
+    CLI_VERSION = "0.51.0-preview.0";
   }
 });
 
@@ -326084,7 +326084,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.51.0-nightly.20260706.gf7af4e518";
+    return "0.51.0-preview.0";
   })();
   return versionPromise;
 }
@@ -329466,7 +329466,9 @@ async function getCorrectedFileContent(config3, filePath, proposedContent, abort
       return { originalContent, correctedContent, fileExists: fileExists2, error: error2 };
     }
   }
-  const aggressiveUnescape = !isGemini3Model(config3.getActiveModel());
+  const activeModel = config3.getActiveModel();
+  const resolvedModel = resolveModel(activeModel, false, false, true, config3);
+  const aggressiveUnescape = !isGemini3Model(resolvedModel, config3) && !isGemini2Model(resolvedModel) && !isCustomModel(resolvedModel, config3);
   correctedContent = await ensureCorrectFileContent(proposedContent, config3.getBaseLlmClient(), abortSignal, config3.getDisableLLMCorrection(), aggressiveUnescape);
   return { originalContent, correctedContent, fileExists: fileExists2 };
 }
@@ -355157,24 +355159,49 @@ function hardenHistory(history, options = {}) {
   if (history.length === 0)
     return history;
   const sentinels = { ...DEFAULT_SENTINELS, ...options.sentinels };
-  let coalesced = coalesce(history);
+  const processed = stripThoughts(history);
+  let coalesced = coalesce(processed);
   coalesced = pairToolsAndEnforceSignatures(coalesced, sentinels);
   coalesced = refineToolResponses(coalesced);
   let final = enforceRoleConstraints(coalesced, sentinels);
   final = scrubHistory(final);
   return final;
 }
+function isInternalThought(part) {
+  return !!part && !!part.thought;
+}
+function stripThoughts(history) {
+  return history.map((turn) => {
+    if (!turn.content.parts)
+      return turn;
+    const hasThought = turn.content.parts.some(isInternalThought);
+    if (!hasThought)
+      return turn;
+    const nonThoughtParts = turn.content.parts.filter((p2) => p2 && !isInternalThought(p2));
+    return {
+      id: turn.id,
+      content: {
+        ...turn.content,
+        parts: nonThoughtParts
+      }
+    };
+  });
+}
 function coalesce(history) {
   const result2 = [];
   for (const turn of history) {
     if (!turn.content.parts || turn.content.parts.length === 0)
       continue;
-    const last2 = result2[result2.length - 1];
+    const lastIdx = result2.length - 1;
+    const last2 = result2[lastIdx];
     if (last2 && last2.content.role === turn.content.role) {
-      last2.content.parts = [
-        ...last2.content.parts || [],
-        ...turn.content.parts || []
-      ];
+      result2[lastIdx] = {
+        id: last2.id,
+        content: {
+          ...last2.content,
+          parts: [...last2.content.parts || [], ...turn.content.parts || []]
+        }
+      };
     } else {
       result2.push({ id: turn.id, content: { ...turn.content } });
     }
@@ -355352,16 +355379,56 @@ function enforceRoleConstraints(history, sentinels) {
   return coalesce(result2);
 }
 function scrubHistory(history) {
-  return history.map((turn) => ({
-    id: turn.id,
-    content: scrubContents([turn.content])[0]
-  }));
+  const result2 = [];
+  for (const turn of history) {
+    const nonThoughtParts = (turn.content.parts ?? []).filter((p2) => p2 && !isInternalThought(p2));
+    if (nonThoughtParts.length === 0)
+      continue;
+    const scrubbedParts = nonThoughtParts.map((p2) => scrubPart(p2));
+    const lastIdx = result2.length - 1;
+    const last2 = result2[lastIdx];
+    if (last2 && last2.content.role === turn.content.role) {
+      result2[lastIdx] = {
+        id: last2.id,
+        content: {
+          ...last2.content,
+          parts: [...last2.content.parts || [], ...scrubbedParts]
+        }
+      };
+    } else {
+      result2.push({
+        id: turn.id,
+        content: {
+          role: turn.content.role,
+          parts: scrubbedParts
+        }
+      });
+    }
+  }
+  return result2;
 }
 function scrubContents(contents) {
-  return contents.map((content) => ({
-    role: content.role,
-    parts: (content.parts || []).map((p2) => scrubPart(p2))
-  }));
+  const result2 = [];
+  for (const content of contents) {
+    const nonThoughtParts = (content.parts ?? []).filter((p2) => p2 && !isInternalThought(p2));
+    if (nonThoughtParts.length === 0)
+      continue;
+    const scrubbedParts = nonThoughtParts.map((p2) => scrubPart(p2));
+    const lastIdx = result2.length - 1;
+    const last2 = result2[lastIdx];
+    if (last2 && last2.role === content.role) {
+      result2[lastIdx] = {
+        role: last2.role,
+        parts: [...last2.parts || [], ...scrubbedParts]
+      };
+    } else {
+      result2.push({
+        role: content.role,
+        parts: scrubbedParts
+      });
+    }
+  }
+  return result2;
 }
 function isThoughtPart(part) {
   return "thoughtSignature" in part;