Skip to content

fix(processor): fix doom loop detection scope and filter order #25255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qz1543706741 wants to merge 1 commit into
base: dev
Choose a base branch
from
+21 −14
Open

fix(processor): fix doom loop detection scope and filter order #25255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions packages/opencode/src/session/processor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,25 @@ export const layer: Layer.Layer<
return { call, part }
})

const recentMatchingToolParts = Effect.fn("SessionProcessor.recentMatchingToolParts")(function* (input: {
tool: string
args: Record<string, any>
}) {
const messages = yield* MessageV2.filterCompactedEffect(ctx.sessionID)
const lastUserIndex = messages.findLastIndex((msg) => msg.info.role === "user")
return messages
.slice(lastUserIndex + 1)
.flatMap((msg) => msg.parts)
.filter(
(part): part is MessageV2.ToolPart =>
part.type === "tool" &&
part.tool === input.tool &&
part.state.status !== "pending" &&
JSON.stringify(part.state.input) === JSON.stringify(input.args),
)
.slice(-DOOM_LOOP_THRESHOLD)
})

const updateToolCall = Effect.fn("SessionProcessor.updateToolCall")(function* (
toolCallID: string,
update: (part: MessageV2.ToolPart) => MessageV2.ToolPart,
Expand Down Expand Up @@ -302,21 +321,9 @@ export const layer: Layer.Layer<
: value.providerMetadata,
}))

const parts = MessageV2.parts(ctx.assistantMessage.id)
const recentParts = parts.slice(-DOOM_LOOP_THRESHOLD)
const recentParts = yield* recentMatchingToolParts({ tool: value.toolName, args: value.input ?? {} })

if (
recentParts.length !== DOOM_LOOP_THRESHOLD ||
!recentParts.every(
(part) =>
part.type === "tool" &&
part.tool === value.toolName &&
part.state.status !== "pending" &&
JSON.stringify(part.state.input) === JSON.stringify(value.input),
)
) {
return
}
if (recentParts.length !== DOOM_LOOP_THRESHOLD) return

const agent = yield* agents.get(ctx.assistantMessage.agent)
yield* permission.ask({
Expand Down
Loading