@google/gemini-cli-core 0.1.7 → 0.1.8-rc.0

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

@@ -0,0 +1,170 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import { processImports, validateImportPath } from './memoryImportProcessor.js';
+// Mock fs/promises
+vi.mock('fs/promises');
+const mockedFs = vi.mocked(fs);
+// Mock console methods to capture warnings
+const originalConsoleWarn = console.warn;
+const originalConsoleError = console.error;
+const originalConsoleDebug = console.debug;
+describe('memoryImportProcessor', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        // Mock console methods
+        console.warn = vi.fn();
+        console.error = vi.fn();
+        console.debug = vi.fn();
+    });
+    afterEach(() => {
+        // Restore console methods
+        console.warn = originalConsoleWarn;
+        console.error = originalConsoleError;
+        console.debug = originalConsoleDebug;
+    });
+    describe('processImports', () => {
+        it('should process basic md file imports', async () => {
+            const content = 'Some content @./test.md more content';
+            const basePath = '/test/path';
+            const importedContent = '# Imported Content\nThis is imported.';
+            mockedFs.access.mockResolvedValue(undefined);
+            mockedFs.readFile.mockResolvedValue(importedContent);
+            const result = await processImports(content, basePath, true);
+            expect(result).toContain('<!-- Imported from: ./test.md -->');
+            expect(result).toContain(importedContent);
+            expect(result).toContain('<!-- End of import from: ./test.md -->');
+            expect(mockedFs.readFile).toHaveBeenCalledWith(path.resolve(basePath, './test.md'), 'utf-8');
+        });
+        it('should warn and fail for non-md file imports', async () => {
+            const content = 'Some content @./instructions.txt more content';
+            const basePath = '/test/path';
+            const result = await processImports(content, basePath, true);
+            expect(console.warn).toHaveBeenCalledWith('[WARN] [ImportProcessor]', 'Import processor only supports .md files. Attempting to import non-md file: ./instructions.txt. This will fail.');
+            expect(result).toContain('<!-- Import failed: ./instructions.txt - Only .md files are supported -->');
+            expect(mockedFs.readFile).not.toHaveBeenCalled();
+        });
+        it('should handle circular imports', async () => {
+            const content = 'Content @./circular.md more content';
+            const basePath = '/test/path';
+            const circularContent = 'Circular @./main.md content';
+            mockedFs.access.mockResolvedValue(undefined);
+            mockedFs.readFile.mockResolvedValue(circularContent);
+            // Set up the import state to simulate we're already processing main.md
+            const importState = {
+                processedFiles: new Set(),
+                maxDepth: 10,
+                currentDepth: 0,
+                currentFile: '/test/path/main.md', // Simulate we're processing main.md
+            };
+            const result = await processImports(content, basePath, true, importState);
+            // The circular import should be detected when processing the nested import
+            expect(result).toContain('<!-- Circular import detected: ./main.md -->');
+        });
+        it('should handle file not found errors', async () => {
+            const content = 'Content @./nonexistent.md more content';
+            const basePath = '/test/path';
+            mockedFs.access.mockRejectedValue(new Error('File not found'));
+            const result = await processImports(content, basePath, true);
+            expect(result).toContain('<!-- Import failed: ./nonexistent.md - File not found -->');
+            expect(console.error).toHaveBeenCalledWith('[ERROR] [ImportProcessor]', 'Failed to import ./nonexistent.md: File not found');
+        });
+        it('should respect max depth limit', async () => {
+            const content = 'Content @./deep.md more content';
+            const basePath = '/test/path';
+            const deepContent = 'Deep @./deeper.md content';
+            mockedFs.access.mockResolvedValue(undefined);
+            mockedFs.readFile.mockResolvedValue(deepContent);
+            const importState = {
+                processedFiles: new Set(),
+                maxDepth: 1,
+                currentDepth: 1,
+            };
+            const result = await processImports(content, basePath, true, importState);
+            expect(console.warn).toHaveBeenCalledWith('[WARN] [ImportProcessor]', 'Maximum import depth (1) reached. Stopping import processing.');
+            expect(result).toBe(content);
+        });
+        it('should handle nested imports recursively', async () => {
+            const content = 'Main @./nested.md content';
+            const basePath = '/test/path';
+            const nestedContent = 'Nested @./inner.md content';
+            const innerContent = 'Inner content';
+            mockedFs.access.mockResolvedValue(undefined);
+            mockedFs.readFile
+                .mockResolvedValueOnce(nestedContent)
+                .mockResolvedValueOnce(innerContent);
+            const result = await processImports(content, basePath, true);
+            expect(result).toContain('<!-- Imported from: ./nested.md -->');
+            expect(result).toContain('<!-- Imported from: ./inner.md -->');
+            expect(result).toContain(innerContent);
+        });
+        it('should handle absolute paths in imports', async () => {
+            const content = 'Content @/absolute/path/file.md more content';
+            const basePath = '/test/path';
+            const importedContent = 'Absolute path content';
+            mockedFs.access.mockResolvedValue(undefined);
+            mockedFs.readFile.mockResolvedValue(importedContent);
+            const result = await processImports(content, basePath, true);
+            expect(result).toContain('<!-- Import failed: /absolute/path/file.md - Path traversal attempt -->');
+        });
+        it('should handle multiple imports in same content', async () => {
+            const content = 'Start @./first.md middle @./second.md end';
+            const basePath = '/test/path';
+            const firstContent = 'First content';
+            const secondContent = 'Second content';
+            mockedFs.access.mockResolvedValue(undefined);
+            mockedFs.readFile
+                .mockResolvedValueOnce(firstContent)
+                .mockResolvedValueOnce(secondContent);
+            const result = await processImports(content, basePath, true);
+            expect(result).toContain('<!-- Imported from: ./first.md -->');
+            expect(result).toContain('<!-- Imported from: ./second.md -->');
+            expect(result).toContain(firstContent);
+            expect(result).toContain(secondContent);
+        });
+    });
+    describe('validateImportPath', () => {
+        it('should reject URLs', () => {
+            expect(validateImportPath('https://example.com/file.md', '/base', [
+                '/allowed',
+            ])).toBe(false);
+            expect(validateImportPath('http://example.com/file.md', '/base', ['/allowed'])).toBe(false);
+            expect(validateImportPath('file:///path/to/file.md', '/base', ['/allowed'])).toBe(false);
+        });
+        it('should allow paths within allowed directories', () => {
+            expect(validateImportPath('./file.md', '/base', ['/base'])).toBe(true);
+            expect(validateImportPath('../file.md', '/base', ['/allowed'])).toBe(false);
+            expect(validateImportPath('/allowed/sub/file.md', '/base', ['/allowed'])).toBe(true);
+        });
+        it('should reject paths outside allowed directories', () => {
+            expect(validateImportPath('/forbidden/file.md', '/base', ['/allowed'])).toBe(false);
+            expect(validateImportPath('../../../file.md', '/base', ['/base'])).toBe(false);
+        });
+        it('should handle multiple allowed directories', () => {
+            expect(validateImportPath('./file.md', '/base', ['/allowed1', '/allowed2'])).toBe(false);
+            expect(validateImportPath('/allowed1/file.md', '/base', [
+                '/allowed1',
+                '/allowed2',
+            ])).toBe(true);
+            expect(validateImportPath('/allowed2/file.md', '/base', [
+                '/allowed1',
+                '/allowed2',
+            ])).toBe(true);
+        });
+        it('should handle relative paths correctly', () => {
+            expect(validateImportPath('file.md', '/base', ['/base'])).toBe(true);
+            expect(validateImportPath('./file.md', '/base', ['/base'])).toBe(true);
+            expect(validateImportPath('../file.md', '/base', ['/parent'])).toBe(false);
+        });
+        it('should handle absolute paths correctly', () => {
+            expect(validateImportPath('/allowed/file.md', '/base', ['/allowed'])).toBe(true);
+            expect(validateImportPath('/forbidden/file.md', '/base', ['/allowed'])).toBe(false);
+        });
+    });
+});
+//# sourceMappingURL=memoryImportProcessor.test.js.map

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

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

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

@@ -4,8 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
- * Retrieves the persistent user ID from a file, creating it if it doesn't exist.
- * This ID is used for unique user tracking.
+ * Retrieves the installation ID from a file, creating it if it doesn't exist.
+ * This ID is used for unique user installation tracking.
  * @returns A UUID string for the user.
  */
-export declare function getPersistentUserId(): string;
+export declare function getInstallationId(): string;
+/**
+ * Retrieves the obfuscated Google Account ID for the currently authenticated user.
+ * When OAuth is available, returns the user's cached Google Account ID. Otherwise, returns the installation ID.
+ * @returns A string ID for the user (Google Account ID if available, otherwise installation ID).
+ */
+export declare function getObfuscatedGoogleAccountId(): string;

package/dist/src/utils/user_id.js

@@ -10,40 +10,62 @@ import { randomUUID } from 'crypto';
 import { GEMINI_DIR } from './paths.js';
 const homeDir = os.homedir() ?? '';
 const geminiDir = path.join(homeDir, GEMINI_DIR);
-const userIdFile = path.join(geminiDir, 'user_id');
+const installationIdFile = path.join(geminiDir, 'installation_id');
 function ensureGeminiDirExists() {
     if (!fs.existsSync(geminiDir)) {
         fs.mkdirSync(geminiDir, { recursive: true });
     }
 }
-function readUserIdFromFile() {
-    if (fs.existsSync(userIdFile)) {
-        const userId = fs.readFileSync(userIdFile, 'utf-8').trim();
-        return userId || null;
+function readInstallationIdFromFile() {
+    if (fs.existsSync(installationIdFile)) {
+        const installationid = fs.readFileSync(installationIdFile, 'utf-8').trim();
+        return installationid || null;
     }
     return null;
 }
-function writeUserIdToFile(userId) {
-    fs.writeFileSync(userIdFile, userId, 'utf-8');
+function writeInstallationIdToFile(installationId) {
+    fs.writeFileSync(installationIdFile, installationId, 'utf-8');
 }
 /**
- * Retrieves the persistent user ID from a file, creating it if it doesn't exist.
- * This ID is used for unique user tracking.
+ * Retrieves the installation ID from a file, creating it if it doesn't exist.
+ * This ID is used for unique user installation tracking.
  * @returns A UUID string for the user.
  */
-export function getPersistentUserId() {
+export function getInstallationId() {
     try {
         ensureGeminiDirExists();
-        let userId = readUserIdFromFile();
-        if (!userId) {
-            userId = randomUUID();
-            writeUserIdToFile(userId);
+        let installationId = readInstallationIdFromFile();
+        if (!installationId) {
+            installationId = randomUUID();
+            writeInstallationIdToFile(installationId);
         }
-        return userId;
+        return installationId;
     }
     catch (error) {
-        console.error('Error accessing persistent user ID file, generating ephemeral ID:', error);
+        console.error('Error accessing installation ID file, generating ephemeral ID:', error);
         return '123456789';
     }
 }
+/**
+ * Retrieves the obfuscated Google Account ID for the currently authenticated user.
+ * When OAuth is available, returns the user's cached Google Account ID. Otherwise, returns the installation ID.
+ * @returns A string ID for the user (Google Account ID if available, otherwise installation ID).
+ */
+export function getObfuscatedGoogleAccountId() {
+    // Try to get cached Google Account ID first
+    try {
+        // Dynamically import to avoid circular dependencies
+        // eslint-disable-next-line @typescript-eslint/no-require-imports, no-restricted-syntax
+        const { getCachedGoogleAccountId } = require('../code_assist/oauth2.js');
+        const googleAccountId = getCachedGoogleAccountId();
+        if (googleAccountId) {
+            return googleAccountId;
+        }
+    }
+    catch (_error) {
+        // If there's any error accessing Google Account ID, fall back to installation ID
+    }
+    // Fall back to installation ID when no Google Account ID is cached or on error
+    return getInstallationId();
+}
 //# sourceMappingURL=user_id.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"user_id.js","sourceRoot":"","sources":["../../../src/utils/user_id.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;AACnC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AACjD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAEnD,SAAS,qBAAqB;IAC5B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB;IACzB,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3D,OAAO,MAAM,IAAI,IAAI,CAAC;IACxB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAc;IACvC,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB;IACjC,IAAI,CAAC;QACH,qBAAqB,EAAE,CAAC;QACxB,IAAI,MAAM,GAAG,kBAAkB,EAAE,CAAC;QAElC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,UAAU,EAAE,CAAC;YACtB,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CACX,mEAAmE,EACnE,KAAK,CACN,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC;AACH,CAAC"}
+{"version":3,"file":"user_id.js","sourceRoot":"","sources":["../../../src/utils/user_id.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;AACnC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AACjD,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;AAEnE,SAAS,qBAAqB;IAC5B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED,SAAS,0BAA0B;IACjC,IAAI,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACtC,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3E,OAAO,cAAc,IAAI,IAAI,CAAC;IAChC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,yBAAyB,CAAC,cAAsB;IACvD,EAAE,CAAC,aAAa,CAAC,kBAAkB,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB;IAC/B,IAAI,CAAC;QACH,qBAAqB,EAAE,CAAC;QACxB,IAAI,cAAc,GAAG,0BAA0B,EAAE,CAAC;QAElD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,cAAc,GAAG,UAAU,EAAE,CAAC;YAC9B,yBAAyB,CAAC,cAAc,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CACX,gEAAgE,EAChE,KAAK,CACN,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,4BAA4B;IAC1C,4CAA4C;IAC5C,IAAI,CAAC;QACH,oDAAoD;QACpD,uFAAuF;QACvF,MAAM,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;QACzE,MAAM,eAAe,GAAG,wBAAwB,EAAE,CAAC;QACnD,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,eAAe,CAAC;QACzB,CAAC;IACH,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,iFAAiF;IACnF,CAAC;IAED,+EAA+E;IAC/E,OAAO,iBAAiB,EAAE,CAAC;AAC7B,CAAC"}

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

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

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

@@ -0,0 +1,40 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { getInstallationId, getObfuscatedGoogleAccountId } from './user_id.js';
+describe('user_id', () => {
+    describe('getInstallationId', () => {
+        it('should return a valid UUID format string', () => {
+            const installationId = getInstallationId();
+            expect(installationId).toBeDefined();
+            expect(typeof installationId).toBe('string');
+            expect(installationId.length).toBeGreaterThan(0);
+            // Should return the same ID on subsequent calls (consistent)
+            const secondCall = getInstallationId();
+            expect(secondCall).toBe(installationId);
+        });
+    });
+    describe('getObfuscatedGoogleAccountId', () => {
+        it('should return a non-empty string', () => {
+            const result = getObfuscatedGoogleAccountId();
+            expect(result).toBeDefined();
+            expect(typeof result).toBe('string');
+            expect(result.length).toBeGreaterThan(0);
+            // Should be consistent on subsequent calls
+            const secondCall = getObfuscatedGoogleAccountId();
+            expect(secondCall).toBe(result);
+        });
+        it('should return the same as installation ID when no Google Account ID is cached', () => {
+            // In a clean test environment, there should be no cached Google Account ID
+            // so getObfuscatedGoogleAccountId should fall back to installation ID
+            const googleAccountIdResult = getObfuscatedGoogleAccountId();
+            const installationIdResult = getInstallationId();
+            // They should be the same when no Google Account ID is cached
+            expect(googleAccountIdResult).toBe(installationIdResult);
+        });
+    });
+});
+//# sourceMappingURL=user_id.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"user_id.test.js","sourceRoot":"","sources":["../../../src/utils/user_id.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC;AAE/E,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAC;YAE3C,MAAM,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,CAAC;YACrC,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7C,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAEjD,6DAA6D;YAC7D,MAAM,UAAU,GAAG,iBAAiB,EAAE,CAAC;YACvC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;QAC5C,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,MAAM,MAAM,GAAG,4BAA4B,EAAE,CAAC;YAE9C,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;YAC7B,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAEzC,2CAA2C;YAC3C,MAAM,UAAU,GAAG,4BAA4B,EAAE,CAAC;YAClD,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+EAA+E,EAAE,GAAG,EAAE;YACvF,2EAA2E;YAC3E,sEAAsE;YACtE,MAAM,qBAAqB,GAAG,4BAA4B,EAAE,CAAC;YAC7D,MAAM,oBAAoB,GAAG,iBAAiB,EAAE,CAAC;YAEjD,8DAA8D;YAC9D,MAAM,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}