@google/gemini-cli-a2a-server 0.35.0-preview.1 → 0.35.0-preview.2

package/dist/a2a-server.mjs

@@ -49228,7 +49228,7 @@ var require_filesubjecttokensupplier = __commonJS({
     });
     var realpath3 = (0, util_1.promisify)((_b = fs70.realpath) !== null && _b !== void 0 ? _b : () => {
     });
-    var lstat4 = (0, util_1.promisify)((_c = fs70.lstat) !== null && _c !== void 0 ? _c : () => {
+    var lstat3 = (0, util_1.promisify)((_c = fs70.lstat) !== null && _c !== void 0 ? _c : () => {
     });
     var FileSubjectTokenSupplier = class {
       /**
@@ -49251,7 +49251,7 @@ var require_filesubjecttokensupplier = __commonJS({
         let parsedFilePath = this.filePath;
         try {
           parsedFilePath = await realpath3(parsedFilePath);
-          if (!(await lstat4(parsedFilePath)).isFile()) {
+          if (!(await lstat3(parsedFilePath)).isFile()) {
             throw new Error();
           }
         } catch (err2) {
@@ -72835,7 +72835,7 @@ var require_filesubjecttokensupplier2 = __commonJS({
     }));
     var realpath3 = (0, util_1.promisify)(fs70.realpath ?? (() => {
     }));
-    var lstat4 = (0, util_1.promisify)(fs70.lstat ?? (() => {
+    var lstat3 = (0, util_1.promisify)(fs70.lstat ?? (() => {
     }));
     var FileSubjectTokenSupplier = class {
       filePath;
@@ -72861,7 +72861,7 @@ var require_filesubjecttokensupplier2 = __commonJS({
         let parsedFilePath = this.filePath;
         try {
           parsedFilePath = await realpath3(parsedFilePath);
-          if (!(await lstat4(parsedFilePath)).isFile()) {
+          if (!(await lstat3(parsedFilePath)).isFile()) {
             throw new Error();
           }
         } catch (err2) {
@@ -198865,8 +198865,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 = "2f90b4653";
-    CLI_VERSION = "0.35.0-preview.1";
+    GIT_COMMIT_INFO = "dd950088c";
+    CLI_VERSION = "0.35.0-preview.2";
   }
 });
 
@@ -328390,7 +328390,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname3);
-    return "0.35.0-preview.1";
+    return "0.35.0-preview.2";
   })();
   return versionPromise;
 }
@@ -388341,10 +388341,8 @@ async function findProjectRoot2(startDir) {
   while (true) {
     const gitPath = path61.join(currentDir, ".git");
     try {
-      const stats = await fs49.lstat(gitPath);
-      if (stats.isDirectory()) {
-        return currentDir;
-      }
+      await fs49.access(gitPath);
+      return currentDir;
     } catch (error2) {
       const isENOENT = typeof error2 === "object" && error2 !== null && "code" in error2 && // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       error2.code === "ENOENT";
@@ -388352,9 +388350,9 @@ async function findProjectRoot2(startDir) {
       if (!isENOENT && !isTestEnv) {
         if (typeof error2 === "object" && error2 !== null && "code" in error2) {
           const fsError = error2;
-          logger6.warn(`Error checking for .git directory at ${gitPath}: ${fsError.message}`);
+          logger6.warn(`Error checking for .git at ${gitPath}: ${fsError.message}`);
         } else {
-          logger6.warn(`Non-standard error checking for .git directory at ${gitPath}: ${String(error2)}`);
+          logger6.warn(`Non-standard error checking for .git at ${gitPath}: ${String(error2)}`);
         }
       }
     }
@@ -388524,8 +388522,10 @@ async function getEnvironmentMemoryPaths(trustedRoots) {
   const allPaths = /* @__PURE__ */ new Set();
   const traversalPromises = trustedRoots.map(async (root) => {
     const resolvedRoot = normalizePath(root);
-    debugLogger.debug("[DEBUG] [MemoryDiscovery] Loading environment memory for trusted root:", resolvedRoot, "(Stopping exactly here)");
-    return findUpwardGeminiFiles(resolvedRoot, resolvedRoot);
+    const gitRoot = await findProjectRoot2(resolvedRoot);
+    const ceiling = gitRoot ? normalizePath(gitRoot) : resolvedRoot;
+    debugLogger.debug("[DEBUG] [MemoryDiscovery] Loading environment memory for trusted root:", resolvedRoot, "(Stopping at", gitRoot ? `git root: ${ceiling})` : `trusted root: ${ceiling} \u2014 no git root found)`);
+    return findUpwardGeminiFiles(resolvedRoot, ceiling);
   });
   const pathArrays = await Promise.all(traversalPromises);
   pathArrays.flat().forEach((p2) => allPaths.add(p2));
@@ -388644,7 +388644,9 @@ async function loadJitSubdirectoryMemory(targetPath, trustedRoots, alreadyLoaded
     debugLogger.debug("[DEBUG] [MemoryDiscovery] JIT memory skipped:", resolvedTarget, "is not in any trusted root.");
     return { files: [], fileIdentities: [] };
   }
-  debugLogger.debug("[DEBUG] [MemoryDiscovery] Loading JIT memory for", resolvedTarget, `(Trusted root: ${bestRoot})`);
+  const gitRoot = await findProjectRoot2(bestRoot);
+  const resolvedCeiling = gitRoot ? normalizePath(gitRoot) : bestRoot;
+  debugLogger.debug("[DEBUG] [MemoryDiscovery] Loading JIT memory for", resolvedTarget, `(Trusted root: ${bestRoot}, Ceiling: ${resolvedCeiling}${gitRoot ? " [git root]" : " [trusted root, no git]"})`);
   let startDir = resolvedTarget;
   try {
     const stat5 = await fs49.stat(resolvedTarget);
@@ -388654,7 +388656,7 @@ async function loadJitSubdirectoryMemory(targetPath, trustedRoots, alreadyLoaded
   } catch {
     startDir = normalizePath(path61.dirname(resolvedTarget));
   }
-  const potentialPaths = await findUpwardGeminiFiles(startDir, bestRoot);
+  const potentialPaths = await findUpwardGeminiFiles(startDir, resolvedCeiling);
   if (potentialPaths.length === 0) {
     return { files: [], fileIdentities: [] };
   }