diff --git a/README.md b/README.md index 3a817d9..915a96b 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,10 @@ codex mcp add limbus --env PYTHONUTF8=1 -- D:\lc-mcp\vendor\aalc\.venv\Scripts\p 所以任务启动时先把原值写到 `~/lc_mcp/runs/*.restore.json`;`stop_task` 强停或任务进程异常退出后, 服务会据此写回。写回失败时 `task_status` 显示 `pending_restore`,并在写回成功前拒绝启动新任务。 +`state` 只反映任务子进程的退出码。AALC 在单次战斗失败(例如日志里的 +`超出最大尝试次数,未能进入战斗`)后仍会继续跑完并正常退出,所以 `task_status` +会把日志尾部的 `[ERROR]`/异常行放进 `errors` 字段:**看到 `succeeded` 也要先看 `errors`。** + ## 环境变量 | 变量 | 默认 | 说明 | diff --git a/lc_mcp/tasks.py b/lc_mcp/tasks.py index 61cb119..5c7fa56 100644 --- a/lc_mcp/tasks.py +++ b/lc_mcp/tasks.py @@ -35,6 +35,22 @@ def tail(path, n): return [] +ERROR_MARKERS = ('[ERROR]', 'Traceback (most recent call last)') +ERROR_SCAN_LINES = 400 + + +def log_errors(path, limit=3): + """挑出日志尾部的报错行。 + + AALC 的每日流程在单次战斗失败后会继续跑完并正常退出(exit 0), 只看退出码 + 会把"超出最大尝试次数,未能进入战斗"这类失败当成成功, 所以状态里额外附上 + 日志里的报错行。 + """ + hits = [line for line in tail(path, ERROR_SCAN_LINES) + if any(marker in line for marker in ERROR_MARKERS)] + return hits[-limit:] + + class TaskRunner: def __init__(self, run_dir, argv_factory=default_argv, keep_logs=20, restore_argv=default_restore_argv): @@ -112,6 +128,9 @@ class TaskRunner: '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 + errors = log_errors(self.info['log']) + if errors: + r['errors'] = errors pending = self._pending_restores() if pending: r['pending_restore'] = [os.path.basename(p) for p in pending] diff --git a/tests/test_lc_mcp.py b/tests/test_lc_mcp.py index 4461e2a..3eed4b4 100644 --- a/tests/test_lc_mcp.py +++ b/tests/test_lc_mcp.py @@ -635,5 +635,37 @@ class TransportTest(unittest.TestCase): self.assertEqual((state['ok'], state['items']), (True, [])) +class TaskErrorSurfaceTest(unittest.TestCase): + """AALC 每日流程单次战斗失败后仍 exit 0; 状态里必须带出日志报错。""" + + CHILD = ('import sys; ' + 'sys.stdout.write("[ERROR] [AALC] tasks\\\\battle\\\\battle.py:83: ' + '超出最大尝试次数,未能进入战斗\\n"); ' + 'sys.stdout.write("[lc_mcp] task daily done\\n"); ' + 'sys.stdout.flush()') + + def test_exit_zero_with_battle_error_is_reported(self): + with tempfile.TemporaryDirectory() as d: + runner = TaskRunner(d, argv_factory=lambda t, p: [sys.executable, '-c', self.CHILD]) + self.assertTrue(runner.start('daily', {'exp': 1})['ok']) + deadline = time.time() + 15 + while time.time() < deadline and runner.running(): + time.sleep(0.05) + status = runner.status() + self.assertEqual((status['state'], status['exit_code']), ('succeeded', 0), status) + self.assertIn('未能进入战斗', status['errors'][-1]) + + def test_clean_log_has_no_errors_field(self): + with tempfile.TemporaryDirectory() as d: + runner = TaskRunner(d, argv_factory=lambda t, p: [sys.executable, '-c', 'print("[lc_mcp] ok")']) + self.assertTrue(runner.start('daily', {})['ok']) + deadline = time.time() + 15 + while time.time() < deadline and runner.running(): + time.sleep(0.05) + status = runner.status() + self.assertEqual(status['state'], 'succeeded') + self.assertNotIn('errors', status) + + if __name__ == '__main__': unittest.main()