@machina.ai/cell-cli 1.33.0-rc1 → 1.38.1-rc1

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

@@ -6,6 +6,15 @@
 import * as path from 'node:path';
 import { VARIABLE_SCHEMA } from './variableSchema.js';
 import { CELL_DIR } from '@google/gemini-cli-core';
+/**
+ * Represents a set of keys that will be considered invalid while unmarshalling
+ * JSON in recursivelyHydrateStrings.
+ */
+const UNMARSHALL_KEY_IGNORE_LIST = new Set([
+    '__proto__',
+    'constructor',
+    'prototype',
+]);
 export const EXTENSIONS_DIRECTORY_NAME = path.join(CELL_DIR, 'extensions');
 export const EXTENSIONS_CONFIG_FILENAME = 'gemini-extension.json';
 export const INSTALL_METADATA_FILENAME = '.cell-cli-extension-install.json';
@@ -30,12 +39,15 @@ export function recursivelyHydrateStrings(obj, values) {
     }
     if (Array.isArray(obj)) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        return obj.map((item) => recursivelyHydrateStrings(item, values));
+        return obj.map((item) => 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        recursivelyHydrateStrings(item, values));
     }
     if (typeof obj === 'object' && obj !== null) {
         const newObj = {};
         for (const key in obj) {
-            if (Object.prototype.hasOwnProperty.call(obj, key)) {
+            if (!UNMARSHALL_KEY_IGNORE_LIST.has(key) &&
+                Object.prototype.hasOwnProperty.call(obj, key)) {
                 newObj[key] = recursivelyHydrateStrings(
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
                 obj[key], values);

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

@@ -1 +1 @@
-{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../../src/config/extensions/variables.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAuB,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AAC3E,MAAM,CAAC,MAAM,0BAA0B,GAAG,uBAAuB,CAAC;AAClE,MAAM,CAAC,MAAM,yBAAyB,GAAG,kCAAkC,CAAC;AAC5E,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC;AAgBlD,MAAM,UAAU,iBAAiB,CAC/B,SAA0B,EAC1B,MAAsB;IAEtB,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,UAAU,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAW,EAAE,OAAwB;IACjE,iBAAiB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,YAAY,CAAC;IAC3B,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CACvC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAC5C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,GAAM,EACN,MAAuB;IAEvB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,uEAAuE;QACvE,OAAO,aAAa,CAAC,GAAG,EAAE,MAAM,CAAiB,CAAC;IACpD,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,uEAAuE;QACvE,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACtB,yBAAyB,CAAC,IAAI,EAAE,MAAM,CAAC,CACxB,CAAC;IACpB,CAAC;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAC5C,MAAM,MAAM,GAA4B,EAAE,CAAC;QAC3C,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACtB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;gBACnD,MAAM,CAAC,GAAG,CAAC,GAAG,yBAAyB;gBACrC,uEAAuE;gBACtE,GAA+B,CAAC,GAAG,CAAC,EACrC,MAAM,CACP,CAAC;YACJ,CAAC;QACH,CAAC;QACD,uEAAuE;QACvE,OAAO,MAAW,CAAC;IACrB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../../src/config/extensions/variables.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAuB,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD;;;GAGG;AACH,MAAM,0BAA0B,GAAgB,IAAI,GAAG,CAAS;IAC9D,WAAW;IACX,aAAa;IACb,WAAW;CACZ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AAC3E,MAAM,CAAC,MAAM,0BAA0B,GAAG,uBAAuB,CAAC;AAClE,MAAM,CAAC,MAAM,yBAAyB,GAAG,kCAAkC,CAAC;AAC5E,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC;AAgBlD,MAAM,UAAU,iBAAiB,CAC/B,SAA0B,EAC1B,MAAsB;IAEtB,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,UAAU,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAW,EAAE,OAAwB;IACjE,iBAAiB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,YAAY,CAAC;IAC3B,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CACvC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAC5C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,GAAM,EACN,MAAuB;IAEvB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,uEAAuE;QACvE,OAAO,aAAa,CAAC,GAAG,EAAE,MAAM,CAAiB,CAAC;IACpD,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,uEAAuE;QACvE,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACtB,+DAA+D;QAC/D,yBAAyB,CAAC,IAAI,EAAE,MAAM,CAAC,CACxB,CAAC;IACpB,CAAC;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAC5C,MAAM,MAAM,GAA4B,EAAE,CAAC;QAC3C,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACtB,IACE,CAAC,0BAA0B,CAAC,GAAG,CAAC,GAAG,CAAC;gBACpC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAC9C,CAAC;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,yBAAyB;gBACrC,uEAAuE;gBACtE,GAA+B,CAAC,GAAG,CAAC,EACrC,MAAM,CACP,CAAC;YACJ,CAAC;QACH,CAAC;QACD,uEAAuE;QACvE,OAAO,MAAW,CAAC;IACrB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}

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

@@ -99,5 +99,21 @@ describe('recursivelyHydrateStrings', () => {
         const result = recursivelyHydrateStrings(obj, context);
         expect(result).toEqual(obj);
     });
+    it('should not allow prototype pollution via __proto__', () => {
+        const payload = JSON.parse('{"__proto__": {"polluted": "yes"}}');
+        const result = recursivelyHydrateStrings(payload, context);
+        expect(result.polluted).toBeUndefined();
+        expect(Object.prototype.hasOwnProperty.call(result, 'polluted')).toBe(false);
+    });
+    it('should not allow prototype pollution via constructor', () => {
+        const payload = JSON.parse('{"constructor": {"prototype": {"polluted": "yes"}}}');
+        const result = recursivelyHydrateStrings(payload, context);
+        expect(result.polluted).toBeUndefined();
+    });
+    it('should not allow prototype pollution via prototype', () => {
+        const payload = JSON.parse('{"prototype": {"polluted": "yes"}}');
+        const result = recursivelyHydrateStrings(payload, context);
+        expect(result.polluted).toBeUndefined();
+    });
 });
 //# sourceMappingURL=variables.test.js.map

package/dist/src/config/extensions/variables.test.js.map

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

package/dist/src/config/footerItems.d.ts

@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { MergedSettings } from './settings.js';
+export declare const ALL_ITEMS: readonly [{
+    readonly id: "workspace";
+    readonly header: "workspace (/directory)";
+    readonly description: "Current working directory";
+}, {
+    readonly id: "git-branch";
+    readonly header: "branch";
+    readonly description: "Current git branch name (not shown when unavailable)";
+}, {
+    readonly id: "sandbox";
+    readonly header: "sandbox";
+    readonly description: "Sandbox type and trust indicator";
+}, {
+    readonly id: "model-name";
+    readonly header: "/model";
+    readonly description: "Current model identifier";
+}, {
+    readonly id: "context-used";
+    readonly header: "context";
+    readonly description: "Percentage of context window used";
+}, {
+    readonly id: "quota";
+    readonly header: "/stats";
+    readonly description: "Remaining usage on daily limit (not shown when unavailable)";
+}, {
+    readonly id: "memory-usage";
+    readonly header: "memory";
+    readonly description: "Memory used by the application";
+}, {
+    readonly id: "session-id";
+    readonly header: "session";
+    readonly description: "Unique identifier for the current session";
+}, {
+    readonly id: "auth";
+    readonly header: "/auth";
+    readonly description: "Current authentication info";
+}, {
+    readonly id: "code-changes";
+    readonly header: "diff";
+    readonly description: "Lines added/removed in the session (not shown when zero)";
+}, {
+    readonly id: "token-count";
+    readonly header: "tokens";
+    readonly description: "Total tokens used in the session (not shown when zero)";
+}];
+export type FooterItemId = (typeof ALL_ITEMS)[number]['id'];
+export declare const DEFAULT_ORDER: string[];
+export declare function deriveItemsFromLegacySettings(settings: MergedSettings): string[];
+/**
+ * Resolves the ordered list and selected set of footer items from settings.
+ * Used by FooterConfigDialog to initialize and reset state.
+ */
+export declare function resolveFooterState(settings: MergedSettings): {
+    orderedIds: string[];
+    selectedIds: Set<string>;
+};

package/dist/src/config/footerItems.js

@@ -0,0 +1,128 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export const ALL_ITEMS = [
+    {
+        id: 'workspace',
+        header: 'workspace (/directory)',
+        description: 'Current working directory',
+    },
+    {
+        id: 'git-branch',
+        header: 'branch',
+        description: 'Current git branch name (not shown when unavailable)',
+    },
+    {
+        id: 'sandbox',
+        header: 'sandbox',
+        description: 'Sandbox type and trust indicator',
+    },
+    {
+        id: 'model-name',
+        header: '/model',
+        description: 'Current model identifier',
+    },
+    {
+        id: 'context-used',
+        header: 'context',
+        description: 'Percentage of context window used',
+    },
+    {
+        id: 'quota',
+        header: '/stats',
+        description: 'Remaining usage on daily limit (not shown when unavailable)',
+    },
+    {
+        id: 'memory-usage',
+        header: 'memory',
+        description: 'Memory used by the application',
+    },
+    {
+        id: 'session-id',
+        header: 'session',
+        description: 'Unique identifier for the current session',
+    },
+    {
+        id: 'auth',
+        header: '/auth',
+        description: 'Current authentication info',
+    },
+    {
+        id: 'code-changes',
+        header: 'diff',
+        description: 'Lines added/removed in the session (not shown when zero)',
+    },
+    {
+        id: 'token-count',
+        header: 'tokens',
+        description: 'Total tokens used in the session (not shown when zero)',
+    },
+];
+export const DEFAULT_ORDER = [
+    'workspace',
+    'git-branch',
+    'sandbox',
+    'model-name',
+    'context-used',
+    'quota',
+    'memory-usage',
+    'session-id',
+    'auth',
+    'code-changes',
+    'token-count',
+];
+export function deriveItemsFromLegacySettings(settings) {
+    const defaults = [
+        'workspace',
+        'git-branch',
+        'sandbox',
+        'model-name',
+        'quota',
+    ];
+    const items = [...defaults];
+    const remove = (arr, id) => {
+        const idx = arr.indexOf(id);
+        if (idx !== -1)
+            arr.splice(idx, 1);
+    };
+    if (settings.ui.footer.hideCWD)
+        remove(items, 'workspace');
+    if (settings.ui.footer.hideSandboxStatus)
+        remove(items, 'sandbox');
+    if (settings.ui.footer.hideModelInfo) {
+        remove(items, 'model-name');
+        remove(items, 'context-used');
+        remove(items, 'quota');
+    }
+    if (!settings.ui.footer.hideContextPercentage &&
+        !items.includes('context-used')) {
+        const modelIdx = items.indexOf('model-name');
+        if (modelIdx !== -1)
+            items.splice(modelIdx + 1, 0, 'context-used');
+        else
+            items.push('context-used');
+    }
+    if (settings.ui.showMemoryUsage)
+        items.push('memory-usage');
+    return items;
+}
+const VALID_IDS = new Set(ALL_ITEMS.map((i) => i.id));
+/**
+ * Resolves the ordered list and selected set of footer items from settings.
+ * Used by FooterConfigDialog to initialize and reset state.
+ */
+export function resolveFooterState(settings) {
+    const showUserIdentity = settings.ui?.showUserIdentity !== false;
+    const filteredValidIds = showUserIdentity
+        ? VALID_IDS
+        : new Set([...VALID_IDS].filter((id) => id !== 'auth'));
+    const source = (settings.ui?.footer?.items ?? deriveItemsFromLegacySettings(settings)).filter((id) => filteredValidIds.has(id));
+    const others = DEFAULT_ORDER.filter((id) => !source.includes(id) && filteredValidIds.has(id));
+    return {
+        orderedIds: [...source, ...others],
+        selectedIds: new Set(source),
+    };
+}
+//# sourceMappingURL=footerItems.js.map

package/dist/src/config/footerItems.js.map

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

package/dist/src/config/footerItems.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/config/footerItems.test.js

@@ -0,0 +1,141 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { deriveItemsFromLegacySettings, resolveFooterState, } from './footerItems.js';
+import { createMockSettings } from '../test-utils/settings.js';
+describe('footerItems', () => {
+    describe('deriveItemsFromLegacySettings', () => {
+        it('returns defaults when no legacy settings are customized', () => {
+            const settings = createMockSettings({
+                ui: { footer: { hideContextPercentage: true } },
+            }).merged;
+            const items = deriveItemsFromLegacySettings(settings);
+            expect(items).toEqual([
+                'workspace',
+                'git-branch',
+                'sandbox',
+                'model-name',
+                'quota',
+            ]);
+        });
+        it('removes workspace when hideCWD is true', () => {
+            const settings = createMockSettings({
+                ui: { footer: { hideCWD: true, hideContextPercentage: true } },
+            }).merged;
+            const items = deriveItemsFromLegacySettings(settings);
+            expect(items).not.toContain('workspace');
+        });
+        it('removes sandbox when hideSandboxStatus is true', () => {
+            const settings = createMockSettings({
+                ui: {
+                    footer: { hideSandboxStatus: true, hideContextPercentage: true },
+                },
+            }).merged;
+            const items = deriveItemsFromLegacySettings(settings);
+            expect(items).not.toContain('sandbox');
+        });
+        it('removes model-name, context-used, and quota when hideModelInfo is true', () => {
+            const settings = createMockSettings({
+                ui: { footer: { hideModelInfo: true, hideContextPercentage: true } },
+            }).merged;
+            const items = deriveItemsFromLegacySettings(settings);
+            expect(items).not.toContain('model-name');
+            expect(items).not.toContain('context-used');
+            expect(items).not.toContain('quota');
+        });
+        it('includes context-used when hideContextPercentage is false', () => {
+            const settings = createMockSettings({
+                ui: { footer: { hideContextPercentage: false } },
+            }).merged;
+            const items = deriveItemsFromLegacySettings(settings);
+            expect(items).toContain('context-used');
+            // Should be after model-name
+            const modelIdx = items.indexOf('model-name');
+            const contextIdx = items.indexOf('context-used');
+            expect(contextIdx).toBe(modelIdx + 1);
+        });
+        it('includes memory-usage when showMemoryUsage is true', () => {
+            const settings = createMockSettings({
+                ui: { showMemoryUsage: true, footer: { hideContextPercentage: true } },
+            }).merged;
+            const items = deriveItemsFromLegacySettings(settings);
+            expect(items).toContain('memory-usage');
+        });
+        it('handles combination of settings', () => {
+            const settings = createMockSettings({
+                ui: {
+                    showMemoryUsage: true,
+                    footer: {
+                        hideCWD: true,
+                        hideModelInfo: true,
+                        hideContextPercentage: false,
+                    },
+                },
+            }).merged;
+            const items = deriveItemsFromLegacySettings(settings);
+            expect(items).toEqual([
+                'git-branch',
+                'sandbox',
+                'context-used',
+                'memory-usage',
+            ]);
+        });
+    });
+    describe('resolveFooterState', () => {
+        it('filters out auth item when showUserIdentity is false', () => {
+            const settings = createMockSettings({
+                ui: {
+                    showUserIdentity: false,
+                    footer: {
+                        items: ['workspace', 'auth', 'model-name'],
+                    },
+                },
+            }).merged;
+            const state = resolveFooterState(settings);
+            expect(state.orderedIds).not.toContain('auth');
+            expect(state.selectedIds.has('auth')).toBe(false);
+            // It should also not be in the 'others' part of orderedIds
+            expect(state.orderedIds).toEqual([
+                'workspace',
+                'model-name',
+                'git-branch',
+                'sandbox',
+                'context-used',
+                'quota',
+                'memory-usage',
+                'session-id',
+                'code-changes',
+                'token-count',
+            ]);
+        });
+        it('includes auth item when showUserIdentity is true', () => {
+            const settings = createMockSettings({
+                ui: {
+                    showUserIdentity: true,
+                    footer: {
+                        items: ['workspace', 'auth', 'model-name'],
+                    },
+                },
+            }).merged;
+            const state = resolveFooterState(settings);
+            expect(state.orderedIds).toContain('auth');
+            expect(state.selectedIds.has('auth')).toBe(true);
+        });
+        it('includes auth item by default when showUserIdentity is undefined (defaults to true)', () => {
+            const settings = createMockSettings({
+                ui: {
+                    footer: {
+                        items: ['workspace', 'auth', 'model-name'],
+                    },
+                },
+            }).merged;
+            const state = resolveFooterState(settings);
+            expect(state.orderedIds).toContain('auth');
+            expect(state.selectedIds.has('auth')).toBe(true);
+        });
+    });
+});
+//# sourceMappingURL=footerItems.test.js.map

package/dist/src/config/footerItems.test.js.map

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

package/dist/src/config/mcp/mcpServerEnablement.test.js

@@ -10,6 +10,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     return {
         ...actual,
         Storage: {
+            // eslint-disable-next-line @typescript-eslint/no-misused-spread
             ...actual.Storage,
             getGlobalGeminiDir: () => '/virtual-home/.cell-cli',
         },

package/dist/src/config/mcp/mcpServerEnablement.test.js.map

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