Merge pull request #2866 from LTS2/fix/2830-empty-message-recovery-with-tool-calls

Fix empty message recovery when tool calls coexist with empty text parts

src/hooks/anthropic-context-window-limit-recovery/empty-content-recovery.ts

@@ -1,6 +1,7 @@
 import {
   findEmptyMessages,
   findEmptyMessageByIndex,
+  findMessagesWithEmptyTextParts,
   injectTextPart,
   replaceEmptyTextParts,
 } from "../session-recovery/storage"
@@ -79,7 +80,9 @@ export async function fixEmptyMessages(params: {
 
   if (!fixed) {
     const emptyMessageIds = findEmptyMessages(params.sessionID)
-    if (emptyMessageIds.length === 0) {
+    const emptyTextPartIds = findMessagesWithEmptyTextParts(params.sessionID)
+    const allIds = [...new Set([...emptyMessageIds, ...emptyTextPartIds])]
+    if (allIds.length === 0) {
       await params.client.tui
         .showToast({
           body: {
@@ -93,7 +96,7 @@ export async function fixEmptyMessages(params: {
       return false
     }
 
-    for (const messageID of emptyMessageIds) {
+    for (const messageID of allIds) {
       const replaced = replaceEmptyTextParts(messageID, PLACEHOLDER_TEXT)
       if (replaced) {
         fixed = true

src/hooks/anthropic-context-window-limit-recovery/message-builder.ts

@@ -4,6 +4,7 @@ import { normalizeSDKResponse } from "../../shared"
 import { isSqliteBackend } from "../../shared/opencode-storage-detection"
 import {
   findEmptyMessages,
+  findMessagesWithEmptyTextParts,
   injectTextPart,
   replaceEmptyTextParts,
 } from "../session-recovery/storage"
@@ -114,12 +115,14 @@ export async function sanitizeEmptyMessagesBeforeSummarize(
   }
 
   const emptyMessageIds = findEmptyMessages(sessionID)
-  if (emptyMessageIds.length === 0) {
+  const emptyTextPartIds = findMessagesWithEmptyTextParts(sessionID)
+  const allIds = [...new Set([...emptyMessageIds, ...emptyTextPartIds])]
+  if (allIds.length === 0) {
     return 0
   }
 
   let fixedCount = 0
-  for (const messageID of emptyMessageIds) {
+  for (const messageID of allIds) {
     const replaced = replaceEmptyTextParts(messageID, PLACEHOLDER_TEXT)
     if (replaced) {
       fixedCount++
@@ -135,7 +138,7 @@ export async function sanitizeEmptyMessagesBeforeSummarize(
     log("[auto-compact] pre-summarize sanitization fixed empty messages", {
       sessionID,
       fixedCount,
-      totalEmpty: emptyMessageIds.length,
+      totalEmpty: allIds.length,
     })
   }