Skip to content

fix(opencode): lastUser identification and loop exit condition #11443

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
khj809 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(opencode): lastUser identification and loop exit condition #11443

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
6 changes: 5 additions & 1 deletion packages/opencode/src/session/prompt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,8 @@ export namespace SessionPrompt {
log.info("loop", { step, sessionID })
if (abort.aborted) break
let msgs = await MessageV2.filterCompacted(MessageV2.stream(sessionID))
// Sort chronologically to ensure that `lastUser` and `lastAssistant` are found correctly
msgs.sort((a, b) => a.info.time.created - b.info.time.created)

let lastUser: MessageV2.User | undefined
let lastAssistant: MessageV2.Assistant | undefined
Expand All @@ -293,10 +295,12 @@ export namespace SessionPrompt {
}

if (!lastUser) throw new Error("No user message found in stream. This should never happen.")

// Check if we have a finished assistant response to the last user message
if (
lastAssistant?.finish &&
!["tool-calls", "unknown"].includes(lastAssistant.finish) &&
lastUser.id < lastAssistant.id
lastUser.id === lastAssistant.parentID
) {
log.info("exiting loop", { sessionID })
break
Expand Down
Loading