@office-ai/aioncli-core 0.26.0 → 0.30.0

package/dist/src/telemetry/semantic.truncation.test.js

@@ -0,0 +1,92 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { toInputMessages } from './semantic.js';
+import {} from '@google/genai';
+// 160KB limit for the total size of string content in a log entry.
+const GLOBAL_TEXT_LIMIT = 160 * 1024;
+const SUFFIX = '...[TRUNCATED]';
+describe('Semantic Telemetry Truncation', () => {
+    it('should not truncate a single part if it is within global limit', () => {
+        // 150KB part -> Should fit in 160KB limit
+        const textLen = 150 * 1024;
+        const longText = 'a'.repeat(textLen);
+        const contents = [
+            {
+                role: 'user',
+                parts: [{ text: longText }],
+            },
+        ];
+        const result = toInputMessages(contents);
+        // @ts-expect-error - testing internal state
+        expect(result[0].parts[0].content.length).toBe(textLen);
+        // @ts-expect-error - testing internal state
+        expect(result[0].parts[0].content.endsWith(SUFFIX)).toBe(false);
+    });
+    it('should truncate a single part if it exceeds global limit', () => {
+        // 170KB part -> Should get truncated to ~160KB
+        const textLen = 170 * 1024;
+        const longText = 'a'.repeat(textLen);
+        const contents = [
+            {
+                role: 'user',
+                parts: [{ text: longText }],
+            },
+        ];
+        const result = toInputMessages(contents);
+        // @ts-expect-error - testing internal state
+        const content = result[0].parts[0].content;
+        expect(content.length).toBeLessThan(textLen);
+        // Because it's the only part, it gets the full budget of 160KB
+        expect(content.length).toBe(GLOBAL_TEXT_LIMIT + SUFFIX.length);
+        expect(content.endsWith(SUFFIX)).toBe(true);
+    });
+    it('should fairly distribute budget among multiple large parts', () => {
+        // Two 100KB parts (Total 200KB) -> Budget 160KB
+        // Each should get roughly 80KB
+        const partLen = 100 * 1024;
+        const part1 = 'a'.repeat(partLen);
+        const part2 = 'b'.repeat(partLen);
+        const contents = [
+            { role: 'user', parts: [{ text: part1 }] },
+            { role: 'model', parts: [{ text: part2 }] },
+        ];
+        const result = toInputMessages(contents);
+        // @ts-expect-error - testing internal state
+        const c1 = result[0].parts[0].content;
+        // @ts-expect-error - testing internal state
+        const c2 = result[1].parts[0].content;
+        expect(c1.length).toBeLessThan(partLen);
+        expect(c2.length).toBeLessThan(partLen);
+        // Budget is split evenly
+        const expectedLen = Math.floor(GLOBAL_TEXT_LIMIT / 2) + SUFFIX.length;
+        expect(c1.length).toBe(expectedLen);
+        expect(c2.length).toBe(expectedLen);
+    });
+    it('should not truncate small parts while truncating large ones', () => {
+        // One 200KB part, one 1KB part.
+        // 1KB part is small (below average), so it keeps its size.
+        // 200KB part gets the remaining budget (128KB - 1KB = 127KB).
+        const bigLen = 200 * 1024;
+        const smallLen = 1 * 1024;
+        const bigText = 'a'.repeat(bigLen);
+        const smallText = 'b'.repeat(smallLen);
+        const contents = [
+            { role: 'user', parts: [{ text: bigText }] },
+            { role: 'model', parts: [{ text: smallText }] },
+        ];
+        const result = toInputMessages(contents);
+        // @ts-expect-error - testing internal state
+        const cBig = result[0].parts[0].content;
+        // @ts-expect-error - testing internal state
+        const cSmall = result[1].parts[0].content;
+        expect(cSmall.length).toBe(smallLen); // Untouched
+        expect(cBig.length).toBeLessThan(bigLen);
+        const expectedBigLen = GLOBAL_TEXT_LIMIT - smallLen + SUFFIX.length;
+        expect(cBig.length).toBe(expectedBigLen);
+    });
+});
+//# sourceMappingURL=semantic.truncation.test.js.map

package/dist/src/telemetry/semantic.truncation.test.js.map

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

package/dist/src/telemetry/telemetryAttributes.js

@@ -9,11 +9,16 @@ const userAccountManager = new UserAccountManager();
 const installationManager = new InstallationManager();
 export function getCommonAttributes(config) {
     const email = userAccountManager.getCachedGoogleAccount();
+    const experiments = config.getExperiments();
     return {
         'session.id': config.getSessionId(),
         'installation.id': installationManager.getInstallationId(),
         interactive: config.isInteractive(),
         ...(email && { 'user.email': email }),
+        ...(experiments &&
+            experiments.experimentIds.length > 0 && {
+            'experiments.ids': experiments.experimentIds,
+        }),
     };
 }
 //# sourceMappingURL=telemetryAttributes.js.map

package/dist/src/telemetry/telemetryAttributes.js.map

@@ -1 +1 @@
-{"version":3,"file":"telemetryAttributes.js","sourceRoot":"","sources":["../../../src/telemetry/telemetryAttributes.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;AACpD,MAAM,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC;AAEtD,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,MAAM,KAAK,GAAG,kBAAkB,CAAC,sBAAsB,EAAE,CAAC;IAC1D,OAAO;QACL,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE;QACnC,iBAAiB,EAAE,mBAAmB,CAAC,iBAAiB,EAAE;QAC1D,WAAW,EAAE,MAAM,CAAC,aAAa,EAAE;QACnC,GAAG,CAAC,KAAK,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;KACtC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"telemetryAttributes.js","sourceRoot":"","sources":["../../../src/telemetry/telemetryAttributes.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;AACpD,MAAM,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC;AAEtD,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,MAAM,KAAK,GAAG,kBAAkB,CAAC,sBAAsB,EAAE,CAAC;IAC1D,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;IAC5C,OAAO;QACL,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE;QACnC,iBAAiB,EAAE,mBAAmB,CAAC,iBAAiB,EAAE;QAC1D,WAAW,EAAE,MAAM,CAAC,aAAa,EAAE;QACnC,GAAG,CAAC,KAAK,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;QACrC,GAAG,CAAC,WAAW;YACb,WAAW,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI;YACtC,iBAAiB,EAAE,WAAW,CAAC,aAAa;SAC7C,CAAC;KACL,CAAC;AACJ,CAAC"}

package/dist/src/telemetry/types.d.ts

@@ -7,6 +7,7 @@ import type { Candidate, Content, GenerateContentConfig, GenerateContentResponse
 import type { Config } from '../config/config.js';
 import type { ApprovalMode } from '../policy/types.js';
 import type { CompletedToolCall } from '../core/coreToolScheduler.js';
+import { CoreToolCallStatus } from '../scheduler/types.js';
 import type { LogAttributes, LogRecord } from '@opentelemetry/api-logs';
 import { ToolCallDecision } from './tool-call-decision.js';
 import { type FileOperation } from './metrics.js';
@@ -15,6 +16,8 @@ import type { ToolRegistry } from '../tools/tool-registry.js';
 import type { OutputFormat } from '../output/types.js';
 import type { AgentTerminateMode } from '../agents/types.js';
 import type { OTelFinishReason } from './semantic.js';
+import { LlmRole } from './llmRole.js';
+export { LlmRole };
 export interface BaseTelemetryEvent {
     'event.name': string;
     /** Current timestamp in ISO 8601 format */
@@ -101,7 +104,8 @@ export declare class ApiRequestEvent implements BaseTelemetryEvent {
     model: string;
     prompt: GenAIPromptDetails;
     request_text?: string;
-    constructor(model: string, prompt_details: GenAIPromptDetails, request_text?: string);
+    role?: LlmRole;
+    constructor(model: string, prompt_details: GenAIPromptDetails, request_text?: string, role?: LlmRole);
     toLogRecord(config: Config): LogRecord;
     toSemanticLogRecord(config: Config): LogRecord;
 }
@@ -116,7 +120,8 @@ export declare class ApiErrorEvent implements BaseTelemetryEvent {
     status_code?: number | string;
     duration_ms: number;
     auth_type?: string;
-    constructor(model: string, error: string, duration_ms: number, prompt_details: GenAIPromptDetails, auth_type?: string, error_type?: string, status_code?: number | string);
+    role?: LlmRole;
+    constructor(model: string, error: string, duration_ms: number, prompt_details: GenAIPromptDetails, auth_type?: string, error_type?: string, status_code?: number | string, role?: LlmRole);
     toLogRecord(config: Config): LogRecord;
     toSemanticLogRecord(config: Config): LogRecord;
 }
@@ -156,7 +161,8 @@ export declare class ApiResponseEvent implements BaseTelemetryEvent {
     response: GenAIResponseDetails;
     usage: GenAIUsageDetails;
     finish_reasons: OTelFinishReason[];
-    constructor(model: string, duration_ms: number, prompt_details: GenAIPromptDetails, response_details: GenAIResponseDetails, auth_type?: string, usage_data?: GenerateContentResponseUsageMetadata, response_text?: string);
+    role?: LlmRole;
+    constructor(model: string, duration_ms: number, prompt_details: GenAIPromptDetails, response_details: GenAIResponseDetails, auth_type?: string, usage_data?: GenerateContentResponseUsageMetadata, response_text?: string, role?: LlmRole);
     toLogRecord(config: Config): LogRecord;
     toSemanticLogRecord(config: Config): LogRecord;
 }
@@ -228,6 +234,15 @@ export declare enum SlashCommandStatus {
     SUCCESS = "success",
     ERROR = "error"
 }
+export declare const EVENT_REWIND = "gemini_cli.rewind";
+export declare class RewindEvent implements BaseTelemetryEvent {
+    'event.name': 'rewind';
+    'event.timestamp': string;
+    outcome: string;
+    constructor(outcome: string);
+    toOpenTelemetryAttributes(config: Config): LogAttributes;
+    toLogBody(): string;
+}
 export declare const EVENT_CHAT_COMPRESSION = "gemini_cli.chat_compression";
 export interface ChatCompressionEvent extends BaseTelemetryEvent {
     'event.name': 'chat_compression';
@@ -327,7 +342,9 @@ export declare class ModelRoutingEvent implements BaseTelemetryEvent {
     reasoning?: string;
     failed: boolean;
     error_message?: string;
-    constructor(decision_model: string, decision_source: string, routing_latency_ms: number, reasoning: string | undefined, failed: boolean, error_message: string | undefined);
+    enable_numerical_routing?: boolean;
+    classifier_threshold?: string;
+    constructor(decision_model: string, decision_source: string, routing_latency_ms: number, reasoning: string | undefined, failed: boolean, error_message: string | undefined, enable_numerical_routing?: boolean, classifier_threshold?: string);
     toOpenTelemetryAttributes(config: Config): LogAttributes;
     toLogBody(): string;
 }
@@ -340,8 +357,8 @@ export declare class ExtensionInstallEvent implements BaseTelemetryEvent {
     extension_id: string;
     extension_version: string;
     extension_source: string;
-    status: 'success' | 'error';
-    constructor(extension_name: string, hashed_extension_name: string, extension_id: string, extension_version: string, extension_source: string, status: 'success' | 'error');
+    status: CoreToolCallStatus.Success | CoreToolCallStatus.Error;
+    constructor(extension_name: string, hashed_extension_name: string, extension_id: string, extension_version: string, extension_source: string, status: CoreToolCallStatus.Success | CoreToolCallStatus.Error);
     toOpenTelemetryAttributes(config: Config): LogAttributes;
     toLogBody(): string;
 }
@@ -354,14 +371,29 @@ export declare class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
     original_content_length: number;
     truncated_content_length: number;
     threshold: number;
-    lines: number;
     prompt_id: string;
     constructor(prompt_id: string, details: {
         toolName: string;
         originalContentLength: number;
         truncatedContentLength: number;
         threshold: number;
-        lines: number;
+    });
+    toOpenTelemetryAttributes(config: Config): LogAttributes;
+    toLogBody(): string;
+}
+export declare const EVENT_TOOL_OUTPUT_MASKING = "gemini_cli.tool_output_masking";
+export declare class ToolOutputMaskingEvent implements BaseTelemetryEvent {
+    'event.name': 'tool_output_masking';
+    'event.timestamp': string;
+    tokens_before: number;
+    tokens_after: number;
+    masked_count: number;
+    total_prunable_tokens: number;
+    constructor(details: {
+        tokens_before: number;
+        tokens_after: number;
+        masked_count: number;
+        total_prunable_tokens: number;
     });
     toOpenTelemetryAttributes(config: Config): LogAttributes;
     toLogBody(): string;
@@ -373,8 +405,8 @@ export declare class ExtensionUninstallEvent implements BaseTelemetryEvent {
     extension_name: string;
     hashed_extension_name: string;
     extension_id: string;
-    status: 'success' | 'error';
-    constructor(extension_name: string, hashed_extension_name: string, extension_id: string, status: 'success' | 'error');
+    status: CoreToolCallStatus.Success | CoreToolCallStatus.Error;
+    constructor(extension_name: string, hashed_extension_name: string, extension_id: string, status: CoreToolCallStatus.Success | CoreToolCallStatus.Error);
     toOpenTelemetryAttributes(config: Config): LogAttributes;
     toLogBody(): string;
 }
@@ -388,8 +420,8 @@ export declare class ExtensionUpdateEvent implements BaseTelemetryEvent {
     extension_previous_version: string;
     extension_version: string;
     extension_source: string;
-    status: 'success' | 'error';
-    constructor(extension_name: string, hashed_extension_name: string, extension_id: string, extension_version: string, extension_previous_version: string, extension_source: string, status: 'success' | 'error');
+    status: CoreToolCallStatus.Success | CoreToolCallStatus.Error;
+    constructor(extension_name: string, hashed_extension_name: string, extension_id: string, extension_version: string, extension_previous_version: string, extension_source: string, status: CoreToolCallStatus.Success | CoreToolCallStatus.Error);
     toOpenTelemetryAttributes(config: Config): LogAttributes;
     toLogBody(): string;
 }
@@ -426,7 +458,7 @@ export declare class LlmLoopCheckEvent implements BaseTelemetryEvent {
     toOpenTelemetryAttributes(config: Config): LogAttributes;
     toLogBody(): string;
 }
-export type TelemetryEvent = StartSessionEvent | EndSessionEvent | UserPromptEvent | ToolCallEvent | ApiRequestEvent | ApiErrorEvent | ApiResponseEvent | FlashFallbackEvent | LoopDetectedEvent | LoopDetectionDisabledEvent | NextSpeakerCheckEvent | MalformedJsonResponseEvent | IdeConnectionEvent | ConversationFinishedEvent | SlashCommandEvent | FileOperationEvent | InvalidChunkEvent | ContentRetryEvent | ContentRetryFailureEvent | ExtensionEnableEvent | ExtensionInstallEvent | ExtensionUninstallEvent | ModelRoutingEvent | ToolOutputTruncatedEvent | ModelSlashCommandEvent | AgentStartEvent | AgentFinishEvent | RecoveryAttemptEvent | LlmLoopCheckEvent | StartupStatsEvent | WebFetchFallbackAttemptEvent | EditStrategyEvent | EditCorrectionEvent;
+export type TelemetryEvent = StartSessionEvent | EndSessionEvent | UserPromptEvent | ToolCallEvent | ApiRequestEvent | ApiErrorEvent | ApiResponseEvent | FlashFallbackEvent | LoopDetectedEvent | LoopDetectionDisabledEvent | NextSpeakerCheckEvent | MalformedJsonResponseEvent | IdeConnectionEvent | ConversationFinishedEvent | SlashCommandEvent | FileOperationEvent | InvalidChunkEvent | ContentRetryEvent | ContentRetryFailureEvent | ExtensionEnableEvent | ExtensionInstallEvent | ExtensionUninstallEvent | ModelRoutingEvent | ToolOutputTruncatedEvent | ModelSlashCommandEvent | AgentStartEvent | AgentFinishEvent | RecoveryAttemptEvent | LlmLoopCheckEvent | StartupStatsEvent | WebFetchFallbackAttemptEvent | ToolOutputMaskingEvent | EditStrategyEvent | PlanExecutionEvent | RewindEvent | EditCorrectionEvent;
 export declare const EVENT_EXTENSION_DISABLE = "gemini_cli.extension_disable";
 export declare class ExtensionDisableEvent implements BaseTelemetryEvent {
     'event.name': 'extension_disable';
@@ -452,8 +484,8 @@ export declare const EVENT_EDIT_CORRECTION = "gemini_cli.edit_correction";
 export declare class EditCorrectionEvent implements BaseTelemetryEvent {
     'event.name': 'edit_correction';
     'event.timestamp': string;
-    correction: 'success' | 'failure';
-    constructor(correction: 'success' | 'failure');
+    correction: CoreToolCallStatus.Success | 'failure';
+    constructor(correction: CoreToolCallStatus.Success | 'failure');
     toOpenTelemetryAttributes(config: Config): LogAttributes;
     toLogBody(): string;
 }
@@ -524,6 +556,38 @@ export declare class WebFetchFallbackAttemptEvent implements BaseTelemetryEvent
     toLogBody(): string;
 }
 export declare const EVENT_HOOK_CALL = "gemini_cli.hook_call";
+export declare const EVENT_APPROVAL_MODE_SWITCH = "gemini_cli.plan.approval_mode_switch";
+export declare class ApprovalModeSwitchEvent implements BaseTelemetryEvent {
+    eventName: string;
+    from_mode: ApprovalMode;
+    to_mode: ApprovalMode;
+    constructor(fromMode: ApprovalMode, toMode: ApprovalMode);
+    'event.name': string;
+    'event.timestamp': string;
+    toOpenTelemetryAttributes(config: Config): LogAttributes;
+    toLogBody(): string;
+}
+export declare const EVENT_APPROVAL_MODE_DURATION = "gemini_cli.plan.approval_mode_duration";
+export declare class ApprovalModeDurationEvent implements BaseTelemetryEvent {
+    eventName: string;
+    mode: ApprovalMode;
+    duration_ms: number;
+    constructor(mode: ApprovalMode, durationMs: number);
+    'event.name': string;
+    'event.timestamp': string;
+    toOpenTelemetryAttributes(config: Config): LogAttributes;
+    toLogBody(): string;
+}
+export declare const EVENT_PLAN_EXECUTION = "gemini_cli.plan.execution";
+export declare class PlanExecutionEvent implements BaseTelemetryEvent {
+    eventName: string;
+    approval_mode: ApprovalMode;
+    constructor(approvalMode: ApprovalMode);
+    'event.name': string;
+    'event.timestamp': string;
+    toOpenTelemetryAttributes(config: Config): LogAttributes;
+    toLogBody(): string;
+}
 export declare class HookCallEvent implements BaseTelemetryEvent {
     'event.name': string;
     'event.timestamp': string;
@@ -542,3 +606,22 @@ export declare class HookCallEvent implements BaseTelemetryEvent {
     toOpenTelemetryAttributes(config: Config): LogAttributes;
     toLogBody(): string;
 }
+export declare const EVENT_KEYCHAIN_AVAILABILITY = "gemini_cli.keychain.availability";
+export declare class KeychainAvailabilityEvent implements BaseTelemetryEvent {
+    'event.name': 'keychain_availability';
+    'event.timestamp': string;
+    available: boolean;
+    constructor(available: boolean);
+    toOpenTelemetryAttributes(config: Config): LogAttributes;
+    toLogBody(): string;
+}
+export declare const EVENT_TOKEN_STORAGE_INITIALIZATION = "gemini_cli.token_storage.initialization";
+export declare class TokenStorageInitializationEvent implements BaseTelemetryEvent {
+    'event.name': 'token_storage_initialization';
+    'event.timestamp': string;
+    type: string;
+    forced: boolean;
+    constructor(type: string, forced: boolean);
+    toOpenTelemetryAttributes(config: Config): LogAttributes;
+    toLogBody(): string;
+}