fix(session-memory): reset dedup state on user messages to preserve cross-turn replies (#92563)

fsdwen · claude · fsdwen · commit b21bbdde0916 · 2026-06-15T19:58:21.000+08:00
- Reset lastAssistantText when a visible user message is included in the
  memory summary, so an assistant reply from a different turn that happens
  to repeat the same text is preserved.
- Only dedupe consecutive assistant rows within the same turn.

Co-Authored-By: Claude &lt;noreply@anthropic.com&gt;
diff --git a/src/hooks/bundled/session-memory/handler.test.ts b/src/hooks/bundled/session-memory/handler.test.ts
@@ -924,4 +924,21 @@ describe("session-memory hook", () => {
     const assistantLines = (memoryContent?.match(/^assistant:/gm) ?? []).length;
     expect(assistantLines).toBe(2);
   });
+
+  it("keeps repeated assistant reply after an intervening visible user message (#92563)", async () => {
+    // Same assistant text across different turns should NOT be deduped.
+    const sessionContent = createMockSessionContent([
+      { role: "user", content: "Question A" },
+      { role: "assistant", content: "OK" },
+      { role: "user", content: "Question B" },
+      { role: "assistant", content: "OK" },
+    ]);
+    const memoryContent = await readSessionTranscript({ sessionContent });
+
+    expect(memoryContent).toContain("user: Question A");
+    expect(memoryContent).toContain("assistant: OK");
+    expect(memoryContent).toContain("user: Question B");
+    const okCount = (memoryContent?.match(/assistant: OK/g) ?? []).length;
+    expect(okCount).toBe(2);
+  });
 });
diff --git a/src/hooks/bundled/session-memory/transcript.ts b/src/hooks/bundled/session-memory/transcript.ts
@@ -47,17 +47,18 @@ export async function getRecentSessionContent(
               continue;
             }
             const text = extractTextMessageContent(msg.content);
+            // Only dedupe consecutive assistant rows so a reply from a different
+            // turn that happens to repeat the same text is still included.
             if (text && !text.startsWith("/")) {
-              // Dedupe consecutive assistant messages with identical text.
-              // Thinking-enabled models produce raw (thinking + text) and
-              // cleaned (text-only) copies in the same turn; delivery mirrors
-              // can also repeat the visible text of the preceding assistant.
-              if (role === "assistant" && text === lastAssistantText) {
-                continue;
-              }
-              allMessages.push(`${role}: ${text}`);
               if (role === "assistant") {
+                if (text === lastAssistantText) {
+                  continue;
+                }
+                allMessages.push(`assistant: ${text}`);
                 lastAssistantText = text;
+              } else {
+                allMessages.push(`${role}: ${text}`);
+                lastAssistantText = undefined;
               }
             }
           }
