@whyshu/argent-engine 0.7.3 → 0.7.5

package/engine/scripts/appointment_grab.py

@@ -0,0 +1,327 @@
+#!/usr/bin/env python3
+"""FULL 抢预约 worker 的浏览器执行器（参数全部来自 AppointmentTask，不读 lip）。
+
+- 日期范围严格使用任务 dateFrom/dateTo；
+- 逐日三态：disabled（不可选）/ selectable_no_slot（可选但无时段）/ selectable_booking_failed / booked；
+- 预约成功即停，不执行 FULL 步骤 5-8；
+- 由 appointment-worker.mjs 启动；stdout 最后一行 JSON 为结果。
+"""
+import argparse
+import asyncio
+import json
+import os
+import sys
+import time
+from datetime import date, datetime, timedelta
+from pathlib import Path
+from types import SimpleNamespace
+
+ROOT = Path(__file__).resolve().parent
+sys.path.insert(0, str(ROOT))
+
+import orchestrator as O  # noqa: E402
+
+
+DATE_CELL_JS = r"""(targetIso) => {
+  const days = document.querySelectorAll('div.day');
+  const MONTHS = ['enero','febrero','marzo','abril','mayo','junio','julio','agosto','septiembre','octubre','noviembre','diciembre'];
+  const my = document.querySelector('.focus-ui-datepicker__content__month-year');
+  const header = my ? (my.textContent || '').trim().toLowerCase() : '';
+  const target = new Date(targetIso + 'T12:00:00');
+  const viewMonths = MONTHS.map((m, mi) => header.includes(m) ? mi : -1).filter(x => x >= 0);
+  const ym = header.match(/(\d{4})/);
+  if (!viewMonths.length || !ym) return {found:false, reason:'header_unreliable', header};
+  const viewYear = parseInt(ym[1], 10);
+  let month = viewMonths[0] - 1, prev = 0, started = false;
+  for (let i = 0; i < days.length; i++) {
+    const t = (days[i].textContent || '').trim();
+    if (!/^\d+$/.test(t)) continue;
+    const d = parseInt(t, 10);
+    if (d === 1 && (prev > 1 || prev === 0)) {
+      if (!started) { started = true; month = viewMonths[0]; } else { month++; }
+    }
+    prev = d;
+    if (started && month === target.getMonth() && d === target.getDate()) {
+      const cls = days[i].className || '';
+      return {found:true, idx:i, disabled: cls.includes('day--disabled'), cls, header};
+    }
+  }
+  return {found:false, reason:'not_in_view', header};
+}"""
+
+
+SCAN_DAYS_JS = r"""() => {
+  const days = [...document.querySelectorAll('div.day')];
+  const MONTHS = ['enero','febrero','marzo','abril','mayo','junio','julio','agosto','septiembre','octubre','noviembre','diciembre'];
+  const my = document.querySelector('.focus-ui-datepicker__content__month-year');
+  const header = my ? (my.textContent || '').trim().toLowerCase() : '';
+  const viewMonths = MONTHS.map((m, mi) => header.includes(m) ? mi : -1).filter(x => x >= 0);
+  const ym = header.match(/(\d{4})/);
+  if (!viewMonths.length || !ym) return {header, dates: []};
+  const viewYear = parseInt(ym[1], 10);
+  let month = viewMonths[0] - 1, year = viewYear, prev = 0, started = false;
+  const out = [];
+  for (const el of days) {
+    const t = (el.textContent || '').trim();
+    if (!/^\d+$/.test(t)) continue;
+    const d = parseInt(t, 10);
+    if (d === 1 && (prev > 1 || prev === 0)) {
+      if (!started) { started = true; month = viewMonths[0]; year = viewYear; }
+      else { month++; if (month > 11) { month = 0; year++; } }
+    }
+    prev = d;
+    if (!started) continue;
+    out.push({date: year + '-' + String(month+1).padStart(2,'0') + '-' + String(d).padStart(2,'0'), disabled: (el.className||'').includes('day--disabled')});
+  }
+  return {header, dates: out};
+}"""
+
+
+def load_task() -> dict:
+    ap = argparse.ArgumentParser()
+    ap.add_argument('--task-json', required=True)
+    ap.add_argument('--cdp-hint', default='')
+    args = ap.parse_args()
+    return json.loads(args.task_json)
+
+
+def iso_day(d) -> date:
+    return datetime.fromisoformat(str(d)[:10]).date()
+
+
+async def prepare_appointment_page(orch) -> None:
+    """进入预约页并选好运输方式/地址，打开日期日历；页面慢/弹窗允许重试。"""
+    last = None
+    for attempt in range(3):
+        try:
+            await orch.browser.visit_plan_page('appointment-v2', orch.state.shipment_id, step=4)
+            if await orch._has_existing_appointment():
+                raise RuntimeError('已有预约存在，不重复抢')
+            page = orch.browser.page
+            trigger = page.locator('#shipment-type-selection-dropdown-id-trigger')
+            await trigger.wait_for(state='visible', timeout=30000)
+            await trigger.click()
+            await asyncio.sleep(0.8)
+            option = page.get_by_role('option', name='Vehículo particular', exact=False).first
+            if await option.count() == 0:
+                option = page.get_by_role('option', name='Vehículo', exact=False).first
+            if await option.count() == 0:
+                raise RuntimeError('未找到 Vehículo 运输选项')
+            await option.click()
+            await asyncio.sleep(1.2)
+            try:
+                await orch.browser.page.wait_for_selector('.andes-list__item-action', timeout=8000)
+                btns = orch.browser.page.locator('.andes-list__item-action')
+                target = None
+                for i in range(await btns.count()):
+                    txt = (await btns.nth(i).text_content() or '')
+                    if 'MXCD05' in txt:
+                        target = (btns.nth(i), txt); break
+                if target is None:
+                    raise RuntimeError('未找到指定仓库 MXCD05')
+                await target[0].scroll_into_view_if_needed(timeout=5000)
+                await asyncio.sleep(0.4)
+                await target[0].click()
+                try:
+                    cont = orch.browser.page.locator('button', has_text='Continuar').first
+                    await cont.click(force=True, timeout=5000)
+                except Exception:
+                    pass
+                await asyncio.sleep(1)
+            except Exception:
+                pass
+            await orch.browser.wait_for_selector('input[readonly]', timeout=15, step=4, action='date_input')
+            await orch.browser.click_selector_with_fallback(4, 'date_input')
+            await asyncio.sleep(1)
+            return
+        except Exception as exc:
+            last = exc
+            orch._log(f'  ⚠️ 预约页准备第 {attempt + 1}/3 次失败: {str(exc)[:100]}')
+            await asyncio.sleep(3)
+    raise RuntimeError(f'预约页准备失败：{last}')
+
+
+async def calendar_month_state(orch) -> dict:
+    return await orch._calendar_state()
+
+
+async def find_date_cell(orch, target: date) -> dict:
+    """返回目标 date 的 {found,idx,disabled}，必要时翻月。"""
+    target_month = target.month - 1
+    target_year = target.year
+    for _ in range(4):
+        st = await calendar_month_state(orch)
+        header = (st.get('header') or '').lower()
+        months = ['enero','febrero','marzo','abril','mayo','junio','julio','agosto','septiembre','octubre','noviembre','diciembre']
+        vis = [i for i, m in enumerate(months) if m in header]
+        yr = year_of(header)
+        if target_month in vis and (yr is None or target_year == yr):
+            r = await orch.browser.page.evaluate(DATE_CELL_JS, target.isoformat())
+            return r if isinstance(r, dict) else json.loads(r)
+        await orch._flip_month(st, target_month, target_year)
+        await asyncio.sleep(0.8)
+    return {'found': False, 'reason': 'flip_failed'}
+
+
+async def scan_available_days(orch, need: int, max_months: int = 4) -> dict:
+    await prepare_appointment_page(orch)
+    collected = {}; order = []; selected = []
+    for _ in range(max_months):
+        r = await orch.browser.page.evaluate(SCAN_DAYS_JS)
+        r = r if isinstance(r, dict) else json.loads(r)
+        for item in r.get('dates') or []:
+            d = item.get('date')
+            if not d or d in collected:
+                continue
+            collected[d] = 'disabled' if item.get('disabled') else 'selectable'
+            order.append(d)
+            if not item.get('disabled'):
+                selected.append(d)
+                if len(selected) >= need:
+                    break
+        if len(selected) >= need:
+            break
+        import re
+        header = (r.get('header') or '').lower()
+        months = ['enero','febrero','marzo','abril','mayo','junio','julio','agosto','septiembre','octubre','noviembre','diciembre']
+        vis = [i for i, m in enumerate(months) if m in header]
+        yr = year_of(header)
+        if not vis or yr is None:
+            break
+        nm = max(vis) + 1
+        ny = yr + (1 if nm > 11 else 0)
+        nm = nm % 12
+        await orch._flip_month(await calendar_month_state(orch), nm, ny)
+        await asyncio.sleep(0.8)
+    return {'states': collected, 'order': order, 'selected': selected[:need]}
+
+
+def year_of(header: str):
+    import re
+    m = re.search(r'(\d{4})', header or '')
+    return int(m.group(1)) if m else None
+
+
+async def run_task(task: dict) -> dict:
+    store = task.get('store') or ''
+    if not store:
+        return {'status': 'failed', 'summary': '任务缺少店铺'}
+    date_mode = task.get('dateMode') or 'range'
+    from_date = iso_day(task['dateFrom']) if date_mode == 'range' else None
+    to_date = iso_day(task['dateTo']) if date_mode == 'range' else None
+    cfg = O.load_config()
+    cfg.store_name = store
+    sel = O.Selectors()
+    args = SimpleNamespace(record_id='', sku=task.get('sku', ''), qty=task.get('quantity'), box=task.get('boxCount'),
+                           shipment_id=task.get('shipmentNo') or '', store_name=store, no_lock=True)
+    orch = O.Orchestrator(cfg, sel, args)
+    orch.state.store_name = store
+    orch.state.record_id = ''
+    orch.state.sku = str(task.get('sku') or '')
+    orch.state.qty = str(task.get('quantity') or '')
+    orch.state.box = str(task.get('boxCount') or '')
+    if task.get('shipmentNo'):
+        orch.state.shipment_id = str(task['shipmentNo'])
+    try:
+        if not orch.acquire_store_executor_lock():
+            return {'status': 'failed', 'summary': f'同店执行者锁冲突：{orch._store_exec_holder}'}
+        _dl, port = orch._open_store()
+        if not port:
+            return {'status': 'failed', 'summary': 'CDP 端口未发现（店铺窗口未就绪）'}
+        orch.browser.cdp_url = f'http://127.0.0.1:{port}'
+        await orch._connect_with_port_rediscovery()
+        await orch._preflight_store_window(phase='appointment-grab')
+        if not orch.state.shipment_id:
+            if not orch.state.sku or not orch.state.qty or not orch.state.box:
+                return {'status': 'failed', 'summary': 'SKU-only 缺少 sku/qty/box（任务参数不完整）'}
+            await orch.step1_prepare()
+            await orch.step2_entry()
+            await orch.step3_select_product()
+        today = (await orch._platform_today()).date()
+        cycles = int(task.get('maxCycles') or 0)
+        cycle_no = 0
+        last_states = {}
+        while True:
+            cycle_no += 1
+            if date_mode == 'available_days':
+                need = int(task.get('availableDays') or 0)
+                scan = await scan_available_days(orch, need)
+                tomorrow = (today + timedelta(days=1)).isoformat()
+                states = {k: v for k, v in dict(scan['states']).items() if k >= tomorrow}
+                targets = [date.fromisoformat(x) for x in scan['selected']]
+                if not targets:
+                    print(json.dumps({'event': 'cycle', 'cycle': cycle_no, 'dateStates': states, 'summary': '未发现可选日'}, ensure_ascii=False), flush=True)
+                for d in targets:
+                    offset = (d - today).days
+                    try:
+                        await orch.browser.visit_plan_page('appointment-v2', orch.state.shipment_id, step=4)
+                        await orch._book_appointment(hour_idx=0, date_offset=offset)
+                        states[d.isoformat()] = 'booked'
+                        return {'status': 'booked', 'date': d.isoformat(), 'slot': 'first', 'dateStates': states, 'summary': f'{d.isoformat()} 预约成功', 'windowMode': 'available_days'}
+                    except Exception as exc:
+                        msg = str(exc)
+                        if any(k in msg for k in ('可用时段不足', '未渲染出可选时段', '时间选择失败', '未写入日期时间')):
+                            states[d.isoformat()] = 'selectable_no_slot'
+                        else:
+                            states[d.isoformat()] = 'selectable_booking_failed'
+                        orch._log(f'  ⚠️ {d} 预约失败: {msg[:160]}')
+            else:
+                targets = []
+                d = max(from_date, today + timedelta(days=1))
+                while d <= to_date:
+                    targets.append(d); d += timedelta(days=1)
+                if not targets:
+                    return {'status': 'failed', 'summary': '日期范围内没有可预约日期（今天及以前不算）'}
+                states = {d.isoformat(): 'pending' for d in targets}
+                for d in targets:
+                    offset = (d - today).days
+                    try:
+                        await prepare_appointment_page(orch)
+                        info = await find_date_cell(orch, d)
+                        if not info.get('found'):
+                            states[d.isoformat()] = 'date_not_found'; continue
+                        if info.get('disabled'):
+                            states[d.isoformat()] = 'disabled'; continue
+                    except Exception as exc:
+                        states[d.isoformat()] = 'page_error'
+                        orch._log(f'  ⚠️ {d} 分类失败: {str(exc)[:120]}'); continue
+                    try:
+                        await orch.browser.visit_plan_page('appointment-v2', orch.state.shipment_id, step=4)
+                        await orch._book_appointment(hour_idx=0, date_offset=offset)
+                        states[d.isoformat()] = 'booked'
+                        return {'status': 'booked', 'date': d.isoformat(), 'slot': 'first', 'dateStates': states, 'summary': f'{d.isoformat()} 预约成功'}
+                    except Exception as exc:
+                        msg = str(exc)
+                        if any(k in msg for k in ('可用时段不足', '未渲染出可选时段', '时间选择失败', '未写入日期时间')):
+                            states[d.isoformat()] = 'selectable_no_slot'
+                        else:
+                            states[d.isoformat()] = 'selectable_booking_failed'
+                        orch._log(f'  ⚠️ {d} 预约失败: {msg[:160]}')
+            last_states = states
+            print(json.dumps({'event': 'cycle', 'cycle': cycle_no, 'dateStates': states}, ensure_ascii=False), flush=True)
+            if cycles and cycle_no >= cycles:
+                break
+            await asyncio.sleep(max(10, int(task.get('pollIntervalSec') or 60)))
+        return {'status': 'failed', 'dateStates': last_states, 'cycles': cycle_no, 'summary': '本轮日期范围内未抢到预约'}
+    finally:
+        try:
+            await orch.browser.close()
+        except Exception:
+            pass
+        try:
+            orch.release_store_executor_lock()
+        except Exception:
+            pass
+
+
+def main():
+    task = load_task()
+    try:
+        out = asyncio.run(run_task(task))
+    except Exception as exc:
+        out = {'status': 'failed', 'summary': f'{type(exc).__name__}: {exc}'}
+    print(json.dumps(out, ensure_ascii=False), flush=True)
+
+
+if __name__ == '__main__':
+    main()

package/engine/scripts/argent-runner.mjs

@@ -0,0 +1,223 @@
+#!/usr/bin/env node
+/**
+ * P4 本机 runner（客户机侧）—— 后台 Pull 派发 + 租约 的执行端。
+ *
+ * 链路：
+ *   ① 用 runner token 向数据中心长轮询领取作业（claim）
+ *   ② 若本机 dsh web 在跑：通过其 task-board HTTP API（同机 loopback，无需 token）
+ *      建卡（pin job.preset）→ 运行 → 轮询直到执行结束
+ *   ③ 把结果 complete 回数据中心（写 Run + 回写卡状态）
+ *   · 执行期间每 30s 发一次心跳续租；租约超时则由服务端回收、别的 runner 可重领
+ *
+ * 用法：
+ *   node scripts/argent-runner.mjs --config ~/.dsh/argent/runner.json          # 常驻循环
+ *   node scripts/argent-runner.mjs --config ... --once                          # 领一个作业就退出（验收/调试）
+ *   node scripts/argent-runner.mjs --health                                     # 只做连通性自检
+ *
+ * 配置文件（600，示例）：
+ * {
+ *   "serverUrl": "https://whyshu.com",
+ *   "tenantAppId": "ly-0001",
+ *   "runnerToken": "eyJ…",
+ *   "dshWebUrl": "http://127.0.0.1:3080",
+ *   "leaseSec": 90,
+ *   "pollWaitMs": 20000,
+ *   "execTimeoutSec": 900
+ * }
+ * ⛔ 不打印 token；⛔ 只允许对 dshWebUrl 的本机地址发请求（校验 host 为 loopback）。
+ */
+import { readFileSync, mkdirSync, appendFileSync } from 'node:fs';
+import { randomUUID } from 'node:crypto';
+import { homedir, hostname } from 'node:os';
+import { join } from 'node:path';
+
+const argv = process.argv.slice(2);
+const has = (f) => argv.includes(f);
+const val = (f, d = '') => { const i = argv.indexOf(f); return i > -1 ? (argv[i + 1] ?? d) : d; };
+
+const CONFIG_PATH = val('--config', join(homedir(), '.dsh', 'argent', 'runner.json'));
+const ONCE = has('--once');
+const HEALTH_ONLY = has('--health');
+const DRY_RUN = has('--dry-run');
+const LOG_DIR = join(homedir(), '.dsh', 'argent', 'runner');
+
+function log(event, extra = {}) {
+  const line = JSON.stringify({ ts: new Date().toISOString(), event, ...extra });
+  console.log(line);
+  try { mkdirSync(LOG_DIR, { recursive: true }); appendFileSync(join(LOG_DIR, 'runner.ndjson'), line + '\n'); } catch { /* 日志失败不影响执行 */ }
+}
+
+function loadConfig() {
+  let cfg = {};
+  try { cfg = JSON.parse(readFileSync(CONFIG_PATH, 'utf8')); } catch (error) {
+    console.error(`❌ 读不到配置 ${CONFIG_PATH}: ${error.message}`);
+    process.exit(2);
+  }
+  const merged = {
+    serverUrl: String(process.env.ARGENT_SERVER_URL || cfg.serverUrl || '').replace(/\/+$/, ''),
+    tenantAppId: String(process.env.ARGENT_TENANT_APP_ID || cfg.tenantAppId || ''),
+    runnerToken: String(process.env.ARGENT_RUNNER_TOKEN || cfg.runnerToken || ''),
+    dshWebUrl: String(process.env.ARGENT_DSH_WEB_URL || cfg.dshWebUrl || 'http://127.0.0.1:3080').replace(/\/+$/, ''),
+    leaseSec: Number(cfg.leaseSec) || 90,
+    pollWaitMs: Number(cfg.pollWaitMs) || 20000,
+    execTimeoutSec: Number(cfg.execTimeoutSec) || 900,
+    runnerId: String(cfg.runnerId || `runner-${hostname().toLowerCase().replace(/[^a-z0-9-]/g, '-')}`),
+  };
+  for (const k of ['serverUrl', 'tenantAppId', 'runnerToken']) {
+    if (!merged[k]) { console.error(`❌ 配置缺少 ${k}（${CONFIG_PATH}）`); process.exit(2); }
+  }
+  const web = new URL(merged.dshWebUrl);
+  if (!['127.0.0.1', 'localhost', '::1'].includes(web.hostname)) {
+    console.error(`❌ dshWebUrl 必须是本机地址（当前 ${web.hostname}）`); process.exit(2);
+  }
+  return merged;
+}
+
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+
+function serverHeaders(cfg) {
+  return { authorization: `Bearer ${cfg.runnerToken}`, 'content-type': 'application/json' };
+}
+
+async function serverCall(cfg, path, { method = 'GET', body } = {}) {
+  const res = await fetch(`${cfg.serverUrl}/api/argent/v1/tenants/${cfg.tenantAppId}${path}`, {
+    method, headers: serverHeaders(cfg), body: body === undefined ? undefined : JSON.stringify(body),
+  });
+  const text = await res.text();
+  let data = null;
+  try { data = JSON.parse(text); } catch { data = text; }
+  if (!res.ok) throw new Error(`${method} ${path} → ${res.status} ${data?.error?.code || ''} ${data?.error?.message || ''}`.trim());
+  return data;
+}
+
+/** task-board 同机 HTTP API（loopback + same-origin marker；不需要 dsh web token） */
+async function tbAction(cfg, action) {
+  const res = await fetch(`${cfg.dshWebUrl}/api/task-board/action`, {
+    method: 'POST',
+    headers: { 'content-type': 'application/json', 'sec-fetch-site': 'same-origin' },
+    body: JSON.stringify({ requestId: randomUUID(), action }),
+  });
+  const text = await res.text();
+  let data = null;
+  try { data = JSON.parse(text); } catch { data = text; }
+  return { status: res.status, data };
+}
+
+async function tbState(cfg) {
+  const res = await fetch(`${cfg.dshWebUrl}/api/task-board/state`, { headers: { 'sec-fetch-site': 'same-origin' } });
+  if (!res.ok) throw new Error(`task-board state → ${res.status}`);
+  return res.json();
+}
+
+/** 执行一个作业：建卡 → 运行 → 等待结算；返回 { outcome, summary, sessionRef } */
+async function executeJob(cfg, job) {
+  const taskId = randomUUID();
+  const create = await tbAction(cfg, {
+    kind: 'create', id: taskId,
+    input: {
+      title: job.title || `后台派发：${job.preset}`,
+      description: String(job.prompt || '').slice(0, 500),
+      prompt: job.prompt,
+      mode: job.preset,
+    },
+  });
+  if (create.status !== 200) {
+    return { outcome: 'failed', summary: `task-board create 失败：HTTP ${create.status} ${JSON.stringify(create.data).slice(0, 300)}` };
+  }
+  log('job.task.created', { jobId: String(job._id), taskId, preset: job.preset });
+
+  const run = await tbAction(cfg, { kind: 'run', taskId });
+  if (run.status !== 200) {
+    return { outcome: 'failed', summary: `task-board run 失败：HTTP ${run.status} ${JSON.stringify(run.data).slice(0, 300)}`, taskId };
+  }
+  log('job.task.running', { jobId: String(job._id), taskId });
+
+  const deadline = Date.now() + cfg.execTimeoutSec * 1000;
+  while (Date.now() < deadline) {
+    await sleep(2000);
+    const state = await tbState(cfg);
+    const task = (state.tasks || []).find((t) => t.id === taskId);
+    if (!task) continue;
+    const execs = task.executions || [];
+    const latest = execs[execs.length - 1];
+    if (latest && latest.endedAt) {
+      const outcome = latest.result === 'succeeded' ? 'succeeded' : 'failed';
+      return { outcome, summary: latest.error ? String(latest.error).slice(0, 500) : '', sessionRef: latest.sessionId || '', taskId };
+    }
+  }
+  return { outcome: 'failed', summary: `执行超时（>${cfg.execTimeoutSec}s）`, taskId };
+}
+
+async function runOnce(cfg) {
+  const claim = await serverCall(cfg, '/jobs/claim', { method: 'POST', body: { runnerId: cfg.runnerId, waitMs: ONCE ? 0 : cfg.pollWaitMs, leaseSec: cfg.leaseSec } });
+  const job = claim?.data?.job;
+  if (!job) return { claimed: false };
+  log('job.claimed', { jobId: String(job._id), preset: job.preset, attempts: job.attempts, runnerId: cfg.runnerId });
+  if (DRY_RUN) { log('job.dry-run', { jobId: String(job._id) }); return { claimed: true, dryRun: true }; }
+
+  // 心跳续租（执行期间每 30s）
+  let heartbeatTimer = null;
+  const startHeartbeat = () => {
+    heartbeatTimer = setInterval(async () => {
+      try {
+        await serverCall(cfg, `/jobs/${job._id}/heartbeat`, { method: 'POST', body: { runnerId: cfg.runnerId, leaseSec: cfg.leaseSec } });
+        log('job.heartbeat', { jobId: String(job._id) });
+      } catch (error) {
+        log('job.heartbeat.error', { jobId: String(job._id), message: error.message });
+      }
+    }, 30_000);
+    if (typeof heartbeatTimer.unref === 'function') heartbeatTimer.unref();
+  };
+
+  startHeartbeat();
+  let result;
+  try {
+    result = await executeJob(cfg, job);
+  } finally {
+    if (heartbeatTimer) clearInterval(heartbeatTimer);
+  }
+
+  try {
+    const done = await serverCall(cfg, `/jobs/${job._id}/complete`, {
+      method: 'POST',
+      body: {
+        runnerId: cfg.runnerId, outcome: result.outcome,
+        summary: result.summary || '', sessionRef: result.sessionRef || '',
+      },
+    });
+    log('job.completed', { jobId: String(job._id), outcome: result.outcome, runId: done?.data?.run?._id || null, taskId: result.taskId || null });
+    return { claimed: true, outcome: result.outcome };
+  } catch (error) {
+    log('job.complete.error', { jobId: String(job._id), message: error.message });
+    return { claimed: true, outcome: result.outcome, completeError: error.message };
+  }
+}
+
+async function health(cfg) {
+  const out = { server: false, dshWeb: false, tenantAppId: cfg.tenantAppId, runnerId: cfg.runnerId };
+  try {
+    const res = await fetch(`${cfg.serverUrl}/api/argent/v1/health`);
+    out.server = res.ok;
+  } catch { /* noop */ }
+  try {
+    const state = await tbState(cfg);
+    out.dshWeb = true;
+    out.boardRevision = state.revision;
+  } catch { /* noop */ }
+  console.log(JSON.stringify(out));
+  return out;
+}
+
+async function main() {
+  const cfg = loadConfig();
+  log('runner.start', { runnerId: cfg.runnerId, tenantAppId: cfg.tenantAppId, server: new URL(cfg.serverUrl).origin, dshWeb: new URL(cfg.dshWebUrl).origin, once: ONCE });
+  if (HEALTH_ONLY) { const h = await health(cfg); process.exit(h.server && h.dshWeb ? 0 : 1); }
+  let stopping = false;
+  process.on('SIGINT', () => { stopping = true; log('runner.stop', {}); process.exit(0); });
+  process.on('SIGTERM', () => { stopping = true; log('runner.stop', {}); process.exit(0); });
+  do {
+    try { await runOnce(cfg); } catch (error) { log('runner.error', { message: error.message }); await sleep(3000); }
+  } while (!ONCE && !stopping);
+}
+
+main().catch((error) => { console.error(`❌ runner 失败: ${error.message}`); process.exit(1); });

package/engine/scripts/argent-setup-check.mjs

@@ -127,7 +127,7 @@ export function buildChecks({ engine, dataDir, state, scopeDirs = [], stateOnly
         : (has
           ? `状态文件在但**形状不认识**（${engine.stateFile(dataDir)}）——版本或字段对不上这份契约`
           : `证据不足：没有状态文件（${engine.stateFile(dataDir)}）⇒ 这份安装没跑过安装后 setup`),
-      fix: state ? [] : ['重启宿主（插件启动期会写一次）', '或重跑安装器：node install-argent.mjs'],
+      fix: state ? [] : ['重启宿主（插件启动期会写一次）', '或运行启动器自检（@whyshu/argent 的自检子命令）修复'],
     })
   }
 
@@ -140,7 +140,7 @@ export function buildChecks({ engine, dataDir, state, scopeDirs = [], stateOnly
     const step = state && state.steps ? state.steps['python-runtime'] : null
     if (verdict) {
       if (verdict.state === 'ready') {
-        checks.push({ id: 'python-runtime', ok: true, detail: `venv 可跑（${venvPython}；${engine.VENV_PKGS.join(' / ')} 可 import）`, fix: [] })
+        checks.push({ id: 'python-runtime', ok: true, detail: `venv 可跑（${venvPython}；${(engine.VENV_IMPORT_PKGS || engine.VENV_PKGS).join(' / ')} 可 import）`, fix: [] })
       } else if (verdict.state === 'timeout') {
         checks.push({
           id: 'python-runtime',
@@ -157,7 +157,7 @@ export function buildChecks({ engine, dataDir, state, scopeDirs = [], stateOnly
           id: 'python-runtime',
           ok: null,
           detail: `证据不足：${verdict.reason}${ver}（${at}），且没有状态文件 ⇒ 无法判断这份安装是否该有它`,
-          fix: ['重跑安装器补齐运行时：node install-argent.mjs --venv-only', '或重启宿主让插件后台补建'],
+          fix: ['运行 `bash scripts/python-runtime.sh ensure` 补齐运行时', '或重启宿主让插件后台补建'],
         })
       } else {
         const repair = step && step.repair && Array.isArray(step.repair.lines) ? step.repair.lines : engine.repairHint({ dataDir }).lines