@google/gemini-cli 0.32.0-preview.0 → 0.33.0-preview.0

package/dist/src/zed-integration/commands/restore.js

@@ -0,0 +1,140 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { getCheckpointInfoList, getToolCallDataSchema, isNodeError, performRestore, } from '@google/gemini-cli-core';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+export class RestoreCommand {
+    name = 'restore';
+    description = 'Restore to a previous checkpoint, or list available checkpoints to restore. This will reset the conversation and file history to the state it was in when the checkpoint was created';
+    requiresWorkspace = true;
+    subCommands = [new ListCheckpointsCommand()];
+    async execute(context, args) {
+        const { config, git: gitService } = context;
+        const argsStr = args.join(' ');
+        try {
+            if (!argsStr) {
+                return await new ListCheckpointsCommand().execute(context);
+            }
+            if (!config.getCheckpointingEnabled()) {
+                return {
+                    name: this.name,
+                    data: 'Checkpointing is not enabled. Please enable it in your settings (`general.checkpointing.enabled: true`) to use /restore.',
+                };
+            }
+            const selectedFile = argsStr.endsWith('.json')
+                ? argsStr
+                : `${argsStr}.json`;
+            const checkpointDir = config.storage.getProjectTempCheckpointsDir();
+            const filePath = path.join(checkpointDir, selectedFile);
+            let data;
+            try {
+                data = await fs.readFile(filePath, 'utf-8');
+            }
+            catch (error) {
+                if (isNodeError(error) && error.code === 'ENOENT') {
+                    return {
+                        name: this.name,
+                        data: `File not found: ${selectedFile}`,
+                    };
+                }
+                throw error;
+            }
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            const toolCallData = JSON.parse(data);
+            const ToolCallDataSchema = getToolCallDataSchema();
+            const parseResult = ToolCallDataSchema.safeParse(toolCallData);
+            if (!parseResult.success) {
+                return {
+                    name: this.name,
+                    data: 'Checkpoint file is invalid or corrupted.',
+                };
+            }
+            const restoreResultGenerator = performRestore(parseResult.data, gitService);
+            const restoreResult = [];
+            for await (const result of restoreResultGenerator) {
+                restoreResult.push(result);
+            }
+            // Format the result nicely since Zed just dumps data
+            const formattedResult = restoreResult
+                .map((r) => {
+                if (r.type === 'message') {
+                    return `[${r.messageType.toUpperCase()}] ${r.content}`;
+                }
+                else if (r.type === 'load_history') {
+                    return `Loaded history with ${r.clientHistory.length} messages.`;
+                }
+                return `Restored: ${JSON.stringify(r)}`;
+            })
+                .join('\n');
+            return {
+                name: this.name,
+                data: formattedResult,
+            };
+        }
+        catch (error) {
+            return {
+                name: this.name,
+                data: `An unexpected error occurred during restore: ${error}`,
+            };
+        }
+    }
+}
+export class ListCheckpointsCommand {
+    name = 'restore list';
+    description = 'Lists all available checkpoints.';
+    async execute(context) {
+        const { config } = context;
+        try {
+            if (!config.getCheckpointingEnabled()) {
+                return {
+                    name: this.name,
+                    data: 'Checkpointing is not enabled. Please enable it in your settings (`general.checkpointing.enabled: true`) to use /restore.',
+                };
+            }
+            const checkpointDir = config.storage.getProjectTempCheckpointsDir();
+            try {
+                await fs.mkdir(checkpointDir, { recursive: true });
+            }
+            catch (_e) {
+                // Ignore
+            }
+            const files = await fs.readdir(checkpointDir);
+            const jsonFiles = files.filter((file) => file.endsWith('.json'));
+            if (jsonFiles.length === 0) {
+                return { name: this.name, data: 'No checkpoints found.' };
+            }
+            const checkpointFiles = new Map();
+            for (const file of jsonFiles) {
+                const filePath = path.join(checkpointDir, file);
+                const data = await fs.readFile(filePath, 'utf-8');
+                checkpointFiles.set(file, data);
+            }
+            const checkpointInfoList = getCheckpointInfoList(checkpointFiles);
+            const formatted = checkpointInfoList
+                .map((info) => {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                const i = info;
+                const fileName = String(i['fileName'] || 'Unknown');
+                const toolName = String(i['toolName'] || 'Unknown');
+                const status = String(i['status'] || 'Unknown');
+                const timestamp = new Date(Number(i['timestamp']) || 0).toLocaleString();
+                return `- **${fileName}**: ${toolName} (Status: ${status}) [${timestamp}]`;
+            })
+                .join('\n');
+            return {
+                name: this.name,
+                data: `Available Checkpoints:\n${formatted}`,
+            };
+        }
+        catch (_error) {
+            return {
+                name: this.name,
+                data: 'An unexpected error occurred while listing checkpoints.',
+            };
+        }
+    }
+}
+//# sourceMappingURL=restore.js.map

package/dist/src/zed-integration/commands/restore.js.map

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

package/dist/src/zed-integration/commands/types.d.ts

@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Config, GitService } from '@google/gemini-cli-core';
+import type { LoadedSettings } from '../../config/settings.js';
+export interface CommandContext {
+    config: Config;
+    settings: LoadedSettings;
+    git?: GitService;
+    sendMessage: (text: string) => Promise<void>;
+}
+export interface CommandArgument {
+    readonly name: string;
+    readonly description: string;
+    readonly isRequired?: boolean;
+}
+export interface Command {
+    readonly name: string;
+    readonly aliases?: string[];
+    readonly description: string;
+    readonly arguments?: CommandArgument[];
+    readonly subCommands?: Command[];
+    readonly requiresWorkspace?: boolean;
+    execute(context: CommandContext, args: string[]): Promise<CommandExecutionResponse>;
+}
+export interface CommandExecutionResponse {
+    readonly name: string;
+    readonly data: unknown;
+}

package/dist/src/zed-integration/commands/types.js

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/dist/src/zed-integration/commands/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/zed-integration/commands/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

package/dist/src/zed-integration/zedIntegration.d.ts

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { Config, GeminiChat, ConversationRecord } from '@google/gemini-cli-core';
+import { type Config, type GeminiChat, type ConversationRecord } from '@google/gemini-cli-core';
 import * as acp from '@agentclientprotocol/sdk';
 import type { LoadedSettings } from '../config/settings.js';
 import type { CliArgs } from '../config/config.js';
@@ -26,6 +26,7 @@ export declare class GeminiAgent {
     cancel(params: acp.CancelNotification): Promise<void>;
     prompt(params: acp.PromptRequest): Promise<acp.PromptResponse>;
     setSessionMode(params: acp.SetSessionModeRequest): Promise<acp.SetSessionModeResponse>;
+    unstable_setSessionModel(params: acp.SetSessionModelRequest): Promise<acp.SetSessionModelResponse>;
 }
 export declare class Session {
     #private;
@@ -33,12 +34,18 @@ export declare class Session {
     private readonly chat;
     private readonly config;
     private readonly connection;
+    private readonly settings;
     private pendingPrompt;
-    constructor(id: string, chat: GeminiChat, config: Config, connection: acp.AgentSideConnection);
+    private commandHandler;
+    constructor(id: string, chat: GeminiChat, config: Config, connection: acp.AgentSideConnection, settings: LoadedSettings);
     cancelPendingPrompt(): Promise<void>;
     setMode(modeId: acp.SessionModeId): acp.SetSessionModeResponse;
+    private getAvailableCommands;
+    sendAvailableCommands(): Promise<void>;
+    setModel(modelId: acp.ModelId): acp.SetSessionModelResponse;
     streamHistory(messages: ConversationRecord['messages']): Promise<void>;
     prompt(params: acp.PromptRequest): Promise<acp.PromptResponse>;
+    private handleCommand;
     private sendUpdate;
     private runTool;
     debug(msg: string): void;

package/dist/src/zed-integration/zedIntegration.js

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { CoreToolCallStatus, AuthType, logToolCall, convertToFunctionResponse, ToolConfirmationOutcome, clearCachedCredentialFile, isNodeError, getErrorMessage, isWithinRoot, getErrorStatus, MCPServerConfig, DiscoveredMCPTool, StreamEventType, ToolCallEvent, debugLogger, ReadManyFilesTool, REFERENCE_CONTENT_START, resolveModel, createWorkingStdio, startupProfiler, Kind, partListUnionToString, LlmRole, ApprovalMode, getVersion, convertSessionToClientHistory, } from '@google/gemini-cli-core';
+import { CoreToolCallStatus, AuthType, logToolCall, convertToFunctionResponse, ToolConfirmationOutcome, clearCachedCredentialFile, isNodeError, getErrorMessage, isWithinRoot, getErrorStatus, MCPServerConfig, DiscoveredMCPTool, StreamEventType, ToolCallEvent, debugLogger, ReadManyFilesTool, REFERENCE_CONTENT_START, resolveModel, createWorkingStdio, startupProfiler, Kind, partListUnionToString, LlmRole, ApprovalMode, getVersion, convertSessionToClientHistory, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_3_1_MODEL, PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL, PREVIEW_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL_AUTO, PREVIEW_GEMINI_MODEL_AUTO, getDisplayString, } from '@google/gemini-cli-core';
 import * as acp from '@agentclientprotocol/sdk';
 import { AcpFileSystemService } from './fileSystemService.js';
 import { getAcpErrorMessage } from './acpErrors.js';
@@ -19,7 +19,9 @@ import { randomUUID } from 'node:crypto';
 import { loadCliConfig } from '../config/config.js';
 import { runExitCleanup } from '../utils/cleanup.js';
 import { SessionSelector } from '../utils/sessionUtils.js';
+import { CommandHandler } from './commandHandler.js';
 export async function runZedIntegration(config, settings, argv) {
+    // ... (skip unchanged lines) ...
     const { stdout: workingStdout } = createWorkingStdio();
     const stdout = Writable.toWeb(workingStdout);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
@@ -152,15 +154,25 @@ export class GeminiAgent {
         startupProfiler.flush(config);
         const geminiClient = config.getGeminiClient();
         const chat = await geminiClient.startChat();
-        const session = new Session(sessionId, chat, config, this.connection);
+        const session = new Session(sessionId, chat, config, this.connection, this.settings);
         this.sessions.set(sessionId, session);
-        return {
+        setTimeout(() => {
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            session.sendAvailableCommands();
+        }, 0);
+        const { availableModels, currentModelId } = buildAvailableModels(config, loadedSettings);
+        const response = {
             sessionId,
             modes: {
                 availableModes: buildAvailableModes(config.isPlanEnabled()),
                 currentModeId: config.getApprovalMode(),
             },
+            models: {
+                availableModels,
+                currentModelId,
+            },
         };
+        return response;
     }
     async loadSession({ sessionId, cwd, mcpServers, }) {
         const config = await this.initializeSessionConfig(sessionId, cwd, mcpServers);
@@ -177,17 +189,27 @@ export class GeminiAgent {
             conversation: sessionData,
             filePath: sessionPath,
         });
-        const session = new Session(sessionId, geminiClient.getChat(), config, this.connection);
+        const session = new Session(sessionId, geminiClient.getChat(), config, this.connection, this.settings);
         this.sessions.set(sessionId, session);
         // Stream history back to client
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         session.streamHistory(sessionData.messages);
-        return {
+        setTimeout(() => {
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            session.sendAvailableCommands();
+        }, 0);
+        const { availableModels, currentModelId } = buildAvailableModels(config, this.settings);
+        const response = {
             modes: {
                 availableModes: buildAvailableModes(config.isPlanEnabled()),
                 currentModeId: config.getApprovalMode(),
             },
+            models: {
+                availableModels,
+                currentModelId,
+            },
         };
+        return response;
     }
     async initializeSessionConfig(sessionId, cwd, mcpServers) {
         const selectedAuthType = this.settings.merged.security.auth.selectedType;
@@ -265,18 +287,28 @@ export class GeminiAgent {
         }
         return session.setMode(params.modeId);
     }
+    async unstable_setSessionModel(params) {
+        const session = this.sessions.get(params.sessionId);
+        if (!session) {
+            throw new Error(`Session not found: ${params.sessionId}`);
+        }
+        return session.setModel(params.modelId);
+    }
 }
 export class Session {
     id;
     chat;
     config;
     connection;
+    settings;
     pendingPrompt = null;
-    constructor(id, chat, config, connection) {
+    commandHandler = new CommandHandler();
+    constructor(id, chat, config, connection, settings) {
         this.id = id;
         this.chat = chat;
         this.config = config;
         this.connection = connection;
+        this.settings = settings;
     }
     async cancelPendingPrompt() {
         if (!this.pendingPrompt) {
@@ -295,6 +327,23 @@ export class Session {
         this.config.setApprovalMode(mode.id);
         return {};
     }
+    getAvailableCommands() {
+        return this.commandHandler.getAvailableCommands();
+    }
+    async sendAvailableCommands() {
+        const availableCommands = this.getAvailableCommands().map((command) => ({
+            name: command.name,
+            description: command.description,
+        }));
+        await this.sendUpdate({
+            sessionUpdate: 'available_commands_update',
+            availableCommands,
+        });
+    }
+    setModel(modelId) {
+        this.config.setModel(modelId);
+        return {};
+    }
     async streamHistory(messages) {
         for (const msg of messages) {
             const contentString = partListUnionToString(msg.content);
@@ -364,9 +413,40 @@ export class Session {
         this.pendingPrompt?.abort();
         const pendingSend = new AbortController();
         this.pendingPrompt = pendingSend;
+        await this.config.waitForMcpInit();
         const promptId = Math.random().toString(16).slice(2);
         const chat = this.chat;
         const parts = await this.#resolvePrompt(params.prompt, pendingSend.signal);
+        // Command interception
+        let commandText = '';
+        for (const part of parts) {
+            if (typeof part === 'object' && part !== null) {
+                if ('text' in part) {
+                    // It is a text part
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-type-assertion
+                    const text = part.text;
+                    if (typeof text === 'string') {
+                        commandText += text;
+                    }
+                }
+                else {
+                    // Non-text part (image, embedded resource)
+                    // Stop looking for command
+                    break;
+                }
+            }
+        }
+        commandText = commandText.trim();
+        if (commandText &&
+            (commandText.startsWith('/') || commandText.startsWith('$'))) {
+            // If we found a command, pass it to handleCommand
+            // Note: handleCommand currently expects `commandText` to be the command string
+            // It uses `parts` argument but effectively ignores it in current implementation
+            const handled = await this.handleCommand(commandText, parts);
+            if (handled) {
+                return { stopReason: 'end_turn' };
+            }
+        }
         let nextMessage = { role: 'user', parts };
         while (nextMessage !== null) {
             if (pendingSend.signal.aborted) {
@@ -432,6 +512,23 @@ export class Session {
         }
         return { stopReason: 'end_turn' };
     }
+    async handleCommand(commandText, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    parts) {
+        const gitService = await this.config.getGitService();
+        const commandContext = {
+            config: this.config,
+            settings: this.settings,
+            git: gitService,
+            sendMessage: async (text) => {
+                await this.sendUpdate({
+                    sessionUpdate: 'agent_message_chunk',
+                    content: { type: 'text', text },
+                });
+            },
+        };
+        return this.commandHandler.handleCommand(commandText, commandContext);
+    }
     async sendUpdate(update) {
         const params = {
             sessionId: this.id,
@@ -474,7 +571,7 @@ export class Session {
                 if (confirmationDetails.type === 'edit') {
                     content.push({
                         type: 'diff',
-                        path: confirmationDetails.fileName,
+                        path: confirmationDetails.filePath,
                         oldText: confirmationDetails.originalContent,
                         newText: confirmationDetails.newContent,
                         _meta: {
@@ -915,7 +1012,8 @@ function toToolCallContent(toolResult) {
             if ('fileName' in toolResult.returnDisplay) {
                 return {
                     type: 'diff',
-                    path: toolResult.returnDisplay.fileName,
+                    path: toolResult.returnDisplay.filePath ??
+                        toolResult.returnDisplay.fileName,
                     oldText: toolResult.returnDisplay.originalContent,
                     newText: toolResult.returnDisplay.newContent,
                     _meta: {
@@ -1053,4 +1151,68 @@ function buildAvailableModes(isPlanEnabled) {
     }
     return modes;
 }
+function buildAvailableModels(config, settings) {
+    const preferredModel = config.getModel() || DEFAULT_GEMINI_MODEL_AUTO;
+    const shouldShowPreviewModels = config.getHasAccessToPreviewModel();
+    const useGemini31 = config.getGemini31LaunchedSync?.() ?? false;
+    const selectedAuthType = settings.merged.security.auth.selectedType;
+    const useCustomToolModel = useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
+    const mainOptions = [
+        {
+            value: DEFAULT_GEMINI_MODEL_AUTO,
+            title: getDisplayString(DEFAULT_GEMINI_MODEL_AUTO),
+            description: 'Let Gemini CLI decide the best model for the task: gemini-2.5-pro, gemini-2.5-flash',
+        },
+    ];
+    if (shouldShowPreviewModels) {
+        mainOptions.unshift({
+            value: PREVIEW_GEMINI_MODEL_AUTO,
+            title: getDisplayString(PREVIEW_GEMINI_MODEL_AUTO),
+            description: useGemini31
+                ? 'Let Gemini CLI decide the best model for the task: gemini-3.1-pro, gemini-3-flash'
+                : 'Let Gemini CLI decide the best model for the task: gemini-3-pro, gemini-3-flash',
+        });
+    }
+    const manualOptions = [
+        {
+            value: DEFAULT_GEMINI_MODEL,
+            title: getDisplayString(DEFAULT_GEMINI_MODEL),
+        },
+        {
+            value: DEFAULT_GEMINI_FLASH_MODEL,
+            title: getDisplayString(DEFAULT_GEMINI_FLASH_MODEL),
+        },
+        {
+            value: DEFAULT_GEMINI_FLASH_LITE_MODEL,
+            title: getDisplayString(DEFAULT_GEMINI_FLASH_LITE_MODEL),
+        },
+    ];
+    if (shouldShowPreviewModels) {
+        const previewProModel = useGemini31
+            ? PREVIEW_GEMINI_3_1_MODEL
+            : PREVIEW_GEMINI_MODEL;
+        const previewProValue = useCustomToolModel
+            ? PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL
+            : previewProModel;
+        manualOptions.unshift({
+            value: previewProValue,
+            title: getDisplayString(previewProModel),
+        }, {
+            value: PREVIEW_GEMINI_FLASH_MODEL,
+            title: getDisplayString(PREVIEW_GEMINI_FLASH_MODEL),
+        });
+    }
+    const scaleOptions = (options) => options.map((o) => ({
+        modelId: o.value,
+        name: o.title,
+        description: o.description,
+    }));
+    return {
+        availableModels: [
+            ...scaleOptions(mainOptions),
+            ...scaleOptions(manualOptions),
+        ],
+        currentModelId: preferredModel,
+    };
+}
 //# sourceMappingURL=zedIntegration.js.map