@google/gemini-cli 0.30.0-preview.5 → 0.31.0-preview.0

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

@@ -0,0 +1,123 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { buildRunEventNotificationContent, MAX_NOTIFICATION_BODY_CHARS, MAX_NOTIFICATION_SUBTITLE_CHARS, MAX_NOTIFICATION_TITLE_CHARS, notifyViaTerminal, } from './terminalNotifications.js';
+const writeToStdout = vi.hoisted(() => vi.fn());
+const debugLogger = vi.hoisted(() => ({
+    debug: vi.fn(),
+}));
+vi.mock('@google/gemini-cli-core', () => ({
+    writeToStdout,
+    debugLogger,
+}));
+describe('terminal notifications', () => {
+    const originalPlatform = process.platform;
+    beforeEach(() => {
+        vi.resetAllMocks();
+        vi.unstubAllEnvs();
+        Object.defineProperty(process, 'platform', {
+            value: 'darwin',
+            configurable: true,
+        });
+    });
+    afterEach(() => {
+        vi.unstubAllEnvs();
+        Object.defineProperty(process, 'platform', {
+            value: originalPlatform,
+            configurable: true,
+        });
+    });
+    it('returns false without writing on non-macOS platforms', async () => {
+        Object.defineProperty(process, 'platform', {
+            value: 'linux',
+            configurable: true,
+        });
+        const shown = await notifyViaTerminal(true, {
+            title: 't',
+            body: 'b',
+        });
+        expect(shown).toBe(false);
+        expect(writeToStdout).not.toHaveBeenCalled();
+    });
+    it('returns false without writing when disabled', async () => {
+        const shown = await notifyViaTerminal(false, {
+            title: 't',
+            body: 'b',
+        });
+        expect(shown).toBe(false);
+        expect(writeToStdout).not.toHaveBeenCalled();
+    });
+    it('emits OSC 9 notification when supported terminal is detected', async () => {
+        vi.stubEnv('TERM_PROGRAM', 'iTerm.app');
+        const shown = await notifyViaTerminal(true, {
+            title: 'Title "quoted"',
+            subtitle: 'Sub\\title',
+            body: 'Body',
+        });
+        expect(shown).toBe(true);
+        expect(writeToStdout).toHaveBeenCalledTimes(1);
+        const emitted = String(writeToStdout.mock.calls[0][0]);
+        expect(emitted.startsWith('\x1b]9;')).toBe(true);
+        expect(emitted.endsWith('\x07')).toBe(true);
+    });
+    it('emits BEL fallback when OSC 9 is not supported', async () => {
+        vi.stubEnv('TERM_PROGRAM', '');
+        vi.stubEnv('TERM', '');
+        const shown = await notifyViaTerminal(true, {
+            title: 'Title',
+            subtitle: 'Subtitle',
+            body: 'Body',
+        });
+        expect(shown).toBe(true);
+        expect(writeToStdout).toHaveBeenCalledWith('\x07');
+    });
+    it('uses BEL fallback when WT_SESSION is set', async () => {
+        vi.stubEnv('WT_SESSION', '1');
+        vi.stubEnv('TERM_PROGRAM', 'WezTerm');
+        const shown = await notifyViaTerminal(true, {
+            title: 'Title',
+            body: 'Body',
+        });
+        expect(shown).toBe(true);
+        expect(writeToStdout).toHaveBeenCalledWith('\x07');
+    });
+    it('returns false and does not throw when terminal write fails', async () => {
+        writeToStdout.mockImplementation(() => {
+            throw new Error('no permissions');
+        });
+        await expect(notifyViaTerminal(true, {
+            title: 'Title',
+            body: 'Body',
+        })).resolves.toBe(false);
+        expect(debugLogger.debug).toHaveBeenCalledTimes(1);
+    });
+    it('strips terminal control sequences and newlines from payload text', async () => {
+        vi.stubEnv('TERM_PROGRAM', 'iTerm.app');
+        const shown = await notifyViaTerminal(true, {
+            title: 'Title',
+            body: '\x1b[32mGreen\x1b[0m\nLine',
+        });
+        expect(shown).toBe(true);
+        const emitted = String(writeToStdout.mock.calls[0][0]);
+        const payload = emitted.slice('\x1b]9;'.length, -1);
+        expect(payload).toContain('Green');
+        expect(payload).toContain('Line');
+        expect(payload).not.toContain('[32m');
+        expect(payload).not.toContain('\n');
+        expect(payload).not.toContain('\r');
+    });
+    it('builds bounded attention notification content', () => {
+        const content = buildRunEventNotificationContent({
+            type: 'attention',
+            heading: 'h'.repeat(400),
+            detail: 'd'.repeat(400),
+        });
+        expect(content.title.length).toBeLessThanOrEqual(MAX_NOTIFICATION_TITLE_CHARS);
+        expect((content.subtitle ?? '').length).toBeLessThanOrEqual(MAX_NOTIFICATION_SUBTITLE_CHARS);
+        expect(content.body.length).toBeLessThanOrEqual(MAX_NOTIFICATION_BODY_CHARS);
+    });
+});
+//# sourceMappingURL=terminalNotifications.test.js.map

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

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

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

@@ -3,5 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { type StartupWarning } from '@google/gemini-cli-core';
 import type { Settings } from '../config/settingsSchema.js';
-export declare function getUserStartupWarnings(settings: Settings, workspaceRoot?: string): Promise<string[]>;
+export declare function getUserStartupWarnings(settings: Settings, workspaceRoot?: string, options?: {
+    isAlternateBuffer?: boolean;
+}): Promise<StartupWarning[]>;

package/dist/src/utils/userStartupWarnings.js

@@ -6,11 +6,12 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import process from 'node:process';
-import { homedir } from '@google/gemini-cli-core';
+import { homedir, getCompatibilityWarnings, WarningPriority, } from '@google/gemini-cli-core';
 import { isFolderTrustEnabled, isWorkspaceTrusted, } from '../config/trustedFolders.js';
 // Individual warning checks
 const homeDirectoryCheck = {
     id: 'home-directory',
+    priority: WarningPriority.Low,
     check: async (workspaceRoot, settings) => {
         if (settings.ui?.showHomeDirectoryWarning === false) {
             return null;
@@ -37,6 +38,7 @@ const homeDirectoryCheck = {
 };
 const rootDirectoryCheck = {
     id: 'root-directory',
+    priority: WarningPriority.High,
     check: async (workspaceRoot, _settings) => {
         try {
             const workspaceRealPath = await fs.realpath(workspaceRoot);
@@ -57,8 +59,24 @@ const WARNING_CHECKS = [
     homeDirectoryCheck,
     rootDirectoryCheck,
 ];
-export async function getUserStartupWarnings(settings, workspaceRoot = process.cwd()) {
-    const results = await Promise.all(WARNING_CHECKS.map((check) => check.check(workspaceRoot, settings)));
-    return results.filter((msg) => msg !== null);
+export async function getUserStartupWarnings(settings, workspaceRoot = process.cwd(), options) {
+    const results = await Promise.all(WARNING_CHECKS.map(async (check) => {
+        const message = await check.check(workspaceRoot, settings);
+        if (message) {
+            return {
+                id: check.id,
+                message,
+                priority: check.priority,
+            };
+        }
+        return null;
+    }));
+    const warnings = results.filter((w) => w !== null);
+    if (settings.ui?.showCompatibilityWarnings !== false) {
+        warnings.push(...getCompatibilityWarnings({
+            isAlternateBuffer: options?.isAlternateBuffer,
+        }));
+    }
+    return warnings;
 }
 //# sourceMappingURL=userStartupWarnings.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"userStartupWarnings.js","sourceRoot":"","sources":["../../../src/utils/userStartupWarnings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EACL,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AAOrC,4BAA4B;AAC5B,MAAM,kBAAkB,GAAiB;IACvC,EAAE,EAAE,gBAAgB;IACpB,KAAK,EAAE,KAAK,EAAE,aAAqB,EAAE,QAAkB,EAAE,EAAE;QACzD,IAAI,QAAQ,CAAC,EAAE,EAAE,wBAAwB,KAAK,KAAK,EAAE,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACH,MAAM,CAAC,iBAAiB,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC1D,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC;gBAC1B,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;aACvB,CAAC,CAAC;YAEH,IAAI,iBAAiB,KAAK,YAAY,EAAE,CAAC;gBACvC,6FAA6F;gBAC7F,IACE,oBAAoB,CAAC,QAAQ,CAAC;oBAC9B,kBAAkB,CAAC,QAAQ,CAAC,CAAC,SAAS,EACtC,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,OAAO,uGAAuG,CAAC;YACjH,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,IAAa,EAAE,CAAC;YACvB,OAAO,oEAAoE,CAAC;QAC9E,CAAC;IACH,CAAC;CACF,CAAC;AAEF,MAAM,kBAAkB,GAAiB;IACvC,EAAE,EAAE,gBAAgB;IACpB,KAAK,EAAE,KAAK,EAAE,aAAqB,EAAE,SAAmB,EAAE,EAAE;QAC1D,IAAI,CAAC;YACH,MAAM,iBAAiB,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC3D,MAAM,YAAY,GAChB,sLAAsL,CAAC;YAEzL,gCAAgC;YAChC,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,iBAAiB,EAAE,CAAC;gBAC1D,OAAO,YAAY,CAAC;YACtB,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,IAAa,EAAE,CAAC;YACvB,OAAO,oEAAoE,CAAC;QAC9E,CAAC;IACH,CAAC;CACF,CAAC;AAEF,qBAAqB;AACrB,MAAM,cAAc,GAA4B;IAC9C,kBAAkB;IAClB,kBAAkB;CACnB,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,QAAkB,EAClB,gBAAwB,OAAO,CAAC,GAAG,EAAE;IAErC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,cAAc,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,CACpE,CAAC;IACF,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"userStartupWarnings.js","sourceRoot":"","sources":["../../../src/utils/userStartupWarnings.ts"],"names":[],"mappings":"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"}

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

@@ -9,6 +9,7 @@ import * as os from 'node:os';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { isFolderTrustEnabled, isWorkspaceTrusted, } from '../config/trustedFolders.js';
+import { getCompatibilityWarnings, WarningPriority, } from '@google/gemini-cli-core';
 // Mock os.homedir to control the home directory in tests
 vi.mock('os', async (importOriginal) => {
     const actualOs = await importOriginal();
@@ -22,6 +23,11 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     return {
         ...actual,
         homedir: () => os.homedir(),
+        getCompatibilityWarnings: vi.fn().mockReturnValue([]),
+        WarningPriority: {
+            Low: 'low',
+            High: 'high',
+        },
     };
 });
 vi.mock('../config/trustedFolders.js', () => ({
@@ -41,26 +47,30 @@ describe('getUserStartupWarnings', () => {
             isTrusted: false,
             source: undefined,
         });
+        vi.mocked(getCompatibilityWarnings).mockReturnValue([]);
     });
     afterEach(async () => {
         await fs.rm(testRootDir, { recursive: true, force: true });
-        vi.clearAllMocks();
+        vi.restoreAllMocks();
     });
     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('Warning you are running Gemini CLI in your home directory'));
-            expect(warnings).toContainEqual(expect.stringContaining('warning can be disabled in /settings'));
+            expect(warnings).toContainEqual(expect.objectContaining({
+                id: 'home-directory',
+                message: expect.stringContaining('Warning you are running Gemini CLI in your home directory'),
+                priority: WarningPriority.Low,
+            }));
         });
         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);
-            expect(warnings).not.toContainEqual(expect.stringContaining('home directory'));
+            expect(warnings.find((w) => w.id === 'home-directory')).toBeUndefined();
         });
         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'));
+            expect(warnings.find((w) => w.id === 'home-directory')).toBeUndefined();
         });
         it('should not return a warning when folder trust is enabled and workspace is trusted', async () => {
             vi.mocked(isFolderTrustEnabled).mockReturnValue(true);
@@ -69,29 +79,61 @@ describe('getUserStartupWarnings', () => {
                 source: 'file',
             });
             const warnings = await getUserStartupWarnings({}, homeDir);
-            expect(warnings).not.toContainEqual(expect.stringContaining('home directory'));
+            expect(warnings.find((w) => w.id === 'home-directory')).toBeUndefined();
         });
     });
     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);
-            expect(warnings).toContainEqual(expect.stringContaining('root directory'));
-            expect(warnings).toContainEqual(expect.stringContaining('folder structure will be used'));
+            expect(warnings).toContainEqual(expect.objectContaining({
+                id: 'root-directory',
+                message: expect.stringContaining('root directory'),
+                priority: WarningPriority.High,
+            }));
         });
         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);
-            expect(warnings).not.toContainEqual(expect.stringContaining('root directory'));
+            expect(warnings.find((w) => w.id === 'root-directory')).toBeUndefined();
         });
     });
     describe('error handling', () => {
         it('should handle errors when checking directory', async () => {
             const nonExistentPath = path.join(testRootDir, 'non-existent');
             const warnings = await getUserStartupWarnings({}, nonExistentPath);
-            const expectedWarning = 'Could not verify the current directory due to a file system error.';
-            expect(warnings).toEqual([expectedWarning, expectedWarning]);
+            const expectedMessage = 'Could not verify the current directory due to a file system error.';
+            expect(warnings).toEqual([
+                expect.objectContaining({ message: expectedMessage }),
+                expect.objectContaining({ message: expectedMessage }),
+            ]);
+        });
+    });
+    describe('compatibility warnings', () => {
+        it('should include compatibility warnings by default', async () => {
+            const compWarning = {
+                id: 'comp-1',
+                message: 'Comp warning 1',
+                priority: WarningPriority.High,
+            };
+            vi.mocked(getCompatibilityWarnings).mockReturnValue([compWarning]);
+            const projectDir = path.join(testRootDir, 'project');
+            await fs.mkdir(projectDir);
+            const warnings = await getUserStartupWarnings({}, projectDir);
+            expect(warnings).toContainEqual(compWarning);
+        });
+        it('should not include compatibility warnings when showCompatibilityWarnings is false', async () => {
+            const compWarning = {
+                id: 'comp-1',
+                message: 'Comp warning 1',
+                priority: WarningPriority.High,
+            };
+            vi.mocked(getCompatibilityWarnings).mockReturnValue([compWarning]);
+            const projectDir = path.join(testRootDir, 'project');
+            await fs.mkdir(projectDir);
+            const warnings = await getUserStartupWarnings({ ui: { showCompatibilityWarnings: false } }, projectDir);
+            expect(warnings).not.toContainEqual(compWarning);
         });
     });
 });

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/zed-integration/acpErrors.js

@@ -19,7 +19,9 @@ function extractRecursiveMessage(input) {
     if ((trimmed.startsWith('{') && trimmed.endsWith('}')) ||
         (trimmed.startsWith('[') && trimmed.endsWith(']'))) {
         try {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             const parsed = JSON.parse(trimmed);
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             const next = parsed?.error?.message ||
                 parsed?.[0]?.error?.message ||
                 parsed?.message;

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

@@ -1 +1 @@
-{"version":3,"file":"acpErrors.js","sourceRoot":"","sources":["../../../src/zed-integration/acpErrors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEjF;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC/C,OAAO,uBAAuB,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAa;IAC5C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAE7B,sEAAsE;IACtE,IACE,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAClD,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAClD,CAAC;QACD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,IAAI,GACR,MAAM,EAAE,KAAK,EAAE,OAAO;gBACtB,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO;gBAC3B,MAAM,EAAE,OAAO,CAAC;YAElB,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;gBACvD,OAAO,uBAAuB,CAAC,IAAI,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,gDAAgD;QAClD,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"acpErrors.js","sourceRoot":"","sources":["../../../src/zed-integration/acpErrors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEjF;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC/C,OAAO,uBAAuB,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAa;IAC5C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAE7B,sEAAsE;IACtE,IACE,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAClD,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAClD,CAAC;QACD,IAAI,CAAC;YACH,mEAAmE;YACnE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnC,mEAAmE;YACnE,MAAM,IAAI,GACR,MAAM,EAAE,KAAK,EAAE,OAAO;gBACtB,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO;gBAC3B,MAAM,EAAE,OAAO,CAAC;YAElB,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;gBACvD,OAAO,uBAAuB,CAAC,IAAI,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,gDAAgD;QAClD,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/src/zed-integration/acpResume.test.js

@@ -6,9 +6,10 @@
 import { describe, it, expect, vi, beforeEach, } from 'vitest';
 import { GeminiAgent } from './zedIntegration.js';
 import * as acp from '@agentclientprotocol/sdk';
-import { AuthType, CoreToolCallStatus, } from '@google/gemini-cli-core';
+import { ApprovalMode, AuthType, CoreToolCallStatus, } from '@google/gemini-cli-core';
 import { loadCliConfig } from '../config/config.js';
 import { SessionSelector, convertSessionToHistoryFormats, } from '../utils/sessionUtils.js';
+import { convertSessionToClientHistory } from '@google/gemini-cli-core';
 vi.mock('../config/config.js', () => ({
     loadCliConfig: vi.fn(),
 }));
@@ -20,6 +21,31 @@ vi.mock('../utils/sessionUtils.js', async (importOriginal) => {
         convertSessionToHistoryFormats: vi.fn(),
     };
 });
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        CoreToolCallStatus: {
+            Validating: 'validating',
+            Scheduled: 'scheduled',
+            Error: 'error',
+            Success: 'success',
+            Executing: 'executing',
+            Cancelled: 'cancelled',
+            AwaitingApproval: 'awaiting_approval',
+        },
+        LlmRole: {
+            MAIN: 'main',
+            SUBAGENT: 'subagent',
+            UTILITY_TOOL: 'utility_tool',
+            USER: 'user',
+            MODEL: 'model',
+            SYSTEM: 'system',
+            TOOL: 'tool',
+        },
+        convertSessionToClientHistory: vi.fn(),
+    };
+});
 describe('GeminiAgent Session Resume', () => {
     let mockConfig;
     let mockSettings;
@@ -40,6 +66,8 @@ describe('GeminiAgent Session Resume', () => {
             storage: {
                 getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
             },
+            getApprovalMode: vi.fn().mockReturnValue('default'),
+            isPlanEnabled: vi.fn().mockReturnValue(false),
         };
         mockSettings = {
             merged: {
@@ -110,15 +138,36 @@ describe('GeminiAgent Session Resume', () => {
             { role: 'model', parts: [{ text: 'Hi there' }] },
         ];
         convertSessionToHistoryFormats.mockReturnValue({
-            clientHistory: mockClientHistory,
             uiHistory: [],
         });
+        convertSessionToClientHistory.mockReturnValue(mockClientHistory);
         const response = await agent.loadSession({
             sessionId,
             cwd: '/tmp',
             mcpServers: [],
         });
-        expect(response).toEqual({});
+        expect(response).toEqual({
+            modes: {
+                availableModes: [
+                    {
+                        id: ApprovalMode.DEFAULT,
+                        name: 'Default',
+                        description: 'Prompts for approval',
+                    },
+                    {
+                        id: ApprovalMode.AUTO_EDIT,
+                        name: 'Auto Edit',
+                        description: 'Auto-approves edit tools',
+                    },
+                    {
+                        id: ApprovalMode.YOLO,
+                        name: 'YOLO',
+                        description: 'Auto-approves all tools',
+                    },
+                ],
+                currentModeId: ApprovalMode.DEFAULT,
+            },
+        });
         // Verify resumeChat received the correct arguments
         expect(mockConfig.getGeminiClient().resumeChat).toHaveBeenCalledWith(mockClientHistory, expect.objectContaining({
             conversation: sessionData,
@@ -171,6 +220,7 @@ describe('GeminiAgent Session Resume', () => {
                     toolCallId: 'call-2',
                     status: 'failed',
                     title: 'Write File',
+                    kind: 'read',
                 }),
             }));
         });

package/dist/src/zed-integration/acpResume.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"acpResume.test.js","sourceRoot":"","sources":["../../../src/zed-integration/acpResume.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"acpResume.test.js","sourceRoot":"","sources":["../../../src/zed-integration/acpResume.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EACR,EAAE,EACF,MAAM,EACN,EAAE,EACF,UAAU,GAGX,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EACL,YAAY,EACZ,QAAQ,EAER,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EACL,eAAe,EACf,8BAA8B,GAC/B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAGxE,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE;CACvB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC3D,MAAM,MAAM,GACV,MAAM,cAAc,EAA6C,CAAC;IACpE,OAAO;QACL,GAAG,MAAM;QACT,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;QACxB,8BAA8B,EAAE,EAAE,CAAC,EAAE,EAAE;KACxC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC1D,MAAM,MAAM,GACV,MAAM,cAAc,EAA4C,CAAC;IACnE,OAAO;QACL,GAAG,MAAM;QACT,kBAAkB,EAAE;YAClB,UAAU,EAAE,YAAY;YACxB,SAAS,EAAE,WAAW;YACtB,KAAK,EAAE,OAAO;YACd,OAAO,EAAE,SAAS;YAClB,SAAS,EAAE,WAAW;YACtB,SAAS,EAAE,WAAW;YACtB,gBAAgB,EAAE,mBAAmB;SACtC;QACD,OAAO,EAAE;YACP,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,UAAU;YACpB,YAAY,EAAE,cAAc;YAC5B,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,MAAM;SACb;QACD,6BAA6B,EAAE,EAAE,CAAC,EAAE,EAAE;KACvC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,IAAI,UAA0B,CAAC;IAC/B,IAAI,YAAoC,CAAC;IACzC,IAAI,QAAiB,CAAC;IACtB,IAAI,cAA+C,CAAC;IACpD,IAAI,KAAkB,CAAC;IAEvB,UAAU,CAAC,GAAG,EAAE;QACd,UAAU,GAAG;YACX,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;YACjD,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;YAChD,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;YAC7B,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;YAC7B,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;gBACvC,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;gBAChD,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;gBAChD,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;aACrC,CAAC;YACF,OAAO,EAAE;gBACP,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,cAAc,CAAC;aAC3D;YACD,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;YACnD,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;SACjB,CAAC;QAC/B,YAAY,GAAG;YACb,MAAM,EAAE;gBACN,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,QAAQ,CAAC,iBAAiB,EAAE,EAAE;gBAChE,UAAU,EAAE,EAAE;aACf;YACD,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;SACmB,CAAC;QACvC,QAAQ,GAAG,EAAwB,CAAC;QACpC,cAAc,GAAG;YACf,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;SACN,CAAC;QAE/C,aAAsB,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAEtD,KAAK,GAAG,IAAI,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC;YACtC,eAAe,EAAE,GAAG,CAAC,gBAAgB;SACtC,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,MAAM,SAAS,GAAG,qBAAqB,CAAC;QACxC,MAAM,WAAW,GAAG;YAClB,SAAS;YACT,QAAQ,EAAE;gBACR,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE;gBAC9C;oBACE,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;oBAC/B,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;oBAClE,SAAS,EAAE;wBACT;4BACE,EAAE,EAAE,QAAQ;4BACZ,IAAI,EAAE,WAAW;4BACjB,WAAW,EAAE,WAAW;4BACxB,MAAM,EAAE,kBAAkB,CAAC,OAAO;4BAClC,aAAa,EAAE,aAAa;yBAC7B;qBACF;iBACF;gBACD;oBACE,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;oBACrC,SAAS,EAAE;wBACT;4BACE,EAAE,EAAE,QAAQ;4BACZ,IAAI,EAAE,YAAY;4BAClB,WAAW,EAAE,YAAY;4BACzB,MAAM,EAAE,kBAAkB,CAAC,KAAK;4BAChC,aAAa,EAAE,mBAAmB;yBACnC;qBACF;iBACF;aACF;SACF,CAAC;QAEF,UAAU,CAAC,eAAe,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;YACnD,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SACnD,CAAC,CAAC;QAEF,eAAmC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;YAC7D,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBACxC,WAAW;gBACX,WAAW,EAAE,uBAAuB;aACrC,CAAC;SACH,CAAC,CAAC,CAAC;QAEJ,MAAM,iBAAiB,GAAG;YACxB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE;YAC5C,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE;SACjD,CAAC;QACD,8BAAkD,CAAC,eAAe,CAAC;YAClE,SAAS,EAAE,EAAE;SACd,CAAC,CAAC;QACF,6BAAiD,CAAC,eAAe,CAChE,iBAAiB,CAClB,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC;YACvC,SAAS;YACT,GAAG,EAAE,MAAM;YACX,UAAU,EAAE,EAAE;SACf,CAAC,CAAC;QAEH,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;YACvB,KAAK,EAAE;gBACL,cAAc,EAAE;oBACd;wBACE,EAAE,EAAE,YAAY,CAAC,OAAO;wBACxB,IAAI,EAAE,SAAS;wBACf,WAAW,EAAE,sBAAsB;qBACpC;oBACD;wBACE,EAAE,EAAE,YAAY,CAAC,SAAS;wBAC1B,IAAI,EAAE,WAAW;wBACjB,WAAW,EAAE,0BAA0B;qBACxC;oBACD;wBACE,EAAE,EAAE,YAAY,CAAC,IAAI;wBACrB,IAAI,EAAE,MAAM;wBACZ,WAAW,EAAE,yBAAyB;qBACvC;iBACF;gBACD,aAAa,EAAE,YAAY,CAAC,OAAO;aACpC;SACF,CAAC,CAAC;QAEH,mDAAmD;QACnD,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAClE,iBAAiB,EACjB,MAAM,CAAC,gBAAgB,CAAC;YACtB,YAAY,EAAE,WAAW;YACzB,QAAQ,EAAE,uBAAuB;SAClC,CAAC,CACH,CAAC;QAEF,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;YACpB,eAAe;YACf,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,oBAAoB,CACvD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC;oBAC9B,aAAa,EAAE,oBAAoB;oBACnC,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;iBACpD,CAAC;aACH,CAAC,CACH,CAAC;YAEF,gBAAgB;YAChB,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,oBAAoB,CACvD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC;oBAC9B,aAAa,EAAE,qBAAqB;oBACpC,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC;wBAC/B,IAAI,EAAE,8BAA8B;qBACrC,CAAC;iBACH,CAAC;aACH,CAAC,CACH,CAAC;YAEF,gBAAgB;YAChB,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,oBAAoB,CACvD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC;oBAC9B,aAAa,EAAE,qBAAqB;oBACpC,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;iBACvD,CAAC;aACH,CAAC,CACH,CAAC;YAEF,qCAAqC;YACrC,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,oBAAoB,CACvD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC;oBAC9B,aAAa,EAAE,WAAW;oBAC1B,UAAU,EAAE,QAAQ;oBACpB,MAAM,EAAE,WAAW;oBACnB,KAAK,EAAE,WAAW;oBAClB,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,SAAS;4BACf,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;yBAC/C;qBACF;iBACF,CAAC;aACH,CAAC,CACH,CAAC;YAEF,8BAA8B;YAC9B,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,oBAAoB,CACvD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC;oBAC9B,aAAa,EAAE,WAAW;oBAC1B,UAAU,EAAE,QAAQ;oBACpB,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,YAAY;oBACnB,IAAI,EAAE,MAAM;iBACb,CAAC;aACH,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -21,10 +21,12 @@ export class AcpFileSystemService {
         if (!this.capabilities.readTextFile) {
             return this.fallback.readTextFile(filePath);
         }
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const response = await this.connection.readTextFile({
             path: filePath,
             sessionId: this.sessionId,
         });
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return response.content;
     }
     async writeTextFile(filePath, content) {

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,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"}
+{"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,mEAAmE;QACnE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;YAClD,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QAEH,+DAA+D;QAC/D,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"}

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

@@ -24,6 +24,7 @@ export declare class GeminiAgent {
     newSessionConfig(sessionId: string, cwd: string, mcpServers: acp.McpServer[], loadedSettings?: LoadedSettings): Promise<Config>;
     cancel(params: acp.CancelNotification): Promise<void>;
     prompt(params: acp.PromptRequest): Promise<acp.PromptResponse>;
+    setSessionMode(params: acp.SetSessionModeRequest): Promise<acp.SetSessionModeResponse>;
 }
 export declare class Session {
     #private;
@@ -34,6 +35,7 @@ export declare class Session {
     private pendingPrompt;
     constructor(id: string, chat: GeminiChat, config: Config, connection: acp.AgentSideConnection);
     cancelPendingPrompt(): Promise<void>;
+    setMode(modeId: acp.SessionModeId): acp.SetSessionModeResponse;
     streamHistory(messages: ConversationRecord['messages']): Promise<void>;
     prompt(params: acp.PromptRequest): Promise<acp.PromptResponse>;
     private sendUpdate;