@trukhinyuri/gemini-pp 0.27.0-nightly.20260121.97aac696f

package/dist/src/ui/commands/quitCommand.js

@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { formatDuration } from '../utils/formatters.js';
+import { CommandKind } from './types.js';
+export const quitCommand = {
+    name: 'quit',
+    altNames: ['exit'],
+    description: 'Exit the cli',
+    kind: CommandKind.BUILT_IN,
+    autoExecute: true,
+    action: (context) => {
+        const now = Date.now();
+        const { sessionStartTime } = context.session.stats;
+        const wallDuration = now - sessionStartTime.getTime();
+        return {
+            type: 'quit',
+            messages: [
+                {
+                    type: 'user',
+                    text: `/quit`, // Keep it consistent, even if /exit was used
+                    id: now - 1,
+                },
+                {
+                    type: 'quit',
+                    duration: formatDuration(wallDuration),
+                    id: now,
+                },
+            ],
+        };
+    },
+};
+//# sourceMappingURL=quitCommand.js.map

package/dist/src/ui/commands/quitCommand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"quitCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/quitCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAqB,MAAM,YAAY,CAAC;AAE5D,MAAM,CAAC,MAAM,WAAW,GAAiB;IACvC,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,CAAC,MAAM,CAAC;IAClB,WAAW,EAAE,cAAc;IAC3B,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE;QAClB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QACnD,MAAM,YAAY,GAAG,GAAG,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAEtD,OAAO;YACL,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,OAAO,EAAE,6CAA6C;oBAC5D,EAAE,EAAE,GAAG,GAAG,CAAC;iBACZ;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,cAAc,CAAC,YAAY,CAAC;oBACtC,EAAE,EAAE,GAAG;iBACR;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}

package/dist/src/ui/commands/quitCommand.test.d.ts

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

package/dist/src/ui/commands/quitCommand.test.js

@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { quitCommand } from './quitCommand.js';
+import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { formatDuration } from '../utils/formatters.js';
+vi.mock('../utils/formatters.js');
+describe('quitCommand', () => {
+    beforeEach(() => {
+        vi.useFakeTimers();
+        vi.setSystemTime(new Date('2025-01-01T01:00:00Z'));
+        vi.mocked(formatDuration).mockReturnValue('1h 0m 0s');
+    });
+    afterEach(() => {
+        vi.useRealTimers();
+        vi.clearAllMocks();
+    });
+    it('returns a QuitActionReturn object with the correct messages', () => {
+        const mockContext = createMockCommandContext({
+            session: {
+                stats: {
+                    sessionStartTime: new Date('2025-01-01T00:00:00Z'),
+                },
+            },
+        });
+        if (!quitCommand.action)
+            throw new Error('Action is not defined');
+        const result = quitCommand.action(mockContext, 'quit');
+        expect(formatDuration).toHaveBeenCalledWith(3600000); // 1 hour in ms
+        expect(result).toEqual({
+            type: 'quit',
+            messages: [
+                {
+                    type: 'user',
+                    text: '/quit',
+                    id: expect.any(Number),
+                },
+                {
+                    type: 'quit',
+                    duration: '1h 0m 0s',
+                    id: expect.any(Number),
+                },
+            ],
+        });
+    });
+});
+//# sourceMappingURL=quitCommand.test.js.map

package/dist/src/ui/commands/quitCommand.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"quitCommand.test.js","sourceRoot":"","sources":["../../../../src/ui/commands/quitCommand.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;AAElC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,EAAE,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACnD,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,WAAW,GAAG,wBAAwB,CAAC;YAC3C,OAAO,EAAE;gBACP,KAAK,EAAE;oBACL,gBAAgB,EAAE,IAAI,IAAI,CAAC,sBAAsB,CAAC;iBACnD;aACF;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAEvD,MAAM,CAAC,cAAc,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;QACrE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,OAAO;oBACb,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;iBACvB;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,UAAU;oBACpB,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;iBACvB;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/ui/commands/restoreCommand.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type Config } from '@google/gemini-cli-core';
+import { type SlashCommand } from './types.js';
+export declare const restoreCommand: (config: Config | null) => SlashCommand | null;

package/dist/src/ui/commands/restoreCommand.js

@@ -0,0 +1,130 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as fs from 'node:fs/promises';
+import path from 'node:path';
+import { z } from 'zod';
+import { formatCheckpointDisplayList, getToolCallDataSchema, getTruncatedCheckpointNames, performRestore, } from '@google/gemini-cli-core';
+import { CommandKind, } from './types.js';
+const HistoryItemSchema = z
+    .object({
+    type: z.string(),
+    id: z.number(),
+})
+    .passthrough();
+const ToolCallDataSchema = getToolCallDataSchema(HistoryItemSchema);
+async function restoreAction(context, args) {
+    const { services, ui } = context;
+    const { config, git: gitService } = services;
+    const { addItem, loadHistory } = ui;
+    const checkpointDir = config?.storage.getProjectTempCheckpointsDir();
+    if (!checkpointDir) {
+        return {
+            type: 'message',
+            messageType: 'error',
+            content: 'Could not determine the .gemini directory path.',
+        };
+    }
+    try {
+        // Ensure the directory exists before trying to read it.
+        await fs.mkdir(checkpointDir, { recursive: true });
+        const files = await fs.readdir(checkpointDir);
+        const jsonFiles = files.filter((file) => file.endsWith('.json'));
+        if (!args) {
+            if (jsonFiles.length === 0) {
+                return {
+                    type: 'message',
+                    messageType: 'info',
+                    content: 'No restorable tool calls found.',
+                };
+            }
+            const fileList = formatCheckpointDisplayList(jsonFiles);
+            return {
+                type: 'message',
+                messageType: 'info',
+                content: `Available tool calls to restore:\n\n${fileList}`,
+            };
+        }
+        const selectedFile = args.endsWith('.json') ? args : `${args}.json`;
+        if (!jsonFiles.includes(selectedFile)) {
+            return {
+                type: 'message',
+                messageType: 'error',
+                content: `File not found: ${selectedFile}`,
+            };
+        }
+        const filePath = path.join(checkpointDir, selectedFile);
+        const data = await fs.readFile(filePath, 'utf-8');
+        const parseResult = ToolCallDataSchema.safeParse(JSON.parse(data));
+        if (!parseResult.success) {
+            return {
+                type: 'message',
+                messageType: 'error',
+                content: `Checkpoint file is invalid: ${parseResult.error.message}`,
+            };
+        }
+        // We safely cast here because:
+        // 1. ToolCallDataSchema strictly validates the existence of 'history' as an array and 'id'/'type' on each item.
+        // 2. We trust that files valid according to this schema (written by useGeminiStream) contain the full HistoryItem structure.
+        const toolCallData = parseResult.data;
+        const actionStream = performRestore(toolCallData, gitService);
+        for await (const action of actionStream) {
+            if (action.type === 'message') {
+                addItem({
+                    type: action.messageType,
+                    text: action.content,
+                }, Date.now());
+            }
+            else if (action.type === 'load_history' && loadHistory) {
+                loadHistory(action.history);
+                if (action.clientHistory) {
+                    config?.getGeminiClient()?.setHistory(action.clientHistory);
+                }
+            }
+        }
+        return {
+            type: 'tool',
+            toolName: toolCallData.toolCall.name,
+            toolArgs: toolCallData.toolCall.args,
+        };
+    }
+    catch (error) {
+        return {
+            type: 'message',
+            messageType: 'error',
+            content: `Could not read restorable tool calls. This is the error: ${error}`,
+        };
+    }
+}
+async function completion(context, _partialArg) {
+    const { services } = context;
+    const { config } = services;
+    const checkpointDir = config?.storage.getProjectTempCheckpointsDir();
+    if (!checkpointDir) {
+        return [];
+    }
+    try {
+        const files = await fs.readdir(checkpointDir);
+        const jsonFiles = files.filter((file) => file.endsWith('.json'));
+        return getTruncatedCheckpointNames(jsonFiles);
+    }
+    catch (_err) {
+        return [];
+    }
+}
+export const restoreCommand = (config) => {
+    if (!config?.getCheckpointingEnabled()) {
+        return null;
+    }
+    return {
+        name: 'restore',
+        description: 'Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested',
+        kind: CommandKind.BUILT_IN,
+        autoExecute: true,
+        action: restoreAction,
+        completion,
+    };
+};
+//# sourceMappingURL=restoreCommand.js.map

package/dist/src/ui/commands/restoreCommand.js.map

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

package/dist/src/ui/commands/restoreCommand.test.d.ts

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

package/dist/src/ui/commands/restoreCommand.test.js

@@ -0,0 +1,190 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import * as fs from 'node:fs/promises';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { restoreCommand } from './restoreCommand.js';
+import {} from './types.js';
+import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { GEMINI_DIR, } from '@google/gemini-cli-core';
+describe('restoreCommand', () => {
+    let mockContext;
+    let mockConfig;
+    let mockGitService;
+    let mockSetHistory;
+    let testRootDir;
+    let geminiTempDir;
+    let checkpointsDir;
+    beforeEach(async () => {
+        testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'restore-command-test-'));
+        geminiTempDir = path.join(testRootDir, GEMINI_DIR);
+        checkpointsDir = path.join(geminiTempDir, 'checkpoints');
+        // The command itself creates this, but for tests it's easier to have it ready.
+        // Some tests might remove it to test error paths.
+        await fs.mkdir(checkpointsDir, { recursive: true });
+        mockSetHistory = vi.fn().mockResolvedValue(undefined);
+        mockGitService = {
+            restoreProjectFromSnapshot: vi.fn().mockResolvedValue(undefined),
+        };
+        mockConfig = {
+            getCheckpointingEnabled: vi.fn().mockReturnValue(true),
+            storage: {
+                getProjectTempCheckpointsDir: vi.fn().mockReturnValue(checkpointsDir),
+                getProjectTempDir: vi.fn().mockReturnValue(geminiTempDir),
+            },
+            getGeminiClient: vi.fn().mockReturnValue({
+                setHistory: mockSetHistory,
+            }),
+        };
+        mockContext = createMockCommandContext({
+            services: {
+                config: mockConfig,
+                git: mockGitService,
+            },
+        });
+    });
+    afterEach(async () => {
+        vi.restoreAllMocks();
+        await fs.rm(testRootDir, { recursive: true, force: true });
+    });
+    it('should return null if checkpointing is not enabled', () => {
+        vi.mocked(mockConfig.getCheckpointingEnabled).mockReturnValue(false);
+        expect(restoreCommand(mockConfig)).toBeNull();
+    });
+    it('should return the command if checkpointing is enabled', () => {
+        expect(restoreCommand(mockConfig)).toEqual(expect.objectContaining({
+            name: 'restore',
+            description: expect.any(String),
+            action: expect.any(Function),
+            completion: expect.any(Function),
+        }));
+    });
+    describe('action', () => {
+        it('should return an error if temp dir is not found', async () => {
+            vi.mocked(mockConfig.storage.getProjectTempCheckpointsDir).mockReturnValue('');
+            expect(await restoreCommand(mockConfig)?.action?.(mockContext, '')).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'Could not determine the .gemini directory path.',
+            });
+        });
+        it('should inform when no checkpoints are found if no args are passed', async () => {
+            // Remove the directory to ensure the command creates it.
+            await fs.rm(checkpointsDir, { recursive: true, force: true });
+            const command = restoreCommand(mockConfig);
+            expect(await command?.action?.(mockContext, '')).toEqual({
+                type: 'message',
+                messageType: 'info',
+                content: 'No restorable tool calls found.',
+            });
+            // Verify the directory was created by the command.
+            await expect(fs.stat(checkpointsDir)).resolves.toBeDefined();
+        });
+        it('should list available checkpoints if no args are passed', async () => {
+            await fs.writeFile(path.join(checkpointsDir, 'test1.json'), '{}');
+            await fs.writeFile(path.join(checkpointsDir, 'test2.json'), '{}');
+            const command = restoreCommand(mockConfig);
+            expect(await command?.action?.(mockContext, '')).toEqual({
+                type: 'message',
+                messageType: 'info',
+                content: 'Available tool calls to restore:\n\ntest1\ntest2',
+            });
+        });
+        it('should return an error if the specified file is not found', async () => {
+            await fs.writeFile(path.join(checkpointsDir, 'test1.json'), '{}');
+            const command = restoreCommand(mockConfig);
+            expect(await command?.action?.(mockContext, 'test2')).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'File not found: test2.json',
+            });
+        });
+        it('should handle file read errors gracefully', async () => {
+            const checkpointName = 'test1';
+            const checkpointPath = path.join(checkpointsDir, `${checkpointName}.json`);
+            // Create a directory instead of a file to cause a read error.
+            await fs.mkdir(checkpointPath);
+            const command = restoreCommand(mockConfig);
+            expect(await command?.action?.(mockContext, checkpointName)).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: expect.stringContaining('Could not read restorable tool calls.'),
+            });
+        });
+        it('should restore a tool call and project state', async () => {
+            const toolCallData = {
+                history: [{ type: 'user', text: 'do a thing', id: 123 }],
+                clientHistory: [{ role: 'user', parts: [{ text: 'do a thing' }] }],
+                commitHash: 'abcdef123',
+                toolCall: { name: 'run_shell_command', args: { command: 'ls' } },
+            };
+            await fs.writeFile(path.join(checkpointsDir, 'my-checkpoint.json'), JSON.stringify(toolCallData));
+            const command = restoreCommand(mockConfig);
+            expect(await command?.action?.(mockContext, 'my-checkpoint')).toEqual({
+                type: 'tool',
+                toolName: 'run_shell_command',
+                toolArgs: { command: 'ls' },
+            });
+            expect(mockContext.ui.loadHistory).toHaveBeenCalledWith(toolCallData.history);
+            expect(mockSetHistory).toHaveBeenCalledWith(toolCallData.clientHistory);
+            expect(mockGitService.restoreProjectFromSnapshot).toHaveBeenCalledWith(toolCallData.commitHash);
+            expect(mockContext.ui.addItem).toHaveBeenCalledWith({
+                type: 'info',
+                text: 'Restored project to the state before the tool call.',
+            }, expect.any(Number));
+        });
+        it('should restore even if only toolCall is present', async () => {
+            const toolCallData = {
+                toolCall: { name: 'run_shell_command', args: { command: 'ls' } },
+            };
+            await fs.writeFile(path.join(checkpointsDir, 'my-checkpoint.json'), JSON.stringify(toolCallData));
+            const command = restoreCommand(mockConfig);
+            expect(await command?.action?.(mockContext, 'my-checkpoint')).toEqual({
+                type: 'tool',
+                toolName: 'run_shell_command',
+                toolArgs: { command: 'ls' },
+            });
+            expect(mockContext.ui.loadHistory).not.toHaveBeenCalled();
+            expect(mockSetHistory).not.toHaveBeenCalled();
+            expect(mockGitService.restoreProjectFromSnapshot).not.toHaveBeenCalled();
+        });
+    });
+    it('should return an error for a checkpoint file missing the toolCall property', async () => {
+        const checkpointName = 'missing-toolcall';
+        await fs.writeFile(path.join(checkpointsDir, `${checkpointName}.json`), JSON.stringify({ history: [] }));
+        const command = restoreCommand(mockConfig);
+        expect(await command?.action?.(mockContext, checkpointName)).toEqual({
+            type: 'message',
+            messageType: 'error',
+            // A more specific error message would be ideal, but for now, we can assert the current behavior.
+            content: expect.stringContaining('Checkpoint file is invalid'),
+        });
+    });
+    describe('completion', () => {
+        it('should return an empty array if temp dir is not found', async () => {
+            vi.mocked(mockConfig.storage.getProjectTempDir).mockReturnValue('');
+            const command = restoreCommand(mockConfig);
+            expect(await command?.completion?.(mockContext, '')).toEqual([]);
+        });
+        it('should return an empty array on readdir error', async () => {
+            await fs.rm(checkpointsDir, { recursive: true, force: true });
+            const command = restoreCommand(mockConfig);
+            expect(await command?.completion?.(mockContext, '')).toEqual([]);
+        });
+        it('should return a list of checkpoint names', async () => {
+            await fs.writeFile(path.join(checkpointsDir, 'test1.json'), '{}');
+            await fs.writeFile(path.join(checkpointsDir, 'test2.json'), '{}');
+            await fs.writeFile(path.join(checkpointsDir, 'not-a-checkpoint.txt'), '{}');
+            const command = restoreCommand(mockConfig);
+            expect(await command?.completion?.(mockContext, '')).toEqual([
+                'test1',
+                'test2',
+            ]);
+        });
+    });
+});
+//# sourceMappingURL=restoreCommand.test.js.map

package/dist/src/ui/commands/restoreCommand.test.js.map

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

package/dist/src/ui/commands/resumeCommand.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { SlashCommand } from './types.js';
+export declare const resumeCommand: SlashCommand;

package/dist/src/ui/commands/resumeCommand.js

@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { CommandKind } from './types.js';
+export const resumeCommand = {
+    name: 'resume',
+    description: 'Browse and resume auto-saved conversations',
+    kind: CommandKind.BUILT_IN,
+    autoExecute: true,
+    action: async (_context, _args) => ({
+        type: 'dialog',
+        dialog: 'sessionBrowser',
+    }),
+};
+//# sourceMappingURL=resumeCommand.js.map

package/dist/src/ui/commands/resumeCommand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resumeCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/resumeCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,CAAC,MAAM,aAAa,GAAiB;IACzC,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,4CAA4C;IACzD,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,KAAK,EACX,QAAwB,EACxB,KAAa,EACoB,EAAE,CAAC,CAAC;QACrC,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,gBAAgB;KACzB,CAAC;CACH,CAAC"}

package/dist/src/ui/commands/rewindCommand.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type SlashCommand } from './types.js';
+export declare const rewindCommand: SlashCommand;

package/dist/src/ui/commands/rewindCommand.js

@@ -0,0 +1,132 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { CommandKind, } from './types.js';
+import { RewindViewer } from '../components/RewindViewer.js';
+import {} from '../types.js';
+import { convertSessionToHistoryFormats } from '../hooks/useSessionBrowser.js';
+import { revertFileChanges } from '../utils/rewindFileOps.js';
+import { RewindOutcome } from '../components/RewindConfirmation.js';
+import { checkExhaustive } from '../../utils/checks.js';
+import { coreEvents, debugLogger } from '@google/gemini-cli-core';
+/**
+ * Helper function to handle the core logic of rewinding a conversation.
+ * This function encapsulates the steps needed to rewind the conversation,
+ * update the client and UI history, and clear the component.
+ *
+ * @param context The command context.
+ * @param client Gemini client
+ * @param recordingService The chat recording service.
+ * @param messageId The ID of the message to rewind to.
+ * @param newText The new text for the input field after rewinding.
+ */
+async function rewindConversation(context, client, recordingService, messageId, newText) {
+    try {
+        const conversation = recordingService.rewindTo(messageId);
+        if (!conversation) {
+            const errorMsg = 'Could not fetch conversation file';
+            debugLogger.error(errorMsg);
+            context.ui.removeComponent();
+            coreEvents.emitFeedback('error', errorMsg);
+            return;
+        }
+        // Convert to UI and Client formats
+        const { uiHistory, clientHistory } = convertSessionToHistoryFormats(conversation.messages);
+        client.setHistory(clientHistory);
+        // Reset context manager as we are rewinding history
+        await context.services.config?.getContextManager()?.refresh();
+        // Update UI History
+        // We generate IDs based on index for the rewind history
+        const startId = 1;
+        const historyWithIds = uiHistory.map((item, idx) => ({
+            ...item,
+            id: startId + idx,
+        }));
+        // 1. Remove component FIRST to avoid flicker and clear the stage
+        context.ui.removeComponent();
+        // 2. Load the rewound history and set the input
+        context.ui.loadHistory(historyWithIds, newText);
+    }
+    catch (error) {
+        // If an error occurs, we still want to remove the component if possible
+        context.ui.removeComponent();
+        coreEvents.emitFeedback('error', error instanceof Error ? error.message : 'Unknown error during rewind');
+    }
+}
+export const rewindCommand = {
+    name: 'rewind',
+    description: 'Jump back to a specific message and restart the conversation',
+    kind: CommandKind.BUILT_IN,
+    action: (context) => {
+        const config = context.services.config;
+        if (!config)
+            return {
+                type: 'message',
+                messageType: 'error',
+                content: 'Config not found',
+            };
+        const client = config.getGeminiClient();
+        if (!client)
+            return {
+                type: 'message',
+                messageType: 'error',
+                content: 'Client not initialized',
+            };
+        const recordingService = client.getChatRecordingService();
+        if (!recordingService)
+            return {
+                type: 'message',
+                messageType: 'error',
+                content: 'Recording service unavailable',
+            };
+        const conversation = recordingService.getConversation();
+        if (!conversation)
+            return {
+                type: 'message',
+                messageType: 'info',
+                content: 'No conversation found.',
+            };
+        const hasUserInteractions = conversation.messages.some((msg) => msg.type === 'user');
+        if (!hasUserInteractions) {
+            return {
+                type: 'message',
+                messageType: 'info',
+                content: 'Nothing to rewind to.',
+            };
+        }
+        return {
+            type: 'custom_dialog',
+            component: (_jsx(RewindViewer, { conversation: conversation, onExit: () => {
+                    context.ui.removeComponent();
+                }, onRewind: async (messageId, newText, outcome) => {
+                    switch (outcome) {
+                        case RewindOutcome.Cancel:
+                            context.ui.removeComponent();
+                            return;
+                        case RewindOutcome.RevertOnly:
+                            if (conversation) {
+                                await revertFileChanges(conversation, messageId);
+                            }
+                            context.ui.removeComponent();
+                            coreEvents.emitFeedback('info', 'File changes reverted.');
+                            return;
+                        case RewindOutcome.RewindAndRevert:
+                            if (conversation) {
+                                await revertFileChanges(conversation, messageId);
+                            }
+                            await rewindConversation(context, client, recordingService, messageId, newText);
+                            return;
+                        case RewindOutcome.RewindOnly:
+                            await rewindConversation(context, client, recordingService, messageId, newText);
+                            return;
+                        default:
+                            checkExhaustive(outcome);
+                    }
+                } })),
+        };
+    },
+};
+//# sourceMappingURL=rewindCommand.js.map

package/dist/src/ui/commands/rewindCommand.js.map

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