fix(charts): preserve comparison types and draggable window headings

Keep current lines and historical scatter points in a dedicated comparison chart type. Expose floating headings and use idempotent placement so StrictMode no longer masks production overlap.

src/features/agent/answer-ui/answer-view-state.ts

@@ -31,7 +31,7 @@ export function normalizeAnswerNodeState(node: Node, input?: unknown): AnswerUiN
     const start = index(proposed[0], labels.length);
     const end = Math.max(start, index(proposed[1], labels.length, labels.length - 1));
     const hidden = indices(state.hidden, series.length);
-    const chart: AnswerChartState = { type: "Chart", view: ["line", "bar", "table"].includes(String(state.view)) ? state.view as AnswerChartState["view"] : node.props.chart_type as "line" | "bar",
+    const chart: AnswerChartState = { type: "Chart", view: ["line", "bar", "table"].includes(String(state.view)) ? state.view as AnswerChartState["view"] : node.props.chart_type === "bar" ? "bar" : "line",
       hidden: hidden.length < series.length ? hidden : [], range: [start, end], point: index(state.point, labels.length), inspecting: state.inspecting === true };
     const data = answerChartTableData(node, chart);
     const table = normalizeAnswerNodeState({ type: "Table", props: data, children: [] }, { ...record(state.table), type: "Table" }) as AnswerTableState;

src/features/agent/answer-ui/catalog.ts

@@ -64,7 +64,7 @@ export const answerUiCatalog = defineCatalog(schema, {
       props: z
         .object({
           title: shortText,
-          chart_type: z.enum(["line", "bar"]),
+          chart_type: z.enum(["line", "bar", "time_comparison"]),
           x_axis_name: z.string().max(128).optional(),
           y_axis_name: z.string().max(128).optional(),
           x_data: z.array(shortText).min(1).max(100),
@@ -82,7 +82,7 @@ export const answerUiCatalog = defineCatalog(schema, {
         })
         .strict(),
       description:
-        "展示查询或用户提供的真实数据；series 必须与 x_data 对齐。浏览者可切换图形与数据表。"
+        "展示真实数据。chart_type=line 为普通折线，bar 为柱状图，time_comparison 为当前曲线与历史散点的同期对比。同期对比的 x_data 为 UTC+8 的 HH:mm 或 HH:mm:ss 共享时刻槽，series.type 使用 line/scatter，每组 sample_times 与 data 等长，保留真实带时区日期，缺测均填 null；历史点放入对应时刻槽。浏览者可切换图形与数据表。"
     },
     Evidence: {
       props: z

src/features/agent/answer-ui/interactive-chart.tsx

@@ -16,7 +16,7 @@ import { AnswerInteractionContext } from "./answer-ui-interaction-context";
 
 export type AnswerChartProps = {
   title: string;
-  chart_type: "line" | "bar";
+  chart_type: "line" | "bar" | "time_comparison";
   x_data: string[];
   series: SafeChartSeries[];
   x_axis_name?: string;
@@ -100,7 +100,7 @@ export const InteractiveChart = memo(function InteractiveChartView(props: Answer
   const numberLabel = chartValueLabel;
   const option = (type: "line" | "bar") => {
     const horizontal = type === "bar" && horizontalBars;
-    const seriesType = (series: SafeChartSeries) => view === props.chart_type ? series.type ?? type : type;
+    const seriesType = (series: SafeChartSeries) => view === (props.chart_type === "bar" ? "bar" : "line") ? series.type ?? type : type;
     const includesBars = visible.some((series) => seriesType(series) === "bar");
     const categoryAxis = { type: "category", data: labels, boundaryGap: type === "bar",
       axisLabel: { fontSize: 11, color: "#64748b", hideOverlap: !horizontal, interval: horizontal ? 0 : "auto",

src/features/agent/presentation/command-schema.ts

@@ -15,7 +15,7 @@ export function createViewSchemas(zod: typeof z = z, publication = false) {
   const chartSchema = z
     .object({
       title: z.string().max(200),
-      chart_type: z.enum(["line", "bar"]),
+      chart_type: z.enum(["line", "bar", "time_comparison"]),
       x_axis_name: z.string().max(128).optional(),
       y_axis_name: z.string().max(128).optional(),
       x_data: z.array(z.string().max(128)).min(1).max(100),

src/features/workbench/components/agent-execution-plan-panel.test.tsx

@@ -130,6 +130,48 @@ function taskPanel(task: OperationalTask, overrides: Partial<ComponentProps<type
   return { ...props, rerender };
 }
 
+it.each(["failed", "unsupported"] as const)("retries an approved %s action using its current version", async (status) => {
+  let finish!: () => void;
+  const onExecute = vi.fn(() => new Promise<void>((resolve) => { finish = resolve; }));
+  const task: OperationalTask = { ...taskBase,
+    permissions: { ...taskBase.permissions, can_execute_work_orders: true },
+    actions: [{ ...taskBase.actions[0], approval_status: "approved", execution_status: status }]
+  };
+  const props = taskPanel(task, { onExecute });
+  const section = screen.getByRole("region", { name: "当前需处理" });
+  expect(section).toHaveTextContent("待重试");
+  const retry = within(section).getByRole("button", { name: "重试执行" });
+  fireEvent.click(retry);
+  expect(retry).toBeDisabled();
+  fireEvent.click(retry);
+  expect(onExecute).toHaveBeenCalledExactlyOnceWith(task.actions[0].action_id, task.actions[0].version);
+  expect(props.onDecision).not.toHaveBeenCalled();
+  finish();
+  await waitFor(() => expect(retry).toBeEnabled());
+  props.rerender(<AgentExecutionPlanPanel {...props} task={{ ...task,
+    actions: [{ ...task.actions[0], version: 4, execution_status: "submitted" }]
+  }} />);
+  expect(screen.queryByRole("button", { name: "重试执行" })).not.toBeInTheDocument();
+  expect(screen.getByRole("button", { name: "核对执行回执" })).toBeVisible();
+});
+
+it("keeps retry disabled without work-order execution permission", () => {
+  const props = taskPanel({ ...taskBase, actions: [{ ...taskBase.actions[0],
+    approval_status: "approved", execution_status: "unsupported"
+  }] });
+  const retry = screen.getByRole("button", { name: "重试执行" });
+  expect(retry).toBeDisabled();
+  fireEvent.click(retry);
+  expect(props.onExecute).not.toHaveBeenCalled();
+});
+
+it.each(["pending", "rejected"] as const)("does not retry a %s action", (approval) => {
+  taskPanel({ ...taskBase, permissions: { ...taskBase.permissions, can_execute_work_orders: true },
+    actions: [{ ...taskBase.actions[0], approval_status: approval, execution_status: "failed" }]
+  });
+  expect(screen.queryByRole("button", { name: "重试执行" })).not.toBeInTheDocument();
+});
+
 it("keeps fixed question answers in the report and focuses them from a data gap", () => {
   const task: OperationalTask = { ...taskBase, actions: [], active_run: null, lifecycle_status: "waiting_human",
     questions: [{ question_request_id: "70000000-0000-4000-8000-000000000001", task_id: taskBase.task_id,

src/features/workbench/components/agent-execution-plan-panel.tsx

@@ -33,6 +33,7 @@ import type {
   OperationalTaskDataSnapshot
 } from "../api/operational-task-client";
 import type { TaskExecutionHistoryTarget } from "../api/operational-task-client";
+import { isRetryableInvestigationAction } from "../utils/investigation-presentation";
 
 type ExecutionNode = {
   id: string;
@@ -568,6 +569,7 @@ export function HumanActionCard({ task, action, onDecision, onExecute, onDraftUp
           <div className="mt-3 flex flex-wrap justify-end gap-2">
             {action.approval_status === "pending" && canDecide ? <><Button variant="outline" size="sm" disabled={submitting !== null} onClick={() => void run("reject")}>拒绝动作</Button>{!command && onDraftUpdate ? <Button variant="outline" size="sm" disabled={submitting !== null || editing} onClick={() => { setDraft(workOrderDraft(action.payload)); setEditing(true); }}>编辑草稿</Button> : null}<Button size="sm" disabled={submitting !== null || editing || savedVersion === action.version || (!command && !!onConfirmDispatch && !canExecute)} onClick={() => void run(!command && onConfirmDispatch ? "confirm" : "approve")}>{submitting === "approve" || submitting === "confirm" ? <Loader2 className="animate-spin" /> : null}{command ? "批准下发命令" : onConfirmDispatch ? "确认并创建预约工单" : "批准创建预约工单"}</Button></> : null}
             {action.approval_status === "approved" && action.execution_status === "not_submitted" ? <Button size="sm" disabled={!canExecute || submitting !== null} title={!canExecute ? "当前账号无此动作执行权限" : undefined} onClick={() => void run("execute")}>{submitting === "execute" ? <Loader2 className="animate-spin" /> : null}{command ? "下发命令" : "创建预约工单"}</Button> : null}
+            {isRetryableInvestigationAction(action) ? <Button size="sm" disabled={!canExecute || submitting !== null || stale} title={!canExecute ? "当前账号无此动作执行权限" : undefined} onClick={() => void run("execute")}>{submitting === "execute" ? <Loader2 className="animate-spin" /> : <RefreshCw size={14} />}重试执行</Button> : null}
             {action.approval_status === "approved" && ["submitted", "unknown"].includes(action.execution_status) ? <Button variant="outline" size="sm" disabled={!canExecute || submitting !== null} onClick={() => void run("reconcile")}>{submitting === "reconcile" ? <Loader2 className="animate-spin" /> : <RefreshCw size={14} />}核对执行回执</Button> : null}
           </div>
         </div>

src/features/workbench/components/investigation-task-report.tsx

@@ -18,7 +18,8 @@ import type {
 import {
   investigationDiagram,
   investigationStatus,
-  isPendingInvestigationAction
+  isPendingInvestigationAction,
+  isRetryableInvestigationAction
 } from "../utils/investigation-presentation";
 import { InvestigationDiagramView } from "./investigation-diagram-view";
 import { InvestigationExpandCard } from "./investigation-expand-card";
@@ -433,6 +434,8 @@ export function InvestigationTaskReport({
                   {actionTitle(action)} ·{" "}
                   {action.approval_status === "pending"
                     ? "待审核"
+                    : isRetryableInvestigationAction(action)
+                      ? "待重试"
                       : action.execution_status === "not_submitted"
                         ? "待执行"
                         : "待核对回执"}

src/features/workbench/utils/investigation-presentation.ts

@@ -71,6 +71,7 @@ export function investigationStatus(task: OperationalTask): string {
   if (task.lifecycle_status === "cancelled") return "本轮已取消";
   if (task.questions?.some((question) => question.status === "pending" && question.execution_generation === task.execution_generation)) return "等待回答";
   if (task.actions.some((action) => action.approval_status === "pending")) return "待人工审核";
+  if (task.actions.some(isRetryableInvestigationAction)) return "待重试动作";
   if (
     task.actions.some(
       (action) =>
@@ -105,6 +106,11 @@ export function isPendingInvestigationAction(action: OperationalTask["actions"][
   return (
     action.approval_status === "pending" ||
     (action.approval_status === "approved" &&
-      ["not_submitted", "submitted", "unknown"].includes(action.execution_status))
+      ["not_submitted", "submitted", "unknown"].includes(action.execution_status)) ||
+    isRetryableInvestigationAction(action)
   );
 }
+
+export function isRetryableInvestigationAction(action: OperationalTask["actions"][number]) {
+  return action.approval_status === "approved" && ["failed", "unsupported"].includes(action.execution_status);
+}

src/shared/ui/floating-window.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useId, useRef, useState, useSyncExternalStore, type ReactNode } from "react";
+import { useEffect, useId, useLayoutEffect, useRef, useState, useSyncExternalStore, type ReactNode } from "react";
 import { createPortal } from "react-dom";
 import { Rnd } from "react-rnd";
 import { Maximize2, Minimize2, X } from "lucide-react";
@@ -48,16 +48,31 @@ export function FloatingWindow({ title, triggerLabel, fillContent = false, openR
   };
 
   useEffect(() => () => removeFloatingWindow(id), [id]);
-  useEffect(() => {
+  useLayoutEffect(() => {
     if (!open) return;
-    const offset = (floatingWindowOrder().filter((windowId) => windowId !== id).length % 5) * 24;
+    const others = floatingWindowOrder().filter((windowId) => windowId !== id);
-    setBounds((current) => fitWindow({ ...current, x: current.x + offset, y: current.y + offset }));
+    const headingHeight = Array.from(floatingWindowHost().querySelectorAll<HTMLElement>(".floating-window-heading"))
+      .reduce((height, element) => Math.max(height, element.offsetHeight), 48);
+    const step = headingHeight + 8;
+    const minHeight = Math.min(260, window.innerHeight - 16);
+    const slots = Math.max(1, Math.floor((window.innerHeight - 64 - minHeight - 8) / step) + 1);
+    const slot = others.length % slots;
+    const y = Math.max(8, Math.min(64 + slot * step, window.innerHeight - minHeight - 8));
+    // Keep the preceding headings exposed. Shorter viewports reduce content
+    // height instead of clamping several windows onto the same title bar.
+    // Absolute placement also makes StrictMode's repeated setup idempotent.
+    setBounds(fitWindow({ x: (window.innerWidth - 800) / 2 + slot * 24, y,
+      width: 800, height: Math.min(560, window.innerHeight - y - 8) }));
     raiseFloatingWindow(id);
     if (focusOnOpen.current) heading.current?.focus({ preventScroll: true });
     focusOnOpen.current = false;
     const resize = () => {
       setViewport({ width: window.innerWidth, height: window.innerHeight });
-      setBounds((current) => fitWindow(current));
+      setBounds((current) => {
+        const minimumHeight = Math.min(260, window.innerHeight - 16);
+        const y = Math.max(8, Math.min(current.y, window.innerHeight - minimumHeight - 8));
+        return fitWindow({ ...current, y, height: Math.min(current.height, window.innerHeight - y - 8) });
+      });
     };
     window.addEventListener("resize", resize);
     return () => {
@@ -75,9 +90,7 @@ export function FloatingWindow({ title, triggerLabel, fillContent = false, openR
       aria-label={triggerLabel ?? `放大查看 ${title}`} title="放大查看" aria-haspopup="dialog" aria-expanded={open}
       onClick={() => {
         if (!open) {
-          const offset = (order.length % 5) * 24;
           setViewport({ width: window.innerWidth, height: window.innerHeight });
-          setBounds(fitWindow({ x: (window.innerWidth - 800) / 2 + offset, y: 64 + offset, width: 800, height: 560 }));
           setMaximized(false);
           focusOnOpen.current = true;
           setManuallyOpen(true);

tests/browser/investigation-action-retry.e2e.ts

@@ -0,0 +1,78 @@
+import { expect, test } from "@playwright/test";
+import { mockAgentApi } from "./support/mock-agent-api";
+
+test("已批准的派单失败动作可重试，并在提交期间禁止重复点击", async ({ page }, testInfo) => {
+  await mockAgentApi(page);
+  await page.emulateMedia({ reducedMotion: "reduce" });
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await page.setContent('<!doctype html><html lang="zh-CN"><head><link rel="stylesheet" href="/src/styles.css"></head><body><main id="reader" style="max-width:680px;margin:auto;padding:16px"></main></body></html>');
+  await page.evaluate(async () => {
+    const entry = await (await fetch("/src/main.tsx")).text();
+    const reactUrl = entry.match(/from "([^"\n]*\/react\.js[^"\n]*)"/)?.[1];
+    const clientUrl = entry.match(/from "([^"\n]*\/react-dom_client\.js[^"\n]*)"/)?.[1];
+    if (!reactUrl || !clientUrl) throw new Error("Vite React module paths unavailable");
+    const reactModule = await import(reactUrl);
+    const React = reactModule.default ?? reactModule;
+    const clientModule = await import(clientUrl);
+    const { createRoot } = clientModule.default ?? clientModule;
+    const { AgentExecutionPlanPanel } = await import("/src/features/workbench/components/agent-execution-plan-panel.tsx");
+    const now = "2026-11-07T13:36:15Z";
+    let task = {
+      task_id: "task-retry", task_type: "event_investigation", title: "SCADA 异常调查",
+      summary: "候选管段515870待现场核验", execution_generation: 1,
+      lifecycle_status: "waiting_human", status: "waiting_human", updated_at: now,
+      latest_report: { revision: 2, execution_generation: 1, published_at: now, report: {
+        title: "现场核验工单派发状态", stage: "final", outcome: "concluded",
+        current_conclusion: "工单已批准，执行适配器尚未配置，现场核验未派发。",
+        conclusion_boundary: "事件未闭环。", recommendations: [], pending_items: [],
+        data_gaps: [], evidence_refs: [], diagram: null
+      } },
+      latest_progress: null, latest_plan: null, active_run: null, evidence: [], access_requests: [],
+      permissions: { can_execute_work_orders: true },
+      actions: [{ action_id: "action-retry", task_id: "task-retry", version: 4,
+        kind: "create_work_order", reason: "候选管段515870需现场核验", proposed_at: now,
+        decided_at: now, executed_at: now, approval_status: "approved", execution_status: "unsupported",
+        execution_detail: "尚未配置该动作的外部执行适配器", evidence_refs: [], receipt: null,
+        payload: { title: "候选管段515870现场漏水核查", description: "核查渗漏、阀门状态并回填照片和压力复测。",
+          work_order_type: "general", priority: "normal" } }]
+    };
+    const calls: { actionId: string; version: number }[] = [];
+    let finish: () => void;
+    const root = createRoot(document.getElementById("reader"));
+    const render = () => root.render(React.createElement(AgentExecutionPlanPanel, {
+      task, onContinue: () => undefined, onDecision: async () => undefined,
+      onReconcile: async () => undefined, onRefresh: () => undefined,
+      onLoadEvidenceSnapshot: async () => undefined,
+      onExecute: async (actionId: string, version: number) => {
+        calls.push({ actionId, version });
+        await new Promise<void>((resolve) => { finish = resolve; });
+        task = { ...task, actions: [{ ...task.actions[0], version: 5,
+          execution_status: "submitted", execution_detail: "工单已提交，等待现场核验回执" }] };
+        render();
+      }
+    }));
+    Object.assign(window, { retryCalls: calls, finishRetry: () => finish() });
+    render();
+  });
+  const section = page.getByRole("region", { name: "当前需处理", exact: true });
+  await expect(section).toContainText("待重试");
+  await section.locator("summary").filter({ hasText: "待重试" }).click();
+  const retry = section.getByRole("button", { name: "重试执行", exact: true });
+  await expect(retry).toBeEnabled();
+  await retry.scrollIntoViewIfNeeded();
+  await page.screenshot({ path: testInfo.outputPath("retry-desktop.png") });
+  await page.setViewportSize({ width: 390, height: 844 });
+  await retry.scrollIntoViewIfNeeded();
+  await expect(retry).toBeInViewport();
+  expect(await page.evaluate(() => document.documentElement.scrollWidth <= window.innerWidth)).toBe(true);
+  await page.screenshot({ path: testInfo.outputPath("retry-mobile.png") });
+  await retry.click();
+  await expect(retry).toBeDisabled();
+  expect(await page.evaluate(() => (window as unknown as { retryCalls: unknown[] }).retryCalls)).toEqual([
+    { actionId: "action-retry", version: 4 }
+  ]);
+  await page.evaluate(() => (window as unknown as { finishRetry: () => void }).finishRetry());
+  await expect(retry).toHaveCount(0);
+  await expect(section.getByRole("button", { name: "核对执行回执" })).toBeVisible();
+  await expect(section).toContainText("工单已提交，等待现场核验回执");
+});

tests/browser/investigation-chart-windows.e2e.ts

@@ -9,6 +9,50 @@ const chart = (index: number) => ({
 
 test.setTimeout(60_000);
 
+for (const height of [900, 720]) {
+  test(`multiple chart headings stay accessible and drag on first press at ${height}px height`, async ({ page }, testInfo) => {
+    await page.setViewportSize({ width: 1440, height });
+    const task = investigationFixture(1, "多图窗口拖动核查");
+    const mock = await mockInvestigationPresentation(page, [task]);
+    await selectInvestigation(page, task.title);
+    for (let index = 1; index <= 4; index++) {
+      await mock.emit(task, { ...chart(index), chart_id: `pressure-${index}` });
+      await expect(page.getByRole("dialog", { name: `合成压力分析 ${index}`, exact: true })).toBeVisible();
+    }
+    if (height === 900) await page.setViewportSize({ width: 1440, height: 720 });
+    for (let index = 1; index <= 4; index++) {
+      const popup = page.getByRole("dialog", { name: `合成压力分析 ${index}`, exact: true });
+      const heading = popup.locator(".floating-window-heading");
+      const box = (await heading.boundingBox())!;
+      expect((await popup.boundingBox())!.y).toBe(64 + (index - 1) * (box.height + 8));
+      const target = { x: box.x + box.width / 2, y: box.y + box.height / 2 };
+      expect(await page.evaluate(({ x, y }) => document.elementFromPoint(x, y)?.closest("[data-floating-window]")?.getAttribute("aria-labelledby"), target))
+        .toBe(await popup.getAttribute("aria-labelledby"));
+    }
+    await testInfo.attach(`multiple-charts-before-drag-${height}`, {
+      body: await page.screenshot({ path: testInfo.outputPath(`multiple-charts-before-drag-${height}.png`) }), contentType: "image/png"
+    });
+    for (const index of [1, 4, 2]) {
+      const popup = page.getByRole("dialog", { name: `合成压力分析 ${index}`, exact: true });
+      const before = (await popup.boundingBox())!;
+      const heading = (await popup.locator(".floating-window-heading").boundingBox())!;
+      const start = { x: heading.x + heading.width - 110, y: heading.y + heading.height / 2 };
+      await page.mouse.move(start.x, start.y);
+      await page.mouse.down();
+      await page.mouse.move(start.x - 120, start.y - 32, { steps: 12 });
+      await page.mouse.up();
+      await expect.poll(async () => Math.round((await popup.boundingBox())!.x - before.x)).toBe(-120);
+      await expect.poll(async () => Math.round((await popup.boundingBox())!.y - before.y)).toBe(-32);
+      expect((await popup.boundingBox())!.width).toBe(before.width);
+      expect((await popup.boundingBox())!.height).toBe(before.height);
+    }
+    await testInfo.attach(`multiple-charts-after-drag-${height}`, {
+      body: await page.screenshot({ path: testInfo.outputPath(`multiple-charts-after-drag-${height}.png`) }), contentType: "image/png"
+    });
+    expect(mock.mutations).toEqual([]);
+  });
+}
+
 test("live analysis opens a window, preserves its position and respects closing and task switches", async ({ page }, testInfo) => {
   const task = investigationFixture(1, "图表自动展示核查");
   const other = investigationFixture(2, "另一项调查");

tests/browser/scada-comparison-chart.e2e.ts

@@ -9,8 +9,8 @@ const times = Array.from({ length: 13 }, (_, index) => `${String(9 + Math.floor(
 const block = {
   version: "answer-ui@1", block_id: "scada-week", phase: "final", fallback_text: "合成 SCADA 七日对照",
   spec: { root: "chart", elements: { chart: { type: "Chart", children: [], props: {
-    title: "压力与前七天同时刻对照（m）", chart_type: "line", y_axis_name: "压力（m）", x_axis_name: "时间（UTC0）",
+    title: "压力与前七天同时刻对照（m）", chart_type: "time_comparison", y_axis_name: "压力（m）", x_axis_name: "时间",
-    x_data: times.map((time) => new Date(`2026-06-14T${time}:00+08:00`).toISOString().slice(11, 16)),
+    x_data: times,
     series: [{ name: "当日三小时", type: "line", data: [34, 34.2, 33.8, 34, 33.5, 33, 32.5, 32, 31, 30, 29, 27, 25],
       sample_times: times.map((time) => new Date(`2026-06-14T${time}:00+08:00`).toISOString().replace(".000Z", "Z")) },
     ...Array.from({ length: 7 }, (_, index) => ({ name: `6月${13 - index}日`, type: "scatter",
@@ -45,7 +45,7 @@ for (const width of [1440, 375, 320]) {
     await panel.getByRole("button", { name: "发送 Agent 指令" }).click();
     const ui = panel.locator(".answer-ui-chart");
     await expect(ui).toBeVisible();
-    await expect(ui).toContainText("时间（UTC+8）");
+    await expect(ui.locator("svg text").filter({ hasText: /^时间$/ })).toBeVisible();
     await expect(ui.getByRole("tab", { name: "复合", exact: true })).toBeVisible();
     await expect(ui.getByLabel("显示的数据序列").getByRole("button")).toHaveCount(8);
     // Each historical day has exactly three unconnected SVG scatter symbols.