Procházet zdrojové kódy

Isolate battle wait strategies with context-local plans

unknown před 2 měsíci
rodič
revize
8076d11aa5

+ 92 - 0
dev/260912-error/log.txt

@@ -0,0 +1,92 @@
+════════════════════════════════════════════════════════════════════════════════
+────────────────────────────── ACTIVITYSHIKIGAMI ───────────────────────────────
+════════════════════════════════════════════════════════════════════════════════
+2026-09-12 12:55:45.424 |      config_model.py:0176 |     INFO | auto save config                                                                               
+2026-09-12 12:55:45.651 |            script.py:0565 |     INFO | module_path: C:\tools\OAS\tasks\ActivityShikigami\script_task.py, module_name: script_task     
+2026-09-12 12:55:45.676 |           game_ui.py:0102 |     INFO | UI get current page                                                                            
+2026-09-12 12:55:45.681 |            logger.py:0320 |     INFO | [UI] page_main                                                                                 
+2026-09-12 12:55:45.683 |            logger.py:0312 |     INFO | <<< UI GOTO PAGE_CLIMB_ACT >>>                                                                 
+2026-09-12 12:55:45.685 |           game_ui.py:0229 |     INFO | Current page: page_main. Following shortest path:                                              
+2026-09-12 12:55:45.687 |           game_ui.py:0231 |     INFO | page_main -> page_climb_act                                                                    
+2026-09-12 12:55:47.458 |           game_ui.py:0276 |     INFO | Page switch: page_main -> page_climb_act                                                       
+2026-09-12 12:55:47.461 |           game_ui.py:0284 |     INFO | Wait appear and operate [AS_SHI, AS_TOGGLE_BUTTON] on page_main                                
+2026-09-12 12:55:47.762 |           control.py:0075 |     INFO | Click (1216,  474) @ AS_SHI                                                                    
+2026-09-12 12:55:48.663 |           control.py:0075 |     INFO | Click (1206,  541) @ AS_TOGGLE_BUTTON                                                          
+2026-09-12 12:55:53.477 |           game_ui.py:0302 |  WARNING | Failed recognize [AS_SHI, AS_TOGGLE_BUTTON] on page_main                                       
+2026-09-12 12:55:53.480 |           game_ui.py:0102 |     INFO | UI get current page                                                                            
+2026-09-12 12:55:53.799 |            logger.py:0320 |     INFO | [UI] page_climb_act                                                                            
+══════════════════════════ START RUN CLIMB TYPE PASS ═══════════════════════════
+2026-09-12 12:55:54.983 |            logger.py:0307 |     INFO | START RUN CLIMB TYPE PASS                                                                      
+2026-09-12 12:55:55.295 |           control.py:0075 |     INFO | Click ( 336,  212) @ AS_TO_BATTLE_MAIN                                                         
+2026-09-12 12:55:57.697 |           control.py:0075 |     INFO | Click ( 162,   99) @ AS_TO_BATTLE_MAIN_2                                                       
+2026-09-12 12:55:58.902 |           control.py:0075 |     INFO | Click (  98,  111) @ AS_TO_BATTLE_MAIN_2                                                       
+────────────────────────────── START SWITCH SOUL ───────────────────────────────
+2026-09-12 12:55:59.502 |            logger.py:0310 |     INFO | START SWITCH SOUL                                                                              
+2026-09-12 12:55:59.797 |           control.py:0075 |     INFO | Click (1038,  584) @ AS_BATTLE_MAIN_TO_RECORDS                                                 
+2026-09-12 12:56:01.000 |           control.py:0075 |     INFO | Click ( 394,   99) @ SS_SOUL_PRESET                                                            
+2026-09-12 12:56:01.305 |       switch_soul.py:0090 |     INFO | Click preset in switch soul                                                                    
+2026-09-12 12:56:01.731 |            logger.py:0320 |     INFO | [SS_GROUP_NAME 0.130s] ['默认分组', '御魂', '结界', '副本', '活动']                            
+2026-09-12 12:56:01.736 |           control.py:0159 |     INFO | Swipe (1224,  190) -> (1190,  330)                                                             
+2026-09-12 12:56:02.606 |            logger.py:0320 |     INFO | [SS_GROUP_NAME 0.124s] ['默认分组', '御魂', '结界', '副本', '活动']                            
+2026-09-12 12:56:02.610 |           control.py:0075 |     INFO | Click (1146,  387) @ sou_group_5                                                               
+2026-09-12 12:56:03.248 |           control.py:0075 |     INFO | Click (1119,  400) @ sou_group_5                                                               
+2026-09-12 12:56:04.716 |           control.py:0075 |     INFO | Click ( 985,  171) @ SS_SOU_SWITCH_1                                                           
+2026-09-12 12:56:05.701 |           control.py:0075 |     INFO | Click ( 772,  420) @ SS_SOU_SWITCH_SURE                                                        
+2026-09-12 12:56:06.819 |       switch_soul.py:0167 |  WARNING | Click team 1 failed in group 5                                                                 
+2026-09-12 12:56:07.117 |       switch_soul.py:0170 |     INFO | Switch soul_one group 5 team 1                                                                 
+2026-09-12 12:56:07.427 |           control.py:0075 |     INFO | Click (  41,   32) @ UI_UI_BACK_YELLOW                                                         
+2026-09-12 12:56:08.025 |       script_task.py:0326 |     INFO | Switch climb mode to pass                                                                      
+2026-09-12 12:56:08.324 |           control.py:0075 |     INFO | Click (1249,  560) @ AS_CLIMB_MODE_SWITCH                                                      
+2026-09-12 12:56:09.832 |            logger.py:0320 |     INFO | [FIRE 0.003s] [挑战]                                                                           
+2026-09-12 12:56:09.834 |       script_task.py:0335 |     INFO | Lock pass team                                                                                 
+2026-09-12 12:56:10.135 |            logger.py:0312 |     INFO | <<< CHECK PASS TICKETS >>>                                                                     
+2026-09-12 12:56:10.433 |            logger.py:0320 |     INFO | [FIRE 0.003s] [挑战]                                                                           
+2026-09-12 12:56:10.731 |           sub_ocr.py:0122 |  WARNING | OCR REMAIN_PASS: Result "" is revised to "0"                                                   
+2026-09-12 12:56:10.734 |            logger.py:0320 |     INFO | [REMAIN_PASS 0.005s] [0]                                                                       
+2026-09-12 12:56:10.736 |       script_task.py:0207 |  WARNING | No tickets left, wait for next time                                                            
+2026-09-12 12:56:11.035 |           control.py:0075 |     INFO | Click (  43,   42) @ UI_UI_BACK_YELLOW                                                         
+2026-09-12 12:56:15.552 |           control.py:0075 |     INFO | Click (  48,   52) @ UI_UI_BACK_YELLOW                                                         
+────────────────────────────── CLIMB SWITCH TO AP ──────────────────────────────
+2026-09-12 12:56:18.265 |            logger.py:0310 |     INFO | CLIMB SWITCH TO AP                                                                             
+2026-09-12 12:56:18.277 |           game_ui.py:0102 |     INFO | UI get current page                                                                            
+2026-09-12 12:56:18.300 |            logger.py:0320 |     INFO | [UI] page_climb_act                                                                            
+2026-09-12 12:56:18.304 |            logger.py:0312 |     INFO | <<< UI GOTO PAGE_CLIMB_ACT >>>                                                                 
+2026-09-12 12:56:18.306 |           game_ui.py:0229 |     INFO | Current page: page_climb_act. Following shortest path:                                         
+2026-09-12 12:56:18.308 |           game_ui.py:0231 |     INFO | page_climb_act                                                                                 
+2026-09-12 12:56:19.473 |           game_ui.py:0273 |     INFO | Page arrived page_climb_act                                                                    
+2026-09-12 12:56:19.476 |            logger.py:0312 |     INFO | <<< START RUN CLIMB TYPE AP >>>                                                                
+2026-09-12 12:56:19.772 |           control.py:0075 |     INFO | Click ( 347,  253) @ AS_TO_BATTLE_MAIN                                                         
+2026-09-12 12:56:22.175 |           control.py:0075 |     INFO | Click ( 204,  112) @ AS_TO_BATTLE_MAIN_2                                                       
+2026-09-12 12:56:23.383 |           control.py:0075 |     INFO | Click ( 131,  108) @ AS_TO_BATTLE_MAIN_2                                                       
+────────────────────────────── START SWITCH SOUL ───────────────────────────────
+2026-09-12 12:56:23.983 |            logger.py:0310 |     INFO | START SWITCH SOUL                                                                              
+2026-09-12 12:56:24.278 |           control.py:0075 |     INFO | Click (1027,  584) @ AS_BATTLE_MAIN_TO_RECORDS                                                 
+2026-09-12 12:56:25.485 |           control.py:0075 |     INFO | Click ( 377,   84) @ SS_SOUL_PRESET                                                            
+2026-09-12 12:56:25.780 |       switch_soul.py:0090 |     INFO | Click preset in switch soul                                                                    
+2026-09-12 12:56:26.202 |            logger.py:0320 |     INFO | [SS_GROUP_NAME 0.120s] ['默认分组', '御魂', '结界', '副本', '活动']                            
+2026-09-12 12:56:26.215 |           control.py:0159 |     INFO | Swipe (1218,  191) -> (1210,  336)                                                             
+2026-09-12 12:56:27.092 |            logger.py:0320 |     INFO | [SS_GROUP_NAME 0.131s] ['默认分组', '御魂', '结界', '副本', '活动']                            
+2026-09-12 12:56:27.097 |           control.py:0075 |     INFO | Click (1200,  383) @ sou_group_5                                                               
+2026-09-12 12:56:27.740 |           control.py:0075 |     INFO | Click (1165,  373) @ sou_group_5                                                               
+2026-09-12 12:56:29.195 |           control.py:0075 |     INFO | Click ( 984,  162) @ SS_SOU_SWITCH_1                                                           
+2026-09-12 12:56:30.162 |       switch_soul.py:0167 |  WARNING | Click team 1 failed in group 5                                                                 
+2026-09-12 12:56:30.977 |       switch_soul.py:0167 |  WARNING | Click team 1 failed in group 5                                                                 
+2026-09-12 12:56:31.286 |       switch_soul.py:0170 |     INFO | Switch soul_one group 5 team 1                                                                 
+2026-09-12 12:56:31.579 |           control.py:0075 |     INFO | Click (  41,   36) @ UI_UI_BACK_YELLOW                                                         
+2026-09-12 12:56:32.179 |       script_task.py:0326 |     INFO | Switch climb mode to ap                                                                        
+2026-09-12 12:56:32.481 |           control.py:0075 |     INFO | Click (1253,  555) @ AS_CLIMB_MODE_SWITCH                                                      
+2026-09-12 12:56:33.985 |            logger.py:0320 |     INFO | [FIRE 0.003s] [挑战]                                                                           
+2026-09-12 12:56:33.988 |       script_task.py:0335 |     INFO | Lock ap team                                                                                   
+2026-09-12 12:56:34.289 |            logger.py:0312 |     INFO | <<< CHECK AP TICKETS >>>                                                                       
+2026-09-12 12:56:34.588 |            logger.py:0320 |     INFO | [FIRE 0.003s] [挑战]                                                                           
+2026-09-12 12:56:34.889 |            logger.py:0320 |     INFO | [REMAIN_AP 0.003s] [2584]                                                                      
+2026-09-12 12:56:35.195 |            logger.py:0320 |     INFO | [FIRE 0.002s] [挑战]                                                                           
+2026-09-12 12:56:35.198 |           control.py:0075 |     INFO | Click (1145,  632) @ FIRE                                                                      
+2026-09-12 12:56:35.338 |       script_task.py:0295 |     INFO | Try click fire, remain times[7]                                                                
+───────────────────────────── GENERAL BATTLE START ─────────────────────────────
+2026-09-12 12:56:36.693 |            logger.py:0310 |     INFO | GENERAL BATTLE START                                                                           
+2026-09-12 12:56:36.695 |    general_battle.py:0039 |     INFO | Current count: 1                                                                               
+2026-09-12 12:56:36.993 |           control.py:0075 |     INFO | Click (1184,  579) @ GB_PREPARE_HIGHLIGHT                                                      
+2026-09-12 12:56:37.895 |           control.py:0075 |     INFO | Click (1177,  576) @ GB_PREPARE_HIGHLIGHT                                                      
+2026-09-12 12:56:38.225 |            device.py:0134 |     INFO | Add stuck record: BATTLE_STATUS_S                                                              
+2026-09-12 12:56:38.229 |       battle_wait.py:0353 |     INFO | Start battle process                                                                           

binární
dev/260912-error/picture1.png


binární
dev/260912-error/picture2.png


+ 44 - 0
memory/2026-09-12-activity-shikigami-reward-timeout.md

@@ -0,0 +1,44 @@
+# ACTIVITYSHIKIGAMI 奖励结算超时排查(2026-09-12)
+
+- 状态:DONE_WITH_CONCERNS。代码、回归测试和原始截图离线回放已验证;未连接实际游戏运行。
+- 输入:`dev/260912-error/log.txt`、`picture1.png`、`picture2.png`,以及 `config/oas2.json` 的 `activity_shikigami` 配置。分支为 `dev`,排查时 HEAD 为 `e70f40ee`。
+
+## 症状与根因
+
+日志在点击挑战后已经进入 `run_general_battle`,两次点击准备,最后记录 `Start battle process`。因此本次卡点是战后奖励结算。用户截图 `picture2.png` 显示“获得奖励”弹窗。
+
+`battle_wait_strategy` 原先只让第一个实例初始化类级 `battle_wait_plan`。后续装饰器的配置存入 `_temp_battle_wait_plan`,但正常调用不会使用它,只有显式进入 `with` 才会生效。先加载 EvoZone 等普通任务、再加载 ActivityShikigami 时,活动任务虽然声明 `success='activity'`,实际却调用 `_bw_success_default`。反向加载也会使普通任务误用活动策略。
+
+复现脚本先导入 `tasks.EvoZone.script_task.ScriptTask`,再导入 `tasks.ActivityShikigami.script_task.ScriptTask`,拦截 `battle_wait_with_strategy` 并检查传入策略:修复前活动任务的 `success` 为 `default`,修复后为 `activity`,普通任务保持 `default`。
+
+原始截图使用现有 `RuleImage` 的 RGB 模板匹配结果:
+
+| 模板 | picture2 匹配度 | 阈值 | 结果 |
+| --- | ---: | ---: | --- |
+| I_UI_REWARD | 0.99397 | 0.73 | 匹配 |
+| I_WIN | 0.29829 | 0.80 | 不匹配 |
+| I_GREED_GHOST | 0.08016 | 0.80 | 不匹配 |
+| I_REWARD | -0.23773 | 0.80 | 不匹配 |
+| I_REWARD_GOLD | 0.49201 | 0.80 | 不匹配 |
+| I_REWARD_GOLD_SNAKE_SKIN | 0.39812 | 0.80 | 不匹配 |
+
+奖励详情模板 I_END_FIX_1/2/3 均未误匹配;picture1 也未匹配 I_UI_REWARD。现有活动奖励模板有效,无须调整图片、阈值或用户配置。
+
+## 修改
+
+- `tasks/Component/GeneralBattle/battle_wait.py`:每个装饰器持有自己的策略和选项;显式 `with` 覆盖通过 ContextVar 保存,并在退出或异常时恢复;随机操作只扩展当前调用的策略,选项不会跨任务或跨调用修改。
+- `tests/tasks/Component/GeneralBattle/test_battle_wait.py`:新增双向加载顺序、随机操作开关、活动奖励关闭、嵌套上下文异常恢复和选项隔离测试。已有测试中的模拟成功处理器补充设置 `bw_ctx.success=True`,与当前返回战斗结果的语义一致。
+
+## 验证
+
+1. 修复前完整 `tests` 基线为 25 passed、3 failed:两个旧测试的模拟处理器没有设置成功状态,一个选项测试暴露了类级 options 共享问题。
+2. 先新增五个针对根因的用例,修复前全部失败,其中活动奖励回放停留在 `Start battle process`,达到截图次数上限。
+3. 修复后运行 `toolkit/python.exe -m pytest tests -q`:35 passed,2 条已有的 Pydantic 弃用警告。
+4. 原始截图离线回放:先导入 EvoZone 再导入 ActivityShikigami;使用实际活动任务的战斗等待实现和 `RuleImage.match`,仅替换截图及设备操作;按 oas2 的配置关闭随机战斗操作。输入 picture2,模拟关闭弹窗后切换到 picture1。6 次截图、1 次位于排除区域之外的点击,返回 True,日志依次为 `Start battle process`、`Win battle`、`Get all reward`、`Battle done`。这验证了截图识别和控制流程,实际设备点击后的页面变化仍需游戏内复测。
+5. `git diff --check` 通过。
+
+## 相关历史与运行环境
+
+策略框架由 `745ce5eb` 引入;`5a3eaddc` 增加选项支持。后续已有多次活动奖励模板与弹窗处理修正,本次根因是策略选择受任务加载顺序影响。
+
+测试使用仓库自带的 Python 3.10。为运行测试安装 pytest 7.4.4;安装过程中发现新版本 pytest 会升级 packaging 并与 uiautomator2 冲突,已将 packaging 恢复到项目要求的 20.9。项目依赖文件未修改。

+ 37 - 72
tasks/Component/GeneralBattle/battle_wait.py

@@ -4,6 +4,7 @@ import copy
 
 
 from functools import wraps
+from contextvars import ContextVar
 from dataclasses import dataclass
 from typing import TypeVar, ParamSpec, Callable
 from enum import Enum, auto
@@ -191,10 +192,9 @@ class BattleWaitPlan:
 
 class battle_wait_strategy:
     """
-    使用with 上下文临时修改  battle_wait_plan
-    首次装饰 func 初始化 battle_wait_plan
+    每个装饰器保存自己的 battle_wait_plan,使用 with 上下文临时覆盖。
     """
-    battle_wait_plan: BattleWaitPlan = None
+    _context = ContextVar('battle_wait_strategy_context', default=None)
     options: dict[str: dict] = {
         'success': {
             'reward_exclude_click_1': ['C_END_MESSAGE_RIGHT_TOP', 'C_END_BUFF_AREA_1', 'C_END_BUFF_AREA_2', 'C_END_SOUL_RECORD', 'C_END_SOUL_DETAILS',],
@@ -206,58 +206,36 @@ class battle_wait_strategy:
 
 
     def __init__(self, *arg, **kwargs):
-        self._temp_options = kwargs.pop('options', None)
-        if self._temp_options is not None:
-            if not isinstance(self._temp_options, dict):
-                raise TypeError(f'temp_options must be a dict, got {self._temp_options!r}')
-            for key, value in self._temp_options.items():
-                if not isinstance(key, str):
-                    raise
-                if not isinstance(value, dict):
-                    raise TypeError(f'temp_options must be a dict, got {self._temp_options!r}')
-            battle_wait_strategy.options.update(self._temp_options)
-
-        self._temp_battle_wait_plan = None
-        if battle_wait_strategy.battle_wait_plan is None:
-            # 首次装饰 func 初始化 battle_wait_plan
-            battle_wait_strategy.battle_wait_plan = BattleWaitPlan(*arg, **kwargs)  # pylint: disable=unused-argument
-        elif self._temp_battle_wait_plan is None:
-            # 使用 with 上下文临时修改 battle_wait_plan
-            self._temp_battle_wait_plan = BattleWaitPlan(*arg, **kwargs)
+        options = kwargs.pop('options', None)
+        self.options = copy.deepcopy(type(self).options or {})
+        if options is not None:
+            self._validate_options(options)
+            self.options.update(copy.deepcopy(options))
+        self.battle_wait_plan = BattleWaitPlan(*arg, **kwargs)
+        self._temp_options = None
+        self._context_tokens = []
 
     def __enter__(self):
-        self._previous_plan = battle_wait_strategy.battle_wait_plan
-
-        if self._temp_battle_wait_plan is not None:
-            battle_wait_strategy.battle_wait_plan = self._temp_battle_wait_plan
+        options = copy.deepcopy(self.options)
+        options.update(copy.deepcopy(self._temp_options or {}))
+        token = self._context.set((self.battle_wait_plan, options))
+        self._context_tokens.append(token)
         return self
 
     def __exit__(self, *exc):
-        battle_wait_strategy.battle_wait_plan = self._previous_plan
+        self._context.reset(self._context_tokens.pop())
         self._temp_options = None
         return False
 
     def __str__(self):
-        temp_plan = getattr(self, '_temp_battle_wait_plan', None)
-        default_plan = getattr(self, 'battle_wait_plan', None)
-        options = dict(battle_wait_strategy.options or {})
+        options = dict(self.options)
         options.update(self._temp_options or {})
-
-        if temp_plan is not None:
-            plan = temp_plan
-            scope = 'temporary'
-        else:
-            plan = default_plan
-            scope = 'decorator'
-
-        if plan is None:
-            return f'{type(self).__name__}(options={options}, plan=None)'
-
+        scope = 'temporary' if self._context_tokens else 'decorator'
         return (
             f'{type(self).__name__}('
             f'scope={scope}, '
             f'options={options}, '
-            f'plan=\n{plan}'
+            f'plan=\n{self.battle_wait_plan}'
             f')'
         )
     def __repr__(self):
@@ -270,46 +248,33 @@ class battle_wait_strategy:
     def __call__(self, func: Callable[P, T]) -> Callable[P, T]:
         @wraps(func)
         def inner(owner, *args: P.args, **kwargs: P.kwargs) -> T:
+            current_plan = self.battle_wait_plan
+            options = copy.deepcopy(self.options)
+            context = self._context.get()
+            if context is not None:
+                current_plan, context_options = context
+                options.update(copy.deepcopy(context_options))
             # 兼容性处理
-            #-----------------------------------------------------------------------
-            if kwargs:
-                override_kwargs = {}
-                override_args = list()
-                for key, value in kwargs.items():
-                    if key == 'random_click_swipt_enable' and value:
-                        override_kwargs['randomclick'] = 'default'
-                        override_args.append('randomclick_default')
-                current_plan = copy.deepcopy(battle_wait_strategy.battle_wait_plan)
-                current_plan = current_plan.override(*override_args)
-            else:
-                current_plan = battle_wait_strategy.battle_wait_plan
-            # -----------------------------------------------------------------------
-            # kwargs.setdefault(
-            #     'battle_wait_plan',
-            #     self.battle_wait_plan,
-            # )
-            options = dict(battle_wait_strategy.options or {})
-            options.update(self._temp_options or {})
+            if kwargs.get('random_click_swipt_enable'):
+                current_plan = copy.deepcopy(current_plan)
+                current_plan.override('randomclick_default')
             return func(owner, battle_wait_plan=current_plan, options=options) \
                 if options else func(owner, battle_wait_plan=current_plan)
 
         return inner
 
     def with_options(self, options: dict) -> "battle_wait_strategy":
+        self._validate_options(options)
+        self._temp_options = copy.deepcopy(options)
+        return self
+
+    @staticmethod
+    def _validate_options(options: dict) -> None:
         if not isinstance(options, dict):
-            raise
+            raise TypeError(f'options must be a dict, got {options!r}')
         for event, v in options.items():
-            if not isinstance(event, str):
-                raise TypeError()
-            if not isinstance(v, dict):
-                raise TypeError()
-        # 先装饰器, 后临时变量
-        if battle_wait_strategy.options is None:
-            battle_wait_strategy.options = options
-            self._temp_options = None
-        else:
-            self._temp_options = options
-        return self
+            if not isinstance(event, str) or not isinstance(v, dict):
+                raise TypeError('options must map event names to dicts')
 
 
 class BattleWait(BaseTask, GeneralBattleAssets):

+ 115 - 5
tests/tasks/Component/GeneralBattle/test_battle_wait.py

@@ -10,8 +10,10 @@ from tasks.Component.GeneralBattle.battle_wait import (
 
 @pytest.fixture(autouse=True)
 def reset_battle_wait_plan(monkeypatch):
-    monkeypatch.setattr(battle_wait_strategy, 'battle_wait_plan', None)
     monkeypatch.setattr(battle_wait_strategy, 'options', None)
+    token = battle_wait_strategy._context.set(None)
+    yield
+    battle_wait_strategy._context.reset(token)
 
 
 def test_default_plan_contains_default_hooks_and_sequence():
@@ -50,13 +52,13 @@ def test_with_context_uses_a_temporary_plan_and_restores_the_default_plan():
     def battle_wait(owner, *, battle_wait_plan):
         return battle_wait_plan
 
-    default_plan = battle_wait_strategy.battle_wait_plan
+    default_plan = strategy.battle_wait_plan
 
     with battle_wait_strategy('success_default', failure='custom'):
         temporary_plan = battle_wait(object())
         assert temporary_plan.failure == 'custom'
 
-    assert battle_wait_strategy.battle_wait_plan is default_plan
+    assert battle_wait_strategy._context.get() is None
     assert battle_wait(object()) is default_plan
 
 
@@ -71,6 +73,71 @@ def test_event_and_strategy_can_be_configured_with_both_supported_forms():
     ]
 
 
+@pytest.mark.parametrize('strategies', [('default', 'activity'), ('activity', 'default')])
+@pytest.mark.parametrize('random_click', [False, True])
+def test_task_strategies_are_independent_of_decoration_order(strategies, random_click):
+    def wait(owner, *, battle_wait_plan):
+        return battle_wait_plan
+
+    tasks = {
+        name: battle_wait_strategy(success=name)(wait)
+        for name in strategies
+    }
+
+    for name, wait in tasks.items():
+        plan = wait(object(), random_click_swipt_enable=random_click)
+        assert plan.success == name
+        assert hasattr(plan, 'randomclick') is random_click
+
+    # A later call must still use the task's own strategy.
+    for name, wait in tasks.items():
+        assert wait(object()).success == name
+
+
+def test_activity_reward_is_collected_after_another_task_is_decorated(monkeypatch):
+    from types import SimpleNamespace
+
+    @battle_wait_strategy()
+    def ordinary_wait(owner, *, battle_wait_plan):
+        return battle_wait_plan
+
+    class ActivityBattle(BattleWait):
+        def __init__(self):
+            self.reward_visible = True
+            self.frames = 0
+            self.clicks = []
+            self.device = SimpleNamespace(
+                stuck_record_add=lambda name: None,
+                click_record_clear=lambda: None,
+            )
+
+        def screenshot(self):
+            self.frames += 1
+            assert self.frames < 10, 'Activity reward was not collected'
+
+        def appear(self, asset, **kwargs):
+            return asset is self.I_UI_REWARD and self.reward_visible
+
+        def appear_then_click(self, asset, **kwargs):
+            return False
+
+        def click(self, asset, **kwargs):
+            self.clicks.append(asset.name)
+            self.reward_visible = False
+
+        @battle_wait_strategy(success='activity')
+        def battle_wait(self, *args, **kwargs):
+            return self.battle_wait_with_strategy(*args, **kwargs)
+
+    # Keep the replay on the normal dismissal path, without random item inspection.
+    monkeypatch.setattr('tasks.Component.GeneralBattle.battle_wait.random.random', lambda: 1)
+    task = ActivityBattle()
+
+    assert task.battle_wait(random_click_swipt_enable=False) is True
+    assert task.clicks == ['exclude_click_activity']
+    assert ordinary_wait(object()).success == 'default'
+
+
 def test_an_event_cannot_be_configured_with_two_strategies():
     with pytest.raises(ValueError, match="configured more than once"):
         BattleWaitPlan('success_default', success='custom')
@@ -90,6 +157,7 @@ def test_setup_runs_before_the_wait_loop():
 
         def _bw_completion_finish(self, bw_ctx):
             self.events.append('completion')
+            bw_ctx.success = True
             return HookSignal.DONE
 
     battle_wait = OrderedBattleWait()
@@ -117,6 +185,7 @@ def test_custom_hook_is_resolved_and_executed_in_the_configured_sequence():
 
         def _bw_completion_finish(self, bw_ctx):
             self.events.append('completion')
+            bw_ctx.success = True
             return HookSignal.DONE
 
     battle_wait = CustomBattleWait()
@@ -160,14 +229,14 @@ def test_dynamic_override_does_not_modify_the_default_plan():
     def battle_wait(owner, *, battle_wait_plan):
         return battle_wait_plan
 
-    default_plan = battle_wait_strategy.battle_wait_plan
+    default_plan = strategy.battle_wait_plan
 
     overridden_plan = battle_wait(object(), random_click_swipt_enable=True)
 
     assert overridden_plan is not default_plan
     assert overridden_plan.randomclick == 'default'
     assert not hasattr(default_plan, 'randomclick')
-    assert battle_wait_strategy.battle_wait_plan is default_plan
+    assert strategy.battle_wait_plan is default_plan
 
 
 def test_dynamic_override_is_only_valid_for_the_current_call():
@@ -207,6 +276,7 @@ def test_decorator_options_and_with_options_are_scoped_to_the_current_call():
 
         def _bw_completion_record(self, bw_ctx):
             received_options.append(bw_ctx.options)
+            bw_ctx.success = True
             return HookSignal.DONE
 
         @strategy
@@ -231,3 +301,43 @@ def test_decorator_options_and_with_options_are_scoped_to_the_current_call():
     assert battle_wait.battle_wait() is True
     assert received_options[-1] == decorator_options
     assert 'C_REWARD_1' in str(strategy)
+
+
+def test_nested_context_restores_each_task_strategy_even_after_an_exception():
+    def wait(owner, *, battle_wait_plan, options=None):
+        return battle_wait_plan.success, options
+
+    ordinary_wait = battle_wait_strategy()(wait)
+    activity_wait = battle_wait_strategy(success='activity')(wait)
+    outer = battle_wait_strategy(success='outer', options={'success': {'source': 'outer'}})
+    inner = battle_wait_strategy(success='inner', options={'success': {'source': 'inner'}})
+
+    # Merely constructing temporary strategies must not change existing tasks.
+    assert ordinary_wait(object()) == ('default', None)
+    assert activity_wait(object()) == ('activity', None)
+    with outer:
+        assert activity_wait(object()) == ('outer', {'success': {'source': 'outer'}})
+        with pytest.raises(RuntimeError, match='interrupted'):
+            with inner:
+                assert ordinary_wait(object()) == ('inner', {'success': {'source': 'inner'}})
+                raise RuntimeError('interrupted')
+        assert activity_wait(object()) == ('outer', {'success': {'source': 'outer'}})
+
+    assert ordinary_wait(object()) == ('default', None)
+    assert activity_wait(object()) == ('activity', None)
+
+
+def test_decorator_options_do_not_leak_between_tasks_or_calls():
+    def wait(owner, *, battle_wait_plan, options):
+        return options
+
+    ordinary_options = {'success': {'excludes': ['C_REWARD_1']}}
+    activity_options = {'success': {'excludes': ['C_END_ACTIVITY_REWARD']}}
+    ordinary_wait = battle_wait_strategy(options=ordinary_options)(wait)
+    activity_wait = battle_wait_strategy(success='activity', options=activity_options)(wait)
+
+    assert ordinary_wait(object()) == ordinary_options
+    assert activity_wait(object()) == activity_options
+    ordinary_wait(object())['success']['excludes'].clear()
+    assert ordinary_wait(object()) == ordinary_options
+    assert activity_wait(object()) == activity_options