@google/gemini-cli-core 0.0.1

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, '.gemini', '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":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,MAAM,sBAAsB,GAA8B;IACxD,KAAK,EAAE,YAAY;IACnB,KAAK,EAAE,YAAY;IACnB,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,YAAY;IACpB,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,MAAM;IACf,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,MAAM;IACb,MAAM,EAAE,KAAK;IACb,QAAQ,EAAE,KAAK;IACf,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,KAAK;IACb,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,KAAK;IACZ,IAAI,EAAE,GAAG;IACT,IAAI,EAAE,OAAO;IACb,MAAM,EAAE,KAAK;IACb,QAAQ,EAAE,OAAO;IACjB,KAAK,EAAE,QAAQ;IACf,KAAK,EAAE,MAAM;IACb,IAAI,EAAE,aAAa;IACnB,KAAK,EAAE,aAAa;IACpB,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,GAAG;IACT,QAAQ,EAAE,OAAO;IACjB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,OAAO;IACf,MAAM,EAAE,OAAO;IACf,MAAM,EAAE,KAAK;IACb,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,KAAK;IACb,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,KAAK;IACb,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,MAAM;IACd,KAAK,EAAE,UAAU;IACjB,WAAW,EAAE,UAAU;IACvB,aAAa,EAAE,YAAY;IAC3B,MAAM,EAAE,YAAY;IACpB,KAAK,EAAE,cAAc;IACrB,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,SAAS;IACjB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,MAAM;IACf,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE,QAAQ;IACnB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,OAAO;IACf,MAAM,EAAE,SAAS;IACjB,MAAM,EAAE,UAAU;IAClB,IAAI,EAAE,UAAU;IAChB,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,KAAK;IACb,SAAS,EAAE,QAAQ;IACnB,SAAS,EAAE,aAAa;IACxB,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,KAAK;IACb,MAAM,EAAE,KAAK;IACb,MAAM,EAAE,KAAK;IACb,eAAe,EAAE,QAAQ;IACzB,YAAY,EAAE,KAAK;IACnB,YAAY,EAAE,KAAK;IACnB,eAAe,EAAE,cAAc;IAC/B,aAAa,EAAE,UAAU;IACzB,WAAW,EAAE,QAAQ;IACrB,UAAU,EAAE,OAAO;IACnB,WAAW,EAAE,YAAY;IACzB,OAAO,EAAE,MAAM;IACf,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,kBAAkB;CAC7B,CAAC;AAEF,MAAM,UAAU,uBAAuB,CAAC,QAAgB;IACtD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;IACvD,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC3C,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;IACvD,OAAO,sBAAsB,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC;AAChD,CAAC"}

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

@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type BaseLlmClient } from '../core/baseLlmClient.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 baseLlmClient The BaseLlmClient to use for the LLM call.
+ * @param abortSignal An abort signal to cancel the operation.
+ * @param promptId A unique ID for the prompt.
+ * @returns A new search and replace pair.
+ */
+export declare function FixLLMEditWithInstruction(instruction: string, old_string: string, new_string: string, error: string, current_content: string, baseLlmClient: BaseLlmClient, abortSignal: AbortSignal): Promise<SearchReplaceEdit>;
+export declare function resetLlmEditFixerCaches_TEST_ONLY(): void;

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

@@ -0,0 +1,121 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Type } from '@google/genai';
+import {} from '../core/baseLlmClient.js';
+import { LruCache } from './LruCache.js';
+import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
+import { promptIdContext } from './promptIdContext.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 baseLlmClient The BaseLlmClient to use for the LLM call.
+ * @param abortSignal An abort signal to cancel the operation.
+ * @param promptId A unique ID for the prompt.
+ * @returns A new search and replace pair.
+ */
+export async function FixLLMEditWithInstruction(instruction, old_string, new_string, error, current_content, baseLlmClient, abortSignal) {
+    let promptId = promptIdContext.getStore();
+    if (!promptId) {
+        promptId = `llm-fixer-fallback-${Date.now()}-${Math.random().toString(16).slice(2)}`;
+        console.warn(`Could not find promptId in context. This is unexpected. Using a fallback ID: ${promptId}`);
+    }
+    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: userPrompt }],
+        },
+    ];
+    const result = (await baseLlmClient.generateJson({
+        contents,
+        schema: SearchReplaceEditSchema,
+        abortSignal,
+        model: DEFAULT_GEMINI_FLASH_MODEL,
+        systemInstruction: EDIT_SYS_PROMPT,
+        promptId,
+    }));
+    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":"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"}

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

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

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

@@ -0,0 +1,105 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { FixLLMEditWithInstruction, resetLlmEditFixerCaches_TEST_ONLY, } from './llm-edit-fixer.js';
+import { promptIdContext } from './promptIdContext.js';
+// Mock the BaseLlmClient
+const mockGenerateJson = vi.fn();
+const mockBaseLlmClient = {
+    generateJson: mockGenerateJson,
+};
+describe('FixLLMEditWithInstruction', () => {
+    const instruction = 'Replace the title';
+    const old_string = '<h1>Old Title</h1>';
+    const new_string = '<h1>New Title</h1>';
+    const error = 'String not found';
+    const current_content = '<body><h1>Old Title</h1></body>';
+    const abortController = new AbortController();
+    const abortSignal = abortController.signal;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        resetLlmEditFixerCaches_TEST_ONLY(); // Ensure cache is cleared before each test
+    });
+    afterEach(() => {
+        vi.useRealTimers(); // Reset timers after each test
+    });
+    const mockApiResponse = {
+        search: '<h1>Old Title</h1>',
+        replace: '<h1>New Title</h1>',
+        noChangesRequired: false,
+        explanation: 'The original search was correct.',
+    };
+    it('should use the promptId from the AsyncLocalStorage context when available', async () => {
+        const testPromptId = 'test-prompt-id-12345';
+        mockGenerateJson.mockResolvedValue(mockApiResponse);
+        await promptIdContext.run(testPromptId, async () => {
+            await FixLLMEditWithInstruction(instruction, old_string, new_string, error, current_content, mockBaseLlmClient, abortSignal);
+        });
+        // Verify that generateJson was called with the promptId from the context
+        expect(mockGenerateJson).toHaveBeenCalledTimes(1);
+        expect(mockGenerateJson).toHaveBeenCalledWith(expect.objectContaining({
+            promptId: testPromptId,
+        }));
+    });
+    it('should generate and use a fallback promptId when context is not available', async () => {
+        mockGenerateJson.mockResolvedValue(mockApiResponse);
+        const consoleWarnSpy = vi
+            .spyOn(console, 'warn')
+            .mockImplementation(() => { });
+        // Run the function outside of any context
+        await FixLLMEditWithInstruction(instruction, old_string, new_string, error, current_content, mockBaseLlmClient, abortSignal);
+        // Verify the warning was logged
+        expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('Could not find promptId in context. This is unexpected. Using a fallback ID: llm-fixer-fallback-'));
+        // Verify that generateJson was called with the generated fallback promptId
+        expect(mockGenerateJson).toHaveBeenCalledTimes(1);
+        expect(mockGenerateJson).toHaveBeenCalledWith(expect.objectContaining({
+            promptId: expect.stringContaining('llm-fixer-fallback-'),
+        }));
+        // Restore mocks
+        consoleWarnSpy.mockRestore();
+    });
+    it('should construct the user prompt correctly', async () => {
+        mockGenerateJson.mockResolvedValue(mockApiResponse);
+        const promptId = 'test-prompt-id-prompt-construction';
+        await promptIdContext.run(promptId, async () => {
+            await FixLLMEditWithInstruction(instruction, old_string, new_string, error, current_content, mockBaseLlmClient, abortSignal);
+        });
+        const generateJsonCall = mockGenerateJson.mock.calls[0][0];
+        const userPromptContent = generateJsonCall.contents[0].parts[0].text;
+        expect(userPromptContent).toContain(`<instruction>\n${instruction}\n</instruction>`);
+        expect(userPromptContent).toContain(`<search>\n${old_string}\n</search>`);
+        expect(userPromptContent).toContain(`<replace>\n${new_string}\n</replace>`);
+        expect(userPromptContent).toContain(`<error>\n${error}\n</error>`);
+        expect(userPromptContent).toContain(`<file_content>\n${current_content}\n</file_content>`);
+    });
+    it('should return a cached result on subsequent identical calls', async () => {
+        mockGenerateJson.mockResolvedValue(mockApiResponse);
+        const testPromptId = 'test-prompt-id-caching';
+        await promptIdContext.run(testPromptId, async () => {
+            // First call - should call the API
+            const result1 = await FixLLMEditWithInstruction(instruction, old_string, new_string, error, current_content, mockBaseLlmClient, abortSignal);
+            // Second call with identical parameters - should hit the cache
+            const result2 = await FixLLMEditWithInstruction(instruction, old_string, new_string, error, current_content, mockBaseLlmClient, abortSignal);
+            expect(result1).toEqual(mockApiResponse);
+            expect(result2).toEqual(mockApiResponse);
+            // Verify the underlying service was only called ONCE
+            expect(mockGenerateJson).toHaveBeenCalledTimes(1);
+        });
+    });
+    it('should not use cache for calls with different parameters', async () => {
+        mockGenerateJson.mockResolvedValue(mockApiResponse);
+        const testPromptId = 'test-prompt-id-cache-miss';
+        await promptIdContext.run(testPromptId, async () => {
+            // First call
+            await FixLLMEditWithInstruction(instruction, old_string, new_string, error, current_content, mockBaseLlmClient, abortSignal);
+            // Second call with a different instruction
+            await FixLLMEditWithInstruction('A different instruction', old_string, new_string, error, current_content, mockBaseLlmClient, abortSignal);
+            // Verify the underlying service was called TWICE
+            expect(mockGenerateJson).toHaveBeenCalledTimes(2);
+        });
+    });
+});
+//# sourceMappingURL=llm-edit-fixer.test.js.map

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

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

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

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+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[] | undefined, folderTrust: boolean, importFormat?: 'flat' | 'tree', fileFilteringOptions?: FileFilteringOptions, maxDirs?: number): Promise<LoadServerHierarchicalMemoryResponse>;