@google/gemini-cli-core 0.35.0-preview.2 → 0.36.0-nightly.20260321.fc03891a1

package/dist/src/services/worktreeService.d.ts

@@ -0,0 +1,33 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export interface WorktreeInfo {
+    name: string;
+    path: string;
+    baseSha: string;
+}
+/**
+ * Service for managing Git worktrees within Gemini CLI.
+ * Handles creation, cleanup, and environment setup for isolated sessions.
+ */
+export declare class WorktreeService {
+    private readonly projectRoot;
+    constructor(projectRoot: string);
+    /**
+     * Creates a new worktree and prepares the environment.
+     */
+    setup(name?: string): Promise<WorktreeInfo>;
+    /**
+     * Checks if a worktree has changes and cleans it up if it's unmodified.
+     */
+    maybeCleanup(info: WorktreeInfo): Promise<boolean>;
+}
+export declare function createWorktreeService(cwd: string): Promise<WorktreeService>;
+export declare function getProjectRootForWorktree(cwd: string): Promise<string>;
+export declare function getWorktreePath(projectRoot: string, name: string): string;
+export declare function createWorktree(projectRoot: string, name: string): Promise<string>;
+export declare function isGeminiWorktree(dirPath: string, projectRoot: string): boolean;
+export declare function hasWorktreeChanges(dirPath: string, baseSha?: string): Promise<boolean>;
+export declare function cleanupWorktree(dirPath: string, projectRoot: string): Promise<void>;

package/dist/src/services/worktreeService.js

@@ -0,0 +1,174 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as path from 'node:path';
+import * as fs from 'node:fs/promises';
+import { realpathSync } from 'node:fs';
+import { execa } from 'execa';
+import { debugLogger } from '../utils/debugLogger.js';
+/**
+ * Service for managing Git worktrees within Gemini CLI.
+ * Handles creation, cleanup, and environment setup for isolated sessions.
+ */
+export class WorktreeService {
+    projectRoot;
+    constructor(projectRoot) {
+        this.projectRoot = projectRoot;
+    }
+    /**
+     * Creates a new worktree and prepares the environment.
+     */
+    async setup(name) {
+        let worktreeName = name?.trim();
+        if (!worktreeName) {
+            const now = new Date();
+            const timestamp = now
+                .toISOString()
+                .replace(/[:.]/g, '-')
+                .replace('T', '-')
+                .replace('Z', '');
+            const randomSuffix = Math.random().toString(36).substring(2, 6);
+            worktreeName = `${timestamp}-${randomSuffix}`;
+        }
+        // Capture the base commit before creating the worktree
+        const { stdout: baseSha } = await execa('git', ['rev-parse', 'HEAD'], {
+            cwd: this.projectRoot,
+        });
+        const worktreePath = await createWorktree(this.projectRoot, worktreeName);
+        return {
+            name: worktreeName,
+            path: worktreePath,
+            baseSha: baseSha.trim(),
+        };
+    }
+    /**
+     * Checks if a worktree has changes and cleans it up if it's unmodified.
+     */
+    async maybeCleanup(info) {
+        const hasChanges = await hasWorktreeChanges(info.path, info.baseSha);
+        if (!hasChanges) {
+            try {
+                await cleanupWorktree(info.path, this.projectRoot);
+                debugLogger.log(`Automatically cleaned up unmodified worktree: ${info.path}`);
+                return true;
+            }
+            catch (error) {
+                debugLogger.error(`Failed to clean up worktree ${info.path}: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }
+        else {
+            debugLogger.debug(`Preserving worktree ${info.path} because it has changes.`);
+        }
+        return false;
+    }
+}
+export async function createWorktreeService(cwd) {
+    const projectRoot = await getProjectRootForWorktree(cwd);
+    return new WorktreeService(projectRoot);
+}
+// Low-level worktree utilities
+export async function getProjectRootForWorktree(cwd) {
+    try {
+        const { stdout } = await execa('git', ['rev-parse', '--git-common-dir'], {
+            cwd,
+        });
+        const gitCommonDir = stdout.trim();
+        const absoluteGitDir = path.isAbsolute(gitCommonDir)
+            ? gitCommonDir
+            : path.resolve(cwd, gitCommonDir);
+        // The project root is the parent of the .git directory/file
+        return path.dirname(absoluteGitDir);
+    }
+    catch (e) {
+        debugLogger.debug(`Failed to get project root for worktree at ${cwd}: ${e instanceof Error ? e.message : String(e)}`);
+        return cwd;
+    }
+}
+export function getWorktreePath(projectRoot, name) {
+    return path.join(projectRoot, '.gemini', 'worktrees', name);
+}
+export async function createWorktree(projectRoot, name) {
+    const worktreePath = getWorktreePath(projectRoot, name);
+    const branchName = `worktree-${name}`;
+    await execa('git', ['worktree', 'add', worktreePath, '-b', branchName], {
+        cwd: projectRoot,
+    });
+    return worktreePath;
+}
+export function isGeminiWorktree(dirPath, projectRoot) {
+    try {
+        const realDirPath = realpathSync(dirPath);
+        const realProjectRoot = realpathSync(projectRoot);
+        const worktreesBaseDir = path.join(realProjectRoot, '.gemini', 'worktrees');
+        const relative = path.relative(worktreesBaseDir, realDirPath);
+        return !relative.startsWith('..') && !path.isAbsolute(relative);
+    }
+    catch {
+        return false;
+    }
+}
+export async function hasWorktreeChanges(dirPath, baseSha) {
+    try {
+        // 1. Check for uncommitted changes (index or working tree)
+        const { stdout: status } = await execa('git', ['status', '--porcelain'], {
+            cwd: dirPath,
+        });
+        if (status.trim() !== '') {
+            return true;
+        }
+        // 2. Check if the current commit has moved from the base
+        if (baseSha) {
+            const { stdout: currentSha } = await execa('git', ['rev-parse', 'HEAD'], {
+                cwd: dirPath,
+            });
+            if (currentSha.trim() !== baseSha) {
+                return true;
+            }
+        }
+        return false;
+    }
+    catch (e) {
+        debugLogger.debug(`Failed to check worktree changes at ${dirPath}: ${e instanceof Error ? e.message : String(e)}`);
+        // If any git command fails, assume the worktree is dirty to be safe.
+        return true;
+    }
+}
+export async function cleanupWorktree(dirPath, projectRoot) {
+    try {
+        await fs.access(dirPath);
+    }
+    catch {
+        return; // Worktree already gone
+    }
+    let branchName;
+    try {
+        // 1. Discover the branch name associated with this worktree path
+        const { stdout } = await execa('git', ['-C', dirPath, 'branch', '--show-current'], {
+            cwd: projectRoot,
+        });
+        branchName = stdout.trim() || undefined;
+        // 2. Remove the worktree
+        await execa('git', ['worktree', 'remove', dirPath, '--force'], {
+            cwd: projectRoot,
+        });
+    }
+    catch (e) {
+        debugLogger.debug(`Failed to remove worktree ${dirPath}: ${e instanceof Error ? e.message : String(e)}`);
+    }
+    finally {
+        // 3. Delete the branch if we found it
+        if (branchName) {
+            try {
+                await execa('git', ['branch', '-D', branchName], {
+                    cwd: projectRoot,
+                });
+            }
+            catch (e) {
+                debugLogger.debug(`Failed to delete branch ${branchName}: ${e instanceof Error ? e.message : String(e)}`);
+            }
+        }
+    }
+}
+//# sourceMappingURL=worktreeService.js.map

package/dist/src/services/worktreeService.js.map

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

package/dist/src/services/worktreeService.test.d.ts

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

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

@@ -0,0 +1,200 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import * as path from 'node:path';
+import * as fs from 'node:fs/promises';
+import { getProjectRootForWorktree, createWorktree, isGeminiWorktree, hasWorktreeChanges, cleanupWorktree, getWorktreePath, WorktreeService, } from './worktreeService.js';
+import { execa } from 'execa';
+vi.mock('execa');
+vi.mock('node:fs/promises');
+vi.mock('node:fs', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        realpathSync: vi.fn((p) => p),
+    };
+});
+describe('worktree utilities', () => {
+    const projectRoot = '/mock/project';
+    const worktreeName = 'test-feature';
+    const expectedPath = path.join(projectRoot, '.gemini', 'worktrees', worktreeName);
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    describe('getProjectRootForWorktree', () => {
+        it('should return the project root from git common dir', async () => {
+            // In main repo, git-common-dir is often just ".git"
+            vi.mocked(execa).mockResolvedValue({
+                stdout: '.git\n',
+            });
+            const result = await getProjectRootForWorktree('/mock/project');
+            expect(result).toBe('/mock/project');
+            expect(execa).toHaveBeenCalledWith('git', ['rev-parse', '--git-common-dir'], { cwd: '/mock/project' });
+        });
+        it('should resolve absolute git common dir paths (as seen in worktrees)', async () => {
+            // Inside a worktree, git-common-dir is usually an absolute path to the main .git folder
+            vi.mocked(execa).mockResolvedValue({
+                stdout: '/mock/project/.git\n',
+            });
+            const result = await getProjectRootForWorktree('/mock/project/.gemini/worktrees/my-feature');
+            expect(result).toBe('/mock/project');
+        });
+        it('should fallback to cwd if git command fails', async () => {
+            vi.mocked(execa).mockRejectedValue(new Error('not a git repo'));
+            const result = await getProjectRootForWorktree('/mock/non-git/src');
+            expect(result).toBe('/mock/non-git/src');
+        });
+    });
+    describe('getWorktreePath', () => {
+        it('should return the correct path for a given name', () => {
+            expect(getWorktreePath(projectRoot, worktreeName)).toBe(expectedPath);
+        });
+    });
+    describe('createWorktree', () => {
+        it('should execute git worktree add with correct branch and path', async () => {
+            vi.mocked(execa).mockResolvedValue({ stdout: '' });
+            const resultPath = await createWorktree(projectRoot, worktreeName);
+            expect(resultPath).toBe(expectedPath);
+            expect(execa).toHaveBeenCalledWith('git', ['worktree', 'add', expectedPath, '-b', `worktree-${worktreeName}`], { cwd: projectRoot });
+        });
+        it('should throw an error if git worktree add fails', async () => {
+            vi.mocked(execa).mockRejectedValue(new Error('git failed'));
+            await expect(createWorktree(projectRoot, worktreeName)).rejects.toThrow('git failed');
+        });
+    });
+    describe('isGeminiWorktree', () => {
+        it('should return true for a valid gemini worktree path', () => {
+            expect(isGeminiWorktree(expectedPath, projectRoot)).toBe(true);
+            expect(isGeminiWorktree(path.join(expectedPath, 'src'), projectRoot)).toBe(true);
+        });
+        it('should return false for a path outside gemini worktrees', () => {
+            expect(isGeminiWorktree(path.join(projectRoot, 'src'), projectRoot)).toBe(false);
+            expect(isGeminiWorktree('/some/other/path', projectRoot)).toBe(false);
+        });
+    });
+    describe('hasWorktreeChanges', () => {
+        it('should return true if git status --porcelain has output', async () => {
+            vi.mocked(execa).mockResolvedValue({
+                stdout: ' M somefile.txt\n?? newfile.txt',
+            });
+            const hasChanges = await hasWorktreeChanges(expectedPath);
+            expect(hasChanges).toBe(true);
+            expect(execa).toHaveBeenCalledWith('git', ['status', '--porcelain'], {
+                cwd: expectedPath,
+            });
+        });
+        it('should return true if there are untracked files', async () => {
+            vi.mocked(execa).mockResolvedValue({
+                stdout: '?? untracked-file.txt\n',
+            });
+            const hasChanges = await hasWorktreeChanges(expectedPath);
+            expect(hasChanges).toBe(true);
+        });
+        it('should return true if HEAD differs from baseSha', async () => {
+            vi.mocked(execa)
+                .mockResolvedValueOnce({ stdout: '' }) // status clean
+                .mockResolvedValueOnce({ stdout: 'different-sha' }); // HEAD moved
+            const hasChanges = await hasWorktreeChanges(expectedPath, 'base-sha');
+            expect(hasChanges).toBe(true);
+        });
+        it('should return false if status is clean and HEAD matches baseSha', async () => {
+            vi.mocked(execa)
+                .mockResolvedValueOnce({ stdout: '' }) // status clean
+                .mockResolvedValueOnce({ stdout: 'base-sha' }); // HEAD same
+            const hasChanges = await hasWorktreeChanges(expectedPath, 'base-sha');
+            expect(hasChanges).toBe(false);
+        });
+        it('should return true if any git command fails', async () => {
+            vi.mocked(execa).mockRejectedValue(new Error('git error'));
+            const hasChanges = await hasWorktreeChanges(expectedPath);
+            expect(hasChanges).toBe(true);
+        });
+    });
+    describe('cleanupWorktree', () => {
+        it('should remove the worktree and delete the branch', async () => {
+            vi.mocked(fs.access).mockResolvedValue(undefined);
+            vi.mocked(execa)
+                .mockResolvedValueOnce({
+                stdout: `worktree-${worktreeName}\n`,
+            }) // branch --show-current
+                .mockResolvedValueOnce({ stdout: '' }) // remove
+                .mockResolvedValueOnce({ stdout: '' }); // branch -D
+            await cleanupWorktree(expectedPath, projectRoot);
+            expect(execa).toHaveBeenCalledTimes(3);
+            expect(execa).toHaveBeenNthCalledWith(1, 'git', ['-C', expectedPath, 'branch', '--show-current'], { cwd: projectRoot });
+            expect(execa).toHaveBeenNthCalledWith(2, 'git', ['worktree', 'remove', expectedPath, '--force'], { cwd: projectRoot });
+            expect(execa).toHaveBeenNthCalledWith(3, 'git', ['branch', '-D', `worktree-${worktreeName}`], { cwd: projectRoot });
+        });
+        it('should handle branch discovery failure gracefully', async () => {
+            vi.mocked(fs.access).mockResolvedValue(undefined);
+            vi.mocked(execa)
+                .mockResolvedValueOnce({ stdout: '' }) // no branch found
+                .mockResolvedValueOnce({ stdout: '' }); // remove
+            await cleanupWorktree(expectedPath, projectRoot);
+            expect(execa).toHaveBeenCalledTimes(2);
+            expect(execa).toHaveBeenNthCalledWith(2, 'git', ['worktree', 'remove', expectedPath, '--force'], { cwd: projectRoot });
+        });
+    });
+});
+describe('WorktreeService', () => {
+    const projectRoot = '/mock/project';
+    const service = new WorktreeService(projectRoot);
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    describe('setup', () => {
+        it('should capture baseSha and create a worktree', async () => {
+            vi.mocked(execa).mockResolvedValue({
+                stdout: 'current-sha\n',
+            });
+            const info = await service.setup('feature-x');
+            expect(execa).toHaveBeenCalledWith('git', ['rev-parse', 'HEAD'], {
+                cwd: projectRoot,
+            });
+            expect(info.name).toBe('feature-x');
+            expect(info.baseSha).toBe('current-sha');
+            expect(info.path).toContain('feature-x');
+        });
+        it('should generate a timestamped name if none provided', async () => {
+            vi.mocked(execa).mockResolvedValue({
+                stdout: 'current-sha\n',
+            });
+            const info = await service.setup();
+            expect(info.name).toMatch(/^\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2}-\w+/);
+            expect(info.path).toContain(info.name);
+        });
+    });
+    describe('maybeCleanup', () => {
+        const info = {
+            name: 'feature-x',
+            path: '/mock/project/.gemini/worktrees/feature-x',
+            baseSha: 'base-sha',
+        };
+        it('should cleanup unmodified worktrees', async () => {
+            // Mock hasWorktreeChanges -> false (no changes)
+            vi.mocked(execa)
+                .mockResolvedValueOnce({ stdout: '' }) // status check
+                .mockResolvedValueOnce({ stdout: 'base-sha' }); // SHA check
+            vi.mocked(fs.access).mockResolvedValue(undefined);
+            vi.mocked(execa).mockResolvedValue({ stdout: '' }); // cleanup calls
+            const cleanedUp = await service.maybeCleanup(info);
+            expect(cleanedUp).toBe(true);
+            // Verify cleanupWorktree utilities were called (execa calls inside cleanupWorktree)
+            expect(execa).toHaveBeenCalledWith(expect.anything(), expect.arrayContaining(['worktree', 'remove', info.path, '--force']), expect.anything());
+        });
+        it('should preserve modified worktrees', async () => {
+            // Mock hasWorktreeChanges -> true (changes detected)
+            vi.mocked(execa).mockResolvedValue({
+                stdout: ' M modified-file.ts',
+            });
+            const cleanedUp = await service.maybeCleanup(info);
+            expect(cleanedUp).toBe(false);
+            // Ensure cleanupWorktree was NOT called
+            expect(execa).not.toHaveBeenCalledWith(expect.anything(), expect.arrayContaining(['worktree', 'remove']), expect.anything());
+        });
+    });
+});
+//# sourceMappingURL=worktreeService.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"worktreeService.test.js","sourceRoot":"","sources":["../../../src/services/worktreeService.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EACL,yBAAyB,EACzB,cAAc,EACd,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACjB,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AAC5B,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC1C,MAAM,MAAM,GAAG,MAAM,cAAc,EAA4B,CAAC;IAChE,OAAO;QACL,GAAG,MAAM;QACT,YAAY,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC;KACtC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,MAAM,WAAW,GAAG,eAAe,CAAC;IACpC,MAAM,YAAY,GAAG,cAAc,CAAC;IACpC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC5B,WAAW,EACX,SAAS,EACT,WAAW,EACX,YAAY,CACb,CAAC;IAEF,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACzC,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,oDAAoD;YACpD,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC;gBACjC,MAAM,EAAE,QAAQ;aACR,CAAC,CAAC;YAEZ,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,eAAe,CAAC,CAAC;YAChE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAChC,KAAK,EACL,CAAC,WAAW,EAAE,kBAAkB,CAAC,EACjC,EAAE,GAAG,EAAE,eAAe,EAAE,CACzB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;YACnF,wFAAwF;YACxF,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC;gBACjC,MAAM,EAAE,sBAAsB;aACtB,CAAC,CAAC;YAEZ,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAC5C,4CAA4C,CAC7C,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAC3D,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAEhE,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,mBAAmB,CAAC,CAAC;YACpE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACzD,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;YAC5E,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAW,CAAC,CAAC;YAE5D,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YAEnE,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACtC,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAChC,KAAK,EACL,CAAC,UAAU,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,YAAY,EAAE,CAAC,EACnE,EAAE,GAAG,EAAE,WAAW,EAAE,CACrB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;YAE5D,MAAM,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACrE,YAAY,CACb,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;YAC7D,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/D,MAAM,CACJ,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,WAAW,CAAC,CAC9D,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;YACjE,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CACvE,KAAK,CACN,CAAC;YACF,MAAM,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACvE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC;gBACjC,MAAM,EAAE,iCAAiC;aACjC,CAAC,CAAC;YAEZ,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,YAAY,CAAC,CAAC;YAE1D,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE;gBACnE,GAAG,EAAE,YAAY;aAClB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC;gBACjC,MAAM,EAAE,yBAAyB;aACzB,CAAC,CAAC;YAEZ,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,YAAY,CAAC,CAAC;YAE1D,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;iBACb,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAW,CAAC,CAAC,eAAe;iBAC9D,qBAAqB,CAAC,EAAE,MAAM,EAAE,eAAe,EAAW,CAAC,CAAC,CAAC,aAAa;YAE7E,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAEtE,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;YAC/E,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;iBACb,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAW,CAAC,CAAC,eAAe;iBAC9D,qBAAqB,CAAC,EAAE,MAAM,EAAE,UAAU,EAAW,CAAC,CAAC,CAAC,YAAY;YAEvE,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAEtE,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAC3D,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;YAE3D,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,YAAY,CAAC,CAAC;YAE1D,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAChE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAClD,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;iBACb,qBAAqB,CAAC;gBACrB,MAAM,EAAE,YAAY,YAAY,IAAI;aAC5B,CAAC,CAAC,wBAAwB;iBACnC,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAW,CAAC,CAAC,SAAS;iBACxD,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAW,CAAC,CAAC,CAAC,YAAY;YAE/D,MAAM,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;YAEjD,MAAM,CAAC,KAAK,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,CAAC,KAAK,CAAC,CAAC,uBAAuB,CACnC,CAAC,EACD,KAAK,EACL,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAChD,EAAE,GAAG,EAAE,WAAW,EAAE,CACrB,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,CAAC,uBAAuB,CACnC,CAAC,EACD,KAAK,EACL,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC,EAC/C,EAAE,GAAG,EAAE,WAAW,EAAE,CACrB,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,CAAC,uBAAuB,CACnC,CAAC,EACD,KAAK,EACL,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,YAAY,EAAE,CAAC,EAC5C,EAAE,GAAG,EAAE,WAAW,EAAE,CACrB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;YACjE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAClD,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;iBACb,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAW,CAAC,CAAC,kBAAkB;iBACjE,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAW,CAAC,CAAC,CAAC,SAAS;YAE5D,MAAM,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;YAEjD,MAAM,CAAC,KAAK,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,CAAC,KAAK,CAAC,CAAC,uBAAuB,CACnC,CAAC,EACD,KAAK,EACL,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC,EAC/C,EAAE,GAAG,EAAE,WAAW,EAAE,CACrB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,MAAM,WAAW,GAAG,eAAe,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,WAAW,CAAC,CAAC;IAEjD,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QACrB,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5D,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC;gBACjC,MAAM,EAAE,eAAe;aACf,CAAC,CAAC;YAEZ,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAE9C,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE;gBAC/D,GAAG,EAAE,WAAW;aACjB,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACzC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;YACnE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC;gBACjC,MAAM,EAAE,eAAe;aACf,CAAC,CAAC;YAEZ,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YAEnC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,0CAA0C,CAAC,CAAC;YACtE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,MAAM,IAAI,GAAG;YACX,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,2CAA2C;YACjD,OAAO,EAAE,UAAU;SACpB,CAAC;QAEF,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,gDAAgD;YAChD,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;iBACb,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAW,CAAC,CAAC,eAAe;iBAC9D,qBAAqB,CAAC,EAAE,MAAM,EAAE,UAAU,EAAW,CAAC,CAAC,CAAC,YAAY;YAEvE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAClD,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAW,CAAC,CAAC,CAAC,gBAAgB;YAE7E,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAEnD,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,oFAAoF;YACpF,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAChC,MAAM,CAAC,QAAQ,EAAE,EACjB,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,EACpE,MAAM,CAAC,QAAQ,EAAE,CAClB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;YAClD,qDAAqD;YACrD,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC;gBACjC,MAAM,EAAE,qBAAqB;aACrB,CAAC,CAAC;YAEZ,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAEnD,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,wCAAwC;YACxC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,oBAAoB,CACpC,MAAM,CAAC,QAAQ,EAAE,EACjB,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,EAC9C,MAAM,CAAC,QAAQ,EAAE,CAClB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/telemetry/clearcut-logger/clearcut-logger.js

@@ -520,6 +520,10 @@ export class ClearcutLogger {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_EXTENSION_IDS,
                 value: event.extension_ids.toString(),
             },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_WORKTREE_ACTIVE,
+                value: event.worktree_active.toString(),
+            },
         ];
         // Add hardware information only to the start session event
         const cpus = os.cpus();