Codex review R1: reset soft-TODO bucket to full on re-attend, add tests

Author: nedtwigg

docs/specs/alarm.md

@@ -206,7 +206,7 @@ The Session leaves `ALARM_RINGING` and returns to `NOTHING_TO_SHOW` when any of
 - the user marks the Session as hard TODO (`t` key or context menu)
 - new output arrives while the Session has attention (starts a new `MIGHT_BE_BUSY` cycle; without attention the alarm stays ringing — see latch in transition rules)
 
-All attention-based dismissals (the first three above) create a soft TODO if `todo` is currently `TODO_OFF`. This prevents phantom dismissals where the alarm vanishes without a trace. Printable keypresses drain the soft TODO's leaky bucket, and if the bucket empties completely the soft TODO clears — so users who engage with the output don't accumulate breadcrumbs. If the user stops typing, the bucket refills over `cfg.todoBucket.timeToFullSeconds` (default 3 s). Synthetic terminal reports (focus events, cursor-position responses) do not drain the bucket.
+All attention-based dismissals (the first three above) create a soft TODO if `todo` is not already `TODO_HARD`. If a partially-drained soft TODO already exists, the bucket resets to full — a fresh alarm ring deserves a full drain cycle. This prevents phantom dismissals where the alarm vanishes without a trace. Printable keypresses drain the soft TODO's leaky bucket, and if the bucket empties completely the soft TODO clears — so users who engage with the output don't accumulate breadcrumbs. If the user stops typing, the bucket refills over `cfg.todoBucket.timeToFullSeconds` (default 3 s). Synthetic terminal reports (focus events, cursor-position responses) do not drain the bucket.
 
 The Session leaves `ALARM_RINGING` and returns to `ALARM_DISABLED` when:
 

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

@@ -254,6 +254,54 @@ describe('AlarmManager in isolation', () => {
     expect(manager.getState(id).todo).toBe(TODO_HARD);
   });
 
+  it('re-attending a ringing alarm resets a partially-drained soft-TODO bucket to full', () => {
+    const id = 'bucket-reset-on-reattend';
+    createSoftTodo(id);
+
+    // Drain the bucket partially (3 out of 5 keypresses)
+    manager.drainTodoBucket(id);
+    manager.drainTodoBucket(id);
+    manager.drainTodoBucket(id);
+    expect(manager.getState(id).todo).toBeCloseTo(0.4);
+
+    // Drive to ALARM_RINGING again
+    manager.clearAttention(id);
+    manager.onData(id);
+    vi.advanceTimersByTime(1_600);
+    manager.onData(id);
+    manager.onData(id);
+    vi.advanceTimersByTime(2_000);
+    vi.advanceTimersByTime(3_000);
+    expect(manager.getState(id).status).toBe('ALARM_RINGING');
+
+    // Re-attend should reset the bucket to full
+    manager.attend(id);
+    expect(manager.getState(id).todo).toBe(TODO_SOFT_FULL);
+  });
+
+  it('re-attending a ringing alarm does NOT override a hard TODO', () => {
+    const id = 'bucket-no-reset-hard';
+    createSoftTodo(id);
+
+    // Promote to hard
+    manager.promoteTodo(id);
+    expect(manager.getState(id).todo).toBe(TODO_HARD);
+
+    // Drive to ALARM_RINGING again
+    manager.clearAttention(id);
+    manager.onData(id);
+    vi.advanceTimersByTime(1_600);
+    manager.onData(id);
+    manager.onData(id);
+    vi.advanceTimersByTime(2_000);
+    vi.advanceTimersByTime(3_000);
+    expect(manager.getState(id).status).toBe('ALARM_RINGING');
+
+    // Re-attend should NOT change hard TODO
+    manager.attend(id);
+    expect(manager.getState(id).todo).toBe(TODO_HARD);
+  });
+
   it('drainTodoBucket is a no-op for hard TODOs', () => {
     const id = 'bucket-hard-noop';
     manager.toggleTodo(id);

lib/src/lib/alarm-manager.ts

@@ -129,7 +129,7 @@ export class AlarmManager {
 
     if (previousStatus === 'ALARM_RINGING') {
       entry.attentionDismissedRing = true;
-      if (entry.todo === TODO_OFF) {
+      if (!isHardTodo(entry.todo)) {
         entry.todo = TODO_SOFT_FULL;
       }
     }