@whyshu/argent 0.1.27 → 0.2.1

package/src/account-token.mjs

@@ -0,0 +1,40 @@
+// 由 core/lib/account-token.mjs 复制（插件是可发布产物，⛔ 不跨目录 import 仓库）。
+// 漂移由 scripts/tests/argent-bundle.test.mjs 的逐字节比对拦截。
+
+/**
+ * 账号 token 的唯一解析点（2026-11-03）
+ *
+ * 为什么要单独成文件：ERP MCP 适配层（core/mcp/erp-server.mjs）与 dsh 宿主插件
+ * （plugins/argent-erp-ui）都要用**同一把**问述账号 JWT，⛔ 不许各写一套"先读哪个文件"。
+ *
+ * 顺序（实测依据见 docs/Argent-0.9-ERP入口与MCP网关-规划.md）：
+ *   ① `ARGENT_ACCOUNT_TOKEN`（显式注入，测试/排障）
+ *   ② `WHYSHU_API_KEY` 环境变量（宿主 profile 注入）
+ *   ③ `~/.dsh/.credentials.yaml` 的 `refs.WHYSHU_API_KEY`（现役；只读，⛔ 绝不写）
+ *
+ * ⚠️ `~/.dsh/argent/whyshu.env` 里的 JWT **已过期**（2026-11-03 实测 401），故意不读它。
+ */
+import { readFileSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+
+/** 只读：从 credentials 文件里取 `WHYSHU_API_KEY: <token>`（窄正则，避免解析整份 YAML） */
+export function readTokenFromCredentials(dshHome = process.env.DSH_HOME || join(homedir(), '.dsh')) {
+  try {
+    const raw = readFileSync(join(dshHome, '.credentials.yaml'), 'utf8')
+    const m = raw.match(/WHYSHU_API_KEY\s*:\s*"?([A-Za-z0-9._-]{20,})/)
+    return m ? m[1] : ''
+  } catch {
+    return ''
+  }
+}
+
+/** @returns {{token:string, source:'env-explicit'|'env-whyshu'|'credentials'|'none'}} */
+export function resolveAccountToken({ env = process.env, dshHome } = {}) {
+  const explicit = String(env.ARGENT_ACCOUNT_TOKEN || '').trim()
+  if (explicit) return { token: explicit, source: 'env-explicit' }
+  const whyshu = String(env.WHYSHU_API_KEY || '').trim()
+  if (whyshu) return { token: whyshu, source: 'env-whyshu' }
+  const fromFile = readTokenFromCredentials(dshHome)
+  return fromFile ? { token: fromFile, source: 'credentials' } : { token: '', source: 'none' }
+}

package/src/actions.mjs

@@ -0,0 +1,114 @@
+/**
+ * actions.mjs —— 宿主壳跑引擎任务的**唯一入口**（方案 C · P2 第二步，2026-11-02）
+ *
+ * 背景：原先 `office-runtime.js` 直接 `spawn(python, ['scripts/*.py'])` 并自己持有 child。
+ * 切到 MCP 后同步 `execFileSync` 无法中途取消 ⇒ 会丢 `task_cancel`。
+ * 现在引擎侧补了 job 三件套（start/status/cancel），这里做**统一封装**：
+ *   · 默认走 MCP（可取消、可轮询、有超时）；
+ *   · `ARGENT_DESKTOP_MCP_ACTIONS=0` 或 MCP 不可用 ⇒ 回退 spawn（保留旧语义）。
+ * 两条路径返回**同一形状**，调用方不需要知道自己走的是哪条。
+ */
+import { spawn } from 'node:child_process'
+import { existsSync } from 'node:fs'
+import { join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+import { engineDirSync } from './kernel.mjs'
+
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms))
+
+let conn = null
+let connDir = ''
+
+async function getConn(engineDir) {
+  if (conn && connDir === engineDir) return conn
+  try { conn?.close?.() } catch { /* noop */ }
+  const mod = await import(pathToFileURL(join(engineDir, 'core', 'mcp', 'client.mjs')).href)
+  conn = mod.connect(join(engineDir, 'core', 'mcp', 'server.mjs'))
+  connDir = engineDir
+  await conn.rpc('initialize', { protocolVersion: '2024-11-05', capabilities: {}, clientInfo: { name: 'argent', version: '0.2.3' } })
+  conn.notify('notifications/initialized')
+  return conn
+}
+
+async function mcpCall(engineDir, name, args) {
+  const c = await getConn(engineDir)
+  const r = await c.rpc('tools/call', { name, arguments: args })
+  const text = (r.content && r.content[0] && r.content[0].text) || '{}'
+  try { return JSON.parse(text) } catch { return { ok: false, error: `MCP 返回非 JSON：${String(text).slice(0, 200)}` } }
+}
+
+function lastJsonLine(out) {
+  const line = String(out || '').split('\n').map((x) => x.trim()).filter((x) => x.startsWith('{')).pop() || ''
+  if (!line) return {}
+  try { return JSON.parse(line) } catch { return {} }
+}
+
+/** spawn 回退（旧语义：流式 stdout/stderr + 可 kill + 超时） */
+function runViaSpawn({ engineDir, kind, record, confirm, step, timeoutMs, onStart }) {
+  const py = process.env.ARGENT_ENGINE_PY || join(process.env.HOME || '', '.dsh', 'argent', 'venv', 'bin', 'python3')
+  const argv = kind === 'skuflow'
+    ? ['scripts/skuflow_invoice_runner.py', '--record-json', JSON.stringify(record), ...(confirm ? [] : ['--generate-only'])]
+    : ['scripts/orchestrator.py', '--record-json', JSON.stringify(record), '--no-lip',
+      ...(step ? ['--mode', 'step', '--step', String(step)] : ['--mode', confirm ? 'full' : 'dry-run']),
+      ...(confirm ? ['--allow-write'] : [])]
+  return new Promise((resolve) => {
+    let stdout = ''
+    let stderr = ''
+    const child = spawn(py, argv, { cwd: engineDir, env: { ...process.env, PYTHONPATH: 'scripts' }, stdio: ['ignore', 'pipe', 'pipe'] })
+    onStart?.({ pid: child.pid, kill: () => { try { child.kill('SIGTERM') } catch { /* noop */ } } })
+    const timer = timeoutMs ? setTimeout(() => { try { child.kill('SIGTERM') } catch { /* noop */ } }, timeoutMs) : null
+    if (timer) timer.unref?.()
+    child.stdout.on('data', (b) => { stdout += b.toString() })
+    child.stderr.on('data', (b) => { stderr += b.toString(); if (stderr.length > 20000) stderr = stderr.slice(-20000) })
+    child.on('error', (e) => { clearTimeout(timer); resolve({ ok: false, code: 2, stdout, stderr: String(e?.message || e), result: {} }) })
+    child.on('close', (code) => {
+      clearTimeout(timer)
+      const result = lastJsonLine(stdout)
+      resolve({ ok: code === 0 && result.ok !== false, code, stdout, stderr, result })
+    })
+  })
+}
+
+/**
+ * 跑一个引擎任务（skuflow / orchestrator）。
+ * @returns {Promise<{ok:boolean, code:number|null, state?:string, stdout?:string, stderr?:string, result?:object, error?:string}>}
+ */
+export async function runEngineTask({ kind, record, confirm = false, step = null, timeoutMs = 0, onStart } = {}) {
+  const engineDir = engineDirSync()
+  if (!engineDir) return { ok: false, code: 2, error: '未找到引擎目录（argent.json 契约未建立）', result: {} }
+  const wantMcp = process.env.ARGENT_DESKTOP_MCP_ACTIONS !== '0' && existsSync(join(engineDir, 'core', 'mcp', 'client.mjs'))
+  if (!wantMcp) return runViaSpawn({ engineDir, kind, record, confirm, step, timeoutMs, onStart })
+
+  try {
+    const st = await mcpCall(engineDir, 'argent_job_start', {
+      kind, record, confirm, ...(step ? { step } : {}), ...(timeoutMs ? { timeoutMs } : {}),
+    })
+    if (!st.ok) return { ok: false, code: st.code ?? 2, error: st.error || 'job_start 失败', result: {} }
+    onStart?.({ jobId: st.jobId, pid: st.pid, kill: () => { mcpCall(engineDir, 'argent_job_cancel', { jobId: st.jobId }).catch(() => {}) } })
+    const deadline = timeoutMs ? Date.now() + timeoutMs : 0
+    for (;;) {
+      await sleep(400)
+      const s = await mcpCall(engineDir, 'argent_job_status', { jobId: st.jobId })
+      if (!s.ok) return { ok: false, code: 2, error: s.error || 'job_status 失败', result: {} }
+      if (s.state !== 'running' && s.state !== 'cancelling') {
+        return { ok: s.state === 'done' && s.code === 0, code: s.code, state: s.state, stdout: s.outputTail, stderr: s.errorTail, result: s.result || {} }
+      }
+      if (deadline && Date.now() > deadline) {
+        await mcpCall(engineDir, 'argent_job_cancel', { jobId: st.jobId }).catch(() => {})
+        return { ok: false, code: null, state: 'cancelled', error: `任务超时（${timeoutMs}ms）已取消`, result: {} }
+      }
+    }
+  } catch (e) {
+    // MCP 起不来（缺 client / 协议错）⇒ 回退 spawn，保证功能不因新通道挂掉
+    const r = await runViaSpawn({ engineDir, kind, record, confirm, step, timeoutMs, onStart })
+    r.stderr = `${r.stderr || ''}\n[actions] MCP 不可用，已回退 spawn：${e?.message || e}`.trim()
+    return r
+  }
+}
+
+/** 关掉长连接（插件卸载/测试用） */
+export function closeActions() {
+  try { conn?.close?.() } catch { /* noop */ }
+  conn = null
+  connDir = ''
+}

package/src/config.mjs

@@ -0,0 +1,47 @@
+/**
+ * 配置契约：agent-report.json 的唯一解析点。
+ *
+ * 单独成文件是为了让 **office 运行时** 与 **health 聚合** 共用同一份解析，
+ * 避免"两处各写一遍 enabled/token 判据"（历史事故的根因形态）。
+ * 纯 node 内建，无宿主 import。
+ */
+import { readFileSync } from 'node:fs'
+import os from 'node:os'
+import { join } from 'node:path'
+
+export const REPORT_FILE = 'agent-report.json'
+export const MIN_INTERVAL_SEC = 5
+export const MAX_INTERVAL_SEC = 300
+
+/**
+ * @param {string} dataDir
+ * @returns {false|{ok:false,reason:string,error?:string}|{ok:true,serverUrl:string,tenantAppId:string,machineId:string,runnerToken:string,machineName:string,intervalSec:number,includeSessionTitles:boolean,chatEnabled:boolean,chatPollSec:number}}
+ */
+export function readConfig(dataDir) {
+  if (!dataDir) return { ok: false, reason: 'no-data-dir' }
+  try {
+    const raw = JSON.parse(readFileSync(join(dataDir, REPORT_FILE), 'utf8'))
+    if (!raw || raw.enabled === false) return { ok: false, reason: 'disabled' }
+    const serverUrl = String(raw.serverUrl || '').replace(/\/+$/, '')
+    const tenantAppId = String(raw.tenantAppId || '').trim()
+    const machineId = String(raw.machineId || '').trim()
+    // Phase 1 兼容：优先 machineToken；旧配置仍可用 runnerToken（其值是 machine token）
+    const runnerToken = String(raw.machineToken || raw.runnerToken || '').trim()
+    if (!serverUrl || !tenantAppId || !machineId || !runnerToken) return { ok: false, reason: 'incomplete' }
+    return {
+      ok: true,
+      serverUrl,
+      tenantAppId,
+      machineId,
+      runnerToken,
+      machineName: String(raw.machineName || os.hostname()),
+      intervalSec: Math.min(Math.max(Number(raw.intervalSec) || 10, MIN_INTERVAL_SEC), MAX_INTERVAL_SEC),
+      includeSessionTitles: raw.includeSessionTitles !== false,
+      // P2：机器对话执行器（默认关；开启后本机出站轮询 ERP 命令并投给目标 dsh 会话）
+      chatEnabled: raw.chatEnabled === true,
+      chatPollSec: Math.min(Math.max(Number(raw.chatPollSec) || 2, 1), 30),
+    }
+  } catch (e) {
+    return { ok: false, reason: e?.code === 'ENOENT' ? 'missing' : 'invalid', error: String(e?.message || e) }
+  }
+}

package/src/error-log.mjs

@@ -0,0 +1,56 @@
+/**
+ * 客户端错误日志（2026-11-06，场景一 P3b）
+ *
+ * 目的：断网/代理故障/鉴权失败时留一份**脱敏**现场，方便用户反馈与排查。
+ *  · 落 `~/.dsh/argent/error-log.jsonl`（0600），单文件 2MB 轮转为 `.1`；
+ *  · ⛔ 不记录 token / 请求正文 / 响应正文；只记 scope/code/message(≤300)/requestId/model；
+ *  · 任何写盘失败都静默（不能因为日志把调用链弄挂）。
+ */
+import { appendFileSync, existsSync, mkdirSync, renameSync, statSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+
+const MAX_BYTES = 2 * 1024 * 1024
+
+export function errorLogDir(dataDir = process.env.ARGENT_DATA_DIR || join(homedir(), '.dsh', 'argent')) {
+  return dataDir
+}
+
+export function errorLogPath(dataDir) {
+  return join(errorLogDir(dataDir), 'error-log.jsonl')
+}
+
+/** 脱敏 + 截断：去掉常见密钥形态，避免把凭据写进日志 */
+export function maskMessage(value, max = 300) {
+  return String(value ?? '')
+    .replace(/\b(?:npm_|sk-)[A-Za-z0-9_-]{8,}/g, '***')
+    .replace(/Bearer\s+[A-Za-z0-9._~+/-]+=*/gi, 'Bearer ***')
+    .slice(0, max)
+}
+
+/**
+ * 写一条客户端错误日志。
+ * @returns {boolean} 是否写入成功（失败静默，不抛）
+ */
+export function logClientError({ scope = '', code = '', message = '', requestId = '', model = '', dataDir } = {}) {
+  try {
+    const dir = errorLogDir(dataDir)
+    mkdirSync(dir, { recursive: true })
+    const file = errorLogPath(dir)
+    if (existsSync(file) && statSync(file).size > MAX_BYTES) {
+      try { renameSync(file, `${file}.1`) } catch { /* 轮转失败就继续追加 */ }
+    }
+    const line = JSON.stringify({
+      at: new Date().toISOString(),
+      scope: String(scope || '').slice(0, 80),
+      code: String(code || '').slice(0, 80),
+      message: maskMessage(message),
+      ...(requestId ? { requestId: String(requestId).slice(0, 120) } : {}),
+      ...(model ? { model: String(model).slice(0, 80) } : {}),
+    })
+    appendFileSync(file, `${line}\n`, { mode: 0o600 })
+    return true
+  } catch {
+    return false
+  }
+}

package/src/fulfillment-result.mjs

@@ -0,0 +1,84 @@
+/**
+ * SkuFlow 机器任务产物回传：
+ *  agent 在最终回复末尾输出一行
+ *    FULFILLMENT_RESULT: {"files":[{"path":"/abs/x.pdf","kind":"product_label"}]}
+ *  本模块解析路径、校验大小/扩展名，并通过 ERP 机器附件接口上传，返回 attachmentId。
+ *
+ * 红线：只接受绝对路径、pdf/png/jpg、单文件 ≤2MB、最多 10 个；不读目录、不执行命令。
+ */
+import { readFile, stat } from 'node:fs/promises'
+import { basename, extname, isAbsolute, resolve } from 'node:path'
+
+export const MARKER = 'FULFILLMENT_RESULT:'
+export const MAX_FILES = 10
+export const MAX_BYTES = 2 * 1024 * 1024
+export const KIND_WHITELIST = new Set(['product_label', 'carton', 'bulk_label', 'invoice'])
+const MIME = { '.pdf': 'application/pdf', '.png': 'image/png', '.jpg': 'image/jpeg', '.jpeg': 'image/jpeg', '.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }
+
+/** 从文本里提取最后一个 FULFILLMENT_RESULT JSON；解析失败只返回 errors，不抛。 */
+export function extractFulfillmentResult(text) {
+  const s = String(text ?? '')
+  const idx = s.lastIndexOf(MARKER)
+  if (idx < 0) return { files: [], errors: [] }
+  let raw = s.slice(idx + MARKER.length).trim()
+  raw = raw.replace(/^```(?:json)?/i, '').replace(/```$/i, '').trim()
+  const start = raw.indexOf('{')
+  if (start < 0) return { files: [], errors: ['FULFILLMENT_RESULT 不是 JSON 对象'] }
+  let depth = 0
+  let inStr = false
+  let esc = false
+  let end = -1
+  for (let i = start; i < raw.length; i++) {
+    const ch = raw[i]
+    if (inStr) {
+      if (esc) esc = false
+      else if (ch === '\\') esc = true
+      else if (ch === '"') inStr = false
+      continue
+    }
+    if (ch === '"') { inStr = true; continue }
+    if (ch === '{') depth++
+    else if (ch === '}') { depth--; if (depth === 0) { end = i; break } }
+  }
+  if (end < 0) return { files: [], errors: ['FULFILLMENT_RESULT JSON 未闭合'] }
+  let data
+  try { data = JSON.parse(raw.slice(start, end + 1)) } catch (e) {
+    return { files: [], errors: [`FULFILLMENT_RESULT JSON 解析失败: ${String(e?.message || e).slice(0, 160)}`] }
+  }
+  const files = (Array.isArray(data?.files) ? data.files : []).slice(0, MAX_FILES).map((f) => ({
+    path: String(f?.path || f?.localPath || f?.file || '').trim(),
+    kind: String(f?.kind || '').trim(),
+    filename: String(f?.filename || '').trim(),
+  })).filter((f) => f.path || f.filename)
+  return { files, errors: [] }
+}
+
+/** 上传产物；apiCall(method, path, body) 由调用方注入（office-runtime 的 ERP 客户端）。 */
+export async function uploadFulfillmentFiles({ files = [], cmdBase = '', apiCall, maxBytes = MAX_BYTES } = {}) {
+  if (typeof apiCall !== 'function') throw new TypeError('apiCall 必须是函数')
+  const out = []
+  const errors = []
+  for (const f of files.slice(0, MAX_FILES)) {
+    try {
+      if (!f.path || !isAbsolute(f.path)) { errors.push(`跳过非绝对路径: ${f.filename || f.path || ''}`); continue }
+      if (!KIND_WHITELIST.has(f.kind)) { errors.push(`跳过非法 kind: ${f.kind || '(空)'}`); continue }
+      const real = resolve(f.path)
+      const ext = extname(real).toLowerCase()
+      if (!MIME[ext]) { errors.push(`跳过非 PDF/图片: ${basename(real)}`); continue }
+      const st = await stat(real)
+      if (!st.isFile()) { errors.push(`不是文件: ${basename(real)}`); continue }
+      if (st.size > maxBytes) { errors.push(`文件超过 ${maxBytes} 字节: ${basename(real)}`); continue }
+      const buf = await readFile(real)
+      const filename = (f.filename || basename(real)).slice(0, 200)
+      const res = await apiCall('POST', `${cmdBase}/attachments`, {
+        filename, mime: MIME[ext], dataBase64: buf.toString('base64'), kind: 'task-artifact',
+      }, 30_000)
+      const ref = res?.data?.attachment?._id || res?.attachment?._id || ''
+      if (!ref) { errors.push(`附件接口未返回 attachmentId: ${filename}`); continue }
+      out.push({ filename, kind: f.kind, ref })
+    } catch (e) {
+      errors.push(`${f.filename || f.path || '文件'} 上传失败: ${String(e?.message || e).slice(0, 160)}`)
+    }
+  }
+  return { files: out, errors }
+}

package/src/health.mjs

@@ -0,0 +1,231 @@
+/**
+ * 桌宠 / CLI 共用的健康聚合（2026-10-29）。
+ *
+ * 设计：
+ *  · `buildHealth()` 是**纯函数**（配置 + 运行时状态 + 外部探测结果 → 检查项），可单测；
+ *  · `collectHealth()` 负责取外部探测（3080 / ziniao-cli / 技能目录），带 TTL 缓存；
+ *  · 不返回 token / 消息正文；`/api/argent/health` 由宿主认证兜底。
+ */
+import { execFile } from 'node:child_process'
+import { readdirSync, statSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+import { promisify } from 'node:util'
+import { readConfig, REPORT_FILE } from './config.mjs'
+import { getWhyshuStatus } from './whyshu-auth.mjs'
+import { collectTimer } from './timer-status.mjs'
+
+const execFileAsync = promisify(execFile)
+
+const TTL = { web: 15_000, ziniao: 60_000, skills: 60_000, doctor: 5 * 60_000 }
+const cache = { webAt: 0, web: null, ziniaoAt: 0, ziniao: null, skillsAt: 0, skills: null, doctorAt: 0, doctor: null }
+
+const fmtAge = (ms) => {
+  if (!Number.isFinite(ms) || ms < 0) return '未知'
+  const s = Math.round(ms / 1000)
+  if (s < 60) return `${s}s`
+  const m = Math.round(s / 60)
+  if (m < 60) return `${m}m`
+  return `${Math.round(m / 60)}h`
+}
+const errText = (e) => String(e?.stderr || e?.stdout || e?.message || e || 'unknown').replace(/\s+/g, ' ').trim().slice(0, 240)
+
+async function probeWeb() {
+  try {
+    const res = await fetch('http://127.0.0.1:3080/', { signal: AbortSignal.timeout(800) })
+    try { await res.body?.cancel?.() } catch { /* noop */ }
+    return { up: true, status: res.status }
+  } catch {
+    return { up: false }
+  }
+}
+
+async function ziniaoVersion() {
+  try {
+    const { stdout } = await execFileAsync('ziniao-cli', ['--version'], { timeout: 3000 })
+    return { ok: true, out: String(stdout).trim().split('\n')[0] }
+  } catch (e) {
+    return { ok: false, error: errText(e) }
+  }
+}
+
+async function ziniaoDoctor() {
+  try {
+    const { stdout } = await execFileAsync('ziniao-cli', ['doctor'], { timeout: 12_000 })
+    const pass = /全部检查通过/.test(String(stdout))
+    return { ok: pass, out: pass ? '全部检查通过' : String(stdout).trim().slice(-300) }
+  } catch (e) {
+    return { ok: false, error: errText(e) }
+  }
+}
+
+function skillsCount() {
+  try {
+    return readdirSync(join(homedir(), '.agents', 'skills')).filter((n) => n.startsWith('ziniao-')).length
+  } catch {
+    return 0
+  }
+}
+
+function configMode(dataDir) {
+  try {
+    return statSync(join(dataDir, REPORT_FILE)).mode & 0o777
+  } catch {
+    return null
+  }
+}
+
+function agentsInfo(ctx) {
+  const svc = typeof ctx?.get === 'function' ? ctx.get('agents') : null
+  let list = []
+  let roots = []
+  try { list = svc?.list?.() || [] } catch { /* noop */ }
+  try { roots = svc?.roots?.() || [] } catch { /* noop */ }
+  return { agents: list.length, roots: roots.length }
+}
+
+/**
+ * 纯函数：由配置/状态/探测结果生成检查清单。
+ * @param {{cfg:object,state:object,chatState:object,extras:object,dataDir:string}} input
+ */
+export function buildHealth({ cfg, state = {}, chatState = {}, extras = {}, dataDir = '' }) {
+  const checks = []
+  const push = (id, label, level, detail = '') => checks.push({ id, label, level, detail })
+  const now = Date.now()
+
+  if (!cfg?.ok) {
+    const reason = cfg?.reason || 'unknown'
+    const text = reason === 'missing' ? '缺少 agent-report.json'
+      : reason === 'disabled' ? 'enabled=false（已停用）'
+      : reason === 'incomplete' ? '缺少 machineId / tenantAppId / token'
+      : reason === 'no-data-dir' ? '数据目录未解析'
+      : `配置不可用：${reason}`
+    push('config', '机器配置', 'error', text)
+  } else {
+    push('config', '机器配置', 'ok', `${cfg.machineId} / ${cfg.tenantAppId}`)
+    if (extras.configMode != null) {
+      const mode = extras.configMode
+      push('config-mode', '配置文件权限', mode === 0o600 ? 'ok' : 'warn',
+        mode === 0o600 ? '600' : `0${mode.toString(8)}（建议 600）`)
+    }
+    const age = state.lastOkAt ? now - Date.parse(state.lastOkAt) : Infinity
+    push('snapshot', 'ERP 上报', age <= 30_000 ? 'ok' : age <= 90_000 ? 'warn' : 'error',
+      state.lastOkAt ? `${fmtAge(age)} 前` : '从未成功')
+    push('snapshot-error', '上报错误', state.lastError ? 'error' : 'ok', state.lastError || '无')
+
+    if (!cfg.chatEnabled) {
+      push('chat', '机器对话', 'warn', '未启用（chatEnabled=false）')
+    } else if (!chatState.started) {
+      push('chat', '机器对话', 'error', '轮询未启动')
+    } else {
+      const cAge = chatState.lastOkAt ? now - Date.parse(chatState.lastOkAt) : Infinity
+      push('chat', '对话轮询', cAge <= 10_000 ? 'ok' : cAge <= 30_000 ? 'warn' : 'error',
+        chatState.lastOkAt ? `${fmtAge(cAge)} 前` : '从未成功')
+      push('chat-error', '对话错误', chatState.lastError ? 'error' : 'ok', chatState.lastError || '无')
+      if (chatState.lastCommandAt) push('chat-last', '最近命令', 'ok', `${fmtAge(now - Date.parse(chatState.lastCommandAt))} 前`)
+    }
+  }
+
+  if (extras.agents != null) {
+    push('agents', '桌面会话', extras.agents > 0 ? 'ok' : 'warn',
+      extras.agents > 0 ? `${extras.agents} 个 agent（根 ${extras.roots ?? '?'}）` : '没有活会话（ERP AI 团队会为空）')
+  }
+
+  if (extras.web) {
+    push('web-poller', '单实例', extras.web.up ? 'warn' : 'ok',
+      extras.web.up ? `web 3080 在跑（HTTP ${extras.web.status}），双 poller 风险` : 'web 3080 已关闭')
+  }
+
+  if (extras.ziniao) {
+    push('ziniao', '紫鸟 CLI', extras.ziniao.ok ? 'ok' : 'warn',
+      extras.ziniao.ok ? extras.ziniao.out : (extras.ziniao.error || '未找到 ziniao-cli'))
+  }
+  if (extras.whyshu) {
+    const w = extras.whyshu
+    if (w.loggedIn) {
+      const d = w.daysLeft
+      push('whyshu', '问述账号', d != null && d <= 3 ? 'warn' : 'ok',
+        `${w.nickname || '已登录'}${w.plan ? ` · ${w.plan}` : ''} · 剩余 ${d ?? '?'} 天`)
+    } else if (w.expired) {
+      push('whyshu', '问述账号', 'warn', '登录已过期，请在桌宠重新登录')
+    } else if (w.invalid) {
+      push('whyshu', '问述账号', 'warn', 'token 无效，请重新登录')
+    } else {
+      push('whyshu', '问述账号', 'warn', '未登录（选「问述代理」前需一键登录）')
+    }
+  }
+  if (extras.skills != null) {
+    push('skills', '紫鸟技能', extras.skills > 0 ? 'ok' : 'warn', `${extras.skills} 个（~/.agents/skills）`)
+  }
+  if (extras.doctor) {
+    push('doctor', '紫鸟自检', extras.doctor.ok ? 'ok' : 'warn',
+      extras.doctor.ok ? extras.doctor.out : (extras.doctor.error || extras.doctor.out || 'doctor 未通过'))
+  }
+  // 日报定时器（2026-10-30）：引擎每小时直跑确定性脚本落状态文件；这里只读它 + LaunchAgent 在册状态。
+  // 为什么必须有这一项：日报不再产生会话/台账，**只有这份状态能回答"今天推没推"**。
+  if (extras.timer) {
+    const t = extras.timer
+    checks.push({ id: t.id, label: t.label, level: t.level, detail: t.detail })
+  }
+
+  const errors = checks.filter((c) => c.level === 'error').length
+  const warns = checks.filter((c) => c.level === 'warn').length
+  const level = errors > 0 ? 'error' : warns > 0 ? 'warn' : 'ok'
+  const summary = level === 'ok' ? 'ERP 已连接' : level === 'warn' ? `注意：${warns} 项待处理` : `异常：${errors} 项`
+  return {
+    ok: level !== 'error',
+    level,
+    summary,
+    at: new Date().toISOString(),
+    machineId: cfg?.ok ? cfg.machineId : '',
+    tenantAppId: cfg?.ok ? cfg.tenantAppId : '',
+    serverUrl: cfg?.ok ? cfg.serverUrl : '',
+    dataDir,
+    checks,
+    // 结构化载荷：桌宠面板要用（下次/上次推送/欠账），⛔ 客户端不要自己再算一份
+    timer: extras.timer?.timer || null,
+  }
+}
+
+async function gatherExtras({ ctx, dataDir, refresh = false }) {
+  const now = Date.now()
+  if (refresh) {
+    cache.webAt = 0; cache.ziniaoAt = 0; cache.skillsAt = 0; cache.doctorAt = 0
+  }
+  if (!cache.web || now - cache.webAt > TTL.web) {
+    cache.web = await probeWeb()
+    cache.webAt = now
+  }
+  if (!cache.ziniao || now - cache.ziniaoAt > TTL.ziniao) {
+    cache.ziniao = await ziniaoVersion()
+    cache.ziniaoAt = now
+  }
+  if (cache.skills == null || now - cache.skillsAt > TTL.skills) {
+    cache.skills = skillsCount()
+    cache.skillsAt = now
+  }
+  if (refresh || (!cache.doctor || now - cache.doctorAt > TTL.doctor)) {
+    cache.doctor = refresh ? await ziniaoDoctor() : null
+    cache.doctorAt = now
+  }
+  return {
+    ...agentsInfo(ctx),
+    configMode: configMode(dataDir),
+    timer: await collectTimer({ dataDir, refresh }),
+    web: cache.web,
+    ziniao: cache.ziniao,
+    skills: cache.skills,
+    doctor: cache.doctor,
+    whyshu: await getWhyshuStatus(ctx, { refresh }),
+  }
+}
+
+/**
+ * 取一次健康结果（带缓存；refresh=true 强制重跑 3080/ziniao/doctor）。
+ * @param {{ctx:object,dataDir:string,state:object,chatState:object,refresh?:boolean}} input
+ */
+export async function collectHealth({ ctx, dataDir, state, chatState, refresh = false }) {
+  const cfg = readConfig(dataDir)
+  const extras = await gatherExtras({ ctx, dataDir, refresh })
+  return buildHealth({ cfg, state, chatState, extras, dataDir })
+}