@minonl/dia 0.0.9 → 0.0.11

package/dist/cli.js

@@ -4392,7 +4392,7 @@ function migrateLegacy(opts = {}) {
 
 // src/claims.ts
 init_paths();
-import { appendFileSync as appendFileSync5, existsSync as existsSync14, mkdirSync as mkdirSync13, readFileSync as readFileSync13 } from "node:fs";
+import { appendFileSync as appendFileSync5, existsSync as existsSync14, mkdirSync as mkdirSync13, readFileSync as readFileSync13, renameSync as renameSync7, writeFileSync as writeFileSync11 } from "node:fs";
 import { execFileSync as execFileSync4 } from "node:child_process";
 import { randomBytes as randomBytes3 } from "node:crypto";
 import { basename as basename7, join as join16, relative as relative5, resolve as resolve9, sep as sep7 } from "node:path";
@@ -4510,6 +4510,58 @@ function unclaim(target, opts = {}) {
     return { ...hit, released_at: new Date().toISOString() };
   });
 }
+function compact(opts = {}) {
+  const days = Math.max(0, Number(opts.days ?? 7));
+  const now = opts.now || new Date;
+  const cutoff = now.getTime() - days * 86400000;
+  return withLock("claims", () => {
+    const f = file();
+    if (!existsSync14(f))
+      return { before: 0, after: 0, dropped: 0 };
+    const raw = readFileSync13(f, "utf8");
+    const lines = raw.split(`
+`).filter((l) => l.trim());
+    const keepIds = new Set;
+    for (const line of lines) {
+      let e;
+      try {
+        e = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      if (e.event !== "claim" || !e.id)
+        continue;
+      const created = new Date(e.created_at || e.ts).getTime();
+      if (isActive({ id: e.id, path: e.path || "", scope: e.scope || "", holder: e.holder || "", created_at: e.created_at || e.ts, expires_at: e.expires_at || e.ts }, now.getTime()) || created > cutoff) {
+        keepIds.add(e.id);
+      }
+    }
+    const kept = [];
+    let dropped = 0;
+    for (const line of lines) {
+      let e;
+      try {
+        e = JSON.parse(line);
+      } catch {
+        dropped++;
+        continue;
+      }
+      if (e.id && keepIds.has(e.id))
+        kept.push(line);
+      else
+        dropped++;
+    }
+    if (dropped) {
+      const tmp = `${f}.tmp.${process.pid}`;
+      writeFileSync11(tmp, kept.join(`
+`) + (kept.length ? `
+` : ""), { mode: 384 });
+      renameSync7(tmp, f);
+    }
+    const after = existsSync14(f) ? readFileSync13(f, "utf8").length : 0;
+    return { before: raw.length, after, dropped };
+  });
+}
 
 // src/task.ts
 init_paths();
@@ -4786,7 +4838,7 @@ init_paths();
 
 // src/agents.ts
 init_paths();
-import { existsSync as existsSync16, mkdirSync as mkdirSync15, readdirSync as readdirSync9, readFileSync as readFileSync15, renameSync as renameSync7, rmSync as rmSync6, writeFileSync as writeFileSync11 } from "node:fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync15, readdirSync as readdirSync9, readFileSync as readFileSync15, renameSync as renameSync8, rmSync as rmSync6, writeFileSync as writeFileSync12 } from "node:fs";
 import { basename as basename8, join as join18, resolve as resolve10 } from "node:path";
 import { execFileSync as execFileSync5 } from "node:child_process";
 var agentsRoot2 = () => agentsRoot();
@@ -4794,8 +4846,8 @@ var fileOf = (agent) => join18(agentsRoot2(), `${agent}.json`);
 function atomicWrite2(path, data) {
   mkdirSync15(join18(path, ".."), { recursive: true });
   const tmp = `${path}.tmp.${process.pid}`;
-  writeFileSync11(tmp, data);
-  renameSync7(tmp, path);
+  writeFileSync12(tmp, data);
+  renameSync8(tmp, path);
 }
 function sh(cmd, args) {
   try {
@@ -4893,7 +4945,7 @@ function discoverTmux() {
 
 // src/tmux.ts
 import { execFileSync as execFileSync6 } from "node:child_process";
-import { mkdtempSync, writeFileSync as writeFileSync12 } from "node:fs";
+import { mkdtempSync, writeFileSync as writeFileSync13 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
 import { join as join19 } from "node:path";
 function tmux(args) {
@@ -4939,7 +4991,7 @@ function deliver(agent, id, opts = {}) {
 `);
   const dir = mkdtempSync(join19(tmpdir2(), "dia-msg-"));
   const buf = join19(dir, "body.txt");
-  writeFileSync12(buf, text);
+  writeFileSync13(buf, text);
   try {
     tmux(["load-buffer", "-b", `dia-${m.id}`, buf]);
     tmux(["paste-buffer", "-p", "-b", `dia-${m.id}`, "-t", pane]);
@@ -5404,7 +5456,7 @@ function checks(reg) {
 
 // src/deps.ts
 init_paths();
-import { existsSync as existsSync20, readFileSync as readFileSync18, mkdirSync as mkdirSync16, writeFileSync as writeFileSync13, chmodSync as chmodSync3 } from "node:fs";
+import { existsSync as existsSync20, readFileSync as readFileSync18, mkdirSync as mkdirSync16, writeFileSync as writeFileSync14, chmodSync as chmodSync3 } from "node:fs";
 import { homedir as homedir10 } from "node:os";
 import { dirname as dirname11, join as join23 } from "node:path";
 import { execFileSync as execFileSync9 } from "node:child_process";
@@ -5511,7 +5563,7 @@ function append4(entry, p) {
   const line = JSON.stringify(entry) + `
 `;
   const prev = existsSync20(path) ? readFileSync18(path, "utf8") : "";
-  writeFileSync13(path, prev.endsWith(`
+  writeFileSync14(path, prev.endsWith(`
 `) || !prev ? prev + line : prev + `
 ` + line);
   try {
@@ -5847,7 +5899,7 @@ function run2(cfg, cmd, opts = {}) {
 }
 
 // src/bw.ts
-import { chmodSync as chmodSync4, existsSync as existsSync24, mkdirSync as mkdirSync17, readFileSync as readFileSync21, rmSync as rmSync7, writeFileSync as writeFileSync14 } from "node:fs";
+import { chmodSync as chmodSync4, existsSync as existsSync24, mkdirSync as mkdirSync17, readFileSync as readFileSync21, rmSync as rmSync7, writeFileSync as writeFileSync15 } from "node:fs";
 init_paths();
 import { join as join27 } from "node:path";
 import { execFileSync as execFileSync10 } from "node:child_process";
@@ -5869,7 +5921,7 @@ function readSession2() {
 function writeSession(key) {
   const f = sessionFile2();
   mkdirSync17(join27(f, ".."), { recursive: true });
-  writeFileSync14(f, key + `
+  writeFileSync15(f, key + `
 `, { mode: 384 });
   chmodSync4(f, 384);
 }
@@ -6100,7 +6152,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";
@@ -6108,7 +6160,7 @@ import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { resolve as resolvePath, sep as pathSep } from "node:path";
 
 // src/team.ts
-import { appendFileSync as appendFileSync8, cpSync as cpSync3, existsSync as existsSync26, mkdirSync as mkdirSync18, readFileSync as readFileSync23, readdirSync as readdirSync11, rmSync as rmSync8, writeFileSync as writeFileSync15 } from "node:fs";
+import { appendFileSync as appendFileSync8, cpSync as cpSync3, existsSync as existsSync26, mkdirSync as mkdirSync18, readFileSync as readFileSync23, readdirSync as readdirSync11, rmSync as rmSync8, writeFileSync as writeFileSync16 } from "node:fs";
 import { homedir as homedir15, tmpdir as tmpdir3 } from "node:os";
 import { join as join29, resolve as resolve14 } from "node:path";
 
@@ -6161,23 +6213,23 @@ function runMock(id) {
   const t = get2(id);
   const dir = runDir(id);
   mkdirSync18(dir, { recursive: true, mode: 448 });
-  writeFileSync15(join29(dir, "plan.md"), `# Plan: ${t.title}
+  writeFileSync16(join29(dir, "plan.md"), `# Plan: ${t.title}
 
 - judge: ${t.judge || "(missing)"}
 - roles: planner → builder → verifier → redteam
 `);
-  writeFileSync15(join29(dir, "diff.patch"), `# mock diff
+  writeFileSync16(join29(dir, "diff.patch"), `# mock diff
 `);
-  writeFileSync15(join29(dir, "test.log"), `mock tests: 0 failures
+  writeFileSync16(join29(dir, "test.log"), `mock tests: 0 failures
 `);
-  writeFileSync15(join29(dir, "verify.json"), JSON.stringify({ conclusion: "通过", commit: "mock", evidence: ["mock test.log"] }, null, 1));
-  writeFileSync15(join29(dir, "redteam.json"), JSON.stringify({ findings: [] }, null, 1));
-  writeFileSync15(join29(dir, "packet.md"), `# 验收包 ${id}
+  writeFileSync16(join29(dir, "verify.json"), JSON.stringify({ conclusion: "通过", commit: "mock", evidence: ["mock test.log"] }, null, 1));
+  writeFileSync16(join29(dir, "redteam.json"), JSON.stringify({ findings: [] }, null, 1));
+  writeFileSync16(join29(dir, "packet.md"), `# 验收包 ${id}
 
 - 结论：通过（mock）
 - 风险：无
 `);
-  writeFileSync15(join29(dir, "run.json"), JSON.stringify({ mock: true, judge: t.judge || null, ts: new Date().toISOString() }, null, 1));
+  writeFileSync16(join29(dir, "run.json"), JSON.stringify({ mock: true, judge: t.judge || null, ts: new Date().toISOString() }, null, 1));
   status3(id, "awaiting_acceptance", "mock run");
   return dir;
 }
@@ -6197,7 +6249,7 @@ function runJudgeSafe(workspace, judge) {
   }
 }
 function writeUsage(dir, id, acc) {
-  writeFileSync15(join29(dir, "usage.json"), JSON.stringify({ task_id: id, calls: acc.rows.length, input_tokens: acc.input, output_tokens: acc.output, total_tokens: acc.total, cost_usd: acc.cost, unpriced_calls: acc.unpriced, by_role: acc.rows }, null, 1));
+  writeFileSync16(join29(dir, "usage.json"), JSON.stringify({ task_id: id, calls: acc.rows.length, input_tokens: acc.input, output_tokens: acc.output, total_tokens: acc.total, cost_usd: acc.cost, unpriced_calls: acc.unpriced, by_role: acc.rows }, null, 1));
 }
 function judgeWorkspace(dir, fallback) {
   try {
@@ -6269,8 +6321,8 @@ function gate(id) {
     exit = typeof e?.status === "number" ? e.status : 1;
     out = String(e?.stdout || e?.message || "");
   }
-  writeFileSync15(join29(dir, "judge.json"), JSON.stringify({ source: "gate", command: judgeCmd, exit, ms: Date.now() - started, ts: new Date().toISOString() }, null, 1));
-  writeFileSync15(join29(dir, "judge.log"), out.slice(0, 20000));
+  writeFileSync16(join29(dir, "judge.json"), JSON.stringify({ source: "gate", command: judgeCmd, exit, ms: Date.now() - started, ts: new Date().toISOString() }, null, 1));
+  writeFileSync16(join29(dir, "judge.log"), out.slice(0, 20000));
   if (exit !== 0)
     return { ok: false, reason: `judge exit: ${exit}（见 judge.log）` };
   return { ok: true };
@@ -6377,7 +6429,7 @@ function snapPath(id, dir, tag) {
     list = [];
   }
   list.push(p);
-  writeFileSync15(f, JSON.stringify(list, null, 1));
+  writeFileSync16(f, JSON.stringify(list, null, 1));
   return p;
 }
 function snapshotWorkspace(src, dest) {
@@ -6415,17 +6467,17 @@ async function repairRedteamHighs(o) {
   await o.builderFix(high);
   const workspace = judgeWorkspace(dir, o.workspace);
   const jr = runJudgeSafe(workspace, judge);
-  writeFileSync15(join29(dir, "test.log"), `judge: ${judge}
+  writeFileSync16(join29(dir, "test.log"), `judge: ${judge}
 exit=${jr.code}
 ${jr.out}`.slice(0, 20000));
   const diff2 = gitDiff(workspace);
-  writeFileSync15(join29(dir, "diff.patch"), diff2);
+  writeFileSync16(join29(dir, "diff.patch"), diff2);
   const ws2 = snapshotWorkspace(workspace, snapPath(id, dir, "redteam-ws-2"));
   const p2 = await o.round2(ws2, diff2);
   redteam = { ...normalizeRedteam(p2.value), repaired: p2.repaired, round: 2 };
-  writeFileSync15(join29(dir, "redteam.json"), JSON.stringify(redteam, null, 1));
+  writeFileSync16(join29(dir, "redteam.json"), JSON.stringify(redteam, null, 1));
   if (jr.code !== 0 || highFindings(redteam).length) {
-    writeFileSync15(join29(dir, "packet.md"), `# 验收包 ${id}
+    writeFileSync16(join29(dir, "packet.md"), `# 验收包 ${id}
 
 - 任务：${t.title}
 - 结论：**已升级**（redteam 修复后仍不达标）
@@ -6523,7 +6575,7 @@ Keep exploration bounded (at most 3 reads); return only the JSON object now.`);
       });
       plan = planned.value;
     } catch (e) {
-      writeFileSync15(join29(dir, "packet.md"), `# 验收包 ${id}
+      writeFileSync16(join29(dir, "packet.md"), `# 验收包 ${id}
 
 - 任务：${t.title}
 - 结论：**已升级**（planner 输出无法解析）
@@ -6533,7 +6585,7 @@ Keep exploration bounded (at most 3 reads); return only the JSON object now.`);
       status3(id, "escalated", "planner: " + e.message);
       return { dir, escalated: true, error: e.message };
     }
-    writeFileSync15(join29(dir, "plan.md"), `# Plan
+    writeFileSync16(join29(dir, "plan.md"), `# Plan
 
 ${JSON.stringify(plan, null, 1)}
 `);
@@ -6551,7 +6603,7 @@ Plan: ${JSON.stringify(plan)}
 Judge: ${judge}${fix}
 Report briefly what you changed and test results.`);
       recordModelCall(id, `builder-${round}`, modelOf(buildNs), buildOut.usage, usageAcc, prices);
-      writeFileSync15(join29(dir, `builder-${round}.md`), buildOut.text || "(no output)");
+      writeFileSync16(join29(dir, `builder-${round}.md`), buildOut.text || "(no output)");
       const vws = snapshotWorkspace(workspace, snapPath(id, dir, `verify-ws-${round}`));
       const verifyNs = await acp.newSession(vws);
       const sVerify = verifyNs.sessionId;
@@ -6566,8 +6618,8 @@ Return only the JSON object.`);
         return r.text;
       });
       verify = { ...normalizeVerify(fixed.value), repaired: fixed.repaired };
-      writeFileSync15(join29(dir, "verify.json"), JSON.stringify(verify, null, 1));
-      writeFileSync15(join29(dir, "test.log"), (verify.evidence || []).join(`
+      writeFileSync16(join29(dir, "verify.json"), JSON.stringify(verify, null, 1));
+      writeFileSync16(join29(dir, "test.log"), (verify.evidence || []).join(`
 `) || "(no evidence)");
       if (verify.conclusion === "通过")
         break;
@@ -6577,9 +6629,9 @@ Return only the JSON object.`);
       lastVerifyKey = key;
     }
     const diff = gitDiff(workspace);
-    writeFileSync15(join29(dir, "diff.patch"), diff);
+    writeFileSync16(join29(dir, "diff.patch"), diff);
     if (verify?.conclusion !== "通过") {
-      writeFileSync15(join29(dir, "packet.md"), `# 验收包 ${id}
+      writeFileSync16(join29(dir, "packet.md"), `# 验收包 ${id}
 
 - 任务：${t.title}
 - 结论：**已升级**（验证未通过）
@@ -6594,7 +6646,7 @@ ${(verify?.evidence || []).map((e) => "- " + e).join(`
       status3(id, "escalated", "verify: " + verify?.conclusion);
       return { dir, verify, escalated: true };
     }
-    writeFileSync15(join29(dir, "run.json"), JSON.stringify({ mock: false, mode: "acp", workspace, judge, ts: new Date().toISOString() }, null, 1));
+    writeFileSync16(join29(dir, "run.json"), JSON.stringify({ mock: false, mode: "acp", workspace, judge, ts: new Date().toISOString() }, null, 1));
     const rws = snapshotWorkspace(workspace, snapPath(id, dir, "redteam-ws"));
     const redNs = await acp.newSession(rws);
     const sRed = redNs.sessionId;
@@ -6610,7 +6662,7 @@ Return only the JSON object.`);
       return r.text;
     });
     let redteam = { ...normalizeRedteam(fixed.value), repaired: fixed.repaired, round: 1 };
-    writeFileSync15(join29(dir, "redteam.json"), JSON.stringify(redteam, null, 1));
+    writeFileSync16(join29(dir, "redteam.json"), JSON.stringify(redteam, null, 1));
     const repaired = await repairRedteamHighs({
       id,
       dir,
@@ -6647,7 +6699,7 @@ Return only the JSON object.`);
     if (repaired.escalated)
       return { dir, verify, redteam, escalated: true };
     writeUsage(dir, id, usageAcc);
-    writeFileSync15(join29(dir, "packet.md"), `# 验收包 ${id}
+    writeFileSync16(join29(dir, "packet.md"), `# 验收包 ${id}
 
 - 任务：${t.title}
 - 判据：${judge}
@@ -6768,7 +6820,7 @@ Judge: ${t.judge}
       });
       plan = planned.value;
     } catch (e) {
-      writeFileSync15(join29(dir, "packet.md"), `# 验收包 ${id}
+      writeFileSync16(join29(dir, "packet.md"), `# 验收包 ${id}
 
 - 任务：${t.title}
 - 结论：**已升级**（planner 输出无法解析）
@@ -6778,7 +6830,7 @@ Judge: ${t.judge}
       status3(id, "escalated", "planner: " + e.message);
       return { dir, escalated: true, error: e.message };
     }
-    writeFileSync15(join29(dir, "plan.md"), `# Plan
+    writeFileSync16(join29(dir, "plan.md"), `# Plan
 
 ${JSON.stringify(plan, null, 1)}
 `);
@@ -6793,7 +6845,7 @@ Plan: ${JSON.stringify(plan)}
 Judge: ${judge}${fix}
 Report briefly what you changed and test results.`, tracker);
       recordModelCall(id, `builder-${round}`, buildOut.model, buildOut.usage, usageAcc, prices);
-      writeFileSync15(join29(dir, `builder-${round}.md`), buildOut.text || "(no output)");
+      writeFileSync16(join29(dir, `builder-${round}.md`), buildOut.text || "(no output)");
       const vws = snapshotWorkspace(workspace, snapPath(id, dir, `verify-ws-${round}`));
       const vOut = await callDsh("verifier", vws, `Repo: ${vws}
 Run this judge yourself: ${judge}
@@ -6807,8 +6859,8 @@ ${msg}`, tracker);
         return r.text;
       });
       verify = { ...normalizeVerify(fixed.value), repaired: fixed.repaired };
-      writeFileSync15(join29(dir, "verify.json"), JSON.stringify(verify, null, 1));
-      writeFileSync15(join29(dir, "test.log"), (verify.evidence || []).join(`
+      writeFileSync16(join29(dir, "verify.json"), JSON.stringify(verify, null, 1));
+      writeFileSync16(join29(dir, "test.log"), (verify.evidence || []).join(`
 `) || "(no evidence)");
       if (verify.conclusion === "通过")
         break;
@@ -6818,9 +6870,9 @@ ${msg}`, tracker);
       lastKey = key;
     }
     const diff = gitDiff(workspace);
-    writeFileSync15(join29(dir, "diff.patch"), diff);
+    writeFileSync16(join29(dir, "diff.patch"), diff);
     if (verify?.conclusion !== "通过") {
-      writeFileSync15(join29(dir, "packet.md"), `# 验收包 ${id}
+      writeFileSync16(join29(dir, "packet.md"), `# 验收包 ${id}
 
 - 任务：${t.title}
 - 结论：**已升级**（验证未通过）
@@ -6835,7 +6887,7 @@ ${(verify?.evidence || []).map((e) => "- " + e).join(`
       status3(id, "escalated", "verify: " + verify?.conclusion);
       return { dir, verify, escalated: true };
     }
-    writeFileSync15(join29(dir, "run.json"), JSON.stringify({ mock: false, mode: "dsh", workspace, judge, ts: new Date().toISOString() }, null, 1));
+    writeFileSync16(join29(dir, "run.json"), JSON.stringify({ mock: false, mode: "dsh", workspace, judge, ts: new Date().toISOString() }, null, 1));
     const rws = snapshotWorkspace(workspace, snapPath(id, dir, "redteam-ws"));
     const rOut = await callDsh("redteam", rws, `Repo: ${rws}
 Diff:
@@ -6851,7 +6903,7 @@ ${msg}`, tracker);
       return r.text;
     });
     let redteam = { ...normalizeRedteam(fixed.value), repaired: fixed.repaired, round: 1 };
-    writeFileSync15(join29(dir, "redteam.json"), JSON.stringify(redteam, null, 1));
+    writeFileSync16(join29(dir, "redteam.json"), JSON.stringify(redteam, null, 1));
     const repaired = await repairRedteamHighs({
       id,
       dir,
@@ -6888,7 +6940,7 @@ ${msg}`, tracker);
     if (repaired.escalated)
       return { dir, verify, redteam, escalated: true };
     writeUsage(dir, id, usageAcc);
-    writeFileSync15(join29(dir, "packet.md"), `# 验收包 ${id}
+    writeFileSync16(join29(dir, "packet.md"), `# 验收包 ${id}
 
 - 任务：${t.title}
 - 判据：${judge}
@@ -6897,7 +6949,7 @@ ${msg}`, tracker);
 - 反驳：${(redteam.findings || []).length} 条
 - 模型调用：${usageAcc.rows.length} 次 / ${usageAcc.total} tokens
 `);
-    writeFileSync15(join29(dir, "run.json"), JSON.stringify({ mock: false, mode: "dsh", workspace, judge, ts: new Date().toISOString() }, null, 1));
+    writeFileSync16(join29(dir, "run.json"), JSON.stringify({ mock: false, mode: "dsh", workspace, judge, ts: new Date().toISOString() }, null, 1));
     status3(id, "awaiting_acceptance", "dsh run");
     return { dir, verify, redteam };
   } finally {
@@ -7096,7 +7148,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,
@@ -7111,7 +7163,7 @@ import {
   statSync as statSync12,
   symlinkSync as symlinkSync3,
   unlinkSync as unlinkSync3,
-  writeFileSync as writeFileSync16
+  writeFileSync as writeFileSync17
 } from "node:fs";
 import { hostname as osHostname } from "node:os";
 import { basename as basename9, dirname as dirname13, isAbsolute as isAbsolute4, join as join31, relative as relative6, resolve as resolve15, sep as sep8 } from "node:path";
@@ -7121,6 +7173,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");
 }
@@ -7163,8 +7261,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)
@@ -7199,10 +7303,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))
@@ -7804,6 +7912,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(`
@@ -7862,7 +8098,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}` });
@@ -7965,7 +8201,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))
@@ -7979,7 +8215,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
   };
@@ -7988,7 +8224,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) => {
@@ -8005,7 +8241,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) => {
@@ -8047,7 +8283,7 @@ function add2(opts) {
     rmSync9(copy, { recursive: true, force: true });
     copyTree(dir, copy);
   }
-  writeFileSync16(serviceLockPath(svc.id), JSON.stringify(lock, null, 1) + `
+  writeFileSync17(serviceLockPath(svc.id), JSON.stringify(lock, null, 1) + `
 `);
   return result;
 }
@@ -8322,14 +8558,14 @@ 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-...] [--tui [--watch] [--no-color]]
-  dia claim <path> [--reason R] [--ttl 4h] [--session S] | dia claims [--all] [--mine] | dia unclaim <path|id> [--force]
+  dia claim <path> [--reason R] [--ttl 4h] [--session S] | dia claims [--all] [--mine] [--gc [--days 7]] | dia unclaim <path|id> [--force]
   dia team run <id> --mock | --acp|--dsh --workspace DIR
   dia team gate|accept|reject|next
   dia team accept <id> [--note ...] [--pr N [--repo R] [--merge]]   # --pr：先验 CI，绿才接受/合并
@@ -8820,7 +9056,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
@@ -9067,6 +9303,11 @@ async function claimsCli(argv) {
       return 0;
     }
     if (sub === "claims") {
+      if (has(args, "--gc")) {
+        const r = compact({ days: Number(flag(args, "--days") || 7) });
+        out(asJson ? JSON.stringify(r, null, 1) : `claims gc: before=${r.before} after=${r.after} dropped=${r.dropped}`);
+        return 0;
+      }
       const mine = has(args, "--mine") ? resolveSessionId(session) : undefined;
       const rows = list3({ all: has(args, "--all"), mine });
       out(asJson ? JSON.stringify(rows, null, 1) : rows.map((c) => `${c.path}	${c.holder}	${c.reason || ""}	${c.expires_at}${isActive(c) ? "" : "\t(expired)"}`).join(`
@@ -9110,6 +9351,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}`);
@@ -9118,6 +9366,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;
@@ -9220,7 +9474,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") {
@@ -9814,6 +10075,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"),