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

Author: kathiekiwi

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

@@ -23,7 +23,7 @@ import { stripModelImages } from "./model-markdown";
 import { reportBlockFromToolPart } from "./report-block-adapter";
 import { shouldShowLiveTurnError } from "./turn-error";
 import type { ResolvedUri } from "./ReportView";
-import { answerContinuesAfter, turnAlreadyOffersWatch } from "./view-actions";
+import { answerContinuesAfter, turnAlreadyOffersWatch, turnProposesWatch } from "./view-actions";
 import { latestRevisionBlocks } from "./view-blocks";
 import { ViewBlocks } from "./view-catalog";
 import { findWakeWatch, WakeBanner, wakeRefFromMessageId, type WakeWatch } from "./WakeBanner";
@@ -258,11 +258,13 @@ const DashboardAgentTurn = memo(function DashboardAgentTurn({
   });
   // One answer for the whole turn: two `render_view` parts each deciding for themselves
   // would show the watch button twice. `ViewBlocks` collapses revisions the same way.
-  const watchOfferedInTurn = turnAlreadyOffersWatch(
-    blocksByPart
-      .filter((blocks): blocks is unknown[] => blocks !== null)
-      .map((blocks) => latestRevisionBlocks(blocks as never))
-  );
+  const watchOfferedInTurn =
+    turnProposesWatch(parts as never) ||
+    turnAlreadyOffersWatch(
+      blocksByPart
+        .filter((blocks): blocks is unknown[] => blocks !== null)
+        .map((blocks) => latestRevisionBlocks(blocks as never))
+    );
 
   const body: React.ReactNode[] = [];
   for (let i = 0; i < parts.length; i++) {

apps/webapp/app/components/dashboard-agent/report-block-adapter.test.ts

@@ -91,11 +91,14 @@ describe("reportBlockFromToolPart", () => {
     expect(reportBlockFromToolPart(part({ output: { ...vm, generatedAt: undefined } }))).toBeNull();
   });
 
-  it("accepts the curated tool output, which drops links and series", () => {
-    const { links, ...curated } = vm;
-    const block = reportBlockFromToolPart(part({ output: { ...curated, seriesOmitted: true } }))!;
-    expect(block.vm.links).toEqual([]);
-    expect(block.vm.metrics[0]!.series).toBeUndefined();
+  it("passes the tool output's series and links through", () => {
+    const series = { points: [80, 40, 120], kind: "measured" };
+    const links = [{ key: "queues", label: "Queues", url: "/queues" }];
+    const block = reportBlockFromToolPart(
+      part({ output: { ...vm, metrics: [{ ...vm.metrics[0], series }], links } })
+    )!;
+    expect(block.vm.metrics[0]!.series).toEqual(series);
+    expect(block.vm.links).toEqual(links);
     expect(block.vm.summary.severity).toBe("crit");
   });
 

apps/webapp/app/components/dashboard-agent/report-sparkline.tsx

@@ -570,15 +570,15 @@ export function ReportSparkline({
  * chart start on the same vertical whatever the value's width.
  */
 /**
- * Below a 19rem container the fixed tracks no longer fit beside the value, so the
+ * Below a 22rem container the fixed tracks no longer fit beside the value, so the
  * sparkline drops to its own line. The columns never change, so the value, delta
  * and note stay on the same verticals at every panel width.
  */
 const METRIC_ROW_CLASS =
-  "grid grid-cols-[7rem_minmax(0,1fr)_2.75rem_6.5rem] items-center gap-x-2 @max-[19rem]:grid-cols-[7rem_minmax(0,1fr)_2.75rem] @max-[19rem]:gap-y-1.5";
+  "grid grid-cols-[7rem_minmax(0,1fr)_2.75rem_6.5rem] items-center gap-x-2 @max-[22rem]:grid-cols-[7rem_minmax(0,1fr)_2.75rem] @max-[22rem]:gap-y-1.5";
 
 /** The sparkline cell: its own full-width line once the row goes narrow. */
-const SPARK_CELL_CLASS = "@max-[19rem]:col-span-3 @max-[19rem]:justify-self-end";
+const SPARK_CELL_CLASS = "@max-[22rem]:col-span-3 @max-[22rem]:justify-self-end";
 
 // Labels are never truncated: the column is sized for the longest one and
 // anything longer wraps.
@@ -674,7 +674,7 @@ export function ReportMetricRow({
         ) : (
           // Keeps the column occupied so a series-less metric doesn't pull the
           // rows out of alignment.
-          <span aria-hidden className="@max-[19rem]:hidden" />
+          <span aria-hidden className="@max-[22rem]:hidden" />
         )}
       </li>
 

apps/webapp/app/components/dashboard-agent/view-actions.test.ts

@@ -6,6 +6,7 @@ import {
   cardAlreadyOffersWatch,
   renderableActions,
   turnAlreadyOffersWatch,
+  turnProposesWatch,
   withoutWatchActions,
 } from "./view-actions";
 
@@ -117,6 +118,32 @@ describe("one watch button per answer", () => {
   });
 });
 
+describe("a turn that proposed a watch through the tool", () => {
+  const text = { type: "text", text: "here is what I found" };
+  const scheduled = (output: unknown, state = "output-available") => ({
+    type: "tool-schedule_watch",
+    state,
+    output,
+  });
+  const intent = { intent: watchAction.intent };
+
+  it("sees the proposal that opened the card", () => {
+    expect(turnProposesWatch([text, scheduled(intent)])).toBe(true);
+  });
+
+  it("leaves the button alone when the spec was rejected — no card opened", () => {
+    expect(turnProposesWatch([text, scheduled({ error: "Couldn't build that watch: bad" })])).toBe(
+      false
+    );
+  });
+
+  it("waits for the output: a call still running proposes nothing", () => {
+    expect(turnProposesWatch([scheduled(intent, "input-available")])).toBe(false);
+    expect(turnProposesWatch([{ type: "tool-schedule_watch", output: intent }])).toBe(false);
+    expect(turnProposesWatch([text])).toBe(false);
+  });
+});
+
 describe("ActionsBlock", () => {
   const source = readFileSync(new URL("./ActionsBlock.tsx", import.meta.url), "utf8");
 
@@ -154,6 +181,10 @@ describe("the one-watch-button flag is decided per turn, not per render_view cal
     expect(turn).toContain("watchOfferedInTurn={watchOfferedInTurn}");
   });
 
+  it("counts the turn's own schedule_watch proposal as an offer", () => {
+    expect(turn).toMatch(/turnProposesWatch\(parts as never\) \|\|/);
+  });
+
   it("lets a card add its own offer but never drop the turn's", () => {
     expect(catalog).toMatch(/watchOfferedInTurn \|\|\s*cardAlreadyOffersWatch\(/);
   });

apps/webapp/app/components/dashboard-agent/view-actions.ts

@@ -1,6 +1,7 @@
 // A navigate target is a plain string at the contract boundary, so only targets
 // that parse become buttons: a hallucinated URI costs a button, never a dead click.
 import {
+  agentIntentSchema,
   isTriggerUri,
   type ActionsBlockAction,
   type ChartAction,
@@ -37,6 +38,21 @@ export function turnAlreadyOffersWatch(blockGroups: ViewBlock[][]): boolean {
   return blockGroups.some(cardAlreadyOffersWatch);
 }
 
+/**
+ * `schedule_watch` opens the pre-filled card itself, so a button repeating it is dead.
+ * A rejected spec returns an error instead of an intent: no card opens, so the button stays.
+ */
+export function turnProposesWatch(
+  parts: ReadonlyArray<{ type?: string; state?: string; output?: unknown }>
+): boolean {
+  return parts.some(
+    (part) =>
+      part.type === "tool-schedule_watch" &&
+      part.state === "output-available" &&
+      agentIntentSchema.safeParse((part.output as { intent?: unknown } | undefined)?.intent).success
+  );
+}
+
 export function withoutWatchActions<T extends CardAction>(actions: T[]): T[] {
   return actions.filter((action) => action.intent.kind !== "watch");
 }

internal-packages/dashboard-agent/src/dashboard-agent.eval.ts

@@ -200,7 +200,6 @@ const FIXTURES: Record<string, unknown> = {
       },
     },
     footer: [{ code: "raise_env_limit" }],
-    seriesOmitted: true,
   },
   get_queue: {
     queue: "task/send-email",

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

@@ -2478,15 +2478,16 @@ describe("the view-model tools don't echo the view back to the model", () => {
           aggregation: "max",
           normal: 40,
           severity: "crit",
+          series: { points: Array.from({ length: 60 }, (_, i) => i * 3), kind: "measured" },
           breakdown: Object.fromEntries(
             Array.from({ length: 60 }, (_, i) => [`task/queue-${i}`, i * 7])
           ),
           annotation: { code: "pending.estimated", value: 4200 },
         },
       ],
       facts: { trustworthy: true, throughput: 12 },
+      links: [{ key: "queues", label: "Queues", url: "/queues" }],
       footer: { code: "report.footer" },
-      seriesOmitted: true,
       uri: "trigger://proj_abc/env_abc/report/health",
     };
 
@@ -2505,6 +2506,8 @@ describe("the view-model tools don't echo the view back to the model", () => {
     expect(serialized).not.toContain("breakdown");
     expect(serialized).not.toContain("observations");
     expect(serialized).not.toContain("footer");
+    expect(serialized).not.toContain("series");
+    expect(serialized).not.toContain("links");
     expect(serialized.length).toBeLessThan(JSON.stringify(output).length / 2);
   });
 

internal-packages/dashboard-agent/src/tool-curation.ts

@@ -146,8 +146,9 @@ export function curateError(group: any) {
   };
 }
 
-// Drops the per-metric `series` arrays and `links`; `seriesOmitted` records that the
-// shape is lossy. Grades and `facts.trustworthy` survive verbatim.
+// The card's copy: everything it draws, including the per-metric `series` and the
+// `links` recommendations key into. The model's copy is trimmed separately by
+// `getReportModelOutput`, so this costs no context.
 export function curateReport(data: unknown) {
   const vm = (data ?? {}) as any;
   const facts = (vm.facts ?? {}) as any;
@@ -180,6 +181,7 @@ export function curateReport(data: unknown) {
       aggregation: m.aggregation,
       normal: m.normal,
       delta: m.delta,
+      series: m.series,
       breakdown: m.breakdown,
       annotation: m.annotation,
       // "unknown" means `value` is a placeholder, not a measurement. "measured" is the
@@ -200,8 +202,8 @@ export function curateReport(data: unknown) {
         dlqDelta: flowEvidence.dlqDelta,
       },
     },
+    links: vm.links,
     footer: vm.footer,
-    seriesOmitted: true,
   };
 }