Skip to content

fix(session): stop prompt loop after model completion #18500

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

Closed
luyanhexay wants to merge 2 commits into from
+10 −2
Closed

fix(session): stop prompt loop after model completion #18500

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8607fb
fix(session): stop prompt loop after model completion
Mar 21, 2026
ce9ca79
Merge branch 'dev' into debug/stable-controller-target
luyanhexay Mar 21, 2026
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
12 changes: 10 additions & 2 deletions packages/opencode/src/session/prompt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,8 +696,14 @@ export namespace SessionPrompt {
break
}

// Check if model finished (finish reason is not "tool-calls" or "unknown")
const modelFinished = processor.message.finish && !["tool-calls", "unknown"].includes(processor.message.finish)
const parts = await MessageV2.parts(processor.message.id)
const hasToolActivity = parts.some((part) => part.type === "tool")
const modelFinished =
!!processor.message.finish &&
(![
"tool-calls",
"unknown",
].includes(processor.message.finish) || (processor.message.finish === "unknown" && !hasToolActivity))

if (modelFinished && !processor.message.error) {
if (format.type === "json_schema") {
Expand All @@ -709,6 +715,8 @@ export namespace SessionPrompt {
await Session.updateMessage(processor.message)
break
}

break
}

if (result === "stop") break
Expand Down
Loading