@office-ai/aioncli-core 0.8.1 → 0.18.4

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

@@ -7,10 +7,11 @@ import { HttpsProxyAgent } from 'https-proxy-agent';
 import { EventMetadataKey } from './event-metadata-key.js';
 import { InstallationManager } from '../../utils/installationManager.js';
 import { UserAccountManager } from '../../utils/userAccountManager.js';
-import { safeJsonStringify } from '../../utils/safeJsonStringify.js';
+import { safeJsonStringify, safeJsonStringifyBooleanValuesOnly, } from '../../utils/safeJsonStringify.js';
 import { FixedDeque } from 'mnemonist';
 import { GIT_COMMIT_INFO, CLI_VERSION } from '../../generated/git-commit.js';
 import { IDE_DEFINITIONS, detectIdeFromEnv, isCloudShell, } from '../../ide/detect-ide.js';
+import { debugLogger } from '../../utils/debugLogger.js';
 export var EventNames;
 (function (EventNames) {
     EventNames["START_SESSION"] = "start_session";
@@ -39,9 +40,17 @@ export var EventNames;
     EventNames["EXTENSION_DISABLE"] = "extension_disable";
     EventNames["EXTENSION_INSTALL"] = "extension_install";
     EventNames["EXTENSION_UNINSTALL"] = "extension_uninstall";
+    EventNames["EXTENSION_UPDATE"] = "extension_update";
     EventNames["TOOL_OUTPUT_TRUNCATED"] = "tool_output_truncated";
     EventNames["MODEL_ROUTING"] = "model_routing";
     EventNames["MODEL_SLASH_COMMAND"] = "model_slash_command";
+    EventNames["SMART_EDIT_STRATEGY"] = "smart_edit_strategy";
+    EventNames["SMART_EDIT_CORRECTION"] = "smart_edit_correction";
+    EventNames["AGENT_START"] = "agent_start";
+    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
@@ -69,6 +78,12 @@ function determineSurface() {
         return 'SURFACE_NOT_SET';
     }
 }
+/**
+ * Determines the GitHub Actions workflow name if the CLI is running in a GitHub Actions environment.
+ */
+function determineGHWorkflowName() {
+    return process.env['GH_WORKFLOW_NAME'];
+}
 /**
  * Clearcut URL to send logging events to.
  */
@@ -145,10 +160,11 @@ export class ClearcutLogger {
                 {
                     event_time_ms: Date.now(),
                     source_extension_json: safeJsonStringify(event),
+                    gws_experiment: this.config?.getExperiments()?.experimentIds ?? [],
                 },
             ]);
             if (wasAtCapacity && this.config?.getDebugMode()) {
-                console.debug(`ClearcutLogger: Dropped old event to prevent memory leak (queue size: ${this.events.size})`);
+                debugLogger.debug(`ClearcutLogger: Dropped old event to prevent memory leak (queue size: ${this.events.size})`);
             }
         }
         catch (error) {
@@ -157,6 +173,41 @@ export class ClearcutLogger {
             }
         }
     }
+    createBasicLogEvent(eventName, data = []) {
+        const surface = determineSurface();
+        const ghWorkflowName = determineGHWorkflowName();
+        const baseMetadata = [
+            ...data,
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_SURFACE,
+                value: surface,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_VERSION,
+                value: CLI_VERSION,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_GIT_COMMIT_HASH,
+                value: GIT_COMMIT_INFO,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_OS,
+                value: process.platform,
+            },
+        ];
+        if (ghWorkflowName) {
+            baseMetadata.push({
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_GH_WORKFLOW_NAME,
+                value: ghWorkflowName,
+            });
+        }
+        return {
+            console_type: 'GEMINI_CLI',
+            application: 102, // GEMINI_CLI
+            event_name: eventName,
+            event_metadata: [baseMetadata],
+        };
+    }
     createLogEvent(eventName, data = []) {
         const email = this.userAccountManager.getCachedGoogleAccount();
         if (eventName !== EventNames.START_SESSION) {
@@ -164,12 +215,7 @@ export class ClearcutLogger {
         }
         const totalAccounts = this.userAccountManager.getLifetimeGoogleAccounts();
         data = this.addDefaultFields(data, totalAccounts);
-        const logEvent = {
-            console_type: 'GEMINI_CLI',
-            application: 102, // GEMINI_CLI
-            event_name: eventName,
-            event_metadata: [data],
-        };
+        const logEvent = this.createBasicLogEvent(eventName, data);
         // Should log either email or install ID, not both. See go/cloudmill-1p-oss-instrumentation#define-sessionable-id
         if (email) {
             logEvent.client_email = email;
@@ -184,20 +230,20 @@ export class ClearcutLogger {
             return;
         }
         this.flushToClearcut().catch((error) => {
-            console.debug('Error flushing to Clearcut:', error);
+            debugLogger.debug('Error flushing to Clearcut:', error);
         });
     }
     async flushToClearcut() {
         if (this.flushing) {
             if (this.config?.getDebugMode()) {
-                console.debug('ClearcutLogger: Flush already in progress, marking pending flush.');
+                debugLogger.debug('ClearcutLogger: Flush already in progress, marking pending flush.');
             }
             this.pendingFlush = true;
             return Promise.resolve({});
         }
         this.flushing = true;
         if (this.config?.getDebugMode()) {
-            console.log('Flushing log events to Clearcut.');
+            debugLogger.log('Flushing log events to Clearcut.');
         }
         const eventsToSend = this.events.toArray();
         this.events.clear();
@@ -248,7 +294,7 @@ export class ClearcutLogger {
             // Fire and forget the pending flush
             this.flushToClearcut().catch((error) => {
                 if (this.config?.getDebugMode()) {
-                    console.debug('Error in pending flush to Clearcut:', error);
+                    debugLogger.debug('Error in pending flush to Clearcut:', error);
                 }
             });
         }
@@ -322,12 +368,21 @@ export class ClearcutLogger {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_TOOLS,
                 value: event.mcp_tools ? event.mcp_tools : '',
             },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_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.GEMINI_CLI_START_SESSION_EXTENSION_IDS,
+                value: event.extension_ids.toString(),
+            },
         ];
         this.sessionData = data;
         // Flush start event immediately
         this.enqueueLogEvent(this.createLogEvent(EventNames.START_SESSION, data));
         this.flushToClearcut().catch((error) => {
-            console.debug('Error flushing to Clearcut:', error);
+            debugLogger.debug('Error flushing to Clearcut:', error);
         });
     }
     logNewPromptEvent(event) {
@@ -359,10 +414,6 @@ export class ClearcutLogger {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_DURATION_MS,
                 value: JSON.stringify(event.duration_ms),
             },
-            {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_ERROR_MESSAGE,
-                value: JSON.stringify(event.error),
-            },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_ERROR_TYPE,
                 value: JSON.stringify(event.error_type),
@@ -400,6 +451,12 @@ export class ClearcutLogger {
                 }
             }
         }
+        if (event.extension_id) {
+            data.push({
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+                value: event.extension_id,
+            });
+        }
         const logEvent = this.createLogEvent(EventNames.TOOL_CALL, data);
         this.enqueueLogEvent(logEvent);
         this.flushIfNeeded();
@@ -463,23 +520,23 @@ export class ClearcutLogger {
             },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_INPUT_TOKEN_COUNT,
-                value: JSON.stringify(event.input_token_count),
+                value: JSON.stringify(event.usage.input_token_count),
             },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_OUTPUT_TOKEN_COUNT,
-                value: JSON.stringify(event.output_token_count),
+                value: JSON.stringify(event.usage.output_token_count),
             },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_CACHED_TOKEN_COUNT,
-                value: JSON.stringify(event.cached_content_token_count),
+                value: JSON.stringify(event.usage.cached_content_token_count),
             },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_THINKING_TOKEN_COUNT,
-                value: JSON.stringify(event.thoughts_token_count),
+                value: JSON.stringify(event.usage.thoughts_token_count),
             },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_TOOL_TOKEN_COUNT,
-                value: JSON.stringify(event.tool_token_count),
+                value: JSON.stringify(event.usage.tool_token_count),
             },
         ];
         this.enqueueLogEvent(this.createLogEvent(EventNames.API_RESPONSE, data));
@@ -523,13 +580,13 @@ export class ClearcutLogger {
     logFlashFallbackEvent() {
         this.enqueueLogEvent(this.createLogEvent(EventNames.FLASH_FALLBACK, []));
         this.flushToClearcut().catch((error) => {
-            console.debug('Error flushing to Clearcut:', error);
+            debugLogger.debug('Error flushing to Clearcut:', error);
         });
     }
     logRipgrepFallbackEvent() {
         this.enqueueLogEvent(this.createLogEvent(EventNames.RIPGREP_FALLBACK, []));
         this.flushToClearcut().catch((error) => {
-            console.debug('Error flushing to Clearcut:', error);
+            debugLogger.debug('Error flushing to Clearcut:', error);
         });
     }
     logLoopDetectedEvent(event) {
@@ -539,6 +596,12 @@ export class ClearcutLogger {
                 value: JSON.stringify(event.loop_type),
             },
         ];
+        if (event.confirmed_by_model) {
+            data.push({
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_LOOP_DETECTED_CONFIRMED_BY_MODEL,
+                value: event.confirmed_by_model,
+            });
+        }
         this.enqueueLogEvent(this.createLogEvent(EventNames.LOOP_DETECTED, data));
         this.flushIfNeeded();
     }
@@ -580,6 +643,12 @@ export class ClearcutLogger {
                 value: JSON.stringify(event.status),
             });
         }
+        if (event.extension_id) {
+            data.push({
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+                value: event.extension_id,
+            });
+        }
         this.enqueueLogEvent(this.createLogEvent(EventNames.SLASH_COMMAND, data));
         this.flushIfNeeded();
     }
@@ -621,25 +690,11 @@ export class ClearcutLogger {
         this.enqueueLogEvent(this.createLogEvent(EventNames.CONVERSATION_FINISHED, data));
         this.flushIfNeeded();
     }
-    logKittySequenceOverflowEvent(event) {
-        const data = [
-            {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_KITTY_SEQUENCE_LENGTH,
-                value: event.sequence_length.toString(),
-            },
-            {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_KITTY_TRUNCATED_SEQUENCE,
-                value: event.truncated_sequence,
-            },
-        ];
-        this.enqueueLogEvent(this.createLogEvent(EventNames.KITTY_SEQUENCE_OVERFLOW, data));
-        this.flushIfNeeded();
-    }
     logEndSessionEvent() {
         // Flush immediately on session end.
         this.enqueueLogEvent(this.createLogEvent(EventNames.END_SESSION, []));
         this.flushToClearcut().catch((error) => {
-            console.debug('Error flushing to Clearcut:', error);
+            debugLogger.debug('Error flushing to Clearcut:', error);
         });
     }
     logInvalidChunkEvent(event) {
@@ -699,12 +754,16 @@ export class ClearcutLogger {
         this.enqueueLogEvent(this.createLogEvent(EventNames.CONTENT_RETRY_FAILURE, data));
         this.flushIfNeeded();
     }
-    logExtensionInstallEvent(event) {
+    async logExtensionInstallEvent(event) {
         const data = [
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
                 value: event.extension_name,
             },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+                value: event.extension_id,
+            },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_VERSION,
                 value: event.extension_version,
@@ -718,22 +777,62 @@ export class ClearcutLogger {
                 value: event.status,
             },
         ];
-        this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_INSTALL, data));
-        this.flushIfNeeded();
+        this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_INSTALL, data));
+        await this.flushToClearcut().catch((error) => {
+            debugLogger.debug('Error flushing to Clearcut:', error);
+        });
     }
-    logExtensionUninstallEvent(event) {
+    async logExtensionUninstallEvent(event) {
         const data = [
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
                 value: event.extension_name,
             },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+                value: event.extension_id,
+            },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_UNINSTALL_STATUS,
                 value: event.status,
             },
         ];
-        this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_UNINSTALL, data));
-        this.flushIfNeeded();
+        this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_UNINSTALL, data));
+        await this.flushToClearcut().catch((error) => {
+            debugLogger.debug('Error flushing to Clearcut:', error);
+        });
+    }
+    async logExtensionUpdateEvent(event) {
+        const data = [
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
+                value: event.extension_name,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+                value: event.extension_id,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_VERSION,
+                value: event.extension_version,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_PREVIOUS_VERSION,
+                value: event.extension_previous_version,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_SOURCE,
+                value: event.extension_source,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_UPDATE_STATUS,
+                value: event.status,
+            },
+        ];
+        this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_UPDATE, data));
+        await this.flushToClearcut().catch((error) => {
+            debugLogger.debug('Error flushing to Clearcut:', error);
+        });
     }
     logToolOutputTruncatedEvent(event) {
         const data = [
@@ -789,19 +888,25 @@ export class ClearcutLogger {
         this.enqueueLogEvent(this.createLogEvent(EventNames.MODEL_ROUTING, data));
         this.flushIfNeeded();
     }
-    logExtensionEnableEvent(event) {
+    async logExtensionEnableEvent(event) {
         const data = [
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
                 value: event.extension_name,
             },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+                value: event.extension_id,
+            },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ENABLE_SETTING_SCOPE,
                 value: event.setting_scope,
             },
         ];
-        this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_ENABLE, data));
-        this.flushIfNeeded();
+        this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_ENABLE, data));
+        await this.flushToClearcut().catch((error) => {
+            debugLogger.debug('Error flushing to Clearcut:', error);
+        });
     }
     logModelSlashCommandEvent(event) {
         const data = [
@@ -813,18 +918,146 @@ export class ClearcutLogger {
         this.enqueueLogEvent(this.createLogEvent(EventNames.MODEL_SLASH_COMMAND, data));
         this.flushIfNeeded();
     }
-    logExtensionDisableEvent(event) {
+    async logExtensionDisableEvent(event) {
         const data = [
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
                 value: event.extension_name,
             },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+                value: event.extension_id,
+            },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_DISABLE_SETTING_SCOPE,
                 value: event.setting_scope,
             },
         ];
-        this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_DISABLE, data));
+        this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_DISABLE, data));
+        await this.flushToClearcut().catch((error) => {
+            debugLogger.debug('Error flushing to Clearcut:', error);
+        });
+    }
+    logSmartEditStrategyEvent(event) {
+        const data = [
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_SMART_EDIT_STRATEGY,
+                value: event.strategy,
+            },
+        ];
+        this.enqueueLogEvent(this.createLogEvent(EventNames.SMART_EDIT_STRATEGY, data));
+        this.flushIfNeeded();
+    }
+    logSmartEditCorrectionEvent(event) {
+        const data = [
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_SMART_EDIT_CORRECTION,
+                value: event.correction,
+            },
+        ];
+        this.enqueueLogEvent(this.createLogEvent(EventNames.SMART_EDIT_CORRECTION, data));
+        this.flushIfNeeded();
+    }
+    logAgentStartEvent(event) {
+        const data = [
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_ID,
+                value: event.agent_id,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_NAME,
+                value: event.agent_name,
+            },
+        ];
+        this.enqueueLogEvent(this.createLogEvent(EventNames.AGENT_START, data));
+        this.flushIfNeeded();
+    }
+    logAgentFinishEvent(event) {
+        const data = [
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_ID,
+                value: event.agent_id,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_NAME,
+                value: event.agent_name,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_DURATION_MS,
+                value: event.duration_ms.toString(),
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_TURN_COUNT,
+                value: event.turn_count.toString(),
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_TERMINATE_REASON,
+                value: event.terminate_reason,
+            },
+        ];
+        this.enqueueLogEvent(this.createLogEvent(EventNames.AGENT_FINISH, data));
+        this.flushIfNeeded();
+    }
+    logRecoveryAttemptEvent(event) {
+        const data = [
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_ID,
+                value: event.agent_id,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_NAME,
+                value: event.agent_name,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_RECOVERY_REASON,
+                value: event.reason,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_RECOVERY_DURATION_MS,
+                value: event.duration_ms.toString(),
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_RECOVERY_SUCCESS,
+                value: event.success.toString(),
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_AGENT_TURN_COUNT,
+                value: event.turn_count.toString(),
+            },
+        ];
+        this.enqueueLogEvent(this.createLogEvent(EventNames.RECOVERY_ATTEMPT, data));
+        this.flushIfNeeded();
+    }
+    logWebFetchFallbackAttemptEvent(event) {
+        const data = [
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_WEB_FETCH_FALLBACK_REASON,
+                value: event.reason,
+            },
+        ];
+        this.enqueueLogEvent(this.createLogEvent(EventNames.WEB_FETCH_FALLBACK_ATTEMPT, data));
+        this.flushIfNeeded();
+    }
+    logLlmLoopCheckEvent(event) {
+        const data = [
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_PROMPT_ID,
+                value: event.prompt_id,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_LLM_LOOP_CHECK_FLASH_CONFIDENCE,
+                value: event.flash_confidence.toString(),
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_LLM_LOOP_CHECK_MAIN_MODEL,
+                value: event.main_model,
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_LLM_LOOP_CHECK_MAIN_MODEL_CONFIDENCE,
+                value: event.main_model_confidence.toString(),
+            },
+        ];
+        this.enqueueLogEvent(this.createLogEvent(EventNames.LLM_LOOP_CHECK, data));
         this.flushIfNeeded();
     }
     /**
@@ -832,7 +1065,6 @@ export class ClearcutLogger {
      * should exist on all log events.
      */
     addDefaultFields(data, totalAccounts) {
-        const surface = determineSurface();
         const defaultLogMetadata = [
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_SESSION_ID,
@@ -846,38 +1078,21 @@ export class ClearcutLogger {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_GOOGLE_ACCOUNTS_COUNT,
                 value: `${totalAccounts}`,
             },
-            {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_SURFACE,
-                value: surface,
-            },
-            {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_VERSION,
-                value: CLI_VERSION,
-            },
-            {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_GIT_COMMIT_HASH,
-                value: GIT_COMMIT_INFO,
-            },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_PROMPT_ID,
                 value: this.promptId,
             },
-            {
-                gemini_cli_key: EventMetadataKey.GEMINI_CLI_OS,
-                value: process.platform,
-            },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_NODE_VERSION,
                 value: process.versions.node,
             },
             {
                 gemini_cli_key: EventMetadataKey.GEMINI_CLI_USER_SETTINGS,
-                value: safeJsonStringify([
-                    {
-                        smart_edit_enabled: this.config?.getUseSmartEdit() ?? false,
-                        model_router_enabled: this.config?.getUseModelRouter() ?? false,
-                    },
-                ]),
+                value: this.getConfigJson(),
+            },
+            {
+                gemini_cli_key: EventMetadataKey.GEMINI_CLI_INTERACTIVE,
+                value: this.config?.isInteractive().toString() ?? 'false',
             },
         ];
         return [...data, ...defaultLogMetadata];
@@ -895,6 +1110,9 @@ export class ClearcutLogger {
             throw new Error('Unsupported proxy type');
         }
     }
+    getConfigJson() {
+        return safeJsonStringifyBooleanValuesOnly(this.config);
+    }
     shutdown() {
         this.logEndSessionEvent();
     }
@@ -903,14 +1121,14 @@ export class ClearcutLogger {
         const eventsToRetry = eventsToSend.slice(-MAX_RETRY_EVENTS); // Keep only the most recent events
         // Log a warning if we're dropping events
         if (eventsToSend.length > MAX_RETRY_EVENTS && this.config?.getDebugMode()) {
-            console.warn(`ClearcutLogger: Dropping ${eventsToSend.length - MAX_RETRY_EVENTS} events due to retry queue limit. Total events: ${eventsToSend.length}, keeping: ${MAX_RETRY_EVENTS}`);
+            debugLogger.warn(`ClearcutLogger: Dropping ${eventsToSend.length - MAX_RETRY_EVENTS} events due to retry queue limit. Total events: ${eventsToSend.length}, keeping: ${MAX_RETRY_EVENTS}`);
         }
         // Determine how many events can be re-queued
         const availableSpace = MAX_EVENTS - this.events.size;
         const numEventsToRequeue = Math.min(eventsToRetry.length, availableSpace);
         if (numEventsToRequeue === 0) {
             if (this.config?.getDebugMode()) {
-                console.debug(`ClearcutLogger: No events re-queued (queue size: ${this.events.size})`);
+                debugLogger.debug(`ClearcutLogger: No events re-queued (queue size: ${this.events.size})`);
             }
             return;
         }
@@ -926,7 +1144,7 @@ export class ClearcutLogger {
             this.events.pop();
         }
         if (this.config?.getDebugMode()) {
-            console.debug(`ClearcutLogger: Re-queued ${numEventsToRequeue} events for retry (queue size: ${this.events.size})`);
+            debugLogger.debug(`ClearcutLogger: Re-queued ${numEventsToRequeue} events for retry (queue size: ${this.events.size})`);
         }
     }
 }