@machina.ai/cell-cli-core 1.6.1-rc2 → 1.8.2-rc1

package/dist/src/telemetry/clearcut-logger/clearcut-logger.js

@@ -10,7 +10,7 @@ import { UserAccountManager } from '../../utils/userAccountManager.js';
 import { safeJsonStringify } from '../../utils/safeJsonStringify.js';
 import { FixedDeque } from 'mnemonist';
 import { GIT_COMMIT_INFO, CLI_VERSION } from '../../generated/git-commit.js';
-import { DetectedIde, detectIdeFromEnv } from '../../ide/detect-ide.js';
+import { IDE_DEFINITIONS, detectIdeFromEnv, isCloudShell, } from '../../ide/detect-ide.js';
 export var EventNames;
 (function (EventNames) {
     EventNames["START_SESSION"] = "start_session";
@@ -36,10 +36,12 @@ export var EventNames;
     EventNames["CONTENT_RETRY"] = "content_retry";
     EventNames["CONTENT_RETRY_FAILURE"] = "content_retry_failure";
     EventNames["EXTENSION_ENABLE"] = "extension_enable";
+    EventNames["EXTENSION_DISABLE"] = "extension_disable";
     EventNames["EXTENSION_INSTALL"] = "extension_install";
     EventNames["EXTENSION_UNINSTALL"] = "extension_uninstall";
     EventNames["TOOL_OUTPUT_TRUNCATED"] = "tool_output_truncated";
     EventNames["MODEL_ROUTING"] = "model_routing";
+    EventNames["MODEL_SLASH_COMMAND"] = "model_slash_command";
 })(EventNames || (EventNames = {}));
 /**
  * Determine the surface that the user is currently using.  Surface is effectively the
@@ -54,11 +56,14 @@ function determineSurface() {
     if (process.env['SURFACE']) {
         return process.env['SURFACE'];
     }
+    else if (isCloudShell()) {
+        return IDE_DEFINITIONS.cloudshell.name;
+    }
     else if (process.env['GITHUB_SHA']) {
         return 'GitHub';
     }
     else if (process.env['TERM_PROGRAM'] === 'vscode') {
-        return detectIdeFromEnv() || DetectedIde.VSCode;
+        return detectIdeFromEnv().name || IDE_DEFINITIONS.vscode.name;
     }
     else {
         return 'SURFACE_NOT_SET';
@@ -252,69 +257,69 @@ export class ClearcutLogger {
     logStartSessionEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MODEL,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_MODEL,
                 value: event.model,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_EMBEDDING_MODEL,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_EMBEDDING_MODEL,
                 value: event.embedding_model,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_SANDBOX,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_SANDBOX,
                 value: event.sandbox_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_CORE_TOOLS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_CORE_TOOLS,
                 value: event.core_tools_enabled,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_APPROVAL_MODE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_APPROVAL_MODE,
                 value: event.approval_mode,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_API_KEY_ENABLED,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_API_KEY_ENABLED,
                 value: event.api_key_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_VERTEX_API_ENABLED,
                 value: event.vertex_ai_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_DEBUG_MODE_ENABLED,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_DEBUG_MODE_ENABLED,
                 value: event.debug_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_VERTEX_API_ENABLED,
                 value: event.vertex_ai_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_SERVERS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_MCP_SERVERS,
                 value: event.mcp_servers,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_VERTEX_API_ENABLED,
                 value: event.vertex_ai_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_TELEMETRY_ENABLED,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_TELEMETRY_ENABLED,
                 value: event.telemetry_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_TELEMETRY_LOG_USER_PROMPTS_ENABLED,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_TELEMETRY_LOG_USER_PROMPTS_ENABLED,
                 value: event.telemetry_log_user_prompts_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_SERVERS_COUNT,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_MCP_SERVERS_COUNT,
                 value: event.mcp_servers_count
                     ? event.mcp_servers_count.toString()
                     : '',
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_TOOLS_COUNT,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_MCP_TOOLS_COUNT,
                 value: event.mcp_tools_count?.toString() ?? '',
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_TOOLS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_MCP_TOOLS,
                 value: event.mcp_tools ? event.mcp_tools : '',
             },
         ];
@@ -329,7 +334,7 @@ export class ClearcutLogger {
         this.promptId = event.prompt_id;
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_USER_PROMPT_LENGTH,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_USER_PROMPT_LENGTH,
                 value: JSON.stringify(event.prompt_length),
             },
         ];
@@ -339,44 +344,52 @@ export class ClearcutLogger {
     logToolCallEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_NAME,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_NAME,
                 value: JSON.stringify(event.function_name),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_DECISION,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_DECISION,
                 value: JSON.stringify(event.decision),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_SUCCESS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_SUCCESS,
                 value: JSON.stringify(event.success),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_DURATION_MS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_DURATION_MS,
                 value: JSON.stringify(event.duration_ms),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_ERROR_MESSAGE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_ERROR_MESSAGE,
                 value: JSON.stringify(event.error),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_ERROR_TYPE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_ERROR_TYPE,
                 value: JSON.stringify(event.error_type),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_TYPE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_TYPE,
                 value: JSON.stringify(event.tool_type),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_CONTENT_LENGTH,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_CONTENT_LENGTH,
                 value: JSON.stringify(event.content_length),
             },
+            {
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_MCP_SERVER_NAME,
+                value: JSON.stringify(event.mcp_server_name),
+            },
         ];
         if (event.metadata) {
             const metadataMapping = {
-                model_added_lines: EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
-                model_removed_lines: EventMetadataKey.GEMINI_CLI_AI_REMOVED_LINES,
-                user_added_lines: EventMetadataKey.GEMINI_CLI_USER_ADDED_LINES,
-                user_removed_lines: EventMetadataKey.GEMINI_CLI_USER_REMOVED_LINES,
+                model_added_lines: EventMetadataKey.CELL_CLI_AI_ADDED_LINES,
+                model_removed_lines: EventMetadataKey.CELL_CLI_AI_REMOVED_LINES,
+                model_added_chars: EventMetadataKey.CELL_CLI_AI_ADDED_CHARS,
+                model_removed_chars: EventMetadataKey.CELL_CLI_AI_REMOVED_CHARS,
+                user_added_lines: EventMetadataKey.CELL_CLI_USER_ADDED_LINES,
+                user_removed_lines: EventMetadataKey.CELL_CLI_USER_REMOVED_LINES,
+                user_added_chars: EventMetadataKey.CELL_CLI_USER_ADDED_CHARS,
+                user_removed_chars: EventMetadataKey.CELL_CLI_USER_REMOVED_CHARS,
             };
             for (const [key, gemini_cli_key] of Object.entries(metadataMapping)) {
                 if (event.metadata[key] !== undefined) {
@@ -394,29 +407,29 @@ export class ClearcutLogger {
     logFileOperationEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_NAME,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_NAME,
                 value: JSON.stringify(event.tool_name),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_FILE_OPERATION_TYPE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_FILE_OPERATION_TYPE,
                 value: JSON.stringify(event.operation),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_FILE_OPERATION_LINES,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_FILE_OPERATION_LINES,
                 value: JSON.stringify(event.lines),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_FILE_OPERATION_MIMETYPE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_FILE_OPERATION_MIMETYPE,
                 value: JSON.stringify(event.mimetype),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_FILE_OPERATION_EXTENSION,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_FILE_OPERATION_EXTENSION,
                 value: JSON.stringify(event.extension),
             },
         ];
         if (event.programming_language) {
             data.push({
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_PROGRAMMING_LANGUAGE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_PROGRAMMING_LANGUAGE,
                 value: event.programming_language,
             });
         }
@@ -427,7 +440,7 @@ export class ClearcutLogger {
     logApiRequestEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_REQUEST_MODEL,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_REQUEST_MODEL,
                 value: JSON.stringify(event.model),
             },
         ];
@@ -437,35 +450,35 @@ export class ClearcutLogger {
     logApiResponseEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_MODEL,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_MODEL,
                 value: JSON.stringify(event.model),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_STATUS_CODE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_STATUS_CODE,
                 value: JSON.stringify(event.status_code),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_DURATION_MS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_DURATION_MS,
                 value: JSON.stringify(event.duration_ms),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_INPUT_TOKEN_COUNT,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_INPUT_TOKEN_COUNT,
                 value: JSON.stringify(event.input_token_count),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_OUTPUT_TOKEN_COUNT,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_OUTPUT_TOKEN_COUNT,
                 value: JSON.stringify(event.output_token_count),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_CACHED_TOKEN_COUNT,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_CACHED_TOKEN_COUNT,
                 value: JSON.stringify(event.cached_content_token_count),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_THINKING_TOKEN_COUNT,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_THINKING_TOKEN_COUNT,
                 value: JSON.stringify(event.thoughts_token_count),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_TOOL_TOKEN_COUNT,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_TOOL_TOKEN_COUNT,
                 value: JSON.stringify(event.tool_token_count),
             },
         ];
@@ -475,19 +488,19 @@ export class ClearcutLogger {
     logApiErrorEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_ERROR_MODEL,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_ERROR_MODEL,
                 value: JSON.stringify(event.model),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_ERROR_TYPE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_ERROR_TYPE,
                 value: JSON.stringify(event.error_type),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_ERROR_STATUS_CODE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_ERROR_STATUS_CODE,
                 value: JSON.stringify(event.status_code),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_ERROR_DURATION_MS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_ERROR_DURATION_MS,
                 value: JSON.stringify(event.duration_ms),
             },
         ];
@@ -497,11 +510,11 @@ export class ClearcutLogger {
     logChatCompressionEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_COMPRESSION_TOKENS_BEFORE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_COMPRESSION_TOKENS_BEFORE,
                 value: `${event.tokens_before}`,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_COMPRESSION_TOKENS_AFTER,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_COMPRESSION_TOKENS_AFTER,
                 value: `${event.tokens_after}`,
             },
         ];
@@ -522,7 +535,7 @@ export class ClearcutLogger {
     logLoopDetectedEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_LOOP_DETECTED_TYPE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_LOOP_DETECTED_TYPE,
                 value: JSON.stringify(event.loop_type),
             },
         ];
@@ -537,11 +550,11 @@ export class ClearcutLogger {
     logNextSpeakerCheck(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_RESPONSE_FINISH_REASON,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_RESPONSE_FINISH_REASON,
                 value: JSON.stringify(event.finish_reason),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_NEXT_SPEAKER_CHECK_RESULT,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_NEXT_SPEAKER_CHECK_RESULT,
                 value: JSON.stringify(event.result),
             },
         ];
@@ -551,19 +564,19 @@ export class ClearcutLogger {
     logSlashCommandEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_SLASH_COMMAND_NAME,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_SLASH_COMMAND_NAME,
                 value: JSON.stringify(event.command),
             },
         ];
         if (event.subcommand) {
             data.push({
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_SLASH_COMMAND_SUBCOMMAND,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_SLASH_COMMAND_SUBCOMMAND,
                 value: JSON.stringify(event.subcommand),
             });
         }
         if (event.status) {
             data.push({
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_SLASH_COMMAND_STATUS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_SLASH_COMMAND_STATUS,
                 value: JSON.stringify(event.status),
             });
         }
@@ -573,7 +586,7 @@ export class ClearcutLogger {
     logMalformedJsonResponseEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_MALFORMED_JSON_RESPONSE_MODEL,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_MALFORMED_JSON_RESPONSE_MODEL,
                 value: JSON.stringify(event.model),
             },
         ];
@@ -583,7 +596,7 @@ export class ClearcutLogger {
     logIdeConnectionEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_IDE_CONNECTION_TYPE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_IDE_CONNECTION_TYPE,
                 value: JSON.stringify(event.connection_type),
             },
         ];
@@ -593,15 +606,15 @@ export class ClearcutLogger {
     logConversationFinishedEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_SESSION_ID,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_SESSION_ID,
                 value: this.config?.getSessionId() ?? '',
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONVERSATION_TURN_COUNT,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_CONVERSATION_TURN_COUNT,
                 value: JSON.stringify(event.turnCount),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_APPROVAL_MODE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_APPROVAL_MODE,
                 value: event.approvalMode,
             },
         ];
@@ -611,11 +624,11 @@ export class ClearcutLogger {
     logKittySequenceOverflowEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_KITTY_SEQUENCE_LENGTH,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_KITTY_SEQUENCE_LENGTH,
                 value: event.sequence_length.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_KITTY_TRUNCATED_SEQUENCE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_KITTY_TRUNCATED_SEQUENCE,
                 value: event.truncated_sequence,
             },
         ];
@@ -633,7 +646,7 @@ export class ClearcutLogger {
         const data = [];
         if (event.error_message) {
             data.push({
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_INVALID_CHUNK_ERROR_MESSAGE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_INVALID_CHUNK_ERROR_MESSAGE,
                 value: event.error_message,
             });
         }
@@ -643,17 +656,21 @@ export class ClearcutLogger {
     logContentRetryEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_ATTEMPT_NUMBER,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_ATTEMPT_NUMBER,
                 value: String(event.attempt_number),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_ERROR_TYPE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_ERROR_TYPE,
                 value: event.error_type,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_DELAY_MS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_DELAY_MS,
                 value: String(event.retry_delay_ms),
             },
+            {
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_REQUEST_MODEL,
+                value: event.model,
+            },
         ];
         this.enqueueLogEvent(this.createLogEvent(EventNames.CONTENT_RETRY, data));
         this.flushIfNeeded();
@@ -661,17 +678,21 @@ export class ClearcutLogger {
     logContentRetryFailureEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_TOTAL_ATTEMPTS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_FAILURE_TOTAL_ATTEMPTS,
                 value: String(event.total_attempts),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_FINAL_ERROR_TYPE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_FAILURE_FINAL_ERROR_TYPE,
                 value: event.final_error_type,
             },
+            {
+                gemini_cli_key: EventMetadataKey.CELL_CLI_API_REQUEST_MODEL,
+                value: event.model,
+            },
         ];
         if (event.total_duration_ms) {
             data.push({
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_TOTAL_DURATION_MS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_FAILURE_TOTAL_DURATION_MS,
                 value: String(event.total_duration_ms),
             });
         }
@@ -681,59 +702,63 @@ export class ClearcutLogger {
     logExtensionInstallEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
                 value: event.extension_name,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_VERSION,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_VERSION,
                 value: event.extension_version,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_SOURCE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_SOURCE,
                 value: event.extension_source,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_INSTALL_STATUS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_INSTALL_STATUS,
                 value: event.status,
             },
         ];
         this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_INSTALL, data));
-        this.flushIfNeeded();
+        this.flushToClearcut().catch((error) => {
+            console.debug('Error flushing to Clearcut:', error);
+        });
     }
     logExtensionUninstallEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
                 value: event.extension_name,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_UNINSTALL_STATUS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_UNINSTALL_STATUS,
                 value: event.status,
             },
         ];
         this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_UNINSTALL, data));
-        this.flushIfNeeded();
+        this.flushToClearcut().catch((error) => {
+            console.debug('Error flushing to Clearcut:', error);
+        });
     }
     logToolOutputTruncatedEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_NAME,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_NAME,
                 value: JSON.stringify(event.tool_name),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_ORIGINAL_LENGTH,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_OUTPUT_TRUNCATED_ORIGINAL_LENGTH,
                 value: JSON.stringify(event.original_content_length),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_TRUNCATED_LENGTH,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_OUTPUT_TRUNCATED_TRUNCATED_LENGTH,
                 value: JSON.stringify(event.truncated_content_length),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_THRESHOLD,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_OUTPUT_TRUNCATED_THRESHOLD,
                 value: JSON.stringify(event.threshold),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_LINES,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_OUTPUT_TRUNCATED_LINES,
                 value: JSON.stringify(event.lines),
             },
         ];
@@ -743,25 +768,25 @@ export class ClearcutLogger {
     logModelRoutingEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_ROUTING_DECISION,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_ROUTING_DECISION,
                 value: event.decision_model,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_ROUTING_DECISION_SOURCE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_ROUTING_DECISION_SOURCE,
                 value: event.decision_source,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_ROUTING_LATENCY_MS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_ROUTING_LATENCY_MS,
                 value: event.routing_latency_ms.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_ROUTING_FAILURE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_ROUTING_FAILURE,
                 value: event.failed.toString(),
             },
         ];
         if (event.error_message) {
             data.push({
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_ROUTING_FAILURE_REASON,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_ROUTING_FAILURE_REASON,
                 value: event.error_message,
             });
         }
@@ -771,17 +796,45 @@ export class ClearcutLogger {
     logExtensionEnableEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
                 value: event.extension_name,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ENABLE_SETTING_SCOPE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_ENABLE_SETTING_SCOPE,
                 value: event.setting_scope,
             },
         ];
         this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_ENABLE, data));
+        this.flushToClearcut().catch((error) => {
+            console.debug('Error flushing to Clearcut:', error);
+        });
+    }
+    logModelSlashCommandEvent(event) {
+        const data = [
+            {
+                gemini_cli_key: EventMetadataKey.CELL_CLI_MODEL_SLASH_COMMAND,
+                value: event.model_name,
+            },
+        ];
+        this.enqueueLogEvent(this.createLogEvent(EventNames.MODEL_SLASH_COMMAND, data));
         this.flushIfNeeded();
     }
+    logExtensionDisableEvent(event) {
+        const data = [
+            {
+                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
+                value: event.extension_name,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_DISABLE_SETTING_SCOPE,
+                value: event.setting_scope,
+            },
+        ];
+        this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_DISABLE, data));
+        this.flushToClearcut().catch((error) => {
+            console.debug('Error flushing to Clearcut:', error);
+        });
+    }
     /**
      * Adds default fields to data, and returns a new data array.  This fields
      * should exist on all log events.
@@ -790,43 +843,43 @@ export class ClearcutLogger {
         const surface = determineSurface();
         const defaultLogMetadata = [
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_SESSION_ID,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_SESSION_ID,
                 value: this.config?.getSessionId() ?? '',
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AUTH_TYPE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_AUTH_TYPE,
                 value: JSON.stringify(this.config?.getContentGeneratorConfig()?.authType),
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_GOOGLE_ACCOUNTS_COUNT,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_GOOGLE_ACCOUNTS_COUNT,
                 value: `${totalAccounts}`,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_SURFACE,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_SURFACE,
                 value: surface,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_VERSION,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_VERSION,
                 value: CLI_VERSION,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_GIT_COMMIT_HASH,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_GIT_COMMIT_HASH,
                 value: GIT_COMMIT_INFO,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_PROMPT_ID,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_PROMPT_ID,
                 value: this.promptId,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_OS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_OS,
                 value: process.platform,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_NODE_VERSION,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_NODE_VERSION,
                 value: process.versions.node,
             },
             {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_USER_SETTINGS,
+                gemini_cli_key: EventMetadataKey.CELL_CLI_USER_SETTINGS,
                 value: safeJsonStringify([
                     {
                         smart_edit_enabled: this.config?.getUseSmartEdit() ?? false,