@machina.ai/cell-cli-core 1.0.21-rc4 → 1.4.0-rc1

package/dist/src/utils/installationManager.js

@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as fs from 'node:fs';
+import { randomUUID } from 'node:crypto';
+import * as path from 'node:path';
+import { Storage } from '../config/storage.js';
+export class InstallationManager {
+    getInstallationIdPath() {
+        return Storage.getInstallationIdPath();
+    }
+    readInstallationIdFromFile() {
+        const installationIdFile = this.getInstallationIdPath();
+        if (fs.existsSync(installationIdFile)) {
+            const installationid = fs
+                .readFileSync(installationIdFile, 'utf-8')
+                .trim();
+            return installationid || null;
+        }
+        return null;
+    }
+    writeInstallationIdToFile(installationId) {
+        const installationIdFile = this.getInstallationIdPath();
+        const dir = path.dirname(installationIdFile);
+        fs.mkdirSync(dir, { recursive: true });
+        fs.writeFileSync(installationIdFile, installationId, 'utf-8');
+    }
+    /**
+     * Retrieves the installation ID from a file, creating it if it doesn't exist.
+     * This ID is used for unique user installation tracking.
+     * @returns A UUID string for the user.
+     */
+    getInstallationId() {
+        try {
+            let installationId = this.readInstallationIdFromFile();
+            if (!installationId) {
+                installationId = randomUUID();
+                this.writeInstallationIdToFile(installationId);
+            }
+            return installationId;
+        }
+        catch (error) {
+            console.error('Error accessing installation ID file, generating ephemeral ID:', error);
+            return '123456789';
+        }
+    }
+}
+//# sourceMappingURL=installationManager.js.map

package/dist/src/utils/installationManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"installationManager.js","sourceRoot":"","sources":["../../../src/utils/installationManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,MAAM,OAAO,mBAAmB;IACtB,qBAAqB;QAC3B,OAAO,OAAO,CAAC,qBAAqB,EAAE,CAAC;IACzC,CAAC;IAEO,0BAA0B;QAChC,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACxD,IAAI,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACtC,MAAM,cAAc,GAAG,EAAE;iBACtB,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC;iBACzC,IAAI,EAAE,CAAC;YACV,OAAO,cAAc,IAAI,IAAI,CAAC;QAChC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,yBAAyB,CAAC,cAAsB;QACtD,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACxD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAC7C,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACvC,EAAE,CAAC,aAAa,CAAC,kBAAkB,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;IAED;;;;OAIG;IACH,iBAAiB;QACf,IAAI,CAAC;YACH,IAAI,cAAc,GAAG,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAEvD,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,cAAc,GAAG,UAAU,EAAE,CAAC;gBAC9B,IAAI,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC;YACjD,CAAC;YAED,OAAO,cAAc,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CACX,gEAAgE,EAChE,KAAK,CACN,CAAC;YACF,OAAO,WAAW,CAAC;QACrB,CAAC;IACH,CAAC;CACF"}

package/dist/src/utils/installationManager.test.d.ts

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

package/dist/src/utils/installationManager.test.js

@@ -0,0 +1,83 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { InstallationManager } from './installationManager.js';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import path from 'node:path';
+import { randomUUID } from 'node:crypto';
+vi.mock('node:fs', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        readFileSync: vi.fn(actual.readFileSync),
+        existsSync: vi.fn(actual.existsSync),
+    };
+});
+vi.mock('os', async (importOriginal) => {
+    const os = await importOriginal();
+    return {
+        ...os,
+        homedir: vi.fn(),
+    };
+});
+vi.mock('crypto', async (importOriginal) => {
+    const crypto = await importOriginal();
+    return {
+        ...crypto,
+        randomUUID: vi.fn(),
+    };
+});
+describe('InstallationManager', () => {
+    let tempHomeDir;
+    let installationManager;
+    const installationIdFile = () => path.join(tempHomeDir, '.cell-cli', 'installation_id');
+    beforeEach(() => {
+        tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-cli-test-home-'));
+        os.homedir.mockReturnValue(tempHomeDir);
+        installationManager = new InstallationManager();
+    });
+    afterEach(() => {
+        fs.rmSync(tempHomeDir, { recursive: true, force: true });
+        vi.clearAllMocks();
+    });
+    describe('getInstallationId', () => {
+        it('should create and write a new installation ID if one does not exist', () => {
+            const newId = 'new-uuid-123';
+            randomUUID.mockReturnValue(newId);
+            const installationId = installationManager.getInstallationId();
+            expect(installationId).toBe(newId);
+            expect(fs.existsSync(installationIdFile())).toBe(true);
+            expect(fs.readFileSync(installationIdFile(), 'utf-8')).toBe(newId);
+        });
+        it('should read an existing installation ID from a file', () => {
+            const existingId = 'existing-uuid-123';
+            fs.mkdirSync(path.dirname(installationIdFile()), { recursive: true });
+            fs.writeFileSync(installationIdFile(), existingId);
+            const installationId = installationManager.getInstallationId();
+            expect(installationId).toBe(existingId);
+        });
+        it('should return the same ID on subsequent calls', () => {
+            const firstId = installationManager.getInstallationId();
+            const secondId = installationManager.getInstallationId();
+            expect(secondId).toBe(firstId);
+        });
+        it('should handle read errors and return a fallback ID', () => {
+            vi.mocked(fs.existsSync).mockReturnValueOnce(true);
+            const readSpy = vi.mocked(fs.readFileSync);
+            readSpy.mockImplementationOnce(() => {
+                throw new Error('Read error');
+            });
+            const consoleErrorSpy = vi
+                .spyOn(console, 'error')
+                .mockImplementation(() => { });
+            const id = installationManager.getInstallationId();
+            expect(id).toBe('123456789');
+            expect(consoleErrorSpy).toHaveBeenCalled();
+        });
+    });
+});
+//# sourceMappingURL=installationManager.test.js.map

package/dist/src/utils/installationManager.test.js.map

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

package/dist/src/utils/language-detection.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export declare function getLanguageFromFilePath(filePath: string): string | undefined;

package/dist/src/utils/language-detection.js

@@ -0,0 +1,101 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as path from 'node:path';
+const extensionToLanguageMap = {
+    '.ts': 'TypeScript',
+    '.js': 'JavaScript',
+    '.mjs': 'JavaScript',
+    '.cjs': 'JavaScript',
+    '.jsx': 'JavaScript',
+    '.tsx': 'TypeScript',
+    '.py': 'Python',
+    '.java': 'Java',
+    '.go': 'Go',
+    '.rb': 'Ruby',
+    '.php': 'PHP',
+    '.phtml': 'PHP',
+    '.cs': 'C#',
+    '.cpp': 'C++',
+    '.cxx': 'C++',
+    '.cc': 'C++',
+    '.c': 'C',
+    '.h': 'C/C++',
+    '.hpp': 'C++',
+    '.swift': 'Swift',
+    '.kt': 'Kotlin',
+    '.rs': 'Rust',
+    '.m': 'Objective-C',
+    '.mm': 'Objective-C',
+    '.pl': 'Perl',
+    '.pm': 'Perl',
+    '.lua': 'Lua',
+    '.r': 'R',
+    '.scala': 'Scala',
+    '.sc': 'Scala',
+    '.sh': 'Shell',
+    '.ps1': 'PowerShell',
+    '.bat': 'Batch',
+    '.cmd': 'Batch',
+    '.sql': 'SQL',
+    '.html': 'HTML',
+    '.htm': 'HTML',
+    '.css': 'CSS',
+    '.less': 'Less',
+    '.sass': 'Sass',
+    '.scss': 'Sass',
+    '.json': 'JSON',
+    '.xml': 'XML',
+    '.yaml': 'YAML',
+    '.yml': 'YAML',
+    '.md': 'Markdown',
+    '.markdown': 'Markdown',
+    '.dockerfile': 'Dockerfile',
+    '.vim': 'Vim script',
+    '.vb': 'Visual Basic',
+    '.fs': 'F#',
+    '.clj': 'Clojure',
+    '.cljs': 'Clojure',
+    '.dart': 'Dart',
+    '.ex': 'Elixir',
+    '.erl': 'Erlang',
+    '.hs': 'Haskell',
+    '.lisp': 'Lisp',
+    '.rkt': 'Racket',
+    '.groovy': 'Groovy',
+    '.jl': 'Julia',
+    '.tex': 'LaTeX',
+    '.ino': 'Arduino',
+    '.asm': 'Assembly',
+    '.s': 'Assembly',
+    '.toml': 'TOML',
+    '.vue': 'Vue',
+    '.svelte': 'Svelte',
+    '.gohtml': 'Go Template',
+    '.hbs': 'Handlebars',
+    '.ejs': 'EJS',
+    '.erb': 'ERB',
+    '.jsp': 'JSP',
+    '.dockerignore': 'Docker',
+    '.gitignore': 'Git',
+    '.npmignore': 'npm',
+    '.editorconfig': 'EditorConfig',
+    '.prettierrc': 'Prettier',
+    '.eslintrc': 'ESLint',
+    '.babelrc': 'Babel',
+    '.tsconfig': 'TypeScript',
+    '.flow': 'Flow',
+    '.graphql': 'GraphQL',
+    '.proto': 'Protocol Buffers',
+};
+export function getLanguageFromFilePath(filePath) {
+    const extension = path.extname(filePath).toLowerCase();
+    if (extension) {
+        return extensionToLanguageMap[extension];
+    }
+    const filename = path.basename(filePath).toLowerCase();
+    return extensionToLanguageMap[`.${filename}`];
+}
+//# sourceMappingURL=language-detection.js.map

package/dist/src/utils/language-detection.js.map

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

package/dist/src/utils/llm-edit-fixer.d.ts

@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type GeminiClient } from '../core/client.js';
+export interface SearchReplaceEdit {
+    search: string;
+    replace: string;
+    noChangesRequired: boolean;
+    explanation: string;
+}
+/**
+ * Attempts to fix a failed edit by using an LLM to generate a new search and replace pair.
+ * @param instruction The instruction for what needs to be done.
+ * @param old_string The original string to be replaced.
+ * @param new_string The original replacement string.
+ * @param error The error that occurred during the initial edit.
+ * @param current_content The current content of the file.
+ * @param geminiClient The Gemini client to use for the LLM call.
+ * @param abortSignal An abort signal to cancel the operation.
+ * @returns A new search and replace pair.
+ */
+export declare function FixLLMEditWithInstruction(instruction: string, old_string: string, new_string: string, error: string, current_content: string, geminiClient: GeminiClient, abortSignal: AbortSignal): Promise<SearchReplaceEdit>;
+export declare function resetLlmEditFixerCaches_TEST_ONLY(): void;

package/dist/src/utils/llm-edit-fixer.js

@@ -0,0 +1,112 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Type } from '@google/genai';
+import {} from '../core/client.js';
+import { LruCache } from './LruCache.js';
+import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
+const MAX_CACHE_SIZE = 50;
+const EDIT_SYS_PROMPT = `
+You are an expert code-editing assistant specializing in debugging and correcting failed search-and-replace operations.
+
+# Primary Goal
+Your task is to analyze a failed edit attempt and provide a corrected \`search\` string that will match the text in the file precisely. The correction should be as minimal as possible, staying very close to the original, failed \`search\` string. Do NOT invent a completely new edit based on the instruction; your job is to fix the provided parameters.
+
+It is important that you do no try to figure out if the instruction is correct. DO NOT GIVE ADVICE. Your only goal here is to do your best to perform the search and replace task! 
+
+# Input Context
+You will be given:
+1. The high-level instruction for the original edit.
+2. The exact \`search\` and \`replace\` strings that failed.
+3. The error message that was produced.
+4. The full content of the source file.
+
+# Rules for Correction
+1.  **Minimal Correction:** Your new \`search\` string must be a close variation of the original. Focus on fixing issues like whitespace, indentation, line endings, or small contextual differences.
+2.  **Explain the Fix:** Your \`explanation\` MUST state exactly why the original \`search\` failed and how your new \`search\` string resolves that specific failure. (e.g., "The original search failed due to incorrect indentation; the new search corrects the indentation to match the source file.").
+3.  **Preserve the \`replace\` String:** Do NOT modify the \`replace\` string unless the instruction explicitly requires it and it was the source of the error. Your primary focus is fixing the \`search\` string.
+4.  **No Changes Case:** CRUCIAL: if the change is already present in the file,  set \`noChangesRequired\` to True and explain why in the \`explanation\`. It is crucial that you only do this if the changes outline in \`replace\` are alredy in the file and suits the instruction!! 
+5.  **Exactness:** The final \`search\` field must be the EXACT literal text from the file. Do not escape characters.
+`;
+const EDIT_USER_PROMPT = `
+# Goal of the Original Edit
+<instruction>
+{instruction}
+</instruction>
+
+# Failed Attempt Details
+- **Original \`search\` parameter (failed):**
+<search>
+{old_string}
+</search>
+- **Original \`replace\` parameter:**
+<replace>
+{new_string}
+</replace>
+- **Error Encountered:**
+<error>
+{error}
+</error>
+
+# Full File Content
+<file_content>
+{current_content}
+</file_content>
+
+# Your Task
+Based on the error and the file content, provide a corrected \`search\` string that will succeed. Remember to keep your correction minimal and explain the precise reason for the failure in your \`explanation\`.
+`;
+const SearchReplaceEditSchema = {
+    type: Type.OBJECT,
+    properties: {
+        explanation: { type: Type.STRING },
+        search: { type: Type.STRING },
+        replace: { type: Type.STRING },
+        noChangesRequired: { type: Type.BOOLEAN },
+    },
+    required: ['search', 'replace', 'explanation'],
+};
+const editCorrectionWithInstructionCache = new LruCache(MAX_CACHE_SIZE);
+/**
+ * Attempts to fix a failed edit by using an LLM to generate a new search and replace pair.
+ * @param instruction The instruction for what needs to be done.
+ * @param old_string The original string to be replaced.
+ * @param new_string The original replacement string.
+ * @param error The error that occurred during the initial edit.
+ * @param current_content The current content of the file.
+ * @param geminiClient The Gemini client to use for the LLM call.
+ * @param abortSignal An abort signal to cancel the operation.
+ * @returns A new search and replace pair.
+ */
+export async function FixLLMEditWithInstruction(instruction, old_string, new_string, error, current_content, geminiClient, abortSignal) {
+    const cacheKey = `${instruction}---${old_string}---${new_string}--${current_content}--${error}`;
+    const cachedResult = editCorrectionWithInstructionCache.get(cacheKey);
+    if (cachedResult) {
+        return cachedResult;
+    }
+    const userPrompt = EDIT_USER_PROMPT.replace('{instruction}', instruction)
+        .replace('{old_string}', old_string)
+        .replace('{new_string}', new_string)
+        .replace('{error}', error)
+        .replace('{current_content}', current_content);
+    const contents = [
+        {
+            role: 'user',
+            parts: [
+                {
+                    text: `${EDIT_SYS_PROMPT}
+${userPrompt}`,
+                },
+            ],
+        },
+    ];
+    const result = (await geminiClient.generateJson(contents, SearchReplaceEditSchema, abortSignal, DEFAULT_GEMINI_FLASH_MODEL));
+    editCorrectionWithInstructionCache.set(cacheKey, result);
+    return result;
+}
+export function resetLlmEditFixerCaches_TEST_ONLY() {
+    editCorrectionWithInstructionCache.clear();
+}
+//# sourceMappingURL=llm-edit-fixer.js.map

package/dist/src/utils/llm-edit-fixer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"llm-edit-fixer.js","sourceRoot":"","sources":["../../../src/utils/llm-edit-fixer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAgB,IAAI,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAqB,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEjE,MAAM,cAAc,GAAG,EAAE,CAAC;AAE1B,MAAM,eAAe,GAAG;;;;;;;;;;;;;;;;;;;;;CAqBvB,CAAC;AAEF,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BxB,CAAC;AASF,MAAM,uBAAuB,GAAG;IAC9B,IAAI,EAAE,IAAI,CAAC,MAAM;IACjB,UAAU,EAAE;QACV,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;QAClC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;QAC7B,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;QAC9B,iBAAiB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;KAC1C;IACD,QAAQ,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,CAAC;CAC/C,CAAC;AAEF,MAAM,kCAAkC,GAAG,IAAI,QAAQ,CAGrD,cAAc,CAAC,CAAC;AAElB;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,WAAmB,EACnB,UAAkB,EAClB,UAAkB,EAClB,KAAa,EACb,eAAuB,EACvB,YAA0B,EAC1B,WAAwB;IAExB,MAAM,QAAQ,GAAG,GAAG,WAAW,MAAM,UAAU,MAAM,UAAU,KAAK,eAAe,KAAK,KAAK,EAAE,CAAC;IAChG,MAAM,YAAY,GAAG,kCAAkC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtE,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC;SACtE,OAAO,CAAC,cAAc,EAAE,UAAU,CAAC;SACnC,OAAO,CAAC,cAAc,EAAE,UAAU,CAAC;SACnC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC;SACzB,OAAO,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;IAEjD,MAAM,QAAQ,GAAc;QAC1B;YACE,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,GAAG,eAAe;EAChC,UAAU,EAAE;iBACL;aACF;SACF;KACF,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,MAAM,YAAY,CAAC,YAAY,CAC7C,QAAQ,EACR,uBAAuB,EACvB,WAAW,EACX,0BAA0B,CAC3B,CAAiC,CAAC;IAEnC,kCAAkC,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACzD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,iCAAiC;IAC/C,kCAAkC,CAAC,KAAK,EAAE,CAAC;AAC7C,CAAC"}

package/dist/src/utils/memoryDiscovery.d.ts

@@ -3,13 +3,14 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { FileFilteringOptions } from '../config/config.js';
+import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
+import type { FileFilteringOptions } from '../config/config.js';
+export interface LoadServerHierarchicalMemoryResponse {
+    memoryContent: string;
+    fileCount: number;
+}
 /**
  * Loads hierarchical GEMINI.md files and concatenates their content.
  * This function is intended for use by the server.
  */
-export declare function loadServerHierarchicalMemory(currentWorkingDirectory: string, includeDirectoriesToReadGemini: readonly string[], debugMode: boolean, fileService: FileDiscoveryService, extensionContextFilePaths?: string[], importFormat?: 'flat' | 'tree', fileFilteringOptions?: FileFilteringOptions, maxDirs?: number): Promise<{
-    memoryContent: string;
-    fileCount: number;
-}>;
+export declare function loadServerHierarchicalMemory(currentWorkingDirectory: string, includeDirectoriesToReadGemini: readonly string[], debugMode: boolean, fileService: FileDiscoveryService, extensionContextFilePaths: string[] | undefined, folderTrust: boolean, importFormat?: 'flat' | 'tree', fileFilteringOptions?: FileFilteringOptions, maxDirs?: number): Promise<LoadServerHierarchicalMemoryResponse>;

package/dist/src/utils/memoryDiscovery.js

@@ -3,14 +3,15 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import * as fs from 'fs/promises';
-import * as fsSync from 'fs';
-import * as path from 'path';
-import { homedir } from 'os';
+import * as fs from 'node:fs/promises';
+import * as fsSync from 'node:fs';
+import * as path from 'node:path';
+import { homedir } from 'node:os';
 import { bfsFileSearch } from './bfsFileSearch.js';
-import { GEMINI_CONFIG_DIR, getAllGeminiMdFilenames, } from '../tools/memoryTool.js';
+import { getAllGeminiMdFilenames } from '../tools/memoryTool.js';
 import { processImports } from './memoryImportProcessor.js';
-import { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, } from '../config/config.js';
+import { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS } from '../config/config.js';
+import { CELL_DIR } from './paths.js';
 // Simple console logger, similar to the one previously in CLI's config.ts
 // TODO: Integrate with a more robust server-side logger if available/appropriate.
 const logger = {
@@ -58,24 +59,40 @@ async function findProjectRoot(startDir) {
         currentDir = parentDir;
     }
 }
-async function getGeminiMdFilePathsInternal(currentWorkingDirectory, includeDirectoriesToReadGemini, userHomePath, debugMode, fileService, extensionContextFilePaths = [], fileFilteringOptions, maxDirs) {
+async function getGeminiMdFilePathsInternal(currentWorkingDirectory, includeDirectoriesToReadGemini, userHomePath, debugMode, fileService, extensionContextFilePaths = [], folderTrust, fileFilteringOptions, maxDirs) {
     const dirs = new Set([
         ...includeDirectoriesToReadGemini,
         currentWorkingDirectory,
     ]);
-    const paths = [];
-    for (const dir of dirs) {
-        const pathsByDir = await getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMode, fileService, extensionContextFilePaths, fileFilteringOptions, maxDirs);
-        paths.push(...pathsByDir);
+    // Process directories in parallel with concurrency limit to prevent EMFILE errors
+    const CONCURRENT_LIMIT = 10;
+    const dirsArray = Array.from(dirs);
+    const pathsArrays = [];
+    for (let i = 0; i < dirsArray.length; i += CONCURRENT_LIMIT) {
+        const batch = dirsArray.slice(i, i + CONCURRENT_LIMIT);
+        const batchPromises = batch.map((dir) => getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMode, fileService, extensionContextFilePaths, folderTrust, fileFilteringOptions, maxDirs));
+        const batchResults = await Promise.allSettled(batchPromises);
+        for (const result of batchResults) {
+            if (result.status === 'fulfilled') {
+                pathsArrays.push(result.value);
+            }
+            else {
+                const error = result.reason;
+                const message = error instanceof Error ? error.message : String(error);
+                logger.error(`Error discovering files in directory: ${message}`);
+                // Continue processing other directories
+            }
+        }
     }
+    const paths = pathsArrays.flat();
     return Array.from(new Set(paths));
 }
-async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMode, fileService, extensionContextFilePaths = [], fileFilteringOptions, maxDirs) {
+async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMode, fileService, extensionContextFilePaths = [], folderTrust, fileFilteringOptions, maxDirs) {
     const allPaths = new Set();
     const geminiMdFilenames = getAllGeminiMdFilenames();
     for (const geminiMdFilename of geminiMdFilenames) {
         const resolvedHome = path.resolve(userHomePath);
-        const globalMemoryPath = path.join(resolvedHome, GEMINI_CONFIG_DIR, geminiMdFilename);
+        const globalMemoryPath = path.join(resolvedHome, CELL_DIR, geminiMdFilename);
         // This part that finds the global file always runs.
         try {
             await fs.access(globalMemoryPath, fsSync.constants.R_OK);
@@ -88,7 +105,7 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMo
         }
         // FIX: Only perform the workspace search (upward and downward scans)
         // if a valid currentWorkingDirectory is provided.
-        if (dir) {
+        if (dir && folderTrust) {
             const resolvedCwd = path.resolve(dir);
             if (debugMode)
                 logger.debug(`Searching for ${geminiMdFilename} starting from CWD: ${resolvedCwd}`);
@@ -101,7 +118,7 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMo
                 ? path.dirname(projectRoot)
                 : path.dirname(resolvedHome);
             while (currentDir && currentDir !== path.dirname(currentDir)) {
-                if (currentDir === path.join(resolvedHome, GEMINI_CONFIG_DIR)) {
+                if (currentDir === path.join(resolvedHome, CELL_DIR)) {
                     break;
                 }
                 const potentialPath = path.join(currentDir, geminiMdFilename);
@@ -147,25 +164,43 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMo
     return finalPaths;
 }
 async function readGeminiMdFiles(filePaths, debugMode, importFormat = 'tree') {
+    // Process files in parallel with concurrency limit to prevent EMFILE errors
+    const CONCURRENT_LIMIT = 20; // Higher limit for file reads as they're typically faster
     const results = [];
-    for (const filePath of filePaths) {
-        try {
-            const content = await fs.readFile(filePath, 'utf-8');
-            // Process imports in the content
-            const processedResult = await processImports(content, path.dirname(filePath), debugMode, undefined, undefined, importFormat);
-            results.push({ filePath, content: processedResult.content });
-            if (debugMode)
-                logger.debug(`Successfully read and processed imports: ${filePath} (Length: ${processedResult.content.length})`);
-        }
-        catch (error) {
-            const isTestEnv = process.env['NODE_ENV'] === 'test' || process.env['VITEST'];
-            if (!isTestEnv) {
+    for (let i = 0; i < filePaths.length; i += CONCURRENT_LIMIT) {
+        const batch = filePaths.slice(i, i + CONCURRENT_LIMIT);
+        const batchPromises = batch.map(async (filePath) => {
+            try {
+                const content = await fs.readFile(filePath, 'utf-8');
+                // Process imports in the content
+                const processedResult = await processImports(content, path.dirname(filePath), debugMode, undefined, undefined, importFormat);
+                if (debugMode)
+                    logger.debug(`Successfully read and processed imports: ${filePath} (Length: ${processedResult.content.length})`);
+                return { filePath, content: processedResult.content };
+            }
+            catch (error) {
+                const isTestEnv = process.env['NODE_ENV'] === 'test' || process.env['VITEST'];
+                if (!isTestEnv) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    logger.warn(`Warning: Could not read ${getAllGeminiMdFilenames()} file at ${filePath}. Error: ${message}`);
+                }
+                if (debugMode)
+                    logger.debug(`Failed to read: ${filePath}`);
+                return { filePath, content: null }; // Still include it with null content
+            }
+        });
+        const batchResults = await Promise.allSettled(batchPromises);
+        for (const result of batchResults) {
+            if (result.status === 'fulfilled') {
+                results.push(result.value);
+            }
+            else {
+                // This case shouldn't happen since we catch all errors above,
+                // but handle it for completeness
+                const error = result.reason;
                 const message = error instanceof Error ? error.message : String(error);
-                logger.warn(`Warning: Could not read ${getAllGeminiMdFilenames()} file at ${filePath}. Error: ${message}`);
+                logger.error(`Unexpected error processing file: ${message}`);
             }
-            results.push({ filePath, content: null }); // Still include it with null content
-            if (debugMode)
-                logger.debug(`Failed to read: ${filePath}`);
         }
     }
     return results;
@@ -192,13 +227,13 @@ currentWorkingDirectoryForDisplay) {
  * Loads hierarchical GEMINI.md files and concatenates their content.
  * This function is intended for use by the server.
  */
-export async function loadServerHierarchicalMemory(currentWorkingDirectory, includeDirectoriesToReadGemini, debugMode, fileService, extensionContextFilePaths = [], importFormat = 'tree', fileFilteringOptions, maxDirs = 200) {
+export async function loadServerHierarchicalMemory(currentWorkingDirectory, includeDirectoriesToReadGemini, debugMode, fileService, extensionContextFilePaths = [], folderTrust, importFormat = 'tree', fileFilteringOptions, maxDirs = 200) {
     if (debugMode)
         logger.debug(`Loading server hierarchical memory for CWD: ${currentWorkingDirectory} (importFormat: ${importFormat})`);
     // For the server, homedir() refers to the server process's home.
     // This is consistent with how MemoryTool already finds the global path.
     const userHomePath = homedir();
-    const filePaths = await getGeminiMdFilePathsInternal(currentWorkingDirectory, includeDirectoriesToReadGemini, userHomePath, debugMode, fileService, extensionContextFilePaths, fileFilteringOptions || DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, maxDirs);
+    const filePaths = await getGeminiMdFilePathsInternal(currentWorkingDirectory, includeDirectoriesToReadGemini, userHomePath, debugMode, fileService, extensionContextFilePaths, folderTrust, fileFilteringOptions || DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, maxDirs);
     if (filePaths.length === 0) {
         if (debugMode)
             logger.debug('No GEMINI.md files found in hierarchy of the workspace.');