@machina.ai/cell-cli-core 1.19.4-rc2 → 1.20.2-rc1

package/dist/src/telemetry/startupProfiler.js

@@ -0,0 +1,147 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { performance } from 'node:perf_hooks';
+import * as os from 'node:os';
+import * as fs from 'node:fs';
+import { recordStartupPerformance } from './metrics.js';
+import { debugLogger } from '../utils/debugLogger.js';
+/**
+ * Buffers startup performance metrics until the telemetry system is fully initialized.
+ */
+export class StartupProfiler {
+    phases = new Map();
+    static instance;
+    constructor() { }
+    static getInstance() {
+        if (!StartupProfiler.instance) {
+            StartupProfiler.instance = new StartupProfiler();
+        }
+        return StartupProfiler.instance;
+    }
+    /**
+     * Returns the mark name for the start of a phase.
+     */
+    getStartMarkName(phaseName) {
+        return `startup:${phaseName}:start`;
+    }
+    /**
+     * Returns the mark name for the end of a phase.
+     */
+    getEndMarkName(phaseName) {
+        return `startup:${phaseName}:end`;
+    }
+    /**
+     * Marks the start of a phase and returns a handle to end it.
+     *
+     * If a phase with the same name is already active (started but not ended),
+     * this method will log a warning and return `undefined`. This allows for
+     * idempotent calls in environments where initialization might happen multiple
+     * times.
+     *
+     * Callers should handle the potential `undefined` return value, typically
+     * by using optional chaining: `handle?.end()`.
+     */
+    start(phaseName, details) {
+        const existingPhase = this.phases.get(phaseName);
+        // Error if starting a phase that's already active.
+        if (existingPhase && !existingPhase.ended) {
+            debugLogger.warn(`[STARTUP] Cannot start phase '${phaseName}': phase is already active. Call end() before starting again.`);
+            return undefined;
+        }
+        const startMarkName = this.getStartMarkName(phaseName);
+        performance.mark(startMarkName, { detail: details });
+        const phase = {
+            name: phaseName,
+            startCpuUsage: process.cpuUsage(),
+            details,
+            ended: false,
+        };
+        this.phases.set(phaseName, phase);
+        // Return a handle that allows ending the phase without repeating the name
+        return {
+            end: (endDetails) => {
+                this._end(phase, endDetails);
+            },
+        };
+    }
+    /**
+     * Marks the end of a phase and calculates duration.
+     * This is now a private method; callers should use the handle returned by start().
+     */
+    _end(phase, details) {
+        // Error if ending a phase that's already ended.
+        if (phase.ended) {
+            debugLogger.warn(`[STARTUP] Cannot end phase '${phase.name}': phase was already ended.`);
+            return;
+        }
+        const startMarkName = this.getStartMarkName(phase.name);
+        const endMarkName = this.getEndMarkName(phase.name);
+        // Check if start mark exists before measuring
+        if (performance.getEntriesByName(startMarkName).length === 0) {
+            debugLogger.warn(`[STARTUP] Cannot measure phase '${phase.name}': start mark '${startMarkName}' not found (likely cleared by reset).`);
+            phase.ended = true;
+            return;
+        }
+        performance.mark(endMarkName, { detail: details });
+        performance.measure(phase.name, startMarkName, endMarkName);
+        phase.cpuUsage = process.cpuUsage(phase.startCpuUsage);
+        phase.ended = true;
+        if (details) {
+            phase.details = { ...phase.details, ...details };
+        }
+    }
+    /**
+     * Flushes buffered metrics to the telemetry system.
+     */
+    flush(config) {
+        debugLogger.log('[STARTUP] StartupProfiler.flush() called with', this.phases.size, 'phases');
+        const commonDetails = {
+            os_platform: os.platform(),
+            os_arch: os.arch(),
+            os_release: os.release(),
+            is_docker: fs.existsSync('/.dockerenv'),
+        };
+        // Get all performance measures.
+        const measures = performance.getEntriesByType('measure');
+        for (const phase of this.phases.values()) {
+            // Warn about incomplete phases.
+            if (!phase.ended) {
+                debugLogger.warn(`[STARTUP] Phase '${phase.name}' was started but never ended. Skipping metrics.`);
+                continue;
+            }
+            // Find the corresponding measure.
+            const measure = measures.find((m) => m.name === phase.name);
+            if (measure && phase.cpuUsage) {
+                const details = {
+                    ...commonDetails,
+                    cpu_usage_user: phase.cpuUsage.user,
+                    cpu_usage_system: phase.cpuUsage.system,
+                    ...phase.details,
+                };
+                debugLogger.log('[STARTUP] Recording metric for phase:', phase.name, 'duration:', measure.duration);
+                recordStartupPerformance(config, measure.duration, {
+                    phase: phase.name,
+                    details,
+                });
+            }
+            else {
+                debugLogger.log('[STARTUP] Skipping phase without measure:', phase.name);
+            }
+        }
+        // Clear performance marks and measures for all tracked phases.
+        for (const phaseName of this.phases.keys()) {
+            const startMarkName = this.getStartMarkName(phaseName);
+            const endMarkName = this.getEndMarkName(phaseName);
+            performance.clearMarks(startMarkName);
+            performance.clearMarks(endMarkName);
+            performance.clearMeasures(phaseName);
+        }
+        // Clear all phases.
+        this.phases.clear();
+    }
+}
+export const startupProfiler = StartupProfiler.getInstance();
+//# sourceMappingURL=startupProfiler.js.map

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

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

package/dist/src/telemetry/startupProfiler.test.d.ts

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

package/dist/src/telemetry/startupProfiler.test.js

@@ -0,0 +1,247 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { StartupProfiler } from './startupProfiler.js';
+// Mock the metrics module
+vi.mock('./metrics.js', () => ({
+    recordStartupPerformance: vi.fn(),
+}));
+// Mock os module
+vi.mock('node:os', () => ({
+    platform: vi.fn(() => 'darwin'),
+    arch: vi.fn(() => 'x64'),
+    release: vi.fn(() => '22.6.0'),
+}));
+// Mock fs module
+vi.mock('node:fs', () => ({
+    existsSync: vi.fn(() => false),
+}));
+describe('StartupProfiler', () => {
+    let profiler;
+    let mockConfig;
+    let recordStartupPerformance;
+    beforeEach(async () => {
+        vi.resetAllMocks();
+        // Get the mocked function
+        const metricsModule = await import('./metrics.js');
+        recordStartupPerformance =
+            metricsModule.recordStartupPerformance;
+        // Create a fresh profiler instance
+        profiler = StartupProfiler.getInstance();
+        // Clear any existing phases and performance entries
+        profiler['phases'].clear();
+        performance.clearMarks();
+        performance.clearMeasures();
+        mockConfig = {
+            getSessionId: () => 'test-session-id',
+            getTelemetryEnabled: () => true,
+        };
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    describe('getInstance', () => {
+        it('should return a singleton instance', () => {
+            const instance1 = StartupProfiler.getInstance();
+            const instance2 = StartupProfiler.getInstance();
+            expect(instance1).toBe(instance2);
+        });
+    });
+    describe('start', () => {
+        it('should create a performance mark for a phase', () => {
+            profiler.start('test_phase');
+            const phase = profiler['phases'].get('test_phase');
+            expect(phase).toBeDefined();
+            expect(phase?.name).toBe('test_phase');
+            // Verify performance mark was created
+            const marks = performance.getEntriesByType('mark');
+            const startMark = marks.find((m) => m.name === 'startup:test_phase:start');
+            expect(startMark).toBeDefined();
+        });
+        it('should record start time with details', () => {
+            const details = { key: 'value', count: 42 };
+            profiler.start('test_phase', details);
+            const phase = profiler['phases'].get('test_phase');
+            expect(phase?.details).toEqual(details);
+        });
+        it('should return undefined when starting a phase that is already active', () => {
+            profiler.start('test_phase');
+            const handle = profiler.start('test_phase');
+            expect(handle).toBeUndefined();
+        });
+    });
+    describe('end', () => {
+        it('should create a performance measure for a started phase', () => {
+            const handle = profiler.start('test_phase');
+            handle?.end();
+            // Verify performance measure was created
+            const measures = performance.getEntriesByType('measure');
+            const measure = measures.find((m) => m.name === 'test_phase');
+            expect(measure).toBeDefined();
+            expect(measure?.duration).toBeGreaterThan(0);
+        });
+        it('should merge details when ending a phase', () => {
+            const handle = profiler.start('test_phase', { initial: 'value' });
+            handle?.end({ additional: 'data' });
+            const phase = profiler['phases'].get('test_phase');
+            expect(phase?.details).toEqual({
+                initial: 'value',
+                additional: 'data',
+            });
+        });
+        it('should overwrite details with same key', () => {
+            const handle = profiler.start('test_phase', { key: 'original' });
+            handle?.end({ key: 'updated' });
+            const phase = profiler['phases'].get('test_phase');
+            expect(phase?.details).toEqual({ key: 'updated' });
+        });
+    });
+    describe('flush', () => {
+        it('should call recordStartupPerformance for each completed phase', () => {
+            const handle1 = profiler.start('phase1');
+            handle1?.end();
+            const handle2 = profiler.start('phase2');
+            handle2?.end();
+            profiler.flush(mockConfig);
+            expect(recordStartupPerformance).toHaveBeenCalledTimes(2);
+        });
+        it('should not record phases without duration', () => {
+            profiler.start('incomplete_phase');
+            profiler.flush(mockConfig);
+            expect(recordStartupPerformance).not.toHaveBeenCalled();
+        });
+        it('should include common details in all metrics', () => {
+            const handle = profiler.start('test_phase');
+            handle?.end();
+            profiler.flush(mockConfig);
+            expect(recordStartupPerformance).toHaveBeenCalledWith(mockConfig, expect.any(Number), expect.objectContaining({
+                phase: 'test_phase',
+                details: expect.objectContaining({
+                    os_platform: 'darwin',
+                    os_arch: 'x64',
+                    os_release: '22.6.0',
+                    is_docker: false,
+                    cpu_usage_user: expect.any(Number),
+                    cpu_usage_system: expect.any(Number),
+                }),
+            }));
+        });
+        it('should merge phase-specific details with common details', () => {
+            const handle = profiler.start('test_phase', { custom: 'value' });
+            handle?.end();
+            profiler.flush(mockConfig);
+            expect(recordStartupPerformance).toHaveBeenCalledWith(mockConfig, expect.any(Number), expect.objectContaining({
+                phase: 'test_phase',
+                details: expect.objectContaining({
+                    custom: 'value',
+                    os_platform: 'darwin',
+                }),
+            }));
+        });
+        it('should clear phases after flushing', () => {
+            const handle = profiler.start('test_phase');
+            handle?.end();
+            profiler.flush(mockConfig);
+            expect(profiler['phases'].size).toBe(0);
+        });
+        it('should detect Docker environment', async () => {
+            const fs = await import('node:fs');
+            fs.existsSync.mockReturnValue(true);
+            const handle = profiler.start('test_phase');
+            handle?.end();
+            profiler.flush(mockConfig);
+            expect(recordStartupPerformance).toHaveBeenCalledWith(mockConfig, expect.any(Number), expect.objectContaining({
+                details: expect.objectContaining({
+                    is_docker: true,
+                }),
+            }));
+        });
+        it('should calculate CPU usage correctly', () => {
+            const cpuUsageSpy = vi.spyOn(process, 'cpuUsage');
+            // Mock start usage
+            cpuUsageSpy.mockReturnValueOnce({ user: 1000, system: 500 });
+            // Mock diff usage (this is what process.cpuUsage(startUsage) returns)
+            cpuUsageSpy.mockReturnValueOnce({ user: 100, system: 50 });
+            const handle = profiler.start('cpu_test_phase');
+            handle?.end();
+            profiler.flush(mockConfig);
+            expect(recordStartupPerformance).toHaveBeenCalledWith(mockConfig, expect.any(Number), expect.objectContaining({
+                phase: 'cpu_test_phase',
+                details: expect.objectContaining({
+                    cpu_usage_user: 100,
+                    cpu_usage_system: 50,
+                }),
+            }));
+        });
+    });
+    describe('integration scenarios', () => {
+        it('should handle a complete startup profiling workflow', () => {
+            // Simulate startup sequence
+            const totalHandle = profiler.start('total_startup');
+            const settingsHandle = profiler.start('load_settings');
+            settingsHandle?.end();
+            const argsHandle = profiler.start('parse_arguments');
+            argsHandle?.end();
+            const appHandle = profiler.start('initialize_app');
+            appHandle?.end();
+            totalHandle?.end();
+            profiler.flush(mockConfig);
+            expect(recordStartupPerformance).toHaveBeenCalledTimes(4);
+            expect(recordStartupPerformance).toHaveBeenCalledWith(mockConfig, expect.any(Number), expect.objectContaining({ phase: 'total_startup' }));
+        });
+        it('should handle nested timing correctly', () => {
+            const outerHandle = profiler.start('outer');
+            const innerHandle = profiler.start('inner');
+            innerHandle?.end();
+            outerHandle?.end();
+            profiler.flush(mockConfig);
+            const calls = recordStartupPerformance.mock
+                .calls;
+            const outerCall = calls.find((call) => call[2].phase === 'outer');
+            const innerCall = calls.find((call) => call[2].phase === 'inner');
+            expect(outerCall).toBeDefined();
+            expect(innerCall).toBeDefined();
+            // Outer duration should be >= inner duration
+            expect(outerCall[1]).toBeGreaterThanOrEqual(innerCall[1]);
+        });
+    });
+    describe('sanity checking', () => {
+        it('should return undefined when starting a phase that is already active', () => {
+            profiler.start('test_phase');
+            const handle = profiler.start('test_phase');
+            expect(handle).toBeUndefined();
+        });
+        it('should allow restarting a phase after it has ended', () => {
+            const handle1 = profiler.start('test_phase');
+            handle1?.end();
+            // Should not throw
+            expect(() => profiler.start('test_phase')).not.toThrow();
+        });
+        it('should not throw error when ending a phase that is already ended', () => {
+            const handle = profiler.start('test_phase');
+            handle?.end();
+            // Calling end() again on the same handle should not throw
+            expect(() => handle?.end()).not.toThrow();
+        });
+        it('should not record metrics for incomplete phases', () => {
+            profiler.start('incomplete_phase');
+            // Never call end()
+            profiler.flush(mockConfig);
+            expect(recordStartupPerformance).not.toHaveBeenCalled();
+        });
+        it('should handle mix of complete and incomplete phases', () => {
+            const completeHandle = profiler.start('complete_phase');
+            completeHandle?.end();
+            profiler.start('incomplete_phase');
+            // Never call end()
+            profiler.flush(mockConfig);
+            // Should only record the complete phase
+            expect(recordStartupPerformance).toHaveBeenCalledTimes(1);
+            expect(recordStartupPerformance).toHaveBeenCalledWith(mockConfig, expect.any(Number), expect.objectContaining({ phase: 'complete_phase' }));
+        });
+    });
+});
+//# sourceMappingURL=startupProfiler.test.js.map

package/dist/src/telemetry/startupProfiler.test.js.map

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

package/dist/src/telemetry/trace.js

@@ -30,7 +30,7 @@ export async function runInDevTraceSpan(opts, fn) {
     const { name: spanName, noAutoEnd, ...restOfSpanOpts } = opts;
     if (process.env['GEMINI_DEV_TRACING'] !== 'true') {
         // If GEMINI_DEV_TRACING env var not set, we do not trace.
-        return await fn({
+        return fn({
             metadata: {
                 name: spanName,
                 attributes: {},
@@ -41,7 +41,7 @@ export async function runInDevTraceSpan(opts, fn) {
         });
     }
     const tracer = trace.getTracer(TRACER_NAME, TRACER_VERSION);
-    return await tracer.startActiveSpan(opts.name, restOfSpanOpts, async (span) => {
+    return tracer.startActiveSpan(opts.name, restOfSpanOpts, async (span) => {
         const meta = {
             name: spanName,
             attributes: {},

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

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

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

@@ -14,6 +14,7 @@ export { ToolCallDecision };
 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';
 export interface BaseTelemetryEvent {
     'event.name': string;
     /** Current timestamp in ISO 8601 format */
@@ -98,11 +99,11 @@ export declare class ApiRequestEvent implements BaseTelemetryEvent {
     'event.name': 'api_request';
     'event.timestamp': string;
     model: string;
-    prompt_id: string;
+    prompt: GenAIPromptDetails;
     request_text?: string;
-    constructor(model: string, prompt_id: string, request_text?: string);
-    toOpenTelemetryAttributes(config: Config): LogAttributes;
-    toLogBody(): string;
+    constructor(model: string, prompt_details: GenAIPromptDetails, request_text?: string);
+    toLogRecord(config: Config): LogRecord;
+    toSemanticLogRecord(config: Config): LogRecord;
 }
 export declare const EVENT_API_ERROR = "gemini_cli.api_error";
 export declare class ApiErrorEvent implements BaseTelemetryEvent {
@@ -154,6 +155,7 @@ export declare class ApiResponseEvent implements BaseTelemetryEvent {
     prompt: GenAIPromptDetails;
     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);
     toLogRecord(config: Config): LogRecord;
     toSemanticLogRecord(config: Config): LogRecord;

package/dist/src/telemetry/types.js

@@ -277,27 +277,50 @@ export class ApiRequestEvent {
     'event.name';
     'event.timestamp';
     model;
-    prompt_id;
+    prompt;
     request_text;
-    constructor(model, prompt_id, request_text) {
+    constructor(model, prompt_details, request_text) {
         this['event.name'] = 'api_request';
         this['event.timestamp'] = new Date().toISOString();
         this.model = model;
-        this.prompt_id = prompt_id;
+        this.prompt = prompt_details;
         this.request_text = request_text;
     }
-    toOpenTelemetryAttributes(config) {
-        return {
+    toLogRecord(config) {
+        const attributes = {
             ...getCommonAttributes(config),
             'event.name': EVENT_API_REQUEST,
             'event.timestamp': this['event.timestamp'],
             model: this.model,
-            prompt_id: this.prompt_id,
+            prompt_id: this.prompt.prompt_id,
             request_text: this.request_text,
         };
+        return { body: `API request to ${this.model}.`, attributes };
     }
-    toLogBody() {
-        return `API request to ${this.model}.`;
+    toSemanticLogRecord(config) {
+        const { 'gen_ai.response.model': _, ...requestConventionAttributes } = getConventionAttributes({
+            model: this.model,
+            auth_type: config.getContentGeneratorConfig()?.authType,
+        });
+        const attributes = {
+            ...getCommonAttributes(config),
+            'event.name': EVENT_GEN_AI_OPERATION_DETAILS,
+            'event.timestamp': this['event.timestamp'],
+            ...toGenerateContentConfigAttributes(this.prompt.generate_content_config),
+            ...requestConventionAttributes,
+        };
+        if (this.prompt.server) {
+            attributes['server.address'] = this.prompt.server.address;
+            attributes['server.port'] = this.prompt.server.port;
+        }
+        if (config.getTelemetryLogPromptsEnabled() && this.prompt.contents) {
+            attributes['gen_ai.input.messages'] = JSON.stringify(toInputMessages(this.prompt.contents));
+        }
+        const logRecord = {
+            body: `GenAI operation request details from ${this.model}.`,
+            attributes,
+        };
+        return logRecord;
     }
 }
 export const EVENT_API_ERROR = 'gemini_cli.api_error';
@@ -402,6 +425,7 @@ export class ApiResponseEvent {
     prompt;
     response;
     usage;
+    finish_reasons;
     constructor(model, duration_ms, prompt_details, response_details, auth_type, usage_data, response_text) {
         this['event.name'] = 'api_response';
         this['event.timestamp'] = new Date().toISOString();
@@ -420,6 +444,7 @@ export class ApiResponseEvent {
             tool_token_count: usage_data?.toolUsePromptTokenCount ?? 0,
             total_token_count: usage_data?.totalTokenCount ?? 0,
         };
+        this.finish_reasons = toFinishReasons(this.response.candidates);
     }
     toLogRecord(config) {
         const attributes = {
@@ -437,6 +462,7 @@ export class ApiResponseEvent {
             prompt_id: this.prompt.prompt_id,
             auth_type: this.auth_type,
             status_code: this.status_code,
+            finish_reasons: this.finish_reasons,
         };
         if (this.response_text) {
             attributes['response_text'] = this.response_text;
@@ -458,7 +484,7 @@ export class ApiResponseEvent {
             'event.name': EVENT_GEN_AI_OPERATION_DETAILS,
             'event.timestamp': this['event.timestamp'],
             'gen_ai.response.id': this.response.response_id,
-            'gen_ai.response.finish_reasons': toFinishReasons(this.response.candidates),
+            'gen_ai.response.finish_reasons': this.finish_reasons,
             'gen_ai.output.messages': JSON.stringify(toOutputMessages(this.response.candidates)),
             ...toGenerateContentConfigAttributes(this.prompt.generate_content_config),
             ...getConventionAttributes(this),