Skip to content

fix(processor): handle abort signal during cleanup (#11) #41

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

Merged
randomm merged 1 commit into from
Jan 26, 2026
Merged

fix(processor): handle abort signal during cleanup (#11) #41

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
54 changes: 33 additions & 21 deletions packages/opencode/src/session/processor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,12 @@ export namespace SessionProcessor {
message: retry,
next: Date.now() + delay,
})
await SessionRetry.sleep(delay, input.abort).catch(() => {})
await SessionRetry.sleep(delay, input.abort).catch((err) => {
if (err?.name === "AbortError") {
log.info("Sleep aborted, checking signal before retry")
}
})
if (input.abort.aborted) break
continue
}
input.assistantMessage.error = error
Expand All @@ -377,22 +382,21 @@ export namespace SessionProcessor {
// and wrap in catch to prevent unhandled promise rejections
const aborted = input.abort.aborted
if (snapshot && !aborted) {
await Snapshot.patch(snapshot)
.then(async (patch) => {
if (patch.files.length) {
await Session.updatePart({
id: Identifier.ascending("part"),
messageID: input.assistantMessage.id,
sessionID: input.sessionID,
type: "patch",
hash: patch.hash,
files: patch.files,
})
}
})
.catch((err) => {
log.error("cleanup patch failed", { error: err })
})
try {
const patch = await Snapshot.patch(snapshot)
if (patch.files.length && !input.abort.aborted) {
await Session.updatePart({
id: Identifier.ascending("part"),
messageID: input.assistantMessage.id,
sessionID: input.sessionID,
type: "patch",
hash: patch.hash,
files: patch.files,
})
}
} catch (err) {
log.error("cleanup patch failed", { error: err })
}
snapshot = undefined
}

Expand All @@ -401,6 +405,10 @@ export namespace SessionProcessor {
await MessageV2.parts(input.assistantMessage.id)
.then(async (parts) => {
for (const part of parts) {
if (input.abort.aborted) {
log.warn("Cleanup interrupted by abort - partial tool state")
break
}
if (part.type === "tool" && part.state.status !== "completed" && part.state.status !== "error") {
await Session.updatePart({
...part,
Expand All @@ -424,10 +432,14 @@ export namespace SessionProcessor {
})
}

input.assistantMessage.time.completed = Date.now()
await Session.updateMessage(input.assistantMessage).catch((err) => {
log.error("cleanup message update failed", { error: err })
})
if (!input.abort.aborted) {
try {
input.assistantMessage.time.completed = Date.now()
await Session.updateMessage(input.assistantMessage)
} catch (err) {
log.error("cleanup message update failed", { error: err })
}
}
if (needsCompaction) return "compact"
if (blocked) return "stop"
if (input.assistantMessage.error) return "stop"
Expand Down
Loading