oasis_test_v2 2.1.0 → 2.1.1

package/dist/index.js

@@ -1391,6 +1391,11 @@ var init_delegation_prompts = __esm({
       "**\u522B\u628A\u5224\u65AD\u8FC7\u7A0B\u8BF4\u7ED9\u7528\u6237**\uFF08\u4E0D\u62A5\u300C\u6211\u8BC4\u4F30\u4E86\u4E0B\u80FD\u529B\u8FB9\u754C\u300D\u300C\u5019\u9009\u6709 3 \u4E2A\u300D\u300C\u6B63\u5728\u9009\u4EBA\u300D\uFF09\uFF0C",
       "\u4E5F**\u522B\u8BA9\u7528\u6237\u81EA\u5DF1\u4ECE\u540D\u5355\u91CC\u6311\u4EBA**\u3002\u4ED6\u53EA\u8BE5\u770B\u5230\uFF1A\u4F60\u7684\u8FFD\u95EE\u3001\u4F60\u5728\u505A\u4EC0\u4E48\u3001\u4EE5\u53CA\u9700\u8981\u4ED6\u786E\u8BA4\u65F6\u7684\u90A3\u5F20\u5361\u3002",
       "",
+      "### \u7528\u6237\u76F4\u63A5\u95EE\u300C\u6709\u54EA\u4E9B\u4EBA / agent\u300D\uFF1A\u522B\u8D70\u4E0B\u9762\u8FD9\u5957",
+      "",
+      "\u90A3\u662F\u5728\u95EE\u82B1\u540D\u518C\uFF0C\u4E0D\u662F\u8BA9\u4F60\u5206\u6D41\u3002\u76F4\u63A5 `oasis actors` \u5982\u5B9E\u5217\uFF08**\u542B `(\u65E0\u5C97\u4F4D)` \u7684**\uFF09\u3002",
+      "**\u522B\u62FF `oasis roles` \u7684\u5728\u5C97\u4EBA\u6570\u56DE\u7B54\u8FD9\u4E2A\u95EE\u9898**\u2014\u2014\u5B83\u53EA\u6570\u5C97\u4F4D\u3001\u4E0D\u5217\u4EBA\u3002",
+      "",
       "### \u5148\u770B\u76EE\u6807\u6E05\u4E0D\u6E05\u695A",
       "",
       "\u4E0D\u6E05\u695A\u5C31**\u53EA\u8FFD\u95EE\u3001\u522B\u52A8\u624B**\u2014\u2014\u522B\u628A\u4E00\u4E2A\u6A21\u7CCA\u76EE\u6807\u4E22\u7ED9\u4E13\u5BB6\u6216\u5DE5\u5355\uFF0C\u90A3\u662F\u628A\u4F60\u7684\u4E0D\u786E\u5B9A\u8F6C\u5AC1\u51FA\u53BB\u3002",
@@ -1403,9 +1408,12 @@ var init_delegation_prompts = __esm({
       "",
       "    oasis roles                  # \u6BCF\u4E2A\u5C97\u4F4D\u8D1F\u8D23\xB7\u8BC4\u5BA1\u54EA\u4E9B\u4EA4\u4ED8\u7269\u3001\u8FD8\u6709\u51E0\u4EBA\u5728\u5C97",
       "    oasis actors --role <\u5C97\u4F4D>    # \u90A3\u4E2A\u5C97\u4F4D\u73B0\u5728\u6709\u8C01\u53EF\u6D3E",
+      "    oasis actors                 # \u5168\u90E8\u5728\u5C97\u7684\u4EBA/agent\uFF08\u672A\u8BBE\u5C97\u4F4D\u7684\u53EA\u6709\u8FD9\u6761\u770B\u5F97\u89C1\uFF09",
       "",
       "**\u53EA\u8BA4\u660E\u786E\u5199\u4E86\u300C\u8D1F\u8D23 <\u67D0\u7C7B\u4EA4\u4ED8\u7269>\u300D\u7684\u5C97\u4F4D\u3002**\u53EA\u6709\u4E00\u4E2A\u540D\u5B57\u3001\u6CA1\u5199\u8D1F\u8D23\u4EC0\u4E48\u7684\uFF0C",
       "\u4E00\u5F8B**\u5F53\u4F5C\u6CA1\u6709\u5BF9\u53E3\u5C97\u4F4D**\u2014\u2014\u90A3\u79CD\u5C97\u4F4D\u6D3E\u8FC7\u53BB\u591A\u534A\u662F\u7A7A\u8F6C\u3002",
+      "**\u4F46\u300C\u6CA1\u6709\u5BF9\u53E3\u5C97\u4F4D\u300D\u2260\u300C\u6CA1\u4EBA\u53EF\u7528\u300D**\uFF1A\u6709\u7684 agent \u6545\u610F\u4E0D\u8BBE\u5C97\u4F4D\uFF08`actors` \u91CC\u663E\u793A `(\u65E0\u5C97\u4F4D)`\uFF09\uFF0C",
+      "\u4E0D\u8FDB\u6309\u5C97\u4F4D\u5206\u6D41\uFF0C\u4F46\u80FD `--to <actorId>` \u70B9\u540D\u6D3E\u3002`roles` \u6570\u51FA 0 \u4EBA**\u4E0D\u7B49\u4E8E**\u6CA1\u6709 agent\u2014\u2014\u5B83\u4E0D\u5217\u4EBA\u3002",
       "",
       "- **\u6709\u5BF9\u53E3\u5C97\u4F4D + \u6709\u4EBA\u5728\u5C97** \u2192 \u518D\u95EE\u4E00\u53E5\uFF1A**\u8FD9\u6D3B\u8981\u90A3\u4E2A\u5C97\u4F4D\u505A\u5224\u65AD\uFF0C\u8FD8\u662F\u53EA\u8981\u6309\u5DF2\u7ED9\u7684\u5185\u5BB9\u548C\u5DF2\u6709\u7684\u98CE\u683C\u6267\u884C\uFF1F**",
       "  - \u8981\u51FA\u65B0\u8BBE\u8BA1\u3001\u8981\u4E0B\u7814\u7A76\u7ED3\u8BBA\u3001\u8981\u505A\u6280\u672F\u9009\u578B \u2192 \u5F80 \u2461 \u770B\u662F\u4E0D\u662F\u591A\u4EF6\uFF0C\u7136\u540E\u59D4\u6D3E\u3002",
@@ -17692,12 +17700,12 @@ function mapIssueKindToAnnotationKind(k2) {
   return k2 === "change_request" ? "change-request" : "comment";
 }
 function nodeToArtifact(node2, edges, requirements) {
-  const inputs = edges.filter((e) => e.toNodeId === node2.id).map((e) => ({
+  const inputs = edges.map((e) => ({
     to: e.fromNodeId,
     pinned: e.pinnedWorkId ?? null,
     required: e.required
   }));
-  const nodeReqs = requirements.filter((r) => r.nodeId === node2.id);
+  const nodeReqs = requirements;
   const reviewers = nodeReqs.length > 0 ? nodeReqs.map((r) => ({
     actor: r.reviewerActorId,
     source: r.source,
@@ -17736,9 +17744,8 @@ function nodeToArtifact(node2, edges, requirements) {
   };
 }
 function workToRevision(w2, workInputs, artifactFiles) {
-  const inputs = workInputs.filter((i) => i.workId === w2.id);
   const basedOn = {};
-  for (const i of inputs) {
+  for (const i of workInputs) {
     basedOn[i.upstreamNodeId] = i.upstreamWorkId;
   }
   const files = artifactFiles.get(w2.id);
@@ -17781,7 +17788,7 @@ function issueToAnnotation(issue2, replies, recipients) {
     target: issue2.aboutWorkId ?? issue2.aboutNodeId ?? "",
     span: void 0
   };
-  const ownReplies = replies.filter((r) => r.issueId === issue2.id).slice().sort((a, b2) => a.createdAt < b2.createdAt ? -1 : a.createdAt > b2.createdAt ? 1 : 0);
+  const ownReplies = replies.slice().sort((a, b2) => a.createdAt < b2.createdAt ? -1 : a.createdAt > b2.createdAt ? 1 : 0);
   const thread = ownReplies.map((r, i) => ({
     author: r.authorActorId,
     ts: r.createdAt,
@@ -17875,9 +17882,8 @@ function buildGateFromRequirements(reqs) {
   });
   return { requirements: contractReqs, eligible, quorum };
 }
-function workToConcludeAttempt(w2, requirements, reviews) {
+function workToConcludeAttempt(w2, reqs) {
   if (w2.acceptanceState === "draft" || (w2.acceptanceState === null || w2.acceptanceState === "rejected") && w2.status === "success" && w2.conclusion != null) {
-    const reqs = requirements.filter((r) => r.nodeId === w2.nodeId);
     if (reqs.length === 0) return null;
     return {
       head: w2.id,
@@ -17889,7 +17895,6 @@ function workToConcludeAttempt(w2, requirements, reviews) {
     };
   }
   if (w2.acceptanceState === "accepted" && w2.outputVersionNo !== null) {
-    const reqs = requirements.filter((r) => r.nodeId === w2.nodeId);
     return {
       head: w2.id,
       openedOn: w2.id,
@@ -17901,6 +17906,16 @@ function workToConcludeAttempt(w2, requirements, reviews) {
   }
   return null;
 }
+function groupRows(rows, keyOf3) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    const key = keyOf3(row);
+    const group = groups.get(key);
+    if (group) group.push(row);
+    else groups.set(key, [row]);
+  }
+  return groups;
+}
 function bridgeLoadReadModel(input) {
   const { snapshots: snapshots2, reworkWavefront = false, convergenceUnified = false, disabledActors } = input;
   const allNodes = [];
@@ -17930,12 +17945,18 @@ function bridgeLoadReadModel(input) {
       name: a.name
     })));
   }
+  const inputsByWork = groupRows(allWorkInputs, (i) => i.workId);
+  const edgesByTarget = groupRows(allEdges, (e) => e.toNodeId);
+  const requirementsByNode = groupRows(allRequirements, (r) => r.nodeId);
+  const repliesByIssue = groupRows(allReplies, (r) => r.issueId);
+  const reviewById = new Map(allReviews.map((r) => [r.id, r]));
   const acceptBlockers = /* @__PURE__ */ new Map();
   for (const snap of snapshots2) {
     let state = null;
+    const snapshotWorks = new Map(snap.works.map((w2) => [w2.id, w2]));
     for (const node2 of snap.nodes) {
       if (!node2.latestWorkId || node2.latestAcceptId === node2.latestWorkId) continue;
-      const lw = snap.works.find((w2) => w2.id === node2.latestWorkId);
+      const lw = snapshotWorks.get(node2.latestWorkId);
       if (!lw || !lw.endedAt || lw.deadAt) continue;
       state ??= new WorkorderState(snap);
       const block = acceptBlock(state, lw.id);
@@ -17952,7 +17973,7 @@ function bridgeLoadReadModel(input) {
   const workById = /* @__PURE__ */ new Map();
   for (const w2 of allWorks) workById.set(w2.id, w2);
   for (const node2 of allNodes) {
-    const art = nodeToArtifact(node2, allEdges, allRequirements);
+    const art = nodeToArtifact(node2, edgesByTarget.get(node2.id) ?? [], requirementsByNode.get(node2.id) ?? []);
     const lw = node2.latestWorkId ? workById.get(node2.latestWorkId) : void 0;
     if (lw) {
       const st = lw.status ?? (lw.retryAt ? "retry" : lw.deadAt ? "dead" : lw.endedAt ? lw.outcome === "failed" ? "failed" : "success" : "running");
@@ -17976,7 +17997,7 @@ function bridgeLoadReadModel(input) {
   }
   const revisions = /* @__PURE__ */ new Map();
   for (const w2 of allWorks) {
-    revisions.set(w2.id, workToRevision(w2, allWorkInputs, artifactFiles));
+    revisions.set(w2.id, workToRevision(w2, inputsByWork.get(w2.id) ?? [], artifactFiles));
   }
   {
     const worksByNode = /* @__PURE__ */ new Map();
@@ -18007,7 +18028,7 @@ function bridgeLoadReadModel(input) {
   for (const issue2 of allIssues) {
     if (issue2.kind === "gap" || issue2.kind === "escalation") continue;
     annotationSeq.set(issue2.id, 0);
-    annotations.set(issue2.id, issueToAnnotation(issue2, allReplies, recipientsByIssue.get(issue2.id) ?? []));
+    annotations.set(issue2.id, issueToAnnotation(issue2, repliesByIssue.get(issue2.id) ?? [], recipientsByIssue.get(issue2.id) ?? []));
   }
   const reviewVotes = /* @__PURE__ */ new Map();
   for (const r of allReviews) {
@@ -18019,7 +18040,7 @@ function bridgeLoadReadModel(input) {
   }
   const concludeAttempts = /* @__PURE__ */ new Map();
   for (const w2 of allWorks) {
-    const attempt = workToConcludeAttempt(w2, allRequirements, allReviews);
+    const attempt = workToConcludeAttempt(w2, requirementsByNode.get(w2.nodeId) ?? []);
     if (!attempt) continue;
     const list2 = concludeAttempts.get(w2.nodeId) ?? [];
     list2.push(attempt);
@@ -18038,6 +18059,19 @@ function bridgeLoadReadModel(input) {
     let seq = 0;
     for (const w2 of allWorks) proposeSeq.set(w2.id, seq++);
   }
+  const workTimeRanks = allWorks.map((w2) => ({ at: w2.createdAt, rank: (proposeSeq.get(w2.id) ?? -1) + 1 })).sort((a, b2) => a.at < b2.at ? -1 : a.at > b2.at ? 1 : 0);
+  for (let i = 1; i < workTimeRanks.length; i++) {
+    workTimeRanks[i].rank = Math.max(workTimeRanks[i].rank, workTimeRanks[i - 1].rank);
+  }
+  const seqBefore = (at) => {
+    let low = 0, high = workTimeRanks.length;
+    while (low < high) {
+      const mid = Math.floor((low + high) / 2);
+      if (workTimeRanks[mid].at < at) low = mid + 1;
+      else high = mid;
+    }
+    return low === 0 ? 0 : workTimeRanks[low - 1].rank;
+  };
   const gaps = /* @__PURE__ */ new Map();
   for (const issue2 of allIssues) {
     if (issue2.kind !== "gap") continue;
@@ -18054,14 +18088,7 @@ function bridgeLoadReadModel(input) {
     if (resolved) {
       if (issue2.resolvedNote !== null) gapView.note = issue2.resolvedNote;
       gapView.resolvedAt = issue2.resolvedAt;
-      let seqAtResolve = 0;
-      for (const w2 of allWorks) {
-        if (w2.createdAt < issue2.resolvedAt) {
-          const s2 = (proposeSeq.get(w2.id) ?? -1) + 1;
-          if (s2 > seqAtResolve) seqAtResolve = s2;
-        }
-      }
-      gapView.resolvedAtSeq = seqAtResolve;
+      gapView.resolvedAtSeq = seqBefore(issue2.resolvedAt);
     }
     const list2 = gaps.get(nodeId) ?? [];
     list2.push(gapView);
@@ -18098,18 +18125,18 @@ function bridgeLoadReadModel(input) {
   for (const node2 of allNodes) {
     if (!node2.latestWorkId) continue;
     if (node2.cancelledAt) continue;
-    const lw = allWorks.find((w2) => w2.id === node2.latestWorkId);
+    const lw = workById.get(node2.latestWorkId);
     if (!lw || !lw.deadAt) {
-      const head = node2.latestProposedWorkId ? allWorks.find((w2) => w2.id === node2.latestProposedWorkId) : void 0;
+      const head = node2.latestProposedWorkId ? workById.get(node2.latestProposedWorkId) : void 0;
       if (!head || head.deadAt || node2.latestAcceptId === head.id) continue;
-      const reqs = allRequirements.filter((r) => r.nodeId === node2.id);
+      const reqs = requirementsByNode.get(node2.id) ?? [];
       if (reqs.length === 0) continue;
       let stoppedAt = null;
       let deadGroups = 0;
       let liveGroups = 0;
       for (const g2 of new Set(reqs.map((r) => r.reviewGroup))) {
         const req = reqs.find((r2) => r2.reviewGroup === g2);
-        const r = req?.latestReviewId ? allReviews.find((x2) => x2.id === req.latestReviewId) : void 0;
+        const r = req?.latestReviewId ? reviewById.get(req.latestReviewId) : void 0;
         if (!r || r.targetWorkId !== head.id) {
           liveGroups += 1;
           continue;
@@ -19276,18 +19303,26 @@ var init_kernel_bridge = __esm({
             typeName: a.type
           };
         }
-        const typeDef = this.schema.get(a.type);
-        const closureGate = humanGateActorsOf(this.model, artifactId);
         const slot = closureSlotOf(this.model, a.workspace);
         const isCurrentClosureSlot = (slot.kind === "closure-report" || slot.kind === "sole-artifact") && slot.id === artifactId;
-        const alreadyAccepted = a.latestAccepted === true;
-        const applicableClosureGate = isCurrentClosureSlot && !alreadyAccepted ? closureGate : [];
+        const notYetSubmitted = a.latestWorkState !== "success";
+        const closureGate = isCurrentClosureSlot && notYetSubmitted ? humanGateActorsOf(this.model, artifactId) : [];
+        if (!isCurrentClosureSlot || !notYetSubmitted || closureGate.length === 0) {
+          return {
+            reviewers: [],
+            quorum: 0,
+            requirements: [],
+            typeName: a.type
+          };
+        }
+        const typeDef = this.schema.get(a.type);
         const { reviewers: predicted } = resolveNodeReviewers({
           typeName: a.type,
           typeDef,
-          ...a.reviewRoles !== void 0 ? { reviewRoles: a.reviewRoles } : {},
+          // reviewRoles=[] 显式覆盖同样传入，避免 resolver 回落到 typeDef 默认角色（0101 语义）。
+          reviewRoles: [],
           roleIndex: this.roleIndex,
-          ...applicableClosureGate.length > 0 ? { closureGate: applicableClosureGate } : {}
+          closureGate
         });
         if (predicted.length === 0) {
           return {
@@ -195420,6 +195455,11 @@ var init_store2 = __esm({
         const r = [...this.rows.values()].find((x2) => x2.childSessionId === childSessionId);
         return r ? this.clone(r) : null;
       }
+      async listChildSessionIds(candidateIds) {
+        if (candidateIds.length === 0) return [];
+        const want = new Set(candidateIds);
+        return [...this.rows.values()].map((r) => r.childSessionId).filter((id) => want.has(id));
+      }
       async getByInvocationId(invocationId) {
         const r = [...this.rows.values()].find((x2) => x2.invocationId === invocationId);
         return r ? this.clone(r) : null;
@@ -215209,13 +215249,22 @@ function clientIpOf(req) {
   if (typeof raw === "string" && raw.trim().length > 0) return raw.split(",")[0].trim();
   return req.socket?.remoteAddress ?? "unknown";
 }
-var DaemonHub;
+function pkgDriftHealDecision(input) {
+  if (!input.nodePkg || input.nodePkg === input.expectedPkg) return "skip";
+  if (input.nowMs - input.lastHealAtMs < PKG_HEAL_COOLDOWN_MS) return "skip";
+  if (input.tries > PKG_HEAL_MAX_TRIES) return "skip";
+  if (input.tries === PKG_HEAL_MAX_TRIES) return "give-up";
+  return "send";
+}
+var PKG_HEAL_COOLDOWN_MS, PKG_HEAL_MAX_TRIES, DaemonHub;
 var init_daemon_hub = __esm({
   "../server/src/daemon-hub.ts"() {
     "use strict";
     init_wrapper();
     init_src();
     init_handshake_throttle();
+    PKG_HEAL_COOLDOWN_MS = 10 * 60 * 1e3;
+    PKG_HEAL_MAX_TRIES = 3;
     DaemonHub = class _DaemonHub {
       daemons = /* @__PURE__ */ new Map();
       /** 底层 socket，仅供 sweepLiveness 对半开连接做 terminate（不等 close 握手）用。 */
@@ -215260,6 +215309,9 @@ var init_daemon_hub = __esm({
       wss;
       ghosts = /* @__PURE__ */ new Map();
       lastDisconnectedAt = /* @__PURE__ */ new Map();
+      /** 通道漂移自愈：上次给某节点补发换包指令的时刻（epoch ms）与本进程内已补发次数。 */
+      pkgHealAt = /* @__PURE__ */ new Map();
+      pkgHealTries = /* @__PURE__ */ new Map();
       lastReconnectedAt = /* @__PURE__ */ new Map();
       static GHOST_TTL_MS = 5 * 60 * 1e3;
       pingIntervalMs;
@@ -215675,6 +215727,37 @@ var init_daemon_hub = __esm({
         if (sent) console.warn(`[hub] evict \u4F1A\u8BDD dispatch=${dispatchId} reason=${reason}`);
         return sent;
       }
+      /**
+       * 通道漂移自愈：节点上报的 `daemonPkg` 与本控制面这条线的包不一致时，握手完就补一帧 `update`
+       * 把正确的包名下发过去（ADR 0515）。没有它，迁移要人点两次「更新」——第一次只是把节点升到
+       * "读得懂 pkg"的那一版，第二次才换包。
+       *
+       * 三道闸，缺一会变成重启风暴：
+       *   ① 只对**上报了** `daemonPkg` 的节点动手。没上报 = 更老的 bundle，它读不懂这个字段，
+       *      发过去只会在它自己那条线里白重装一遍，纯粹是一次无意义的重启。
+       *   ② 每个节点 10 分钟内最多补一次（与节点侧换包冷却同宽）。
+       *   ③ 本进程内每个节点最多补 3 次：换包失败的节点会带着旧包名重连，没有这条就是每 10 分钟重启一轮。
+       */
+      healDaemonPkgDrift(daemon) {
+        const decision = pkgDriftHealDecision({
+          nodePkg: daemon.meta.daemonPkg,
+          expectedPkg: DAEMON_NPM_PACKAGE,
+          lastHealAtMs: this.pkgHealAt.get(daemon.daemonId) ?? 0,
+          tries: this.pkgHealTries.get(daemon.daemonId) ?? 0,
+          nowMs: Date.now()
+        });
+        if (decision === "skip") return;
+        if (decision === "give-up") {
+          this.pkgHealTries.set(daemon.daemonId, PKG_HEAL_MAX_TRIES + 1);
+          console.error(`[hub] \u8282\u70B9 ${daemon.daemonId} \u8FDE\u7EED ${PKG_HEAL_MAX_TRIES} \u6B21\u6CA1\u80FD\u4ECE ${daemon.meta.daemonPkg} \u6362\u5230 ${DAEMON_NPM_PACKAGE}\uFF0C\u505C\u6B62\u81EA\u52A8\u8865\u53D1\u2014\u2014\u53BB\u770B\u5B83\u7684 node.log`);
+          return;
+        }
+        const tries = (this.pkgHealTries.get(daemon.daemonId) ?? 0) + 1;
+        this.pkgHealAt.set(daemon.daemonId, Date.now());
+        this.pkgHealTries.set(daemon.daemonId, tries);
+        console.error(`[hub] \u8282\u70B9 ${daemon.daemonId} \u8FD8\u5728 ${daemon.meta.daemonPkg} \u8FD9\u6761\u7EBF\u4E0A\uFF0C\u672C\u63A7\u5236\u9762\u7528 ${DAEMON_NPM_PACKAGE}\u2014\u2014\u8865\u53D1\u6362\u5305\u6307\u4EE4\uFF08\u7B2C ${tries} \u6B21\uFF09`);
+        daemon.send({ type: "update", pkg: DAEMON_NPM_PACKAGE });
+      }
       handleConnection(ws, req) {
         const dataplane = req.oasisDataplane;
         if (dataplane) {
@@ -215706,6 +215789,7 @@ var init_daemon_hub = __esm({
             if (this.lastDisconnectedAt.has(daemonId)) this.lastReconnectedAt.set(daemonId, Date.now());
             this.ghosts.delete(daemonId);
             Object.assign(daemon.meta, msg.meta);
+            this.healDaemonPkgDrift(daemon);
             if (!registered) {
               registered = true;
               this.lastSeen.set(daemonId, Date.now());
@@ -220960,6 +221044,16 @@ var init_service6 = __esm({
         await this.store.updateCompany(companyId, { onboardingVariant: variant });
         return { ...company, onboardingVariant: variant };
       }
+      /**
+       * 改团队名称。**只改 name，不动 slug**——slug 是路由键（company:<slug> 与引擎 schema co_<slug>
+       * 的一部分，`create` 里注释「建成不可改」），改它会让所有历史链接失效。
+       * 校验（非空 / trim）在路由层做完了，这里假设 name 已经是非空 trim 过的字符串。
+       */
+      async renameCompany(id, name) {
+        const company = await this.requireCompany(id);
+        await this.store.updateCompany(id, { name });
+        return { ...company, name };
+      }
       /** 设置/清除公司头像引用（"blob:<哈希>"；null = 回到默认首字母标识）。 */
       async setAvatar(id, ref2) {
         const company = await this.requireCompany(id);
@@ -221849,14 +221943,29 @@ function companiesDomain(opts) {
     router.patch("/api/companies/:id", async (req) => {
       const cid = req.params.id;
       const b2 = req.body ?? {};
-      if (b2.onboardingVariant === void 0) {
-        throw new ApiError(400, "BAD_REQUEST", "\u7F3A\u5C11\u53EF\u66F4\u65B0\u5B57\u6BB5\uFF08onboardingVariant\uFF09");
+      const hasName = b2.name !== void 0;
+      const hasVariant = b2.onboardingVariant !== void 0;
+      if (!hasName && !hasVariant) {
+        throw new ApiError(400, "BAD_REQUEST", "\u7F3A\u5C11\u53EF\u66F4\u65B0\u5B57\u6BB5\uFF08name / onboardingVariant\uFF09");
       }
-      if (b2.onboardingVariant !== "A" && b2.onboardingVariant !== "B") {
+      let trimmedName;
+      if (hasName) {
+        if (typeof b2.name !== "string" || !b2.name.trim()) {
+          throw new ApiError(400, "BAD_REQUEST", "name \u987B\u4E3A\u975E\u7A7A\u5B57\u7B26\u4E32");
+        }
+        trimmedName = b2.name.trim();
+      }
+      if (hasVariant && b2.onboardingVariant !== "A" && b2.onboardingVariant !== "B") {
         throw new ApiError(400, "BAD_REQUEST", `onboardingVariant \u987B\u4E3A "A" | "B"`);
       }
       await requireOwnerOrAdmin(req, cid);
-      const company = await service.setOnboardingVariant(cid, b2.onboardingVariant).catch(mapErr);
+      let company;
+      if (trimmedName !== void 0) {
+        company = await service.renameCompany(cid, trimmedName).catch(mapErr);
+      }
+      if (hasVariant) {
+        company = await service.setOnboardingVariant(cid, b2.onboardingVariant).catch(mapErr);
+      }
       return { status: 200, body: company };
     });
     router.post("/api/companies", async (req) => {
@@ -223954,7 +224063,6 @@ function buildWorkorderActivity(input) {
     const tail = nodeId.split(":").slice(2).join(":");
     return tail || nodeId;
   };
-  const deliverableName = (workId, nodeId) => artifactsByWork.get(workId)?.[0]?.name ?? nodeName(nodeId);
   const groupCards = /* @__PURE__ */ new Map();
   const groupIndexOf = /* @__PURE__ */ new Map();
   const cardOfWork = /* @__PURE__ */ new Map();
@@ -224068,7 +224176,8 @@ function buildWorkorderActivity(input) {
         const workId = String(ev.workId ?? "");
         const d = cardOfWork.get(workId);
         if (!d) break;
-        if (ev.outcome === "failed" && isDispatchLayerFailure(ev.detail)) {
+        const zeroOutput = ev.outcome === "completed" && workById.get(workId)?.status === "failed";
+        if (zeroOutput || ev.outcome === "failed" && isDispatchLayerFailure(ev.detail)) {
           cardOfWork.delete(workId);
           if (![...cardOfWork.values()].includes(d)) {
             for (const [k2, v2] of groupCards) if (v2 === d) groupCards.delete(k2);
@@ -224109,7 +224218,7 @@ function buildWorkorderActivity(input) {
         d.artifacts = artifactsByWork.get(workId) ?? d.artifacts;
         if (d.nodeId) groupIndexOf.set(d.nodeId, (groupIndexOf.get(d.nodeId) ?? 0) + 1);
         const node2 = d.nodeId ? nodeById.get(d.nodeId) : void 0;
-        const name = deliverableName(workId, d.nodeId);
+        const name = nodeName(d.nodeId);
         if (d.nodeId && rootBriefNodeIds.has(d.nodeId)) {
           const isFirstRound = !concludedRootBriefNodeIds.has(d.nodeId);
           concludedRootBriefNodeIds.add(d.nodeId);
@@ -224146,7 +224255,7 @@ function buildWorkorderActivity(input) {
         if (reviewers.length === 0 && isSystemAccept(by)) break;
         const bypassed = reviewers.length > 0 && isSystemAccept(by);
         const existing = acceptCards.get(workId);
-        const status = bypassed ? node2?.isFinalOutput ? ACTIVITY_COPY.autoAccepted(nameOf(reviewers[0])) : ACTIVITY_COPY.autoAcceptedNode(deliverableName(workId, nodeId), nameOf(reviewers[0])) : node2?.isFinalOutput ? ACTIVITY_COPY.accepted : ACTIVITY_COPY.acceptedNode(deliverableName(workId, nodeId));
+        const status = bypassed ? node2?.isFinalOutput ? ACTIVITY_COPY.autoAccepted(nameOf(reviewers[0])) : ACTIVITY_COPY.autoAcceptedNode(nodeName(nodeId), nameOf(reviewers[0])) : node2?.isFinalOutput ? ACTIVITY_COPY.accepted : ACTIVITY_COPY.acceptedNode(nodeName(nodeId));
         if (existing) {
           touch(existing, rec);
           existing.executorId = bypassed ? reviewers[0] : by;
@@ -224177,7 +224286,7 @@ function buildWorkorderActivity(input) {
         const targetWorkId = String(ev.targetWorkId ?? "");
         const reviewerId = str4(ev.reviewerActorId) ?? rec.actorId;
         const isAgent2 = ev.reviewerIsAgent === true;
-        const name = deliverableName(targetWorkId, nodeId);
+        const name = nodeName(nodeId);
         reviewCards.set(reviewId, {
           id: `review:${reviewId}`,
           seq: rec.seq,
@@ -224213,7 +224322,7 @@ function buildWorkorderActivity(input) {
         d.executorId = str4(ev.reviewerActorId) ?? d.executorId;
         d.actions = [];
         const nodeId = d.nodeId;
-        const name = deliverableName(targetWorkId, nodeId);
+        const name = nodeName(nodeId);
         if (ev.verdict === "approve") {
           d.status = ACTIVITY_COPY.reviewApproved(name);
         } else {
@@ -230192,6 +230301,18 @@ function createChatSessionsDomain(opts) {
       drafts.delete(req.params["id"]);
       return { status: 200, body: { text: draft.text } };
     });
+    async function markDelegationChildren(sessions, callerCompanyId) {
+      const wiring = opts.delegations;
+      if (!wiring || !wiring.enabled() || sessions.length === 0) return sessions;
+      const companyId = sessions[0]?.companyId ?? callerCompanyId;
+      const ledger = await wiring.storeFor(companyId).catch(() => null);
+      if (!ledger) return sessions;
+      const childIds = new Set(
+        await ledger.listChildSessionIds(sessions.map((s2) => s2.id)).catch(() => [])
+      );
+      if (childIds.size === 0) return sessions;
+      return sessions.map((s2) => childIds.has(s2.id) ? { ...s2, isDelegationChild: true } : s2);
+    }
     router.get("/api/chat-sessions", async (req) => {
       const store2 = await storeFor(req);
       if (req.query?.get("analysis") === "all") {
@@ -230206,7 +230327,8 @@ function createChatSessionsDomain(opts) {
       }
       const analyzedRunId = req.query?.get("analyzedRunId") ?? void 0;
       const sessions = analyzedRunId ? await store2.listSessionsByAnalyzedRun(analyzedRunId) : await store2.listSessions(req.auth.actor);
-      return { status: 200, body: { items: sessions } };
+      const items = await markDelegationChildren(sessions, req.auth.companyId ?? void 0);
+      return { status: 200, body: { items } };
     });
     router.post("/api/chat-sessions", async (req) => {
       const store2 = await storeFor(req);
@@ -244624,6 +244746,14 @@ var init_postgres_delegations = __esm({
         );
         return r.rows[0] ? toRecord2(r.rows[0]) : null;
       }
+      async listChildSessionIds(candidateIds) {
+        if (candidateIds.length === 0) return [];
+        const r = await this.pool.query(
+          `SELECT child_session_id FROM ${this.s}.chat_session_delegations WHERE child_session_id = ANY($1)`,
+          [[...candidateIds]]
+        );
+        return r.rows.map((row) => row.child_session_id);
+      }
       async getByInvocationId(invocationId) {
         const r = await this.pool.query(
           `SELECT * FROM ${this.s}.chat_session_delegations WHERE invocation_id = $1`,
@@ -265431,10 +265561,16 @@ ${res.warning}`);
         println(role ? `\u6CA1\u6709${all2 ? "" : "\u5728\u5C97\u7684"} ${role} \u5C97\u4F4D\u5458\u5DE5` : "\u6CA1\u6709\u5458\u5DE5");
         break;
       }
+      let anyRoleless = false;
       for (const a of rows) {
-        const pos = (a.positions ?? []).join(",") || "(\u65E0\u5C97\u4F4D)";
+        const hasRole = (a.positions ?? []).length > 0;
+        if (!hasRole) anyRoleless = true;
+        const pos = hasRole ? (a.positions ?? []).join(",") : "(\u65E0\u5C97\u4F4D)";
         println(`${a.id}	${a.name ?? ""}	${a.kind}	${pos}${a.status === "active" ? "" : `	[${a.status}]`}`);
       }
+      if (anyRoleless) {
+        println("\u2014\u2014 \u6807\u300C(\u65E0\u5C97\u4F4D)\u300D\u7684\uFF1A\u4E0D\u4F1A\u88AB\u6309\u5C97\u4F4D\u7684\u81EA\u52A8\u5206\u6D41 / \u6D3E\u5355\u9009\u4E2D\uFF0C\u4F46\u53EF\u4EE5\u70B9\u540D\u6307\u6D3E\uFF08`oasis assign <\u8282\u70B9> --owner <id>`\uFF0C\u6216\u59D4\u6D3E\u65F6 `--to <actorId>`\uFF09\u3002");
+      }
       break;
     }
     // 诊断 1be339c7 ③：单人详情——「这个 id 到底是谁」。协调者要从岗位跳到人时用它，chat agent 想核实
@@ -265521,6 +265657,7 @@ ${res.warning}`);
         println(`${r.name}	${r.label}	${flagsText}${uses ? `	${uses}` : ""}`);
         if (r.description) println(`  ${r.description}`);
       }
+      println("\u2014\u2014 \u672C\u547D\u4EE4\u53EA\u5217\u5C97\u4F4D\u4E0E\u5728\u5C97\u4EBA\u6570\uFF0C\u4E0D\u5217\u5177\u4F53\u7684\u4EBA / agent\u3002\u8981\u770B\u6709\u8C01\u53EF\u6D3E\uFF08\u542B\u672A\u8BBE\u5C97\u4F4D\u7684\uFF09\u7528 `oasis actors`\u3002");
       break;
     }
     case "assign": {
@@ -266418,7 +266555,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.1.0" : "dev";
+var PKG_VERSION = true ? "2.1.1" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test_v2",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "b2d3dc4e4d8383e1df616a6e1bd2c07c274ad10f"
+    "sourceHead": "75bc8ca411b3af4f39aba67b159c6570f2b35a7a"
   }
 }