diff --git a/‎packages/opencode/src/session/processor.ts‎
Lines changed: 6 additions & 7 deletions b/‎packages/opencode/src/session/processor.ts‎
Lines changed: 6 additions & 7 deletions
@@ -350,21 +350,20 @@ const layer = Layer.effect(
                 : value.providerMetadata,
             }))
 
-            const parts = yield* MessageV2.parts(ctx.assistantMessage.id).pipe(
+            const msgs = yield* MessageV2.filterCompactedEffect(ctx.sessionID).pipe(
               Effect.provideService(Database.Service, database),
             )
-            const recentParts = parts.slice(-DOOM_LOOP_THRESHOLD)
-
-            if (
-              recentParts.length !== DOOM_LOOP_THRESHOLD ||
-              !recentParts.every(
+            const matchingParts = msgs
+              .flatMap((m) => m.parts)
+              .filter(
                 (part) =>
                   part.type === "tool" &&
                   part.tool === value.name &&
                   part.state.status !== "pending" &&
                   JSON.stringify(part.state.input) === JSON.stringify(input),
               )
-            ) {
+
+            if (matchingParts.length < DOOM_LOOP_THRESHOLD) {
               return
             }