@machina.ai/cell-cli-core 1.0.13-rc8 → 1.0.17-rc1

package/dist/src/config/config.test.js

@@ -11,12 +11,23 @@ import { DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT, } from '../telemetry/i
 import { AuthType, createContentGeneratorConfig, } from '../core/contentGenerator.js';
 import { GeminiClient } from '../core/client.js';
 import { GitService } from '../services/gitService.js';
-import { loadServerHierarchicalMemory } from '../utils/memoryDiscovery.js';
+import { IdeClient } from '../ide/ide-client.js';
+vi.mock('fs', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        existsSync: vi.fn().mockReturnValue(true),
+        statSync: vi.fn().mockReturnValue({
+            isDirectory: vi.fn().mockReturnValue(true),
+        }),
+        realpathSync: vi.fn((path) => path),
+    };
+});
 // Mock dependencies that might be called during Config construction or createServerConfig
 vi.mock('../tools/tool-registry', () => {
     const ToolRegistryMock = vi.fn();
     ToolRegistryMock.prototype.registerTool = vi.fn();
-    ToolRegistryMock.prototype.discoverTools = vi.fn();
+    ToolRegistryMock.prototype.discoverAllTools = vi.fn();
     ToolRegistryMock.prototype.getAllTools = vi.fn(() => []); // Mock methods if needed
     ToolRegistryMock.prototype.getTool = vi.fn();
     ToolRegistryMock.prototype.getFunctionDeclarations = vi.fn(() => []);
@@ -92,6 +103,7 @@ describe('Server Config (config.ts)', () => {
         telemetry: TELEMETRY_SETTINGS,
         sessionId: SESSION_ID,
         model: MODEL,
+        ideClient: IdeClient.getInstance(false),
     };
     beforeEach(() => {
         // Reset mocks if necessary
@@ -126,7 +138,10 @@ describe('Server Config (config.ts)', () => {
                 model: newModel,
                 apiKey: 'test-key',
             };
-            createContentGeneratorConfig.mockReturnValue(mockContentConfig);
+            createContentGeneratorConfig.mockResolvedValue(mockContentConfig);
+            // Set fallback mode to true to ensure it gets reset
+            config.setFallbackMode(true);
+            expect(config.isInFallbackMode()).toBe(true);
             await config.refreshAuth(authType);
             expect(createContentGeneratorConfig).toHaveBeenCalledWith(config, authType, {
                 clientId: undefined,
@@ -138,6 +153,68 @@ describe('Server Config (config.ts)', () => {
             expect(config.getContentGeneratorConfig().model).toBe(newModel);
             expect(config.getModel()).toBe(newModel); // getModel() should return the updated model
             expect(GeminiClient).toHaveBeenCalledWith(config);
+            // Verify that fallback mode is reset
+            expect(config.isInFallbackMode()).toBe(false);
+        });
+        it('should preserve conversation history when refreshing auth', async () => {
+            const config = new Config(baseParams);
+            const authType = AuthType.USE_GEMINI;
+            const mockContentConfig = {
+                model: 'gemini-pro',
+                apiKey: 'test-key',
+            };
+            createContentGeneratorConfig.mockResolvedValue(mockContentConfig);
+            // Mock the existing client with some history
+            const mockExistingHistory = [
+                { role: 'user', parts: [{ text: 'Hello' }] },
+                { role: 'model', parts: [{ text: 'Hi there!' }] },
+                { role: 'user', parts: [{ text: 'How are you?' }] },
+            ];
+            const mockExistingClient = {
+                isInitialized: vi.fn().mockReturnValue(true),
+                getHistory: vi.fn().mockReturnValue(mockExistingHistory),
+            };
+            const mockNewClient = {
+                isInitialized: vi.fn().mockReturnValue(true),
+                getHistory: vi.fn().mockReturnValue([]),
+                setHistory: vi.fn(),
+                initialize: vi.fn().mockResolvedValue(undefined),
+            };
+            // Set the existing client
+            config.geminiClient = mockExistingClient;
+            GeminiClient.mockImplementation(() => mockNewClient);
+            await config.refreshAuth(authType);
+            // Verify that existing history was retrieved
+            expect(mockExistingClient.getHistory).toHaveBeenCalled();
+            // Verify that new client was created and initialized
+            expect(GeminiClient).toHaveBeenCalledWith(config);
+            expect(mockNewClient.initialize).toHaveBeenCalledWith(mockContentConfig);
+            // Verify that history was restored to the new client
+            expect(mockNewClient.setHistory).toHaveBeenCalledWith(mockExistingHistory);
+        });
+        it('should handle case when no existing client is initialized', async () => {
+            const config = new Config(baseParams);
+            const authType = AuthType.USE_GEMINI;
+            const mockContentConfig = {
+                model: 'gemini-pro',
+                apiKey: 'test-key',
+            };
+            createContentGeneratorConfig.mockResolvedValue(mockContentConfig);
+            const mockNewClient = {
+                isInitialized: vi.fn().mockReturnValue(true),
+                getHistory: vi.fn().mockReturnValue([]),
+                setHistory: vi.fn(),
+                initialize: vi.fn().mockResolvedValue(undefined),
+            };
+            // No existing client
+            config.geminiClient = null;
+            GeminiClient.mockImplementation(() => mockNewClient);
+            await config.refreshAuth(authType);
+            // Verify that new client was created and initialized
+            expect(GeminiClient).toHaveBeenCalledWith(config);
+            expect(mockNewClient.initialize).toHaveBeenCalledWith(mockContentConfig);
+            // Verify that setHistory was not called since there was no existing history
+            expect(mockNewClient.setHistory).not.toHaveBeenCalled();
         });
     });
     it('Config constructor should store userMemory correctly', () => {
@@ -179,6 +256,21 @@ describe('Server Config (config.ts)', () => {
         const config = new Config(paramsWithFileFiltering);
         expect(config.getFileFilteringRespectGitIgnore()).toBe(false);
     });
+    it('should initialize WorkspaceContext with includeDirectories', () => {
+        const includeDirectories = ['/path/to/dir1', '/path/to/dir2'];
+        const paramsWithIncludeDirs = {
+            ...baseParams,
+            includeDirectories,
+        };
+        const config = new Config(paramsWithIncludeDirs);
+        const workspaceContext = config.getWorkspaceContext();
+        const directories = workspaceContext.getDirectories();
+        // Should include the target directory plus the included directories
+        expect(directories).toHaveLength(3);
+        expect(directories).toContain(path.resolve(baseParams.targetDir));
+        expect(directories).toContain('/path/to/dir1');
+        expect(directories).toContain('/path/to/dir2');
+    });
     it('Config constructor should set telemetry to true when provided as true', () => {
         const paramsWithTelemetry = {
             ...baseParams,
@@ -279,26 +371,5 @@ describe('Server Config (config.ts)', () => {
             expect(config.getTelemetryOtlpEndpoint()).toBe(DEFAULT_OTLP_ENDPOINT);
         });
     });
-    describe('refreshMemory', () => {
-        it('should update memory and file count on successful refresh', async () => {
-            const config = new Config(baseParams);
-            const mockMemoryData = {
-                memoryContent: 'new memory content',
-                fileCount: 5,
-            };
-            loadServerHierarchicalMemory.mockResolvedValue(mockMemoryData);
-            const result = await config.refreshMemory();
-            expect(loadServerHierarchicalMemory).toHaveBeenCalledWith(config.getWorkingDir(), config.getDebugMode(), config.getFileService(), config.getExtensionContextFilePaths(), config.getFileFilteringOptions());
-            expect(config.getUserMemory()).toBe(mockMemoryData.memoryContent);
-            expect(config.getGeminiMdFileCount()).toBe(mockMemoryData.fileCount);
-            expect(result).toEqual(mockMemoryData);
-        });
-        it('should propagate errors from loadServerHierarchicalMemory', async () => {
-            const config = new Config(baseParams);
-            const testError = new Error('Failed to load memory');
-            loadServerHierarchicalMemory.mockRejectedValue(testError);
-            await expect(config.refreshMemory()).rejects.toThrow(testError);
-        });
-    });
 });
 //# sourceMappingURL=config.test.js.map

package/dist/src/config/config.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../../src/config/config.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAQ,MAAM,QAAQ,CAAC;AACpE,OAAO,EAAE,MAAM,EAAmC,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,mBAAmB,IAAI,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACxF,OAAO,EACL,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,QAAQ,EACR,4BAA4B,GAC7B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAE3E,0FAA0F;AAC1F,EAAE,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACrC,MAAM,gBAAgB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IACjC,gBAAgB,CAAC,SAAS,CAAC,YAAY,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,gBAAgB,CAAC,SAAS,CAAC,aAAa,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IACnD,gBAAgB,CAAC,SAAS,CAAC,WAAW,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAyB;IACnF,gBAAgB,CAAC,SAAS,CAAC,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7C,gBAAgB,CAAC,SAAS,CAAC,uBAAuB,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IACrE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5C,4BAA4B,EAAE,EAAE,CAAC,EAAE,EAAE;CACtC,CAAC,CAAC,CAAC;AAEJ,+EAA+E;AAC/E,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AACvB,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAC9B,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AACzB,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AACzB,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AACzB,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;AAC1B,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;AAC/B,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAC9B,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;AACpC,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;IACnB,mBAAmB,EAAE,EAAE,CAAC,EAAE,EAAE;IAC5B,0BAA0B,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,6BAA6B;IACnF,wBAAwB,EAAE,WAAW;IACrC,iBAAiB,EAAE,SAAS;CAC7B,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,6BAA6B,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC9D,MAAM,MAAM,GACV,MAAM,cAAc,EAAgD,CAAC;IACvE,OAAO;QACL,GAAG,MAAM;QACT,4BAA4B,EAAE,EAAE,CAAC,EAAE,EAAE;KACtC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;IAClC,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;QAC9C,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;KACjD,CAAC,CAAC;CACJ,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,uBAAuB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACxD,MAAM,MAAM,GAAG,MAAM,cAAc,EAA0C,CAAC;IAC9E,OAAO;QACL,GAAG,MAAM;QACT,mBAAmB,EAAE,EAAE,CAAC,EAAE,EAAE;KAC7B,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACxC,MAAM,cAAc,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IAC/B,cAAc,CAAC,SAAS,CAAC,UAAU,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9C,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;AACxC,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,MAAM,KAAK,GAAG,YAAY,CAAC;IAC3B,MAAM,OAAO,GAAkB;QAC7B,OAAO,EAAE,QAAQ;QACjB,KAAK,EAAE,oBAAoB;KAC5B,CAAC;IACF,MAAM,UAAU,GAAG,iBAAiB,CAAC;IACrC,MAAM,UAAU,GAAG,KAAK,CAAC;IACzB,MAAM,QAAQ,GAAG,eAAe,CAAC;IACjC,MAAM,YAAY,GAAG,KAAK,CAAC;IAC3B,MAAM,WAAW,GAAG,kBAAkB,CAAC;IACvC,MAAM,kBAAkB,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC9C,MAAM,eAAe,GAAG,kBAAkB,CAAC;IAC3C,MAAM,UAAU,GAAG,iBAAiB,CAAC;IACrC,MAAM,UAAU,GAAqB;QACnC,GAAG,EAAE,MAAM;QACX,cAAc,EAAE,eAAe;QAC/B,OAAO,EAAE,OAAO;QAChB,SAAS,EAAE,UAAU;QACrB,SAAS,EAAE,UAAU;QACrB,QAAQ,EAAE,QAAQ;QAClB,WAAW,EAAE,YAAY;QACzB,UAAU,EAAE,WAAW;QACvB,SAAS,EAAE,kBAAkB;QAC7B,SAAS,EAAE,UAAU;QACrB,KAAK,EAAE,KAAK;KACb,CAAC;IAEF,UAAU,CAAC,GAAG,EAAE;QACd,2BAA2B;QAC3B,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;YACtF,MAAM,QAAQ,GAAG,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAClD,UAAU,CAAC,SAAS,CAAC,UAAmB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAEtE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;gBACxB,GAAG,UAAU;gBACb,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;YAEH,MAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6EAA6E,EAAE,KAAK,IAAI,EAAE;YAC3F,MAAM,QAAQ,GAAG,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAClD,UAAU,CAAC,SAAS,CAAC,UAAmB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAEtE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;gBACxB,GAAG,UAAU;gBACb,aAAa,EAAE,KAAK;aACrB,CAAC,CAAC;YAEH,MAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;YACtC,MAAM,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC;YACrC,MAAM,QAAQ,GAAG,cAAc,CAAC;YAChC,MAAM,iBAAiB,GAAG;gBACxB,KAAK,EAAE,QAAQ;gBACf,MAAM,EAAE,UAAU;aACnB,CAAC;YAED,4BAAqC,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;YAE1E,MAAM,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEnC,MAAM,CAAC,4BAA4B,CAAC,CAAC,oBAAoB,CACvD,MAAM,EACN,QAAQ,EACR;gBACE,QAAQ,EAAE,SAAS;gBACnB,cAAc,EAAE,SAAS;gBACzB,aAAa,EAAE,SAAS;aACzB,EACD,SAAS,CACV,CAAC;YACF,mEAAmE;YACnE,MAAM,CAAC,MAAM,CAAC,yBAAyB,EAAE,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACtE,MAAM,CAAC,MAAM,CAAC,yBAAyB,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,6CAA6C;YACvF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;QAEtC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACjD,iCAAiC;QACjC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,sBAAsB;IACtF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE,GAAG,EAAE;QACtF,MAAM,mBAAmB,GAAqB,EAAE,GAAG,UAAU,EAAE,CAAC;QAChE,OAAO,mBAAmB,CAAC,UAAU,CAAC;QACtC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAE/C,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qFAAqF,EAAE,GAAG,EAAE;QAC7F,MAAM,eAAe,GAAG,kBAAkB,CAAC;QAC3C,MAAM,qBAAqB,GAAqB;YAC9C,GAAG,UAAU;YACb,eAAe;SAChB,CAAC;QACF,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAClC,MAAM,CAAC,uBAAuB,CAAC,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2FAA2F,EAAE,GAAG,EAAE;QACnG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,2CAA2C;QACnE,MAAM,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,gCAAgC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,uBAAuB,GAAqB;YAChD,GAAG,UAAU;YACb,aAAa,EAAE;gBACb,gBAAgB,EAAE,KAAK;aACxB;SACF,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,uBAAuB,CAAC,CAAC;QACnD,MAAM,CAAC,MAAM,CAAC,gCAAgC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,mBAAmB,GAAqB;YAC5C,GAAG,UAAU;YACb,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;SAC7B,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAC/C,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;QACjF,MAAM,mBAAmB,GAAqB;YAC5C,GAAG,UAAU;YACb,SAAS,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;SAC9B,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAC/C,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE,GAAG,EAAE;QACtF,MAAM,sBAAsB,GAAqB,EAAE,GAAG,UAAU,EAAE,CAAC;QACnE,OAAO,sBAAsB,CAAC,SAAS,CAAC;QACxC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,sBAAsB,CAAC,CAAC;QAClD,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;QACtC,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,MAAM,GAAqB;YAC/B,GAAG,UAAU;YACb,WAAW,EAAE,wBAAwB;SACtC,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,aAAa,EAAE,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;YAChE,MAAM,MAAM,GAAqB;gBAC/B,GAAG,UAAU;gBACb,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC7B,CAAC;YACF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;YAC9C,MAAM,QAAQ,GAAG,mCAAmC,CAAC;YACrD,MAAM,MAAM,GAAqB;gBAC/B,GAAG,UAAU;gBACb,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE;aACrD,CAAC;YACF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,wBAAwB,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;YAC7D,MAAM,MAAM,GAAqB;gBAC/B,GAAG,UAAU;gBACb,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC7B,CAAC;YACF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,wBAAwB,EAAE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;YACnD,MAAM,MAAM,GAAqB;gBAC/B,GAAG,UAAU;gBACb,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;aAChD,CAAC;YACF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,6BAA6B,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;YACzE,MAAM,MAAM,GAAqB;gBAC/B,GAAG,UAAU;gBACb,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC7B,CAAC;YACF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,6BAA6B,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qFAAqF,EAAE,GAAG,EAAE;YAC7F,MAAM,sBAAsB,GAAqB,EAAE,GAAG,UAAU,EAAE,CAAC;YACnE,OAAO,sBAAsB,CAAC,SAAS,CAAC;YACxC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,sBAAsB,CAAC,CAAC;YAClD,MAAM,CAAC,MAAM,CAAC,6BAA6B,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;YACpF,MAAM,sBAAsB,GAAqB,EAAE,GAAG,UAAU,EAAE,CAAC;YACnE,OAAO,sBAAsB,CAAC,SAAS,CAAC;YACxC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,sBAAsB,CAAC,CAAC;YAClD,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;YACjF,MAAM,sBAAsB,GAAqB,EAAE,GAAG,UAAU,EAAE,CAAC;YACnE,OAAO,sBAAsB,CAAC,SAAS,CAAC;YACxC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,sBAAsB,CAAC,CAAC;YAClD,MAAM,CAAC,MAAM,CAAC,wBAAwB,EAAE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;YACzE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;YACtC,MAAM,cAAc,GAAG;gBACrB,aAAa,EAAE,oBAAoB;gBACnC,SAAS,EAAE,CAAC;aACb,CAAC;YAED,4BAAqC,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;YAEzE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,EAAE,CAAC;YAE5C,MAAM,CAAC,4BAA4B,CAAC,CAAC,oBAAoB,CACvD,MAAM,CAAC,aAAa,EAAE,EACtB,MAAM,CAAC,YAAY,EAAE,EACrB,MAAM,CAAC,cAAc,EAAE,EACvB,MAAM,CAAC,4BAA4B,EAAE,EACrC,MAAM,CAAC,uBAAuB,EAAE,CACjC,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;YAClE,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YACrE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;YACzE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;YACtC,MAAM,SAAS,GAAG,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAEpD,4BAAqC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAEpE,MAAM,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../../src/config/config.test.ts"],"names":[],"mappings":"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"}

package/dist/src/config/flashFallback.test.js

@@ -3,18 +3,26 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, beforeEach } from 'vitest';
+import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { Config } from './config.js';
 import { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL } from './models.js';
+import { IdeClient } from '../ide/ide-client.js';
+import fs from 'node:fs';
+vi.mock('node:fs');
 describe('Flash Model Fallback Configuration', () => {
     let config;
     beforeEach(() => {
+        vi.mocked(fs.existsSync).mockReturnValue(true);
+        vi.mocked(fs.statSync).mockReturnValue({
+            isDirectory: () => true,
+        });
         config = new Config({
             sessionId: 'test-session',
             targetDir: '/test',
             debugMode: false,
             cwd: '/test',
             model: DEFAULT_GEMINI_MODEL,
+            ideClient: IdeClient.getInstance(false),
         });
         // Initialize contentGeneratorConfig for testing
         config.contentGeneratorConfig = {
@@ -22,21 +30,11 @@ describe('Flash Model Fallback Configuration', () => {
             authType: 'oauth-personal',
         };
     });
+    // These tests do not actually test fallback. isInFallbackMode() only returns true,
+    // when setFallbackMode is marked as true. This is to decouple setting a model
+    // with the fallback mechanism. This will be necessary we introduce more
+    // intelligent model routing.
     describe('setModel', () => {
-        it('should update the model and mark as switched during session', () => {
-            expect(config.getModel()).toBe(DEFAULT_GEMINI_MODEL);
-            expect(config.isModelSwitchedDuringSession()).toBe(false);
-            config.setModel(DEFAULT_GEMINI_FLASH_MODEL);
-            expect(config.getModel()).toBe(DEFAULT_GEMINI_FLASH_MODEL);
-            expect(config.isModelSwitchedDuringSession()).toBe(true);
-        });
-        it('should handle multiple model switches during session', () => {
-            config.setModel(DEFAULT_GEMINI_FLASH_MODEL);
-            expect(config.isModelSwitchedDuringSession()).toBe(true);
-            config.setModel('gemini-1.5-pro');
-            expect(config.getModel()).toBe('gemini-1.5-pro');
-            expect(config.isModelSwitchedDuringSession()).toBe(true);
-        });
         it('should only mark as switched if contentGeneratorConfig exists', () => {
             // Create config without initializing contentGeneratorConfig
             const newConfig = new Config({
@@ -45,10 +43,11 @@ describe('Flash Model Fallback Configuration', () => {
                 debugMode: false,
                 cwd: '/test',
                 model: DEFAULT_GEMINI_MODEL,
+                ideClient: IdeClient.getInstance(false),
             });
             // Should not crash when contentGeneratorConfig is undefined
             newConfig.setModel(DEFAULT_GEMINI_FLASH_MODEL);
-            expect(newConfig.isModelSwitchedDuringSession()).toBe(false);
+            expect(newConfig.isInFallbackMode()).toBe(false);
         });
     });
     describe('getModel', () => {
@@ -65,50 +64,27 @@ describe('Flash Model Fallback Configuration', () => {
                 debugMode: false,
                 cwd: '/test',
                 model: 'custom-model',
+                ideClient: IdeClient.getInstance(false),
             });
             expect(newConfig.getModel()).toBe('custom-model');
         });
     });
-    describe('isModelSwitchedDuringSession', () => {
+    describe('isInFallbackMode', () => {
         it('should start as false for new session', () => {
-            expect(config.isModelSwitchedDuringSession()).toBe(false);
+            expect(config.isInFallbackMode()).toBe(false);
         });
         it('should remain false if no model switch occurs', () => {
             // Perform other operations that don't involve model switching
-            expect(config.isModelSwitchedDuringSession()).toBe(false);
+            expect(config.isInFallbackMode()).toBe(false);
         });
         it('should persist switched state throughout session', () => {
             config.setModel(DEFAULT_GEMINI_FLASH_MODEL);
-            expect(config.isModelSwitchedDuringSession()).toBe(true);
+            // Setting state for fallback mode as is expected of clients
+            config.setFallbackMode(true);
+            expect(config.isInFallbackMode()).toBe(true);
             // Should remain true even after getting model
             config.getModel();
-            expect(config.isModelSwitchedDuringSession()).toBe(true);
-        });
-    });
-    describe('resetModelToDefault', () => {
-        it('should reset model to default and clear session switch flag', () => {
-            // Switch to Flash first
-            config.setModel(DEFAULT_GEMINI_FLASH_MODEL);
-            expect(config.getModel()).toBe(DEFAULT_GEMINI_FLASH_MODEL);
-            expect(config.isModelSwitchedDuringSession()).toBe(true);
-            // Reset to default
-            config.resetModelToDefault();
-            // Should be back to default with flag cleared
-            expect(config.getModel()).toBe(DEFAULT_GEMINI_MODEL);
-            expect(config.isModelSwitchedDuringSession()).toBe(false);
-        });
-        it('should handle case where contentGeneratorConfig is not initialized', () => {
-            // Create config without initializing contentGeneratorConfig
-            const newConfig = new Config({
-                sessionId: 'test-session-2',
-                targetDir: '/test',
-                debugMode: false,
-                cwd: '/test',
-                model: DEFAULT_GEMINI_MODEL,
-            });
-            // Should not crash when contentGeneratorConfig is undefined
-            expect(() => newConfig.resetModelToDefault()).not.toThrow();
-            expect(newConfig.isModelSwitchedDuringSession()).toBe(false);
+            expect(config.isInFallbackMode()).toBe(true);
         });
     });
 });

package/dist/src/config/flashFallback.test.js.map

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

package/dist/src/config/models.d.ts

@@ -5,4 +5,5 @@
  */
 export declare const DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
 export declare const DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
+export declare const DEFAULT_GEMINI_FLASH_LITE_MODEL = "gemini-2.5-flash-lite";
 export declare const DEFAULT_GEMINI_EMBEDDING_MODEL = "gemini-embedding-001";

package/dist/src/config/models.js

@@ -5,5 +5,6 @@
  */
 export const DEFAULT_GEMINI_MODEL = 'gemini-2.5-pro';
 export const DEFAULT_GEMINI_FLASH_MODEL = 'gemini-2.5-flash';
+export const DEFAULT_GEMINI_FLASH_LITE_MODEL = 'gemini-2.5-flash-lite';
 export const DEFAULT_GEMINI_EMBEDDING_MODEL = 'gemini-embedding-001';
 //# sourceMappingURL=models.js.map

package/dist/src/config/models.js.map

@@ -1 +1 @@
-{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/config/models.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AACrD,MAAM,CAAC,MAAM,0BAA0B,GAAG,kBAAkB,CAAC;AAC7D,MAAM,CAAC,MAAM,8BAA8B,GAAG,sBAAsB,CAAC"}
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/config/models.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AACrD,MAAM,CAAC,MAAM,0BAA0B,GAAG,kBAAkB,CAAC;AAC7D,MAAM,CAAC,MAAM,+BAA+B,GAAG,uBAAuB,CAAC;AAEvE,MAAM,CAAC,MAAM,8BAA8B,GAAG,sBAAsB,CAAC"}

package/dist/src/core/client.d.ts

@@ -34,7 +34,7 @@ export declare class GeminiClient {
      */
     private readonly COMPRESSION_PRESERVE_THRESHOLD;
     private readonly loopDetector;
-    private lastPromptId?;
+    private lastPromptId;
     constructor(config: Config);
     initialize(contentGeneratorConfig: ContentGeneratorConfig): Promise<void>;
     getContentGenerator(): ContentGenerator;
@@ -44,7 +44,10 @@ export declare class GeminiClient {
     isInitialized(): boolean;
     getHistory(): Content[];
     setHistory(history: Content[]): void;
+    setTools(): Promise<void>;
     resetChat(): Promise<void>;
+    addDirectoryContext(): Promise<void>;
+    private getDirectoryContext;
     private getEnvironment;
     startChat(extraHistory?: Content[]): Promise<GeminiChat>;
     sendMessageStream(request: PartListUnion, signal: AbortSignal, prompt_id: string, turns?: number, originalModel?: string): AsyncGenerator<ServerGeminiStreamEvent, Turn>;

package/dist/src/core/client.js

@@ -19,7 +19,10 @@ import { AuthType, createContentGenerator, } from './contentGenerator.js';
 import { ProxyAgent, setGlobalDispatcher } from 'undici';
 import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
 import { LoopDetectionService } from '../services/loopDetectionService.js';
-import { ideContext } from '../services/ideContext.js';
+import { ideContext } from '../ide/ideContext.js';
+import { logNextSpeakerCheck } from '../telemetry/loggers.js';
+import { MalformedJsonResponseEvent, NextSpeakerCheckEvent, } from '../telemetry/types.js';
+import { ClearcutLogger } from '../telemetry/clearcut-logger/clearcut-logger.js';
 function isThinkingSupported(model) {
     if (model.startsWith('gemini-2.5'))
         return true;
@@ -76,6 +79,7 @@ export class GeminiClient {
         }
         this.embeddingModel = config.getEmbeddingModel();
         this.loopDetector = new LoopDetectionService(config);
+        this.lastPromptId = this.config.getSessionId();
     }
     async initialize(contentGeneratorConfig) {
         this.contentGenerator = await createContentGenerator(contentGeneratorConfig, this.config, this.config.getSessionId());
@@ -108,11 +112,36 @@ export class GeminiClient {
     setHistory(history) {
         this.getChat().setHistory(history);
     }
+    async setTools() {
+        const toolRegistry = await this.config.getToolRegistry();
+        const toolDeclarations = toolRegistry.getFunctionDeclarations();
+        const tools = [{ functionDeclarations: toolDeclarations }];
+        this.getChat().setTools(tools);
+    }
     async resetChat() {
         this.chat = await this.startChat();
     }
+    async addDirectoryContext() {
+        if (!this.chat) {
+            return;
+        }
+        this.getChat().addHistory({
+            role: 'user',
+            parts: [{ text: await this.getDirectoryContext() }],
+        });
+    }
+    async getDirectoryContext() {
+        const workspaceContext = this.config.getWorkspaceContext();
+        const workspaceDirectories = workspaceContext.getDirectories();
+        const folderStructures = await Promise.all(workspaceDirectories.map((dir) => getFolderStructure(dir, {
+            fileService: this.config.getFileService(),
+        })));
+        const folderStructure = folderStructures.join('\n');
+        const dirList = workspaceDirectories.map((dir) => `  - ${dir}`).join('\n');
+        const workingDirPreamble = `I'm currently working in the following directories:\n${dirList}\n Folder structures are as follows:\n${folderStructure}`;
+        return workingDirPreamble;
+    }
     async getEnvironment() {
-        const cwd = this.config.getWorkingDir();
         const today = new Date().toLocaleDateString(undefined, {
             weekday: 'long',
             year: 'numeric',
@@ -120,14 +149,28 @@ export class GeminiClient {
             day: 'numeric',
         });
         const platform = process.platform;
-        const folderStructure = await getFolderStructure(cwd, {
+        const workspaceContext = this.config.getWorkspaceContext();
+        const workspaceDirectories = workspaceContext.getDirectories();
+        const folderStructures = await Promise.all(workspaceDirectories.map((dir) => getFolderStructure(dir, {
             fileService: this.config.getFileService(),
-        });
+        })));
+        const folderStructure = folderStructures.join('\n');
+        let workingDirPreamble;
+        if (workspaceDirectories.length === 1) {
+            workingDirPreamble = `I'm currently working in the directory: ${workspaceDirectories[0]}`;
+        }
+        else {
+            const dirList = workspaceDirectories
+                .map((dir) => `  - ${dir}`)
+                .join('\n');
+            workingDirPreamble = `I'm currently working in the following directories:\n${dirList}`;
+        }
         const context = `
   This is the Gemini CLI. We are setting up the context for our chat.
   Today's date is ${today}.
   My operating system is: ${platform}
-  I'm currently working in the directory: ${cwd}
+  ${workingDirPreamble}
+  Here is the folder structure of the current working directories:\n
   ${folderStructure}
           `.trim();
         const initialParts = [{ text: context }];
@@ -205,7 +248,7 @@ export class GeminiClient {
     }
     async *sendMessageStream(request, signal, prompt_id, turns = this.MAX_TURNS, originalModel) {
         if (this.lastPromptId !== prompt_id) {
-            this.loopDetector.reset();
+            this.loopDetector.reset(prompt_id);
             this.lastPromptId = prompt_id;
         }
         this.sessionTurnCount++;
@@ -225,24 +268,31 @@ export class GeminiClient {
         if (compressed) {
             yield { type: GeminiEventType.ChatCompressed, value: compressed };
         }
-        if (this.config.getIdeMode()) {
-            const openFiles = ideContext.getOpenFilesContext();
-            if (openFiles) {
+        if (this.config.getIdeModeFeature() && this.config.getIdeMode()) {
+            const ideContextState = ideContext.getIdeContext();
+            const openFiles = ideContextState?.workspaceState?.openFiles;
+            if (openFiles && openFiles.length > 0) {
                 const contextParts = [];
-                if (openFiles.activeFile) {
-                    contextParts.push(`This is the file that the user was most recently looking at:\n- Path: ${openFiles.activeFile}`);
-                    if (openFiles.cursor) {
-                        contextParts.push(`This is the cursor position in the file:\n- Cursor Position: Line ${openFiles.cursor.line}, Character ${openFiles.cursor.character}`);
+                const firstFile = openFiles[0];
+                const activeFile = firstFile.isActive ? firstFile : undefined;
+                if (activeFile) {
+                    contextParts.push(`This is the file that the user is looking at:\n- Path: ${activeFile.path}`);
+                    if (activeFile.cursor) {
+                        contextParts.push(`This is the cursor position in the file:\n- Cursor Position: Line ${activeFile.cursor.line}, Character ${activeFile.cursor.character}`);
                     }
-                    if (openFiles.selectedText) {
-                        contextParts.push(`This is the selected text in the active file:\n- ${openFiles.selectedText}`);
+                    if (activeFile.selectedText) {
+                        contextParts.push(`This is the selected text in the file:\n- ${activeFile.selectedText}`);
                     }
                 }
-                if (openFiles.recentOpenFiles && openFiles.recentOpenFiles.length > 0) {
-                    const recentFiles = openFiles.recentOpenFiles
-                        .map((file) => `- ${file.filePath}`)
+                const otherOpenFiles = activeFile ? openFiles.slice(1) : openFiles;
+                if (otherOpenFiles.length > 0) {
+                    const recentFiles = otherOpenFiles
+                        .map((file) => `- ${file.path}`)
                         .join('\n');
-                    contextParts.push(`Here are files the user has recently opened, with the most recent at the top:\n${recentFiles}`);
+                    const heading = activeFile
+                        ? `Here are some other files the user has open, with the most recent at the top:`
+                        : `Here are some files the user has open, with the most recent at the top:`;
+                    contextParts.push(`${heading}\n${recentFiles}`);
                 }
                 if (contextParts.length > 0) {
                     request = [
@@ -275,6 +325,7 @@ export class GeminiClient {
                 return turn;
             }
             const nextSpeakerCheck = await checkNextSpeaker(this.getChat(), this, signal);
+            logNextSpeakerCheck(this.config, new NextSpeakerCheckEvent(prompt_id, turn.finishReason?.toString() || '', nextSpeakerCheck?.next_speaker || ''));
             if (nextSpeakerCheck?.next_speaker === 'model') {
                 const nextRequest = [{ text: 'Please continue.' }];
                 // This recursive call's events will be yielded out, but the final
@@ -304,17 +355,25 @@ export class GeminiClient {
                     responseMimeType: 'application/json',
                 },
                 contents,
-            });
+            }, this.lastPromptId);
             const result = await retryWithBackoff(apiCall, {
                 onPersistent429: async (authType, error) => await this.handleFlashFallback(authType, error),
                 authType: this.config.getContentGeneratorConfig()?.authType,
             });
-            const text = getResponseText(result);
+            let text = getResponseText(result);
             if (!text) {
                 const error = new Error('API returned an empty response for generateJson.');
                 await reportError(error, 'Error in generateJson: API returned an empty response.', contents, 'generateJson-empty-response');
                 throw error;
             }
+            const prefix = '```json';
+            const suffix = '```';
+            if (text.startsWith(prefix) && text.endsWith(suffix)) {
+                ClearcutLogger.getInstance(this.config)?.logMalformedJsonResponseEvent(new MalformedJsonResponseEvent(modelToUse));
+                text = text
+                    .substring(prefix.length, text.length - suffix.length)
+                    .trim();
+            }
             try {
                 const sanitized = stripJsonCodeBlock(text);
                 return JSON.parse(sanitized);
@@ -358,7 +417,7 @@ export class GeminiClient {
                 model: modelToUse,
                 config: requestConfig,
                 contents,
-            });
+            }, this.lastPromptId);
             const result = await retryWithBackoff(apiCall, {
                 onPersistent429: async (authType, error) => await this.handleFlashFallback(authType, error),
                 authType: this.config.getContentGeneratorConfig()?.authType,
@@ -485,6 +544,7 @@ export class GeminiClient {
                 const accepted = await fallbackHandler(currentModel, fallbackModel, error);
                 if (accepted !== false && accepted !== null) {
                     this.config.setModel(fallbackModel);
+                    this.config.setFallbackMode(true);
                     return fallbackModel;
                 }
                 // Check if the model was switched manually in the handler