@machina.ai/cell-cli 1.59.0-rc2 → 1.64.0-rc1

package/dist/src/services/FeedbackService.js

@@ -38,7 +38,34 @@ export class FeedbackService {
     transformStatsForApi(stats) {
         const computed = computeSessionStats(stats.metrics);
         const { metrics } = stats;
+        const toolsBreakdown = {};
+        for (const [toolName, toolStats] of Object.entries(metrics.tools.byName)) {
+            toolsBreakdown[toolName] = {
+                count: toolStats.count,
+                success: toolStats.success,
+                fail: toolStats.fail,
+                duration_ms: toolStats.durationMs,
+                decisions: {
+                    accept: toolStats.decisions.accept,
+                    reject: toolStats.decisions.reject,
+                    modify: toolStats.decisions.modify,
+                    auto_accept: toolStats.decisions.auto_accept,
+                },
+            };
+        }
+        const compressionEvents = (metrics.compression?.events || []).map((evt) => ({
+            tokens_before: evt.tokensBefore,
+            tokens_after: evt.tokensAfter,
+            turn_index: evt.turnIndex,
+            timestamp: evt.timestamp,
+        }));
+        const contextCompression = {
+            total_compressions: metrics.compression?.totalCompressions ?? 0,
+            total_tokens_reduced: metrics.compression?.totalTokensReduced ?? 0,
+            events: compressionEvents,
+        };
         return {
+            prompt_count: stats.promptCount,
             interaction_summary: {
                 tool_calls: {
                     total: metrics.tools.totalCalls,
@@ -61,12 +88,41 @@ export class FeedbackService {
                 api_time_seconds: computed.totalApiTime / 1000,
                 tool_time_seconds: computed.totalToolTime / 1000,
             },
-            model_usage: Object.entries(metrics.models).map(([model_name, model_metrics]) => ({
-                model_name,
-                requests_count: model_metrics.api.totalRequests,
-                input_tokens: model_metrics.tokens.prompt,
-                output_tokens: model_metrics.tokens.candidates,
-            })),
+            model_usage: Object.entries(metrics.models).map(([model_name, model_metrics]) => {
+                const rolesUsage = {};
+                for (const [role, roleStats] of Object.entries(model_metrics.roles || {})) {
+                    if (roleStats) {
+                        rolesUsage[role] = {
+                            requests_count: roleStats.totalRequests,
+                            input_tokens: roleStats.tokens.prompt,
+                            output_tokens: roleStats.tokens.candidates,
+                            cached_tokens: roleStats.tokens.cached,
+                        };
+                    }
+                }
+                const thinkingLevelsUsage = {};
+                for (const [tl, tlStats] of Object.entries(model_metrics.thinkingLevels || {})) {
+                    if (tlStats) {
+                        thinkingLevelsUsage[tl] = {
+                            requests_count: tlStats.totalRequests,
+                            input_tokens: tlStats.tokens.prompt,
+                            output_tokens: tlStats.tokens.candidates,
+                            cached_tokens: tlStats.tokens.cached,
+                        };
+                    }
+                }
+                return {
+                    model_name,
+                    requests_count: model_metrics.api.totalRequests,
+                    input_tokens: model_metrics.tokens.prompt,
+                    output_tokens: model_metrics.tokens.candidates,
+                    cached_tokens: model_metrics.tokens.cached,
+                    roles: rolesUsage,
+                    thinking_levels: thinkingLevelsUsage,
+                };
+            }),
+            tools_breakdown: toolsBreakdown,
+            context_compression: contextCompression,
             cache_summary: {
                 saved_input_tokens: computed.totalCachedTokens,
                 saved_input_percentage: computed.cacheEfficiency / 100,

package/dist/src/services/FeedbackService.js.map

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

package/dist/src/services/FeedbackService.test.d.ts

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

package/dist/src/services/FeedbackService.test.js

@@ -0,0 +1,282 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { FeedbackService } from './FeedbackService.js';
+import { ToolCallDecision } from '../ui/contexts/SessionContext.js';
+describe('FeedbackService', () => {
+    let mockConfig;
+    let service;
+    beforeEach(() => {
+        mockConfig = {
+            getAgentApiUrl: vi.fn().mockReturnValue('https://api.cell.ai'),
+            getContentGeneratorConfig: vi
+                .fn()
+                .mockReturnValue({ token: 'mock-token-123' }),
+        };
+        service = new FeedbackService(mockConfig);
+    });
+    const createMockSessionStats = () => ({
+        sessionId: 'session-xyz-123',
+        sessionStartTime: new Date(Date.now() - 60000),
+        promptCount: 4,
+        lastPromptTokenCount: 1500,
+        metrics: {
+            models: {
+                'gemini-2.5-pro': {
+                    api: {
+                        totalRequests: 2,
+                        totalErrors: 0,
+                        totalLatencyMs: 1200,
+                    },
+                    tokens: {
+                        input: 800,
+                        prompt: 1000,
+                        candidates: 400,
+                        total: 1400,
+                        cached: 200,
+                        thoughts: 50,
+                        tool: 20,
+                    },
+                    roles: {
+                        main: {
+                            totalRequests: 1,
+                            totalErrors: 0,
+                            totalLatencyMs: 800,
+                            tokens: {
+                                input: 500,
+                                prompt: 600,
+                                candidates: 250,
+                                total: 850,
+                                cached: 100,
+                                thoughts: 30,
+                                tool: 10,
+                            },
+                        },
+                        utility_compressor: {
+                            totalRequests: 1,
+                            totalErrors: 0,
+                            totalLatencyMs: 400,
+                            tokens: {
+                                input: 300,
+                                prompt: 400,
+                                candidates: 150,
+                                total: 550,
+                                cached: 100,
+                                thoughts: 20,
+                                tool: 10,
+                            },
+                        },
+                    },
+                    thinkingLevels: {
+                        HIGH: {
+                            totalRequests: 1,
+                            totalErrors: 0,
+                            totalLatencyMs: 800,
+                            tokens: {
+                                input: 500,
+                                prompt: 600,
+                                candidates: 250,
+                                total: 850,
+                                cached: 100,
+                                thoughts: 30,
+                                tool: 10,
+                            },
+                        },
+                    },
+                },
+            },
+            tools: {
+                totalCalls: 3,
+                totalSuccess: 2,
+                totalFail: 1,
+                totalDurationMs: 450,
+                totalDecisions: {
+                    [ToolCallDecision.ACCEPT]: 1,
+                    [ToolCallDecision.REJECT]: 0,
+                    [ToolCallDecision.MODIFY]: 1,
+                    [ToolCallDecision.AUTO_ACCEPT]: 1,
+                },
+                byName: {
+                    read_file: {
+                        count: 2,
+                        success: 2,
+                        fail: 0,
+                        durationMs: 250,
+                        decisions: {
+                            [ToolCallDecision.ACCEPT]: 1,
+                            [ToolCallDecision.REJECT]: 0,
+                            [ToolCallDecision.MODIFY]: 0,
+                            [ToolCallDecision.AUTO_ACCEPT]: 1,
+                        },
+                    },
+                    run_shell_command: {
+                        count: 1,
+                        success: 0,
+                        fail: 1,
+                        durationMs: 200,
+                        decisions: {
+                            [ToolCallDecision.ACCEPT]: 0,
+                            [ToolCallDecision.REJECT]: 0,
+                            [ToolCallDecision.MODIFY]: 1,
+                            [ToolCallDecision.AUTO_ACCEPT]: 0,
+                        },
+                    },
+                },
+            },
+            files: {
+                totalLinesAdded: 45,
+                totalLinesRemoved: 12,
+            },
+            compression: {
+                totalCompressions: 1,
+                totalTokensReduced: 5000,
+                events: [
+                    {
+                        tokensBefore: 8000,
+                        tokensAfter: 3000,
+                        turnIndex: 2,
+                        timestamp: '2026-09-24T12:34:56.789Z',
+                    },
+                ],
+            },
+        },
+    });
+    describe('transformStatsForApi (Enriched Payload)', () => {
+        it('should include prompt_count in metadata and preserve interaction_summary, performance, cache_summary', () => {
+            const stats = createMockSessionStats();
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const transformed = service.transformStatsForApi(stats);
+            // Backwards compatibility checks
+            expect(transformed.interaction_summary).toBeDefined();
+            expect(transformed.interaction_summary.tool_calls.total).toBe(3);
+            expect(transformed.interaction_summary.code_changes.lines_added).toBe(45);
+            expect(transformed.performance).toBeDefined();
+            expect(transformed.performance.api_time_seconds).toBeGreaterThanOrEqual(0);
+            expect(transformed.cache_summary).toBeDefined();
+            // Enriched metadata
+            expect(transformed.prompt_count).toBe(4);
+        });
+        it('should enrich model_usage with cached_tokens, thinking_levels, and roles', () => {
+            const stats = createMockSessionStats();
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const transformed = service.transformStatsForApi(stats);
+            expect(transformed.model_usage).toHaveLength(1);
+            const model = transformed.model_usage[0];
+            expect(model.model_name).toBe('gemini-2.5-pro');
+            expect(model.requests_count).toBe(2);
+            expect(model.input_tokens).toBe(1000);
+            expect(model.output_tokens).toBe(400);
+            expect(model.cached_tokens).toBe(200);
+            // Enriched roles
+            expect(model.roles).toBeDefined();
+            expect(model.roles.main).toEqual({
+                requests_count: 1,
+                input_tokens: 600,
+                output_tokens: 250,
+                cached_tokens: 100,
+            });
+            expect(model.roles.utility_compressor).toEqual({
+                requests_count: 1,
+                input_tokens: 400,
+                output_tokens: 150,
+                cached_tokens: 100,
+            });
+            // Enriched thinking levels
+            expect(model.thinking_levels).toBeDefined();
+            expect(model.thinking_levels.HIGH).toEqual({
+                requests_count: 1,
+                input_tokens: 600,
+                output_tokens: 250,
+                cached_tokens: 100,
+            });
+        });
+        it('should enrich tools_breakdown with byName stats and decisions', () => {
+            const stats = createMockSessionStats();
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const transformed = service.transformStatsForApi(stats);
+            expect(transformed.tools_breakdown).toBeDefined();
+            expect(transformed.tools_breakdown.read_file).toEqual({
+                count: 2,
+                success: 2,
+                fail: 0,
+                duration_ms: 250,
+                decisions: {
+                    accept: 1,
+                    reject: 0,
+                    modify: 0,
+                    auto_accept: 1,
+                },
+            });
+            expect(transformed.tools_breakdown.run_shell_command).toEqual({
+                count: 1,
+                success: 0,
+                fail: 1,
+                duration_ms: 200,
+                decisions: {
+                    accept: 0,
+                    reject: 0,
+                    modify: 1,
+                    auto_accept: 0,
+                },
+            });
+        });
+        it('should enrich context_compression block with events and reductions', () => {
+            const stats = createMockSessionStats();
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const transformed = service.transformStatsForApi(stats);
+            expect(transformed.context_compression).toEqual({
+                total_compressions: 1,
+                total_tokens_reduced: 5000,
+                events: [
+                    {
+                        tokens_before: 8000,
+                        tokens_after: 3000,
+                        turn_index: 2,
+                        timestamp: '2026-09-24T12:34:56.789Z',
+                    },
+                ],
+            });
+        });
+        it('should provide default empty context_compression when no compressions occurred', () => {
+            const stats = createMockSessionStats();
+            delete stats.metrics.compression;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const transformed = service.transformStatsForApi(stats);
+            expect(transformed.context_compression).toEqual({
+                total_compressions: 0,
+                total_tokens_reduced: 0,
+                events: [],
+            });
+        });
+    });
+    describe('sendStatistics', () => {
+        it('should post JSON to /cell/v1.1/gemini/session/stats with sessionId and bearer token', async () => {
+            const stats = createMockSessionStats();
+            const mockFetch = vi.fn().mockResolvedValue({
+                ok: true,
+                status: 200,
+            });
+            vi.stubGlobal('fetch', mockFetch);
+            await service.sendStatistics(stats);
+            expect(mockFetch).toHaveBeenCalledTimes(1);
+            const [url, options] = mockFetch.mock.calls[0];
+            expect(url).toBe('https://api.cell.ai/cell/v1.1/gemini/session/stats');
+            expect(options.method).toBe('POST');
+            expect(options.headers).toMatchObject({
+                'Content-Type': 'application/json',
+                Authorization: 'Bearer mock-token-123',
+                sessionId: 'session-xyz-123',
+            });
+            const body = JSON.parse(options.body);
+            expect(body.prompt_count).toBe(4);
+            expect(body.context_compression.total_compressions).toBe(1);
+            expect(body.tools_breakdown.read_file).toBeDefined();
+            expect(body.model_usage[0].cached_tokens).toBe(200);
+            vi.unstubAllGlobals();
+        });
+    });
+});
+//# sourceMappingURL=FeedbackService.test.js.map

package/dist/src/services/FeedbackService.test.js.map

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

package/dist/src/services/FileCommandLoader.js

@@ -59,9 +59,6 @@ export class FileCommandLoader {
      * @returns A promise that resolves to an array of all loaded SlashCommands.
      */
     async loadCommands(signal) {
-        if (this.folderTrustEnabled && !this.isTrustedFolder) {
-            return [];
-        }
         const allCommands = [];
         const globOptions = {
             nodir: true,
@@ -156,14 +153,15 @@ export class FileCommandLoader {
         });
         // 2. Project commands (skip if same directory as user commands, e.g. when
         //    cwd is the user's home directory, to avoid false conflict warnings)
-        if (!storage.isWorkspaceHomeDir()) {
+        if (!storage.isWorkspaceHomeDir() &&
+            (!this.folderTrustEnabled || this.isTrustedFolder)) {
             dirs.push({
                 path: storage.getProjectCommandsDir(),
                 kind: CommandKind.WORKSPACE_FILE,
             });
         }
         // 3. Extension commands (processed last to detect all conflicts)
-        if (this.config) {
+        if (this.config && (!this.folderTrustEnabled || this.isTrustedFolder)) {
             const activeExtensions = this.config
                 .getExtensions()
                 .filter((ext) => ext.isActive)

package/dist/src/services/FileCommandLoader.js.map

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

package/dist/src/services/FileCommandLoader.test.js

@@ -5,6 +5,7 @@
  */
 import * as glob from 'glob';
 import * as path from 'node:path';
+import * as os from 'node:os';
 import { CELL_DIR, Storage, homedir, } from '@google/gemini-cli-core';
 import mock from 'mock-fs';
 import { FileCommandLoader } from './FileCommandLoader.js';
@@ -48,6 +49,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     return {
         ...original,
         Storage: original.Storage,
+        homedir: vi.fn(original.homedir),
         isCommandAllowed: vi.fn(),
         ShellExecutionService: {
             execute: vi.fn(),
@@ -276,6 +278,28 @@ describe('FileCommandLoader', () => {
         // Verify they are loaded as user commands, not duplicated as workspace commands
         expect(commands.every((c) => c.kind === CommandKind.USER_FILE)).toBe(true);
     });
+    it('handles empty homedir gracefully without throwing when loading commands', async () => {
+        vi.mocked(homedir).mockReturnValue('');
+        const projectCommandsDir = path.join('/workspace', CELL_DIR, 'commands');
+        mock({
+            [projectCommandsDir]: {
+                'project.toml': 'prompt = "Project prompt"',
+            },
+        });
+        const mockConfig = {
+            getProjectRoot: vi.fn(() => '/workspace'),
+            getExtensions: vi.fn(() => []),
+            getFolderTrust: vi.fn(() => true),
+            isTrustedFolder: vi.fn(() => true),
+        };
+        const loader = new FileCommandLoader(mockConfig);
+        const commands = await loader.loadCommands(signal);
+        expect(commands).toBeDefined();
+        expect(commands).toHaveLength(1);
+        expect(commands[0].name).toBe('project');
+        expect(commands[0].kind).toBe(CommandKind.WORKSPACE_FILE);
+        vi.mocked(homedir).mockReturnValue(os.homedir());
+    });
     it('ignores files with TOML syntax errors', async () => {
         const userCommandsDir = Storage.getUserCommandsDir();
         mock({
@@ -1017,23 +1041,61 @@ describe('FileCommandLoader', () => {
             const commands = await loader.loadCommands(signal);
             expect(commands).toHaveLength(2);
         });
-        it('does not load when folder is not trusted', async () => {
+        it('allows global user commands but excludes project and extension commands when folder is not trusted', async () => {
+            const userCommandsDir = Storage.getUserCommandsDir();
+            const projectCommandsDir = path.join('/path/to/project', '.cell-cli', 'commands');
             const mockConfig = {
                 getProjectRoot: vi.fn(() => '/path/to/project'),
-                getExtensions: vi.fn(() => []),
+                getExtensions: vi.fn(() => [
+                    {
+                        name: 'ext1',
+                        id: 'ext1-id',
+                        path: '/path/to/ext1',
+                        isActive: true,
+                    },
+                ]),
                 getFolderTrust: vi.fn(() => true),
                 isTrustedFolder: vi.fn(() => false),
             };
-            const userCommandsDir = Storage.getUserCommandsDir();
             mock({
                 [userCommandsDir]: {
-                    'test1.toml': 'prompt = "Prompt 1"',
-                    'test2.toml': 'prompt = "Prompt 2"',
+                    'user1.toml': 'prompt = "User Prompt 1"',
+                    'user2.toml': 'prompt = "User Prompt 2"',
+                },
+                [projectCommandsDir]: {
+                    'project1.toml': 'prompt = "Project Prompt 1"',
+                },
+                '/path/to/ext1/commands': {
+                    'ext_cmd.toml': 'prompt = "Extension Prompt"',
                 },
             });
             const loader = new FileCommandLoader(mockConfig);
             const commands = await loader.loadCommands(signal);
-            expect(commands).toHaveLength(0);
+            expect(commands).toHaveLength(2);
+            expect(commands.map((c) => c.name).sort()).toEqual(['user1', 'user2']);
+        });
+        it('allows global user commands in listAvailableFiles when folder is not trusted', async () => {
+            const userCommandsDir = Storage.getUserCommandsDir();
+            const projectCommandsDir = path.join('/path/to/project', '.cell-cli', 'commands');
+            mock({
+                [userCommandsDir]: {
+                    'user_cmd.toml': 'prompt = "User prompt"',
+                },
+                [projectCommandsDir]: {
+                    'project_cmd.toml': 'prompt = "Project prompt"',
+                },
+            });
+            const mockConfig = {
+                getProjectRoot: vi.fn(() => '/path/to/project'),
+                getExtensions: vi.fn(() => []),
+                getFolderTrust: vi.fn(() => true),
+                isTrustedFolder: vi.fn(() => false),
+            };
+            const loader = new FileCommandLoader(mockConfig);
+            const groups = await loader.listAvailableFiles();
+            expect(groups).toHaveLength(1);
+            expect(groups[0]?.displayName).toBe('User');
+            expect(groups[0]?.files).toEqual(['user_cmd.toml']);
         });
     });
     describe('Aborted signal', () => {