审查修复: 任务配置恢复、执行器容错与续局状态、识别性能

Browse Source
正确性
- stop_task 强杀后 run_task 的临时次数会残留在 config.yaml (AALC 中途整份存盘);
  任务启动时先落盘原值, 强停/异常退出后由 TaskRunner 用 --restore 写回,
  写回失败时拒绝启动新任务并在 task_status 显示 pending_restore
- Jev 执行器: 工具失败不再抛异常导致整局退出 (Session raise_on_error=False),
  原有的"截图暂不可用"等降级分支终于生效; 刷新计数/开战标记只在动作成功后更新
- 一局完成后归档 jev_shop_context.json, 否则 claim_requested 让下一局一启动就判定完成
- 通用按钮直接点已核对的坐标, 不再 click_text 重新搜索 (可能点到背景同名按钮)
- 认证行按字节比较, 非 ASCII 输入不再让 compare_digest 抛 TypeError
- 单实例互斥改用 use_last_error 读取 ERROR_ALREADY_EXISTS

性能
- find_image 只在窗口尺寸变化时清模板缓存 (原来每次两次全量 gc); 模板列表只扫描一次
- 截图 PNG 压缩级别 1: 1080p 存图 0.66s -> 0.19s
- 执行器每帧截图只解码一次 (button_enabled 75ms -> 0.3ms); 地图模板与 ORB 描述子按比例缓存
- 箭头模板用 imdecode 读取, 支持中文路径 (输出与 imread 逐像素一致)

测试 73 -> 84, 修改前的识别输出与修改后逐项比对一致。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
yws
2026-10-03 00:31:21 +00:00
co-authored by Claude Opus 5.5
parent 5ab5fd9508
commit 030527f5de
9 changed files with 444 additions and 105 deletions
+89 -1
View File
@@ -1,3 +1,5 @@
import json
import os
import tempfile import tempfile
import sys import sys
import unittest import unittest
@@ -435,7 +437,38 @@ class SceneRegressionTest(unittest.TestCase):
def test_disabled_selection_is_not_clickable_candidate(self): def test_disabled_selection_is_not_clickable_candidate(self):
state = {'items': [{'text': '选择', 'x': 100, 'y': 10, 'w': 80, 'h': 40}]} state = {'items': [{'text': '选择', 'x': 100, 'y': 10, 'w': 80, 'h': 40}]}
self.assertFalse(any(o['action']['tool'] == 'click_text' for o in agent.candidates(state).values())) self.assertFalse(any(k.startswith('button_') for k in agent.candidates(state)))
@mock.patch.object(agent, 'button_enabled', return_value=True)
def test_generic_button_clicks_the_checked_item(self, _enabled):
# 重新按文字搜索会多一次截图+OCR, 且可能点到背景里同名的另一个按钮
state = {'items': [{'text': '继续', 'x': 100, 'y': 200, 'w': 80, 'h': 40}]}
self.assertEqual(agent.candidates(state)['button_0']['action'],
{'tool': 'click', 'args': {'x': 140, 'y': 220}})
def test_screenshot_decoded_once_for_repeated_checks(self):
from PIL import Image
with tempfile.TemporaryDirectory() as folder:
shot = Path(folder) / 'shot.png'
Image.new('L', (200, 100), 200).save(shot)
state = {'screen': {'path': str(shot)}}
item = {'x': 10, 'y': 10, 'w': 50, 'h': 20}
with mock.patch.object(Image, 'open', wraps=Image.open) as opened:
self.assertTrue(agent.button_enabled(state, item))
self.assertTrue(agent.button_enabled(state, dict(item, x=100)))
self.assertEqual(opened.call_count, 1)
Image.new('L', (200, 101), 0).save(shot) # 同路径的新内容不能命中旧缓存
self.assertFalse(agent.button_enabled(state, item))
def test_map_templates_are_loaded_once(self):
screenshot = Path(__file__).resolve().parent / 'fixtures' / 'floor4_white_events.png'
if not (agent.REPO_ROOT / 'vendor' / 'aalc' / 'assets').is_dir():
self.skipTest('AALC submodule assets unavailable')
state = {'screen': {'path': str(screenshot)}}
first = agent.map_candidates(state)
loads = agent._map_template.cache_info().misses
self.assertEqual(agent.map_candidates(state), first)
self.assertEqual(agent._map_template.cache_info().misses, loads)
def test_battle_cinematic_keeps_macro_available(self): def test_battle_cinematic_keeps_macro_available(self):
state = {'items': [{'text': '破裂+5', 'x': 100, 'y': 10, 'w': 80, 'h': 40}]} state = {'items': [{'text': '破裂+5', 'x': 100, 'y': 10, 'w': 80, 'h': 40}]}
@@ -464,5 +497,60 @@ class SceneRegressionTest(unittest.TestCase):
self.assertNotIn('battle', agent.candidates(state, previous_battle=True)) self.assertNotIn('battle', agent.candidates(state, previous_battle=True))
class MainLoopTest(unittest.TestCase):
def run_main(self, home, bridge, steps=3):
config = home / 'cfg.json'
config.write_text('{}', encoding='utf-8')
with mock.patch.object(agent, 'RUNTIME_HOME', home), \
mock.patch.object(agent, 'STOP_FILE', home / 'JEV_STOP'), \
mock.patch.object(agent, 'Bridge', return_value=bridge) as make_bridge, \
mock.patch.object(agent, 'acquire_single_instance', return_value=lambda: None), \
mock.patch.object(agent.time, 'sleep'), \
mock.patch.dict(os.environ, {'OPENCODE_API_KEY': 'test-key', 'LC_FIXED_FALLBACK': '1'}), \
mock.patch.object(sys, 'argv', ['agent', str(config), '--steps', str(steps)]):
agent.main()
return make_bridge
def test_completed_run_archives_context_for_next_run(self):
with tempfile.TemporaryDirectory() as folder:
home = Path(folder)
(home / 'jev_shop_context.json').write_text(json.dumps(
{'refresh_used': 0, 'floor': 5, 'claim_requested': True, 'battery_obtained': True}))
bridge = mock.Mock()
bridge.call.return_value = {'ok': True, 'items': [
{'text': t, 'x': 0, 'y': 0, 'w': 1, 'h': 1, 'score': 1.0} for t in ('探索状态', '进入')]}
self.run_main(home, bridge)
self.assertEqual(json.loads((home / 'jev_mirror_status.json').read_text())['state'], 'completed')
# 否则下一局一启动就因 claim_requested 被判定为“已完成”
self.assertFalse((home / 'jev_shop_context.json').exists())
self.assertEqual(len(list(home.glob('jev_shop_context.*.json'))), 1)
def test_tool_errors_are_observed_instead_of_aborting(self):
with tempfile.TemporaryDirectory() as folder:
home = Path(folder)
bridge = mock.Mock()
bridge.call.return_value = {'ok': False, 'error': '截图失败'}
make_bridge = self.run_main(home, bridge, steps=2)
make_bridge.assert_called_once_with(raise_on_error=False)
status = json.loads((home / 'jev_mirror_status.json').read_text())
self.assertNotIn('error', status) # 没有因异常退出, 而是按“截图暂不可用”继续等待
self.assertEqual(status['choice'], 'wait')
class SessionTest(unittest.TestCase):
def test_tool_errors_can_be_returned_instead_of_raised(self):
import mcp_session
session = mcp_session.Session.__new__(mcp_session.Session)
session.request = mock.Mock(return_value={'isError': True, 'content': [
{'type': 'text', 'text': json.dumps({'ok': False, 'error': 'text not found'})}]})
session.raise_on_error = False
self.assertEqual(session.call('click_text', {'text': 'x'}), {'ok': False, 'error': 'text not found'})
session.raise_on_error = True
with self.assertRaises(RuntimeError):
session.call('click_text', {'text': 'x'})
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()