@@ -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>
   );
 }
@@ -116,9 +116,10 @@ describe("watch wake narration", () => {
 
     const first = await harness.sendAction(WAKE);
     // A drained queue is a fact the check already established, so the sentence is the
-    // dashboard's own wording and no model is called for it. The banner states the
-    // headline, so the wake only says what happens next.
-    expect(collectText(first.chunks)).toBe("Nothing to do — I've stopped watching.");
+    // dashboard's own wording and no model is called for it.
+    expect(collectText(first.chunks)).toBe(
+      "task/send-receipt queue drained\n\nNothing to do — I've stopped watching it."
+    );
 
     // The streamed message must carry the same id the read-model copy is persisted
     // under, or the panel renders the narration twice.
@@ -250,11 +251,8 @@ describe("watch wake narration", () => {
       facts: { reason: "terminal_unsatisfied" },
     });
 
-    // Read as `condition_impossible`: only that resolution is neutral here, and only a
-    // neutral outcome offers another watch instead of reporting a problem.
-    expect(collectText(wake.chunks)).toBe(
-      "I've stopped watching. Ask me if you want another watch set up."
-    );
+    // Read as `condition_impossible`: only that resolution says the queue is gone.
+    expect(collectText(wake.chunks)).toContain("task/send-receipt queue no longer exists");
     expect(wakeText(prompts)).toBe("[]");
   });
 
@@ -465,7 +463,7 @@ describe("watch wake narration", () => {
     const first = await harness.sendAction(WAKE);
     // Streamed — so it is on `session.out` and in the next boot's history — while the
     // row it was supposed to land alongside never arrived.
-    expect(collectText(first.chunks)).toContain("I've stopped watching");
+    expect(collectText(first.chunks)).toContain("queue drained");
     expect(failing.calls.appendMessage).toHaveLength(1);
     expect(table.countOf(chatId, wakeId)).toBe(0);
     const durable = first.chunks;
 
@@ -510,6 +510,7 @@ async function narrateWatchWake(args: {
     resolution: wakeResolution(action),
     observed: action.observed,
     note: action.note,
+    subjectLink: wakeSubjectLink(action, tenancy),
     startsInvestigation: wakeStartsInvestigation(action),
   });
   logger.info("dashboard-agent watch wake narration lane", {
 
@@ -33,24 +33,20 @@ describe("which model narrates a wake", () => {
     const plan = planWatchNarration(DRAINED);
     expect(plan.model).toBe("none");
     if (plan.model !== "none") throw new Error("unreachable");
-    // Just what to do. The banner above the wake already states the headline and
-    // the user's reason, and a wake says each fact once.
-    expect(plan.text).toBe("Nothing to do — I've stopped watching.");
-    expect(plan.presentation.headline).toBe("task/send-receipt queue drained");
+    // 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", () => {
     const plan = planWatchNarration({ ...DRAINED, resolution: "condition_impossible" });
     expect(plan.model).toBe("none");
     if (plan.model !== "none") throw new Error("unreachable");
-    expect(plan.presentation.headline).toContain("no longer exists");
-  });
-
-  it("never repeats the headline or the note the banner already states", () => {
-    const { text } = deterministicWakeNarration(DRAINED);
-    expect(text).not.toContain("queue drained");
-    expect(text).not.toContain("tell me when the backlog drains");
-    expect(text).not.toContain("You asked to be told when");
+    expect(plan.text).toContain("no longer exists");
   });
 
   it("uses Haiku when the fact has to be turned into what to do", () => {
@@ -64,10 +60,15 @@ describe("which model narrates a wake", () => {
     expect(planWatchNarration({ ...DRAINED, startsInvestigation: true }).model).toBe("sonnet");
   });
 
-  it("never names the watched object again — the banner just named it", () => {
-    const { text } = deterministicWakeNarration(DRAINED);
-    expect(text).not.toContain("task/send-receipt");
-    expect(text).not.toContain("trigger://");
+  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("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", () => {
 
@@ -1,5 +1,6 @@
 import {
   presentResolvedWatch,
+  watchNoteLine,
   type WatchObservedOutcome,
   type WatchPresentation,
   type WatchResolution,
@@ -33,6 +34,8 @@ export type NarratableWake = {
   resolution: WatchResolution;
   observed?: WatchObservedOutcome;
   note?: string;
+  /** The watched thing as a `trigger://` markdown link, when the tenancy allows one. */
+  subjectLink?: string;
   /** The user pre-approved an investigation and it has already been started. */
   startsInvestigation: boolean;
 };
@@ -42,25 +45,21 @@ export type NarratableWake = {
  * exactly the judgement a model is for, and this lane is the one where there is
  * nothing to judge.
  */
-function nextStep(presentation: WatchPresentation): string {
+function nextStep(presentation: WatchPresentation, subjectLink?: string): string {
+  const subject = subjectLink ?? "it";
   switch (presentation.category) {
     case "positive":
-      return "Nothing to do — I've stopped watching.";
+      return `Nothing to do — I've stopped watching ${subject}.`;
     // A neutral outcome is an answer without a problem in it: the watched thing is
     // gone, cancelled, or was never readable.
     case "neutral":
-      return "I've stopped watching. Ask me if you want another watch set up.";
+      return `I've stopped watching ${subject}. Ask me if you want another watch set up.`;
     case "attention":
-      return "Ask me to look into it if you want the why.";
+      return `Ask me to look into ${subject} if you want the why.`;
   }
 }
 
-/**
- * The whole wake message, when no model is needed.
- *
- * Only the next step: the wake banner above it already states the headline and the
- * user's note, and each fact is said once per wake.
- */
+/** The whole wake message, when no model is needed. */
 export function deterministicWakeNarration(wake: NarratableWake): {
   text: string;
   presentation: WatchPresentation;
@@ -71,7 +70,15 @@ export function deterministicWakeNarration(wake: NarratableWake): {
     resolution: wake.resolution,
     observed: wake.observed ?? null,
   });
-  return { text: nextStep(presentation), presentation };
+  const lines = [
+    // The headline is already a complete fact, and every surface states it this way.
+    // 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));
+
+  return { text: lines.join("\n\n"), presentation };
 }
 
 /**