@vellumai/assistant 0.4.48 → 0.4.50

package/src/__tests__/history-repair.test.ts

@@ -428,6 +428,251 @@ describe("repairHistory", () => {
     expect(stats.orphanToolResultsDowngraded).toBe(0);
     expect(stats.consecutiveSameRoleMerged).toBe(0);
   });
+
+  test("keeps server_tool_use + web_search_tool_result paired in assistant message", () => {
+    // Both blocks should stay in the assistant message (self-paired)
+    const messages: Message[] = [
+      { role: "user", content: [{ type: "text", text: "Search for cats" }] },
+      {
+        role: "assistant",
+        content: [
+          {
+            type: "server_tool_use",
+            id: "stu_1",
+            name: "web_search",
+            input: { query: "cats" },
+          },
+          {
+            type: "web_search_tool_result",
+            tool_use_id: "stu_1",
+            content: [{ type: "web_search_result", url: "https://cats.com" }],
+          },
+          { type: "text", text: "Here are some results about cats." },
+        ],
+      },
+    ];
+
+    const { messages: repaired, stats } = repairHistory(messages);
+
+    expect(repaired).toEqual(messages);
+    expect(stats.missingToolResultsInserted).toBe(0);
+    expect(stats.orphanToolResultsDowngraded).toBe(0);
+  });
+
+  test("synthesizes web_search_tool_result in assistant message when missing (interrupted stream)", () => {
+    // If server_tool_use has no paired result (e.g. stream was interrupted),
+    // the synthetic result goes in the SAME assistant message, not a user message
+    const messages: Message[] = [
+      { role: "user", content: [{ type: "text", text: "Search" }] },
+      {
+        role: "assistant",
+        content: [
+          {
+            type: "server_tool_use",
+            id: "stu_1",
+            name: "web_search",
+            input: { query: "test" },
+          },
+        ],
+      },
+      {
+        role: "user",
+        content: [{ type: "text", text: "next message" }],
+      },
+    ];
+
+    const { messages: repaired, stats } = repairHistory(messages);
+
+    expect(stats.missingToolResultsInserted).toBe(1);
+
+    // Synthetic result is in the assistant message, not the user message
+    const assistantMsg = repaired[1];
+    expect(assistantMsg.content).toHaveLength(2);
+    expect(assistantMsg.content[1]).toMatchObject({
+      type: "web_search_tool_result",
+      tool_use_id: "stu_1",
+      content: { type: "web_search_tool_result_error", error_code: "unavailable" },
+    });
+
+    // User message has no web_search_tool_result
+    const userMsg = repaired[2];
+    expect(userMsg.content.every((b) => b.type !== "web_search_tool_result")).toBe(true);
+  });
+
+  test("migrates legacy web_search_tool_result from user message to assistant message", () => {
+    // Old history format: server_tool_use in assistant, web_search_tool_result in user.
+    // Repair: synthesize result in assistant, orphan-downgrade the user-side result.
+    const messages: Message[] = [
+      { role: "user", content: [{ type: "text", text: "Search" }] },
+      {
+        role: "assistant",
+        content: [
+          {
+            type: "server_tool_use",
+            id: "srvtoolu_abc",
+            name: "web_search",
+            input: { query: "test" },
+          },
+          {
+            type: "tool_use",
+            id: "tu_1",
+            name: "bash",
+            input: { cmd: "ls" },
+          },
+        ],
+      },
+      {
+        role: "user",
+        content: [
+          {
+            type: "web_search_tool_result",
+            tool_use_id: "srvtoolu_abc",
+            content: [{ type: "web_search_result", url: "https://example.com" }],
+          },
+          { type: "tool_result", tool_use_id: "tu_1", content: "files" },
+        ],
+      },
+      {
+        role: "assistant",
+        content: [{ type: "text", text: "Done" }],
+      },
+    ];
+
+    const { messages: repaired, stats } = repairHistory(messages);
+
+    // Synthetic web_search_tool_result added to assistant message
+    expect(stats.missingToolResultsInserted).toBe(1);
+
+    // The assistant message now has the server pair + client tool_use
+    const assistantMsg = repaired[1];
+    const serverToolUse = assistantMsg.content.find((b) => b.type === "server_tool_use");
+    const webSearchResult = assistantMsg.content.find((b) => b.type === "web_search_tool_result");
+    expect(serverToolUse).toBeDefined();
+    expect(webSearchResult).toBeDefined();
+
+    // The user message has tool_result for tu_1, and the old web_search_tool_result is downgraded
+    const userMsg = repaired[2];
+    expect(stats.orphanToolResultsDowngraded).toBe(1);
+    expect(userMsg.content.some((b) => b.type === "tool_result")).toBe(true);
+    expect(userMsg.content.every((b) => b.type !== "web_search_tool_result")).toBe(true);
+  });
+
+  test("trailing server_tool_use gets synthetic result in same assistant message", () => {
+    // No trailing user message needed — result goes in the assistant message
+    const messages: Message[] = [
+      { role: "user", content: [{ type: "text", text: "Go" }] },
+      {
+        role: "assistant",
+        content: [
+          {
+            type: "server_tool_use",
+            id: "stu_1",
+            name: "web_search",
+            input: { query: "test" },
+          },
+        ],
+      },
+    ];
+
+    const { messages: repaired, stats } = repairHistory(messages);
+
+    expect(stats.missingToolResultsInserted).toBe(1);
+    // Result is in the assistant message
+    expect(repaired).toHaveLength(2);
+    expect(repaired[1].role).toBe("assistant");
+    expect(repaired[1].content).toHaveLength(2);
+    expect(repaired[1].content[1]).toMatchObject({
+      type: "web_search_tool_result",
+      tool_use_id: "stu_1",
+      content: { type: "web_search_tool_result_error", error_code: "unavailable" },
+    });
+  });
+
+  test("downgrades type-mismatched tool_result for server_tool_use", () => {
+    // A tool_result in the user message for a server_tool_use ID is orphaned —
+    // server-side results belong in the assistant message
+    const messages: Message[] = [
+      { role: "user", content: [{ type: "text", text: "Search" }] },
+      {
+        role: "assistant",
+        content: [
+          {
+            type: "server_tool_use",
+            id: "stu_1",
+            name: "web_search",
+            input: { query: "test" },
+          },
+        ],
+      },
+      {
+        role: "user",
+        content: [
+          { type: "tool_result", tool_use_id: "stu_1", content: "wrong type" },
+        ],
+      },
+      {
+        role: "assistant",
+        content: [{ type: "text", text: "Done" }],
+      },
+    ];
+
+    const { messages: repaired, stats } = repairHistory(messages);
+
+    // Synthetic web_search_tool_result added to assistant message
+    expect(stats.missingToolResultsInserted).toBe(1);
+    // The mismatched tool_result in user message is orphaned (no pending client tool_use)
+    expect(stats.orphanToolResultsDowngraded).toBe(1);
+
+    // Assistant message has the server pair
+    const assistantMsg = repaired[1];
+    expect(assistantMsg.content.some((b) => b.type === "web_search_tool_result")).toBe(true);
+
+    // User message has no web_search_tool_result — the tool_result was downgraded to text
+    const userMsg = repaired[2];
+    expect(userMsg.content.every((b) => b.type !== "web_search_tool_result")).toBe(true);
+    expect(userMsg.content.every((b) => b.type !== "tool_result")).toBe(true);
+  });
+
+  test("downgrades type-mismatched web_search_tool_result for tool_use", () => {
+    // A web_search_tool_result paired with a regular tool_use ID is a type mismatch
+    const messages: Message[] = [
+      { role: "user", content: [{ type: "text", text: "Go" }] },
+      {
+        role: "assistant",
+        content: [
+          { type: "tool_use", id: "tu_1", name: "bash", input: { cmd: "ls" } },
+        ],
+      },
+      {
+        role: "user",
+        content: [
+          {
+            type: "web_search_tool_result",
+            tool_use_id: "tu_1",
+            content: [{ type: "web_search_result", url: "https://example.com" }],
+          },
+        ],
+      },
+      {
+        role: "assistant",
+        content: [{ type: "text", text: "Done" }],
+      },
+    ];
+
+    const { messages: repaired, stats } = repairHistory(messages);
+
+    expect(stats.orphanToolResultsDowngraded).toBe(1);
+    expect(stats.missingToolResultsInserted).toBe(1);
+
+    const userMsg = repaired[2];
+    const trBlocks = userMsg.content.filter((b) => b.type === "tool_result");
+    expect(trBlocks).toHaveLength(1);
+    expect(trBlocks[0]).toMatchObject({
+      type: "tool_result",
+      tool_use_id: "tu_1",
+      is_error: true,
+    });
+  });
 });
 
 describe("deepRepairHistory", () => {