@google/gemini-cli-core 0.21.0-nightly.20251209.ec9a8c7a7 → 0.21.0-preview.1

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

@@ -0,0 +1,82 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { GitService } from '../services/gitService.js';
+import type { GeminiClient } from '../core/client.js';
+import { z } from 'zod';
+import type { Content } from '@google/genai';
+import type { ToolCallRequestInfo } from '../core/turn.js';
+export interface ToolCallData<HistoryType = unknown, ArgsType = unknown> {
+    history?: HistoryType;
+    clientHistory?: Content[];
+    commitHash?: string;
+    toolCall: {
+        name: string;
+        args: ArgsType;
+    };
+    messageId?: string;
+}
+export declare function getToolCallDataSchema(historyItemSchema?: z.ZodTypeAny): z.ZodObject<{
+    history: z.ZodOptional<z.ZodArray<z.ZodTypeAny, "many">>;
+    clientHistory: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        role: z.ZodOptional<z.ZodString>;
+        parts: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">;
+    }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+        role: z.ZodOptional<z.ZodString>;
+        parts: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">;
+    }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+        role: z.ZodOptional<z.ZodString>;
+        parts: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">;
+    }, z.ZodTypeAny, "passthrough">>, "many">>;
+    commitHash: z.ZodOptional<z.ZodString>;
+    toolCall: z.ZodObject<{
+        name: z.ZodString;
+        args: z.ZodRecord<z.ZodString, z.ZodUnknown>;
+    }, "strip", z.ZodTypeAny, {
+        name: string;
+        args: Record<string, unknown>;
+    }, {
+        name: string;
+        args: Record<string, unknown>;
+    }>;
+    messageId: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    toolCall: {
+        name: string;
+        args: Record<string, unknown>;
+    };
+    history?: any[] | undefined;
+    clientHistory?: z.objectOutputType<{
+        role: z.ZodOptional<z.ZodString>;
+        parts: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">;
+    }, z.ZodTypeAny, "passthrough">[] | undefined;
+    commitHash?: string | undefined;
+    messageId?: string | undefined;
+}, {
+    toolCall: {
+        name: string;
+        args: Record<string, unknown>;
+    };
+    history?: any[] | undefined;
+    clientHistory?: z.objectInputType<{
+        role: z.ZodOptional<z.ZodString>;
+        parts: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">;
+    }, z.ZodTypeAny, "passthrough">[] | undefined;
+    commitHash?: string | undefined;
+    messageId?: string | undefined;
+}>;
+export declare function generateCheckpointFileName(toolCall: ToolCallRequestInfo): string | null;
+export declare function formatCheckpointDisplayList(filenames: string[]): string;
+export declare function getTruncatedCheckpointNames(filenames: string[]): string[];
+export declare function processRestorableToolCalls<HistoryType>(toolCalls: ToolCallRequestInfo[], gitService: GitService, geminiClient: GeminiClient, history?: HistoryType): Promise<{
+    checkpointsToWrite: Map<string, string>;
+    toolCallToCheckpointMap: Map<string, string>;
+    errors: string[];
+}>;
+export interface CheckpointInfo {
+    messageId: string;
+    checkpoint: string;
+}
+export declare function getCheckpointInfoList(checkpointFiles: Map<string, string>): CheckpointInfo[];

package/dist/src/utils/checkpointUtils.js

@@ -0,0 +1,117 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as path from 'node:path';
+import { getErrorMessage } from './errors.js';
+import { z } from 'zod';
+const ContentSchema = z
+    .object({
+    role: z.string().optional(),
+    parts: z.array(z.record(z.unknown())),
+})
+    .passthrough();
+export function getToolCallDataSchema(historyItemSchema) {
+    const schema = historyItemSchema ?? z.any();
+    return z.object({
+        history: z.array(schema).optional(),
+        clientHistory: z.array(ContentSchema).optional(),
+        commitHash: z.string().optional(),
+        toolCall: z.object({
+            name: z.string(),
+            args: z.record(z.unknown()),
+        }),
+        messageId: z.string().optional(),
+    });
+}
+export function generateCheckpointFileName(toolCall) {
+    const toolArgs = toolCall.args;
+    const toolFilePath = toolArgs['file_path'];
+    if (!toolFilePath) {
+        return null;
+    }
+    const timestamp = new Date()
+        .toISOString()
+        .replace(/:/g, '-')
+        .replace(/\./g, '_');
+    const toolName = toolCall.name;
+    const fileName = path.basename(toolFilePath);
+    return `${timestamp}-${fileName}-${toolName}`;
+}
+export function formatCheckpointDisplayList(filenames) {
+    return getTruncatedCheckpointNames(filenames).join('\n');
+}
+export function getTruncatedCheckpointNames(filenames) {
+    return filenames.map((file) => {
+        const components = file.split('.');
+        if (components.length <= 1) {
+            return file;
+        }
+        components.pop();
+        return components.join('.');
+    });
+}
+export async function processRestorableToolCalls(toolCalls, gitService, geminiClient, history) {
+    const checkpointsToWrite = new Map();
+    const toolCallToCheckpointMap = new Map();
+    const errors = [];
+    for (const toolCall of toolCalls) {
+        try {
+            let commitHash;
+            try {
+                commitHash = await gitService.createFileSnapshot(`Snapshot for ${toolCall.name}`);
+            }
+            catch (error) {
+                errors.push(`Failed to create new snapshot for ${toolCall.name}: ${getErrorMessage(error)}. Attempting to use current commit.`);
+                commitHash = await gitService.getCurrentCommitHash();
+            }
+            if (!commitHash) {
+                errors.push(`Failed to create snapshot for ${toolCall.name}. Checkpointing may not be working properly. Ensure Git is installed and the project directory is accessible.`);
+                continue;
+            }
+            const checkpointFileName = generateCheckpointFileName(toolCall);
+            if (!checkpointFileName) {
+                errors.push(`Skipping restorable tool call due to missing file_path: ${toolCall.name}`);
+                continue;
+            }
+            const clientHistory = await geminiClient.getHistory();
+            const checkpointData = {
+                history,
+                clientHistory,
+                toolCall: {
+                    name: toolCall.name,
+                    args: toolCall.args,
+                },
+                commitHash,
+                messageId: toolCall.prompt_id,
+            };
+            const fileName = `${checkpointFileName}.json`;
+            checkpointsToWrite.set(fileName, JSON.stringify(checkpointData, null, 2));
+            toolCallToCheckpointMap.set(toolCall.callId, fileName.replace('.json', ''));
+        }
+        catch (error) {
+            errors.push(`Failed to create checkpoint for ${toolCall.name}: ${getErrorMessage(error)}`);
+        }
+    }
+    return { checkpointsToWrite, toolCallToCheckpointMap, errors };
+}
+export function getCheckpointInfoList(checkpointFiles) {
+    const checkpointInfoList = [];
+    for (const [file, content] of checkpointFiles) {
+        try {
+            const toolCallData = JSON.parse(content);
+            if (toolCallData.messageId) {
+                checkpointInfoList.push({
+                    messageId: toolCallData.messageId,
+                    checkpoint: file.replace('.json', ''),
+                });
+            }
+        }
+        catch (_e) {
+            // Ignore invalid JSON files
+        }
+    }
+    return checkpointInfoList;
+}
+//# sourceMappingURL=checkpointUtils.js.map

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

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

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

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

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

@@ -0,0 +1,229 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { z } from 'zod';
+import { getToolCallDataSchema, generateCheckpointFileName, formatCheckpointDisplayList, getTruncatedCheckpointNames, processRestorableToolCalls, getCheckpointInfoList, } from './checkpointUtils.js';
+describe('checkpoint utils', () => {
+    describe('getToolCallDataSchema', () => {
+        it('should return a schema that validates a basic tool call data object', () => {
+            const schema = getToolCallDataSchema();
+            const validData = {
+                toolCall: { name: 'test-tool', args: { foo: 'bar' } },
+            };
+            const result = schema.safeParse(validData);
+            expect(result.success).toBe(true);
+        });
+        it('should validate with an optional history schema', () => {
+            const historyItemSchema = z.object({ id: z.number(), event: z.string() });
+            const schema = getToolCallDataSchema(historyItemSchema);
+            const validData = {
+                history: [{ id: 1, event: 'start' }],
+                toolCall: { name: 'test-tool', args: {} },
+            };
+            const result = schema.safeParse(validData);
+            expect(result.success).toBe(true);
+        });
+        it('should fail validation if history items do not match the schema', () => {
+            const historyItemSchema = z.object({ id: z.number(), event: z.string() });
+            const schema = getToolCallDataSchema(historyItemSchema);
+            const invalidData = {
+                history: [{ id: '1', event: 'start' }], // id should be a number
+                toolCall: { name: 'test-tool', args: {} },
+            };
+            const result = schema.safeParse(invalidData);
+            expect(result.success).toBe(false);
+        });
+        it('should validate clientHistory with the correct schema', () => {
+            const schema = getToolCallDataSchema();
+            const validData = {
+                clientHistory: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+                toolCall: { name: 'test-tool', args: {} },
+            };
+            const result = schema.safeParse(validData);
+            expect(result.success).toBe(true);
+        });
+    });
+    describe('generateCheckpointFileName', () => {
+        it('should generate a filename with timestamp, basename, and tool name', () => {
+            vi.useFakeTimers();
+            vi.setSystemTime(new Date('2025-01-01T12:00:00.000Z'));
+            const toolCall = {
+                callId: '1',
+                name: 'replace',
+                args: { file_path: '/path/to/my-file.txt' },
+                isClientInitiated: false,
+                prompt_id: 'p1',
+            };
+            const expected = '2025-01-01T12-00-00_000Z-my-file.txt-replace';
+            const actual = generateCheckpointFileName(toolCall);
+            expect(actual).toBe(expected);
+            vi.useRealTimers();
+        });
+        it('should return null if file_path is not in the tool arguments', () => {
+            const toolCall = {
+                callId: '1',
+                name: 'replace',
+                args: { some_other_arg: 'value' },
+                isClientInitiated: false,
+                prompt_id: 'p1',
+            };
+            const actual = generateCheckpointFileName(toolCall);
+            expect(actual).toBeNull();
+        });
+    });
+    describe('formatCheckpointDisplayList and getTruncatedCheckpointNames', () => {
+        const filenames = [
+            '2025-01-01T12-00-00_000Z-my-file.txt-replace.json',
+            '2025-01-01T13-00-00_000Z-another.js-write_file.json',
+            'no-extension-file',
+        ];
+        it('getTruncatedCheckpointNames should remove the .json extension', () => {
+            const expected = [
+                '2025-01-01T12-00-00_000Z-my-file.txt-replace',
+                '2025-01-01T13-00-00_000Z-another.js-write_file',
+                'no-extension-file',
+            ];
+            const actual = getTruncatedCheckpointNames(filenames);
+            expect(actual).toEqual(expected);
+        });
+        it('formatCheckpointDisplayList should return a newline-separated string of truncated names', () => {
+            const expected = [
+                '2025-01-01T12-00-00_000Z-my-file.txt-replace',
+                '2025-01-01T13-00-00_000Z-another.js-write_file',
+                'no-extension-file',
+            ].join('\n');
+            const actual = formatCheckpointDisplayList(filenames);
+            expect(actual).toEqual(expected);
+        });
+    });
+    describe('processRestorableToolCalls', () => {
+        const mockGitService = {
+            createFileSnapshot: vi.fn(),
+            getCurrentCommitHash: vi.fn(),
+        };
+        const mockGeminiClient = {
+            getHistory: vi.fn(),
+        };
+        beforeEach(() => {
+            vi.clearAllMocks();
+        });
+        it('should create checkpoints for restorable tool calls', async () => {
+            const toolCalls = [
+                {
+                    callId: '1',
+                    name: 'replace',
+                    args: { file_path: 'a.txt' },
+                    prompt_id: 'p1',
+                    isClientInitiated: false,
+                },
+            ];
+            mockGitService.createFileSnapshot.mockResolvedValue('hash123');
+            mockGeminiClient.getHistory.mockResolvedValue([
+                { role: 'user', parts: [] },
+            ]);
+            const { checkpointsToWrite, toolCallToCheckpointMap, errors } = await processRestorableToolCalls(toolCalls, mockGitService, mockGeminiClient, 'history-data');
+            expect(errors).toHaveLength(0);
+            expect(checkpointsToWrite.size).toBe(1);
+            expect(toolCallToCheckpointMap.get('1')).toBeDefined();
+            const fileName = checkpointsToWrite.values().next().value;
+            expect(fileName).toBeDefined();
+            const fileContent = JSON.parse(fileName);
+            expect(fileContent.commitHash).toBe('hash123');
+            expect(fileContent.history).toBe('history-data');
+            expect(fileContent.clientHistory).toEqual([{ role: 'user', parts: [] }]);
+            expect(fileContent.toolCall.name).toBe('replace');
+            expect(fileContent.messageId).toBe('p1');
+        });
+        it('should handle git snapshot failure by using current commit hash', async () => {
+            const toolCalls = [
+                {
+                    callId: '1',
+                    name: 'replace',
+                    args: { file_path: 'a.txt' },
+                    prompt_id: 'p1',
+                    isClientInitiated: false,
+                },
+            ];
+            mockGitService.createFileSnapshot.mockRejectedValue(new Error('Snapshot failed'));
+            mockGitService.getCurrentCommitHash.mockResolvedValue('fallback-hash');
+            const { checkpointsToWrite, errors } = await processRestorableToolCalls(toolCalls, mockGitService, mockGeminiClient);
+            expect(errors).toHaveLength(1);
+            expect(errors[0]).toContain('Failed to create new snapshot');
+            expect(checkpointsToWrite.size).toBe(1);
+            const value = checkpointsToWrite.values().next().value;
+            expect(value).toBeDefined();
+            const fileContent = JSON.parse(value);
+            expect(fileContent.commitHash).toBe('fallback-hash');
+        });
+        it('should skip tool calls with no file_path', async () => {
+            const toolCalls = [
+                {
+                    callId: '1',
+                    name: 'replace',
+                    args: { not_a_path: 'a.txt' },
+                    prompt_id: 'p1',
+                    isClientInitiated: false,
+                },
+            ];
+            mockGitService.createFileSnapshot.mockResolvedValue('hash123');
+            const { checkpointsToWrite, errors } = await processRestorableToolCalls(toolCalls, mockGitService, mockGeminiClient);
+            expect(errors).toHaveLength(1);
+            expect(errors[0]).toContain('Skipping restorable tool call due to missing file_path');
+            expect(checkpointsToWrite.size).toBe(0);
+        });
+        it('should log an error if git snapshot fails and then skip the tool call', async () => {
+            const toolCalls = [
+                {
+                    callId: '1',
+                    name: 'replace',
+                    args: { file_path: 'a.txt' },
+                    prompt_id: 'p1',
+                    isClientInitiated: false,
+                },
+            ];
+            mockGitService.createFileSnapshot.mockRejectedValue(new Error('Snapshot failed'));
+            mockGitService.getCurrentCommitHash.mockResolvedValue(undefined);
+            const { checkpointsToWrite, errors } = await processRestorableToolCalls(toolCalls, mockGitService, mockGeminiClient);
+            expect(errors).toHaveLength(2);
+            expect(errors[0]).toContain('Failed to create new snapshot');
+            expect(errors[1]).toContain('Failed to create snapshot for replace');
+            expect(checkpointsToWrite.size).toBe(0);
+        });
+    });
+    describe('getCheckpointInfoList', () => {
+        it('should parse valid checkpoint files and return a list of info', () => {
+            const checkpointFiles = new Map([
+                ['checkpoint1.json', JSON.stringify({ messageId: 'msg1' })],
+                ['checkpoint2.json', JSON.stringify({ messageId: 'msg2' })],
+            ]);
+            const expected = [
+                { messageId: 'msg1', checkpoint: 'checkpoint1' },
+                { messageId: 'msg2', checkpoint: 'checkpoint2' },
+            ];
+            const actual = getCheckpointInfoList(checkpointFiles);
+            expect(actual).toEqual(expected);
+        });
+        it('should ignore files with invalid JSON', () => {
+            const checkpointFiles = new Map([
+                ['checkpoint1.json', JSON.stringify({ messageId: 'msg1' })],
+                ['invalid.json', 'not-json'],
+            ]);
+            const expected = [{ messageId: 'msg1', checkpoint: 'checkpoint1' }];
+            const actual = getCheckpointInfoList(checkpointFiles);
+            expect(actual).toEqual(expected);
+        });
+        it('should ignore files that are missing a messageId', () => {
+            const checkpointFiles = new Map([
+                ['checkpoint1.json', JSON.stringify({ messageId: 'msg1' })],
+                ['no-msg-id.json', JSON.stringify({ other_prop: 'value' })],
+            ]);
+            const expected = [{ messageId: 'msg1', checkpoint: 'checkpoint1' }];
+            const actual = getCheckpointInfoList(checkpointFiles);
+            expect(actual).toEqual(expected);
+        });
+    });
+});
+//# sourceMappingURL=checkpointUtils.test.js.map

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

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