@sleep2agi/commhub-server 0.9.0-preview.139 → 0.9.0-preview.140

package/src/tools.ts

@@ -1,3 +1,4 @@
+import { parseScheduledWorkOutcome, qualifyScheduledWorkOutcome, saveScheduledWorkOutcome } from "./scheduled-work-outcome.js";
 import { selectHumanInboxIds } from "./human-inbox.js";
 import { hostSupervisorIdentityRows } from "./host-supervisor-identity.js";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
@@ -728,12 +729,12 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
 
   server.tool(
     "report_status",
-    "Report agent status. Returns inbox_count so you know if there are pending tasks.",
+    "Report agent status. Returns inbox_count.",
     {
       resume_id: z.string().min(1).max(200).describe("Claude Code session UUID (unique per session)"),
       alias: z.string().min(1).max(200).describe("Human-readable session name for dispatching (e.g. 指挥室/知识哥)"),
       status: z.enum(["working", "idle", "blocked", "error", "waiting_input", "offline"]),
-      task: z.string().max(TASK_CONTENT_MAX).optional().describe("Current task description (the hub stores only the first 200 chars on the session row; the full text is matched against tasks.content)"),
+      task: z.string().max(TASK_CONTENT_MAX).optional().describe("Task (session stores 200 chars; full text matches tasks.content)"),
       output: z.string().max(50000).optional().describe("Recent output (max 4000 chars stored)"),
       score: z.number().min(0).max(10).optional().describe("Self-score 1-10"),
       progress: z.number().min(0).max(100).optional().describe("Progress 0-100"),
@@ -741,6 +742,15 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
       hostname: z.string().max(200).optional().describe("Agent hostname"),
       agent: z.string().max(100).optional().describe("Agent type (claude-code / codex / opencode)"),
       project_dir: z.string().max(1000).optional().describe("Agent working directory"),
+      // #1198 — OS account the process runs as (platform identity only; no env fallback).
+      os_user: z.string().min(1).max(256).optional().describe("OS account"),
+      // #1474 — names of the env keys this node actually has. Never values; the
+      // node-side collector parses and drops them. Capped at 50 * 64 chars so a
+      // pathological secrets.env cannot grow this row without bound.
+      secret_keys: z.array(z.string().regex(/^[A-Z_][A-Z0-9_]{0,63}$/)).max(50).optional().describe("Env key names only"),
+      // #1510 — how the node reaches this hub. Reported by the node because only
+      // it knows the last hop. Reporting only; no write path reads it yet.
+      env_transport: z.enum(["loopback", "https", "plain"]).optional().describe("Hub link kind"),
       version: z.string().max(100).optional().describe("Agent version"),
       tmux_name: z.string().max(200).optional().describe("tmux session name"),
       // V2 fields
@@ -963,7 +973,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
       // instead of rejecting the whole report (see node-health-store.ts).
       health: nodeHealthSchema,
     },
-    async ({ resume_id, alias, status, task, output, score, progress, server: srv, hostname: hn, agent: ag, project_dir: pd, version: ver, tmux_name: tmux, node_id, session_id, config_path, channels, model: mdl, node_name: nn, network_id: netId, host, process_telemetry: proc, external_schedules: externalSchedules, config_snapshot: cfgSnap, rules_file_capable: rulesFileCapable, skills_capable: skillsCapable, files_capable: filesCapable, logs_capable: logsCapable, health: nodeHealth }) => {
+    async ({ resume_id, alias, status, task, output, score, progress, server: srv, hostname: hn, agent: ag, project_dir: pd, os_user: osUser, version: ver, tmux_name: tmux, node_id, session_id, config_path, channels, model: mdl, node_name: nn, network_id: netId, host, process_telemetry: proc, external_schedules: externalSchedules, config_snapshot: cfgSnap, rules_file_capable: rulesFileCapable, skills_capable: skillsCapable, files_capable: filesCapable, logs_capable: logsCapable, health: nodeHealth, secret_keys: secretKeys, env_transport: envTransport }) => {
       const effectiveNetId = getNetworkId(netId);
       const sessionNetId = effectiveNetId ?? "default";
       if (!callerTokenIsNetwork || !enforceNetworkId) {
@@ -1110,7 +1120,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
                   channels, model, cpu_load_1min, cpu_cores, mem_total_gb, mem_used_gb, mem_avail_gb, disk_total_gb,
                   disk_used_gb, disk_avail_gb, process_rss_bytes, process_rss_mb, process_cpu_pct,
                   process_uptime_seconds, process_in_flight_count, external_schedules, registered_at,
-                  rules_file_capable, skills_capable, files_capable, logs_capable
+                  rules_file_capable, skills_capable, files_capable, logs_capable, os_user, secret_keys
              FROM sessions WHERE alias = ?1 AND resume_id != ?2 AND network_id = ?3
              ORDER BY updated_at DESC LIMIT 1`,
           effectiveAlias, resume_id, sessionNetId,
@@ -1155,6 +1165,43 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
              last_seen_at = datetime('now'), updated_at = datetime('now')`,
           [resume_id, effectiveAlias, tmux ?? null, srv ?? null, hostIp, hostHostname, ag ?? null, pd ?? null, ver ?? null, storedStatus, sessionTask, trimmedOutput ?? null, progress ?? null, score ?? null, node_id ?? null, session_id ?? null, config_path ?? null, channels ?? null, sessionNetId, mdl ?? null, cpuLoad1m, cpuCores, memTotalGb, memUsedGb, memAvailGb, diskTotalGb, diskUsedGb, diskAvailGb, processRssBytes, processRssMb, processCpuPct, processUptimeSeconds, processInFlightCount, externalSchedulesJson, peerReplyInboxCapable ? 1 : 0]
         );
+        // #1198 — os_user is its own UPDATE so the INSERT/UPSERT shape stays
+        // pinned (test698). Absent means "not reported": keep the stored value.
+        // A resume_id handover DELETE+INSERTs a row that starts NULL, so copy
+        // the replaced row only when this report omits the field. COALESCE
+        // keeps a value already on the surviving row.
+        if (osUser) {
+          db.run(
+            `UPDATE sessions SET os_user = ?2, updated_at = datetime('now') WHERE resume_id = ?1`,
+            [resume_id, osUser],
+          );
+        }
+        // #1474 — its own UPDATE for the same reason as os_user: the INSERT /
+        // UPSERT placeholder bytes stay untouched. An EMPTY array is a real
+        // report ("this node has no secrets") and must overwrite the old list;
+        // only `undefined` (field absent) keeps the previous value.
+        if (envTransport) {
+          db.run(
+            `UPDATE sessions SET env_transport = ?2, updated_at = datetime('now') WHERE resume_id = ?1`,
+            [resume_id, envTransport],
+          );
+        }
+        if (Array.isArray(secretKeys)) {
+          db.run(
+            `UPDATE sessions SET secret_keys = ?2, updated_at = datetime('now') WHERE resume_id = ?1`,
+            [resume_id, JSON.stringify(secretKeys)],
+          );
+        } else if (typeof handover?.secret_keys === "string" && handover.secret_keys) {
+          db.run(
+            `UPDATE sessions SET secret_keys = COALESCE(secret_keys, ?2) WHERE resume_id = ?1`,
+            [resume_id, handover.secret_keys],
+          );
+        } else if (typeof handover?.os_user === "string" && handover.os_user) {
+          db.run(
+            `UPDATE sessions SET os_user = COALESCE(os_user, ?2) WHERE resume_id = ?1`,
+            [resume_id, handover.os_user],
+          );
+        }
         if (handover) {
           // 换 resume_id 那条路径上 ON CONFLICT 不会触发;INSERT 完再把没上报(仍为 NULL)的
           // 描述性列从被替换的那行接手。INSERT 语句与参数列表保持原样 —— test698 的变异
@@ -1908,8 +1955,8 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
       // (db.ts) write back into A's task result + inbox — cross-tenant
       // write. Verify ownership, reject on mismatch.
       if (parentIn) {
-        const parentRow = db.get<{ network_id: string | null }>(
-          "SELECT network_id FROM tasks WHERE task_id = ?1",
+        const parentRow = db.get<{ network_id: string | null; from_name: string; to_name: string }>(
+          "SELECT network_id, from_name, to_name FROM tasks WHERE task_id = ?1",
           [parentIn]
         );
         if (!parentRow) {
@@ -1924,6 +1971,24 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
             ok: false, error: "cross_network_parent",
             message: "parent_task_id belongs to a different network",
           }) }] };
+        } else {
+          // Node-TMAI#4 (D): same-network is NOT sufficient. The dispatcher
+          // must be a party to the task it claims as parent — either its
+          // originator or its assignee. Without this, a same-network caller
+          // could attach its dispatch to any third party's task and the
+          // chain would later surface that child's result to the third
+          // party's originator. Compare canonical aliases so a committed
+          // rename on either side cannot defeat the check.
+          const parentFromAlias = resolveCanonicalAlias(effectiveNetId, parentRow.from_name).alias;
+          const parentToAlias = resolveCanonicalAlias(effectiveNetId, parentRow.to_name).alias;
+          const childFromAlias = resolveCanonicalAlias(effectiveNetId, from_session).alias;
+          if (childFromAlias !== parentFromAlias && childFromAlias !== parentToAlias) {
+            console.log(`[${ts()}] 🚫 send_task: non-participant parent rejected, parent=${parentIn.slice(0, 8)} caller=${childFromAlias}`);
+            return { content: [{ type: "text" as const, text: JSON.stringify({
+              ok: false, error: "parent_not_participant",
+              message: "parent_task_id is not a task this sender took part in",
+            }) }] };
+          }
         }
       }
 
@@ -2212,6 +2277,9 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
     };
   const handleReply = async (args: any, peerCapabilityRequired: boolean) => {
       const { alias, text, in_reply_to, status: replyStatus = "replied", from_session: _fromIn, network_id: netId, attachments, meta, thread_id: threadId, turn_id: turnId } = args;
+      const workSignal = parseScheduledWorkOutcome(meta, replyStatus);
+      if (!workSignal.ok) return { content: [{ type: "text" as const, text: JSON.stringify({ ok: false, error: workSignal.error, reply_queued: false }) }] };
+      if (workSignal.outcome && !in_reply_to) return { content: [{ type: "text" as const, text: JSON.stringify({ ok: false, error: "scheduled_work_outcome_task_required", reply_queued: false }) }] };
       const fromMismatch = fromIdentityMismatchReply(_fromIn); if (fromMismatch) return fromMismatch; const from_session = defaultFrom(_fromIn);
       const effectiveNetId = getNetworkId(netId);
       if (!canWrite(effectiveNetId)) return writeDeniedReply(effectiveNetId);
@@ -2297,6 +2365,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
         lateSql = addScope(lateSql, lateParams, effectiveNetId);
         const lateCandidate = db.get<LateTask>(lateSql, ...lateParams) ?? null;
         if (lateCandidate && !["created", "delivered", "acked", "running"].includes(lateCandidate.status)) {
+          if (workSignal.outcome) return { content: [{ type: "text" as const, text: JSON.stringify({ ok: false, error: "scheduled_work_outcome_terminal", reply_queued: false }) }] };
           // Old runtimes do not send turn identity and retain the old result.
           if (!threadId || !turnId) {
             return { content: [{ type: "text" as const, text: JSON.stringify({
@@ -2460,6 +2529,17 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
 
         }
 
+        let workBinding: Extract<ReturnType<typeof qualifyScheduledWorkOutcome>, { ok: true }> | undefined;
+        if (workSignal.outcome) {
+          if (!in_reply_to || !callerTokenIsNetwork || !callerTokenId || !enforceNetworkId || effectiveNetId !== enforceNetworkId)
+            return { ok: false as const, error: "scheduled_work_outcome_bound_node_required" };
+          const token = db.get<{ bound_node_id: string | null }>(
+            "SELECT bound_node_id FROM api_tokens WHERE token_id = ?1 AND network_id = ?2", callerTokenId, enforceNetworkId);
+          const qualified = qualifyScheduledWorkOutcome(in_reply_to, enforceNetworkId, token?.bound_node_id ?? null);
+          if (!qualified.ok) return qualified;
+          workBinding = qualified;
+        }
+
         // #507 — write meta_json on inbox insert (parity with send_task L952).
         // Prior to this the attachments field on a send_reply call was
         // silently stripped by MCP Zod, leaving `ok:true` with no persisted
@@ -2514,11 +2594,12 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
           if (result.changes === 0) {
             throw new Error(`reply_atomic_cas_failed:${in_reply_to}`);
           }
+          if (workBinding && workSignal.outcome) saveScheduledWorkOutcome(workBinding.binding, workSignal.outcome);
           syncScheduledRunForTask(in_reply_to, effectiveNetId);
           // #1548 —— 终态回复是最强的活性证据:一个还标着 blocked 的发送方在此回到 idle。
           //   只出 blocked;working 可能真在忙别的任务,不碰。
           releaseBlockedSession(from_session, effectiveNetId);
-          return { ok: true as const, replyLogged: true };
+          return { ok: true as const, replyLogged: true, ...(workSignal.outcome ? { workOutcome: workSignal.outcome } : {}) };
         }
         return { ok: true as const, replyLogged: false };
       });
@@ -2632,6 +2713,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
           text: JSON.stringify({
             ok: true,
             message_id: id,
+            ...("workOutcome" in replyOutcome ? { scheduled_work_outcome: replyOutcome.workOutcome } : {}),
             session_status: session?.status ?? "unknown",
             ...(warning ? { warning } : {}),
             ...(attachmentsSaved !== null ? { attachments_saved: attachmentsSaved } : {}),
@@ -4389,6 +4471,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
         // These options belong under the strict flags envelope.
         opencodeGeneration: z.never().optional(),
         opencodeUnsafeTools: z.never().optional(),
+        opencodeNewServer: z.never().optional(),
         channels: z.array(z.unknown()).optional(),
         // app「新建节点」确认页的工作目录(绝对路径或 ~/…,daemon 侧展开并校验)。
         // 缺席 = 老行为:落 daemon 的 cwd。
@@ -6556,7 +6639,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
     project_id: z.string().max(200).nullable().optional(),
     owner: reqPerson.nullable().optional().describe("负责人 (a person): {kind:'user', id | username} (ids / usernames from requirements_people; names resolve in the task's network); a node is rejected with owner_must_be_human — use agent_owner"),
     agent_owner: reqPerson.nullable().optional().describe("负责 Agent: {kind:'node', id | alias}"),
-    participants: z.array(reqPerson).max(100).optional().describe("REPLACES the whole list (written like owner / agent_owner; omitted people are removed, [] clears). To add or remove a few, use participants_add / participants_remove on requirements_update."),
+    participants: z.array(reqPerson).max(100).optional().describe("REPLACES the whole list (like owner/agent_owner; omitted people are removed, [] clears). For a few, use participants_add/participants_remove."),
     external_url: z.string().max(500).nullable().optional(),
     parent_id: z.string().regex(/^[A-Za-z0-9_-]{1,200}$/).nullable().optional().describe("parent requirement (same network, no cycles, ≤ 5 levels); null detaches"),
   };
@@ -6591,13 +6674,13 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
     parent_id: z.string().max(200).optional().describe("children of this requirement ('none' = top level)"),
     department_id: z.string().max(64).optional().describe("owner (or its Agent's owner) in this department or below"),
     top_level: z.boolean().optional(), q: z.string().max(200).optional(),
-    overdue: z.boolean().optional().describe("true = open tasks past their due (date-only due: before today, Asia/Shanghai); false = everything else"),
+    overdue: z.boolean().optional().describe("true = open tasks whose due is past (date-only: before today, Asia/Shanghai); false = rest"),
     due_within_days: z.number().int().min(0).max(365).optional().describe("open tasks not yet overdue, due by the end of today + N days (0 = later today)"),
     limit: z.number().int().min(1).max(1000).optional().describe(`page size, default ${REQ_LIST_MCP_DEFAULT_LIMIT}`),
     cursor: z.string().max(600).optional().describe("next_cursor from the previous page"),
-    view: z.enum(["full", "summary"]).optional().describe("default summary (no description / checklist bodies; has_description, checklist_count instead); full = everything"),
-    changes: z.boolean().optional().describe("with updated_since: only tasks changed since then (archived included; with include_last_event also ones with a newer event, e.g. a comment) + deleted ids + server_time"),
-    include_last_event: z.boolean().optional().describe("default false; true adds last_event per row (newest event incl. comments: type, field, actor, at, summary; null if none), ~150 B/row"),
+    view: z.enum(["full", "summary"]).optional().describe("default summary (no bodies; has_description/checklist_count instead); full = everything"),
+    changes: z.boolean().optional().describe("with updated_since: only tasks changed since then (incl. archived; +deleted ids +server_time; with include_last_event also newer events)"),
+    include_last_event: z.boolean().optional().describe("default false; true adds last_event per row (~150 B/row: type, field, actor, at, summary; null if none)"),
   };
   const reqListKeys = Object.keys(reqListShape);
   server.registerTool(
@@ -6791,16 +6874,16 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
   const schedId = z.string();
   const schedFields = {
     name: z.string(), task: z.string(), target_node_id: z.string().optional(),
-    schedule: z.any().describe("once{run_at}|interval{every_seconds>=60}|daily{time}|weekly{time,weekdays}"),
-    timezone: z.string().optional(), priority: z.string().optional(),
+    schedule: z.any().describe("once|interval|daily|weekly"),
+    timezone: z.string().optional(), priority: z.string().optional(), no_change_backoff: z.boolean().optional(),
   };
   server.tool("schedule_list", "Hub schedules for or by you.", { status: z.string().optional() },
     async ({ status }) => scheduleCall(id => agentListSchedules(id, status)));
   server.tool("schedule_get", "One schedule.", { schedule_id: schedId },
     async ({ schedule_id }) => scheduleCall(id => agentGetSchedule(id, schedule_id)));
-  server.tool("schedule_create", "Schedule a task to target_node_id (default you).", schedFields,
+  server.tool("schedule_create", "Create your schedule.", schedFields,
     async (args) => scheduleCall((id, w) => agentCreateSchedule(id, w, args as Record<string, unknown>)));
-  server.tool("schedule_update", "Edit your schedule; status=paused|active.",
+  server.tool("schedule_update", "Edit yours.",
     { ...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_batch_interval", "Batch interval edit; per-ID results.",