@google/gemini-cli-a2a-server 0.15.0-nightly.20251110.c0b766ad → 0.15.0-nightly.20251111.51f952e7

package/dist/a2a-server.mjs

@@ -63543,11 +63543,11 @@ var require_XMLParser = __commonJS({
 // node_modules/fast-xml-parser/src/xmlbuilder/orderedJs2Xml.js
 var require_orderedJs2Xml = __commonJS({
   "node_modules/fast-xml-parser/src/xmlbuilder/orderedJs2Xml.js"(exports2, module2) {
-    var EOL4 = "\n";
+    var EOL3 = "\n";
     function toXml(jArray, options2) {
       let indentation = "";
       if (options2.format && options2.indentBy.length > 0) {
-        indentation = EOL4;
+        indentation = EOL3;
       }
       return arrToStr(jArray, options2, "", indentation);
     }
@@ -65770,10 +65770,10 @@ var require_universalify2 = __commonJS({
 // node_modules/jsonfile/utils.js
 var require_utils8 = __commonJS({
   "node_modules/jsonfile/utils.js"(exports2, module2) {
-    function stringify5(obj, { EOL: EOL4 = "\n", finalEOL = true, replacer = null, spaces } = {}) {
-      const EOF3 = finalEOL ? EOL4 : "";
+    function stringify5(obj, { EOL: EOL3 = "\n", finalEOL = true, replacer = null, spaces } = {}) {
+      const EOF3 = finalEOL ? EOL3 : "";
       const str = JSON.stringify(obj, replacer, spaces);
-      return str.replace(/\n/g, EOL4) + EOF3;
+      return str.replace(/\n/g, EOL3) + EOF3;
     }
     function stripBom(content) {
       if (Buffer.isBuffer(content)) content = content.toString("utf8");
@@ -295896,8 +295896,8 @@ var Float64Vector = import_vector.default.Float64Vector;
 var PointerVector = import_vector.default.PointerVector;
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "c0b766ad";
-var CLI_VERSION = "0.15.0-nightly.20251110.c0b766ad";
+var GIT_COMMIT_INFO = "51f952e7";
+var CLI_VERSION = "0.15.0-nightly.20251111.51f952e7";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -296071,7 +296071,8 @@ var ClearcutLogger = class _ClearcutLogger {
       this.events.push([
         {
           event_time_ms: Date.now(),
-          source_extension_json: safeJsonStringify(event)
+          source_extension_json: safeJsonStringify(event),
+          gws_experiment: this.config?.getExperiments()?.experimentIds ?? []
         }
       ]);
       if (wasAtCapacity && this.config?.getDebugMode()) {
@@ -298697,7 +298698,7 @@ async function createContentGenerator(config2, gcConfig, sessionId2) {
     if (gcConfig.fakeResponses) {
       return FakeContentGenerator.fromFile(gcConfig.fakeResponses);
     }
-    const version3 = "0.15.0-nightly.20251110.c0b766ad";
+    const version3 = "0.15.0-nightly.20251111.51f952e7";
     const userAgent = `GeminiCLI/${version3} (${process.platform}; ${process.arch})`;
     const baseHeaders = {
       "User-Agent": userAgent
@@ -307601,7 +307602,6 @@ var GrepTool = class _GrepTool extends BaseDeclarativeTool {
 // packages/core/dist/src/tools/ripGrep.js
 import fs31 from "node:fs";
 import path33 from "node:path";
-import { EOL as EOL2 } from "node:os";
 import { spawn as spawn4 } from "node:child_process";
 
 // node_modules/@joshua.litt/get-ripgrep/dist/index.js
@@ -320734,46 +320734,37 @@ var GrepToolInvocation2 = class extends BaseToolInvocation {
       };
     }
   }
-  parseRipgrepOutput(output, basePath) {
+  parseRipgrepJsonOutput(output, basePath) {
     const results = [];
     if (!output)
       return results;
-    const lines = output.split(EOL2);
+    const lines = output.trim().split("\n");
     for (const line of lines) {
       if (!line.trim())
         continue;
-      const firstColonIndex = line.indexOf(":");
-      if (firstColonIndex === -1)
-        continue;
-      const secondColonIndex = line.indexOf(":", firstColonIndex + 1);
-      if (secondColonIndex === -1)
-        continue;
-      const filePathRaw = line.substring(0, firstColonIndex);
-      const lineNumberStr = line.substring(firstColonIndex + 1, secondColonIndex);
-      const lineContent = line.substring(secondColonIndex + 1);
-      const lineNumber = parseInt(lineNumberStr, 10);
-      if (!isNaN(lineNumber)) {
-        const absoluteFilePath = path33.resolve(basePath, filePathRaw);
-        const relativeFilePath = path33.relative(basePath, absoluteFilePath);
-        results.push({
-          filePath: relativeFilePath || path33.basename(absoluteFilePath),
-          lineNumber,
-          line: lineContent
-        });
+      try {
+        const json = JSON.parse(line);
+        if (json.type === "match") {
+          const match2 = json.data;
+          if (match2.path?.text && match2.lines?.text) {
+            const absoluteFilePath = path33.resolve(basePath, match2.path.text);
+            const relativeFilePath = path33.relative(basePath, absoluteFilePath);
+            results.push({
+              filePath: relativeFilePath || path33.basename(absoluteFilePath),
+              lineNumber: match2.line_number,
+              line: match2.lines.text.trimEnd()
+            });
+          }
+        }
+      } catch (error) {
+        debugLogger.warn(`Failed to parse ripgrep JSON line: ${line}`, error);
       }
     }
     return results;
   }
   async performRipgrepSearch(options2) {
     const { pattern, path: absolutePath, include } = options2;
-    const rgArgs = [
-      "--line-number",
-      "--no-heading",
-      "--with-filename",
-      "--ignore-case",
-      "--regexp",
-      pattern
-    ];
+    const rgArgs = ["--json", "--ignore-case", "--regexp", pattern];
     if (include) {
       rgArgs.push("--glob", include);
     }
@@ -320825,7 +320816,7 @@ var GrepToolInvocation2 = class extends BaseToolInvocation {
           }
         });
       });
-      return this.parseRipgrepOutput(output, absolutePath);
+      return this.parseRipgrepJsonOutput(output, absolutePath);
     } catch (error) {
       console.error(`GrepLogic: ripgrep failed: ${getErrorMessage(error)}`);
       throw error;
@@ -329868,19 +329859,27 @@ function isModifiableDeclarativeTool(tool) {
   return "getModifyContext" in tool;
 }
 function createTempFilesForModify(currentContent, proposedContent, file_path) {
-  const tempDir = os11.tmpdir();
-  const diffDir = path38.join(tempDir, "gemini-cli-tool-modify-diffs");
-  if (!fs36.existsSync(diffDir)) {
-    fs36.mkdirSync(diffDir, { recursive: true });
+  const diffDir = fs36.mkdtempSync(path38.join(os11.tmpdir(), "gemini-cli-tool-modify-"));
+  try {
+    fs36.chmodSync(diffDir, 448);
+  } catch (e2) {
+    debugLogger.error(`Error setting permissions on temp diff directory: ${diffDir}`, e2);
+    throw e2;
   }
   const ext2 = path38.extname(file_path);
   const fileName = path38.basename(file_path, ext2);
   const timestamp = Date.now();
   const tempOldPath = path38.join(diffDir, `gemini-cli-modify-${fileName}-old-${timestamp}${ext2}`);
   const tempNewPath = path38.join(diffDir, `gemini-cli-modify-${fileName}-new-${timestamp}${ext2}`);
-  fs36.writeFileSync(tempOldPath, currentContent, "utf8");
-  fs36.writeFileSync(tempNewPath, proposedContent, "utf8");
-  return { oldPath: tempOldPath, newPath: tempNewPath };
+  fs36.writeFileSync(tempOldPath, currentContent, {
+    encoding: "utf8",
+    mode: 384
+  });
+  fs36.writeFileSync(tempNewPath, proposedContent, {
+    encoding: "utf8",
+    mode: 384
+  });
+  return { oldPath: tempOldPath, newPath: tempNewPath, dirPath: diffDir };
 }
 function getUpdatedParams(tmpOldPath, tempNewPath, originalParams, modifyContext) {
   let oldContent = "";
@@ -329903,7 +329902,7 @@ function getUpdatedParams(tmpOldPath, tempNewPath, originalParams, modifyContext
   const updatedDiff = createPatch(path38.basename(modifyContext.getFilePath(originalParams)), oldContent, newContent, "Current", "Proposed", DEFAULT_DIFF_OPTIONS);
   return { updatedParams, updatedDiff };
 }
-function deleteTempFiles(oldPath, newPath) {
+function deleteTempFiles(oldPath, newPath, dirPath) {
   try {
     fs36.unlinkSync(oldPath);
   } catch {
@@ -329914,17 +329913,24 @@ function deleteTempFiles(oldPath, newPath) {
   } catch {
     debugLogger.error(`Error deleting temp diff file: ${newPath}`);
   }
+  try {
+    fs36.rmdirSync(dirPath);
+  } catch {
+    debugLogger.error(`Error deleting temp diff directory: ${dirPath}`);
+  }
 }
-async function modifyWithEditor(originalParams, modifyContext, editorType, _abortSignal, onEditorClose) {
-  const currentContent = await modifyContext.getCurrentContent(originalParams);
-  const proposedContent = await modifyContext.getProposedContent(originalParams);
-  const { oldPath, newPath } = createTempFilesForModify(currentContent, proposedContent, modifyContext.getFilePath(originalParams));
+async function modifyWithEditor(originalParams, modifyContext, editorType, _abortSignal, onEditorClose, overrides) {
+  const hasCurrentOverride = overrides !== void 0 && "currentContent" in overrides;
+  const hasProposedOverride = overrides !== void 0 && "proposedContent" in overrides;
+  const currentContent = hasCurrentOverride ? overrides.currentContent ?? "" : await modifyContext.getCurrentContent(originalParams);
+  const proposedContent = hasProposedOverride ? overrides.proposedContent ?? "" : await modifyContext.getProposedContent(originalParams);
+  const { oldPath, newPath, dirPath } = createTempFilesForModify(currentContent ?? "", proposedContent ?? "", modifyContext.getFilePath(originalParams));
   try {
     await openDiff(oldPath, newPath, editorType, onEditorClose);
     const result = getUpdatedParams(oldPath, newPath, originalParams, modifyContext);
     return result;
   } finally {
-    deleteTempFiles(oldPath, newPath);
+    deleteTempFiles(oldPath, newPath, dirPath);
   }
 }
 
@@ -331319,7 +331325,7 @@ A good instruction should concisely answer:
 // packages/core/dist/src/tools/shell.js
 import fs40 from "node:fs";
 import path42 from "node:path";
-import os16, { EOL as EOL3 } from "node:os";
+import os16, { EOL as EOL2 } from "node:os";
 import crypto20 from "node:crypto";
 
 // packages/core/dist/src/config/models.js
@@ -337065,7 +337071,7 @@ var ShellToolInvocation = class extends BaseToolInvocation {
       const backgroundPIDs = [];
       if (os16.platform() !== "win32") {
         if (fs40.existsSync(tempFilePath)) {
-          const pgrepLines = fs40.readFileSync(tempFilePath, "utf8").split(EOL3).filter(Boolean);
+          const pgrepLines = fs40.readFileSync(tempFilePath, "utf8").split(EOL2).filter(Boolean);
           for (const line of pgrepLines) {
             if (!/^\d+$/.test(line)) {
               debugLogger.error(`pgrep: ${line}`);
@@ -343958,7 +343964,11 @@ var CoreToolScheduler = class _CoreToolScheduler {
           ...waitingToolCall.confirmationDetails,
           isModifying: true
         });
-        const { updatedParams, updatedDiff } = await modifyWithEditor(waitingToolCall.request.args, modifyContext, editorType, signal, this.onEditorClose);
+        const contentOverrides = waitingToolCall.confirmationDetails.type === "edit" ? {
+          currentContent: waitingToolCall.confirmationDetails.originalContent,
+          proposedContent: waitingToolCall.confirmationDetails.newContent
+        } : void 0;
+        const { updatedParams, updatedDiff } = await modifyWithEditor(waitingToolCall.request.args, modifyContext, editorType, signal, this.onEditorClose, contentOverrides);
         this.setArgsInternal(callId, updatedParams);
         this.setStatusInternal(callId, "awaiting_approval", signal, {
           ...waitingToolCall.confirmationDetails,
@@ -354956,7 +354966,7 @@ async function getClientMetadata() {
   if (!clientMetadataPromise) {
     clientMetadataPromise = (async () => ({
       ideName: "GEMINI_CLI",
-      ideVersion: "0.15.0-nightly.20251110.c0b766ad",
+      ideVersion: "0.15.0-nightly.20251111.51f952e7",
       platform: getPlatform(),
       updateChannel: await getReleaseChannel(__dirname5)
     }))();
@@ -359725,26 +359735,28 @@ async function handleAutomaticOAuth(mcpServerName, mcpServerConfig, wwwAuthentic
     return false;
   }
 }
+function createTransportRequestInit(mcpServerConfig, headers) {
+  return {
+    headers: {
+      ...mcpServerConfig.headers,
+      ...headers
+    }
+  };
+}
 async function createTransportWithOAuth(mcpServerName, mcpServerConfig, accessToken) {
   try {
     if (mcpServerConfig.httpUrl) {
       const oauthTransportOptions = {
-        requestInit: {
-          headers: {
-            ...mcpServerConfig.headers,
-            Authorization: `Bearer ${accessToken}`
-          }
-        }
+        requestInit: createTransportRequestInit(mcpServerConfig, {
+          Authorization: `Bearer ${accessToken}`
+        })
       };
       return new StreamableHTTPClientTransport(new URL(mcpServerConfig.httpUrl), oauthTransportOptions);
     } else if (mcpServerConfig.url) {
       return new SSEClientTransport(new URL(mcpServerConfig.url), {
-        requestInit: {
-          headers: {
-            ...mcpServerConfig.headers,
-            Authorization: `Bearer ${accessToken}`
-          }
-        }
+        requestInit: createTransportRequestInit(mcpServerConfig, {
+          Authorization: `Bearer ${accessToken}`
+        })
       });
     }
     return null;
@@ -360050,6 +360062,7 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode) {
   if (mcpServerConfig.authProviderType === AuthProviderType.SERVICE_ACCOUNT_IMPERSONATION) {
     const provider = new ServiceAccountImpersonationProvider(mcpServerConfig);
     const transportOptions = {
+      requestInit: createTransportRequestInit(mcpServerConfig, {}),
       authProvider: provider
     };
     if (mcpServerConfig.httpUrl) {
@@ -360062,6 +360075,7 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode) {
   if (mcpServerConfig.authProviderType === AuthProviderType.GOOGLE_CREDENTIALS) {
     const provider = new GoogleCredentialProvider(mcpServerConfig);
     const transportOptions = {
+      requestInit: createTransportRequestInit(mcpServerConfig, {}),
       authProvider: provider
     };
     if (mcpServerConfig.httpUrl) {