@machina.ai/cell-cli-core 1.13.0-rc4 → 1.16.0-rc1

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

@@ -50,10 +50,11 @@ export var EventNames;
     EventNames["AGENT_FINISH"] = "agent_finish";
     EventNames["RECOVERY_ATTEMPT"] = "recovery_attempt";
     EventNames["WEB_FETCH_FALLBACK_ATTEMPT"] = "web_fetch_fallback_attempt";
+    EventNames["LLM_LOOP_CHECK"] = "llm_loop_check";
 })(EventNames || (EventNames = {}));
 /**
  * Determine the surface that the user is currently using.  Surface is effectively the
- * distribution channel in which the user is using Gemini CLI.  Gemini CLI comes bundled
+ * distribution channel in which the user is using Cell CLI.  Cell CLI comes bundled
  * w/ Firebase Studio and Cloud Shell.  Users that manually download themselves will
  * likely be "SURFACE_NOT_SET".
  *
@@ -153,6 +154,7 @@ export class ClearcutLogger {
                 {
                     event_time_ms: Date.now(),
                     source_extension_json: safeJsonStringify(event),
+                    gws_experiment: this.config?.getExperiments()?.experimentIds ?? [],
                 },
             ]);
             if (wasAtCapacity && this.config?.getDebugMode()) {
@@ -175,19 +177,19 @@ export class ClearcutLogger {
                 [
                     ...data,
                     {
-                        gemini_cli_key: EventMetadataKey.CELL_CLI_SURFACE,
+                        CELL_CLI_key: EventMetadataKey.CELL_CLI_SURFACE,
                         value: surface,
                     },
                     {
-                        gemini_cli_key: EventMetadataKey.CELL_CLI_VERSION,
+                        CELL_CLI_key: EventMetadataKey.CELL_CLI_VERSION,
                         value: CLI_VERSION,
                     },
                     {
-                        gemini_cli_key: EventMetadataKey.CELL_CLI_GIT_COMMIT_HASH,
+                        CELL_CLI_key: EventMetadataKey.CELL_CLI_GIT_COMMIT_HASH,
                         value: GIT_COMMIT_INFO,
                     },
                     {
-                        gemini_cli_key: EventMetadataKey.CELL_CLI_OS,
+                        CELL_CLI_key: EventMetadataKey.CELL_CLI_OS,
                         value: process.platform,
                     },
                 ],
@@ -289,78 +291,78 @@ export class ClearcutLogger {
     logStartSessionEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_MODEL,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_MODEL,
                 value: event.model,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_EMBEDDING_MODEL,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_EMBEDDING_MODEL,
                 value: event.embedding_model,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_SANDBOX,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_SANDBOX,
                 value: event.sandbox_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_CORE_TOOLS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_CORE_TOOLS,
                 value: event.core_tools_enabled,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_APPROVAL_MODE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_APPROVAL_MODE,
                 value: event.approval_mode,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_API_KEY_ENABLED,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_API_KEY_ENABLED,
                 value: event.api_key_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_VERTEX_API_ENABLED,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_VERTEX_API_ENABLED,
                 value: event.vertex_ai_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_DEBUG_MODE_ENABLED,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_DEBUG_MODE_ENABLED,
                 value: event.debug_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_VERTEX_API_ENABLED,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_VERTEX_API_ENABLED,
                 value: event.vertex_ai_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_MCP_SERVERS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_MCP_SERVERS,
                 value: event.mcp_servers,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_VERTEX_API_ENABLED,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_VERTEX_API_ENABLED,
                 value: event.vertex_ai_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_TELEMETRY_ENABLED,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_TELEMETRY_ENABLED,
                 value: event.telemetry_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_TELEMETRY_LOG_USER_PROMPTS_ENABLED,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_TELEMETRY_LOG_USER_PROMPTS_ENABLED,
                 value: event.telemetry_log_user_prompts_enabled.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_MCP_SERVERS_COUNT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_MCP_SERVERS_COUNT,
                 value: event.mcp_servers_count
                     ? event.mcp_servers_count.toString()
                     : '',
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_MCP_TOOLS_COUNT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_MCP_TOOLS_COUNT,
                 value: event.mcp_tools_count?.toString() ?? '',
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_MCP_TOOLS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_MCP_TOOLS,
                 value: event.mcp_tools ? event.mcp_tools : '',
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_EXTENSIONS_COUNT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_EXTENSIONS_COUNT,
                 value: event.extensions_count.toString(),
             },
             // We deliberately do not log the names of extensions here, to be safe.
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_START_SESSION_EXTENSION_IDS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_START_SESSION_EXTENSION_IDS,
                 value: event.extension_ids.toString(),
             },
         ];
@@ -375,7 +377,7 @@ export class ClearcutLogger {
         this.promptId = event.prompt_id;
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_USER_PROMPT_LENGTH,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_USER_PROMPT_LENGTH,
                 value: JSON.stringify(event.prompt_length),
             },
         ];
@@ -385,35 +387,35 @@ export class ClearcutLogger {
     logToolCallEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_NAME,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_CALL_NAME,
                 value: JSON.stringify(event.function_name),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_DECISION,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_CALL_DECISION,
                 value: JSON.stringify(event.decision),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_SUCCESS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_CALL_SUCCESS,
                 value: JSON.stringify(event.success),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_DURATION_MS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_CALL_DURATION_MS,
                 value: JSON.stringify(event.duration_ms),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_ERROR_TYPE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_CALL_ERROR_TYPE,
                 value: JSON.stringify(event.error_type),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_TYPE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_TYPE,
                 value: JSON.stringify(event.tool_type),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_CONTENT_LENGTH,
+                CELL_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,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_CALL_MCP_SERVER_NAME,
                 value: JSON.stringify(event.mcp_server_name),
             },
         ];
@@ -428,10 +430,10 @@ export class ClearcutLogger {
                 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)) {
+            for (const [key, CELL_CLI_key] of Object.entries(metadataMapping)) {
                 if (event.metadata[key] !== undefined) {
                     data.push({
-                        gemini_cli_key,
+                        CELL_CLI_key,
                         value: JSON.stringify(event.metadata[key]),
                     });
                 }
@@ -439,7 +441,7 @@ export class ClearcutLogger {
         }
         if (event.extension_id) {
             data.push({
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
                 value: event.extension_id,
             });
         }
@@ -450,29 +452,29 @@ export class ClearcutLogger {
     logFileOperationEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_NAME,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_CALL_NAME,
                 value: JSON.stringify(event.tool_name),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_FILE_OPERATION_TYPE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_FILE_OPERATION_TYPE,
                 value: JSON.stringify(event.operation),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_FILE_OPERATION_LINES,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_FILE_OPERATION_LINES,
                 value: JSON.stringify(event.lines),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_FILE_OPERATION_MIMETYPE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_FILE_OPERATION_MIMETYPE,
                 value: JSON.stringify(event.mimetype),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_FILE_OPERATION_EXTENSION,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_FILE_OPERATION_EXTENSION,
                 value: JSON.stringify(event.extension),
             },
         ];
         if (event.programming_language) {
             data.push({
-                gemini_cli_key: EventMetadataKey.CELL_CLI_PROGRAMMING_LANGUAGE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_PROGRAMMING_LANGUAGE,
                 value: event.programming_language,
             });
         }
@@ -483,7 +485,7 @@ export class ClearcutLogger {
     logApiRequestEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_REQUEST_MODEL,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_REQUEST_MODEL,
                 value: JSON.stringify(event.model),
             },
         ];
@@ -493,35 +495,35 @@ export class ClearcutLogger {
     logApiResponseEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_MODEL,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_RESPONSE_MODEL,
                 value: JSON.stringify(event.model),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_STATUS_CODE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_RESPONSE_STATUS_CODE,
                 value: JSON.stringify(event.status_code),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_DURATION_MS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_RESPONSE_DURATION_MS,
                 value: JSON.stringify(event.duration_ms),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_INPUT_TOKEN_COUNT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_RESPONSE_INPUT_TOKEN_COUNT,
                 value: JSON.stringify(event.usage.input_token_count),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_OUTPUT_TOKEN_COUNT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_RESPONSE_OUTPUT_TOKEN_COUNT,
                 value: JSON.stringify(event.usage.output_token_count),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_CACHED_TOKEN_COUNT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_RESPONSE_CACHED_TOKEN_COUNT,
                 value: JSON.stringify(event.usage.cached_content_token_count),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_THINKING_TOKEN_COUNT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_RESPONSE_THINKING_TOKEN_COUNT,
                 value: JSON.stringify(event.usage.thoughts_token_count),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_RESPONSE_TOOL_TOKEN_COUNT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_RESPONSE_TOOL_TOKEN_COUNT,
                 value: JSON.stringify(event.usage.tool_token_count),
             },
         ];
@@ -531,19 +533,19 @@ export class ClearcutLogger {
     logApiErrorEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_ERROR_MODEL,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_ERROR_MODEL,
                 value: JSON.stringify(event.model),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_ERROR_TYPE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_ERROR_TYPE,
                 value: JSON.stringify(event.error_type),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_ERROR_STATUS_CODE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_ERROR_STATUS_CODE,
                 value: JSON.stringify(event.status_code),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_ERROR_DURATION_MS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_ERROR_DURATION_MS,
                 value: JSON.stringify(event.duration_ms),
             },
         ];
@@ -553,11 +555,11 @@ export class ClearcutLogger {
     logChatCompressionEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_COMPRESSION_TOKENS_BEFORE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_COMPRESSION_TOKENS_BEFORE,
                 value: `${event.tokens_before}`,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_COMPRESSION_TOKENS_AFTER,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_COMPRESSION_TOKENS_AFTER,
                 value: `${event.tokens_after}`,
             },
         ];
@@ -578,10 +580,16 @@ export class ClearcutLogger {
     logLoopDetectedEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_LOOP_DETECTED_TYPE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_LOOP_DETECTED_TYPE,
                 value: JSON.stringify(event.loop_type),
             },
         ];
+        if (event.confirmed_by_model) {
+            data.push({
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_LOOP_DETECTED_CONFIRMED_BY_MODEL,
+                value: event.confirmed_by_model,
+            });
+        }
         this.enqueueLogEvent(this.createLogEvent(EventNames.LOOP_DETECTED, data));
         this.flushIfNeeded();
     }
@@ -593,11 +601,11 @@ export class ClearcutLogger {
     logNextSpeakerCheck(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_RESPONSE_FINISH_REASON,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_RESPONSE_FINISH_REASON,
                 value: JSON.stringify(event.finish_reason),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_NEXT_SPEAKER_CHECK_RESULT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_NEXT_SPEAKER_CHECK_RESULT,
                 value: JSON.stringify(event.result),
             },
         ];
@@ -607,25 +615,25 @@ export class ClearcutLogger {
     logSlashCommandEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_SLASH_COMMAND_NAME,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_SLASH_COMMAND_NAME,
                 value: JSON.stringify(event.command),
             },
         ];
         if (event.subcommand) {
             data.push({
-                gemini_cli_key: EventMetadataKey.CELL_CLI_SLASH_COMMAND_SUBCOMMAND,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_SLASH_COMMAND_SUBCOMMAND,
                 value: JSON.stringify(event.subcommand),
             });
         }
         if (event.status) {
             data.push({
-                gemini_cli_key: EventMetadataKey.CELL_CLI_SLASH_COMMAND_STATUS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_SLASH_COMMAND_STATUS,
                 value: JSON.stringify(event.status),
             });
         }
         if (event.extension_id) {
             data.push({
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
                 value: event.extension_id,
             });
         }
@@ -635,7 +643,7 @@ export class ClearcutLogger {
     logMalformedJsonResponseEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_MALFORMED_JSON_RESPONSE_MODEL,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_MALFORMED_JSON_RESPONSE_MODEL,
                 value: JSON.stringify(event.model),
             },
         ];
@@ -645,7 +653,7 @@ export class ClearcutLogger {
     logIdeConnectionEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_IDE_CONNECTION_TYPE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_IDE_CONNECTION_TYPE,
                 value: JSON.stringify(event.connection_type),
             },
         ];
@@ -655,31 +663,21 @@ export class ClearcutLogger {
     logConversationFinishedEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_SESSION_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_SESSION_ID,
                 value: this.config?.getSessionId() ?? '',
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_CONVERSATION_TURN_COUNT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_CONVERSATION_TURN_COUNT,
                 value: JSON.stringify(event.turnCount),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_APPROVAL_MODE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_APPROVAL_MODE,
                 value: event.approvalMode,
             },
         ];
         this.enqueueLogEvent(this.createLogEvent(EventNames.CONVERSATION_FINISHED, data));
         this.flushIfNeeded();
     }
-    logKittySequenceOverflowEvent(event) {
-        const data = [
-            {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_KITTY_SEQUENCE_LENGTH,
-                value: event.sequence_length.toString(),
-            },
-        ];
-        this.enqueueLogEvent(this.createLogEvent(EventNames.KITTY_SEQUENCE_OVERFLOW, data));
-        this.flushIfNeeded();
-    }
     logEndSessionEvent() {
         // Flush immediately on session end.
         this.enqueueLogEvent(this.createLogEvent(EventNames.END_SESSION, []));
@@ -691,7 +689,7 @@ export class ClearcutLogger {
         const data = [];
         if (event.error_message) {
             data.push({
-                gemini_cli_key: EventMetadataKey.CELL_CLI_INVALID_CHUNK_ERROR_MESSAGE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_INVALID_CHUNK_ERROR_MESSAGE,
                 value: event.error_message,
             });
         }
@@ -701,19 +699,19 @@ export class ClearcutLogger {
     logContentRetryEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_ATTEMPT_NUMBER,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_ATTEMPT_NUMBER,
                 value: String(event.attempt_number),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_ERROR_TYPE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_ERROR_TYPE,
                 value: event.error_type,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_DELAY_MS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_DELAY_MS,
                 value: String(event.retry_delay_ms),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_API_REQUEST_MODEL,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_REQUEST_MODEL,
                 value: event.model,
             },
         ];
@@ -723,127 +721,127 @@ export class ClearcutLogger {
     logContentRetryFailureEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_FAILURE_TOTAL_ATTEMPTS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_FAILURE_TOTAL_ATTEMPTS,
                 value: String(event.total_attempts),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_FAILURE_FINAL_ERROR_TYPE,
+                CELL_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,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_API_REQUEST_MODEL,
                 value: event.model,
             },
         ];
         if (event.total_duration_ms) {
             data.push({
-                gemini_cli_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_FAILURE_TOTAL_DURATION_MS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_CONTENT_RETRY_FAILURE_TOTAL_DURATION_MS,
                 value: String(event.total_duration_ms),
             });
         }
         this.enqueueLogEvent(this.createLogEvent(EventNames.CONTENT_RETRY_FAILURE, data));
         this.flushIfNeeded();
     }
-    logExtensionInstallEvent(event) {
+    async logExtensionInstallEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
                 value: event.extension_name,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
                 value: event.extension_id,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_VERSION,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_VERSION,
                 value: event.extension_version,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_SOURCE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_SOURCE,
                 value: event.extension_source,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_INSTALL_STATUS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_INSTALL_STATUS,
                 value: event.status,
             },
         ];
         this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_INSTALL, data));
-        this.flushToClearcut().catch((error) => {
+        await this.flushToClearcut().catch((error) => {
             debugLogger.debug('Error flushing to Clearcut:', error);
         });
     }
-    logExtensionUninstallEvent(event) {
+    async logExtensionUninstallEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
                 value: event.extension_name,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
                 value: event.extension_id,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_UNINSTALL_STATUS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_UNINSTALL_STATUS,
                 value: event.status,
             },
         ];
         this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_UNINSTALL, data));
-        this.flushToClearcut().catch((error) => {
+        await this.flushToClearcut().catch((error) => {
             debugLogger.debug('Error flushing to Clearcut:', error);
         });
     }
-    logExtensionUpdateEvent(event) {
+    async logExtensionUpdateEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
                 value: event.extension_name,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
                 value: event.extension_id,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_VERSION,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_VERSION,
                 value: event.extension_version,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_PREVIOUS_VERSION,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_PREVIOUS_VERSION,
                 value: event.extension_previous_version,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_SOURCE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_SOURCE,
                 value: event.extension_source,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_UPDATE_STATUS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_UPDATE_STATUS,
                 value: event.status,
             },
         ];
         this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_UPDATE, data));
-        this.flushToClearcut().catch((error) => {
+        await this.flushToClearcut().catch((error) => {
             debugLogger.debug('Error flushing to Clearcut:', error);
         });
     }
     logToolOutputTruncatedEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_CALL_NAME,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_CALL_NAME,
                 value: JSON.stringify(event.tool_name),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_OUTPUT_TRUNCATED_ORIGINAL_LENGTH,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_OUTPUT_TRUNCATED_ORIGINAL_LENGTH,
                 value: JSON.stringify(event.original_content_length),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_OUTPUT_TRUNCATED_TRUNCATED_LENGTH,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_OUTPUT_TRUNCATED_TRUNCATED_LENGTH,
                 value: JSON.stringify(event.truncated_content_length),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_OUTPUT_TRUNCATED_THRESHOLD,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_OUTPUT_TRUNCATED_THRESHOLD,
                 value: JSON.stringify(event.threshold),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_TOOL_OUTPUT_TRUNCATED_LINES,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_TOOL_OUTPUT_TRUNCATED_LINES,
                 value: JSON.stringify(event.lines),
             },
         ];
@@ -853,85 +851,85 @@ export class ClearcutLogger {
     logModelRoutingEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_ROUTING_DECISION,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_ROUTING_DECISION,
                 value: event.decision_model,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_ROUTING_DECISION_SOURCE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_ROUTING_DECISION_SOURCE,
                 value: event.decision_source,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_ROUTING_LATENCY_MS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_ROUTING_LATENCY_MS,
                 value: event.routing_latency_ms.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_ROUTING_FAILURE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_ROUTING_FAILURE,
                 value: event.failed.toString(),
             },
         ];
         if (event.error_message) {
             data.push({
-                gemini_cli_key: EventMetadataKey.CELL_CLI_ROUTING_FAILURE_REASON,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_ROUTING_FAILURE_REASON,
                 value: event.error_message,
             });
         }
         this.enqueueLogEvent(this.createLogEvent(EventNames.MODEL_ROUTING, data));
         this.flushIfNeeded();
     }
-    logExtensionEnableEvent(event) {
+    async logExtensionEnableEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
                 value: event.extension_name,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
                 value: event.extension_id,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_ENABLE_SETTING_SCOPE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_ENABLE_SETTING_SCOPE,
                 value: event.setting_scope,
             },
         ];
         this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_ENABLE, data));
-        this.flushToClearcut().catch((error) => {
+        await this.flushToClearcut().catch((error) => {
             debugLogger.debug('Error flushing to Clearcut:', error);
         });
     }
     logModelSlashCommandEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_MODEL_SLASH_COMMAND,
+                CELL_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) {
+    async logExtensionDisableEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_NAME,
                 value: event.extension_name,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_ID,
                 value: event.extension_id,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_EXTENSION_DISABLE_SETTING_SCOPE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_EXTENSION_DISABLE_SETTING_SCOPE,
                 value: event.setting_scope,
             },
         ];
         this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_DISABLE, data));
-        this.flushToClearcut().catch((error) => {
+        await this.flushToClearcut().catch((error) => {
             debugLogger.debug('Error flushing to Clearcut:', error);
         });
     }
     logSmartEditStrategyEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_SMART_EDIT_STRATEGY,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_SMART_EDIT_STRATEGY,
                 value: event.strategy,
             },
         ];
@@ -941,7 +939,7 @@ export class ClearcutLogger {
     logSmartEditCorrectionEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_SMART_EDIT_CORRECTION,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_SMART_EDIT_CORRECTION,
                 value: event.correction,
             },
         ];
@@ -951,11 +949,11 @@ export class ClearcutLogger {
     logAgentStartEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_ID,
                 value: event.agent_id,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_NAME,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_NAME,
                 value: event.agent_name,
             },
         ];
@@ -965,23 +963,23 @@ export class ClearcutLogger {
     logAgentFinishEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_ID,
                 value: event.agent_id,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_NAME,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_NAME,
                 value: event.agent_name,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_DURATION_MS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_DURATION_MS,
                 value: event.duration_ms.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_TURN_COUNT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_TURN_COUNT,
                 value: event.turn_count.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_TERMINATE_REASON,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_TERMINATE_REASON,
                 value: event.terminate_reason,
             },
         ];
@@ -991,27 +989,27 @@ export class ClearcutLogger {
     logRecoveryAttemptEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_ID,
                 value: event.agent_id,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_NAME,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_NAME,
                 value: event.agent_name,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_RECOVERY_REASON,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_RECOVERY_REASON,
                 value: event.reason,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_RECOVERY_DURATION_MS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_RECOVERY_DURATION_MS,
                 value: event.duration_ms.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_RECOVERY_SUCCESS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_RECOVERY_SUCCESS,
                 value: event.success.toString(),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AGENT_TURN_COUNT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AGENT_TURN_COUNT,
                 value: event.turn_count.toString(),
             },
         ];
@@ -1021,13 +1019,35 @@ export class ClearcutLogger {
     logWebFetchFallbackAttemptEvent(event) {
         const data = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_WEB_FETCH_FALLBACK_REASON,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_WEB_FETCH_FALLBACK_REASON,
                 value: event.reason,
             },
         ];
         this.enqueueLogEvent(this.createLogEvent(EventNames.WEB_FETCH_FALLBACK_ATTEMPT, data));
         this.flushIfNeeded();
     }
+    logLlmLoopCheckEvent(event) {
+        const data = [
+            {
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_PROMPT_ID,
+                value: event.prompt_id,
+            },
+            {
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_LLM_LOOP_CHECK_FLASH_CONFIDENCE,
+                value: event.flash_confidence.toString(),
+            },
+            {
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_LLM_LOOP_CHECK_MAIN_MODEL,
+                value: event.main_model,
+            },
+            {
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_LLM_LOOP_CHECK_MAIN_MODEL_CONFIDENCE,
+                value: event.main_model_confidence.toString(),
+            },
+        ];
+        this.enqueueLogEvent(this.createLogEvent(EventNames.LLM_LOOP_CHECK, data));
+        this.flushIfNeeded();
+    }
     /**
      * Adds default fields to data, and returns a new data array.  This fields
      * should exist on all log events.
@@ -1035,29 +1055,33 @@ export class ClearcutLogger {
     addDefaultFields(data, totalAccounts) {
         const defaultLogMetadata = [
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_SESSION_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_SESSION_ID,
                 value: this.config?.getSessionId() ?? '',
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_AUTH_TYPE,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_AUTH_TYPE,
                 value: JSON.stringify(this.config?.getContentGeneratorConfig()?.authType),
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_GOOGLE_ACCOUNTS_COUNT,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_GOOGLE_ACCOUNTS_COUNT,
                 value: `${totalAccounts}`,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_PROMPT_ID,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_PROMPT_ID,
                 value: this.promptId,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_NODE_VERSION,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_NODE_VERSION,
                 value: process.versions.node,
             },
             {
-                gemini_cli_key: EventMetadataKey.CELL_CLI_USER_SETTINGS,
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_USER_SETTINGS,
                 value: this.getConfigJson(),
             },
+            {
+                CELL_CLI_key: EventMetadataKey.CELL_CLI_INTERACTIVE,
+                value: this.config?.isInteractive().toString() ?? 'false',
+            },
         ];
         return [...data, ...defaultLogMetadata];
     }