diff --git a/packages/dsh-loopx-plugin/src/driver.ts b/packages/dsh-loopx-plugin/src/driver.ts index 5f144538cf..bdafac88a7 100644 --- a/packages/dsh-loopx-plugin/src/driver.ts +++ b/packages/dsh-loopx-plugin/src/driver.ts @@ -1011,6 +1011,7 @@ export class LoopXContinuationDriver { private async evaluate(state: DriverState): Promise { if (!this.ready(state)) return false + const session = state.agent.session const startedAt = performance.now() let stage: AdmissionStage = 'maintenance-slot' let admissionSignal: AbortSignal | undefined @@ -1056,6 +1057,9 @@ export class LoopXContinuationDriver { if (!waitingForIdle && state.controller === controller) state.controller = undefined } + // Cancellation can land after the maintenance callback has built its plan. + if (admissionSignal?.aborted || state.agent.session !== session) return false + if (plan.kind === 'wait') { if (plan.schedulerToken !== undefined) state.schedulerToken = plan.schedulerToken if (plan.unchangedPolls !== undefined) state.unchangedPolls = plan.unchangedPolls diff --git a/packages/dsh-loopx-plugin/tests/driver.spec.ts b/packages/dsh-loopx-plugin/tests/driver.spec.ts index 19e11c9443..537e78776d 100644 --- a/packages/dsh-loopx-plugin/tests/driver.spec.ts +++ b/packages/dsh-loopx-plugin/tests/driver.spec.ts @@ -2340,6 +2340,49 @@ describe('GoalBar exact-Session Driver bridge', () => { await driver.dispose() }) + it.each([ + { plan: 'queue', shouldRun: true, interruption: 'Pause' }, + { plan: 'wait', shouldRun: false, interruption: 'Pause' }, + { plan: 'queue', shouldRun: true, interruption: 'maintenance cancellation' }, + { plan: 'wait', shouldRun: false, interruption: 'maintenance cancellation' }, + ])('discards a $plan plan returned after $interruption', async ({ shouldRun, interruption }) => { + const fixture = runnerFixture({ shouldRun, waitMinutes: 5 }) + const clock = schedulerClock() + const host = fakeAgent() + const driver = new LoopXContinuationDriver({ + runner: fixture.runner, + isLiveAgent: () => true, + retryDelaysMs: [0, 0], + clock, + }) + const capture = { agent: host.agent, session: host.agent.session } + vi.spyOn(host.agent, 'runMaintenance').mockImplementationOnce(async task => { + const maintenance = new AbortController() + const plan = await task(maintenance.signal) + if (interruption === 'Pause') { + await expect(driver.cancelQueued(capture)).resolves.toEqual({ kind: 'applied' }) + } else { + maintenance.abort() + } + return plan + }) + try { + driver.observeAgent(host.agent) + host.appendEvent(userSkillInvocationEvent()) + const interrupted = await driver.evaluateActivatedSession(capture) + expect(host.nextTurn).toHaveLength(0) + expect(clock.timers).toHaveLength(0) + expect(interrupted).toEqual({ kind: 'unavailable', reason: 'evaluation_unavailable' }) + + await expect(driver.evaluateActivatedSession(capture)).resolves.toEqual({ kind: 'applied' }) + expect(fixture.quotaCalls).toHaveLength(2) + expect(host.nextTurn).toHaveLength(shouldRun ? 1 : 0) + expect(clock.timers).toHaveLength(shouldRun ? 0 : 1) + } finally { + await driver.dispose() + } + }) + it('Pause removes only the captured Session scheduled continuation', async () => { const fixture = runnerFixture({ shouldRun: false, waitMinutes: 5 }) const first = fakeAgent()