Files
lc-mcp/lc_mcp/tasks.py
T
ywsandClaude Opus 5.5 030527f5de 审查修复: 任务配置恢复、执行器容错与续局状态、识别性能
正确性
- 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>
2026-10-03 00:31:21 +00:00

153 lines
6.5 KiB
Python

# -*- coding: utf-8 -*-
"""长任务管理: 同一时刻最多一个 AALC 任务子进程。"""
import glob
import json
import os
import signal
import subprocess
import sys
import threading
import time
from .aalc_task import RESTORE_ENV
REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
IS_WIN = sys.platform.startswith('win')
RESTORE_SUFFIX = '.restore.json'
def default_argv(task, params):
return [sys.executable, '-m', 'lc_mcp.aalc_task', task, json.dumps(params)]
def default_restore_argv(path):
return [sys.executable, '-m', 'lc_mcp.aalc_task', '--restore', path]
def tail(path, n):
try:
with open(path, 'rb') as f:
f.seek(0, os.SEEK_END)
f.seek(max(0, f.tell() - 64 * 1024))
lines = f.read().decode('utf-8', 'replace').splitlines()
return lines[-n:]
except OSError:
return []
class TaskRunner:
def __init__(self, run_dir, argv_factory=default_argv, keep_logs=20, restore_argv=default_restore_argv):
self.run_dir = os.path.abspath(run_dir)
os.makedirs(self.run_dir, exist_ok=True)
self.argv_factory = argv_factory
self.restore_argv = restore_argv
self.keep_logs = keep_logs
self._lock = threading.Lock()
self.proc = None
self.info = None
def running(self):
return self.proc is not None and self.proc.poll() is None
def _env(self):
return dict(os.environ, PYTHONPATH=REPO + os.pathsep + os.environ.get('PYTHONPATH', ''),
PYTHONIOENCODING='utf-8', PYTHONUNBUFFERED='1')
def _pending_restores(self):
"""被强杀/崩溃的任务留下的原值文件(不含正在运行的任务自己的)。新的在前:
有多份时最后写回的是最早一份, 也就是真正的原值。"""
current = self.info.get('restore') if self.info and self.running() else None
return [p for p in sorted(glob.glob(os.path.join(self.run_dir, '*' + RESTORE_SUFFIX)), reverse=True)
if p != current]
def _restore_leftovers(self):
"""把遗留的原值写回 config.yaml。成功返回 None, 否则返回原因。"""
for path in self._pending_restores():
name = os.path.basename(path)
try:
r = subprocess.run(self.restore_argv(path), cwd=REPO, env=self._env(),
stdin=subprocess.DEVNULL, capture_output=True, timeout=120)
except (OSError, subprocess.TimeoutExpired) as e:
return 'config restore from %s failed: %s' % (name, e)
if r.returncode != 0 or os.path.exists(path):
out = (r.stdout + r.stderr).decode('utf-8', 'replace').strip().splitlines()[-3:]
return 'config restore from %s failed (exit %s): %s' % (name, r.returncode, ' | '.join(out))
return None
def start(self, task, params):
with self._lock:
if self.running():
return {'ok': False, 'error': '已有任务在跑: %s (先 stop_task)' % self.info['task']}
err = self._restore_leftovers()
if err:
# 否则新任务会把残留的覆盖值当成原值记下, 真正的原值就丢了
return {'ok': False, 'error': err + '; 写回 config.yaml 之前不启动新任务'}
stamp = time.strftime('%Y%m%d_%H%M%S')
base = os.path.join(self.run_dir, 'task_%s_%s' % (stamp, task))
env = self._env()
env[RESTORE_ENV] = base + RESTORE_SUFFIX
kw = {'creationflags': subprocess.CREATE_NEW_PROCESS_GROUP} if IS_WIN else {'start_new_session': True}
with open(base + '.log', 'wb') as logf:
self.proc = subprocess.Popen(self.argv_factory(task, params), cwd=REPO, env=env,
stdin=subprocess.DEVNULL, stdout=logf, stderr=subprocess.STDOUT, **kw)
self.info = {'task': task, 'params': params, 'log': (base + '.log').replace('\\', '/'),
'restore': env[RESTORE_ENV], 'started': time.time(), 'stopped_by_user': False}
self._prune()
return {'ok': True, 'task': task, 'pid': self.proc.pid, 'log': self.info['log']}
def status(self, lines=30):
with self._lock:
if self.info is None:
r = {'ok': True, 'state': 'idle'}
else:
code = self.proc.poll()
if code is None:
state = 'running'
else:
self.info.setdefault('ended', time.time())
state = 'stopped' if self.info['stopped_by_user'] else 'succeeded' if code == 0 else 'failed'
r = {'ok': True, 'state': state, 'task': self.info['task'], 'params': self.info['params'],
'elapsed_s': int((self.info.get('ended') or time.time()) - self.info['started']),
'log': self.info['log'], 'log_tail': tail(self.info['log'], max(1, min(int(lines), 200)))}
if code is not None:
r['exit_code'] = code
pending = self._pending_restores()
if pending:
r['pending_restore'] = [os.path.basename(p) for p in pending]
return r
def stop(self):
with self._lock:
if self.running():
self.info['stopped_by_user'] = True
pid = self.proc.pid
if IS_WIN:
subprocess.run(['taskkill', '/PID', str(pid), '/T', '/F'], capture_output=True)
else:
try:
os.killpg(pid, signal.SIGKILL)
except ProcessLookupError:
pass
try:
self.proc.wait(timeout=10)
except subprocess.TimeoutExpired:
return {'ok': False, 'error': '进程 %d 10 秒内没退出' % pid}
self.info['ended'] = time.time()
r = {'ok': True, 'state': 'stopped', 'task': self.info['task']}
else:
r = {'ok': True, 'state': 'idle', 'note': '没有在跑的任务'}
# 强杀时任务的 finally 不会执行, 由这里把临时覆盖的次数写回
err = self._restore_leftovers()
if err:
r.update(ok=False, error=err)
return r
def _prune(self):
logs = sorted(glob.glob(os.path.join(self.run_dir, 'task_*.log')), key=os.path.getmtime)
for p in logs[:-self.keep_logs]:
try:
os.remove(p)
except OSError:
pass