@google/gemini-cli 0.35.0-preview.1 → 0.35.0-preview.3

package/bundle/{chunk-FIQWQZVG.js → chunk-QO53VEHI.js}

@@ -21271,7 +21271,7 @@ var require_filesubjecttokensupplier = __commonJS({
     }));
     var realpath2 = (0, util_1.promisify)(fs11.realpath ?? (() => {
     }));
-    var lstat3 = (0, util_1.promisify)(fs11.lstat ?? (() => {
+    var lstat2 = (0, util_1.promisify)(fs11.lstat ?? (() => {
     }));
     var FileSubjectTokenSupplier = class {
       filePath;
@@ -21297,7 +21297,7 @@ var require_filesubjecttokensupplier = __commonJS({
         let parsedFilePath = this.filePath;
         try {
           parsedFilePath = await realpath2(parsedFilePath);
-          if (!(await lstat3(parsedFilePath)).isFile()) {
+          if (!(await lstat2(parsedFilePath)).isFile()) {
             throw new Error();
           }
         } catch (err) {
@@ -51444,10 +51444,8 @@ async function findProjectRoot2(startDir) {
   while (true) {
     const gitPath = path9.join(currentDir, ".git");
     try {
-      const stats = await fs10.lstat(gitPath);
-      if (stats.isDirectory()) {
-        return currentDir;
-      }
+      await fs10.access(gitPath);
+      return currentDir;
     } catch (error) {
       const isENOENT = typeof error === "object" && error !== null && "code" in error && // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       error.code === "ENOENT";
@@ -51456,11 +51454,11 @@ async function findProjectRoot2(startDir) {
         if (typeof error === "object" && error !== null && "code" in error) {
           const fsError = error;
           logger3.warn(
-            `Error checking for .git directory at ${gitPath}: ${fsError.message}`
+            `Error checking for .git at ${gitPath}: ${fsError.message}`
           );
         } else {
           logger3.warn(
-            `Non-standard error checking for .git directory at ${gitPath}: ${String(error)}`
+            `Non-standard error checking for .git at ${gitPath}: ${String(error)}`
           );
         }
       }
@@ -51679,12 +51677,15 @@ async function getEnvironmentMemoryPaths(trustedRoots) {
   const allPaths = /* @__PURE__ */ new Set();
   const traversalPromises = trustedRoots.map(async (root) => {
     const resolvedRoot = normalizePath(root);
+    const gitRoot = await findProjectRoot2(resolvedRoot);
+    const ceiling = gitRoot ? normalizePath(gitRoot) : resolvedRoot;
     debugLogger.debug(
       "[DEBUG] [MemoryDiscovery] Loading environment memory for trusted root:",
       resolvedRoot,
-      "(Stopping exactly here)"
+      "(Stopping at",
+      gitRoot ? `git root: ${ceiling})` : `trusted root: ${ceiling} \u2014 no git root found)`
     );
-    return findUpwardGeminiFiles(resolvedRoot, resolvedRoot);
+    return findUpwardGeminiFiles(resolvedRoot, ceiling);
   });
   const pathArrays = await Promise.all(traversalPromises);
   pathArrays.flat().forEach((p) => allPaths.add(p));
@@ -51852,10 +51853,12 @@ async function loadJitSubdirectoryMemory(targetPath, trustedRoots, alreadyLoaded
     );
     return { files: [], fileIdentities: [] };
   }
+  const gitRoot = await findProjectRoot2(bestRoot);
+  const resolvedCeiling = gitRoot ? normalizePath(gitRoot) : bestRoot;
   debugLogger.debug(
     "[DEBUG] [MemoryDiscovery] Loading JIT memory for",
     resolvedTarget,
-    `(Trusted root: ${bestRoot})`
+    `(Trusted root: ${bestRoot}, Ceiling: ${resolvedCeiling}${gitRoot ? " [git root]" : " [trusted root, no git]"})`
   );
   let startDir = resolvedTarget;
   try {
@@ -51866,7 +51869,7 @@ async function loadJitSubdirectoryMemory(targetPath, trustedRoots, alreadyLoaded
   } catch {
     startDir = normalizePath(path9.dirname(resolvedTarget));
   }
-  const potentialPaths = await findUpwardGeminiFiles(startDir, bestRoot);
+  const potentialPaths = await findUpwardGeminiFiles(startDir, resolvedCeiling);
   if (potentialPaths.length === 0) {
     return { files: [], fileIdentities: [] };
   }

package/bundle/{chunk-DHZSW3D5.js → chunk-UMBTJI7I.js}

@@ -150,7 +150,7 @@ import {
   tokenLimit,
   uiTelemetryService,
   yellowBright
-} from "./chunk-FKGF3664.js";
+} from "./chunk-GGMTXEJO.js";
 import {
   require_undici
 } from "./chunk-37ZTTFQF.js";
@@ -181,7 +181,7 @@ import {
   shortenPath,
   tildeifyPath,
   unescapePath
-} from "./chunk-FIQWQZVG.js";
+} from "./chunk-QO53VEHI.js";
 import {
   __commonJS,
   __export,
@@ -82763,7 +82763,7 @@ var authCommand = {
 import process29 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "2f90b4653";
+var GIT_COMMIT_INFO = "d1de82c46";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises2 from "node:fs/promises";
@@ -88096,7 +88096,7 @@ Use /mcp auth <server-name> to authenticate.`
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./core-YBLRHI5E.js");
+      const { MCPOAuthProvider } = await import("./core-LTXVJI4H.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };