Handle command-exit watches on PTY exit

Author: nedtwigg

docs/specs/alert.md

@@ -307,6 +307,8 @@ The command-exit track is intentionally stricter than WATCHING. It exists for th
 | `IDLE` | watched command is still running and attention expires or is explicitly lost | `COMMAND_EXIT_ARMED` | Store `attentionLostAt`. |
 | `COMMAND_EXIT_ARMED` | same command finishes, runtime is at least `T_USER_ATTENTION`, and Session lacks attention | `ALERT_RINGING` | Create generated command-exit notification, set `todo = true`, and ring. |
 | `COMMAND_EXIT_ARMED` | same command finishes too quickly | `IDLE` | Clear without ringing. |
+| `COMMAND_EXIT_ARMED` | PTY exits before a command-finish semantic event, runtime is at least `T_USER_ATTENTION`, and Session lacks attention | `ALERT_RINGING` | Treat process exit as the fallback finish event for commands such as `exec <long command>` or shells that exit before emitting a finish marker. |
+| `IDLE` | PTY exits before a command-finish semantic event | `IDLE` | Clear any stored `commandExitWatch`; a dead process must not become armed later. |
 | `COMMAND_EXIT_ARMED` | Session regains attention before finish | `IDLE` | Clear the arm; the user is watching again. |
 | any | a different command starts | `IDLE` | Replace the watch with the new command if it is eligible. |
 | `ALERT_RINGING` | explicit attention boundary / dismiss / TODO clear | `IDLE` | Public status falls back to the other tracks. |

lib/src/lib/alert-manager.test.ts

@@ -352,6 +352,45 @@ describe('AlertManager in isolation', () => {
     });
   });
 
+  it('finishes an armed command-exit watch when the PTY exits without commandFinish', () => {
+    const id = 'command-exit-pty-exit';
+
+    manager.attend(id);
+    manager.applyTerminalSemanticEvents(id, [
+      { type: 'commandLine', commandLine: 'exec pnpm build' },
+      { type: 'commandStart', source: 'osc633_E', startedAt: Date.now() },
+    ]);
+
+    vi.advanceTimersByTime(15_000);
+    expect(manager.getState(id).status).toBe('COMMAND_EXIT_ARMED');
+
+    manager.onExit(id, 1);
+    expect(manager.getState(id)).toMatchObject({
+      status: 'ALERT_RINGING',
+      todo: true,
+      notification: { source: 'COMMAND_EXIT', title: 'Command finished', body: 'exec pnpm build exited 1' },
+    });
+  });
+
+  it('clears an unarmed command-exit watch when the PTY exits before attention loss', () => {
+    const id = 'command-exit-pty-exit-unarmed';
+
+    manager.attend(id);
+    manager.applyTerminalSemanticEvents(id, [
+      { type: 'commandLine', commandLine: 'exec true' },
+      { type: 'commandStart', source: 'osc633_E', startedAt: Date.now() },
+    ]);
+
+    manager.onExit(id, 0);
+    vi.advanceTimersByTime(15_000);
+
+    expect(manager.getState(id)).toMatchObject({
+      status: 'WATCHING_DISABLED',
+      todo: false,
+      notification: null,
+    });
+  });
+
   it('does not ring command-exit alerts for commands shorter than the attention window', () => {
     const id = 'quick-command-exit';
 

lib/src/lib/alert-manager.ts

@@ -136,9 +136,11 @@ export class AlertManager {
     entry?.monitor?.onData();
   }
 
-  // Intentional no-op: the monitor detects silence and transitions naturally,
-  // and we keep the entry so alert/todo state survives the PTY exit.
-  onExit(_id: string): void {}
+  onExit(id: string, exitCode?: number): void {
+    const entry = this.entries.get(id);
+    if (!entry) return;
+    if (this.finishCommandExitWatch(id, entry, exitCode)) this.notify(id);
+  }
 
   onResize(id: string): void {
     const entry = this.entries.get(id);

lib/src/lib/platform/fake-adapter.ts

@@ -157,6 +157,7 @@ export class FakePtyAdapter implements PlatformAdapter {
     this.terminalSizes.delete(id);
     this.inputHandlers.delete(id);
     this.protocolParsers.delete(id);
+    this.alertManager.onExit(id, 0);
     for (const handler of this.exitHandlers) {
       handler({ id, exitCode: 0 });
     }
@@ -321,7 +322,7 @@ export class FakePtyAdapter implements PlatformAdapter {
       const exitTimer = setTimeout(() => {
         if (!this.terminals.has(id)) return;
         this.activeTimers.delete(id);
-        this.alertManager.onExit(id);
+        this.alertManager.onExit(id, scenario.exitCode ?? 0);
         for (const handler of this.exitHandlers) {
           handler({ id, exitCode: scenario.exitCode ?? 0 });
         }

standalone/src/tauri-adapter.ts

@@ -75,7 +75,7 @@ export class TauriAdapter implements PlatformAdapter {
 
     this.unlistenFns.push(
       await listen<{ id: string; exitCode: number }>("pty:exit", (event) => {
-        this.alertManager.onExit(event.payload.id);
+        this.alertManager.onExit(event.payload.id, event.payload.exitCode);
         this.protocolParsers.delete(event.payload.id);
         for (const handler of this.exitHandlers) {
           handler(event.payload);

vscode-ext/src/message-router.ts

@@ -75,9 +75,9 @@ ptyManager.addCallbacks({
       log.info(`[alert-feed] ${id}: ${before} → ${after}`);
     }
   },
-  onExit(id: string) {
+  onExit(id: string, exitCode: number) {
     log.info(`[alert-feed] ${id}: PTY exited`);
-    alertManager.onExit(id);
+    alertManager.onExit(id, exitCode);
     alertProtocolParsers.delete(id);
   },
 });