@machina.ai/cell-cli-core 1.0.13-rc8 → 1.0.17-rc1

package/dist/src/prompts/mcp-prompts.js

@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export function getMCPServerPrompts(config, serverName) {
+    const promptRegistry = config.getPromptRegistry();
+    if (!promptRegistry) {
+        return [];
+    }
+    return promptRegistry.getPromptsByServer(serverName);
+}
+//# sourceMappingURL=mcp-prompts.js.map

package/dist/src/prompts/mcp-prompts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-prompts.js","sourceRoot":"","sources":["../../../src/prompts/mcp-prompts.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,MAAM,UAAU,mBAAmB,CACjC,MAAc,EACd,UAAkB;IAElB,MAAM,cAAc,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAC;IAClD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,cAAc,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;AACvD,CAAC"}

package/dist/src/prompts/prompt-registry.d.ts

@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { DiscoveredMCPPrompt } from '../tools/mcp-client.js';
+export declare class PromptRegistry {
+    private prompts;
+    /**
+     * Registers a prompt definition.
+     * @param prompt - The prompt object containing schema and execution logic.
+     */
+    registerPrompt(prompt: DiscoveredMCPPrompt): void;
+    /**
+     * Returns an array of all registered and discovered prompt instances.
+     */
+    getAllPrompts(): DiscoveredMCPPrompt[];
+    /**
+     * Get the definition of a specific prompt.
+     */
+    getPrompt(name: string): DiscoveredMCPPrompt | undefined;
+    /**
+     * Returns an array of prompts registered from a specific MCP server.
+     */
+    getPromptsByServer(serverName: string): DiscoveredMCPPrompt[];
+}

package/dist/src/prompts/prompt-registry.js

@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export class PromptRegistry {
+    prompts = new Map();
+    /**
+     * Registers a prompt definition.
+     * @param prompt - The prompt object containing schema and execution logic.
+     */
+    registerPrompt(prompt) {
+        if (this.prompts.has(prompt.name)) {
+            const newName = `${prompt.serverName}_${prompt.name}`;
+            console.warn(`Prompt with name "${prompt.name}" is already registered. Renaming to "${newName}".`);
+            this.prompts.set(newName, { ...prompt, name: newName });
+        }
+        else {
+            this.prompts.set(prompt.name, prompt);
+        }
+    }
+    /**
+     * Returns an array of all registered and discovered prompt instances.
+     */
+    getAllPrompts() {
+        return Array.from(this.prompts.values()).sort((a, b) => a.name.localeCompare(b.name));
+    }
+    /**
+     * Get the definition of a specific prompt.
+     */
+    getPrompt(name) {
+        return this.prompts.get(name);
+    }
+    /**
+     * Returns an array of prompts registered from a specific MCP server.
+     */
+    getPromptsByServer(serverName) {
+        const serverPrompts = [];
+        for (const prompt of this.prompts.values()) {
+            if (prompt.serverName === serverName) {
+                serverPrompts.push(prompt);
+            }
+        }
+        return serverPrompts.sort((a, b) => a.name.localeCompare(b.name));
+    }
+}
+//# sourceMappingURL=prompt-registry.js.map

package/dist/src/prompts/prompt-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-registry.js","sourceRoot":"","sources":["../../../src/prompts/prompt-registry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,MAAM,OAAO,cAAc;IACjB,OAAO,GAAqC,IAAI,GAAG,EAAE,CAAC;IAE9D;;;OAGG;IACH,cAAc,CAAC,MAA2B;QACxC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,MAAM,OAAO,GAAG,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YACtD,OAAO,CAAC,IAAI,CACV,qBAAqB,MAAM,CAAC,IAAI,yCAAyC,OAAO,IAAI,CACrF,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,aAAa;QACX,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACrD,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAC7B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,SAAS,CAAC,IAAY;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,UAAkB;QACnC,MAAM,aAAa,GAA0B,EAAE,CAAC;QAChD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YAC3C,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;gBACrC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;QACD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACpE,CAAC;CACF"}

package/dist/src/services/fileDiscoveryService.test.js

@@ -3,99 +3,140 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import * as fs from 'fs/promises';
+import * as os from 'os';
+import * as path from 'path';
 import { FileDiscoveryService } from './fileDiscoveryService.js';
-import { GitIgnoreParser } from '../utils/gitIgnoreParser.js';
-import * as gitUtils from '../utils/gitUtils.js';
-// Mock the GitIgnoreParser
-vi.mock('../utils/gitIgnoreParser.js');
-// Mock gitUtils module
-vi.mock('../utils/gitUtils.js');
 describe('FileDiscoveryService', () => {
-    let service;
-    let mockGitIgnoreParser;
-    const mockProjectRoot = '/test/project';
-    beforeEach(() => {
-        mockGitIgnoreParser = {
-            initialize: vi.fn(),
-            isIgnored: vi.fn(),
-            loadPatterns: vi.fn(),
-            loadGitRepoPatterns: vi.fn(),
-        };
-        vi.mocked(GitIgnoreParser).mockImplementation(() => mockGitIgnoreParser);
-        vi.mocked(gitUtils.isGitRepository).mockReturnValue(true);
-        vi.mocked(gitUtils.findGitRoot).mockReturnValue('/test/project');
-        vi.clearAllMocks();
+    let testRootDir;
+    let projectRoot;
+    async function createTestFile(filePath, content = '') {
+        const fullPath = path.join(projectRoot, filePath);
+        await fs.mkdir(path.dirname(fullPath), { recursive: true });
+        await fs.writeFile(fullPath, content);
+        return fullPath;
+    }
+    beforeEach(async () => {
+        testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'file-discovery-test-'));
+        projectRoot = path.join(testRootDir, 'project');
+        await fs.mkdir(projectRoot, { recursive: true });
     });
-    afterEach(() => {
-        vi.restoreAllMocks();
+    afterEach(async () => {
+        await fs.rm(testRootDir, { recursive: true, force: true });
     });
     describe('initialization', () => {
-        it('should initialize git ignore parser by default', () => {
-            service = new FileDiscoveryService(mockProjectRoot);
-            expect(GitIgnoreParser).toHaveBeenCalledWith(mockProjectRoot);
-            expect(GitIgnoreParser).toHaveBeenCalledTimes(2);
-            expect(mockGitIgnoreParser.loadGitRepoPatterns).toHaveBeenCalled();
-            expect(mockGitIgnoreParser.loadPatterns).toHaveBeenCalled();
+        it('should initialize git ignore parser by default in a git repo', async () => {
+            await fs.mkdir(path.join(projectRoot, '.git'));
+            await createTestFile('.gitignore', 'node_modules/');
+            const service = new FileDiscoveryService(projectRoot);
+            // Let's check the effect of the parser instead of mocking it.
+            expect(service.shouldGitIgnoreFile('node_modules/foo.js')).toBe(true);
+            expect(service.shouldGitIgnoreFile('src/foo.js')).toBe(false);
         });
-        it('should not initialize git ignore parser when not a git repo', () => {
-            vi.mocked(gitUtils.isGitRepository).mockReturnValue(false);
-            service = new FileDiscoveryService(mockProjectRoot);
-            expect(GitIgnoreParser).toHaveBeenCalledOnce();
-            expect(mockGitIgnoreParser.loadGitRepoPatterns).not.toHaveBeenCalled();
+        it('should not load git repo patterns when not in a git repo', async () => {
+            // No .git directory
+            await createTestFile('.gitignore', 'node_modules/');
+            const service = new FileDiscoveryService(projectRoot);
+            // .gitignore is not loaded in non-git repos
+            expect(service.shouldGitIgnoreFile('node_modules/foo.js')).toBe(false);
+        });
+        it('should load .geminiignore patterns even when not in a git repo', async () => {
+            await createTestFile('.geminiignore', 'secrets.txt');
+            const service = new FileDiscoveryService(projectRoot);
+            expect(service.shouldGeminiIgnoreFile('secrets.txt')).toBe(true);
+            expect(service.shouldGeminiIgnoreFile('src/index.js')).toBe(false);
         });
     });
     describe('filterFiles', () => {
-        beforeEach(() => {
-            mockGitIgnoreParser.isIgnored.mockImplementation((path) => path.includes('node_modules') || path.includes('.git'));
-            service = new FileDiscoveryService(mockProjectRoot);
+        beforeEach(async () => {
+            await fs.mkdir(path.join(projectRoot, '.git'));
+            await createTestFile('.gitignore', 'node_modules/\n.git/\ndist');
+            await createTestFile('.geminiignore', 'logs/');
         });
-        it('should filter out git-ignored files by default', () => {
+        it('should filter out git-ignored and gemini-ignored files by default', () => {
             const files = [
                 'src/index.ts',
                 'node_modules/package/index.js',
                 'README.md',
                 '.git/config',
                 'dist/bundle.js',
-            ];
-            const filtered = service.filterFiles(files);
-            expect(filtered).toEqual(['src/index.ts', 'README.md', 'dist/bundle.js']);
+                'logs/latest.log',
+            ].map((f) => path.join(projectRoot, f));
+            const service = new FileDiscoveryService(projectRoot);
+            expect(service.filterFiles(files)).toEqual(['src/index.ts', 'README.md'].map((f) => path.join(projectRoot, f)));
         });
         it('should not filter files when respectGitIgnore is false', () => {
             const files = [
                 'src/index.ts',
                 'node_modules/package/index.js',
                 '.git/config',
-            ];
-            const filtered = service.filterFiles(files, { respectGitIgnore: false });
-            expect(filtered).toEqual(files);
+                'logs/latest.log',
+            ].map((f) => path.join(projectRoot, f));
+            const service = new FileDiscoveryService(projectRoot);
+            const filtered = service.filterFiles(files, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: true, // still respect this one
+            });
+            expect(filtered).toEqual(['src/index.ts', 'node_modules/package/index.js', '.git/config'].map((f) => path.join(projectRoot, f)));
+        });
+        it('should not filter files when respectGeminiIgnore is false', () => {
+            const files = [
+                'src/index.ts',
+                'node_modules/package/index.js',
+                'logs/latest.log',
+            ].map((f) => path.join(projectRoot, f));
+            const service = new FileDiscoveryService(projectRoot);
+            const filtered = service.filterFiles(files, {
+                respectGitIgnore: true,
+                respectGeminiIgnore: false,
+            });
+            expect(filtered).toEqual(['src/index.ts', 'logs/latest.log'].map((f) => path.join(projectRoot, f)));
         });
         it('should handle empty file list', () => {
-            const filtered = service.filterFiles([]);
-            expect(filtered).toEqual([]);
+            const service = new FileDiscoveryService(projectRoot);
+            expect(service.filterFiles([])).toEqual([]);
         });
     });
-    describe('shouldGitIgnoreFile', () => {
-        beforeEach(() => {
-            mockGitIgnoreParser.isIgnored.mockImplementation((path) => path.includes('node_modules'));
-            service = new FileDiscoveryService(mockProjectRoot);
+    describe('shouldGitIgnoreFile & shouldGeminiIgnoreFile', () => {
+        beforeEach(async () => {
+            await fs.mkdir(path.join(projectRoot, '.git'));
+            await createTestFile('.gitignore', 'node_modules/');
+            await createTestFile('.geminiignore', '*.log');
         });
         it('should return true for git-ignored files', () => {
-            expect(service.shouldGitIgnoreFile('node_modules/package/index.js')).toBe(true);
+            const service = new FileDiscoveryService(projectRoot);
+            expect(service.shouldGitIgnoreFile(path.join(projectRoot, 'node_modules/package/index.js'))).toBe(true);
+        });
+        it('should return false for non-git-ignored files', () => {
+            const service = new FileDiscoveryService(projectRoot);
+            expect(service.shouldGitIgnoreFile(path.join(projectRoot, 'src/index.ts'))).toBe(false);
+        });
+        it('should return true for gemini-ignored files', () => {
+            const service = new FileDiscoveryService(projectRoot);
+            expect(service.shouldGeminiIgnoreFile(path.join(projectRoot, 'debug.log'))).toBe(true);
         });
-        it('should return false for non-ignored files', () => {
-            expect(service.shouldGitIgnoreFile('src/index.ts')).toBe(false);
+        it('should return false for non-gemini-ignored files', () => {
+            const service = new FileDiscoveryService(projectRoot);
+            expect(service.shouldGeminiIgnoreFile(path.join(projectRoot, 'src/index.ts'))).toBe(false);
         });
     });
     describe('edge cases', () => {
-        it('should handle relative project root paths', () => {
-            const relativeService = new FileDiscoveryService('./relative/path');
-            expect(relativeService).toBeInstanceOf(FileDiscoveryService);
+        it('should handle relative project root paths', async () => {
+            await fs.mkdir(path.join(projectRoot, '.git'));
+            await createTestFile('.gitignore', 'ignored.txt');
+            const service = new FileDiscoveryService(path.relative(process.cwd(), projectRoot));
+            expect(service.shouldGitIgnoreFile(path.join(projectRoot, 'ignored.txt'))).toBe(true);
+            expect(service.shouldGitIgnoreFile(path.join(projectRoot, 'not-ignored.txt'))).toBe(false);
         });
-        it('should handle filterFiles with undefined options', () => {
-            const files = ['src/index.ts'];
-            const filtered = service.filterFiles(files, undefined);
-            expect(filtered).toEqual(files);
+        it('should handle filterFiles with undefined options', async () => {
+            await fs.mkdir(path.join(projectRoot, '.git'));
+            await createTestFile('.gitignore', 'ignored.txt');
+            const service = new FileDiscoveryService(projectRoot);
+            const files = ['src/index.ts', 'ignored.txt'].map((f) => path.join(projectRoot, f));
+            expect(service.filterFiles(files, undefined)).toEqual([
+                path.join(projectRoot, 'src/index.ts'),
+            ]);
         });
     });
 });

package/dist/src/services/fileDiscoveryService.test.js.map

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

package/dist/src/services/gitService.test.js

@@ -6,22 +6,13 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { GitService } from './gitService.js';
 import * as path from 'path';
+import * as fs from 'fs/promises';
+import * as os from 'os';
+import { getProjectHash, GEMINI_DIR } from '../utils/paths.js';
 const hoistedMockExec = vi.hoisted(() => vi.fn());
 vi.mock('node:child_process', () => ({
     exec: hoistedMockExec,
 }));
-const hoistedMockMkdir = vi.hoisted(() => vi.fn());
-const hoistedMockReadFile = vi.hoisted(() => vi.fn());
-const hoistedMockWriteFile = vi.hoisted(() => vi.fn());
-vi.mock('fs/promises', async (importOriginal) => {
-    const actual = (await importOriginal());
-    return {
-        ...actual,
-        mkdir: hoistedMockMkdir,
-        readFile: hoistedMockReadFile,
-        writeFile: hoistedMockWriteFile,
-    };
-});
 const hoistedMockEnv = vi.hoisted(() => vi.fn());
 const hoistedMockSimpleGit = vi.hoisted(() => vi.fn());
 const hoistedMockCheckIsRepo = vi.hoisted(() => vi.fn());
@@ -44,34 +35,26 @@ const hoistedIsGitRepositoryMock = vi.hoisted(() => vi.fn());
 vi.mock('../utils/gitUtils.js', () => ({
     isGitRepository: hoistedIsGitRepositoryMock,
 }));
-const hoistedMockIsNodeError = vi.hoisted(() => vi.fn());
-vi.mock('../utils/errors.js', () => ({
-    isNodeError: hoistedMockIsNodeError,
-}));
 const hoistedMockHomedir = vi.hoisted(() => vi.fn());
-vi.mock('os', () => ({
-    homedir: hoistedMockHomedir,
-}));
-const hoistedMockCreateHash = vi.hoisted(() => {
-    const mockUpdate = vi.fn().mockReturnThis();
-    const mockDigest = vi.fn();
+vi.mock('os', async (importOriginal) => {
+    const actual = await importOriginal();
     return {
-        createHash: vi.fn(() => ({
-            update: mockUpdate,
-            digest: mockDigest,
-        })),
-        mockUpdate,
-        mockDigest,
+        ...actual,
+        homedir: hoistedMockHomedir,
     };
 });
-vi.mock('crypto', () => ({
-    createHash: hoistedMockCreateHash.createHash,
-}));
 describe('GitService', () => {
-    const mockProjectRoot = '/test/project';
-    const mockHomedir = '/mock/home';
-    const mockHash = 'mock-hash';
-    beforeEach(() => {
+    let testRootDir;
+    let projectRoot;
+    let homedir;
+    let hash;
+    beforeEach(async () => {
+        testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'git-service-test-'));
+        projectRoot = path.join(testRootDir, 'project');
+        homedir = path.join(testRootDir, 'home');
+        await fs.mkdir(projectRoot, { recursive: true });
+        await fs.mkdir(homedir, { recursive: true });
+        hash = getProjectHash(projectRoot);
         vi.clearAllMocks();
         hoistedIsGitRepositoryMock.mockReturnValue(true);
         hoistedMockExec.mockImplementation((command, callback) => {
@@ -83,13 +66,7 @@ describe('GitService', () => {
             }
             return {};
         });
-        hoistedMockMkdir.mockResolvedValue(undefined);
-        hoistedMockReadFile.mockResolvedValue('');
-        hoistedMockWriteFile.mockResolvedValue(undefined);
-        hoistedMockIsNodeError.mockImplementation((e) => e instanceof Error);
-        hoistedMockHomedir.mockReturnValue(mockHomedir);
-        hoistedMockCreateHash.mockUpdate.mockReturnThis();
-        hoistedMockCreateHash.mockDigest.mockReturnValue(mockHash);
+        hoistedMockHomedir.mockReturnValue(homedir);
         hoistedMockEnv.mockImplementation(() => ({
             checkIsRepo: hoistedMockCheckIsRepo,
             init: hoistedMockInit,
@@ -113,17 +90,18 @@ describe('GitService', () => {
             commit: 'initial',
         });
     });
-    afterEach(() => {
+    afterEach(async () => {
         vi.restoreAllMocks();
+        await fs.rm(testRootDir, { recursive: true, force: true });
     });
     describe('constructor', () => {
-        it('should successfully create an instance if projectRoot is a Git repository', () => {
-            expect(() => new GitService(mockProjectRoot)).not.toThrow();
+        it('should successfully create an instance', () => {
+            expect(() => new GitService(projectRoot)).not.toThrow();
         });
     });
     describe('verifyGitAvailability', () => {
         it('should resolve true if git --version command succeeds', async () => {
-            const service = new GitService(mockProjectRoot);
+            const service = new GitService(projectRoot);
             await expect(service.verifyGitAvailability()).resolves.toBe(true);
         });
         it('should resolve false if git --version command fails', async () => {
@@ -131,7 +109,7 @@ describe('GitService', () => {
                 callback(new Error('git not found'));
                 return {};
             });
-            const service = new GitService(mockProjectRoot);
+            const service = new GitService(projectRoot);
             await expect(service.verifyGitAvailability()).resolves.toBe(false);
         });
     });
@@ -141,11 +119,11 @@ describe('GitService', () => {
                 callback(new Error('git not found'));
                 return {};
             });
-            const service = new GitService(mockProjectRoot);
+            const service = new GitService(projectRoot);
             await expect(service.initialize()).rejects.toThrow('Checkpointing is enabled, but Git is not installed. Please install Git or disable checkpointing to continue.');
         });
         it('should call setupShadowGitRepository if Git is available', async () => {
-            const service = new GitService(mockProjectRoot);
+            const service = new GitService(projectRoot);
             const setupSpy = vi
                 .spyOn(service, 'setupShadowGitRepository')
                 .mockResolvedValue(undefined);
@@ -154,64 +132,67 @@ describe('GitService', () => {
         });
     });
     describe('setupShadowGitRepository', () => {
-        const repoDir = path.join(mockHomedir, '.gemini', 'history', mockHash);
-        const hiddenGitIgnorePath = path.join(repoDir, '.gitignore');
-        const visibleGitIgnorePath = path.join(mockProjectRoot, '.gitignore');
-        const gitConfigPath = path.join(repoDir, '.gitconfig');
-        it('should create a .gitconfig file with the correct content', async () => {
-            const service = new GitService(mockProjectRoot);
-            await service.setupShadowGitRepository();
-            const expectedConfigContent = '[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n';
-            expect(hoistedMockWriteFile).toHaveBeenCalledWith(gitConfigPath, expectedConfigContent);
+        let repoDir;
+        let gitConfigPath;
+        beforeEach(() => {
+            repoDir = path.join(homedir, GEMINI_DIR, 'history', hash);
+            gitConfigPath = path.join(repoDir, '.gitconfig');
         });
         it('should create history and repository directories', async () => {
-            const service = new GitService(mockProjectRoot);
+            const service = new GitService(projectRoot);
             await service.setupShadowGitRepository();
-            expect(hoistedMockMkdir).toHaveBeenCalledWith(repoDir, {
-                recursive: true,
-            });
+            const stats = await fs.stat(repoDir);
+            expect(stats.isDirectory()).toBe(true);
+        });
+        it('should create a .gitconfig file with the correct content', async () => {
+            const service = new GitService(projectRoot);
+            await service.setupShadowGitRepository();
+            const expectedConfigContent = '[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n';
+            const actualConfigContent = await fs.readFile(gitConfigPath, 'utf-8');
+            expect(actualConfigContent).toBe(expectedConfigContent);
         });
         it('should initialize git repo in historyDir if not already initialized', async () => {
             hoistedMockCheckIsRepo.mockResolvedValue(false);
-            const service = new GitService(mockProjectRoot);
+            const service = new GitService(projectRoot);
             await service.setupShadowGitRepository();
             expect(hoistedMockSimpleGit).toHaveBeenCalledWith(repoDir);
             expect(hoistedMockInit).toHaveBeenCalled();
         });
         it('should not initialize git repo if already initialized', async () => {
             hoistedMockCheckIsRepo.mockResolvedValue(true);
-            const service = new GitService(mockProjectRoot);
+            const service = new GitService(projectRoot);
             await service.setupShadowGitRepository();
             expect(hoistedMockInit).not.toHaveBeenCalled();
         });
         it('should copy .gitignore from projectRoot if it exists', async () => {
-            const gitignoreContent = `node_modules/\n.env`;
-            hoistedMockReadFile.mockImplementation(async (filePath) => {
-                if (filePath === visibleGitIgnorePath) {
-                    return gitignoreContent;
-                }
-                return '';
-            });
-            const service = new GitService(mockProjectRoot);
+            const gitignoreContent = 'node_modules/\n.env';
+            const visibleGitIgnorePath = path.join(projectRoot, '.gitignore');
+            await fs.writeFile(visibleGitIgnorePath, gitignoreContent);
+            const service = new GitService(projectRoot);
             await service.setupShadowGitRepository();
-            expect(hoistedMockReadFile).toHaveBeenCalledWith(visibleGitIgnorePath, 'utf-8');
-            expect(hoistedMockWriteFile).toHaveBeenCalledWith(hiddenGitIgnorePath, gitignoreContent);
+            const hiddenGitIgnorePath = path.join(repoDir, '.gitignore');
+            const copiedContent = await fs.readFile(hiddenGitIgnorePath, 'utf-8');
+            expect(copiedContent).toBe(gitignoreContent);
+        });
+        it('should not create a .gitignore in shadow repo if project .gitignore does not exist', async () => {
+            const service = new GitService(projectRoot);
+            await service.setupShadowGitRepository();
+            const hiddenGitIgnorePath = path.join(repoDir, '.gitignore');
+            // An empty string is written if the file doesn't exist.
+            const content = await fs.readFile(hiddenGitIgnorePath, 'utf-8');
+            expect(content).toBe('');
         });
         it('should throw an error if reading projectRoot .gitignore fails with other errors', async () => {
-            const readError = new Error('Read permission denied');
-            hoistedMockReadFile.mockImplementation(async (filePath) => {
-                if (filePath === visibleGitIgnorePath) {
-                    throw readError;
-                }
-                return '';
-            });
-            hoistedMockIsNodeError.mockImplementation((e) => e instanceof Error);
-            const service = new GitService(mockProjectRoot);
-            await expect(service.setupShadowGitRepository()).rejects.toThrow('Read permission denied');
+            const visibleGitIgnorePath = path.join(projectRoot, '.gitignore');
+            // Create a directory instead of a file to cause a read error
+            await fs.mkdir(visibleGitIgnorePath);
+            const service = new GitService(projectRoot);
+            // EISDIR is the expected error code on Unix-like systems
+            await expect(service.setupShadowGitRepository()).rejects.toThrow(/EISDIR: illegal operation on a directory, read|EBUSY: resource busy or locked, read/);
         });
         it('should make an initial commit if no commits exist in history repo', async () => {
             hoistedMockCheckIsRepo.mockResolvedValue(false);
-            const service = new GitService(mockProjectRoot);
+            const service = new GitService(projectRoot);
             await service.setupShadowGitRepository();
             expect(hoistedMockCommit).toHaveBeenCalledWith('Initial commit', {
                 '--allow-empty': null,
@@ -219,7 +200,7 @@ describe('GitService', () => {
         });
         it('should not make an initial commit if commits already exist', async () => {
             hoistedMockCheckIsRepo.mockResolvedValue(true);
-            const service = new GitService(mockProjectRoot);
+            const service = new GitService(projectRoot);
             await service.setupShadowGitRepository();
             expect(hoistedMockCommit).not.toHaveBeenCalled();
         });