Merge remote-tracking branch 'origin/feat/dashboard-agent-flows-watch' into feat/agent-storybook-gallery

Author: kathiekiwi

apps/webapp/app/components/dashboard-agent/WakeBanner.tsx

@@ -1,8 +1,11 @@
 /**
- * The banner above a wake narration.
+ * The banner above a wake narration: the label, the icon and the tone frame, and
+ * nothing else. The narration under it states the headline, the user's note and the
+ * next step, and each of those is said once per wake — so the banner marks the
+ * message as a wake rather than restating it.
  *
- * This component holds no kind-specific wording: tone, semantic icon and headline
- * come from contracts and `app/presenters/v3/dashboardAgent`. All it decides is which glyph a
+ * This component holds no kind-specific wording: tone and semantic icon come from
+ * contracts and `app/presenters/v3/dashboardAgent`. All it decides is which glyph a
  * semantic icon draws and which frame a tone paints.
  *
  * A wake is identified by its message id, `wake:watch:{watchId}:{fired|expired}`.
@@ -23,11 +26,7 @@ import type {
 } from "@internal/dashboard-agent-contracts";
 import { cn } from "~/utils/cn";
 import { type AgentTone, TONE_ICON_COLOR } from "./agent-badges";
-import {
-  presentResolvedWatch,
-  watchSubline,
-  WATCH_PRESENTATION_FALLBACK,
-} from "~/presenters/v3/dashboardAgent";
+import { presentResolvedWatch, WATCH_PRESENTATION_FALLBACK } from "~/presenters/v3/dashboardAgent";
 
 const WAKE_ID_PREFIX = "wake:watch:";
 
@@ -137,20 +136,15 @@ export function WakeBanner({
   const presentation = wakePresentation(outcome, watch);
   const tone = presentation.tone as AgentTone;
   const Icon = SEMANTIC_ICON[presentation.semanticIcon];
-  const note = watchSubline(watch);
 
   return (
     <div
-      className={cn("flex items-start gap-2 rounded-r-md border-l-2 px-3 py-2", TONE_FRAME[tone])}
+      className={cn("flex items-center gap-2 rounded-r-md border-l-2 px-3 py-2", TONE_FRAME[tone])}
     >
-      <Icon className={cn("mt-0.5 size-4 shrink-0", TONE_ICON_COLOR[tone])} />
-      <div className="min-w-0">
-        <p className="text-xxs font-medium uppercase tracking-wider text-text-dimmed">
-          {presentation.label}
-        </p>
-        <p className="text-sm font-medium text-text-bright">{presentation.headline}</p>
-        {note ? <p className="truncate text-xs text-text-dimmed">{note}</p> : null}
-      </div>
+      <Icon className={cn("size-4 shrink-0", TONE_ICON_COLOR[tone])} />
+      <p className="text-xxs font-medium uppercase tracking-wider text-text-dimmed">
+        {presentation.label}
+      </p>
     </div>
   );
 }

internal-packages/dashboard-agent/src/watch-narration.test.ts

@@ -33,10 +33,13 @@ describe("which model narrates a wake", () => {
     const plan = planWatchNarration(DRAINED);
     expect(plan.model).toBe("none");
     if (plan.model !== "none") throw new Error("unreachable");
-    // The dashboard's own sentence, the user's reason, then what to do.
-    expect(plan.text).toContain("task/send-receipt queue drained");
-    expect(plan.text).toContain("You asked to be told when: tell me when the backlog drains");
-    expect(plan.text).toContain("Nothing to do");
+    // The dashboard's own sentence, the user's reason, then what to do — each once.
+    // The banner above the wake carries the label and nothing else.
+    expect(plan.text.split("\n\n")).toEqual([
+      "task/send-receipt queue drained",
+      "You asked to be told when: tell me when the backlog drains",
+      "Nothing to do — I've stopped watching it.",
+    ]);
   });
 
   it("needs no model when the answer is that the watched thing is gone", () => {
@@ -57,13 +60,15 @@ describe("which model narrates a wake", () => {
     expect(planWatchNarration({ ...DRAINED, startsInvestigation: true }).model).toBe("sonnet");
   });
 
-  it("links the watched object when the wake carries the tenancy for one", () => {
+  it("links the watched object once, on the line that acts on it", () => {
     const { text } = deterministicWakeNarration({
       ...DRAINED,
       subjectLink: "[task/send-receipt](trigger://queue/proj_abc/env_abc/task%2Fsend-receipt)",
     });
-    expect(text).toContain("(trigger://queue/");
     expect(text).toContain("I've stopped watching [task/send-receipt]");
+    // The headline already names the queue, so it is not followed by the link too.
+    expect(text.split("\n\n")[0]).toBe("task/send-receipt queue drained");
+    expect(text.match(/trigger:\/\//g)).toHaveLength(1);
   });
 
   it("never says fired or expired", () => {

internal-packages/dashboard-agent/src/watch-narration.ts

@@ -72,7 +72,8 @@ export function deterministicWakeNarration(wake: NarratableWake): {
   });
   const lines = [
     // The headline is already a complete fact, and every surface states it this way.
-    wake.subjectLink ? `${presentation.headline} (${wake.subjectLink})` : presentation.headline,
+    // The subject is not repeated after it — the next step links it, once.
+    presentation.headline,
     wake.note ? watchNoteLine(wake.note) : null,
     nextStep(presentation, wake.subjectLink),
   ].filter((line): line is string => Boolean(line));