From 2159765949c39c2ea73e1c447c95c21a18e891a1 Mon Sep 17 00:00:00 2001
From: root <root@localhost>
Date: Sat, 3 Oct 2026 21:20:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(download):=20=E5=B7=B2=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8D=E8=A2=AB=20qB=20=E4=B8=AD=E9=97=B4?=
 =?UTF-8?q?=E6=80=81=E6=94=B9=E5=9B=9E=EF=BC=88H2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

importing / imported 只由整理侧推进：checkingResumeData / queuedDL / checkingUP / moving 等中间态只更新原始字段，不改回 queued / downloading / completed，completed_at 不重写；这期间也不做无进展判定。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Cxwgnn2pbzQ7rXv3rq7fei
---
 .../src/modules/acquisition-organize/services/downloads.ts  | 3 ++-
 packages/mapping/src/download.ts                            | 6 ++++--
 packages/mapping/test/enums.test.ts                         | 5 +++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/server/src/modules/acquisition-organize/services/downloads.ts b/apps/server/src/modules/acquisition-organize/services/downloads.ts
index 081a5693..bfd47283 100644
--- a/apps/server/src/modules/acquisition-organize/services/downloads.ts
+++ b/apps/server/src/modules/acquisition-organize/services/downloads.ts
@@ -771,7 +771,8 @@ async function observeLocked(
   let noProgressSince = row.no_progress_since;
   let lastProgressAt = row.last_progress_at;
   let stalledNow = false;
-  if (obs.status === "downloading") {
+  // importing / imported 期间(qB 重新校验 / 移动等中间态)不做无进展判定
+  if (obs.status === "downloading" && (merged.status === "downloading" || merged.status === "stalled")) {
     if (downloaded > row.downloaded_bytes || !lastProgressAt) {
       lastProgressAt = now;
       noProgressSince = null;
diff --git a/packages/mapping/src/download.ts b/packages/mapping/src/download.ts
index 35b65b89..7ee3f338 100644
--- a/packages/mapping/src/download.ts
+++ b/packages/mapping/src/download.ts
@@ -62,7 +62,9 @@ export function toDomainDownloadStatus(status: DownloadStatus, pauseReason: Paus
 
 /**
  * 同步轮询时合并"下载器观察"与"当前业务状态":
- * - 业务叠加态在其底层下载状态不变时保留(importing/imported 遇 completed、stalled 遇 downloading、submitting 遇 queued);
+ * - importing / imported 只由整理侧推进:下载器的任何中间态(checkingResumeData / queuedDL / checkingUP / moving,
+ *   乃至出错 / 缺文件)都不把它改回下载阶段,同步只更新原始字段;只有 removed(调用方确认移除)例外;
+ * - 其余业务叠加态在其底层下载状态不变时保留(stalled 遇 downloading、submitting 遇 queued);
  * - 暂停原因为 policy/agent 且下载器仍是暂停时保留原因,不被改写成 user;
  * - 其余以观察为准。
  */
@@ -72,7 +74,7 @@ export function mergeObservedDownloadState(
 ): ContractDownloadState {
   const next = TO_CONTRACT[observed];
   const keep =
-    ((current.status === "importing" || current.status === "imported") && observed === "completed") ||
+    ((current.status === "importing" || current.status === "imported") && observed !== "removed") ||
     (current.status === "stalled" && observed === "downloading") ||
     (current.status === "submitting" && observed === "queued");
   if (keep) return { ...current };
diff --git a/packages/mapping/test/enums.test.ts b/packages/mapping/test/enums.test.ts
index fa15264f..eb812c79 100644
--- a/packages/mapping/test/enums.test.ts
+++ b/packages/mapping/test/enums.test.ts
@@ -57,6 +57,11 @@ describe("下载状态", () => {
       st("paused", "threshold"),
     );
     expect(M.mergeObservedDownloadState(st("imported"), "removed")).toEqual(st("removed"));
+    // 已进入整理侧:qB 重启 / 重新校验 / 移动的中间态不把状态改回下载阶段
+    for (const o of ["queued", "downloading", "paused_by_user", "error", "missing_files"] as const) {
+      expect(M.mergeObservedDownloadState(st("imported"), o), o).toEqual(st("imported"));
+      expect(M.mergeObservedDownloadState(st("importing"), o), o).toEqual(st("importing"));
+    }
   });
 });