Skip to content

Commit 6d09da3

Browse files
fix: process queued messages after session interrupt
When interrupting a session with queued messages, the queued messages would show as 'QUEUED' but never get processed. This happened because cancel() would reject all callbacks without restarting the loop. Changes: - Add loopId to track each loop instance - Restart loop after cancel if there were pending callbacks - Use loopId to prevent old loop's cleanup from aborting new loop Fixes anomalyco#3543
1 parent 52db0f2 commit 6d09da3

1 file changed

Lines changed: 29 additions & 10 deletions

File tree

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

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ export namespace SessionPrompt {
6161
string,
6262
{
6363
abort: AbortController
64+
loopId: string
6465
callbacks: {
6566
resolve(input: MessageV2.WithParts): void
6667
reject(): void
@@ -209,38 +210,56 @@ export namespace SessionPrompt {
209210
function start(sessionID: string) {
210211
const s = state()
211212
if (s[sessionID]) return
213+
const loopId = Identifier.ascending("loop")
212214
const controller = new AbortController()
213215
s[sessionID] = {
214216
abort: controller,
217+
loopId,
215218
callbacks: [],
216219
}
217-
return controller.signal
220+
return { signal: controller.signal, loopId }
218221
}
219222

220-
export function cancel(sessionID: string) {
221-
log.info("cancel", { sessionID })
223+
export function cancel(sessionID: string, loopId?: string) {
224+
log.info("cancel", { sessionID, loopId })
222225
const s = state()
223226
const match = s[sessionID]
224227
if (!match) return
228+
// If loopId is provided, only cancel if it matches the current loop
229+
// This prevents the old loop's cleanup from aborting a newly started loop
230+
if (loopId && match.loopId !== loopId) return
225231
match.abort.abort()
226-
for (const item of match.callbacks) {
227-
item.reject()
228-
}
232+
const pendingCallbacks = [...match.callbacks]
229233
delete s[sessionID]
230234
SessionStatus.set(sessionID, { type: "idle" })
231-
return
235+
236+
// If there were queued requests, restart the loop to handle pending messages
237+
if (pendingCallbacks.length > 0) {
238+
loop(sessionID)
239+
.then((result) => {
240+
for (const cb of pendingCallbacks) {
241+
cb.resolve(result)
242+
}
243+
})
244+
.catch(() => {
245+
for (const cb of pendingCallbacks) {
246+
cb.reject()
247+
}
248+
})
249+
}
232250
}
233251

234252
export const loop = fn(Identifier.schema("session"), async (sessionID) => {
235-
const abort = start(sessionID)
236-
if (!abort) {
253+
const startResult = start(sessionID)
254+
if (!startResult) {
237255
return new Promise<MessageV2.WithParts>((resolve, reject) => {
238256
const callbacks = state()[sessionID].callbacks
239257
callbacks.push({ resolve, reject })
240258
})
241259
}
242260

243-
using _ = defer(() => cancel(sessionID))
261+
const { signal: abort, loopId } = startResult
262+
using _ = defer(() => cancel(sessionID, loopId))
244263

245264
let step = 0
246265
while (true) {

0 commit comments

Comments
 (0)