3 files changed, 12 insertions, 4 deletions
diff --git a/packages/cli/src/ui/hooks/useGeminiStream.test.tsx b/packages/cli/src/ui/hooks/useGeminiStream.test.tsx
index f8cc61bc..cb5b35b4 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.test.tsx
+++ b/packages/cli/src/ui/hooks/useGeminiStream.test.tsx
@@ -38,12 +38,17 @@ const MockedGeminiClientClass = vi.hoisted(() =>
   }),
 );
 
+const MockedUserPromptEvent = vi.hoisted(() =>
+  vi.fn().mockImplementation(() => {}),
+);
+
 vi.mock('@gemini-cli/core', async (importOriginal) => {
   const actualCoreModule = (await importOriginal()) as any;
   return {
     ...actualCoreModule,
     GitService: vi.fn(),
     GeminiClient: MockedGeminiClientClass,
+    UserPromptEvent: MockedUserPromptEvent,
   };
 });
 
@@ -283,6 +288,7 @@ describe('useGeminiStream', () => {
       getProjectRoot: vi.fn(() => '/test/dir'),
       getCheckpointingEnabled: vi.fn(() => false),
       getGeminiClient: mockGetGeminiClient,
+      getDisableDataCollection: () => false,
       addHistory: vi.fn(),
     } as unknown as Config;
     mockOnDebugMessage = vi.fn();
diff --git a/packages/cli/src/ui/hooks/useGeminiStream.ts b/packages/cli/src/ui/hooks/useGeminiStream.ts
index 09b14666..921fbdb1 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.ts
+++ b/packages/cli/src/ui/hooks/useGeminiStream.ts
@@ -23,6 +23,7 @@ import {
   EditorType,
   ThoughtSummary,
   isAuthError,
+  UserPromptEvent,
 } from '@gemini-cli/core';
 import { type Part, type PartListUnion } from '@google/genai';
 import {
@@ -213,10 +214,10 @@ export const useGeminiStream = (
 
       if (typeof query === 'string') {
         const trimmedQuery = query.trim();
-        logUserPrompt(config, {
-          prompt: trimmedQuery,
-          prompt_length: trimmedQuery.length,
-        });
+        logUserPrompt(
+          config,
+          new UserPromptEvent(trimmedQuery.length, trimmedQuery),
+        );
         onDebugMessage(`User query: '${trimmedQuery}'`);
         await logger?.logMessage(MessageSenderType.USER, trimmedQuery);
 
diff --git a/packages/cli/src/ui/hooks/useToolScheduler.test.ts b/packages/cli/src/ui/hooks/useToolScheduler.test.ts
index 8e3f139b..4c8901dc 100644
--- a/packages/cli/src/ui/hooks/useToolScheduler.test.ts
+++ b/packages/cli/src/ui/hooks/useToolScheduler.test.ts
@@ -48,6 +48,7 @@ const mockToolRegistry = {
 const mockConfig = {
   getToolRegistry: vi.fn(() => mockToolRegistry as unknown as ToolRegistry),
   getApprovalMode: vi.fn(() => ApprovalMode.DEFAULT),
+  getDisableDataCollection: () => false,
 };
 
 const mockTool: Tool = {