feat(downloads): fold download plans into download panel (DL-3)

- Waiting plans (approval / disk space / automation off / queued) are
  active-segment rows on /download-tasks/board, merged by created_at,
  counted, with approve / cancel actions; ?plan= deep links and legacy
  /downloads/plans routes redirect to the panel
- Download detail shows "why this download" (source, purpose, replaced
  version, reasons); raw evaluation in tech info
- Failed / cancelled / expired plans appear in the entity download
  history; rejected / revoked / expired approvals close draft plans
- New GET /acquisition-plans/{id}/why, POST /acquisition-plans/{id}/cancel
- User-facing copy no longer says 下载计划; glossary updated

Co-Authored-By: Claude Opus 5.5 <[email protected]>

apps/web/app/routes/console/audit.tsx

@@ -38,7 +38,8 @@ const ACTION_LABEL: Record<string, string> = {
   "pi_upstream.oauth_logout": "退出订阅登录",
   "schedule.run_now": "立即执行定时任务",
   "schedule.skip": "跳过定时任务",
-  "acquisition_plan.manual_submit": "手动提交下载计划",
+  "acquisition_plan.manual_submit": "手动提交下载",
+  "acquisition_plan.cancel": "取消下载",
   "engine.run_retry": "重跑任务",
   "capability.invoke": "智能体操作",
   "capability.denied": "智能体操作被拒绝",
@@ -75,7 +76,7 @@ const TARGET_LABEL: Record<string, string> = {
   site_account: "站点账号",
   feed_source: "RSS",
   engine_run: "任务",
-  acquisition_plan: "下载计划",
+  acquisition_plan: "下载",
   download_task: "下载任务",
   media_entity: "作品",
   source_release: "资源",

apps/web/app/routes/console/downloads.plans.tsx

@@ -1,157 +1,8 @@
-import type { AcquisitionPlan, PlanStatus } from "@umt/contracts";
-import { ClipboardList } from "lucide-react";
-import { useState } from "react";
-import { Link } from "react-router";
-import { PLAN_STATUS_LABEL, useDownloadTasks, usePlans } from "~/api/downloads.ts";
-import { type DataColumn, DataTable } from "~/components/console/data-table.tsx";
-import { DetailSheet } from "~/components/console/detail-sheet.tsx";
-import { FilterBar, FilterSelect } from "~/components/console/filter-bar.tsx";
-import { JsonView } from "~/components/console/json-view.tsx";
-import { KvList } from "~/components/console/kv-list.tsx";
-import { consolePath } from "~/components/console/nav.ts";
-import { PageHeader } from "~/components/console/page-header.tsx";
-import { StatusBadge } from "~/components/console/status-badge.tsx";
-import { TechInfo } from "~/components/console/tech-info.tsx";
-import { useQueryState } from "~/components/console/use-query-state.ts";
-import { DownloadsTabs } from "~/components/downloads/downloads-tabs.tsx";
-import { PRIORITY } from "~/components/library/labels.ts";
-import { Button } from "~/components/ui/button.tsx";
-import { relTime } from "~/components/workbench/release-fields.ts";
-import { planReasonText } from "~/lib/labels.ts";
-import { formatBytes, formatDateTime } from "~/lib/utils.ts";
+import { legacyRedirectLoader } from "./redirects.ts";
 
-export const meta = () => [{ title: "下载计划 · 下载面板 · UHD 媒体自动化控制台" }];
+// DL-3:下载计划并入下载面板;旧地址 /console/downloads/plans(?plan=)与 /plans/:id 跳到下载面板并打开对应行
+export const clientLoader = legacyRedirectLoader;
 
-const PURPOSE = { fill: "补缺", upgrade: "升级", replace_source: "换源" } as const;
-
-const planTone = (s: PlanStatus) =>
-  s === "failed" ? "destructive" : s === "completed" ? "success" : s === "expired" ? "warning" : "neutral";
-
-export default function DownloadPlansPage() {
-  const f = useQueryState(["status"] as const);
-  const [openPlan, setOpenPlan] = useState<AcquisitionPlan | null>(null);
-  const plans = usePlans((f.values.status || undefined) as PlanStatus | undefined);
-  // 计划 → 下载任务:同一列表按 acquisitionPlanId 对上
-  const downloads = useDownloadTasks({});
-  const rows = plans.data?.pages.flatMap((p) => p.items);
-  const linkedDownload = openPlan
-    ? downloads.data?.pages.flatMap((p) => p.items).find((t) => t.acquisitionPlanId === openPlan.id)
-    : undefined;
-
-  const columns: DataColumn<AcquisitionPlan>[] = [
-    {
-      key: "purpose",
-      header: "计划",
-      cell: (p) => (
-        <p className="text-foreground">
-          {PURPOSE[p.purpose]} · 优先级 {PRIORITY[p.priority as keyof typeof PRIORITY] ?? p.priority}
-        </p>
-      ),
-    },
-    {
-      key: "status",
-      header: "状态",
-      cell: (p) => <StatusBadge tone={planTone(p.status)}>{PLAN_STATUS_LABEL[p.status]}</StatusBadge>,
-    },
-    {
-      key: "reserved",
-      header: "预留空间",
-      hideBelow: "md",
-      align: "right",
-      cell: (p) => <span className="tabular-nums">{formatBytes(p.reservedBytes, 1)}</span>,
-    },
-    {
-      key: "reason",
-      header: "说明",
-      hideBelow: "lg",
-      cell: (p) => <span className="line-clamp-1 text-muted-foreground">{planReasonText(p.statusReason) ?? "—"}</span>,
-    },
-    {
-      key: "at",
-      header: "创建",
-      hideBelow: "sm",
-      cell: (p) => <span className="whitespace-nowrap text-muted-foreground">{relTime(p.createdAt)}</span>,
-    },
-  ];
-
-  return (
-    <>
-      <PageHeader title="下载面板" />
-      <DownloadsTabs />
-      <FilterBar onReset={f.active ? f.reset : undefined}>
-        <FilterSelect
-          label="状态"
-          value={f.values.status}
-          onChange={(v) => f.set("status", v)}
-          options={Object.entries(PLAN_STATUS_LABEL).map(([value, label]) => ({ value, label }))}
-        />
-      </FilterBar>
-      <DataTable
-        columns={columns}
-        rows={rows}
-        rowKey={(p) => p.id}
-        loading={plans.isPending}
-        error={plans.error}
-        onRetry={() => void plans.refetch()}
-        onRowClick={setOpenPlan}
-        selectedKey={openPlan?.id}
-        hasMore={plans.hasNextPage}
-        onLoadMore={() => void plans.fetchNextPage()}
-        loadingMore={plans.isFetchingNextPage}
-        empty={{
-          icon: ClipboardList,
-          title: f.active ? "没有符合筛选的下载计划" : "还没有下载计划",
-          description: f.active ? undefined : "选中可下载的资源后出现在这里。",
-        }}
-      />
-
-      <DetailSheet
-        open={!!openPlan}
-        onOpenChange={(o) => !o && setOpenPlan(null)}
-        title={openPlan ? `${PURPOSE[openPlan.purpose]}计划` : ""}
-        description={planReasonText(openPlan?.statusReason) ?? undefined}
-        footer={
-          linkedDownload ? (
-            <Button asChild size="sm">
-              <Link to={consolePath("downloads", linkedDownload.id)}>查看下载任务</Link>
-            </Button>
-          ) : null
-        }
-      >
-        {openPlan ? (
-          <>
-            <KvList
-              items={[
-                {
-                  label: "状态",
-                  value: (
-                    <StatusBadge tone={planTone(openPlan.status)}>{PLAN_STATUS_LABEL[openPlan.status]}</StatusBadge>
-                  ),
-                },
-                {
-                  label: "优先级",
-                  value: PRIORITY[openPlan.priority as keyof typeof PRIORITY] ?? openPlan.priority,
-                },
-                { label: "预留空间", value: formatBytes(openPlan.reservedBytes, 1) },
-                { label: "过期于", value: formatDateTime(openPlan.expiresAt) },
-                { label: "创建", value: formatDateTime(openPlan.createdAt) },
-              ]}
-            />
-            <TechInfo
-              className="mt-4"
-              items={[
-                { label: "计划 ID", value: openPlan.id, wide: true },
-                { label: "收录版本 ID", value: openPlan.slotId, wide: true },
-                { label: "资源 ID", value: openPlan.sourceReleaseId, wide: true },
-                { label: "说明原码", value: openPlan.statusReason },
-              ]}
-            >
-              <JsonView label="评估依据" value={openPlan.evaluation} defaultOpen={false} />
-              <JsonView label="预算预留" value={openPlan.budgetReservation} defaultOpen={false} />
-            </TechInfo>
-          </>
-        ) : null}
-      </DetailSheet>
-    </>
-  );
+export default function LegacyRedirect() {
+  return null;
 }

apps/web/app/routes/console/downloads.tsx

@@ -1,14 +1,16 @@
 import { useQueryClient } from "@tanstack/react-query";
-import type { DownloadBoardState } from "@umt/contracts";
+import type { DownloadBoardItem, DownloadBoardRow, DownloadBoardState } from "@umt/contracts";
 import { EventType } from "@umt/contracts";
 import { RefreshCw } from "lucide-react";
-import { useMemo, useState } from "react";
-import { Link } from "react-router";
-import { useDownloadBoard } from "~/api/downloads.ts";
-import { DataTable } from "~/components/console/data-table.tsx";
+import { useEffect, useMemo, useState } from "react";
+import { Link, useSearchParams } from "react-router";
+import { useBoardPlanRow, useDownloadBoard, usePlan } from "~/api/downloads.ts";
+import { type DataColumn, DataTable } from "~/components/console/data-table.tsx";
 import { DetailSheet } from "~/components/console/detail-sheet.tsx";
+import { LoadingState } from "~/components/console/empty-state.tsx";
 import { consolePath } from "~/components/console/nav.ts";
 import { PageHeader } from "~/components/console/page-header.tsx";
+import { StatusBadge } from "~/components/console/status-badge.tsx";
 import { readBoardState, writeBoardState } from "~/components/downloads/board-format.ts";
 import { CacheVolumes } from "~/components/downloads/cache-volumes.tsx";
 import {
@@ -19,13 +21,17 @@ import {
   TransferLine,
 } from "~/components/downloads/download-board.tsx";
 import { DownloadDetail } from "~/components/downloads/download-detail.tsx";
-import { DownloadsTabs } from "~/components/downloads/downloads-tabs.tsx";
+import { DROPPED_STATUS, droppedReason } from "~/components/downloads/plan-format.ts";
+import { PlanDetail, WhySection } from "~/components/downloads/plan-row.tsx";
 import { Button } from "~/components/ui/button.tsx";
 import { useSse } from "~/lib/sse.ts";
 
 export const meta = () => [{ title: "下载面板 · UHD 媒体自动化控制台" }];
 
 // DL-2:默认只看进行中;已完成单独一段(本浏览器记住选择)。页面可见时每 4 秒刷新速度,切到后台停。
+// DL-3:没提交到下载器的下载(等批准 / 等磁盘空间…)也是「进行中」的行;?plan=<计划 id> 深链打开对应行。
+
+const COMPLETED = new Set(["completed", "importing", "imported"]);
 
 export default function DownloadsPage() {
   // SPA 模式:路由组件只在浏览器渲染,可直接读本地记住的分段
@@ -35,8 +41,19 @@ export default function DownloadsPage() {
     writeBoardState(s);
   };
   const [openId, setOpenId] = useState<string | null>(null);
+  const [params, setParams] = useSearchParams();
+  const deepPlan = params.get("plan");
   const qc = useQueryClient();
   const board = useDownloadBoard(state);
+  const deep = useBoardPlanRow(deepPlan);
+
+  // 深链:找到行就切到它所在的分段并打开;没有行(已结束的下载)打开结束说明
+  useEffect(() => {
+    const row = deep.data;
+    if (!row) return;
+    setStateRaw(row.kind === "task" && COMPLETED.has(row.status) ? "completed" : "active");
+    setOpenId(row.id);
+  }, [deep.data]);
 
   // 状态变化、阈值事件到达时立即刷新(速度靠轮询)
   useSse(
@@ -50,11 +67,23 @@ export default function DownloadsPage() {
   );
 
   const pages = board.data?.pages;
-  const rows = pages?.flatMap((p) => p.items);
+  const allRows = pages?.flatMap((p) => p.items);
+  const rows: DownloadBoardRow[] | undefined =
+    state === "completed" ? allRows?.filter((r): r is DownloadBoardItem => r.kind === "task") : allRows;
   const first = pages?.[0];
-  const open = rows?.find((t) => t.id === openId) ?? null;
-  const columns = useMemo(() => (state === "active" ? activeColumns() : completedColumns()), [state]);
+  const open = rows?.find((t) => t.id === openId) ?? (deep.data?.id === openId ? deep.data : null) ?? null;
+  const columns = useMemo(
+    () => (state === "active" ? activeColumns() : (completedColumns() as unknown as DataColumn<DownloadBoardRow>[])),
+    [state],
+  );
   const empty = BOARD_EMPTY[state];
+  const closeDeep = () => {
+    if (!deepPlan) return;
+    const next = new URLSearchParams(params);
+    next.delete("plan");
+    setParams(next, { replace: true });
+  };
+  const endedPlan = deepPlan && deep.isSuccess && deep.data === null ? deepPlan : null;
 
   return (
     <>
@@ -67,7 +96,6 @@ export default function DownloadsPage() {
           </Button>
         }
       />
-      <DownloadsTabs />
       <CacheVolumes />
       <div className="mb-3 flex flex-wrap items-center justify-between gap-x-4 gap-y-2">
         <BoardSegments value={state} counts={first?.counts} onChange={setState} />
@@ -90,19 +118,59 @@ export default function DownloadsPage() {
 
       <DetailSheet
         open={!!open}
-        onOpenChange={(o) => !o && setOpenId(null)}
+        onOpenChange={(o) => {
+          if (o) return;
+          setOpenId(null);
+          closeDeep();
+        }}
         width="lg"
         title={open?.name ?? ""}
         footer={
-          open ? (
+          open?.kind === "task" ? (
             <Button asChild variant="outline" size="sm">
               <Link to={consolePath("downloads", open.id)}>打开详情页</Link>
             </Button>
           ) : null
         }
       >
-        {open ? <DownloadDetail task={open} live={open.live} /> : null}
+        {open?.kind === "task" ? <DownloadDetail task={open} live={open.live} /> : null}
+        {open?.kind === "plan" ? <PlanDetail p={open} /> : null}
       </DetailSheet>
+
+      <EndedPlanSheet planId={endedPlan} onClose={closeDeep} />
     </>
   );
 }
+
+/** 深链指向已结束的下载(没提交成功 / 已取消 / 已过期):说明原因与来由;作品的下载历史里也有 */
+function EndedPlanSheet({ planId, onClose }: { planId: string | null; onClose: () => void }) {
+  const plan = usePlan(planId);
+  const p = plan.data;
+  const ended = p && (p.status === "failed" || p.status === "cancelled" || p.status === "expired") ? p.status : null;
+  return (
+    <DetailSheet
+      open={!!planId}
+      onOpenChange={(o) => !o && onClose()}
+      title={ended ? "这次下载没有提交" : "下载"}
+      description={p ? (droppedReason(p.statusReason) ?? undefined) : undefined}
+    >
+      {plan.isPending ? (
+        <LoadingState rows={3} />
+      ) : !p ? (
+        <p className="text-sm text-muted-foreground">没找到这次下载，可能已被清理。</p>
+      ) : (
+        <div className="space-y-5">
+          {ended ? (
+            <StatusBadge tone={DROPPED_STATUS[ended].tone}>{DROPPED_STATUS[ended].label}</StatusBadge>
+          ) : (
+            <p className="text-sm text-muted-foreground">这次下载已经结束。</p>
+          )}
+          <WhySection
+            planId={p.id}
+            extraTech={[{ label: "状态原码", value: `${p.status} · ${p.statusReason ?? "—"}` }]}
+          />
+        </div>
+      )}
+    </DetailSheet>
+  );
+}

apps/web/app/routes/console/library.$id.tsx

@@ -45,6 +45,7 @@ import { EmptyState, ErrorState, LoadingState } from "~/components/console/empty
 import { consolePath } from "~/components/console/nav.ts";
 import { StatusBadge } from "~/components/console/status-badge.tsx";
 import { TechInfo } from "~/components/console/tech-info.tsx";
+import { DROPPED_STATUS, droppedReason, PURPOSE_LABEL } from "~/components/downloads/plan-format.ts";
 import { evidenceLabel, FieldLockDialog, IdentityDialog, MergeDialog } from "~/components/library/entity-dialogs.tsx";
 import {
   CONTENT_TYPE,
@@ -88,7 +89,7 @@ import { SubscriptionFormDialog } from "~/components/subscriptions/subscription-
 import { Button } from "~/components/ui/button.tsx";
 import { errorMessage } from "~/lib/api.ts";
 import { useUiPrefs } from "~/lib/ui-prefs.ts";
-import { formatBytes, formatDateTime } from "~/lib/utils.ts";
+import { cn, formatBytes, formatDateTime } from "~/lib/utils.ts";
 
 // 作品详情(REQ §13.1 / §13.4.3):实际路径、外部身份映射及状态、元数据来源、各 Slot、候选拒绝理由、
 // 内容单元、下载历史与校验结果,同一页同时展示。
@@ -871,11 +872,7 @@ function DownloadsPanel({ detail }: { detail: LibraryDetail }) {
             {d.downloadTask.name}
           </Link>
           <p className="text-meta text-muted-foreground">
-            {d.plan
-              ? `${d.plan.purpose === "upgrade" ? "升级" : d.plan.purpose === "fill" ? "补缺" : "换源"}计划 · `
-              : d.downloadTask.origin === "adopted"
-                ? "接管 · "
-                : ""}
+            {d.plan ? `${PURPOSE_LABEL[d.plan.purpose]} · ` : d.downloadTask.origin === "adopted" ? "接管 · " : ""}
             {formatDateTime(d.downloadTask.createdAt)}
           </p>
         </div>
@@ -935,15 +932,54 @@ function DownloadsPanel({ detail }: { detail: LibraryDetail }) {
   // 没有下载任务的整理记录(文件管理按路径手动整理等),下载任务的记录已在上表
   const listed = new Set(detail.downloads.map((d) => d.downloadTask.id));
   const manual = (detail.organizationRecords ?? []).filter((r) => !r.downloadTaskId || !listed.has(r.downloadTaskId));
+  // DL-3:没提交到下载器就结束的下载(失败 / 取消 / 过期),原因走原因码表,原码进技术信息
+  const dropped = detail.droppedPlans ?? [];
   return (
     <Panel title="下载历史与校验结果" bodyClassName="p-0 sm:p-0">
-      <DataTable
-        plain
-        columns={columns}
-        rows={detail.downloads}
-        rowKey={(d) => d.downloadTask.id}
-        empty={{ title: manual.length ? "没有下载任务，只有手动整理记录" : "还没有下载记录" }}
-      />
+      {detail.downloads.length || !dropped.length ? (
+        <DataTable
+          plain
+          columns={columns}
+          rows={detail.downloads}
+          rowKey={(d) => d.downloadTask.id}
+          empty={{ title: manual.length ? "没有下载任务，只有手动整理记录" : "还没有下载记录" }}
+        />
+      ) : null}
+      {dropped.length ? (
+        <div className={cn("px-4 py-3 sm:px-5", detail.downloads.length ? "border-t border-border/60" : "")}>
+          <p className="mb-2 text-meta text-muted-foreground">没提交到下载器</p>
+          <ul className="space-y-2">
+            {dropped.map(({ plan, releaseTitle }) => {
+              const st = DROPPED_STATUS[plan.status as keyof typeof DROPPED_STATUS] ?? DROPPED_STATUS.failed;
+              const why = droppedReason(plan.statusReason);
+              return (
+                <li key={plan.id} className="min-w-0">
+                  <div className="flex min-w-0 flex-wrap items-center gap-2">
+                    <StatusBadge tone={st.tone}>{st.label}</StatusBadge>
+                    <Link
+                      to={`${consolePath("downloads")}?plan=${plan.id}`}
+                      className="min-w-0 max-w-full truncate font-mono text-caption text-foreground hover:underline sm:max-w-md"
+                      title={releaseTitle ?? undefined}
+                    >
+                      {releaseTitle ?? "未知资源"}
+                    </Link>
+                    <span className="text-meta text-muted-foreground tabular-nums">
+                      {PURPOSE_LABEL[plan.purpose]} · {formatDateTime(plan.updatedAt)}
+                    </span>
+                  </div>
+                  {why ? <p className="mt-0.5 text-meta text-muted-foreground">{why}</p> : null}
+                  <TechInfo
+                    items={[
+                      { label: "计划 ID", value: plan.id, wide: true },
+                      { label: "原因码", value: plan.statusReason, wide: true },
+                    ]}
+                  />
+                </li>
+              );
+            })}
+          </ul>
+        </div>
+      ) : null}
       {manual.length ? (
         <div className="border-t border-border/60 px-4 py-3 sm:px-5">
           <p className="mb-2 text-meta text-muted-foreground">其他整理记录</p>

apps/web/app/routes/console/redirects.ts

@@ -25,13 +25,17 @@ export function legacyRedirect(pathname: string, search: string): string | null
   if (engineRun) return withRest(`/console/tasks?run=${engineRun[1]}`);
   // IA-3:身份与元数据取消,待识别 / 外部身份 / 别名并入媒体概览
   if (path === "/console/identity") return withRest(`/console/library?${IDENTITY_TAB[tab ?? ""] ?? IDENTITY_TAB.pool}`);
+  // DL-3:下载计划页签取消,计划并入下载面板;带计划 id 的深链(?plan= 或 /plans/:id)打开对应行
+  if (path === "/console/downloads/plans") return withRest("/console/downloads");
+  const planPath = /^\/console\/downloads\/plans\/([^/]+)$/.exec(path);
+  if (planPath) return withRest(`/console/downloads?plan=${planPath[1]}`);
 
   if (!tab) return null;
   if (path === "/console/tasks") {
     // FE-6:计划从任务页拆出,回到独立的计划页(?job= 透传)
     if (tab === "plan") return withRest("/console/schedules");
     if (tab === "downloads") return withRest("/console/downloads");
-    if (tab === "plans") return withRest("/console/downloads/plans");
+    if (tab === "plans") return withRest("/console/downloads");
     // 旧"业务任务"页签:统一任务流
     if (tab === "tasks" || tab === "business") return withRest("/console/tasks");
     return null;
@@ -49,7 +53,10 @@ export function legacyRedirect(pathname: string, search: string): string | null
 export const LEGACY_REDIRECTS: { from: string; to: string }[] = [
   { from: "/console/tasks?tab=downloads", to: "/console/downloads" },
   { from: "/console/tasks?tab=downloads&status=paused", to: "/console/downloads?status=paused" },
-  { from: "/console/tasks?tab=plans", to: "/console/downloads/plans" },
+  { from: "/console/tasks?tab=plans", to: "/console/downloads" },
+  { from: "/console/downloads/plans", to: "/console/downloads" },
+  { from: "/console/downloads/plans?plan=p-1", to: "/console/downloads?plan=p-1" },
+  { from: "/console/downloads/plans/p-1", to: "/console/downloads?plan=p-1" },
   { from: "/console/tasks?tab=tasks", to: "/console/tasks" },
   { from: "/console/tasks?tab=business", to: "/console/tasks" },
   { from: "/console/subscriptions?tab=policies", to: "/console/rules" },

apps/web/app/routes/console/tasks.tsx

@@ -15,7 +15,7 @@ import { legacyRedirectLoader } from "./redirects.ts";
 
 export const meta = () => [{ title: "任务 · UHD 媒体自动化控制台" }];
 
-// 旧的 ?tab=downloads / plans / business / plan 跳到下载面板 / 下载计划 / 任务流 / 计划页
+// 旧的 ?tab=downloads / plans / business / plan 跳到下载面板 / 下载面板 / 任务流 / 计划页
 export const clientLoader = legacyRedirectLoader;
 
 type Tab = StreamTab;