oasis_test 0.1.53 → 0.1.54

package/dist/index.js

@@ -46,6 +46,7 @@ function emptyReadModel() {
     annotations: /* @__PURE__ */ new Map(),
     annotationSeq: /* @__PURE__ */ new Map(),
     seals: /* @__PURE__ */ new Map(),
+    holds: /* @__PURE__ */ new Map(),
     lastOpAt: /* @__PURE__ */ new Map(),
     pinMeta: /* @__PURE__ */ new Map(),
     gaps: /* @__PURE__ */ new Map(),
@@ -316,13 +317,28 @@ function fold(model, op) {
       gap.resolved = true;
       gap.resolvedAtSeq = op.seq;
       if (p2.note !== void 0) gap.note = p2.note;
-      for (const e of model.escalations.get(op.artifactId) ?? []) e.resolved = true;
+      for (const e of model.escalations.get(op.artifactId) ?? []) {
+        if (e.resolved) continue;
+        if (e.gapId !== void 0) {
+          if (e.gapId === p2.gapId) e.resolved = true;
+        } else if (e.part === gap.part) {
+          e.resolved = true;
+        }
+      }
       break;
     }
     case "escalate": {
       const p2 = op.payload;
       const list = model.escalations.get(op.artifactId) ?? [];
-      list.push({ part: p2.part ?? null, reason: p2.reason, by: op.actor, ...op.hand !== void 0 ? { hand: op.hand } : {}, at: op.timestamp, resolved: false });
+      list.push({
+        part: p2.part ?? null,
+        reason: p2.reason,
+        by: op.actor,
+        ...op.hand !== void 0 ? { hand: op.hand } : {},
+        at: op.timestamp,
+        resolved: false,
+        ...p2.gapId !== void 0 ? { gapId: p2.gapId } : {}
+      });
       model.escalations.set(op.artifactId, list);
       break;
     }
@@ -418,6 +434,21 @@ function fold(model, op) {
       model.seals.delete(op.artifactId);
       break;
     }
+    case "hold": {
+      const p2 = op.payload;
+      if (!model.artifacts.has(op.artifactId)) throw new CorruptLogError(op, "hold on missing artifact");
+      model.holds.set(op.artifactId, {
+        source: p2.source,
+        by: op.actor,
+        at: op.timestamp,
+        ...p2.reason !== void 0 ? { reason: p2.reason } : {}
+      });
+      break;
+    }
+    case "release": {
+      model.holds.delete(op.artifactId);
+      break;
+    }
     case "unlink_input": {
       const p2 = op.payload;
       const artifact = model.artifacts.get(op.artifactId);
@@ -499,6 +530,12 @@ function lifecycleOf(model, id) {
   const seal = model.seals.get(id);
   return seal ? `sealed:${seal.reason}` : "active";
 }
+function isHeld(model, id) {
+  return model.holds.has(id);
+}
+function holdOf(model, id) {
+  return model.holds.get(id) ?? null;
+}
 function annotationsOf(model, id) {
   const revisionIds = new Set(revisionsOf(model, id).map((r) => r.id));
   return [...model.annotations.values()].filter(
@@ -565,7 +602,14 @@ function findGap(model, gapId) {
   return null;
 }
 function unresolvedEscalationsOf(model, id) {
-  return (model.escalations.get(id) ?? []).filter((e) => !e.resolved).map((e) => ({ part: e.part, reason: e.reason, by: e.by, ...e.hand !== void 0 ? { hand: e.hand } : {}, at: e.at }));
+  return (model.escalations.get(id) ?? []).filter((e) => !e.resolved).map((e) => ({
+    part: e.part,
+    reason: e.reason,
+    by: e.by,
+    ...e.hand !== void 0 ? { hand: e.hand } : {},
+    at: e.at,
+    ...e.gapId !== void 0 ? { gapId: e.gapId } : {}
+  }));
 }
 function listPendingReviews(model, workspace) {
   const all = [...model.pendingReviews.values()];
@@ -606,6 +650,16 @@ function stuckDiagnosis(model, id, opts) {
   if (!artifact || lifecycle !== "active") {
     return { id, lifecycle, staleMs, causes, needsCoordinator: false };
   }
+  if (isHeld(model, id)) {
+    const h = holdOf(model, id);
+    causes.push({
+      category: "held",
+      source: "oplog",
+      detail: `\u8282\u70B9\u5DF2\u6682\u505C\u6D3E\u53D1\uFF08${h?.source ?? "?"}${h?.reason ? `\uFF1A${h.reason}` : ""}\uFF09\u2014\u2014\u5F85\u89E3\u963B`,
+      handler: "human"
+    });
+    return { id, lifecycle, staleMs, causes, needsCoordinator: false };
+  }
   if (artifact.owner.startsWith("pending:role:")) {
     causes.push({
       category: "owner-pending",
@@ -2454,19 +2508,28 @@ var init_kernel = __esm({
        */
       async escalate(args) {
         this.artifactOrThrow(args.artifactId);
-        if (!isHumanActor(args.actor)) {
+        if (!isHumanActor(args.actor) && args.actor !== SYSTEM_ACTOR) {
           const ws = this.model.artifacts.get(args.artifactId)?.workspace;
           const brief = [...this.model.artifacts.values()].find((a) => a.type === "brief" && a.workspace === ws);
           const manager = brief?.fields?.["manager"];
           if (manager !== args.actor) {
             throw new KernelError(
-              `escalate \u4EC5\u9650\u672C\u5DE5\u5355\u7BA1\u7406\u8005\uFF08brief.fields.manager\uFF09\u6216\u4EBA\u7C7B\u8C03\u7528\u2014\u2014${args.actor} \u4E0D\u662F\u3002\u4F60\u82E5\u662F producer/owner \u5361\u4F4F\u4E86\uFF1A\u7528 \`oasis gap\` \u4E0A\u62A5\u9700\u8981\uFF0C\u7531\u7BA1\u7406\u8005\u5206\u8BCA\uFF08\u51B3\u7B56 0030 D4\uFF09\u3002`
+              `escalate \u4EC5\u9650\u672C\u5DE5\u5355\u7BA1\u7406\u8005\uFF08brief.fields.manager\uFF09\u3001\u4EBA\u7C7B\u6216\u7CFB\u7EDF\u8C03\u7528\u2014\u2014${args.actor} \u4E0D\u662F\u3002\u4F60\u82E5\u662F producer/owner \u5361\u4F4F\u4E86\uFF1A\u7528 \`oasis gap\` \u4E0A\u62A5\u9700\u8981\uFF0C\u7531\u7BA1\u7406\u8005\u5206\u8BCA\uFF08\u51B3\u7B56 0030 D4\uFF09\u3002`
             );
           }
         }
+        let part = args.part;
+        let gapId = args.gapId;
+        if (gapId) {
+          const found = findGap(this.model, gapId);
+          if (found && found.artifactId === args.artifactId) {
+            if (part === void 0 && found.gap.part) part = found.gap.part;
+          }
+        }
         await this.commit(args.artifactId, args.actor, "escalate", args.artifactId, {
           reason: args.reason,
-          ...args.part !== void 0 ? { part: args.part } : {}
+          ...part !== void 0 ? { part } : {},
+          ...gapId !== void 0 ? { gapId } : {}
         }, void 0, args.hand);
       }
       /** 决策 0027 D1：人显式关闭本 artifact 上的 escalate（off-graph 解决兜底）。 */
@@ -2619,6 +2682,43 @@ var init_kernel = __esm({
         const payload = { persistence: "persistent" };
         await this.commit(args.artifactId, args.actor, "promote", args.artifactId, payload);
       }
+      /**
+       * 节点级派发暂停（node-hold，本批）：落一条 hold op——**只挡 agent 派发、不锁内容**（≠ seal/freeze，
+       * 见 docs/notes/artifact-seal-lifecycle.md）。用于自动升级冻结（source:"sla"）与人/管理者显式暂停。
+       * 不校验 lifecycle：sealed 节点本就不派、held 于它无意义但无害；主用途是冻 active 节点。幂等——重复 hold 覆盖来源。
+       */
+      async hold(args) {
+        this.artifactOrThrow(args.artifactId);
+        this.assertHoldAdmission(args.artifactId, args.actor);
+        const payload = {
+          source: args.source,
+          ...args.reason !== void 0 ? { reason: args.reason } : {}
+        };
+        await this.commit(args.artifactId, args.actor, "hold", args.artifactId, payload);
+      }
+      /** 解阻（node-hold）：撤销 hold，节点恢复可派（投影下一拍重推当下欠的活）。空解（未 held）拦下，避免日志噪声。 */
+      async release(args) {
+        this.artifactOrThrow(args.artifactId);
+        this.assertHoldAdmission(args.artifactId, args.actor);
+        if (!isHeld(this.model, args.artifactId)) throw new KernelError(`not held: ${args.artifactId}`);
+        const payload = { ...args.reason !== void 0 ? { reason: args.reason } : {} };
+        await this.commit(args.artifactId, args.actor, "release", args.artifactId, payload);
+      }
+      /**
+       * hold/release 准入闸（红线 6：管控在服务端收紧）：人类 / 本工单管理者 / `actor:system`（自动升级）可调；
+       * 普通 producer/owner agent 不可——防 agent 把自己节点暂停了逃避派发（同 escalate 的机制闸精神，kernel.escalate）。
+       */
+      assertHoldAdmission(artifactId, actor) {
+        if (isHumanActor(actor)) return;
+        if (actor === SYSTEM_ACTOR) return;
+        const ws = this.model.artifacts.get(artifactId)?.workspace;
+        const brief = [...this.model.artifacts.values()].find((a) => a.type === "brief" && a.workspace === ws);
+        const manager = brief?.fields?.["manager"];
+        if (manager === actor) return;
+        throw new KernelError(
+          `hold/release \u4EC5\u9650\u4EBA\u7C7B\u3001\u672C\u5DE5\u5355\u7BA1\u7406\u8005\uFF08brief.fields.manager\uFF09\u6216\u7CFB\u7EDF\u8C03\u7528\u2014\u2014${actor} \u4E0D\u662F\u3002`
+        );
+      }
       // ── 治理 op（§11.3）：force/override 单点豁免可直发；结构 op 以 Intervention 为载体 ──────
       /** 治理解封：sealed → active（lifecycle = 最后一条 seal/reopen，§4.4）。frozen 解冻、cancelled 复活都走它 */
       async reopen(args) {
@@ -4269,6 +4369,7 @@ var init_dispatcher = __esm({
         const { kernel } = this.opts;
         const jobWorkspace = kernel.model.artifacts.get(spec.artifactId)?.workspace;
         if (jobWorkspace && await this.opts.resolveDispatchHold?.(jobWorkspace)) return 0;
+        if (isHeld(kernel.model, spec.artifactId)) return 0;
         this.assertSpawnAttemptCurrent(jobKey, attempt);
         const seqNow = kernel.model.lastSeq.get(spec.artifactId) ?? 0;
         const strike = this.strikes.get(jobKey);
@@ -24554,7 +24655,8 @@ ${acceptanceCriteria.map((c) => `- ${c}`).join("\n")}` : brief;
         artifactId: str(args, "artifactId"),
         actor,
         reason: str(args, "reason"),
-        ...optStr(args, "part") !== void 0 ? { part: optStr(args, "part") } : {}
+        ...optStr(args, "part") !== void 0 ? { part: optStr(args, "part") } : {},
+        ...optStr(args, "gapId") !== void 0 ? { gapId: optStr(args, "gapId") } : {}
       });
       return { message: '\u5DF2\u4E0A\u62A5\uFF08escalate\uFF09\uFF1A\u7CFB\u7EDF\u5C06\u5347\u7EA7\u5230\u8D1F\u8D23\u4EBA\u6536\u4EF6\u7BB1\u3002\u4F60\u53EF\u4EE5\u6536\u5DE5\u4E86\uFF1B\u4E4B\u540E\u53EF\u80FD\u5728\u5BF9\u8BDD\u91CC\u88AB ta \u95EE\u5230\u3002\u26A0\uFE0F \u82E5\u8FD9\u6B21\u4E0A\u62A5\u5173\u8054\u67D0\u6761 gap\uFF0C**\u4E0D\u8981\u5BF9\u5B83\u8C03 resolve-gap**\u2014\u2014\u90A3\u8868\u793A"\u9700\u6C42\u5DF2\u6EE1\u8DB3\u3001\u8BA9 owner \u590D\u5DE5"\uFF0C\u73B0\u5728\u8FD8\u6CA1\u6EE1\u8DB3\uFF1Bgap \u4FDD\u6301 open \u8282\u70B9\u624D\u4F1A\u7EE7\u7EED\u7B49\u5F85\u3002' };
     }
@@ -24610,6 +24712,23 @@ ${acceptanceCriteria.map((c) => `- ${c}`).join("\n")}` : brief;
       await kernel.reopen({ artifactId: str(args, "artifactId"), actor, note: optStr(args, "note") });
       return { message: `reopened ${str(args, "artifactId")}\uFF08lifecycle \u2192 active\uFF09` };
     }
+    case "hold": {
+      await kernel.hold({
+        artifactId: str(args, "artifactId"),
+        actor,
+        source: optStr(args, "source") ?? "human",
+        ...optStr(args, "reason") !== void 0 ? { reason: optStr(args, "reason") } : {}
+      });
+      return { message: `\u8282\u70B9\u5DF2\u6682\u505C\u6D3E\u53D1\uFF08hold\uFF09\uFF1A${str(args, "artifactId")}\u3002\u6062\u590D\u7528 release\u3002` };
+    }
+    case "release": {
+      await kernel.release({
+        artifactId: str(args, "artifactId"),
+        actor,
+        ...optStr(args, "reason") !== void 0 ? { reason: optStr(args, "reason") } : {}
+      });
+      return { message: `\u8282\u70B9\u5DF2\u89E3\u963B\uFF08release\uFF09\uFF1A${str(args, "artifactId")}\u2014\u2014\u6295\u5F71\u4E0B\u4E00\u62CD\u4F1A\u91CD\u63A8\u8BE5\u8282\u70B9\u5F53\u4E0B\u6B20\u7684\u6D3B\u3002` };
+    }
     case "forceConclude": {
       await kernel.forceConclude({
         artifactId: str(args, "artifactId"),
@@ -26675,6 +26794,15 @@ var init_memory_trace_store = __esm({
         const nextCursor = items.length > limit ? page[page.length - 1]?.id ?? null : null;
         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) => ({
+          actorId: run.actorId,
+          artifactId: run.artifactId,
+          startedAt: run.startedAt,
+          effectiveModel: run.effectiveModel,
+          usage: structuredClone(run.usage)
+        }));
+      }
       async appendEvent(runId, event) {
         return (await this.appendEvents(runId, [event]))[0];
       }
@@ -39704,6 +39832,8 @@ async function runACPSession(job, cfg) {
       ...job.env,
       ...cfg.yoloEnv ?? {},
       ...job.wrapperPaths?.length ? { PATH: `${job.wrapperPaths.map((p2) => path11.dirname(p2)).join(path11.delimiter)}${path11.delimiter}${job.env?.["PATH"] ?? process.env["PATH"] ?? ""}` } : {},
+      // 每会话技能目录绝对路径 → env（供不扫 cwd 的 runtime 经 config external_dirs 发现，见 injectSkillsDirEnv）。
+      ...cfg.injectSkillsDirEnv ? { [cfg.injectSkillsDirEnv]: path11.join(dir, sessionSkillsSubdir(cfg.runtimeKind ?? "")) } : {},
       OASIS_SERVER: job.server.url,
       OASIS_TOKEN: job.actorToken
     },
@@ -39946,6 +40076,7 @@ var init_acp = __esm({
     path11 = __toESM(require("node:path"), 1);
     readline3 = __toESM(require("node:readline"), 1);
     init_sync_skills();
+    init_skill_cache();
     init_claude_code();
     init_usage();
     init_pricing();
@@ -40218,6 +40349,11 @@ var init_hermes = __esm({
           },
           extraArgs: this.opts.extraArgs,
           runtimeKind: "hermes",
+          // hermes 不扫 cwd 技能目录（只认 $HERMES_HOME/skills + config external_dirs）。把本会话
+          // 技能目录绝对路径喂到 OASIS_HERMES_SKILLS_DIR；node enroll 已把 config.yaml 的
+          // skills.external_dirs 配成该 env → hermes 每 session 发现各自技能。见
+          // packages/adapters/docs/modules/07-skills-delivery.md 与 connect-script.ts。
+          injectSkillsDirEnv: "OASIS_HERMES_SKILLS_DIR",
           ...this.opts.syncSkills ? { syncSkills: this.opts.syncSkills } : {}
         });
       }
@@ -41036,6 +41172,45 @@ if command -v hermes &>/dev/null; then
       "$HERMES_PIP" install 'agent-client-protocol>=0.9.0,<1.0'
     fi
   fi
+  # Oasis \u6BCF\u4F1A\u8BDD\u6280\u80FD\uFF1Ahermes \u4E0D\u626B cwd\uFF0C\u53EA\u8BA4 $HERMES_HOME/skills + config skills.external_dirs\u3002
+  # \u5E42\u7B49\u5730\u628A config.yaml \u7684 external_dirs \u914D\u6210\u5B57\u9762\u91CF $OASIS_HERMES_SKILLS_DIR\uFF08\u7531 hermes \u8FD0\u884C\u65F6
+  # \u6309 env \u5C55\u5F00\uFF1Badapter \u6BCF\u4F1A\u8BDD\u628A\u8BE5 env \u6307\u5411\u672C workdir \u7684\u6280\u80FD\u76EE\u5F55 \u2192 \u6BCF session \u5404\u81EA\u53D1\u73B0\uFF0C\u8BFB\u4FA7\u9694\u79BB\uFF09\u3002
+  HERMES_HOME_DIR="$HERMES_HOME"
+  if [ -z "$HERMES_HOME_DIR" ]; then HERMES_HOME_DIR="$HOME/.hermes"; fi
+  "$HERMES_PY" - "$HERMES_HOME_DIR/config.yaml" <<'PYEOF' || true
+import sys, os
+try:
+    import yaml
+except Exception:
+    sys.exit(0)
+p = sys.argv[1]
+data = {}
+if os.path.exists(p):
+    try:
+        with open(p) as f:
+            data = yaml.safe_load(f) or {}
+    except Exception:
+        sys.exit(0)
+if not isinstance(data, dict):
+    sys.exit(0)
+skills = data.get("skills")
+if not isinstance(skills, dict):
+    skills = {}
+    data["skills"] = skills
+ext = skills.get("external_dirs")
+if not isinstance(ext, list):
+    ext = [] if not ext else [ext]
+    skills["external_dirs"] = ext
+token = "$OASIS_HERMES_SKILLS_DIR"
+if token not in ext:
+    ext.append(token)
+    os.makedirs(os.path.dirname(p), exist_ok=True)
+    tmp = p + ".oasis.tmp"
+    with open(tmp, "w") as f:
+        yaml.safe_dump(data, f, sort_keys=False, allow_unicode=True)
+    os.replace(tmp, p)
+    print("-> hermes config.yaml: skills.external_dirs += $OASIS_HERMES_SKILLS_DIR")
+PYEOF
 fi
 
 OASIS_DIR="$(pwd)"
@@ -41743,8 +41918,18 @@ var init_node_store = __esm({
 });
 
 // ../server/src/domains/collab/inbox.ts
-function buildInbox(model, me, leadOf) {
+function buildInbox(model, me, leadOf, resolveActor) {
   const out = [];
+  const gapItems = [];
+  const actorRef = (id) => {
+    const extra = resolveActor?.(id);
+    return {
+      id,
+      ...extra?.name ? { name: extra.name } : {},
+      ...extra?.role ? { role: extra.role } : {},
+      ...extra?.avatar ? { avatar: extra.avatar } : {}
+    };
+  };
   const creatorOf = /* @__PURE__ */ new Map();
   for (const a of model.artifacts.values()) {
     if (a.type === "brief") creatorOf.set(a.workspace, a.owner);
@@ -41765,44 +41950,53 @@ function buildInbox(model, me, leadOf) {
       summary: `\u5DE5\u5355\u7F3A\u4EBA\u624B\uFF1A${pendingRole[1]} \u89D2\u8272\u65E0\u5458\u5DE5\uFF0C\u300C${nodeLabel(a)}\u300D\u5F85\u6D3E\u2014\u2014\u8BF7\u8865\u4EBA\u6216 assign`
     });
   }
-  const gapEscalationSeen = /* @__PURE__ */ new Set();
   for (const a of model.artifacts.values()) {
-    const escs = unresolvedEscalationsOf(model, a.id);
-    if (escs.length === 0) continue;
     const isOwnerRecipient = creatorOf.get(a.workspace) === me;
     const isLeadRecipient = !!leadOf && leadOf(a.owner) === me;
     if (!isOwnerRecipient && !isLeadRecipient) continue;
-    const key = `${a.workspace}:${a.id}`;
-    if (gapEscalationSeen.has(key)) continue;
-    gapEscalationSeen.add(key);
-    const who = isOwnerRecipient ? "\uFF08\u4F60\u662F\u5DE5\u5355\u5F52\u5C5E\u4EBA\uFF09" : "\uFF08\u4F60\u662F\u5361\u4F4F\u8282\u70B9 owner \u7684\u4E0A\u7EA7\uFF09";
-    out.push({
-      kind: "gap-escalation",
-      artifactId: a.id,
-      workspace: a.workspace,
-      since: escs.at(-1).at,
-      actionRequired: true,
-      summary: `\u300C${nodeLabel(a)}\u300D\u88AB\u4E0A\u62A5\u9700\u4F60\u4ECB\u5165${who}\uFF1A${escs.at(-1).reason.slice(0, 100)}${escs.length > 1 ? `\uFF08\u5171 ${escs.length} \u6761\uFF09` : ""}`
-    });
-  }
-  for (const a of model.artifacts.values()) {
     const gaps = unresolvedGapsOf(model, a.id);
-    if (gaps.length === 0) continue;
-    const isOwnerRecipient = creatorOf.get(a.workspace) === me;
-    const isLeadRecipient = !!leadOf && leadOf(a.owner) === me;
-    if (!isOwnerRecipient && !isLeadRecipient) continue;
-    const key = `${a.workspace}:${a.id}`;
-    if (gapEscalationSeen.has(key)) continue;
-    gapEscalationSeen.add(key);
+    const escalations = unresolvedEscalationsOf(model, a.id);
     const who = isOwnerRecipient ? "\uFF08\u4F60\u662F\u5DE5\u5355\u5F52\u5C5E\u4EBA\uFF09" : "\uFF08\u4F60\u662F\u5361\u4F4F\u8282\u70B9 owner \u7684\u4E0A\u7EA7\uFF09";
-    out.push({
-      kind: "gap-escalation",
-      artifactId: a.id,
-      workspace: a.workspace,
-      since: model.lastOpAt.get(a.id) ?? "",
-      actionRequired: true,
-      summary: `\u300C${nodeLabel(a)}\u300D\u5361\u5728\u672A\u89E3\u51B3\u7684\u7F3A\u53E3\u4E0A\u3001\u9700\u4F60\u4ECB\u5165${who}\uFF1A${gaps[0].description.slice(0, 80)}${gaps.length > 1 ? `\uFF08\u5171 ${gaps.length} \u6761\uFF09` : ""}`
-    });
+    for (const gap of gaps) {
+      const byGapId = escalations.filter((entry) => entry.gapId === gap.gapId);
+      const samePartGaps = gaps.filter((candidate) => candidate.part === gap.part);
+      const samePartEscalations = escalations.filter(
+        (entry) => entry.gapId === void 0 && entry.part === gap.part
+      );
+      const partlessEscalations = escalations.filter(
+        (entry) => entry.gapId === void 0 && entry.part === null
+      );
+      const exactEscalation = byGapId.at(-1) ?? (samePartGaps.length === 1 ? samePartEscalations.at(-1) : void 0) ?? (gaps.length === 1 ? partlessEscalations.at(-1) : void 0);
+      gapItems.push({
+        kind: "gap-escalation",
+        artifactId: a.id,
+        workspace: a.workspace,
+        since: exactEscalation?.at ?? gap.lastReportedAt ?? model.lastOpAt.get(a.id) ?? "",
+        actionRequired: true,
+        summary: exactEscalation?.reason ?? gap.description,
+        gap: {
+          gapId: gap.gapId,
+          // 契约：reporter 永远是 GapView.by（原始上报人）；诊断者另见 diagnosis 文案，不覆盖署名。
+          reporter: actorRef(gap.by),
+          artifactLabel: nodeLabel(a),
+          problem: gap.description,
+          ...exactEscalation ? { diagnosis: exactEscalation.reason } : {},
+          priority: exactEscalation ? "decision_required" : "blocked",
+          reportCount: gap.reportCount ?? 1
+        }
+      });
+    }
+    if (gaps.length === 0 && escalations.length > 0) {
+      const last = escalations.at(-1);
+      gapItems.push({
+        kind: "gap-escalation",
+        artifactId: a.id,
+        workspace: a.workspace,
+        since: last.at,
+        actionRequired: true,
+        summary: `\u300C${nodeLabel(a)}\u300D\u88AB\u4E0A\u62A5\u9700\u4F60\u4ECB\u5165${who}\uFF1A${last.reason.slice(0, 100)}${escalations.length > 1 ? `\uFF08\u5171 ${escalations.length} \u6761\uFF09` : ""}`
+      });
+    }
   }
   for (const r of listPendingReviews(model)) {
     if (r.origin) continue;
@@ -41910,7 +42104,10 @@ function buildInbox(model, me, leadOf) {
     if (gate) continue;
     out.push({ kind: "assigned", artifactId: a.id, workspace: ws, since: model.lastOpAt.get(a.id) ?? "", actionRequired: true, summary: `\u5728\u9014\u5F85\u529E\uFF1A${label}` });
   }
-  return out.sort((x2, y) => x2.since < y.since ? 1 : x2.since > y.since ? -1 : 0);
+  const rank = (item) => item.gap?.priority === "decision_required" ? 0 : 1;
+  gapItems.sort((a, b2) => rank(a) - rank(b2) || a.since.localeCompare(b2.since));
+  out.sort((x2, y) => x2.since < y.since ? 1 : x2.since > y.since ? -1 : 0);
+  return [...gapItems, ...out];
 }
 var init_inbox = __esm({
   "../server/src/domains/collab/inbox.ts"() {
@@ -41970,7 +42167,9 @@ var init_audit = __esm({
       reopen: "\u91CD\u5F00",
       seal: "\u5C01\u5B58",
       link_input: "\u63A5\u4F9D\u8D56",
-      report_gap: "\u7559\u7F3A\u53E3"
+      report_gap: "\u7559\u7F3A\u53E3",
+      hold: "\u6682\u505C\u6D3E\u53D1",
+      release: "\u89E3\u963B"
     };
   }
 });
@@ -42021,6 +42220,139 @@ var init_dashboard = __esm({
   }
 });
 
+// ../server/src/domains/collab/organization-usage.ts
+function emptyUsage() {
+  return {
+    input: 0,
+    cache: 0,
+    output: 0,
+    tokens: 0,
+    costUsdMicros: 0,
+    costParts: { input: 0, cache: 0, output: 0 }
+  };
+}
+function usageOf(run) {
+  if (!run.effectiveModel?.trim()) return null;
+  const input = Math.max(run.usage.inputTokens ?? 0, 0);
+  const cache = Math.max(run.usage.cacheReadTokens ?? 0, 0) + Math.max(run.usage.cacheCreationTokens ?? 0, 0);
+  const output = Math.max(run.usage.outputTokens ?? 0, 0);
+  const tokens = input + cache + output;
+  const costUsdMicros = Math.max(run.usage.costUsdMicros ?? 0, 0);
+  const denominator = tokens || 1;
+  const inputCost = Math.round(costUsdMicros * input / denominator);
+  const cacheCost = Math.round(costUsdMicros * cache / denominator);
+  return {
+    input,
+    cache,
+    output,
+    tokens,
+    costUsdMicros,
+    costParts: {
+      input: inputCost,
+      cache: cacheCost,
+      output: costUsdMicros - inputCost - cacheCost
+    }
+  };
+}
+function addUsage(target, addition) {
+  target.input += addition.input;
+  target.cache += addition.cache;
+  target.output += addition.output;
+  target.tokens += addition.tokens;
+  target.costUsdMicros += addition.costUsdMicros;
+  target.costParts.input += addition.costParts.input;
+  target.costParts.cache += addition.costParts.cache;
+  target.costParts.output += addition.costParts.output;
+}
+function bucketFormatter(timeZone, kind) {
+  return new Intl.DateTimeFormat("en-CA", {
+    timeZone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    ...kind === "hour" ? { hour: "2-digit", hourCycle: "h23" } : {}
+  });
+}
+function bucketKey(formatter, value, kind) {
+  const date3 = new Date(value);
+  if (!Number.isFinite(date3.getTime())) return null;
+  const parts = new Map(formatter.formatToParts(date3).map((part) => [part.type, part.value]));
+  const day = `${parts.get("year")}-${parts.get("month")}-${parts.get("day")}`;
+  return kind === "hour" ? `${day}T${parts.get("hour")}` : day;
+}
+function buildOrganizationUsageSummary(input) {
+  const formatter = bucketFormatter(input.timeZone, input.bucketKind);
+  const workorders = buildWorkorderSummaries(input.model);
+  const workorderById = new Map(workorders.map((workorder) => [workorder.id, workorder]));
+  const workspaceByArtifact = new Map([...input.model.artifacts.values()].map((artifact) => [artifact.id, artifact.workspace]));
+  const buckets = /* @__PURE__ */ new Map();
+  const rows = /* @__PURE__ */ new Map();
+  const total = emptyUsage();
+  let unpricedRunCount = 0;
+  for (const run of input.runs) {
+    const usage = usageOf(run);
+    if (!usage) {
+      unpricedRunCount += 1;
+      continue;
+    }
+    addUsage(total, usage);
+    const key = bucketKey(formatter, run.startedAt, input.bucketKind);
+    if (key) {
+      const bucket = buckets.get(key) ?? { key, ...emptyUsage() };
+      addUsage(bucket, usage);
+      buckets.set(key, bucket);
+    }
+    const workspace = run.artifactId ? workspaceByArtifact.get(run.artifactId) : void 0;
+    const workorder = workspace ? workorderById.get(workspace) : void 0;
+    const rowId = workorder?.id ?? UNASSIGNED_ID;
+    let row = rows.get(rowId);
+    if (!row) {
+      row = {
+        id: rowId,
+        title: workorder?.title ?? "\u672A\u5173\u8054\u5DE5\u5355",
+        stage: workorder?.stage ?? "unassigned",
+        usage: emptyUsage(),
+        employees: [],
+        share: 0,
+        ...!workorder ? { unassigned: true } : {}
+      };
+      rows.set(rowId, row);
+    }
+    addUsage(row.usage, usage);
+    let employee = row.employees.find((item) => item.actorId === run.actorId);
+    if (!employee) {
+      employee = { actorId: run.actorId, usage: emptyUsage(), share: 0 };
+      row.employees.push(employee);
+    }
+    addUsage(employee.usage, usage);
+  }
+  const workorderRows = [...rows.values()].map((row) => {
+    row.share = total.tokens > 0 ? row.usage.tokens / total.tokens : 0;
+    row.employees = row.employees.map((employee) => ({
+      ...employee,
+      share: row.usage.tokens > 0 ? employee.usage.tokens / row.usage.tokens : 0
+    })).sort((a, b2) => b2.usage.tokens - a.usage.tokens);
+    return row;
+  }).sort((a, b2) => {
+    if (a.unassigned !== b2.unassigned) return a.unassigned ? 1 : -1;
+    return b2.usage.tokens - a.usage.tokens;
+  });
+  return {
+    total,
+    buckets: [...buckets.values()].sort((a, b2) => a.key.localeCompare(b2.key)),
+    workorders: workorderRows,
+    unpricedRunCount
+  };
+}
+var UNASSIGNED_ID;
+var init_organization_usage = __esm({
+  "../server/src/domains/collab/organization-usage.ts"() {
+    "use strict";
+    init_workorders();
+    UNASSIGNED_ID = "__unassigned__";
+  }
+});
+
 // ../server/src/domains/collab/index.ts
 async function resolveLead(registry2, me) {
   const rec = await registry2.getActor(me);
@@ -42098,6 +42430,34 @@ function collabDomain(opts) {
     return ctx;
   }
   return (router) => {
+    router.get("/api/organization/usage-summary", async (req) => {
+      if (!opts.trace) {
+        return { status: 503, body: { error: { code: "no_trace_store", message: "\u8FD0\u884C\u7528\u91CF\u6570\u636E\u6E90\u672A\u63A5\u5165" } } };
+      }
+      const from = req.query.get("from");
+      const to = req.query.get("to");
+      const bucket = req.query.get("bucket");
+      const timeZone = req.query.get("timeZone") ?? "UTC";
+      if (!from || !to || bucket !== "hour" && bucket !== "day") {
+        return { status: 400, body: { error: { code: "bad_request", message: "from / to / bucket(hour|day) \u5FC5\u586B" } } };
+      }
+      const fromMs = Date.parse(from);
+      const toMs = Date.parse(to);
+      if (!Number.isFinite(fromMs) || !Number.isFinite(toMs) || fromMs > toMs) {
+        return { status: 400, body: { error: { code: "bad_request", message: "from / to \u65F6\u95F4\u8303\u56F4\u65E0\u6548" } } };
+      }
+      try {
+        new Intl.DateTimeFormat("en", { timeZone }).format();
+      } catch {
+        return { status: 400, body: { error: { code: "bad_request", message: "timeZone \u65E0\u6548" } } };
+      }
+      const { kernel } = await resolveCtx(req.auth.companyId);
+      const runs = await opts.trace.listUsageRuns({ from, to });
+      return {
+        status: 200,
+        body: buildOrganizationUsageSummary({ model: kernel.model, runs, bucketKind: bucket, timeZone })
+      };
+    });
     router.get("/api/workorders", async (req) => {
       const { kernel, registry: registry2, artifacts } = await resolveCtx(req.auth.companyId);
       const resolve5 = await buildResolver(registry2);
@@ -42165,8 +42525,13 @@ function collabDomain(opts) {
     });
     router.get("/api/inbox", async (req) => {
       const { kernel, registry: registry2 } = await resolveCtx(req.auth.companyId);
-      const leadOf = await buildLeadResolver(registry2);
-      return { status: 200, body: { items: buildInbox(kernel.model, req.auth.actor, leadOf) } };
+      const [leadOf, resolveActor] = await Promise.all([
+        buildLeadResolver(registry2),
+        // 决策 0026 (c)：gap 升级也发卡住节点 owner 的人类上级
+        buildResolver(registry2)
+        // 决策 0042：gap reporter 名册 join
+      ]);
+      return { status: 200, body: { items: buildInbox(kernel.model, req.auth.actor, leadOf, resolveActor) } };
     });
     router.get("/api/audit", async (req) => {
       const { oplog } = await resolveCtx(req.auth.companyId);
@@ -42227,12 +42592,14 @@ var init_collab = __esm({
     init_inbox();
     init_audit();
     init_dashboard();
+    init_organization_usage();
     init_node_state();
     init_workorders();
     init_workorder_detail();
     init_inbox();
     init_audit();
     init_dashboard();
+    init_organization_usage();
     init_planner();
   }
 });
@@ -42753,6 +43120,17 @@ var init_service4 = __esm({
         const page = await this.store.listRuns(filter);
         return { ...page, items: page.items.map((run) => this.withDisplayCost(run)) };
       }
+      /** 组织汇总专用瘦读：只取归属、时间和 usage，并统一补齐展示成本。 */
+      async listUsageRuns(filter) {
+        const rows = await this.store.listUsageRuns(filter);
+        return rows.map((row) => ({
+          ...row,
+          usage: {
+            ...row.usage,
+            costUsdMicros: displayCostUsdMicros(row.effectiveModel, row.usage)
+          }
+        }));
+      }
       /** 按维度查聚合用量（per-session/per-agent plan §4）。store 未实现聚合时返回空。
        *  读侧补全展示成本：adapter 未上报 cost 时按价格快照估算（与员工周统计同口径）。 */
       async queryUsageStats(filter) {
@@ -45586,7 +45964,7 @@ var init_worker = __esm({
 \u3010\u600E\u4E48\u5E72\u3011\u963B\u585E\u662F**\u75C7\u72B6**\u4E0D\u662F\u75C5\u3002\u7CFB\u7EDF\u5DF2\u5148\u673A\u68B0\u5206\u8BCA\u3001\u628A**\u80FD\u5B9A\u4F4D\u7684**\uFF08\u8D44\u6E90\u6392\u961F / \u8FD0\u884C\u65F6\u7194\u65AD / \u4EBA\u6CA1\u63A5 / \u7B49\u4E00\u4E2A\u5065\u5EB7\u5728\u4EA7\u7684\u4E0A\u6E38\uFF09\u8DEF\u7531\u7ED9\u4E86\u5BF9\u53E3\u5904\u7F6E\u8005\uFF1B\u8D70\u5230\u4F60\u8FD9\u513F\u7684\u662F\u9700\u8981\u4F60\u5224\u65AD\u7684\u90A3\u7C7B\u3002
 \u2460 \u5148\u8BFB\u4E0B\u65B9"\u75C5\u5386"\u6BB5 + \u5FC5\u8981\u65F6 \`oasis status/content <id>\` \u6CBF\u4F9D\u8D56\u94FE\u6478\u6E05\u8BED\u4E49\u6839\uFF1B
 \u2461 \u51FA**\u6700\u7701\u4E8B\u3001\u6700\u6CBB\u672C**\u7684\u4E00\u624B\uFF1A\u80FD\u8865\u4E0A\u4E0B\u6587\u5C31\u522B\u6539\u56FE\u3001\u80FD\u8FDE\u65E2\u6709\u5C31\u522B\u65B0\u5EFA\u3001\u80FD\u81EA\u5DF1\u89E3\u51B3\u5C31\u522B\u60CA\u52A8\u4EBA\uFF1B\u9500\u6BC1\u6027\u6539\u56FE\uFF08\u65AD\u8FB9/\u5E9F\u8282\u70B9/\u6539\u6D3E\uFF09apply \u65F6\u7CFB\u7EDF\u4F1A\u81EA\u52A8\u8F6C\u6210\u5F85\u4EBA\u786E\u8BA4\u7684\u63D0\u6848\uFF0C\u4F60 stage \u597D\u8BB2\u6E05\u5F71\u54CD\u5373\u53EF\u3002
-\u2462 **\u6536\u5C3E\u5FC5\u987B\u663E\u5F0F**\u2014\u2014\u628A\u8FD9\u6761\u7EBF\u63A8\u52A8\u4E86\u3001\u6216\u5224\u65AD\u8BE5\u7531 owner \u7EE7\u7EED \u2192 \`oasis resolve-gap --gap <id> --note "<\u4F60\u505A\u4E86\u4EC0\u4E48 / owner \u8BE5\u600E\u4E48\u63A5>"\`\uFF08**\u4E0D\u53D1\u8FD9\u53E5 gap \u4E0D\u89E3\u3001owner \u4E0D\u9192**\uFF09\uFF1B\u591F\u4E0D\u7740 / \u8981\u4EBA\u5B9A \u2192 \`oasis escalate <\u8282\u70B9> --reason "<\u6839\u56E0 + \u8981\u4EBA\u505A\u4EC0\u4E48>"\` \u4E0A\u62A5\u3002**\u7EDD\u4E0D\u7A7A\u624B\u9000\u51FA**\uFF1A\u4EC0\u4E48\u90FD\u4E0D\u505A\u5730\u6536\u5DE5 = \u628A\u8282\u70B9\u6C38\u4E45\u667E\u6B7B\uFF0C\u6700\u7CDF\u3002`;
+\u2462 **\u6536\u5C3E\u5FC5\u987B\u663E\u5F0F**\u2014\u2014\u628A\u8FD9\u6761\u7EBF\u63A8\u52A8\u4E86\u3001\u6216\u5224\u65AD\u8BE5\u7531 owner \u7EE7\u7EED \u2192 \`oasis resolve-gap --gap <id> --note "<\u4F60\u505A\u4E86\u4EC0\u4E48 / owner \u8BE5\u600E\u4E48\u63A5>"\`\uFF08**\u4E0D\u53D1\u8FD9\u53E5 gap \u4E0D\u89E3\u3001owner \u4E0D\u9192**\uFF09\uFF1B\u591F\u4E0D\u7740 / \u8981\u4EBA\u5B9A \u2192 \`oasis escalate <\u8282\u70B9> --reason "<\u6839\u56E0 + \u8981\u4EBA\u505A\u4EC0\u4E48>" --gap <gapId> [--part <part>]\` \u4E0A\u62A5\uFF08**\u5FC5\u987B\u5E26 --gap**\uFF0C\u6709 part \u65F6\u4E00\u5E76\u5E26\u4E0A\uFF09\u3002**\u7EDD\u4E0D\u7A7A\u624B\u9000\u51FA**\uFF1A\u4EC0\u4E48\u90FD\u4E0D\u505A\u5730\u6536\u5DE5 = \u628A\u8282\u70B9\u6C38\u4E45\u667E\u6B7B\uFF0C\u6700\u7CDF\u3002`;
     CONVERSATIONAL_ETHOS = `\u4F60\u662F\u8FD9\u4E2A\u5DE5\u5355\u7684**\u7BA1\u7406\u8005**\uFF0C\u6B63\u5728\u548C\u5DE5\u5355\u53D1\u8D77\u4EBA\u5BF9\u8BDD\u3001\u4E00\u8D77\u628A\u5B83\u5F80\u524D\u63A8\u3002\u4F60\u7684\u624B\u6BB5\u5F88\u5BBD\uFF1A\u5E2E\u5404\u8282\u70B9 owner \u626B\u6E05\u969C\u788D\u3001\u7B54\u7591\u3001\u8865\u4E0A\u4E0B\u6587\u3001**\u81EA\u5DF1\u8DD1\u5206\u6790 / \u62C9\u6570\u636E / \u5199\u8BF4\u660E**\u3001\u534F\u8C03\u8DE8\u8282\u70B9\u3001\u6309\u9700\u6539\u56FE\uFF08\u8FDE\u8FB9 / \u65B0\u5EFA / \u53BB\u91CD / \u6539\u6D3E / \u6539\u6807\u9898\u4E0E brief\uFF09\u3001\u4E3A\u53D1\u8D77\u4EBA\u89E3\u7B54\u6216\u4EE3\u529E\u5DE5\u5355\u8303\u56F4\u5185\u7684\u4E8B\u52A1\u3002**\u4F60\u6709\u4F1A\u8BDD\u5185\u7684\u5168\u90E8\u80FD\u529B\uFF08Bash / \u6587\u4EF6 / \u4EFB\u610F CLI\uFF09\uFF0C\u653E\u5F00\u7528\u3002\u552F\u4E00\u786C\u8FB9\u754C\uFF1A\u4E0D\u66FF owner \u5199\u8282\u70B9\u7684\u4EA7\u7269\u6B63\u6587**\uFF08\u8865\u4E0A\u4E0B\u6587\u3001\u7ED9\u53C2\u8003\u90FD\u884C\uFF0C\u522B\u4EE3\u7B14\uFF09\u3002
 - **\u5148\u8BCA\u65AD\u3001\u7ED9\u65B9\u6848\u3001\u95EE ta**\uFF1A\u770B\u6E05\u5361\u5728\u54EA\uFF0C\u7ED9 1\u20132 \u4E2A\u53EF\u884C\u505A\u6CD5\u3001\u8BB2\u6E05\u5404\u81EA\u5F71\u54CD\uFF0C\u95EE ta \u91C7\u7528\u54EA\u4E2A\u2014\u2014\u522B\u81EA\u4F5C\u4E3B\u5F20\u95F7\u5934\u6539\u3002\u660E\u663E\u4E14\u4F4E\u98CE\u9669\u7684\u53EF\u4EE5\u5148\u505A\u4E00\u7248\u518D\u8BF4\u3002
 - **\u6539\u52A8\u5206\u4E24\u7C7B**\uFF08\u6388\u6743\u5355\u4F4D\u662F diff\uFF09\uFF1A\u52A0\u8FB9 / \u65B0\u589E\u8282\u70B9 / \u6539\u6807\u9898 brief \u8FD9\u7C7B**\u53EF\u9006\u7684**\uFF08B\uFF09\uFF0C\`stage\`\u2192\`apply\` \u76F4\u63A5\u843D\u3001\u505A\u5B8C\u628A\u52A8\u4E86\u4EC0\u4E48\u544A\u8BC9 ta\uFF1B\u65AD\u8FB9 / \u5E9F\u8282\u70B9 / \u6539\u6D3E / \u64A4\u90E8\u4EF6\u8FD9\u7C7B**\u9500\u6BC1\u6027\u7684**\uFF08C\uFF09\uFF0C\u4F60 \`apply\` \u65F6\u7CFB\u7EDF\u4F1A**\u81EA\u52A8\u8F6C\u6210\u4E00\u4EFD\u5F85\u786E\u8BA4\u63D0\u6848**\u653E\u5230 ta \u9762\u524D\u7684\u300C\u5F85\u786E\u8BA4\u53D8\u66F4\u300D\u5361\u2014\u2014\u4F60 **stage \u597D\u3001\u628A\u5F71\u54CD\u8BB2\u6E05\u695A\u5C31\u884C\uFF0C\u522B\u81EA\u5DF1\u786C\u843D**\uFF0C\u7531 ta \u5728\u5361\u4E0A\u786E\u8BA4\u6216\u9A73\u56DE\u3002
@@ -45613,7 +45991,7 @@ var init_worker = __esm({
 
 \u3010\u6536\u5C3E gap / \u4E0A\u62A5\u5361\u70B9\u3011\uFF08\u4E0D\u8D70\u6682\u5B58\u7F13\u51B2\uFF0C\u76F4\u63A5\u751F\u6548\uFF09
 - \`oasis resolve-gap --gap <gapId> --note "<\u4F60\u505A\u4E86\u4EC0\u4E48 / owner \u8BE5\u600E\u4E48\u7EE7\u7EED>"\` \u2014\u2014 **\u4FEE\u5B8C\u4E00\u6761 gap \u5FC5\u987B\u663E\u5F0F\u6536\u5C3E**\uFF1A\u8FDE\u8FB9 / \u5EFA\u8282\u70B9**\u4E0D\u4F1A\u81EA\u52A8\u89E3 gap**\uFF0C\u4E0D\u53D1\u8FD9\u53E5\u62A5 gap \u7684 owner \u9192\u4E0D\u8FC7\u6765\u3002\`--gap\` = \u90A3\u6761 gap \u7684 id\uFF08reconcile \u4EFB\u52A1\u91CC\u4F1A\u7ED9\u4F60\uFF09\uFF1B\`--note\` \u539F\u6837\u7ED9 owner \u770B\uFF0C\u5199\u4EBA\u8BDD\u3002
-- \`oasis escalate <id> --reason "<\u7F3A\u4EC0\u4E48\u80FD\u529B / \u8981\u4EBA\u66FF\u4F60\u5B9A\u6216\u505A\u4EC0\u4E48>"\` \u2014\u2014 **\u641E\u4E0D\u5B9A / \u62FF\u4E0D\u51C6 / \u6839\u56E0\u4E0D\u5728\u56FE\u4E0A\u5C31\u4E0A\u62A5\u53D1\u8D77\u4EBA**\uFF08\u522B\u6C89\u9ED8\u9000\u51FA\uFF09\u3002\`<id>\` = \u5361\u4F4F\u7684\u8282\u70B9\uFF1B\`--reason\` \u8BF4\u6E05\u4F60\u5224\u65AD\u7684\u6839\u56E0\u548C\u9700\u8981\u4EBA\u505A\u4EC0\u4E48\u3002\u7CFB\u7EDF\u4F1A\u767B\u8BB0\u672C\u6B21\u4F1A\u8BDD\uFF0C\u4EBA\u56DE\u8BDD\u65F6\u4F60\u88AB**\u63A5\u7740\u5524\u8D77\u3001\u5E26\u4E0A\u4E0B\u6587\u7EE7\u7EED\u89E3**\u3002
+- \`oasis escalate <id> --reason "<\u7F3A\u4EC0\u4E48\u80FD\u529B / \u8981\u4EBA\u66FF\u4F60\u5B9A\u6216\u505A\u4EC0\u4E48>" --gap <gapId> [--part <part>]\` \u2014\u2014 **\u641E\u4E0D\u5B9A / \u62FF\u4E0D\u51C6 / \u6839\u56E0\u4E0D\u5728\u56FE\u4E0A\u5C31\u4E0A\u62A5\u53D1\u8D77\u4EBA**\uFF08\u522B\u6C89\u9ED8\u9000\u51FA\uFF09\u3002\`<id>\` = \u5361\u4F4F\u7684\u8282\u70B9\uFF1B\`--reason\` \u8BF4\u6E05\u4F60\u5224\u65AD\u7684\u6839\u56E0\u548C\u9700\u8981\u4EBA\u505A\u4EC0\u4E48\u3002\u7CFB\u7EDF\u4F1A\u767B\u8BB0\u672C\u6B21\u4F1A\u8BDD\uFF0C\u4EBA\u56DE\u8BDD\u65F6\u4F60\u88AB**\u63A5\u7740\u5524\u8D77\u3001\u5E26\u4E0A\u4E0B\u6587\u7EE7\u7EED\u89E3**\u3002
 
 \u3010\u8BFB\u56FE\u3011\uFF08\u90FD\u8BFB**\u771F\u56FE**\uFF0C\u4E0E\u522B\u7684 agent \u540C\u8BED\u4E49\uFF0C\u4E0D\u53D7\u4F60\u6682\u5B58\u5F71\u54CD\uFF09
 - \`oasis graph\` \u2014\u2014 \u5168\u56FE\u4F9D\u8D56\u8FB9\uFF08\u8C01\u8FDE\u8C01\uFF09\uFF1B\`oasis ls\` \u2014\u2014 \u5168\u4EA7\u7269\u5217\u8868\uFF08id / type / owner / head / \u961F\u5217 / \u72B6\u6001\u6807\uFF09\u3002\u5148\u7528\u5B83\u4EEC\u5EFA\u7ACB\u5168\u5C40\u56FE\u666F\u3002
@@ -45779,7 +46157,7 @@ ${SHARED_GRAPH_BODY}`;
         const out = [];
         for (const artifact of this.deps.kernel.model.artifacts.values()) {
           for (const g2 of unresolvedGapsOf(this.deps.kernel.model, artifact.id)) {
-            out.push({ artifactId: artifact.id, gapId: g2.gapId, description: g2.description });
+            out.push({ artifactId: artifact.id, gapId: g2.gapId, description: g2.description, part: g2.part });
           }
         }
         return out;
@@ -45814,6 +46192,10 @@ ${SHARED_GRAPH_BODY}`;
         }
         return lines.length > 0 ? lines.join("\n") : "\uFF08\u56FE\u91CC\u6682\u65E0\u5176\u5B83\u4EA7\u7269\uFF09";
       }
+      escalateCmd(gap, reasonPlaceholder) {
+        const partFlag = gap.part ? ` --part ${gap.part}` : "";
+        return `oasis escalate ${gap.artifactId} --reason "${reasonPlaceholder}" --gap ${gap.gapId}${partFlag}`;
+      }
       async reconcile(gap) {
         const gapper = this.deps.kernel.model.artifacts.get(gap.artifactId);
         const brief = gapper?.title ?? gapper?.description ?? "";
@@ -45826,7 +46208,7 @@ ${SHARED_GRAPH_BODY}`;
           `## \u8981\u4F60\u505A\u4EC0\u4E48\uFF08\u5148\u5206\u8BCA\uFF09`,
           `\u8FD9\u4E2A\u9700\u6C42**\u53EF\u80FD\u662F\u4EFB\u4F55\u963B\u585E**\u2014\u2014\u7F3A\u4E0A\u6E38\u8F93\u5165 / \u7F3A\u4FE1\u606F / \u8981\u4EBA\u51B3\u7B56 / \u7F3A\u80FD\u529B\uFF08\u5982\u67D0\u4E2A\u5DE5\u5177\u88C5\u4E0D\u4E0A\uFF09\u3002\u4F60\u5206\u8BCA\uFF1A`,
           `- **\u56FE\u4E0A\u80FD\u4FEE\u7684**\uFF08\u7F3A\u4E0A\u6E38/\u8BE5\u8FDE\u6CA1\u8FDE\uFF09\u2192 \u5224\u65AD\u8FDE\u65E2\u6709\uFF08\u53BB\u91CD\uFF0C\u4F18\u5148\uFF09\u8FD8\u662F\u65B0\u5EFA\u2014\u2014\u6BD4\u5BF9\u4E0B\u9762\u73B0\u6709\u4EA7\u7269\u7684 brief\uFF1B\u62FF\u4E0D\u51C6\u5C31 \`oasis content <\u5019\u9009id>\` \u8BFB\u6B63\u6587\u3002`,
-          `- **\u56FE\u4E0A\u4FEE\u4E0D\u4E86\u7684**\uFF08\u8981\u4EBA\u62CD\u677F / \u7F3A\u73AF\u5883\u80FD\u529B\uFF09\u2192 \`oasis escalate ${gap.artifactId} --reason "<\u8981\u4EBA\u5B9A/\u505A\u4EC0\u4E48>"\`\uFF0C\u7CFB\u7EDF\u4F1A\u5347\u7EA7\u7ED9\u53D1\u8D77\u4EBA\u3001\u4F60\u4E4B\u540E\u53EF\u80FD\u5728\u5BF9\u8BDD\u91CC\u88AB ta \u95EE\u5230\uFF0C\u7136\u540E\u6536\u5DE5\u3002`,
+          `- **\u56FE\u4E0A\u4FEE\u4E0D\u4E86\u7684**\uFF08\u8981\u4EBA\u62CD\u677F / \u7F3A\u73AF\u5883\u80FD\u529B\uFF09\u2192 \`${this.escalateCmd(gap, "<\u8981\u4EBA\u5B9A/\u505A\u4EC0\u4E48>")}\`\uFF0C\u7CFB\u7EDF\u4F1A\u5347\u7EA7\u7ED9\u53D1\u8D77\u4EBA\u3001\u4F60\u4E4B\u540E\u53EF\u80FD\u5728\u5BF9\u8BDD\u91CC\u88AB ta \u95EE\u5230\uFF0C\u7136\u540E\u6536\u5DE5\u3002`,
           ``,
           `## \u73B0\u6709\u4EA7\u7269\uFF08id / type / \u662F\u5426\u5DF2\u4EA4\u4ED8 / brief / \u4F9D\u8D56\uFF09`,
           this.structDigest(gap.artifactId),
@@ -45840,11 +46222,11 @@ ${SHARED_GRAPH_BODY}`;
           `- \u786E\u65E0\u5339\u914D\u3001\u65B0\u9700\u6C42 \u2192 \`oasis spawn --type <\u7C7B\u578B> --title "<\u77ED\u540D>" --brief "${gap.description}"\`\uFF08\u4E0D\u7528\u7ED9 id\uFF09+ \`oasis link ${gap.artifactId} --to <\u7C7B\u578B>:<\u77ED\u540D>\`\uFF08\u6309 type:title \u5F15\u521A\u5EFA\u7684\uFF09\u2192 apply\u3002`,
           `- **\u4FEE\u5B8C\u624D\u6536\u5C3E**\uFF1A\`oasis resolve-gap --gap ${gap.gapId} --note "<\u4F60\u505A\u4E86\u4EC0\u4E48 / owner \u8BE5\u600E\u4E48\u7EE7\u7EED>"\`\u2014\u2014**\u8FDE\u8FB9\u4E0D\u4F1A\u81EA\u52A8\u89E3 gap**\uFF0C\u4E0D\u53D1\u8FD9\u53E5 owner \u9192\u4E0D\u8FC7\u6765\uFF1Bnote \u4F1A\u539F\u6837\u7ED9 owner \u770B\uFF0C\u5199\u4EBA\u8BDD\u3002`,
           `**B. \u8981\u4EBA**\uFF08\u51B3\u7B56/\u80FD\u529B\u95EE\u9898\uFF0C\u56FE\u4E0A\u4FEE\u4E0D\u4E86\uFF09\uFF1A`,
-          `- \`oasis escalate ${gap.artifactId} --reason "<\u8981\u4EBA\u5B9A/\u505A\u4EC0\u4E48>"\` \u540E**\u76F4\u63A5\u6536\u5DE5**\u3002`,
+          `- \`${this.escalateCmd(gap, "<\u8981\u4EBA\u5B9A/\u505A\u4EC0\u4E48>")}\` \u540E**\u76F4\u63A5\u6536\u5DE5**\u3002`,
           `- \u26A0\uFE0F **\u7EDD\u4E0D\u8981\u5BF9\u8FD9\u6761 gap \u8C03 resolve-gap**\u2014\u2014resolve-gap \u7684\u542B\u4E49\u662F"**\u9700\u6C42\u5DF2\u6EE1\u8DB3\u3001\u8BA9 owner \u590D\u5DE5**"\uFF0C\u4E0D\u662F"\u6211\u5206\u8BCA\u5B8C\u4E86"\u7684\u767B\u8BB0\u3002\u73B0\u5728\u9700\u6C42\u8FD8\u6CA1\u6EE1\u8DB3\uFF1Agap \u4FDD\u6301 open \u624D\u662F"\u8282\u70B9\u7EE7\u7EED\u7B49\u5F85"\u7684\u6B63\u786E\u72B6\u6001\uFF1B\u63D0\u524D resolve \u4F1A\u8BA9 owner \u5728\u5565\u90FD\u6CA1\u53D8\u7684\u60C5\u51B5\u4E0B\u88AB\u53EB\u9192\u767D\u8DD1\u3001\u8FD8\u4F1A\u628A\u4F60\u7684\u4E0A\u62A5\u4ECE\u4EBA\u7684\u6536\u4EF6\u7BB1\u91CC\u62B9\u6389\u3002\u4EBA\u7B54\u590D\u540E\uFF08\u591A\u534A\u5728\u5BF9\u8BDD\u91CC\u627E\u4F60\uFF09\u4F60\u518D\u4FEE\u56FE\u3001\u90A3\u65F6\u624D resolve-gap\u3002`,
           `**\u5176\u5B83**\uFF1A`,
           `- \u987A\u624B\u53D1\u73B0\u4E24\u4E2A\u4EA7\u7269\u91CD\u590D \u2192 **\u5148\u628A\u89E3 gap \u90A3\u7B14\uFF08\u542B resolve-gap\uFF09\u5355\u72EC\u6536\u6389**\uFF0C\u518D\u53E6\u8D77\u4E00\u7B14\uFF1A\`oasis edit\` \u6269\u4FDD\u7559\u4EF6 brief + \`oasis link\` \u6539\u8FDE\u6D88\u8D39\u8005 + \`oasis cancel\` \u5E9F\u5F03\u4EF6\uFF0C\u4E00\u8D77\u6682\u5B58\u518D apply\u3002`,
-          `- **\u62FF\u4E0D\u51C6\u4FEE\u6CD5 \u2192 \u4E00\u5F8B\u627E\u4EBA\uFF0C\u7EDD\u4E0D\u6C89\u9ED8\u9000\u51FA**\uFF1A\`oasis escalate ${gap.artifactId} --reason "<\u4F60\u5361\u5728\u54EA\u3001\u9700\u8981\u4EBA\u66FF\u4F60\u5B9A/\u505A\u4EC0\u4E48>"\` \u628A\u7591\u8651\u4E0A\u62A5\u7ED9\u53D1\u8D77\u4EBA\u2014\u2014\u7CFB\u7EDF\u4F1A\u767B\u8BB0\u672C\u6B21\u4F1A\u8BDD\uFF0C\u4EBA\u56DE\u8BDD\u65F6\u4F60\u88AB\u63A5\u7740\u5524\u8D77\u3001\u5E26\u7740\u4E0A\u4E0B\u6587\u7EE7\u7EED\u89E3\u3002**\u6CA1\u6709"\u8FD8\u4E0D\u5230\u8981\u4EBA\u7684\u7A0B\u5EA6"\u8FD9\u4E00\u6863\uFF1A\u6539\u4E0D\u52A8\u53C8\u62FF\u4E0D\u51C6\uFF0C\u5C31\u662F\u8981\u4EBA\u3002\u4EC0\u4E48\u90FD\u4E0D\u505A\u5730\u6536\u5DE5 = \u628A\u8282\u70B9\u6C38\u4E45\u667E\u6B7B\uFF0C\u6700\u7CDF\u3002**`
+          `- **\u62FF\u4E0D\u51C6\u4FEE\u6CD5 \u2192 \u4E00\u5F8B\u627E\u4EBA\uFF0C\u7EDD\u4E0D\u6C89\u9ED8\u9000\u51FA**\uFF1A\`${this.escalateCmd(gap, "<\u4F60\u5361\u5728\u54EA\u3001\u9700\u8981\u4EBA\u66FF\u4F60\u5B9A/\u505A\u4EC0\u4E48>")}\` \u628A\u7591\u8651\u4E0A\u62A5\u7ED9\u53D1\u8D77\u4EBA\u2014\u2014\u7CFB\u7EDF\u4F1A\u767B\u8BB0\u672C\u6B21\u4F1A\u8BDD\uFF0C\u4EBA\u56DE\u8BDD\u65F6\u4F60\u88AB\u63A5\u7740\u5524\u8D77\u3001\u5E26\u7740\u4E0A\u4E0B\u6587\u7EE7\u7EED\u89E3\u3002**\u6CA1\u6709"\u8FD8\u4E0D\u5230\u8981\u4EBA\u7684\u7A0B\u5EA6"\u8FD9\u4E00\u6863\uFF1A\u6539\u4E0D\u52A8\u53C8\u62FF\u4E0D\u51C6\uFF0C\u5C31\u662F\u8981\u4EBA\u3002\u4EC0\u4E48\u90FD\u4E0D\u505A\u5730\u6536\u5DE5 = \u628A\u8282\u70B9\u6C38\u4E45\u667E\u6B7B\uFF0C\u6700\u7CDF\u3002**`
         ].join("\n");
         const subjectKey = `gap:${gap.gapId}`;
         const emptyCount = this.emptyHandedGap.get(subjectKey) ?? 0;
@@ -45854,7 +46236,7 @@ ${SHARED_GRAPH_BODY}`;
           `## \u26A0\uFE0F \u63A5\u4E0A\u4E00\u8F6E\u2014\u2014\u4F60\u4E0A\u6B21\u88AB\u5524\u8D77\u5374**\u7A7A\u624B\u9000\u51FA\u4E86**\uFF08\u65E2\u6CA1 resolve-gap \u4E5F\u6CA1 escalate\uFF09`,
           `\u8FD9\u6761\u7EBF\u8FD8\u5361\u7740\u3002\u8FD9\u4E00\u8F6E\u4F60**\u5FC5\u987B**\u4E8C\u9009\u4E00\u6536\u53E3\uFF0C\u4E0D\u8BB8\u518D\u7A7A\u624B\u9000\u51FA\uFF1A`,
           `- \u5DF2\u628A\u8FD9\u6761\u7EBF\u63A8\u52A8 / \u5224\u65AD\u8BE5 owner \u63A5\u624B \u2192 \`oasis resolve-gap --gap ${gap.gapId} --note "<\u4F60\u505A\u4E86\u4EC0\u4E48 / owner \u600E\u4E48\u63A5>"\``,
-          `- \u591F\u4E0D\u7740 / \u8981\u4EBA\u62CD\u677F \u2192 \`oasis escalate ${gap.artifactId} --reason "<\u6839\u56E0 + \u8981\u4EBA\u505A\u4EC0\u4E48>"\``,
+          `- \u591F\u4E0D\u7740 / \u8981\u4EBA\u62CD\u677F \u2192 \`${this.escalateCmd(gap, "<\u6839\u56E0 + \u8981\u4EBA\u505A\u4EC0\u4E48>")}\``,
           `\u4E0D\u53D1\u8FD9\u4E24\u53E5\u4E4B\u4E00\uFF0Cgap \u6C38\u8FDC\u89E3\u4E0D\u5F00\u3001owner \u6C38\u8FDC\u9192\u4E0D\u8FC7\u6765\u3002**\u8FD9\u662F\u6700\u540E\u4E00\u6B21\u673A\u4F1A\u2014\u2014\u518D\u7A7A\u624B\uFF0C\u7CFB\u7EDF\u4F1A\u66FF\u4F60\u4E0A\u62A5\u7ED9\u4EBA\u3002**`
         ].join("\n");
         const resumeId = emptyCount > 0 ? this.emptyHandedSession.get(subjectKey) : void 0;
@@ -45877,7 +46259,9 @@ ${SHARED_GRAPH_BODY}`;
           await this.deps.kernel.escalate({
             artifactId: gap.artifactId,
             actor: run.managerActorId,
-            reason: `\u7BA1\u7406\u8005\u88AB\u7CFB\u7EDF\u5524\u8D77 ${n} \u8F6E\u4ECD\u672A\u6536\u53E3\uFF08\u65E2\u672A resolve-gap \u4E5F\u672A escalate\uFF09\u2014\u2014\u7CFB\u7EDF\u4EE3\u4E3A\u4E0A\u62A5\uFF0C\u8BF7\u4F60\u5904\u7406\u8FD9\u6761\u5361\u70B9\uFF1A${gap.description}`
+            reason: `\u7BA1\u7406\u8005\u88AB\u7CFB\u7EDF\u5524\u8D77 ${n} \u8F6E\u4ECD\u672A\u6536\u53E3\uFF08\u65E2\u672A resolve-gap \u4E5F\u672A escalate\uFF09\u2014\u2014\u7CFB\u7EDF\u4EE3\u4E3A\u4E0A\u62A5\uFF0C\u8BF7\u4F60\u5904\u7406\u8FD9\u6761\u5361\u70B9\uFF1A${gap.description}`,
+            gapId: gap.gapId,
+            ...gap.part ? { part: gap.part } : {}
           }).catch((e) => this.deps.log?.(`[coordinator] ${gap.artifactId} \u81EA\u52A8 escalate \u5931\u8D25\uFF1A${String(e)}`));
           this.deps.log?.(`[coordinator] ${gap.artifactId} \u7BA1\u7406\u8005\u8FDE\u7EED ${n} \u8F6E\u7A7A\u624B \u2192 \u7CFB\u7EDF\u81EA\u52A8 escalate \u4EA4\u53D1\u8D77\u4EBA`);
           this.emptyHandedGap.delete(subjectKey);
@@ -54496,6 +54880,22 @@ var PostgresTraceStore = class _PostgresTraceStore {
     const nextCursor = hasMore ? page[page.length - 1]?.id ?? null : null;
     return { items: page, nextCursor };
   }
+  async listUsageRuns(filter) {
+    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
+       ORDER BY started_at`,
+      [filter.from, filter.to]
+    );
+    return r.rows.map((row) => ({
+      actorId: row.actor_id,
+      artifactId: row.artifact_id ?? null,
+      startedAt: row.started_at,
+      effectiveModel: row.effective_model ?? null,
+      usage: row.usage
+    }));
+  }
   /* ---------- 事件流（单写者 seq + 幂等吸收）---------- */
   async appendEvent(runId, event) {
     return (await this.appendEvents(runId, [event]))[0];
@@ -56414,6 +56814,7 @@ async function startServe(opts) {
       collabDomain({
         kernel,
         oplog,
+        trace: trace.service,
         registry: registryStore,
         artifacts: artifactStateStore,
         dispatchJournal: () => journalRing.slice(-200),
@@ -57088,8 +57489,17 @@ ${detail}` : genericLine));
         if (f2.action !== "produce") continue;
         const cur = kernel.model.artifacts.get(f2.artifactId);
         if (!cur) continue;
-        if (now - Date.parse(f2.fusedAt) > agentMs) {
-          await escalate(f2.artifactId, cur.owner, `agent \u8FDE\u8D25\u7194\u65AD\u540E ${Math.round(agentMs / 6e4)} \u5206\u949F\u65E0\u4EBA\u5904\u7406`);
+        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`;
+        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`);
+        } catch (err) {
+          console.error(`[sla] \u7194\u65AD\u5347\u7EA7\u5931\u8D25 ${f2.artifactId}: ${String(err)}`);
         }
       }
     })().catch((err) => console.error(`[sla] \u626B\u63CF\u5931\u8D25: ${String(err)}`));
@@ -58861,9 +59271,10 @@ ${res.warning}`);
     }
     case "escalate": {
       const { message } = await api.cmd("escalate", {
-        artifactId: needPos(positional, 0, "oasis escalate <artifactId> --reason t [--part p]"),
+        artifactId: needPos(positional, 0, "oasis escalate <artifactId> --reason t [--gap id] [--part p]"),
         reason: need(flags, "reason"),
-        ...flags.get("part") !== void 0 ? { part: flags.get("part") } : {}
+        ...flags.get("part") !== void 0 ? { part: flags.get("part") } : {},
+        ...flags.get("gap") !== void 0 ? { gapId: flags.get("gap") } : {}
       });
       println(message);
       break;
@@ -58876,6 +59287,23 @@ ${res.warning}`);
       println(message);
       break;
     }
+    case "hold": {
+      const { message } = await api.cmd("hold", {
+        artifactId: needPos(positional, 0, "oasis hold <artifactId> [--reason t]"),
+        ...flags.get("reason") !== void 0 ? { reason: flags.get("reason") } : {},
+        ...flags.get("source") !== void 0 ? { source: flags.get("source") } : {}
+      });
+      println(message);
+      break;
+    }
+    case "release": {
+      const { message } = await api.cmd("release", {
+        artifactId: needPos(positional, 0, "oasis release <artifactId> [--reason t]"),
+        ...flags.get("reason") !== void 0 ? { reason: flags.get("reason") } : {}
+      });
+      println(message);
+      break;
+    }
     case "add-revision": {
       const { message } = await api.cmd("addRevision", {
         artifactId: needPos(positional, 0, "oasis add-revision <artifactId> --desc <\u8981\u5B83\u5B8C\u6210\u4EC0\u4E48> [--role <\u8C01\u6765\u505A>]"),
@@ -59328,7 +59756,7 @@ ${res.warning}`);
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.53" : "dev";
+var PKG_VERSION = true ? "0.1.54" : "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.53",
+  "version": "0.1.54",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"