@sleep2agi/commhub-server 0.9.0-preview.114 → 0.9.0-preview.116

package/src/task-access-http.test.ts

@@ -2,7 +2,7 @@
 //
 // 场景:Hub 管理员 admin 的网络 NET。成员:
 //   alice —— 新建成员,经授权接口显式设成 scoped,授权 P1(只看)、P2(可改);
-//            (新成员默认值 NEW_MEMBER_TASK_ACCESS 暂时是 'all',见「默认值与授权接口」)
+//            (#746 起新成员默认值 NEW_MEMBER_TASK_ACCESS 就是 'scoped',见「默认值与授权接口」)
 //   carol —— 升级前的老成员(task_access='all'):行为必须与今天逐字相同;
 //   vic   —— 经授权接口显式设成 scoped 的 viewer,授权 P3(只看)。
 // admin 建的卡:c_own(负责人 alice)、c_part(参与人 alice)、c_p1 / c_p2 / c_p3(在项目里)、c_other(与 alice 无关)。
@@ -117,10 +117,14 @@ afterAll(() => {
 });
 
 describe("默认值与授权接口", () => {
-  test("新成员默认 all:常量是 'all';管理员建号 / POST members / 邀请码加入都落在 all 且看得见全部卡", async () => {
-    expect(NEW_MEMBER_TASK_ACCESS).toBe("all");
-    const all = ["ta-other", "ta-own", "ta-p1", "ta-p2", "ta-p3", "ta-part"];
+  test("#746 新成员默认 scoped:管理员建号 / POST members / 邀请码加入都落在 scoped —— 只看自己的卡与授权项目;admin 角色照旧 all", async () => {
+    expect(NEW_MEMBER_TASK_ACCESS).toBe("scoped");
     const stamp = Date.now();
+    const names = async (t: string) => {
+      const r = await get(t, `/api/requirements?network_id=${NET}`);
+      expect(r.status).toBe(200);
+      return (r.body.requirements as any[]).map(x => x.name).filter((n: string) => n.startsWith("ta-") || n.startsWith("dm-")).sort();
+    };
     // 管理员建号
     const u1 = { username: `ta_new1_${stamp}`, password: PW, network_id: NET, role: "member" };
     expect((await send(admin.token, "POST", "/api/admin/users", u1)).status).toBe(200);
@@ -128,24 +132,43 @@ describe("默认值与授权接口", () => {
     // POST /members 不带 task_access
     const u2 = register(`ta_new2_${stamp}`, PW);
     expect((await send(admin.token, "POST", `/api/networks/${NET}/members`, { user_id: u2.user!.user_id, role: "member" })).status).toBe(200);
-    // 邀请码加入
+    // 邀请码加入(member 与 viewer 两种邀请)
     const inv = await send(admin.token, "POST", `/api/networks/${NET}/invite`, { role: "member" });
     const u3 = register(`ta_new3_${stamp}`, PW);
     expect((await send(u3.token!, "POST", "/api/networks/join", { invite_code: inv.body.invite_code })).status).toBe(200);
-    for (const [id, token] of [[l1.body.user.user_id, l1.body.token], [u2.user!.user_id, u2.token!], [u3.user!.user_id, u3.token!]] as [string, string][]) {
+    const paths: Array<[string, string, string]> = [["admin-users", l1.body.user.user_id, l1.body.token], ["post-members", u2.user!.user_id, u2.token!], ["invite", u3.user!.user_id, u3.token!]];
+    for (const [path, id, token] of paths) {
       const g = await get(admin.token, `/api/networks/${NET}/members/${id}/task-grants`);
-      expect(g.body.task_access).toBe("all");
-      expect(g.body.restricted).toBe(false);
-      expect(await listIds(token)).toEqual(all);
+      expect([path, g.body.task_access, g.body.restricted]).toEqual([path, "scoped", true]);
       const me = await get(token, "/api/auth/me");
-      expect(me.body.networks.find((n: any) => n.network_id === NET).task_access).toBe("all");
+      expect(me.body.networks.find((n: any) => n.network_id === NET).task_access).toBe("scoped");
+      // 自己负责的卡 + 授权项目 P1 看得见;别人的无关卡(ta-other)列表里没有、直取也是 404
+      expect((await send(admin.token, "POST", "/api/requirements", { network_id: NET, name: `dm-own-${path}`, owner: userRef(id) })).status).toBe(201);
+      expect((await send(admin.token, "PUT", `/api/networks/${NET}/members/${id}/task-grants`, { project_grants: [P["ta-P1"]] })).status).toBe(200);
+      expect([path, await names(token)]).toEqual([path, [`dm-own-${path}`, "ta-p1"]]);
+      expect((await get(token, `/api/requirements/${C["ta-other"].id}?network_id=${NET}`)).status).toBe(404);
+    }
+    // 管理员仍能经现有接口把成员放宽到 all,之后看见全部卡
+    expect((await send(admin.token, "PUT", `/api/networks/${NET}/members/${u2.user!.user_id}/task-grants`, { task_access: "all" })).status).toBe(200);
+    expect((await names(u2.token!))).toContain("ta-other");
+    // admin 角色(POST members / 邀请码)照旧存 'all';不受这一列约束
+    const a1 = register(`ta_new5_${stamp}`, PW);
+    expect((await send(admin.token, "POST", `/api/networks/${NET}/members`, { user_id: a1.user!.user_id, role: "admin" })).status).toBe(200);
+    const invA = await send(admin.token, "POST", `/api/networks/${NET}/invite`, { role: "admin" });
+    const a2 = register(`ta_new6_${stamp}`, PW);
+    expect((await send(a2.token!, "POST", "/api/networks/join", { invite_code: invA.body.invite_code })).status).toBe(200);
+    for (const a of [a1, a2]) {
+      const g = await get(admin.token, `/api/networks/${NET}/members/${a.user!.user_id}/task-grants`);
+      expect([g.body.task_access, g.body.restricted]).toEqual(["all", false]);
+      expect(await names(a.token!)).toContain("ta-other");
     }
-    // POST /members 显式传 scoped 仍然生效
+    // 升级前的老成员(carol,直接写 'all' 的行)照旧全看见
+    expect(await names(carol.token)).toContain("ta-other");
+    // POST /members 显式传 all 仍然生效
     const u4 = register(`ta_new4_${stamp}`, PW);
-    expect((await send(admin.token, "POST", `/api/networks/${NET}/members`, { user_id: u4.user!.user_id, role: "member", task_access: "scoped" })).status).toBe(200);
-    expect((await get(admin.token, `/api/networks/${NET}/members/${u4.user!.user_id}/task-grants`)).body.task_access).toBe("scoped");
-    expect(await listIds(u4.token!)).toEqual([]);
-    for (const id of [l1.body.user.user_id, u2.user!.user_id, u3.user!.user_id, u4.user!.user_id]) {
+    expect((await send(admin.token, "POST", `/api/networks/${NET}/members`, { user_id: u4.user!.user_id, role: "member", task_access: "all" })).status).toBe(200);
+    expect((await get(admin.token, `/api/networks/${NET}/members/${u4.user!.user_id}/task-grants`)).body.task_access).toBe("all");
+    for (const id of [l1.body.user.user_id, u2.user!.user_id, u3.user!.user_id, u4.user!.user_id, a1.user!.user_id, a2.user!.user_id]) {
       expect((await send(admin.token, "DELETE", `/api/networks/${NET}/members/${id}`)).status).toBe(200);
     }
   });

package/src/task-access.ts

@@ -17,7 +17,7 @@ import { deleteDepartmentGrantsForProject, departmentGrantsForMember, headCardsF
 
 // ── 表结构(放在这里而不是 db.ts:db.ts 每多一行,文档里钉着的行号就漂一次) ──
 // ALTER 的 DEFAULT 'all' 让**升级前已有的**成员行全部落在旧语义 —— 升级不收窄任何人;新成员按下面的
-// NEW_MEMBER_TASK_ACCESS 入库。项目授权:行存在 = 可看,can_edit=1 = 可改。
+// newMemberTaskAccess() 入库(#746:默认 'scoped')。项目授权:行存在 = 可看,can_edit=1 = 可改。
 try { db.exec("ALTER TABLE network_members ADD COLUMN task_access TEXT NOT NULL DEFAULT 'all'"); } catch {}
 db.exec(`
   CREATE TABLE IF NOT EXISTS network_member_project_grants (
@@ -33,12 +33,19 @@ db.exec(`
 `);
 
 /**
- * 新成员(管理员建号 / POST members / 邀请码)默认的任务范围。
- * 暂时是 'all':app ≤0.2.163 没有任务权限界面,从那些 app 加的成员若默认 scoped 会一张卡都看不到,
- * 管理员也没法在那些 app 里放宽。等 owner 的设备都 ≥0.2.164 且他确认后,改回 'scoped'(只改这一行)。
- * 显式 task_access='scoped'(POST members / PUT task-grants)不受这个默认值影响。
+ * 新成员默认的任务范围(#746,owner 选方案 2):只看相关任务。入库路径全部显式写这一列,不靠列 DEFAULT:
+ *   ① addNetworkMember —— POST /api/networks/:id/members、POST /api/admin/users(带 network_id)
+ *   ② joinByInvite     —— POST /api/networks/join(邀请码)
+ * owner 行(register 自动建网、createNetwork、db.ts 的 V3.13 迁移)不经过这里,照旧落列默认 'all'。
+ * 列 DEFAULT 仍是 'all'、不迁移老行 —— 升级前的成员一个都不收窄。显式 task_access 覆盖默认;
+ * 管理员随时可 PUT /api/networks/:id/members/:uid/task-grants {task_access:'all'} 放宽。
  */
-export const NEW_MEMBER_TASK_ACCESS: TaskAccessMode = "all";
+export const NEW_MEMBER_TASK_ACCESS: TaskAccessMode = "scoped";
+
+/** 新成员行要写入的 task_access。admin 角色本来就不受这一列约束,照旧存 'all'(降级成 member 时与今天行为一致)。 */
+export function newMemberTaskAccess(role: string): TaskAccessMode {
+  return UNRESTRICTED_ROLES.has(role) ? "all" : NEW_MEMBER_TASK_ACCESS;
+}
 
 export type TaskAccessMode = "all" | "scoped";
 export type ProjectGrant = { project_id: string; can_edit: boolean };

package/src/task-expiry-notice.ts

@@ -201,31 +201,33 @@ function noteEvent(taskId: string, status: string, detail: string): void {
   } catch {}
 }
 
-function deliverToAgent(alias: string, networkId: string | null, inReplyTo: string, text: string, meta: Record<string, unknown>): string {
-  const id = `exp_${uuidv4().replace(/-/g, "").slice(0, 20)}`;
+function deliverToAgent(alias: string, networkId: string | null, inReplyTo: string, text: string, meta: Record<string, unknown>, status = "expired", prefix = "exp_"): string {
+  const id = `${prefix}${uuidv4().replace(/-/g, "").slice(0, 20)}`;
   const nodeId = agentSession(alias, networkId)?.node_id ?? null;
   db.run(
     `INSERT INTO inbox (id, session_name, node_id, type, priority, content, from_session, in_reply_to, requires_response, network_id, meta_json)
      VALUES (?1, ?2, ?3, 'reply', 'normal', ?4, 'hub', ?5, 'none', ?6, ?7)`,
     [id, alias, nodeId, text, inReplyTo, networkId, JSON.stringify(meta)],
   );
-  pushEvent(alias, { type: "new_reply", inbox_count: pendingInboxCount(alias, networkId), from: "hub", message_id: id, in_reply_to: inReplyTo, status: "expired" }, networkId);
+  pushEvent(alias, { type: "new_reply", inbox_count: pendingInboxCount(alias, networkId), from: "hub", message_id: id, in_reply_to: inReplyTo, status }, networkId);
   return id;
 }
 
-function deliver(
+/** 按 route 投递一条通知。#758 孤儿任务通知复用它(kind / status / id 前缀不同)。 */
+export function deliver(
   route: Extract<ExpirySenderRoute, { kind: "agent" | "user" }>,
   networkId: string | null,
   fromAlias: string,
   inReplyTo: string,
   notice: { title: string; text: string },
   meta: Record<string, unknown>,
+  as: { kind: string; status: string; agentPrefix: string; userPrefix: string } = { kind: TASK_EXPIRED_NOTICE_KIND, status: "expired", agentPrefix: "exp_", userPrefix: "dm_expired_" },
 ): string | null {
-  if (route.kind === "agent") return deliverToAgent(route.alias, networkId, inReplyTo, notice.text, meta);
+  if (route.kind === "agent") return deliverToAgent(route.alias, networkId, inReplyTo, notice.text, meta, as.status, as.agentPrefix);
   if (!networkId) return null;
   return sendAgentNotice({
-    networkId, userId: route.userId, fromAlias, kind: TASK_EXPIRED_NOTICE_KIND,
-    title: notice.title, text: notice.text, severity: "warning", meta, idPrefix: "dm_expired_",
+    networkId, userId: route.userId, fromAlias, kind: as.kind,
+    title: notice.title, text: notice.text, severity: "warning", meta, idPrefix: as.userPrefix,
   });
 }
 

package/src/task-orphan-http.test.ts

@@ -0,0 +1,287 @@
+// #758 —— 孤儿任务:acked / running 超过阈值,接收节点在开工之后回到 idle / offline 却没回复。
+// HTTP 集成测试(真实 Bun.serve,私有端口,临时库);test2123 在真实 PostgreSQL 上原样再跑一遍。
+//
+// 任务经真入口 POST /api/task 派出,目标用自己的节点令牌经 /mcp ack_inbox / report_status 推进;
+// 只把任务的时间戳往前拨,然后调巡检(server.ts patrolOrphanTasks,5 分钟定时器调的就是它)。
+//
+// 钉住:
+//   1. 孤儿(agent 派的)→ 记一条 task.orphan_suspected、发一条 inbox reply 给派活节点,任务状态不变;第二次巡检不重发。
+//   2. 人派的孤儿 → user_inbox 一条。
+//   3. 节点 working → 不标。
+//   4. 不到阈值 → 不标;阈值可由 COMMHUB_ORPHAN_TASK_MINUTES 改,0 = 关。
+//   5. 节点开工之后没再报过状态 → 不标。
+//   6. scheduler 派的孤儿 → 标,但不通知。
+//   7. TTL 巡检(patrolExpiredTasks)不碰孤儿阶段:不写 orphan 事件。
+//
+// 跑法:cd server && bun test src/task-orphan-http.test.ts
+
+import { afterAll, beforeAll, beforeEach, describe, expect, test } from "bun:test";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+const DIR = mkdtempSync(join(tmpdir(), "anet-orphan-"));
+process.env.COMMHUB_DB ||= join(DIR, "hub.db");
+process.env.COMMHUB_UPLOADS_DIR = join(DIR, "uploads");
+process.env.HOST = "127.0.0.1";
+const ENV = "COMMHUB_ORPHAN_TASK_MINUTES";
+const LOOKBACK_ENV = "COMMHUB_ORPHAN_TASK_LOOKBACK_HOURS";
+delete process.env[ENV];
+delete process.env[LOOKBACK_ENV];
+const PW = "Orphan123!xyz";
+const stamp = Date.now();
+
+let db: any;
+let patrol: () => void;
+let ttlPatrol: () => void;
+let flag: (o?: { minutes?: number | null }) => Array<{ task_id: string; notified: string | null }>;
+let hub: any = null;
+let BASE = "";
+let NET = "";
+let umaToken = "", umaId = "";
+let EVENT = "";
+type Node = { alias: string; nodeId: string; token: string };
+const nodes: Record<"sender" | "target", Node> = {} as any;
+
+async function send(token: string, method: string, path: string, payload?: unknown) {
+  const res = await fetch(`${BASE}${path}`, {
+    method,
+    headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
+    body: payload === undefined ? undefined : JSON.stringify(payload),
+  });
+  return { status: res.status, body: await res.json().catch(() => null) as any };
+}
+async function tool(token: string, name: string, args: Record<string, unknown>) {
+  const res = await fetch(`${BASE}/mcp`, {
+    method: "POST",
+    headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json", Accept: "application/json, text/event-stream", "MCP-Protocol-Version": "2025-03-26" },
+    body: JSON.stringify({ jsonrpc: "2.0", id: 1, method: "tools/call", params: { name, arguments: args } }),
+  });
+  const raw = await res.text();
+  const data = raw.split("\n").filter((x) => x.startsWith("data:"));
+  const payload = data.length ? JSON.parse(data.at(-1)!.slice(5).trim()) : JSON.parse(raw);
+  return JSON.parse(payload.result.content[0].text);
+}
+
+let seq = 0;
+async function dispatch(token: string): Promise<{ id: string; content: string }> {
+  const content = `orphan case ${stamp} #${++seq}`;
+  const r = await send(token, "POST", "/api/task", { alias: nodes.target.alias, task: content, network_id: NET });
+  expect(r.status).toBe(200);
+  expect(r.body.ok).toBe(true);
+  return { id: r.body.task_id, content };
+}
+async function ack(taskId: string) {
+  const r = await tool(nodes.target.token, "ack_inbox", { alias: nodes.target.alias, message_id: taskId, network_id: NET });
+  expect(r.ok).toBe(true);
+  expect(taskRow(taskId).status).toBe("acked");
+}
+async function targetStatus(status: string, task?: string) {
+  const r = await tool(nodes.target.token, "report_status", { resume_id: `sdk-${nodes.target.nodeId}`, alias: nodes.target.alias, status, task, node_id: nodes.target.nodeId, network_id: NET });
+  expect(r.ok).toBe(true);
+}
+/** 任务的时间戳拨到 `minutes` 分钟前(节点的 last_seen_at 不动 = 「之后还报过状态」)。 */
+function age(taskId: string, minutes: number) {
+  const off = `-${minutes * 60} seconds`;
+  db.run(
+    `UPDATE tasks SET created_at = datetime('now', ?2),
+        delivered_at = CASE WHEN delivered_at IS NULL THEN NULL ELSE datetime('now', ?2) END,
+        started_at = CASE WHEN started_at IS NULL THEN NULL ELSE datetime('now', ?2) END,
+        consumed_at = CASE WHEN consumed_at IS NULL THEN NULL ELSE datetime('now', ?2) END
+      WHERE task_id = ?1`,
+    [taskId, off],
+  );
+}
+const taskRow = (taskId: string) => db.get("SELECT status, result, completed_at FROM tasks WHERE task_id = ?1", taskId) as { status: string; result: string | null; completed_at: string | null };
+const orphanEvents = (taskId: string) => db.all("SELECT from_status, to_status, event_type, event_key, actor, detail FROM task_events WHERE task_id = ?1 AND event_type = ?2", taskId, EVENT) as any[];
+const agentNotices = () => db.all("SELECT in_reply_to, type, requires_response, content FROM inbox WHERE network_id = ?1 AND session_name = ?2 AND from_session = 'hub'", NET, nodes.sender.alias) as any[];
+const userNotices = () => db.all("SELECT kind, from_session, content FROM user_inbox WHERE network_id = ?1 AND user_id = ?2", NET, umaId) as any[];
+
+function withMinutes<T>(value: string | undefined, fn: () => T): T {
+  const prev = process.env[ENV];
+  if (value === undefined) delete process.env[ENV]; else process.env[ENV] = value;
+  try { return fn(); } finally { if (prev === undefined) delete process.env[ENV]; else process.env[ENV] = prev; }
+}
+
+beforeAll(async () => {
+  ({ db } = await import("./db.js"));
+  const { addNetworkMember, createNetworkTokenForNode, register } = await import("./auth.js");
+  const orphan: any = await import("./task-orphan.js");
+  EVENT = orphan.ORPHAN_EVENT_TYPE;
+  flag = orphan.flagOrphanTasks;
+  const boss = register(`orphan_boss_${stamp}`, PW);
+  expect(boss.ok).toBe(true);
+  NET = boss.network_id!;
+  const bossId = boss.user!.user_id;
+  const uma = register(`orphan_uma_${stamp}`, PW);
+  umaToken = uma.token!; umaId = uma.user!.user_id;
+  expect(addNetworkMember(NET, umaId, "member", bossId, { agentAccess: "all" }).ok).toBe(true);
+  for (const key of ["sender", "target"] as const) {
+    const alias = `orphan-${key}-${stamp}`;
+    const nodeId = `n_orphan_${key}_${stamp}`;
+    const minted = createNetworkTokenForNode(bossId, NET, alias, nodeId);
+    expect(minted.ok).toBe(true);
+    nodes[key] = { alias, nodeId, token: minted.token! };
+  }
+  const mod: any = await import("./server.js");
+  patrol = mod.patrolOrphanTasks;
+  ttlPatrol = mod.patrolExpiredTasks;
+  hub = mod.bootServer({ port: 0, hostname: "127.0.0.1" });
+  BASE = `http://127.0.0.1:${hub.port}`;
+  for (const n of Object.values(nodes)) {
+    const r = await tool(n.token, "report_status", { resume_id: `sdk-${n.nodeId}`, alias: n.alias, status: "idle", node_id: n.nodeId, network_id: NET });
+    expect(r.ok).toBe(true);
+  }
+}, 30_000);
+
+beforeEach(() => {
+  db.run("UPDATE tasks SET status = 'replied', completed_at = datetime('now') WHERE network_id = ?1 AND status IN ('created', 'delivered', 'acked', 'running')", [NET]);
+  db.run("DELETE FROM inbox WHERE network_id = ?1 AND from_session = 'hub'", [NET]);
+  db.run("DELETE FROM user_inbox WHERE network_id = ?1", [NET]);
+  // 上一条用例可能把目标留在 offline / working:派活前先让它回到 idle(否则 /api/task 回 202 排队)。
+  db.run("UPDATE sessions SET status = 'idle' WHERE alias = ?1 AND network_id = ?2", [nodes.target.alias, NET]);
+});
+
+afterAll(() => {
+  try { hub?.stop?.(true); } catch {}
+  try { rmSync(DIR, { recursive: true, force: true }); } catch {}
+});
+
+describe("#758 orphan detected", () => {
+  test("acked 2h, node idle since → one event + one inbox reply to the sending agent; status unchanged; second pass silent", async () => {
+    const t = await dispatch(nodes.sender.token);
+    await ack(t.id);
+    age(t.id, 120);
+    await targetStatus("idle");
+
+    withMinutes(undefined, () => patrol());
+
+    expect(taskRow(t.id)).toMatchObject({ status: "acked", result: null, completed_at: null });
+    const ev = orphanEvents(t.id);
+    expect(ev.length).toBe(1);
+    expect(ev[0]).toMatchObject({ from_status: "acked", to_status: "acked", event_key: EVENT, actor: "patrol" });
+    expect(ev[0].detail).toContain(`notify: agent ${nodes.sender.alias}`);
+    const n = agentNotices();
+    expect(n.length).toBe(1);
+    expect(n[0]).toMatchObject({ in_reply_to: t.id, type: "reply", requires_response: "none" });
+    expect(n[0].content).toContain(nodes.target.alias);
+    expect(n[0].content).toContain("没有改这条任务的状态");
+
+    // 第二、三次巡检:不重发、不重记。
+    withMinutes(undefined, () => { patrol(); patrol(); });
+    expect(orphanEvents(t.id).length).toBe(1);
+    expect(agentNotices().length).toBe(1);
+    expect(taskRow(t.id).status).toBe("acked");
+  });
+
+  test("running task, node went offline afterwards → flagged; a human sender gets one user_inbox notice", async () => {
+    const t = await dispatch(umaToken);
+    await ack(t.id);
+    await targetStatus("working", t.content);
+    expect(taskRow(t.id).status).toBe("running");
+    age(t.id, 90);
+    await targetStatus("idle");
+    db.run("UPDATE sessions SET status = 'offline' WHERE alias = ?1 AND network_id = ?2", [nodes.target.alias, NET]);
+
+    const out = withMinutes(undefined, () => flag());
+    expect(out).toEqual([{ task_id: t.id, notified: "user" }]);
+    expect(taskRow(t.id).status).toBe("running");
+    const u = userNotices();
+    expect(u.length).toBe(1);
+    expect(u[0]).toMatchObject({ kind: "task_orphan_suspected", from_session: nodes.target.alias });
+    expect(withMinutes(undefined, () => flag())).toEqual([]);
+    expect(userNotices().length).toBe(1);
+  });
+});
+
+describe("#758 not orphans", () => {
+  test("node is working (busy) → not flagged", async () => {
+    const t = await dispatch(nodes.sender.token);
+    await ack(t.id);
+    age(t.id, 120);
+    await targetStatus("working", "something else");
+    withMinutes(undefined, () => patrol());
+    expect(orphanEvents(t.id).length).toBe(0);
+    expect(agentNotices().length).toBe(0);
+  });
+
+  test("younger than the threshold → not flagged; env lowers it; 0 turns it off", async () => {
+    const t = await dispatch(nodes.sender.token);
+    await ack(t.id);
+    age(t.id, 45);
+    await targetStatus("idle");
+    withMinutes(undefined, () => patrol());
+    expect(orphanEvents(t.id).length).toBe(0);
+    withMinutes("0", () => patrol());
+    expect(orphanEvents(t.id).length).toBe(0);
+    withMinutes("30", () => patrol());
+    expect(orphanEvents(t.id).length).toBe(1);
+    expect(agentNotices().length).toBe(1);
+  });
+
+  test("node has not reported any status since the task started → not flagged", async () => {
+    const t = await dispatch(nodes.sender.token);
+    await ack(t.id);
+    age(t.id, 120);
+    await targetStatus("idle");
+    db.run("UPDATE sessions SET last_seen_at = datetime('now', '-180 minutes'), updated_at = datetime('now', '-180 minutes') WHERE alias = ?1 AND network_id = ?2", [nodes.target.alias, NET]);
+    withMinutes(undefined, () => patrol());
+    expect(orphanEvents(t.id).length).toBe(0);
+    expect(agentNotices().length).toBe(0);
+  });
+});
+
+describe("#758 lookback cap", () => {
+  test("a 10-day-old orphan is not flagged by default (72h cap) but is with lookback 0", async () => {
+    // 10 天前的那条直接写库(目标上已有开着的任务时 /api/task 回 202 排队,而这里要两条同时开着)。
+    const t = { id: `orphan_old_${stamp}` };
+    db.run(
+      `INSERT INTO tasks (task_id, from_name, from_node_id, to_name, to_node_id, priority, status, content, requires_response, created_at, delivered_at, network_id)
+       VALUES (?1, ?2, ?3, ?4, ?5, 'normal', 'acked', 'ten days old', 'reply', datetime('now', '-240 hours'), datetime('now', '-240 hours'), ?6)`,
+      [t.id, nodes.sender.alias, nodes.sender.nodeId, nodes.target.alias, nodes.target.nodeId, NET],
+    );
+    await targetStatus("idle");
+    withMinutes(undefined, () => patrol());
+    expect(orphanEvents(t.id).length).toBe(0);
+    expect(agentNotices().length).toBe(0);
+    // 71 小时的照常标出:上限只挡更老的。
+    const recent = await dispatch(nodes.sender.token);
+    await ack(recent.id);
+    age(recent.id, 71 * 60);
+    await targetStatus("idle");
+    withMinutes(undefined, () => patrol());
+    expect(orphanEvents(recent.id).length).toBe(1);
+    expect(orphanEvents(t.id).length).toBe(0);
+    process.env[LOOKBACK_ENV] = "0";
+    try { withMinutes(undefined, () => patrol()); } finally { delete process.env[LOOKBACK_ENV]; }
+    expect(orphanEvents(t.id).length).toBe(1);
+    expect(agentNotices().map((n) => n.in_reply_to).sort()).toEqual([recent.id, t.id].sort());
+  });
+});
+
+describe("#758 scheduler and regression", () => {
+  test("scheduler-sent orphan → flagged, sender not notified", async () => {
+    const id = `orphan_sched_${stamp}`;
+    db.run(
+      `INSERT INTO tasks (task_id, from_name, to_name, to_node_id, priority, status, content, requires_response, created_at, delivered_at, network_id)
+       VALUES (?1, 'scheduler', ?2, ?3, 'normal', 'acked', 'scheduled run', 'reply', datetime('now', '-120 minutes'), datetime('now', '-120 minutes'), ?4)`,
+      [id, nodes.target.alias, nodes.target.nodeId, NET],
+    );
+    await targetStatus("idle");
+    const out = withMinutes(undefined, () => flag());
+    expect(out).toEqual([{ task_id: id, notified: null }]);
+    expect(orphanEvents(id)[0].detail).toContain("notify: none (scheduler)");
+    expect(agentNotices().length).toBe(0);
+    expect(userNotices().length).toBe(0);
+  });
+
+  test("the TTL patrol alone does not run the orphan phase", async () => {
+    const t = await dispatch(nodes.sender.token);
+    await ack(t.id);
+    age(t.id, 120);
+    await targetStatus("idle");
+    withMinutes(undefined, () => ttlPatrol());
+    expect(orphanEvents(t.id).length).toBe(0);
+    expect(taskRow(t.id).status).toBe("acked");
+  });
+});

package/src/task-orphan.ts

@@ -0,0 +1,119 @@
+// #758 —— 「孤儿任务」:任务还停在 acked / running,接收节点却已经回到 idle(或 offline)、
+// 并且在任务开工之后还报过状态 —— 节点转去干别的了,没回这一条。
+//
+// 生产只读实测:17 条任务 acked / running 超过 1 小时,接收节点早已 idle;最长一条(admin 的 P0)挂了 15.7 小时。
+// 以前巡检只对 delivered 记警告(task-lifecycle-watcher.ts),acked / running 这一段谁都看不见。
+//
+// 规则(每次 5 分钟任务巡检跑一遍,server.ts runTaskPatrol):
+//   status ∈ {acked, running}
+//   ∧ 开工时刻 = COALESCE(started_at, delivered_at, created_at) 早于 COMMHUB_ORPHAN_TASK_MINUTES(默认 60;0 = 关)
+//   ∧ 开工时刻在最近 COMMHUB_ORPHAN_TASK_LOOKBACK_HOURS 内(默认 72;0 = 不设上限)—— 首次部署不爆发历史通知
+//   ∧ 接收节点(sessions 同网络同别名)当前 status ∈ {idle, offline}
+//   ∧ 节点最后一次报状态 COALESCE(last_seen_at, updated_at) 晚于开工时刻
+// 命中后对每条任务**只做一次**:
+//   - task_events 写一行 event_type = event_key = task.orphan_suspected(唯一索引 (task_id, event_key) 兜底,
+//     ON CONFLICT DO NOTHING;只有真插进去的那一次才往下走)。
+//   - 通知派活的一方,与过期通知同一条路(task-expiry-notice.ts 的 classifyExpirySender / deliver):
+//     agent → inbox reply + new_reply;人 → user_inbox;scheduler / hub / api → 不发。
+//   - **不改任务状态**:不 fail、不关、不碰过期语义。
+
+import { db } from "./db.js";
+import { parseDbTimestampMs } from "./db-timestamp.js";
+import { classifyExpirySender, deliver, type ExpiredTaskRow } from "./task-expiry-notice.js";
+
+export const ORPHAN_TASK_ENV = "COMMHUB_ORPHAN_TASK_MINUTES";
+export const ORPHAN_DEFAULT_MINUTES = 60;
+export const ORPHAN_LOOKBACK_ENV = "COMMHUB_ORPHAN_TASK_LOOKBACK_HOURS";
+export const ORPHAN_DEFAULT_LOOKBACK_HOURS = 72;
+export const ORPHAN_EVENT_TYPE = "task.orphan_suspected";
+export const ORPHAN_NOTICE_KIND = "task_orphan_suspected";
+const BATCH_LIMIT = 200;
+
+/** 未设 / 非数字 → 默认 60;0 或负数 → 关闭(null)。 */
+export function orphanTaskMinutes(env: Record<string, string | undefined> = process.env): number | null {
+  const raw = (env[ORPHAN_TASK_ENV] ?? "").trim();
+  if (!raw) return ORPHAN_DEFAULT_MINUTES;
+  const n = Number(raw);
+  if (!Number.isFinite(n)) return ORPHAN_DEFAULT_MINUTES;
+  return n > 0 ? n : null;
+}
+
+/** 只看开工时刻在最近 N 小时内的任务:未设 / 非数字 / 负数 → 默认 72;0 → 不设上限。
+ *  首次部署时不把几周前的历史 acked / running 一次性全标出来、给派活方(包括 owner)刷一屏通知。 */
+export function orphanLookbackHours(env: Record<string, string | undefined> = process.env): number | null {
+  const raw = (env[ORPHAN_LOOKBACK_ENV] ?? "").trim();
+  const n = raw ? Number(raw) : NaN;
+  if (!Number.isFinite(n) || n < 0) return ORPHAN_DEFAULT_LOOKBACK_HOURS;
+  return n === 0 ? null : n;
+}
+
+type OrphanRow = ExpiredTaskRow & { status: string; started: string; node_status: string; node_seen: string };
+
+export type OrphanFlagged = { task_id: string; notified: "agent" | "user" | null };
+
+export function orphanNoticeText(r: Pick<OrphanRow, "task_id" | "to_name" | "status" | "content" | "node_status">, openMin: number | null): { title: string; text: string } {
+  const preview = (r.content ?? "").replace(/\s+/g, " ").trim().slice(0, 60);
+  const m = openMin === null ? "?" : String(openMin);
+  return {
+    title: "任务可能没人收尾",
+    text: `[Hub] 任务可能没人收尾:你派给 ${r.to_name} 的任务 ${r.task_id} 停在 ${r.status} 已 ${m} 分钟,但 ${r.to_name} 之后已回到 ${r.node_status},一直没有回复。`
+      + `Hub 没有改这条任务的状态。\n内容:${preview}\n`
+      + `建议:问 ${r.to_name} 一句,或 cancel_task 后换个节点重派。\n`
+      + `Task ${r.task_id} to ${r.to_name} has been ${r.status} for ${m} min while ${r.to_name} went ${r.node_status} without replying. Its status was not changed.`,
+  };
+}
+
+/** 一次巡检的孤儿阶段。返回本次新标记的任务(测试 / 日志用)。调用方负责吞异常。 */
+export function flagOrphanTasks(opts: { minutes?: number | null; lookbackHours?: number | null; nowMs?: number } = {}): OrphanFlagged[] {
+  const minutes = opts.minutes === undefined ? orphanTaskMinutes() : opts.minutes;
+  if (!minutes || minutes <= 0) return [];
+  const cutoff = `datetime('now', '-${Math.max(1, Math.round(minutes * 60))} seconds')`;
+  const started = "COALESCE(t.started_at, t.delivered_at, t.created_at)";
+  const lookback = opts.lookbackHours === undefined ? orphanLookbackHours() : opts.lookbackHours;
+  const lookbackSql = lookback && lookback > 0
+    ? `AND ${started} >= datetime('now', '-${Math.max(1, Math.round(lookback * 3600))} seconds')`
+    : "";
+  const rows = db.all<OrphanRow>(
+    `SELECT t.task_id, t.network_id, t.from_name, t.from_node_id, t.to_name, t.content, t.created_at, t.expires_at,
+            t.parent_task_id, t.meta_json, t.status, ${started} AS started,
+            s.status AS node_status, COALESCE(s.last_seen_at, s.updated_at) AS node_seen
+       FROM tasks t
+       JOIN sessions s ON s.alias = t.to_name AND s.network_id = COALESCE(t.network_id, 'default')
+      WHERE t.status IN ('acked', 'running')
+        AND ${started} < ${cutoff}
+        ${lookbackSql}
+        AND s.status IN ('idle', 'offline')
+        AND COALESCE(s.last_seen_at, s.updated_at) > ${started}
+        AND NOT EXISTS (SELECT 1 FROM task_events e WHERE e.task_id = t.task_id AND e.event_key = '${ORPHAN_EVENT_TYPE}')
+      ORDER BY t.created_at ASC LIMIT ${BATCH_LIMIT}`,
+  );
+  const nowMs = opts.nowMs ?? Date.now();
+  const flagged: OrphanFlagged[] = [];
+  for (const r of rows) {
+    const route = classifyExpirySender(r);
+    const who = route.kind === "none" ? `none (${route.reason})` : `${route.kind} ${route.kind === "agent" ? route.alias : route.username}`;
+    const detail = `${r.to_name} is ${r.node_status} (last status ${r.node_seen}) since ${r.status} at ${r.started}; notify: ${who}`;
+    const res = db.run(
+      `INSERT INTO task_events (task_id, from_status, to_status, event_type, event_key, actor, detail, network_id)
+       VALUES (?1, ?2, ?2, '${ORPHAN_EVENT_TYPE}', '${ORPHAN_EVENT_TYPE}', 'patrol', ?3, ?4)
+       ON CONFLICT(task_id, event_key) DO NOTHING`,
+      [r.task_id, r.status, detail, r.network_id ?? null],
+    );
+    if (res.changes < 1) continue; // 只做一次:别的巡检 / 别的 Hub worker 已经标过了
+    let notified: OrphanFlagged["notified"] = null;
+    if (route.kind !== "none") {
+      try {
+        const startedMs = parseDbTimestampMs(r.started);
+        const openMin = Number.isFinite(startedMs) ? Math.max(0, Math.round((nowMs - startedMs) / 60_000)) : null;
+        const meta = { task_orphan_suspected: { task_id: r.task_id, target: r.to_name, status: r.status, node_status: r.node_status } };
+        const id = deliver(route, r.network_id, r.to_name, r.task_id, orphanNoticeText(r, openMin), meta,
+          { kind: ORPHAN_NOTICE_KIND, status: "orphan_suspected", agentPrefix: "orph_", userPrefix: "dm_orphan_" });
+        if (id) notified = route.kind;
+      } catch (e: any) {
+        console.error(`[patrol] orphan notice failed task=${r.task_id}: ${e?.message || e}`);
+      }
+    }
+    flagged.push({ task_id: r.task_id, notified });
+  }
+  return flagged;
+}

package/src/tools.ts

@@ -2,6 +2,7 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { requestAdopt, getAdopt, ackAdopt, unadopt, resolveManagedDaemon, activeBinding, createdDaemon } from "./node-daemon-bindings.js";
 import { runtimeReadinessSchema } from "./runtime-readiness.js";
 import { lockNodeAlias } from "./node-token-ownership.js";
+import { clearNodeFromAgentTeams } from "./agent-teams.js";
 import { parseDbTimestampMs } from "./db-timestamp.js";
 import { z } from "zod/v4";
 import { nodeHealthSchema, normalizeNodeHealth, recordNodeHealth } from "./node-health-store.js";
@@ -5348,6 +5349,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
               );
             }
             db.run(`DELETE FROM nodes WHERE node_id = ?1`, [row.child_node_id]);
+            clearNodeFromAgentTeams(row.child_node_id); // #764
             auditCreateNodeStrict({
               action: "delete_node_completed",
               user_id: null, network_id: row.network_id, target_id: request_id,
@@ -6392,7 +6394,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
   server.tool("schedule_create", "Schedule a task to target_node_id (default you).", schedFields,
     async (args) => scheduleCall((id, w) => agentCreateSchedule(id, w, args as Record<string, unknown>)));
   server.tool("schedule_update", "Edit your schedule; status=paused|active.",
-    { ...schedFields, schedule_id: schedId, name: z.string().optional(), task: z.string().optional(), schedule: z.any().optional(), status: z.string().optional() },
+    { ...schedFields, schedule_id: schedId, base_revision: z.number().int().min(0).optional().describe("Reject if current revision differs."), name: z.string().optional(), task: z.string().optional(), schedule: z.any().optional(), status: z.string().optional() },
     async ({ schedule_id, ...rest }) => scheduleCall((id, w) => agentUpdateSchedule(id, w, schedule_id, rest as Record<string, unknown>)));
   server.tool("schedule_cancel", "Cancel your schedule.", { schedule_id: schedId },
     async ({ schedule_id }) => scheduleCall((id, w) => agentCancelSchedule(id, w, schedule_id)));