oasis_test 0.1.52 → 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;
     }
@@ -339,7 +355,7 @@ function fold(model, op) {
         nonMonotonicOps: p2.nonMonotonicOps,
         proposedBy: p2.proposedBy,
         origin: p2.origin ?? null,
-        workspace: p2.plan.workspace ?? null,
+        workspace: p2.plan.workspace ?? model.artifacts.get(op.artifactId)?.workspace ?? null,
         advisory: p2.advisory ?? [],
         downstreamClosure: p2.downstreamClosure ?? [],
         at: op.timestamp,
@@ -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",
@@ -2004,9 +2058,9 @@ var init_kernel = __esm({
           throw new KernelError(`revision not in queue: ${args.revisionId}\uFF08state=${target?.state ?? "missing"}\uFF09`);
         }
         if (isStale(this.model, head)) {
-          const path20 = this.pathForStaleHead(artifact, queue);
+          const path19 = this.pathForStaleHead(artifact, queue);
           throw new KernelError(
-            `stale base: ${head.id} based on ${head.base ?? "\u2205"}, head is ${artifact.currentRev ?? "\u2205"} \u2014 ` + (path20 === "rebase" ? `\u9700\u8981 rebase\uFF1A\u4F5C\u8005\u5728\u65B0 head \u4E0A\u91CD\u5199\u540E propose --rebase-of ${head.id}\uFF08\xA75.5\uFF09` : `\u591A\u6761\u7ADE\u4E89\u4E14\u68C0\u67E5\u8D35 \u2192 group-commit\uFF1Aowner \u4E00\u6B21\u96C6\u6210\u6574\u6279\uFF08\xA75.5\uFF09`)
+            `stale base: ${head.id} based on ${head.base ?? "\u2205"}, head is ${artifact.currentRev ?? "\u2205"} \u2014 ` + (path19 === "rebase" ? `\u9700\u8981 rebase\uFF1A\u4F5C\u8005\u5728\u65B0 head \u4E0A\u91CD\u5199\u540E propose --rebase-of ${head.id}\uFF08\xA75.5\uFF09` : `\u591A\u6761\u7ADE\u4E89\u4E14\u68C0\u67E5\u8D35 \u2192 group-commit\uFF1Aowner \u4E00\u6B21\u96C6\u6210\u6574\u6279\uFF08\xA75.5\uFF09`)
           );
         }
         await this.landHead(args.artifactId, args.actor, head, args.hand);
@@ -2023,13 +2077,13 @@ var init_kernel = __esm({
           const head = queue[0];
           if (!head) return { landed };
           if (isStale(this.model, head)) {
-            const path20 = this.pathForStaleHead(artifact, queue);
+            const path19 = this.pathForStaleHead(artifact, queue);
             return {
               landed,
               blockedHead: {
                 revision: head,
-                path: path20,
-                hint: path20 === "rebase" ? `\u4F5C\u8005\u91CD\u5199\u540E propose --rebase-of ${head.id}` : `owner \u96C6\u6210\u6574\u6279\uFF08integrate\uFF09\uFF0CR*.parents = [head, \u2026batch]`
+                path: path19,
+                hint: path19 === "rebase" ? `\u4F5C\u8005\u91CD\u5199\u540E propose --rebase-of ${head.id}` : `owner \u96C6\u6210\u6574\u6279\uFF08integrate\uFF09\uFF0CR*.parents = [head, \u2026batch]`
               }
             };
           }
@@ -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);
@@ -4808,6 +4909,172 @@ var init_src2 = __esm({
   }
 });
 
+// ../server/src/git/ci-provider.ts
+function normalizeRemote(remote) {
+  let s2 = remote.trim();
+  s2 = s2.replace(/^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//, "");
+  s2 = s2.replace(/^git@/, "").replace(/^([^/:]+):/, "$1/");
+  s2 = s2.replace(/\/+$/, "").replace(/\.git$/i, "");
+  const slash = s2.indexOf("/");
+  if (slash > 0) s2 = s2.slice(0, slash).toLowerCase() + s2.slice(slash);
+  return s2;
+}
+function isGitHubRemote(remote) {
+  return !!remote && /(?:^|\/\/|@)github\.com[/:]/i.test(remote);
+}
+function ciBranchFor(artifactId, sha2) {
+  const s2 = slug3(artifactId.replace(/^artifact:/, "")).slice(0, 48);
+  return `oasis-ci/${s2}/${sha2.slice(0, 8)}`;
+}
+function mirrorDirFor(mirrorRoot, repo) {
+  if (repo.repoDir) return repo.repoDir;
+  const key = repo.remote ? `${slug3(repo.id)}-${crypto.createHash("sha1").update(normalizeRemote(repo.remote)).digest("hex").slice(0, 8)}` : slug3(repo.id);
+  return `${mirrorRoot}/${key}`;
+}
+var import_node_child_process, crypto, fs, path, import_node_util, execFile, slug3, GhCiProvider;
+var init_ci_provider = __esm({
+  "../server/src/git/ci-provider.ts"() {
+    "use strict";
+    import_node_child_process = require("node:child_process");
+    crypto = __toESM(require("node:crypto"), 1);
+    fs = __toESM(require("node:fs"), 1);
+    path = __toESM(require("node:path"), 1);
+    import_node_util = require("node:util");
+    execFile = (0, import_node_util.promisify)(import_node_child_process.execFile);
+    slug3 = (id) => id.replace(/[^a-zA-Z0-9_-]+/g, "_");
+    GhCiProvider = class {
+      constructor(opts) {
+        this.opts = opts;
+      }
+      repoDir(repo) {
+        return mirrorDirFor(this.opts.mirrorRoot, repo);
+      }
+      /** 缺则 clone（首次使用/进程重启后本地镜像不存在）——否则 git fetch 会"not a git repo"报错。同 GitRemoteIntegrator。 */
+      ensureClone(repo) {
+        const dir = this.repoDir(repo);
+        if (fs.existsSync(path.join(dir, ".git"))) {
+          if (repo.remote) {
+            let origin = "";
+            try {
+              origin = (0, import_node_child_process.execFileSync)("git", ["remote", "get-url", "origin"], { cwd: dir, env: process.env }).toString().trim();
+            } catch {
+            }
+            if (origin !== repo.remote) {
+              (0, import_node_child_process.execFileSync)("git", ["remote", "set-url", "origin", repo.remote], { cwd: dir, env: process.env });
+              this.opts.log?.(`[ci] ${repo.id} \u955C\u50CF origin \u7EA0\u504F\uFF1A${origin || "(\u65E0)"} \u2192 ${repo.remote}`);
+            }
+          }
+          return;
+        }
+        if (!repo.remote) throw new Error(`repo ${repo.id} \u65E0 remote\uFF0C\u65E0\u6CD5 clone`);
+        fs.mkdirSync(path.dirname(dir), { recursive: true });
+        (0, import_node_child_process.execFileSync)("git", ["clone", "--quiet", repo.remote, dir], { env: process.env });
+        this.opts.log?.(`[ci] cloned ${repo.id} \u2192 ${dir}`);
+      }
+      async gh(repo, args) {
+        this.ensureClone(repo);
+        const { stdout } = await execFile("gh", args, { cwd: this.repoDir(repo), env: process.env });
+        return stdout.trim();
+      }
+      async git(repo, args) {
+        this.ensureClone(repo);
+        const { stdout } = await execFile("git", args, { cwd: this.repoDir(repo), env: process.env });
+        return stdout.trim();
+      }
+      async ensurePr(ref, meta) {
+        if (!ref.repo.remote) throw new Error(`repo ${ref.repo.id} \u65E0 remote\uFF0C\u65E0\u6CD5\u5F00 PR`);
+        await this.git(ref.repo, ["fetch", "--quiet", "--prune", "origin"]);
+        await this.git(ref.repo, ["push", "--quiet", "--force-with-lease", "origin", `${ref.sha}:refs/heads/${ref.branch}`]);
+        const existing = await this.gh(ref.repo, ["pr", "list", "--head", ref.branch, "--base", ref.repo.develop, "--state", "open", "--json", "number,url"]);
+        const list = JSON.parse(existing || "[]");
+        if (list[0]) return list[0];
+        const url = await this.gh(ref.repo, ["pr", "create", "--base", ref.repo.develop, "--head", ref.branch, "--title", meta.title, "--body", meta.body]);
+        const created = JSON.parse(await this.gh(ref.repo, ["pr", "view", ref.branch, "--json", "number,url"]));
+        this.opts.log?.(`[ci] opened PR ${created.url} (${ref.branch} \u2192 ${ref.repo.develop})`);
+        return created.url ? created : { number: created.number, url };
+      }
+      async status(ref) {
+        let raw;
+        try {
+          raw = await this.gh(ref.repo, ["pr", "view", ref.branch, "--json", "statusCheckRollup,createdAt"]);
+        } catch (e) {
+          return { state: "pending", summary: `\u8BFB PR \u72B6\u6001\u5931\u8D25\uFF08\u4E0B\u8F6E\u91CD\u8BD5\uFF09\uFF1A${String(e)}` };
+        }
+        const parsed = JSON.parse(raw || "{}");
+        const rollup = parsed.statusCheckRollup ?? [];
+        if (rollup.length === 0) {
+          const grace = this.opts.noCheckGraceMs ?? 12e4;
+          const ageMs = parsed.createdAt ? Date.now() - Date.parse(parsed.createdAt) : Infinity;
+          if (ageMs < grace) return { state: "pending" };
+          if (this.opts.failClosedWhenNoChecks) return { state: "failure", summary: "\u8BE5\u4ED3\u672A\u914D\u4EFB\u4F55 Actions check\uFF08fail-closed\uFF09\u2014\u2014\u8BF7\u8865 CI \u6216\u6539\u914D\u7F6E" };
+          this.opts.log?.(`[ci] ${ref.repo.id} PR ${ref.branch} \u5F00\u4E86 ${Math.round(ageMs / 1e3)}s \u4ECD\u65E0 check\uFF0C\u5224\u65E0 CI\u3001\u95F8\u7A7A\u8FC7\uFF08\u544A\u8B66\uFF09`);
+          return { state: "success", summary: "\u65E0 CI check\uFF0C\u95F8\u7A7A\u8FC7" };
+        }
+        const failed = [];
+        let anyPending = false;
+        for (const c of rollup) {
+          const concl = (c.conclusion ?? "").toUpperCase();
+          const st = (c.status ?? "").toUpperCase();
+          if (st && st !== "COMPLETED") {
+            anyPending = true;
+            continue;
+          }
+          if (concl && !["SUCCESS", "NEUTRAL", "SKIPPED"].includes(concl)) failed.push(c);
+        }
+        if (failed.length > 0) {
+          const blocks = [];
+          for (const c of failed) {
+            const name = c.name ?? c.context ?? "check";
+            const concl = (c.conclusion ?? "").toUpperCase();
+            const url = c.detailsUrl ?? c.targetUrl ?? "";
+            let block = `  - ${name} \u2192 ${concl}${url ? `
+    ${url}` : ""}`;
+            const tail = await this.failedLogTail(ref.repo, url);
+            if (tail) block += `
+    \u5931\u8D25\u65E5\u5FD7\uFF08\u672B\u5C3E\uFF09\uFF1A
+${tail.split("\n").map((l) => "      " + l).join("\n")}`;
+            blocks.push(block);
+          }
+          return { state: "failure", summary: `CI \u672A\u8FC7\uFF08${failed.length} \u4E2A check\uFF09\uFF1A
+${blocks.join("\n")}` };
+        }
+        if (anyPending) return { state: "pending" };
+        return { state: "success", summary: `CI \u901A\u8FC7\uFF08${rollup.length} \u4E2A check\uFF09` };
+      }
+      /** best-effort：从 check 的 detailsUrl 提 Actions run id，取失败步骤日志末尾（截断）。取不到返回空。 */
+      async failedLogTail(repo, detailsUrl) {
+        const m2 = /\/runs\/(\d+)/.exec(detailsUrl);
+        if (!m2) return "";
+        try {
+          const log3 = await this.gh(repo, ["run", "view", m2[1], "--log-failed"]);
+          return log3.split("\n").filter(Boolean).slice(-40).join("\n").slice(-2e3);
+        } catch {
+          return "";
+        }
+      }
+      async merge(ref) {
+        try {
+          await this.gh(ref.repo, ["pr", "merge", ref.branch, "--merge", "--delete-branch"]);
+          this.opts.log?.(`[ci] merged PR ${ref.branch} \u2192 ${ref.repo.develop}`);
+          return { merged: true };
+        } catch (e) {
+          return { merged: false, reason: String(e) };
+        }
+      }
+      async isMerged(ref) {
+        if (!ref.repo.remote) return false;
+        try {
+          await this.git(ref.repo, ["fetch", "--quiet", "origin", ref.repo.develop]);
+          await this.git(ref.repo, ["merge-base", "--is-ancestor", ref.sha, `origin/${ref.repo.develop}`]);
+          return true;
+        } catch {
+          return false;
+        }
+      }
+    };
+  }
+});
+
 // ../server/src/git/collect.ts
 function collectUmbrellaCommits(repos, featBranch, env) {
   const out = {};
@@ -4815,7 +5082,7 @@ function collectUmbrellaCommits(repos, featBranch, env) {
     if (!r.remote) continue;
     let ls;
     try {
-      ls = (0, import_node_child_process.execFileSync)("git", ["ls-remote", r.remote, `refs/heads/${featBranch}`, `refs/heads/${r.develop}`], {
+      ls = (0, import_node_child_process2.execFileSync)("git", ["ls-remote", r.remote, `refs/heads/${featBranch}`, `refs/heads/${r.develop}`], {
         encoding: "utf8",
         ...env ? { env } : {}
       });
@@ -4830,12 +5097,16 @@ function collectUmbrellaCommits(repos, featBranch, env) {
     }
     const featSha = refs.get(`refs/heads/${featBranch}`);
     const devSha = refs.get(`refs/heads/${r.develop}`);
-    if (featSha && featSha !== devSha) out[r.id] = featSha;
+    if (featSha && featSha !== devSha) out[r.remote ? normalizeRemote(r.remote) : r.id] = featSha;
   }
   return out;
 }
 function parseUmbrellaCommits(contentRef, repos) {
-  const byId = new Map(repos.map((r) => [r.id, r]));
+  const byKey = /* @__PURE__ */ new Map();
+  for (const r of repos) {
+    byKey.set(r.id, r);
+    if (r.remote) byKey.set(normalizeRemote(r.remote), r);
+  }
   if (contentRef.trim().startsWith("{")) {
     let manifest = null;
     try {
@@ -4845,8 +5116,8 @@ function parseUmbrellaCommits(contentRef, repos) {
     }
     if (manifest) {
       const out = [];
-      for (const [id, sha2] of Object.entries(manifest)) {
-        const repo = byId.get(id);
+      for (const [key, sha2] of Object.entries(manifest)) {
+        const repo = byKey.get(key);
         if (repo && typeof sha2 === "string") out.push({ repo, sha: sha2 });
       }
       return out;
@@ -4854,11 +5125,12 @@ function parseUmbrellaCommits(contentRef, repos) {
   }
   return repos[0] ? [{ repo: repos[0], sha: contentRef }] : [];
 }
-var import_node_child_process;
+var import_node_child_process2;
 var init_collect = __esm({
   "../server/src/git/collect.ts"() {
     "use strict";
-    import_node_child_process = require("node:child_process");
+    import_node_child_process2 = require("node:child_process");
+    init_ci_provider();
   }
 });
 
@@ -4869,17 +5141,16 @@ function autoMergeWorkIntoFeat(args) {
   for (const repo of args.repos) {
     if (!repo.remote) continue;
     const remote = repo.remote;
-    const key = `${repo.id.replace(/[^a-zA-Z0-9_-]+/g, "_")}-${(0, import_node_crypto3.createHash)("sha1").update(remote).digest("hex").slice(0, 12)}`;
-    const dir = path.join(args.mirrorRoot, key);
-    const git = (a) => (0, import_node_child_process2.execFileSync)("git", ["-C", dir, ...a], { encoding: "utf8", env, maxBuffer: 256 * 1024 * 1024 }).trim();
+    const dir = mirrorDirFor(args.mirrorRoot, repo);
+    const git = (a) => (0, import_node_child_process3.execFileSync)("git", ["-C", dir, ...a], { encoding: "utf8", env, maxBuffer: 256 * 1024 * 1024 }).trim();
     const clone2 = () => {
-      fs.rmSync(dir, { recursive: true, force: true });
-      fs.mkdirSync(path.dirname(dir), { recursive: true });
-      (0, import_node_child_process2.execFileSync)("git", ["clone", "--quiet", remote, dir], { env, maxBuffer: 256 * 1024 * 1024 });
+      fs2.rmSync(dir, { recursive: true, force: true });
+      fs2.mkdirSync(path2.dirname(dir), { recursive: true });
+      (0, import_node_child_process3.execFileSync)("git", ["clone", "--quiet", remote, dir], { env, maxBuffer: 256 * 1024 * 1024 });
       git(["config", "user.email", "oasis@local"]);
       git(["config", "user.name", "oasis"]);
     };
-    if (!fs.existsSync(path.join(dir, ".git"))) {
+    if (!fs2.existsSync(path2.join(dir, ".git"))) {
       clone2();
     } else {
       let originOk = false;
@@ -4934,18 +5205,18 @@ function autoMergeWorkIntoFeat(args) {
     staged.push(dir);
   }
   for (const dir of staged) {
-    (0, import_node_child_process2.execFileSync)("git", ["-C", dir, "push", "--quiet", "origin", args.featBranch], { env, maxBuffer: 256 * 1024 * 1024 });
+    (0, import_node_child_process3.execFileSync)("git", ["-C", dir, "push", "--quiet", "origin", args.featBranch], { env, maxBuffer: 256 * 1024 * 1024 });
   }
   return { ok: true };
 }
-var import_node_child_process2, import_node_crypto3, fs, path;
+var import_node_child_process3, fs2, path2;
 var init_auto_merge = __esm({
   "../server/src/git/auto-merge.ts"() {
     "use strict";
-    import_node_child_process2 = require("node:child_process");
-    import_node_crypto3 = require("node:crypto");
-    fs = __toESM(require("node:fs"), 1);
-    path = __toESM(require("node:path"), 1);
+    import_node_child_process3 = require("node:child_process");
+    fs2 = __toESM(require("node:fs"), 1);
+    path2 = __toESM(require("node:path"), 1);
+    init_ci_provider();
   }
 });
 
@@ -5361,8 +5632,8 @@ var init_parseUtil = __esm({
     init_errors2();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path20, errorMaps, issueData } = params;
-      const fullPath = [...path20, ...issueData.path || []];
+      const { data, path: path19, errorMaps, issueData } = params;
+      const fullPath = [...path19, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -5670,11 +5941,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path20, key) {
+      constructor(parent, value, path19, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path20;
+        this._path = path19;
         this._key = key;
       }
       get path() {
@@ -9248,10 +9519,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path20) {
-  if (!path20)
+function getElementAtPath(obj, path19) {
+  if (!path19)
     return obj;
-  return path20.reduce((acc, key) => acc?.[key], obj);
+  return path19.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -9500,11 +9771,11 @@ function aborted(x2, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path20, issues) {
+function prefixIssues(path19, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path20);
+    iss.path.unshift(path19);
     return iss;
   });
 }
@@ -18044,8 +18315,8 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path20) {
-      let input = path20;
+    function removeDotSegments(path19) {
+      let input = path19;
       const output = [];
       let nextSlash = -1;
       let len = 0;
@@ -18297,8 +18568,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path20, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path20 && path20 !== "/" ? path20 : void 0;
+        const [path19, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path19 && path19 !== "/" ? path19 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -21811,23 +22082,23 @@ var init_router = __esm({
     };
     Router = class {
       routes = [];
-      on(method, path20, handler) {
-        this.routes.push({ method, segments: path20.split("/").filter(Boolean), handler });
+      on(method, path19, handler) {
+        this.routes.push({ method, segments: path19.split("/").filter(Boolean), handler });
       }
-      get(path20, h) {
-        this.on("GET", path20, h);
+      get(path19, h) {
+        this.on("GET", path19, h);
       }
-      post(path20, h) {
-        this.on("POST", path20, h);
+      post(path19, h) {
+        this.on("POST", path19, h);
       }
-      patch(path20, h) {
-        this.on("PATCH", path20, h);
+      patch(path19, h) {
+        this.on("PATCH", path19, h);
       }
-      put(path20, h) {
-        this.on("PUT", path20, h);
+      put(path19, h) {
+        this.on("PUT", path19, h);
       }
-      delete(path20, h) {
-        this.on("DELETE", path20, h);
+      delete(path19, h) {
+        this.on("DELETE", path19, h);
       }
       match(method, pathname) {
         const parts = pathname.split("/").filter(Boolean);
@@ -22296,10 +22567,10 @@ async function buildDynamicWorkorderPlan(input) {
   const schema = input.schema;
   const schemaByName = new Map(schema.map((def) => [def.name, def]));
   const displayTitle = input.title?.trim() || input.description;
-  const slug6 = artifactSlug(input.requestedArtifactId ?? input.workspace, displayTitle);
-  const briefId = `artifact:brief:${slug6}`;
+  const slug4 = artifactSlug(input.requestedArtifactId ?? input.workspace, displayTitle);
+  const briefId = `artifact:brief:${slug4}`;
   const primaryType = schemaByName.has(input.requestedType) && input.requestedType !== "brief" ? input.requestedType : "prd";
-  const primaryId = input.requestedArtifactId && input.requestedType === primaryType ? input.requestedArtifactId : `artifact:${primaryType}:${slug6}`;
+  const primaryId = input.requestedArtifactId && input.requestedType === primaryType ? input.requestedArtifactId : `artifact:${primaryType}:${slug4}`;
   const issues = [...input.agentIssues ?? []];
   const enforceStaffing = Boolean(input.registry);
   const staffableTypes = new Set((await plannerArtifactTypes(schema, input.registry)).map((def) => def.name));
@@ -22378,7 +22649,7 @@ async function buildDynamicWorkorderPlan(input) {
       const owner = await resolveRole(def.ownerRole, type);
       const ownerActor = owner.actor ?? (type === primaryType ? input.actor : `pending:role:${def.ownerRole}`);
       if (enforceStaffing && !owner.actor && type !== primaryType) continue;
-      const id = type === primaryType ? primaryId : `artifact:${type}:${slug6}`;
+      const id = type === primaryType ? primaryId : `artifact:${type}:${slug4}`;
       availableNodes.push({ type, id, role: def.ownerRole, owner: ownerActor });
     }
   }
@@ -23859,11 +24130,11 @@ async function resolveProposeContent(kernel, blobs, args, artifactId, ctx) {
     const ws = art?.workspace;
     const repos = ws ? (await ctx.resolveCodeRepo(ws))?.repos : void 0;
     if (repos?.length) {
-      const slug6 = (id) => id.replace(/[^a-zA-Z0-9_-]+/g, "_");
-      const feat = `feat/${slug6(artifactId)}`;
+      const slug4 = (id) => id.replace(/[^a-zA-Z0-9_-]+/g, "_");
+      const feat = `feat/${slug4(artifactId)}`;
       const proposingPart = optStr(args, "part");
       if (proposingPart !== void 0 && ctx.gitMirrorRoot) {
-        const work = `feat/${slug6(artifactId)}__${slug6(proposingPart)}`;
+        const work = `feat/${slug4(artifactId)}__${slug4(proposingPart)}`;
         const r = autoMergeWorkIntoFeat({
           repos,
           workBranch: work,
@@ -24384,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' };
     }
@@ -24440,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"),
@@ -24582,7 +24871,7 @@ async function runView(kernel, oplog, blobs, name, artifactId, params, ciGateSta
     }
     case "content": {
       const id = need2();
-      const path20 = params?.get("path") ?? null;
+      const path19 = params?.get("path") ?? null;
       const artifact = model.artifacts.get(id);
       if (!artifact) throw new Error(`artifact \u4E0D\u5B58\u5728: ${id}`);
       const head = artifact.currentRev;
@@ -24594,11 +24883,11 @@ async function runView(kernel, oplog, blobs, name, artifactId, params, ciGateSta
       const dec2 = new TextDecoder();
       if (headRev.contentKind === "manifest") {
         const entries = await readManifest(blobs, headRev.contentRef);
-        if (path20 !== null) {
-          const e = entries.find((x2) => x2.path === path20);
-          if (!e) throw new Error(`\u6587\u4EF6\u4E0D\u5B58\u5728: ${path20}\uFF08\u672C\u4EA7\u7269\u6709\uFF1A${entries.map((x2) => x2.path).join("\u3001")}\uFF09`);
+        if (path19 !== null) {
+          const e = entries.find((x2) => x2.path === path19);
+          if (!e) throw new Error(`\u6587\u4EF6\u4E0D\u5B58\u5728: ${path19}\uFF08\u672C\u4EA7\u7269\u6709\uFF1A${entries.map((x2) => x2.path).join("\u3001")}\uFF09`);
           const isText = !e.bytes.includes(0);
-          return { kind: "file", path: path20, bytes: e.bytes.length, text: isText ? dec2.decode(e.bytes) : null };
+          return { kind: "file", path: path19, bytes: e.bytes.length, text: isText ? dec2.decode(e.bytes) : null };
         }
         return {
           kind: "manifest",
@@ -24870,7 +25159,9 @@ async function startOasisServer(opts) {
         if (url.pathname === "/api/intervention/draft" && req.method === "POST") {
           try {
             const plan = JSON.parse(rawBody);
-            const { draftId, changeClass, nonMonotonicOps } = await engine.kernel.proposeIntervention(plan, actor);
+            const chatSessionId = req.headers["x-chat-session-id"];
+            const origin = typeof chatSessionId === "string" && chatSessionId ? chatSessionId : void 0;
+            const { draftId, changeClass, nonMonotonicOps } = await engine.kernel.proposeIntervention(plan, actor, origin ? { origin } : void 0);
             res.writeHead(200, { "content-type": "application/json" }).end(
               JSON.stringify({ draftId, changeClass, nonMonotonicOps })
             );
@@ -25236,7 +25527,10 @@ async function startOasisServer(opts) {
           try {
             const viewName = url.searchParams.get("name") ?? "";
             if (viewName === "intervention-drafts") {
-              const data2 = listPendingReviews(engine.kernel.model).map((r) => ({
+              const origin = url.searchParams.get("origin");
+              const workspace = url.searchParams.get("workspace") ?? void 0;
+              const reviews = listPendingReviews(engine.kernel.model, origin === null ? workspace : void 0).filter((r) => origin === null ? true : r.origin === origin);
+              const data2 = reviews.map((r) => ({
                 id: r.draftId,
                 plan: r.plan,
                 draftedBy: r.proposedBy,
@@ -25247,6 +25541,7 @@ async function startOasisServer(opts) {
                 downstreamClosure: r.downstreamClosure,
                 at: r.at,
                 origin: r.origin,
+                workspace: r.workspace,
                 anchor: r.anchor
               }));
               res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ data: data2 }));
@@ -25559,12 +25854,12 @@ async function startOasisServer(opts) {
               const actorCtx = await opts.resolveActorContext(body.actorId).catch(() => null);
               if (actorCtx) {
                 const { mkdtempSync: mkdtempSync9, mkdirSync: mkdirSync17, writeFileSync: writeFileSync15 } = await import("node:fs");
-                const { join: join24, dirname: dirname19 } = await import("node:path");
-                const { tmpdir: tmpdir13 } = await import("node:os");
-                const dir = mkdtempSync9(join24(tmpdir13(), "oasis-chat-"));
+                const { join: join23, dirname: dirname19 } = await import("node:path");
+                const { tmpdir: tmpdir12 } = await import("node:os");
+                const dir = mkdtempSync9(join23(tmpdir12(), "oasis-chat-"));
                 if (actorCtx.config?.prompt) {
                   for (const [rel, content] of Object.entries(splitIdentityFiles2(actorCtx.config.prompt))) {
-                    const file = join24(dir, rel);
+                    const file = join23(dir, rel);
                     mkdirSync17(dirname19(file), { recursive: true });
                     writeFileSync15(file, content);
                   }
@@ -25576,12 +25871,12 @@ async function startOasisServer(opts) {
                     const s2 = byId.get(id);
                     return s2 ? `- **${s2.name}** (\`${s2.id}\`): ${s2.description}` : `- \`${id}\`\uFF08\u672A\u5728\u6280\u80FD\u5E93\u4E2D\uFF0C\u53EF\u80FD\u5DF2\u5378\u8F7D\uFF09`;
                   });
-                  writeFileSync15(join24(dir, "SKILLS.md"), ["# \u53EF\u7528\u6280\u80FD", "", "\u4EE5\u4E0B\u6280\u80FD\u5DF2\u4E3A\u4F60\u542F\u7528\uFF0C\u53EF\u5728\u672C\u6B21\u4F1A\u8BDD\u4E2D\u76F4\u63A5\u4F7F\u7528\uFF1A", "", ...lines].join("\n"));
+                  writeFileSync15(join23(dir, "SKILLS.md"), ["# \u53EF\u7528\u6280\u80FD", "", "\u4EE5\u4E0B\u6280\u80FD\u5DF2\u4E3A\u4F60\u542F\u7528\uFF0C\u53EF\u5728\u672C\u6B21\u4F1A\u8BDD\u4E2D\u76F4\u63A5\u4F7F\u7528\uFF1A", "", ...lines].join("\n"));
                 }
                 if (opts.materializeSkills) {
                   const skillFiles = await opts.materializeSkills(body.actorId, "claude").catch(() => ({}));
                   for (const [rel, content] of Object.entries(skillFiles)) {
-                    const file = join24(dir, rel);
+                    const file = join23(dir, rel);
                     mkdirSync17(dirname19(file), { recursive: true });
                     writeFileSync15(file, content);
                   }
@@ -25595,7 +25890,7 @@ async function startOasisServer(opts) {
                     const modeNote = c.mode === "oauth" ? "OAuth \xB7 \u51ED\u8BC1\u7531\u5E73\u53F0\u7BA1\u7406\uFF0C\u901A\u8FC7\u5BF9\u5E94 CLI wrapper \u8C03\u7528" : "\u76F4\u63A5\u5199\u5165 \xB7 \u51ED\u8BC1\u5DF2\u6CE8\u5165\u73AF\u5883\u53D8\u91CF";
                     return `- **${c.name}** (\`${c.id}\`): ${statusNote} \xB7 ${modeNote}`;
                   });
-                  writeFileSync15(join24(dir, "CONNECTORS.md"), ["# \u53EF\u7528\u8FDE\u63A5\u5668", "", "\u4EE5\u4E0B\u8FDE\u63A5\u5668\u5DF2\u4E3A\u672C\u6B21\u4F1A\u8BDD\u914D\u7F6E\uFF0C\u51ED\u8BC1\u5DF2\u901A\u8FC7\u73AF\u5883\u53D8\u91CF\u6216 CLI wrapper \u6CE8\u5165\uFF0C\u65E0\u9700\u624B\u52A8\u914D\u7F6E\uFF1A", "", ...lines].join("\n"));
+                  writeFileSync15(join23(dir, "CONNECTORS.md"), ["# \u53EF\u7528\u8FDE\u63A5\u5668", "", "\u4EE5\u4E0B\u8FDE\u63A5\u5668\u5DF2\u4E3A\u672C\u6B21\u4F1A\u8BDD\u914D\u7F6E\uFF0C\u51ED\u8BC1\u5DF2\u901A\u8FC7\u73AF\u5883\u53D8\u91CF\u6216 CLI wrapper \u6CE8\u5165\uFF0C\u65E0\u9700\u624B\u52A8\u914D\u7F6E\uFF1A", "", ...lines].join("\n"));
                 }
                 spawnCwd = dir;
               }
@@ -26037,16 +26332,16 @@ function createTokenIssuer(opts = {}) {
 function createNodeTokenStore(file) {
   const read = () => {
     try {
-      return JSON.parse(fs3.readFileSync(file, "utf8"));
+      return JSON.parse(fs4.readFileSync(file, "utf8"));
     } catch {
       return {};
     }
   };
-  const write = (table) => fs3.writeFileSync(file, JSON.stringify(table, null, 2), { mode: 384 });
+  const write = (table) => fs4.writeFileSync(file, JSON.stringify(table, null, 2), { mode: 384 });
   return {
     issue(nodeId) {
       const table = read();
-      const token = `ont_${(0, import_node_crypto4.randomBytes)(24).toString("base64url")}`;
+      const token = `ont_${(0, import_node_crypto3.randomBytes)(24).toString("base64url")}`;
       table[token] = nodeId;
       write(table);
       return token;
@@ -26068,14 +26363,14 @@ function createEnrollTokenStore(defaultTtlMs = 30 * 60 * 1e3, file) {
   const read = () => {
     if (!file) return table;
     try {
-      return new Map(Object.entries(JSON.parse(fs3.readFileSync(file, "utf8"))));
+      return new Map(Object.entries(JSON.parse(fs4.readFileSync(file, "utf8"))));
     } catch {
       return /* @__PURE__ */ new Map();
     }
   };
   const write = (m2) => {
     if (!file) return;
-    fs3.writeFileSync(file, JSON.stringify(Object.fromEntries(m2), null, 2), { mode: 384 });
+    fs4.writeFileSync(file, JSON.stringify(Object.fromEntries(m2), null, 2), { mode: 384 });
   };
   const table = /* @__PURE__ */ new Map();
   const prune = () => {
@@ -26088,7 +26383,7 @@ function createEnrollTokenStore(defaultTtlMs = 30 * 60 * 1e3, file) {
   return {
     issue(name, ttlMs = defaultTtlMs) {
       const m2 = prune();
-      const token = `ent_${(0, import_node_crypto4.randomBytes)(24).toString("base64url")}`;
+      const token = `ent_${(0, import_node_crypto3.randomBytes)(24).toString("base64url")}`;
       const expiresAt = Date.now() + ttlMs;
       m2.set(token, { name, expiresAt });
       write(m2);
@@ -26118,33 +26413,33 @@ function createEnrollTokenStore(defaultTtlMs = 30 * 60 * 1e3, file) {
     }
   };
 }
-var import_node_crypto4, fs3, path2, SESSION_TOKEN_PREFIX, b64url, fromB64url, readOrCreateSecret, sign, signatureMatches, isTokenClaims;
+var import_node_crypto3, fs4, path3, SESSION_TOKEN_PREFIX, b64url, fromB64url, readOrCreateSecret, sign, signatureMatches, isTokenClaims;
 var init_tokens = __esm({
   "../server/src/tokens.ts"() {
     "use strict";
-    import_node_crypto4 = require("node:crypto");
-    fs3 = __toESM(require("node:fs"), 1);
-    path2 = __toESM(require("node:path"), 1);
+    import_node_crypto3 = require("node:crypto");
+    fs4 = __toESM(require("node:fs"), 1);
+    path3 = __toESM(require("node:path"), 1);
     SESSION_TOKEN_PREFIX = "oat_v2_";
     b64url = (value) => Buffer.from(value).toString("base64url");
     fromB64url = (value) => Buffer.from(value, "base64url").toString("utf8");
     readOrCreateSecret = (file) => {
-      if (!file) return (0, import_node_crypto4.randomBytes)(32);
+      if (!file) return (0, import_node_crypto3.randomBytes)(32);
       try {
-        const raw = fs3.readFileSync(file, "utf8").trim();
+        const raw = fs4.readFileSync(file, "utf8").trim();
         if (raw) return Buffer.from(raw, "base64url");
       } catch {
       }
-      const secret = (0, import_node_crypto4.randomBytes)(32);
-      fs3.mkdirSync(path2.dirname(file), { recursive: true });
-      fs3.writeFileSync(file, secret.toString("base64url"), { mode: 384 });
+      const secret = (0, import_node_crypto3.randomBytes)(32);
+      fs4.mkdirSync(path3.dirname(file), { recursive: true });
+      fs4.writeFileSync(file, secret.toString("base64url"), { mode: 384 });
       return secret;
     };
-    sign = (secret, payload) => (0, import_node_crypto4.createHmac)("sha256", secret).update(payload).digest("base64url");
+    sign = (secret, payload) => (0, import_node_crypto3.createHmac)("sha256", secret).update(payload).digest("base64url");
     signatureMatches = (actual, expected) => {
       const a = Buffer.from(actual);
       const b2 = Buffer.from(expected);
-      return a.length === b2.length && (0, import_node_crypto4.timingSafeEqual)(a, b2);
+      return a.length === b2.length && (0, import_node_crypto3.timingSafeEqual)(a, b2);
     };
     isTokenClaims = (value) => {
       if (value === null || typeof value !== "object") return false;
@@ -26499,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];
       }
@@ -26992,9 +27296,9 @@ var init_memory_control_plane_store = __esm({
         const c = this.companies.get(id);
         return c ? { ...c } : null;
       }
-      async getCompanyBySlug(slug6) {
+      async getCompanyBySlug(slug4) {
         for (const c of this.companies.values()) {
-          if (c.slug === slug6) return { ...c };
+          if (c.slug === slug4) return { ...c };
         }
         return null;
       }
@@ -27489,8 +27793,8 @@ function namedError(name, message) {
   return err;
 }
 function slugProjectId(name) {
-  const slug6 = name.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-  return `proj_${slug6 || Date.now()}`;
+  const slug4 = name.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+  return `proj_${slug4 || Date.now()}`;
 }
 function runStateKey(workOrderId, nodeId) {
   return `${workOrderId ?? ""}::${nodeId ?? ""}`;
@@ -27920,13 +28224,13 @@ var init_service = __esm({
       async readDocument(contentRef) {
         for (const [projectId, space] of this.spaces) {
           if (!contentRef.startsWith(`${space.rootRef}/`)) continue;
-          const path20 = contentRef.slice(space.rootRef.length + 1);
-          const content = space.files.get(path20);
+          const path19 = contentRef.slice(space.rootRef.length + 1);
+          const content = space.files.get(path19);
           if (content === void 0) return null;
           return {
             contentRef,
             content,
-            url: `https://outline.local/${encodeURIComponent(projectId)}/${path20.split("/").map(encodeURIComponent).join("/")}`
+            url: `https://outline.local/${encodeURIComponent(projectId)}/${path19.split("/").map(encodeURIComponent).join("/")}`
           };
         }
         return null;
@@ -28010,8 +28314,8 @@ var init_service = __esm({
         const space = this.requireSpace(state.projectId);
         const stored = { ...state, payload: { ...state.payload }, updatedAt: state.updatedAt ?? (/* @__PURE__ */ new Date()).toISOString() };
         space.runStates.set(runStateKey(state.workOrderId, state.nodeId), stored);
-        const path20 = `run_state/${state.workOrderId ?? "project"}/${state.nodeId ?? "default"}.json`;
-        space.files.set(path20, JSON.stringify(stored, null, 2));
+        const path19 = `run_state/${state.workOrderId ?? "project"}/${state.nodeId ?? "default"}.json`;
+        space.files.set(path19, JSON.stringify(stored, null, 2));
         return { ...stored, payload: { ...stored.payload } };
       }
       requireSpace(projectId) {
@@ -28711,13 +29015,13 @@ var init_service = __esm({
 });
 
 // ../server/src/dev-store.ts
-var import_node_crypto5, fs4, path3, NdjsonOplogStore, DirBlobStore, MUTATORS, FileTypeRegistryStore, FileRegistryStore, FileProjectStateStore, FileProjectDocumentStore, FileArtifactStateStore, FileTraceStore, MemoryChatSessionStore, FileChatSessionStore;
+var import_node_crypto4, fs5, path4, NdjsonOplogStore, DirBlobStore, MUTATORS, FileTypeRegistryStore, FileRegistryStore, FileProjectStateStore, FileProjectDocumentStore, FileArtifactStateStore, FileTraceStore, MemoryChatSessionStore, FileChatSessionStore;
 var init_dev_store = __esm({
   "../server/src/dev-store.ts"() {
     "use strict";
-    import_node_crypto5 = require("node:crypto");
-    fs4 = __toESM(require("node:fs"), 1);
-    path3 = __toESM(require("node:path"), 1);
+    import_node_crypto4 = require("node:crypto");
+    fs5 = __toESM(require("node:fs"), 1);
+    path4 = __toESM(require("node:path"), 1);
     init_src();
     init_src3();
     init_src3();
@@ -28729,8 +29033,8 @@ var init_dev_store = __esm({
       }
       static async open(file) {
         const memory = new MemoryOplogStore();
-        if (fs4.existsSync(file)) {
-          for (const line of fs4.readFileSync(file, "utf8").split("\n")) {
+        if (fs5.existsSync(file)) {
+          for (const line of fs5.readFileSync(file, "utf8").split("\n")) {
             if (!line.trim()) continue;
             const stored = JSON.parse(line);
             const { artifactId, seq, ...op } = stored;
@@ -28738,15 +29042,15 @@ var init_dev_store = __esm({
             if (assigned !== seq) throw new Error(`corrupt ndjson log: seq mismatch at ${line}`);
           }
         } else {
-          fs4.mkdirSync(path3.dirname(file), { recursive: true });
-          fs4.writeFileSync(file, "");
+          fs5.mkdirSync(path4.dirname(file), { recursive: true });
+          fs5.writeFileSync(file, "");
         }
         return new _NdjsonOplogStore(file, memory);
       }
       async append(artifactId, op, expectedSeq) {
         const seq = await this.memory.append(artifactId, op, expectedSeq);
         const stored = { ...op, artifactId, seq };
-        fs4.appendFileSync(this.file, JSON.stringify(stored) + "\n");
+        fs5.appendFileSync(this.file, JSON.stringify(stored) + "\n");
         return seq;
       }
       read(artifactId, fromSeq) {
@@ -28762,39 +29066,39 @@ var init_dev_store = __esm({
     DirBlobStore = class {
       constructor(dir) {
         this.dir = dir;
-        fs4.mkdirSync(dir, { recursive: true });
+        fs5.mkdirSync(dir, { recursive: true });
       }
       fileOf(hash) {
-        return path3.join(this.dir, hash);
+        return path4.join(this.dir, hash);
       }
       async put(bytes) {
-        const hash = (0, import_node_crypto5.createHash)("sha256").update(bytes).digest("hex");
+        const hash = (0, import_node_crypto4.createHash)("sha256").update(bytes).digest("hex");
         const file = this.fileOf(hash);
-        if (!fs4.existsSync(file)) fs4.writeFileSync(file, bytes);
+        if (!fs5.existsSync(file)) fs5.writeFileSync(file, bytes);
         return hash;
       }
       async meta(hash) {
         const file = this.fileOf(hash);
-        if (!fs4.existsSync(file)) return null;
-        const size = fs4.statSync(file).size;
-        const fd = fs4.openSync(file, "r");
+        if (!fs5.existsSync(file)) return null;
+        const size = fs5.statSync(file).size;
+        const fd = fs5.openSync(file, "r");
         const head = Buffer.alloc(16);
-        fs4.readSync(fd, head, 0, 16, 0);
-        fs4.closeSync(fd);
+        fs5.readSync(fd, head, 0, 16, 0);
+        fs5.closeSync(fd);
         const contentType = sniffContentType(new Uint8Array(head));
         return { size, ...contentType ? { contentType } : {} };
       }
       async get(hash) {
         const file = this.fileOf(hash);
-        if (!fs4.existsSync(file)) throw new BlobNotFoundError(hash);
-        return new Uint8Array(fs4.readFileSync(file));
+        if (!fs5.existsSync(file)) throw new BlobNotFoundError(hash);
+        return new Uint8Array(fs5.readFileSync(file));
       }
       async has(hash) {
-        return fs4.existsSync(this.fileOf(hash));
+        return fs5.existsSync(this.fileOf(hash));
       }
       async sweep(reachable) {
-        for (const name of fs4.readdirSync(this.dir)) {
-          if (!reachable.has(name)) fs4.unlinkSync(this.fileOf(name));
+        for (const name of fs5.readdirSync(this.dir)) {
+          if (!reachable.has(name)) fs5.unlinkSync(this.fileOf(name));
         }
       }
     };
@@ -28822,7 +29126,7 @@ var init_dev_store = __esm({
         this.file = file;
       }
       static async open(file) {
-        const seed = fs4.existsSync(file) ? JSON.parse(fs4.readFileSync(file, "utf8")) : [];
+        const seed = fs5.existsSync(file) ? JSON.parse(fs5.readFileSync(file, "utf8")) : [];
         return new _FileTypeRegistryStore(file, seed);
       }
       async put(def) {
@@ -28835,8 +29139,8 @@ var init_dev_store = __esm({
       }
       async save() {
         const tmp = `${this.file}.tmp`;
-        fs4.writeFileSync(tmp, JSON.stringify(await this.list(), null, 2));
-        fs4.renameSync(tmp, this.file);
+        fs5.writeFileSync(tmp, JSON.stringify(await this.list(), null, 2));
+        fs5.renameSync(tmp, this.file);
       }
     };
     FileRegistryStore = class _FileRegistryStore extends MemoryRegistryStore {
@@ -28854,8 +29158,8 @@ var init_dev_store = __esm({
       }
       static async open(file) {
         const store = new _FileRegistryStore(file);
-        if (fs4.existsSync(file)) {
-          const snap = JSON.parse(fs4.readFileSync(file, "utf8"));
+        if (fs5.existsSync(file)) {
+          const snap = JSON.parse(fs5.readFileSync(file, "utf8"));
           for (const a of snap.actors) await MemoryRegistryStore.prototype.upsertActor.call(store, a);
           for (const c of snap.configs) await MemoryRegistryStore.prototype.appendConfig.call(store, c);
           for (const t of snap.teams) await MemoryRegistryStore.prototype.upsertTeam.call(store, t);
@@ -28896,7 +29200,7 @@ var init_dev_store = __esm({
           skillFiles: skillFilesEntries,
           connections
         };
-        fs4.writeFileSync(this.file, JSON.stringify(snap, null, 2));
+        fs5.writeFileSync(this.file, JSON.stringify(snap, null, 2));
       }
     };
     FileProjectStateStore = class _FileProjectStateStore extends MemoryProjectStateStore {
@@ -28906,8 +29210,8 @@ var init_dev_store = __esm({
       }
       static async open(file) {
         const store = new _FileProjectStateStore(file);
-        if (fs4.existsSync(file)) {
-          const snap = JSON.parse(fs4.readFileSync(file, "utf8"));
+        if (fs5.existsSync(file)) {
+          const snap = JSON.parse(fs5.readFileSync(file, "utf8"));
           for (const project of snap.projects ?? []) await MemoryProjectStateStore.prototype.upsertProject.call(store, project);
           const membersByProject = /* @__PURE__ */ new Map();
           for (const member of snap.members ?? []) {
@@ -28919,8 +29223,8 @@ var init_dev_store = __esm({
             await MemoryProjectStateStore.prototype.replaceProjectMembers.call(store, projectId, members);
           }
         } else {
-          fs4.mkdirSync(path3.dirname(file), { recursive: true });
-          fs4.writeFileSync(file, JSON.stringify({ projects: [], members: [] }, null, 2));
+          fs5.mkdirSync(path4.dirname(file), { recursive: true });
+          fs5.writeFileSync(file, JSON.stringify({ projects: [], members: [] }, null, 2));
         }
         return store;
       }
@@ -28939,7 +29243,7 @@ var init_dev_store = __esm({
       async save() {
         const projects = await this.listProjects();
         const members = (await Promise.all(projects.map((project) => this.listProjectMembers(project.id)))).flat();
-        fs4.writeFileSync(this.file, JSON.stringify({ projects, members }, null, 2));
+        fs5.writeFileSync(this.file, JSON.stringify({ projects, members }, null, 2));
       }
     };
     FileProjectDocumentStore = class _FileProjectDocumentStore extends MemoryProjectDocumentStore {
@@ -28949,8 +29253,8 @@ var init_dev_store = __esm({
       }
       static async open(file) {
         const store = new _FileProjectDocumentStore(file);
-        if (fs4.existsSync(file)) {
-          const snap = JSON.parse(fs4.readFileSync(file, "utf8"));
+        if (fs5.existsSync(file)) {
+          const snap = JSON.parse(fs5.readFileSync(file, "utf8"));
           for (const [projectId, space] of Object.entries(snap.spaces ?? {})) {
             store.spaces.set(projectId, {
               rootRef: space.rootRef,
@@ -28964,8 +29268,8 @@ var init_dev_store = __esm({
             });
           }
         } else {
-          fs4.mkdirSync(path3.dirname(file), { recursive: true });
-          fs4.writeFileSync(file, JSON.stringify({ spaces: {} }, null, 2));
+          fs5.mkdirSync(path4.dirname(file), { recursive: true });
+          fs5.writeFileSync(file, JSON.stringify({ spaces: {} }, null, 2));
         }
         return store;
       }
@@ -28998,7 +29302,7 @@ var init_dev_store = __esm({
             runStates: [...space.runStates.values()]
           };
         }
-        fs4.writeFileSync(this.file, JSON.stringify({ spaces }, null, 2));
+        fs5.writeFileSync(this.file, JSON.stringify({ spaces }, null, 2));
       }
     };
     FileArtifactStateStore = class _FileArtifactStateStore extends MemoryArtifactStateStore {
@@ -29008,8 +29312,8 @@ var init_dev_store = __esm({
       }
       static async open(file) {
         const store = new _FileArtifactStateStore(file);
-        if (fs4.existsSync(file)) {
-          const snap = JSON.parse(fs4.readFileSync(file, "utf8"));
+        if (fs5.existsSync(file)) {
+          const snap = JSON.parse(fs5.readFileSync(file, "utf8"));
           for (const artifact of snap.artifacts ?? []) await MemoryArtifactStateStore.prototype.upsertArtifact.call(store, artifact);
           for (const revision of snap.revisions ?? []) await MemoryArtifactStateStore.prototype.upsertRevision.call(store, revision);
           for (const event of snap.events ?? []) await MemoryArtifactStateStore.prototype.appendEvent.call(store, event);
@@ -29018,8 +29322,8 @@ var init_dev_store = __esm({
           for (const binding of snap.workspaceBindings ?? []) await MemoryArtifactStateStore.prototype.upsertWorkspaceBinding.call(store, binding);
           for (const ws of snap.workspaceDispatchHeld ?? []) await MemoryArtifactStateStore.prototype.setWorkspaceDispatchHold.call(store, ws, true);
         } else {
-          fs4.mkdirSync(path3.dirname(file), { recursive: true });
-          fs4.writeFileSync(file, JSON.stringify({ artifacts: [], revisions: [], events: [], annotations: [], nodeOutputs: [], workspaceBindings: [], workspaceDispatchHeld: [] }, null, 2));
+          fs5.mkdirSync(path4.dirname(file), { recursive: true });
+          fs5.writeFileSync(file, JSON.stringify({ artifacts: [], revisions: [], events: [], annotations: [], nodeOutputs: [], workspaceBindings: [], workspaceDispatchHeld: [] }, null, 2));
         }
         return store;
       }
@@ -29052,7 +29356,7 @@ var init_dev_store = __esm({
         await this.save();
       }
       async save() {
-        fs4.writeFileSync(this.file, JSON.stringify(await this.listAll(), null, 2));
+        fs5.writeFileSync(this.file, JSON.stringify(await this.listAll(), null, 2));
       }
     };
     FileTraceStore = class _FileTraceStore extends MemoryTraceStore {
@@ -29061,39 +29365,39 @@ var init_dev_store = __esm({
         this.dir = dir;
       }
       get runsFile() {
-        return path3.join(this.dir, "runs.ndjson");
+        return path4.join(this.dir, "runs.ndjson");
       }
       get toolCallsFile() {
-        return path3.join(this.dir, "tool-calls.ndjson");
+        return path4.join(this.dir, "tool-calls.ndjson");
       }
       get linksFile() {
-        return path3.join(this.dir, "links.ndjson");
+        return path4.join(this.dir, "links.ndjson");
       }
       get artifactsFile() {
-        return path3.join(this.dir, "artifacts.ndjson");
+        return path4.join(this.dir, "artifacts.ndjson");
       }
       get eventsDir() {
-        return path3.join(this.dir, "events");
+        return path4.join(this.dir, "events");
       }
       eventsFile(runId) {
-        return path3.join(this.eventsDir, `${encodeURIComponent(runId)}.ndjson`);
+        return path4.join(this.eventsDir, `${encodeURIComponent(runId)}.ndjson`);
       }
       appendLine(file, obj) {
-        fs4.appendFileSync(file, JSON.stringify(obj) + "\n");
+        fs5.appendFileSync(file, JSON.stringify(obj) + "\n");
       }
       static replay(file, fn) {
-        if (!fs4.existsSync(file)) return;
-        for (const line of fs4.readFileSync(file, "utf8").split("\n")) {
+        if (!fs5.existsSync(file)) return;
+        for (const line of fs5.readFileSync(file, "utf8").split("\n")) {
           if (!line.trim()) continue;
           fn(JSON.parse(line));
         }
       }
       static async open(dir) {
         const store = new _FileTraceStore(dir);
-        fs4.mkdirSync(store.eventsDir, { recursive: true });
+        fs5.mkdirSync(store.eventsDir, { recursive: true });
         _FileTraceStore.replay(store.runsFile, (r) => store.restoreRun(r));
-        for (const name of fs4.readdirSync(store.eventsDir)) {
-          _FileTraceStore.replay(path3.join(store.eventsDir, name), (e) => store.restoreEvent(e));
+        for (const name of fs5.readdirSync(store.eventsDir)) {
+          _FileTraceStore.replay(path4.join(store.eventsDir, name), (e) => store.restoreEvent(e));
         }
         _FileTraceStore.replay(store.toolCallsFile, (c) => store.restoreToolCall(c));
         _FileTraceStore.replay(store.linksFile, (l) => store.restoreLink(l));
@@ -29196,14 +29500,14 @@ var init_dev_store = __esm({
       }
       static async open(file) {
         const store = new _FileChatSessionStore(file);
-        if (fs4.existsSync(file)) {
-          const snap = JSON.parse(fs4.readFileSync(file, "utf8"));
+        if (fs5.existsSync(file)) {
+          const snap = JSON.parse(fs5.readFileSync(file, "utf8"));
           for (const s2 of snap.sessions ?? []) store.sessions.set(s2.id, s2);
           for (const [sid, list] of Object.entries(snap.messages ?? {})) store.messages.set(sid, list);
           for (const [sid, ids] of Object.entries(snap.sessionWorkOrders ?? {})) store.sessionWorkOrders.set(sid, new Set(ids));
         } else {
-          fs4.mkdirSync(path3.dirname(file), { recursive: true });
-          fs4.writeFileSync(file, JSON.stringify({ sessions: [], messages: {}, sessionWorkOrders: {} }, null, 2));
+          fs5.mkdirSync(path4.dirname(file), { recursive: true });
+          fs5.writeFileSync(file, JSON.stringify({ sessions: [], messages: {}, sessionWorkOrders: {} }, null, 2));
         }
         return store;
       }
@@ -29238,19 +29542,19 @@ var init_dev_store = __esm({
           messages: Object.fromEntries(this.messages),
           sessionWorkOrders: Object.fromEntries([...this.sessionWorkOrders].map(([k2, v2]) => [k2, [...v2]]))
         };
-        fs4.writeFileSync(this.file, JSON.stringify(snap, null, 2));
+        fs5.writeFileSync(this.file, JSON.stringify(snap, null, 2));
       }
     };
   }
 });
 
 // ../server/src/control-plane-file-store.ts
-var fs5, path4, MUTATORS2, FileControlPlaneStore;
+var fs6, path5, MUTATORS2, FileControlPlaneStore;
 var init_control_plane_file_store = __esm({
   "../server/src/control-plane-file-store.ts"() {
     "use strict";
-    fs5 = __toESM(require("node:fs"), 1);
-    path4 = __toESM(require("node:path"), 1);
+    fs6 = __toESM(require("node:fs"), 1);
+    path5 = __toESM(require("node:path"), 1);
     init_src3();
     MUTATORS2 = [
       "createCompany",
@@ -29278,15 +29582,15 @@ var init_control_plane_file_store = __esm({
       }
       static async open(file) {
         const store = new _FileControlPlaneStore(file);
-        if (fs5.existsSync(file)) {
-          const snap = JSON.parse(fs5.readFileSync(file, "utf8"));
+        if (fs6.existsSync(file)) {
+          const snap = JSON.parse(fs6.readFileSync(file, "utf8"));
           for (const c of snap.companies ?? []) await MemoryControlPlaneStore.prototype.createCompany.call(store, c);
           for (const m2 of snap.members ?? []) await MemoryControlPlaneStore.prototype.upsertMember.call(store, m2);
           for (const inv of snap.invitations ?? []) await MemoryControlPlaneStore.prototype.createInvitation.call(store, inv);
           for (const a of snap.accounts ?? []) await MemoryControlPlaneStore.prototype.upsertAccount.call(store, a);
           for (const e of snap.accountSecrets ?? []) store.accountSecrets.set(e.accountId, { ...e.secret });
         } else {
-          fs5.mkdirSync(path4.dirname(file), { recursive: true });
+          fs6.mkdirSync(path5.dirname(file), { recursive: true });
         }
         return store;
       }
@@ -29307,7 +29611,7 @@ var init_control_plane_file_store = __esm({
           accounts,
           accountSecrets
         };
-        fs5.writeFileSync(this.file, JSON.stringify(snap, null, 2));
+        fs6.writeFileSync(this.file, JSON.stringify(snap, null, 2));
       }
     };
   }
@@ -29666,8 +29970,8 @@ var init_recovery_plan = __esm({
 
 // ../server/src/auth/crypto.ts
 function hashPassword(password) {
-  const salt = (0, import_node_crypto6.randomBytes)(16);
-  const dk = (0, import_node_crypto6.scryptSync)(password, salt, SCRYPT_KEYLEN, { N: SCRYPT_N, maxmem: 64 * 1024 * 1024 });
+  const salt = (0, import_node_crypto5.randomBytes)(16);
+  const dk = (0, import_node_crypto5.scryptSync)(password, salt, SCRYPT_KEYLEN, { N: SCRYPT_N, maxmem: 64 * 1024 * 1024 });
   return `scrypt$${SCRYPT_N}$${salt.toString("base64url")}$${dk.toString("base64url")}`;
 }
 function verifyPassword(password, stored) {
@@ -29684,8 +29988,8 @@ function verifyPassword(password, stored) {
     return false;
   }
   if (expected.length === 0) return false;
-  const dk = (0, import_node_crypto6.scryptSync)(password, salt, expected.length, { N, maxmem: 64 * 1024 * 1024 });
-  return dk.length === expected.length && (0, import_node_crypto6.timingSafeEqual)(dk, expected);
+  const dk = (0, import_node_crypto5.scryptSync)(password, salt, expected.length, { N, maxmem: 64 * 1024 * 1024 });
+  return dk.length === expected.length && (0, import_node_crypto5.timingSafeEqual)(dk, expected);
 }
 function b64urlJson(value) {
   return Buffer.from(JSON.stringify(value)).toString("base64url");
@@ -29693,17 +29997,17 @@ function b64urlJson(value) {
 function signSession(claims, secret) {
   const head = b64urlJson({ alg: "HS256", typ: "JWT" });
   const body = b64urlJson(claims);
-  const sig = (0, import_node_crypto6.createHmac)("sha256", secret).update(`${head}.${body}`).digest("base64url");
+  const sig = (0, import_node_crypto5.createHmac)("sha256", secret).update(`${head}.${body}`).digest("base64url");
   return `${head}.${body}.${sig}`;
 }
 function verifySession(token, secret, nowMs) {
   const parts = token.split(".");
   if (parts.length !== 3) return null;
   const [head, body, sig] = parts;
-  const expected = (0, import_node_crypto6.createHmac)("sha256", secret).update(`${head}.${body}`).digest("base64url");
+  const expected = (0, import_node_crypto5.createHmac)("sha256", secret).update(`${head}.${body}`).digest("base64url");
   const got = Buffer.from(sig);
   const exp = Buffer.from(expected);
-  if (got.length !== exp.length || !(0, import_node_crypto6.timingSafeEqual)(got, exp)) return null;
+  if (got.length !== exp.length || !(0, import_node_crypto5.timingSafeEqual)(got, exp)) return null;
   let claims;
   try {
     claims = JSON.parse(Buffer.from(body, "base64url").toString("utf8"));
@@ -29715,21 +30019,21 @@ function verifySession(token, secret, nowMs) {
   return claims;
 }
 function generateCode() {
-  return String((0, import_node_crypto6.randomInt)(0, 1e6)).padStart(6, "0");
+  return String((0, import_node_crypto5.randomInt)(0, 1e6)).padStart(6, "0");
 }
 function hashCode(code, secret) {
-  return (0, import_node_crypto6.createHmac)("sha256", secret).update(`code:${code}`).digest("base64url");
+  return (0, import_node_crypto5.createHmac)("sha256", secret).update(`code:${code}`).digest("base64url");
 }
 function safeEqualHash(a, b2) {
   const ba = Buffer.from(a);
   const bb = Buffer.from(b2);
-  return ba.length === bb.length && (0, import_node_crypto6.timingSafeEqual)(ba, bb);
+  return ba.length === bb.length && (0, import_node_crypto5.timingSafeEqual)(ba, bb);
 }
-var import_node_crypto6, SCRYPT_N, SCRYPT_KEYLEN;
+var import_node_crypto5, SCRYPT_N, SCRYPT_KEYLEN;
 var init_crypto = __esm({
   "../server/src/auth/crypto.ts"() {
     "use strict";
-    import_node_crypto6 = require("node:crypto");
+    import_node_crypto5 = require("node:crypto");
     SCRYPT_N = 16384;
     SCRYPT_KEYLEN = 32;
   }
@@ -29737,11 +30041,11 @@ var init_crypto = __esm({
 
 // ../server/src/file-engine.ts
 async function openFileEngine(dir, seed = {}) {
-  fs6.mkdirSync(dir, { recursive: true });
-  const oplog = await NdjsonOplogStore.open(path5.join(dir, "oplog.ndjson"));
-  const blobs = new DirBlobStore(path5.join(dir, "blobs"));
-  const assets = new DirBlobStore(path5.join(dir, "assets"));
-  const registry2 = await FileRegistryStore.open(path5.join(dir, "registry-store.json"));
+  fs7.mkdirSync(dir, { recursive: true });
+  const oplog = await NdjsonOplogStore.open(path6.join(dir, "oplog.ndjson"));
+  const blobs = new DirBlobStore(path6.join(dir, "blobs"));
+  const assets = new DirBlobStore(path6.join(dir, "assets"));
+  const registry2 = await FileRegistryStore.open(path6.join(dir, "registry-store.json"));
   const kernel = await Kernel.open(oplog, {
     schema: seed.schema ?? [],
     registry: seed.registry ?? [],
@@ -29754,12 +30058,12 @@ async function openFileEngine(dir, seed = {}) {
 function companyEngineDirName(companyId) {
   return companyId.replace(/[^A-Za-z0-9._-]/g, "_");
 }
-var fs6, path5;
+var fs7, path6;
 var init_file_engine = __esm({
   "../server/src/file-engine.ts"() {
     "use strict";
-    fs6 = __toESM(require("node:fs"), 1);
-    path5 = __toESM(require("node:path"), 1);
+    fs7 = __toESM(require("node:fs"), 1);
+    path6 = __toESM(require("node:path"), 1);
     init_src2();
     init_dev_store();
   }
@@ -32013,7 +32317,7 @@ var require_websocket = __commonJS({
     var http2 = require("http");
     var net = require("net");
     var tls = require("tls");
-    var { randomBytes: randomBytes5, createHash: createHash12 } = require("crypto");
+    var { randomBytes: randomBytes5, createHash: createHash11 } = require("crypto");
     var { Duplex, Readable } = require("stream");
     var { URL: URL2 } = require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -32681,7 +32985,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash12("sha1").update(key + GUID).digest("base64");
+        const digest = createHash11("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -33050,7 +33354,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter = require("events");
     var http2 = require("http");
     var { Duplex } = require("stream");
-    var { createHash: createHash12 } = require("crypto");
+    var { createHash: createHash11 } = require("crypto");
     var extension2 = require_extension();
     var PerMessageDeflate2 = require_permessage_deflate();
     var subprotocol2 = require_subprotocol();
@@ -33357,7 +33661,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash12("sha1").update(key + GUID).digest("base64");
+        const digest = createHash11("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -33501,12 +33805,12 @@ var init_daemon_hub = __esm({
         this.disconnectListeners.add(cb);
         return () => this.disconnectListeners.delete(cb);
       }
-      constructor(server, path20 = "/daemon/ws", resolveNode, opts = {}) {
+      constructor(server, path19 = "/daemon/ws", resolveNode, opts = {}) {
         this.pingIntervalMs = opts.pingIntervalMs ?? 2e4;
         this.silenceTimeoutMs = opts.silenceTimeoutMs ?? 6e4;
         this.wss = new import_websocket_server.default({
           server,
-          path: path20,
+          path: path19,
           ...resolveNode ? {
             verifyClient: (info, cb) => {
               const authHeader = info.req.headers.authorization ?? "";
@@ -33688,11 +33992,11 @@ async function fetchGitHubApi(url) {
 async function fetchFromClawHub(sourceUrl) {
   const parsed = new URL(sourceUrl);
   const parts = parsed.pathname.replace(/^\//, "").split("/").filter(Boolean);
-  const slug6 = parts[parts.length - 1];
-  if (!slug6) throw new Error(`Cannot extract ClawHub slug from URL: ${sourceUrl}`);
+  const slug4 = parts[parts.length - 1];
+  if (!slug4) throw new Error(`Cannot extract ClawHub slug from URL: ${sourceUrl}`);
   const apiBase = "https://clawhub.ai/api/v1";
-  const meta = await fetch(`${apiBase}/skills/${encodeURIComponent(slug6)}`).then((r) => {
-    if (r.status === 404) throw new Error(`Skill not found on ClawHub: ${slug6}`);
+  const meta = await fetch(`${apiBase}/skills/${encodeURIComponent(slug4)}`).then((r) => {
+    if (r.status === 404) throw new Error(`Skill not found on ClawHub: ${slug4}`);
     if (!r.ok) throw new Error(`ClawHub returned ${r.status}`);
     return r.json();
   });
@@ -33700,13 +34004,13 @@ async function fetchFromClawHub(sourceUrl) {
   let latestVersion = (chSkill.tags?.["latest"] ?? meta.latestVersion?.version) || "";
   let filePaths = [];
   if (latestVersion) {
-    const vUrl = `${apiBase}/skills/${encodeURIComponent(slug6)}/versions/${encodeURIComponent(latestVersion)}`;
+    const vUrl = `${apiBase}/skills/${encodeURIComponent(slug4)}/versions/${encodeURIComponent(latestVersion)}`;
     const vMeta = await fetch(vUrl).then((r) => r.ok ? r.json() : null);
     if (vMeta) filePaths = vMeta.version.files.map((f2) => f2.path);
   }
   const bundle = new Bundle();
   for (const fp of filePaths) {
-    let fileUrl = `${apiBase}/skills/${encodeURIComponent(slug6)}/file?path=${encodeURIComponent(fp)}`;
+    let fileUrl = `${apiBase}/skills/${encodeURIComponent(slug4)}/file?path=${encodeURIComponent(fp)}`;
     if (latestVersion) fileUrl += `&version=${encodeURIComponent(latestVersion)}`;
     try {
       const content = await fetchText(fileUrl);
@@ -33717,11 +34021,11 @@ async function fetchFromClawHub(sourceUrl) {
       console.warn(`[skill-fetcher] ClawHub: skipping ${fp}: ${err}`);
     }
   }
-  if (!bundle.files["SKILL.md"]) throw new Error(`ClawHub: SKILL.md missing for ${slug6}`);
+  if (!bundle.files["SKILL.md"]) throw new Error(`ClawHub: SKILL.md missing for ${slug4}`);
   const { name, description } = parseSkillFrontmatter(bundle.files["SKILL.md"]);
   return {
-    id: `claw-${slug6.replace(/[^a-z0-9-]/g, "-")}`,
-    name: name || chSkill.displayName || slug6,
+    id: `claw-${slug4.replace(/[^a-z0-9-]/g, "-")}`,
+    name: name || chSkill.displayName || slug4,
     description: description || chSkill.summary || "",
     files: bundle.files
   };
@@ -33861,13 +34165,13 @@ var init_skill_fetcher = __esm({
       files = {};
       totalBytes = 0;
       fileCount = 0;
-      add(path20, content) {
+      add(path19, content) {
         const bytes = new TextEncoder().encode(content).length;
         if (this.fileCount >= MAX_FILE_COUNT)
           throw new Error(`Import bundle exceeds ${MAX_FILE_COUNT} file limit`);
         if (this.totalBytes + bytes > MAX_TOTAL_BYTES)
           throw new Error(`Import bundle exceeds ${MAX_TOTAL_BYTES} byte limit`);
-        this.files[path20] = content;
+        this.files[path19] = content;
         this.totalBytes += bytes;
         this.fileCount++;
       }
@@ -33884,13 +34188,13 @@ function variableKeyFromEnv(env = process.env) {
     return buf;
   }
   if (env.NODE_ENV === "production") throw new Error("OASIS_VAR_KEY is required in production");
-  return (0, import_node_crypto7.createHash)("sha256").update("oasis-dev-only-variable-key").digest();
+  return (0, import_node_crypto6.createHash)("sha256").update("oasis-dev-only-variable-key").digest();
 }
-var import_node_crypto7, REDACTED_MARKER, ActorsService, mask, changedKeys;
+var import_node_crypto6, REDACTED_MARKER, ActorsService, mask, changedKeys;
 var init_service2 = __esm({
   "../server/src/domains/actors/service.ts"() {
     "use strict";
-    import_node_crypto7 = require("node:crypto");
+    import_node_crypto6 = require("node:crypto");
     init_skill_fetcher();
     init_identity();
     init_feishu_oauth();
@@ -34136,7 +34440,7 @@ ${input.description}
         };
         await this.opts.store.putInstalledSkill(installed);
         const skillFiles = Object.entries(fetched.files).map(
-          ([path20, content]) => this.buildSkillFile(id, path20, content, now)
+          ([path19, content]) => this.buildSkillFile(id, path19, content, now)
         );
         await this.opts.store.putSkillFiles(id, skillFiles);
         await this.audit({ kind: "skill_install", actorId: by, by, at: now, detail: { skillId: id, source: input.sourceKind, sourceUrl } });
@@ -34171,7 +34475,7 @@ ${input.description}
             connectorId
           });
           const skillFiles = Object.entries(entry.files).map(
-            ([path20, content]) => this.buildSkillFile(id, path20, content, now)
+            ([path19, content]) => this.buildSkillFile(id, path19, content, now)
           );
           await this.opts.store.putSkillFiles(id, skillFiles);
         }
@@ -34189,25 +34493,25 @@ ${input.description}
        * 构造 SkillFile：正文内联进 content（决策 0036）；blobHash/size 计算为 content 的 sha256
        * 与字节数，仅作元数据/审计（不再有读取方，正文直接从 content 出）。
        */
-      buildSkillFile(skillId, path20, content, now) {
+      buildSkillFile(skillId, path19, content, now) {
         const bytes = new TextEncoder().encode(content);
-        const blobHash = (0, import_node_crypto7.createHash)("sha256").update(bytes).digest("hex");
-        return { skillId, path: path20, content, blobHash, size: bytes.length, updatedAt: now };
+        const blobHash = (0, import_node_crypto6.createHash)("sha256").update(bytes).digest("hex");
+        return { skillId, path: path19, content, blobHash, size: bytes.length, updatedAt: now };
       }
       /**
        * 更新或新建技能的单个文件。
        * 正文内联进 skill_files（决策 0036），更新文件索引，但**不**改写技能的 name/description——
        * 如果修改的是 SKILL.md，调用方应另外调用 updateInstalledSkill 同步 frontmatter。
        */
-      async putSkillFile(skillId, path20, content) {
+      async putSkillFile(skillId, path19, content) {
         const cur = (await this.opts.store.listInstalledSkills()).find((x2) => x2.id === skillId);
         if (!cur) throw new Error(`\u672A\u5B89\u88C5\u8BE5\u6280\u80FD\uFF1A${skillId}`);
         const now = this.now();
-        const file = this.buildSkillFile(skillId, path20, content, now);
+        const file = this.buildSkillFile(skillId, path19, content, now);
         const existing = await this.opts.store.listSkillFiles(skillId);
-        const next = [...existing.filter((f2) => f2.path !== path20), file];
+        const next = [...existing.filter((f2) => f2.path !== path19), file];
         await this.opts.store.putSkillFiles(skillId, next);
-        if (path20 === "SKILL.md") {
+        if (path19 === "SKILL.md") {
           const { name, description } = parseSkillFrontmatter(content);
           if (name || description) {
             await this.opts.store.putInstalledSkill({
@@ -34223,11 +34527,11 @@ ${input.description}
        * 删除技能的单个支撑文件（SKILL.md 主文档受保护，调用方应先拦截）。
        * 单文件删除=读现有清单→剔除该 path→整体回写（putSkillFiles 是 replace-all 语义）；blob 残留由 GC 回收。
        */
-      async deleteSkillFile(skillId, path20) {
+      async deleteSkillFile(skillId, path19) {
         const cur = (await this.opts.store.listInstalledSkills()).find((x2) => x2.id === skillId);
         if (!cur) throw new Error(`\u672A\u5B89\u88C5\u8BE5\u6280\u80FD\uFF1A${skillId}`);
         const existing = await this.opts.store.listSkillFiles(skillId);
-        const next = existing.filter((f2) => f2.path !== path20);
+        const next = existing.filter((f2) => f2.path !== path19);
         if (next.length === existing.length) return;
         await this.opts.store.putSkillFiles(skillId, next);
       }
@@ -34525,15 +34829,15 @@ ${input.description}
         return env;
       }
       encrypt(plain) {
-        const iv = (0, import_node_crypto7.randomBytes)(12);
-        const cipher = (0, import_node_crypto7.createCipheriv)("aes-256-gcm", this.opts.variableKey, iv);
+        const iv = (0, import_node_crypto6.randomBytes)(12);
+        const cipher = (0, import_node_crypto6.createCipheriv)("aes-256-gcm", this.opts.variableKey, iv);
         const enc4 = Buffer.concat([cipher.update(plain, "utf8"), cipher.final()]);
         return [iv.toString("base64"), cipher.getAuthTag().toString("base64"), enc4.toString("base64")].join(".");
       }
       decrypt(packed) {
         const [iv, tag, data] = packed.split(".");
         if (!iv || !tag || typeof data !== "string") throw new Error("malformed ciphertext");
-        const decipher = (0, import_node_crypto7.createDecipheriv)("aes-256-gcm", this.opts.variableKey, Buffer.from(iv, "base64"));
+        const decipher = (0, import_node_crypto6.createDecipheriv)("aes-256-gcm", this.opts.variableKey, Buffer.from(iv, "base64"));
         decipher.setAuthTag(Buffer.from(tag, "base64"));
         return Buffer.concat([decipher.update(Buffer.from(data, "base64")), decipher.final()]).toString("utf8");
       }
@@ -35067,7 +35371,7 @@ async function listSkillMetadataForActor(args) {
     usedDirs.add(dir);
     const sorted = [...metas].sort((a, b2) => a.path.localeCompare(b2.path));
     let latest = "1970-01-01T00:00:00.000Z";
-    const hasher = (0, import_node_crypto8.createHash)("sha256");
+    const hasher = (0, import_node_crypto7.createHash)("sha256");
     for (const m2 of sorted) {
       if (m2.updatedAt > latest) latest = m2.updatedAt;
       hasher.update(m2.path);
@@ -35090,11 +35394,11 @@ async function listSkillMetadataForActor(args) {
     const dir = sanitizeSkillDir(b2.name || b2.id);
     if (usedDirs.has(dir)) continue;
     usedDirs.add(dir);
-    const hasher = (0, import_node_crypto8.createHash)("sha256");
+    const hasher = (0, import_node_crypto7.createHash)("sha256");
     for (const p2 of paths) {
       hasher.update(p2);
       hasher.update("\0");
-      hasher.update((0, import_node_crypto8.createHash)("sha256").update(b2.files[p2]).digest("hex"));
+      hasher.update((0, import_node_crypto7.createHash)("sha256").update(b2.files[p2]).digest("hex"));
       hasher.update("\0");
     }
     out.push({
@@ -35110,11 +35414,11 @@ async function listSkillMetadataForActor(args) {
   return out;
 }
 function builtinSkillToFiles(b2) {
-  return Object.entries(b2.files ?? {}).map(([path20, content]) => ({
+  return Object.entries(b2.files ?? {}).map(([path19, content]) => ({
     skillId: `builtin:${b2.id}`,
-    path: path20,
+    path: path19,
     content,
-    blobHash: (0, import_node_crypto8.createHash)("sha256").update(content).digest("hex"),
+    blobHash: (0, import_node_crypto7.createHash)("sha256").update(content).digest("hex"),
     size: Buffer.byteLength(content, "utf8"),
     updatedAt: "1970-01-01T00:00:00.000Z"
   }));
@@ -35124,6 +35428,10 @@ function skillsDirForRuntime(runtimeKind) {
     case "claude":
     case "claude-code":
       return ".claude/skills";
+    case "codex":
+      return ".codex/skills";
+    case "cursor":
+      return ".cursor/skills";
     default:
       return ".agent_context/skills";
   }
@@ -35158,11 +35466,11 @@ async function materializeSkillFiles(args) {
   }
   return out;
 }
-var import_node_crypto8;
+var import_node_crypto7;
 var init_skill_materializer = __esm({
   "../server/src/domains/actors/skill-materializer.ts"() {
     "use strict";
-    import_node_crypto8 = require("node:crypto");
+    import_node_crypto7 = require("node:crypto");
   }
 });
 
@@ -35652,7 +35960,7 @@ function createActorsDomain(opts) {
     ...kernel !== void 0 ? { onRolesChanged: (a, r) => kernel.setActorRoles(a, r) } : {},
     audit: async (entry) => {
       await opts.audit?.({
-        id: `reg_${(0, import_node_crypto9.randomUUID)()}`,
+        id: `reg_${(0, import_node_crypto8.randomUUID)()}`,
         actor: entry.by,
         kind: "registry_change",
         target: entry.actorId,
@@ -35687,11 +35995,11 @@ function createActorsDomain(opts) {
     register: actorsDomain({ resolveCtx, ...opts.trace ? { trace: opts.trace } : {}, ...opts.listBuiltinSkills ? { listBuiltinSkills: opts.listBuiltinSkills } : {}, ...opts.getBuiltinSkills ? { getBuiltinSkills: opts.getBuiltinSkills } : {} })
   };
 }
-var import_node_crypto9;
+var import_node_crypto8;
 var init_actors = __esm({
   "../server/src/domains/actors/index.ts"() {
     "use strict";
-    import_node_crypto9 = require("node:crypto");
+    import_node_crypto8 = require("node:crypto");
     init_service2();
     init_routes();
     init_service2();
@@ -36524,11 +36832,11 @@ var init_projects = __esm({
 });
 
 // ../server/src/domains/companies/service.ts
-var import_node_crypto10, ROLES, INVITABLE_ROLES, INVITATION_TTL_MS, SLUG_RE, CompanyError, CompaniesService;
+var import_node_crypto9, ROLES, INVITABLE_ROLES, INVITATION_TTL_MS, SLUG_RE, CompanyError, CompaniesService;
 var init_service3 = __esm({
   "../server/src/domains/companies/service.ts"() {
     "use strict";
-    import_node_crypto10 = require("node:crypto");
+    import_node_crypto9 = require("node:crypto");
     ROLES = ["owner", "admin", "member"];
     INVITABLE_ROLES = ["admin", "member"];
     INVITATION_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
@@ -36580,7 +36888,7 @@ var init_service3 = __esm({
         const existing = await this.store.getAccountByEmail(normalized);
         if (existing) return existing;
         const account = {
-          id: `actor:human:${(0, import_node_crypto10.randomUUID)()}`,
+          id: `actor:human:${(0, import_node_crypto9.randomUUID)()}`,
           email: normalized,
           name: name ?? normalized,
           status: "active"
@@ -36625,14 +36933,14 @@ var init_service3 = __esm({
       }
       /** 新建公司：校验 slug、生成 id=company:<slug>、把创建者设为 owner。 */
       async create(input, creatorAccountId) {
-        const slug6 = input.slug?.trim() ?? "";
-        if (!SLUG_RE.test(slug6)) throw new CompanyError(400, "BAD_SLUG", "slug \u987B\u4E3A URL \u5B89\u5168\u7684\u5C0F\u5199\u4E32\uFF08^[a-z][a-z0-9-]*$\uFF09");
+        const slug4 = input.slug?.trim() ?? "";
+        if (!SLUG_RE.test(slug4)) throw new CompanyError(400, "BAD_SLUG", "slug \u987B\u4E3A URL \u5B89\u5168\u7684\u5C0F\u5199\u4E32\uFF08^[a-z][a-z0-9-]*$\uFF09");
         const name = input.name?.trim() ?? "";
         if (!name) throw new CompanyError(400, "BAD_REQUEST", "\u7F3A\u5C11 name");
-        if (await this.store.getCompanyBySlug(slug6)) throw new CompanyError(409, "SLUG_TAKEN", `slug \u5DF2\u88AB\u5360\u7528\uFF1A${slug6}`);
+        if (await this.store.getCompanyBySlug(slug4)) throw new CompanyError(409, "SLUG_TAKEN", `slug \u5DF2\u88AB\u5360\u7528\uFF1A${slug4}`);
         const company = {
-          id: `company:${slug6}`,
-          slug: slug6,
+          id: `company:${slug4}`,
+          slug: slug4,
           name,
           status: "active",
           createdAt: this.now(),
@@ -36704,7 +37012,7 @@ var init_service3 = __esm({
         }
         const nowMs = Date.parse(this.now());
         const invitation = {
-          id: `invitation:${(0, import_node_crypto10.randomUUID)()}`,
+          id: `invitation:${(0, import_node_crypto9.randomUUID)()}`,
           companyId,
           email: mail,
           role,
@@ -36862,9 +37170,9 @@ var init_routes3 = __esm({
 
 // ../server/src/domains/companies/migrate.ts
 function resolveDefaultCompanyConfig(env = process.env) {
-  const slug6 = env["OASIS_DEFAULT_COMPANY_SLUG"]?.trim() || "oasis";
+  const slug4 = env["OASIS_DEFAULT_COMPANY_SLUG"]?.trim() || "oasis";
   const name = env["OASIS_DEFAULT_COMPANY_NAME"]?.trim() || "Oasis \u603B\u90E8";
-  return { id: `company:${slug6}`, slug: slug6, name };
+  return { id: `company:${slug4}`, slug: slug4, name };
 }
 async function migrateDefaultCompany(store, actors, opts = {}) {
   const now = opts.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
@@ -37188,7 +37496,7 @@ var init_sender = __esm({
 function deriveBoardKey(artifactId) {
   const tail = artifactId.split(":").pop() ?? artifactId;
   const ascii = tail.replace(/[^a-zA-Z0-9-]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 24);
-  const sha8 = (0, import_node_crypto11.createHash)("sha256").update(artifactId).digest("hex").slice(0, 8);
+  const sha8 = (0, import_node_crypto10.createHash)("sha256").update(artifactId).digest("hex").slice(0, 8);
   return ascii ? `od-${ascii}-${sha8}` : `od-${sha8}`;
 }
 async function odApi(base, fetchImpl, method, p2, body) {
@@ -37221,13 +37529,13 @@ async function ensureProject(base, fetchImpl, boardKey, title) {
 }
 function materializeContext(resolvedDir, files) {
   if (!resolvedDir) return;
-  fs7.mkdirSync(resolvedDir, { recursive: true });
-  const root = path6.join(resolvedDir, "task-context");
-  fs7.rmSync(root, { recursive: true, force: true });
+  fs8.mkdirSync(resolvedDir, { recursive: true });
+  const root = path7.join(resolvedDir, "task-context");
+  fs8.rmSync(root, { recursive: true, force: true });
   for (const [rel, content] of Object.entries(files)) {
-    const f2 = path6.join(root, rel);
-    fs7.mkdirSync(path6.dirname(f2), { recursive: true });
-    fs7.writeFileSync(f2, content);
+    const f2 = path7.join(root, rel);
+    fs8.mkdirSync(path7.dirname(f2), { recursive: true });
+    fs8.writeFileSync(f2, content);
   }
 }
 async function startDesignRun(base, fetchImpl, args) {
@@ -37235,8 +37543,8 @@ async function startDesignRun(base, fetchImpl, args) {
     agentId: args.agentId,
     projectId: args.boardKey,
     conversationId: args.conversationId,
-    assistantMessageId: (0, import_node_crypto11.randomUUID)(),
-    clientRequestId: (0, import_node_crypto11.randomUUID)(),
+    assistantMessageId: (0, import_node_crypto10.randomUUID)(),
+    clientRequestId: (0, import_node_crypto10.randomUUID)(),
     message: args.message,
     systemPrompt: args.systemPrompt
   });
@@ -37289,23 +37597,23 @@ async function harvestBoard(base, fetchImpl, publicBase, workRoot, boardKey, run
   const htmls = (listing.files ?? []).filter((f2) => f2.kind === "html" && !f2.path.startsWith("task-context/")).filter((f2) => (f2.artifactManifest?.status ?? "complete") === "complete").sort((a, b2) => (b2.mtime ?? 0) - (a.mtime ?? 0));
   const entry = htmls[0]?.path;
   if (!entry) throw new Error("\u753B\u677F\u9879\u76EE\u65E0\u5DF2\u5B8C\u6210\u7684 HTML \u5165\u53E3\u7A3F\u2014\u2014\u8BBE\u8BA1\u4F1A\u8BDD\u672A\u4EA7\u51FA\u53EF\u4EA4\u4ED8\u754C\u9762");
-  const dir = fs7.mkdtempSync(path6.join(workRoot, "od-deliverable-"));
+  const dir = fs8.mkdtempSync(path7.join(workRoot, "od-deliverable-"));
   const fetchInline = async (rel) => {
     const res = await fetchImpl(`${base}/api/projects/${encodeURIComponent(boardKey)}/export/${encodeURIComponent(rel)}?inline=1`);
     if (!res.ok) throw new Error(`od export ${rel} \u2192 ${res.status}`);
     return await res.text();
   };
-  fs7.writeFileSync(path6.join(dir, "index.html"), await fetchInline(entry));
+  fs8.writeFileSync(path7.join(dir, "index.html"), await fetchInline(entry));
   for (const f2 of listing.files ?? []) {
     if (f2.path.endsWith(".md") && !f2.path.includes("/")) {
       try {
-        fs7.writeFileSync(path6.join(dir, f2.path), await fetchInline(f2.path));
+        fs8.writeFileSync(path7.join(dir, f2.path), await fetchInline(f2.path));
       } catch {
       }
     }
   }
-  fs7.writeFileSync(
-    path6.join(dir, "board.link"),
+  fs8.writeFileSync(
+    path7.join(dir, "board.link"),
     `${publicBase}/projects/${boardKey}
 \u5165\u53E3\u7A3F\uFF1A${entry}
 \u5FEB\u7167\u6765\u6E90 run\uFF1A${runId}
@@ -37338,14 +37646,14 @@ async function runOpenDesignSession(opts) {
   const { dir, entry } = await harvestBoard(opts.base, fetchImpl, opts.publicBase, workRoot, boardKey, runId);
   return { dir, entry, boardKey, runId };
 }
-var import_node_crypto11, fs7, os, path6;
+var import_node_crypto10, fs8, os, path7;
 var init_driver = __esm({
   "../adapters/src/open-design/driver.ts"() {
     "use strict";
-    import_node_crypto11 = require("node:crypto");
-    fs7 = __toESM(require("node:fs"), 1);
+    import_node_crypto10 = require("node:crypto");
+    fs8 = __toESM(require("node:fs"), 1);
     os = __toESM(require("node:os"), 1);
-    path6 = __toESM(require("node:path"), 1);
+    path7 = __toESM(require("node:path"), 1);
   }
 });
 
@@ -37471,26 +37779,26 @@ function classifyExit(result) {
   return void 0;
 }
 function conversationExists(sessionId) {
-  const configDir = process.env["CLAUDE_CONFIG_DIR"] || path7.join(os2.homedir(), ".claude");
-  const projectsDir = path7.join(configDir, "projects");
+  const configDir = process.env["CLAUDE_CONFIG_DIR"] || path8.join(os2.homedir(), ".claude");
+  const projectsDir = path8.join(configDir, "projects");
   const target = `${sessionId}.jsonl`;
   try {
-    for (const proj of fs8.readdirSync(projectsDir)) {
-      if (fs8.existsSync(path7.join(projectsDir, proj, target))) return true;
+    for (const proj of fs9.readdirSync(projectsDir)) {
+      if (fs9.existsSync(path8.join(projectsDir, proj, target))) return true;
     }
   } catch {
   }
   return false;
 }
-var import_node_child_process3, import_node_crypto12, fs8, os2, path7, readline, ClaudeCodeAdapter;
+var import_node_child_process4, import_node_crypto11, fs9, os2, path8, readline, ClaudeCodeAdapter;
 var init_claude_code = __esm({
   "../adapters/src/claude-code/index.ts"() {
     "use strict";
-    import_node_child_process3 = require("node:child_process");
-    import_node_crypto12 = require("node:crypto");
-    fs8 = __toESM(require("node:fs"), 1);
+    import_node_child_process4 = require("node:child_process");
+    import_node_crypto11 = require("node:crypto");
+    fs9 = __toESM(require("node:fs"), 1);
     os2 = __toESM(require("node:os"), 1);
-    path7 = __toESM(require("node:path"), 1);
+    path8 = __toESM(require("node:path"), 1);
     readline = __toESM(require("node:readline"), 1);
     init_sync_skills();
     ClaudeCodeAdapter = class {
@@ -37519,10 +37827,10 @@ var init_claude_code = __esm({
         };
       }
       async spawn(job) {
-        const slug6 = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
-        const id = `claude-${slug6}-${(0, import_node_crypto12.randomUUID)().slice(0, 8)}`;
-        const dir = job.runtimeSessionId ? path7.join(this.opts.workRoot ?? os2.tmpdir(), "oasis-chat-sessions", job.runtimeSessionId.replace(/[^a-zA-Z0-9_-]+/g, "_")) : fs8.mkdtempSync(path7.join(this.opts.workRoot ?? os2.tmpdir(), "oasis-session-"));
-        fs8.mkdirSync(dir, { recursive: true });
+        const slug4 = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
+        const id = `claude-${slug4}-${(0, import_node_crypto11.randomUUID)().slice(0, 8)}`;
+        const dir = job.runtimeSessionId ? path8.join(this.opts.workRoot ?? os2.tmpdir(), "oasis-chat-sessions", job.runtimeSessionId.replace(/[^a-zA-Z0-9_-]+/g, "_")) : fs9.mkdtempSync(path8.join(this.opts.workRoot ?? os2.tmpdir(), "oasis-session-"));
+        fs9.mkdirSync(dir, { recursive: true });
         await runSyncSkills(this.opts.syncSkills, {
           actorId: job.actor,
           actorToken: job.actorToken,
@@ -37531,14 +37839,14 @@ var init_claude_code = __esm({
           sessionDir: dir
         });
         for (const [rel, content] of Object.entries(job.bundle.files)) {
-          const file = path7.join(dir, rel);
-          fs8.mkdirSync(path7.dirname(file), { recursive: true });
-          fs8.writeFileSync(file, content);
+          const file = path8.join(dir, rel);
+          fs9.mkdirSync(path8.dirname(file), { recursive: true });
+          fs9.writeFileSync(file, content);
         }
         for (const [rel, b64] of Object.entries(job.bundle.binaryFiles ?? {})) {
-          const file = path7.join(dir, rel);
-          fs8.mkdirSync(path7.dirname(file), { recursive: true });
-          fs8.writeFileSync(file, Buffer.from(b64, "base64"));
+          const file = path8.join(dir, rel);
+          fs9.mkdirSync(path8.dirname(file), { recursive: true });
+          fs9.writeFileSync(file, Buffer.from(b64, "base64"));
         }
         const prompt = job.bundle.files["TASK.md"];
         if (!prompt) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
@@ -37559,7 +37867,7 @@ var init_claude_code = __esm({
           ...this.opts.extraArgs ?? []
         ];
         const otelEnv = this.resolveOtelEnv(job, id);
-        const child = (0, import_node_child_process3.spawn)(this.opts.claudeBin ?? "claude", args, {
+        const child = (0, import_node_child_process4.spawn)(this.opts.claudeBin ?? "claude", args, {
           cwd: dir,
           env: {
             // 凭证泄漏防护：剔除 pnpm/npm 脚本注入的变量——npm_lifecycle_script 等会把 serve 的启动命令
@@ -37570,7 +37878,7 @@ var init_claude_code = __esm({
             ...job.env,
             // BUG-4 缓冲：抬高单响应输出 token 上限（临时缓冲，根治靠分解）
             ...this.opts.maxOutputTokens ? { CLAUDE_CODE_MAX_OUTPUT_TOKENS: String(this.opts.maxOutputTokens) } : {},
-            ...job.wrapperPaths?.length ? { PATH: `${job.wrapperPaths.map((p2) => path7.dirname(p2)).join(path7.delimiter)}${path7.delimiter}${job.env?.["PATH"] ?? process.env["PATH"] ?? ""}` } : {},
+            ...job.wrapperPaths?.length ? { PATH: `${job.wrapperPaths.map((p2) => path8.dirname(p2)).join(path8.delimiter)}${path8.delimiter}${job.env?.["PATH"] ?? process.env["PATH"] ?? ""}` } : {},
             OASIS_SERVER: job.server.url,
             OASIS_TOKEN: job.actorToken,
             // OTel 遥测（默认关；resolveOtelEnv 决定开不开，runId 进 resource 属性自然归位到本次 run）。
@@ -37582,8 +37890,8 @@ var init_claude_code = __esm({
         });
         if (promptViaStdin) child.stdin.write(prompt);
         child.stdin.end();
-        let transcriptRef = path7.join(dir, "transcript.txt");
-        const out = fs8.createWriteStream(transcriptRef);
+        let transcriptRef = path8.join(dir, "transcript.txt");
+        const out = fs9.createWriteStream(transcriptRef);
         const telemetryCbs = [];
         let eventSeq = 0;
         let lastResult;
@@ -37669,14 +37977,14 @@ var init_claude_code = __esm({
           const reason = killedByUs ? "timeout" : classifyExit(lastResult);
           if (this.opts.cleanupWorkdir && !job.runtimeSessionId) {
             try {
-              const keepDir = path7.join(this.opts.workRoot ?? os2.tmpdir(), "oasis-transcripts");
-              fs8.mkdirSync(keepDir, { recursive: true });
-              const kept = path7.join(keepDir, `${id}.txt`);
+              const keepDir = path8.join(this.opts.workRoot ?? os2.tmpdir(), "oasis-transcripts");
+              fs9.mkdirSync(keepDir, { recursive: true });
+              const kept = path8.join(keepDir, `${id}.txt`);
               const src = transcriptRef;
               out.end(() => {
                 try {
-                  fs8.renameSync(src, kept);
-                  fs8.rmSync(dir, { recursive: true, force: true });
+                  fs9.renameSync(src, kept);
+                  fs9.rmSync(dir, { recursive: true, force: true });
                 } catch {
                 }
               });
@@ -37872,10 +38180,20 @@ var init_resilient = __esm({
 
 // ../adapters/src/_core/skill-cache.ts
 function defaultCacheRoot() {
-  return path8.join(os3.homedir(), ".oasis", "skill-cache");
+  return path9.join(os3.homedir(), ".oasis", "skill-cache");
 }
 function sessionSkillsSubdir(runtimeKind) {
-  return runtimeKind === "claude" || runtimeKind === "claude-code" ? ".claude/skills" : ".agent_context/skills";
+  switch (runtimeKind) {
+    case "claude":
+    case "claude-code":
+      return ".claude/skills";
+    case "codex":
+      return ".codex/skills";
+    case "cursor":
+      return ".cursor/skills";
+    default:
+      return ".agent_context/skills";
+  }
 }
 async function syncActorSkills(opts) {
   const cacheRoot = opts.cacheRoot ?? defaultCacheRoot();
@@ -37883,7 +38201,7 @@ async function syncActorSkills(opts) {
   });
   const now = opts.now ?? (() => /* @__PURE__ */ new Date());
   const actorDir = pathForActor(cacheRoot, opts.actorId);
-  const manifestPath = path8.join(actorDir, "manifest.json");
+  const manifestPath = path9.join(actorDir, "manifest.json");
   await fsp.mkdir(actorDir, { recursive: true, mode: 493 });
   const release = await acquireLock(cacheRoot, opts.actorId, now, log3);
   try {
@@ -37901,7 +38219,7 @@ async function syncActorSkills(opts) {
       const cloudIds = new Set(cloudMetadata.map((s2) => s2.id));
       for (const cloud of cloudMetadata) {
         const cached2 = manifest.skills[cloud.id];
-        const skillDir = path8.join(actorDir, cloud.dir);
+        const skillDir = path9.join(actorDir, cloud.dir);
         const inSync = cached2 && cached2.dir === cloud.dir && cached2.contentHash === cloud.contentHash && cached2.cloudUpdatedAt === cloud.updatedAt && await dirLooksValid(skillDir, cached2.fileList);
         if (inSync) {
           skipped += 1;
@@ -37929,7 +38247,7 @@ async function syncActorSkills(opts) {
       for (const [id, entry] of Object.entries(manifest.skills)) {
         if (cloudIds.has(id)) continue;
         try {
-          await fsp.rm(path8.join(actorDir, entry.dir), { recursive: true, force: true });
+          await fsp.rm(path9.join(actorDir, entry.dir), { recursive: true, force: true });
         } catch (err) {
           log3("warn", `\u5220\u9664\u5B64\u513F\u6280\u80FD\u76EE\u5F55\u5931\u8D25 ${entry.dir}`, err);
         }
@@ -37946,14 +38264,14 @@ async function syncActorSkills(opts) {
   }
 }
 function pathForActor(cacheRoot, actorId) {
-  return path8.join(cacheRoot, "actors", encodeURIComponent(actorId));
+  return path9.join(cacheRoot, "actors", encodeURIComponent(actorId));
 }
 function lockPathFor(cacheRoot, actorId) {
-  return path8.join(cacheRoot, "locks", `${encodeURIComponent(actorId)}.lock`);
+  return path9.join(cacheRoot, "locks", `${encodeURIComponent(actorId)}.lock`);
 }
 async function acquireLock(cacheRoot, actorId, now, log3) {
   const lockPath = lockPathFor(cacheRoot, actorId);
-  await fsp.mkdir(path8.dirname(lockPath), { recursive: true, mode: 493 });
+  await fsp.mkdir(path9.dirname(lockPath), { recursive: true, mode: 493 });
   const started = now().getTime();
   while (true) {
     try {
@@ -38019,26 +38337,26 @@ async function readManifest2(manifestPath, actorId, log3) {
   };
 }
 async function writeManifest(manifestPath, manifest) {
-  const dir = path8.dirname(manifestPath);
+  const dir = path9.dirname(manifestPath);
   await fsp.mkdir(dir, { recursive: true });
   const tmp = `${manifestPath}.${process.pid}.${Date.now()}.tmp`;
   await fsp.writeFile(tmp, JSON.stringify(manifest, null, 2), { mode: 420 });
   await fsp.rename(tmp, manifestPath);
 }
 async function materializeSkillDir(actorDir, targetDir, files, previousDir) {
-  const targetPath = path8.join(actorDir, targetDir);
-  const tmpPath = path8.join(actorDir, `${targetDir}.new.${process.pid}.${Date.now()}`);
-  const oldBackup = path8.join(actorDir, `${targetDir}.old.${process.pid}.${Date.now()}`);
+  const targetPath = path9.join(actorDir, targetDir);
+  const tmpPath = path9.join(actorDir, `${targetDir}.new.${process.pid}.${Date.now()}`);
+  const oldBackup = path9.join(actorDir, `${targetDir}.old.${process.pid}.${Date.now()}`);
   await fsp.rm(tmpPath, { recursive: true, force: true });
   await fsp.mkdir(tmpPath, { recursive: true, mode: 493 });
   for (const f2 of files) {
     if (!f2.content) continue;
-    const dest = path8.join(tmpPath, f2.path);
-    const rel = path8.relative(tmpPath, dest);
-    if (rel.startsWith("..") || path8.isAbsolute(rel)) {
+    const dest = path9.join(tmpPath, f2.path);
+    const rel = path9.relative(tmpPath, dest);
+    if (rel.startsWith("..") || path9.isAbsolute(rel)) {
       throw new Error(`SkillFile.path \u4E0D\u5408\u6CD5: ${f2.path}`);
     }
-    await fsp.mkdir(path8.dirname(dest), { recursive: true });
+    await fsp.mkdir(path9.dirname(dest), { recursive: true });
     await fsp.writeFile(dest, f2.content, { mode: 420 });
   }
   let hadOld = false;
@@ -38052,14 +38370,14 @@ async function materializeSkillDir(actorDir, targetDir, files, previousDir) {
   await fsp.rename(tmpPath, targetPath);
   if (hadOld) await fsp.rm(oldBackup, { recursive: true, force: true });
   if (previousDir && previousDir !== targetDir) {
-    await fsp.rm(path8.join(actorDir, previousDir), { recursive: true, force: true });
+    await fsp.rm(path9.join(actorDir, previousDir), { recursive: true, force: true });
   }
 }
 async function dirLooksValid(dir, expectFileList) {
   if (expectFileList.length === 0) return false;
   try {
     for (const rel of expectFileList) {
-      await fsp.stat(path8.join(dir, rel));
+      await fsp.stat(path9.join(dir, rel));
     }
     return true;
   } catch {
@@ -38068,18 +38386,18 @@ async function dirLooksValid(dir, expectFileList) {
 }
 async function syncSessionSymlinks(sessionDir, runtimeKind, actorDir, manifest, log3) {
   const subdir = sessionSkillsSubdir(runtimeKind);
-  const skillsDir = path8.join(sessionDir, subdir);
+  const skillsDir = path9.join(sessionDir, subdir);
   await fsp.mkdir(skillsDir, { recursive: true, mode: 493 });
   const desired = /* @__PURE__ */ new Map();
   for (const entry of Object.values(manifest.skills)) {
-    desired.set(entry.dir, path8.join(actorDir, entry.dir));
+    desired.set(entry.dir, path9.join(actorDir, entry.dir));
   }
   for (const [name, target] of desired) {
-    const link = path8.join(skillsDir, name);
+    const link = path9.join(skillsDir, name);
     let ok = false;
     try {
       const current = await fsp.readlink(link);
-      ok = path8.resolve(skillsDir, current) === target;
+      ok = path9.resolve(skillsDir, current) === target;
     } catch {
     }
     if (!ok) {
@@ -38099,19 +38417,19 @@ async function syncSessionSymlinks(sessionDir, runtimeKind, actorDir, manifest,
   for (const name of entries) {
     if (desired.has(name)) continue;
     try {
-      await fsp.rm(path8.join(skillsDir, name), { recursive: true, force: true });
+      await fsp.rm(path9.join(skillsDir, name), { recursive: true, force: true });
     } catch (err) {
       log3("warn", `\u6E05\u5B64\u513F\u5931\u8D25 ${name}`, err);
     }
   }
 }
-var fsp, os3, path8, MANIFEST_SCHEMA_VERSION, STALE_LOCK_MS, LOCK_ACQUIRE_TIMEOUT_MS, LOCK_POLL_MS;
+var fsp, os3, path9, MANIFEST_SCHEMA_VERSION, STALE_LOCK_MS, LOCK_ACQUIRE_TIMEOUT_MS, LOCK_POLL_MS;
 var init_skill_cache = __esm({
   "../adapters/src/_core/skill-cache.ts"() {
     "use strict";
     fsp = __toESM(require("node:fs/promises"), 1);
     os3 = __toESM(require("node:os"), 1);
-    path8 = __toESM(require("node:path"), 1);
+    path9 = __toESM(require("node:path"), 1);
     MANIFEST_SCHEMA_VERSION = 1;
     STALE_LOCK_MS = 6e4;
     LOCK_ACQUIRE_TIMEOUT_MS = 3e4;
@@ -38295,7 +38613,7 @@ async function discoverAntigravityModels(bin) {
 async function discoverACPModels(bin, provider, args = ["acp"]) {
   const child = (() => {
     try {
-      return (0, import_node_child_process4.spawn)(bin, args, { stdio: ["pipe", "pipe", "ignore"], env: { ...process.env } });
+      return (0, import_node_child_process5.spawn)(bin, args, { stdio: ["pipe", "pipe", "ignore"], env: { ...process.env } });
     } catch {
       return null;
     }
@@ -38401,11 +38719,11 @@ function parseACPSessionNewModels(result) {
 async function discoverOpenclawModels(bin) {
   throw new Error("discoverOpenclawModels: TODO");
 }
-var import_node_child_process4, import_node_fs2, import_node_os, import_node_path, modelCache, CACHE_TTL_MS2;
+var import_node_child_process5, import_node_fs2, import_node_os, import_node_path, modelCache, CACHE_TTL_MS2;
 var init_models = __esm({
   "../adapters/src/_core/models.ts"() {
     "use strict";
-    import_node_child_process4 = require("node:child_process");
+    import_node_child_process5 = require("node:child_process");
     import_node_fs2 = require("node:fs");
     import_node_os = require("node:os");
     import_node_path = require("node:path");
@@ -38480,12 +38798,12 @@ function parseCodexModel(lines) {
 function codexSessionsRoot() {
   const candidates = [];
   const ch = process.env["CODEX_HOME"];
-  if (ch) candidates.push(path9.join(ch, "sessions"));
+  if (ch) candidates.push(path10.join(ch, "sessions"));
   const home = process.env["HOME"] || os4.homedir();
-  if (home) candidates.push(path9.join(home, ".codex", "sessions"));
+  if (home) candidates.push(path10.join(home, ".codex", "sessions"));
   for (const c of candidates) {
     try {
-      if (fs9.statSync(c).isDirectory()) return c;
+      if (fs10.statSync(c).isDirectory()) return c;
     } catch {
     }
   }
@@ -38499,13 +38817,13 @@ function codexRolloutExists(sessionId, root = codexSessionsRoot()) {
     if (hit) return;
     let ents;
     try {
-      ents = fs9.readdirSync(d, { withFileTypes: true });
+      ents = fs10.readdirSync(d, { withFileTypes: true });
     } catch {
       return;
     }
     for (const ent of ents) {
       if (hit) return;
-      const p2 = path9.join(d, ent.name);
+      const p2 = path10.join(d, ent.name);
       if (ent.isDirectory()) walk(p2);
       else if (ent.isFile() && ent.name.startsWith("rollout-") && ent.name.endsWith(suffix)) {
         hit = true;
@@ -38522,17 +38840,17 @@ function listRecentRollouts(root, sinceMs) {
   const walk = (d) => {
     let ents;
     try {
-      ents = fs9.readdirSync(d, { withFileTypes: true });
+      ents = fs10.readdirSync(d, { withFileTypes: true });
     } catch {
       return;
     }
     for (const ent of ents) {
-      const p2 = path9.join(d, ent.name);
+      const p2 = path10.join(d, ent.name);
       if (ent.isDirectory()) walk(p2);
       else if (ent.isFile() && ent.name.startsWith("rollout-") && ent.name.endsWith(".jsonl")) {
         let m2 = 0;
         try {
-          m2 = fs9.statSync(p2).mtimeMs;
+          m2 = fs10.statSync(p2).mtimeMs;
         } catch {
         }
         if (m2 >= margin) found.push({ f: p2, m: m2 });
@@ -38557,7 +38875,7 @@ function scanCodexTelemetry(workdir, sinceMs, sessionsRoot = codexSessionsRoot()
     const files = listRecentRollouts(sessionsRoot, sinceMs);
     const readLines = (f2) => {
       try {
-        return fs9.readFileSync(f2, "utf8").split("\n");
+        return fs10.readFileSync(f2, "utf8").split("\n");
       } catch {
         return null;
       }
@@ -38757,15 +39075,15 @@ function normalizeCodexConsoleLine(line, state = createCodexNormalizeState()) {
   tool.output.push(line);
   return [];
 }
-var import_node_child_process5, import_node_crypto13, fs9, os4, path9, readline2, CodexAdapter;
+var import_node_child_process6, import_node_crypto12, fs10, os4, path10, readline2, CodexAdapter;
 var init_codex = __esm({
   "../adapters/src/codex/index.ts"() {
     "use strict";
-    import_node_child_process5 = require("node:child_process");
-    import_node_crypto13 = require("node:crypto");
-    fs9 = __toESM(require("node:fs"), 1);
+    import_node_child_process6 = require("node:child_process");
+    import_node_crypto12 = require("node:crypto");
+    fs10 = __toESM(require("node:fs"), 1);
     os4 = __toESM(require("node:os"), 1);
-    path9 = __toESM(require("node:path"), 1);
+    path10 = __toESM(require("node:path"), 1);
     readline2 = __toESM(require("node:readline"), 1);
     init_sync_skills();
     init_claude_code();
@@ -38774,10 +39092,10 @@ var init_codex = __esm({
         this.opts = opts;
       }
       async spawn(job) {
-        const slug6 = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
-        const id = `codex-${slug6}-${(0, import_node_crypto13.randomUUID)().slice(0, 8)}`;
+        const slug4 = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
+        const id = `codex-${slug4}-${(0, import_node_crypto12.randomUUID)().slice(0, 8)}`;
         const startedAtMs = Date.now();
-        const dir = fs9.mkdtempSync(path9.join(this.opts.workRoot ?? os4.tmpdir(), "oasis-session-"));
+        const dir = fs10.mkdtempSync(path10.join(this.opts.workRoot ?? os4.tmpdir(), "oasis-session-"));
         await runSyncSkills(this.opts.syncSkills, {
           actorId: job.actor,
           actorToken: job.actorToken,
@@ -38786,9 +39104,9 @@ var init_codex = __esm({
           sessionDir: dir
         });
         for (const [rel, content] of Object.entries(job.bundle.files)) {
-          const file = path9.join(dir, rel);
-          fs9.mkdirSync(path9.dirname(file), { recursive: true });
-          fs9.writeFileSync(file, content);
+          const file = path10.join(dir, rel);
+          fs10.mkdirSync(path10.dirname(file), { recursive: true });
+          fs10.writeFileSync(file, content);
         }
         const task = job.bundle.files["TASK.md"];
         if (!task) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
@@ -38811,20 +39129,20 @@ var init_codex = __esm({
           ...this.opts.extraArgs ?? [],
           prompt
         ];
-        const child = (0, import_node_child_process5.spawn)(this.opts.codexBin ?? "codex", args, {
+        const child = (0, import_node_child_process6.spawn)(this.opts.codexBin ?? "codex", args, {
           cwd: dir,
           env: {
             ...scrubLeakyEnv(process.env),
             ...this.opts.env,
             ...job.env,
-            ...job.wrapperPaths?.length ? { PATH: `${job.wrapperPaths.map((p2) => path9.dirname(p2)).join(path9.delimiter)}${path9.delimiter}${job.env?.["PATH"] ?? process.env["PATH"] ?? ""}` } : {},
+            ...job.wrapperPaths?.length ? { PATH: `${job.wrapperPaths.map((p2) => path10.dirname(p2)).join(path10.delimiter)}${path10.delimiter}${job.env?.["PATH"] ?? process.env["PATH"] ?? ""}` } : {},
             OASIS_SERVER: job.server.url,
             OASIS_TOKEN: job.actorToken
           },
           stdio: ["ignore", "pipe", "pipe"]
         });
-        let transcriptRef = path9.join(dir, "transcript.txt");
-        const out = fs9.createWriteStream(transcriptRef);
+        let transcriptRef = path10.join(dir, "transcript.txt");
+        const out = fs10.createWriteStream(transcriptRef);
         const outputCbs = [];
         const telemetryCbs = [];
         const normalizeState = createCodexNormalizeState();
@@ -38890,14 +39208,14 @@ var init_codex = __esm({
           if (exited) return;
           if (this.opts.cleanupWorkdir) {
             try {
-              const keepDir = path9.join(this.opts.workRoot ?? os4.tmpdir(), "oasis-transcripts");
-              fs9.mkdirSync(keepDir, { recursive: true });
-              const kept = path9.join(keepDir, `${id}.txt`);
+              const keepDir = path10.join(this.opts.workRoot ?? os4.tmpdir(), "oasis-transcripts");
+              fs10.mkdirSync(keepDir, { recursive: true });
+              const kept = path10.join(keepDir, `${id}.txt`);
               const src = transcriptRef;
               out.end(() => {
                 try {
-                  fs9.renameSync(src, kept);
-                  fs9.rmSync(dir, { recursive: true, force: true });
+                  fs10.renameSync(src, kept);
+                  fs10.rmSync(dir, { recursive: true, force: true });
                 } catch {
                 }
               });
@@ -39486,10 +39804,10 @@ function buildReportedUsage(acc, model, inputTokensIncludeCacheRead) {
   return buildUsage(normalized, cost);
 }
 async function runACPSession(job, cfg) {
-  const slug6 = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
-  const binTag = path10.basename(cfg.bin).replace(/[^a-zA-Z0-9]/g, "").slice(0, 12) || "acp";
-  const id = `${binTag}-${slug6}-${(0, import_node_crypto14.randomUUID)().slice(0, 8)}`;
-  const dir = fs10.mkdtempSync(path10.join(cfg.workRoot ?? os5.tmpdir(), "oasis-session-"));
+  const slug4 = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
+  const binTag = path11.basename(cfg.bin).replace(/[^a-zA-Z0-9]/g, "").slice(0, 12) || "acp";
+  const id = `${binTag}-${slug4}-${(0, import_node_crypto13.randomUUID)().slice(0, 8)}`;
+  const dir = fs11.mkdtempSync(path11.join(cfg.workRoot ?? os5.tmpdir(), "oasis-session-"));
   if (cfg.runtimeKind) {
     await runSyncSkills(cfg.syncSkills, {
       actorId: job.actor,
@@ -39500,27 +39818,29 @@ async function runACPSession(job, cfg) {
     });
   }
   for (const [rel, content] of Object.entries(job.bundle.files)) {
-    const file = path10.join(dir, rel);
-    fs10.mkdirSync(path10.dirname(file), { recursive: true });
-    fs10.writeFileSync(file, content);
+    const file = path11.join(dir, rel);
+    fs11.mkdirSync(path11.dirname(file), { recursive: true });
+    fs11.writeFileSync(file, content);
   }
   const task = job.bundle.files["TASK.md"];
   if (!task) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
-  const child = (0, import_node_child_process6.spawn)(cfg.bin, [...cfg.args ?? [], ...cfg.extraArgs ?? []], {
+  const child = (0, import_node_child_process7.spawn)(cfg.bin, [...cfg.args ?? [], ...cfg.extraArgs ?? []], {
     cwd: dir,
     env: {
       ...scrubLeakyEnv(process.env),
       ...cfg.env,
       ...job.env,
       ...cfg.yoloEnv ?? {},
-      ...job.wrapperPaths?.length ? { PATH: `${job.wrapperPaths.map((p2) => path10.dirname(p2)).join(path10.delimiter)}${path10.delimiter}${job.env?.["PATH"] ?? process.env["PATH"] ?? ""}` } : {},
+      ...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
     },
     stdio: ["pipe", "pipe", "pipe"]
   });
-  let transcriptRef = path10.join(dir, "transcript.txt");
-  const transcriptOut = fs10.createWriteStream(transcriptRef);
+  let transcriptRef = path11.join(dir, "transcript.txt");
+  const transcriptOut = fs11.createWriteStream(transcriptRef);
   const outputCbs = [];
   const telemetryCbs = [];
   const exitCbs = [];
@@ -39537,14 +39857,14 @@ async function runACPSession(job, cfg) {
     if (capturedSessionId && !info.runtimeSessionId) info = { ...info, runtimeSessionId: capturedSessionId };
     if (cfg.cleanupWorkdir) {
       try {
-        const keepDir = path10.join(cfg.workRoot ?? os5.tmpdir(), "oasis-transcripts");
-        fs10.mkdirSync(keepDir, { recursive: true });
-        const kept = path10.join(keepDir, `${id}.txt`);
+        const keepDir = path11.join(cfg.workRoot ?? os5.tmpdir(), "oasis-transcripts");
+        fs11.mkdirSync(keepDir, { recursive: true });
+        const kept = path11.join(keepDir, `${id}.txt`);
         const src = transcriptRef;
         transcriptOut.end(() => {
           try {
-            fs10.renameSync(src, kept);
-            fs10.rmSync(dir, { recursive: true, force: true });
+            fs11.renameSync(src, kept);
+            fs11.rmSync(dir, { recursive: true, force: true });
           } catch {
           }
         });
@@ -39745,17 +40065,18 @@ ${task}` : task;
     }
   };
 }
-var import_node_child_process6, import_node_crypto14, fs10, os5, path10, readline3, ACPClient;
+var import_node_child_process7, import_node_crypto13, fs11, os5, path11, readline3, ACPClient;
 var init_acp = __esm({
   "../adapters/src/_core/acp.ts"() {
     "use strict";
-    import_node_child_process6 = require("node:child_process");
-    import_node_crypto14 = require("node:crypto");
-    fs10 = __toESM(require("node:fs"), 1);
+    import_node_child_process7 = require("node:child_process");
+    import_node_crypto13 = require("node:crypto");
+    fs11 = __toESM(require("node:fs"), 1);
     os5 = __toESM(require("node:os"), 1);
-    path10 = __toESM(require("node:path"), 1);
+    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();
@@ -40028,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 } : {}
         });
       }
@@ -40087,9 +40413,9 @@ var init_kiro = __esm({
 
 // ../adapters/src/_core/subprocess.ts
 async function materialize(job, cfg) {
-  const slug6 = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
-  const id = `${slug6}-${(0, import_node_crypto15.randomUUID)().slice(0, 8)}`;
-  const dir = fs11.mkdtempSync(path11.join(cfg.workRoot ?? os6.tmpdir(), "oasis-session-"));
+  const slug4 = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
+  const id = `${slug4}-${(0, import_node_crypto14.randomUUID)().slice(0, 8)}`;
+  const dir = fs12.mkdtempSync(path12.join(cfg.workRoot ?? os6.tmpdir(), "oasis-session-"));
   if (cfg.runtimeKind) {
     await runSyncSkills(cfg.syncSkills, {
       actorId: job.actor,
@@ -40100,9 +40426,9 @@ async function materialize(job, cfg) {
     });
   }
   for (const [rel, content] of Object.entries(job.bundle.files)) {
-    const file = path11.join(dir, rel);
-    fs11.mkdirSync(path11.dirname(file), { recursive: true });
-    fs11.writeFileSync(file, content);
+    const file = path12.join(dir, rel);
+    fs12.mkdirSync(path12.dirname(file), { recursive: true });
+    fs12.writeFileSync(file, content);
   }
   const task = job.bundle.files["TASK.md"];
   if (!task) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
@@ -40113,7 +40439,7 @@ function buildEnv(job, extra) {
     ...scrubLeakyEnv(process.env),
     ...extra,
     ...job.env,
-    ...job.wrapperPaths?.length ? { PATH: `${job.wrapperPaths.map((p2) => path11.dirname(p2)).join(path11.delimiter)}${path11.delimiter}${job.env?.["PATH"] ?? process.env["PATH"] ?? ""}` } : {},
+    ...job.wrapperPaths?.length ? { PATH: `${job.wrapperPaths.map((p2) => path12.dirname(p2)).join(path12.delimiter)}${path12.delimiter}${job.env?.["PATH"] ?? process.env["PATH"] ?? ""}` } : {},
     OASIS_SERVER: job.server.url,
     OASIS_TOKEN: job.actorToken
   };
@@ -40125,14 +40451,14 @@ function makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir, exitCbs) {
     if (cfg.model && !info.model) info = { ...info, model: cfg.model };
     if (cfg.cleanupWorkdir) {
       try {
-        const keepDir = path11.join(cfg.workRoot ?? os6.tmpdir(), "oasis-transcripts");
-        fs11.mkdirSync(keepDir, { recursive: true });
-        const kept = path11.join(keepDir, `${id}.txt`);
+        const keepDir = path12.join(cfg.workRoot ?? os6.tmpdir(), "oasis-transcripts");
+        fs12.mkdirSync(keepDir, { recursive: true });
+        const kept = path12.join(keepDir, `${id}.txt`);
         const src = transcriptRefPtr.value;
         transcriptOut.end(() => {
           try {
-            fs11.renameSync(src, kept);
-            fs11.rmSync(dir, { recursive: true, force: true });
+            fs12.renameSync(src, kept);
+            fs12.rmSync(dir, { recursive: true, force: true });
           } catch {
           }
         });
@@ -40149,13 +40475,13 @@ function makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir, exitCbs) {
 async function runStreamJson(job, cfg) {
   const { id, dir, task: _task } = await materialize(job, cfg);
   const args = [...cfg.buildArgs(job, dir), ...cfg.extraArgs ?? []];
-  const child = (0, import_node_child_process7.spawn)(cfg.bin, args, {
+  const child = (0, import_node_child_process8.spawn)(cfg.bin, args, {
     cwd: dir,
     env: buildEnv(job, cfg.env),
     stdio: ["ignore", "pipe", "pipe"]
   });
-  const transcriptRefPtr = { value: path11.join(dir, "transcript.txt") };
-  const transcriptOut = fs11.createWriteStream(transcriptRefPtr.value);
+  const transcriptRefPtr = { value: path12.join(dir, "transcript.txt") };
+  const transcriptOut = fs12.createWriteStream(transcriptRefPtr.value);
   const outputCbs = [];
   const telemetryCbs = [];
   const exitCbs = [];
@@ -40225,13 +40551,13 @@ async function runStreamJson(job, cfg) {
 async function runOneShotText(job, cfg) {
   const { id, dir } = await materialize(job, cfg);
   const args = [...cfg.buildArgs(job, dir), ...cfg.extraArgs ?? []];
-  const child = (0, import_node_child_process7.spawn)(cfg.bin, args, {
+  const child = (0, import_node_child_process8.spawn)(cfg.bin, args, {
     cwd: dir,
     env: buildEnv(job, cfg.env),
     stdio: ["ignore", "pipe", "pipe"]
   });
-  const transcriptRefPtr = { value: path11.join(dir, "transcript.txt") };
-  const transcriptOut = fs11.createWriteStream(transcriptRefPtr.value);
+  const transcriptRefPtr = { value: path12.join(dir, "transcript.txt") };
+  const transcriptOut = fs12.createWriteStream(transcriptRefPtr.value);
   const outputCbs = [];
   const exitCbs = [];
   const { finish, exited } = makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir, exitCbs);
@@ -40288,15 +40614,15 @@ async function runOneShotText(job, cfg) {
     }
   });
 }
-var import_node_child_process7, import_node_crypto15, fs11, os6, path11, readline4;
+var import_node_child_process8, import_node_crypto14, fs12, os6, path12, readline4;
 var init_subprocess = __esm({
   "../adapters/src/_core/subprocess.ts"() {
     "use strict";
-    import_node_child_process7 = require("node:child_process");
-    import_node_crypto15 = require("node:crypto");
-    fs11 = __toESM(require("node:fs"), 1);
+    import_node_child_process8 = require("node:child_process");
+    import_node_crypto14 = require("node:crypto");
+    fs12 = __toESM(require("node:fs"), 1);
     os6 = __toESM(require("node:os"), 1);
-    path11 = __toESM(require("node:path"), 1);
+    path12 = __toESM(require("node:path"), 1);
     readline4 = __toESM(require("node:readline"), 1);
     init_claude_code();
     init_sync_skills();
@@ -40703,11 +41029,11 @@ function normalizeOpenClaw(line) {
   }
   return [];
 }
-var import_node_crypto16, OpenClawAdapter;
+var import_node_crypto15, OpenClawAdapter;
 var init_openclaw = __esm({
   "../adapters/src/openclaw/index.ts"() {
     "use strict";
-    import_node_crypto16 = require("node:crypto");
+    import_node_crypto15 = require("node:crypto");
     init_subprocess();
     OpenClawAdapter = class {
       constructor(opts = {}) {
@@ -40725,7 +41051,7 @@ var init_openclaw = __esm({
 ---
 
 ${task}` : task;
-            const sessionId = job2.runtimeSessionId ?? `oasis-${(0, import_node_crypto16.randomUUID)().slice(0, 8)}`;
+            const sessionId = job2.runtimeSessionId ?? `oasis-${(0, import_node_crypto15.randomUUID)().slice(0, 8)}`;
             return [
               "agent",
               ...opts.mode !== "gateway" ? ["--local"] : [],
@@ -40846,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)"
@@ -41197,7 +41562,7 @@ function nodesDomain(deps) {
         nodeId = incomingNodeId;
         deps.enrollTokens.setIssuedNodeId(enrollToken, nodeId);
       } else {
-        nodeId = `node-${(0, import_node_crypto17.randomUUID)().slice(0, 8)}`;
+        nodeId = `node-${(0, import_node_crypto16.randomUUID)().slice(0, 8)}`;
         deps.enrollTokens.setIssuedNodeId(enrollToken, nodeId);
       }
       const existingNode = await deps.nodeStore.getNode(nodeId);
@@ -41337,11 +41702,11 @@ function nodesDomain(deps) {
     });
   };
 }
-var import_node_crypto17, import_node_fs3, import_node_url, import_node_path2;
+var import_node_crypto16, import_node_fs3, import_node_url, import_node_path2;
 var init_routes4 = __esm({
   "../server/src/domains/nodes/routes.ts"() {
     "use strict";
-    import_node_crypto17 = require("node:crypto");
+    import_node_crypto16 = require("node:crypto");
     import_node_fs3 = require("node:fs");
     import_node_url = require("node:url");
     import_node_path2 = require("node:path");
@@ -41403,11 +41768,11 @@ var init_types3 = __esm({
 });
 
 // ../server/src/node-store.ts
-var fs12, MemoryNodeStore, FileNodeStore;
+var fs13, MemoryNodeStore, FileNodeStore;
 var init_node_store = __esm({
   "../server/src/node-store.ts"() {
     "use strict";
-    fs12 = __toESM(require("node:fs"), 1);
+    fs13 = __toESM(require("node:fs"), 1);
     MemoryNodeStore = class {
       nodes = /* @__PURE__ */ new Map();
       runtimes = /* @__PURE__ */ new Map();
@@ -41492,16 +41857,16 @@ var init_node_store = __esm({
       static async open(file) {
         const s2 = new _FileNodeStore(file);
         try {
-          const snap = JSON.parse(fs12.readFileSync(file, "utf8"));
+          const snap = JSON.parse(fs13.readFileSync(file, "utf8"));
           for (const n of snap.nodes ?? []) s2.nodes.set(n.id, n);
           for (const r of snap.runtimes ?? []) s2.runtimes.set(r.id, r);
         } catch {
-          fs12.writeFileSync(file, JSON.stringify({ nodes: [], runtimes: [] }, null, 2));
+          fs13.writeFileSync(file, JSON.stringify({ nodes: [], runtimes: [] }, null, 2));
         }
         return s2;
       }
       flush() {
-        fs12.writeFileSync(this.file, JSON.stringify({
+        fs13.writeFileSync(this.file, JSON.stringify({
           nodes: [...this.nodes.values()],
           runtimes: [...this.runtimes.values()]
         }, null, 2));
@@ -41553,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);
@@ -41575,48 +41950,61 @@ 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;
-    if (!r.workspace || creatorOf.get(r.workspace) !== me) continue;
+    if (!r.workspace) continue;
+    const anchorOwner = model.artifacts.get(r.anchor)?.owner;
+    const isOwnerRecipient = creatorOf.get(r.workspace) === me;
+    const isLeadRecipient = !!anchorOwner && !!leadOf && leadOf(anchorOwner) === me;
+    if (!isOwnerRecipient && !isLeadRecipient) continue;
     out.push({
       kind: "change-confirm",
       artifactId: r.anchor,
@@ -41716,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"() {
@@ -41776,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"
     };
   }
 });
@@ -41827,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);
@@ -41904,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);
@@ -41971,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);
@@ -42033,19 +42592,21 @@ 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();
   }
 });
 
 // ../server/src/domains/collab/create-seeded-workorder.ts
 function makeSeededWorkorderCreator(deps) {
-  const genWorkspace = deps.genWorkspace ?? (() => `ws:wo-${(0, import_node_crypto18.randomUUID)().slice(0, 8)}`);
+  const genWorkspace = deps.genWorkspace ?? (() => `ws:wo-${(0, import_node_crypto17.randomUUID)().slice(0, 8)}`);
   return async (input) => {
     const workspace = genWorkspace();
     if (input.projectId && deps.artifactState) {
@@ -42082,11 +42643,11 @@ function makeSeededWorkorderCreator(deps) {
     return { workspace, rootArtifactId: briefId, spawned: planned.spawned };
   };
 }
-var import_node_crypto18, enc2;
+var import_node_crypto17, enc2;
 var init_create_seeded_workorder = __esm({
   "../server/src/domains/collab/create-seeded-workorder.ts"() {
     "use strict";
-    import_node_crypto18 = require("node:crypto");
+    import_node_crypto17 = require("node:crypto");
     init_planner();
     enc2 = (s2) => new TextEncoder().encode(s2);
   }
@@ -42559,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) {
@@ -43164,7 +43736,7 @@ function createChatSessionsDomain(opts) {
       const runtimeId = await currentRuntimeId(body.aiActorId) ?? "unknown";
       const now = (/* @__PURE__ */ new Date()).toISOString();
       const session = {
-        id: (0, import_node_crypto19.randomUUID)(),
+        id: (0, import_node_crypto18.randomUUID)(),
         humanActorId: req.auth.actor,
         aiActorId: body.aiActorId,
         runtimeId,
@@ -43215,7 +43787,7 @@ function createChatSessionsDomain(opts) {
       if (!body?.role || !body?.content) throw new ApiError(400, "BAD_REQUEST", "role and content required");
       if (body.role !== "user" && body.role !== "assistant") throw new ApiError(400, "BAD_REQUEST", "role must be user or assistant");
       const msg = await store.appendMessage({
-        id: (0, import_node_crypto19.randomUUID)(),
+        id: (0, import_node_crypto18.randomUUID)(),
         sessionId: req.params.id,
         role: body.role,
         content: body.content,
@@ -43252,11 +43824,11 @@ function createChatSessionsDomain(opts) {
     });
   };
 }
-var import_node_crypto19;
+var import_node_crypto18;
 var init_chat_sessions = __esm({
   "../server/src/domains/chat-sessions/index.ts"() {
     "use strict";
-    import_node_crypto19 = require("node:crypto");
+    import_node_crypto18 = require("node:crypto");
     init_router();
     init_workorders();
     init_chat_parts();
@@ -44622,11 +45194,11 @@ function ackMsFromEnv(fallback) {
   const n = Number(v2);
   return Number.isFinite(n) && n >= 0 ? n : fallback;
 }
-var import_node_crypto20, DaemonHubAdapter, BindingRouterAdapter;
+var import_node_crypto19, DaemonHubAdapter, BindingRouterAdapter;
 var init_daemon_adapter = __esm({
   "../server/src/daemon-adapter.ts"() {
     "use strict";
-    import_node_crypto20 = require("node:crypto");
+    import_node_crypto19 = require("node:crypto");
     DaemonHubAdapter = class {
       constructor(hub, opts = {}) {
         this.hub = hub;
@@ -44713,7 +45285,7 @@ var init_daemon_adapter = __esm({
       async spawn(job) {
         const nodeId = job.binding?.nodeId;
         if (!nodeId) throw new Error("DaemonHubAdapter \u9700\u8981 job.binding.nodeId\uFF08\u8DEF\u7531\u9519\u8BEF\uFF09");
-        const dispatchId = `dispatch:${(0, import_node_crypto20.randomUUID)()}`;
+        const dispatchId = `dispatch:${(0, import_node_crypto19.randomUUID)()}`;
         const entry = {
           nodeId,
           exitCbs: [],
@@ -44857,13 +45429,13 @@ function classifyPage(page, lastPushedHash, serviceAccount) {
   if (sha(body) === lastPushedHash) return { kind: "echo" };
   return { kind: "human-edit", content: body, updatedBy: page.updatedBy };
 }
-var import_node_crypto21, sha, enc3, dec, MirrorEngine, MapMirrorIdentities;
+var import_node_crypto20, sha, enc3, dec, MirrorEngine, MapMirrorIdentities;
 var init_engine = __esm({
   "../server/src/mirror/engine.ts"() {
     "use strict";
-    import_node_crypto21 = require("node:crypto");
+    import_node_crypto20 = require("node:crypto");
     init_src();
-    sha = (s2) => (0, import_node_crypto21.createHash)("sha256").update(s2, "utf8").digest("hex");
+    sha = (s2) => (0, import_node_crypto20.createHash)("sha256").update(s2, "utf8").digest("hex");
     enc3 = (s2) => new TextEncoder().encode(s2);
     dec = (b2) => new TextDecoder().decode(b2);
     MirrorEngine = class {
@@ -44976,22 +45548,22 @@ var init_engine = __esm({
 });
 
 // ../server/src/mirror/fs-state.ts
-var fs14, FsMirrorStateStore;
+var fs15, FsMirrorStateStore;
 var init_fs_state = __esm({
   "../server/src/mirror/fs-state.ts"() {
     "use strict";
-    fs14 = __toESM(require("node:fs"), 1);
+    fs15 = __toESM(require("node:fs"), 1);
     FsMirrorStateStore = class {
       constructor(file) {
         this.file = file;
-        if (fs14.existsSync(file)) {
-          const obj = JSON.parse(fs14.readFileSync(file, "utf8"));
+        if (fs15.existsSync(file)) {
+          const obj = JSON.parse(fs15.readFileSync(file, "utf8"));
           for (const [k2, v2] of Object.entries(obj)) this.map.set(k2, v2);
         }
       }
       map = /* @__PURE__ */ new Map();
       flush() {
-        fs14.writeFileSync(this.file, JSON.stringify(Object.fromEntries(this.map), null, 2));
+        fs15.writeFileSync(this.file, JSON.stringify(Object.fromEntries(this.map), null, 2));
       }
       async get(artifactId) {
         return this.map.get(artifactId) ?? null;
@@ -45008,13 +45580,13 @@ var init_fs_state = __esm({
 });
 
 // ../server/src/git/integrate.ts
-var import_node_child_process8, fs15, path13, GitRemoteIntegrator;
+var import_node_child_process9, fs16, path14, GitRemoteIntegrator;
 var init_integrate = __esm({
   "../server/src/git/integrate.ts"() {
     "use strict";
-    import_node_child_process8 = require("node:child_process");
-    fs15 = __toESM(require("node:fs"), 1);
-    path13 = __toESM(require("node:path"), 1);
+    import_node_child_process9 = require("node:child_process");
+    fs16 = __toESM(require("node:fs"), 1);
+    path14 = __toESM(require("node:path"), 1);
     GitRemoteIntegrator = class {
       constructor(remote, cloneDir, develop = "develop") {
         this.remote = remote;
@@ -45023,7 +45595,7 @@ var init_integrate = __esm({
       }
       env = { ...process.env, LC_ALL: "C", LANG: "C", GIT_TERMINAL_PROMPT: "0" };
       git(args) {
-        return (0, import_node_child_process8.execFileSync)("git", ["-C", this.cloneDir, ...args], {
+        return (0, import_node_child_process9.execFileSync)("git", ["-C", this.cloneDir, ...args], {
           encoding: "utf8",
           env: this.env,
           maxBuffer: 256 * 1024 * 1024
@@ -45031,9 +45603,9 @@ var init_integrate = __esm({
       }
       /** 确保本地工作克隆存在并拉到最新远程态。幂等。 */
       sync() {
-        if (!fs15.existsSync(path13.join(this.cloneDir, ".git"))) {
-          fs15.mkdirSync(path13.dirname(this.cloneDir), { recursive: true });
-          (0, import_node_child_process8.execFileSync)("git", ["clone", "--quiet", this.remote, this.cloneDir], { env: this.env, maxBuffer: 256 * 1024 * 1024 });
+        if (!fs16.existsSync(path14.join(this.cloneDir, ".git"))) {
+          fs16.mkdirSync(path14.dirname(this.cloneDir), { recursive: true });
+          (0, import_node_child_process9.execFileSync)("git", ["clone", "--quiet", this.remote, this.cloneDir], { env: this.env, maxBuffer: 256 * 1024 * 1024 });
           this.git(["config", "user.email", "oasis@local"]);
           this.git(["config", "user.name", "oasis"]);
         } else {
@@ -45083,224 +45655,26 @@ var init_integrate = __esm({
 });
 
 // ../server/src/git/sync.ts
-var os7, path14, slug3, GitSyncWorker;
 var init_sync = __esm({
   "../server/src/git/sync.ts"() {
     "use strict";
-    os7 = __toESM(require("node:os"), 1);
-    path14 = __toESM(require("node:path"), 1);
-    init_src2();
-    init_integrate();
-    init_collect();
-    slug3 = (id) => id.replace(/[^a-zA-Z0-9_-]+/g, "_");
-    GitSyncWorker = class {
-      // 仓库键(remote||id) → 集成器（缓存）
-      constructor(deps) {
-        this.deps = deps;
-      }
-      integrators = /* @__PURE__ */ new Map();
-      integratorFor(repo) {
-        if (!repo.remote) return null;
-        const key = repo.remote;
-        let g2 = this.integrators.get(key);
-        if (!g2) {
-          const root = this.deps.mirrorRoot ?? path14.join(os7.tmpdir(), "oasis-git-mirrors");
-          const cloneDir = repo.repoDir ?? path14.join(root, slug3(repo.id));
-          g2 = new GitRemoteIntegrator(repo.remote, cloneDir, repo.develop);
-          this.integrators.set(key, g2);
-        }
-        return g2;
-      }
-      /** 一轮：把每个已 conclude 的代码 artifact 的 commit **逐仓**集成进各自 develop。幂等（git ancestor 判断）。 */
-      async tick() {
-        const { kernel, log: log3 } = this.deps;
-        const synced = /* @__PURE__ */ new Set();
-        for (const artifact of kernel.model.artifacts.values()) {
-          const p2 = await this.deps.resolveProject(artifact.workspace);
-          if (!p2 || !p2.repos?.length) continue;
-          if (!isConcluded(kernel.model, artifact.id)) continue;
-          const head = artifact.currentRev;
-          if (!head) continue;
-          const rev = kernel.model.revisions.get(head);
-          if (!rev || rev.contentKind !== "external-pin") continue;
-          for (const { repo, sha: sha2 } of parseUmbrellaCommits(rev.contentRef, p2.repos)) {
-            const integ = this.integratorFor(repo);
-            if (!integ) continue;
-            const tag = `${artifact.id}/${repo.id}@${sha2.slice(0, 12)}`;
-            try {
-              if (!synced.has(repo.remote)) {
-                integ.sync();
-                synced.add(repo.remote);
-              }
-              const r = integ.integrate(sha2, `integrate ${tag} \u2192 ${repo.develop}`);
-              if (r.merged) log3?.(`[git] merged ${tag} \u2192 ${repo.develop}`);
-              else if (r.conflicts?.length) log3?.(`[git] ${tag} \u96C6\u6210\u51B2\u7A81: ${r.conflicts.join(", ")}\uFF08\u5F85\u56DE\u704C blocking annotation + rebase\uFF09`);
-            } catch (e) {
-              log3?.(`[git] ${tag} \u96C6\u6210\u5931\u8D25\uFF08\u4E0B\u4E00\u8F6E\u91CD\u8BD5\uFF09: ${String(e)}`);
-            }
-          }
-        }
-      }
-    };
-  }
-});
-
-// ../server/src/git/ci-provider.ts
-function mirrorDirFor(mirrorRoot, repo) {
-  if (repo.repoDir) return repo.repoDir;
-  const key = repo.remote ? `${slug4(repo.id)}-${crypto.createHash("sha1").update(repo.remote).digest("hex").slice(0, 8)}` : slug4(repo.id);
-  return `${mirrorRoot}/${key}`;
-}
-var import_node_child_process9, crypto, fs16, path15, import_node_util, execFile, slug4, GhCiProvider;
-var init_ci_provider = __esm({
-  "../server/src/git/ci-provider.ts"() {
-    "use strict";
-    import_node_child_process9 = require("node:child_process");
-    crypto = __toESM(require("node:crypto"), 1);
-    fs16 = __toESM(require("node:fs"), 1);
-    path15 = __toESM(require("node:path"), 1);
-    import_node_util = require("node:util");
-    execFile = (0, import_node_util.promisify)(import_node_child_process9.execFile);
-    slug4 = (id) => id.replace(/[^a-zA-Z0-9_-]+/g, "_");
-    GhCiProvider = class {
-      constructor(opts) {
-        this.opts = opts;
-      }
-      repoDir(repo) {
-        return mirrorDirFor(this.opts.mirrorRoot, repo);
-      }
-      /** 缺则 clone（首次使用/进程重启后本地镜像不存在）——否则 git fetch 会"not a git repo"报错。同 GitRemoteIntegrator。 */
-      ensureClone(repo) {
-        const dir = this.repoDir(repo);
-        if (fs16.existsSync(path15.join(dir, ".git"))) {
-          if (repo.remote) {
-            let origin = "";
-            try {
-              origin = (0, import_node_child_process9.execFileSync)("git", ["remote", "get-url", "origin"], { cwd: dir, env: process.env }).toString().trim();
-            } catch {
-            }
-            if (origin !== repo.remote) {
-              (0, import_node_child_process9.execFileSync)("git", ["remote", "set-url", "origin", repo.remote], { cwd: dir, env: process.env });
-              this.opts.log?.(`[ci] ${repo.id} \u955C\u50CF origin \u7EA0\u504F\uFF1A${origin || "(\u65E0)"} \u2192 ${repo.remote}`);
-            }
-          }
-          return;
-        }
-        if (!repo.remote) throw new Error(`repo ${repo.id} \u65E0 remote\uFF0C\u65E0\u6CD5 clone`);
-        fs16.mkdirSync(path15.dirname(dir), { recursive: true });
-        (0, import_node_child_process9.execFileSync)("git", ["clone", "--quiet", repo.remote, dir], { env: process.env });
-        this.opts.log?.(`[ci] cloned ${repo.id} \u2192 ${dir}`);
-      }
-      async gh(repo, args) {
-        this.ensureClone(repo);
-        const { stdout } = await execFile("gh", args, { cwd: this.repoDir(repo), env: process.env });
-        return stdout.trim();
-      }
-      async git(repo, args) {
-        this.ensureClone(repo);
-        const { stdout } = await execFile("git", args, { cwd: this.repoDir(repo), env: process.env });
-        return stdout.trim();
-      }
-      async ensurePr(ref, meta) {
-        if (!ref.repo.remote) throw new Error(`repo ${ref.repo.id} \u65E0 remote\uFF0C\u65E0\u6CD5\u5F00 PR`);
-        await this.git(ref.repo, ["fetch", "--quiet", "--prune", "origin"]);
-        await this.git(ref.repo, ["push", "--quiet", "--force-with-lease", "origin", `${ref.sha}:refs/heads/${ref.branch}`]);
-        const existing = await this.gh(ref.repo, ["pr", "list", "--head", ref.branch, "--base", ref.repo.develop, "--state", "open", "--json", "number,url"]);
-        const list = JSON.parse(existing || "[]");
-        if (list[0]) return list[0];
-        const url = await this.gh(ref.repo, ["pr", "create", "--base", ref.repo.develop, "--head", ref.branch, "--title", meta.title, "--body", meta.body]);
-        const created = JSON.parse(await this.gh(ref.repo, ["pr", "view", ref.branch, "--json", "number,url"]));
-        this.opts.log?.(`[ci] opened PR ${created.url} (${ref.branch} \u2192 ${ref.repo.develop})`);
-        return created.url ? created : { number: created.number, url };
-      }
-      async status(ref) {
-        let raw;
-        try {
-          raw = await this.gh(ref.repo, ["pr", "view", ref.branch, "--json", "statusCheckRollup,createdAt"]);
-        } catch (e) {
-          return { state: "pending", summary: `\u8BFB PR \u72B6\u6001\u5931\u8D25\uFF08\u4E0B\u8F6E\u91CD\u8BD5\uFF09\uFF1A${String(e)}` };
-        }
-        const parsed = JSON.parse(raw || "{}");
-        const rollup = parsed.statusCheckRollup ?? [];
-        if (rollup.length === 0) {
-          const grace = this.opts.noCheckGraceMs ?? 12e4;
-          const ageMs = parsed.createdAt ? Date.now() - Date.parse(parsed.createdAt) : Infinity;
-          if (ageMs < grace) return { state: "pending" };
-          if (this.opts.failClosedWhenNoChecks) return { state: "failure", summary: "\u8BE5\u4ED3\u672A\u914D\u4EFB\u4F55 Actions check\uFF08fail-closed\uFF09\u2014\u2014\u8BF7\u8865 CI \u6216\u6539\u914D\u7F6E" };
-          this.opts.log?.(`[ci] ${ref.repo.id} PR ${ref.branch} \u5F00\u4E86 ${Math.round(ageMs / 1e3)}s \u4ECD\u65E0 check\uFF0C\u5224\u65E0 CI\u3001\u95F8\u7A7A\u8FC7\uFF08\u544A\u8B66\uFF09`);
-          return { state: "success", summary: "\u65E0 CI check\uFF0C\u95F8\u7A7A\u8FC7" };
-        }
-        const failed = [];
-        let anyPending = false;
-        for (const c of rollup) {
-          const concl = (c.conclusion ?? "").toUpperCase();
-          const st = (c.status ?? "").toUpperCase();
-          if (st && st !== "COMPLETED") {
-            anyPending = true;
-            continue;
-          }
-          if (concl && !["SUCCESS", "NEUTRAL", "SKIPPED"].includes(concl)) failed.push(c);
-        }
-        if (failed.length > 0) {
-          const blocks = [];
-          for (const c of failed) {
-            const name = c.name ?? c.context ?? "check";
-            const concl = (c.conclusion ?? "").toUpperCase();
-            const url = c.detailsUrl ?? c.targetUrl ?? "";
-            let block = `  - ${name} \u2192 ${concl}${url ? `
-    ${url}` : ""}`;
-            const tail = await this.failedLogTail(ref.repo, url);
-            if (tail) block += `
-    \u5931\u8D25\u65E5\u5FD7\uFF08\u672B\u5C3E\uFF09\uFF1A
-${tail.split("\n").map((l) => "      " + l).join("\n")}`;
-            blocks.push(block);
-          }
-          return { state: "failure", summary: `CI \u672A\u8FC7\uFF08${failed.length} \u4E2A check\uFF09\uFF1A
-${blocks.join("\n")}` };
-        }
-        if (anyPending) return { state: "pending" };
-        return { state: "success", summary: `CI \u901A\u8FC7\uFF08${rollup.length} \u4E2A check\uFF09` };
-      }
-      /** best-effort：从 check 的 detailsUrl 提 Actions run id，取失败步骤日志末尾（截断）。取不到返回空。 */
-      async failedLogTail(repo, detailsUrl) {
-        const m2 = /\/runs\/(\d+)/.exec(detailsUrl);
-        if (!m2) return "";
-        try {
-          const log3 = await this.gh(repo, ["run", "view", m2[1], "--log-failed"]);
-          return log3.split("\n").filter(Boolean).slice(-40).join("\n").slice(-2e3);
-        } catch {
-          return "";
-        }
-      }
-      async merge(ref) {
-        try {
-          await this.gh(ref.repo, ["pr", "merge", ref.branch, "--merge", "--delete-branch"]);
-          this.opts.log?.(`[ci] merged PR ${ref.branch} \u2192 ${ref.repo.develop}`);
-          return { merged: true };
-        } catch (e) {
-          return { merged: false, reason: String(e) };
-        }
-      }
-    };
   }
 });
 
 // ../server/src/git/ci-gate.ts
-var slug5, CiGateWorker;
+var CiGateWorker;
 var init_ci_gate = __esm({
   "../server/src/git/ci-gate.ts"() {
     "use strict";
     init_src2();
     init_collect();
-    slug5 = (id) => id.replace(/[^a-zA-Z0-9_-]+/g, "_");
+    init_ci_provider();
     CiGateWorker = class {
       constructor(deps) {
         this.deps = deps;
         this.ciActor = deps.ciActor ?? "actor:ci";
       }
       ciActor;
-      /** 进程内"已尝试合并"去重（避免每轮重复 gh pr merge；重启后至多多试一次，gh 报已合并即无害）。 */
-      mergedOnce = /* @__PURE__ */ new Set();
       /** 逐产物失败退避：连续失败指数拉长重试间隔，超过阈值响亮升级一次（不再静默每轮刷日志）。 */
       failures = /* @__PURE__ */ new Map();
       inBackoff(artifactId) {
@@ -45336,9 +45710,8 @@ var init_ci_gate = __esm({
         if (!p2 || !p2.repos?.length) return null;
         const units = [];
         for (const { repo, sha: sha2 } of parseUmbrellaCommits(contentRef, p2.repos)) {
-          if (!repo.remote) continue;
-          const artifactSlug2 = slug5(artifactId.replace(/^artifact:/, "")).slice(0, 48);
-          units.push({ repo, sha: sha2, branch: `oasis-ci/${artifactSlug2}/${sha2.slice(0, 8)}` });
+          if (!isGitHubRemote(repo.remote)) continue;
+          units.push({ repo, sha: sha2, branch: ciBranchFor(artifactId, sha2) });
         }
         return units;
       }
@@ -45386,14 +45759,6 @@ var init_ci_gate = __esm({
                 log3?.(`[ci] vote ${artifact.id} \u5931\u8D25\uFF08\u9000\u907F\u91CD\u8BD5\uFF09\uFF1A${String(e)}`);
               }
             );
-          } else if (isConcluded(kernel.model, artifact.id) && rev.contentKind === "external-pin") {
-            await this.mergeMilestone(artifact.id, artifact.workspace, rev.contentRef, head).then(
-              () => this.recordOk(artifact.id),
-              (e) => {
-                this.recordFail(artifact.id);
-                log3?.(`[ci] merge ${artifact.id} \u5931\u8D25\uFF08\u9000\u907F\u91CD\u8BD5\uFF09\uFF1A${String(e)}`);
-              }
-            );
           } else {
             this.clearStatus(artifact.id);
           }
@@ -45430,32 +45795,122 @@ var init_ci_gate = __esm({
         this.clearStatus(artifactId);
         log3?.(`[ci] ${artifactId} CI \u5168\u7EFF \u2192 approve`);
       }
-      async mergeMilestone(artifactId, workspace, contentRef, head) {
-        const { ci, log: log3 } = this.deps;
-        const units = await this.unitsFor(artifactId, workspace, contentRef);
-        if (!units) {
-          this.clearStatus(artifactId);
-          return;
+    };
+  }
+});
+
+// ../server/src/git/merge-worker.ts
+var MergeWorker;
+var init_merge_worker = __esm({
+  "../server/src/git/merge-worker.ts"() {
+    "use strict";
+    init_src2();
+    init_collect();
+    init_integrate();
+    init_ci_provider();
+    MergeWorker = class {
+      constructor(deps) {
+        this.deps = deps;
+      }
+      integrators = /* @__PURE__ */ new Map();
+      mergedOnce = /* @__PURE__ */ new Set();
+      failures = /* @__PURE__ */ new Map();
+      inBackoff(id) {
+        const f2 = this.failures.get(id);
+        return !!f2 && Date.now() < f2.nextAt;
+      }
+      recordFail(id) {
+        const base = this.deps.backoff?.baseMs ?? 3e4;
+        const cap = this.deps.backoff?.capMs ?? 6e5;
+        const escalateAfter = this.deps.backoff?.escalateAfter ?? 5;
+        const f2 = this.failures.get(id) ?? { count: 0, nextAt: 0, escalated: false };
+        f2.count += 1;
+        f2.nextAt = Date.now() + Math.min(base * 2 ** (f2.count - 1), cap);
+        if (f2.count >= escalateAfter && !f2.escalated) {
+          f2.escalated = true;
+          this.deps.log?.(`[merge] \u26A0\uFE0F ${id} \u8FDE\u7EED\u5931\u8D25 ${f2.count} \u6B21\uFF0C\u5DF2\u8FDB\u5165\u957F\u9000\u907F\uFF08\u4E0A\u9650 ${Math.round(cap / 1e3)}s\uFF09\u2014\u2014\u8BF7\u4EBA\u5DE5\u68C0\u67E5\u8FDC\u7AEF\u4ED3 / \u5206\u652F\u4FDD\u62A4\u72B6\u6001`);
         }
-        const pending = units.filter((u) => !this.mergedOnce.has(`${artifactId}::${head}::${u.repo.id}`));
-        if (pending.length === 0) {
-          this.clearStatus(artifactId);
-          return;
+        this.failures.set(id, f2);
+      }
+      recordOk(id) {
+        this.failures.delete(id);
+      }
+      setStatus(id, s2) {
+        this.deps.statusSink?.set(id, { ...s2, updatedAt: (/* @__PURE__ */ new Date()).toISOString() });
+      }
+      clearStatus(id) {
+        this.deps.statusSink?.delete(id);
+      }
+      /** 非 GitHub 仓的本地集成器（按归一化 remote 缓存；克隆目录与 CI 闸同套 mirrorDirFor，逻辑 id 重名不撞）。 */
+      integratorFor(repo) {
+        if (!repo.remote) return null;
+        const key = normalizeRemote(repo.remote);
+        let g2 = this.integrators.get(key);
+        if (!g2) {
+          g2 = new GitRemoteIntegrator(repo.remote, mirrorDirFor(this.deps.mirrorRoot, repo), repo.develop);
+          this.integrators.set(key, g2);
         }
-        this.setStatus(artifactId, { phase: "merging", repos: pending.map((u) => ({ repoId: u.repo.id, sha: u.sha.slice(0, 8), state: "success" })) });
-        for (const unit of units) {
-          const key = `${artifactId}::${head}::${unit.repo.id}`;
-          if (this.mergedOnce.has(key)) continue;
-          const r = await ci.merge({ repo: unit.repo, branch: unit.branch });
-          if (r.merged) {
-            this.mergedOnce.add(key);
-            log3?.(`[ci] merged ${artifactId}/${unit.repo.id} \u2192 ${unit.repo.develop}`);
-          } else {
-            this.mergedOnce.add(key);
-            log3?.(`[ci] ${artifactId}/${unit.repo.id} \u672A\u5408\uFF08${r.reason ?? "not mergeable"}\uFF09\u2014\u2014\u82E5\u5DF2\u5408\u5E76\u53EF\u5FFD\u7565`);
+        return g2;
+      }
+      async tick() {
+        const { kernel, log: log3 } = this.deps;
+        for (const artifact of kernel.model.artifacts.values()) {
+          const head = artifact.currentRev;
+          if (!head) continue;
+          const rev = kernel.model.revisions.get(head);
+          if (!rev || rev.contentKind !== "external-pin") continue;
+          if (!isConcluded(kernel.model, artifact.id)) continue;
+          if (this.inBackoff(artifact.id)) continue;
+          const p2 = await this.deps.resolveProject(artifact.workspace);
+          if (!p2 || !p2.repos?.length) {
+            this.clearStatus(artifact.id);
+            continue;
+          }
+          const units = parseUmbrellaCommits(rev.contentRef, p2.repos).filter((u) => u.repo.remote);
+          const keyOf = (u) => `${artifact.id}::${head}::${normalizeRemote(u.repo.remote)}`;
+          const pending = units.filter((u) => !this.mergedOnce.has(keyOf(u)));
+          if (pending.length === 0) {
+            this.clearStatus(artifact.id);
+            continue;
+          }
+          this.setStatus(artifact.id, { phase: "merging", repos: pending.map((u) => ({ repoId: u.repo.id, sha: u.sha.slice(0, 8), state: "success" })) });
+          try {
+            for (const { repo, sha: sha2 } of pending) {
+              if (isGitHubRemote(repo.remote)) {
+                if (await this.deps.ci.isMerged({ repo, sha: sha2 })) {
+                  this.mergedOnce.add(keyOf({ repo }));
+                  continue;
+                }
+                const branch = ciBranchFor(artifact.id, sha2);
+                await this.deps.ci.ensurePr(
+                  { repo, branch, sha: sha2 },
+                  { title: `[oasis-ci] ${artifact.id} \u2192 ${repo.develop}`, body: `merge artifact ${artifact.id} @ ${sha2}` }
+                );
+                const r = await this.deps.ci.merge({ repo, branch });
+                this.mergedOnce.add(keyOf({ repo }));
+                log3?.(r.merged ? `[merge] merged ${artifact.id}/${repo.id} \u2192 ${repo.develop}\uFF08PR\uFF09` : `[merge] ${artifact.id}/${repo.id} \u672A\u5408\uFF08${r.reason ?? "not mergeable"}\uFF09\u2014\u2014\u82E5\u5DF2\u5408\u53EF\u5FFD\u7565`);
+              } else {
+                const integ = this.integratorFor(repo);
+                if (!integ) continue;
+                integ.sync();
+                const r = integ.integrate(sha2, `integrate ${artifact.id}/${repo.id}@${sha2.slice(0, 12)} \u2192 ${repo.develop}`);
+                if (r.merged || r.already) {
+                  this.mergedOnce.add(keyOf({ repo }));
+                  if (r.merged) log3?.(`[merge] merged ${artifact.id}/${repo.id} \u2192 ${repo.develop}\uFF08\u672C\u5730\uFF09`);
+                } else if (r.conflicts?.length) {
+                  log3?.(`[merge] ${artifact.id}/${repo.id} \u96C6\u6210\u51B2\u7A81: ${r.conflicts.join(", ")}\uFF08\u5F85\u56DE\u704C blocking annotation + rebase\uFF09`);
+                }
+              }
+            }
+            this.recordOk(artifact.id);
+            this.clearStatus(artifact.id);
+          } catch (e) {
+            this.recordFail(artifact.id);
+            const f2 = this.failures.get(artifact.id);
+            this.setStatus(artifact.id, { phase: "stuck", repos: [], reason: String(e).slice(0, 500), ...f2 ? { retryAt: new Date(f2.nextAt).toISOString() } : {} });
+            log3?.(`[merge] ${artifact.id} \u5408\u5E76\u5931\u8D25\uFF08\u9000\u907F\u91CD\u8BD5\uFF09\uFF1A${String(e)}`);
           }
         }
-        this.clearStatus(artifactId);
       }
     };
   }
@@ -45492,11 +45947,11 @@ var init_resolve = __esm({
 });
 
 // ../server/src/coordinator/worker.ts
-var import_node_crypto22, AUTONOMOUS_ETHOS, CONVERSATIONAL_ETHOS, SHARED_GRAPH_BODY, COORDINATOR_SYSTEM_PROMPT, CONVERSATIONAL_MANAGER_BODY, CoordinatorWorker;
+var import_node_crypto21, AUTONOMOUS_ETHOS, CONVERSATIONAL_ETHOS, SHARED_GRAPH_BODY, COORDINATOR_SYSTEM_PROMPT, CONVERSATIONAL_MANAGER_BODY, CoordinatorWorker;
 var init_worker = __esm({
   "../server/src/coordinator/worker.ts"() {
     "use strict";
-    import_node_crypto22 = require("node:crypto");
+    import_node_crypto21 = require("node:crypto");
     init_src2();
     init_identity();
     AUTONOMOUS_ETHOS = `\u4F60\u662F\u8FD9\u4E2A\u5DE5\u5355\u7684**\u7BA1\u7406\u8005**\u2014\u2014\u804C\u8D23\u662F\u8BA9\u5B83\u987A\u7545\u8DD1\u5B8C\u3002\u7CFB\u7EDF\u5728\u67D0\u4E2A\u8282\u70B9\u5361\u4F4F\u3001\u673A\u68B0\u5206\u8BCA\u786E\u8BA4"\u9700\u8981\u4F60"\u65F6\u5524\u8D77\u4F60\uFF08\u65E0\u4EBA\u5728\u573A\uFF0C\u4F60\u8FD9\u4E00\u8F6E\u628A\u80FD\u505A\u7684\u505A\u6389\uFF09\u3002\u4F60\u7684\u624B\u6BB5\u5F88\u5BBD\uFF1A
@@ -45509,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
@@ -45536,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
@@ -45672,7 +46127,7 @@ ${SHARED_GRAPH_BODY}`;
         return this.deps.kernel.model.lastSeq.get(artifactId) ?? 0;
       }
       evaluationKey(kind, artifactId, evidence) {
-        const fingerprint = (0, import_node_crypto22.createHash)("sha256").update(JSON.stringify(evidence)).digest("hex");
+        const fingerprint = (0, import_node_crypto21.createHash)("sha256").update(JSON.stringify(evidence)).digest("hex");
         return `${kind}:${artifactId}:${fingerprint}`;
       }
       artifactEvidence(id) {
@@ -45702,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;
@@ -45737,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 ?? "";
@@ -45749,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),
@@ -45763,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;
@@ -45777,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;
@@ -45800,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);
@@ -45912,7 +46373,7 @@ ${SHARED_GRAPH_BODY}`;
         const token = this.deps.tokenFor(actorId, ctx);
         const serverUrl = this.deps.serverUrlFor ? await this.deps.serverUrlFor(ctx) : this.deps.serverUrl;
         const workspace = this.deps.kernel.model.artifacts.get(artifactId)?.workspace;
-        const runtimeSessionId = opts?.resumeSessionId ?? (0, import_node_crypto22.randomUUID)();
+        const runtimeSessionId = opts?.resumeSessionId ?? (0, import_node_crypto21.randomUUID)();
         const job = {
           actor: actorId,
           actorToken: token,
@@ -46008,22 +46469,22 @@ async function loadBuiltinSkills(skillsDir) {
   const skills = [];
   for (const d of dirents) {
     if (!d.isDirectory()) continue;
-    const slug6 = d.name;
-    const skillDir = (0, import_node_path4.join)(skillsDir, slug6);
+    const slug4 = d.name;
+    const skillDir = (0, import_node_path4.join)(skillsDir, slug4);
     const files = {};
     try {
       await collectDir(skillDir, skillDir, files);
     } catch (err) {
-      console.warn(`[builtin-skills] failed reading ${slug6}: ${String(err)}`);
+      console.warn(`[builtin-skills] failed reading ${slug4}: ${String(err)}`);
       continue;
     }
     const skillMd = files["SKILL.md"];
     if (!skillMd) {
-      console.warn(`[builtin-skills] ${slug6} has no SKILL.md, skipping`);
+      console.warn(`[builtin-skills] ${slug4} has no SKILL.md, skipping`);
       continue;
     }
     const { name, description } = parseSkillFrontmatter(skillMd);
-    skills.push({ id: slug6, name: name || slug6, description, files });
+    skills.push({ id: slug4, name: name || slug4, description, files });
   }
   return skills;
 }
@@ -46105,6 +46566,7 @@ var init_src5 = __esm({
     init_sync();
     init_ci_provider();
     init_ci_gate();
+    init_merge_worker();
     init_resolve();
     init_identity();
     init_worker();
@@ -49475,7 +49937,7 @@ var require_split2 = __commonJS({
 var require_helper = __commonJS({
   "../../node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/helper.js"(exports2, module2) {
     "use strict";
-    var path20 = require("path");
+    var path19 = require("path");
     var Stream = require("stream").Stream;
     var split = require_split2();
     var util2 = require("util");
@@ -49514,7 +49976,7 @@ var require_helper = __commonJS({
     };
     module2.exports.getFileName = function(rawEnv) {
       var env = rawEnv || process.env;
-      var file = env.PGPASSFILE || (isWin ? path20.join(env.APPDATA || "./", "postgresql", "pgpass.conf") : path20.join(env.HOME || "./", ".pgpass"));
+      var file = env.PGPASSFILE || (isWin ? path19.join(env.APPDATA || "./", "postgresql", "pgpass.conf") : path19.join(env.HOME || "./", ".pgpass"));
       return file;
     };
     module2.exports.usePgPass = function(stats, fname) {
@@ -49646,7 +50108,7 @@ var require_helper = __commonJS({
 var require_lib = __commonJS({
   "../../node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/index.js"(exports2, module2) {
     "use strict";
-    var path20 = require("path");
+    var path19 = require("path");
     var fs21 = require("fs");
     var helper = require_helper();
     module2.exports = function(connInfo, cb) {
@@ -51208,33 +51670,33 @@ __export(trajectory_exports, {
   exportTrajectories: () => exportTrajectories
 });
 async function exportTrajectories(dataDir) {
-  const root = path16.join(dataDir, "trajectories");
+  const root = path15.join(dataDir, "trajectories");
   if (!fs17.existsSync(root)) return [];
   const model = emptyReadModel();
-  const oplogFile = path16.join(dataDir, "oplog.ndjson");
+  const oplogFile = path15.join(dataDir, "oplog.ndjson");
   if (fs17.existsSync(oplogFile)) {
     const oplog = await NdjsonOplogStore.open(oplogFile);
     for await (const entry of oplog.readAll()) fold(model, entry.op);
   }
   const samples = [];
   for (const sessionId of fs17.readdirSync(root).sort()) {
-    const dir = path16.join(root, sessionId);
-    const sessionFile = path16.join(dir, "session.json");
+    const dir = path15.join(root, sessionId);
+    const sessionFile = path15.join(dir, "session.json");
     if (!fs17.existsSync(sessionFile)) continue;
     const session = JSON.parse(fs17.readFileSync(sessionFile, "utf8"));
     const events = [];
-    const eventsFile = path16.join(dir, "events.ndjson");
+    const eventsFile = path15.join(dir, "events.ndjson");
     if (fs17.existsSync(eventsFile)) {
       for (const line of fs17.readFileSync(eventsFile, "utf8").split("\n")) {
         if (line.trim()) events.push(JSON.parse(line));
       }
     }
     const bundle = {};
-    const bundleDir = path16.join(dir, "bundle");
+    const bundleDir = path15.join(dir, "bundle");
     const walk = (sub) => {
-      for (const name of fs17.readdirSync(path16.join(bundleDir, sub))) {
+      for (const name of fs17.readdirSync(path15.join(bundleDir, sub))) {
         const rel = sub ? `${sub}/${name}` : name;
-        const full = path16.join(bundleDir, rel);
+        const full = path15.join(bundleDir, rel);
         if (fs17.statSync(full).isDirectory()) walk(rel);
         else bundle[rel] = fs17.readFileSync(full, "utf8");
       }
@@ -51251,47 +51713,47 @@ async function exportTrajectories(dataDir) {
   }
   return samples;
 }
-var fs17, path16, FsTrajectorySink;
+var fs17, path15, FsTrajectorySink;
 var init_trajectory = __esm({
   "../cli/src/trajectory.ts"() {
     "use strict";
     fs17 = __toESM(require("node:fs"), 1);
-    path16 = __toESM(require("node:path"), 1);
+    path15 = __toESM(require("node:path"), 1);
     init_src2();
     init_src5();
     FsTrajectorySink = class {
       constructor(dataDir, broadcast) {
         this.broadcast = broadcast;
-        this.root = path16.join(dataDir, "trajectories");
+        this.root = path15.join(dataDir, "trajectories");
       }
       root;
       dir(sessionId) {
-        return path16.join(this.root, sessionId);
+        return path15.join(this.root, sessionId);
       }
       begin(session, bundleFiles) {
         const dir = this.dir(session.sessionId);
-        fs17.mkdirSync(path16.join(dir, "bundle"), { recursive: true });
-        fs17.writeFileSync(path16.join(dir, "session.json"), JSON.stringify(session, null, 2));
+        fs17.mkdirSync(path15.join(dir, "bundle"), { recursive: true });
+        fs17.writeFileSync(path15.join(dir, "session.json"), JSON.stringify(session, null, 2));
         for (const [rel, content] of Object.entries(bundleFiles)) {
-          const file = path16.join(dir, "bundle", rel);
-          fs17.mkdirSync(path16.dirname(file), { recursive: true });
+          const file = path15.join(dir, "bundle", rel);
+          fs17.mkdirSync(path15.dirname(file), { recursive: true });
           fs17.writeFileSync(file, content);
         }
         this.broadcast?.({ type: "begin", sessionId: session.sessionId, data: session });
       }
       recover(session) {
         fs17.mkdirSync(this.dir(session.sessionId), { recursive: true });
-        const file = path16.join(this.dir(session.sessionId), "session.json");
+        const file = path15.join(this.dir(session.sessionId), "session.json");
         if (!fs17.existsSync(file)) fs17.writeFileSync(file, JSON.stringify(session, null, 2));
         this.broadcast?.({ type: "begin", sessionId: session.sessionId, data: { ...session, recovered: true } });
       }
       event(sessionId, event) {
         fs17.mkdirSync(this.dir(sessionId), { recursive: true });
-        fs17.appendFileSync(path16.join(this.dir(sessionId), "events.ndjson"), JSON.stringify(event) + "\n");
+        fs17.appendFileSync(path15.join(this.dir(sessionId), "events.ndjson"), JSON.stringify(event) + "\n");
         this.broadcast?.({ type: "event", sessionId, data: event });
       }
       end(sessionId, update) {
-        const file = path16.join(this.dir(sessionId), "session.json");
+        const file = path15.join(this.dir(sessionId), "session.json");
         const session = JSON.parse(fs17.readFileSync(file, "utf8"));
         session.exit = update.exit;
         session.opRefs = update.opRefs;
@@ -51302,23 +51764,23 @@ var init_trajectory = __esm({
        *  路径逻辑复用写入侧 `this.dir()`（单一真相，随 --dir 迁移同步）；带路径穿越防护。 */
       readBundleFile(sessionId, rel) {
         if (!sessionId || sessionId.includes("/") || sessionId.includes("..")) return null;
-        const bundleRoot = path16.join(this.dir(sessionId), "bundle");
-        const target = path16.resolve(bundleRoot, rel);
-        if (target !== bundleRoot && !target.startsWith(bundleRoot + path16.sep)) return null;
+        const bundleRoot = path15.join(this.dir(sessionId), "bundle");
+        const target = path15.resolve(bundleRoot, rel);
+        if (target !== bundleRoot && !target.startsWith(bundleRoot + path15.sep)) return null;
         if (!fs17.existsSync(target) || !fs17.statSync(target).isFile()) return null;
         return fs17.readFileSync(target, "utf8");
       }
       /** 列出某会话 bundle 下所有文件的相对路径（供前端「本次输入」点开清单）。 */
       listBundle(sessionId) {
         if (!sessionId || sessionId.includes("/") || sessionId.includes("..")) return [];
-        const bundleRoot = path16.join(this.dir(sessionId), "bundle");
+        const bundleRoot = path15.join(this.dir(sessionId), "bundle");
         if (!fs17.existsSync(bundleRoot)) return [];
         const out = [];
         const walk = (d) => {
           for (const e of fs17.readdirSync(d, { withFileTypes: true })) {
-            const full = path16.join(d, e.name);
+            const full = path15.join(d, e.name);
             if (e.isDirectory()) walk(full);
-            else out.push(path16.relative(bundleRoot, full));
+            else out.push(path15.relative(bundleRoot, full));
           }
         };
         walk(bundleRoot);
@@ -51330,21 +51792,21 @@ var init_trajectory = __esm({
 
 // src/index.ts
 var fs20 = __toESM(require("node:fs"));
-var os10 = __toESM(require("node:os"));
-var path19 = __toESM(require("node:path"));
+var os9 = __toESM(require("node:os"));
+var path18 = __toESM(require("node:path"));
 var import_node_child_process15 = require("node:child_process");
 
 // ../cli/src/cli.ts
 var fs19 = __toESM(require("node:fs"), 1);
-var os9 = __toESM(require("node:os"), 1);
-var path18 = __toESM(require("node:path"), 1);
-var import_node_crypto27 = require("node:crypto");
+var os8 = __toESM(require("node:os"), 1);
+var path17 = __toESM(require("node:path"), 1);
+var import_node_crypto26 = require("node:crypto");
 
 // ../cli/src/serve.ts
 var fs18 = __toESM(require("node:fs"), 1);
-var os8 = __toESM(require("node:os"), 1);
-var path17 = __toESM(require("node:path"), 1);
-var import_node_crypto25 = require("node:crypto");
+var os7 = __toESM(require("node:os"), 1);
+var path16 = __toESM(require("node:path"), 1);
+var import_node_crypto24 = require("node:crypto");
 var import_node_url4 = require("node:url");
 init_src2();
 init_src5();
@@ -52261,7 +52723,7 @@ function defaultDocumentPath2(input) {
 init_src4();
 
 // ../storage/src/postgres.ts
-var import_node_crypto23 = require("node:crypto");
+var import_node_crypto22 = require("node:crypto");
 
 // ../../node_modules/.pnpm/pg@8.21.0/node_modules/pg/esm/index.mjs
 var import_lib = __toESM(require_lib2(), 1);
@@ -52396,7 +52858,7 @@ var PostgresBlobStore = class _PostgresBlobStore {
     return new _PostgresBlobStore(pool, schema);
   }
   async put(bytes) {
-    const hash = (0, import_node_crypto23.createHash)("sha256").update(bytes).digest("hex");
+    const hash = (0, import_node_crypto22.createHash)("sha256").update(bytes).digest("hex");
     await this.pool.query(
       `INSERT INTO ${this.t} (hash, bytes, size, content_type) VALUES ($1, $2, $3, $4) ON CONFLICT (hash) DO NOTHING`,
       [hash, Buffer.from(bytes), bytes.byteLength, sniffContentType(bytes) ?? null]
@@ -53861,8 +54323,8 @@ var PostgresControlPlaneStore = class _PostgresControlPlaneStore {
     const r = await this.pool.query(`SELECT * FROM ${this.s}.companies WHERE id = $1`, [id]);
     return r.rows[0] ? rowToCompany(r.rows[0]) : null;
   }
-  async getCompanyBySlug(slug6) {
-    const r = await this.pool.query(`SELECT * FROM ${this.s}.companies WHERE slug = $1`, [slug6]);
+  async getCompanyBySlug(slug4) {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.companies WHERE slug = $1`, [slug4]);
     return r.rows[0] ? rowToCompany(r.rows[0]) : null;
   }
   async listCompanies() {
@@ -54306,7 +54768,7 @@ var PostgresTraceStore = class _PostgresTraceStore {
         run.exitReason,
         run.errorCode,
         run.errorMessage,
-        JSON.stringify(run.usage),
+        run.usage === null ? null : JSON.stringify(run.usage),
         run.effectiveModel,
         run.modelSource,
         run.transcriptRef,
@@ -54353,7 +54815,7 @@ var PostgresTraceStore = class _PostgresTraceStore {
     for (const [key, spec] of Object.entries(_PostgresTraceStore.RUN_COLS)) {
       if (!(key in patch)) continue;
       const v2 = patch[key];
-      args.push(spec.json ? JSON.stringify(v2 ?? null) : v2 ?? null);
+      args.push(spec.json ? v2 == null ? null : JSON.stringify(v2) : v2 ?? null);
       sets.push(spec.json ? `${spec.col}=$${args.length}::jsonb` : `${spec.col}=$${args.length}`);
     }
     args.push(this.now());
@@ -54418,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];
@@ -54706,7 +55184,7 @@ var PostgresTraceStore = class _PostgresTraceStore {
            COALESCE(SUM(COALESCE((usage->>'cacheCreationTokens')::bigint, 0)), 0),
            COALESCE(SUM(COALESCE((usage->>'costUsdMicros')::bigint, 0)), 0)
          FROM ${this.s}.agent_runs
-         WHERE usage IS NOT NULL
+         WHERE jsonb_typeof(usage) = 'object'
            AND started_at >= $2 AND started_at < $3
          GROUP BY actor_id, runtime_instance_id, runtime_kind, effective_model, hour`,
         [cid, from, to]
@@ -55412,7 +55890,7 @@ var rowToMessage = (row) => ({
 });
 
 // ../storage/src/postgres-nodes.ts
-var import_node_crypto24 = require("node:crypto");
+var import_node_crypto23 = require("node:crypto");
 var ident8 = (s2) => {
   if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
   return s2;
@@ -55550,7 +56028,7 @@ var PostgresNodeTokenStore = class _PostgresNodeTokenStore {
     return store;
   }
   issue(nodeId) {
-    const token = `ont_${(0, import_node_crypto24.randomBytes)(24).toString("base64url")}`;
+    const token = `ont_${(0, import_node_crypto23.randomBytes)(24).toString("base64url")}`;
     this.cache.set(token, nodeId);
     void this.pool.query(`INSERT INTO ${this.s}.node_tokens (token,node_id) VALUES ($1,$2)`, [token, nodeId]);
     return token;
@@ -55697,7 +56175,7 @@ function builtinSkillsDir() {
   const override = process.env["OASIS_BUILTIN_SKILLS_DIR"]?.trim();
   if (override) return override;
   const repoRoot = (0, import_node_url4.fileURLToPath)(new URL("../../../", __esm_import_meta_url));
-  return path17.join(repoRoot, "skills");
+  return path16.join(repoRoot, "skills");
 }
 function materializeBuiltins(builtins, runtimeKind) {
   if (builtins.length === 0) return {};
@@ -55731,10 +56209,10 @@ var oasisWrapperCache;
 function oasisWrapperScript() {
   if (oasisWrapperCache && fs18.existsSync(oasisWrapperCache)) return oasisWrapperCache;
   const repoRoot = (0, import_node_url4.fileURLToPath)(new URL("../../../", __esm_import_meta_url));
-  const tsx = path17.join(repoRoot, "node_modules/.bin/tsx");
-  const main = path17.join(repoRoot, "packages/cli/src/main.ts");
-  const dir = fs18.mkdtempSync(path17.join(os8.tmpdir(), "oasis-cli-"));
-  const wrapper = path17.join(dir, "oasis");
+  const tsx = path16.join(repoRoot, "node_modules/.bin/tsx");
+  const main = path16.join(repoRoot, "packages/cli/src/main.ts");
+  const dir = fs18.mkdtempSync(path16.join(os7.tmpdir(), "oasis-cli-"));
+  const wrapper = path16.join(dir, "oasis");
   fs18.writeFileSync(wrapper, `#!/usr/bin/env bash
 exec ${JSON.stringify(tsx)} ${JSON.stringify(main)} "$@"
 `);
@@ -55826,7 +56304,7 @@ function traceRuntimeKind(runtimeKind) {
 async function startServe(opts) {
   const serverStartedAt = (/* @__PURE__ */ new Date()).toISOString();
   fs18.mkdirSync(opts.dir, { recursive: true });
-  const serverHeartbeatFile = path17.join(opts.dir, "serve-heartbeat.json");
+  const serverHeartbeatFile = path16.join(opts.dir, "serve-heartbeat.json");
   let previousServerHeartbeatAt;
   if (fs18.existsSync(serverHeartbeatFile)) {
     try {
@@ -55842,7 +56320,7 @@ async function startServe(opts) {
   writeServerHeartbeat();
   const serverHeartbeatTimer = setInterval(writeServerHeartbeat, 5e3);
   serverHeartbeatTimer.unref?.();
-  const lock = path17.join(opts.dir, "serve.lock");
+  const lock = path16.join(opts.dir, "serve.lock");
   if (fs18.existsSync(lock)) {
     const pid = Number(fs18.readFileSync(lock, "utf8"));
     let alive = false;
@@ -55856,15 +56334,15 @@ async function startServe(opts) {
   }
   fs18.writeFileSync(lock, String(process.pid));
   const loadJson = (name) => {
-    const file = path17.join(opts.dir, name);
+    const file = path16.join(opts.dir, name);
     return fs18.existsSync(file) ? JSON.parse(fs18.readFileSync(file, "utf8")) : void 0;
   };
   const pgDsn = process.env["OASIS_PG_DSN"] ?? process.env["DATABASE_URL"];
   const pgSchema = process.env["OASIS_PG_SCHEMA"] ?? "public";
   const pgPool = pgDsn ? createPgPool(pgDsn) : void 0;
-  const oplog = pgDsn && pgPool ? await PostgresOplogStore.open(pgPool, pgSchema) : await NdjsonOplogStore.open(path17.join(opts.dir, "oplog.ndjson"));
-  const blobs = pgDsn && pgPool ? await PostgresBlobStore.open(pgPool, pgSchema) : new DirBlobStore(path17.join(opts.dir, "blobs"));
-  const assets = new DirBlobStore(path17.join(opts.dir, "assets"));
+  const oplog = pgDsn && pgPool ? await PostgresOplogStore.open(pgPool, pgSchema) : await NdjsonOplogStore.open(path16.join(opts.dir, "oplog.ndjson"));
+  const blobs = pgDsn && pgPool ? await PostgresBlobStore.open(pgPool, pgSchema) : new DirBlobStore(path16.join(opts.dir, "blobs"));
+  const assets = new DirBlobStore(path16.join(opts.dir, "assets"));
   const defaultRootSchema = [
     { name: "brief", description: "\u5DE5\u5355\u603B\u7EB2\uFF1A\u53D1\u8D77\u65B9\u5BF9\u9F50\u7684\u603B\u76EE\u6807\u4E0E\u8303\u56F4\uFF0C\u6574\u5F20\u534F\u4F5C\u56FE\u7684\u6839\u3002", contentType: "text", ownerRole: "founder" },
     {
@@ -55882,7 +56360,7 @@ async function startServe(opts) {
   if (!schema.some((d) => d.name === "document")) {
     schema.push({ name: "document", description: "\u901A\u7528\u6587\u6863\uFF1A\u672A\u7EC6\u5206\u7684\u6587\u5B57\u4EA7\u7269\uFF08\u5177\u4F53\u7C7B\u578B\u89C1 docType\uFF09\u3002", contentType: "text", ownerRole: "writer" });
   }
-  const typeStore = await FileTypeRegistryStore.open(path17.join(opts.dir, "type-registry.json"));
+  const typeStore = await FileTypeRegistryStore.open(path16.join(opts.dir, "type-registry.json"));
   if ((await typeStore.list()).length === 0) for (const d of schema) await typeStore.put(d);
   {
     const live = await typeStore.list();
@@ -55890,7 +56368,7 @@ async function startServe(opts) {
     schema.length = 0;
     schema.push(...live);
   }
-  const registryStore = pgDsn && pgPool ? await PostgresRegistryStore.open(pgPool, pgSchema) : await FileRegistryStore.open(path17.join(opts.dir, "registry-store.json"));
+  const registryStore = pgDsn && pgPool ? await PostgresRegistryStore.open(pgPool, pgSchema) : await FileRegistryStore.open(path16.join(opts.dir, "registry-store.json"));
   try {
     await backfillSkillContentFromAssets(registryStore, assets);
   } catch (err) {
@@ -55914,14 +56392,14 @@ async function startServe(opts) {
     // per-contentType merge facet（§5.6）：text=expensive→group-commit、code/structured=cheap→顺序 rebase
     handlers: defaultHandlersByContentType()
   });
-  const issuer = createTokenIssuer({ secretFile: path17.join(opts.dir, "session-token-secret") });
-  const operatorActor = `actor:human:${os8.userInfo().username}`;
+  const issuer = createTokenIssuer({ secretFile: path16.join(opts.dir, "session-token-secret") });
+  const operatorActor = `actor:human:${os7.userInfo().username}`;
   const operatorToken = issuer.issue(operatorActor);
-  fs18.writeFileSync(path17.join(opts.dir, "operator-token"), operatorToken, { mode: 384 });
-  let nodeTokens = createNodeTokenStore(path17.join(opts.dir, "node-tokens.json"));
-  const enrollTokens = createEnrollTokenStore(30 * 60 * 1e3, path17.join(opts.dir, "enroll-tokens.json"));
-  let nodeStore = await FileNodeStore.open(path17.join(opts.dir, "nodes.json"));
-  const registryAuditFile = path17.join(opts.dir, "registry-audit.ndjson");
+  fs18.writeFileSync(path16.join(opts.dir, "operator-token"), operatorToken, { mode: 384 });
+  let nodeTokens = createNodeTokenStore(path16.join(opts.dir, "node-tokens.json"));
+  const enrollTokens = createEnrollTokenStore(30 * 60 * 1e3, path16.join(opts.dir, "enroll-tokens.json"));
+  let nodeStore = await FileNodeStore.open(path16.join(opts.dir, "nodes.json"));
+  const registryAuditFile = path16.join(opts.dir, "registry-audit.ndjson");
   const registryListeners = /* @__PURE__ */ new Set();
   const registryAudit = (record5) => {
     fs18.appendFile(registryAuditFile, JSON.stringify(record5) + "\n", () => {
@@ -55963,9 +56441,9 @@ async function startServe(opts) {
     nodeTokens = await PostgresNodeTokenStore.open(pgPool, pgSchema);
     console.log(`[serve] \u4E8B\u5B9E/\u72B6\u6001\u4F53\u7CFB\uFF1APostgres schema=${pgSchema}\uFF08oplog / registry / blobs / artifacts / chat\uFF09`);
   } else {
-    projectStateStore = await FileProjectStateStore.open(path17.join(opts.dir, "artifact-document-projects.json"));
-    artifactStateStore = await FileArtifactStateStore.open(path17.join(opts.dir, "artifact-document-state.json"));
-    chatSessionStore = await FileChatSessionStore.open(path17.join(opts.dir, "chat-sessions.json"));
+    projectStateStore = await FileProjectStateStore.open(path16.join(opts.dir, "artifact-document-projects.json"));
+    artifactStateStore = await FileArtifactStateStore.open(path16.join(opts.dir, "artifact-document-state.json"));
+    chatSessionStore = await FileChatSessionStore.open(path16.join(opts.dir, "chat-sessions.json"));
     console.log("[serve] \u4EA4\u4ED8\u7269\u72B6\u6001\u4F53\u7CFB\uFF1A\u672C\u5730 JSON dev store");
     console.log("[serve] \u8282\u70B9/\u8FD0\u884C\u65F6\u4F53\u7CFB\uFF1A\u672C\u5730 JSON dev store");
   }
@@ -55984,7 +56462,7 @@ async function startServe(opts) {
     });
     console.log(`[serve] \u9879\u76EE\u6587\u6863\u4F53\u7CFB\uFF1AOutline ${outlineUrl}\uFF08\u6302\u5728 Team Workspace\u300C\u9879\u76EE\u300D\u4E0B\uFF09`);
   } else {
-    projectDocumentStore = await FileProjectDocumentStore.open(path17.join(opts.dir, "project-document-spaces.json"));
+    projectDocumentStore = await FileProjectDocumentStore.open(path16.join(opts.dir, "project-document-spaces.json"));
     console.log("[serve] \u9879\u76EE\u6587\u6863\u4F53\u7CFB\uFF1A\u672C\u5730\u5185\u5B58/\u6587\u4EF6 dev store");
   }
   const registryActorNames = /* @__PURE__ */ new Map();
@@ -56018,7 +56496,7 @@ async function startServe(opts) {
     traceStore = await PostgresTraceStore.open(tracePool, pgSchema);
     console.log(`[serve] \u8FD0\u884C\u8F68\u8FF9\u4F53\u7CFB\uFF1APostgres schema=${pgSchema}${traceDsn === pgDsn ? "" : "\uFF08\u72EC\u7ACB trace \u5E93\uFF09"}`);
   } else {
-    traceStore = await FileTraceStore.open(path17.join(opts.dir, "trace"));
+    traceStore = await FileTraceStore.open(path16.join(opts.dir, "trace"));
     console.log("[serve] \u8FD0\u884C\u8F68\u8FF9\u4F53\u7CFB\uFF1A\u672C\u5730 ndjson dev store");
   }
   traceStoreForActors = traceStore;
@@ -56039,7 +56517,7 @@ async function startServe(opts) {
     create: createSeededWorkorder,
     projectExists: async (id) => Boolean(await projectStateStore.getProject(id))
   });
-  const controlPlaneStore = pgDsn && pgPool ? await PostgresControlPlaneStore.open(pgPool, pgSchema) : await FileControlPlaneStore.open(path17.join(opts.dir, "control-plane.json"));
+  const controlPlaneStore = pgDsn && pgPool ? await PostgresControlPlaneStore.open(pgPool, pgSchema) : await FileControlPlaneStore.open(path16.join(opts.dir, "control-plane.json"));
   if (pgDsn && pgPool) {
     const priceStore = await PostgresModelPriceStore.open(pgPool, pgSchema);
     setModelPriceCacheLoader(async () => {
@@ -56128,8 +56606,8 @@ async function startServe(opts) {
     }
     return auth.sessionAccountId(headers);
   };
-  const workorderDrafts = new WorkorderDraftStore(path17.join(opts.dir, "workorder-drafts.json"));
-  const journalFile = path17.join(opts.dir, "dispatch-journal.ndjson");
+  const workorderDrafts = new WorkorderDraftStore(path16.join(opts.dir, "workorder-drafts.json"));
+  const journalFile = path16.join(opts.dir, "dispatch-journal.ndjson");
   const journalRing = [];
   if (fs18.existsSync(journalFile)) {
     try {
@@ -56173,7 +56651,7 @@ async function startServe(opts) {
     defaultEngine: { kernel, oplog, blobs, registry: registryStore, assets },
     defaultCompanyId,
     buildEngine: async (companyId) => {
-      const engine2 = await openFileEngine(path17.join(opts.dir, "companies", companyEngineDirName(companyId)), { schema });
+      const engine2 = await openFileEngine(path16.join(opts.dir, "companies", companyEngineDirName(companyId)), { schema });
       await ensureCompanyActors(controlPlaneStore, companyId, engine2.registry);
       await syncRegistryRolesToKernel(engine2.registry, engine2.kernel);
       return engine2;
@@ -56290,7 +56768,7 @@ async function startServe(opts) {
         }));
       }
       const limits = { wallClockMs: SESSION_WALL_CLOCK_MS.planner };
-      const artifactId = `artifact:planner:${(0, import_node_crypto25.randomUUID)()}`;
+      const artifactId = `artifact:planner:${(0, import_node_crypto24.randomUUID)()}`;
       const handle = await chatRemoteAdapter.spawn({
         actor: planner.id,
         actorToken: issueSessionToken(planner.id, { artifactId, action: "plan-workorder", limits, binding }),
@@ -56318,7 +56796,7 @@ async function startServe(opts) {
     resolveCodeRepo: (ws) => resolveCodeRepoRef?.(ws) ?? null,
     // B3 auto-merge（§9.7）：part propose 时把工作分支合进伞分支的兜底 mirror 根——与 GitSyncWorker/CiGate
     // 的 git-mirrors **分开**（各自 checkout 不同分支，共享 clone 会竞态）。
-    gitMirrorRoot: path17.join(opts.dir, "propose-mirrors"),
+    gitMirrorRoot: path16.join(opts.dir, "propose-mirrors"),
     domains: [
       actors.register,
       companies.register,
@@ -56336,6 +56814,7 @@ async function startServe(opts) {
       collabDomain({
         kernel,
         oplog,
+        trace: trace.service,
         registry: registryStore,
         artifacts: artifactStateStore,
         dispatchJournal: () => journalRing.slice(-200),
@@ -56401,8 +56880,8 @@ async function startServe(opts) {
     },
     retainedSession: (key) => key.annotationId && key.artifactId ? allDispatchers().map((d) => d.retainedProduceSessionFor(key.artifactId)).find(Boolean) : coordinatorRef?.retainedSessionFor(key),
     // 0030 D3/D7 落盘：discuss 按项表写文件，serve 重启后同一卡点续同一段、不再新开。
-    discussSessions: new FileSideMap(path17.join(opts.dir, "discuss-sessions.json")),
-    escalateDiscussRetain: new FileSideMap(path17.join(opts.dir, "escalate-discuss-retain.json")),
+    discussSessions: new FileSideMap(path16.join(opts.dir, "discuss-sessions.json")),
+    escalateDiscussRetain: new FileSideMap(path16.join(opts.dir, "escalate-discuss-retain.json")),
     // 切片 2b：代署 escalate 发起会话保留（落盘）
     dispatchChat: async ({ actorId, message, sessionId, chatSessionId, attachments, workspace, companyId }) => {
       const runCompanyId = companyId ?? defaultCompanyId;
@@ -56425,10 +56904,10 @@ async function startServe(opts) {
       if (!localUrl) {
         throw new ApiError(503, "SERVER_URL_NOT_READY", "server URL \u5C1A\u672A\u5C31\u7EEA");
       }
-      const runtimeSessionId = sessionId ?? (0, import_node_crypto25.randomUUID)();
+      const runtimeSessionId = sessionId ?? (0, import_node_crypto24.randomUUID)();
       const resumeRuntimeSession = Boolean(sessionId);
-      const traceRunId = `chat-run:${(0, import_node_crypto25.randomUUID)()}`;
-      const artifactId = `artifact:chat:${(0, import_node_crypto25.randomUUID)()}`;
+      const traceRunId = `chat-run:${(0, import_node_crypto24.randomUUID)()}`;
+      const artifactId = `artifact:chat:${(0, import_node_crypto24.randomUUID)()}`;
       const traceStartedAt = (/* @__PURE__ */ new Date()).toISOString();
       let traceSeq = 0;
       let lastProgressTouchMs = 0;
@@ -56707,7 +57186,7 @@ ${detail}` : genericLine));
   console.log(`[serve] \u8FDC\u7A0B agent API URL\uFF1A${remoteApiUrl ?? "\u672A\u914D\u7F6E\uFF08\u4EC5\u652F\u6301\u672C\u673A runtime\uFF09"}`);
   const projectsCfg = loadJson("projects.json");
   const seedProjects = (projectsCfg?.projects ?? []).map(
-    (p2) => p2.repos?.length ? { ...p2, repos: p2.repos.map((r) => r.repoDir ? { ...r, repoDir: path17.resolve(opts.dir, r.repoDir) } : r) } : p2
+    (p2) => p2.repos?.length ? { ...p2, repos: p2.repos.map((r) => r.repoDir ? { ...r, repoDir: path16.resolve(opts.dir, r.repoDir) } : r) } : p2
   );
   for (const sp of seedProjects) {
     const existing = await projectStateStore.getProject(sp.id);
@@ -56837,8 +57316,8 @@ ${detail}` : genericLine));
         // 每 agent 并发产出上限默认 5（工单数 / 全局总量默认不限）；--max-produce-per-agent N 覆盖。
         maxConcurrentProducePerActor: opts.maxConcurrentProducePerActor ?? 5,
         // 提案 uniform-annotation-resolve ③/④ 落盘：容错计数 + produce 会话号（重启不丢；丢了也只是降级/多容错一轮）
-        annotationRescue: new FileSideMap(path17.join(opts.dir, `annotation-rescue.${companyId}.json`)),
-        produceSessions: new FileSideMap(path17.join(opts.dir, `produce-sessions.${companyId}.json`))
+        annotationRescue: new FileSideMap(path16.join(opts.dir, `annotation-rescue.${companyId}.json`)),
+        produceSessions: new FileSideMap(path16.join(opts.dir, `produce-sessions.${companyId}.json`))
       });
       const slot = { dispatcher: d, logged: 0, ticking: false };
       dispatchers.set(companyId, slot);
@@ -57010,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)}`));
@@ -57024,7 +57512,7 @@ ${detail}` : genericLine));
       schema: schemaMap,
       mirrors: new Map(opts.mirror.connectors.map((c) => [c.platform, c])),
       identities: opts.mirror.identities ?? new MapMirrorIdentities(),
-      state: new FsMirrorStateStore(path17.join(opts.dir, "mirror-state.json")),
+      state: new FsMirrorStateStore(path16.join(opts.dir, "mirror-state.json")),
       ...opts.mirror.debounceMs !== void 0 ? { debounceMs: opts.mirror.debounceMs } : {},
       log: (m2) => console.log(m2)
     });
@@ -57034,27 +57522,20 @@ ${detail}` : genericLine));
   }
   let gitTimer;
   if (opts.dispatch) {
-    if (ciGateEnabled) {
-      const ci = new GhCiProvider({
-        mirrorRoot: path17.join(opts.dir, "git-mirrors"),
-        failClosedWhenNoChecks: process.env["OASIS_CI_FAIL_CLOSED"] === "1",
-        log: (m2) => console.log(m2)
-      });
-      const ciGate = new CiGateWorker({ kernel, resolveProject, ci, statusSink: ciGateStatus, log: (m2) => console.log(m2) });
-      gitTimer = setInterval(() => {
-        void ciGate.tick().catch((err) => console.error(`[ci] tick \u5931\u8D25: ${String(err)}`));
-      }, 3e4);
-    } else {
-      const gitSync = new GitSyncWorker({
-        kernel,
-        resolveProject,
-        mirrorRoot: path17.join(opts.dir, "git-mirrors"),
-        log: (m2) => console.log(m2)
-      });
-      gitTimer = setInterval(() => {
-        void gitSync.tick().catch((err) => console.error(`[git] \u540C\u6B65\u5931\u8D25: ${String(err)}`));
-      }, 3e4);
-    }
+    const gitMirrorRoot = path16.join(opts.dir, "git-mirrors");
+    const ci = new GhCiProvider({
+      mirrorRoot: gitMirrorRoot,
+      failClosedWhenNoChecks: process.env["OASIS_CI_FAIL_CLOSED"] === "1",
+      log: (m2) => console.log(m2)
+    });
+    const mergeWorker = new MergeWorker({ kernel, resolveProject, ci, mirrorRoot: gitMirrorRoot, statusSink: ciGateStatus, log: (m2) => console.log(m2) });
+    const ciGate = ciGateEnabled ? new CiGateWorker({ kernel, resolveProject, ci, statusSink: ciGateStatus, log: (m2) => console.log(m2) }) : void 0;
+    gitTimer = setInterval(() => {
+      void (async () => {
+        if (ciGate) await ciGate.tick().catch((err) => console.error(`[ci] tick \u5931\u8D25: ${String(err)}`));
+        await mergeWorker.tick().catch((err) => console.error(`[merge] tick \u5931\u8D25: ${String(err)}`));
+      })();
+    }, 3e4);
   }
   let coordTimer;
   let livenessTimer;
@@ -57109,7 +57590,7 @@ ${detail}` : genericLine));
       // 病历里展示节点的"在跑会话情况"（runId + 跑了多久）：从派发器在途会话按 artifactId 过滤。
       sessionsOf: (id) => allDispatchers().flatMap((d) => d.inFlightSessions()).filter((s2) => s2.artifactId === id).map((s2) => ({ runId: s2.sessionId, action: s2.action, startedAt: s2.startedAt })),
       log: (m2) => console.log(m2),
-      retention: new FileSideMap(path17.join(opts.dir, "retained-sessions.json"))
+      retention: new FileSideMap(path16.join(opts.dir, "retained-sessions.json"))
       // 0030 D7 落盘
     });
     coordinatorRef = coordinator;
@@ -57653,7 +58134,7 @@ async function startNode(opts) {
 // ../cli/src/daemon/machine-id.ts
 var import_node_child_process14 = require("node:child_process");
 var import_node_fs6 = require("node:fs");
-var import_node_crypto26 = require("node:crypto");
+var import_node_crypto25 = require("node:crypto");
 var import_node_os7 = require("node:os");
 function linuxMachineId() {
   for (const p2 of ["/etc/machine-id", "/var/lib/dbus/machine-id"]) {
@@ -57719,7 +58200,7 @@ var defaultSources = {
 function resolveNodeId(sources = {}) {
   const s2 = { ...defaultSources, ...sources };
   const material = `${s2.machineFingerprint()}:${s2.osUser()}`;
-  const digest = (0, import_node_crypto26.createHash)("sha256").update(material).digest("hex").slice(0, 12);
+  const digest = (0, import_node_crypto25.createHash)("sha256").update(material).digest("hex").slice(0, 12);
   return `node-${digest}`;
 }
 
@@ -57889,8 +58370,8 @@ function makeClient(base, token) {
       if (!res.ok) await fail(res);
       return (await res.json()).data;
     },
-    async request(method, path20, body) {
-      const res = await fetch(`${base}${path20}`, {
+    async request(method, path19, body) {
+      const res = await fetch(`${base}${path19}`, {
         method,
         headers,
         ...body !== void 0 ? { body: JSON.stringify(body) } : {}
@@ -57898,8 +58379,8 @@ function makeClient(base, token) {
       if (!res.ok) await fail(res);
       return await res.json();
     },
-    async post(path20, body) {
-      const res = await fetch(`${base}${path20}`, { method: "POST", headers, body: JSON.stringify(body) });
+    async post(path19, body) {
+      const res = await fetch(`${base}${path19}`, { method: "POST", headers, body: JSON.stringify(body) });
       if (!res.ok) await fail(res);
       return await res.json();
     }
@@ -57912,14 +58393,14 @@ async function runCli(argv, println = console.log) {
     return;
   }
   const { positional, flags } = parseArgs(rest);
-  const dir = flags.get("dir") ?? process.env["OASIS_DIR"] ?? path18.resolve(".oasis");
+  const dir = flags.get("dir") ?? process.env["OASIS_DIR"] ?? path17.resolve(".oasis");
   if (command === "node" && positional[0] !== "output") {
     const serverUrl = flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"] ?? "ws://127.0.0.1:7320/node-gateway";
     const nodeName = flags.get("name") ?? process.env["OASIS_NODE_NAME"];
-    const nodeIdFile = path18.join(dir, "node-id");
-    const nodeTokenFile = path18.join(dir, "node-token");
-    const enrollTokenFile = path18.join(dir, "enroll-token");
-    const reportMarkerFile = path18.join(dir, "report-runtimes");
+    const nodeIdFile = path17.join(dir, "node-id");
+    const nodeTokenFile = path17.join(dir, "node-token");
+    const enrollTokenFile = path17.join(dir, "enroll-token");
+    const reportMarkerFile = path17.join(dir, "report-runtimes");
     const persistedNodeId = fs19.existsSync(nodeIdFile) ? fs19.readFileSync(nodeIdFile, "utf8").trim() : null;
     let nodeId = persistedNodeId || resolveNodeId();
     let token2 = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? (fs19.existsSync(nodeTokenFile) ? fs19.readFileSync(nodeTokenFile, "utf8").trim() : void 0);
@@ -57930,7 +58411,7 @@ async function runCli(argv, println = console.log) {
       const res = await fetch(`${httpBase2}/api/nodes/exchange`, {
         method: "POST",
         headers: { "content-type": "application/json" },
-        body: JSON.stringify({ enrollToken, nodeId, hostname: os9.hostname() })
+        body: JSON.stringify({ enrollToken, nodeId, hostname: os8.hostname() })
       });
       if (!res.ok) throw new Error(`enroll token exchange failed: HTTP ${res.status}`);
       const body = await res.json();
@@ -57960,11 +58441,11 @@ async function runCli(argv, println = console.log) {
       println("\u2192 Installing oasis_test globally...");
       spawnSync("npm", ["install", "-g", "oasis_test@latest"], { stdio: "inherit" });
       const prefix = execSync2("npm prefix -g").toString().trim();
-      const binPath = path18.join(prefix, "bin", "oasis_test");
+      const binPath = path17.join(prefix, "bin", "oasis_test");
       const svcArgs = `node --server-ws ${serverUrl} --dir ${dir}${nodeName ? ` --name ${nodeName}` : ""}`;
       if (process.platform === "linux") {
-        const svcFile = path18.join(os9.homedir(), ".config/systemd/user/oasis-node.service");
-        fs19.mkdirSync(path18.dirname(svcFile), { recursive: true });
+        const svcFile = path17.join(os8.homedir(), ".config/systemd/user/oasis-node.service");
+        fs19.mkdirSync(path17.dirname(svcFile), { recursive: true });
         if (spawnSync("systemctl", ["--user", "is-active", "--quiet", "oasis-node"], {}).status === 0)
           spawnSync("systemctl", ["--user", "stop", "oasis-node"], { stdio: "inherit" });
         fs19.writeFileSync(svcFile, [
@@ -57976,7 +58457,7 @@ async function runCli(argv, println = console.log) {
           `ExecStart=${binPath} ${svcArgs}`,
           // Carry the install-time PATH so the detached daemon detects CLIs in user dirs
           // (~/.npm-global/bin, ~/.local/bin) — systemd --user otherwise gives a minimal PATH.
-          `Environment=PATH=${process.env["PATH"] ?? ""}:${path18.join(os9.homedir(), ".npm-global/bin")}:${path18.join(os9.homedir(), ".local/bin")}:/usr/local/bin`,
+          `Environment=PATH=${process.env["PATH"] ?? ""}:${path17.join(os8.homedir(), ".npm-global/bin")}:${path17.join(os8.homedir(), ".local/bin")}:/usr/local/bin`,
           "Restart=on-failure",
           "RestartSec=5",
           "StandardOutput=journal",
@@ -57988,23 +58469,23 @@ async function runCli(argv, println = console.log) {
         ].join("\n"));
         spawnSync("systemctl", ["--user", "daemon-reload"], { stdio: "inherit" });
         spawnSync("systemctl", ["--user", "enable", "--now", "oasis-node"], { stdio: "inherit" });
-        spawnSync("loginctl", ["enable-linger", os9.userInfo().username], { stdio: "ignore" });
+        spawnSync("loginctl", ["enable-linger", os8.userInfo().username], { stdio: "ignore" });
         println("\u2713 Oasis node service started (systemd --user oasis-node)");
         println("  Status : systemctl --user status oasis-node");
         println("  Logs   : journalctl --user -u oasis-node -f");
         println("  Stop   : systemctl --user stop oasis-node");
       } else if (process.platform === "darwin") {
-        const plist = path18.join(os9.homedir(), "Library/LaunchAgents/com.oasis.node.plist");
-        fs19.mkdirSync(path18.dirname(plist), { recursive: true });
+        const plist = path17.join(os8.homedir(), "Library/LaunchAgents/com.oasis.node.plist");
+        fs19.mkdirSync(path17.dirname(plist), { recursive: true });
         spawnSync("launchctl", ["unload", plist], { stdio: "ignore" });
         const argXml = [binPath, "node", "--server-ws", serverUrl, "--dir", dir, ...nodeName ? ["--name", nodeName] : []].map((a) => `<string>${a}</string>`).join("");
-        fs19.writeFileSync(plist, `<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0"><dict><key>Label</key><string>com.oasis.node</string><key>ProgramArguments</key><array>${argXml}</array><key>RunAtLoad</key><true/><key>KeepAlive</key><true/><key>StandardOutPath</key><string>${os9.homedir()}/.oasis-node.log</string><key>StandardErrorPath</key><string>${os9.homedir()}/.oasis-node.err</string></dict></plist>`);
+        fs19.writeFileSync(plist, `<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0"><dict><key>Label</key><string>com.oasis.node</string><key>ProgramArguments</key><array>${argXml}</array><key>RunAtLoad</key><true/><key>KeepAlive</key><true/><key>StandardOutPath</key><string>${os8.homedir()}/.oasis-node.log</string><key>StandardErrorPath</key><string>${os8.homedir()}/.oasis-node.err</string></dict></plist>`);
         spawnSync("launchctl", ["load", plist], { stdio: "inherit" });
         println("\u2713 Oasis node service started (macOS LaunchAgent com.oasis.node)");
-        println(`  Logs : tail -f ${os9.homedir()}/.oasis-node.log`);
+        println(`  Logs : tail -f ${os8.homedir()}/.oasis-node.log`);
         println(`  Stop : launchctl unload ${plist}`);
       } else {
-        spawnSync("sh", ["-c", `nohup ${binPath} ${svcArgs} > ${path18.join(os9.homedir(), ".oasis-node.log")} 2>&1 &`], { stdio: "inherit" });
+        spawnSync("sh", ["-c", `nohup ${binPath} ${svcArgs} > ${path17.join(os8.homedir(), ".oasis-node.log")} 2>&1 &`], { stdio: "inherit" });
         println(`\u2713 Oasis node started in background (nohup). Logs: ~/.oasis-node.log`);
         println("  Note: no automatic restart on reboot in this environment.");
       }
@@ -58020,14 +58501,14 @@ async function runCli(argv, println = console.log) {
     return;
   }
   if (command === "node-token") {
-    const store = createNodeTokenStore(path18.join(dir, "node-tokens.json"));
+    const store = createNodeTokenStore(path17.join(dir, "node-tokens.json"));
     const sub = positional[0];
     if (sub === "issue") {
-      const id = flags.get("id") ?? `node-${(0, import_node_crypto27.randomUUID)()}`;
+      const id = flags.get("id") ?? `node-${(0, import_node_crypto26.randomUUID)()}`;
       const token2 = store.issue(id);
       println(token2);
       process.stderr.write(
-        `\u5DF2\u4E3A ${id} \u7B7E\u53D1 node-token\uFF08\u5199\u5165 ${path18.join(dir, "node-tokens.json")}\uFF09\u3002
+        `\u5DF2\u4E3A ${id} \u7B7E\u53D1 node-token\uFF08\u5199\u5165 ${path17.join(dir, "node-tokens.json")}\uFF09\u3002
 \u628A\u4E0A\u9762\u8FD9\u4E32\u653E\u5230\u8282\u70B9\u673A\uFF1A--token <t> / $OASIS_NODE_TOKEN / <\u8282\u70B9dir>/node-token
 `
       );
@@ -58048,7 +58529,7 @@ async function runCli(argv, println = console.log) {
   }
   if (command === "admin" && positional[0] === "grant-owner") {
     const email2 = need(flags, "email");
-    const store = await FileControlPlaneStore.open(path18.join(dir, "control-plane.json"));
+    const store = await FileControlPlaneStore.open(path17.join(dir, "control-plane.json"));
     const activeCompanies = (await store.listCompanies()).filter((c) => c.status === "active");
     const companyId = flags.get("company") ?? activeCompanies[0]?.id ?? resolveDefaultCompanyConfig().id;
     const name = flags.get("name");
@@ -58061,7 +58542,7 @@ async function runCli(argv, println = console.log) {
   }
   if (command === "export-trajectories") {
     const { exportTrajectories: exportTrajectories2 } = await Promise.resolve().then(() => (init_trajectory(), trajectory_exports));
-    const samples = await exportTrajectories2(path18.resolve(dir));
+    const samples = await exportTrajectories2(path17.resolve(dir));
     const outFile = flags.get("out");
     const lines = samples.map((sample) => JSON.stringify(sample)).join("\n");
     if (outFile !== void 0) {
@@ -58073,10 +58554,10 @@ async function runCli(argv, println = console.log) {
     return;
   }
   if (command === "serve" && positional[0] === "install") {
-    const absDir = path18.resolve(dir);
-    const name = `oasis-serve-${path18.basename(absDir)}`;
-    const unitDir = flags.get("unit-dir") ?? path18.join(os9.homedir(), ".config", "systemd", "user");
-    const bin = flags.get("bin") ?? path18.join(os9.homedir(), ".local", "bin", "oasis");
+    const absDir = path17.resolve(dir);
+    const name = `oasis-serve-${path17.basename(absDir)}`;
+    const unitDir = flags.get("unit-dir") ?? path17.join(os8.homedir(), ".config", "systemd", "user");
+    const bin = flags.get("bin") ?? path17.join(os8.homedir(), ".local", "bin", "oasis");
     const port = flags.get("port") ?? "7320";
     const extra = (flags.get("dispatch") === "true" ? ` --dispatch true` : "") + (flags.has("model") ? ` --model ${flags.get("model")}` : "");
     const unit = [
@@ -58094,7 +58575,7 @@ async function runCli(argv, println = console.log) {
       ``
     ].join("\n");
     fs19.mkdirSync(unitDir, { recursive: true });
-    const unitPath = path18.join(unitDir, `${name}.service`);
+    const unitPath = path17.join(unitDir, `${name}.service`);
     fs19.writeFileSync(unitPath, unit);
     println(`\u5DF2\u5199\u5165 ${unitPath}`);
     println(`\u542F\u7528\uFF1Asystemctl --user daemon-reload && systemctl --user enable --now ${name}`);
@@ -58117,14 +58598,14 @@ async function runCli(argv, println = console.log) {
     });
     const port2 = new URL(handle.baseUrl).port;
     println(`oasis serve \u5C31\u7EEA\uFF1Ahttp://0.0.0.0:${port2}\uFF08\u672C\u673A\u8BBF\u95EE\u7528 http://127.0.0.1:${port2}\uFF09`);
-    println(`operator token \u5DF2\u5199\u5165 ${path18.join(dir, "operator-token")}\uFF08\u672C\u673A CLI \u81EA\u52A8\u8BFB\u53D6\uFF09`);
+    println(`operator token \u5DF2\u5199\u5165 ${path17.join(dir, "operator-token")}\uFF08\u672C\u673A CLI \u81EA\u52A8\u8BFB\u53D6\uFF09`);
     if (flags.get("dispatch") === "true") println(`\u8C03\u5EA6\u5FAA\u73AF\u5DF2\u542F\u52A8\uFF08claude-code adapter\uFF09`);
     await new Promise(() => {
     });
     return;
   }
   const base = flags.get("server") ?? process.env["OASIS_SERVER"] ?? "http://127.0.0.1:7320";
-  const tokenFile = path18.join(dir, "operator-token");
+  const tokenFile = path17.join(dir, "operator-token");
   const token = flags.get("token") ?? process.env["OASIS_TOKEN"] ?? (fs19.existsSync(tokenFile) ? fs19.readFileSync(tokenFile, "utf8").trim() : void 0);
   if (!token) {
     throw new Error(`\u65E0 token\uFF1A\u5148 oasis serve\uFF08\u4F1A\u751F\u6210 ${tokenFile}\uFF09\uFF0C\u6216\u663E\u5F0F --token / $OASIS_TOKEN`);
@@ -58149,7 +58630,7 @@ async function runCli(argv, println = console.log) {
     const out = [];
     const walk = (abs, rel) => {
       for (const name of fs19.readdirSync(abs)) {
-        const childAbs = path18.join(abs, name);
+        const childAbs = path17.join(abs, name);
         const childRel = rel ? `${rel}/${name}` : name;
         if (fs19.statSync(childAbs).isDirectory()) walk(childAbs, childRel);
         else out.push({ path: childRel, contentBase64: fs19.readFileSync(childAbs).toString("base64") });
@@ -58501,7 +58982,7 @@ async function runCli(argv, println = console.log) {
           if (file !== void 0) {
             const bytes = fs19.readFileSync(file);
             const res = await api.request("POST", `/api/projects/${encodeURIComponent(projectId)}/files`, {
-              name: flags.get("name") ?? path18.basename(file),
+              name: flags.get("name") ?? path17.basename(file),
               ...flags.has("path") ? { path: flags.get("path") } : {},
               content_base64: bytes.toString("base64"),
               ...flags.has("content-type") ? { content_type: flags.get("content-type") } : {}
@@ -58790,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;
@@ -58805,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>]"),
@@ -59083,8 +59582,8 @@ ${res.warning}`);
     }
     case "content": {
       const id = needPos(positional, 0, "oasis content <artifactId> [path]");
-      const path20 = positional[1];
-      const c = await api.view("content", id, path20 ? { path: path20 } : void 0);
+      const path19 = positional[1];
+      const c = await api.view("content", id, path19 ? { path: path19 } : void 0);
       if (c.kind === "empty") println("\uFF08\u672C\u4EA7\u7269\u5C1A\u65E0\u5185\u5BB9\uFF09");
       else if (c.kind === "external-pin") println(`\u4EE3\u7801/\u5916\u90E8\u4EA4\u4ED8\u7269\uFF1A\u5185\u5BB9\u5728 git/\u5916\u90E8 \u2192 ${c.ref}\uFF08\u6309\u300C\u600E\u4E48\u63D0\u4EA4\u300D\u91CC\u7684\u4ED3\u5E93\u6E05\u5355 clone \u53D6\uFF09`);
       else if (c.kind === "text") println(c.text);
@@ -59257,14 +59756,14 @@ ${res.warning}`);
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.52" : "dev";
-var OASIS_DIR = path19.join(os10.homedir(), ".oasis");
-var CONFIG_FILE = path19.join(OASIS_DIR, "node-config.json");
-var PID_FILE = path19.join(OASIS_DIR, "node.pid");
-var BIN_FILE = path19.join(OASIS_DIR, "bin", "oasis.js");
-var LOCAL_BIN = path19.join(os10.homedir(), ".local", "bin", "oasis");
-var LOG_FILE = path19.join(OASIS_DIR, "node.log");
-var NPM_PREFIX = path19.join(OASIS_DIR, "npm-global");
+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");
+var BIN_FILE = path18.join(OASIS_DIR, "bin", "oasis.js");
+var LOCAL_BIN = path18.join(os9.homedir(), ".local", "bin", "oasis");
+var LOG_FILE = path18.join(OASIS_DIR, "node.log");
+var NPM_PREFIX = path18.join(OASIS_DIR, "npm-global");
 var PKG_NAME = "oasis_test";
 var parseFlags = (argv) => {
   const flags = /* @__PURE__ */ new Map();
@@ -59303,26 +59802,26 @@ var isRunning = (pid) => {
 };
 var httpBase = (wsUrl) => wsUrl.replace(/^ws(s?):\/\//, "http$1://").replace(/\/node-gateway.*$/, "");
 function installBinary() {
-  fs20.mkdirSync(path19.dirname(BIN_FILE), { recursive: true });
+  fs20.mkdirSync(path18.dirname(BIN_FILE), { recursive: true });
   fs20.copyFileSync(process.argv[1], BIN_FILE);
-  fs20.mkdirSync(path19.dirname(LOCAL_BIN), { recursive: true });
+  fs20.mkdirSync(path18.dirname(LOCAL_BIN), { recursive: true });
   fs20.writeFileSync(LOCAL_BIN, `#!/bin/sh
 exec node "${BIN_FILE}" "$@"
 `, { mode: 493 });
 }
 function setupAutostart() {
   const cmd = `${process.execPath} "${BIN_FILE}" --_daemon`;
-  const home = os10.homedir();
+  const home = os9.homedir();
   const extraBins = [
-    path19.join(home, ".npm-global", "bin"),
-    path19.join(home, ".local", "bin"),
+    path18.join(home, ".npm-global", "bin"),
+    path18.join(home, ".local", "bin"),
     "/usr/local/bin"
   ];
   const daemonPath = [process.env["PATH"] ?? "", ...extraBins].filter(Boolean).join(":");
   if (process.platform === "linux") {
-    const unitDir = path19.join(os10.homedir(), ".config", "systemd", "user");
+    const unitDir = path18.join(os9.homedir(), ".config", "systemd", "user");
     fs20.mkdirSync(unitDir, { recursive: true });
-    fs20.writeFileSync(path19.join(unitDir, "oasis-node.service"), [
+    fs20.writeFileSync(path18.join(unitDir, "oasis-node.service"), [
       "[Unit]",
       "Description=Oasis Node Daemon",
       "After=network.target",
@@ -59344,8 +59843,8 @@ function setupAutostart() {
     } catch {
     }
   } else if (process.platform === "darwin") {
-    const plist = path19.join(os10.homedir(), "Library", "LaunchAgents", "com.oasis.node.plist");
-    fs20.mkdirSync(path19.dirname(plist), { recursive: true });
+    const plist = path18.join(os9.homedir(), "Library", "LaunchAgents", "com.oasis.node.plist");
+    fs20.mkdirSync(path18.dirname(plist), { recursive: true });
     fs20.writeFileSync(plist, `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0"><dict>
@@ -59398,7 +59897,7 @@ function selfUpdate() {
   const cfg = readConfig();
   if (!cfg?.serverUrl) throw new Error("no config \u2014 run `oasis start` first");
   const nameArg = cfg.name ? ` --name '${cfg.name.replace(/'/g, "'\\''")}'` : "";
-  const oasisBin = path19.join(NPM_PREFIX, "bin", "oasis");
+  const oasisBin = path18.join(NPM_PREFIX, "bin", "oasis");
   const startCmd = `"${oasisBin}" start --server-ws '${cfg.serverUrl}'${nameArg}`;
   const inner = `{ echo "[oasis] self-update \u2192 npm install --prefix ${NPM_PREFIX} ${PKG_NAME}@latest"; sleep 2; npm install -g --prefer-online --prefix '${NPM_PREFIX}' '${PKG_NAME}@latest' && ${startCmd}; } >> '${LOG_FILE}' 2>&1`;
   const hasSystemd = process.platform === "linux" && (() => {
@@ -59498,7 +59997,7 @@ void (async () => {
       const res = await fetch(`${httpBase(serverUrl)}/api/nodes/exchange`, {
         method: "POST",
         headers: { "content-type": "application/json" },
-        body: JSON.stringify({ enrollToken, nodeId: derivedNodeId, hostname: os10.hostname() })
+        body: JSON.stringify({ enrollToken, nodeId: derivedNodeId, hostname: os9.hostname() })
       });
       if (!res.ok) throw new Error(`enroll token exchange failed: HTTP ${res.status}`);
       const body = await res.json();
@@ -59521,7 +60020,7 @@ void (async () => {
     const pid = spawnDaemon();
     console.log(`\u2713 daemon started (PID ${pid})${nameChanged ? `  [name updated: ${prev.name} \u2192 ${name}]` : ""}`);
     console.log(`  logs: tail -f ${LOG_FILE}`);
-    if (!process.env["PATH"]?.includes(path19.dirname(LOCAL_BIN)))
+    if (!process.env["PATH"]?.includes(path18.dirname(LOCAL_BIN)))
       console.log(`  add to PATH: echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc && source ~/.bashrc`);
     return;
   }