@machina.ai/cell-cli 1.22.5-rc1 → 1.25.0-rc3

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

@@ -8,6 +8,7 @@ import { getUserStartupWarnings } from './userStartupWarnings.js';
 import * as os from 'node:os';
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import { isFolderTrustEnabled, isWorkspaceTrusted, } from '../config/trustedFolders.js';
 // Mock os.homedir to control the home directory in tests
 vi.mock('os', async (importOriginal) => {
     const actualOs = await importOriginal();
@@ -16,6 +17,17 @@ vi.mock('os', async (importOriginal) => {
         homedir: vi.fn(),
     };
 });
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        homedir: () => os.homedir(),
+    };
+});
+vi.mock('../config/trustedFolders.js', () => ({
+    isFolderTrustEnabled: vi.fn(),
+    isWorkspaceTrusted: vi.fn(),
+}));
 describe('getUserStartupWarnings', () => {
     let testRootDir;
     let homeDir;
@@ -24,6 +36,11 @@ describe('getUserStartupWarnings', () => {
         homeDir = path.join(testRootDir, 'home');
         await fs.mkdir(homeDir, { recursive: true });
         vi.mocked(os.homedir).mockReturnValue(homeDir);
+        vi.mocked(isFolderTrustEnabled).mockReturnValue(false);
+        vi.mocked(isWorkspaceTrusted).mockReturnValue({
+            isTrusted: false,
+            source: undefined,
+        });
     });
     afterEach(async () => {
         await fs.rm(testRootDir, { recursive: true, force: true });
@@ -31,34 +48,48 @@ describe('getUserStartupWarnings', () => {
     });
     describe('home directory check', () => {
         it('should return a warning when running in home directory', async () => {
-            const warnings = await getUserStartupWarnings(homeDir);
-            expect(warnings).toContainEqual(expect.stringContaining('home directory'));
+            const warnings = await getUserStartupWarnings({}, homeDir);
+            expect(warnings).toContainEqual(expect.stringContaining('Warning you are running Cell CLI in your home directory'));
+            expect(warnings).toContainEqual(expect.stringContaining('warning can be disabled in /settings'));
         });
         it('should not return a warning when running in a project directory', async () => {
             const projectDir = path.join(testRootDir, 'project');
             await fs.mkdir(projectDir);
-            const warnings = await getUserStartupWarnings(projectDir);
+            const warnings = await getUserStartupWarnings({}, projectDir);
+            expect(warnings).not.toContainEqual(expect.stringContaining('home directory'));
+        });
+        it('should not return a warning when showHomeDirectoryWarning is false', async () => {
+            const warnings = await getUserStartupWarnings({ ui: { showHomeDirectoryWarning: false } }, homeDir);
+            expect(warnings).not.toContainEqual(expect.stringContaining('home directory'));
+        });
+        it('should not return a warning when folder trust is enabled and workspace is trusted', async () => {
+            vi.mocked(isFolderTrustEnabled).mockReturnValue(true);
+            vi.mocked(isWorkspaceTrusted).mockReturnValue({
+                isTrusted: true,
+                source: 'file',
+            });
+            const warnings = await getUserStartupWarnings({}, homeDir);
             expect(warnings).not.toContainEqual(expect.stringContaining('home directory'));
         });
     });
     describe('root directory check', () => {
         it('should return a warning when running in a root directory', async () => {
             const rootDir = path.parse(testRootDir).root;
-            const warnings = await getUserStartupWarnings(rootDir);
+            const warnings = await getUserStartupWarnings({}, rootDir);
             expect(warnings).toContainEqual(expect.stringContaining('root directory'));
             expect(warnings).toContainEqual(expect.stringContaining('folder structure will be used'));
         });
         it('should not return a warning when running in a non-root directory', async () => {
             const projectDir = path.join(testRootDir, 'project');
             await fs.mkdir(projectDir);
-            const warnings = await getUserStartupWarnings(projectDir);
+            const warnings = await getUserStartupWarnings({}, projectDir);
             expect(warnings).not.toContainEqual(expect.stringContaining('root directory'));
         });
     });
     describe('error handling', () => {
         it('should handle errors when checking directory', async () => {
             const nonExistentPath = path.join(testRootDir, 'non-existent');
-            const warnings = await getUserStartupWarnings(nonExistentPath);
+            const warnings = await getUserStartupWarnings({}, nonExistentPath);
             const expectedWarning = 'Could not verify the current directory due to a file system error.';
             expect(warnings).toEqual([expectedWarning, expectedWarning]);
         });

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

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

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

@@ -3,10 +3,19 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { StreamingState } from '../ui/types.js';
+export interface TerminalTitleOptions {
+    streamingState: StreamingState;
+    thoughtSubject?: string;
+    isConfirming: boolean;
+    folderName: string;
+    showThoughts: boolean;
+    useDynamicTitle: boolean;
+}
 /**
- * Computes the window title for the Cell CLI application.
+ * Computes the dynamic terminal window title based on the current CLI state.
  *
- * @param folderName - The name of the current folder/workspace to display in the title
- * @returns The computed window title, either from CLI_TITLE environment variable or the default Gemini title
+ * @param options - The current state of the CLI and environment context
+ * @returns A formatted string padded to 80 characters for the terminal title
  */
-export declare function computeWindowTitle(folderName: string): string;
+export declare function computeTerminalTitle({ streamingState, thoughtSubject, isConfirming, folderName, showThoughts, useDynamicTitle, }: TerminalTitleOptions): string;

package/dist/src/utils/windowTitle.js

@@ -3,17 +3,75 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { StreamingState } from '../ui/types.js';
+function truncate(text, maxLen) {
+    if (text.length <= maxLen) {
+        return text;
+    }
+    return text.substring(0, maxLen - 1) + '…';
+}
 /**
- * Computes the window title for the Cell CLI application.
+ * Computes the dynamic terminal window title based on the current CLI state.
  *
- * @param folderName - The name of the current folder/workspace to display in the title
- * @returns The computed window title, either from CLI_TITLE environment variable or the default Gemini title
+ * @param options - The current state of the CLI and environment context
+ * @returns A formatted string padded to 80 characters for the terminal title
  */
-export function computeWindowTitle(folderName) {
-    const title = process.env['CLI_TITLE'] || `Gemini - ${folderName}`;
+export function computeTerminalTitle({ streamingState, thoughtSubject, isConfirming, folderName, showThoughts, useDynamicTitle, }) {
+    const MAX_LEN = 80;
+    // Use CLI_TITLE env var if available, otherwise use the provided folder name
+    let displayContext = process.env['CLI_TITLE'] || folderName;
+    if (!useDynamicTitle) {
+        const base = 'Cell CLI ';
+        // Max context length is 80 - base.length - 2 (for brackets)
+        const maxContextLen = MAX_LEN - base.length - 2;
+        displayContext = truncate(displayContext, maxContextLen);
+        return `${base}(${displayContext})`.padEnd(MAX_LEN, ' ');
+    }
+    // Pre-calculate suffix but keep it flexible
+    const getSuffix = (context) => ` (${context})`;
+    let title;
+    if (isConfirming ||
+        streamingState === StreamingState.WaitingForConfirmation) {
+        const base = '✋  Action Required';
+        // Max context length is 80 - base.length - 3 (for ' (' and ')')
+        const maxContextLen = MAX_LEN - base.length - 3;
+        const context = truncate(displayContext, maxContextLen);
+        title = `${base}${getSuffix(context)}`;
+    }
+    else if (streamingState === StreamingState.Idle) {
+        const base = '◇  Ready';
+        // Max context length is 80 - base.length - 3 (for ' (' and ')')
+        const maxContextLen = MAX_LEN - base.length - 3;
+        const context = truncate(displayContext, maxContextLen);
+        title = `${base}${getSuffix(context)}`;
+    }
+    else {
+        // Active/Working state
+        const cleanSubject = showThoughts && thoughtSubject?.replace(/[\r\n]+/g, ' ').trim();
+        // If we have a thought subject and it's too long to fit with the suffix,
+        // we drop the suffix to maximize space for the thought.
+        // Otherwise, we keep the suffix.
+        const suffix = getSuffix(displayContext);
+        const suffixLen = suffix.length;
+        const canFitThoughtWithSuffix = cleanSubject
+            ? cleanSubject.length + suffixLen + 3 <= MAX_LEN
+            : true;
+        let activeSuffix = '';
+        let maxStatusLen = MAX_LEN - 3; // Subtract icon prefix "✦  " (3 chars)
+        if (!cleanSubject || canFitThoughtWithSuffix) {
+            activeSuffix = suffix;
+            maxStatusLen -= activeSuffix.length;
+        }
+        const displayStatus = cleanSubject
+            ? truncate(cleanSubject, maxStatusLen)
+            : 'Working…';
+        title = `✦  ${displayStatus}${activeSuffix}`;
+    }
     // Remove control characters that could cause issues in terminal titles
-    return title.replace(
     // eslint-disable-next-line no-control-regex
-    /[\x00-\x1F\x7F]/g, '');
+    const safeTitle = title.replace(/[\x00-\x1F\x7F]/g, '');
+    // Pad the title to a fixed width to prevent taskbar icon resizing/jitter.
+    // We also slice it to ensure it NEVER exceeds MAX_LEN.
+    return safeTitle.padEnd(MAX_LEN, ' ').substring(0, MAX_LEN);
 }
 //# sourceMappingURL=windowTitle.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"windowTitle.js","sourceRoot":"","sources":["../../../src/utils/windowTitle.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,UAAkB;IACnD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,YAAY,UAAU,EAAE,CAAC;IAEnE,uEAAuE;IACvE,OAAO,KAAK,CAAC,OAAO;IAClB,4CAA4C;IAC5C,kBAAkB,EAClB,EAAE,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"windowTitle.js","sourceRoot":"","sources":["../../../src/utils/windowTitle.ts"],"names":[],"mappings":"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"}

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

@@ -3,47 +3,190 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { computeWindowTitle } from './windowTitle.js';
-describe('computeWindowTitle', () => {
-    let originalEnv;
-    beforeEach(() => {
-        originalEnv = process.env;
-        vi.stubEnv('CLI_TITLE', undefined);
-    });
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import { computeTerminalTitle } from './windowTitle.js';
+import { StreamingState } from '../ui/types.js';
+describe('computeTerminalTitle', () => {
     afterEach(() => {
-        process.env = originalEnv;
-    });
-    it('should use default Gemini title when CLI_TITLE is not set', () => {
-        const result = computeWindowTitle('my-project');
-        expect(result).toBe('Gemini - my-project');
-    });
-    it('should use CLI_TITLE environment variable when set', () => {
-        vi.stubEnv('CLI_TITLE', 'Custom Title');
-        const result = computeWindowTitle('my-project');
-        expect(result).toBe('Custom Title');
-    });
-    it('should remove control characters from title', () => {
-        vi.stubEnv('CLI_TITLE', 'Title\x1b[31m with \x07 control chars');
-        const result = computeWindowTitle('my-project');
-        // The \x1b[31m (ANSI escape sequence) and \x07 (bell character) should be removed
-        expect(result).toBe('Title[31m with  control chars');
-    });
-    it('should handle folder names with control characters', () => {
-        const result = computeWindowTitle('project\x07name');
-        expect(result).toBe('Gemini - projectname');
-    });
-    it('should handle empty folder name', () => {
-        const result = computeWindowTitle('');
-        expect(result).toBe('Gemini - ');
-    });
-    it('should handle folder names with spaces', () => {
-        const result = computeWindowTitle('my project');
-        expect(result).toBe('Gemini - my project');
-    });
-    it('should handle folder names with special characters', () => {
-        const result = computeWindowTitle('project-name_v1.0');
-        expect(result).toBe('Gemini - project-name_v1.0');
+        vi.unstubAllEnvs();
+    });
+    it.each([
+        {
+            description: 'idle state title with folder name',
+            args: {
+                streamingState: StreamingState.Idle,
+                isConfirming: false,
+                folderName: 'my-project',
+                showThoughts: false,
+                useDynamicTitle: true,
+            },
+            expected: '◇  Ready (my-project)',
+        },
+        {
+            description: 'legacy title when useDynamicTitle is false',
+            args: {
+                streamingState: StreamingState.Responding,
+                isConfirming: false,
+                folderName: 'my-project',
+                showThoughts: true,
+                useDynamicTitle: false,
+            },
+            expected: 'Cell CLI (my-project)'.padEnd(80, ' '),
+            exact: true,
+        },
+        {
+            description: 'active state title with "Working…" when thoughts are disabled',
+            args: {
+                streamingState: StreamingState.Responding,
+                thoughtSubject: 'Reading files',
+                isConfirming: false,
+                folderName: 'my-project',
+                showThoughts: false,
+                useDynamicTitle: true,
+            },
+            expected: '✦  Working… (my-project)',
+        },
+        {
+            description: 'active state title with thought subject and suffix when thoughts are short enough',
+            args: {
+                streamingState: StreamingState.Responding,
+                thoughtSubject: 'Short thought',
+                isConfirming: false,
+                folderName: 'my-project',
+                showThoughts: true,
+                useDynamicTitle: true,
+            },
+            expected: '✦  Short thought (my-project)',
+        },
+        {
+            description: 'fallback active title with suffix if no thought subject is provided even when thoughts are enabled',
+            args: {
+                streamingState: StreamingState.Responding,
+                thoughtSubject: undefined,
+                isConfirming: false,
+                folderName: 'my-project',
+                showThoughts: true,
+                useDynamicTitle: true,
+            },
+            expected: '✦  Working… (my-project)'.padEnd(80, ' '),
+            exact: true,
+        },
+        {
+            description: 'action required state when confirming',
+            args: {
+                streamingState: StreamingState.Idle,
+                isConfirming: true,
+                folderName: 'my-project',
+                showThoughts: false,
+                useDynamicTitle: true,
+            },
+            expected: '✋  Action Required (my-project)',
+        },
+    ])('should return $description', ({ args, expected, exact }) => {
+        const title = computeTerminalTitle(args);
+        if (exact) {
+            expect(title).toBe(expected);
+        }
+        else {
+            expect(title).toContain(expected);
+        }
+        expect(title.length).toBe(80);
+    });
+    it('should return active state title with thought subject and NO suffix when thoughts are very long', () => {
+        const longThought = 'A'.repeat(70);
+        const title = computeTerminalTitle({
+            streamingState: StreamingState.Responding,
+            thoughtSubject: longThought,
+            isConfirming: false,
+            folderName: 'my-project',
+            showThoughts: true,
+            useDynamicTitle: true,
+        });
+        expect(title).not.toContain('(my-project)');
+        expect(title).toContain('✦  AAAAAAAAAAAAAAAA');
+        expect(title.length).toBe(80);
+    });
+    it('should truncate long thought subjects when thoughts are enabled', () => {
+        const longThought = 'A'.repeat(100);
+        const title = computeTerminalTitle({
+            streamingState: StreamingState.Responding,
+            thoughtSubject: longThought,
+            isConfirming: false,
+            folderName: 'my-project',
+            showThoughts: true,
+            useDynamicTitle: true,
+        });
+        expect(title.length).toBe(80);
+        expect(title).toContain('…');
+        expect(title.trimEnd().length).toBe(80);
+    });
+    it('should strip control characters from the title', () => {
+        const title = computeTerminalTitle({
+            streamingState: StreamingState.Responding,
+            thoughtSubject: 'BadTitle\x00 With\x07Control\x1BChars',
+            isConfirming: false,
+            folderName: 'my-project',
+            showThoughts: true,
+            useDynamicTitle: true,
+        });
+        expect(title).toContain('BadTitle WithControlChars');
+        expect(title).not.toContain('\x00');
+        expect(title).not.toContain('\x07');
+        expect(title).not.toContain('\x1B');
+        expect(title.length).toBe(80);
+    });
+    it('should prioritize CLI_TITLE environment variable over folder name when thoughts are disabled', () => {
+        vi.stubEnv('CLI_TITLE', 'EnvOverride');
+        const title = computeTerminalTitle({
+            streamingState: StreamingState.Idle,
+            isConfirming: false,
+            folderName: 'my-project',
+            showThoughts: false,
+            useDynamicTitle: true,
+        });
+        expect(title).toContain('◇  Ready (EnvOverride)');
+        expect(title).not.toContain('my-project');
+        expect(title.length).toBe(80);
+    });
+    it.each([
+        {
+            name: 'folder name',
+            folderName: 'A'.repeat(100),
+            expected: '◇  Ready (AAAAA',
+        },
+        {
+            name: 'CLI_TITLE',
+            folderName: 'my-project',
+            envTitle: 'B'.repeat(100),
+            expected: '◇  Ready (BBBBB',
+        },
+    ])('should truncate very long $name to fit within 80 characters', ({ folderName, envTitle, expected }) => {
+        if (envTitle) {
+            vi.stubEnv('CLI_TITLE', envTitle);
+        }
+        const title = computeTerminalTitle({
+            streamingState: StreamingState.Idle,
+            isConfirming: false,
+            folderName,
+            showThoughts: false,
+            useDynamicTitle: true,
+        });
+        expect(title.length).toBe(80);
+        expect(title).toContain(expected);
+        expect(title).toContain('…)');
+    });
+    it('should truncate long folder name when useDynamicTitle is false', () => {
+        const longFolderName = 'C'.repeat(100);
+        const title = computeTerminalTitle({
+            streamingState: StreamingState.Responding,
+            isConfirming: false,
+            folderName: longFolderName,
+            showThoughts: true,
+            useDynamicTitle: false,
+        });
+        expect(title.length).toBe(80);
+        expect(title).toContain('Cell CLI (CCCCC');
+        expect(title).toContain('…)');
     });
 });
 //# sourceMappingURL=windowTitle.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"windowTitle.test.js","sourceRoot":"","sources":["../../../src/utils/windowTitle.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,WAA8B,CAAC;IAEnC,UAAU,CAAC,GAAG,EAAE;QACd,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;QAC1B,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,WAAW,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,MAAM,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,uCAAuC,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAChD,kFAAkF;QAClF,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,MAAM,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,MAAM,GAAG,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,MAAM,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,MAAM,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"windowTitle.test.js","sourceRoot":"","sources":["../../../src/utils/windowTitle.test.ts"],"names":[],"mappings":"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"}

package/dist/src/validateNonInterActiveAuth.d.ts

@@ -6,4 +6,4 @@
 import type { Config } from '@google/gemini-cli-core';
 import { AuthType } from '@google/gemini-cli-core';
 import { type LoadedSettings } from './config/settings.js';
-export declare function validateNonInteractiveAuth(configuredAuthType: AuthType | undefined, useExternalAuth: boolean | undefined, nonInteractiveConfig: Config, settings: LoadedSettings): Promise<Config>;
+export declare function validateNonInteractiveAuth(configuredAuthType: AuthType | undefined, useExternalAuth: boolean | undefined, nonInteractiveConfig: Config, settings: LoadedSettings): Promise<AuthType>;

package/dist/src/validateNonInterActiveAuth.js

@@ -42,8 +42,7 @@ export async function validateNonInteractiveAuth(configuredAuthType, useExternal
                 throw new Error(err);
             }
         }
-        await nonInteractiveConfig.refreshAuth(authType);
-        return nonInteractiveConfig;
+        return authType;
     }
     catch (error) {
         if (nonInteractiveConfig.getOutputFormat() === OutputFormat.JSON) {

package/dist/src/validateNonInterActiveAuth.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateNonInterActiveAuth.js","sourceRoot":"","sources":["../../src/validateNonInterActiveAuth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validateNonInterActiveAuth.js","sourceRoot":"","sources":["../../src/validateNonInterActiveAuth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,SAAS,GACV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAuB,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,SAAS,kBAAkB;IACzB,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,MAAM,EAAE,CAAC;QACnD,OAAO,QAAQ,CAAC,iBAAiB,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,KAAK,MAAM,EAAE,CAAC;QACxD,OAAO,QAAQ,CAAC,aAAa,CAAC;IAChC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClC,OAAO,QAAQ,CAAC,UAAU,CAAC;IAC7B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,kBAAwC,EACxC,eAAoC,EACpC,oBAA4B,EAC5B,QAAwB;IAExB,IAAI,CAAC;QACH,MAAM,iBAAiB,GAAG,kBAAkB,IAAI,kBAAkB,EAAE,CAAC;QAErE,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC;QAClE,IAAI,YAAY,IAAI,iBAAiB,KAAK,YAAY,EAAE,CAAC;YACvD,MAAM,OAAO,GAAG,iBAAiB;gBAC/B,CAAC,CAAC,wCAAwC,YAAY,+BAA+B,iBAAiB,kDAAkD;gBACxJ,CAAC,CAAC,kBAAkB,YAAY,qDAAqD,CAAC;YACxF,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,qCAAqC,kBAAkB,wIAAwI,CAAC;YAChN,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QAED,MAAM,QAAQ,GAAa,iBAAiB,CAAC;QAE7C,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YACjD,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,oBAAoB,CAAC,eAAe,EAAE,KAAK,YAAY,CAAC,IAAI,EAAE,CAAC;YACjE,WAAW,CACT,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EACzD,oBAAoB,EACpB,SAAS,CAAC,0BAA0B,CACrC,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1E,MAAM,cAAc,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;AACH,CAAC"}

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

@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { FileSystemService } from '@google/gemini-cli-core';
-import type * as acp from './acp.js';
+import type * as acp from '@agentclientprotocol/sdk';
 /**
  * ACP client-based implementation of FileSystemService
  */
 export declare class AcpFileSystemService implements FileSystemService {
-    private readonly client;
+    private readonly connection;
     private readonly sessionId;
     private readonly capabilities;
     private readonly fallback;
-    constructor(client: acp.Client, sessionId: string, capabilities: acp.FileSystemCapability, fallback: FileSystemService);
+    constructor(connection: acp.AgentSideConnection, sessionId: string, capabilities: acp.FileSystemCapability, fallback: FileSystemService);
     readTextFile(filePath: string): Promise<string>;
     writeTextFile(filePath: string, content: string): Promise<void>;
 }

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

@@ -7,12 +7,12 @@
  * ACP client-based implementation of FileSystemService
  */
 export class AcpFileSystemService {
-    client;
+    connection;
     sessionId;
     capabilities;
     fallback;
-    constructor(client, sessionId, capabilities, fallback) {
-        this.client = client;
+    constructor(connection, sessionId, capabilities, fallback) {
+        this.connection = connection;
         this.sessionId = sessionId;
         this.capabilities = capabilities;
         this.fallback = fallback;
@@ -21,11 +21,9 @@ export class AcpFileSystemService {
         if (!this.capabilities.readTextFile) {
             return this.fallback.readTextFile(filePath);
         }
-        const response = await this.client.readTextFile({
+        const response = await this.connection.readTextFile({
             path: filePath,
             sessionId: this.sessionId,
-            line: null,
-            limit: null,
         });
         return response.content;
     }
@@ -33,7 +31,7 @@ export class AcpFileSystemService {
         if (!this.capabilities.writeTextFile) {
             return this.fallback.writeTextFile(filePath, content);
         }
-        await this.client.writeTextFile({
+        await this.connection.writeTextFile({
             path: filePath,
             content,
             sessionId: this.sessionId,

package/dist/src/zed-integration/fileSystemService.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileSystemService.js","sourceRoot":"","sources":["../../../src/zed-integration/fileSystemService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH;;GAEG;AACH,MAAM,OAAO,oBAAoB;IAEZ;IACA;IACA;IACA;IAJnB,YACmB,MAAkB,EAClB,SAAiB,EACjB,YAAsC,EACtC,QAA2B;QAH3B,WAAM,GAAN,MAAM,CAAY;QAClB,cAAS,GAAT,SAAS,CAAQ;QACjB,iBAAY,GAAZ,YAAY,CAA0B;QACtC,aAAQ,GAAR,QAAQ,CAAmB;IAC3C,CAAC;IAEJ,KAAK,CAAC,YAAY,CAAC,QAAgB;QACjC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;YAC9C,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,QAAgB,EAAE,OAAe;QACnD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAC9B,IAAI,EAAE,QAAQ;YACd,OAAO;YACP,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"fileSystemService.js","sourceRoot":"","sources":["../../../src/zed-integration/fileSystemService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH;;GAEG;AACH,MAAM,OAAO,oBAAoB;IAEZ;IACA;IACA;IACA;IAJnB,YACmB,UAAmC,EACnC,SAAiB,EACjB,YAAsC,EACtC,QAA2B;QAH3B,eAAU,GAAV,UAAU,CAAyB;QACnC,cAAS,GAAT,SAAS,CAAQ;QACjB,iBAAY,GAAZ,YAAY,CAA0B;QACtC,aAAQ,GAAR,QAAQ,CAAmB;IAC3C,CAAC;IAEJ,KAAK,CAAC,YAAY,CAAC,QAAgB;QACjC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;YAClD,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,QAAgB,EAAE,OAAe;QACnD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;YAClC,IAAI,EAAE,QAAQ;YACd,OAAO;YACP,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;CACF"}