@vybestack/llxprt-code 0.3.4 → 0.4.1-nightly.250922.4a350bed

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

@@ -3,6 +3,7 @@
  * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import type { Settings } from './settings.js';
 export declare const TRUSTED_FOLDERS_FILENAME = "trustedFolders.json";
 export declare const SETTINGS_DIRECTORY_NAME = ".llxprt";
 export declare const USER_SETTINGS_DIR: string;
@@ -25,12 +26,22 @@ export interface TrustedFoldersFile {
     path: string;
 }
 export declare class LoadedTrustedFolders {
-    user: TrustedFoldersFile;
-    errors: TrustedFoldersError[];
+    readonly user: TrustedFoldersFile;
+    readonly errors: TrustedFoldersError[];
     constructor(user: TrustedFoldersFile, errors: TrustedFoldersError[]);
     get rules(): TrustRule[];
+    /**
+     * Returns true or false if the path should be "trusted". This function
+     * should only be invoked when the folder trust setting is active.
+     *
+     * @param location path
+     * @returns
+     */
+    isPathTrusted(location: string): boolean | undefined;
     setValue(path: string, trustLevel: TrustLevel): void;
 }
 export declare function loadTrustedFolders(): LoadedTrustedFolders;
 export declare function saveTrustedFolders(trustedFoldersFile: TrustedFoldersFile): void;
-export declare function isWorkspaceTrusted(): boolean | undefined;
+/** Is folder trust feature enabled per the current applied settings */
+export declare function isFolderTrustEnabled(settings: Settings): boolean;
+export declare function isWorkspaceTrusted(settings: Settings): boolean | undefined;

package/dist/src/config/trustedFolders.js

@@ -3,10 +3,10 @@
  * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import * as fs from 'fs';
-import * as path from 'path';
-import { homedir } from 'os';
-import { getErrorMessage, isWithinRoot } from '@vybestack/llxprt-code-core';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { homedir } from 'node:os';
+import { getErrorMessage, isWithinRoot, getIdeTrust, } from '@vybestack/llxprt-code-core';
 import stripJsonComments from 'strip-json-comments';
 export const TRUSTED_FOLDERS_FILENAME = 'trustedFolders.json';
 export const SETTINGS_DIRECTORY_NAME = '.llxprt';
@@ -31,6 +31,44 @@ export class LoadedTrustedFolders {
             trustLevel,
         }));
     }
+    /**
+     * Returns true or false if the path should be "trusted". This function
+     * should only be invoked when the folder trust setting is active.
+     *
+     * @param location path
+     * @returns
+     */
+    isPathTrusted(location) {
+        const trustedPaths = [];
+        const untrustedPaths = [];
+        for (const rule of this.rules) {
+            switch (rule.trustLevel) {
+                case TrustLevel.TRUST_FOLDER:
+                    trustedPaths.push(rule.path);
+                    break;
+                case TrustLevel.TRUST_PARENT:
+                    trustedPaths.push(path.dirname(rule.path));
+                    break;
+                case TrustLevel.DO_NOT_TRUST:
+                    untrustedPaths.push(rule.path);
+                    break;
+                default:
+                    // Do nothing for unknown trust levels.
+                    break;
+            }
+        }
+        for (const trustedPath of trustedPaths) {
+            if (isWithinRoot(location, trustedPath)) {
+                return true;
+            }
+        }
+        for (const untrustedPath of untrustedPaths) {
+            if (path.normalize(location) === path.normalize(untrustedPath)) {
+                return false;
+            }
+        }
+        return undefined;
+    }
     setValue(path, trustLevel) {
         this.user.config[path] = trustLevel;
         saveTrustedFolders(this.user);
@@ -65,48 +103,36 @@ export function saveTrustedFolders(trustedFoldersFile) {
         if (!fs.existsSync(dirPath)) {
             fs.mkdirSync(dirPath, { recursive: true });
         }
-        fs.writeFileSync(trustedFoldersFile.path, JSON.stringify(trustedFoldersFile.config, null, 2), 'utf-8');
+        fs.writeFileSync(trustedFoldersFile.path, JSON.stringify(trustedFoldersFile.config, null, 2), { encoding: 'utf-8', mode: 0o600 });
     }
     catch (error) {
         console.error('Error saving trusted folders file:', error);
     }
 }
-export function isWorkspaceTrusted() {
-    const { rules, errors } = loadTrustedFolders();
-    if (errors.length > 0) {
-        for (const error of errors) {
+/** Is folder trust feature enabled per the current applied settings */
+export function isFolderTrustEnabled(settings) {
+    // In llxprt, we use flat settings structure
+    const folderTrustSetting = settings.folderTrust ?? false;
+    return folderTrustSetting;
+}
+function getWorkspaceTrustFromLocalConfig() {
+    const folders = loadTrustedFolders();
+    if (folders.errors.length > 0) {
+        for (const error of folders.errors) {
             console.error(`Error loading trusted folders config from ${error.path}: ${error.message}`);
         }
     }
-    const trustedPaths = [];
-    const untrustedPaths = [];
-    for (const rule of rules) {
-        switch (rule.trustLevel) {
-            case TrustLevel.TRUST_FOLDER:
-                trustedPaths.push(rule.path);
-                break;
-            case TrustLevel.TRUST_PARENT:
-                trustedPaths.push(path.dirname(rule.path));
-                break;
-            case TrustLevel.DO_NOT_TRUST:
-                untrustedPaths.push(rule.path);
-                break;
-            default:
-                // Do nothing for unknown trust levels.
-                break;
-        }
-    }
-    const cwd = process.cwd();
-    for (const trustedPath of trustedPaths) {
-        if (isWithinRoot(cwd, trustedPath)) {
-            return true;
-        }
+    return folders.isPathTrusted(process.cwd());
+}
+export function isWorkspaceTrusted(settings) {
+    if (!isFolderTrustEnabled(settings)) {
+        return true;
     }
-    for (const untrustedPath of untrustedPaths) {
-        if (path.normalize(cwd) === path.normalize(untrustedPath)) {
-            return false;
-        }
+    const ideTrust = getIdeTrust();
+    if (ideTrust !== undefined) {
+        return ideTrust;
     }
-    return undefined;
+    // Fall back to the local user configuration
+    return getWorkspaceTrustFromLocalConfig();
 }
 //# sourceMappingURL=trustedFolders.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"trustedFolders.js","sourceRoot":"","sources":["../../../src/config/trustedFolders.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"trustedFolders.js","sourceRoot":"","sources":["../../../src/config/trustedFolders.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EACL,eAAe,EACf,YAAY,EACZ,WAAW,GACZ,MAAM,6BAA6B,CAAC;AACrC,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAGpD,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAqB,CAAC;AAC9D,MAAM,CAAC,MAAM,uBAAuB,GAAG,SAAS,CAAC;AACjD,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,uBAAuB,CAAC,CAAC;AAC/E,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAAC,IAAI,CAChD,iBAAiB,EACjB,wBAAwB,CACzB,CAAC;AAEF,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,2CAA6B,CAAA;IAC7B,2CAA6B,CAAA;IAC7B,2CAA6B,CAAA;AAC/B,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AAiBD,MAAM,OAAO,oBAAoB;IAEpB;IACA;IAFX,YACW,IAAwB,EACxB,MAA6B;QAD7B,SAAI,GAAJ,IAAI,CAAoB;QACxB,WAAM,GAAN,MAAM,CAAuB;IACrC,CAAC;IAEJ,IAAI,KAAK;QACP,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;YACnE,IAAI;YACJ,UAAU;SACX,CAAC,CAAC,CAAC;IACN,CAAC;IAED;;;;;;OAMG;IACH,aAAa,CAAC,QAAgB;QAC5B,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,MAAM,cAAc,GAAa,EAAE,CAAC;QAEpC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC;gBACxB,KAAK,UAAU,CAAC,YAAY;oBAC1B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC7B,MAAM;gBACR,KAAK,UAAU,CAAC,YAAY;oBAC1B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC3C,MAAM;gBACR,KAAK,UAAU,CAAC,YAAY;oBAC1B,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC/B,MAAM;gBACR;oBACE,uCAAuC;oBACvC,MAAM;YACV,CAAC;QACH,CAAC;QAED,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,IAAI,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC;gBACxC,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;YAC3C,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC/D,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,QAAQ,CAAC,IAAY,EAAE,UAAsB;QAC3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;QACpC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CACF;AAED,MAAM,UAAU,kBAAkB;IAChC,MAAM,MAAM,GAA0B,EAAE,CAAC;IACzC,MAAM,UAAU,GAA+B,EAAE,CAAC;IAElD,MAAM,QAAQ,GAAG,yBAAyB,CAAC;IAE3C,4BAA4B;IAC5B,IAAI,CAAC;QACH,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACnD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAGnD,CAAC;YACF,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC;YAC/B,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,oBAAoB,CAC7B,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,EACtC,MAAM,CACP,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,kBAAsC;IAEtC,IAAI,CAAC;QACH,8BAA8B;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,CAAC;QAED,EAAE,CAAC,aAAa,CACd,kBAAkB,CAAC,IAAI,EACvB,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAClD,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CACnC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,oBAAoB,CAAC,QAAkB;IACrD,4CAA4C;IAC5C,MAAM,kBAAkB,GAAG,QAAQ,CAAC,WAAW,IAAI,KAAK,CAAC;IACzD,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,SAAS,gCAAgC;IACvC,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;IAErC,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnC,OAAO,CAAC,KAAK,CACX,6CAA6C,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,CAC5E,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,QAAkB;IACnD,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,4CAA4C;IAC5C,OAAO,gCAAgC,EAAE,CAAC;AAC5C,CAAC"}

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

@@ -53,6 +53,40 @@ describe('Trusted Folders Loading', () => {
         expect(rules).toEqual([]);
         expect(errors).toEqual([]);
     });
+    describe('isPathTrusted', () => {
+        function setup({ config = {} } = {}) {
+            mockFsExistsSync.mockImplementation((p) => p === USER_TRUSTED_FOLDERS_PATH);
+            fs.readFileSync.mockImplementation((p) => {
+                if (p === USER_TRUSTED_FOLDERS_PATH)
+                    return JSON.stringify(config);
+                return '{}';
+            });
+            const folders = loadTrustedFolders();
+            return { folders };
+        }
+        it('provides a method to determine if a path is trusted', () => {
+            const { folders } = setup({
+                config: {
+                    './myfolder': TrustLevel.TRUST_FOLDER,
+                    '/trustedparent/trustme': TrustLevel.TRUST_PARENT,
+                    '/user/folder': TrustLevel.TRUST_FOLDER,
+                    '/secret': TrustLevel.DO_NOT_TRUST,
+                    '/secret/publickeys': TrustLevel.TRUST_FOLDER,
+                },
+            });
+            expect(folders.isPathTrusted('/secret')).toBe(false);
+            expect(folders.isPathTrusted('/user/folder')).toBe(true);
+            expect(folders.isPathTrusted('/secret/publickeys/public.pem')).toBe(true);
+            expect(folders.isPathTrusted('/user/folder/harhar')).toBe(true);
+            expect(folders.isPathTrusted('myfolder/somefile.jpg')).toBe(true);
+            expect(folders.isPathTrusted('/trustedparent/someotherfolder')).toBe(true);
+            expect(folders.isPathTrusted('/trustedparent/trustme')).toBe(true);
+            // No explicit rule covers this file
+            expect(folders.isPathTrusted('/secret/bankaccounts.json')).toBe(undefined);
+            expect(folders.isPathTrusted('/secret/mine/privatekey.pem')).toBe(undefined);
+            expect(folders.isPathTrusted('/user/someotherfolder')).toBe(undefined);
+        });
+    });
     it('should load user rules if only user file exists', () => {
         const userPath = USER_TRUSTED_FOLDERS_PATH;
         mockFsExistsSync.mockImplementation((p) => p === userPath);
@@ -88,12 +122,15 @@ describe('Trusted Folders Loading', () => {
         const loadedFolders = loadTrustedFolders();
         loadedFolders.setValue('/new/path', TrustLevel.TRUST_FOLDER);
         expect(loadedFolders.user.config['/new/path']).toBe(TrustLevel.TRUST_FOLDER);
-        expect(mockFsWriteFileSync).toHaveBeenCalledWith(USER_TRUSTED_FOLDERS_PATH, JSON.stringify({ '/new/path': TrustLevel.TRUST_FOLDER }, null, 2), 'utf-8');
+        expect(mockFsWriteFileSync).toHaveBeenCalledWith(USER_TRUSTED_FOLDERS_PATH, JSON.stringify({ '/new/path': TrustLevel.TRUST_FOLDER }, null, 2), { encoding: 'utf-8', mode: 0o600 });
     });
 });
 describe('isWorkspaceTrusted', () => {
     let mockCwd;
     const mockRules = {};
+    const mockSettings = {
+        folderTrust: true,
+    };
     beforeEach(() => {
         vi.spyOn(process, 'cwd').mockImplementation(() => mockCwd);
         vi.spyOn(fs, 'readFileSync').mockImplementation((p) => {
@@ -112,45 +149,83 @@ describe('isWorkspaceTrusted', () => {
     it('should return true for a directly trusted folder', () => {
         mockCwd = '/home/user/projectA';
         mockRules['/home/user/projectA'] = TrustLevel.TRUST_FOLDER;
-        expect(isWorkspaceTrusted()).toBe(true);
+        expect(isWorkspaceTrusted(mockSettings)).toBe(true);
     });
     it('should return true for a child of a trusted folder', () => {
         mockCwd = '/home/user/projectA/src';
         mockRules['/home/user/projectA'] = TrustLevel.TRUST_FOLDER;
-        expect(isWorkspaceTrusted()).toBe(true);
+        expect(isWorkspaceTrusted(mockSettings)).toBe(true);
     });
     it('should return true for a child of a trusted parent folder', () => {
         mockCwd = '/home/user/projectB';
         mockRules['/home/user/projectB/somefile.txt'] = TrustLevel.TRUST_PARENT;
-        expect(isWorkspaceTrusted()).toBe(true);
+        expect(isWorkspaceTrusted(mockSettings)).toBe(true);
     });
     it('should return false for a directly untrusted folder', () => {
         mockCwd = '/home/user/untrusted';
         mockRules['/home/user/untrusted'] = TrustLevel.DO_NOT_TRUST;
-        expect(isWorkspaceTrusted()).toBe(false);
+        expect(isWorkspaceTrusted(mockSettings)).toBe(false);
     });
     it('should return undefined for a child of an untrusted folder', () => {
         mockCwd = '/home/user/untrusted/src';
         mockRules['/home/user/untrusted'] = TrustLevel.DO_NOT_TRUST;
-        expect(isWorkspaceTrusted()).toBeUndefined();
+        expect(isWorkspaceTrusted(mockSettings)).toBeUndefined();
     });
     it('should return undefined when no rules match', () => {
         mockCwd = '/home/user/other';
         mockRules['/home/user/projectA'] = TrustLevel.TRUST_FOLDER;
         mockRules['/home/user/untrusted'] = TrustLevel.DO_NOT_TRUST;
-        expect(isWorkspaceTrusted()).toBeUndefined();
+        expect(isWorkspaceTrusted(mockSettings)).toBeUndefined();
     });
     it('should prioritize trust over distrust', () => {
         mockCwd = '/home/user/projectA/untrusted';
         mockRules['/home/user/projectA'] = TrustLevel.TRUST_FOLDER;
         mockRules['/home/user/projectA/untrusted'] = TrustLevel.DO_NOT_TRUST;
-        expect(isWorkspaceTrusted()).toBe(true);
+        expect(isWorkspaceTrusted(mockSettings)).toBe(true);
     });
     it('should handle path normalization', () => {
         mockCwd = '/home/user/projectA';
         mockRules[`/home/user/../user/${path.basename('/home/user/projectA')}`] =
             TrustLevel.TRUST_FOLDER;
-        expect(isWorkspaceTrusted()).toBe(true);
+        expect(isWorkspaceTrusted(mockSettings)).toBe(true);
+    });
+});
+import { getIdeTrust } from '@vybestack/llxprt-code-core';
+vi.mock('@vybestack/llxprt-code-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        getIdeTrust: vi.fn(),
+    };
+});
+describe('isWorkspaceTrusted with IDE override', () => {
+    const mockSettings = {
+        folderTrust: true,
+    };
+    it('should return true when ideTrust is true, ignoring config', () => {
+        vi.mocked(getIdeTrust).mockReturnValue(true);
+        // Even if config says don't trust, ideTrust should win.
+        vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify({ [process.cwd()]: TrustLevel.DO_NOT_TRUST }));
+        expect(isWorkspaceTrusted(mockSettings)).toBe(true);
+    });
+    it('should return false when ideTrust is false, ignoring config', () => {
+        vi.mocked(getIdeTrust).mockReturnValue(false);
+        // Even if config says trust, ideTrust should win.
+        vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify({ [process.cwd()]: TrustLevel.TRUST_FOLDER }));
+        expect(isWorkspaceTrusted(mockSettings)).toBe(false);
+    });
+    it('should fall back to config when ideTrust is undefined', () => {
+        vi.mocked(getIdeTrust).mockReturnValue(undefined);
+        vi.spyOn(fs, 'existsSync').mockReturnValue(true);
+        vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify({ [process.cwd()]: TrustLevel.TRUST_FOLDER }));
+        expect(isWorkspaceTrusted(mockSettings)).toBe(true);
+    });
+    it('should always return true if folderTrust setting is disabled', () => {
+        const settings = {
+            folderTrust: false,
+        };
+        vi.mocked(getIdeTrust).mockReturnValue(false);
+        expect(isWorkspaceTrusted(settings)).toBe(true);
     });
 });
 //# sourceMappingURL=trustedFolders.test.js.map

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

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

package/dist/src/gemini.js

@@ -1,11 +1,12 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * @license
  * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import React from 'react';
-import { render } from 'ink';
+import React, { useState, useEffect } from 'react';
+import { render, Box, Text } from 'ink';
+import Spinner from 'ink-spinner';
 import { AppWrapper } from './ui/App.js';
 import { ErrorBoundary } from './ui/components/ErrorBoundary.js';
 import { loadCliConfig, parseArguments } from './config/config.js';
@@ -19,7 +20,7 @@ import { spawn } from 'node:child_process';
 import { start_sandbox } from './utils/sandbox.js';
 import chalk from 'chalk';
 import { loadSettings, SettingScope, } from './config/settings.js';
-import { getSettingsService, sessionId, AuthType, getOauthClient, setGitStatsService, FatalConfigError,
+import { getSettingsService, sessionId, AuthType, getOauthClient, setGitStatsService, FatalConfigError, uiTelemetryService,
 // IDE connection logging removed - telemetry disabled in llxprt
  } from '@vybestack/llxprt-code-core';
 import { themeManager } from './ui/themes/theme-manager.js';
@@ -28,7 +29,7 @@ import { getUserStartupWarnings } from './utils/userStartupWarnings.js';
 import { ConsolePatcher } from './ui/utils/ConsolePatcher.js';
 import { runNonInteractive } from './nonInteractiveCli.js';
 import { loadExtensions } from './config/extension.js';
-import { cleanupCheckpoints, registerCleanup } from './utils/cleanup.js';
+import { cleanupCheckpoints, registerCleanup, runExitCleanup, } from './utils/cleanup.js';
 import { getCliVersion } from './utils/version.js';
 import { validateAuthMethod } from './config/auth.js';
 import { setMaxSizedBoxDebugging } from './ui/components/shared/MaxSizedBox.js';
@@ -41,6 +42,7 @@ import { handleAutoUpdate } from './utils/handleAutoUpdate.js';
 import { GitStatsServiceImpl } from './providers/logging/git-stats-service-impl.js';
 import { appEvents, AppEvent } from './utils/events.js';
 import { SettingsContext } from './ui/contexts/SettingsContext.js';
+import { writeFileSync } from 'node:fs';
 export function validateDnsResolutionOrder(order) {
     const defaultValue = 'ipv4first';
     if (order === undefined) {
@@ -83,6 +85,26 @@ async function relaunchWithAdditionalArgs(additionalArgs) {
     await new Promise((resolve) => child.on('close', resolve));
     process.exit(0);
 }
+const InitializingComponent = ({ initialTotal }) => {
+    const [total, setTotal] = useState(initialTotal);
+    const [connected, setConnected] = useState(0);
+    useEffect(() => {
+        const onStart = ({ count }) => setTotal(count);
+        const onChange = () => {
+            setConnected((val) => val + 1);
+        };
+        appEvents.on('mcp-servers-discovery-start', onStart);
+        appEvents.on('mcp-server-connected', onChange);
+        appEvents.on('mcp-server-error', onChange);
+        return () => {
+            appEvents.off('mcp-servers-discovery-start', onStart);
+            appEvents.off('mcp-server-connected', onChange);
+            appEvents.off('mcp-server-error', onChange);
+        };
+    }, []);
+    const message = `Connecting to MCP servers... (${connected}/${total})`;
+    return (_jsx(Box, { children: _jsxs(Text, { children: [_jsx(Spinner, {}), " ", message] }) }));
+};
 import { runZedIntegration } from './zed-integration/zedIntegration.js';
 import { existsSync, mkdirSync } from 'fs';
 import { homedir } from 'os';
@@ -162,7 +184,25 @@ export async function main() {
     const workspaceRoot = process.cwd();
     const settings = loadSettings(workspaceRoot);
     const argv = await parseArguments(settings.merged);
+    const hasPipedInput = !process.stdin.isTTY;
+    let cachedStdinData = null;
+    let stdinWasRead = false;
+    const readStdinOnce = async () => {
+        if (!stdinWasRead) {
+            stdinWasRead = true;
+            cachedStdinData = await readStdin();
+        }
+        return cachedStdinData ?? '';
+    };
+    const questionFromArgs = argv.promptInteractive || argv.prompt || (argv.promptWords || []).join(' ');
     await cleanupCheckpoints();
+    if (hasPipedInput) {
+        const stdinSnapshot = await readStdinOnce();
+        if (!stdinSnapshot && !questionFromArgs) {
+            console.error(`No input provided via stdin. Input can be provided by piping data into gemini or using the --prompt option.`);
+            process.exit(1);
+        }
+    }
     if (settings.errors.length > 0) {
         const errorMessages = settings.errors.map((error) => `Error in ${error.path}: ${error.message}`);
         throw new FatalConfigError(`${errorMessages.join('\n')}\nPlease fix the configuration file(s) and try again.`);
@@ -176,6 +216,12 @@ export async function main() {
     }
     const extensions = loadExtensions(workspaceRoot);
     const config = await loadCliConfig(settings.merged, extensions, sessionId, argv);
+    if (argv.sessionSummary) {
+        registerCleanup(() => {
+            const metrics = uiTelemetryService.getMetrics();
+            writeFileSync(argv.sessionSummary, JSON.stringify({ sessionMetrics: metrics }, null, 2));
+        });
+    }
     const consolePatcher = new ConsolePatcher({
         stderr: true,
         debugMode: config.getDebugMode(),
@@ -217,15 +263,22 @@ export async function main() {
             settings.setValue(SettingScope.User, 'selectedAuthType', AuthType.USE_NONE);
         }
     }
-    // Empty key causes issues with the GoogleGenAI package.
-    if (process.env['GEMINI_API_KEY']?.trim() === '') {
-        delete process.env['GEMINI_API_KEY'];
-    }
-    if (process.env['GOOGLE_API_KEY']?.trim() === '') {
-        delete process.env['GOOGLE_API_KEY'];
-    }
     setMaxSizedBoxDebugging(config.getDebugMode());
+    const mcpServers = config.getMcpServers();
+    const mcpServersCount = mcpServers ? Object.keys(mcpServers).length : 0;
+    let spinnerInstance;
+    if (typeof config.isInteractive === 'function' &&
+        config.isInteractive() &&
+        mcpServersCount > 0) {
+        spinnerInstance = render(_jsx(InitializingComponent, { initialTotal: mcpServersCount }));
+    }
     await config.initialize();
+    if (spinnerInstance) {
+        // Small UX detail to show the completion message for a bit before unmounting.
+        await new Promise((f) => setTimeout(f, 100));
+        spinnerInstance.clear();
+        spinnerInstance.unmount();
+    }
     if (config.getIdeMode()) {
         const ideClient = config.getIdeClient();
         if (ideClient) {
@@ -448,8 +501,8 @@ export async function main() {
                 }
             }
             let stdinData = '';
-            if (!process.stdin.isTTY) {
-                stdinData = await readStdin();
+            if (hasPipedInput) {
+                stdinData = await readStdinOnce();
             }
             // This function is a copy of the one from sandbox.ts
             // It is moved here to decouple sandbox.ts from the CLI's argument structure.
@@ -515,16 +568,17 @@ export async function main() {
     // Check if a provider is already active on startup
     providerManager.getActiveProvider();
     // Render UI, passing necessary config values. Check that there is no command line question.
-    if (config.isInteractive()) {
+    if (typeof config.isInteractive === 'function' && config.isInteractive()) {
         await startInteractiveUI(config, settings, startupWarnings, workspaceRoot);
         return;
     }
     // If not a TTY, read from stdin
     // This is for cases where the user pipes input directly into the command
-    if (!process.stdin.isTTY) {
-        const stdinData = await readStdin();
+    if (hasPipedInput) {
+        const stdinData = await readStdinOnce();
         if (stdinData) {
-            input = `${stdinData}\n\n${input}`;
+            const existingInput = input ? `${input}` : '';
+            input = `${stdinData}\n\n${existingInput}`;
         }
     }
     if (!input) {
@@ -534,6 +588,8 @@ export async function main() {
     const prompt_id = Math.random().toString(16).slice(2);
     const nonInteractiveConfig = await validateNonInteractiveAuth(settings.merged.selectedAuthType, settings.merged.useExternalAuth, config);
     await runNonInteractive(nonInteractiveConfig, input, prompt_id);
+    // Call cleanup before process.exit, which causes cleanup to not run
+    await runExitCleanup();
     process.exit(0);
 }
 function setWindowTitle(title, settings) {