2 files changed, 12 insertions, 0 deletions
diff --git a/packages/cli/src/gemini.tsx b/packages/cli/src/gemini.tsx
index 0478a40e..34ec3bd0 100644
--- a/packages/cli/src/gemini.tsx
+++ b/packages/cli/src/gemini.tsx
@@ -33,6 +33,7 @@ import {
   WebSearchTool,
   WriteFileTool,
   sessionId,
+  logUserPrompt,
 } from '@gemini-cli/core';
 
 export async function main() {
@@ -120,6 +121,11 @@ export async function main() {
     process.exit(1);
   }
 
+  logUserPrompt(config, {
+    prompt: input,
+    prompt_length: input.length,
+  });
+
   // Non-interactive mode handled by runNonInteractive
   const nonInteractiveConfig = await loadNonInteractiveConfig(
     config,
diff --git a/packages/cli/src/nonInteractiveCli.ts b/packages/cli/src/nonInteractiveCli.ts
index 069a7be8..bf60011f 100644
--- a/packages/cli/src/nonInteractiveCli.ts
+++ b/packages/cli/src/nonInteractiveCli.ts
@@ -9,6 +9,8 @@ import {
   ToolCallRequestInfo,
   executeToolCall,
   ToolRegistry,
+  shutdownTelemetry,
+  isTelemetrySdkInitialized,
 } from '@gemini-cli/core';
 import {
   Content,
@@ -119,5 +121,9 @@ export async function runNonInteractive(
   } catch (error) {
     console.error('Error processing input:', error);
     process.exit(1);
+  } finally {
+    if (isTelemetrySdkInitialized()) {
+      await shutdownTelemetry();
+    }
   }
 }