Skip to content

Commit 5260384

Browse files
committed
fix(processor): handle abort signal during cleanup (#11) (#41)
- Add abort check after retry sleep to prevent infinite loop - Check abort before and after snapshot patch - Log warning when cleanup interrupted mid-loop - Move completed time inside abort check - Add logging for aborted sleep
1 parent 76e82be commit 5260384

1 file changed

Lines changed: 33 additions & 21 deletions

File tree

‎packages/opencode/src/session/processor.ts‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,12 @@ export namespace SessionProcessor {
363363
message: retry,
364364
next: Date.now() + delay,
365365
})
366-
await SessionRetry.sleep(delay, input.abort).catch(() => {})
366+
await SessionRetry.sleep(delay, input.abort).catch((err) => {
367+
if (err?.name === "AbortError") {
368+
log.info("Sleep aborted, checking signal before retry")
369+
}
370+
})
371+
if (input.abort.aborted) break
367372
continue
368373
}
369374
input.assistantMessage.error = error
@@ -378,22 +383,21 @@ export namespace SessionProcessor {
378383
// and wrap in catch to prevent unhandled promise rejections
379384
const aborted = input.abort.aborted
380385
if (snapshot && !aborted) {
381-
await Snapshot.patch(snapshot)
382-
.then(async (patch) => {
383-
if (patch.files.length) {
384-
await Session.updatePart({
385-
id: Identifier.ascending("part"),
386-
messageID: input.assistantMessage.id,
387-
sessionID: input.sessionID,
388-
type: "patch",
389-
hash: patch.hash,
390-
files: patch.files,
391-
})
392-
}
393-
})
394-
.catch((err) => {
395-
log.error("cleanup patch failed", { error: err })
396-
})
386+
try {
387+
const patch = await Snapshot.patch(snapshot)
388+
if (patch.files.length && !input.abort.aborted) {
389+
await Session.updatePart({
390+
id: Identifier.ascending("part"),
391+
messageID: input.assistantMessage.id,
392+
sessionID: input.sessionID,
393+
type: "patch",
394+
hash: patch.hash,
395+
files: patch.files,
396+
})
397+
}
398+
} catch (err) {
399+
log.error("cleanup patch failed", { error: err })
400+
}
397401
snapshot = undefined
398402
}
399403

@@ -402,6 +406,10 @@ export namespace SessionProcessor {
402406
await MessageV2.parts(input.assistantMessage.id)
403407
.then(async (parts) => {
404408
for (const part of parts) {
409+
if (input.abort.aborted) {
410+
log.warn("Cleanup interrupted by abort - partial tool state")
411+
break
412+
}
405413
if (part.type === "tool" && part.state.status !== "completed" && part.state.status !== "error") {
406414
await Session.updatePart({
407415
...part,
@@ -425,10 +433,14 @@ export namespace SessionProcessor {
425433
})
426434
}
427435

428-
input.assistantMessage.time.completed = Date.now()
429-
await Session.updateMessage(input.assistantMessage).catch((err) => {
430-
log.error("cleanup message update failed", { error: err })
431-
})
436+
if (!input.abort.aborted) {
437+
try {
438+
input.assistantMessage.time.completed = Date.now()
439+
await Session.updateMessage(input.assistantMessage)
440+
} catch (err) {
441+
log.error("cleanup message update failed", { error: err })
442+
}
443+
}
432444
if (needsCompaction) return "compact"
433445
if (blocked) return "stop"
434446
if (input.assistantMessage.error) return "stop"

0 commit comments

Comments
 (0)