@minonl/dia 0.0.8 → 0.0.10

package/README.md

@@ -90,6 +90,18 @@ bash tests/smoke.sh     # 用 Node 跑一遍构建产物
 bun src/cli.ts version  # 直接跑源码
 ```
 
+### CI 矩阵（`.github/workflows/test.yml`）
+
+| job | 触发 | 是否 required | 说明 |
+|---|---|---|---|
+| `test (ubuntu-latest)` | PR | ✅ | 全量：单测 / kb / job / build / install / smoke / e2e |
+| `test (macos-latest)` | PR | ✅ | 同上（**macOS 特有差异只有这里能抓到**，例如没有 `timeout(1)`） |
+| `windows-smoke` | PR（代码改动） | ❌ 非阻塞 | 装依赖 + `dia --version` + 纯逻辑测试；`dia job` 的 Windows 后端尚未实现（`install` 返回 rc=3），落地后再升 required |
+| `changes` | PR | ❌ | 判定改动是否只碰 `docs/**` / `llms*.txt`：是则跳过测试矩阵（docs-only 快通道） |
+
+> 只在 `pull_request` 上跑（不再对特性分支的 push 重复跑）。
+> 改这里时**保持 `test (…)` 的 job 名不变**——分支保护按名字要求这两个 check。
+
 ## 命令
 
 ```bash

package/dist/cli.js

@@ -4720,6 +4720,67 @@ function build(opts = {}) {
   return { schema: 1, nodes: filteredNodes, edges: filteredEdges, cycles: findCycles(tasks) };
 }
 
+// src/graph-tui.ts
+var ORDER = ["doing", "blocked", "review", "todo", "awaiting_acceptance", "accepted", "done", "dropped", "rejected", "escalated"];
+var color = (s, code, on) => on ? `\x1B[${code}m${s}\x1B[0m` : s;
+function render2(g, opts = {}) {
+  const on = opts.color ?? false;
+  const tasks = g.nodes.filter((n) => n.kind === "task");
+  const taskById = new Map(tasks.map((t) => [t.id, t]));
+  const edgesFrom = (id, kind) => g.edges.filter((e) => e.from === id && e.kind === kind);
+  const lines = [];
+  const groups = new Map;
+  for (const t of tasks) {
+    const st = t.status || "todo";
+    groups.set(st, [...groups.get(st) || [], t]);
+  }
+  for (const st of [...ORDER.filter((s) => groups.has(s)), ...[...groups.keys()].filter((s) => !ORDER.includes(s))]) {
+    lines.push(color(`[${st}]`, "1;36", on));
+    for (const t of groups.get(st).sort((a, b) => a.label.localeCompare(b.label))) {
+      lines.push(`  ${color(t.label, "1", on)}  ${color(t.id.replace(/^task:/, ""), "2", on)}${t.owner ? `  owner=${t.owner}` : ""}`);
+      for (const e of edgesFrom(t.id, "depends_on")) {
+        const dep = taskById.get(e.to);
+        lines.push(`    ${color("↳ depends", "34", on)} ${dep?.label || e.to}${dep ? ` [${dep.status}]` : ""}`);
+      }
+      for (const e of edgesFrom(t.id, "touches"))
+        lines.push(`    ${color("↳ touches", "35", on)} ${e.to.replace(/^path:/, "")}`);
+      if (t.blocked_by?.length)
+        lines.push(`    ${color(`⚠ blocked_by ${t.blocked_by.join(", ")}`, "31", on)}`);
+    }
+    lines.push("");
+  }
+  if (!tasks.length)
+    lines.push("(no tasks)");
+  const claimEdges = g.edges.filter((e) => e.kind === "claims");
+  if (claimEdges.length) {
+    lines.push(color("claims", "1;36", on));
+    for (const e of claimEdges)
+      lines.push(`  ${e.from.replace(/^session:/, "")} → ${e.to.replace(/^path:/, "")}`);
+    lines.push("");
+  }
+  for (const c of g.cycles)
+    lines.push(color(`⚠ cycle: ${c.join(" -> ")}`, "31", on));
+  return lines.join(`
+`);
+}
+function watch(build, opts = {}) {
+  const paint = () => process.stdout.write("\x1B[2J\x1B[H" + render2(build(), { color: opts.color ?? process.stdout.isTTY }) + `
+`);
+  paint();
+  const timer = setInterval(() => {
+    try {
+      paint();
+    } catch {}
+  }, opts.intervalMs ?? 2000);
+  const stop = () => {
+    clearInterval(timer);
+    process.exit(0);
+  };
+  process.on("SIGINT", stop);
+  process.on("SIGTERM", stop);
+  return new Promise(() => {});
+}
+
 // packages/cli/src/index.ts
 init_paths();
 
@@ -5491,6 +5552,25 @@ function jobRootResolved() {
   const legacy = join24(homedir11(), ".local", "share", "dia-job");
   return !existsSync21(next) && existsSync21(legacy) ? legacy : next;
 }
+function runJobCapture(argv) {
+  const { bin, error } = jobBin();
+  if (!bin) {
+    process.stderr.write(`dia job: ${error || "未找到 dia-job；先跑 packages/job/install.sh 或设置 DIA_JOB_BIN"}
+`);
+    return { status: 2, stdout: "", stderr: "" };
+  }
+  const r = spawnSync2(bin, argv, {
+    encoding: "utf8",
+    stdio: ["inherit", "pipe", "pipe"],
+    env: { ...process.env, DIA_JOB_ROOT: jobRootResolved() }
+  });
+  if (r.error) {
+    process.stderr.write(`dia job: ${r.error.message}
+`);
+    return { status: 1, stdout: "", stderr: "" };
+  }
+  return { status: r.status ?? 1, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
+}
 function runJob(argv) {
   const { bin, error } = jobBin();
   if (!bin) {
@@ -6020,7 +6100,7 @@ function askBroker(req, timeoutMs = 5000) {
 }
 
 // packages/cli/src/index.ts
-import { execFileSync as execFileSync12, spawn as spawn2, spawnSync as spawnSync5 } from "node:child_process";
+import { execFileSync as execFileSync12, spawn as spawn3, spawnSync as spawnSync5 } from "node:child_process";
 import { mkdirSync as mkdirSync20, openSync as openSync3 } from "node:fs";
 import { basename as basename10, join as join32 } from "node:path";
 import { existsSync as existsSync29, readFileSync as readFileSync26 } from "node:fs";
@@ -7016,7 +7096,7 @@ function propose(opts = {}) {
 }
 
 // src/service.ts
-import { spawnSync as spawnSync4 } from "node:child_process";
+import { spawn as spawn2, spawnSync as spawnSync4 } from "node:child_process";
 import { createHash as createHash11, randomBytes as randomBytes4 } from "node:crypto";
 import {
   appendFileSync as appendFileSync9,
@@ -7041,6 +7121,52 @@ var ID_RE2 = /^[a-z0-9][a-z0-9-]*$/;
 var VERSION_RE = /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/;
 var LIFECYCLE_TYPES = new Set(["periodic", "bounded", "service"]);
 var STDIN_TYPES = new Set(["json", "text", "none"]);
+var ACP_HOSTS = ["dsh", "opencode"];
+var HEALTHCHECK_KINDS = new Set(["script", "acp"]);
+var isPlainObject = (v) => v !== null && typeof v === "object" && !Array.isArray(v);
+var isNonEmptyString = (v) => typeof v === "string" && v.trim() !== "";
+function acpAgentCommand(agent) {
+  if (!ACP_HOSTS.includes(agent?.host))
+    throw new Error(`E_MANIFEST: entry.agent.host must be ${ACP_HOSTS.join("|")}`);
+  const profile = agent.profile?.trim();
+  if (agent.host === "dsh")
+    return ["dsh", ...profile ? ["--profile", profile] : [], "acp"];
+  return ["opencode", "acp"];
+}
+var isAgentEntry = (e) => !!e && e.agent !== undefined && e.agent !== null;
+var healthcheckKind = (hc) => hc?.kind ?? "script";
+var entryCmdOf = (svc) => svc.entry.cmd ?? "";
+function checkAgentEntry(a) {
+  if (!isPlainObject(a))
+    throw new Error("E_MANIFEST: entry.agent must be an object");
+  if (!ACP_HOSTS.includes(a.host))
+    throw new Error(`E_MANIFEST: entry.agent.host must be ${ACP_HOSTS.join("|")}`);
+  for (const k of ["profile", "persona"]) {
+    if (a[k] !== undefined && !isNonEmptyString(a[k]))
+      throw new Error(`E_MANIFEST: entry.agent.${k} must be a non-empty string`);
+  }
+  if (a.host !== "dsh" && a.profile !== undefined) {
+    throw new Error(`E_MANIFEST: entry.agent.profile 只适用于 host=dsh（${a.host} 没有 profile）`);
+  }
+  return a;
+}
+function checkEntry(entry) {
+  if (!isPlainObject(entry))
+    throw new Error("E_MANIFEST: entry required");
+  const hasCmd = entry.cmd !== undefined && entry.cmd !== null;
+  const hasAgent = entry.agent !== undefined && entry.agent !== null;
+  if (hasCmd && hasAgent)
+    throw new Error("E_MANIFEST: entry.cmd 与 entry.agent 互斥，只能声明其一");
+  if (!hasCmd && !hasAgent)
+    throw new Error("E_MANIFEST: entry.cmd required（脚本型）或 entry.agent（agent 型）");
+  if (hasCmd) {
+    if (typeof entry.cmd !== "string" || !entry.cmd.trim())
+      throw new Error("E_MANIFEST: entry.cmd required");
+  } else {
+    checkAgentEntry(entry.agent);
+  }
+  return entry;
+}
 function entryDir() {
   return process.env.DIA_JOB_ENTRY_DIR || join31(jobRoot2(), "bin");
 }
@@ -7083,8 +7209,14 @@ var LEVELS = ["ok", "degraded", "fail"];
 function checkHealthcheck(hc) {
   if (hc === null || typeof hc !== "object" || Array.isArray(hc))
     throw new Error("E_MANIFEST: healthcheck must be an object");
-  if (typeof hc.cmd !== "string" || !hc.cmd.trim())
-    throw new Error("E_MANIFEST: healthcheck.cmd required");
+  if (hc.kind !== undefined && !HEALTHCHECK_KINDS.has(hc.kind))
+    throw new Error("E_MANIFEST: healthcheck.kind must be script|acp");
+  if (healthcheckKind(hc) === "script") {
+    if (typeof hc.cmd !== "string" || !hc.cmd.trim())
+      throw new Error("E_MANIFEST: healthcheck.cmd required");
+  } else if (hc.cmd !== undefined) {
+    throw new Error("E_MANIFEST: healthcheck.kind=acp 不得再声明 cmd（判据是 initialize + session/new，不是外部脚本）");
+  }
   if (hc.interval !== undefined) {
     const why = checkCronInterval(hc.interval);
     if (why)
@@ -7119,10 +7251,14 @@ function validateServiceManifest(m) {
     throw new Error("E_MANIFEST: bad id");
   if (!m.version || !VERSION_RE.test(m.version))
     throw new Error("E_MANIFEST: bad version");
-  if (m.entry === null || typeof m.entry !== "object" || Array.isArray(m.entry))
-    throw new Error("E_MANIFEST: entry required");
-  if (typeof m.entry.cmd !== "string" || !m.entry.cmd.trim())
-    throw new Error("E_MANIFEST: entry.cmd required");
+  checkEntry(m.entry);
+  const agentEntry = isAgentEntry(m.entry);
+  if (agentEntry && healthcheckKind(m.healthcheck) !== "acp") {
+    throw new Error('E_MANIFEST: entry.agent 必须配 healthcheck.kind="acp"（脚本型 healthcheck 无 cmd 可执行）');
+  }
+  if (!agentEntry && m.healthcheck && healthcheckKind(m.healthcheck) === "acp") {
+    throw new Error('E_MANIFEST: healthcheck.kind="acp" 只适用于 entry.agent 型服务');
+  }
   if (m.lifecycle === null || typeof m.lifecycle !== "object" || Array.isArray(m.lifecycle))
     throw new Error("E_MANIFEST: lifecycle required");
   if (!LIFECYCLE_TYPES.has(m.lifecycle.type))
@@ -7237,7 +7373,18 @@ var STALE_FACTOR = 1.5;
 var MIN_HEALTH_INTERVAL = 60;
 var healthInterval = (hc) => hc?.interval ?? DEFAULT_HEALTH_INTERVAL;
 var staleAfter = (hc) => Math.floor(healthInterval(hc) * STALE_FACTOR);
-var isRecord = (v) => !!v && typeof v === "object" && v.kind === "health" && typeof v.state === "string";
+var isRecord = (v) => !!v && typeof v === "object" && v.kind === "health" && (v.state === "ok" || v.state === "degraded" || v.state === "fail");
+var TS_RE = /"ts"\s*:\s*(-?\d+)/;
+var KIND_RE = /"kind"\s*:\s*"([A-Za-z0-9_-]+)"/;
+function parseStateLine(line) {
+  const head = line.slice(0, 256), tail = line.slice(-256);
+  const ts = TS_RE.exec(head)?.[1] ?? TS_RE.exec(tail)?.[1];
+  const kind = KIND_RE.exec(head)?.[1] ?? KIND_RE.exec(tail)?.[1];
+  if (!ts || !kind)
+    return null;
+  const n = Number(ts);
+  return Number.isFinite(n) ? { ts: n, kind } : null;
+}
 function findLastHealth(lines, service, gen) {
   for (let i = lines.length - 1;i >= 0; i--) {
     const r = lines[i];
@@ -7422,6 +7569,24 @@ function diaCmd() {
   const entry = entries.find((p) => existsSync28(p));
   return entry ? `${q(process.execPath)} ${q(entry)}` : "dia";
 }
+function decorateStatus(text, view) {
+  const lines = String(text ?? "").split(`
+`);
+  const outLines = [];
+  for (const line of lines) {
+    outLines.push(line);
+    const m = line.match(/local\.dia-job-svc-([A-Za-z0-9._-]+)/) || line.match(/(?:^|\s)svc-([A-Za-z0-9._-]+)\s/);
+    if (!m)
+      continue;
+    try {
+      const v = view(m[1]);
+      if (v?.label)
+        outLines.push(`      health=${v.label}`);
+    } catch {}
+  }
+  return outLines.join(`
+`);
+}
 function servicesRoot() {
   return process.env.DIA_SERVICE_HOME || join31(diaHome(), "services");
 }
@@ -7456,15 +7621,34 @@ function readHealthLines(file) {
   if (!existsSync28(file))
     return [];
   const rows = [];
-  for (const line of readFileSync25(file, "utf8").split(`
-`)) {
+  const lines = readFileSync25(file, "utf8").split(`
+`);
+  for (const line of lines) {
     if (!line.trim())
       continue;
     try {
       const d = JSON.parse(line);
       if (isRecord(d))
         rows.push(d);
+      continue;
     } catch {}
+    const head = parseStateLine(line);
+    const state = head ? /"state"\s*:\s*"(ok|degraded|fail)"/.exec(line)?.[1] : undefined;
+    if (head && state) {
+      rows.push({
+        ...head,
+        state,
+        service: "",
+        gen: "",
+        source: "schedule",
+        candidate: state,
+        streak: 0,
+        raw: state,
+        exit: null,
+        timeout: false,
+        detail: ""
+      });
+    }
   }
   return rows;
 }
@@ -7473,6 +7657,41 @@ function appendHealthRecord(file, rec) {
   appendFileSync9(file, JSON.stringify(rec) + `
 `);
 }
+function readServiceHealth(id, opts = {}) {
+  const { healthFile } = opts;
+  const now = opts.now ?? Math.floor(Date.now() / 1000);
+  const jr = opts.jobRoot ?? jobRoot2();
+  const dir = opts.servicesRoot ?? (process.env.DIA_SERVICE_HOME || join31(jr, "services"));
+  const installDir = join31(dir, id);
+  let lock = null;
+  try {
+    lock = readLockFile(id);
+  } catch {}
+  let svc = null;
+  try {
+    svc = readServiceManifest(lock?.dir ?? installDir);
+  } catch {}
+  if (!svc)
+    return healthView({ adopted: true, hasHealthcheck: false, now });
+  const hc = svc?.healthcheck;
+  if (!hc)
+    return healthView({ hasHealthcheck: false, now });
+  const ledger = healthFile ?? healthStatePath(id);
+  const recs = readHealthLines(ledger).filter(isRecord);
+  let rec = lock ? findLastHealth(recs, id, lock.gen) : null;
+  if (!rec) {
+    for (let i = recs.length - 1;i >= 0; i--) {
+      const r = recs[i];
+      if (r.state !== "ok" && r.state !== "degraded" && r.state !== "fail")
+        continue;
+      if (r.service && r.service !== id)
+        continue;
+      if (!rec || r.ts > rec.ts)
+        rec = r;
+    }
+  }
+  return healthView({ record: rec, hasHealthcheck: true, hc, now });
+}
 function listServices(opts = {}) {
   const root = opts.servicesRoot ?? servicesRoot();
   const jr = opts.jobRoot ?? jobRoot2();
@@ -7641,6 +7860,134 @@ function runHealth(svc, opts) {
   }
   return { judgement, report, stdout, stderr, ms };
 }
+async function runAcpHealth(svc, opts) {
+  const hc = svc.healthcheck;
+  if (!hc || healthcheckKind(hc) !== "acp")
+    throw new Error("E_MANIFEST: runAcpHealth 只处理 healthcheck.kind=acp");
+  const agent = svc.entry.agent;
+  if (!agent)
+    throw new Error("E_MANIFEST: healthcheck.kind=acp 需要 entry.agent");
+  const timeoutMs = (hc.timeout ?? DEFAULT_HEALTH_TIMEOUT) * 1000;
+  const now = opts.now ?? Date.now;
+  const t0 = now();
+  const argv = acpAgentCommand(agent);
+  const env = { ...process.env, ...opts.env ?? {} };
+  const steps = [];
+  const finish = (status, exit) => {
+    const judgement = {
+      ...judgeHealth(exit, {}),
+      state: status,
+      exit,
+      timeout: false,
+      detail: steps.filter((x) => x.state !== "ok").map((x) => `${x.step}: ${x.detail}`).join("; ") || `initialize + session/new ok（${agent.host}${agent.profile ? " --profile " + agent.profile : ""}）`
+    };
+    return { judgement, report: { status, checks: steps.map((x) => ({ name: x.step, status: x.state, detail: x.detail })) }, ms: now() - t0, steps };
+  };
+  const child = spawn2(argv[0], argv.slice(1), { cwd: opts.dir, env, stdio: ["pipe", "pipe", "pipe"] });
+  const pending = new Map;
+  let buf = "";
+  child.stdout.setEncoding("utf8");
+  child.stdout.on("data", (chunk) => {
+    buf += chunk;
+    for (let i = buf.indexOf(`
+`);i >= 0; i = buf.indexOf(`
+`)) {
+      const line = buf.slice(0, i).trim();
+      buf = buf.slice(i + 1);
+      if (!line)
+        continue;
+      let msg;
+      try {
+        msg = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      const waiter = msg && msg.id !== undefined ? pending.get(msg.id) : undefined;
+      if (waiter) {
+        pending.delete(msg.id);
+        waiter(msg);
+      }
+    }
+  });
+  const spawnError = await new Promise((resolve) => {
+    let settled = false;
+    const done = (v) => {
+      if (!settled) {
+        settled = true;
+        resolve(v);
+      }
+    };
+    child.once("error", (e) => done(String(e?.message || e)));
+    child.once("spawn", () => done(null));
+    setTimeout(() => done(null), 50);
+  });
+  if (spawnError)
+    return steps.push({ step: "initialize", state: "degraded", detail: `端点起不来：${spawnError}` }), finish("degraded", 20);
+  const call = (id, method, params) => new Promise((resolve) => {
+    const timer = setTimeout(() => {
+      pending.delete(id);
+      resolve({ timeout: true });
+    }, timeoutMs);
+    pending.set(id, (m) => {
+      clearTimeout(timer);
+      resolve(m);
+    });
+    try {
+      child.stdin.write(JSON.stringify({ jsonrpc: "2.0", id, method, params }) + `
+`);
+    } catch (e) {
+      clearTimeout(timer);
+      pending.delete(id);
+      resolve({ died: String(e?.message || e) });
+    }
+  });
+  try {
+    const init = await call(1, "initialize", { protocolVersion: 1, clientCapabilities: {} });
+    if (init.timeout)
+      steps.push({ step: "initialize", state: "degraded", detail: "initialize 超时" });
+    else if (init.died)
+      steps.push({ step: "initialize", state: "degraded", detail: `端点已退出：${init.died}` });
+    else if (init.error)
+      steps.push({ step: "initialize", state: "degraded", detail: `initialize 报错：${init.error?.message ?? JSON.stringify(init.error)}` });
+    else if (!init.result)
+      steps.push({ step: "initialize", state: "degraded", detail: "initialize 无 result" });
+    else
+      steps.push({ step: "initialize", state: "ok", detail: "initialize ok" });
+    if (steps[0].state !== "ok")
+      return finish("degraded", 20);
+    const ns = await call(2, "session/new", { cwd: opts.dir, mcpServers: [] });
+    if (ns.timeout)
+      steps.push({ step: "session/new", state: "fail", detail: "session/new 超时" });
+    else if (ns.error)
+      steps.push({ step: "session/new", state: "fail", detail: `session/new 报错：${ns.error?.message ?? JSON.stringify(ns.error)}` });
+    else if (!ns.result?.sessionId)
+      steps.push({ step: "session/new", state: "fail", detail: "session/new 未返回 sessionId" });
+    else
+      steps.push({ step: "session/new", state: "ok", detail: `session ${ns.result.sessionId}` });
+    return steps[1].state === "ok" ? finish("ok", 0) : finish("fail", 21);
+  } finally {
+    try {
+      child.kill("SIGKILL");
+    } catch {}
+  }
+}
+function recordHealth(svc, judgement, opts = {}) {
+  const id = svc.id;
+  const gen = opts.gen || generationOf(id);
+  const now = opts.now ?? Math.floor(Date.now() / 1000);
+  const file = opts.stateFile || process.env.DIA_SERVICE_HEALTH_FILE || healthStatePath(id);
+  const record = transition(findLastHealth(readHealthLines(file), id, gen), {
+    service: id,
+    gen,
+    source: opts.source ?? "manual",
+    ts: now,
+    judgement,
+    debounce: svc.healthcheck?.debounce,
+    checks: opts.checks
+  });
+  appendHealthRecord(file, record);
+  return { record, statePath: file };
+}
 function whichTimeout1() {
   const probe = spawnSync4("bash", ["-c", "command -v timeout || command -v gtimeout"], { encoding: "utf8" });
   const p = String(probe.stdout ?? "").trim().split(`
@@ -7699,7 +8046,7 @@ function collectManagedFiles(base, hc) {
 }
 function verify4(dir, opts = {}) {
   const svc = readServiceManifest(dir);
-  const entry = resolveEntry(svc.entry.cmd, dir);
+  const entry = resolveEntry(entryCmdOf(svc), dir);
   const drift = [];
   if (!existsSync28(entry.path))
     drift.push({ code: "entry_missing", detail: `entry 不存在：${entry.path}` });
@@ -7802,7 +8149,7 @@ function add2(opts) {
   }
   if (svc.healthcheck)
     healthJobInterval(svc);
-  const entry = resolveEntry(svc.entry.cmd, dir);
+  const entry = resolveEntry(entryCmdOf(svc), dir);
   if (!existsSync28(entry.path))
     throw new Error(`E_UNSTABLE_ENTRY: entry 不存在：${entry.path}`);
   if (!isExecutableFile(entry.path))
@@ -7816,7 +8163,7 @@ function add2(opts) {
     gen,
     dryRun: !!opts.dryRun,
     backend,
-    entry: { declared: svc.entry.cmd, kind: entry.kind, path: entry.path, link: null },
+    entry: { declared: entryCmdOf(svc), kind: entry.kind, path: entry.path, link: null },
     jobs: { service: serviceJobName(svc.id), health: svc.healthcheck ? healthJobName(svc.id) : null },
     target_mismatch: mismatch
   };
@@ -7825,7 +8172,7 @@ function add2(opts) {
       rmSync9(dir, { recursive: true, force: true });
     return result;
   }
-  const backfill = ["--allow-unstable", "--desc", `dia service ${svc.id}: healthcheck 只读判定，稳定入口 ${entryPathOf(svc.entry.cmd, dir)}`];
+  const backfill = ["--allow-unstable", "--desc", `dia service ${svc.id}: healthcheck 只读判定，稳定入口 ${entryPathOf(entryCmdOf(svc), dir)}`];
   const runner = opts.runner ?? defaultRunner({ backfill });
   const installed = [];
   const fail = (code, msg, rc) => {
@@ -7842,7 +8189,7 @@ function add2(opts) {
     entryPath = linkEntry(entry.path);
     result.entry.link = entryPath;
     result.entry.path = entryPath;
-  } else if (svc.entry.cmd.startsWith(entryDir())) {
+  } else if (entryCmdOf(svc).startsWith(entryDir())) {
     result.entry.link = entry.path;
   }
   const jobArgs = (name, cmd) => {
@@ -8159,13 +8506,13 @@ usage:
   dia collab status|enable|disable [--persona ID]   # dia-msg 默认能力开关（默认开）
   dia whoami [--json] [--name NAME]   # 当前会话身份（session id）
   dia in [--unread] [--all] [--legacy] [--json]   # 会话收件箱（正文内联）
-  dia out --to <session_id> --subject S (--body B|--body-file F) [--kind K] [--reply-to ID]
+  dia out --to <session_id> --subject S (--body B|--body-file F) [--kind K] [--touch p1,p2] [--reply-to ID]
   dia ack <id> | dia reply <id> --body B | dia close <id> --reason R | dia show <id>
   dia msg send|show|inbox|ack|delivered|deliver [--wait]|reply|needs-info|status|stuck|thread|escalate|agents|migrate
   dia agents list|register|unregister|discover
   dia msg deliver <agent> <id> [--transport tmux|acp]
   dia task add|list|link|status|done [--owner S] [--depends a,b] [--touches p1,p2]
-  dia graph [--json] [--task t-...]
+  dia graph [--json] [--task t-...] [--tui [--watch] [--no-color]]
   dia claim <path> [--reason R] [--ttl 4h] [--session S] | dia claims [--all] [--mine] | dia unclaim <path|id> [--force]
   dia team run <id> --mock | --acp|--dsh --workspace DIR
   dia team gate|accept|reject|next
@@ -8558,6 +8905,19 @@ async function taskCli(argv) {
 }
 async function graphCli(argv) {
   const asJson = has(argv, "--json");
+  if (has(argv, "--tui") || has(argv, "--watch")) {
+    const paint = (g) => out(render2(g, { color: !!process.stdout.isTTY && !has(argv, "--no-color") }));
+    try {
+      if (has(argv, "--watch"))
+        return await watch(() => build({ task: flag(argv, "--task") }), { color: !!process.stdout.isTTY && !has(argv, "--no-color") });
+      const g = build({ task: flag(argv, "--task") });
+      paint(g);
+      return g.cycles.length ? 3 : 0;
+    } catch (e) {
+      err(e?.message || String(e));
+      return String(e?.message || e).startsWith("E_GRAPH") ? 2 : 31;
+    }
+  }
   try {
     const g = build({ task: flag(argv, "--task") });
     if (asJson)
@@ -8644,7 +9004,7 @@ function spawnDetachedDelivery(args) {
   const log = join32(dir, `deliver-${id}.log`);
   const fd = openSync3(log, "a");
   const bin = process.argv[1];
-  const child = spawn2(process.execPath, [bin, "msg", "deliver", ...args, "--wait"], {
+  const child = spawn3(process.execPath, [bin, "msg", "deliver", ...args, "--wait"], {
     detached: true,
     stdio: ["ignore", fd, fd],
     env: process.env
@@ -8934,6 +9294,13 @@ async function collabCli(argv) {
       i++;
     }
   }
+  const touchPaths = [...flags(args, "--touch"), ...(flag(args, "--touches") || "").split(",")].map((x) => x.trim()).filter(Boolean);
+  if (touchPaths.length)
+    refs.touches = touchPaths.join(",");
+  const refPaths = (m) => [
+    ...(m.refs?.touches || "").split(","),
+    ...m.refs?.path ? [m.refs.path] : []
+  ].map((x) => x.trim()).filter(Boolean);
   const view = (m) => ({ ...m, body: bodyOf(m) });
   const print = (m) => {
     out(`${m.id}	[${m.state}]	${m.subject}`);
@@ -8942,6 +9309,12 @@ async function collabCli(argv) {
     out(`  kind: ${m.kind}${m.requires_reply ? "  需回复" : ""}${m.deadline ? `  deadline=${m.deadline}` : ""}  thread=${m.thread_id}#${m.seq}`);
     if (m.refs && Object.keys(m.refs).length)
       out(`  refs: ${Object.entries(m.refs).map(([k, v]) => `${k}=${v}`).join(" ")}`);
+    const touches = refPaths(m);
+    if (touches.length) {
+      const held = list3({}).filter((c) => touches.includes(c.path) && c.holder !== m.to.session_id);
+      for (const c of held)
+        out(`  ⚠ claim: ${c.path} 由 ${c.holder} 持有（${c.reason || "no reason"}）`);
+    }
     const body = bodyOf(m);
     if (body) {
       const max = 4000;
@@ -9044,7 +9417,14 @@ async function collabCli(argv) {
         idempotencyKey: flag(args, "--idempotency-key"),
         hops: flag(args, "--hops") ? Number(flag(args, "--hops")) : undefined
       });
-      out(asJson ? JSON.stringify(m, null, 1) : `${m.id}	${m.thread_id}#${m.seq}	${m.from.session_id} → ${m.to.session_id}	${m.kind}	${m.subject}`);
+      const overlaps = list3({}).filter((c) => touchPaths.includes(c.path) && c.holder !== m.from.session_id);
+      if (asJson)
+        out(JSON.stringify(overlaps.length ? { ...m, claim_overlaps: overlaps } : m, null, 1));
+      else {
+        out(`${m.id}	${m.thread_id}#${m.seq}	${m.from.session_id} → ${m.to.session_id}	${m.kind}	${m.subject}`);
+        for (const c of overlaps)
+          out(`  ⚠ claim overlap: ${c.path} 由 ${c.holder} 持有（${c.reason || "no reason"}）`);
+      }
       return 0;
     }
     if (sub === "ack") {
@@ -9638,6 +10018,18 @@ async function serviceCli(argv) {
       }
       const fromWrapper = has(args, "--from-wrapper");
       const ex = flag(args, "--exit");
+      const dir = serviceDir(id);
+      const svc = readServiceManifest(dir);
+      if (healthcheckKind(svc.healthcheck) === "acp" && !fromWrapper) {
+        const run = await runAcpHealth(svc, { dir });
+        const rec = recordHealth(svc, run.judgement, { gen: flag(args, "--gen"), stateFile: flag(args, "--state-file") });
+        const code = run.judgement.state === "ok" ? 0 : run.judgement.state === "degraded" ? 30 : 1;
+        if (asJson)
+          out(JSON.stringify({ id, verdict: run.judgement.state, shown: rec.record.state, exit: run.judgement.exit, detail: run.judgement.detail, steps: run.steps }, null, 1));
+        else
+          out(`${id}: ${run.judgement.state}（shown=${rec.record.state}${run.judgement.detail ? ", " + run.judgement.detail : ""}）`);
+        return code;
+      }
       const r = runServiceHealth(id, {
         wrapperExit: fromWrapper ? Number(ex ?? "1") : undefined,
         gen: flag(args, "--gen"),
@@ -10086,8 +10478,19 @@ async function main(rawArgv) {
     return agentsCli(argv.slice(1));
   if (cmd === "team")
     return teamCli(argv.slice(1));
-  if (cmd === "job")
-    return runJob(argv.slice(1));
+  if (cmd === "job") {
+    const rest = argv.slice(1);
+    if (rest[0] === "status" || rest[0] === "list") {
+      const r = runJobCapture(rest);
+      if (r.stderr)
+        process.stderr.write(r.stderr);
+      const text = decorateStatus(r.stdout, (id) => readServiceHealth(id));
+      if (text)
+        out(text.replace(/\n$/, ""));
+      return r.status;
+    }
+    return runJob(rest);
+  }
   if (cmd === "price") {
     const table = loadPrices();
     if (has(argv.slice(1), "--json"))

package/docs/index.md

@@ -31,7 +31,7 @@ Agent 入口：[`llms.txt`](https://github.com/minonl/dia/blob/main/llms.txt)（
 | [价目表（tokens → 金额）](pricing.md) | 原则：没有价格就不编造；unpriced 明确记录，预算按 tokens 兜底。 |
 | [目标提案（team next）](proposals.md) | 定位：团队可以提候选，不能定目标。 |
 | [Sandbox 细化设计（dia）](security-sandbox.md) | 依据：dsh 本机源码实测、Hermes/Pi 取证、[/tmp/dia-sbx 实验]。 |
-| [服务（service）：可托管的执行体](service-noun.md) | 状态：提案（设计，未实现）。只做脚本型服务；healthcheck 按专用退出码域判定，旧结果超新鲜度窗口即报 stale。 |
+| [服务（service）：可托管的执行体](service-noun.md) | 状态：已实现（v0.0.10，脚本型 + agent 型）。脚本型走 entry.cmd，agent 型走 entry.agent + healthcheck.kind="acp"； |
 | [dia 状态页（单一事实源）](status.md) | 任何"现在做到哪了"的问题，以本页为准；其他文档是细节。 |
 | [全自动团队：人只在验收介入](team-automation.md) | 目标：计划→实现→验证→对抗→修复全自动循环；人只在验收阶段拍板。 |
 | [团队章程：谁来做 dia（开发团队）](team.md) | 2026-10-28 升级：开发团队执行模式改为全自动循环（计划→实现→验证→对抗→修复），人只在验收阶段介入； |