合并 codex/mcp-runtime-reliability: 运行可靠性、局状态与决策交接
与 main 上的审查修复及 2131f89 (story-test) 合并, 冲突处理:
- mcp_session: 保留超时/取消客户端, 补回 raise_on_error
- 执行器: 局状态改用 run_state (run_id 绑定), 取代完成后归档 context;
Jev 请求统一经 jev_client.request_answer (支持 baseUrl/curl, 返回置信度与概率);
保留截图解码缓存、地图模板缓存、按坐标点按钮、use_last_error 单实例互斥;
刷新计数与开战标记只在动作成功后更新
- battle_batch: 取消/预算框架 + 只在看到胜率按钮时点胜率再回车;
回合标签改为包含匹配 (OCR 常输出 'wave1')
- 文档采用 reliability 版本 (已是仓库相对路径), 注明 jev_client
- 测试: 互斥量桩改为 WinDLL/get_last_error, 战斗批次测试按胜率语义重写,
Jev 测试改为对 jev_client 打桩, 生命周期测试改为轮询; 145 项通过
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+46
-29
@@ -1,16 +1,18 @@
|
||||
"""Bounded Win Rate batches through MCP, with a fresh UI check per turn."""
|
||||
import argparse
|
||||
import json
|
||||
import math
|
||||
import os
|
||||
import time
|
||||
from mcp_session import Session
|
||||
from pathlib import Path
|
||||
from mcp_session import Session, SessionCancelled, SessionTimeout
|
||||
from game_scenes import battle_is_terminal, battle_is_visible
|
||||
|
||||
STOP_FILE = Path(os.environ.get('LC_JEV_HOME', str(Path.home() / 'lc_mcp' / 'jev'))) / 'JEV_STOP'
|
||||
|
||||
|
||||
def is_terminal(state):
|
||||
texts = [item['text'].replace(' ', '') for item in state.get('items', [])]
|
||||
return any(text.upper() in ('VICTORY', 'DEFEAT') or
|
||||
any(marker in text for marker in ('正在探索', '获得E.G.O饰品', '选择主题卡包',
|
||||
'开始战斗', '选择一位罪人', '选项事件'))
|
||||
for text in texts)
|
||||
return battle_is_terminal(state)
|
||||
|
||||
|
||||
def main():
|
||||
@@ -18,32 +20,47 @@ def main():
|
||||
parser.add_argument('--seconds', type=float, default=40)
|
||||
parser.add_argument('--battle-confirmed', action='store_true')
|
||||
args = parser.parse_args()
|
||||
if not math.isfinite(args.seconds) or args.seconds <= 0:
|
||||
parser.error('--seconds must be finite and positive')
|
||||
deadline = time.monotonic() + min(50, max(1, args.seconds))
|
||||
pairs = 0
|
||||
with Session(raise_on_error=False) as client:
|
||||
state = client.call('get_state')
|
||||
texts = ' '.join(item['text'] for item in state.get('items', []))
|
||||
active = args.battle_confirmed or any(marker in texts.upper() for marker in ('WAVE', 'TURN', 'DURANTE', '胜率', '伤害'))
|
||||
while time.monotonic() < deadline:
|
||||
# 战斗特写会隐藏 HUD;只有明确的结算/地图/选项信号才退出。
|
||||
if not active or is_terminal(state):
|
||||
break
|
||||
# P cycles between Win Rate and Damage in current game versions.
|
||||
# Only start a turn when its explicit Win Rate control is visible.
|
||||
labels = [item['text'].replace(' ', '').lower()
|
||||
for item in state.get('items', [])]
|
||||
target = next((item['text'] for item in state.get('items', [])
|
||||
if item['text'].replace(' ', '').lower()
|
||||
in ('win', 'winrate', '胜率')), None)
|
||||
if target and any(label in ('turn', 'wave', '回合', '波次') for label in labels):
|
||||
selected = client.call('click_text', {'text': target})
|
||||
if selected.get('ok'):
|
||||
time.sleep(.5)
|
||||
client.call('keypress', {'key': 'enter'})
|
||||
pairs += 1
|
||||
time.sleep(2.5)
|
||||
state = {}
|
||||
def cancelled():
|
||||
return STOP_FILE.exists() or time.monotonic() >= deadline
|
||||
try:
|
||||
if cancelled():
|
||||
raise SessionCancelled('Battle batch stopped before connecting')
|
||||
with Session(cancelled=cancelled, raise_on_error=False) as client:
|
||||
state = client.call('get_state')
|
||||
print(json.dumps({'pairs': pairs, 'state': state}, ensure_ascii=False))
|
||||
active = args.battle_confirmed or battle_is_visible(state)
|
||||
while not cancelled():
|
||||
# Cinematics hide the HUD; explicit scene boundaries end combat.
|
||||
if not state.get('ok') or not active or is_terminal(state):
|
||||
break
|
||||
# P cycles between Win Rate and Damage in current game versions.
|
||||
# Only start a turn when its explicit Win Rate control is visible.
|
||||
items = state.get('items', [])
|
||||
labels = [item['text'].replace(' ', '').lower() for item in items]
|
||||
target = next((item['text'] for item, label in zip(items, labels)
|
||||
if label in ('win', 'winrate', '胜率')), None)
|
||||
# OCR 常把回合数连在一起(如 'WAVE 1' -> 'wave1'), 用包含匹配
|
||||
if target and any(m in label for label in labels for m in ('turn', 'wave', '回合', '波次')):
|
||||
selected = client.call('click_text', {'text': target})
|
||||
if selected.get('ok'):
|
||||
time.sleep(.5)
|
||||
if cancelled():
|
||||
raise SessionCancelled('Battle batch stopped between Win Rate and Enter')
|
||||
client.call('keypress', {'key': 'enter'})
|
||||
pairs += 1
|
||||
time.sleep(min(2.5, max(0, deadline - time.monotonic())))
|
||||
if cancelled():
|
||||
break
|
||||
state = client.call('get_state')
|
||||
result = {'pairs': pairs, 'state': state, 'stopped': cancelled()}
|
||||
except (SessionCancelled, SessionTimeout) as error:
|
||||
result = {'pairs': pairs, 'state': state, 'stopped': True,
|
||||
'error': str(error), 'outcome_unknown': error.outcome_unknown}
|
||||
print(json.dumps(result, ensure_ascii=False))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
Reference in New Issue
Block a user