From 0528e531e3717362fa28fc58b5ed2a35a0195f73 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Thu, 3 Sep 2026 16:14:58 +0800
Subject: [PATCH] fix(transfer): keep directory intercept intent stable

---
 app/modules/filemanager/transhandler.py | 11 +++-
 tests/test_filemanager_planning.py      | 74 ++++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/app/modules/filemanager/transhandler.py b/app/modules/filemanager/transhandler.py
index d8a3fb971..85fa859fc 100644
--- a/app/modules/filemanager/transhandler.py
+++ b/app/modules/filemanager/transhandler.py
@@ -1101,8 +1101,13 @@ class TransHandler:
         observe_cleanup_before_transfer: Optional[Callable[[], bool]] = None,
         step_runner: Optional[TransferStepRunner] = None,
     ) -> TransferInfo:
-        """只消费冻结目标和有序操作，并在执行期处理覆盖与插件拦截。"""
+        """只消费冻结目标和有序操作，并在执行期处理覆盖与插件拦截。
+
+        持久步骤意图中的源文件必须使用规划输入快照；目录执行时可能重新统计
+        STREAM 大小，但这类运行期投影不属于步骤身份。
+        """
         fileitem = FileItem(**checkpoint.planning_input.source_fileitem)
+        frozen_source_payload = checkpoint.planning_input.source_fileitem
         target_storage = checkpoint.target_storage
         target_path = Path(checkpoint.final_target_path)
         transfer_type = checkpoint.resolved_transfer_type
@@ -1162,7 +1167,7 @@ class TransHandler:
             allowed, reason = self.__intercept_with_step(
                 step_runner=step_runner,
                 payload={
-                    "source": fileitem.model_dump(mode="json"),
+                    "source": frozen_source_payload,
                     "target_storage": target_storage,
                     "target_path": target_path.as_posix(),
                     "transfer_type": transfer_type,
@@ -1292,7 +1297,7 @@ class TransHandler:
         allowed, reason = self.__intercept_with_step(
             step_runner=step_runner,
             payload={
-                "source": fileitem.model_dump(mode="json"),
+                "source": frozen_source_payload,
                 "target_storage": target_storage,
                 "target_path": target_file.as_posix(),
                 "transfer_type": transfer_type,
diff --git a/tests/test_filemanager_planning.py b/tests/test_filemanager_planning.py
index 9785be525..e5e29b8ec 100644
--- a/tests/test_filemanager_planning.py
+++ b/tests/test_filemanager_planning.py
@@ -1,9 +1,14 @@
 from dataclasses import replace
 from pathlib import Path
+from unittest.mock import Mock
 
 import pytest
 
-from app.application.transfer.workflow import TransferPlanCheckpoint, TransferPlanningInput
+from app.application.transfer.workflow import (
+    TransferPlanCheckpoint,
+    TransferPlanItem,
+    TransferPlanningInput,
+)
 from app.domain.context import MediaInfo
 from app.domain.meta.metabase import MetaBase
 from app.modules.filemanager import transhandler as transhandler_module
@@ -575,3 +580,70 @@ def test_directory_intercept_preserves_legacy_payload(monkeypatch):
     assert payload.options is None
     assert "meta" not in payload.model_fields_set
     assert "options" not in payload.model_fields_set
+
+
+def test_directory_intercept_step_uses_frozen_source_after_size_projection():
+    """目录执行期修正根目录大小时，持久拦截意图仍使用冻结源快照。"""
+    root = FileItem(
+        storage="alist",
+        path="/downloads/disc",
+        name="disc",
+        type="dir",
+    )
+    stream = FileItem(
+        storage="alist",
+        path="/downloads/disc/BDMV/STREAM/00001.m2ts",
+        name="00001.m2ts",
+        type="file",
+        extension="m2ts",
+        size=123,
+    )
+    planning_input = TransferPlanningInput(
+        source_fileitem=root.model_dump(mode="json"),
+        target_storage="alist",
+        target_path="/library",
+        requested_transfer_type="copy",
+        need_rename=False,
+    )
+    checkpoint = TransferPlanCheckpoint(
+        planning_input=planning_input,
+        target_storage="alist",
+        root_target_path="/library/disc",
+        final_target_path="/library/disc",
+        resolved_transfer_type="copy",
+        items=(TransferPlanItem(
+            sequence=0,
+            source_fileitem=stream.model_dump(mode="json"),
+            target_storage="alist",
+            target_path="/library/disc/BDMV/STREAM/00001.m2ts",
+        ),),
+        need_rename=False,
+        overwrite_mode="never",
+    )
+    runner = Mock()
+    steps = []
+
+    def run_step(*, phase, kind, payload, execute, observe):
+        """模拟 durable runner，并记录其接受的冻结步骤意图。"""
+        steps.append((phase, kind, payload))
+        return execute()
+
+    runner.run.side_effect = run_step
+    storage = RecordingStorage([])
+
+    result = TransHandler().execute_transfer_plan(
+        checkpoint,
+        meta=_build_media()[0],
+        mediainfo=_build_media()[1],
+        source_oper=storage,
+        target_oper=storage,
+        step_runner=runner,
+    )
+
+    assert result.success is True
+    intercept = next(
+        payload
+        for _phase, kind, payload in steps
+        if kind == "plugin_transfer_intercept"
+    )
+    assert intercept["source"] == planning_input.source_fileitem