@google/gemini-cli-core 0.7.0-nightly.20250912.68035591 → 0.7.0-preview.0

package/dist/src/ide/detect-ide.test.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { describe, it, expect, vi, afterEach } from 'vitest';
-import { detectIde, DetectedIde, getIdeInfo } from './detect-ide.js';
+import { detectIde, IDE_DEFINITIONS } from './detect-ide.js';
 describe('detectIde', () => {
     const ideProcessInfo = { pid: 123, command: 'some/path/to/code' };
     const ideProcessInfoNoCode = { pid: 123, command: 'some/path/to/fork' };
@@ -18,92 +18,75 @@ describe('detectIde', () => {
     it('should detect Devin', () => {
         vi.stubEnv('TERM_PROGRAM', 'vscode');
         vi.stubEnv('__COG_BASHRC_SOURCED', '1');
-        expect(detectIde(ideProcessInfo)).toBe(DetectedIde.Devin);
+        expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.devin);
     });
     it('should detect Replit', () => {
         vi.stubEnv('TERM_PROGRAM', 'vscode');
         vi.stubEnv('REPLIT_USER', 'testuser');
-        expect(detectIde(ideProcessInfo)).toBe(DetectedIde.Replit);
+        expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.replit);
     });
     it('should detect Cursor', () => {
         vi.stubEnv('TERM_PROGRAM', 'vscode');
         vi.stubEnv('CURSOR_TRACE_ID', 'some-id');
-        expect(detectIde(ideProcessInfo)).toBe(DetectedIde.Cursor);
+        expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.cursor);
     });
     it('should detect Codespaces', () => {
         vi.stubEnv('TERM_PROGRAM', 'vscode');
         vi.stubEnv('CODESPACES', 'true');
-        expect(detectIde(ideProcessInfo)).toBe(DetectedIde.Codespaces);
+        expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.codespaces);
     });
     it('should detect Cloud Shell via EDITOR_IN_CLOUD_SHELL', () => {
         vi.stubEnv('TERM_PROGRAM', 'vscode');
         vi.stubEnv('EDITOR_IN_CLOUD_SHELL', 'true');
-        expect(detectIde(ideProcessInfo)).toBe(DetectedIde.CloudShell);
+        expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.cloudshell);
     });
     it('should detect Cloud Shell via CLOUD_SHELL', () => {
         vi.stubEnv('TERM_PROGRAM', 'vscode');
         vi.stubEnv('CLOUD_SHELL', 'true');
-        expect(detectIde(ideProcessInfo)).toBe(DetectedIde.CloudShell);
+        expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.cloudshell);
     });
     it('should detect Trae', () => {
         vi.stubEnv('TERM_PROGRAM', 'vscode');
         vi.stubEnv('TERM_PRODUCT', 'Trae');
-        expect(detectIde(ideProcessInfo)).toBe(DetectedIde.Trae);
+        expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.trae);
     });
     it('should detect Firebase Studio via MONOSPACE_ENV', () => {
         vi.stubEnv('TERM_PROGRAM', 'vscode');
         vi.stubEnv('MONOSPACE_ENV', 'true');
-        expect(detectIde(ideProcessInfo)).toBe(DetectedIde.FirebaseStudio);
+        expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.firebasestudio);
     });
     it('should detect VSCode when no other IDE is detected and command includes "code"', () => {
         vi.stubEnv('TERM_PROGRAM', 'vscode');
         vi.stubEnv('MONOSPACE_ENV', '');
-        expect(detectIde(ideProcessInfo)).toBe(DetectedIde.VSCode);
+        expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.vscode);
     });
     it('should detect VSCodeFork when no other IDE is detected and command does not include "code"', () => {
         vi.stubEnv('TERM_PROGRAM', 'vscode');
         vi.stubEnv('MONOSPACE_ENV', '');
-        expect(detectIde(ideProcessInfoNoCode)).toBe(DetectedIde.VSCodeFork);
-    });
-    it('should prioritize other IDEs over VSCode detection', () => {
-        vi.stubEnv('TERM_PROGRAM', 'vscode');
-        vi.stubEnv('REPLIT_USER', 'testuser');
-        expect(detectIde(ideProcessInfo)).toBe(DetectedIde.Replit);
+        expect(detectIde(ideProcessInfoNoCode)).toBe(IDE_DEFINITIONS.vscodefork);
     });
 });
-describe('getIdeInfo', () => {
-    it('should return correct info for Devin', () => {
-        expect(getIdeInfo(DetectedIde.Devin)).toEqual({ displayName: 'Devin' });
-    });
-    it('should return correct info for Replit', () => {
-        expect(getIdeInfo(DetectedIde.Replit)).toEqual({ displayName: 'Replit' });
-    });
-    it('should return correct info for Cursor', () => {
-        expect(getIdeInfo(DetectedIde.Cursor)).toEqual({ displayName: 'Cursor' });
-    });
-    it('should return correct info for CloudShell', () => {
-        expect(getIdeInfo(DetectedIde.CloudShell)).toEqual({
-            displayName: 'Cloud Shell',
-        });
-    });
-    it('should return correct info for Codespaces', () => {
-        expect(getIdeInfo(DetectedIde.Codespaces)).toEqual({
-            displayName: 'GitHub Codespaces',
-        });
-    });
-    it('should return correct info for FirebaseStudio', () => {
-        expect(getIdeInfo(DetectedIde.FirebaseStudio)).toEqual({
-            displayName: 'Firebase Studio',
-        });
+describe('detectIde with ideInfoFromFile', () => {
+    const ideProcessInfo = { pid: 123, command: 'some/path/to/code' };
+    afterEach(() => {
+        vi.unstubAllEnvs();
     });
-    it('should return correct info for Trae', () => {
-        expect(getIdeInfo(DetectedIde.Trae)).toEqual({ displayName: 'Trae' });
+    it('should use the name and displayName from the file', () => {
+        const ideInfoFromFile = {
+            name: 'custom-ide',
+            displayName: 'Custom IDE',
+        };
+        expect(detectIde(ideProcessInfo, ideInfoFromFile)).toEqual(ideInfoFromFile);
     });
-    it('should return correct info for VSCode', () => {
-        expect(getIdeInfo(DetectedIde.VSCode)).toEqual({ displayName: 'VS Code' });
+    it('should fall back to env detection if name is missing', () => {
+        const ideInfoFromFile = { displayName: 'Custom IDE' };
+        vi.stubEnv('TERM_PROGRAM', 'vscode');
+        expect(detectIde(ideProcessInfo, ideInfoFromFile)).toBe(IDE_DEFINITIONS.vscode);
     });
-    it('should return correct info for VSCodeFork', () => {
-        expect(getIdeInfo(DetectedIde.VSCodeFork)).toEqual({ displayName: 'IDE' });
+    it('should fall back to env detection if displayName is missing', () => {
+        const ideInfoFromFile = { name: 'custom-ide' };
+        vi.stubEnv('TERM_PROGRAM', 'vscode');
+        expect(detectIde(ideProcessInfo, ideInfoFromFile)).toBe(IDE_DEFINITIONS.vscode);
     });
 });
 //# sourceMappingURL=detect-ide.test.js.map

package/dist/src/ide/detect-ide.test.js.map

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

package/dist/src/ide/ide-client.d.ts

@@ -3,8 +3,14 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { type DetectedIde } from '../ide/detect-ide.js';
-import { type DiffUpdateResult } from './ideContext.js';
+import { type IdeInfo } from '../ide/detect-ide.js';
+export type DiffUpdateResult = {
+    status: 'accepted';
+    content?: string;
+} | {
+    status: 'rejected';
+    content: undefined;
+};
 export type IDEConnectionState = {
     status: IDEConnectionStatus;
     details?: string;
@@ -22,8 +28,9 @@ export declare class IdeClient {
     private client;
     private state;
     private currentIde;
-    private currentIdeDisplayName;
     private ideProcessInfo;
+    private connectionConfig;
+    private authToken;
     private diffResponses;
     private statusListeners;
     private trustChangeListeners;
@@ -42,20 +49,24 @@ export declare class IdeClient {
     removeTrustChangeListener(listener: (isTrusted: boolean) => void): void;
     connect(): Promise<void>;
     /**
-     * A diff is accepted with any modifications if the user performs one of the
-     * following actions:
-     * - Clicks the checkbox icon in the IDE to accept
-     * - Runs `command+shift+p` > "Gemini CLI: Accept Diff in IDE" to accept
-     * - Selects "accept" in the CLI UI
-     * - Saves the file via `ctrl/command+s`
+     * Opens a diff view in the IDE, allowing the user to review and accept or
+     * reject changes.
+     *
+     * This method sends a request to the IDE to display a diff between the
+     * current content of a file and the new content provided. It then waits for
+     * a notification from the IDE indicating that the user has either accepted
+     * (potentially with manual edits) or rejected the diff.
+     *
+     * A mutex ensures that only one diff view can be open at a time to prevent
+     * race conditions.
      *
-     * A diff is rejected if the user performs one of the following actions:
-     * - Clicks the "x" icon in the IDE
-     * - Runs "Gemini CLI: Close Diff in IDE"
-     * - Selects "no" in the CLI UI
-     * - Closes the file
+     * @param filePath The absolute path to the file to be diffed.
+     * @param newContent The proposed new content for the file.
+     * @returns A promise that resolves with a `DiffUpdateResult`, indicating
+     *   whether the diff was 'accepted' or 'rejected' and including the final
+     *   content if accepted.
      */
-    openDiff(filePath: string, newContent?: string): Promise<DiffUpdateResult>;
+    openDiff(filePath: string, newContent: string): Promise<DiffUpdateResult>;
     /**
      * Acquires a lock to ensure sequential execution of critical sections.
      *
@@ -79,13 +90,13 @@ export declare class IdeClient {
     }): Promise<string | undefined>;
     resolveDiffFromCli(filePath: string, outcome: 'accepted' | 'rejected'): Promise<void>;
     disconnect(): Promise<void>;
-    getCurrentIde(): DetectedIde | undefined;
+    getCurrentIde(): IdeInfo | undefined;
     getConnectionStatus(): IDEConnectionState;
     getDetectedIdeDisplayName(): string | undefined;
     isDiffingEnabled(): boolean;
     private discoverTools;
     private setState;
-    static validateWorkspacePath(ideWorkspacePath: string | undefined, currentIdeDisplayName: string | undefined, cwd: string): {
+    static validateWorkspacePath(ideWorkspacePath: string | undefined, cwd: string): {
         isValid: boolean;
         error?: string;
     };

package/dist/src/ide/ide-client.js

@@ -5,17 +5,19 @@
  */
 import * as fs from 'node:fs';
 import { isSubpath } from '../utils/paths.js';
-import { detectIde, getIdeInfo } from '../ide/detect-ide.js';
-import { ideContextStore, IdeDiffAcceptedNotificationSchema, IdeDiffClosedNotificationSchema, CloseDiffResponseSchema, } from './ideContext.js';
-import { IdeContextNotificationSchema } from './types.js';
+import { detectIde } from '../ide/detect-ide.js';
+import { ideContextStore } from './ideContext.js';
+import { IdeContextNotificationSchema, IdeDiffAcceptedNotificationSchema, IdeDiffClosedNotificationSchema, IdeDiffRejectedNotificationSchema, } from './types.js';
 import { getIdeProcessInfo } from './process-utils.js';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+import { CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js';
 import * as os from 'node:os';
 import * as path from 'node:path';
 import { EnvHttpProxyAgent } from 'undici';
 import { ListToolsResultSchema } from '@modelcontextprotocol/sdk/types.js';
+import { IDE_REQUEST_TIMEOUT_MS } from './constants.js';
 const logger = {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     debug: (...args) => console.debug('[DEBUG] [IDEClient]', ...args),
@@ -49,8 +51,9 @@ export class IdeClient {
         details: 'IDE integration is currently disabled. To enable it, run /ide enable.',
     };
     currentIde;
-    currentIdeDisplayName;
     ideProcessInfo;
+    connectionConfig;
+    authToken;
     diffResponses = new Map();
     statusListeners = new Set();
     trustChangeListeners = new Set();
@@ -67,10 +70,8 @@ export class IdeClient {
             IdeClient.instancePromise = (async () => {
                 const client = new IdeClient();
                 client.ideProcessInfo = await getIdeProcessInfo();
-                client.currentIde = detectIde(client.ideProcessInfo);
-                if (client.currentIde) {
-                    client.currentIdeDisplayName = getIdeInfo(client.currentIde).displayName;
-                }
+                client.connectionConfig = await client.getConnectionConfigFromFile();
+                client.currentIde = detectIde(client.ideProcessInfo, client.connectionConfig?.ideInfo);
                 return client;
             })();
         }
@@ -89,28 +90,31 @@ export class IdeClient {
         this.trustChangeListeners.delete(listener);
     }
     async connect() {
-        if (!this.currentIde || !this.currentIdeDisplayName) {
+        if (!this.currentIde) {
             this.setState(IDEConnectionStatus.Disconnected, `IDE integration is not supported in your current environment. To use this feature, run Gemini CLI in one of these supported IDEs: VS Code or VS Code forks`, false);
             return;
         }
         this.setState(IDEConnectionStatus.Connecting);
-        const configFromFile = await this.getConnectionConfigFromFile();
-        const workspacePath = configFromFile?.workspacePath ??
+        this.connectionConfig = await this.getConnectionConfigFromFile();
+        if (this.connectionConfig?.authToken) {
+            this.authToken = this.connectionConfig.authToken;
+        }
+        const workspacePath = this.connectionConfig?.workspacePath ??
             process.env['GEMINI_CLI_IDE_WORKSPACE_PATH'];
-        const { isValid, error } = IdeClient.validateWorkspacePath(workspacePath, this.currentIdeDisplayName, process.cwd());
+        const { isValid, error } = IdeClient.validateWorkspacePath(workspacePath, process.cwd());
         if (!isValid) {
             this.setState(IDEConnectionStatus.Disconnected, error, true);
             return;
         }
-        if (configFromFile) {
-            if (configFromFile.port) {
-                const connected = await this.establishHttpConnection(configFromFile.port);
+        if (this.connectionConfig) {
+            if (this.connectionConfig.port) {
+                const connected = await this.establishHttpConnection(this.connectionConfig.port);
                 if (connected) {
                     return;
                 }
             }
-            if (configFromFile.stdio) {
-                const connected = await this.establishStdioConnection(configFromFile.stdio);
+            if (this.connectionConfig.stdio) {
+                const connected = await this.establishStdioConnection(this.connectionConfig.stdio);
                 if (connected) {
                     return;
                 }
@@ -130,21 +134,25 @@ export class IdeClient {
                 return;
             }
         }
-        this.setState(IDEConnectionStatus.Disconnected, `Failed to connect to IDE companion extension in ${this.currentIdeDisplayName}. Please ensure the extension is running. To install the extension, run /ide install.`, true);
+        this.setState(IDEConnectionStatus.Disconnected, `Failed to connect to IDE companion extension in ${this.currentIde.displayName}. Please ensure the extension is running. To install the extension, run /ide install.`, true);
     }
     /**
-     * A diff is accepted with any modifications if the user performs one of the
-     * following actions:
-     * - Clicks the checkbox icon in the IDE to accept
-     * - Runs `command+shift+p` > "Gemini CLI: Accept Diff in IDE" to accept
-     * - Selects "accept" in the CLI UI
-     * - Saves the file via `ctrl/command+s`
+     * Opens a diff view in the IDE, allowing the user to review and accept or
+     * reject changes.
+     *
+     * This method sends a request to the IDE to display a diff between the
+     * current content of a file and the new content provided. It then waits for
+     * a notification from the IDE indicating that the user has either accepted
+     * (potentially with manual edits) or rejected the diff.
+     *
+     * A mutex ensures that only one diff view can be open at a time to prevent
+     * race conditions.
      *
-     * A diff is rejected if the user performs one of the following actions:
-     * - Clicks the "x" icon in the IDE
-     * - Runs "Gemini CLI: Close Diff in IDE"
-     * - Selects "no" in the CLI UI
-     * - Closes the file
+     * @param filePath The absolute path to the file to be diffed.
+     * @param newContent The proposed new content for the file.
+     * @returns A promise that resolves with a `DiffUpdateResult`, indicating
+     *   whether the diff was 'accepted' or 'rejected' and including the final
+     *   content if accepted.
      */
     async openDiff(filePath, newContent) {
         const release = await this.acquireMutex();
@@ -155,15 +163,27 @@ export class IdeClient {
             }
             this.diffResponses.set(filePath, resolve);
             this.client
-                .callTool({
-                name: `openDiff`,
-                arguments: {
-                    filePath,
-                    newContent,
+                .request({
+                method: 'tools/call',
+                params: {
+                    name: `openDiff`,
+                    arguments: {
+                        filePath,
+                        newContent,
+                    },
                 },
+            }, CallToolResultSchema, { timeout: IDE_REQUEST_TIMEOUT_MS })
+                .then((parsedResultData) => {
+                if (parsedResultData.isError) {
+                    const textPart = parsedResultData.content.find((part) => part.type === 'text');
+                    const errorMessage = textPart?.text ?? `Tool 'openDiff' reported an error.`;
+                    logger.debug(`Request for openDiff ${filePath} failed with isError:`, errorMessage);
+                    this.diffResponses.delete(filePath);
+                    reject(new Error(errorMessage));
+                }
             })
                 .catch((err) => {
-                logger.debug(`callTool for ${filePath} failed:`, err);
+                logger.debug(`Request for openDiff ${filePath} failed:`, err);
                 this.diffResponses.delete(filePath);
                 reject(err);
             });
@@ -200,22 +220,48 @@ export class IdeClient {
     }
     async closeDiff(filePath, options) {
         try {
-            const result = await this.client?.callTool({
-                name: `closeDiff`,
-                arguments: {
-                    filePath,
-                    suppressNotification: options?.suppressNotification,
+            if (!this.client) {
+                return undefined;
+            }
+            const resultData = await this.client.request({
+                method: 'tools/call',
+                params: {
+                    name: `closeDiff`,
+                    arguments: {
+                        filePath,
+                        suppressNotification: options?.suppressNotification,
+                    },
                 },
-            });
-            if (result) {
-                const parsed = CloseDiffResponseSchema.parse(result);
-                return parsed.content;
+            }, CallToolResultSchema, { timeout: IDE_REQUEST_TIMEOUT_MS });
+            if (!resultData) {
+                return undefined;
+            }
+            if (resultData.isError) {
+                const textPart = resultData.content.find((part) => part.type === 'text');
+                const errorMessage = textPart?.text ?? `Tool 'closeDiff' reported an error.`;
+                logger.debug(`Request for closeDiff ${filePath} failed with isError:`, errorMessage);
+                return undefined;
+            }
+            const textPart = resultData.content.find((part) => part.type === 'text');
+            if (textPart?.text) {
+                try {
+                    const parsedJson = JSON.parse(textPart.text);
+                    if (parsedJson && typeof parsedJson.content === 'string') {
+                        return parsedJson.content;
+                    }
+                    if (parsedJson && parsedJson.content === null) {
+                        return undefined;
+                    }
+                }
+                catch (_e) {
+                    logger.debug(`Invalid JSON in closeDiff response for ${filePath}:`, textPart.text);
+                }
             }
         }
         catch (err) {
-            logger.debug(`callTool for ${filePath} failed:`, err);
+            logger.debug(`Request for closeDiff ${filePath} failed:`, err);
         }
-        return;
+        return undefined;
     }
     // Closes the diff. Instead of waiting for a notification,
     // manually resolves the diff resolver as the desired outcome.
@@ -254,7 +300,7 @@ export class IdeClient {
         return this.state;
     }
     getDetectedIdeDisplayName() {
-        return this.currentIdeDisplayName;
+        return this.currentIde?.displayName;
     }
     isDiffingEnabled() {
         return (!!this.client &&
@@ -316,17 +362,17 @@ export class IdeClient {
             ideContextStore.clear();
         }
     }
-    static validateWorkspacePath(ideWorkspacePath, currentIdeDisplayName, cwd) {
+    static validateWorkspacePath(ideWorkspacePath, cwd) {
         if (ideWorkspacePath === undefined) {
             return {
                 isValid: false,
-                error: `Failed to connect to IDE companion extension in ${currentIdeDisplayName}. Please ensure the extension is running. To install the extension, run /ide install.`,
+                error: `Failed to connect to IDE companion extension. Please ensure the extension is running. To install the extension, run /ide install.`,
             };
         }
         if (ideWorkspacePath === '') {
             return {
                 isValid: false,
-                error: `To use this feature, please open a workspace folder in ${currentIdeDisplayName} and try again.`,
+                error: `To use this feature, please open a workspace folder in your IDE and try again.`,
             };
         }
         const ideWorkspacePaths = ideWorkspacePath.split(path.delimiter);
@@ -338,7 +384,7 @@ export class IdeClient {
         if (!isWithinWorkspace) {
             return {
                 isValid: false,
-                error: `Directory mismatch. Gemini CLI is running in a different location than the open workspace in ${currentIdeDisplayName}. Please run the CLI from one of the following directories: ${ideWorkspacePaths.join(', ')}`,
+                error: `Directory mismatch. Gemini CLI is running in a different location than the open workspace in the IDE. Please run the CLI from one of the following directories: ${ideWorkspacePaths.join(', ')}`,
             };
         }
         return { isValid: true };
@@ -389,7 +435,7 @@ export class IdeClient {
             // windows are open, multiple files matching the pattern are expected to
             // exist.
         }
-        const portFileDir = path.join(os.tmpdir(), '.gemini', 'ide');
+        const portFileDir = path.join(os.tmpdir(), 'gemini', 'ide');
         let portFiles;
         try {
             portFiles = await fs.promises.readdir(portFileDir);
@@ -398,6 +444,9 @@ export class IdeClient {
             logger.debug('Failed to read IDE connection directory:', e);
             return undefined;
         }
+        if (!portFiles) {
+            return undefined;
+        }
         const fileRegex = new RegExp(`^gemini-ide-server-${this.ideProcessInfo.pid}-\\d+\\.json$`);
         const matchingFiles = portFiles
             .filter((file) => fileRegex.test(file))
@@ -426,7 +475,7 @@ export class IdeClient {
             if (!content) {
                 return false;
             }
-            const { isValid } = IdeClient.validateWorkspacePath(content.workspacePath, this.currentIdeDisplayName, process.cwd());
+            const { isValid } = IdeClient.validateWorkspacePath(content.workspacePath, process.cwd());
             return isValid;
         });
         if (validWorkspaces.length === 0) {
@@ -437,7 +486,7 @@ export class IdeClient {
         }
         const portFromEnv = this.getPortFromEnv();
         if (portFromEnv) {
-            const matchingPort = validWorkspaces.find((content) => content.port === portFromEnv);
+            const matchingPort = validWorkspaces.find((content) => String(content.port) === portFromEnv);
             if (matchingPort) {
                 return matchingPort;
             }
@@ -462,7 +511,7 @@ export class IdeClient {
             return new Response(response.body, {
                 status: response.status,
                 statusText: response.statusText,
-                headers: response.headers,
+                headers: [...response.headers.entries()],
             });
         };
     }
@@ -480,10 +529,11 @@ export class IdeClient {
             }
         });
         this.client.onerror = (_error) => {
-            this.setState(IDEConnectionStatus.Disconnected, `IDE connection error. The connection was lost unexpectedly. Please try reconnecting by running /ide enable`, true);
+            const errorMessage = _error instanceof Error ? _error.message : `_error`;
+            this.setState(IDEConnectionStatus.Disconnected, `IDE connection error. The connection was lost unexpectedly. Please try reconnecting by running /ide enable\n${errorMessage}`, true);
         };
         this.client.onclose = () => {
-            this.setState(IDEConnectionStatus.Disconnected, `IDE connection error. The connection was lost unexpectedly. Please try reconnecting by running /ide enable`, true);
+            this.setState(IDEConnectionStatus.Disconnected, `IDE connection closed. To reconnect, run /ide enable.`, true);
         };
         this.client.setNotificationHandler(IdeDiffAcceptedNotificationSchema, (notification) => {
             const { filePath, content } = notification.params;
@@ -496,6 +546,19 @@ export class IdeClient {
                 logger.debug(`No resolver found for ${filePath}`);
             }
         });
+        this.client.setNotificationHandler(IdeDiffRejectedNotificationSchema, (notification) => {
+            const { filePath } = notification.params;
+            const resolver = this.diffResponses.get(filePath);
+            if (resolver) {
+                resolver({ status: 'rejected', content: undefined });
+                this.diffResponses.delete(filePath);
+            }
+            else {
+                logger.debug(`No resolver found for ${filePath}`);
+            }
+        });
+        // For backwards compatability. Newer extension versions will only send
+        // IdeDiffRejectedNotificationSchema.
         this.client.setNotificationHandler(IdeDiffClosedNotificationSchema, (notification) => {
             const { filePath } = notification.params;
             const resolver = this.diffResponses.get(filePath);
@@ -519,6 +582,11 @@ export class IdeClient {
             });
             transport = new StreamableHTTPClientTransport(new URL(`http://${getIdeServerHost()}:${port}/mcp`), {
                 fetch: this.createProxyAwareFetch(),
+                requestInit: {
+                    headers: this.authToken
+                        ? { Authorization: `Bearer ${this.authToken}` }
+                        : {},
+                },
             });
             await this.client.connect(transport);
             this.registerClientHandlers();