@office-ai/aioncli-core 0.26.0 → 0.30.0

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

@@ -4,84 +4,197 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { describe, it, expect, vi } from 'vitest';
-import { calculateRequestTokenCount } from './tokenCalculation.js';
-describe('calculateRequestTokenCount', () => {
-    const mockContentGenerator = {
-        countTokens: vi.fn(),
-    };
-    const model = 'gemini-pro';
-    it('should use countTokens API for media requests (images/files)', async () => {
-        vi.mocked(mockContentGenerator.countTokens).mockResolvedValue({
-            totalTokens: 100,
+import { calculateRequestTokenCount, estimateTokenCountSync, } from './tokenCalculation.js';
+describe('tokenCalculation', () => {
+    describe('calculateRequestTokenCount', () => {
+        const mockContentGenerator = {
+            countTokens: vi.fn(),
+        };
+        const model = 'gemini-pro';
+        it('should use countTokens API for media requests (images/files)', async () => {
+            vi.mocked(mockContentGenerator.countTokens).mockResolvedValue({
+                totalTokens: 100,
+            });
+            const request = [{ inlineData: { mimeType: 'image/png', data: 'data' } }];
+            const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
+            expect(count).toBe(100);
+            expect(mockContentGenerator.countTokens).toHaveBeenCalled();
+        });
+        it('should estimate tokens locally for tool calls', async () => {
+            vi.mocked(mockContentGenerator.countTokens).mockClear();
+            const request = [{ functionCall: { name: 'foo', args: { bar: 'baz' } } }];
+            const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
+            expect(count).toBeGreaterThan(0);
+            expect(mockContentGenerator.countTokens).not.toHaveBeenCalled();
+        });
+        it('should estimate tokens locally for simple ASCII text', async () => {
+            vi.mocked(mockContentGenerator.countTokens).mockClear();
+            // 12 chars. 12 * 0.25 = 3 tokens.
+            const request = 'Hello world!';
+            const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
+            expect(count).toBe(3);
+            expect(mockContentGenerator.countTokens).not.toHaveBeenCalled();
+        });
+        it('should estimate tokens locally for CJK text with higher weight', async () => {
+            vi.mocked(mockContentGenerator.countTokens).mockClear();
+            // 2 chars. 2 * 1.3 = 2.6 -> floor(2.6) = 2.
+            const request = '你好';
+            const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
+            expect(count).toBeGreaterThanOrEqual(2);
+            expect(mockContentGenerator.countTokens).not.toHaveBeenCalled();
+        });
+        it('should handle mixed content', async () => {
+            vi.mocked(mockContentGenerator.countTokens).mockClear();
+            // 'Hi': 2 * 0.25 = 0.5
+            // '你好': 2 * 1.3 = 2.6
+            // Total: 3.1 -> 3
+            const request = 'Hi你好';
+            const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
+            expect(count).toBe(3);
+            expect(mockContentGenerator.countTokens).not.toHaveBeenCalled();
+        });
+        it('should handle empty text', async () => {
+            const request = '';
+            const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
+            expect(count).toBe(0);
+        });
+        it('should fallback to local estimation when countTokens API fails', async () => {
+            vi.mocked(mockContentGenerator.countTokens).mockRejectedValue(new Error('API error'));
+            const request = [
+                { text: 'Hello' },
+                { inlineData: { mimeType: 'image/png', data: 'data' } },
+            ];
+            const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
+            expect(count).toBe(3001);
+            expect(mockContentGenerator.countTokens).toHaveBeenCalled();
+        });
+        it('should use fixed estimate for images in fallback', async () => {
+            vi.mocked(mockContentGenerator.countTokens).mockRejectedValue(new Error('API error'));
+            const request = [
+                { inlineData: { mimeType: 'image/png', data: 'large_data' } },
+            ];
+            const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
+            expect(count).toBe(3000);
+        });
+        it('should use countTokens API for PDF requests', async () => {
+            vi.mocked(mockContentGenerator.countTokens).mockResolvedValue({
+                totalTokens: 5160,
+            });
+            const request = [
+                { inlineData: { mimeType: 'application/pdf', data: 'pdf_data' } },
+            ];
+            const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
+            expect(count).toBe(5160);
+            expect(mockContentGenerator.countTokens).toHaveBeenCalled();
+        });
+        it('should use fixed estimate for PDFs in fallback', async () => {
+            vi.mocked(mockContentGenerator.countTokens).mockRejectedValue(new Error('API error'));
+            const request = [
+                { inlineData: { mimeType: 'application/pdf', data: 'large_pdf_data' } },
+            ];
+            const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
+            // PDF estimate: 25800 tokens (~100 pages at 258 tokens/page)
+            expect(count).toBe(25800);
         });
-        const request = [{ inlineData: { mimeType: 'image/png', data: 'data' } }];
-        const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
-        expect(count).toBe(100);
-        expect(mockContentGenerator.countTokens).toHaveBeenCalled();
-    });
-    it('should estimate tokens locally for tool calls', async () => {
-        vi.mocked(mockContentGenerator.countTokens).mockClear();
-        const request = [{ functionCall: { name: 'foo', args: { bar: 'baz' } } }];
-        const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
-        // Estimation logic: JSON.stringify(part).length / 4
-        // JSON: {"functionCall":{"name":"foo","args":{"bar":"baz"}}}
-        // Length: ~53 chars. 53 / 4 = 13.25 -> 13.
-        expect(count).toBeGreaterThan(0);
-        expect(mockContentGenerator.countTokens).not.toHaveBeenCalled();
-    });
-    it('should estimate tokens locally for simple ASCII text', async () => {
-        vi.mocked(mockContentGenerator.countTokens).mockClear();
-        // 12 chars. 12 * 0.25 = 3 tokens.
-        const request = 'Hello world!';
-        const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
-        expect(count).toBe(3);
-        expect(mockContentGenerator.countTokens).not.toHaveBeenCalled();
-    });
-    it('should estimate tokens locally for CJK text with higher weight', async () => {
-        vi.mocked(mockContentGenerator.countTokens).mockClear();
-        // 2 chars. 2 * 1.3 = 2.6 -> floor(2.6) = 2.
-        // Old logic would be 2/4 = 0.5 -> 0.
-        const request = '你好';
-        const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
-        expect(count).toBeGreaterThanOrEqual(2);
-        expect(mockContentGenerator.countTokens).not.toHaveBeenCalled();
-    });
-    it('should handle mixed content', async () => {
-        vi.mocked(mockContentGenerator.countTokens).mockClear();
-        // 'Hi': 2 * 0.25 = 0.5
-        // '你好': 2 * 1.3 = 2.6
-        // Total: 3.1 -> 3
-        const request = 'Hi你好';
-        const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
-        expect(count).toBe(3);
-        expect(mockContentGenerator.countTokens).not.toHaveBeenCalled();
-    });
-    it('should handle empty text', async () => {
-        const request = '';
-        const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
-        expect(count).toBe(0);
-    });
-    it('should fallback to local estimation when countTokens API fails', async () => {
-        vi.mocked(mockContentGenerator.countTokens).mockRejectedValue(new Error('API error'));
-        const request = [
-            { text: 'Hello' },
-            { inlineData: { mimeType: 'image/png', data: 'data' } },
-        ];
-        const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
-        // Should fallback to estimation:
-        // 'Hello': 5 chars * 0.25 = 1.25
-        // inlineData: 3000
-        // Total: 3001.25 -> 3001
-        expect(count).toBe(3001);
-        expect(mockContentGenerator.countTokens).toHaveBeenCalled();
     });
-    it('should use fixed estimate for images in fallback', async () => {
-        vi.mocked(mockContentGenerator.countTokens).mockRejectedValue(new Error('API error'));
-        const request = [
-            { inlineData: { mimeType: 'image/png', data: 'large_data' } },
-        ];
-        const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
-        expect(count).toBe(3000);
+    describe('estimateTokenCountSync', () => {
+        it('should use fast heuristic for massive strings', () => {
+            const massiveText = 'a'.repeat(200_000);
+            // 200,000 / 4 = 50,000 tokens
+            const parts = [{ text: massiveText }];
+            expect(estimateTokenCountSync(parts)).toBe(50000);
+        });
+        it('should estimate functionResponse without full stringification', () => {
+            const toolResult = 'result'.repeat(1000); // 6000 chars
+            const parts = [
+                {
+                    functionResponse: {
+                        name: 'my_tool',
+                        id: '123',
+                        response: { output: toolResult },
+                    },
+                },
+            ];
+            const tokens = estimateTokenCountSync(parts);
+            // payload ~6013 chars / 4 = 1503.25
+            // name 7 / 4 = 1.75
+            // total ~1505
+            expect(tokens).toBeGreaterThan(1500);
+            expect(tokens).toBeLessThan(1600);
+        });
+        it('should handle Gemini 3 multimodal nested parts in functionResponse', () => {
+            const parts = [
+                {
+                    functionResponse: {
+                        name: 'multimodal_tool',
+                        id: '456',
+                        response: { status: 'success' },
+                        // Gemini 3 nested parts
+                        parts: [
+                            { inlineData: { mimeType: 'image/png', data: 'base64...' } },
+                            { text: 'Look at this image' },
+                        ],
+                    },
+                },
+            ];
+            const tokens = estimateTokenCountSync(parts);
+            // image 3000 + text 4.5 + response 5 = ~3009.5
+            expect(tokens).toBeGreaterThan(3000);
+            expect(tokens).toBeLessThan(3100);
+        });
+        it('should respect the maximum recursion depth limit', () => {
+            // Create a structure nested to depth 5 (exceeding limit of 3)
+            const parts = [
+                {
+                    functionResponse: {
+                        name: 'd0',
+                        response: { val: 'a' }, // ~12 chars -> 3 tokens
+                        parts: [
+                            {
+                                functionResponse: {
+                                    name: 'd1',
+                                    response: { val: 'a' }, // ~12 chars -> 3 tokens
+                                    parts: [
+                                        {
+                                            functionResponse: {
+                                                name: 'd2',
+                                                response: { val: 'a' }, // ~12 chars -> 3 tokens
+                                                parts: [
+                                                    {
+                                                        functionResponse: {
+                                                            name: 'd3',
+                                                            response: { val: 'a' }, // ~12 chars -> 3 tokens
+                                                            parts: [
+                                                                {
+                                                                    functionResponse: {
+                                                                        name: 'd4',
+                                                                        response: { val: 'a' },
+                                                                    },
+                                                                },
+                                                            ],
+                                                        },
+                                                    },
+                                                ],
+                                            },
+                                        },
+                                    ],
+                                },
+                            },
+                        ],
+                    },
+                },
+            ];
+            const tokens = estimateTokenCountSync(parts);
+            // It should count d0, d1, d2, d3 (depth 0, 1, 2, 3) but NOT d4 (depth 4)
+            // d0..d3: 4 * ~4 tokens = ~16
+            expect(tokens).toBeGreaterThan(10);
+            expect(tokens).toBeLessThan(30);
+        });
+        it('should handle empty or nullish inputs gracefully', () => {
+            expect(estimateTokenCountSync([])).toBe(0);
+            expect(estimateTokenCountSync([{ text: '' }])).toBe(0);
+            expect(estimateTokenCountSync([{}])).toBe(0);
+        });
     });
 });
 //# sourceMappingURL=tokenCalculation.test.js.map

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

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

package/dist/src/utils/tool-utils.d.ts

@@ -4,6 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { AnyDeclarativeTool, AnyToolInvocation } from '../index.js';
+import { ApprovalMode } from '../policy/types.js';
+import { CoreToolCallStatus } from '../scheduler/types.js';
+/**
+ * Options for determining if a tool call should be hidden in the CLI history.
+ */
+export interface ShouldHideToolCallParams {
+    /** The display name of the tool. */
+    displayName: string;
+    /** The current status of the tool call. */
+    status: CoreToolCallStatus;
+    /** The approval mode active when the tool was called. */
+    approvalMode?: ApprovalMode;
+    /** Whether the tool has produced a result for display. */
+    hasResultDisplay: boolean;
+}
+/**
+ * Determines if a tool call should be hidden from the standard tool history UI.
+ *
+ * We hide tools in several cases:
+ * 1. Ask User tools that are in progress, displayed via specialized UI.
+ * 2. Ask User tools that errored without result display, typically param
+ *    validation errors that the agent automatically recovers from.
+ * 3. WriteFile and Edit tools when in Plan Mode, redundant because the
+ *    resulting plans are displayed separately upon exiting plan mode.
+ */
+export declare function shouldHideToolCall(params: ShouldHideToolCallParams): boolean;
 /**
  * Generates a suggestion string for a tool name that was not found in the registry.
  * It finds the closest matches based on Levenshtein distance.

package/dist/src/utils/tool-utils.js

@@ -6,6 +6,41 @@
 import { isTool } from '../index.js';
 import { SHELL_TOOL_NAMES } from './shell-utils.js';
 import levenshtein from 'fast-levenshtein';
+import { ApprovalMode } from '../policy/types.js';
+import { CoreToolCallStatus } from '../scheduler/types.js';
+import { ASK_USER_DISPLAY_NAME, WRITE_FILE_DISPLAY_NAME, EDIT_DISPLAY_NAME, } from '../tools/tool-names.js';
+/**
+ * Determines if a tool call should be hidden from the standard tool history UI.
+ *
+ * We hide tools in several cases:
+ * 1. Ask User tools that are in progress, displayed via specialized UI.
+ * 2. Ask User tools that errored without result display, typically param
+ *    validation errors that the agent automatically recovers from.
+ * 3. WriteFile and Edit tools when in Plan Mode, redundant because the
+ *    resulting plans are displayed separately upon exiting plan mode.
+ */
+export function shouldHideToolCall(params) {
+    const { displayName, status, approvalMode, hasResultDisplay } = params;
+    switch (displayName) {
+        case ASK_USER_DISPLAY_NAME:
+            switch (status) {
+                case CoreToolCallStatus.Scheduled:
+                case CoreToolCallStatus.Validating:
+                case CoreToolCallStatus.Executing:
+                case CoreToolCallStatus.AwaitingApproval:
+                    return true;
+                case CoreToolCallStatus.Error:
+                    return !hasResultDisplay;
+                default:
+                    return false;
+            }
+        case WRITE_FILE_DISPLAY_NAME:
+        case EDIT_DISPLAY_NAME:
+            return approvalMode === ApprovalMode.PLAN;
+        default:
+            return false;
+    }
+}
 /**
  * Generates a suggestion string for a tool name that was not found in the registry.
  * It finds the closest matches based on Levenshtein distance.
@@ -83,6 +118,7 @@ export function doesToolInvocationMatch(toolOrToolName, invocation, patterns) {
                 // This invocation has no command - nothing to check.
                 continue;
             }
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
             command = String(invocation.params.command);
         }
         if (toolNames.some((name) => SHELL_TOOL_NAMES.includes(name))) {

package/dist/src/utils/tool-utils.js.map

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

package/dist/src/utils/tool-utils.test.js

@@ -4,9 +4,75 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { expect, describe, it } from 'vitest';
-import { doesToolInvocationMatch, getToolSuggestion } from './tool-utils.js';
-import { ReadFileTool } from '../tools/read-file.js';
+import { doesToolInvocationMatch, getToolSuggestion, shouldHideToolCall, } from './tool-utils.js';
+import { ReadFileTool, ApprovalMode, CoreToolCallStatus, ASK_USER_DISPLAY_NAME, WRITE_FILE_DISPLAY_NAME, EDIT_DISPLAY_NAME, READ_FILE_DISPLAY_NAME, } from '../index.js';
 import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
+describe('shouldHideToolCall', () => {
+    it.each([
+        {
+            status: CoreToolCallStatus.Scheduled,
+            hasResult: true,
+            shouldHide: true,
+        },
+        {
+            status: CoreToolCallStatus.Executing,
+            hasResult: true,
+            shouldHide: true,
+        },
+        {
+            status: CoreToolCallStatus.AwaitingApproval,
+            hasResult: true,
+            shouldHide: true,
+        },
+        {
+            status: CoreToolCallStatus.Validating,
+            hasResult: true,
+            shouldHide: true,
+        },
+        {
+            status: CoreToolCallStatus.Success,
+            hasResult: true,
+            shouldHide: false,
+        },
+        {
+            status: CoreToolCallStatus.Error,
+            hasResult: false,
+            shouldHide: true,
+        },
+        {
+            status: CoreToolCallStatus.Error,
+            hasResult: true,
+            shouldHide: false,
+        },
+    ])('AskUser: status=$status, hasResult=$hasResult -> hide=$shouldHide', ({ status, hasResult, shouldHide }) => {
+        expect(shouldHideToolCall({
+            displayName: ASK_USER_DISPLAY_NAME,
+            status,
+            hasResultDisplay: hasResult,
+        })).toBe(shouldHide);
+    });
+    it.each([
+        {
+            name: WRITE_FILE_DISPLAY_NAME,
+            mode: ApprovalMode.PLAN,
+            visible: false,
+        },
+        { name: EDIT_DISPLAY_NAME, mode: ApprovalMode.PLAN, visible: false },
+        {
+            name: WRITE_FILE_DISPLAY_NAME,
+            mode: ApprovalMode.DEFAULT,
+            visible: true,
+        },
+        { name: READ_FILE_DISPLAY_NAME, mode: ApprovalMode.PLAN, visible: true },
+    ])('Plan Mode: tool=$name, mode=$mode -> visible=$visible', ({ name, mode, visible }) => {
+        expect(shouldHideToolCall({
+            displayName: name,
+            status: CoreToolCallStatus.Success,
+            approvalMode: mode,
+            hasResultDisplay: true,
+        })).toBe(!visible);
+    });
+});
 describe('getToolSuggestion', () => {
     it('should suggest the top N closest tool names for a typo', () => {
         const allToolNames = ['list_files', 'read_file', 'write_file'];
@@ -55,7 +121,11 @@ describe('doesToolInvocationMatch', () => {
         expect(result).toBe(true);
     });
     describe('for non-shell tools', () => {
-        const readFileTool = new ReadFileTool({}, createMockMessageBus());
+        const mockConfig = {
+            getTargetDir: () => '/tmp',
+            getFileFilteringOptions: () => ({}),
+        };
+        const readFileTool = new ReadFileTool(mockConfig, createMockMessageBus());
         const invocation = {
             params: { file: 'test.txt' },
         };

package/dist/src/utils/tool-utils.test.js.map

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

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

@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { AsyncLocalStorage } from 'node:async_hooks';
+/**
+ * Contextual information for a tool call execution.
+ */
+export interface ToolCallContext {
+    /** The unique ID of the tool call. */
+    callId: string;
+    /** The ID of the scheduler managing the execution. */
+    schedulerId: string;
+    /** The ID of the parent tool call, if this is a nested execution (e.g., in a subagent). */
+    parentCallId?: string;
+}
+/**
+ * AsyncLocalStorage instance for tool call context.
+ */
+export declare const toolCallContext: AsyncLocalStorage<ToolCallContext>;
+/**
+ * Runs a function within a tool call context.
+ *
+ * @param context The context to set.
+ * @param fn The function to run.
+ * @returns The result of the function.
+ */
+export declare function runWithToolCallContext<T>(context: ToolCallContext, fn: () => T): T;
+/**
+ * Retrieves the current tool call context.
+ *
+ * @returns The current ToolCallContext, or undefined if not in a context.
+ */
+export declare function getToolCallContext(): ToolCallContext | undefined;

package/dist/src/utils/toolCallContext.js

@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { AsyncLocalStorage } from 'node:async_hooks';
+/**
+ * AsyncLocalStorage instance for tool call context.
+ */
+export const toolCallContext = new AsyncLocalStorage();
+/**
+ * Runs a function within a tool call context.
+ *
+ * @param context The context to set.
+ * @param fn The function to run.
+ * @returns The result of the function.
+ */
+export function runWithToolCallContext(context, fn) {
+    return toolCallContext.run(context, fn);
+}
+/**
+ * Retrieves the current tool call context.
+ *
+ * @returns The current ToolCallContext, or undefined if not in a context.
+ */
+export function getToolCallContext() {
+    return toolCallContext.getStore();
+}
+//# sourceMappingURL=toolCallContext.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"toolCallContext.js","sourceRoot":"","sources":["../../../src/utils/toolCallContext.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAcrD;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,iBAAiB,EAAmB,CAAC;AAExE;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CACpC,OAAwB,EACxB,EAAW;IAEX,OAAO,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAC1C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB;IAChC,OAAO,eAAe,CAAC,QAAQ,EAAE,CAAC;AACpC,CAAC"}

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

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