oasis_test 0.1.54 → 0.1.56

package/dist/index.js

@@ -4014,7 +4014,10 @@ function computeReviewJobs(model) {
   }
   return out;
 }
-var import_node_crypto2, DEFAULT_PREDISPATCH_TIMEOUT_MS, SpawnAttemptStale, SEED_ROOT_SUCCESSFUL_PRODUCE_LIMIT, CANVAS_RUNTIME_KIND, NON_PRODUCE_FALLBACK_RUNTIME_KIND, Dispatcher;
+function isSelfHealingExit(reason) {
+  return reason !== void 0 && SELF_HEALING_EXITS.has(reason);
+}
+var import_node_crypto2, DEFAULT_PREDISPATCH_TIMEOUT_MS, SpawnAttemptStale, SEED_ROOT_SUCCESSFUL_PRODUCE_LIMIT, SELF_HEALING_EXITS, CANVAS_RUNTIME_KIND, NON_PRODUCE_FALLBACK_RUNTIME_KIND, Dispatcher;
 var init_dispatcher = __esm({
   "../core/src/dispatcher.ts"() {
     "use strict";
@@ -4032,6 +4035,7 @@ var init_dispatcher = __esm({
       }
     };
     SEED_ROOT_SUCCESSFUL_PRODUCE_LIMIT = 5;
+    SELF_HEALING_EXITS = /* @__PURE__ */ new Set(["rate-limit"]);
     CANVAS_RUNTIME_KIND = "open-design";
     NON_PRODUCE_FALLBACK_RUNTIME_KIND = "claude-code";
     Dispatcher = class {
@@ -4076,6 +4080,20 @@ var init_dispatcher = __esm({
           fusedAt: st.fusedAt
         }));
       }
+      /**
+       * 长期饥饿的自愈类 job（rate-limit 持续退避超 starvationMs 仍未恢复）：自愈类从不熔断、进不了 fusedJobs，
+       * 若配额**长期**不足就成了静默卡死——本访问器供 SLA 扫描把它升级为**算力缺口**（提案"长期不足才=算力缺口"）。
+       */
+      starvingJobs(starvationMs, now) {
+        const out = [];
+        for (const [jobKey, st] of this.strikes) {
+          if (st.fused || !isSelfHealingExit(st.lastReason) || !st.firstFailedAt) continue;
+          const sinceMs = now - Date.parse(st.firstFailedAt);
+          if (sinceMs <= starvationMs) continue;
+          out.push({ jobKey, artifactId: st.artifactId, actor: st.actor, action: st.action, consecutiveFailures: st.count, lastReason: st.lastReason, sinceMs });
+        }
+        return out;
+      }
       /** v1 调度准入：当前被并发上限挡下、等待重评的 produce 会话数（/api/view dispatches 表面化）。 */
       queuedCount() {
         return this.queued.size;
@@ -4315,19 +4333,22 @@ var init_dispatcher = __esm({
       }
       recordSpawnFailure(jobKey, spec, reason) {
         const seqAtVerdict = this.opts.kernel.model.lastSeq.get(spec.artifactId) ?? 0;
-        const consecutive = (this.strikes.get(jobKey)?.count ?? 0) + 1;
+        const prev = this.strikes.get(jobKey);
+        const consecutive = (prev?.count ?? 0) + 1;
         const max = this.opts.backoff?.maxConsecutiveFailures ?? 3;
         const base = this.opts.backoff?.baseMs ?? 3e4;
-        const fused = consecutive >= max;
+        const cap = this.opts.backoff?.maxBackoffMs ?? 30 * 6e4;
+        const fused = consecutive >= max && !isSelfHealingExit(reason);
         this.strikes.set(jobKey, {
           artifactId: spec.artifactId,
           actor: spec.actor,
           action: spec.action,
           count: consecutive,
-          nextEligibleAt: Date.now() + base * 2 ** (consecutive - 1),
+          nextEligibleAt: Date.now() + Math.min(base * 2 ** (consecutive - 1), cap),
           fused,
           ...fused ? { fusedAt: (/* @__PURE__ */ new Date()).toISOString() } : {},
           seqAtVerdict,
+          firstFailedAt: prev?.firstFailedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
           lastReason: reason
         });
         if (fused) {
@@ -4401,7 +4422,7 @@ var init_dispatcher = __esm({
           }
         }
         const retry = this.strikes.get(jobKey);
-        const lastFailure = retry && retry.count > 0 && retry.lastReason ? { reason: retry.lastReason } : void 0;
+        const lastFailure = retry && retry.count > 0 && retry.lastReason && !isSelfHealingExit(retry.lastReason) ? { reason: retry.lastReason } : void 0;
         const ws = kernel.model.artifacts.get(spec.artifactId)?.workspace;
         const codeRepo = ws ? await this.opts.resolveCodeRepo?.(ws) ?? null : null;
         this.assertSpawnAttemptCurrent(jobKey, attempt);
@@ -4588,19 +4609,23 @@ var init_dispatcher = __esm({
         if (progressed) {
           this.strikes.delete(jobKey);
         } else {
-          consecutive = (this.strikes.get(jobKey)?.count ?? 0) + 1;
+          const prev = this.strikes.get(jobKey);
+          consecutive = (prev?.count ?? 0) + 1;
           const max = this.opts.backoff?.maxConsecutiveFailures ?? 3;
           const base = this.opts.backoff?.baseMs ?? 3e4;
-          const fused = consecutive >= max;
+          const cap = this.opts.backoff?.maxBackoffMs ?? 30 * 6e4;
+          const fused = consecutive >= max && !isSelfHealingExit(info.reason);
           this.strikes.set(jobKey, {
             artifactId: spec.artifactId,
             actor: spec.actor,
             action: spec.action,
             count: consecutive,
-            nextEligibleAt: Date.now() + base * 2 ** (consecutive - 1),
+            // 退避封顶（maxBackoffMs，默认 30min）：自愈类不熔断→consecutive 可无界增长，不封顶则间隔爆炸。
+            nextEligibleAt: Date.now() + Math.min(base * 2 ** (consecutive - 1), cap),
             fused,
             ...fused ? { fusedAt: (/* @__PURE__ */ new Date()).toISOString() } : {},
             seqAtVerdict: seqAtExit,
+            firstFailedAt: prev?.firstFailedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
             ...info.reason ? { lastReason: info.reason } : {}
           });
           if (fused) {
@@ -22454,6 +22479,82 @@ var init_node_state = __esm({
   }
 });
 
+// ../server/src/domains/collab/stall.ts
+function shortId(id) {
+  return id.length > 22 ? `${id.slice(0, 14)}\u2026` : id;
+}
+function stallOf(model, id, runtime) {
+  const a = model.artifacts.get(id);
+  if (!a) return null;
+  const ownerIsAgent = a.owner.startsWith("actor:agent:");
+  if (runtime?.status === "running") {
+    return { kind: "running", detail: `${runtime.action ?? "produce"} \u5728\u8DD1`, ...runtime.startedAt ? { since: runtime.startedAt } : {} };
+  }
+  if (isHeld(model, id)) {
+    const h = holdOf(model, id);
+    return { kind: "held", action: "resume", detail: `\u5DF2\u6682\u505C\u6D3E\u53D1${h?.reason ? `\uFF1A${h.reason}` : ""}\u2014\u2014\u5F85\u6062\u590D`, ...h?.at ? { since: h.at } : {} };
+  }
+  if (runtime && (runtime.status === "failed" || runtime.status === "fused" || runtime.status === "escalated")) {
+    const label = runtime.status === "escalated" ? "\u5DF2\u5347\u7EA7\u3001\u5F85\u4EBA\u4ECB\u5165" : runtime.status === "fused" ? "\u8FDE\u8D25\u7194\u65AD\u3001\u505C\u6D3E\u5F85\u5904\u7406" : "\u8FD0\u884C\u51FA\u9519";
+    return {
+      kind: "failed",
+      detail: `${label}${runtime.reason ? `\uFF08${runtime.reason}\uFF09` : ""}`,
+      ...runtime.reason ? { reason: runtime.reason } : {},
+      ...runtime.finishedAt ? { since: runtime.finishedAt } : {}
+    };
+  }
+  const head = queueOf(model, id)[0];
+  if (head) {
+    const authors = declaredHumanAuthorsOf(model, head);
+    if (authors.size > 0) {
+      const approved = new Set((model.reviews.get(head.id) ?? []).filter((v2) => v2.verdict === "approve").map((v2) => v2.author));
+      const missing = [...authors].filter((x2) => !approved.has(x2));
+      if (missing.length > 0) {
+        return {
+          kind: "waiting_human",
+          action: "accept",
+          actorId: missing[0],
+          ref: head.id,
+          detail: `\u7B49 ${shortId(missing[0])} \u9A8C\u6536 ${shortId(head.id)} \u7248${missing.length > 1 ? `\uFF08\u5171 ${missing.length} \u4EBA\uFF09` : ""}`,
+          since: head.createdAt
+        };
+      }
+    }
+  }
+  const gate = pendingConcludeAttempt(model, id);
+  if (gate?.gate) {
+    const votedBy = new Set((model.reviews.get(gate.head) ?? []).map((v2) => v2.author));
+    const humanEligible = gate.gate.eligible.filter((r) => r.startsWith("actor:human:") && !votedBy.has(r));
+    if (humanEligible.length > 0) {
+      return { kind: "waiting_human", action: "review", actorId: humanEligible[0], detail: `\u7B49 ${shortId(humanEligible[0])} \u5BA1\u6279\uFF08quorum=${gate.gate.quorum}\uFF09`, since: gate.at };
+    }
+  }
+  if (hasOpenHumanChangeRequest(model, id) || headRejected(model, id)) {
+    return ownerIsAgent ? { kind: "waiting_agent", action: "rework", actorId: a.owner, detail: "\u6709\u672A\u5904\u7406\u7684\u53D8\u66F4\u8BF7\u6C42\uFF0C\u5F85\u8FD4\u5DE5" } : { kind: "waiting_human", action: "rework", actorId: a.owner, detail: "\u6709\u672A\u5904\u7406\u7684\u53D8\u66F4\u8BF7\u6C42\uFF0C\u5F85\u4F60\u8FD4\u5DE5" };
+  }
+  const escs = unresolvedEscalationsOf(model, id);
+  if (escs.length > 0) {
+    return { kind: "waiting_human", action: "discuss", ref: id, detail: `\u5DF2\u4E0A\u62A5\u5F85\u4EBA\u4ECB\u5165\uFF1A${escs.at(-1).reason.slice(0, 60)}`, since: escs.at(-1).at };
+  }
+  const gaps = unresolvedGapsOf(model, id);
+  if (gaps.length > 0) {
+    return { kind: "waiting_human", action: "resolve_gap", detail: `\u5361\u5728\u7F3A\u53E3\u4E0A\u5F85\u4EBA\u8865\uFF1A${gaps[0].description.slice(0, 60)}` };
+  }
+  const b2 = blockedOf(model, id);
+  if (b2.blocked) {
+    const dep = a.inputs.find((e) => e.required && !isConcluded(model, e.to));
+    if (dep) return { kind: "waiting_system", ref: dep.to, detail: `\u7B49\u4E0A\u6E38\u6536\u53E3\uFF1A${shortId(dep.to)}` };
+    return { kind: "waiting_system", detail: `\u963B\u585E\u4E2D\uFF1A${b2.reasons[0] ?? "\u5F85\u524D\u7F6E\u5C31\u7EEA"}` };
+  }
+  return null;
+}
+var init_stall = __esm({
+  "../server/src/domains/collab/stall.ts"() {
+    "use strict";
+    init_src2();
+  }
+});
+
 // ../server/src/coordinator/identity.ts
 function isCoordinatorAgentName(name) {
   return COORDINATOR_NAME_RE.test(name);
@@ -23105,6 +23206,11 @@ function buildWorkorderDetail(model, workspaceId, resolveActor, resolveProject,
       ...e.upstreamCancelled ? { upstreamCancelled: true } : {}
     })) : [];
     const pv = reviewerPreview?.(a.id);
+    const stallRaw = stallOf(model, a.id, runtime);
+    const stall = stallRaw ? (() => {
+      const { actorId, ...rest } = stallRaw;
+      return { ...rest, ...actorId ? { actor: ref(actorId) } : {} };
+    })() : void 0;
     return {
       id: a.id,
       type: a.type,
@@ -23119,12 +23225,35 @@ function buildWorkorderDetail(model, workspaceId, resolveActor, resolveProject,
       ...runtime ? { runtime } : {},
       ...pv ? { reviewers: pv.reviewers.map((r) => ({ actor: ref(r.actor), source: r.source })), quorum: pv.quorum, typeName: pv.typeName } : {},
       // 过期事实（提案 rework-cascade-rollout）：无条件透出，前端 DAG 挂「上游已更新」徽标。
-      ...outdated.length > 0 ? { outdated } : {}
+      ...outdated.length > 0 ? { outdated } : {},
+      // 停滞四态（看得清）：为什么不动 + 谁欠什么 + 去处理锚；null 时不带。
+      ...stall ? { stall } : {}
     };
   });
   const edges = arts.flatMap(
     (a) => a.inputs.map((e) => ({ from: a.id, to: e.to, pinned: e.pinned, required: e.required }))
   );
+  const stallSummary = (() => {
+    const counts = { running: 0, held: 0, failed: 0, waitingHuman: 0, waitingAgent: 0, waitingSystem: 0 };
+    const sev = { failed: 5, held: 4, waiting_human: 3, waiting_agent: 2, waiting_system: 1, running: 0 };
+    const stuck = [];
+    for (const n of nodes) {
+      const st = n.stall;
+      if (!st) continue;
+      if (st.kind === "running") counts.running++;
+      else if (st.kind === "held") counts.held++;
+      else if (st.kind === "failed") counts.failed++;
+      else if (st.kind === "waiting_human") counts.waitingHuman++;
+      else if (st.kind === "waiting_agent") counts.waitingAgent++;
+      else counts.waitingSystem++;
+      if (st.kind !== "running") {
+        stuck.push({ id: n.id, label: n.label, kind: st.kind, ...st.action ? { action: st.action } : {}, ...st.ref ? { ref: st.ref } : {}, detail: st.detail, ...st.actor ? { actor: st.actor } : {} });
+      }
+    }
+    stuck.sort((a, b2) => sev[b2.kind] - sev[a.kind]);
+    const total = counts.running + counts.held + counts.failed + counts.waitingHuman + counts.waitingAgent + counts.waitingSystem;
+    return total > 0 ? { counts, stuck } : void 0;
+  })();
   const activity = buildActivity(model, arts, ref);
   const coordinatorActivity = buildCoordinatorActivity(arts, ops, ref);
   const acceptance = buildAcceptance(model, arts);
@@ -23140,6 +23269,7 @@ function buildWorkorderDetail(model, workspaceId, resolveActor, resolveProject,
     acceptance,
     ...managerActorId ? { managerActorId } : {},
     ...spec?.acceptanceCriteria ? { acceptanceCriteria: spec.acceptanceCriteria } : {},
+    ...stallSummary ? { stallSummary } : {},
     planning
   };
 }
@@ -23435,6 +23565,7 @@ var init_workorder_detail = __esm({
     "use strict";
     init_src2();
     init_node_state();
+    init_stall();
     init_workorders();
     ACTIVITY_NOTE_MAX_CHARS = 500;
     COORDINATOR_EDIT_KINDS = /* @__PURE__ */ new Set([
@@ -26795,7 +26926,7 @@ var init_memory_trace_store = __esm({
         return { items: page.map((r) => this.decorate(structuredClone(r))), nextCursor };
       }
       async listUsageRuns(filter) {
-        return [...this.runs.values()].filter((run) => run.usage !== null && run.startedAt >= filter.from && run.startedAt <= filter.to).map((run) => ({
+        return [...this.runs.values()].filter((run) => run.usage != null && run.startedAt >= filter.from && run.startedAt <= filter.to).map((run) => ({
           actorId: run.actorId,
           artifactId: run.artifactId,
           startedAt: run.startedAt,
@@ -33839,6 +33970,10 @@ var init_daemon_hub = __esm({
       connectedDaemons() {
         return [...this.daemons.values()];
       }
+      /** 最近一帧（含 pong 心跳）的时刻（ms）——节点心跳时钟，供节点健康派生判"心跳新鲜"。缺 = 未连接/已清。 */
+      lastSeenAt(daemonId) {
+        return this.lastSeen.get(daemonId);
+      }
       /** Nodes that disconnected within the last GHOST_TTL_MS ms. */
       recentlyDisconnected() {
         const cutoff = Date.now() - _DaemonHub.GHOST_TTL_MS;
@@ -35528,6 +35663,7 @@ function actorsDomain(opts) {
           status: "active",
           ...b2.email !== void 0 ? { email: b2.email } : {},
           ...b2.teamId !== void 0 ? { teamId: b2.teamId } : {},
+          ...b2.reportsTo ? { reportsTo: b2.reportsTo } : {},
           ...avatar !== void 0 ? { avatar } : {},
           ...positions !== void 0 ? { roles: positions } : {}
         },
@@ -35542,10 +35678,12 @@ function actorsDomain(opts) {
       const b2 = req.body ?? {};
       const positions = positionsFromPayload(b2);
       const avatar = avatarRefFromPayload(b2);
-      const { positions: _positions, id: _id, kind: _kind, avatar: _avatar, ...patch } = b2;
+      const { positions: _positions, id: _id, kind: _kind, avatar: _avatar, reportsTo: _reportsTo, ...patch } = b2;
       const actor = await service.upsertActor({
         ...existing,
         ...patch,
+        // 汇报人：显式给（含清空）——传空串/null 归一为 undefined（写库落 null）；未传则保留原值
+        ...b2.reportsTo !== void 0 ? { reportsTo: b2.reportsTo || void 0 } : {},
         ...avatar !== void 0 ? { avatar } : {},
         ...positions !== void 0 ? { roles: positions } : {},
         id: existing.id,
@@ -36380,12 +36518,12 @@ function parseAcceptanceCriteria(body) {
 }
 function parseReviewActor(req) {
   const actor = String(req.auth.actor);
-  const shortId = actor.split(":").slice(2).join(":") || actor;
+  const shortId2 = actor.split(":").slice(2).join(":") || actor;
   const b2 = req.body ?? {};
   return {
     actorKind: actor.includes(":agent:") ? "agent" : "human",
     actorId: actor,
-    ...b2.actor_name !== void 0 || b2.actorName !== void 0 ? { actorName: b2.actor_name ?? b2.actorName } : { actorName: shortId }
+    ...b2.actor_name !== void 0 || b2.actorName !== void 0 ? { actorName: b2.actor_name ?? b2.actorName } : { actorName: shortId2 }
   };
 }
 function parseAnnotationActor(req) {
@@ -41403,6 +41541,63 @@ var init_connect_script = __esm({
   }
 });
 
+// ../server/src/node-health.ts
+function deriveNodeHealth(input) {
+  const staleMs = input.staleMs ?? 9e4;
+  const maxFail = input.maxConsecutiveFailures ?? 3;
+  const cf = input.snapshot?.consecutiveFailures ?? 0;
+  const heartbeatFresh = input.lastHeartbeatMs !== void 0 && input.now - input.lastHeartbeatMs < staleMs;
+  const healthy = input.online && heartbeatFresh && cf < maxFail;
+  return {
+    healthy,
+    online: input.online,
+    ...input.lastHeartbeatMs !== void 0 ? { lastHeartbeatAt: new Date(input.lastHeartbeatMs).toISOString() } : {},
+    activeRunCount: input.activeRunCount,
+    consecutiveFailures: cf,
+    ...input.snapshot?.lastSuccessfulDispatchAt ? { lastSuccessfulDispatchAt: input.snapshot.lastSuccessfulDispatchAt } : {},
+    ...input.snapshot?.lastFailureAt ? { lastFailureAt: input.snapshot.lastFailureAt } : {},
+    ...input.snapshot?.lastFailureReason ? { lastFailureReason: input.snapshot.lastFailureReason } : {}
+  };
+}
+var NodeHealthTracker;
+var init_node_health = __esm({
+  "../server/src/node-health.ts"() {
+    "use strict";
+    NodeHealthTracker = class {
+      byNode = /* @__PURE__ */ new Map();
+      ensure(nodeId) {
+        let s2 = this.byNode.get(nodeId);
+        if (!s2) {
+          s2 = { consecutiveFailures: 0 };
+          this.byNode.set(nodeId, s2);
+        }
+        return s2;
+      }
+      /** 节点交付了一次会话（可达）：清零连败、记成功时刻。 */
+      recordReachable(nodeId, nowIso = (/* @__PURE__ */ new Date()).toISOString()) {
+        const s2 = this.ensure(nodeId);
+        s2.consecutiveFailures = 0;
+        s2.lastSuccessfulDispatchAt = nowIso;
+      }
+      /** 节点级失败（server-unreachable/失联/派发丢失）：连败 +1、记失败时刻与归因。 */
+      recordUnreachable(nodeId, reason, nowIso = (/* @__PURE__ */ new Date()).toISOString()) {
+        const s2 = this.ensure(nodeId);
+        s2.consecutiveFailures += 1;
+        s2.lastFailureAt = nowIso;
+        if (reason !== void 0) s2.lastFailureReason = reason;
+      }
+      snapshot(nodeId) {
+        const s2 = this.byNode.get(nodeId);
+        return s2 ? { ...s2 } : void 0;
+      }
+      /** 节点被删除/换机时清账（可选调用）。 */
+      forget(nodeId) {
+        this.byNode.delete(nodeId);
+      }
+    };
+  }
+});
+
 // ../server/src/domains/nodes/routes.ts
 function nodesDomain(deps) {
   let hubWired = false;
@@ -41486,6 +41681,8 @@ function nodesDomain(deps) {
       }
       const daemonVersionById = new Map((hub?.connectedDaemons() ?? []).map((d) => [d.daemonId, d.meta.daemonVersion]));
       const connectionById = new Map((hub?.recentConnectionChanges() ?? []).map((d) => [d.daemonId, d]));
+      const onlineIds = new Set((hub?.connectedDaemons() ?? []).map((d) => d.daemonId));
+      const healthNow = Date.now();
       const nodes = await deps.nodeStore.listNodes();
       const items = await Promise.all(nodes.map(async (n) => {
         const rts = await deps.nodeStore.listRuntimes(n.id);
@@ -41514,6 +41711,15 @@ function nodesDomain(deps) {
               ...connection.lastDisconnectedAt ? { lastDisconnectedAt: new Date(connection.lastDisconnectedAt).toISOString() } : {},
               ...connection.lastReconnectedAt ? { lastReconnectedAt: new Date(connection.lastReconnectedAt).toISOString() } : {}
             }
+          } : {},
+          ...deps.nodeHealth ? {
+            health: deriveNodeHealth({
+              online: onlineIds.has(n.id),
+              ...hub?.lastSeenAt(n.id) !== void 0 ? { lastHeartbeatMs: hub.lastSeenAt(n.id) } : {},
+              activeRunCount: deps.activeRunCountOf?.(n.id) ?? 0,
+              ...deps.nodeHealth.snapshot(n.id) ? { snapshot: deps.nodeHealth.snapshot(n.id) } : {},
+              now: healthNow
+            })
           } : {}
         };
       }));
@@ -41712,6 +41918,7 @@ var init_routes4 = __esm({
     import_node_path2 = require("node:path");
     init_src4();
     init_connect_script();
+    init_node_health();
   }
 });
 
@@ -43123,7 +43330,7 @@ var init_service4 = __esm({
       /** 组织汇总专用瘦读：只取归属、时间和 usage，并统一补齐展示成本。 */
       async listUsageRuns(filter) {
         const rows = await this.store.listUsageRuns(filter);
-        return rows.map((row) => ({
+        return rows.filter((row) => row.usage != null).map((row) => ({
           ...row,
           usage: {
             ...row.usage,
@@ -45205,6 +45412,7 @@ var init_daemon_adapter = __esm({
         this.nodeLostGraceMs = opts.nodeLostGraceMs ?? graceFromEnv(12e4);
         this.ackTimeoutMs = opts.ackTimeoutMs ?? ackMsFromEnv(15e3);
         this.log = opts.log ?? ((m2) => console.warn(m2));
+        this.health = opts.health;
         hub.addMessageListener((_daemonId, msg) => this.onDaemonMessage(msg));
         hub.addDisconnectListener((daemonId) => this.onNodeDown(daemonId));
         hub.addConnectListener((daemon) => this.onNodeUp(daemon.daemonId));
@@ -45213,6 +45421,7 @@ var init_daemon_adapter = __esm({
       nodeLostGraceMs;
       ackTimeoutMs;
       log;
+      health;
       /** 断联节点 → 收割定时器。重连取消；到期收割。 */
       reapTimers = /* @__PURE__ */ new Map();
       /** 统一结算一次会话退出：清 ack 定时器、置 exited、触发回调、从 pending 摘除。幂等（已退出即跳过）。 */
@@ -45224,9 +45433,17 @@ var init_daemon_adapter = __esm({
           entry.ackTimer = void 0;
         }
         entry.exited = info;
+        if (info.reason === "server-unreachable") this.health?.recordUnreachable(entry.nodeId, info.reason);
+        else this.health?.recordReachable(entry.nodeId);
         for (const cb of entry.exitCbs.splice(0)) cb(info);
         this.pending.delete(dispatchId);
       }
+      /** 该节点当前在途（未退出）会话数——节点健康的 activeRunCount。 */
+      activeRunCount(nodeId) {
+        let n = 0;
+        for (const e of this.pending.values()) if (e.nodeId === nodeId && !e.exited) n++;
+        return n;
+      }
       /** 收到任何回帧（started/event/output/exited）即视为派发已达，取消 ack 超时。 */
       cancelAck(dispatchId) {
         const entry = this.pending.get(dispatchId);
@@ -45269,6 +45486,8 @@ var init_daemon_adapter = __esm({
       onDaemonMessage(msg) {
         if (msg.type === "session_started") {
           this.cancelAck(msg.dispatchId);
+          const entry = this.pending.get(msg.dispatchId);
+          if (entry) this.health?.recordReachable(entry.nodeId);
         } else if (msg.type === "session_exited") {
           const info = msg.info.reason || msg.info.code !== null ? msg.info : { ...msg.info, reason: "error" };
           this.settle(msg.dispatchId, info);
@@ -45769,6 +45988,12 @@ var init_ci_gate = __esm({
         const statuses = [];
         const repoViews = [];
         for (const unit of units) {
+          if (await ci.isMerged({ repo: unit.repo, sha: unit.sha })) {
+            const status2 = { state: "success", summary: `${unit.repo.id}@${unit.sha.slice(0, 8)}: \u5185\u5BB9\u5DF2\u5728 ${unit.repo.develop}\uFF08\u4E0A\u8F6E\u5DF2\u5408\uFF09\uFF0CCI \u514D\u68C0` };
+            statuses.push({ unit, status: status2 });
+            repoViews.push({ repoId: unit.repo.id, sha: unit.sha.slice(0, 8), state: "success", summary: status2.summary });
+            continue;
+          }
           const pr = await ci.ensurePr(
             { repo: unit.repo, branch: unit.branch, sha: unit.sha },
             { title: `[oasis-ci] ${artifactId} \u2192 ${unit.repo.develop}`, body: `CI gate for artifact ${artifactId} @ ${unit.sha}` }
@@ -46558,6 +46783,7 @@ var init_src5 = __esm({
     init_playbooks2();
     init_scheduler();
     init_daemon_adapter();
+    init_node_health();
     init_side_map();
     init_engine();
     init_fs_state();
@@ -52908,6 +53134,7 @@ var PostgresRegistryStore = class _PostgresRegistryStore {
         name       text NOT NULL,
         email      text,
         team_id    text,
+        reports_to text,                        -- \u6C47\u62A5\u4EBA\uFF08\u8D1F\u8D23\u4EBA\uFF09\uFF1A\u53E6\u4E00\u4E2A actor id\uFF0C\u53EF\u7A7A
         status     text NOT NULL,              -- active | disabled\uFF08\u5220\u9664\u5373\u505C\u7528\uFF09
         roles      jsonb NOT NULL DEFAULT '[]'::jsonb,  -- spec \xA76.2 \u540D\u518C\u89D2\u8272\uFF08\u4EFB\u52A1 2.0\uFF09
         avatar     text,                              -- "blob:<hash>"\uFF0C\u7A7A=\u9ED8\u8BA4\u751F\u6210
@@ -52933,6 +53160,7 @@ var PostgresRegistryStore = class _PostgresRegistryStore {
     await pool.query(`ALTER TABLE "${s2}".actor_configs ADD COLUMN IF NOT EXISTS max_concurrent integer NOT NULL DEFAULT 4`);
     await pool.query(`ALTER TABLE "${s2}".actor_configs ADD COLUMN IF NOT EXISTS reviewer_ids jsonb NOT NULL DEFAULT '[]'::jsonb`);
     await pool.query(`ALTER TABLE "${s2}".actor_configs ADD COLUMN IF NOT EXISTS batched_continuation boolean NOT NULL DEFAULT false`);
+    await pool.query(`ALTER TABLE "${s2}".actors ADD COLUMN IF NOT EXISTS reports_to text`);
     await pool.query(`
       CREATE TABLE IF NOT EXISTS "${s2}".teams (
         id            text PRIMARY KEY,
@@ -53036,10 +53264,10 @@ var PostgresRegistryStore = class _PostgresRegistryStore {
   /* ---------- 员工 ---------- */
   async upsertActor(a) {
     await this.pool.query(
-      `INSERT INTO ${this.s}.actors (id, kind, name, email, team_id, status, roles, avatar, created_at)
-       VALUES ($1,$2,$3,$4,$5,$6,$7::jsonb,$8,$9)
-       ON CONFLICT (id) DO UPDATE SET kind=$2, name=$3, email=$4, team_id=$5, status=$6, roles=$7::jsonb, avatar=$8`,
-      [a.id, a.kind, a.name, a.email ?? null, a.teamId ?? null, a.status, JSON.stringify(a.roles), a.avatar ?? null, a.createdAt]
+      `INSERT INTO ${this.s}.actors (id, kind, name, email, team_id, status, roles, avatar, created_at, reports_to)
+       VALUES ($1,$2,$3,$4,$5,$6,$7::jsonb,$8,$9,$10)
+       ON CONFLICT (id) DO UPDATE SET kind=$2, name=$3, email=$4, team_id=$5, status=$6, roles=$7::jsonb, avatar=$8, reports_to=$10`,
+      [a.id, a.kind, a.name, a.email ?? null, a.teamId ?? null, a.status, JSON.stringify(a.roles), a.avatar ?? null, a.createdAt, a.reportsTo ?? null]
     );
   }
   async getActor(id) {
@@ -53398,6 +53626,7 @@ var rowToActor = (row) => ({
   name: row.name,
   ...row.email !== null ? { email: row.email } : {},
   ...row.team_id !== null ? { teamId: row.team_id } : {},
+  ...row.reports_to !== null && row.reports_to !== void 0 ? { reportsTo: row.reports_to } : {},
   status: row.status,
   roles: row.roles ?? [],
   ...row.avatar !== null && row.avatar !== void 0 ? { avatar: row.avatar } : {},
@@ -54884,7 +55113,7 @@ var PostgresTraceStore = class _PostgresTraceStore {
     const r = await this.pool.query(
       `SELECT actor_id, artifact_id, started_at, effective_model, usage
        FROM ${this.s}.agent_runs
-       WHERE usage IS NOT NULL AND started_at >= $1 AND started_at <= $2
+       WHERE jsonb_typeof(usage) = 'object' AND started_at >= $1 AND started_at <= $2
        ORDER BY started_at`,
       [filter.from, filter.to]
     );
@@ -56668,6 +56897,8 @@ async function startServe(opts) {
   let hub = null;
   let chatRemoteAdapter = null;
   let dispatchRemoteAdapter = null;
+  const nodeHealth = new NodeHealthTracker();
+  const activeRunCountOf = (nodeId) => (chatRemoteAdapter?.activeRunCount(nodeId) ?? 0) + (dispatchRemoteAdapter?.activeRunCount(nodeId) ?? 0);
   let localUrl = "";
   const chatLiveSessions = /* @__PURE__ */ new Map();
   const remoteApiUrl = opts.publicUrl ? normalizeHttpBaseUrl(opts.publicUrl) : apiUrlFromGatewayUrl(opts.gatewayUrl);
@@ -56809,7 +57040,9 @@ async function startServe(opts) {
         nodeStore,
         registry: registryStore,
         gatewayUrl: opts.gatewayUrl ?? `ws://127.0.0.1:${opts.port ?? 7320}/node-gateway`,
-        repoRemote: opts.nodeRepoRemote ?? "git@github.com:open-friday/oasis-core.git"
+        repoRemote: opts.nodeRepoRemote ?? "git@github.com:open-friday/oasis-core.git",
+        nodeHealth,
+        activeRunCountOf
       }),
       collabDomain({
         kernel,
@@ -57178,7 +57411,7 @@ ${detail}` : genericLine));
     }
   });
   hub = new DaemonHub(server.httpServer, "/node-gateway", (t) => nodeTokens.resolve(t));
-  const hubAdapterOpts = { log: (m2) => console.warn(m2) };
+  const hubAdapterOpts = { log: (m2) => console.warn(m2), health: nodeHealth };
   chatRemoteAdapter = new DaemonHubAdapter(hub, hubAdapterOpts);
   dispatchRemoteAdapter = new DaemonHubAdapter(hub, hubAdapterOpts);
   const port = new URL(server.baseUrl).port;
@@ -57413,6 +57646,7 @@ ${detail}` : genericLine));
   }
   const humanMs = opts.sla?.humanMs ?? 24 * 36e5;
   const agentMs = opts.sla?.agentMs ?? 10 * 6e4;
+  const quotaStarvationMs = opts.sla?.quotaStarvationMs ?? 6 * 36e5;
   const initiatorCache = /* @__PURE__ */ new Map();
   const initiatorOf = async (workspace) => {
     if (initiatorCache.has(workspace)) return initiatorCache.get(workspace);
@@ -57485,22 +57719,29 @@ ${detail}` : genericLine));
           await escalate(a.id, a.owner, `human \u6301\u6709 ${Math.round(humanMs / 6e4)} \u5206\u949F\u672A\u52A8\u5DE5`);
         }
       }
-      for (const f2 of allDispatchers().flatMap((d) => d.fusedJobs())) {
-        if (f2.action !== "produce") continue;
-        const cur = kernel.model.artifacts.get(f2.artifactId);
-        if (!cur) continue;
-        if (now - Date.parse(f2.fusedAt) <= agentMs) continue;
-        if (unresolvedEscalationsOf(kernel.model, f2.artifactId).length > 0) continue;
-        if (isHeld(kernel.model, f2.artifactId)) continue;
-        const reason = `agent \u8FDE\u8D25\u7194\u65AD\u540E ${Math.round(agentMs / 6e4)} \u5206\u949F\u65E0\u4EBA\u5904\u7406\uFF08\u8FDE\u8D25 ${f2.consecutiveFailures} \u6B21\uFF09`;
+      const escalateHold = async (artifactId, reason, kind) => {
+        if (unresolvedEscalationsOf(kernel.model, artifactId).length > 0) return;
+        if (isHeld(kernel.model, artifactId)) return;
+        const owner = kernel.model.artifacts.get(artifactId)?.owner ?? "";
         try {
-          await kernel.escalate({ artifactId: f2.artifactId, actor: SYSTEM_ACTOR, reason });
-          await kernel.hold({ artifactId: f2.artifactId, actor: SYSTEM_ACTOR, source: "sla", reason });
-          journal({ kind: "escalated", at: (/* @__PURE__ */ new Date()).toISOString(), artifactId: f2.artifactId, from: cur.owner, to: cur.owner, reason });
-          console.log(`[sla] ${f2.artifactId} \u7194\u65AD\u5347\u7EA7\uFF1A\u843D escalate + hold\uFF08owner \u4FDD\u6301 ${cur.owner}\uFF0C\u4E0D\u593A\uFF09`);
+          await kernel.escalate({ artifactId, actor: SYSTEM_ACTOR, reason });
+          await kernel.hold({ artifactId, actor: SYSTEM_ACTOR, source: "sla", reason });
+          journal({ kind: "escalated", at: (/* @__PURE__ */ new Date()).toISOString(), artifactId, from: owner, to: owner, reason });
+          console.log(`[sla] ${artifactId} ${kind}\uFF1A\u843D escalate + hold\uFF08owner \u4FDD\u6301 ${owner}\uFF0C\u4E0D\u593A\uFF09`);
         } catch (err) {
-          console.error(`[sla] \u7194\u65AD\u5347\u7EA7\u5931\u8D25 ${f2.artifactId}: ${String(err)}`);
+          console.error(`[sla] ${kind}\u5931\u8D25 ${artifactId}: ${String(err)}`);
         }
+      };
+      for (const f2 of allDispatchers().flatMap((d) => d.fusedJobs())) {
+        if (f2.action !== "produce") continue;
+        if (!kernel.model.artifacts.get(f2.artifactId)) continue;
+        if (now - Date.parse(f2.fusedAt) <= agentMs) continue;
+        await escalateHold(f2.artifactId, `agent \u8FDE\u8D25\u7194\u65AD\u540E ${Math.round(agentMs / 6e4)} \u5206\u949F\u65E0\u4EBA\u5904\u7406\uFF08\u8FDE\u8D25 ${f2.consecutiveFailures} \u6B21\uFF09`, "\u7194\u65AD\u5347\u7EA7");
+      }
+      for (const s2 of allDispatchers().flatMap((d) => d.starvingJobs(quotaStarvationMs, now))) {
+        if (s2.action !== "produce") continue;
+        if (!kernel.model.artifacts.get(s2.artifactId)) continue;
+        await escalateHold(s2.artifactId, `\u914D\u989D\u957F\u671F\u4E0D\u8DB3\uFF1A\u7ED1\u5B9A\u8D26\u53F7\u5DF2\u9650\u6D41 ${Math.round(s2.sinceMs / 36e5)} \u5C0F\u65F6\u4ECD\u672A\u6062\u590D\uFF08\u7591\u4F3C\u7B97\u529B\u7F3A\u53E3\uFF0C\u9700\u52A0\u989D\u5EA6/\u6362\u7ED1\u5B9A/\u51CF\u5E76\u53D1\uFF09`, "\u914D\u989D\u9965\u997F\u5347\u7EA7");
       }
     })().catch((err) => console.error(`[sla] \u626B\u63CF\u5931\u8D25: ${String(err)}`));
   }, opts.sla?.scanMs ?? 6e4);
@@ -59756,7 +59997,7 @@ ${res.warning}`);
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.54" : "dev";
+var PKG_VERSION = true ? "0.1.56" : "dev";
 var OASIS_DIR = path18.join(os9.homedir(), ".oasis");
 var CONFIG_FILE = path18.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path18.join(OASIS_DIR, "node.pid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.54",
+  "version": "0.1.56",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"