oasis_test_v2 2.2.16 → 2.2.17

package/dist/_base/wrapper-base.sh

@@ -17,6 +17,18 @@
 
 set -euo pipefail
 
+# 这个候选是不是一个 oasis wrapper？
+#
+# 判据与 TS 侧的 `isOasisWrapperPath` **同一条**：解析到底之后路径以 `/wrapper.sh` 结尾。
+# 所有连接器的 wrapper 都是「以 commandName 之名软链到 <connector>/wrapper.sh」，
+# 所以这一条既认得出自己、也认得出**别的会话/别的部署根** stage 出来的那些。
+oasis_is_wrapper() {
+  case "$(realpath "$1" 2>/dev/null)" in
+    */wrapper.sh) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
 # Resolve the real binary path (avoid recursion into self).
 # If ${OASIS_BIN_VAR} is already set (injected by inject()), use it — unless it points
 # back at this very wrapper. Otherwise scan PATH for the first executable that isn't us.
@@ -24,9 +36,6 @@ oasis_resolve_bin() {
   local bin_var="${OASIS_BIN_VAR:?OASIS_BIN_VAR must be set}"
   local cmd_name="${OASIS_CMD_NAME:?OASIS_CMD_NAME must be set}"
 
-  local SELF
-  SELF="$(realpath "$0" 2>/dev/null || echo "$0")"
-
   # If already set by inject() AND executable on THIS machine, skip the PATH scan —
   # but **only if it isn't this wrapper itself**.
   #
@@ -36,18 +45,28 @@ oasis_resolve_bin() {
   # 触发更新就会把 /tmp/oasis-conn-* 带进去）。于是 GH_BIN 指向 wrapper 自己 →
   # 这里的快路径直接 return → 后面 exec "$GH_BIN" 就是无限递归调用自身。
   # 症状还特别误导：递归被 oasis_check_available 拦下，报的是「cli is upgrading」。
-  if [ -n "${!bin_var:-}" ] && [ -x "${!bin_var:-}" ] \
-     && [ "$(realpath "${!bin_var}" 2>/dev/null)" != "$SELF" ]; then
+  # ⚠ 判据是「是不是 wrapper」，不是「是不是**我**」：daemon 的 PATH 被污染时，
+  # inject() 解出来的可能是**另一个**会话的 wrapper，信了照样递归。
+  if [ -n "${!bin_var:-}" ] && [ -x "${!bin_var:-}" ] && ! oasis_is_wrapper "${!bin_var}"; then
     return 0
   fi
   # 空 / 不可执行 / 指向自己：清掉，让下面的 PATH 扫描重新填。
   unset "$bin_var" 2>/dev/null || true
 
-  # Fallback: scan PATH for real binary (skip self to avoid recursion)
+  # Fallback: scan PATH —— **跳过所有 oasis wrapper，不只是自己**。
+  #
+  # ⚠ 把 `oasis_is_wrapper` 换回 `!= "$SELF"` 会炸机（2026-09-11 两次实测，进程数冲到
+  # 1.1 万、load 391）。同一台机器上常常同时挂着**多个** staged wrapper 目录
+  # （不同会话、不同部署根），它们各自是**不同的 wrapper.sh 文件**，realpath 互不相等；
+  # 只比 `$0` 的话，A 把 B 当「真 CLI」exec 过去，B 再把 A 当真 CLI，
+  # 叠上 `oasis_check_available` 的 `--version` 自检，每跳再 fork 一次 → 指数级。
+  #
+  # 平时看不出来，是因为 inject() 会把 LARK_BIN/GH_BIN 直接设好、走上面那条快路径，
+  # 根本不扫 PATH。那个绝对路径**一旦失效**（文件被挪走/升级换名）就立刻掉进这里。
   local candidate
   while IFS= read -r dir; do
     candidate="$dir/$cmd_name"
-    if [ -x "$candidate" ] && [ "$(realpath "$candidate" 2>/dev/null)" != "$SELF" ]; then
+    if [ -x "$candidate" ] && ! oasis_is_wrapper "$candidate"; then
       printf -v "$bin_var" '%s' "$candidate"
       export "$bin_var"
       return 0
@@ -67,7 +86,7 @@ oasis_resolve_bin() {
   # 还能被找回来，不至于「按 <cmd> 扫 PATH 一个都找不到」。**别删它**，也别据此重新引入自动挪动。
   while IFS= read -r dir; do
     candidate="$dir/$cmd_name.oasis-displaced"
-    if [ -x "$candidate" ] && [ "$(realpath "$candidate" 2>/dev/null)" != "$SELF" ]; then
+    if [ -x "$candidate" ] && ! oasis_is_wrapper "$candidate"; then
       printf -v "$bin_var" '%s' "$candidate"
       export "$bin_var"
       return 0

package/dist/index.js

@@ -25452,7 +25452,9 @@ var init_codex = __esm({
         const reasoningEffort = this.opts.reasoningEffort;
         return runProtocolSession(job, {
           bin: this.opts.codexBin ?? "codex",
-          args: ["app-server", "--stdio"],
+          // 同 exec 那条路：关掉登录 shell，否则 `~/.profile` 会把 `$HOME/.local/bin` 前置到
+          // PATH 最前，压过注入的连接器 wrapper（理由与实证见 exec 分支里那段长注释）。
+          args: ["app-server", "--stdio", "-c", "allow_login_shell=false"],
           extraArgs: this.opts.extraArgs,
           blockedFlags: CODEX_APP_SERVER_BLOCKED_FLAGS,
           workRoot: this.opts.workRoot,
@@ -25633,6 +25635,24 @@ ${task}` : task;
           // 打开 reasoning 摘要通道：默认 auto，让 codex 产出 reasoning item（→ thought → 前端思考块）。
           ...this.opts.reasoningSummary !== "none" ? ["-c", `model_reasoning_summary=${this.opts.reasoningSummary ?? "auto"}`] : [],
           ...this.opts.reasoningEffort ? ["-c", `model_reasoning_effort=${this.opts.reasoningEffort}`] : [],
+          /* ★ 关掉登录 shell（2026-09-11）。
+                   codex 的 shell 工具默认把每条命令丢进 `/bin/bash -lc`——本机 codex 自己的
+                   thread_history 里逐字记着 `"command":"/bin/bash -lc \"pwd && rg …"`。
+                   登录 shell 会重跑 `~/.profile`，而 Ubuntu 的 profile 里是
+                   `PATH="$HOME/.local/bin:$PATH"`（**前置**）；于是任何装在 `~/.local/bin` 的同名 CLI
+                   都会抢到注入的连接器 wrapper 前面。实测后果：飞书连接器凭据、连接记录全对，
+                   dev-agent（codex）跑 `lark-cli whoami` 却回 `not_configured`——wrapper 被绕过、
+                   而隔离键 `LARKSUITE_CLI_CONFIG_DIR` 照旧生效指着空目录，两头落空。
+                   同机同用户的 claude-code agent 一切正常，差别只有这一个 `-l`。
+          
+                   `allow_login_shell` 是 codex 的正式配置键（本机实测：给它传整数会报
+                   `invalid type: integer, expected a boolean in \`allow_login_shell\``，
+                   而不存在的键是被静默忽略的），exec 与 app-server 两条路都吃 `-c` 覆盖。
+          
+                   ⚠ 未验证的一格：这个键**是否真的**就是那个 `-l` 的开关，只能等下一次
+                   codex 派单后在节点上 `ps` 看是 `bash -lc` 还是 `bash -c`。设错了是 no-op，不会更坏。 */
+          "-c",
+          "allow_login_shell=false",
           // ADR「agent CLI 启动参数员工级可配置化」：员工配置 job.extraArgs（在前）+ opts.extraArgs（静态默认，在后），
           // 过 CODEX_BLOCKED_FLAGS 拦截。追加在**位置 prompt 之前**（codex exec 的 [PROMPT] 必须是末位参数）。
           ...prepareExtraArgs(
@@ -28663,7 +28683,7 @@ function projectsIntoContent(kind, role, origin, telemetryTextInContent) {
       return true;
   }
 }
-var import_node_crypto15, CHAT_ITEMS_DOUBLE_WRITE_ENV, ChatItemLedger;
+var import_node_crypto15, CHAT_ITEMS_DOUBLE_WRITE_ENV, SEGMENT_END_NOTE, ChatItemLedger;
 var init_chat_item_ledger = __esm({
   "../server/src/chat-item-ledger.ts"() {
     "use strict";
@@ -28671,6 +28691,7 @@ var init_chat_item_ledger = __esm({
     init_chat_item();
     import_node_crypto15 = require("node:crypto");
     CHAT_ITEMS_DOUBLE_WRITE_ENV = "OASIS_CHAT_ITEMS_DOUBLE_WRITE";
+    SEGMENT_END_NOTE = "\u672C\u6BB5\u65E0\u8F93\u51FA\uFF08\u4EBA\u5728\u9996\u4E2A\u6B63\u6587\u4E4B\u524D\u63D2\u4E86\u8BDD\uFF09";
     ChatItemLedger = class {
       constructor(deps) {
         this.deps = deps;
@@ -28699,6 +28720,8 @@ var init_chat_item_ledger = __esm({
       log;
       persistEnabled;
       telemetryTextInContent;
+      /** 本段的「无输出」注解已经提前落过（`closeSegmentBeforeUserInput`），`beginSegment` 别再落一条。 */
+      segmentEndEmitted = false;
       /** **不变量 1**：`providerItemKey → itemId`，本账本唯一持有。切段/收尾清空。 */
       itemKeyMap = /* @__PURE__ */ new Map();
       /** 内存账本：itemId → 行。插入顺序即 seq 顺序。 */
@@ -28916,19 +28939,11 @@ var init_chat_item_ledger = __esm({
        * 映射一并清空——新段是新行，复用旧 itemId 会把新文本写进上一条消息。
        */
       beginSegment() {
-        this.closeStreamingRows("completed");
-        if (this.segmentItemCount === 0 && this.messageId) {
-          this.insert({
-            kind: "control",
-            role: "assistant",
-            status: "completed",
-            origin: "server",
-            text: "",
-            attrs: {},
-            inContent: false,
-            persist: true,
-            payload: { code: "segment_end", note: "\u672C\u6BB5\u65E0\u8F93\u51FA\uFF08\u4EBA\u5728\u9996\u4E2A\u6B63\u6587\u4E4B\u524D\u63D2\u4E86\u8BDD\uFF09" }
-          });
+        if (this.segmentEndEmitted) {
+          this.segmentEndEmitted = false;
+        } else {
+          this.closeStreamingRows("completed");
+          if (this.segmentItemCount === 0 && this.messageId) this.insertSegmentEnd();
         }
         this.itemKeyMap.clear();
         this.lastTurnId = null;
@@ -28936,6 +28951,41 @@ var init_chat_item_ledger = __esm({
         this.segment += 1;
         this.segmentItemCount = 0;
       }
+      /**
+       * 人插话时，先把「这一段到此为止」落定；**必须在那条 user 行之前调用**。
+       *
+       * 展示序（`ord`）由落库那一刻的表级序列派，所以**谁先落库谁在上面**。此前这条注解跟在
+       * `beginSegment()` 里、而 `beginSegment` 由 `onUserInput` 回调在 user 行之后触发，于是
+       * 「本段无输出」排到了人说的那句话**下面**——发起人 2026-09-11 的现场（会话 `eca44da4`：
+       * user 行 ord 8503、注解 ord 8504）。他要的顺序是：开启这一轮的那条消息 → agent 头像块
+       * （里面就是这条注解）→ 人插的那句话 → agent 接着说。
+       *
+       * 返回落下的那一行（`null` = 本段有输出、或还没有 assistant 行可归属，不需要注解），
+       * 调用方据它把这条推上 v3 流——不推的话它只在下一次快照才出现。
+       */
+      closeSegmentBeforeUserInput() {
+        this.closeStreamingRows("completed");
+        if (this.segmentEndEmitted) return null;
+        if (this.segmentItemCount !== 0 || !this.messageId) return null;
+        const id = this.insertSegmentEnd();
+        this.segmentEndEmitted = true;
+        const row = this.rows.get(id);
+        return { itemId: id, version: row.wireVersion, startedVersion: row.startedVersion, ord: row.ord };
+      }
+      /** 零输出段兜底（S1 评审 B1）：那条 assistant 行库里已经在了，一条 item 都没有会被对账抓成假红。 */
+      insertSegmentEnd() {
+        return this.insert({
+          kind: "control",
+          role: "assistant",
+          status: "completed",
+          origin: "server",
+          text: "",
+          attrs: {},
+          inContent: false,
+          persist: true,
+          payload: { code: "segment_end", note: SEGMENT_END_NOTE }
+        });
+      }
       /** 行落库了，把本段还挂着 NULL 的 assistant item 认领回去，并让后续 item 直接带上它。 */
       bindMessage(messageId) {
         this.messageId = messageId;
@@ -159847,6 +159897,7 @@ var DEFAULT_BUFFER_MAX, DEFAULT_GRACE_MS, DEFAULT_LIVE_COALESCE_MS, DEFAULT_LIVE
 var init_live_chat = __esm({
   "../server/src/live-chat.ts"() {
     "use strict";
+    init_chat_item_ledger();
     DEFAULT_BUFFER_MAX = 4e3;
     DEFAULT_GRACE_MS = 6e4;
     DEFAULT_LIVE_COALESCE_MS = 24;
@@ -160593,6 +160644,24 @@ var init_live_chat = __esm({
           text: shown,
           ...opts?.attachments?.length ? { attachments: opts.attachments } : {}
         };
+        const segmentEnd = (() => {
+          try {
+            return turn.items?.closeSegmentBeforeUserInput() ?? null;
+          } catch {
+            return null;
+          }
+        })();
+        if (segmentEnd) {
+          this.publishServerItem(turn, {
+            itemId: segmentEnd.itemId,
+            itemType: "control",
+            startedVersion: segmentEnd.startedVersion,
+            version: segmentEnd.version,
+            ord: segmentEnd.ord,
+            status: "completed",
+            payload: { code: "segment_end", note: SEGMENT_END_NOTE }
+          });
+        }
         try {
           turn.items?.recordUserInput(shown, opts?.attachments, opts?.clientKeys);
         } catch {
@@ -212756,7 +212825,15 @@ var init_service4 = __esm({
        * 亲手提交过至少一版」。这是仓库里唯一一条真实存在的「产物 ↔ 人」关系；
        * 「谁 own 这个节点」不用（节点 owner 是**派给谁**，派了没干完的也会被算成产出，那是假数据）。
        *
-       * 同一产物被同一人提交多版只出现一次，`revisionCount` 记他提过几版、`updatedAt` 取他最近一次提交。
+       * **空轮不算产出**（ADR 0539 补记）：内核把**每一轮执行**都投影成一版 revision，这一轮一个产出文件
+       * 都没有时 bridge 如实给 `contentKind="empty"`（运行中占位 / 被限流打死的空跑 / 只留结论没产正文，
+       * 见 `bridge-readmodel.workToRevision` 与 ADR-0134）。那种版本这里一律跳过——它不是「他交了什么」，
+       * 展示层拿到只会得到一行没有大小、点开写着「还没有可预览的正文」的空行。
+       * 项目页「相关文件」早就不列这类轮次（`collectEngineFilesForProject` 的
+       * `latestAcceptId` / `cancelledAt` / `arts.length === 0` 三道闸），本栏此前漏了这条口径。
+       *
+       * 于是 `revisionCount` 记的是**他交付过几版**、`latestRevisionId`/`updatedAt` 取**他最近一次真的
+       * 交了东西的那一版**；一版都没交过内容的产物整条不出现。
        *
        * 数据同 `artifactDetail`：从 `kernel.model` 现算投影（新引擎 oplog 已退役、派生 store 恒空），
        * 不读 `artifact_revisions` 表——读那张表在新引擎上永远是空列表。
@@ -212774,6 +212851,7 @@ var init_service4 = __esm({
         const byArtifact = /* @__PURE__ */ new Map();
         for (const revision of projection.revisions) {
           if (revision.actorId !== actorId) continue;
+          if (isEmptyContent(this.kernel.model.revisions.get(revision.revisionId)?.contentKind)) continue;
           const artifact = artifactById.get(revision.artifactId);
           if (!artifact) continue;
           const prev = byArtifact.get(revision.artifactId);
@@ -212816,8 +212894,10 @@ var init_service4 = __esm({
        * 同一个 {@link contentByteSize}**，不另写一套判据）：装箱单摊成每个物理文件一行，
        * 其余（inline-blob / external-pin / 装箱单解析失败）整份产物一行。
        *
-       * 取哪一版：**他自己最近提交的那一版**（`latestRevisionId`），不是产物的 current head——
-       * 这一栏回答的是「他交了什么」，拿别人后来覆盖的版本冒充他的产出就是假数据。
+       * 取哪一版：**他自己最近交付过内容的那一版**（`latestRevisionId`，空轮已在
+       * {@link listActorArtifacts} 里滤掉），不是产物的 current head——这一栏回答的是「他交了什么」，
+       * 拿别人后来覆盖的版本冒充他的产出就是假数据。该版本 id 随行发给前端（`revisionId`），
+       * 预览栏据它定位同一版：行与预览必须指着同一个东西，否则会出现「行上有 20 KB、点开说没有正文」。
        */
       async listActorFiles(actorId) {
         const artifacts = await this.listActorArtifacts(actorId);
@@ -212829,6 +212909,7 @@ var init_service4 = __esm({
           const base = {
             artifactId: item.artifactId,
             projectId: item.projectId,
+            revisionId: item.latestRevisionId,
             type: item.type,
             updatedAt: item.updatedAt,
             ...contentKind ? { contentKind } : {},
@@ -220147,6 +220228,20 @@ ${input.description}
           };
         });
       }
+      /**
+       * 这一行变量是谁建的（子 PRD《密钥管理》§1 的权限判据）。**只读元数据、不解密**——
+       * `listVariables()` 会把每一行都解一遍出掩码，写路径上没必要付那个钱。
+       *
+       * 返回 undefined 有两种含义，调用方按「放行」处理：行不存在（新建），
+       * 或行是 2026-09-10 之前落的（那时还没有 created_by 这一格）。
+       */
+      async variableCreatedBy(key, selector = {}) {
+        const rows = await this.opts.store.listVariables();
+        const hit = rows.find(
+          (r) => r.key === key && (r.actorId ?? "") === (selector.actorId ?? "") && (r.projectId ?? "") === (selector.projectId ?? "")
+        );
+        return hit?.createdBy;
+      }
       async revealVariable(key, actorId) {
         const ct = await this.opts.store.getVariableCiphertext(key, actorId);
         if (ct === null) return null;
@@ -221932,6 +222027,17 @@ function actorsDomain(opts) {
         );
       }
     };
+    const requireSecretOwner = async (req, service, key, selector = {}) => {
+      const owner = await service.variableCreatedBy(key, selector);
+      if (!owner || owner === req.auth.actor) return;
+      const manager = opts.isCompanyManager ? await opts.isCompanyManager(req.auth.companyId ?? "", req.auth.actor).catch(() => false) : false;
+      if (manager) return;
+      throw new ApiError(
+        403,
+        "SECRET_NOT_OWNED",
+        "\u8FD9\u4EFD\u5BC6\u94A5\u7531\u522B\u4EBA\u521B\u5EFA\uFF0C\u53EA\u6709\u521B\u5EFA\u8005\u672C\u4EBA\u6216\u7EC4\u7EC7\u7BA1\u7406\u8005\u53EF\u4EE5\u4FEE\u6539 / \u5220\u9664"
+      );
+    };
     const auditVariableChange = async (req, kind, variableKey, targetScope) => {
       await opts.credentialAudit?.({
         kind,
@@ -221986,6 +222092,7 @@ function actorsDomain(opts) {
         );
       }
       if (b2.value === void 0 || b2.value === "") return { status: 200, body: { ok: true } };
+      await requireSecretOwner(req, service, b2.key, scope === "project" ? { projectId: b2.projectId } : {});
       await service.putVariable({
         key: b2.key,
         value: b2.value,
@@ -222013,6 +222120,7 @@ function actorsDomain(opts) {
       requireVariableManager(req);
       const { service } = await resolveCtx(req.auth.companyId);
       const projectId2 = req.query.get("projectId") ?? void 0;
+      await requireSecretOwner(req, service, req.params.key, projectId2 ? { projectId: projectId2 } : {});
       await service.deleteVariable(
         req.params.key,
         void 0,
@@ -222060,6 +222168,7 @@ function actorsDomain(opts) {
           );
         }
       }
+      await requireSecretOwner(req, service, b2.key, { actorId });
       await service.putVariable({
         key: b2.key,
         value: b2.value,
@@ -222080,6 +222189,7 @@ function actorsDomain(opts) {
     router.delete("/api/actors/:id/variables/:key", async (req) => {
       requireVariableManager(req);
       const { service } = await resolveCtx(req.auth.companyId);
+      await requireSecretOwner(req, service, req.params.key, { actorId: req.params.id });
       await service.deleteVariable(req.params.key, req.params.id);
       await auditVariableChange(req, "credential_delete", req.params.key, `personal:${req.params.id}`);
       return { status: 200, body: { ok: true } };
@@ -222888,7 +222998,7 @@ function createActorsDomain(opts) {
   return {
     service: defaultCtx.service,
     resolveCtx,
-    register: actorsDomain({ resolveCtx, ...opts.trace ? { trace: opts.trace } : {}, ...opts.listBuiltinSkills ? { listBuiltinSkills: opts.listBuiltinSkills } : {}, ...opts.getBuiltinSkills ? { getBuiltinSkills: opts.getBuiltinSkills } : {}, ...opts.getConnectorSkills ? { getConnectorSkills: opts.getConnectorSkills } : {}, ...opts.refreshConnectorSkills ? { refreshConnectorSkills: opts.refreshConnectorSkills } : {}, ...opts.memory ? { memory: opts.memory } : {}, ...opts.resolveDispatchScope ? { resolveDispatchScope: opts.resolveDispatchScope } : {}, ...opts.projectExists ? { projectExists: opts.projectExists } : {}, ...opts.credentialAudit ? { credentialAudit: opts.credentialAudit } : {}, ...opts.readCredentialAudit ? { readCredentialAudit: opts.readCredentialAudit } : {}, ...opts.credentialRevealLimits ? { credentialRevealLimits: opts.credentialRevealLimits } : {}, ...opts.skillMarket ? { skillMarket: opts.skillMarket } : {}, ...opts.resolveNodeTenancy ? { resolveNodeTenancy: opts.resolveNodeTenancy } : {} })
+    register: actorsDomain({ resolveCtx, ...opts.trace ? { trace: opts.trace } : {}, ...opts.listBuiltinSkills ? { listBuiltinSkills: opts.listBuiltinSkills } : {}, ...opts.getBuiltinSkills ? { getBuiltinSkills: opts.getBuiltinSkills } : {}, ...opts.getConnectorSkills ? { getConnectorSkills: opts.getConnectorSkills } : {}, ...opts.refreshConnectorSkills ? { refreshConnectorSkills: opts.refreshConnectorSkills } : {}, ...opts.memory ? { memory: opts.memory } : {}, ...opts.resolveDispatchScope ? { resolveDispatchScope: opts.resolveDispatchScope } : {}, ...opts.projectExists ? { projectExists: opts.projectExists } : {}, ...opts.isCompanyManager ? { isCompanyManager: opts.isCompanyManager } : {}, ...opts.credentialAudit ? { credentialAudit: opts.credentialAudit } : {}, ...opts.readCredentialAudit ? { readCredentialAudit: opts.readCredentialAudit } : {}, ...opts.credentialRevealLimits ? { credentialRevealLimits: opts.credentialRevealLimits } : {}, ...opts.skillMarket ? { skillMarket: opts.skillMarket } : {}, ...opts.resolveNodeTenancy ? { resolveNodeTenancy: opts.resolveNodeTenancy } : {} })
   };
 }
 var import_node_crypto49;
@@ -223245,6 +223355,7 @@ ${errs.join("\n")}`);
             id: item.id,
             artifact_id: item.artifactId,
             project_id: item.projectId,
+            revision_id: item.revisionId,
             type: item.type,
             name: item.name,
             file_path: item.filePath,
@@ -223920,6 +224031,15 @@ var init_routes5 = __esm({
   }
 });
 
+// ../server/src/domains/collab/activity-notice.ts
+var NOTICE_TITLE;
+var init_activity_notice = __esm({
+  "../server/src/domains/collab/activity-notice.ts"() {
+    "use strict";
+    NOTICE_TITLE = "\u53D8\u66F4\u901A\u77E5";
+  }
+});
+
 // ../server/src/domains/collab/review-activity.ts
 function reviewCardId(targetWorkId, reviewerActorId) {
   return `${REVIEW_CARD_PREFIX}${encodeURIComponent(targetWorkId)}:${encodeURIComponent(reviewerActorId)}`;
@@ -224068,35 +224188,18 @@ var init_review_activity = __esm({
 
 // ../server/src/domains/collab/review-requirement-activity.ts
 function reviewRequirementActivity(snap, events, ref2) {
-  const previous3 = /* @__PURE__ */ new Map();
   const titles = new Map(snap.nodes.map((n) => [n.id, n.title]));
   const cards = [];
   const label = (r) => `${ref2(r.reviewerActorId).name || "\u672A\u547D\u540D\u5BA1\u6838\u4EBA"}${r.source === "closure" ? "\uFF08\u7ED3\u6848\u5BA1\u6838\uFF09" : ""}`;
-  const names = (rows) => [...new Set(rows.map(label))].join("\u3001") || "\u65E0";
+  const names = (rows) => [...new Set(rows.map(label))].join("\u3001");
+  const submitter = (id) => ref2(id).name?.trim() || "\u672A\u547D\u540D\u6210\u5458";
+  const sentence = (id, nodeTitle, rows) => rows.length ? `${submitter(id)} \u66F4\u6539\u300A${nodeTitle}\u300B\u8282\u70B9\u7684\u5BA1\u6838\u4EBA\u4E3A ${names(rows)}\u3002` : `${submitter(id)} \u6E05\u7A7A\u4E86\u300A${nodeTitle}\u300B\u8282\u70B9\u7684\u5BA1\u6838\u4EBA\u3002`;
   for (const rec of [...events].sort((a, b2) => a.seq - b2.seq)) {
     if (rec.status === "pending" || rec.status === "failed") continue;
     const e = rec.event;
-    if (e.kind === "plan.changed") {
-      for (const node2 of e.addNodes ?? []) previous3.set(node2.id, node2.reviewers ?? []);
-      for (const id of e.removeNodes ?? []) previous3.delete(id);
-      continue;
-    }
-    if (e.kind === "plan.add_node") {
-      previous3.set(e.nodeId, e.reviewers ?? []);
-      continue;
-    }
     if (e.kind !== "plan.update_review_requirements") continue;
-    const before = previous3.get(e.nodeId);
-    const after = e.reviewers;
-    const beforeKeys = new Set(before?.map(requirementKey));
-    const afterKeys = new Set(after.map(requirementKey));
-    const added = before ? after.filter((r) => !beforeKeys.has(requirementKey(r))) : [];
-    const removed = before?.filter((r) => !afterKeys.has(requirementKey(r))) ?? [];
+    if (!isAuthoredChange(rec)) continue;
     const nodeTitle = titles.get(e.nodeId) || "\u5DF2\u79FB\u9664\u7684\u8282\u70B9";
-    if (!isAuthoredChange(rec)) {
-      previous3.set(e.nodeId, after);
-      continue;
-    }
     cards.push({
       id: `wo:${rec.seq}`,
       seq: rec.seq,
@@ -224107,24 +224210,19 @@ function reviewRequirementActivity(snap, events, ref2) {
       executor: ref2(rec.actorId),
       ...rec.handActorId ? { handActor: ref2(rec.handActorId) } : {},
       phase: "done",
-      status: `\u66F4\u65B0\u4E86\u300A${nodeTitle}\u300B\u7684\u5BA1\u6838\u5217\u8868\u3002`,
-      detail: [
-        ...added.length ? [`\u65B0\u589E\uFF1A${names(added)}`] : [],
-        ...removed.length ? [`\u79FB\u9664\uFF1A${names(removed)}`] : [],
-        `\u66F4\u65B0\u540E\uFF1A${names(after)}`
-      ].join("\n"),
+      noticeTitle: NOTICE_TITLE,
+      status: sentence(rec.actorId, nodeTitle, e.reviewers),
       artifacts: [],
       actions: []
     });
-    previous3.set(e.nodeId, after);
   }
   return cards;
 }
-var requirementKey, isAuthoredChange;
+var isAuthoredChange;
 var init_review_requirement_activity = __esm({
   "../server/src/domains/collab/review-requirement-activity.ts"() {
     "use strict";
-    requirementKey = (r) => JSON.stringify([r.reviewerActorId, r.reviewGroup, r.source]);
+    init_activity_notice();
     isAuthoredChange = (rec) => rec.origin !== "apply" && rec.origin !== "effect" && !rec.actorId.startsWith("actor:system:");
   }
 });
@@ -224220,7 +224318,6 @@ function buildWorkorderActivity(input) {
     return tail || nodeId;
   };
   const cardOfWork = /* @__PURE__ */ new Map();
-  const latestCardOfNode = /* @__PURE__ */ new Map();
   const executionCards = [];
   const offTimeline = (w2) => isDispatchLayerFailure(w2.outcomeDetail) || w2.outcome === "completed" && statusOf2(w2) !== "success" && !artifactsByWork.get(w2.id)?.length;
   const statusOf2 = (w2) => w2.status ?? (w2.outcome === "failed" ? "failed" : w2.outcome === "completed" ? "success" : "running");
@@ -224249,35 +224346,45 @@ function buildWorkorderActivity(input) {
     works.sort((a, b2) => a.createdAt.localeCompare(b2.createdAt) || a.id.localeCompare(b2.id));
     const interrupts = [...interruptsOfNode.get(nodeId) ?? []].sort();
     const node2 = nodeById.get(nodeId);
+    const nodeCancelledAt = node2?.cancelledAt ?? null;
     const name = nodeName(nodeId);
-    let card2 = null;
+    let fold2 = null;
     for (const [idx, w2] of works.entries()) {
-      if (!card2) {
-        card2 = {
-          /* 卡 id 取组内**首个** work（React key 与滚动锚点因此稳定）；`at` 是这一轮开工的时刻。 */
-          id: `work:${w2.id}`,
-          traceWorkIds: [],
-          seq: 0,
-          // 事件循环里按首个 work.create 的 seq 填
-          at: w2.createdAt,
-          updatedAt: w2.createdAt,
-          nodeId,
-          executorId: w2.assigneeActorId,
-          phase: "running",
-          status: ACTIVITY_COPY.working(name),
-          artifacts: [],
-          actions: []
-        };
-        executionCards.push(card2);
-        latestCardOfNode.set(nodeId, card2);
+      const next = works[idx + 1];
+      const artifacts = artifactsByWork.get(w2.id) ?? [];
+      const st = statusOf2(w2);
+      const interrupt = interrupts.find((t) => t >= w2.createdAt && (!next || t < next.createdAt));
+      const removedHere = !!nodeCancelledAt && nodeCancelledAt >= w2.createdAt && (!next || nodeCancelledAt < next.createdAt);
+      const reassigned = !!next && next.assigneeActorId !== w2.assigneeActorId;
+      const killedByPlan = !!(w2.deadAt || w2.cancelledAt) && !!next && (reassigned || (next.nodeVersion ?? 0) > (w2.nodeVersion ?? 0));
+      const failedRound = !w2.conclusion && !interrupt && !removedHere && !killedByPlan && (!!w2.deadAt || !!w2.cancelledAt || st === "failed" || st === "retry");
+      if (failedRound && fold2) {
+        fold2.traceWorkIds.push(w2.id);
+        cardOfWork.set(w2.id, fold2);
+        fold2.updatedAt = lastStampOf(w2);
+        fold2.stuckReason = w2.outcomeDetail?.reason === "timeout" ? "timeout" : "failed";
+        fold2.foldedRounds = (fold2.foldedRounds ?? 1) + 1;
+        fold2.status = ACTIVITY_COPY.foldedFailures(nameOf(fold2.executorId), name, fold2.foldedRounds);
+        continue;
       }
-      card2.traceWorkIds.push(w2.id);
+      fold2 = null;
+      const card2 = {
+        /* 卡 id = 这一轮的 workId（连败折叠时取第一轮，React key 与滚动锚点因此稳定）。 */
+        id: `work:${w2.id}`,
+        traceWorkIds: [w2.id],
+        seq: 0,
+        // 事件循环里按这一轮 work.create 的 seq 填
+        at: w2.createdAt,
+        updatedAt: lastStampOf(w2),
+        nodeId,
+        executorId: w2.assigneeActorId,
+        phase: "running",
+        status: ACTIVITY_COPY.working(name),
+        artifacts,
+        actions: []
+      };
+      executionCards.push(card2);
       cardOfWork.set(w2.id, card2);
-      card2.executorId = w2.assigneeActorId;
-      card2.updatedAt = lastStampOf(w2);
-      card2.artifacts = artifactsByWork.get(w2.id) ?? card2.artifacts;
-      delete card2.openWorkId;
-      delete card2.stuckReason;
       if (w2.conclusion) {
         card2.phase = "done";
         if (rootBriefNodeIds.has(nodeId)) {
@@ -224293,32 +224400,21 @@ function buildWorkorderActivity(input) {
             card2.status = awaits ? ACTIVITY_COPY.doneAwaitingReview(name) : ACTIVITY_COPY.done(name);
           }
         }
-        card2 = null;
-        continue;
-      }
-      const next = works[idx + 1];
-      const interrupt = interrupts.find((t) => t >= w2.createdAt && (!next || t < next.createdAt));
-      if (interrupt) {
+      } else if (interrupt) {
         card2.phase = "stuck";
         card2.status = ACTIVITY_COPY.interruptedByIssue(name);
         if (interrupt > card2.updatedAt) card2.updatedAt = interrupt;
-        card2 = null;
-        continue;
-      }
-      const stuckKind = w2.outcomeDetail?.reason === "timeout" ? "timeout" : "failed";
-      const st = statusOf2(w2);
-      if (w2.deadAt || w2.cancelledAt) {
+      } else if (removedHere || killedByPlan) {
         card2.phase = "stuck";
-        card2.stuckReason = stuckKind;
-        card2.status = ACTIVITY_COPY.killed(name);
-      } else if (st === "failed") {
+        card2.status = removedHere ? ACTIVITY_COPY.interruptedByNodeRemoved(name) : reassigned ? ACTIVITY_COPY.interruptedByReassign(name, nameOf(next.assigneeActorId)) : ACTIVITY_COPY.interruptedByPlanChange(name);
+        if (!removedHere && !reassigned) card2.planChangeUnnamed = true;
+        if (removedHere && nodeCancelledAt > card2.updatedAt) card2.updatedAt = nodeCancelledAt;
+      } else if (failedRound) {
+        const stuckKind = w2.outcomeDetail?.reason === "timeout" ? "timeout" : "failed";
         card2.phase = "stuck";
         card2.stuckReason = stuckKind;
-        card2.status = stuckKind === "timeout" ? ACTIVITY_COPY.timedOut(nameOf(card2.executorId)) : ACTIVITY_COPY.failed(nameOf(card2.executorId));
-      } else if (st === "retry") {
-        card2.phase = "stuck";
-        card2.stuckReason = stuckKind;
-        card2.status = ACTIVITY_COPY.awaitingRedispatch(nameOf(card2.executorId), name);
+        card2.status = w2.deadAt || w2.cancelledAt ? ACTIVITY_COPY.killed(name) : st === "retry" ? ACTIVITY_COPY.awaitingRedispatch(nameOf(card2.executorId), name) : stuckKind === "timeout" ? ACTIVITY_COPY.timedOut(nameOf(card2.executorId)) : ACTIVITY_COPY.failed(nameOf(card2.executorId));
+        fold2 = card2;
       } else if (w2.endedAt) {
         card2.phase = "running";
         card2.status = ACTIVITY_COPY.awaitingConclude(name);
@@ -224339,17 +224435,28 @@ function buildWorkorderActivity(input) {
     if (rec.handActorId) d.handActorId = rec.handActorId;
     return d;
   };
-  const woCard = (rec, executorId, status, detail, phase = "done") => {
+  const cardOpenAt = (nodeId, at) => {
+    const list2 = worksOfNode.get(nodeId);
+    if (!list2) return void 0;
+    let hit;
+    for (const w2 of list2) {
+      if (w2.createdAt > at) break;
+      hit = w2;
+    }
+    return hit ? cardOfWork.get(hit.id) : void 0;
+  };
+  const woCard = (rec, status, opts = {}) => {
     standalone.push({
       id: `wo:${rec.seq}`,
       seq: rec.seq,
       at: rec.createdAt,
       updatedAt: rec.createdAt,
-      executorId,
+      executorId: rec.actorId,
       ...rec.handActorId ? { handActorId: rec.handActorId } : {},
-      phase,
+      phase: "done",
+      ...opts.notice ? { noticeTitle: NOTICE_TITLE } : {},
       status,
-      ...detail ? { detail } : {},
+      ...opts.detail ? { detail: opts.detail } : {},
       artifacts: [],
       actions: []
     });
@@ -224362,20 +224469,29 @@ function buildWorkorderActivity(input) {
       case "plan.changed": {
         break;
       }
+      /* 暂停 / 恢复是**人对这单做的事**，不是某一轮执行——走「变更通知」那套卡面（帧 `2874:1189`）。
+         此前它们沿用执行卡的标题模板，卡面第一行被拼成「{谁} 已完成」（`ACTIVITY_PHASE_LABEL.done`），
+         第二行才是「{谁}已暂停任务。」——标题和正文说的不是同一件事，而「已完成」在这一拍根本
+         没有所指（暂停不是完成）。 */
       case "workorder.paused":
-        woCard(rec, rec.actorId, ACTIVITY_COPY.paused(nameOf(rec.actorId)), str4(ev.reason));
+        woCard(rec, ACTIVITY_COPY.paused(nameOf(rec.actorId)), { notice: true, detail: str4(ev.reason) });
         break;
       case "workorder.resumed":
-        woCard(rec, rec.actorId, ACTIVITY_COPY.resumedWorkorder(nameOf(rec.actorId)));
+        woCard(rec, ACTIVITY_COPY.resumedWorkorder(nameOf(rec.actorId)), { notice: true });
         break;
       case "workorder.meta_changed": {
         const patch = ev.patch ?? {};
         if (!("goal" in patch) && !("description" in patch)) break;
-        woCard(rec, rec.actorId, ACTIVITY_COPY.goalChanged(nameOf(rec.actorId), managerName()));
+        woCard(rec, ACTIVITY_COPY.goalChanged(nameOf(rec.actorId), managerName()));
         break;
       }
       case "plan.update_spec": {
-        woCard(rec, rec.actorId, ACTIVITY_COPY.specConfirmed, void 0, "running");
+        const nodeId = String(ev.nodeId ?? "");
+        const d = cardOpenAt(nodeId, rec.createdAt);
+        if (d?.planChangeUnnamed) {
+          d.status = ACTIVITY_COPY.interruptedBySpecChange(nameOf(rec.actorId), nodeName(nodeId));
+          delete d.planChangeUnnamed;
+        }
         break;
       }
       /* ── 执行（work）──────────────────────────────────────────────
@@ -224655,10 +224771,10 @@ function buildWorkorderActivity(input) {
       case "plan.node_retry": {
         const nodeId = String(ev.nodeId ?? "");
         const by = str4(ev.by) ?? rec.actorId;
-        const target = latestCardOfNode.get(nodeId);
-        if (!target || target.phase !== "stuck") break;
+        const target = cardOpenAt(nodeId, rec.createdAt);
+        if (!target || target.phase !== "stuck" || !target.stuckReason) break;
         touch(target, rec);
-        target.status = target.stuckReason === "timeout" ? ACTIVITY_COPY.retriedAfterTimeout(nameOf(target.executorId), nameOf(by)) : ACTIVITY_COPY.retriedAfterFailure(nameOf(target.executorId), nameOf(by));
+        target.status = target.foldedRounds && target.foldedRounds > 1 ? ACTIVITY_COPY.foldedFailuresRetried(nameOf(target.executorId), nodeName(nodeId), target.foldedRounds, nameOf(by)) : target.stuckReason === "timeout" ? ACTIVITY_COPY.retriedAfterTimeout(nameOf(target.executorId), nameOf(by)) : ACTIVITY_COPY.retriedAfterFailure(nameOf(target.executorId), nameOf(by));
         break;
       }
       default:
@@ -224822,6 +224938,7 @@ function buildWorkorderActivity(input) {
       ...d.reviewWorkId ? { reviewWorkId: d.reviewWorkId, reviewers: d.reviewerIds?.map(ref2) } : {},
       ...d.handActorId ? { handActor: ref2(d.handActorId) } : {},
       phase: d.phase,
+      ...d.noticeTitle ? { noticeTitle: d.noticeTitle } : {},
       status: d.status,
       ...d.detail ? { detail: d.detail } : {},
       ...d.reviewNotes?.length ? { reviewNotes: d.reviewNotes } : {},
@@ -224843,13 +224960,13 @@ var init_activity2 = __esm({
     "use strict";
     init_src();
     init_src4();
+    init_activity_notice();
     init_review_activity();
     init_review_requirement_activity();
     init_workorder_manager();
     init_escalation_recipient();
     ACTIVITY_EVENT_KINDS = [
       "plan.changed",
-      "plan.add_node",
       "plan.update_review_requirements",
       "plan.update_spec",
       "plan.node_retry",
@@ -224923,7 +225040,39 @@ var init_activity2 = __esm({
        *
        * 不重复缺口卡那句「需要 @{协调者} 协助解决」：该找谁由缺口卡自己说，执行卡只说这一轮到此为止。
        */
+      /**
+       * **连败折叠**：同一节点上连续没跑成的 N 轮折成一张。不折叠的话 `ws:wo-6d588f8e` 的《隔离边界实现》
+       * 会在时间线上连出 12 张，其中 9 张都是「执行失败。」——真正要给人看的是「这个节点一直没跑成」
+       * 这一件事，逐轮的原因在轨迹抽屉里（`traceWorkIds` 收齐全部 N 轮，一轮不少）。
+       */
+      foldedFailures: (executor, node2, n) => `${executor} \u8FDE\u7EED ${n} \u6B21\u6CA1\u8DD1\u6210\u300A${node2}\u300B\u3002`,
+      /** 折叠卡上补「谁按的重试」——不把「连续 N 次」换成单轮那句。 */
+      foldedFailuresRetried: (executor, node2, n, by) => `${executor} \u8FDE\u7EED ${n} \u6B21\u6CA1\u8DD1\u6210\u300A${node2}\u300B\uFF0C${by}\u5DF2\u4ECB\u5165\u91CD\u8BD5\u3002`,
       interruptedByIssue: (node2) => `\u300A${node2}\u300B\u672C\u8F6E\u6267\u884C\u56E0\u5361\u70B9\u4E2D\u65AD\u3002`,
+      /**
+       * 这一轮**被计划变更打断**（P15）。与卡点中断同级：计划一动，这一轮就不再是「还在跑」，
+       * 而是被引擎当场顶掉了——`plan.delete_node` 直接 `killLatestWork`；`plan.update_spec`（spec 真变）
+       * 与 `plan.assign_actor`（换人）把 `node.version` 加一，scan 随即重派，`work.create` 自带
+       * supersede 把在跑的这一轮翻成 dead。
+       *
+       * 此前这两条都不结束卡：删节点那档只落到 {@link killed}「本轮执行已终止」，不说是计划调整；
+       * 改 spec / 改派那档**根本没有结局**——新一轮直接改写同一张卡，「中断」在页面上不存在，
+       * 卡上署名还会换成新人（与 §2.1「一张卡只讲一个人的事」相抵）。
+       */
+      interruptedByPlanChange: (node2) => `\u300A${node2}\u300B\u672C\u8F6E\u6267\u884C\u56E0\u8BA1\u5212\u8C03\u6574\u4E2D\u65AD\u3002`,
+      /**
+       * 计划变更里最常见的那一种：**有人改了任务说明**，在跑的这一轮因此被顶掉。
+       *
+       * 这句取代了原来那张独立的任务级卡「已确认任务说明更新，正在判断该修改的影响。」——两张卡讲的
+       * 本来就是同一件事：计划动了、这一轮做不下去了。旧卡还有两个毛病：`phase` 写死 `running`，
+       * 没有任何一拍能让它收口（`ws:wo-217a0909` 12:13 那两张就是这么永久停在「进行中」的）；文案是
+       * 一句没有主语也没有宾语的固定串，两次内容不同的修改渲染成两行一模一样的字。
+       */
+      interruptedBySpecChange: (by, node2) => `${by} \u66F4\u65B0\u4E86\u4EFB\u52A1\u8BF4\u660E\uFF0C\u300A${node2}\u300B\u672C\u8F6E\u6267\u884C\u5230\u6B64\u4E2D\u65AD\u3002`,
+      /** 换人那一档点破接手的人——卡到此为止，下一轮是新执行人的新卡。 */
+      interruptedByReassign: (node2, next) => `\u300A${node2}\u300B\u672C\u8F6E\u6267\u884C\u56E0\u8BA1\u5212\u8C03\u6574\u4E2D\u65AD\uFF0C\u5DF2\u6539\u7531 ${next} \u63A5\u624B\u3002`,
+      /** 节点被移出计划：这一轮再没有下文，也不会有新卡。 */
+      interruptedByNodeRemoved: (node2) => `\u300A${node2}\u300B\u5DF2\u4ECE\u8BA1\u5212\u4E2D\u79FB\u9664\uFF0C\u672C\u8F6E\u6267\u884C\u4E2D\u65AD\u3002`,
       /**
        * 引擎判卷 success、`endedAt` 也写了，却始终没有 `work.conclude`：**交了稿没收口**。
        * 如实说这一档，不冒充「正在处理」——后者把一轮早就结束的执行画成还在跑。
@@ -224960,7 +225109,6 @@ var init_activity2 = __esm({
       paused: (actor) => `${actor}\u5DF2\u6682\u505C\u4EFB\u52A1\u3002`,
       resumedWorkorder: (actor) => `${actor}\u5DF2\u6062\u590D\u4EFB\u52A1\u3002`,
       goalChanged: (actor, manager) => `${actor}\u4FEE\u6539\u4E86\u4EFB\u52A1\u76EE\u6807\uFF0C\u9700\u8981 ${manager}\u91CD\u65B0\u8BC4\u4F30\u3002`,
-      specConfirmed: "\u5DF2\u786E\u8BA4\u4EFB\u52A1\u8BF4\u660E\u66F4\u65B0\uFF0C\u6B63\u5728\u5224\u65AD\u8BE5\u4FEE\u6539\u7684\u5F71\u54CD\u3002",
       handleEscalation: (target) => `${target} \u7684\u6267\u884C\u5F02\u5E38\u6301\u7EED\u672A\u89E3\u51B3\u3002`,
       handledEscalation: (target) => `\u5DF2\u5904\u7406 ${target} \u7684\u6267\u884C\u5F02\u5E38\u3002`,
       /**
@@ -225969,13 +226117,7 @@ function buildWaitingInbox(reviews, works, policy, nowIso, me, resolveActor) {
       const isSelf = r.actorId === me;
       const actorLabel = displayName(resolveActor, r.actorId);
       if (r.status === "dead" || r.status === "exhausted") {
-        out.push(isSelf ? card(kind, r, "urgent", start, `\u4F60\u7684${KIND_LABEL[kind]}\u5DF2\u4E2D\u6B62\uFF0C\u9700\u8981\u4F60\u4ECB\u5165\u91CD\u5F00`) : card(
-          kind,
-          r,
-          "urgent",
-          start,
-          `\u8FD9\u4E00\u6B65\u7684${KIND_LABEL[kind]}\u5DF2\u4E2D\u6B62\uFF08${actorLabel} \u8FDE\u7EED\u5931\u8D25\u8D85\u9650\uFF09\u2014\u2014\u672C\u8F6E${KIND_LABEL[kind]}\u6536\u4E0D\u9F50\u3001\u8282\u70B9\u505C\u5728\u8FD9\u91CC\uFF0C\u9700\u8981\u4F60\u91CD\u5F00\u8FD9\u4E00\u8F6E`
-        ));
+        out.push(isSelf ? card(kind, r, "urgent", start, `\u4F60\u7684${KIND_LABEL[kind]}\u5DF2\u4E2D\u6B62\uFF0C\u9700\u8981\u4F60\u4ECB\u5165\u91CD\u5F00`) : card(kind, r, "urgent", start, kind === "review-waiting" ? `\u8FD9\u4E00\u6B65\u7684\u8BC4\u5BA1\u5DF2\u4E2D\u6B62\uFF08${actorLabel} \u8FDE\u7EED\u5931\u8D25\u8D85\u9650\uFF09\u2014\u2014\u672C\u8F6E\u8BC4\u5BA1\u6536\u4E0D\u9F50\u3001\u8282\u70B9\u505C\u5728\u8FD9\u91CC\uFF0C\u9700\u8981\u4F60\u91CD\u5F00\u8FD9\u4E00\u8F6E` : `\u8FD9\u4E00\u6B65\u7684\u5904\u7406\u5DF2\u4E2D\u6B62\uFF08${actorLabel} \u8FDE\u7EED\u5931\u8D25\u8D85\u9650\uFF09\u2014\u2014\u8282\u70B9\u505C\u5728\u8FD9\u91CC\uFF0C\u9700\u8981\u6709\u4EBA\u91CD\u5F00`));
         continue;
       }
       if (r.status !== "running") continue;
@@ -226027,14 +226169,20 @@ function collectWaitingRows(snapshots2, me, policy = CODE_DEFAULT_POLICY) {
     const requirementHeads = new Map(snap.requirements.map((q2) => [reqKey(q2), q2.latestReviewId]));
     const requirementHead = (r) => requirementHeads.get(reqKey(r));
     const nodesWithRequirements = new Set(snap.requirements.map((q2) => q2.nodeId));
-    const managerOfWo = snap.nodes.find((n) => n.type === "brief")?.fields?.["manager"];
+    const briefNode = snap.nodes.find((n) => n.type === "brief");
+    const managerOfWo = briefNode?.fields?.["manager"];
     const isManager = typeof managerOfWo === "string" && managerOfWo === me;
+    const launcher = briefNode?.assigneeActorId ?? null;
+    const openIssueNodes = new Set(
+      snap.issues.filter((i) => i.resolvedAt === null && i.aboutNodeId !== null).map((i) => i.aboutNodeId)
+    );
+    const nodeHasOpenIssue = (nodeId) => openIssueNodes.has(nodeId);
     const latestReview = /* @__PURE__ */ new Map();
     for (const r of snap.reviews) {
       if (cancelled.has(r.nodeId)) continue;
       if (acceptedWork.get(r.nodeId) === r.targetWorkId) continue;
       const mine = r.reviewerActorId === me;
-      const oversees = nodeOwner.get(r.nodeId) === me || isManager;
+      const oversees = nodeOwner.get(r.nodeId) === me || isManager || launcher === me;
       if (!mine && !oversees) continue;
       latestBy(latestReview, r);
     }
@@ -226053,10 +226201,12 @@ function collectWaitingRows(snapshots2, me, policy = CODE_DEFAULT_POLICY) {
       const humanPending = !stopped && classify(r.reviewerActorId) === "human";
       if (!mine && !stopped && !humanPending) continue;
       const audience = [r.reviewerActorId];
-      const owner = nodeOwner.get(r.nodeId);
-      if (stopped || humanPending) {
-        if (owner && !audience.includes(owner)) audience.push(owner);
-        if (typeof managerOfWo === "string" && !audience.includes(managerOfWo)) audience.push(managerOfWo);
+      const addBystanders = humanPending || stopped && !nodeHasOpenIssue(r.nodeId);
+      if (addBystanders) {
+        for (const candidate of [launcher, managerOfWo, nodeOwner.get(r.nodeId)]) {
+          if (typeof candidate !== "string" || classify(candidate) !== "human") continue;
+          if (!audience.includes(candidate)) audience.push(candidate);
+        }
       }
       reviews.push({
         id: r.id,
@@ -226073,17 +226223,25 @@ function collectWaitingRows(snapshots2, me, policy = CODE_DEFAULT_POLICY) {
     const latestMain = /* @__PURE__ */ new Map();
     const latestReply = /* @__PURE__ */ new Map();
     for (const w2 of snap.works) {
-      if (w2.assigneeActorId !== me || cancelled.has(w2.nodeId)) continue;
+      if (cancelled.has(w2.nodeId)) continue;
       latestBy(isReplyWork(w2) ? latestReply : latestMain, w2);
     }
     for (const w2 of [...latestMain.values(), ...latestReply.values()]) {
       const st = workState(w2, hasOutput(w2, outputCountOf(w2.id)));
       if (st !== "running" && st !== "dead") continue;
+      const audience = [w2.assigneeActorId];
+      if (st === "dead" && !nodeHasOpenIssue(w2.nodeId)) {
+        for (const candidate of [launcher, managerOfWo, nodeOwner.get(w2.nodeId)]) {
+          if (typeof candidate !== "string" || classify(candidate) !== "human") continue;
+          if (!audience.includes(candidate)) audience.push(candidate);
+        }
+      }
       works.push({
         id: w2.id,
         workorderId: snap.workorder.id,
         artifactId: w2.nodeId,
         actorId: w2.assigneeActorId,
+        notifyActorIds: audience,
         ...nodeTitle.get(w2.nodeId) ? { title: nodeTitle.get(w2.nodeId) } : {},
         createdAt: w2.createdAt,
         startedAt: w2.startedAt,
@@ -259067,6 +259225,16 @@ async function startServe(opts) {
     // ADR 0125：写 scope=project 变量时校验 projectId 真实存在（getProject 直查，含临时项目）。
     // projectStateStore 在下方 ~行 1023 才赋值——本箭头只在请求时跑，那时已就绪（同 resolveDispatchScope 惰性模式）。
     projectExists: async (id) => await projectStateStore.getProject(id) !== null,
+    /* 子 PRD《密钥管理》§1 的权限判据：密钥的写 / 删要认「创建者本人或组织管理者」。
+       owner 与 admin 都算组织管理者（与组织页 `orgIdentityOf` 同一口径）。
+       `controlPlaneStore` 在下方才赋值——本箭头只在请求时跑，那时已就绪（同 projectExists 的惰性模式）。
+       成员表按 accountId 主键，但行上带 actorId，密钥那边手里只有 actorId，所以按 actorId 找。 */
+    isCompanyManager: async (companyId, actorId) => {
+      if (!companyId || !actorId) return false;
+      const members = await controlPlaneStore.listMembers(companyId).catch(() => []);
+      const me = members.find((m2) => m2.actorId === actorId);
+      return me?.role === "owner" || me?.role === "admin";
+    },
     // CO-302 数据面隔离（actors 域试点）：按当前公司取其引擎，用各自 registry 服务该域请求。
     // engineRouter 在下方（行 ~411）以 const 声明；此箭头只在请求时调用，那时已初始化，闭包引用合法
     // （TDZ 只在构造时访问才报错，这里不访问）。默认公司命中现有单实例（registry===registryStore），
@@ -271790,7 +271958,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.16" : "dev";
+var PKG_VERSION = true ? "2.2.17" : "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.2.16",
+  "version": "2.2.17",
   "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": "ece9e8f169691cc135c16c42f8b998b5809aced6"
+    "sourceHead": "1c93b971ada0fb88e327a81413365e770998710a"
   }
 }