Settling state, abort rule, and the race matrix (settle teardown, step 2)

apps/desktop/src/main/main.ts

@@ -1,4 +1,4 @@
 import { app, BrowserWindow, dialog, ipcMain, Menu, nativeImage, Notification, powerMonitor, protocol, safeStorage, shell } from "electron";
 
 if (app.isPackaged && process.env.ADE_RUNTIME_PACKAGED === undefined) {
   process.env.ADE_RUNTIME_PACKAGED = "1";
@@ -210,7 +210,7 @@
 import { localIpcListenOptions } from "../../../ade-cli/src/services/runtime/localIpcListenOptions";
 import { normalizeProjectRootPath } from "../../../ade-cli/src/services/projects/projectRoots";
 import {
   ACCOUNT_SESSION_CREDENTIAL_KEY,
   getSignedInAccountAccessToken,
 } from "../../../ade-cli/src/services/account/accountAuthService";
 import { createPushRelayClient } from "../../../ade-cli/src/services/push/pushRelayClient";
@@ -3589,6 +3589,12 @@
       db,
       sessionService,
       emitEvent: emitPrEvent,
+      getChatLiveness: async (sessionId) => {
+        const summary = await agentChatService.getSessionSummary(sessionId);
+        return summary
+          ? { status: summary.status, awaitingInput: summary.awaitingInput }
+          : null;
+      },
     });
     laneTeardownDeps.agentChatService = {
       countActiveForLane: (laneId) => agentChatService.countActiveForLane(laneId),

apps/desktop/src/main/services/ai/tools/ctoOperatorTools.test.ts

@@ -497,6 +497,7 @@ describe("createCtoOperatorTools", () => {
           ...row,
         })),
         settleSession: vi.fn(() => true),
+        settleSessionReportingAbort: vi.fn(() => ({ found: true, settled: true })),
         unsettleSession: vi.fn(() => true),
         setSettleOverride: vi.fn(() => true),
         snoozeSession: vi.fn(() => true),
@@ -548,7 +549,7 @@ describe("createCtoOperatorTools", () => {
         sessionId: "chat-1",
         outcome: "CI green",
       })).resolves.toMatchObject({ success: true });
-      expect(sessionService.settleSession).toHaveBeenCalledWith("chat-1", {
+      expect(sessionService.settleSessionReportingAbort).toHaveBeenCalledWith("chat-1", {
         outcome: "CI green",
         source: "operator",
       });

apps/desktop/src/main/services/ai/tools/ctoOperatorTools.ts

@@ -49,6 +49,7 @@ export interface CtoOperatorToolDeps {
     | "updateMeta"
     | "get"
     | "settleSession"
+    | "settleSessionReportingAbort"
     | "unsettleSession"
     | "setSettleOverride"
     | "snoozeSession"
@@ -552,11 +553,20 @@ export function createCtoOperatorTools(deps: CtoOperatorToolDeps): Record<string
     }),
     execute: async ({ sessionId, outcome }) => {
       try {
-        const ok = deps.sessionService.settleSession(sessionId, {
+        const result = deps.sessionService.settleSessionReportingAbort(sessionId, {
           ...(outcome ? { outcome } : {}),
           source: "operator",
         });
-        if (!ok) return { success: false, error: `Session not found: ${sessionId}` };
+        if (!result.found) return { success: false, error: `Session not found: ${sessionId}` };
+        if (!result.settled) {
+          // The session went active while the settle was in flight. Saying "not
+          // found" here would send the operator looking for a session that is
+          // sitting right there, working.
+          return {
+            success: false,
+            error: `Session is active again, so it was not settled: ${sessionId}`,
+          };
+        }
         return { success: true, sessionId, ...readSessionLifecycle(deps, sessionId) };
       } catch (error) {
         return { success: false, error: getErrorMessage(error) };