@google/gemini-cli-core 0.4.0-nightly.20250904.e133acd2 → 0.4.0-preview.1

package/dist/src/core/turn.test.js

@@ -6,6 +6,7 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { Turn, GeminiEventType } from './turn.js';
 import { reportError } from '../utils/errorReporting.js';
+import { StreamEventType } from './geminiChat.js';
 const mockSendMessageStream = vi.fn();
 const mockGetHistory = vi.fn();
 const mockMaybeIncludeSchemaDepthContext = vi.fn();
@@ -24,6 +25,7 @@ vi.mock('@google/genai', async (importOriginal) => {
 vi.mock('../utils/errorReporting', () => ({
     reportError: vi.fn(),
 }));
+// Use the actual implementation from partUtils now that it's provided.
 vi.mock('../utils/generateContentResponseUtilities', () => ({
     getResponseText: (resp) => resp.candidates?.[0]?.content?.parts?.map((part) => part.text).join('') ||
         undefined,
@@ -55,10 +57,16 @@ describe('Turn', () => {
         it('should yield content events for text parts', async () => {
             const mockResponseStream = (async function* () {
                 yield {
-                    candidates: [{ content: { parts: [{ text: 'Hello' }] } }],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [{ content: { parts: [{ text: 'Hello' }] } }],
+                    },
                 };
                 yield {
-                    candidates: [{ content: { parts: [{ text: ' world' }] } }],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [{ content: { parts: [{ text: ' world' }] } }],
+                    },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
@@ -73,36 +81,29 @@ describe('Turn', () => {
             }, 'prompt-id-1');
             expect(events).toEqual([
                 { type: GeminiEventType.Content, value: 'Hello' },
-                {
-                    type: GeminiEventType.Finished,
-                    value: {
-                        reason: undefined,
-                        usageMetadata: undefined,
-                    },
-                },
                 { type: GeminiEventType.Content, value: ' world' },
-                {
-                    type: GeminiEventType.Finished,
-                    value: {
-                        reason: undefined,
-                        usageMetadata: undefined,
-                    },
-                },
             ]);
             expect(turn.getDebugResponses().length).toBe(2);
         });
         it('should yield tool_call_request events for function calls', async () => {
             const mockResponseStream = (async function* () {
                 yield {
-                    functionCalls: [
-                        {
-                            id: 'fc1',
-                            name: 'tool1',
-                            args: { arg1: 'val1' },
-                            isClientInitiated: false,
-                        },
-                        { name: 'tool2', args: { arg2: 'val2' }, isClientInitiated: false }, // No ID
-                    ],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        functionCalls: [
+                            {
+                                id: 'fc1',
+                                name: 'tool1',
+                                args: { arg1: 'val1' },
+                                isClientInitiated: false,
+                            },
+                            {
+                                name: 'tool2',
+                                args: { arg2: 'val2' },
+                                isClientInitiated: false,
+                            }, // No ID
+                        ],
+                    },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
@@ -111,7 +112,7 @@ describe('Turn', () => {
             for await (const event of turn.run(reqParts, new AbortController().signal)) {
                 events.push(event);
             }
-            expect(events.length).toBe(3);
+            expect(events.length).toBe(2);
             const event1 = events[0];
             expect(event1.type).toBe(GeminiEventType.ToolCallRequest);
             expect(event1.value).toEqual(expect.objectContaining({
@@ -136,17 +137,23 @@ describe('Turn', () => {
             const abortController = new AbortController();
             const mockResponseStream = (async function* () {
                 yield {
-                    candidates: [{ content: { parts: [{ text: 'First part' }] } }],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [{ content: { parts: [{ text: 'First part' }] } }],
+                    },
                 };
                 abortController.abort();
                 yield {
-                    candidates: [
-                        {
-                            content: {
-                                parts: [{ text: 'Second part - should not be processed' }],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [
+                            {
+                                content: {
+                                    parts: [{ text: 'Second part - should not be processed' }],
+                                },
                             },
-                        },
-                    ],
+                        ],
+                    },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
@@ -157,13 +164,6 @@ describe('Turn', () => {
             }
             expect(events).toEqual([
                 { type: GeminiEventType.Content, value: 'First part' },
-                {
-                    type: GeminiEventType.Finished,
-                    value: {
-                        reason: undefined,
-                        usageMetadata: undefined,
-                    },
-                },
                 { type: GeminiEventType.UserCancelled },
             ]);
             expect(turn.getDebugResponses().length).toBe(1);
@@ -193,71 +193,68 @@ describe('Turn', () => {
         it('should handle function calls with undefined name or args', async () => {
             const mockResponseStream = (async function* () {
                 yield {
-                    functionCalls: [
-                        { id: 'fc1', name: undefined, args: { arg1: 'val1' } },
-                        { id: 'fc2', name: 'tool2', args: undefined },
-                        { id: 'fc3', name: undefined, args: undefined },
-                    ],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [],
+                        functionCalls: [
+                            // Add `id` back to the mock to match what the code expects
+                            { id: 'fc1', name: undefined, args: { arg1: 'val1' } },
+                            { id: 'fc2', name: 'tool2', args: undefined },
+                            { id: 'fc3', name: undefined, args: undefined },
+                        ],
+                    },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
             const events = [];
-            const reqParts = [{ text: 'Test undefined tool parts' }];
-            for await (const event of turn.run(reqParts, new AbortController().signal)) {
+            for await (const event of turn.run([{ text: 'Test undefined tool parts' }], new AbortController().signal)) {
                 events.push(event);
             }
-            expect(events.length).toBe(4);
+            expect(events.length).toBe(3);
+            // Assertions for each specific tool call event
             const event1 = events[0];
-            expect(event1.type).toBe(GeminiEventType.ToolCallRequest);
-            expect(event1.value).toEqual(expect.objectContaining({
+            expect(event1.value).toMatchObject({
                 callId: 'fc1',
                 name: 'undefined_tool_name',
                 args: { arg1: 'val1' },
-                isClientInitiated: false,
-            }));
-            expect(turn.pendingToolCalls[0]).toEqual(event1.value);
+            });
             const event2 = events[1];
-            expect(event2.type).toBe(GeminiEventType.ToolCallRequest);
-            expect(event2.value).toEqual(expect.objectContaining({
+            expect(event2.value).toMatchObject({
                 callId: 'fc2',
                 name: 'tool2',
                 args: {},
-                isClientInitiated: false,
-            }));
-            expect(turn.pendingToolCalls[1]).toEqual(event2.value);
+            });
             const event3 = events[2];
-            expect(event3.type).toBe(GeminiEventType.ToolCallRequest);
-            expect(event3.value).toEqual(expect.objectContaining({
+            expect(event3.value).toMatchObject({
                 callId: 'fc3',
                 name: 'undefined_tool_name',
                 args: {},
-                isClientInitiated: false,
-            }));
-            expect(turn.pendingToolCalls[2]).toEqual(event3.value);
-            expect(turn.getDebugResponses().length).toBe(1);
+            });
         });
         it('should yield finished event when response has finish reason', async () => {
             const mockResponseStream = (async function* () {
                 yield {
-                    candidates: [
-                        {
-                            content: { parts: [{ text: 'Partial response' }] },
-                            finishReason: 'STOP',
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [
+                            {
+                                content: { parts: [{ text: 'Partial response' }] },
+                                finishReason: 'STOP',
+                            },
+                        ],
+                        usageMetadata: {
+                            promptTokenCount: 17,
+                            candidatesTokenCount: 50,
+                            cachedContentTokenCount: 10,
+                            thoughtsTokenCount: 5,
+                            toolUsePromptTokenCount: 2,
                         },
-                    ],
-                    usageMetadata: {
-                        promptTokenCount: 17,
-                        candidatesTokenCount: 50,
-                        cachedContentTokenCount: 10,
-                        thoughtsTokenCount: 5,
-                        toolUsePromptTokenCount: 2,
                     },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
             const events = [];
-            const reqParts = [{ text: 'Test finish reason' }];
-            for await (const event of turn.run(reqParts, new AbortController().signal)) {
+            for await (const event of turn.run([{ text: 'Test finish reason' }], new AbortController().signal)) {
                 events.push(event);
             }
             expect(events).toEqual([
@@ -280,16 +277,19 @@ describe('Turn', () => {
         it('should yield finished event for MAX_TOKENS finish reason', async () => {
             const mockResponseStream = (async function* () {
                 yield {
-                    candidates: [
-                        {
-                            content: {
-                                parts: [
-                                    { text: 'This is a long response that was cut off...' },
-                                ],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [
+                            {
+                                content: {
+                                    parts: [
+                                        { text: 'This is a long response that was cut off...' },
+                                    ],
+                                },
+                                finishReason: 'MAX_TOKENS',
                             },
-                            finishReason: 'MAX_TOKENS',
-                        },
-                    ],
+                        ],
+                    },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
@@ -312,12 +312,15 @@ describe('Turn', () => {
         it('should yield finished event for SAFETY finish reason', async () => {
             const mockResponseStream = (async function* () {
                 yield {
-                    candidates: [
-                        {
-                            content: { parts: [{ text: 'Content blocked' }] },
-                            finishReason: 'SAFETY',
-                        },
-                    ],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [
+                            {
+                                content: { parts: [{ text: 'Content blocked' }] },
+                                finishReason: 'SAFETY',
+                            },
+                        ],
+                    },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
@@ -337,12 +340,17 @@ describe('Turn', () => {
         it('should yield finished event with undefined reason when there is no finish reason', async () => {
             const mockResponseStream = (async function* () {
                 yield {
-                    candidates: [
-                        {
-                            content: { parts: [{ text: 'Response without finish reason' }] },
-                            // No finishReason property
-                        },
-                    ],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [
+                            {
+                                content: {
+                                    parts: [{ text: 'Response without finish reason' }],
+                                },
+                                // No finishReason property
+                            },
+                        ],
+                    },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
@@ -356,29 +364,31 @@ describe('Turn', () => {
                     type: GeminiEventType.Content,
                     value: 'Response without finish reason',
                 },
-                {
-                    type: GeminiEventType.Finished,
-                    value: { reason: undefined, usageMetadata: undefined },
-                },
             ]);
         });
         it('should handle multiple responses with different finish reasons', async () => {
             const mockResponseStream = (async function* () {
                 yield {
-                    candidates: [
-                        {
-                            content: { parts: [{ text: 'First part' }] },
-                            // No finish reason on first response
-                        },
-                    ],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [
+                            {
+                                content: { parts: [{ text: 'First part' }] },
+                                // No finish reason on first response
+                            },
+                        ],
+                    },
                 };
                 yield {
-                    candidates: [
-                        {
-                            content: { parts: [{ text: 'Second part' }] },
-                            finishReason: 'OTHER',
-                        },
-                    ],
+                    value: {
+                        type: StreamEventType.CHUNK,
+                        candidates: [
+                            {
+                                content: { parts: [{ text: 'Second part' }] },
+                                finishReason: 'OTHER',
+                            },
+                        ],
+                    },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
@@ -389,13 +399,6 @@ describe('Turn', () => {
             }
             expect(events).toEqual([
                 { type: GeminiEventType.Content, value: 'First part' },
-                {
-                    type: GeminiEventType.Finished,
-                    value: {
-                        reason: undefined,
-                        usageMetadata: undefined,
-                    },
-                },
                 { type: GeminiEventType.Content, value: 'Second part' },
                 {
                     type: GeminiEventType.Finished,
@@ -406,20 +409,23 @@ describe('Turn', () => {
         it('should yield citation and finished events when response has citationMetadata', async () => {
             const mockResponseStream = (async function* () {
                 yield {
-                    candidates: [
-                        {
-                            content: { parts: [{ text: 'Some text.' }] },
-                            citationMetadata: {
-                                citations: [
-                                    {
-                                        uri: 'https://example.com/source1',
-                                        title: 'Source 1 Title',
-                                    },
-                                ],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [
+                            {
+                                content: { parts: [{ text: 'Some text.' }] },
+                                citationMetadata: {
+                                    citations: [
+                                        {
+                                            uri: 'https://example.com/source1',
+                                            title: 'Source 1 Title',
+                                        },
+                                    ],
+                                },
+                                finishReason: 'STOP',
                             },
-                            finishReason: 'STOP',
-                        },
-                    ],
+                        ],
+                    },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
@@ -442,24 +448,27 @@ describe('Turn', () => {
         it('should yield a single citation event for multiple citations in one response', async () => {
             const mockResponseStream = (async function* () {
                 yield {
-                    candidates: [
-                        {
-                            content: { parts: [{ text: 'Some text.' }] },
-                            citationMetadata: {
-                                citations: [
-                                    {
-                                        uri: 'https://example.com/source2',
-                                        title: 'Title2',
-                                    },
-                                    {
-                                        uri: 'https://example.com/source1',
-                                        title: 'Title1',
-                                    },
-                                ],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [
+                            {
+                                content: { parts: [{ text: 'Some text.' }] },
+                                citationMetadata: {
+                                    citations: [
+                                        {
+                                            uri: 'https://example.com/source2',
+                                            title: 'Title2',
+                                        },
+                                        {
+                                            uri: 'https://example.com/source1',
+                                            title: 'Title1',
+                                        },
+                                    ],
+                                },
+                                finishReason: 'STOP',
                             },
-                            finishReason: 'STOP',
-                        },
-                    ],
+                        ],
+                    },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
@@ -482,20 +491,23 @@ describe('Turn', () => {
         it('should not yield citation event if there is no finish reason', async () => {
             const mockResponseStream = (async function* () {
                 yield {
-                    candidates: [
-                        {
-                            content: { parts: [{ text: 'Some text.' }] },
-                            citationMetadata: {
-                                citations: [
-                                    {
-                                        uri: 'https://example.com/source1',
-                                        title: 'Source 1 Title',
-                                    },
-                                ],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [
+                            {
+                                content: { parts: [{ text: 'Some text.' }] },
+                                citationMetadata: {
+                                    citations: [
+                                        {
+                                            uri: 'https://example.com/source1',
+                                            title: 'Source 1 Title',
+                                        },
+                                    ],
+                                },
+                                // No finishReason
                             },
-                            // No finishReason
-                        },
-                    ],
+                        ],
+                    },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
@@ -505,10 +517,6 @@ describe('Turn', () => {
             }
             expect(events).toEqual([
                 { type: GeminiEventType.Content, value: 'Some text.' },
-                {
-                    type: GeminiEventType.Finished,
-                    value: { reason: undefined, usageMetadata: undefined },
-                },
             ]);
             // No Citation event (but we do get a Finished event with undefined reason)
             expect(events.some((e) => e.type === GeminiEventType.Citation)).toBe(false);
@@ -516,24 +524,27 @@ describe('Turn', () => {
         it('should ignore citations without a URI', async () => {
             const mockResponseStream = (async function* () {
                 yield {
-                    candidates: [
-                        {
-                            content: { parts: [{ text: 'Some text.' }] },
-                            citationMetadata: {
-                                citations: [
-                                    {
-                                        uri: 'https://example.com/source1',
-                                        title: 'Good Source',
-                                    },
-                                    {
-                                        // uri is undefined
-                                        title: 'Bad Source',
-                                    },
-                                ],
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [
+                            {
+                                content: { parts: [{ text: 'Some text.' }] },
+                                citationMetadata: {
+                                    citations: [
+                                        {
+                                            uri: 'https://example.com/source1',
+                                            title: 'Good Source',
+                                        },
+                                        {
+                                            // uri is undefined
+                                            title: 'Bad Source',
+                                        },
+                                    ],
+                                },
+                                finishReason: 'STOP',
                             },
-                            finishReason: 'STOP',
-                        },
-                    ],
+                        ],
+                    },
                 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
@@ -572,6 +583,26 @@ describe('Turn', () => {
             expect(events).toEqual([{ type: GeminiEventType.UserCancelled }]);
             expect(reportError).not.toHaveBeenCalled();
         });
+        it('should yield a Retry event when it receives one from the chat stream', async () => {
+            const mockResponseStream = (async function* () {
+                yield { type: StreamEventType.RETRY };
+                yield {
+                    type: StreamEventType.CHUNK,
+                    value: {
+                        candidates: [{ content: { parts: [{ text: 'Success' }] } }],
+                    },
+                };
+            })();
+            mockSendMessageStream.mockResolvedValue(mockResponseStream);
+            const events = [];
+            for await (const event of turn.run([], new AbortController().signal)) {
+                events.push(event);
+            }
+            expect(events).toEqual([
+                { type: GeminiEventType.Retry },
+                { type: GeminiEventType.Content, value: 'Success' },
+            ]);
+        });
     });
     describe('getDebugResponses', () => {
         it('should return collected debug responses', async () => {
@@ -582,8 +613,8 @@ describe('Turn', () => {
                 functionCalls: [{ name: 'debugTool' }],
             };
             const mockResponseStream = (async function* () {
-                yield resp1;
-                yield resp2;
+                yield { type: StreamEventType.CHUNK, value: resp1 };
+                yield { type: StreamEventType.CHUNK, value: resp2 };
             })();
             mockSendMessageStream.mockResolvedValue(mockResponseStream);
             const reqParts = [{ text: 'Hi' }];