@google/gemini-cli 0.0.777 → 0.0.899

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@google/gemini-cli",
-    "version": "0.0.777",
+    "version": "0.0.899",
     "description": "Gemini CLI",
     "repository": {
         "type": "git",
@@ -22,14 +22,10 @@
         "typecheck": "tsc --noEmit"
     },
     "files": [
-        "dist",
-        "npm-shrinkwrap.json"
-    ],
-    "bundleDependencies": [
-        "@google/gemini-cli-core"
+        "dist"
     ],
     "config": {
-        "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.0.777"
+        "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.0.899"
     },
     "dependencies": {
         "@google/gemini-cli-core": "file:../core",

package/dist/src/commands/extensions/disable.d.ts

@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type CommandModule } from 'yargs';
-import { SettingScope } from '../../config/settings.js';
 interface DisableArgs {
     name: string;
-    scope: SettingScope;
+    scope?: string;
 }
 export declare function handleDisable(args: DisableArgs): void;
 export declare const disableCommand: CommandModule;

package/dist/src/commands/extensions/disable.js

@@ -9,7 +9,12 @@ import { SettingScope } from '../../config/settings.js';
 import { getErrorMessage } from '../../utils/errors.js';
 export function handleDisable(args) {
     try {
-        disableExtension(args.name, args.scope);
+        if (args.scope?.toLowerCase() === 'workspace') {
+            disableExtension(args.name, SettingScope.Workspace);
+        }
+        else {
+            disableExtension(args.name, SettingScope.User);
+        }
         console.log(`Extension "${args.name}" successfully disabled for scope "${args.scope}".`);
     }
     catch (error) {
@@ -29,9 +34,18 @@ export const disableCommand = {
         describe: 'The scope to disable the extenison in.',
         type: 'string',
         default: SettingScope.User,
-        choices: [SettingScope.User, SettingScope.Workspace],
     })
-        .check((_argv) => true),
+        .check((argv) => {
+        if (argv.scope &&
+            !Object.values(SettingScope)
+                .map((s) => s.toLowerCase())
+                .includes(argv.scope.toLowerCase())) {
+            throw new Error(`Invalid scope: ${argv.scope}. Please use one of ${Object.values(SettingScope)
+                .map((s) => s.toLowerCase())
+                .join(', ')}.`);
+        }
+        return true;
+    }),
     handler: (argv) => {
         handleDisable({
             name: argv['name'],

package/dist/src/commands/extensions/disable.js.map

@@ -1 +1 @@
-{"version":3,"file":"disable.js","sourceRoot":"","sources":["../../../../src/commands/extensions/disable.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAsB,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAOxD,MAAM,UAAU,aAAa,CAAC,IAAiB;IAC7C,IAAI,CAAC;QACH,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,sCAAsC,IAAI,CAAC,KAAK,IAAI,CAC5E,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAkB;IAC3C,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE,wBAAwB;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,uCAAuC;QACjD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,QAAQ,EAAE,wCAAwC;QAClD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,YAAY,CAAC,IAAI;QAC1B,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC;KACrD,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC;IAC3B,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QAChB,aAAa,CAAC;YACZ,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;YAC5B,KAAK,EAAE,IAAI,CAAC,OAAO,CAAiB;SACrC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
+{"version":3,"file":"disable.js","sourceRoot":"","sources":["../../../../src/commands/extensions/disable.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAsB,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAOxD,MAAM,UAAU,aAAa,CAAC,IAAiB;IAC7C,IAAI,CAAC;QACH,IAAI,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,WAAW,EAAE,CAAC;YAC9C,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;QACtD,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,sCAAsC,IAAI,CAAC,KAAK,IAAI,CAC5E,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAkB;IAC3C,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE,wBAAwB;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,uCAAuC;QACjD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,QAAQ,EAAE,wCAAwC;QAClD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,YAAY,CAAC,IAAI;KAC3B,CAAC;SACD,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;QACd,IACE,IAAI,CAAC,KAAK;YACV,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;iBACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC3B,QAAQ,CAAE,IAAI,CAAC,KAAgB,CAAC,WAAW,EAAE,CAAC,EACjD,CAAC;YACD,MAAM,IAAI,KAAK,CACb,kBAAkB,IAAI,CAAC,KAAK,uBAAuB,MAAM,CAAC,MAAM,CAC9D,YAAY,CACb;iBACE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,CACjB,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IACN,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QAChB,aAAa,CAAC;YACZ,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;YAC5B,KAAK,EAAE,IAAI,CAAC,OAAO,CAAW;SAC/B,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}

package/dist/src/commands/extensions/enable.d.ts

@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type CommandModule } from 'yargs';
-import { SettingScope } from '../../config/settings.js';
 interface EnableArgs {
     name: string;
-    scope?: SettingScope;
+    scope?: string;
 }
 export declare function handleEnable(args: EnableArgs): void;
 export declare const enableCommand: CommandModule;

package/dist/src/commands/extensions/enable.js

@@ -9,8 +9,12 @@ import { enableExtension } from '../../config/extension.js';
 import { SettingScope } from '../../config/settings.js';
 export function handleEnable(args) {
     try {
-        const scope = args.scope ? args.scope : SettingScope.User;
-        enableExtension(args.name, scope);
+        if (args.scope?.toLowerCase() === 'workspace') {
+            enableExtension(args.name, SettingScope.Workspace);
+        }
+        else {
+            enableExtension(args.name, SettingScope.User);
+        }
         if (args.scope) {
             console.log(`Extension "${args.name}" successfully enabled for scope "${args.scope}".`);
         }
@@ -33,9 +37,18 @@ export const enableCommand = {
         .option('scope', {
         describe: 'The scope to enable the extenison in. If not set, will be enabled in all scopes.',
         type: 'string',
-        choices: [SettingScope.User, SettingScope.Workspace],
     })
-        .check((_argv) => true),
+        .check((argv) => {
+        if (argv.scope &&
+            !Object.values(SettingScope)
+                .map((s) => s.toLowerCase())
+                .includes(argv.scope.toLowerCase())) {
+            throw new Error(`Invalid scope: ${argv.scope}. Please use one of ${Object.values(SettingScope)
+                .map((s) => s.toLowerCase())
+                .join(', ')}.`);
+        }
+        return true;
+    }),
     handler: (argv) => {
         handleEnable({
             name: argv['name'],

package/dist/src/commands/extensions/enable.js.map

@@ -1 +1 @@
-{"version":3,"file":"enable.js","sourceRoot":"","sources":["../../../../src/commands/extensions/enable.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAsB,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAOxD,MAAM,UAAU,YAAY,CAAC,IAAgB;IAC3C,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC;QAC1D,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAClC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,qCAAqC,IAAI,CAAC,KAAK,IAAI,CAC3E,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,uCAAuC,CAC/D,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,gBAAgB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAkB;IAC1C,OAAO,EAAE,yBAAyB;IAClC,QAAQ,EAAE,uBAAuB;IACjC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,sCAAsC;QAChD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,QAAQ,EACN,kFAAkF;QACpF,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC;KACrD,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC;IAC3B,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QAChB,YAAY,CAAC;YACX,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;YAC5B,KAAK,EAAE,IAAI,CAAC,OAAO,CAAiB;SACrC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
+{"version":3,"file":"enable.js","sourceRoot":"","sources":["../../../../src/commands/extensions/enable.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAsB,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAOxD,MAAM,UAAU,YAAY,CAAC,IAAgB;IAC3C,IAAI,CAAC;QACH,IAAI,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,WAAW,EAAE,CAAC;YAC9C,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,qCAAqC,IAAI,CAAC,KAAK,IAAI,CAC3E,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,uCAAuC,CAC/D,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,gBAAgB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAkB;IAC1C,OAAO,EAAE,yBAAyB;IAClC,QAAQ,EAAE,uBAAuB;IACjC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,sCAAsC;QAChD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,QAAQ,EACN,kFAAkF;QACpF,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;QACd,IACE,IAAI,CAAC,KAAK;YACV,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;iBACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC3B,QAAQ,CAAE,IAAI,CAAC,KAAgB,CAAC,WAAW,EAAE,CAAC,EACjD,CAAC;YACD,MAAM,IAAI,KAAK,CACb,kBAAkB,IAAI,CAAC,KAAK,uBAAuB,MAAM,CAAC,MAAM,CAC9D,YAAY,CACb;iBACE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,CACjB,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IACN,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QAChB,YAAY,CAAC;YACX,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;YAC5B,KAAK,EAAE,IAAI,CAAC,OAAO,CAAW;SAC/B,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}

package/dist/src/config/extensions/extensionEnablement.d.ts

@@ -9,6 +9,20 @@ export interface ExtensionEnablementConfig {
 export interface AllExtensionsEnablementConfig {
     [extensionName: string]: ExtensionEnablementConfig;
 }
+export declare class Override {
+    baseRule: string;
+    isDisable: boolean;
+    includeSubdirs: boolean;
+    constructor(baseRule: string, isDisable: boolean, includeSubdirs: boolean);
+    static fromInput(inputRule: string, includeSubdirs: boolean): Override;
+    static fromFileRule(fileRule: string): Override;
+    conflictsWith(other: Override): boolean;
+    isEqualTo(other: Override): boolean;
+    asRegex(): RegExp;
+    isChildOf(parent: Override): boolean;
+    output(): string;
+    matchesPath(path: string): boolean;
+}
 /**
  * Determines if an extension is enabled based on the configuration and current path.
  * The last matching rule in the overrides list wins.

package/dist/src/config/extensions/extensionEnablement.js

@@ -5,6 +5,69 @@
  */
 import fs from 'node:fs';
 import path from 'node:path';
+export class Override {
+    baseRule;
+    isDisable;
+    includeSubdirs;
+    constructor(baseRule, isDisable, includeSubdirs) {
+        this.baseRule = baseRule;
+        this.isDisable = isDisable;
+        this.includeSubdirs = includeSubdirs;
+    }
+    static fromInput(inputRule, includeSubdirs) {
+        const isDisable = inputRule.startsWith('!');
+        let baseRule = isDisable ? inputRule.substring(1) : inputRule;
+        baseRule = ensureLeadingAndTrailingSlash(baseRule);
+        return new Override(baseRule, isDisable, includeSubdirs);
+    }
+    static fromFileRule(fileRule) {
+        const isDisable = fileRule.startsWith('!');
+        let baseRule = isDisable ? fileRule.substring(1) : fileRule;
+        const includeSubdirs = baseRule.endsWith('*');
+        baseRule = includeSubdirs
+            ? baseRule.substring(0, baseRule.length - 1)
+            : baseRule;
+        return new Override(baseRule, isDisable, includeSubdirs);
+    }
+    conflictsWith(other) {
+        if (this.baseRule === other.baseRule) {
+            return (this.includeSubdirs !== other.includeSubdirs ||
+                this.isDisable !== other.isDisable);
+        }
+        return false;
+    }
+    isEqualTo(other) {
+        return (this.baseRule === other.baseRule &&
+            this.includeSubdirs === other.includeSubdirs &&
+            this.isDisable === other.isDisable);
+    }
+    asRegex() {
+        return globToRegex(`${this.baseRule}${this.includeSubdirs ? '*' : ''}`);
+    }
+    isChildOf(parent) {
+        if (!parent.includeSubdirs) {
+            return false;
+        }
+        return parent.asRegex().test(this.baseRule);
+    }
+    output() {
+        return `${this.isDisable ? '!' : ''}${this.baseRule}${this.includeSubdirs ? '*' : ''}`;
+    }
+    matchesPath(path) {
+        return this.asRegex().test(path);
+    }
+}
+const ensureLeadingAndTrailingSlash = function (dirPath) {
+    // Normalize separators to forward slashes for consistent matching across platforms.
+    let result = dirPath.replace(/\\/g, '/');
+    if (result.charAt(0) !== '/') {
+        result = '/' + result;
+    }
+    if (result.charAt(result.length - 1) !== '/') {
+        result = result + '/';
+    }
+    return result;
+};
 /**
  * Converts a glob pattern to a RegExp object.
  * This is a simplified implementation that supports `*`.
@@ -15,7 +78,7 @@ import path from 'node:path';
 function globToRegex(glob) {
     const regexString = glob
         .replace(/[.+?^${}()|[\]\\]/g, '\\$&') // Escape special regex characters
-        .replace(/\*/g, '.*'); // Convert * to .*
+        .replace(/(\/?)\*/g, '($1.*)?'); // Convert * to optional group
     return new RegExp(`^${regexString}$`);
 }
 /**
@@ -38,12 +101,11 @@ export class ExtensionEnablementManager {
         const extensionConfig = config[extensionName];
         // Extensions are enabled by default.
         let enabled = true;
-        for (const rule of extensionConfig?.overrides ?? []) {
-            const isDisableRule = rule.startsWith('!');
-            const globPattern = isDisableRule ? rule.substring(1) : rule;
-            const regex = globToRegex(globPattern);
-            if (regex.test(currentPath)) {
-                enabled = !isDisableRule;
+        const allOverrides = extensionConfig?.overrides ?? [];
+        for (const rule of allOverrides) {
+            const override = Override.fromFileRule(rule);
+            if (override.matchesPath(ensureLeadingAndTrailingSlash(currentPath))) {
+                enabled = !override.isDisable;
             }
         }
         return enabled;
@@ -72,35 +134,21 @@ export class ExtensionEnablementManager {
         if (!config[extensionName]) {
             config[extensionName] = { overrides: [] };
         }
-        const pathWithGlob = `${scopePath}*`;
-        const pathWithoutGlob = scopePath;
-        const newPath = includeSubdirs ? pathWithGlob : pathWithoutGlob;
-        const conflictingPath = includeSubdirs ? pathWithoutGlob : pathWithGlob;
-        config[extensionName].overrides = config[extensionName].overrides.filter((rule) => rule !== conflictingPath &&
-            rule !== `!${conflictingPath}` &&
-            rule !== `!${newPath}`);
-        if (!config[extensionName].overrides.includes(newPath)) {
-            config[extensionName].overrides.push(newPath);
-        }
+        const override = Override.fromInput(scopePath, includeSubdirs);
+        const overrides = config[extensionName].overrides.filter((rule) => {
+            const fileOverride = Override.fromFileRule(rule);
+            if (fileOverride.conflictsWith(override) ||
+                fileOverride.isEqualTo(override)) {
+                return false; // Remove conflicts and equivalent values.
+            }
+            return !fileOverride.isChildOf(override);
+        });
+        overrides.push(override.output());
+        config[extensionName].overrides = overrides;
         this.writeConfig(config);
     }
     disable(extensionName, includeSubdirs, scopePath) {
-        const config = this.readConfig();
-        if (!config[extensionName]) {
-            config[extensionName] = { overrides: [] };
-        }
-        const pathWithGlob = `${scopePath}*`;
-        const pathWithoutGlob = scopePath;
-        const targetPath = includeSubdirs ? pathWithGlob : pathWithoutGlob;
-        const newRule = `!${targetPath}`;
-        const conflictingPath = includeSubdirs ? pathWithoutGlob : pathWithGlob;
-        config[extensionName].overrides = config[extensionName].overrides.filter((rule) => rule !== conflictingPath &&
-            rule !== `!${conflictingPath}` &&
-            rule !== targetPath);
-        if (!config[extensionName].overrides.includes(newRule)) {
-            config[extensionName].overrides.push(newRule);
-        }
-        this.writeConfig(config);
+        this.enable(extensionName, includeSubdirs, `!${scopePath}`);
     }
     remove(extensionName) {
         const config = this.readConfig();

package/dist/src/config/extensions/extensionEnablement.js.map

@@ -1 +1 @@
-{"version":3,"file":"extensionEnablement.js","sourceRoot":"","sources":["../../../../src/config/extensions/extensionEnablement.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extensionEnablement.js","sourceRoot":"","sources":["../../../../src/config/extensions/extensionEnablement.ts"],"names":[],"mappings":"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"}

package/dist/src/config/extensions/extensionEnablement.test.js

@@ -3,11 +3,11 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import * as path from 'node:path';
 import fs from 'node:fs';
 import os from 'node:os';
-import path from 'node:path';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
-import { ExtensionEnablementManager } from './extensionEnablement.js';
+import { ExtensionEnablementManager, Override } from './extensionEnablement.js';
 // Helper to create a temporary directory for testing
 function createTestDir() {
     const dirPath = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-test-'));
@@ -40,12 +40,12 @@ describe('ExtensionEnablementManager', () => {
             expect(manager.isEnabled('ext-test', '/any/path')).toBe(true);
         });
         it('should enable a path based on an override rule', () => {
-            manager.disable('ext-test', true, '*'); // Disable globally
+            manager.disable('ext-test', true, '/');
             manager.enable('ext-test', true, '/home/user/projects/');
             expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(true);
         });
         it('should disable a path based on a disable override rule', () => {
-            manager.enable('ext-test', true, '*'); // Enable globally
+            manager.enable('ext-test', true, '/');
             manager.disable('ext-test', true, '/home/user/projects/');
             expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(false);
         });
@@ -59,58 +59,203 @@ describe('ExtensionEnablementManager', () => {
             manager.disable('ext-test', false, '/home/user/projects/my-app');
             expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(false);
         });
+        it('should handle', () => {
+            manager.enable('ext-test', true, '/home/user/projects');
+            manager.disable('ext-test', false, '/home/user/projects/my-app');
+            expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(false);
+            expect(manager.isEnabled('ext-test', '/home/user/projects/something-else')).toBe(true);
+        });
     });
     describe('includeSubdirs', () => {
         it('should add a glob when enabling with includeSubdirs', () => {
             manager.enable('ext-test', true, '/path/to/dir');
             const config = manager.readConfig();
-            expect(config['ext-test'].overrides).toContain('/path/to/dir*');
+            expect(config['ext-test'].overrides).toContain('/path/to/dir/*');
         });
         it('should not add a glob when enabling without includeSubdirs', () => {
             manager.enable('ext-test', false, '/path/to/dir');
             const config = manager.readConfig();
-            expect(config['ext-test'].overrides).toContain('/path/to/dir');
-            expect(config['ext-test'].overrides).not.toContain('/path/to/dir*');
+            expect(config['ext-test'].overrides).toContain('/path/to/dir/');
+            expect(config['ext-test'].overrides).not.toContain('/path/to/dir/*');
         });
         it('should add a glob when disabling with includeSubdirs', () => {
             manager.disable('ext-test', true, '/path/to/dir');
             const config = manager.readConfig();
-            expect(config['ext-test'].overrides).toContain('!/path/to/dir*');
+            expect(config['ext-test'].overrides).toContain('!/path/to/dir/*');
         });
         it('should remove conflicting glob rule when enabling without subdirs', () => {
             manager.enable('ext-test', true, '/path/to/dir'); // Adds /path/to/dir*
             manager.enable('ext-test', false, '/path/to/dir'); // Should remove the glob
             const config = manager.readConfig();
-            expect(config['ext-test'].overrides).toContain('/path/to/dir');
-            expect(config['ext-test'].overrides).not.toContain('/path/to/dir*');
+            expect(config['ext-test'].overrides).toContain('/path/to/dir/');
+            expect(config['ext-test'].overrides).not.toContain('/path/to/dir/*');
         });
         it('should remove conflicting non-glob rule when enabling with subdirs', () => {
             manager.enable('ext-test', false, '/path/to/dir'); // Adds /path/to/dir
             manager.enable('ext-test', true, '/path/to/dir'); // Should remove the non-glob
             const config = manager.readConfig();
-            expect(config['ext-test'].overrides).toContain('/path/to/dir*');
-            expect(config['ext-test'].overrides).not.toContain('/path/to/dir');
+            expect(config['ext-test'].overrides).toContain('/path/to/dir/*');
+            expect(config['ext-test'].overrides).not.toContain('/path/to/dir/');
         });
         it('should remove conflicting rules when disabling', () => {
             manager.enable('ext-test', true, '/path/to/dir'); // enabled with glob
             manager.disable('ext-test', false, '/path/to/dir'); // disabled without
             const config = manager.readConfig();
-            expect(config['ext-test'].overrides).toContain('!/path/to/dir');
-            expect(config['ext-test'].overrides).not.toContain('/path/to/dir*');
+            expect(config['ext-test'].overrides).toContain('!/path/to/dir/');
+            expect(config['ext-test'].overrides).not.toContain('/path/to/dir/*');
         });
         it('should correctly evaluate isEnabled with subdirs', () => {
-            manager.disable('ext-test', true, '*');
+            manager.disable('ext-test', true, '/');
             manager.enable('ext-test', true, '/path/to/dir');
-            expect(manager.isEnabled('ext-test', '/path/to/dir')).toBe(true);
-            expect(manager.isEnabled('ext-test', '/path/to/dir/sub')).toBe(true);
-            expect(manager.isEnabled('ext-test', '/path/to/another')).toBe(false);
+            expect(manager.isEnabled('ext-test', '/path/to/dir/')).toBe(true);
+            expect(manager.isEnabled('ext-test', '/path/to/dir/sub/')).toBe(true);
+            expect(manager.isEnabled('ext-test', '/path/to/another/')).toBe(false);
         });
         it('should correctly evaluate isEnabled without subdirs', () => {
-            manager.disable('ext-test', true, '*');
+            manager.disable('ext-test', true, '/*');
             manager.enable('ext-test', false, '/path/to/dir');
             expect(manager.isEnabled('ext-test', '/path/to/dir')).toBe(true);
             expect(manager.isEnabled('ext-test', '/path/to/dir/sub')).toBe(false);
         });
     });
+    describe('pruning child rules', () => {
+        it('should remove child rules when enabling a parent with subdirs', () => {
+            // Pre-existing rules for children
+            manager.enable('ext-test', false, '/path/to/dir/subdir1');
+            manager.disable('ext-test', true, '/path/to/dir/subdir2');
+            manager.enable('ext-test', false, '/path/to/another/dir');
+            // Enable the parent directory
+            manager.enable('ext-test', true, '/path/to/dir');
+            const config = manager.readConfig();
+            const overrides = config['ext-test'].overrides;
+            // The new parent rule should be present
+            expect(overrides).toContain(`/path/to/dir/*`);
+            // Child rules should be removed
+            expect(overrides).not.toContain('/path/to/dir/subdir1/');
+            expect(overrides).not.toContain(`!/path/to/dir/subdir2/*`);
+            // Unrelated rules should remain
+            expect(overrides).toContain('/path/to/another/dir/');
+        });
+        it('should remove child rules when disabling a parent with subdirs', () => {
+            // Pre-existing rules for children
+            manager.enable('ext-test', false, '/path/to/dir/subdir1');
+            manager.disable('ext-test', true, '/path/to/dir/subdir2');
+            manager.enable('ext-test', false, '/path/to/another/dir');
+            // Disable the parent directory
+            manager.disable('ext-test', true, '/path/to/dir');
+            const config = manager.readConfig();
+            const overrides = config['ext-test'].overrides;
+            // The new parent rule should be present
+            expect(overrides).toContain(`!/path/to/dir/*`);
+            // Child rules should be removed
+            expect(overrides).not.toContain('/path/to/dir/subdir1/');
+            expect(overrides).not.toContain(`!/path/to/dir/subdir2/*`);
+            // Unrelated rules should remain
+            expect(overrides).toContain('/path/to/another/dir/');
+        });
+        it('should not remove child rules if includeSubdirs is false', () => {
+            manager.enable('ext-test', false, '/path/to/dir/subdir1');
+            manager.enable('ext-test', false, '/path/to/dir'); // Not including subdirs
+            const config = manager.readConfig();
+            const overrides = config['ext-test'].overrides;
+            expect(overrides).toContain('/path/to/dir/subdir1/');
+            expect(overrides).toContain('/path/to/dir/');
+        });
+    });
+    it('should enable a path based on an enable override', () => {
+        manager.disable('ext-test', true, '/Users/chrstn');
+        manager.enable('ext-test', true, '/Users/chrstn/gemini-cli');
+        expect(manager.isEnabled('ext-test', '/Users/chrstn/gemini-cli')).toBe(true);
+    });
+    it('should ignore subdirs', () => {
+        manager.disable('ext-test', false, '/Users/chrstn');
+        expect(manager.isEnabled('ext-test', '/Users/chrstn/gemini-cli')).toBe(true);
+    });
+});
+describe('Override', () => {
+    it('should create an override from input', () => {
+        const override = Override.fromInput('/path/to/dir', true);
+        expect(override.baseRule).toBe(`/path/to/dir/`);
+        expect(override.isDisable).toBe(false);
+        expect(override.includeSubdirs).toBe(true);
+    });
+    it('should create a disable override from input', () => {
+        const override = Override.fromInput('!/path/to/dir', false);
+        expect(override.baseRule).toBe(`/path/to/dir/`);
+        expect(override.isDisable).toBe(true);
+        expect(override.includeSubdirs).toBe(false);
+    });
+    it('should create an override from a file rule', () => {
+        const override = Override.fromFileRule('/path/to/dir');
+        expect(override.baseRule).toBe('/path/to/dir');
+        expect(override.isDisable).toBe(false);
+        expect(override.includeSubdirs).toBe(false);
+    });
+    it('should create a disable override from a file rule', () => {
+        const override = Override.fromFileRule('!/path/to/dir/');
+        expect(override.isDisable).toBe(true);
+        expect(override.baseRule).toBe('/path/to/dir/');
+        expect(override.includeSubdirs).toBe(false);
+    });
+    it('should create an override with subdirs from a file rule', () => {
+        const override = Override.fromFileRule('/path/to/dir/*');
+        expect(override.baseRule).toBe('/path/to/dir/');
+        expect(override.isDisable).toBe(false);
+        expect(override.includeSubdirs).toBe(true);
+    });
+    it('should correctly identify conflicting overrides', () => {
+        const override1 = Override.fromInput('/path/to/dir', true);
+        const override2 = Override.fromInput('/path/to/dir', false);
+        expect(override1.conflictsWith(override2)).toBe(true);
+    });
+    it('should correctly identify non-conflicting overrides', () => {
+        const override1 = Override.fromInput('/path/to/dir', true);
+        const override2 = Override.fromInput('/path/to/another/dir', true);
+        expect(override1.conflictsWith(override2)).toBe(false);
+    });
+    it('should correctly identify equal overrides', () => {
+        const override1 = Override.fromInput('/path/to/dir', true);
+        const override2 = Override.fromInput('/path/to/dir', true);
+        expect(override1.isEqualTo(override2)).toBe(true);
+    });
+    it('should correctly identify unequal overrides', () => {
+        const override1 = Override.fromInput('/path/to/dir', true);
+        const override2 = Override.fromInput('!/path/to/dir', true);
+        expect(override1.isEqualTo(override2)).toBe(false);
+    });
+    it('should generate the correct regex', () => {
+        const override = Override.fromInput('/path/to/dir', true);
+        const regex = override.asRegex();
+        expect(regex.test('/path/to/dir/')).toBe(true);
+        expect(regex.test('/path/to/dir/subdir')).toBe(true);
+        expect(regex.test('/path/to/another/dir')).toBe(false);
+    });
+    it('should correctly identify child overrides', () => {
+        const parent = Override.fromInput('/path/to/dir', true);
+        const child = Override.fromInput('/path/to/dir/subdir', false);
+        expect(child.isChildOf(parent)).toBe(true);
+    });
+    it('should correctly identify child overrides with glob', () => {
+        const parent = Override.fromInput('/path/to/dir/*', true);
+        const child = Override.fromInput('/path/to/dir/subdir', false);
+        expect(child.isChildOf(parent)).toBe(true);
+    });
+    it('should correctly identify non-child overrides', () => {
+        const parent = Override.fromInput('/path/to/dir', true);
+        const other = Override.fromInput('/path/to/another/dir', false);
+        expect(other.isChildOf(parent)).toBe(false);
+    });
+    it('should generate the correct output string', () => {
+        const override = Override.fromInput('/path/to/dir', true);
+        expect(override.output()).toBe(`/path/to/dir/*`);
+    });
+    it('should generate the correct output string for a disable override', () => {
+        const override = Override.fromInput('!/path/to/dir', false);
+        expect(override.output()).toBe(`!/path/to/dir/`);
+    });
+    it('should disable a path based on a disable override rule', () => {
+        const override = Override.fromInput('!/path/to/dir', false);
+        expect(override.output()).toBe(`!/path/to/dir/`);
+    });
 });
 //# sourceMappingURL=extensionEnablement.test.js.map