@google/gemini-cli 0.65.0-preview.0 → 0.66.0-nightly.20261017.ged96faedf

package/bundle/{chunk-43EXRO7A.js → chunk-NU74STQ5.js}

@@ -31,7 +31,7 @@ import {
   partListUnionToString,
   require_strip_json_comments,
   sanitizeFilenamePart
-} from "./chunk-TP236FKO.js";
+} from "./chunk-QCWGLPCO.js";
 import {
   __commonJS,
   __require,
@@ -16386,6 +16386,18 @@ var LoadedSettings = class {
       return;
     }
     this.isTrusted = isTrusted;
+    if (isTrusted && Object.keys(this._workspaceFile.settings).length === 0 && Object.keys(this._workspaceFile.originalSettings).length > 0) {
+      const resolvedWorkspaceSettings = resolveSettings(
+        this._workspaceFile.originalSettings,
+        this._workspaceFile.path,
+        this.errors
+      );
+      normalizeLegacyTheme(resolvedWorkspaceSettings);
+      this._workspaceFile = {
+        ...this._workspaceFile,
+        settings: resolvedWorkspaceSettings
+      };
+    }
     this.workspace = isTrusted ? this._workspaceFile : this.createEmptyWorkspace(this._workspaceFile);
     this._merged = this.computeMergedSettings();
     coreEvents.emitSettingsChanged();
@@ -16400,12 +16412,12 @@ var LoadedSettings = class {
   }
   computeMergedSettings(forceTrusted = false) {
     const isTrusted = forceTrusted || this.isTrusted;
-    const workspace = forceTrusted ? this._workspaceFile : this.workspace;
+    const workspaceSettings = forceTrusted ? Object.keys(this._workspaceFile.settings).length > 0 ? this._workspaceFile.settings : this._workspaceFile.originalSettings : this.workspace.settings;
     const merged = mergeSettings(
       this.system.settings,
       this.systemDefaults.settings,
       this.user.settings,
-      workspace.settings,
+      workspaceSettings,
       isTrusted
     );
     const adminSettingSchema = getSettingsSchema().admin;
@@ -16672,6 +16684,75 @@ function loadSettings(workspaceDir = process2.cwd()) {
     () => _doLoadSettings(normalizedWorkspaceDir)
   );
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function getParentRecord(root, objectPath) {
+  let current = root;
+  for (let i = 0; i < objectPath.length - 1; i++) {
+    if (!isRecord(current)) {
+      return void 0;
+    }
+    current = current[objectPath[i]];
+  }
+  return isRecord(current) ? current : void 0;
+}
+function coerceValidSettings(expandedSettings, issues) {
+  const clone2 = structuredClone(expandedSettings);
+  const pathsToRestore = [];
+  for (const issue of issues) {
+    const firstNumberIdx = issue.path.findIndex((p) => typeof p === "number");
+    const objectPath = (firstNumberIdx === -1 ? issue.path : issue.path.slice(0, firstNumberIdx)).filter((p) => typeof p === "string");
+    if (objectPath.length === 0) {
+      return expandedSettings;
+    }
+    const lastKey = objectPath[objectPath.length - 1];
+    const container = getParentRecord(clone2, objectPath);
+    if (container && Object.hasOwn(container, lastKey)) {
+      delete container[lastKey];
+      pathsToRestore.push(objectPath);
+    }
+  }
+  const partialValidation = validateSettings(clone2);
+  if (!partialValidation.success || !partialValidation.data) {
+    return expandedSettings;
+  }
+  const coerced = partialValidation.data;
+  for (const objectPath of pathsToRestore) {
+    const lastKey = objectPath[objectPath.length - 1];
+    const sourceContainer = getParentRecord(expandedSettings, objectPath);
+    const targetContainer = getParentRecord(coerced, objectPath);
+    if (sourceContainer && targetContainer && Object.hasOwn(sourceContainer, lastKey)) {
+      targetContainer[lastKey] = sourceContainer[lastKey];
+    }
+  }
+  return coerced;
+}
+function normalizeLegacyTheme(settings) {
+  if (settings.ui?.theme === "VS") {
+    settings.ui.theme = DefaultLight.name;
+  } else if (settings.ui?.theme === "VS2015") {
+    settings.ui.theme = DefaultDark.name;
+  }
+}
+function resolveSettings(rawSettings, filePath, settingsErrors) {
+  if (Object.keys(rawSettings).length === 0) {
+    return {};
+  }
+  const expandedSettings = resolveEnvVarsInObject(rawSettings);
+  const validationResult = validateSettings(expandedSettings);
+  if (!validationResult.success && validationResult.error) {
+    if (settingsErrors) {
+      settingsErrors.push({
+        message: formatValidationError(validationResult.error, filePath),
+        path: filePath,
+        severity: "warning"
+      });
+    }
+    return coerceValidSettings(expandedSettings, validationResult.error.issues);
+  }
+  return validationResult.data ?? expandedSettings;
+}
 function _doLoadSettings(workspaceDir) {
   let systemSettings = {};
   let systemDefaultSettings = {};
@@ -16693,37 +16774,9 @@ function _doLoadSettings(workspaceDir) {
             path: filePath,
             severity: "error"
           });
-          return { settings: {}, rawSettings: {} };
-        }
-        const settingsObject = rawSettings;
-        const expandedSettings = resolveEnvVarsInObject(
-          settingsObject
-        );
-        const validationResult = validateSettings(expandedSettings);
-        if (!validationResult.success && validationResult.error) {
-          const errorMessage = formatValidationError(
-            validationResult.error,
-            filePath
-          );
-          settingsErrors.push({
-            message: errorMessage,
-            path: filePath,
-            severity: "warning"
-          });
-          return {
-            settings: expandedSettings,
-            rawSettings: settingsObject,
-            rawJson: content
-          };
+          return { rawSettings: {} };
         }
-        return {
-          // Since we've successfully validated expandedSettings against settingsZodSchema,
-          // it's safe to cast the resulting data to the Settings type.
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-          settings: validationResult.data ?? expandedSettings,
-          rawSettings: settingsObject,
-          rawJson: content
-        };
+        return { rawSettings, rawJson: content };
       }
     } catch (error) {
       settingsErrors.push({
@@ -16732,12 +16785,12 @@ function _doLoadSettings(workspaceDir) {
         severity: "error"
       });
     }
-    return { settings: {}, rawSettings: {} };
+    return { rawSettings: {} };
   };
   const securityCache = createPathSecurityCache();
   const loadSystemFile = (filePath, fileLabel) => {
     if (!fs4.existsSync(filePath)) {
-      return { settings: {}, rawSettings: {} };
+      return { rawSettings: {} };
     }
     const check = isFileAndDirectorySecureSync(filePath, securityCache);
     if (!check.secure) {
@@ -16746,7 +16799,7 @@ function _doLoadSettings(workspaceDir) {
         path: filePath,
         severity: "warning"
       });
-      return { settings: {}, rawSettings: {} };
+      return { rawSettings: {} };
     }
     return load(filePath);
   };
@@ -16756,26 +16809,10 @@ function _doLoadSettings(workspaceDir) {
     "system defaults"
   );
   const userResult = load(USER_SETTINGS_PATH);
-  let workspaceResult = {
-    settings: {},
-    rawSettings: {},
-    rawJson: void 0
-  };
+  let workspaceResult = { rawSettings: {} };
   if (!storage.isWorkspaceHomeDir()) {
     workspaceResult = load(workspaceSettingsPath);
   }
-  const systemOriginalSettings = structuredClone(systemResult.rawSettings);
-  const systemDefaultsOriginalSettings = structuredClone(
-    systemDefaultsResult.rawSettings
-  );
-  const userOriginalSettings = structuredClone(userResult.rawSettings);
-  const workspaceOriginalSettings = structuredClone(
-    workspaceResult.rawSettings
-  );
-  systemSettings = systemResult.settings;
-  systemDefaultSettings = systemDefaultsResult.settings;
-  userSettings = userResult.settings;
-  workspaceSettings = workspaceResult.settings;
   const envAuthOverride = process2.env["GEMINI_CLI_AUTH_OVERRIDE"];
   if (envAuthOverride) {
     delete process2.env["GEMINI_CLI_AUTH_OVERRIDE"];
@@ -16786,31 +16823,34 @@ function _doLoadSettings(workspaceDir) {
     envAuthOverride
   ) : void 0;
   if (authOverride) {
-    if (!userSettings.security) {
-      userSettings.security = {};
-    }
-    if (!userSettings.security.auth) {
-      userSettings.security.auth = {};
-    }
-    userSettings.security.auth.selectedType = authOverride;
-    if (!userOriginalSettings.security) {
-      userOriginalSettings.security = {};
-    }
-    if (!userOriginalSettings.security.auth) {
-      userOriginalSettings.security.auth = {};
-    }
-    userOriginalSettings.security.auth.selectedType = authOverride;
-  }
-  if (userSettings.ui?.theme === "VS") {
-    userSettings.ui.theme = DefaultLight.name;
-  } else if (userSettings.ui?.theme === "VS2015") {
-    userSettings.ui.theme = DefaultDark.name;
-  }
-  if (workspaceSettings.ui?.theme === "VS") {
-    workspaceSettings.ui.theme = DefaultLight.name;
-  } else if (workspaceSettings.ui?.theme === "VS2015") {
-    workspaceSettings.ui.theme = DefaultDark.name;
+    userResult.rawSettings = {
+      ...userResult.rawSettings,
+      security: {
+        ...userResult.rawSettings?.security,
+        auth: {
+          ...userResult.rawSettings?.security?.auth,
+          selectedType: authOverride
+        }
+      }
+    };
   }
+  const systemOriginalSettings = structuredClone(systemResult.rawSettings);
+  const systemDefaultsOriginalSettings = structuredClone(
+    systemDefaultsResult.rawSettings
+  );
+  const userOriginalSettings = structuredClone(userResult.rawSettings);
+  const workspaceOriginalSettings = structuredClone(
+    workspaceResult.rawSettings
+  );
+  systemSettings = resolveSettings(
+    systemResult.rawSettings,
+    systemSettingsPath
+  );
+  systemDefaultSettings = resolveSettings(
+    systemDefaultsResult.rawSettings,
+    systemDefaultsPath
+  );
+  userSettings = resolveSettings(userResult.rawSettings, USER_SETTINGS_PATH);
   const initialTrustCheckSettings = customDeepMerge(
     getMergeStrategyForPath,
     getDefaultsFromSchema(),
@@ -16819,6 +16859,12 @@ function _doLoadSettings(workspaceDir) {
     systemSettings
   );
   const isTrusted = isWorkspaceTrusted(initialTrustCheckSettings, workspaceDir)?.isTrusted ?? false;
+  if (isTrusted) {
+    workspaceSettings = resolveSettings(
+      workspaceResult.rawSettings,
+      workspaceSettingsPath
+    );
+  }
   const tempMergedSettings = mergeSettings(
     systemSettings,
     systemDefaultSettings,
@@ -16827,6 +16873,28 @@ function _doLoadSettings(workspaceDir) {
     isTrusted
   );
   loadEnvironment(tempMergedSettings, workspaceDir);
+  systemSettings = resolveSettings(
+    systemResult.rawSettings,
+    systemSettingsPath,
+    settingsErrors
+  );
+  systemDefaultSettings = resolveSettings(
+    systemDefaultsResult.rawSettings,
+    systemDefaultsPath,
+    settingsErrors
+  );
+  userSettings = resolveSettings(
+    userResult.rawSettings,
+    USER_SETTINGS_PATH,
+    settingsErrors
+  );
+  workspaceSettings = isTrusted ? resolveSettings(
+    workspaceResult.rawSettings,
+    workspaceSettingsPath,
+    settingsErrors
+  ) : {};
+  normalizeLegacyTheme(userSettings);
+  normalizeLegacyTheme(workspaceSettings);
   const fatalErrors = settingsErrors.filter((e) => e.severity === "error");
   if (fatalErrors.length > 0) {
     const errorMessages = fatalErrors.map(