Use watchingEnabled for tutorial WATCHING detection

Author: nedtwigg

docs/specs/tutorial.md

@@ -55,18 +55,18 @@ Note: `-` produces a `direction: 'vertical'` split (panes stack top/bottom = hor
 
 ### Section 2 — Alert and TODO (6 items)
 
-The detector subscribes to `subscribeToActivity()` and tracks per-id `(status, todo)` transitions.
+The detector subscribes to `subscribeToActivity()` and tracks per-id `(status, watchingEnabled, todo)` transitions.
 
 | ID | Title | Detection |
 |---|---|---|
-| `al-enable` | Enable WATCHING on a pane (click bell or `a`) | status transitions away from `WATCHING_DISABLED` |
+| `al-enable` | Enable WATCHING on a pane (click bell or `a`) | `watchingEnabled` transitions `false → true` |
 | `al-busy` | Watch the bell tilt while a task runs | status enters `BUSY`, `MIGHT_BE_BUSY`, or `OSC_NOTIF_BUSY` |
 | `al-ring` | Bell rings on completion | status enters `ALERT_RINGING` |
 | `al-todo-auto` | TODO appears when you dismiss the ringing alert | `todo` transitions `false → true` while previous status was `ALERT_RINGING` |
 | `al-todo-clear` | Press passthrough Enter to clear the TODO | `todo` transitions `true → false` |
 | `al-todo-manual` | Manually add a TODO (`t` or right-click) | `todo` transitions `false → true` while previous status was NOT `ALERT_RINGING` |
 
-The detector remembers the most recent pane whose WATCHING track was enabled. The Alert section view shows a runner-local instruction: "Press `s` here to start a fake busy task." `s` is **not** a real MouseTerm shortcut; it is intercepted by `TutRunner` only while the Alert section is open. When pressed, the runner does two things:
+The detector remembers the most recent pane whose `watchingEnabled` flag is true, even when projected `status` is currently owned by protocol or command-exit alert tracks. The Alert section view shows a runner-local instruction: "Press `s` here to start a fake busy task." `s` is **not** a real MouseTerm shortcut; it is intercepted by `TutRunner` only while the Alert section is open. When pressed, the runner does two things:
 
 1. Resolves that pane to its current PTY session id, then calls `adapter.pumpActivity(sessionId, BUSY_DEMO_DURATION_MS, 800)` — drives the alert-manager's activity monitor on the same WATCHING-enabled session with **no text output**, so the bell tilts to BUSY without scrolling any scenario text. The session id is resolved at trigger time so `Cmd/Ctrl+Arrow` swaps do not leave the tutorial pumping an old pane id. If no WATCHING-enabled pane is known, the runner falls back to `PANE_BOXED` (the changelog pane). `BUSY_DEMO_DURATION_MS` is `cfg.alert.userAttention + 250` so silence begins after the attention idle window has expired, with a small scheduler-jitter guard; otherwise the "user is looking at this pane" check inside `ActivityMonitor.startNeedsAttentionConfirmTimer` would suppress the ring rather than let it fire.
 2. Animates a countdown in-place where the "Press s…" hint was: `⠋ Fake task will finish in N seconds.` ticking down to 1, then a static `✓ Fake task finished. Press s to start another one.` once the activity stops. Detection is purely timing-based via the existing `ActivityMonitor`, so no shell integration is required.

website/src/lib/tut-detector.test.ts

@@ -4,15 +4,19 @@ import type { ActivityState } from "mouseterm-lib/lib/terminal-registry";
 import { TutDetector } from "./tut-detector";
 import { TutorialState } from "./tutorial-state";
 
-function activity(status: ActivityState["status"], todo = false): ActivityState {
-  return { status, watchingEnabled: status !== "WATCHING_DISABLED", todo, notification: null };
+function activity(
+  status: ActivityState["status"],
+  todo = false,
+  watchingEnabled = status !== "WATCHING_DISABLED",
+): ActivityState {
+  return { status, watchingEnabled, todo, notification: null };
 }
 
-function makeDetectorHarness() {
+function makeDetectorHarness(initialActivitySnapshot = new Map<string, ActivityState>()) {
   let activePanelListener: ((panel: { id?: string } | undefined) => void) | null = null;
   let activityListener: (() => void) | null = null;
   let mouseListener: (() => void) | null = null;
-  let activitySnapshot = new Map<string, ActivityState>();
+  let activitySnapshot = initialActivitySnapshot;
   let mouseSnapshot = new Map<string, MouseSelectionState>();
   const onWatchingDemoPaneChange = vi.fn();
 
@@ -117,8 +121,8 @@ describe("TutDetector", () => {
     const { state, setActivitySnapshot } = makeDetectorHarness();
 
     setActivitySnapshot(new Map([
-      ["pane-a", { status: "BUSY", todo: false }],
-      ["pane-b", { status: "ALERT_RINGING", todo: false }],
+      ["pane-a", activity("BUSY")],
+      ["pane-b", activity("ALERT_RINGING")],
     ]));
 
     expect(state.isComplete("al-busy")).toBe(false);
@@ -155,6 +159,43 @@ describe("TutDetector", () => {
     expect(state.isComplete("al-enable")).toBe(true);
   });
 
+  it("does not credit al-enable for projected command-exit status while WATCHING is off", () => {
+    const { state, onWatchingDemoPaneChange, setActivitySnapshot } = makeDetectorHarness();
+
+    onWatchingDemoPaneChange.mockClear();
+    setActivitySnapshot(new Map([
+      ["pane-a", activity("WATCHING_DISABLED", false, false)],
+    ]));
+    setActivitySnapshot(new Map([
+      ["pane-a", activity("COMMAND_EXIT_ARMED", false, false)],
+    ]));
+
+    expect(state.isComplete("al-enable")).toBe(false);
+    expect(onWatchingDemoPaneChange).not.toHaveBeenCalled();
+  });
+
+  it("credits al-enable when WATCHING turns on under an existing projected status", () => {
+    const { state, onWatchingDemoPaneChange, setActivitySnapshot } = makeDetectorHarness();
+
+    setActivitySnapshot(new Map([
+      ["pane-a", activity("COMMAND_EXIT_ARMED", false, false)],
+    ]));
+    setActivitySnapshot(new Map([
+      ["pane-a", activity("COMMAND_EXIT_ARMED", false, true)],
+    ]));
+
+    expect(state.isComplete("al-enable")).toBe(true);
+    expect(onWatchingDemoPaneChange).toHaveBeenLastCalledWith("pane-a");
+  });
+
+  it("does not seed the WATCHING demo pane from projected alert status", () => {
+    const { onWatchingDemoPaneChange } = makeDetectorHarness(new Map([
+      ["pane-a", activity("ALERT_RINGING", false, false)],
+    ]));
+
+    expect(onWatchingDemoPaneChange).toHaveBeenLastCalledWith(null);
+  });
+
   it("tracks the pane whose WATCHING was enabled for the busy demo", () => {
     const { onWatchingDemoPaneChange, setActivitySnapshot } = makeDetectorHarness();
 

website/src/lib/tut-detector.ts

@@ -63,7 +63,7 @@ export class TutDetector {
     // mis-read as a transition from "nothing".
     for (const [id, s] of this.activityStore.getActivitySnapshot()) {
       this.prevActivity.set(id, { ...s });
-      if (s.status !== "WATCHING_DISABLED") {
+      if (s.watchingEnabled) {
         this.watchingEnabledPaneIds.add(id);
         this.preferredWatchingPaneId ??= id;
       }
@@ -157,12 +157,12 @@ export class TutDetector {
         continue;
       }
 
-      if (prev.status === "WATCHING_DISABLED" && current.status !== "WATCHING_DISABLED") {
+      if (!prev.watchingEnabled && current.watchingEnabled) {
         this.state.markComplete("al-enable");
         this.watchingEnabledPaneIds.add(id);
         this.preferredWatchingPaneId = id;
         this.emitWatchingDemoPaneChange();
-      } else if (prev.status !== "WATCHING_DISABLED" && current.status === "WATCHING_DISABLED") {
+      } else if (prev.watchingEnabled && !current.watchingEnabled) {
         this.watchingEnabledPaneIds.delete(id);
         if (this.preferredWatchingPaneId === id) {
           this.preferredWatchingPaneId = this.watchingEnabledPaneIds.values().next().value ?? null;