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

apps/ade-cli/src/services/sync/syncRemoteCommandService.test.ts

@@ -2344,6 +2344,7 @@ describe("session lifecycle remote commands", () => {
   }) {
     const sessionService = {
       settleSession: vi.fn(() => true),
+      settleSessionReportingAbort: vi.fn(() => ({ found: true, settled: true })),
       unsettleSession: vi.fn(() => true),
       settleSessions: vi.fn(() => ["session-1"]),
       unsettleSessions: vi.fn(),
@@ -2369,7 +2370,7 @@ describe("session lifecycle remote commands", () => {
       sessionId: "session-1",
       outcome: "PR #841 merged",
     }))).resolves.toEqual({ ok: true, sessionId: "session-1" });
-    expect(sessionService.settleSession).toHaveBeenCalledWith("session-1", { outcome: "PR #841 merged" });
+    expect(sessionService.settleSessionReportingAbort).toHaveBeenCalledWith("session-1", { outcome: "PR #841 merged" });
 
     await expect(service.execute(makePayload("session.unsettleSession", { sessionId: "session-1" })))
       .resolves.toEqual({ ok: true, sessionId: "session-1" });
@@ -2393,7 +2394,7 @@ describe("session lifecycle remote commands", () => {
     }))).resolves.toEqual({ ok: true, sessionId: "session-1" });
 
     expect(handleSessionSettled).not.toHaveBeenCalled();
-    expect(sessionService.settleSession).toHaveBeenCalledWith("session-1", {});
+    expect(sessionService.settleSessionReportingAbort).toHaveBeenCalledWith("session-1", {});
   });
 
   // `dismissPendingInputBeforeSettle` mutates and can then throw for a row with

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/adeActions/registry.test.ts

@@ -1624,6 +1624,7 @@
     const requestAttention = vi.fn(() => true);
     const setStatusNote = vi.fn(() => true);
     const settleSession = vi.fn(() => true);
+    const settleSessionReportingAbort = vi.fn(() => ({ found: true, settled: true }));
     const unsettleSession = vi.fn(() => true);
     const markSessionAttentionRequested = vi.fn();
     const setSessionRuntimeState = vi.fn(() => true);
@@ -1642,6 +1643,7 @@
         requestAttention,
         setStatusNote,
         settleSession,
+        settleSessionReportingAbort,
         unsettleSession,
       },
       ptyService: {
@@ -1853,11 +1855,13 @@
   it("dismisses pending chat input before settling through the session action", async () => {
     const dismissPendingInputForSettlement = vi.fn(async () => undefined);
     const settleSession = vi.fn(() => true);
+    const settleSessionReportingAbort = vi.fn(() => ({ found: true, settled: true }));
     const runtime = {
       sessionService: {
         get: vi.fn(() => ({ id: "chat-1", toolType: "codex-chat" })),
         list: vi.fn(),
         settleSession,
+        settleSessionReportingAbort,
       },
       agentChatService: {
         dismissPendingInputForSettlement,
@@ -1875,14 +1879,15 @@
       dismissPendingInput: true,
     })).resolves.toEqual({ ok: true, sessionId: "chat-1" });
     expect(dismissPendingInputForSettlement).toHaveBeenCalledWith({ sessionId: "chat-1" });
-    expect(settleSession).toHaveBeenCalledWith("chat-1", { source: "user" });
+    expect(settleSessionReportingAbort).toHaveBeenCalledWith("chat-1", { source: "user" });
     expect(dismissPendingInputForSettlement.mock.invocationCallOrder[0]).toBeLessThan(
-      settleSession.mock.invocationCallOrder[0]!,
+      settleSessionReportingAbort.mock.invocationCallOrder[0]!,
     );
   });
 
   it("does not pretend a native CLI prompt was dismissed while its process is still blocked", async () => {
     const settleSession = vi.fn(() => true);
+    const settleSessionReportingAbort = vi.fn(() => ({ found: true, settled: true }));
     const setSessionRuntimeState = vi.fn(() => true);
     const runtime = {
       sessionService: {

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

@@ -29,6 +29,7 @@ import type { createCtoStateService } from "../../cto/ctoStateService";
 import type { CtoMemoryService } from "../../cto/ctoMemoryService";
 import { getErrorMessage, nowIso, parseIsoToEpoch } from "../../shared/utils";
 import { buildAdePrUrl } from "../../../../shared/deeplinks";
+import { settleAbortMessage } from "../../sessions/settleTerminalSession";
 
 export interface CtoOperatorToolDeps {
   currentSessionId: string;
@@ -49,6 +50,7 @@ export interface CtoOperatorToolDeps {
     | "updateMeta"
     | "get"
     | "settleSession"
+    | "settleSessionReportingAbort"
     | "unsettleSession"
     | "setSettleOverride"
     | "snoozeSession"
@@ -552,11 +554,16 @@ 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 reason matters: `teardown_failed` and `joined_in_flight` do not
+          // mean the session went active, and saying so misdirects the operator.
+          return { success: false, error: settleAbortMessage(sessionId, result.abortedBy) };
+        }
         return { success: true, sessionId, ...readSessionLifecycle(deps, sessionId) };
       } catch (error) {
         return { success: false, error: getErrorMessage(error) };