Skip to content

A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.

Treat a cursor-wait seq ahead of the host as a restart

feizfabe99bf08b1
diff --git a/ds-bot/src/host/computer/index.js b/ds-bot/src/host/computer/index.js
index 4a57d50a..77c7630e 100644
--- a/ds-bot/src/host/computer/index.js
+++ b/ds-bot/src/host/computer/index.js
@@ -277,7 +277,12 @@ export function install(rt) {
held.handoffLift?.()
}
})
- rt.closeComputerWaiters = () => { for (const waiter of [...cursorWaiters]) { cursorWaiters.delete(waiter); waiter.wake = () => {} } }
+ rt.closeComputerWaiters = () => {
+ for (const waiter of [...cursorWaiters]) {
+ cursorWaiters.delete(waiter)
+ waiter.close()
+ }
+ }
rt.refreshComputer = refreshComputer
// ---- App identity ----
@@ -1041,7 +1046,8 @@ export function install(rt) {
case 'set-enabled':
return setEnabled(body.enabled === true)
case 'cursor-wait': {
- const after = Number(body.after) || 0
+ // A seq beyond ours means the host restarted: seq starts over at 1.
+ const after = Number(body.after) > cursorSeq ? 0 : (Number(body.after) || 0)
const fresh = () => [...cursors.values()].filter(event => event.seq > after)
const now = () => ({ now: Date.now(), events: fresh() })
if (fresh().length > 0) return now()
@@ -1053,6 +1059,10 @@ export function install(rt) {
clearTimeout(timer)
resolve(now())
},
+ close: () => {
+ clearTimeout(timer)
+ resolve({ now: Date.now(), events: [] })
+ },
}
const timer = setTimeout(() => { cursorWaiters.delete(waiter); resolve({ now: Date.now(), events: [] }) }, 25000)
cursorWaiters.add(waiter)
@@ -1180,6 +1190,7 @@ export function install(rt) {
ctx.effect(() => () => {
stopped = true
leases.dispose()
+ rt.closeComputerWaiters()
for (const { resolve } of pendingAsks.values()) resolve('deny')
pendingAsks.clear()
for (const { abort } of inFlight.values()) abort.abort(new Error('DS Bot stopped'))
diff --git a/ds-bot/test/computer.test.js b/ds-bot/test/computer.test.js
index aa7e5fd8..71b0e2f9 100644
--- a/ds-bot/test/computer.test.js
+++ b/ds-bot/test/computer.test.js
@@ -1030,4 +1030,11 @@ test('cursor-wait returns fresh events, wakes on publish, and times out empty',
assert.equal(woke.events.length, 1)
assert.equal(woke.events[0].mode, 'window')
// nothing newer → the wait resolves empty after the timeout (stubbed short)
+ // a seq ahead of ours means the host restarted: answer like after=0
+ const restarted = await rt.computerEndpoint('cursor-wait', { after: 9999 })
+ assert.equal(restarted.events.length, 1)
+ // dispose resolves a pending waiter with no events
+ const held = rt.computerEndpoint('cursor-wait', { after: restarted.events[0].seq })
+ rt.closeComputerWaiters()
+ assert.deepEqual((await held).events, [])
})