Merge branch 'blitz/gemini-content-fix/B3' into blitz/gemini-interactions/integration

Author: jpr5

src/__tests__/gemini-interactions.test.ts

@@ -220,8 +220,8 @@ describe("geminiInteractionsToCompletionRequest", () => {
     const result = geminiInteractionsToCompletionRequest({
       model: "gemini-2.5-flash",
       input: [
-        { role: "user", parts: [{ type: "text", text: "hi" }] },
-        { role: "model", parts: [{ type: "text", text: "hello" }] },
+        { role: "user", content: [{ type: "text", text: "hi" }] },
+        { role: "model", content: [{ type: "text", text: "hello" }] },
       ],
     });
     expect(result.messages).toEqual([
@@ -247,7 +247,7 @@ describe("geminiInteractionsToCompletionRequest", () => {
       input: [
         {
           role: "user",
-          parts: [
+          content: [
             {
               type: "function_result",
               call_id: "call_abc",
@@ -339,7 +339,7 @@ describe("geminiInteractionsToCompletionRequest", () => {
       input: [
         {
           role: "model",
-          parts: [
+          content: [
             { type: "text", text: "Calling tool..." },
             {
               type: "function_call",
@@ -367,12 +367,12 @@ describe("geminiInteractionsToCompletionRequest", () => {
     expect(result.stream).toBe(false);
   });
 
-  it("handles Turn with empty parts array — user/assistant produce empty-content message", () => {
+  it("handles Turn with empty content array — user/assistant produce empty-content message", () => {
     const result = geminiInteractionsToCompletionRequest({
       model: "gemini-2.5-flash",
       input: [
-        { role: "user", parts: [] },
-        { role: "model", parts: [] },
+        { role: "user", content: [] },
+        { role: "model", content: [] },
       ],
     });
     expect(result.messages).toEqual([
@@ -381,15 +381,15 @@ describe("geminiInteractionsToCompletionRequest", () => {
     ]);
   });
 
-  it("handles Turn with empty parts array — non-user/non-assistant role is skipped", () => {
+  it("handles Turn with empty content array — non-user/non-assistant role is skipped", () => {
     const result = geminiInteractionsToCompletionRequest({
       model: "gemini-2.5-flash",
       input: [
-        { role: "system", parts: [] },
-        { role: "user", parts: [{ type: "text", text: "hi" }] },
+        { role: "system", content: [] },
+        { role: "user", content: [{ type: "text", text: "hi" }] },
       ],
     });
-    // The system turn with empty parts is skipped; only the user turn is kept
+    // The system turn with empty content is skipped; only the user turn is kept
     expect(result.messages).toEqual([{ role: "user", content: "hi" }]);
   });
 
@@ -399,7 +399,7 @@ describe("geminiInteractionsToCompletionRequest", () => {
       input: [
         {
           role: "user",
-          parts: [
+          content: [
             {
               type: "function_result",
               call_id: "call_str",
@@ -414,6 +414,85 @@ describe("geminiInteractionsToCompletionRequest", () => {
     expect(result.messages[0].content).toBe("plain string result");
     expect(result.messages[0].tool_call_id).toBe("call_str");
   });
+
+  // ─── Legacy parts fallback tests ──────────────────────────────────────
+
+  it("handles Turn[] with legacy parts field for text (backwards compat)", () => {
+    const result = geminiInteractionsToCompletionRequest({
+      model: "gemini-2.5-flash",
+      input: [
+        { role: "user", parts: [{ type: "text", text: "hi from parts" }] },
+        { role: "model", parts: [{ type: "text", text: "hello from parts" }] },
+      ],
+    });
+    expect(result.messages).toEqual([
+      { role: "user", content: "hi from parts" },
+      { role: "assistant", content: "hello from parts" },
+    ]);
+  });
+
+  it("handles Turn[] with legacy parts field for function_call (backwards compat)", () => {
+    const result = geminiInteractionsToCompletionRequest({
+      model: "gemini-2.5-flash",
+      input: [
+        {
+          role: "model",
+          parts: [
+            {
+              type: "function_call",
+              name: "legacy_tool",
+              id: "call_legacy",
+              arguments: { key: "value" },
+            },
+          ],
+        },
+      ],
+    });
+    expect(result.messages).toHaveLength(1);
+    expect(result.messages[0].role).toBe("assistant");
+    expect(result.messages[0].tool_calls).toHaveLength(1);
+    expect(result.messages[0].tool_calls![0].function.name).toBe("legacy_tool");
+    expect(result.messages[0].tool_calls![0].id).toBe("call_legacy");
+  });
+
+  it("handles Turn[] with legacy parts field for function_result (backwards compat)", () => {
+    const result = geminiInteractionsToCompletionRequest({
+      model: "gemini-2.5-flash",
+      input: [
+        {
+          role: "user",
+          parts: [
+            {
+              type: "function_result",
+              call_id: "call_legacy_result",
+              output: { status: "ok" },
+            },
+          ],
+        },
+      ],
+    });
+    expect(result.messages).toHaveLength(1);
+    expect(result.messages[0].role).toBe("tool");
+    expect(result.messages[0].content).toBe('{"status":"ok"}');
+    expect(result.messages[0].tool_call_id).toBe("call_legacy_result");
+  });
+
+  // ─── content vs parts preference test ─────────────────────────────────
+
+  it("prefers content over parts when both are present on a Turn", () => {
+    const result = geminiInteractionsToCompletionRequest({
+      model: "gemini-2.5-flash",
+      input: [
+        {
+          role: "user",
+          content: [{ type: "text", text: "from-content" }],
+          parts: [{ type: "text", text: "from-parts" }],
+        },
+      ],
+    });
+    expect(result.messages).toHaveLength(1);
+    expect(result.messages[0].content).toBe("from-content");
+  });
 });
 
 // ─── Unit tests: response builders ──────────────────────────────────────
@@ -928,7 +1007,7 @@ describe("Gemini Interactions — fixture matching", () => {
       input: [
         {
           role: "user",
-          parts: [
+          content: [
             {
               type: "function_result",
               call_id: "call_abc",