普通镜牢转交 AALC,核对镜牢实际完成局数,合成与任务互斥
转交与互斥(原未提交改动,合入选队分支后提交): - MCP 初始化说明和工具描述引导常规日常/领奖/普通镜牢走 task_status -> run_task -> 轮询;jev_mirror_agent 默认转交 AALC, 明确的速通配置、决策模型或未完成速通局仍走逐步模式。 - 新增 ~/lc_mcp/game.lock:run_task 子进程与模块合成脚本互斥, 合成脚本另查 task_status,状态不明时不接管游戏。 - all 任务的 HDR 提示无 GUI 时直接确认并记录;预检按窗口位置 决定是否计标题栏,set_windows=false 跳过;levelup card/weakest 同步失败返回非零。急停提示改为 End 键。 镜牢结果(对接文档指出的缺口): - 预检拒绝空队列和没有适用当前难度队伍的配置:AALC 会一局不打 就以 0 退出。可用判定与 Mirror_task 的固定用途规则一致。 - 监听 mirror_signal 统计实际完成局数;少于应打局数记 [ERROR] 并以退出码 4 结束,task_status 为 failed。 - mirror 指定 count 时临时关闭 infinite_dungeons(否则次数变成 9999),原值写入恢复文件,结束或强杀后写回。 验证:Linux / Python 3.12 全套 507 项通过;git diff --check 通过。 用上游真实 Mirror_task 回放了无可用队伍和正常完成两种情况; Windows 实机仍需回归。 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+21
-7
@@ -18,7 +18,7 @@ sys.path.insert(0, REPO)
|
|||||||
from lc_mcp import server as srv_mod # noqa: E402
|
from lc_mcp import server as srv_mod # noqa: E402
|
||||||
from lc_mcp.engine import find_hits # noqa: E402
|
from lc_mcp.engine import find_hits # noqa: E402
|
||||||
from lc_mcp.fake_engine import FakeEngine # noqa: E402
|
from lc_mcp.fake_engine import FakeEngine # noqa: E402
|
||||||
from lc_mcp.protocol import Server, TOOLS # noqa: E402
|
from lc_mcp.protocol import AUTOMATION_INSTRUCTIONS, Server, TOOLS # noqa: E402
|
||||||
from lc_mcp.tasks import TaskRunner # noqa: E402
|
from lc_mcp.tasks import TaskRunner # noqa: E402
|
||||||
|
|
||||||
START = {'text': '开始', 'x': 100, 'y': 200, 'w': 40, 'h': 20}
|
START = {'text': '开始', 'x': 100, 'y': 200, 'w': 40, 'h': 20}
|
||||||
@@ -67,6 +67,7 @@ class ProtocolTest(unittest.TestCase):
|
|||||||
def test_initialize_and_list(self):
|
def test_initialize_and_list(self):
|
||||||
r = self.s.handle({'jsonrpc': '2.0', 'id': 7, 'method': 'initialize', 'params': {}})
|
r = self.s.handle({'jsonrpc': '2.0', 'id': 7, 'method': 'initialize', 'params': {}})
|
||||||
self.assertEqual(r['id'], 7)
|
self.assertEqual(r['id'], 7)
|
||||||
|
self.assertEqual(r['result']['instructions'], AUTOMATION_INSTRUCTIONS)
|
||||||
names = [t['name'] for t in self.s.handle({'jsonrpc': '2.0', 'id': 8, 'method': 'tools/list'})['result']['tools']]
|
names = [t['name'] for t in self.s.handle({'jsonrpc': '2.0', 'id': 8, 'method': 'tools/list'})['result']['tools']]
|
||||||
self.assertEqual(names, [t['name'] for t in TOOLS])
|
self.assertEqual(names, [t['name'] for t in TOOLS])
|
||||||
self.assertIsNone(self.s.handle({'jsonrpc': '2.0', 'method': 'notifications/initialized'}))
|
self.assertIsNone(self.s.handle({'jsonrpc': '2.0', 'method': 'notifications/initialized'}))
|
||||||
@@ -213,7 +214,7 @@ class AalcTaskArgsTest(unittest.TestCase):
|
|||||||
|
|
||||||
class Cfg:
|
class Cfg:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.values, self.saved, self.flushes = {'set_mirror_count': 1}, {}, 0
|
self.values, self.saved, self.flushes = {'set_mirror_count': 1, 'infinite_dungeons': True}, {}, 0
|
||||||
|
|
||||||
def get_value(self, key):
|
def get_value(self, key):
|
||||||
return self.values[key]
|
return self.values[key]
|
||||||
@@ -228,20 +229,33 @@ class AalcTaskArgsTest(unittest.TestCase):
|
|||||||
self.flushes += 1
|
self.flushes += 1
|
||||||
|
|
||||||
cfg = Cfg()
|
cfg = Cfg()
|
||||||
with tempfile.TemporaryDirectory() as d:
|
before = {'set_mirror_count': 1, 'infinite_dungeons': True}
|
||||||
|
lines = []
|
||||||
|
with tempfile.TemporaryDirectory() as d, mock.patch.object(aalc_task, 'log', lines.append):
|
||||||
path = os.path.join(d, 'x.restore.json')
|
path = os.path.join(d, 'x.restore.json')
|
||||||
originals = aalc_task.apply_overrides(cfg, 'mirror', {'count': 5}, path)
|
originals = aalc_task.apply_overrides(cfg, 'mirror', {'count': 5}, path)
|
||||||
self.assertEqual(cfg.values['set_mirror_count'], 5)
|
# 指定次数时无限刷牢必须关掉, 否则 AALC 把次数改成 9999
|
||||||
|
self.assertEqual(cfg.values, {'set_mirror_count': 5, 'infinite_dungeons': False})
|
||||||
|
self.assertIn('无限刷牢', '\n'.join(lines))
|
||||||
with open(path, encoding='utf-8') as f:
|
with open(path, encoding='utf-8') as f:
|
||||||
self.assertEqual(json.load(f), {'set_mirror_count': 1})
|
self.assertEqual(json.load(f), before)
|
||||||
self.assertEqual(originals, {'set_mirror_count': 1})
|
self.assertEqual(originals, before)
|
||||||
# 任务进程被强杀后, TaskRunner 用 --restore 读文件写回
|
# 任务进程被强杀后, TaskRunner 用 --restore 读文件写回
|
||||||
aalc_task.restore_file(path, cfg)
|
aalc_task.restore_file(path, cfg)
|
||||||
self.assertEqual((cfg.saved, cfg.flushes), ({'set_mirror_count': 1}, 1))
|
self.assertEqual((cfg.saved, cfg.flushes), (before, 1))
|
||||||
self.assertFalse(os.path.exists(path))
|
self.assertFalse(os.path.exists(path))
|
||||||
self.assertEqual(aalc_task.apply_overrides(cfg, 'reward', {}, path), {})
|
self.assertEqual(aalc_task.apply_overrides(cfg, 'reward', {}, path), {})
|
||||||
self.assertFalse(os.path.exists(path)) # 没有覆盖就不留恢复文件
|
self.assertFalse(os.path.exists(path)) # 没有覆盖就不留恢复文件
|
||||||
|
|
||||||
|
def test_mirror_without_count_keeps_configured_infinite_mode(self):
|
||||||
|
from lc_mcp import aalc_task
|
||||||
|
cfg = mock.Mock()
|
||||||
|
cfg.get_value.side_effect = {'set_EXP_count': 3}.get
|
||||||
|
self.assertEqual(aalc_task.apply_overrides(cfg, 'mirror', {}), {})
|
||||||
|
cfg.unsaved_set_value.assert_not_called()
|
||||||
|
self.assertEqual(aalc_task.apply_overrides(cfg, 'daily', {'exp': 1}), {'set_EXP_count': 3})
|
||||||
|
cfg.unsaved_set_value.assert_called_once_with('set_EXP_count', 1)
|
||||||
|
|
||||||
|
|
||||||
class TaskRestoreTest(unittest.TestCase):
|
class TaskRestoreTest(unittest.TestCase):
|
||||||
"""run_task 的临时次数会随 AALC 中途存盘写进 config.yaml; 强杀后必须写回原值。"""
|
"""run_task 的临时次数会随 AALC 中途存盘写进 config.yaml; 强杀后必须写回原值。"""
|
||||||
|
|||||||
Reference in New Issue
Block a user