fix: tighten transcript repair matching

steipete · steipete · commit 19614bd2bd8d · 2026-05-04T03:01:10.000+01:00
diff --git a/src/agents/pi-embedded-runner/run/attempt.test.ts b/src/agents/pi-embedded-runner/run/attempt.test.ts
@@ -699,13 +699,13 @@ describe("ensureVisibleAssistantTextInSessionTranscript", () => {
     expect(activeSession.agent.state.messages).toBe(after);
   });
 
-  it("concatenates delivered chunks only when no canonical assistant text exists", () => {
+  it("preserves delivered block separators only when no canonical assistant text exists", () => {
     const before = [{ role: "user", content: "hello" }] as unknown as AgentMessage[];
     const after = [
       ...before,
       {
         role: "assistant",
-        content: [{ type: "text", text: "abcdef" }],
+        content: [{ type: "text", text: "First paragraph.\n\nSecond paragraph." }],
       },
     ] as unknown as AgentMessage[];
     const activeSession = { agent: { state: { messages: before } } };
@@ -722,7 +722,7 @@ describe("ensureVisibleAssistantTextInSessionTranscript", () => {
     const repaired = ensureVisibleAssistantTextInSessionTranscript({
       activeSession,
       sessionManager,
-      assistantTexts: ["abc", "def"],
+      assistantTexts: ["First paragraph.", "Second paragraph."],
       provider: "openai",
       modelId: "gpt-5.5",
       modelApi: "responses",
@@ -733,11 +733,62 @@ describe("ensureVisibleAssistantTextInSessionTranscript", () => {
     expect(repaired).toBe(true);
     expect(appendMessage).toHaveBeenCalledWith(
       expect.objectContaining({
-        content: [{ type: "text", text: "abcdef" }],
+        content: [{ type: "text", text: "First paragraph.\n\nSecond paragraph." }],
       }),
     );
   });
 
+  it("limits duplicate detection to the current turn when repairing", () => {
+    const before = [
+      {
+        role: "assistant",
+        content: [{ type: "text", text: "Repeated answer" }],
+      },
+      {
+        role: "user",
+        content: [{ type: "text", text: "ask again" }],
+      },
+    ] as unknown as AgentMessage[];
+    const after = [
+      ...before,
+      {
+        role: "assistant",
+        content: [{ type: "text", text: "Repeated answer" }],
+      },
+    ] as unknown as AgentMessage[];
+    const activeSession = { agent: { state: { messages: before } } };
+    const appendMessage = vi.fn();
+    const sessionManager = {
+      buildSessionContext: vi.fn().mockReturnValueOnce({ messages: before }).mockReturnValueOnce({
+        messages: after,
+      }),
+      appendMessage,
+    } as unknown as Parameters<
+      typeof ensureVisibleAssistantTextInSessionTranscript
+    >[0]["sessionManager"];
+
+    const repaired = ensureVisibleAssistantTextInSessionTranscript({
+      activeSession,
+      sessionManager,
+      visibleText: "Repeated answer",
+      assistantTexts: ["Repeated answer"],
+      currentTurnStartIndex: 1,
+      provider: "openai",
+      modelId: "gpt-5.5",
+      modelApi: "responses",
+      runId: "run-repeated-answer",
+      now: 5,
+    });
+
+    expect(repaired).toBe(true);
+    expect(appendMessage).toHaveBeenCalledWith(
+      expect.objectContaining({
+        content: [{ type: "text", text: "Repeated answer" }],
+      }),
+    );
+    expect(activeSession.agent.state.messages).toBe(after);
+  });
+
   it("does not fall back to delivered chunks when canonical assistant text is empty", () => {
     const messages = [{ role: "user", content: "hello" }] as unknown as AgentMessage[];
     const activeSession = { agent: { state: { messages } } };
diff --git a/src/agents/pi-embedded-runner/run/attempt.ts b/src/agents/pi-embedded-runner/run/attempt.ts
@@ -611,6 +611,7 @@ export function ensureVisibleAssistantTextInSessionTranscript(params: {
   >;
   visibleText?: string;
   assistantTexts: readonly string[];
+  currentTurnStartIndex?: number;
   provider: string;
   modelId: string;
   modelApi?: string;
@@ -623,15 +624,19 @@ export function ensureVisibleAssistantTextInSessionTranscript(params: {
     params.assistantTexts
       .map((text) => text.trim())
       .filter(Boolean)
-      .join("")
+      .join("\n\n")
       .trim();
   const normalizedVisibleText = normalizeAssistantTranscriptCompareText(visibleText);
   if (!normalizedVisibleText) {
     return false;
   }
 
   const context = params.sessionManager.buildSessionContext();
-  const alreadyPresent = context.messages.some((message) => {
+  const currentTurnMessages =
+    typeof params.currentTurnStartIndex === "number"
+      ? context.messages.slice(Math.max(0, params.currentTurnStartIndex))
+      : context.messages;
+  const alreadyPresent = currentTurnMessages.some((message) => {
     if (message.role !== "assistant") {
       return false;
     }
@@ -3323,6 +3328,7 @@ export async function runEmbeddedAttempt(
                 ? (extractAssistantVisibleText(currentAttemptAssistant) ?? "")
                 : undefined,
               assistantTexts,
+              currentTurnStartIndex: prePromptMessageCount,
               provider: params.provider,
               modelId: params.modelId,
               modelApi: params.model.api,
