npm - @machina.ai/cell-cli - Versions diffs - 1.33.0-rc1 → 1.38.1-rc1 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2022) hide show

package/dist/src/utils/devtoolsService.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { Config } from '@google/gemini-cli-core';
+import { type Config } from '@google/gemini-cli-core';
 /**
  * Initializes the activity logger.
  * Interception starts immediately in buffering mode.
@@ -16,5 +16,15 @@ export declare function setupInitialActivityLogger(config: Config): Promise<void
  * Deduplicates concurrent calls — returns the same promise if already in flight.
  */
 export declare function startDevToolsServer(config: Config): Promise<string>;
+/**
+ * Handles the F12 key toggle for the DevTools panel.
+ * Starts the DevTools server, attempts to open the browser.
+ * If the panel is already open, it closes it.
+ * If the panel is closed:
+ * - Attempts to open the browser.
+ * - If browser opening is successful, the panel remains closed.
+ * - If browser opening fails or is not possible, the panel is opened.
+ */
+export declare function toggleDevToolsPanel(config: Config, isOpen: boolean, toggle: () => void, setOpen: () => void): Promise<void>;
 /** Reset module-level state — test only. */
 export declare function resetForTesting(): void;

package/dist/src/utils/devtoolsService.js CHANGED Viewed

@@ -6,7 +6,6 @@
 import { debugLogger } from '@google/gemini-cli-core';
 import WebSocket from 'ws';
 import { initActivityLogger, addNetworkTransport, ActivityLogger, } from './activityLogger.js';
-const DEVTOOLS_PKG = 'gemini-cli-devtools';
 const DEFAULT_DEVTOOLS_PORT = 25417;
 const DEFAULT_DEVTOOLS_HOST = '127.0.0.1';
 const MAX_PROMOTION_ATTEMPTS = 3;
@@ -42,7 +41,7 @@ function probeDevTools(host, port) {
  * Returns { host, port } of the DevTools to connect to.
  */
 async function startOrJoinDevTools(defaultHost, defaultPort) {
-    const mod = await import(DEVTOOLS_PKG);
+    const mod = await import('@google/gemini-cli-devtools');
     const devtools = mod.DevTools.getInstance();
     const url = await devtools.start();
     const actualPort = devtools.getPort();
@@ -157,6 +156,41 @@ async function startDevToolsServerImpl(config) {
     connectedUrl = url;
     return url;
 }
+/**
+ * Handles the F12 key toggle for the DevTools panel.
+ * Starts the DevTools server, attempts to open the browser.
+ * If the panel is already open, it closes it.
+ * If the panel is closed:
+ * - Attempts to open the browser.
+ * - If browser opening is successful, the panel remains closed.
+ * - If browser opening fails or is not possible, the panel is opened.
+ */
+export async function toggleDevToolsPanel(config, isOpen, toggle, setOpen) {
+    if (isOpen) {
+        toggle();
+        return;
+    }
+    try {
+        const { openBrowserSecurely, shouldLaunchBrowser } = await import('@google/gemini-cli-core');
+        const url = await startDevToolsServer(config);
+        if (shouldLaunchBrowser()) {
+            try {
+                await openBrowserSecurely(url);
+                // Browser opened successfully, don't open drawer.
+                return;
+            }
+            catch (e) {
+                debugLogger.warn('Failed to open browser securely:', e);
+            }
+        }
+        // If we can't launch browser or it failed, open drawer.
+        setOpen();
+    }
+    catch (e) {
+        setOpen();
+        debugLogger.error('Failed to start DevTools server:', e);
+    }
+}
 /** Reset module-level state — test only. */
 export function resetForTesting() {
     promotionAttempts = 0;

package/dist/src/utils/devtoolsService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"devtoolsService.js","sourceRoot":"","sources":["../../../src/utils/devtoolsService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,~~EAAE~~,MAAM,yBAAyB,CAAC;~~AAEtD~~,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,cAAc,GACf,MAAM,qBAAqB,CAAC;AAQ7B,MAAM,~~YAAY,GAAG,~~qBAAqB,~~CAAC;AAC3C,MAAM,qBAAqB,~~GAAG,KAAK,CAAC;AACpC,MAAM,qBAAqB,GAAG,WAAW,CAAC;AAC1C,MAAM,sBAAsB,GAAG,CAAC,CAAC;AACjC,IAAI,iBAAiB,GAAG,CAAC,CAAC;AAC1B,IAAI,kBAAkB,GAA2B,IAAI,CAAC;AACtD,IAAI,YAAY,GAAkB,IAAI,CAAC;AAEvC;;;GAGG;AACH,SAAS,aAAa,CAAC,IAAY,EAAE,IAAY;IAC/C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,EAAE,GAAG,IAAI,SAAS,CAAC,QAAQ,IAAI,IAAI,IAAI,KAAK,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,EAAE,GAAG,CAAC,CAAC;QAER,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YACjB,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAClB,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,mBAAmB,CAChC,WAAmB,EACnB,WAAmB;IAEnB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,~~YAAY~~,CAAC,CAAC;~~IACvC~~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"}
1	+ {"version":3,"file":"devtoolsService.js","sourceRoot":"","sources":["../../../src/utils/devtoolsService.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/devtoolsService.test.js CHANGED Viewed

@@ -54,23 +54,28 @@ vi.mock('./activityLogger.js', () => ({
         getInstance: () => mockActivityLoggerInstance,
     },
 }));
+const mockShouldLaunchBrowser = vi.hoisted(() => vi.fn(() => true));
+const mockOpenBrowserSecurely = vi.hoisted(() => vi.fn(() => Promise.resolve()));
 vi.mock('@google/gemini-cli-core', () => ({
     debugLogger: {
         log: vi.fn(),
         debug: vi.fn(),
         error: vi.fn(),
+        warn: vi.fn(),
     },
+    shouldLaunchBrowser: mockShouldLaunchBrowser,
+    openBrowserSecurely: mockOpenBrowserSecurely,
 }));
 vi.mock('ws', () => ({
     default: MockWebSocket,
 }));
-vi.mock('gemini-cli-devtools', () => ({
+vi.mock('@google/gemini-cli-devtools', () => ({
     DevTools: {
         getInstance: () => mockDevToolsInstance,
     },
 }));
 // --- Import under test (after mocks) ---
-import { setupInitialActivityLogger, startDevToolsServer, resetForTesting, } from './devtoolsService.js';
+import { setupInitialActivityLogger, startDevToolsServer, toggleDevToolsPanel, resetForTesting, } from './devtoolsService.js';
 function createMockConfig(overrides = {}) {
     return {
         isInteractive: vi.fn().mockReturnValue(true),
@@ -299,5 +304,72 @@ describe('devtoolsService', () => {
             expect(mockAddNetworkTransport).toHaveBeenCalledTimes(3);
         });
     });
+    describe('toggleDevToolsPanel', () => {
+        it('calls toggle (to close) when already open', async () => {
+            const config = createMockConfig();
+            const toggle = vi.fn();
+            const setOpen = vi.fn();
+            const promise = toggleDevToolsPanel(config, true, toggle, setOpen);
+            await promise;
+            expect(toggle).toHaveBeenCalledTimes(1);
+            expect(setOpen).not.toHaveBeenCalled();
+        });
+        it('does NOT call toggle or setOpen when browser opens successfully', async () => {
+            const config = createMockConfig();
+            const toggle = vi.fn();
+            const setOpen = vi.fn();
+            mockShouldLaunchBrowser.mockReturnValue(true);
+            mockOpenBrowserSecurely.mockResolvedValue(undefined);
+            mockDevToolsInstance.start.mockResolvedValue('http://127.0.0.1:25417');
+            mockDevToolsInstance.getPort.mockReturnValue(25417);
+            const promise = toggleDevToolsPanel(config, false, toggle, setOpen);
+            await vi.waitFor(() => expect(MockWebSocket.instances.length).toBe(1));
+            MockWebSocket.instances[0].simulateError();
+            await promise;
+            expect(toggle).not.toHaveBeenCalled();
+            expect(setOpen).not.toHaveBeenCalled();
+        });
+        it('calls setOpen when browser fails to open', async () => {
+            const config = createMockConfig();
+            const toggle = vi.fn();
+            const setOpen = vi.fn();
+            mockShouldLaunchBrowser.mockReturnValue(true);
+            mockOpenBrowserSecurely.mockRejectedValue(new Error('no browser'));
+            mockDevToolsInstance.start.mockResolvedValue('http://127.0.0.1:25417');
+            mockDevToolsInstance.getPort.mockReturnValue(25417);
+            const promise = toggleDevToolsPanel(config, false, toggle, setOpen);
+            await vi.waitFor(() => expect(MockWebSocket.instances.length).toBe(1));
+            MockWebSocket.instances[0].simulateError();
+            await promise;
+            expect(toggle).not.toHaveBeenCalled();
+            expect(setOpen).toHaveBeenCalledTimes(1);
+        });
+        it('calls setOpen when shouldLaunchBrowser returns false', async () => {
+            const config = createMockConfig();
+            const toggle = vi.fn();
+            const setOpen = vi.fn();
+            mockShouldLaunchBrowser.mockReturnValue(false);
+            mockDevToolsInstance.start.mockResolvedValue('http://127.0.0.1:25417');
+            mockDevToolsInstance.getPort.mockReturnValue(25417);
+            const promise = toggleDevToolsPanel(config, false, toggle, setOpen);
+            await vi.waitFor(() => expect(MockWebSocket.instances.length).toBe(1));
+            MockWebSocket.instances[0].simulateError();
+            await promise;
+            expect(toggle).not.toHaveBeenCalled();
+            expect(setOpen).toHaveBeenCalledTimes(1);
+        });
+        it('calls setOpen when DevTools server fails to start', async () => {
+            const config = createMockConfig();
+            const toggle = vi.fn();
+            const setOpen = vi.fn();
+            mockDevToolsInstance.start.mockRejectedValue(new Error('fail'));
+            const promise = toggleDevToolsPanel(config, false, toggle, setOpen);
+            await vi.waitFor(() => expect(MockWebSocket.instances.length).toBe(1));
+            MockWebSocket.instances[0].simulateError();
+            await promise;
+            expect(toggle).not.toHaveBeenCalled();
+            expect(setOpen).toHaveBeenCalledTimes(1);
+        });
+    });
 });
 //# sourceMappingURL=devtoolsService.test.js.map

package/dist/src/utils/devtoolsService.test.js.map CHANGED Viewed

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

package/dist/src/utils/dialogScopeUtils.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { LoadableSettingScope, LoadedSettings } from '../config/settings.js';
+import { type LoadableSettingScope, type Settings } from '../config/settings.js';
 /**
  * Shared scope labels for dialog components that need to display setting scopes
  */
@@ -22,4 +22,8 @@ export declare function getScopeItems(): Array<{
 /**
  * Generate scope message for a specific setting
  */
-export declare function getScopeMessageForSetting(settingKey: string, selectedScope: LoadableSettingScope, settings: LoadedSettings): string;
+export declare function getScopeMessageForSetting(settingKey: string, selectedScope: LoadableSettingScope, settings: {
+    forScope: (scope: LoadableSettingScope) => {
+        settings: Settings;
+    };
+}): string;

package/dist/src/utils/dialogScopeUtils.js CHANGED Viewed

@@ -3,8 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { isLoadableSettingScope, SettingScope } from '../config/settings.js';
-import { settingExistsInScope } from './settingsUtils.js';
+import { isLoadableSettingScope, SettingScope, } from '../config/settings.js';
+import { isInSettingsScope } from './settingsUtils.js';
 /**
  * Shared scope labels for dialog components that need to display setting scopes
  */
@@ -35,14 +35,14 @@ export function getScopeMessageForSetting(settingKey, selectedScope, settings) {
         .filter((scope) => scope !== selectedScope);
     const modifiedInOtherScopes = otherScopes.filter((scope) => {
         const scopeSettings = settings.forScope(scope).settings;
-        return settingExistsInScope(settingKey, scopeSettings);
+        return isInSettingsScope(settingKey, scopeSettings);
     });
     if (modifiedInOtherScopes.length === 0) {
         return '';
     }
     const modifiedScopesStr = modifiedInOtherScopes.join(', ');
     const currentScopeSettings = settings.forScope(selectedScope).settings;
-    const existsInCurrentScope = settingExistsInScope(settingKey, currentScopeSettings);
+    const existsInCurrentScope = isInSettingsScope(settingKey, currentScopeSettings);
     return existsInCurrentScope
         ? `(Also modified in ${modifiedScopesStr})`
         : `(Modified in ${modifiedScopesStr})`;

package/dist/src/utils/dialogScopeUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dialogScopeUtils.js","sourceRoot":"","sources":["../../../src/utils/dialogScopeUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;~~AAMH~~,OAAO,~~EAAE~~,sBAAsB,~~EAAE~~,YAAY,~~EAAE~~,MAAM,uBAAuB,CAAC;~~AAC7E~~,OAAO,EAAE,~~oBAAoB~~,EAAE,MAAM,oBAAoB,CAAC;~~AAE1D~~;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,eAAe;IACpC,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,oBAAoB;IAC9C,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,iBAAiB;CAChC,CAAC;AAEX;;GAEG;AACH,MAAM,UAAU,aAAa;IAI3B,OAAO;QACL,EAAE,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE;QACpE;YACE,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC;YAC3C,KAAK,EAAE,YAAY,CAAC,SAAS;SAC9B;QACD,EAAE,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE;KACzE,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CACvC,UAAkB,EAClB,aAAmC,EACnC,~~QAAwB~~;~~IAExB~~,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;SAC5C,MAAM,CAAC,sBAAsB,CAAC;SAC9B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,aAAa,CAAC,CAAC;IAE9C,MAAM,qBAAqB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACzD,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;QACxD,OAAO,~~oBAAoB~~,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;~~IACzD~~,CAAC,CAAC,CAAC;IAEH,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3D,MAAM,oBAAoB,GAAG,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC;IACvE,MAAM,oBAAoB,GAAG,~~oBAAoB~~,~~CAC/C~~,UAAU,EACV,oBAAoB,CACrB,CAAC;IAEF,OAAO,oBAAoB;QACzB,CAAC,CAAC,qBAAqB,iBAAiB,GAAG;QAC3C,CAAC,CAAC,gBAAgB,iBAAiB,GAAG,CAAC;AAC3C,CAAC"}
1	+ {"version":3,"file":"dialogScopeUtils.js","sourceRoot":"","sources":["../../../src/utils/dialogScopeUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,sBAAsB,EACtB,YAAY,GAGb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,eAAe;IACpC,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,oBAAoB;IAC9C,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,iBAAiB;CAChC,CAAC;AAEX;;GAEG;AACH,MAAM,UAAU,aAAa;IAI3B,OAAO;QACL,EAAE,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE;QACpE;YACE,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC;YAC3C,KAAK,EAAE,YAAY,CAAC,SAAS;SAC9B;QACD,EAAE,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE;KACzE,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CACvC,UAAkB,EAClB,aAAmC,EACnC,QAEC;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;SAC5C,MAAM,CAAC,sBAAsB,CAAC;SAC9B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,aAAa,CAAC,CAAC;IAE9C,MAAM,qBAAqB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACzD,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;QACxD,OAAO,iBAAiB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3D,MAAM,oBAAoB,GAAG,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC;IACvE,MAAM,oBAAoB,GAAG,iBAAiB,CAC5C,UAAU,EACV,oBAAoB,CACrB,CAAC;IAEF,OAAO,oBAAoB;QACzB,CAAC,CAAC,qBAAqB,iBAAiB,GAAG;QAC3C,CAAC,CAAC,gBAAgB,iBAAiB,GAAG,CAAC;AAC3C,CAAC"}

package/dist/src/utils/dialogScopeUtils.test.js CHANGED Viewed

@@ -6,7 +6,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { SettingScope } from '../config/settings.js';
 import { getScopeItems, getScopeMessageForSetting, } from './dialogScopeUtils.js';
-import { settingExistsInScope } from './settingsUtils.js';
+import { isInSettingsScope } from './settingsUtils.js';
 vi.mock('../config/settings', () => ({
     SettingScope: {
         User: 'user',
@@ -16,7 +16,7 @@ vi.mock('../config/settings', () => ({
     isLoadableSettingScope: (scope) => ['user', 'workspace', 'system'].includes(scope),
 }));
 vi.mock('./settingsUtils', () => ({
-    settingExistsInScope: vi.fn(),
+    isInSettingsScope: vi.fn(),
 }));
 describe('dialogScopeUtils', () => {
     beforeEach(() => {
@@ -40,12 +40,12 @@ describe('dialogScopeUtils', () => {
             };
         });
         it('should return empty string if not modified in other scopes', () => {
-            vi.mocked(settingExistsInScope).mockReturnValue(false);
+            vi.mocked(isInSettingsScope).mockReturnValue(false);
             const message = getScopeMessageForSetting('key', SettingScope.User, mockSettings);
             expect(message).toBe('');
         });
         it('should return message indicating modification in other scopes', () => {
-            vi.mocked(settingExistsInScope).mockReturnValue(true);
+            vi.mocked(isInSettingsScope).mockReturnValue(true);
             const message = getScopeMessageForSetting('key', SettingScope.User, mockSettings);
             expect(message).toMatch(/Also modified in/);
             expect(message).toMatch(/workspace/);
@@ -64,7 +64,7 @@ describe('dialogScopeUtils', () => {
                     return { settings: userSettings };
                 return { settings: {} };
             });
-            vi.mocked(settingExistsInScope).mockImplementation((_key, settings) => {
+            vi.mocked(isInSettingsScope).mockImplementation((_key, settings) => {
                 if (settings === workspaceSettings)
                     return true;
                 if (settings === systemSettings)

package/dist/src/utils/dialogScopeUtils.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dialogScopeUtils.test.js","sourceRoot":"","sources":["../../../src/utils/dialogScopeUtils.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,YAAY,~~EAAE~~,MAAM,uBAAuB,CAAC;~~AAErD~~,OAAO,EACL,aAAa,EACb,yBAAyB,GAC1B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,~~oBAAoB~~,EAAE,MAAM,oBAAoB,CAAC;~~AAE1D~~,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,CAAC;IACnC,YAAY,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,SAAS,EAAE,WAAW;QACtB,MAAM,EAAE,QAAQ;KACjB;IACD,sBAAsB,EAAE,CAAC,KAAa,EAAE,EAAE,CACxC,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;CAClD,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,CAAC;IAChC,~~oBAAoB~~,EAAE,EAAE,CAAC,EAAE,EAAE;~~CAC9B~~,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAClE,MAAM,KAAK,GAAG,aAAa,EAAE,CAAC;YAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;gBACpB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE;gBACpD,EAAE,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,YAAY,CAAC,SAAS,EAAE;gBAC9D,EAAE,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE;aACzD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACzC,IAAI,YAAoD,CAAC;QAEzD,UAAU,CAAC,GAAG,EAAE;YACd,YAAY,GAAG;gBACb,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;aACpD,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;YACpE,EAAE,CAAC,MAAM,CAAC,~~oBAAoB~~,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;~~YACvD~~,MAAM,OAAO,GAAG,yBAAyB,CACvC,KAAK,EACL,YAAY,CAAC,IAAI,EACjB,YAAyC,CAC1C,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;YACvE,EAAE,CAAC,MAAM,CAAC,~~oBAAoB~~,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;~~YAEtD~~,MAAM,OAAO,GAAG,yBAAyB,CACvC,KAAK,EACL,YAAY,CAAC,IAAI,EACjB,YAAyC,CAC1C,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;YAC5C,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACrC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+EAA+E,EAAE,GAAG,EAAE;YACvF,MAAM,iBAAiB,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;YACjD,MAAM,cAAc,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;YAC3C,MAAM,YAAY,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;YAEvC,YAAY,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,KAAa,EAAE,EAAE;gBACzD,IAAI,KAAK,KAAK,YAAY,CAAC,SAAS;oBAClC,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC;gBACzC,IAAI,KAAK,KAAK,YAAY,CAAC,MAAM;oBAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;gBACvE,IAAI,KAAK,KAAK,YAAY,CAAC,IAAI;oBAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;gBACnE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;YAC1B,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,MAAM,CAAC,~~oBAAoB~~,CAAC,CAAC,kBAAkB,~~CAChD~~,CAAC,IAAI,EAAE,QAAiB,EAAE,EAAE;gBAC1B,IAAI,QAAQ,KAAK,iBAAiB;oBAAE,OAAO,IAAI,CAAC;gBAChD,IAAI,QAAQ,KAAK,cAAc;oBAAE,OAAO,KAAK,CAAC;gBAC9C,IAAI,QAAQ,KAAK,YAAY;oBAAE,OAAO,KAAK,CAAC;gBAC5C,OAAO,KAAK,CAAC;YACf,CAAC,CACF,CAAC;YAEF,MAAM,OAAO,GAAG,yBAAyB,CACvC,KAAK,EACL,YAAY,CAAC,IAAI,EACjB,YAAyC,CAC1C,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"dialogScopeUtils.test.js","sourceRoot":"","sources":["../../../src/utils/dialogScopeUtils.test.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/envVarResolver.d.ts CHANGED Viewed

@@ -5,15 +5,18 @@
  */
 /**
  * Resolves environment variables in a string.
- * Replaces $VAR_NAME and ${VAR_NAME} with their corresponding environment variable values.
- * If the environment variable is not defined, the original placeholder is preserved.
+ * Replaces $VAR_NAME, ${VAR_NAME}, and ${VAR_NAME:-DEFAULT_VALUE} with their corresponding
+ * environment variable values. If the environment variable is not defined and no default
+ * value is provided, the original placeholder is preserved.
  *
  * @param value - The string that may contain environment variable placeholders
+ * @param customEnv - Optional record of environment variables to use before process.env
  * @returns The string with environment variables resolved
  *
  * @example
  * resolveEnvVarsInString("Token: $API_KEY") // Returns "Token: secret-123"
  * resolveEnvVarsInString("URL: ${BASE_URL}/api") // Returns "URL: https://api.example.com/api"
+ * resolveEnvVarsInString("URL: ${MISSING_VAR:-https://default.com}") // Returns "URL: https://default.com"
  * resolveEnvVarsInString("Missing: $UNDEFINED_VAR") // Returns "Missing: $UNDEFINED_VAR"
  */
 export declare function resolveEnvVarsInString(value: string, customEnv?: Record<string, string>): string;

package/dist/src/utils/envVarResolver.js CHANGED Viewed

@@ -5,27 +5,37 @@
  */
 /**
  * Resolves environment variables in a string.
- * Replaces $VAR_NAME and ${VAR_NAME} with their corresponding environment variable values.
- * If the environment variable is not defined, the original placeholder is preserved.
+ * Replaces $VAR_NAME, ${VAR_NAME}, and ${VAR_NAME:-DEFAULT_VALUE} with their corresponding
+ * environment variable values. If the environment variable is not defined and no default
+ * value is provided, the original placeholder is preserved.
  *
  * @param value - The string that may contain environment variable placeholders
+ * @param customEnv - Optional record of environment variables to use before process.env
  * @returns The string with environment variables resolved
  *
  * @example
  * resolveEnvVarsInString("Token: $API_KEY") // Returns "Token: secret-123"
  * resolveEnvVarsInString("URL: ${BASE_URL}/api") // Returns "URL: https://api.example.com/api"
+ * resolveEnvVarsInString("URL: ${MISSING_VAR:-https://default.com}") // Returns "URL: https://default.com"
  * resolveEnvVarsInString("Missing: $UNDEFINED_VAR") // Returns "Missing: $UNDEFINED_VAR"
  */
 export function resolveEnvVarsInString(value, customEnv) {
-    const envVarRegex = /\$(?:(\w+)|{([^}]+)})/g; // Find $VAR_NAME or ${VAR_NAME}
-    return value.replace(envVarRegex, (match, varName1, varName2) => {
-        const varName = varName1 || varName2;
+    // Regex matches $VAR_NAME, ${VAR_NAME}, and ${VAR_NAME:-DEFAULT_VALUE}
+    const envVarRegex = /\$(?:(\w+)|{([^}]+?)(?::-([^}]*))?})/g;
+    return value.replace(envVarRegex, (match, varName1, varName2, defaultValue) => {
+        const varName = varName1 || varName2 || '';
+        if (!varName) {
+            return match;
+        }
         if (customEnv && typeof customEnv[varName] === 'string') {
             return customEnv[varName];
         }
         if (process && process.env && typeof process.env[varName] === 'string') {
             return process.env[varName];
         }
+        if (defaultValue !== undefined) {
+            return defaultValue;
+        }
         return match;
     });
 }
@@ -78,7 +88,9 @@ function resolveEnvVarsInObjectInternal(obj, visited, customEnv) {
         }
         visited.add(obj);
         // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        const result = obj.map((item) => resolveEnvVarsInObjectInternal(item, visited, customEnv));
+        const result = obj.map((item) =>
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        resolveEnvVarsInObjectInternal(item, visited, customEnv));
         visited.delete(obj);
         return result;
     }

package/dist/src/utils/envVarResolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"envVarResolver.js","sourceRoot":"","sources":["../../../src/utils/envVarResolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH~~;;;;;;;;;;;;GAYG~~;AACH,MAAM,UAAU,sBAAsB,CACpC,KAAa,EACb,SAAkC;IAElC,MAAM,WAAW,GAAG,~~wBAAwB~~,CAAC~~,CAAC,gCAAgC~~;~~IAC9E~~,OAAO,KAAK,CAAC,OAAO,~~CAAC~~,WAAW,~~EAAE~~,~~CAAC~~,~~KAAK~~,~~EAAE~~,~~QAAQ~~,~~EAAE~~,~~QAAQ~~,~~EAAE~~,EAAE;~~QAC9D~~,MAAM,OAAO,~~GAAG~~,QAAQ,IAAI,QAAQ,CAAC;~~QACrC~~,IAAI,SAAS,IAAI,OAAO,SAAS,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YACxD,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC;QACD,IAAI,OAAO,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YACvE,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,~~CAAC~~,CAAC;~~AACL~~,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,sBAAsB,CACpC,GAAM,EACN,SAAkC;IAElC,OAAO,8BAA8B,CAAC,GAAG,EAAE,IAAI,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;AACvE,CAAC;AAED;;;;;;GAMG;AACH,SAAS,8BAA8B,CACrC,GAAM,EACN,OAAwB,EACxB,SAAkC;IAElC,IACE,GAAG,KAAK,IAAI;QACZ,GAAG,KAAK,SAAS;QACjB,OAAO,GAAG,KAAK,SAAS;QACxB,OAAO,GAAG,KAAK,QAAQ,EACvB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,uEAAuE;QACvE,OAAO,sBAAsB,CAAC,GAAG,EAAE,SAAS,CAAiB,CAAC;IAChE,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,+BAA+B;QAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,2CAA2C;YAC3C,uEAAuE;YACvE,OAAO,CAAC,GAAG,GAAG,CAAiB,CAAC;QAClC,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,uEAAuE;QACvE,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,~~CAC9B,~~8BAA8B,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CACzC,CAAC;QAClB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,+BAA+B;QAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,GAAa,CAAC,EAAE,CAAC;YAC/B,2CAA2C;YAC3C,OAAO,EAAE,GAAG,GAAG,EAAO,CAAC;QACzB,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,GAAa,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,EAAE,GAAG,GAAG,EAAO,CAAC;QAC/B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;gBACtD,MAAM,CAAC,GAAG,CAAC,GAAG,8BAA8B,CAC1C,MAAM,CAAC,GAAG,CAAC,EACX,OAAO,EACP,SAAS,CACV,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,GAAa,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
1	+ {"version":3,"file":"envVarResolver.js","sourceRoot":"","sources":["../../../src/utils/envVarResolver.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/envVarResolver.test.js CHANGED Viewed

@@ -6,28 +6,32 @@
 import { describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { resolveEnvVarsInString, resolveEnvVarsInObject, } from './envVarResolver.js';
 describe('resolveEnvVarsInString', () => {
-    let originalEnv;
     beforeEach(() => {
-        originalEnv = { ...process.env };
+        vi.stubEnv('TEST_VAR', '');
     });
     afterEach(() => {
-        process.env = originalEnv;
+        vi.unstubAllEnvs();
     });
     it('should resolve $VAR_NAME format', () => {
-        process.env['TEST_VAR'] = 'test-value';
+        vi.stubEnv('TEST_VAR', 'test-value');
         const result = resolveEnvVarsInString('Value is $TEST_VAR');
         expect(result).toBe('Value is test-value');
     });
     it('should resolve ${VAR_NAME} format', () => {
-        process.env['TEST_VAR'] = 'test-value';
+        vi.stubEnv('TEST_VAR', 'test-value');
         const result = resolveEnvVarsInString('Value is ${TEST_VAR}');
         expect(result).toBe('Value is test-value');
     });
-    it('should resolve multiple variables in the same string', () => {
-        process.env['HOST'] = 'localhost';
-        process.env['PORT'] = '3000';
+    it('should resolve multiple variables', () => {
+        vi.stubEnv('HOST', 'localhost');
+        vi.stubEnv('PORT', '8080');
         const result = resolveEnvVarsInString('URL: http://$HOST:${PORT}/api');
-        expect(result).toBe('URL: http://localhost:3000/api');
+        expect(result).toBe('URL: http://localhost:8080/api');
+    });
+    it('should support environment variables with dots', () => {
+        vi.stubEnv('FOO.BAR', 'baz');
+        const result = resolveEnvVarsInString('Value: ${FOO.BAR}');
+        expect(result).toBe('Value: baz');
     });
     it('should leave undefined variables unchanged', () => {
         const result = resolveEnvVarsInString('Value is $UNDEFINED_VAR');
@@ -46,22 +50,35 @@ describe('resolveEnvVarsInString', () => {
         expect(result).toBe('No variables here');
     });
     it('should handle mixed defined and undefined variables', () => {
-        process.env['DEFINED'] = 'value';
+        vi.stubEnv('DEFINED', 'value');
         const result = resolveEnvVarsInString('$DEFINED and $UNDEFINED mixed');
         expect(result).toBe('value and $UNDEFINED mixed');
     });
+    it('should use default value when environment variable is missing', () => {
+        const result = resolveEnvVarsInString('URL: ${MISSING_VAR:-https://default.example.com}/api');
+        expect(result).toBe('URL: https://default.example.com/api');
+    });
+    it('should ignore default value when environment variable is present', () => {
+        vi.stubEnv('PRESENT_VAR', 'https://actual.example.com');
+        const result = resolveEnvVarsInString('URL: ${PRESENT_VAR:-https://default.example.com}/api');
+        expect(result).toBe('URL: https://actual.example.com/api');
+    });
+    it('should support empty default value', () => {
+        const result = resolveEnvVarsInString('Value: ${MISSING_VAR:-}');
+        expect(result).toBe('Value: ');
+    });
+    it('should correctly handle default values that contain colons or dashes', () => {
+        const result = resolveEnvVarsInString('Value: ${MISSING_VAR:-val:-123-abc}');
+        expect(result).toBe('Value: val:-123-abc');
+    });
 });
 describe('resolveEnvVarsInObject', () => {
-    let originalEnv;
-    beforeEach(() => {
-        originalEnv = { ...process.env };
-    });
     afterEach(() => {
-        process.env = originalEnv;
+        vi.unstubAllEnvs();
     });
     it('should resolve variables in nested objects', () => {
-        process.env['API_KEY'] = 'secret-123';
-        process.env['DB_URL'] = 'postgresql://localhost/test';
+        vi.stubEnv('API_KEY', 'secret-123');
+        vi.stubEnv('DB_URL', 'postgresql://localhost/test');
         const config = {
             server: {
                 auth: {
@@ -83,8 +100,8 @@ describe('resolveEnvVarsInObject', () => {
         });
     });
     it('should resolve variables in arrays', () => {
-        process.env['ENV'] = 'production';
-        process.env['VERSION'] = '1.0.0';
+        vi.stubEnv('ENV', 'production');
+        vi.stubEnv('VERSION', '1.0.0');
         const config = {
             tags: ['$ENV', 'app', '${VERSION}'],
             metadata: {
@@ -111,8 +128,8 @@ describe('resolveEnvVarsInObject', () => {
         expect(result).toEqual(config);
     });
     it('should handle MCP server config structure', () => {
-        process.env['API_TOKEN'] = 'token-123';
-        process.env['SERVER_PORT'] = '8080';
+        vi.stubEnv('API_TOKEN', 'token-123');
+        vi.stubEnv('SERVER_PORT', '8080');
         const extensionConfig = {
             name: 'test-extension',
             version: '1.0.0',
@@ -157,7 +174,7 @@ describe('resolveEnvVarsInObject', () => {
         expect(result).toEqual(config);
     });
     it('should handle circular references in objects without infinite recursion', () => {
-        process.env['TEST_VAR'] = 'resolved-value';
+        vi.stubEnv('TEST_VAR', 'resolved-value');
         const config = {
             name: '$TEST_VAR',
             value: 42,
@@ -174,7 +191,7 @@ describe('resolveEnvVarsInObject', () => {
         expect(result.self).not.toBe(result);
     });
     it('should handle circular references in arrays without infinite recursion', () => {
-        process.env['ARRAY_VAR'] = 'array-value';
+        vi.stubEnv('ARRAY_VAR', 'array-value');
         const arr = ['$ARRAY_VAR', 123];
         // Create circular reference
         arr.push(arr);
@@ -189,7 +206,7 @@ describe('resolveEnvVarsInObject', () => {
         expect(result[2]).not.toBe(result);
     });
     it('should handle complex nested circular references', () => {
-        process.env['NESTED_VAR'] = 'nested-resolved';
+        vi.stubEnv('NESTED_VAR', 'nested-resolved');
         const obj1 = { name: '$NESTED_VAR', id: 1 };
         const obj2 = { name: 'static', id: 2 };
         // Create cross-references