Merge branch 'dl2b'

Co-Authored-By: Claude Fable 5.1 <[email protected]>

# Conflicts:
#	apps/web/app/components/library/versions.tsx

apps/web/app/components/downloads/board-format.test.ts

@@ -27,14 +27,14 @@ describe("下载面板展示换算(DL-2)", () => {
 
   it("最近一次整理结果:已入库 / 整理中 / 待整理 / 入库失败 / 部分入库;有待处理事项时链到待处理", () => {
     expect(organizeState({ status: "completed", organize: null })).toMatchObject({ label: "待整理", to: null });
-    expect(organizeState({ status: "importing", organize: null }).label).toBe("整理中");
-    expect(organizeState({ status: "imported", organize: null }).label).toBe("已入库");
+    expect(organizeState({ status: "importing", organize: null })?.label).toBe("整理中");
+    expect(organizeState({ status: "imported", organize: null })?.label).toBe("已入库");
     expect(organizeState({ status: "completed", organize: rec("succeeded") })).toMatchObject({
       label: "已入库",
       tone: "success",
       to: `/console/organize/${RID}`,
     });
-    expect(organizeState({ status: "completed", organize: rec("running") }).label).toBe("整理中");
+    expect(organizeState({ status: "completed", organize: rec("running") })?.label).toBe("整理中");
     const failed = organizeState({
       status: "completed",
       organize: rec("failed", {
@@ -42,19 +42,43 @@ describe("下载面板展示换算(DL-2)", () => {
         decision: { id: "00000000-0000-4000-8000-000000000002", kind: "identity_unresolved" },
       }),
     });
-    // 原因码不直接给人看
-    expect(failed).toMatchObject({ label: "入库失败", tone: "destructive", hint: null });
-    expect(failed.to).toBe("/console/inbox?kind=identity_unresolved");
-    expect(organizeState({ status: "completed", organize: rec("failed", { reason: "磁盘已满" }) }).hint).toBe(
+    // 原因码转成人话,不直接给人看
+    expect(failed).toMatchObject({
+      label: "入库失败",
+      tone: "destructive",
+      hint: "没识别出作品。指定作品后重新整理",
+    });
+    expect(failed?.to).toBe("/console/inbox?kind=identity_unresolved");
+    expect(organizeState({ status: "completed", organize: rec("failed", { reason: "磁盘已满" }) })?.hint).toBe(
       "磁盘已满",
     );
-    expect(organizeState({ status: "completed", organize: rec("partial") }).label).toBe("部分入库");
+    expect(organizeState({ status: "completed", organize: rec("partial") })?.label).toBe("部分入库");
+    expect(organizeState({ status: "completed", organize: rec("failed", { reason: "transfer_failed" }) })?.hint).toBe(
+      "文件没有整理成功。在整理记录里查看失败的文件",
+    );
+    expect(
+      organizeState({ status: "completed", organize: rec("partial", { reason: "blocked:target_exists" }) })?.hint,
+    ).toBe("媒体库里已有同名文件。在待处理里选择替换或跳过");
+    // 不认识的码不显示
+    expect(
+      organizeState({ status: "completed", organize: rec("failed", { reason: "some_new_code" }) })?.hint,
+    ).toBeNull();
     expect(organizeState({ status: "completed", organize: rec("cancelled") })).toMatchObject({
       label: "待整理",
       to: null,
     });
   });
 
+  it("外部任务:没整理过显示 —(null),整理过的照常显示结果", () => {
+    expect(organizeState({ status: "completed", organize: null, managed: false })).toBeNull();
+    expect(organizeState({ status: "completed", organize: null, managed: true })?.label).toBe("待整理");
+    expect(organizeState({ status: "completed", organize: rec("succeeded"), managed: false })?.label).toBe("已入库");
+    expect(
+      organizeState({ status: "completed", organize: rec("failed", { reason: "transfer_failed" }), managed: false })
+        ?.label,
+    ).toBe("入库失败");
+  });
+
   it("连接数:全 0 且总数未知时不显示", () => {
     const base = {
       dlSpeed: 0,

apps/web/app/components/downloads/board-format.ts

@@ -1,5 +1,6 @@
 import type { DownloadBoardItem, DownloadBoardState, DownloadLive } from "@umt/contracts";
 import { consolePath } from "~/components/console/nav.ts";
+import { reasonLine } from "~/lib/reasons.ts";
 import { formatBytes } from "~/lib/utils.ts";
 
 // 下载面板(DL-2)的展示换算:速度、剩余时间、整理状态、实时状态补充。
@@ -33,15 +34,20 @@ export type OrganizeState = {
   hint: string | null;
 };
 
-/** 原因:内部码(小写下划线)不显示,其余原样。TODO(DEAI-2 合并后):改用 ~/lib/reasons.ts 的 reasonLine 人话化 */
+/** 原因 → 一句人话(DEAI-2 原因码表);不认识的内部码不给人看,原码在详情的技术信息里 */
 export function reasonHint(raw: string | null | undefined): string | null {
-  if (!raw) return null;
-  return /^[a-z0-9_]+([:.,][a-z0-9_:.,-]*)?$/.test(raw) ? null : raw;
+  return reasonLine(raw, "") || null;
 }
 
-/** 已完成任务的最近一次整理结果:已入库 / 整理中 / 待整理 / 入库失败 / 部分入库 */
-export function organizeState(t: Pick<DownloadBoardItem, "status" | "organize">): OrganizeState {
+/**
+ * 已完成任务的最近一次整理结果:已入库 / 整理中 / 待整理 / 入库失败 / 部分入库。
+ * 外部任务(managed=false)没整理过时不算"待整理",返回 null(界面显示 —);整理过的照常显示结果。
+ */
+export function organizeState(
+  t: Pick<DownloadBoardItem, "status" | "organize"> & { managed?: boolean },
+): OrganizeState | null {
   const rec = t.organize;
+  if (t.managed === false && !rec && t.status !== "importing" && t.status !== "imported") return null;
   const to = rec?.decision
     ? `${consolePath("inbox")}?kind=${rec.decision.kind}`
     : rec

apps/web/app/components/downloads/download-board.tsx

@@ -195,6 +195,7 @@ export function activeColumns(): DataColumn<DownloadBoardItem>[] {
 
 function OrganizeBadge({ t }: { t: DownloadBoardItem }) {
   const s = organizeState(t);
+  if (!s) return <span className="text-meta text-muted-foreground">—</span>;
   const badge = <StatusBadge tone={s.tone}>{s.label}</StatusBadge>;
   return (
     <div className="flex max-w-56 flex-col items-start gap-0.5">

apps/web/app/components/downloads/download-detail.tsx

@@ -24,7 +24,7 @@ import { Button } from "~/components/ui/button.tsx";
 import { relTime } from "~/components/workbench/release-fields.ts";
 import { errorMessage } from "~/lib/api.ts";
 import { planReasonText } from "~/lib/labels.ts";
-import { humanizeReason, reasonLine } from "~/lib/reasons.ts";
+import { humanizeReason, reasonCode, reasonLine } from "~/lib/reasons.ts";
 import { formatBytes, formatDateTime } from "~/lib/utils.ts";
 import { liveItems } from "./board-format.ts";
 import { BusinessTimeline } from "./business-timeline.tsx";
@@ -162,7 +162,7 @@ export function DownloadDetail({ task, live }: { task: DownloadTask; live?: Down
         <KvList
           className="mt-3"
           items={[
-            { label: "下载器", value: names.data?.get(task.instanceId) ?? task.instanceId.slice(0, 8) },
+            { label: "下载器", value: names.data?.get(task.instanceId) ?? "未知" },
             { label: "大小", value: task.sizeBytes === null ? "未知" : formatBytes(task.sizeBytes, 2) },
             { label: "剩余", value: task.remainingBytes === null ? "未知" : formatBytes(task.remainingBytes, 2) },
             ...liveItems(live),
@@ -181,6 +181,9 @@ export function DownloadDetail({ task, live }: { task: DownloadTask; live?: Down
             { label: "内容路径", value: task.contentPath, wide: true },
             { label: "torrent hash", value: task.torrentHash, wide: true },
             { label: "任务 ID", value: task.id, wide: true },
+            { label: "下载器 ID", value: task.instanceId, wide: true },
+            importFailed ? { label: "整理失败原因码", value: reasonCode(importFailed.reason) } : null,
+            importFailed ? { label: "整理记录 ID", value: importFailed.id, wide: true } : null,
           ]}
         >
           {task.lastError ? <JsonView label="下载器错误原文" value={task.lastError} tone="destructive" /> : null}
@@ -201,7 +204,13 @@ export function DownloadDetail({ task, live }: { task: DownloadTask; live?: Down
               { label: "说明", value: planReasonText(plan.data.statusReason), wide: true },
             ]}
           />
-          <TechInfo className="mt-2">
+          <TechInfo
+            className="mt-2"
+            items={[
+              { label: "计划 ID", value: plan.data.id, wide: true },
+              { label: "说明原码", value: plan.data.statusReason },
+            ]}
+          >
             <JsonView label="评估依据" value={plan.data.evaluation} />
           </TechInfo>
         </DetailSection>