fix(claude): retire interrupted background tasks

Author: cfal

server-agents/claude/src/agents/claude/__tests__/abort-timer.test.js

@@ -282,7 +282,8 @@ describe('ClaudeCliRuntime abort force-kill fallback', () => {
   it('settles cleanly when an interrupt ends a fenced background wait', async () => {
     const runtime = createRuntime();
     const ctrl = createControllableProc();
-    spawnMock.mockReturnValue(ctrl.proc);
+    const nextCtrl = createControllableProc();
+    spawnMock.mockReturnValueOnce(ctrl.proc).mockReturnValueOnce(nextCtrl.proc);
     const failures = [];
     const finishes = [];
     runtime.onFailed((chatId, message) => failures.push({ chatId, message }));
@@ -321,10 +322,21 @@ describe('ClaudeCliRuntime abort force-kill fallback', () => {
 
     ctrl.push(IDLE);
     await turn;
+    await flush();
     expect(cleared).toContain(completionFallback.id);
     expect(ctrl.proc.killed).toBe(false);
+    expect(ctrl.proc.ended).toBe(true);
     expect(failures).toEqual([]);
     expect(finishes).toEqual([{ chatId: 'chat-1', exitCode: 0 }]);
+
+    const nextTurn = runtime.runClaudeTurn(startOptions({ command: 'after stop' }));
+    await flush();
+    nextCtrl.push(INIT);
+    nextCtrl.startLatestInput();
+    nextCtrl.push({ type: 'assistant', content: [{ type: 'text', text: 'continued' }] });
+    settleTurn(nextCtrl);
+    await nextTurn;
+    expect(spawnMock).toHaveBeenCalledTimes(2);
   });
 
   it('cancels a queued submitted input when an internal turn is interrupted', async () => {

server-agents/claude/src/agents/claude/cli-session-state.ts

@@ -124,11 +124,15 @@ export function handleClaudeProviderLifecycleMessage(
     );
     return true;
   }
+  const retireAfterSettlement =
+    protocol.backgroundContinuationPending && protocol.abortRequested;
+  if (retireAfterSettlement) session.backgroundTaskCount = 0;
 
   const failure = protocol.settlementFailureMessage();
   if (failure) {
     handlers.logger.warn('Claude CLI run settled with an error', details);
     handlers.fail(failure);
+    if (retireAfterSettlement) handlers.retire();
     return true;
   }
   if (protocol.cleanAbortResultSeen) {
@@ -137,5 +141,6 @@ export function handleClaudeProviderLifecycleMessage(
     handlers.logger.info('Claude CLI run settled at provider idle', details);
   }
   handlers.finish();
+  if (retireAfterSettlement) handlers.retire();
   return true;
 }