fix(agents): preserve final text after stale incomplete-turn state

hclsys · hclsys · commit 4bc5e2aa53c4 · 2026-05-12T15:05:51.000+08:00
Fixes #80918
diff --git a/src/agents/pi-embedded-runner/run.incomplete-turn.test.ts b/src/agents/pi-embedded-runner/run.incomplete-turn.test.ts
@@ -4,6 +4,7 @@ import { hasCommittedMessagingToolDeliveryEvidence } from "./delivery-evidence.j
 import { makeAttemptResult } from "./run.overflow-compaction.fixture.js";
 import {
   loadRunOverflowCompactionHarness,
+  mockedBuildEmbeddedRunPayloads,
   mockedClassifyFailoverReason,
   mockedGlobalHookRunner,
   mockedLog,
@@ -1181,6 +1182,37 @@ describe("runEmbeddedPiAgent incomplete-turn safety", () => {
     expect(incompleteTurnText).toBeNull();
   });
 
+  it("uses current attempt assistant state instead of stale lastAssistant for incomplete-turn detection (#80918)", () => {
+    const incompleteTurnText = resolveIncompleteTurnPayloadText({
+      payloadCount: 1,
+      aborted: false,
+      timedOut: false,
+      attempt: makeAttemptResult({
+        assistantTexts: ["Compression complete and verified. Here is the summary."],
+        toolMetas: [{ toolName: "update_plan" }],
+        lastAssistant: {
+          role: "assistant",
+          stopReason: "toolUse",
+          provider: "openrouter",
+          model: "deepseek/deepseek-v4-pro",
+          content: [{ type: "tool_use", id: "tool_1", name: "update_plan", input: {} }],
+        } as unknown as EmbeddedRunAttemptResult["lastAssistant"],
+        currentAttemptAssistant: {
+          role: "assistant",
+          stopReason: "stop",
+          provider: "openrouter",
+          model: "deepseek/deepseek-v4-pro",
+          content: [
+            { type: "thinking", thinking: "update_plan returned successfully" },
+            { type: "text", text: "Compression complete and verified. Here is the summary." },
+          ],
+        } as unknown as EmbeddedRunAttemptResult["currentAttemptAssistant"],
+      }),
+    });
+
+    expect(incompleteTurnText).toBeNull();
+  });
+
   it("surfaces an error for tool-use terminal turn with pre-tool text via runEmbeddedPiAgent (#76477)", async () => {
     mockedClassifyFailoverReason.mockReturnValue(null);
     mockedRunEmbeddedAttempt.mockResolvedValueOnce(
@@ -1212,6 +1244,56 @@ describe("runEmbeddedPiAgent incomplete-turn safety", () => {
     expectWarnMessageWith("incomplete turn detected");
   });
 
+  it("preserves final assistant text when lastAssistant is stale after update_plan (#80918)", async () => {
+    mockedClassifyFailoverReason.mockReturnValue(null);
+    mockedBuildEmbeddedRunPayloads.mockReturnValueOnce([
+      { text: "Compression complete and verified. Here is the summary." },
+    ]);
+    const currentAttemptAssistant = {
+      role: "assistant",
+      stopReason: "stop",
+      provider: "openrouter",
+      model: "deepseek/deepseek-v4-pro",
+      content: [
+        { type: "thinking", thinking: "update_plan returned successfully" },
+        { type: "text", text: "Compression complete and verified. Here is the summary." },
+      ],
+    } as unknown as EmbeddedRunAttemptResult["currentAttemptAssistant"];
+    mockedRunEmbeddedAttempt.mockResolvedValueOnce(
+      makeAttemptResult({
+        assistantTexts: ["Compression complete and verified. Here is the summary."],
+        toolMetas: [{ toolName: "update_plan" }],
+        lastAssistant: {
+          stopReason: "toolUse",
+          provider: "openrouter",
+          model: "deepseek/deepseek-v4-pro",
+          content: [{ type: "tool_use", id: "tool_1", name: "update_plan", input: {} }],
+        } as unknown as EmbeddedRunAttemptResult["lastAssistant"],
+        currentAttemptAssistant,
+      }),
+    );
+
+    const result = await runEmbeddedPiAgent({
+      ...overflowBaseRunParams,
+      provider: "openrouter",
+      model: "deepseek/deepseek-v4-pro",
+      runId: "run-update-plan-stale-last-assistant",
+    });
+
+    expect(mockedRunEmbeddedAttempt).toHaveBeenCalledTimes(1);
+    expect(mockedBuildEmbeddedRunPayloads).toHaveBeenCalledWith(
+      expect.objectContaining({ lastAssistant: currentAttemptAssistant }),
+    );
+    expect(result.payloads?.[0]).toMatchObject({
+      text: "Compression complete and verified. Here is the summary.",
+    });
+    expect(result.payloads?.[0]?.isError).not.toBe(true);
+    expectNoWarnMessageWith("incomplete turn detected");
+    expect(result.meta?.finalAssistantVisibleText).toBe(
+      "Compression complete and verified. Here is the summary.",
+    );
+  });
+
   it("treats missing replay metadata as replay-invalid", () => {
     const attempt = makeAttemptResult();
     delete (attempt as Partial<EmbeddedRunAttemptResult>).replayMetadata;
diff --git a/src/agents/pi-embedded-runner/run.ts b/src/agents/pi-embedded-runner/run.ts
@@ -2470,13 +2470,16 @@ export async function runEmbeddedPiAgent(
             compactionCount: autoCompactionCount > 0 ? autoCompactionCount : undefined,
             compactionTokensAfter: lastCompactionTokensAfter,
           };
-          const finalAssistantVisibleText = resolveFinalAssistantVisibleText(sessionLastAssistant);
-          const finalAssistantRawText = resolveFinalAssistantRawText(sessionLastAssistant);
+          const terminalAssistantForPayloads = currentAttemptAssistant ?? sessionLastAssistant;
+          const finalAssistantVisibleText = resolveFinalAssistantVisibleText(
+            terminalAssistantForPayloads,
+          );
+          const finalAssistantRawText = resolveFinalAssistantRawText(terminalAssistantForPayloads);
 
           const payloads = buildEmbeddedRunPayloads({
             assistantTexts: attempt.assistantTexts,
             toolMetas: attempt.toolMetas,
-            lastAssistant: attempt.lastAssistant,
+            lastAssistant: terminalAssistantForPayloads,
             lastToolError: attempt.lastToolError,
             config: params.config,
             isCronTrigger: params.trigger === "cron",
diff --git a/src/agents/pi-embedded-runner/run/incomplete-turn.ts b/src/agents/pi-embedded-runner/run/incomplete-turn.ts
@@ -231,7 +231,8 @@ export function resolveIncompleteTurnPayloadText(params: {
   // Pre-tool text alone (payloadCount > 0) must not suppress the incomplete-
   // turn check in that case — the final post-tool response was never
   // produced. (#76477)
-  const toolUseTerminal = params.attempt.lastAssistant?.stopReason === "toolUse";
+  const terminalAssistant = params.attempt.currentAttemptAssistant ?? params.attempt.lastAssistant;
+  const toolUseTerminal = terminalAssistant?.stopReason === "toolUse";
 
   if (
     (params.payloadCount !== 0 && !toolUseTerminal) ||
@@ -256,7 +257,7 @@ export function resolveIncompleteTurnPayloadText(params: {
   const stopReason = params.attempt.lastAssistant?.stopReason;
   const incompleteTerminalAssistant = isIncompleteTerminalAssistantTurn({
     hasAssistantVisibleText: params.payloadCount > 0,
-    lastAssistant: params.attempt.lastAssistant,
+    lastAssistant: terminalAssistant,
   });
   const reasoningOnlyAssistant = isReasoningOnlyAssistantTurn(
     params.attempt.currentAttemptAssistant ?? params.attempt.lastAssistant,
