@sleep2agi/commhub-server 0.5.2-preview.0 → 0.5.3-preview.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sleep2agi/commhub-server",
-  "version": "0.5.2-preview.0",
-  "description": "CommHub Server \u2014 AI Agent communication hub with MCP protocol, multi-network isolation, user auth, and 18 MCP tools.",
+  "version": "0.5.3-preview.0",
+  "description": "CommHub Server — AI Agent communication hub with MCP protocol, multi-network isolation, user auth, and 18 MCP tools.",
   "type": "module",
   "main": "src/index.ts",
   "bin": {
@@ -39,6 +39,7 @@
     "bun": ">=1.2.0"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.12.0"
+    "@modelcontextprotocol/sdk": "^1.12.0",
+    "bun-types": "^1.3.13"
   }
-}
+}

package/src/db.ts

@@ -307,6 +307,13 @@ try { db.exec("CREATE INDEX IF NOT EXISTS idx_inbox_network ON inbox(network_id)
 try { db.exec("CREATE INDEX IF NOT EXISTS idx_task_events_network ON task_events(network_id)"); } catch {}
 try { db.exec("CREATE INDEX IF NOT EXISTS idx_completions_network ON completions(network_id)"); } catch {}
 
+// ── Task lineage: parent_task_id for auto-chaining sub-task replies up the chain.
+// When 主编 (child) replies to a task that 指挥室 sent on behalf of admin, we want
+// admin to see the answer even if 指挥室's own session has died. The hub forwards
+// the reply up the chain via parent_task_id.
+try { db.exec("ALTER TABLE tasks ADD COLUMN parent_task_id TEXT"); } catch {}
+try { db.exec("CREATE INDEX IF NOT EXISTS idx_tasks_parent ON tasks(parent_task_id)"); } catch {}
+
 // Helpers
 export function uuidv4(): string {
   return crypto.randomUUID();
@@ -345,6 +352,77 @@ export function logAudit(userId: string | null, username: string | null, action:
   } catch {}
 }
 
+// Auto-chain a sub-task's reply up to the parent task lineage so the original
+// requester sees the final answer even if the intermediate session timed out.
+//
+// Why: 链路 admin → 指挥室 → 主编. 主编 finishes 5min later, but 指挥室's
+// session has already ended (replied with 'still working'). Without lineage,
+// 主编's reply just sits in 指挥室's inbox unread and admin never gets the
+// answer.
+//
+// What we do: when a child task with parent_task_id reaches a terminal state,
+// append the child reply to the parent task's result, bump parent status to
+// 'replied' if it's still open, and post an inbox notification to the parent's
+// originator (so an upstream agent or the dashboard sees the chained answer).
+// Recurse up the chain (in case of N hops).
+export function chainReplyToParent(childTaskId: string, replyText: string, replyStatus: "replied" | "failed" | "cancelled" = "replied", maxDepth = 5): void {
+  let currentChildId: string | null = childTaskId;
+  let currentReply = replyText;
+  let depth = 0;
+  while (currentChildId && depth < maxDepth) {
+    depth++;
+    type ChildRow = { parent_task_id: string | null; to_name: string; from_name: string; content: string };
+    type ParentRow = { task_id: string; from_name: string; to_name: string; status: string; result: string | null; network_id: string | null; parent_task_id: string | null };
+    const child: ChildRow | null = db.get<ChildRow>(
+      "SELECT parent_task_id, to_name, from_name, content FROM tasks WHERE task_id = ?1",
+      currentChildId
+    );
+    if (!child?.parent_task_id) return;
+    const parent: ParentRow | null = db.get<ParentRow>(
+      "SELECT task_id, from_name, to_name, status, result, network_id, parent_task_id FROM tasks WHERE task_id = ?1",
+      child.parent_task_id
+    );
+    if (!parent) return;
+
+    const childAlias = child.to_name;
+    const marker = `\n\n[via ${childAlias} 子任务结果]\n${currentReply}`;
+    const newResult = parent.result ? parent.result + marker : `[via ${childAlias} 子任务结果]\n${currentReply}`;
+
+    // Bump parent status to replied if still open. If it was already replied
+    // (e.g. 指挥室 sent an early status update), we still want to update the
+    // result so the dashboard can render the final chained answer — but keep
+    // status as replied (it was already terminal).
+    if (parent.status === "delivered" || parent.status === "acked" || parent.status === "running" || parent.status === "created") {
+      db.run(
+        "UPDATE tasks SET status = ?1, result = ?2, completed_at = datetime('now') WHERE task_id = ?3",
+        [replyStatus, newResult.slice(0, 8000), parent.task_id]
+      );
+      logTaskEvent(parent.task_id, parent.status, replyStatus, "auto-chain", `from ${childAlias}`);
+    } else {
+      db.run(
+        "UPDATE tasks SET result = ?1, completed_at = datetime('now') WHERE task_id = ?2",
+        [newResult.slice(0, 8000), parent.task_id]
+      );
+      logTaskEvent(parent.task_id, parent.status, parent.status, "auto-chain-append", `from ${childAlias}`);
+    }
+
+    if (parent.from_name && parent.from_name !== "hub" && parent.from_name !== "api") {
+      try {
+        const notifyId = `chain_${crypto.randomUUID().replace(/-/g, "").slice(0, 16)}`;
+        db.run(
+          `INSERT INTO inbox (id, session_name, type, priority, content, from_session, in_reply_to, requires_response, network_id)
+           VALUES (?1, ?2, 'reply', 'normal', ?3, ?4, ?5, 'none', ?6)`,
+          [notifyId, parent.from_name, `[${childAlias} 子任务完成]\n${currentReply.slice(0, 4000)}`, parent.to_name, parent.task_id, parent.network_id ?? null]
+        );
+      } catch {}
+    }
+
+    // Recurse up the chain.
+    currentChildId = parent.task_id;
+    currentReply = newResult;
+  }
+}
+
 export function logTaskEvent(taskId: string, fromStatus: string | null, toStatus: string, actor: string, detail?: string) {
   try {
     db.run(

package/src/tools.ts

@@ -1,6 +1,6 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod/v4";
-import { db, uuidv4, logTaskEvent } from "./db.js";
+import { db, uuidv4, logTaskEvent, chainReplyToParent } from "./db.js";
 import { pushEvent, pushBroadcast } from "./push.js";
 import { getUserNetworkRole } from "./auth.js";
 
@@ -230,6 +230,28 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
       // Log event after transaction
       if (updatedTaskId) logTaskEvent(updatedTaskId, null, "replied", alias, "report_completion");
 
+      // Auto-chain to parent lineage (mirror of send_reply path).
+      if (updatedTaskId) {
+        try {
+          chainReplyToParent(updatedTaskId, result, "replied");
+          const parentChain = db.get<{ parent_task_id: string | null }>(
+            "SELECT parent_task_id FROM tasks WHERE task_id = ?1",
+            [updatedTaskId]
+          );
+          if (parentChain?.parent_task_id) {
+            const parent = db.get<{ from_name: string; task_id: string }>(
+              "SELECT from_name, task_id FROM tasks WHERE task_id = ?1",
+              [parentChain.parent_task_id]
+            );
+            if (parent?.from_name && parent.from_name !== "hub" && parent.from_name !== "api") {
+              pushEvent(parent.from_name, { type: "chained_reply", parent_task_id: parent.task_id, child_task_id: updatedTaskId, child_alias: alias });
+            }
+          }
+        } catch (e: any) {
+          console.log(`[${ts()}] ⚠ chainReplyToParent (completion) failed: ${e.message}`);
+        }
+      }
+
       return {
         content: [{ type: "text" as const, text: JSON.stringify({ ok: true, completion_id: id }) }],
       };
@@ -394,9 +416,23 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
       from_session: z.string().max(200).optional(),
       ttl_seconds: z.number().min(1).max(86400).optional().describe("Task TTL in seconds (default: 3600)"),
       network_id: z.string().max(200).optional().describe("Network scope"),
+      parent_task_id: z.string().max(200).optional().describe("Parent task this dispatch is on behalf of. When the child task replies the hub will auto-chain the answer to the parent task's originator, so the user sees the final result even if the intermediate session ends."),
     },
-    async ({ alias, task, priority, context, from_session: _fromIn, ttl_seconds, network_id: netId }) => { const from_session = defaultFrom(_fromIn);
+    async ({ alias, task, priority, context, from_session: _fromIn, ttl_seconds, network_id: netId, parent_task_id: parentIn }) => { const from_session = defaultFrom(_fromIn);
       const effectiveNetId = getNetworkId(netId);
+      // Resolve parent_task_id: explicit > inferred (caller's most recent
+      // delivered/started inbox task that's still open). Inference is the
+      // safety net for when the LLM forgets to pass parent_task_id.
+      let parentTaskId: string | null = parentIn ?? null;
+      if (!parentTaskId && from_session && from_session !== "hub" && from_session !== "api") {
+        try {
+          const recent = db.get<{ task_id: string }>(
+            "SELECT task_id FROM tasks WHERE to_name = ?1 AND status IN ('delivered','started') ORDER BY created_at DESC LIMIT 1",
+            [from_session]
+          );
+          if (recent?.task_id) parentTaskId = recent.task_id;
+        } catch {}
+      }
 
       // Role check: viewer cannot send tasks
       if (!canWrite(effectiveNetId)) {
@@ -425,12 +461,12 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
           [id, alias, priority, task, context ?? null, from_session, effectiveNetId ?? null]
         );
         db.run(
-          `INSERT INTO tasks (task_id, from_name, to_name, priority, status, content, requires_response, created_at, delivered_at, expires_at, network_id)
-           VALUES (?1, ?2, ?3, ?4, 'delivered', ?5, 'reply', datetime('now'), datetime('now'), datetime('now', ?6), ?7)`,
-          [id, from_session, alias, priority, task, `+${ttl_seconds || 3600} seconds`, effectiveNetId ?? null]
+          `INSERT INTO tasks (task_id, from_name, to_name, priority, status, content, requires_response, created_at, delivered_at, expires_at, network_id, parent_task_id)
+           VALUES (?1, ?2, ?3, ?4, 'delivered', ?5, 'reply', datetime('now'), datetime('now'), datetime('now', ?6), ?7, ?8)`,
+          [id, from_session, alias, priority, task, `+${ttl_seconds || 3600} seconds`, effectiveNetId ?? null, parentTaskId]
         );
       });
-      logTaskEvent(id, null, "delivered", from_session, `→ ${alias}`);
+      logTaskEvent(id, null, "delivered", from_session, parentTaskId ? `→ ${alias} (parent=${parentTaskId.slice(0,8)})` : `→ ${alias}`);
 
       const session = scopedSessionStatus(alias, effectiveNetId);
 
@@ -542,6 +578,30 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
       // Log event after commit (outside transaction)
       if (replyLogged && in_reply_to) logTaskEvent(in_reply_to, null, replyStatus, from_session, text.slice(0, 200));
 
+      // Auto-chain reply up to parent task lineage so admin sees the final
+      // answer even if the intermediate session has died.
+      if (replyLogged && in_reply_to) {
+        try {
+          chainReplyToParent(in_reply_to, text, replyStatus);
+          // Push SSE event for parent originator if there is a chain.
+          const parentChain = db.get<{ parent_task_id: string | null; from_name: string }>(
+            "SELECT parent_task_id, from_name FROM tasks WHERE task_id = ?1",
+            [in_reply_to]
+          );
+          if (parentChain?.parent_task_id) {
+            const parent = db.get<{ from_name: string; task_id: string }>(
+              "SELECT from_name, task_id FROM tasks WHERE task_id = ?1",
+              [parentChain.parent_task_id]
+            );
+            if (parent?.from_name && parent.from_name !== "hub" && parent.from_name !== "api") {
+              pushEvent(parent.from_name, { type: "chained_reply", parent_task_id: parent.task_id, child_task_id: in_reply_to, child_alias: alias });
+            }
+          }
+        } catch (e: any) {
+          console.log(`[${ts()}] ⚠ chainReplyToParent failed: ${e.message}`);
+        }
+      }
+
       const session = scopedSessionStatus(alias, effectiveNetId);
       pushEvent(alias, { type: "new_reply", from: from_session, message_id: id, in_reply_to, status: replyStatus });