@google/gemini-cli-core 0.13.0-nightly.20251102.d7243fb8 → 0.13.0-preview.0

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

@@ -3,36 +3,76 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { EventEmitter } from 'node:events';
-import type { GeminiCLIExtension } from '../config/config.js';
-export interface ExtensionLoader {
-    getExtensions(): GeminiCLIExtension[];
-    extensionEvents(): EventEmitter<ExtensionEvents>;
+import type { EventEmitter } from 'node:events';
+import type { Config, GeminiCLIExtension } from '../config/config.js';
+export declare abstract class ExtensionLoader {
+    private readonly eventEmitter?;
+    protected config: Config | undefined;
+    protected startingCount: number;
+    protected startCompletedCount: number;
+    protected stoppingCount: number;
+    protected stopCompletedCount: number;
+    constructor(eventEmitter?: EventEmitter<ExtensionEvents> | undefined);
+    /**
+     * All currently known extensions, both active and inactive.
+     */
+    abstract getExtensions(): GeminiCLIExtension[];
+    /**
+     * Fully initializes all active extensions.
+     *
+     * Called within `Config.initialize`, which must already have an
+     * McpClientManager, PromptRegistry, and GeminiChat set up.
+     */
+    start(config: Config): Promise<void>;
+    /**
+     * Unconditionally starts an `extension` and loads all its MCP servers,
+     * context, custom commands, etc. Assumes that `start` has already been called
+     * and we have a Config object.
+     *
+     * This should typically only be called from `start`, most other calls should
+     * go through `maybeStartExtension` which will only start the extension if
+     * extension reloading is enabled and the `config` object is initialized.
+     */
+    protected startExtension(extension: GeminiCLIExtension): Promise<void>;
+    /**
+     * If extension reloading is enabled and `start` has already been called,
+     * then calls `startExtension` to include all extension features into the
+     * program.
+     */
+    protected maybeStartExtension(extension: GeminiCLIExtension): Promise<void> | undefined;
+    /**
+     * Unconditionally stops an `extension` and unloads all its MCP servers,
+     * context, custom commands, etc. Assumes that `start` has already been called
+     * and we have a Config object.
+     *
+     * Most calls should go through `maybeStopExtension` which will only stop the
+     * extension if extension reloading is enabled and the `config` object is
+     * initialized.
+     */
+    protected stopExtension(extension: GeminiCLIExtension): Promise<void>;
+    /**
+     * If extension reloading is enabled and `start` has already been called,
+     * then this also performs all necessary steps to remove all extension
+     * features from the rest of the system.
+     */
+    protected maybeStopExtension(extension: GeminiCLIExtension): Promise<void> | undefined;
 }
 export interface ExtensionEvents {
-    extensionEnabled: ExtensionEnableEvent[];
-    extensionDisabled: ExtensionDisableEvent[];
-    extensionLoaded: ExtensionLoadEvent[];
-    extensionUnloaded: ExtensionUnloadEvent[];
-    extensionInstalled: ExtensionInstallEvent[];
-    extensionUninstalled: ExtensionUninstallEvent[];
-    extensionUpdated: ExtensionUpdateEvent[];
+    extensionsStarting: ExtensionsStartingEvent[];
+    extensionsStopping: ExtensionsStoppingEvent[];
+}
+export interface ExtensionsStartingEvent {
+    total: number;
+    completed: number;
 }
-interface BaseExtensionEvent {
-    extension: GeminiCLIExtension;
+export interface ExtensionsStoppingEvent {
+    total: number;
+    completed: number;
 }
-export type ExtensionDisableEvent = BaseExtensionEvent;
-export type ExtensionEnableEvent = BaseExtensionEvent;
-export type ExtensionInstallEvent = BaseExtensionEvent;
-export type ExtensionLoadEvent = BaseExtensionEvent;
-export type ExtensionUnloadEvent = BaseExtensionEvent;
-export type ExtensionUninstallEvent = BaseExtensionEvent;
-export type ExtensionUpdateEvent = BaseExtensionEvent;
-export declare class SimpleExtensionLoader implements ExtensionLoader {
-    private readonly extensions;
-    private _eventEmitter;
-    constructor(extensions: GeminiCLIExtension[]);
-    extensionEvents(): EventEmitter<ExtensionEvents>;
+export declare class SimpleExtensionLoader extends ExtensionLoader {
+    protected readonly extensions: GeminiCLIExtension[];
+    constructor(extensions: GeminiCLIExtension[], eventEmitter?: EventEmitter<ExtensionEvents>);
     getExtensions(): GeminiCLIExtension[];
+    loadExtension(extension: GeminiCLIExtension): Promise<void>;
+    unloadExtension(extension: GeminiCLIExtension): Promise<void>;
 }
-export {};

package/dist/src/utils/extensionLoader.js

@@ -3,18 +3,160 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { EventEmitter } from 'node:events';
-export class SimpleExtensionLoader {
+export class ExtensionLoader {
+    eventEmitter;
+    // Assigned in `start`.
+    config;
+    // Used to track the count of currently starting and stopping extensions and
+    // fire appropriate events.
+    startingCount = 0;
+    startCompletedCount = 0;
+    stoppingCount = 0;
+    stopCompletedCount = 0;
+    constructor(eventEmitter) {
+        this.eventEmitter = eventEmitter;
+    }
+    /**
+     * Fully initializes all active extensions.
+     *
+     * Called within `Config.initialize`, which must already have an
+     * McpClientManager, PromptRegistry, and GeminiChat set up.
+     */
+    async start(config) {
+        if (!this.config) {
+            this.config = config;
+        }
+        else {
+            throw new Error('Already started, you may only call `start` once.');
+        }
+        await Promise.all(this.getExtensions()
+            .filter((e) => e.isActive)
+            .map(this.startExtension.bind(this)));
+    }
+    /**
+     * Unconditionally starts an `extension` and loads all its MCP servers,
+     * context, custom commands, etc. Assumes that `start` has already been called
+     * and we have a Config object.
+     *
+     * This should typically only be called from `start`, most other calls should
+     * go through `maybeStartExtension` which will only start the extension if
+     * extension reloading is enabled and the `config` object is initialized.
+     */
+    async startExtension(extension) {
+        if (!this.config) {
+            throw new Error('Cannot call `startExtension` prior to calling `start`.');
+        }
+        this.startingCount++;
+        this.eventEmitter?.emit('extensionsStarting', {
+            total: this.startingCount,
+            completed: this.startCompletedCount,
+        });
+        try {
+            await this.config.getMcpClientManager().startExtension(extension);
+            // TODO: Move all extension features here, including at least:
+            // - context file loading
+            // - custom command loading
+            // - excluded tool configuration
+        }
+        finally {
+            this.startCompletedCount++;
+            this.eventEmitter?.emit('extensionsStarting', {
+                total: this.startingCount,
+                completed: this.startCompletedCount,
+            });
+            if (this.startingCount === this.startCompletedCount) {
+                this.startingCount = 0;
+                this.startCompletedCount = 0;
+            }
+        }
+    }
+    /**
+     * If extension reloading is enabled and `start` has already been called,
+     * then calls `startExtension` to include all extension features into the
+     * program.
+     */
+    maybeStartExtension(extension) {
+        if (this.config && this.config.getEnableExtensionReloading()) {
+            return this.startExtension(extension);
+        }
+        return;
+    }
+    /**
+     * Unconditionally stops an `extension` and unloads all its MCP servers,
+     * context, custom commands, etc. Assumes that `start` has already been called
+     * and we have a Config object.
+     *
+     * Most calls should go through `maybeStopExtension` which will only stop the
+     * extension if extension reloading is enabled and the `config` object is
+     * initialized.
+     */
+    async stopExtension(extension) {
+        if (!this.config) {
+            throw new Error('Cannot call `stopExtension` prior to calling `start`.');
+        }
+        this.stoppingCount++;
+        this.eventEmitter?.emit('extensionsStopping', {
+            total: this.stoppingCount,
+            completed: this.stopCompletedCount,
+        });
+        try {
+            await this.config.getMcpClientManager().stopExtension(extension);
+            // TODO: Remove all extension features here, including at least:
+            // - context files
+            // - custom commands
+            // - excluded tools
+        }
+        finally {
+            this.stopCompletedCount++;
+            this.eventEmitter?.emit('extensionsStopping', {
+                total: this.stoppingCount,
+                completed: this.stopCompletedCount,
+            });
+            if (this.stoppingCount === this.stopCompletedCount) {
+                this.stoppingCount = 0;
+                this.stopCompletedCount = 0;
+            }
+        }
+    }
+    /**
+     * If extension reloading is enabled and `start` has already been called,
+     * then this also performs all necessary steps to remove all extension
+     * features from the rest of the system.
+     */
+    maybeStopExtension(extension) {
+        if (this.config && this.config.getEnableExtensionReloading()) {
+            return this.stopExtension(extension);
+        }
+        return;
+    }
+}
+export class SimpleExtensionLoader extends ExtensionLoader {
     extensions;
-    _eventEmitter = new EventEmitter();
-    constructor(extensions) {
+    constructor(extensions, eventEmitter) {
+        super(eventEmitter);
         this.extensions = extensions;
     }
-    extensionEvents() {
-        return this._eventEmitter;
-    }
     getExtensions() {
         return this.extensions;
     }
+    /// Adds `extension` to the list of extensions and calls
+    /// `maybeStartExtension`.
+    ///
+    /// This is intended for dynamic loading of extensions after calling `start`.
+    async loadExtension(extension) {
+        this.extensions.push(extension);
+        await this.maybeStartExtension(extension);
+    }
+    /// Removes `extension` from the list of extensions and calls
+    // `maybeStopExtension` if it was found.
+    ///
+    /// This is intended for dynamic unloading of extensions after calling `start`.
+    async unloadExtension(extension) {
+        const index = this.extensions.indexOf(extension);
+        if (index === -1)
+            return;
+        this.extensions.splice(index, 1);
+        await this.maybeStopExtension(extension);
+    }
 }
 //# sourceMappingURL=extensionLoader.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"extensionLoader.js","sourceRoot":"","sources":["../../../src/utils/extensionLoader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AA8B3C,MAAM,OAAO,qBAAqB;IAEH;IADrB,aAAa,GAAG,IAAI,YAAY,EAAmB,CAAC;IAC5D,YAA6B,UAAgC;QAAhC,eAAU,GAAV,UAAU,CAAsB;IAAG,CAAC;IAEjE,eAAe;QACb,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;CACF"}
+{"version":3,"file":"extensionLoader.js","sourceRoot":"","sources":["../../../src/utils/extensionLoader.ts"],"names":[],"mappings":"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"}

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

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

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

@@ -0,0 +1,90 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest';
+import { SimpleExtensionLoader } from './extensionLoader.js';
+import {} from '../tools/mcp-client-manager.js';
+describe('SimpleExtensionLoader', () => {
+    let mockConfig;
+    let extensionReloadingEnabled;
+    let mockMcpClientManager;
+    const activeExtension = {
+        name: 'test-extension',
+        isActive: true,
+        version: '1.0.0',
+        path: '/path/to/extension',
+        contextFiles: [],
+        id: '123',
+    };
+    const inactiveExtension = {
+        name: 'test-extension',
+        isActive: false,
+        version: '1.0.0',
+        path: '/path/to/extension',
+        contextFiles: [],
+        id: '123',
+    };
+    beforeEach(() => {
+        mockMcpClientManager = {
+            startExtension: vi.fn(),
+            stopExtension: vi.fn(),
+        };
+        extensionReloadingEnabled = false;
+        mockConfig = {
+            getMcpClientManager: () => mockMcpClientManager,
+            getEnableExtensionReloading: () => extensionReloadingEnabled,
+        };
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('should start active extensions', async () => {
+        const loader = new SimpleExtensionLoader([activeExtension]);
+        await loader.start(mockConfig);
+        expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(activeExtension);
+    });
+    it('should not start inactive extensions', async () => {
+        const loader = new SimpleExtensionLoader([inactiveExtension]);
+        await loader.start(mockConfig);
+        expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
+    });
+    describe('interactive extension loading and unloading', () => {
+        it('should not call `start` or `stop` if the loader is not already started', async () => {
+            const loader = new SimpleExtensionLoader([]);
+            await loader.loadExtension(activeExtension);
+            expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
+            await loader.unloadExtension(activeExtension);
+            expect(mockMcpClientManager.stopExtension).not.toHaveBeenCalled();
+        });
+        it('should start extensions that were explicitly loaded prior to initializing the loader', async () => {
+            const loader = new SimpleExtensionLoader([]);
+            await loader.loadExtension(activeExtension);
+            expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
+            await loader.start(mockConfig);
+            expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(activeExtension);
+        });
+        it.each([true, false])('should only call `start` and `stop` if extension reloading is enabled ($i)', async (reloadingEnabled) => {
+            extensionReloadingEnabled = reloadingEnabled;
+            const loader = new SimpleExtensionLoader([]);
+            await loader.start(mockConfig);
+            expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
+            await loader.loadExtension(activeExtension);
+            if (reloadingEnabled) {
+                expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(activeExtension);
+            }
+            else {
+                expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
+            }
+            await loader.unloadExtension(activeExtension);
+            if (reloadingEnabled) {
+                expect(mockMcpClientManager.stopExtension).toHaveBeenCalledExactlyOnceWith(activeExtension);
+            }
+            else {
+                expect(mockMcpClientManager.stopExtension).not.toHaveBeenCalled();
+            }
+        });
+    });
+});
+//# sourceMappingURL=extensionLoader.test.js.map

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

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

package/dist/src/utils/fetch.js

@@ -50,11 +50,6 @@ export async function fetchWithTimeout(url, timeout) {
     }
 }
 export function setGlobalProxy(proxy) {
-    try {
-        setGlobalDispatcher(new ProxyAgent(proxy));
-    }
-    catch (e) {
-        console.error(`Failed to set proxy: ${getErrorMessage(e)}`);
-    }
+    setGlobalDispatcher(new ProxyAgent(proxy));
 }
 //# sourceMappingURL=fetch.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/utils/fetch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAEzD,MAAM,iBAAiB,GAAG;IACxB,OAAO;IACP,QAAQ;IACR,gCAAgC;IAChC,aAAa;IACb,OAAO;IACP,QAAQ;IACR,QAAQ;CACT,CAAC;AAEF,MAAM,OAAO,UAAW,SAAQ,KAAK;IAG1B;IAFT,YACE,OAAe,EACR,IAAa;QAEpB,KAAK,CAAC,OAAO,CAAC,CAAC;QAFR,SAAI,GAAJ,IAAI,CAAS;QAGpB,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;QACvC,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjE,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,GAAW,EACX,OAAe;IAEf,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;IAEhE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QACjE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACrD,MAAM,IAAI,UAAU,CAAC,2BAA2B,OAAO,IAAI,EAAE,WAAW,CAAC,CAAC;QAC5E,CAAC;QACD,MAAM,IAAI,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/C,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,SAAS,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAa;IAC1C,IAAI,CAAC;QACH,mBAAmB,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,wBAAwB,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC"}
+{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/utils/fetch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAEzD,MAAM,iBAAiB,GAAG;IACxB,OAAO;IACP,QAAQ;IACR,gCAAgC;IAChC,aAAa;IACb,OAAO;IACP,QAAQ;IACR,QAAQ;CACT,CAAC;AAEF,MAAM,OAAO,UAAW,SAAQ,KAAK;IAG1B;IAFT,YACE,OAAe,EACR,IAAa;QAEpB,KAAK,CAAC,OAAO,CAAC,CAAC;QAFR,SAAI,GAAJ,IAAI,CAAS;QAGpB,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;QACvC,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjE,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,GAAW,EACX,OAAe;IAEf,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;IAEhE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QACjE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACrD,MAAM,IAAI,UAAU,CAAC,2BAA2B,OAAO,IAAI,EAAE,WAAW,CAAC,CAAC;QAC5E,CAAC;QACD,MAAM,IAAI,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/C,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,SAAS,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAa;IAC1C,mBAAmB,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7C,CAAC"}

package/dist/src/utils/llm-edit-fixer.d.ts

@@ -22,5 +22,5 @@ export interface SearchReplaceEdit {
  * @param promptId A unique ID for the prompt.
  * @returns A new search and replace pair.
  */
-export declare function FixLLMEditWithInstruction(instruction: string, old_string: string, new_string: string, error: string, current_content: string, baseLlmClient: BaseLlmClient, abortSignal: AbortSignal): Promise<SearchReplaceEdit>;
+export declare function FixLLMEditWithInstruction(instruction: string, old_string: string, new_string: string, error: string, current_content: string, baseLlmClient: BaseLlmClient, abortSignal: AbortSignal): Promise<SearchReplaceEdit | null>;
 export declare function resetLlmEditFixerCaches_TEST_ONLY(): void;

package/dist/src/utils/llm-edit-fixer.js

@@ -11,6 +11,7 @@ import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
 import { promptIdContext } from './promptIdContext.js';
 import { debugLogger } from './debugLogger.js';
 const MAX_CACHE_SIZE = 50;
+const GENERATE_JSON_TIMEOUT_MS = 40000; // 40 seconds
 const EDIT_SYS_PROMPT = `
 You are an expert code-editing assistant specializing in debugging and correcting failed search-and-replace operations.
 
@@ -72,6 +73,27 @@ const SearchReplaceEditSchema = {
     required: ['search', 'replace', 'explanation'],
 };
 const editCorrectionWithInstructionCache = new LruCache(MAX_CACHE_SIZE);
+async function generateJsonWithTimeout(client, params, timeoutMs) {
+    try {
+        // Create a signal that aborts automatically after the specified timeout.
+        const timeoutSignal = AbortSignal.timeout(timeoutMs);
+        const result = await client.generateJson({
+            ...params,
+            // The operation will be aborted if either the original signal is aborted
+            // or if the timeout is reached.
+            abortSignal: AbortSignal.any([
+                params.abortSignal ?? new AbortController().signal,
+                timeoutSignal,
+            ]),
+        });
+        return result;
+    }
+    catch (_err) {
+        // An AbortError will be thrown on timeout.
+        // We catch it and return null to signal that the operation timed out.
+        return null;
+    }
+}
 /**
  * Attempts to fix a failed edit by using an LLM to generate a new search and replace pair.
  * @param instruction The instruction for what needs to be done.
@@ -114,7 +136,7 @@ export async function FixLLMEditWithInstruction(instruction, old_string, new_str
             parts: [{ text: userPrompt }],
         },
     ];
-    const result = (await baseLlmClient.generateJson({
+    const result = await generateJsonWithTimeout(baseLlmClient, {
         contents,
         schema: SearchReplaceEditSchema,
         abortSignal,
@@ -122,8 +144,10 @@ export async function FixLLMEditWithInstruction(instruction, old_string, new_str
         systemInstruction: EDIT_SYS_PROMPT,
         promptId,
         maxAttempts: 1,
-    }));
-    editCorrectionWithInstructionCache.set(cacheKey, result);
+    }, GENERATE_JSON_TIMEOUT_MS);
+    if (result) {
+        editCorrectionWithInstructionCache.set(cacheKey, result);
+    }
     return result;
 }
 export function resetLlmEditFixerCaches_TEST_ONLY() {

package/dist/src/utils/llm-edit-fixer.js.map

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

package/dist/src/utils/llm-edit-fixer.test.js

@@ -20,6 +20,7 @@ describe('FixLLMEditWithInstruction', () => {
     const abortController = new AbortController();
     const abortSignal = abortController.signal;
     beforeEach(() => {
+        vi.useFakeTimers();
         vi.clearAllMocks();
         resetLlmEditFixerCaches_TEST_ONLY(); // Ensure cache is cleared before each test
     });
@@ -182,5 +183,25 @@ describe('FixLLMEditWithInstruction', () => {
             });
         });
     });
+    it('should return null if the LLM call times out', { timeout: 60000 }, async () => {
+        mockGenerateJson.mockImplementation(async ({ abortSignal }) => 
+        // Simulate a long-running operation that never resolves on its own.
+        // It will only reject when the abort signal is triggered by the timeout.
+        new Promise((_resolve, reject) => {
+            if (abortSignal?.aborted) {
+                return reject(new DOMException('Aborted', 'AbortError'));
+            }
+            abortSignal?.addEventListener('abort', () => {
+                reject(new DOMException('Aborted', 'AbortError'));
+            });
+        }));
+        const testPromptId = 'test-prompt-id-timeout';
+        const fixPromise = promptIdContext.run(testPromptId, () => FixLLMEditWithInstruction(instruction, old_string, new_string, error, current_content, mockBaseLlmClient, abortSignal));
+        // Let the timers advance just past the 40000ms default timeout.
+        await vi.advanceTimersByTimeAsync(40001);
+        const result = await fixPromise;
+        expect(result).toBeNull();
+        expect(mockGenerateJson).toHaveBeenCalledOnce();
+    });
 });
 //# sourceMappingURL=llm-edit-fixer.test.js.map

package/dist/src/utils/llm-edit-fixer.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"llm-edit-fixer.test.js","sourceRoot":"","sources":["../../../src/utils/llm-edit-fixer.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EACL,yBAAyB,EACzB,iCAAiC,GAElC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,yBAAyB;AACzB,MAAM,gBAAgB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;AACjC,MAAM,iBAAiB,GAAG;IACxB,YAAY,EAAE,gBAAgB;CACH,CAAC;AAE9B,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,MAAM,WAAW,GAAG,mBAAmB,CAAC;IACxC,MAAM,UAAU,GAAG,oBAAoB,CAAC;IACxC,MAAM,UAAU,GAAG,oBAAoB,CAAC;IACxC,MAAM,KAAK,GAAG,kBAAkB,CAAC;IACjC,MAAM,eAAe,GAAG,iCAAiC,CAAC;IAC1D,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC9C,MAAM,WAAW,GAAG,eAAe,CAAC,MAAM,CAAC;IAE3C,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,iCAAiC,EAAE,CAAC,CAAC,2CAA2C;IAClF,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC,+BAA+B;IACrD,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAsB;QACzC,MAAM,EAAE,oBAAoB;QAC5B,OAAO,EAAE,oBAAoB;QAC7B,iBAAiB,EAAE,KAAK;QACxB,WAAW,EAAE,kCAAkC;KAChD,CAAC;IAEF,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;QACzF,MAAM,YAAY,GAAG,sBAAsB,CAAC;QAC5C,gBAAgB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAEpD,MAAM,eAAe,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,yBAAyB,CAC7B,WAAW,EACX,UAAU,EACV,UAAU,EACV,KAAK,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,CACZ,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,yEAAyE;QACzE,MAAM,CAAC,gBAAgB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAClD,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB,CAC3C,MAAM,CAAC,gBAAgB,CAAC;YACtB,QAAQ,EAAE,YAAY;SACvB,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;QACzF,gBAAgB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,cAAc,GAAG,EAAE;aACtB,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC;aACtB,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAEhC,0CAA0C;QAC1C,MAAM,yBAAyB,CAC7B,WAAW,EACX,UAAU,EACV,UAAU,EACV,KAAK,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,CACZ,CAAC;QAEF,gCAAgC;QAChC,MAAM,CAAC,cAAc,CAAC,CAAC,oBAAoB,CACzC,MAAM,CAAC,gBAAgB,CACrB,kGAAkG,CACnG,CACF,CAAC;QAEF,2EAA2E;QAC3E,MAAM,CAAC,gBAAgB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAClD,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB,CAC3C,MAAM,CAAC,gBAAgB,CAAC;YACtB,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC,qBAAqB,CAAC;SACzD,CAAC,CACH,CAAC;QAEF,gBAAgB;QAChB,cAAc,CAAC,WAAW,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,gBAAgB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,oCAAoC,CAAC;QAEtD,MAAM,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,yBAAyB,CAC7B,WAAW,EACX,UAAU,EACV,UAAU,EACV,KAAK,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,CACZ,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAErE,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,CACjC,kBAAkB,WAAW,kBAAkB,CAChD,CAAC;QACF,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,aAAa,UAAU,aAAa,CAAC,CAAC;QAC1E,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,cAAc,UAAU,cAAc,CAAC,CAAC;QAC5E,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,YAAY,KAAK,YAAY,CAAC,CAAC;QACnE,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,CACjC,mBAAmB,eAAe,mBAAmB,CACtD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,gBAAgB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,wBAAwB,CAAC;QAE9C,MAAM,eAAe,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;YACjD,mCAAmC;YACnC,MAAM,OAAO,GAAG,MAAM,yBAAyB,CAC7C,WAAW,EACX,UAAU,EACV,UAAU,EACV,KAAK,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,CACZ,CAAC;YAEF,+DAA+D;YAC/D,MAAM,OAAO,GAAG,MAAM,yBAAyB,CAC7C,WAAW,EACX,UAAU,EACV,UAAU,EACV,KAAK,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,CACZ,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACzC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACzC,qDAAqD;YACrD,MAAM,CAAC,gBAAgB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QACxE,gBAAgB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,2BAA2B,CAAC;QAEjD,MAAM,eAAe,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;YACjD,aAAa;YACb,MAAM,yBAAyB,CAC7B,WAAW,EACX,UAAU,EACV,UAAU,EACV,KAAK,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,CACZ,CAAC;YAEF,2CAA2C;YAC3C,MAAM,yBAAyB,CAC7B,yBAAyB,EACzB,UAAU,EACV,UAAU,EACV,KAAK,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,CACZ,CAAC;YAEF,iDAAiD;YACjD,MAAM,CAAC,gBAAgB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAC1C,EAAE,CAAC,6EAA6E,EAAE,KAAK,IAAI,EAAE;YAC3F,yEAAyE;YACzE,gDAAgD;YAEhD,MAAM,aAAa,GAAsB;gBACvC,MAAM,EAAE,eAAe;gBACvB,OAAO,EAAE,mBAAmB;gBAC5B,iBAAiB,EAAE,KAAK;gBACxB,WAAW,EAAE,uBAAuB;aACrC,CAAC;YAEF,MAAM,cAAc,GAAsB;gBACxC,MAAM,EAAE,gBAAgB;gBACxB,OAAO,EAAE,oBAAoB;gBAC7B,iBAAiB,EAAE,KAAK;gBACxB,WAAW,EAAE,wBAAwB;aACtC,CAAC;YAEF,gBAAgB;iBACb,qBAAqB,CAAC,aAAa,CAAC;iBACpC,qBAAqB,CAAC,cAAc,CAAC,CAAC;YAEzC,MAAM,YAAY,GAAG,sBAAsB,CAAC;YAE5C,MAAM,eAAe,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;gBACjD,+EAA+E;gBAC/E,wFAAwF;gBACxF,MAAM,KAAK,GAAG,MAAM,yBAAyB,CAC3C,UAAU,EAAE,cAAc;gBAC1B,SAAS,EAAE,aAAa;gBACxB,cAAc,EAAE,2BAA2B;gBAC3C,MAAM,EAAE,kBAAkB;gBAC1B,OAAO,EAAE,QAAQ;gBACjB,iBAAiB,EACjB,WAAW,CACZ,CAAC;gBAEF,uFAAuF;gBACvF,wFAAwF;gBACxF,MAAM,KAAK,GAAG,MAAM,yBAAyB,CAC3C,6BAA6B,EAAE,6BAA6B;gBAC5D,aAAa,EAAE,4BAA4B;gBAC3C,OAAO,EAAE,aAAa;gBACtB,EAAE,EAAE,kBAAkB;gBACtB,EAAE,EAAE,QAAQ;gBACZ,iBAAiB,EACjB,WAAW,CACZ,CAAC;gBAEF,oEAAoE;gBACpE,2CAA2C;gBAC3C,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBACrC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBACtC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAEjC,6DAA6D;gBAC7D,wCAAwC;gBACxC,MAAM,CAAC,gBAAgB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACpD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACvE,4DAA4D;YAE5D,MAAM,YAAY,GAAsB;gBACtC,MAAM,EAAE,sBAAsB;gBAC9B,OAAO,EAAE,sBAAsB;gBAC/B,iBAAiB,EAAE,KAAK;gBACxB,WAAW,EAAE,0BAA0B;aACxC,CAAC;YAEF,MAAM,eAAe,GAAsB;gBACzC,MAAM,EAAE,aAAa;gBACrB,OAAO,EAAE,aAAa;gBACtB,iBAAiB,EAAE,KAAK;gBACxB,WAAW,EAAE,iBAAiB;aAC/B,CAAC;YAEF,gBAAgB;iBACb,qBAAqB,CAAC,YAAY,CAAC;iBACnC,qBAAqB,CAAC,eAAe,CAAC,CAAC;YAE1C,MAAM,YAAY,GAAG,uBAAuB,CAAC;YAE7C,MAAM,eAAe,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;gBACjD,gCAAgC;gBAChC,MAAM,QAAQ,GAAG,MAAM,yBAAyB,CAC9C,yBAAyB,EACzB,sBAAsB,EAAE,eAAe;gBACvC,sBAAsB,EAAE,eAAe;gBACvC,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,WAAW,CACZ,CAAC;gBAEF,+BAA+B;gBAC/B,MAAM,WAAW,GAAG,MAAM,yBAAyB,CACjD,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,wBAAwB,EACxB,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,CACZ,CAAC;gBAEF,qDAAqD;gBACrD,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBACvC,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;gBAC7C,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBAE1C,4DAA4D;gBAC5D,MAAM,CAAC,gBAAgB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACpD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"llm-edit-fixer.test.js","sourceRoot":"","sources":["../../../src/utils/llm-edit-fixer.test.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/shell-utils.js

@@ -187,6 +187,32 @@ function collectCommandDetails(root, source) {
     }
     return details;
 }
+function hasPromptCommandTransform(root) {
+    const stack = [root];
+    while (stack.length > 0) {
+        const current = stack.pop();
+        if (!current) {
+            continue;
+        }
+        if (current.type === 'expansion') {
+            for (let i = 0; i < current.childCount - 1; i += 1) {
+                const operatorNode = current.child(i);
+                const transformNode = current.child(i + 1);
+                if (operatorNode?.type === '@' &&
+                    transformNode?.text?.toLowerCase() === 'p') {
+                    return true;
+                }
+            }
+        }
+        for (let i = current.namedChildCount - 1; i >= 0; i -= 1) {
+            const child = current.namedChild(i);
+            if (child) {
+                stack.push(child);
+            }
+        }
+    }
+    return false;
+}
 function parseBashCommandDetails(command) {
     if (treeSitterInitializationError) {
         throw treeSitterInitializationError;
@@ -204,7 +230,9 @@ function parseBashCommandDetails(command) {
     const details = collectCommandDetails(tree.rootNode, command);
     return {
         details,
-        hasError: tree.rootNode.hasError || details.length === 0,
+        hasError: tree.rootNode.hasError ||
+            details.length === 0 ||
+            hasPromptCommandTransform(tree.rootNode),
     };
 }
 function parsePowerShellCommandDetails(command, executable) {