@office-ai/aioncli-core 0.2.3 → 0.18.4

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

@@ -3,63 +3,106 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, afterEach, vi } from 'vitest';
-import { detectIde, DetectedIde } from './detect-ide.js';
+import { describe, it, expect, vi, afterEach } from 'vitest';
+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' };
     afterEach(() => {
         vi.unstubAllEnvs();
+        // Clear Cursor-specific environment variables that might interfere with tests
+        delete process.env['CURSOR_TRACE_ID'];
     });
-    it.each([
-        {
-            env: {},
-            expected: DetectedIde.VSCode,
-        },
-        {
-            env: { __COG_BASHRC_SOURCED: '1' },
-            expected: DetectedIde.Devin,
-        },
-        {
-            env: { REPLIT_USER: 'test' },
-            expected: DetectedIde.Replit,
-        },
-        {
-            env: { CURSOR_TRACE_ID: 'test' },
-            expected: DetectedIde.Cursor,
-        },
-        {
-            env: { CODESPACES: 'true' },
-            expected: DetectedIde.Codespaces,
-        },
-        {
-            env: { EDITOR_IN_CLOUD_SHELL: 'true' },
-            expected: DetectedIde.CloudShell,
-        },
-        {
-            env: { CLOUD_SHELL: 'true' },
-            expected: DetectedIde.CloudShell,
-        },
-        {
-            env: { TERM_PRODUCT: 'Trae' },
-            expected: DetectedIde.Trae,
-        },
-        {
-            env: { FIREBASE_DEPLOY_AGENT: 'true' },
-            expected: DetectedIde.FirebaseStudio,
-        },
-        {
-            env: { MONOSPACE_ENV: 'true' },
-            expected: DetectedIde.FirebaseStudio,
-        },
-    ])('detects the IDE for $expected', ({ env, expected }) => {
+    it('should return undefined if TERM_PROGRAM is not vscode', () => {
+        vi.stubEnv('TERM_PROGRAM', '');
+        expect(detectIde(ideProcessInfo)).toBeUndefined();
+    });
+    it('should detect Devin', () => {
+        vi.stubEnv('TERM_PROGRAM', 'vscode');
+        vi.stubEnv('__COG_BASHRC_SOURCED', '1');
+        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(IDE_DEFINITIONS.replit);
+    });
+    it('should detect Cursor', () => {
+        vi.stubEnv('TERM_PROGRAM', 'vscode');
+        vi.stubEnv('CURSOR_TRACE_ID', 'some-id');
+        expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.cursor);
+    });
+    it('should detect Codespaces', () => {
+        vi.stubEnv('TERM_PROGRAM', 'vscode');
+        vi.stubEnv('CODESPACES', 'true');
+        vi.stubEnv('CURSOR_TRACE_ID', '');
+        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');
+        vi.stubEnv('CURSOR_TRACE_ID', '');
+        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');
+        vi.stubEnv('CURSOR_TRACE_ID', '');
+        expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.cloudshell);
+    });
+    it('should detect Trae', () => {
+        vi.stubEnv('TERM_PROGRAM', 'vscode');
+        vi.stubEnv('TERM_PRODUCT', 'Trae');
+        vi.stubEnv('CURSOR_TRACE_ID', '');
+        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');
+        vi.stubEnv('CURSOR_TRACE_ID', '');
+        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', '');
+        vi.stubEnv('CURSOR_TRACE_ID', '');
+        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', '');
+        vi.stubEnv('CURSOR_TRACE_ID', '');
+        expect(detectIde(ideProcessInfoNoCode)).toBe(IDE_DEFINITIONS.vscodefork);
+    });
+    it('should detect AntiGravity', () => {
+        vi.stubEnv('TERM_PROGRAM', 'vscode');
+        vi.stubEnv('ANTIGRAVITY_CLI_ALIAS', 'agy');
+        expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.antigravity);
+    });
+});
+describe('detectIde with ideInfoFromFile', () => {
+    const ideProcessInfo = { pid: 123, command: 'some/path/to/code' };
+    afterEach(() => {
+        vi.unstubAllEnvs();
+    });
+    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 fall back to env detection if name is missing', () => {
+        const ideInfoFromFile = { displayName: 'Custom IDE' };
+        vi.stubEnv('TERM_PROGRAM', 'vscode');
+        vi.stubEnv('CURSOR_TRACE_ID', '');
+        expect(detectIde(ideProcessInfo, ideInfoFromFile)).toBe(IDE_DEFINITIONS.vscode);
+    });
+    it('should fall back to env detection if displayName is missing', () => {
+        const ideInfoFromFile = { name: 'custom-ide' };
         vi.stubEnv('TERM_PROGRAM', 'vscode');
-        for (const [key, value] of Object.entries(env)) {
-            vi.stubEnv(key, value);
-        }
-        expect(detectIde()).toBe(expected);
-    });
-    it('returns undefined for non-vscode', () => {
-        vi.stubEnv('TERM_PROGRAM', 'definitely-not-vscode');
-        expect(detectIde()).toBeUndefined();
+        vi.stubEnv('CURSOR_TRACE_ID', '');
+        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":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEzD,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC;QACN;YACE,GAAG,EAAE,EAAE;YACP,QAAQ,EAAE,WAAW,CAAC,MAAM;SAC7B;QACD;YACE,GAAG,EAAE,EAAE,oBAAoB,EAAE,GAAG,EAAE;YAClC,QAAQ,EAAE,WAAW,CAAC,KAAK;SAC5B;QACD;YACE,GAAG,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE;YAC5B,QAAQ,EAAE,WAAW,CAAC,MAAM;SAC7B;QACD;YACE,GAAG,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE;YAChC,QAAQ,EAAE,WAAW,CAAC,MAAM;SAC7B;QACD;YACE,GAAG,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;YAC3B,QAAQ,EAAE,WAAW,CAAC,UAAU;SACjC;QACD;YACE,GAAG,EAAE,EAAE,qBAAqB,EAAE,MAAM,EAAE;YACtC,QAAQ,EAAE,WAAW,CAAC,UAAU;SACjC;QACD;YACE,GAAG,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE;YAC5B,QAAQ,EAAE,WAAW,CAAC,UAAU;SACjC;QACD;YACE,GAAG,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE;YAC7B,QAAQ,EAAE,WAAW,CAAC,IAAI;SAC3B;QACD;YACE,GAAG,EAAE,EAAE,qBAAqB,EAAE,MAAM,EAAE;YACtC,QAAQ,EAAE,WAAW,CAAC,cAAc;SACrC;QACD;YACE,GAAG,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE;YAC9B,QAAQ,EAAE,WAAW,CAAC,cAAc;SACrC;KACF,CAAC,CAAC,+BAA+B,EAAE,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE;QACxD,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QACrC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzB,CAAC;QACD,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAC;QACpD,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,aAAa,EAAE,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"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 { DetectedIde } from '../ide/detect-ide.js';
-import { DiffUpdateResult } from '../ide/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;
@@ -18,47 +24,89 @@ export declare enum IDEConnectionStatus {
  * Manages the connection to and interaction with the IDE server.
  */
 export declare class IdeClient {
-    private static instance;
+    private static instancePromise;
     private client;
     private state;
-    private readonly currentIde;
-    private readonly currentIdeDisplayName;
+    private currentIde;
+    private ideProcessInfo;
+    private connectionConfig;
+    private authToken;
     private diffResponses;
     private statusListeners;
+    private trustChangeListeners;
+    private availableTools;
+    /**
+     * A mutex to ensure that only one diff view is open in the IDE at a time.
+     * This prevents race conditions and UI issues in IDEs like VSCode that
+     * can't handle multiple diff views being opened simultaneously.
+     */
+    private diffMutex;
     private constructor();
-    static getInstance(): IdeClient;
+    static getInstance(): Promise<IdeClient>;
     addStatusChangeListener(listener: (state: IDEConnectionState) => void): void;
     removeStatusChangeListener(listener: (state: IDEConnectionState) => void): void;
-    connect(): Promise<void>;
+    addTrustChangeListener(listener: (isTrusted: boolean) => void): void;
+    removeTrustChangeListener(listener: (isTrusted: boolean) => void): void;
+    connect(options?: {
+        logToConsole?: boolean;
+    }): Promise<void>;
+    /**
+     * 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.
+     *
+     * @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>;
     /**
-     * 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`
+     * Acquires a lock to ensure sequential execution of critical sections.
+     *
+     * This method implements a promise-based mutex. It works by chaining promises.
+     * Each call to `acquireMutex` gets the current `diffMutex` promise. It then
+     * creates a *new* promise (`newMutex`) that will be resolved when the caller
+     * invokes the returned `release` function. The `diffMutex` is immediately
+     * updated to this `newMutex`.
+     *
+     * The method returns a promise that resolves with the `release` function only
+     * *after* the *previous* `diffMutex` promise has resolved. This creates a
+     * queue where each subsequent operation must wait for the previous one to release
+     * the lock.
      *
-     * 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
+     * @returns A promise that resolves to a function that must be called to
+     *   release the lock.
      */
-    openDiff(filePath: string, newContent?: string): Promise<DiffUpdateResult>;
-    closeDiff(filePath: string): Promise<string | undefined>;
+    private acquireMutex;
+    closeDiff(filePath: string, options?: {
+        suppressNotification?: boolean;
+    }): 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;
     };
     private getPortFromEnv;
-    private getIdeInfoFromFile;
+    private getStdioConfigFromEnv;
+    private getConnectionConfigFromFile;
     private createProxyAwareFetch;
     private registerClientHandlers;
-    private establishConnection;
+    private establishHttpConnection;
+    private establishStdioConnection;
 }