fix(client): accept exact current-only sku state

client/scripts/capture_sku_reveal_spike.py

@@ -13,9 +13,17 @@ sys.path.insert(0, str(CLIENT_ROOT / "src"))
 
 from cmbuyer_client.device.adb import AdbClient, DeviceConnectionError, SubprocessAdbRunner
 from cmbuyer_client.device.baseline import NoReconnectUiautomatorConnector
-from cmbuyer_client.pdd.sku_reveal_spike import SkuRevealSpikeCapturer, SkuRevealSpikeError
-from cmbuyer_client.pdd.sku_selection import EXPECTED_GOODS_ID, SkuSelectionError
-from cmbuyer_client.pdd.sku_selection_runner import SkuSelectionRunError, safe_failure_stage
+from cmbuyer_client.pdd.sku_reveal_spike import (
+    safe_reveal_failure_stage,
+    SkuRevealSpikeCapturer,
+    SkuRevealSpikeError,
+)
+from cmbuyer_client.pdd.sku_selection import (
+    EXPECTED_GOODS_ID,
+    _safe_sku_entry_failure_stage,
+    SkuSelectionError,
+)
+from cmbuyer_client.pdd.sku_selection_runner import SkuSelectionRunError
 
 
 def parse_arguments(argv: list[str] | None = None) -> argparse.Namespace:
@@ -42,6 +50,14 @@ def validate_arguments(arguments: argparse.Namespace) -> None:
         raise ValueError("--timeout 必须是大于 0 的有限数值。")
 
 
+def _safe_capture_failure_stage(error: BaseException) -> str:
+    # 入口与 reveal 各有不可伪造的正式 marker；入口优先，不能被外层 reveal 标注覆盖。
+    entry_stage = _safe_sku_entry_failure_stage(error)
+    if entry_stage is not None:
+        return entry_stage
+    return safe_reveal_failure_stage(error) or "unknown"
+
+
 def main(argv: list[str] | None = None) -> int:
     arguments = parse_arguments(argv)
     try:
@@ -74,7 +90,7 @@ def main(argv: list[str] | None = None) -> int:
     except (DeviceConnectionError, SkuSelectionError, SkuSelectionRunError, SkuRevealSpikeError) as error:
         # 不回显页面正文、节点、serial、坐标、路径或第三方异常。
         print(
-            f"规格 reveal 取证失败：stage={safe_failure_stage(error)}；已停止，未发布本地证据目录。",
+            f"规格 reveal 取证失败：stage={_safe_capture_failure_stage(error)}；已停止，未发布本地证据目录。",
             file=sys.stderr,
         )
         return 1