chore: merge ShiinaKuroko baseline into alpha

.claude/skills

@@ -1 +1 @@
-../.agents/skills
+../.agents/skills

.gitignore

@@ -135,6 +135,22 @@ Cargo.lock
 # Agent temporary files
 .tmp/
 
+# Agent debug toolkit keeps empty output directories but ignores generated files.
+!tools/debug_toolkit/
+!tools/debug_toolkit/result/
+!tools/debug_toolkit/result/logs/
+!tools/debug_toolkit/result/logs/.gitkeep
+!tools/debug_toolkit/result/screenshot/
+!tools/debug_toolkit/result/screenshot/.gitkeep
+!tools/debug_toolkit/result/ocr/
+!tools/debug_toolkit/result/ocr/.gitkeep
+tools/debug_toolkit/result/logs/*
+!tools/debug_toolkit/result/logs/.gitkeep
+tools/debug_toolkit/result/screenshot/*
+!tools/debug_toolkit/result/screenshot/.gitkeep
+tools/debug_toolkit/result/ocr/*
+!tools/debug_toolkit/result/ocr/.gitkeep
+
 # MCP / Jupyter 测试产物
 test_*.ipynb
 *_test.ipynb

CLAUDE.md

@@ -1 +1 @@
-AGENTS.md
+AGENTS.md

autowsgr/combat/__init__.py

@@ -11,9 +11,9 @@
     fleet_slot_from_api,
     resolve_fleet_selection,
 )
-from .history import CombatEvent, CombatHistory, CombatResult, FightResult
+from .history import CombatEvent, CombatHistory, CombatResult, FightResult, grade_condition_met
 from .node_tracker import MapNodeData, NodeTracker
-from .plan import CombatMode, CombatPlan, NodeDecision
+from .plan import CombatMode, CombatPlan, GradeCondition, NodeDecision
 from .recognition import (
     SHIP_DROP_PAGE_SIGNATURE,
     ShipDropResult,
@@ -38,6 +38,7 @@
     'FleetPreset',
     'FleetSelectionSource',
     'FleetSlotRule',
+    'GradeCondition',
     'MapNodeData',
     'NodeDecision',
     'NodeTracker',
@@ -47,6 +48,7 @@
     'ShipDropResult',
     'ShipSelector',
     'fleet_slot_from_api',
+    'grade_condition_met',
     'recognize_enemy_formation',
     'recognize_ship_drop',
     'resolve_fleet_selection',

autowsgr/combat/actions.py

@@ -89,11 +89,6 @@ class Coords:
 # ═══════════════════════════════════════════════════════════════════════════════
 
 
-def click_start_march(device: AndroidController) -> None:
-    """点击出征按钮。"""
-    device.click(*Coords.START_MARCH)
-
-
 def click_retreat(device: AndroidController) -> None:
     """点击撤退按钮（索敌成功界面）。"""
     device.click(*Coords.RETREAT)
@@ -319,11 +314,17 @@ def get_ship_drop(device: AndroidController, ocr: OCREngine) -> str | None:
         掉落的舰船名称，或 ``None`` 如果未获取到。
     """
 
-    screen = device.screenshot()
-    result = recognize_ship_drop(screen, ocr)
-    if result.ship_name:
-        _log.info('[Combat] 掉落识别: {} ({})', result.ship_name, result.ship_type or '未知')
-    return result.ship_name
+    # 页面动画可能让首帧尚未完成; 保留有限重试后再交给调用方点击离开。
+    for attempt in range(5):
+        if attempt:
+            time.sleep(0.5)
+        screen = device.screenshot()
+        result = recognize_ship_drop(screen, ocr)
+        if result.ship_name:
+            _log.info('[Combat] 掉落识别: {} ({})', result.ship_name, result.ship_type or '未知')
+            return result.ship_name
+        _log.debug('[Combat] 掉落 OCR 第 {}/5 次未识别', attempt + 1)
+    return None
 
 
 # ═══════════════════════════════════════════════════════════════════════════════

autowsgr/combat/fleet.py

@@ -25,9 +25,6 @@
     from autowsgr.combat.plan import CombatPlan
 
 
-NATIVE_FLEET_VESSEL_TYPES = tuple(vessel_type.native for vessel_type in FLEET_VESSEL_TYPES)
-"""由公共 native 契约提供的普通舰种。"""
-
 _NATIVE_CODE_TO_SHIP_TYPE: Mapping[str, ShipType] = MappingProxyType(
     {
         'cv': ShipType.CV,