@google/gemini-cli-a2a-server 0.65.0-preview.0 → 0.66.0-nightly.20261016.gdebf42324

package/dist/a2a-server.mjs

@@ -45922,7 +45922,7 @@ var require_src5 = __commonJS({
     var jws = require_jws();
     var path103 = __require("path");
     var util_1 = __require("util");
-    var readFile12 = fs90.readFile ? (0, util_1.promisify)(fs90.readFile) : async () => {
+    var readFile11 = fs90.readFile ? (0, util_1.promisify)(fs90.readFile) : async () => {
       throw new ErrorWithCode("use key rather than keyFile.", "MISSING_CREDENTIALS");
     };
     var GOOGLE_TOKEN_URL = "https://www.googleapis.com/oauth2/v4/token";
@@ -46011,7 +46011,7 @@ var require_src5 = __commonJS({
         const ext2 = path103.extname(keyFile);
         switch (ext2) {
           case ".json": {
-            const key = await readFile12(keyFile, "utf8");
+            const key = await readFile11(keyFile, "utf8");
             const body2 = JSON.parse(key);
             const privateKey = body2.private_key;
             const clientEmail = body2.client_email;
@@ -46023,7 +46023,7 @@ var require_src5 = __commonJS({
           case ".der":
           case ".crt":
           case ".pem": {
-            const privateKey = await readFile12(keyFile, "utf8");
+            const privateKey = await readFile11(keyFile, "utf8");
             return { privateKey };
           }
           case ".p12":
@@ -47480,7 +47480,7 @@ var require_filesubjecttokensupplier = __commonJS({
     exports2.FileSubjectTokenSupplier = void 0;
     var util_1 = __require("util");
     var fs90 = __require("fs");
-    var readFile12 = (0, util_1.promisify)((_a4 = fs90.readFile) !== null && _a4 !== void 0 ? _a4 : () => {
+    var readFile11 = (0, util_1.promisify)((_a4 = fs90.readFile) !== null && _a4 !== void 0 ? _a4 : () => {
     });
     var realpath2 = (0, util_1.promisify)((_b = fs90.realpath) !== null && _b !== void 0 ? _b : () => {
     });
@@ -47517,7 +47517,7 @@ var require_filesubjecttokensupplier = __commonJS({
           throw err2;
         }
         let subjectToken;
-        const rawText = await readFile12(parsedFilePath, { encoding: "utf8" });
+        const rawText = await readFile11(parsedFilePath, { encoding: "utf8" });
         if (this.formatType === "text") {
           subjectToken = rawText;
         } else if (this.formatType === "json" && this.subjectTokenFieldName) {
@@ -53087,8 +53087,8 @@ var require_graceful_fs = __commonJS({
       fs91.createReadStream = createReadStream6;
       fs91.createWriteStream = createWriteStream5;
       var fs$readFile = fs91.readFile;
-      fs91.readFile = readFile12;
-      function readFile12(path103, options, cb) {
+      fs91.readFile = readFile11;
+      function readFile11(path103, options, cb) {
         if (typeof options === "function")
           cb = options, options = null;
         return go$readFile(path103, options, cb);
@@ -54456,7 +54456,7 @@ var require_jsonfile = __commonJS({
       }
       return obj;
     }
-    var readFile12 = universalify.fromPromise(_readFile);
+    var readFile11 = universalify.fromPromise(_readFile);
     function readFileSync11(file, options = {}) {
       if (typeof options === "string") {
         options = { encoding: options };
@@ -54488,7 +54488,7 @@ var require_jsonfile = __commonJS({
       return fs90.writeFileSync(file, str2, options);
     }
     module2.exports = {
-      readFile: readFile12,
+      readFile: readFile11,
       readFileSync: readFileSync11,
       writeFile: writeFile9,
       writeFileSync: writeFileSync8
@@ -84204,7 +84204,7 @@ var require_src14 = __commonJS({
         });
       };
     }
-    var readFile12 = fs90.readFile ? (0, _util.promisify)(fs90.readFile) : /* @__PURE__ */ _asyncToGenerator(/* @__PURE__ */ _regenerator().m(function _callee() {
+    var readFile11 = fs90.readFile ? (0, _util.promisify)(fs90.readFile) : /* @__PURE__ */ _asyncToGenerator(/* @__PURE__ */ _regenerator().m(function _callee() {
       return _regenerator().w(function(_context) {
         while (1) switch (_context.n) {
           case 0:
@@ -84344,7 +84344,7 @@ var require_src14 = __commonJS({
                   break;
                 case 1:
                   _context2.n = 2;
-                  return readFile12(keyFile, "utf8");
+                  return readFile11(keyFile, "utf8");
                 case 2:
                   key = _context2.v;
                   body2 = JSON.parse(key);
@@ -84362,7 +84362,7 @@ var require_src14 = __commonJS({
                   });
                 case 4:
                   _context2.n = 5;
-                  return readFile12(keyFile, "utf8");
+                  return readFile11(keyFile, "utf8");
                 case 5:
                   _privateKey = _context2.v;
                   return _context2.a(2, {
@@ -85959,7 +85959,7 @@ var require_filesubjecttokensupplier2 = __commonJS({
     exports2.FileSubjectTokenSupplier = void 0;
     var util_1 = __require("util");
     var fs90 = __require("fs");
-    var readFile12 = (0, util_1.promisify)(fs90.readFile ?? (() => {
+    var readFile11 = (0, util_1.promisify)(fs90.readFile ?? (() => {
     }));
     var realpath2 = (0, util_1.promisify)(fs90.realpath ?? (() => {
     }));
@@ -85999,7 +85999,7 @@ var require_filesubjecttokensupplier2 = __commonJS({
           throw err2;
         }
         let subjectToken;
-        const rawText = await readFile12(parsedFilePath, { encoding: "utf8" });
+        const rawText = await readFile11(parsedFilePath, { encoding: "utf8" });
         if (this.formatType === "text") {
           subjectToken = rawText;
         } else if (this.formatType === "json" && this.subjectTokenFieldName) {
@@ -112182,7 +112182,7 @@ var require_getCredentials = __commonJS({
     var fs90 = __require("fs");
     var util_1 = __require("util");
     var errorWithCode_1 = require_errorWithCode();
-    var readFile12 = fs90.readFile ? (0, util_1.promisify)(fs90.readFile) : async () => {
+    var readFile11 = fs90.readFile ? (0, util_1.promisify)(fs90.readFile) : async () => {
       throw new errorWithCode_1.ErrorWithCode("use key rather than keyFile.", "MISSING_CREDENTIALS");
     };
     var ExtensionFiles;
@@ -112204,7 +112204,7 @@ var require_getCredentials = __commonJS({
        * @returns A promise that resolves with the credentials.
        */
       async getCredentials() {
-        const key = await readFile12(this.keyFilePath, "utf8");
+        const key = await readFile11(this.keyFilePath, "utf8");
         let body2;
         try {
           body2 = JSON.parse(key);
@@ -112230,7 +112230,7 @@ var require_getCredentials = __commonJS({
        * @returns A promise that resolves with the private key.
        */
       async getCredentials() {
-        const privateKey = await readFile12(this.keyFilePath, "utf8");
+        const privateKey = await readFile11(this.keyFilePath, "utf8");
         return { privateKey };
       }
     };
@@ -113860,7 +113860,7 @@ var require_filesubjecttokensupplier3 = __commonJS({
     exports2.FileSubjectTokenSupplier = void 0;
     var util_1 = __require("util");
     var fs90 = __require("fs");
-    var readFile12 = (0, util_1.promisify)(fs90.readFile ?? (() => {
+    var readFile11 = (0, util_1.promisify)(fs90.readFile ?? (() => {
     }));
     var realpath2 = (0, util_1.promisify)(fs90.realpath ?? (() => {
     }));
@@ -113900,7 +113900,7 @@ var require_filesubjecttokensupplier3 = __commonJS({
           throw err2;
         }
         let subjectToken;
-        const rawText = await readFile12(parsedFilePath, { encoding: "utf8" });
+        const rawText = await readFile11(parsedFilePath, { encoding: "utf8" });
         if (this.formatType === "text") {
           subjectToken = rawText;
         } else if (this.formatType === "json" && this.subjectTokenFieldName) {
@@ -139667,6 +139667,25 @@ var init_token_storage = __esm({
   }
 });
 
+// packages/core/dist/src/utils/compatibility.js
+function isTmux() {
+  return !!process.env["TMUX"];
+}
+function isDumbTerminal() {
+  const term = process.env["TERM"] || "";
+  return term === "dumb" || term === "vt100";
+}
+var WarningPriority;
+var init_compatibility = __esm({
+  "packages/core/dist/src/utils/compatibility.js"() {
+    "use strict";
+    (function(WarningPriority2) {
+      WarningPriority2["Low"] = "low";
+      WarningPriority2["High"] = "high";
+    })(WarningPriority || (WarningPriority = {}));
+  }
+});
+
 // packages/core/dist/src/utils/stdio.js
 function writeToStdout(...args2) {
   return originalStdoutWrite(...args2);
@@ -139677,7 +139696,28 @@ function writeToStderr(...args2) {
 function isKey(key, obj) {
   return key in obj;
 }
-function createWorkingStdio() {
+function wrapWithSynchronizedOutput(chunk) {
+  if (!chunk || STANDALONE_MODE_SEQUENCES.has(chunk) || chunk.startsWith("\x1B]") && (chunk.endsWith("\x07") || chunk.endsWith("\x1B\\"))) {
+    return chunk;
+  }
+  if (isDumbTerminal()) {
+    return chunk;
+  }
+  const inTmux = isTmux();
+  const syncStart = inTmux ? TMUX_ENTER_SYNCHRONIZED_OUTPUT_SEQ : ENTER_SYNCHRONIZED_OUTPUT_SEQ;
+  const syncEnd = inTmux ? TMUX_EXIT_SYNCHRONIZED_OUTPUT_SEQ : EXIT_SYNCHRONIZED_OUTPUT_SEQ;
+  if (chunk.startsWith(syncStart) && chunk.endsWith(syncEnd)) {
+    return chunk;
+  }
+  let inner = chunk;
+  if (inner.startsWith(ENTER_SYNCHRONIZED_OUTPUT_SEQ) && inner.endsWith(EXIT_SYNCHRONIZED_OUTPUT_SEQ)) {
+    inner = inner.slice(ENTER_SYNCHRONIZED_OUTPUT_SEQ.length, -EXIT_SYNCHRONIZED_OUTPUT_SEQ.length);
+  } else if (inner.startsWith(TMUX_ENTER_SYNCHRONIZED_OUTPUT_SEQ) && inner.endsWith(TMUX_EXIT_SYNCHRONIZED_OUTPUT_SEQ)) {
+    inner = inner.slice(TMUX_ENTER_SYNCHRONIZED_OUTPUT_SEQ.length, -TMUX_EXIT_SYNCHRONIZED_OUTPUT_SEQ.length);
+  }
+  return `${syncStart}${inner}${syncEnd}`;
+}
+function createWorkingStdio(options) {
   let cursorShownForIme = false;
   const workingStdoutWrite = (...args2) => {
     const [chunk] = args2;
@@ -139692,12 +139732,18 @@ function createWorkingStdio() {
       } else if (cursorShownForIme) {
         if (chunk.endsWith(EXIT_SYNCHRONIZED_OUTPUT_SEQ)) {
           args2[0] = `${chunk.slice(0, -EXIT_SYNCHRONIZED_OUTPUT_SEQ.length)}${HIDE_CURSOR_SEQ}${EXIT_SYNCHRONIZED_OUTPUT_SEQ}`;
+        } else if (chunk.endsWith(TMUX_EXIT_SYNCHRONIZED_OUTPUT_SEQ)) {
+          args2[0] = `${chunk.slice(0, -TMUX_EXIT_SYNCHRONIZED_OUTPUT_SEQ.length)}${HIDE_CURSOR_SEQ}${TMUX_EXIT_SYNCHRONIZED_OUTPUT_SEQ}`;
         } else {
           args2[0] = `${chunk}${HIDE_CURSOR_SEQ}`;
         }
         cursorShownForIme = false;
       }
     }
+    const currentChunk = args2[0];
+    if (options?.synchronizedOutput && typeof currentChunk === "string") {
+      args2[0] = wrapWithSynchronizedOutput(currentChunk);
+    }
     return writeToStdout(...args2);
   };
   const stdoutHandler = {
@@ -139734,18 +139780,32 @@ function createWorkingStdio() {
   const inkStderr = new Proxy(process.stderr, stderrHandler);
   return { stdout: inkStdout, stderr: inkStderr };
 }
-var originalStdoutWrite, originalStderrWrite, INK_CURSOR_POSITION_END_REGEX, SHOW_CURSOR_SEQ, HIDE_CURSOR_SEQ, EXIT_SYNCHRONIZED_OUTPUT_SEQ;
+var originalStdoutWrite, originalStderrWrite, INK_CURSOR_POSITION_END_REGEX, SHOW_CURSOR_SEQ, HIDE_CURSOR_SEQ, ENTER_SYNCHRONIZED_OUTPUT_SEQ, EXIT_SYNCHRONIZED_OUTPUT_SEQ, TMUX_ENTER_SYNCHRONIZED_OUTPUT_SEQ, TMUX_EXIT_SYNCHRONIZED_OUTPUT_SEQ, STANDALONE_MODE_SEQUENCES;
 var init_stdio = __esm({
   "packages/core/dist/src/utils/stdio.js"() {
     "use strict";
     init_events();
+    init_compatibility();
     originalStdoutWrite = process.stdout.write.bind(process.stdout);
     originalStderrWrite = process.stderr.write.bind(process.stderr);
     INK_CURSOR_POSITION_END_REGEX = // eslint-disable-next-line no-control-regex
-    /\x1b\[(?:\d+G|\d+;\d+H|D)(\x1b\[\?2026l)?$/;
+    /\x1b\[(?:\d+G|\d+;\d+H|D)(\x1b\[\?2026l|\x1bP=2s\x1b\\)?$/;
     SHOW_CURSOR_SEQ = "\x1B[?25h";
     HIDE_CURSOR_SEQ = "\x1B[?25l";
+    ENTER_SYNCHRONIZED_OUTPUT_SEQ = "\x1B[?2026h";
     EXIT_SYNCHRONIZED_OUTPUT_SEQ = "\x1B[?2026l";
+    TMUX_ENTER_SYNCHRONIZED_OUTPUT_SEQ = "\x1BP=1s\x1B\\";
+    TMUX_EXIT_SYNCHRONIZED_OUTPUT_SEQ = "\x1BP=2s\x1B\\";
+    STANDALONE_MODE_SEQUENCES = /* @__PURE__ */ new Set([
+      SHOW_CURSOR_SEQ,
+      HIDE_CURSOR_SEQ,
+      "\x1B[?7l",
+      "\x1B[?7h",
+      "\x1B[?1004h",
+      "\x1B[?1004l",
+      "\x1B[?1049h",
+      "\x1B[?1049l"
+    ]);
   }
 });
 
@@ -221368,8 +221428,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 = "204db94ae";
-    CLI_VERSION = "0.65.0-preview.0";
+    GIT_COMMIT_INFO = "debf42324";
+    CLI_VERSION = "0.66.0-nightly.20261016.gdebf42324";
   }
 });
 
@@ -228065,7 +228125,7 @@ var require_discovery = __commonJS({
     var util5 = __require("util");
     var apirequest_1 = require_apirequest();
     var endpoint_1 = require_endpoint();
-    var readFile12 = util5.promisify(fs90.readFile);
+    var readFile11 = util5.promisify(fs90.readFile);
     var Discovery = class {
       /**
        * Discovery for discovering API endpoints
@@ -228152,7 +228212,7 @@ var require_discovery = __commonJS({
           const parts2 = resolve23.parse(apiDiscoveryUrl);
           if (apiDiscoveryUrl && !parts2.protocol) {
             this.log("Reading from file " + apiDiscoveryUrl);
-            const file = await readFile12(apiDiscoveryUrl, { encoding: "utf8" });
+            const file = await readFile11(apiDiscoveryUrl, { encoding: "utf8" });
             return this.makeEndpoint(JSON.parse(file));
           } else {
             this.log("Requesting " + apiDiscoveryUrl);
@@ -249128,7 +249188,7 @@ var require_metadata5 = __commonJS({
     var gcpMetadata = require_src4();
     var google_auth_library_1 = require_src6();
     var util_1 = __require("util");
-    var readFile12 = (0, util_1.promisify)(fs90.readFile);
+    var readFile11 = (0, util_1.promisify)(fs90.readFile);
     function zoneFromQualifiedZone(qualified) {
       return qualified.split("/").pop();
     }
@@ -249197,7 +249257,7 @@ var require_metadata5 = __commonJS({
       const location = zoneFromQualifiedZone(qualifiedZone);
       let namespace = "";
       try {
-        namespace = await readFile12(exports2.KUBERNETES_NAMESPACE_ID_PATH, "utf8");
+        namespace = await readFile11(exports2.KUBERNETES_NAMESPACE_ID_PATH, "utf8");
       } catch (err2) {
       }
       return {
@@ -297242,6 +297302,31 @@ function getDiffCommand(oldPath, newPath, editor) {
       return null;
   }
 }
+function quoteCmdArg(arg) {
+  if (/[\r\n\0]/.test(arg)) {
+    throw new Error("Invalid argument: newlines are not allowed");
+  }
+  if (arg.includes('"')) {
+    throw new Error("Invalid argument: double quotes are not allowed on Windows");
+  }
+  if (!arg) {
+    return '""';
+  }
+  if (/^[a-zA-Z0-9\-_.:/\\]+$/.test(arg)) {
+    return arg;
+  }
+  let result2 = '"' + arg;
+  let backslashCount = 0;
+  for (let i3 = arg.length - 1; i3 >= 0; i3--) {
+    if (arg[i3] === "\\") {
+      backslashCount++;
+    } else {
+      break;
+    }
+  }
+  result2 += "\\".repeat(backslashCount) + '"';
+  return result2;
+}
 async function openDiff(oldPath, newPath, editor) {
   if (isHeadlessMode()) {
     debugLogger.warn("External editor spawning is disabled in headless/server mode.");
@@ -297272,10 +297357,19 @@ async function openDiff(oldPath, newPath, editor) {
     return;
   }
   return new Promise((resolve23, reject) => {
-    const childProcess2 = spawn2(diffCommand.command, diffCommand.args, {
-      stdio: "inherit",
-      shell: process.platform === "win32"
-    });
+    const isWindows2 = process.platform === "win32";
+    let childProcess2;
+    try {
+      const spawnArgs = isWindows2 ? diffCommand.args.map(quoteCmdArg) : diffCommand.args;
+      childProcess2 = spawn2(diffCommand.command, spawnArgs, {
+        stdio: "inherit",
+        shell: isWindows2
+      });
+    } catch (error2) {
+      coreEvents.emit(CoreEvent.ExternalEditorClosed);
+      reject(error2);
+      return;
+    }
     let isSettled = false;
     childProcess2.on("close", (code) => {
       if (isSettled)
@@ -337673,7 +337767,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.65.0-preview.0";
+    return "0.66.0-nightly.20261016.gdebf42324";
   })();
   return versionPromise;
 }
@@ -345467,9 +345561,33 @@ function getSafeGitEnv(baseEnv = process.env) {
       cleanedEnv[key] = value;
     }
   }
+  let baseSshCommand = cleanedEnv["GIT_SSH_COMMAND"];
+  if (!baseSshCommand && cleanedEnv["GIT_SSH"]) {
+    const gitSsh = cleanedEnv["GIT_SSH"];
+    baseSshCommand = gitSsh.includes(" ") && !gitSsh.startsWith('"') && !gitSsh.startsWith("'") ? '"' + gitSsh + '"' : gitSsh;
+  }
+  if (!baseSshCommand) {
+    baseSshCommand = "ssh";
+  }
+  const execMatch = baseSshCommand.match(/^\s*(?:"([^"]+)"|'([^']+)'|(\S+))/);
+  const executable = execMatch ? execMatch[1] || execMatch[2] || execMatch[3] || "" : "";
+  const execName = executable.split(/[/\\]/).pop() || "";
+  const isPlink = /^(?:tortoise)?plink(?:\.exe)?$/i.test(execName);
+  const batchFlag = isPlink ? "-batch" : "-o BatchMode=yes";
+  const hasBatchFlag = isPlink ? /(?:^|\s)-batch(?:\s|$)/.test(baseSshCommand) : /\bbatchmode\s*=\s*yes\b/i.test(baseSshCommand) && !/\bbatchmode\s*=\s*no\b/i.test(baseSshCommand);
+  let gitSshCommand = baseSshCommand;
+  if (!hasBatchFlag && execMatch) {
+    const execLength = execMatch[0].length;
+    gitSshCommand = baseSshCommand.slice(0, execLength) + " " + batchFlag + baseSshCommand.slice(execLength);
+  }
   return {
     ...cleanedEnv,
     GIT_TERMINAL_PROMPT: "0",
+    GIT_ASKPASS: "",
+    SSH_ASKPASS: "",
+    GIT_SSH_COMMAND: gitSshCommand,
+    GH_PROMPT_DISABLED: "1",
+    GCM_INTERACTIVE: "never",
     GIT_CONFIG_GLOBAL: devNullPath,
     GIT_CONFIG_SYSTEM: devNullPath,
     GIT_CONFIG_NOSYSTEM: "1",
@@ -375740,30 +375858,44 @@ function parseFrontmatter(content) {
   }
   return parseSimpleFrontmatter(content);
 }
+function stripOuterQuotes(value) {
+  if (value.length >= 2 && (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'"))) {
+    return value.slice(1, -1);
+  }
+  return value;
+}
 function parseSimpleFrontmatter(content) {
   const lines = content.split(/\r?\n/);
   let name3;
   let description;
   for (let i3 = 0; i3 < lines.length; i3++) {
     const line = lines[i3];
-    const nameMatch = line.match(/^\s*name:\s*(.*)$/);
-    if (nameMatch) {
-      name3 = nameMatch[1].trim();
+    const namePrefixMatch = line.match(/^[ \t]*name[ \t]*:/i);
+    if (namePrefixMatch) {
+      name3 = stripOuterQuotes(line.slice(namePrefixMatch[0].length).trim());
       continue;
     }
-    const descMatch = line.match(/^\s*description:\s*(.*)$/);
-    if (descMatch) {
-      const descLines = [descMatch[1].trim()];
+    const descPrefixMatch = line.match(/^([ \t]*)description[ \t]*:/i);
+    if (descPrefixMatch) {
+      const descIndent = descPrefixMatch[1].length;
+      const firstLine = line.slice(descPrefixMatch[0].length).trim();
+      const descLines = /^[>|][-+]?$/.test(firstLine) ? [] : [firstLine];
       while (i3 + 1 < lines.length) {
         const nextLine = lines[i3 + 1];
-        if (nextLine.match(/^[ \t]+\S/)) {
+        const nextIndentMatch = nextLine.match(/^[ \t]*/);
+        const nextIndent = nextIndentMatch ? nextIndentMatch[0].length : 0;
+        const isNonEmpty = nextIndent < nextLine.length;
+        const isKnownKey = /^[ \t]*(?:name|description)[ \t]*:/i.test(nextLine);
+        const isComment2 = /^[ \t]*#/.test(nextLine);
+        const isOtherKeyAtOrAboveDescIndent = nextIndent <= descIndent && /^[ \t]*[a-zA-Z0-9_-]+[ \t]*:/.test(nextLine);
+        if (isNonEmpty && !isKnownKey && !isComment2 && !isOtherKeyAtOrAboveDescIndent) {
           descLines.push(nextLine.trim());
           i3++;
         } else {
           break;
         }
       }
-      description = descLines.filter(Boolean).join(" ");
+      description = stripOuterQuotes(descLines.filter(Boolean).join(" "));
       continue;
     }
   }
@@ -375806,7 +375938,7 @@ async function loadSkillsFromDir(dir) {
 }
 async function loadSkillFromFile(filePath) {
   try {
-    const content = await fs58.readFile(filePath, "utf-8");
+    const content = await readFileWithEncoding(filePath);
     const match2 = content.match(FRONTMATTER_REGEX);
     if (!match2) {
       return null;
@@ -375835,7 +375967,8 @@ var init_skillLoader = __esm({
     init_js_yaml();
     init_debugLogger();
     init_events();
-    FRONTMATTER_REGEX = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n([\s\S]*))?/;
+    init_fileUtils();
+    FRONTMATTER_REGEX = /^\uFEFF?---[ \t]*\r?\n([\s\S]*?)\r?\n---[ \t]*(?:\r?\n([\s\S]*))?$/;
   }
 });
 
@@ -389422,6 +389555,20 @@ var init_tool_modifier = __esm({
 function isTaintRiskDetectable(invocation) {
   return typeof invocation === "object" && invocation !== null && "hasTaintedOrBuildFileRisk" in invocation && typeof invocation.hasTaintedOrBuildFileRisk === "function";
 }
+function getToolCallGroupIds(requests, isGroupable) {
+  const groupable = requests.map(isGroupable);
+  const groupIds = requests.map(() => void 0);
+  let runStart = 0;
+  for (let i3 = 0; i3 <= requests.length; i3++) {
+    if (i3 < requests.length && groupable[i3])
+      continue;
+    if (i3 - runStart >= 2) {
+      groupIds.fill(requests[runStart].callId, runStart, i3);
+    }
+    runStart = i3 + 1;
+  }
+  return groupIds;
+}
 var createErrorResponse, Scheduler;
 var init_scheduler = __esm({
   "packages/core/dist/src/scheduler/scheduler.js"() {
@@ -389613,11 +389760,13 @@ var init_scheduler = __esm({
         });
         try {
           const toolRegistry = this.context.toolRegistry;
-          const newCalls = sortedRequests.map((request) => {
+          const groupIds = getToolCallGroupIds(sortedRequests, (request) => toolRegistry.getTool(request.name)?.kind === Kind.Agent);
+          const newCalls = sortedRequests.map((request, index) => {
             const enrichedRequest = {
               ...request,
               schedulerId: this.schedulerId,
-              parentCallId: this.parentCallId
+              parentCallId: this.parentCallId,
+              groupId: groupIds[index]
             };
             const tool = toolRegistry.getTool(request.name);
             if (!tool) {
@@ -389890,7 +390039,8 @@ var init_scheduler = __esm({
             originalRequestArgs: result2.request.originalRequestArgs ?? result2.request.args,
             isClientInitiated: result2.request.isClientInitiated,
             prompt_id: result2.request.prompt_id,
-            schedulerId: this.schedulerId
+            schedulerId: this.schedulerId,
+            groupId: result2.request.groupId
           };
           if (!newTool) {
             const errorCall = this._createToolNotFoundErroredToolCall(newRequest, this.context.toolRegistry.getAllToolNames());
@@ -424087,18 +424237,6 @@ ${REFERENCE_CONTENT_END}`;
   }
 });
 
-// packages/core/dist/src/utils/compatibility.js
-var WarningPriority;
-var init_compatibility = __esm({
-  "packages/core/dist/src/utils/compatibility.js"() {
-    "use strict";
-    (function(WarningPriority2) {
-      WarningPriority2["Low"] = "low";
-      WarningPriority2["High"] = "high";
-    })(WarningPriority || (WarningPriority = {}));
-  }
-});
-
 // packages/core/dist/src/services/worktreeService.js
 var init_worktreeService = __esm({
   "packages/core/dist/src/services/worktreeService.js"() {