revert 6b9b778d82 (#26893)

packages/core/src/core/geminiChat.test.ts

@@ -2904,73 +2904,6 @@ describe('GeminiChat', () => {
     });
   });
 
-  describe('getHistory with curated: true', () => {
-    it('should not drop model turns with function calls and empty text', () => {
-      const history: Content[] = [
-        { role: 'user', parts: [{ text: 'Hello' }] },
-        {
-          role: 'model',
-          parts: [{ functionCall: { name: 'test_tool', args: {} }, text: '' }],
-        },
-        {
-          role: 'user',
-          parts: [{ functionResponse: { name: 'test_tool', response: {} } }],
-        },
-      ];
-      const chatWithHistory = new GeminiChat(mockConfig, '', [], history);
-
-      const curatedHistory = chatWithHistory.getHistory(true);
-
-      expect(curatedHistory.length).toBe(3);
-      expect(curatedHistory[1].role).toBe('model');
-      expect(curatedHistory[1].parts![0].functionCall).toBeDefined();
-    });
-
-    it('should not drop model turns with inlineData and empty text', () => {
-      const history: Content[] = [
-        { role: 'user', parts: [{ text: 'Hello' }] },
-        {
-          role: 'model',
-          parts: [
-            {
-              inlineData: { mimeType: 'image/jpeg', data: 'base64...' },
-              text: '',
-            },
-          ],
-        },
-      ];
-      const chatWithHistory = new GeminiChat(mockConfig, '', [], history);
-
-      const curatedHistory = chatWithHistory.getHistory(true);
-
-      expect(curatedHistory.length).toBe(2);
-      expect(curatedHistory[1].role).toBe('model');
-      expect(curatedHistory[1].parts![0].inlineData).toBeDefined();
-    });
-
-    it('should not drop model turns with fileData and empty text', () => {
-      const history: Content[] = [
-        { role: 'user', parts: [{ text: 'Hello' }] },
-        {
-          role: 'model',
-          parts: [
-            {
-              fileData: { mimeType: 'image/jpeg', fileUri: 'https://...' },
-              text: '',
-            },
-          ],
-        },
-      ];
-      const chatWithHistory = new GeminiChat(mockConfig, '', [], history);
-
-      const curatedHistory = chatWithHistory.getHistory(true);
-
-      expect(curatedHistory.length).toBe(2);
-      expect(curatedHistory[1].role).toBe('model');
-      expect(curatedHistory[1].parts![0].fileData).toBeDefined();
-    });
-  });
-
   describe('stripToolCallIdPrefixes', () => {
     it('should strip tool name prefix matching the tool name', () => {
       const contents: Content[] = [

packages/core/src/core/geminiChat.ts

@@ -146,15 +146,7 @@ function isValidContent(content: Content): boolean {
     if (part === undefined || Object.keys(part).length === 0) {
       return false;
     }
-    if (
+    if (!part.thought && part.text !== undefined && part.text === '') {
-      !part.thought &&
-      !part.functionCall &&
-      !part.functionResponse &&
-      !part.inlineData &&
-      !part.fileData &&
-      part.text !== undefined &&
-      part.text === ''
-    ) {
       return false;
     }
   }