oasis_test_v2 2.2.6 → 2.2.8

package/dist/index.js

@@ -366,12 +366,16 @@ var init_annotation = __esm({
 function commentThreadSessionId(a, b2) {
   return `${COMMENT_THREAD_SESSION_PREFIX}${[a, b2].sort().join("|")}`;
 }
-var GAP_THREAD_SESSION_PREFIX, COMMENT_THREAD_SESSION_PREFIX;
+function reviewThreadSessionId(a, b2) {
+  return `${REVIEW_THREAD_SESSION_PREFIX}${[a, b2].sort().join("|")}`;
+}
+var GAP_THREAD_SESSION_PREFIX, COMMENT_THREAD_SESSION_PREFIX, REVIEW_THREAD_SESSION_PREFIX;
 var init_collab_view = __esm({
   "../contract/src/collab-view.ts"() {
     "use strict";
     GAP_THREAD_SESSION_PREFIX = "gapline:";
     COMMENT_THREAD_SESSION_PREFIX = "commentline:";
+    REVIEW_THREAD_SESSION_PREFIX = "reviewline:";
   }
 });
 
@@ -1340,27 +1344,21 @@ function trimRoundSummariesForReturn(summaries, recentRounds = DELEGATION_RETURN
   });
 }
 function collectDelegationArtifacts(roundSummaries) {
-  const artifacts = /* @__PURE__ */ new Map();
+  const out = [];
   for (const round of roundSummaries) {
     for (const file of round.files ?? []) {
-      const seen = artifacts.get(file.name);
-      if (seen) {
-        if (!seen.blobRef && file.blobRef) seen.blobRef = file.blobRef;
-        continue;
-      }
-      artifacts.set(file.name, {
+      out.push({
         name: file.name,
         ...file.blobRef ? { blobRef: file.blobRef } : {},
         round: round.round,
-        // settledSeq 透传自这个名字**第一次出现**的那一轮。未收口的轮次（pending 续跑那一支）
-        // 与本字段落地前的存量行都没有值——前端凭 `settledSeq` 是否缺失走两条路径：
-        //   有 → 按 settledSeq 各自定位对应 `chat-msg:delegation-done|<id>:<seq>`；
-        //   无 → 该委派整条退回「单委派单锚点」降级（`ann:36bfa04b`）。
+        // 这一轮收口时的 settledSeq。未收口的轮次（pending 续跑那一支）与本字段落地前的存量行
+        // 都没有值——前端凭它是否缺失走两条路径：有 → 按 settledSeq 各自定位对应
+        // `chat-msg:delegation-done|<id>:<seq>`；无 → 该委派整条退回单锚点降级（`ann:36bfa04b`）。
         ...typeof round.settledSeq === "number" ? { settledSeq: round.settledSeq } : {}
       });
     }
   }
-  return [...artifacts.values()];
+  return out;
 }
 function delegationOutboxFingerprints(roundSummaries) {
   const out = /* @__PURE__ */ new Map();
@@ -12271,7 +12269,7 @@ function latestProposedOf(state, nodeId, deliveriesOnly) {
   const successes = state.mainWorksOf(nodeId).filter((w2) => w2.status === "success" && (!deliveriesOnly || state.artifactsOf(w2.id).length > 0 || w2.conclusion != null)).sort((a, b2) => a.createdAt.localeCompare(b2.createdAt));
   return successes.length > 0 ? successes[successes.length - 1].id : null;
 }
-var workCreate, workKill, workResponse, workHandoffRecorded, workStart, workSubmitOutput, workContentEdited, workConclude, nodeLatestProposedRebased, workTimeout;
+var workCreate, workRedispatch, workSnapshotRecorded, workKill, workResponse, workHandoffRecorded, workStart, workSubmitOutput, workContentEdited, workConclude, nodeLatestProposedRebased, workTimeout;
 var init_work = __esm({
   "../engine/src/handlers/work.ts"() {
     "use strict";
@@ -12384,11 +12382,78 @@ var init_work = __esm({
       // 会话侧也要杀（旧 agent 可能还挂着）。cancelPreviousWork 找不到/会话已退则 no-op。
       // 回信 work 不杀前会话（apply 不 kill 主链，节点已完结、无在跑会话），只派发。
       async effect(e, ctx) {
-        if (e.pauseGateVersion === 1 && !await ctx.canDispatchWork(e.workorderId, e.workId)) return;
+        if (!await ctx.canDispatchWork(e.workorderId, e.workId)) return;
         if (!e.replyToIssueId) await ctx.cancelPreviousWork(e.nodeId, e.workId);
         await ctx.dispatchWork(e.workId, e.resumeEligible !== void 0 ? { resumeEligible: e.resumeEligible } : void 0);
       }
     };
+    workRedispatch = {
+      name: "work/redispatch",
+      kind: "work.redispatch",
+      apply() {
+      },
+      async effect(e, ctx) {
+        if (!await ctx.canDispatchWork(e.workorderId, e.workId, { neverStarted: true })) return;
+        await ctx.dispatchWork(e.workId, { resumeEligible: false });
+      }
+    };
+    workSnapshotRecorded = {
+      name: "work/snapshot-recorded",
+      kind: "work.snapshot_recorded",
+      apply(e, state, ctx) {
+        const node2 = state.node(e.nodeId);
+        if (!ctx.actorId.startsWith("actor:human:") || !state.workorder.dispatchPaused || !node2 || node2.cancelledAt || node2.latestWorkId !== e.expectedLatestWorkId || state.work(e.workId) || !e.contentRef || !e.conclusion.trim()) return;
+        if (state.allWorksIncludingReplies(e.nodeId).some((w2) => !w2.endedAt && !w2.deadAt) || state.allReviews().some((r) => r.nodeId === e.nodeId && !r.endedAt && !r.cancelledAt)) return;
+        state.insertWork({
+          id: e.workId,
+          workorderId: e.workorderId,
+          nodeId: e.nodeId,
+          assigneeActorId: ctx.actorId,
+          createdAt: ctx.at,
+          startedAt: null,
+          endedAt: ctx.at,
+          deadAt: null,
+          cancelledAt: null,
+          status: "success",
+          lane: "main",
+          outcome: "completed",
+          outcomeDetail: null,
+          sessionRef: null,
+          continuesWorkId: node2.latestAcceptId,
+          parentWorkId: node2.latestProposedWorkId,
+          outputVersionNo: null,
+          conclusion: e.conclusion,
+          proposalReason: e.conclusion,
+          lastActivityAt: ctx.at,
+          handledIssueIds: null,
+          agentHandoffAttemptId: null,
+          businessHandoffStatus: null,
+          businessHandoffRecordedAt: null,
+          acceptanceState: null,
+          acceptedAt: null,
+          acceptedBy: null,
+          rejectedReason: null,
+          overrideBy: null,
+          overrideReason: null,
+          nodeVersion: node2.version
+        });
+        state.replaceArtifacts(e.workId, [{
+          id: `${e.workId}:out`,
+          workId: e.workId,
+          nodeId: e.nodeId,
+          type: null,
+          name: "output",
+          logicalPath: "/",
+          contentRef: e.contentRef,
+          contentKind: "inline",
+          ordinal: 0,
+          createdAt: ctx.at
+        }]);
+        state.replaceWorkInputs(e.workId, state.edgesInto(e.nodeId).filter((edge) => edge.kind === "data" && edge.pinnedWorkId).map((edge) => ({ workId: e.workId, upstreamNodeId: edge.fromNodeId, upstreamWorkId: edge.pinnedWorkId })));
+        state.replaceRequirements(e.nodeId, state.requirementsOf(e.nodeId).map((r) => ({ ...r, latestReviewId: null })));
+        state.updateNode(e.nodeId, { latestWorkId: e.workId, latestProposedWorkId: e.workId, updatedAt: ctx.at });
+      }
+    };
     workKill = {
       name: "work/kill",
       kind: "work.kill",
@@ -12810,7 +12875,7 @@ var init_review = __esm({
         }
       },
       async effect(e, ctx) {
-        if (e.pauseGateVersion === 1 && !await ctx.canDispatchReview(e.workorderId, e.reviewId)) return;
+        if (!await ctx.canDispatchReview(e.workorderId, e.reviewId)) return;
         if (e.reviewerIsAgent) await ctx.dispatchReview(e.reviewId, e.nodeId, e.reviewerActorId);
         else await ctx.notify([e.reviewerActorId], { kind: "review-requested", reviewId: e.reviewId });
       }
@@ -13089,6 +13154,8 @@ var init_handlers = __esm({
       erase(planUpdateFields),
       /* ── 节点级 work（7）── */
       erase(workCreate),
+      erase(workRedispatch),
+      erase(workSnapshotRecorded),
       erase(workStart),
       erase(workSubmitOutput),
       erase(workContentEdited),
@@ -13663,11 +13730,15 @@ var init_bus = __esm({
           // ★ 注入 workorderId：派发侧读模型没追上时，据它指名重读那张工单（见 EngineIO.dispatchWork 注释）。
           dispatchWork: (id, opts) => this.io.dispatchWork(id, { ...opts, workorderId: record8.workorderId }),
           dispatchReview: (id, nodeId, reviewerActorId) => this.io.dispatchReview(id, nodeId, reviewerActorId),
-          canDispatchWork: async (workorderId, workId) => {
+          canDispatchWork: async (workorderId, workId, opts) => {
             const snap = await this.store.transaction((tx) => tx.loadWorkorder(workorderId));
             if (!snap || snap.workorder.dispatchPaused) return false;
             const work = snap.works.find((row) => row.id === workId);
-            return work?.status === "running" && !work.deadAt && !work.endedAt;
+            if (opts?.neverStarted && work) {
+              const node2 = snap.nodes.find((row) => row.id === work.nodeId);
+              if (work.startedAt || work.sessionRef || !node2 || node2.cancelledAt || node2.latestWorkId !== workId) return false;
+            }
+            return work?.status === "running" && !work.deadAt && !work.cancelledAt && !work.endedAt;
           },
           canDispatchReview: async (workorderId, reviewId) => {
             const snap = await this.store.transaction((tx) => tx.loadWorkorder(workorderId));
@@ -17335,6 +17406,7 @@ ${supplemental.taskAppend.trim()}
           ...Object.keys(jobEnv).length > 0 ? { env: jobEnv } : {},
           ...provisioned?.wrapperPaths && provisioned.wrapperPaths.length > 0 ? { wrapperPaths: provisioned.wrapperPaths } : {},
           ...provisioned?.requiredTools && provisioned.requiredTools.length > 0 ? { requiredTools: provisioned.requiredTools } : {},
+          ...provisioned?.requiredToolVersions && Object.keys(provisioned.requiredToolVersions).length > 0 ? { requiredToolVersions: provisioned.requiredToolVersions } : {},
           // 凭据本体随 job 下发，供**节点侧本机注入**（见上方 provision 注释）。
           ...provisioned?.connectorCreds && provisioned.connectorCreds.length > 0 ? { connectorCreds: provisioned.connectorCreds } : {},
           ...executionEnv !== void 0 ? { executionEnv } : {},
@@ -19708,6 +19780,39 @@ var init_kernel_bridge = __esm({
           throw new KernelError("\u5185\u5BB9\u5DF2\u88AB\u66F4\u65B0\uFF0C\u8BF7\u91CD\u65B0\u6253\u5F00\u6587\u4EF6\u540E\u518D\u4FDD\u5B58", "content-conflict");
         }
       }
+      /** 暂停时保存人工完整稿：不借 work.create 开运行，不改暂停位，验收/下游调度留待恢复。 */
+      async recordPausedRevision(args) {
+        if (!args.actor.startsWith("actor:human:")) {
+          throw new KernelError("\u6682\u505C\u671F\u95F4\u5F55\u5165\u5B8C\u6574\u7A3F\u4EC5\u9650\u4EBA\u7C7B\u64CD\u4F5C", "forbidden");
+        }
+        await this.refreshTracked();
+        const wid = this.wo(args.artifactId);
+        const snap = await this.store.transaction((tx) => tx.loadWorkorder(wid));
+        const node2 = snap?.nodes.find((n) => n.id === args.artifactId);
+        if (!snap?.workorder.dispatchPaused || !node2 || node2.cancelledAt) {
+          throw new KernelError("\u5DE5\u5355\u6216\u8282\u70B9\u72B6\u6001\u5DF2\u53D8\u5316\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5\u4FDD\u5B58", "revision-conflict");
+        }
+        const workId = deriveWorkId(node2.id, snap.works.filter((w2) => w2.nodeId === node2.id).length + 1);
+        await this.commit({
+          companyId: "",
+          workorderId: wid,
+          actorId: args.actor,
+          event: {
+            kind: "work.snapshot_recorded",
+            workorderId: wid,
+            nodeId: node2.id,
+            workId,
+            expectedLatestWorkId: node2.latestWorkId,
+            contentRef: args.contentRef,
+            conclusion: args.note
+          }
+        });
+        const after = await this.store.transaction((tx) => tx.loadWorkorder(wid));
+        if (!after?.artifacts.some((a) => a.workId === workId && a.contentRef === args.contentRef)) {
+          throw new KernelError("\u4FDD\u5B58\u672A\u843D\u8D26\uFF1A\u8282\u70B9\u5DF2\u88AB\u4FEE\u6539\u6216\u5DE5\u5355\u5DF2\u6062\u590D\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5", "revision-conflict");
+        }
+        return this.model.revisions.get(workId);
+      }
       async proposeRevision(args) {
         await this.refreshTracked();
         const wid = this.wo(args.artifactId);
@@ -29417,11 +29522,22 @@ async function sweepStaleChatTurns(deps) {
     deps.log?.(
       `[chat-turn-sweep] \u8F6E\u6B21 ${turn.id}\uFF08\u4F1A\u8BDD ${turn.chatSessionId}\uFF09\u6536\u53E3\u4E3A ${outcome.status}\uFF08${outcome.reason}\uFF09\uFF0C\u4F1A\u8BDD\u69FD\u5DF2\u91CA\u653E`
     );
+    const settledStatus = outcome.settled ? outcome.status : void 0;
+    if (deps.onTurnSettled && settledStatus && settledStatus !== "succeeded") {
+      await deps.onTurnSettled({
+        chatSessionId: turn.chatSessionId,
+        turnId: turn.id,
+        status: settledStatus,
+        reason: outcome.reason ?? `\u8F6E\u6B21\u6536\u53E3\u4E3A ${settledStatus}`
+      }).catch((e) => {
+        deps.log?.(`[chat-turn-sweep] \u8F6E\u6B21 ${turn.id} \u6536\u53E3\u540E\u7684\u56DE\u8C03\u5931\u8D25\uFF08\u4E0D\u5F71\u54CD\u672C\u62CD\uFF09: ${String(e)}`);
+      });
+    }
   }
   return settled;
 }
 async function sweepStaleChatTurnsAcrossCompanies(deps) {
-  const { listCompanies, storesFor, onCompanyError, log: log3, ...rest } = deps;
+  const { listCompanies, storesFor, onCompanyError, log: log3, onTurnSettled, ...rest } = deps;
   const settled = [];
   for (const companyId of await listCompanies()) {
     try {
@@ -29431,7 +29547,9 @@ async function sweepStaleChatTurnsAcrossCompanies(deps) {
         turns: stores.turns,
         ...stores.assistantRowStatus ? { assistantRowStatus: stores.assistantRowStatus } : {},
         ...stores.settleAssistantRow ? { settleAssistantRow: stores.settleAssistantRow } : {},
-        ...log3 ? { log: (m2) => log3(companyId ? `${m2}\uFF3B${companyId}\uFF3D` : m2) } : {}
+        ...log3 ? { log: (m2) => log3(companyId ? `${m2}\uFF3B${companyId}\uFF3D` : m2) } : {},
+        // 把这一家的 companyId 补进去再往外报——下游（委派台账）按公司分 store，少了它就查错库。
+        ...onTurnSettled ? { onTurnSettled: (info) => onTurnSettled({ ...info, ...companyId ? { companyId } : {} }) } : {}
       });
       settled.push(...outcomes);
     } catch (err) {
@@ -159619,7 +159737,7 @@ function normalizedOpToV3Op(op, kind) {
   if (op === "set_text") return "set_text";
   if (op === "patch_input") return "patch_input";
   if (op === "set_status") {
-    return kind === "tool_call" || kind === "tool_result" ? "completed" : void 0;
+    return "completed";
   }
   return void 0;
 }
@@ -159803,7 +159921,7 @@ var init_live_chat = __esm({
         if (!turn.items) return;
         const itemId = outcome.itemId;
         const itemType = normalizedKindToItemType(event.kind);
-        const operation = normalizedOpToV3Op(event.opShape.op, event.kind);
+        let operation = normalizedOpToV3Op(event.opShape.op, event.kind);
         if (!operation) return;
         const perItem = turn.v3Items.get(itemId) ?? { textOffset: 0, started: false };
         const isTextual2 = event.kind === "text" || event.kind === "thinking";
@@ -159839,6 +159957,7 @@ var init_live_chat = __esm({
           payload = { input: opShape.input };
         } else if (opShape.op === "set_status") {
           if (opShape.status === "streaming") return;
+          operation = opShape.status === "completed" ? "completed" : "failed";
         }
         turn.v3Items.set(itemId, perItem);
         const frame = {
@@ -159969,6 +160088,24 @@ var init_live_chat = __esm({
         this.publishV3(turn, this.assignV3Seq(turn, frame));
         return true;
       }
+      /** 恢复路在 DB 收口旧 item 后，将同一身份/版本的终态发给已挂上的观众。 */
+      publishItemStatus(chatSessionId, item) {
+        const turn = this.turns.get(chatSessionId);
+        if (!turn || turn.status !== "running" || item.sessionId !== chatSessionId || item.status === "streaming") return false;
+        if (turn.items?.turnId !== item.turnId) return false;
+        this.flushPendingV3(turn);
+        this.publishV3(turn, this.assignV3Seq(turn, {
+          protocolVersion: 3,
+          streamId: turn.liveStreamId,
+          turnId: item.turnId,
+          itemId: item.id,
+          itemType: normalizedKindToItemType(item.kind),
+          operation: item.status === "completed" ? "completed" : "failed",
+          itemVersion: item.version,
+          ...item.ord !== null ? { ord: item.ord } : {}
+        }));
+        return true;
+      }
       emitV3TurnTerminal(turn, status) {
         if (status !== "done" && status !== "error") return;
         const operation = status === "done" ? "turn_completed" : "turn_failed";
@@ -195686,6 +195823,7 @@ var init_service3 = __esm({
                 const store = await this.options.resolveStore(companyId).catch(() => null);
                 await store?.patch(record8.id, { childRunId: anchor }).catch(() => null);
               }
+              await this.bindChildRunToPlaceholder(record8, companyId, claim.turn.assistantRunId ?? void 0);
               await notDispatched("resumed-existing-run");
               return;
             }
@@ -195700,7 +195838,15 @@ var init_service3 = __esm({
             ...companyId ? { companyId } : {},
             ...snapshot ? { parentConversationSnapshot: snapshot } : {},
             extraSystemPrompt: EXPERT_DELEGATION_SYSTEM_PROMPT,
-            ..._DelegationService.inboundBundle(inbound) ? { workspaceBundle: _DelegationService.inboundBundle(inbound) } : {}
+            ..._DelegationService.inboundBundle(inbound) ? { workspaceBundle: _DelegationService.inboundBundle(inbound) } : {},
+            /* 派发这一侧要拿它们建 `chat_items` 账本（见本文件 `DelegationDispatchRequest` 的注释）。
+               轮次口径与 `bindChildRunToPlaceholder` / `seedChildRoundRows` **逐字一致**：
+               `record.roundSummaries.length + 1`。三处一旦不同源，item 就会挂到上一轮那条回答行上。 */
+            assistantMessageId: childRoundMessageIds(
+              record8.childSessionId,
+              record8.roundSummaries.length + 1
+            ).placeholderId,
+            chatTurnId: turnId
           });
           outcomeSettled = true;
           await opts?.onDispatched?.().catch((err) => console.warn(`[delegation] \u5F85\u8F6C\u8FBE\u6807\u8BB0\u5DF2\u6D88\u8D39\u5931\u8D25\uFF08${record8.id}\uFF09: ${String(err)}`));
@@ -195719,6 +195865,7 @@ var init_service3 = __esm({
             const store = await this.options.resolveStore(companyId);
             await store.patch(record8.id, { childRunId: anchor }).catch(() => null);
           }
+          await this.bindChildRunToPlaceholder(record8, companyId, dispatched.runId);
           this.track(this.settleRound(record8, dispatched, companyId, () => output, turnId, turns));
         } catch (error2) {
           const failedAt = this.now();
@@ -195835,6 +195982,29 @@ var init_service3 = __esm({
        * 委派台账是同一类账，只是多一层——它还得回流。所以这里只做两件：把行拍成 `failed/interrupted`、
        * 然后走同一个 {@link notifySettled}。已经是终态的行原样返回（幂等，重复扫不重复回流）。
        */
+      /**
+       * 把这一轮的 run 锚点写到子会话那条**回答占位行**上。
+       *
+       * 为什么非它不可：serve 重启后，daemon 的 hello 对账与会话进程自报身份**共用**
+       * `planChatTurnRecovery`，而那个函数第一行就是 `if (!row.runId) continue` —— 占位行没有 runId，
+       * 这条子会话就永远配不出恢复计划，答 `unknown`，然后被 hub evict（杀掉）。
+       * 轮次是第几轮按 `roundSummaries.length + 1` 算，与 `seedChildRoundRows` 那两处口径逐字一致。
+       *
+       * 失败只记日志：这是加固，不是这一轮派发成立的前提。
+       */
+      async bindChildRunToPlaceholder(record8, companyId, runId) {
+        if (!runId) return;
+        const round = record8.roundSummaries.length + 1;
+        const { placeholderId } = childRoundMessageIds(record8.childSessionId, round);
+        try {
+          const chatStore = await this.options.resolveChatSessions(companyId);
+          await chatStore.updateMessage(placeholderId, { runId });
+        } catch (err) {
+          console.warn(
+            `[delegation] \u5B50\u4F1A\u8BDD\u5360\u4F4D\u884C\u5199 runId \u5931\u8D25\uFF08${record8.id} child=${record8.childSessionId} round=${round} run=${runId}\uFF09: ${String(err)}\u2014\u2014\u91CD\u542F\u540E\u8FD9\u6761\u5B50\u4F1A\u8BDD\u4F1A\u88AB\u5224 unknown \u5E76 evict`
+          );
+        }
+      }
       async settleFromSweep(childSessionId, reason, companyId) {
         const store = await this.options.resolveStore(companyId).catch(() => null);
         if (!store) return null;
@@ -196940,7 +197110,11 @@ function toChatDispatchRequest(request2) {
     delegatedChildTurn: true,
     // §6.1.3 去程：`--file` 带来的字节就在这一格。**丢了它命令照样回 202**，
     // 而专家的工作区里什么都没有——这正是上一版真实发生过的形态。
-    ...request2.workspaceBundle ? { workspaceBundle: request2.workspaceBundle } : {}
+    ...request2.workspaceBundle ? { workspaceBundle: request2.workspaceBundle } : {},
+    // 这两格漏了同样**不报错**：子会话照跑、正文照回，只是 `chat_items` 的行没有 message_id、
+    // turnId 回落成 `chat-run-turn:<runId>`，右栏面板的增量流对不上轮——正是本文件存在的理由。
+    ...request2.assistantMessageId ? { assistantMessageId: request2.assistantMessageId } : {},
+    ...request2.chatTurnId ? { chatTurnId: request2.chatTurnId } : {}
   };
 }
 function applyWorkspaceBundle(target, bundle) {
@@ -196957,12 +197131,15 @@ var init_dispatch_adapter = __esm({
 // ../server/src/domains/delegations/sweep-hook.ts
 function delegationSweepHook(deps) {
   const log3 = deps.log ?? ((m2) => console.warn(m2));
-  return async (chatSessionId, reason) => {
-    const session = await deps.sessions.getSession(chatSessionId).catch((err) => {
-      log3(`[chat-sweep] \u4F1A\u8BDD ${chatSessionId} \u7684\u516C\u53F8\u5F52\u5C5E\u8BFB\u4E0D\u5230\uFF08${String(err)}\uFF09\u2014\u2014\u6309\u9ED8\u8BA4\u516C\u53F8\u8BD5\u4E00\u6B21`);
-      return null;
-    });
-    const companyId = session?.companyId ?? void 0;
+  return async (chatSessionId, reason, _messageId, knownCompanyId) => {
+    let companyId = knownCompanyId;
+    if (companyId === void 0) {
+      const session = await deps.sessions.getSession(chatSessionId).catch((err) => {
+        log3(`[chat-sweep] \u4F1A\u8BDD ${chatSessionId} \u7684\u516C\u53F8\u5F52\u5C5E\u8BFB\u4E0D\u5230\uFF08${String(err)}\uFF09\u2014\u2014\u6309\u9ED8\u8BA4\u516C\u53F8\u8BD5\u4E00\u6B21`);
+        return null;
+      });
+      companyId = session?.companyId ?? void 0;
+    }
     await deps.settle(chatSessionId, reason, companyId).catch((err) => {
       log3(`[chat-sweep] \u59D4\u6D3E\u53F0\u8D26\u6536\u655B\u5931\u8D25\uFF08\u4F1A\u8BDD ${chatSessionId} \u516C\u53F8 ${companyId ?? "\u9ED8\u8BA4"}\uFF09: ${String(err)}`);
     });
@@ -197157,27 +197334,77 @@ var init_assembly = __esm({
 });
 
 // ../server/src/domains/delegations/child-live-turn.ts
-function registerDelegatedChildTurn(liveChat, childSessionId, session) {
+function registerDelegatedChildTurn(liveChat, childSessionId, session, deps = {}) {
+  const log3 = deps.log ?? ((m2) => console.warn(m2));
   const appendInput = session.appendInput;
-  if (typeof appendInput !== "function" || session.canAppendInput === false) return;
+  const canAppend = typeof appendInput === "function" && session.canAppendInput !== false;
+  const ledger = new ChatItemLedger({
+    ...deps.items ? { items: deps.items } : {},
+    sessionId: childSessionId,
+    turnId: deps.turnId ?? fallbackTurnId(session.runId),
+    ...session.runId ? { runId: session.runId } : {},
+    ...deps.assistantMessageId ? { messageId: deps.assistantMessageId } : {},
+    ...deps.versionSeed !== void 0 ? { versionSeed: deps.versionSeed } : {},
+    log: log3
+  });
   const ctrl = liveChat.start(childSessionId, {
     runtimeSessionId: session.id,
     ...session.runId ? { runId: session.runId } : {},
     kill: () => {
       void session.kill?.();
     },
-    appendInput: (input) => appendInput.call(session, input),
+    // 纪律 ①：插不进去的 runtime 也登记，只是这两格照实报。
+    ...canAppend && appendInput ? { appendInput: (input) => appendInput.call(session, input) } : {},
     // **每次现读**，不快照：一轮跑到收尾时 stdin 会先关，那之后 runtime 自己会回
     // `session-closing`，判断权本就该留在它那儿（同 `/api/chat` 那条路的写法）。
     get canAppendInput() {
-      return session.canAppendInput !== false;
+      return typeof session.appendInput === "function" && session.canAppendInput !== false;
+    }
+  }, { items: ledger });
+  if (deps.assistantMessageId) ctrl.setAssistantMessageId(deps.assistantMessageId);
+  const hasChannels = typeof session.onOutput === "function" || typeof session.onTelemetry === "function" || typeof session.onLiveEvent === "function";
+  const normalized4 = typeof session.onNormalizedProviderEvent === "function" ? {
+    onNormalizedProviderEvent: session.onNormalizedProviderEvent.bind(session),
+    finishTurn: (signal) => session.finishNormalizedTurn?.(signal)
+  } : hasChannels ? attachStreamNormalizer(
+    {
+      id: session.id,
+      onOutput: (cb) => session.onOutput?.(cb),
+      onTelemetry: (cb) => session.onTelemetry?.(cb),
+      onLiveEvent: (cb) => session.onLiveEvent?.(cb),
+      ...session.supportsLiveProtocol !== void 0 ? { supportsLiveProtocol: session.supportsLiveProtocol } : {}
+    },
+    {
+      providerName: deps.runtimeKind ?? "runtime",
+      fallbackTurnId: `oasis-turn:${session.runId ?? session.id}`
+    }
+  ) : null;
+  normalized4?.onNormalizedProviderEvent((event) => {
+    try {
+      ctrl.applyNormalizedEvent(event);
+    } catch {
     }
   });
-  void session.done.then(() => ctrl.finish("done"), () => ctrl.finish("error"));
+  const settle = async (signal) => {
+    try {
+      normalized4?.finishTurn(signal);
+    } catch {
+    }
+    try {
+      ledger.finish(signal);
+      await ledger.drain();
+    } catch (err) {
+      log3(`[delegation] \u5B50\u4F1A\u8BDD ${childSessionId} \u8D26\u672C\u6536\u5C3E\u5931\u8D25: ${String(err)}`);
+    }
+    ctrl.finish(signal === "completed" ? "done" : "error");
+  };
+  void session.done.then(() => settle("completed"), () => settle("failed"));
 }
 var init_child_live_turn = __esm({
   "../server/src/domains/delegations/child-live-turn.ts"() {
     "use strict";
+    init_src6();
+    init_chat_item_ledger();
   }
 });
 
@@ -197291,10 +197518,12 @@ var init_tool_home = __esm({
 });
 
 // ../connectors/src/_base/install.ts
-function installPlan(cmd, platform2, toolsPrefix) {
-  if (cmd === "lark-cli") {
+function installPlan(cmd, platform2, toolsPrefix, version2) {
+  const npmPkg = NPM_TOOL_PACKAGES[cmd];
+  if (npmPkg) {
     const npm = platform2 === "win32" ? "npm.cmd" : "npm";
-    return [{ file: npm, args: ["install", "-g", "--prefix", toolsPrefix, "@larksuite/cli"], ensureDir: toolsPrefix }];
+    const spec = version2 ? `${npmPkg}@${version2}` : npmPkg;
+    return [{ file: npm, args: ["install", "-g", "--prefix", toolsPrefix, spec], ensureDir: toolsPrefix }];
   }
   const pkg = cmd === "gh" ? { brew: "gh", apt: "gh", dnf: "gh", pacman: "github-cli", apk: "github-cli", winget: "GitHub.cli", choco: "gh", scoop: "gh" } : { brew: "git", apt: "git", dnf: "git", pacman: "git", apk: "git", winget: "Git.Git", choco: "git", scoop: "git" };
   if (platform2 === "darwin") {
@@ -197339,17 +197568,54 @@ function defaultDeps() {
     mkdirp: (dir) => {
       (0, import_node_fs9.mkdirSync)(dir, { recursive: true });
     },
-    log: (msg) => console.warn(msg)
+    log: (msg) => console.warn(msg),
+    installedVersion: async (pkg, prefix) => readInstalledVersion(pkg, prefix)
   };
 }
-async function ensureToolInstalled(cmd, deps = {}) {
+function readInstalledVersion(pkg, prefix) {
+  const parts = pkg.split("/");
+  for (const mid of [["lib", "node_modules"], ["node_modules"]]) {
+    const file = (0, import_node_path11.join)(prefix, ...mid, ...parts, "package.json");
+    if (!(0, import_node_fs9.existsSync)(file)) continue;
+    try {
+      const v2 = JSON.parse((0, import_node_fs9.readFileSync)(file, "utf8")).version;
+      if (typeof v2 === "string" && v2) return v2;
+    } catch {
+    }
+  }
+  return null;
+}
+async function alignToWantedVersion(cmd, wanted, d) {
+  if (alignedVersion.get(cmd) === wanted) return;
+  const pkg = NPM_TOOL_PACKAGES[cmd];
+  if (!pkg) return;
+  const installed = await d.installedVersion(pkg, d.toolsPrefix);
+  if (!installed) return;
+  if (installed === wanted) {
+    alignedVersion.set(cmd, wanted);
+    return;
+  }
+  const npm = d.platform === "win32" ? "npm.cmd" : "npm";
+  d.log(`[connector-install] ${cmd} ${installed} \u2192 ${wanted}\uFF08\u670D\u52A1\u7AEF\u767B\u8BB0\u7248\u672C\uFF09\uFF0C\u5B89\u88C5\u4E2D\u2026`);
+  try {
+    d.mkdirp(d.toolsPrefix);
+    await d.run(npm, ["install", "-g", "--prefix", d.toolsPrefix, `${pkg}@${wanted}`]);
+    alignedVersion.set(cmd, wanted);
+    d.log(`[connector-install] ${cmd} \u5DF2\u5BF9\u9F50\u5230 ${wanted}`);
+  } catch (err) {
+    d.log(`[connector-install] ${cmd} \u5BF9\u9F50\u5230 ${wanted} \u5931\u8D25\uFF0C\u7EE7\u7EED\u7528 ${installed}\uFF1A${String(err)}`);
+  }
+}
+async function ensureToolInstalled(cmd, opts = {}) {
+  const { versions, ...deps } = opts;
   const d = { ...defaultDeps(), ...deps };
-  if (confirmed.has(cmd)) return true;
-  if (await d.isPresent(cmd)) {
+  const wanted = versions?.[cmd];
+  if (confirmed.has(cmd) || await d.isPresent(cmd)) {
     confirmed.add(cmd);
+    if (wanted) await alignToWantedVersion(cmd, wanted, d);
     return true;
   }
-  const steps = installPlan(cmd, d.platform, d.toolsPrefix);
+  const steps = installPlan(cmd, d.platform, d.toolsPrefix, wanted);
   if (steps.length === 0) {
     d.log(`[connector-install] ${cmd} \u7F3A\u5931\uFF0C\u4E14 ${d.platform} \u4E0B\u65E0\u5DF2\u77E5\u81EA\u52A8\u5B89\u88C5\u6CD5\u2014\u2014\u8BF7\u624B\u52A8\u5B89\u88C5`);
     return false;
@@ -197362,6 +197628,7 @@ async function ensureToolInstalled(cmd, deps = {}) {
       await d.run(step.file, step.args);
       if (await d.isPresent(cmd)) {
         confirmed.add(cmd);
+        if (wanted) alignedVersion.set(cmd, wanted);
         d.log(`[connector-install] ${cmd} \u5B89\u88C5\u6210\u529F\uFF08${step.file} ${step.args.join(" ")}\uFF09`);
         return true;
       }
@@ -197372,15 +197639,15 @@ async function ensureToolInstalled(cmd, deps = {}) {
   d.log(`[connector-install] ${cmd} \u81EA\u52A8\u5B89\u88C5\u672A\u6210\u529F\u2014\u2014\u5C06\u56DE\u9000\u5230 wrapper/\u547D\u4EE4\u81EA\u8EAB\u62A5\u9519`);
   return false;
 }
-async function ensureConnectorTools(tools, deps = {}) {
+async function ensureConnectorTools(tools, opts = {}) {
   if (!tools || tools.length === 0) return [];
   const missing = [];
   for (const cmd of tools) {
-    if (!await ensureToolInstalled(cmd, deps)) missing.push(cmd);
+    if (!await ensureToolInstalled(cmd, opts)) missing.push(cmd);
   }
   return missing;
 }
-var import_node_child_process12, import_node_util2, import_node_fs9, import_node_path11, execFileAsync, confirmed;
+var import_node_child_process12, import_node_util2, import_node_fs9, import_node_path11, execFileAsync, NPM_TOOL_PACKAGES, confirmed, alignedVersion;
 var init_install = __esm({
   "../connectors/src/_base/install.ts"() {
     "use strict";
@@ -197390,7 +197657,9 @@ var init_install = __esm({
     import_node_path11 = require("node:path");
     init_tool_home();
     execFileAsync = (0, import_node_util2.promisify)(import_node_child_process12.execFile);
+    NPM_TOOL_PACKAGES = { "lark-cli": "@larksuite/cli" };
     confirmed = /* @__PURE__ */ new Set();
+    alignedVersion = /* @__PURE__ */ new Map();
   }
 });
 
@@ -201461,7 +201730,7 @@ var init_connector_adapter = __esm({
       async spawn(job) {
         const t0 = Date.now();
         if (job.requiredTools?.length) {
-          const missing = await ensureConnectorTools(job.requiredTools);
+          const missing = await ensureConnectorTools(job.requiredTools, { versions: job.requiredToolVersions });
           if (missing.length) log("[adapter]", `  connector tools still missing (agent may fail): ${missing.join(", ")}`);
         }
         const prepared = await prepareConnectorsForJob(job);
@@ -203125,13 +203394,22 @@ async function startOasisServer(opts) {
       resolveStore: opts.delegationStoreFor,
       resolveChatSessions: resolveChatSessionsForDelegation,
       resolveActors: async (companyId) => (await actorsDomain2.resolveCtx(companyId)).service,
-      // **派发完顺手把子会话这一轮登记进 live 注册表**（v2 bug 0088）。缺这一步时下面那行
-      // `appendToChild` 恒回 `no-live-turn`——注册表里从来没有以 `childSessionId` 为键的轮，
-      // 于是每一条 `--continue` 转达都落队列，专家要等本轮跑完才看见「手上这段作废」。
-      // 理由与两条纪律见 `child-live-turn.ts` 的文件头。
+      /* **派发完顺手把子会话这一轮登记进 live 注册表，并给它接上 `chat_items` 账本。**
+         两件事的成因不同，都在 `child-live-turn.ts` 的文件头：
+          · 不登记 → 下面那行 `appendToChild` 恒回 `no-live-turn`，每一条 `--follow-up` 转达
+            都落队列，专家要等本轮跑完才看见「手上这段作废」（v2 bug 0088）；
+          · 不接账本 → 子会话在 `chat_items` 里只有 storage 层镜像来的一问一答两行纯文字，
+            右栏面板只能靠详情接口拿 run_id 去轨迹表**现折**，跑的过程中一片空白。 */
       dispatchChat: async (request2) => {
         const session = await dispatchChat(request2);
-        registerDelegatedChildTurn(liveChat, request2.chatSessionId, session);
+        const itemStore = opts.resolveChatItems ? await opts.resolveChatItems(request2.companyId).catch(() => void 0) : opts.chatItems;
+        const versionSeed = itemStore ? await itemStore.sessionVersionCursor(request2.chatSessionId).catch(() => 0) : 0;
+        registerDelegatedChildTurn(liveChat, request2.chatSessionId, session, {
+          ...itemStore ? { items: itemStore } : {},
+          ...request2.chatTurnId ? { turnId: request2.chatTurnId } : {},
+          ...request2.assistantMessageId ? { assistantMessageId: request2.assistantMessageId } : {},
+          versionSeed
+        });
         return session;
       },
       appendToChild: (childSessionId, text5, extra) => liveChat.append(childSessionId, text5, extra),
@@ -203906,6 +204184,7 @@ async function startOasisServer(opts) {
         const rawBody = Buffer.concat(chunks).toString("utf8");
         const companyCtx = opts.resolveCompanyContext ? await opts.resolveCompanyContext(actor, req.headers, url.pathname) : void 0;
         const currentCompanyId = companyCtx?.kind === "ok" ? companyCtx.companyId : void 0;
+        const connectorActorsService = async (companyId) => opts.actors ? (await opts.actors.resolveCtx(companyId ?? currentCompanyId)).service : void 0;
         const wodrafts = opts.resolveWorkorderDrafts ? await opts.resolveWorkorderDrafts(currentCompanyId) : opts.workorderDrafts;
         const wodraftPlannerIssues = (opts.resolveWorkorderDraftPlannerIssues && await opts.resolveWorkorderDraftPlannerIssues(currentCompanyId)) ?? opts.workorderDraftPlannerIssues ?? defaultDraftPlannerIssuesStore;
         const engine = await resolveEngine(currentCompanyId);
@@ -205969,12 +206248,12 @@ ${composed}`;
               const actorCtx = await opts.resolveActorContext(body2.actorId).catch(() => null);
               if (actorCtx) {
                 const { mkdtempSync: mkdtempSync6, mkdirSync: mkdirSync25, writeFileSync: writeFileSync18 } = await import("node:fs");
-                const { join: join39, dirname: dirname36 } = await import("node:path");
+                const { join: join40, dirname: dirname36 } = await import("node:path");
                 const { tmpdir: tmpdir12 } = await import("node:os");
-                const dir = mkdtempSync6(join39(tmpdir12(), "oasis-chat-"));
+                const dir = mkdtempSync6(join40(tmpdir12(), "oasis-chat-"));
                 if (actorCtx.config?.prompt) {
                   for (const [rel, content3] of Object.entries(splitIdentityFiles2(actorCtx.config.prompt))) {
-                    const file = join39(dir, rel);
+                    const file = join40(dir, rel);
                     mkdirSync25(dirname36(file), { recursive: true });
                     writeFileSync18(file, content3);
                   }
@@ -205986,12 +206265,12 @@ ${composed}`;
                     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`;
                   });
-                  writeFileSync18(join39(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"));
+                  writeFileSync18(join40(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(body2.actorId, "claude").catch(() => ({}));
                   for (const [rel, content3] of Object.entries(skillFiles)) {
-                    const file = join39(dir, rel);
+                    const file = join40(dir, rel);
                     mkdirSync25(dirname36(file), { recursive: true });
                     writeFileSync18(file, content3);
                   }
@@ -206005,7 +206284,7 @@ ${composed}`;
                     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}`;
                   });
-                  writeFileSync18(join39(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"));
+                  writeFileSync18(join40(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;
               }
@@ -206090,7 +206369,7 @@ ${composed}`;
         }
         if (req.method === "POST" && /^\/api\/connectors\/[^/]+\/disconnect$/.test(url.pathname)) {
           const connId = decodeURIComponent(url.pathname.split("/")[3] ?? "");
-          const svc = opts.actors?.service;
+          const svc = await connectorActorsService();
           if (!svc) {
             res.writeHead(501).end(JSON.stringify({ error: "actors service disabled" }));
             return;
@@ -206116,7 +206395,7 @@ ${composed}`;
         }
         if (req.method === "DELETE" && /^\/api\/connectors\/[^/]+$/.test(url.pathname)) {
           const connId = decodeURIComponent(url.pathname.slice("/api/connectors/".length));
-          const svc = opts.actors?.service;
+          const svc = await connectorActorsService();
           if (!svc) {
             res.writeHead(501).end(JSON.stringify({ error: "actors service disabled" }));
             return;
@@ -206135,6 +206414,31 @@ ${composed}`;
           }
           return;
         }
+        if (req.method === "DELETE" && /^\/api\/actors\/[^/]+\/connectors\/[^/]+$/.test(url.pathname)) {
+          const parts = url.pathname.split("/");
+          const actorId = decodeURIComponent(parts[3] ?? "");
+          const connId = decodeURIComponent(parts[5] ?? "");
+          const svc = await connectorActorsService();
+          if (!svc) {
+            res.writeHead(501).end(JSON.stringify({ error: "actors service disabled" }));
+            return;
+          }
+          try {
+            const { variablesDeleted } = await svc.deleteActorConnector(actorId, connId);
+            let channelDisabled = false;
+            if (connId === "feishu" && channelService) {
+              const b2 = await channelService.getBindingForActor(actorId);
+              if (b2 && b2.status !== "revoked") {
+                await channelService.disable(actorId);
+                channelDisabled = true;
+              }
+            }
+            res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ ok: true, variablesDeleted, channelDisabled }));
+          } catch (e) {
+            res.writeHead(500).end(JSON.stringify({ error: String(e) }));
+          }
+          return;
+        }
         if (url.pathname === "/api/connectors/feishu/setup" && req.method === "GET") {
           res.writeHead(200, { "content-type": "text/event-stream", "cache-control": "no-cache", connection: "keep-alive" });
           const send = (obj2) => res.write(`data: ${JSON.stringify(obj2)}
@@ -206184,8 +206488,8 @@ ${composed}`;
               if (!errStr && pollData["client_id"]) {
                 const clientId = String(pollData["client_id"]);
                 const clientSecret = pollData["client_secret"] ? String(pollData["client_secret"]) : void 0;
-                if (opts.actors && clientSecret) {
-                  const svc = opts.actors.service;
+                const svc = clientSecret ? await connectorActorsService() : void 0;
+                if (svc && clientSecret) {
                   const credScope = actorIdParam ? { scope: "personal", actorId: actorIdParam } : { scope: "global" };
                   await svc.putVariable({ key: "FEISHU_APP_ID", value: clientId, ...credScope, connectorId: "feishu", encrypted: true });
                   await svc.putVariable({ key: "FEISHU_APP_SECRET", value: clientSecret, ...credScope, connectorId: "feishu", encrypted: true });
@@ -206248,6 +206552,8 @@ ${composed}`;
             });
             githubAppPending.put(state, {
               ...actorId ? { actorId } : {},
+              // 回调那一步没有鉴权头，解析不出公司——只能在这里记下来带过去。
+              ...currentCompanyId ? { companyId: currentCompanyId } : {},
               employeeSlug: nameSlug,
               createdAtMs: Date.now(),
               // 存下这次选的归属——回调时要拿它跟 GitHub 返回的 owner 比对。
@@ -206268,7 +206574,7 @@ ${composed}`;
         if (url.pathname === "/api/connectors/github/app/orgs" && req.method === "POST") {
           try {
             const { actorId } = JSON.parse(rawBody || "{}");
-            const svc = opts.actors?.service;
+            const svc = await connectorActorsService();
             if (!svc) throw new Error("actors service unavailable");
             const token = await svc.revealResolvedVariable("GITHUB_TOKEN", actorId);
             if (!token) {
@@ -206301,7 +206607,7 @@ ${composed}`;
         }
         if (url.pathname === "/api/connectors/github/app/available" && req.method === "POST") {
           try {
-            const svc = opts.actors?.service;
+            const svc = await connectorActorsService();
             if (!svc) throw new Error("actors service unavailable");
             const rows = await svc.listVariables();
             const plain = (key, actorId) => rows.find((r) => r.key === key && r.actorId === actorId && !r.encrypted)?.maskedValue ?? "";
@@ -206364,7 +206670,7 @@ ${composed}`;
               res.writeHead(400, { "content-type": "application/json" }).end(JSON.stringify({ error: "\u7F3A\u5C11 appId" }));
               return;
             }
-            const svc = opts.actors?.service;
+            const svc = await connectorActorsService();
             if (!svc) throw new Error("actors service unavailable");
             const rows = await svc.listVariables();
             const owners = rows.filter((r) => r.key === "GITHUB_APP_ID" && !r.encrypted && r.maskedValue === appId);
@@ -206411,7 +206717,7 @@ ${composed}`;
               bad(400, "\u8FD9\u4E0D\u50CF\u4E00\u4E2A\u79C1\u94A5\u6587\u4EF6\u2014\u2014\u8BF7\u4E0A\u4F20 GitHub \u4E0B\u8F7D\u7684 .pem\uFF08\u5185\u5BB9\u4EE5 -----BEGIN ... PRIVATE KEY----- \u5F00\u5934\uFF09");
               return;
             }
-            const svc = opts.actors?.service;
+            const svc = await connectorActorsService();
             if (!svc) throw new Error("actors service unavailable");
             let meta;
             try {
@@ -206469,7 +206775,7 @@ ${composed}`;
         if (url.pathname === "/api/connectors/github/app/permissions" && req.method === "POST") {
           try {
             const { actorId } = JSON.parse(rawBody || "{}");
-            const svc = opts.actors?.service;
+            const svc = await connectorActorsService();
             if (!svc) throw new Error("actors service unavailable");
             const appId = await svc.revealResolvedVariable("GITHUB_APP_ID", actorId);
             const privateKeyPem = await svc.revealResolvedVariable("GITHUB_APP_PRIVATE_KEY", actorId);
@@ -206523,7 +206829,7 @@ ${composed}`;
               fail(problem.message);
               return;
             }
-            const svc = opts.actors?.service;
+            const svc = await connectorActorsService(pending.companyId);
             if (!svc) throw new Error("actors service unavailable");
             const scope = pending.actorId ? { scope: "personal", actorId: pending.actorId } : { scope: "global" };
             const put3 = (key, value2, encrypted) => svc.putVariable({ key, value: value2, ...scope, connectorId: "github", encrypted });
@@ -206592,7 +206898,7 @@ ${composed}`;
               reply({ ok: false, error: "pending" });
               return;
             }
-            const svc = opts.actors?.service;
+            const svc = await connectorActorsService();
             if (!svc) throw new Error("actors service unavailable");
             const scope = pending.actorId ? { scope: "personal", actorId: pending.actorId } : { scope: "global" };
             const put3 = (key, value2, encrypted) => svc.putVariable({ key, value: value2, ...scope, connectorId: "github", encrypted });
@@ -206681,8 +206987,8 @@ ${composed}`;
               throw new Error(String(data["error_description"] ?? errStr ?? "login failed"));
             }
             if (!data["access_token"]) throw new Error("no access_token in response");
-            if (opts.actors) {
-              const svc = opts.actors.service;
+            const svc = await connectorActorsService();
+            if (svc) {
               if (actorId) {
                 await svc.putVariable({ key: "FEISHU_APP_ID", value: appId, scope: "personal", actorId, connectorId: "feishu", encrypted: true });
               } else {
@@ -206783,8 +207089,8 @@ ${composed}`;
               });
               const p2 = await pr.json();
               if (p2.access_token) {
-                if (opts.actors) {
-                  const svc = opts.actors.service;
+                const svc = await connectorActorsService();
+                if (svc) {
                   const connId = "github";
                   await svc.upsertConnector({ id: connId, name: "GitHub", mode: "oauth", status: "connected", account: "github" });
                   for (const [k2, v2] of [["GIT_AUTHOR_NAME", actorNameParam], ["GIT_AUTHOR_EMAIL", ""], ["GIT_COMMITTER_NAME", actorNameParam], ["GIT_COMMITTER_EMAIL", ""], ["EMAIL", ""]])
@@ -214524,7 +214830,7 @@ async function prepareDroppedDispatch(work, deps) {
   const node2 = kernel.model.artifacts.get(work.nodeId);
   const snap = await kernel.getStore().transaction((tx) => tx.loadWorkorder(work.workorderId));
   const current = snap?.works.find((w2) => w2.id === work.workId);
-  if (!snap || !current || current.status !== "running" || current.startedAt || current.sessionRef || current.endedAt || !snap.nodes.some((n) => n.id === work.nodeId && n.latestWorkId === current.id && !n.cancelledAt) || !node2 || node2.workspace !== work.workorderId || lifecycleOf(kernel.model, node2.id) !== "active" || kernel.model.pausedWorkorders.has(work.workorderId) || isHeld(kernel.model, node2.id)) return false;
+  if (!snap || snap.workorder.dispatchPaused || !current || current.status !== "running" || current.deadAt || current.cancelledAt || current.startedAt || current.sessionRef || current.endedAt || !snap.nodes.some((n) => n.id === work.nodeId && n.latestWorkId === current.id && !n.cancelledAt) || !node2 || node2.workspace !== work.workorderId || lifecycleOf(kernel.model, node2.id) !== "active" || isHeld(kernel.model, node2.id)) return false;
   if (snap.issues.some((i) => i.kind === "escalation" && i.aboutNodeId === node2.id && !i.resolvedAt && i.intent !== "advisory")) return false;
   if (!work.assigneeActorId) return false;
   const binding = await deps.bindingFor(work.assigneeActorId);
@@ -216135,13 +216441,14 @@ async function planChatTurnRecovery(deps) {
   const plans = [];
   for (const row of rows) {
     if (!row.runId) continue;
-    const run = await deps.getRun(row.runId).catch(() => null);
+    const run = await deps.getRun(row.runId);
     if (!run || run.status !== "running" || run.action !== "chat" || !run.artifactId) continue;
     const active = byArtifact.get(run.artifactId);
     if (!active || deps.isWired(run.artifactId)) continue;
     const meta = asObj3(run.metadata);
     const runtimeSessionId = typeof meta?.runtimeSessionId === "string" ? meta.runtimeSessionId : run.jobKey ?? void 0;
-    plans.push({
+    const turn = await deps.getTurnForRun?.(row.sessionId, run.id);
+    const plan = {
       dispatchId: active.dispatchId,
       chatSessionId: row.sessionId,
       assistantMsgId: row.id,
@@ -216152,18 +216459,42 @@ async function planChatTurnRecovery(deps) {
       ...runtimeSessionId ? { runtimeSessionId } : {},
       startedAt: run.startedAt,
       seedContent: row.content,
-      seedParts: partsOf(row.parts)
-    });
+      seedParts: partsOf(row.parts),
+      ...turn ? { turnId: turn.id } : {}
+    };
+    if (turn && turn.status !== "reserved" && turn.status !== "running") {
+      deps.onSettled?.({ plan, turn });
+      continue;
+    }
+    plans.push(plan);
   }
   return plans;
 }
+async function finishPersistedRecoveryItems(items, sessionId, turnId, status, log3) {
+  if (!items || !chatItemsDoubleWriteEnabled()) return [];
+  try {
+    const rows = await items.listItemsByTurn(sessionId, turnId);
+    let version2 = await items.sessionVersionCursor(sessionId);
+    const closed = [];
+    for (const row of rows) {
+      if (row.status !== "streaming") continue;
+      const updated = await items.applyOp(row.id, { op: "set_status", status }, { version: ++version2 });
+      if (!updated) throw new Error(`item ${row.id} disappeared`);
+      closed.push(updated);
+    }
+    return closed;
+  } catch (err) {
+    log3(`[chat-recovery] items \u6536\u5C3E\u5931\u8D25\uFF1Asession=${sessionId} turn=${turnId} ${String(err)}`);
+    return [];
+  }
+}
 function wireRecoveredChatTurn(deps) {
   const { plan, handle, liveChat, chatStore, trace } = deps;
   const log3 = deps.log ?? (() => void 0);
   const itemLedger = new ChatItemLedger({
     ...deps.items ? { items: deps.items } : {},
     sessionId: plan.chatSessionId,
-    turnId: deps.itemsTurnId ?? fallbackTurnId(plan.runId),
+    turnId: deps.itemsTurnId ?? plan.turnId ?? fallbackTurnId(plan.runId),
     runId: plan.runId,
     messageId: plan.assistantMsgId,
     log: log3
@@ -216329,6 +216660,14 @@ function wireRecoveredChatTurn(deps) {
     normalizedSource.finishTurn(failed ? "failed" : "completed");
     itemLedger.finish(failed ? "failed" : "completed");
     await itemLedger.drain();
+    const closedItems = await finishPersistedRecoveryItems(
+      deps.items,
+      plan.chatSessionId,
+      itemLedger.turnId,
+      failed ? "failed" : "completed",
+      log3
+    );
+    for (const item of closedItems) liveChat.publishItemStatus(plan.chatSessionId, item);
     await chatStore.updateMessage(currentMsgId, {
       content: itemLedger.projectContent(),
       status: failed ? "error" : "done",
@@ -216426,6 +216765,29 @@ async function reconcileChatExitFrame(deps) {
     const meta = asObj3(run.metadata);
     if (meta?.dispatchId !== deps.dispatchId) continue;
     if (deps.ownedRunId?.(row.sessionId) === row.runId) return false;
+    const turn = await deps.getTurnForRun?.(row.sessionId, run.id);
+    if (turn && turn.status !== "reserved" && turn.status !== "running") {
+      await reconcileSettledChatTurn({
+        plan: {
+          dispatchId: deps.dispatchId,
+          chatSessionId: row.sessionId,
+          assistantMsgId: row.id,
+          runId: run.id,
+          artifactId: run.artifactId,
+          actor: run.actorId,
+          startedAt: run.startedAt,
+          seedContent: row.content,
+          seedParts: partsOf(row.parts),
+          turnId: turn.id
+        },
+        turn,
+        chatStore: deps.chatStore,
+        trace: deps.trace,
+        ...deps.items ? { items: deps.items } : {},
+        ...deps.log ? { log: deps.log } : {}
+      });
+      return true;
+    }
     const { info } = deps;
     const failed = exitFailed(info);
     const finishedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -216467,6 +216829,13 @@ async function reconcileChatExitFrame(deps) {
     normalizer.turnFinished(failed ? "failed" : "completed");
     itemLedger.finish(failed ? "failed" : "completed");
     await itemLedger.drain();
+    await finishPersistedRecoveryItems(
+      deps.items,
+      row.sessionId,
+      itemLedger.turnId,
+      failed ? "failed" : "completed",
+      deps.log ?? (() => void 0)
+    );
     await deps.chatStore.updateMessage(row.id, {
       content: itemLedger.projectContent(),
       status: failed ? "error" : "done",
@@ -216505,6 +216874,156 @@ async function reconcileChatExitFrame(deps) {
   }
   return false;
 }
+async function planChatTurnRecoveryAcrossCompanies(deps) {
+  const groups = [];
+  const settled = [];
+  const skipped = [];
+  let scanned = 0;
+  for (const companyId of await deps.listCompanies()) {
+    try {
+      const stores = await deps.storesFor(companyId);
+      const companySettled = [];
+      const plans = await planChatTurnRecovery({
+        activeSessions: deps.activeSessions,
+        listRunningAssistantMessages: stores.listRunningAssistantMessages,
+        getRun: deps.getRun,
+        isWired: deps.isWired,
+        ...stores.getTurnForRun ? { getTurnForRun: stores.getTurnForRun } : {},
+        onSettled: (hit) => companySettled.push(hit)
+      });
+      scanned += 1;
+      settled.push(...companySettled.map((hit) => ({ ...hit, companyId, stores })));
+      if (plans.length) groups.push({ companyId, stores, plans });
+      if (deps.stopOnFirstHit && (plans.length || companySettled.length)) break;
+    } catch (err) {
+      skipped.push({ companyId, error: String(err) });
+      deps.onCompanyError?.(companyId, err);
+    }
+  }
+  return { groups, settled, scanned, skipped };
+}
+async function sweepDanglingChatTurnsAcrossCompanies(deps) {
+  const { listCompanies, storesFor, onCompanyError, onSessionClosed, log: log3, ...rest } = deps;
+  const closed = [];
+  for (const companyId of await listCompanies()) {
+    try {
+      const stores = await storesFor(companyId);
+      const ids2 = await sweepDanglingChatTurns({
+        ...rest,
+        listRunningAssistantMessages: stores.listRunningAssistantMessages,
+        listMessages: (sid) => stores.chatStore.listMessages(sid),
+        updateMessage: (id, patch) => stores.chatStore.updateMessage(id, patch),
+        ...log3 ? { log: (m2) => log3(companyId ? `${m2}\uFF3B${companyId}\uFF3D` : m2) } : {},
+        ...onSessionClosed ? { onSessionClosed: (sid, reason, messageId) => onSessionClosed(sid, reason, messageId, companyId) } : {}
+      });
+      closed.push(...ids2);
+    } catch (err) {
+      onCompanyError?.(companyId, err);
+    }
+  }
+  return closed;
+}
+async function reconcileChatExitFrameAcrossCompanies(deps) {
+  const { listCompanies, storesFor, onCompanyError, log: log3, ...rest } = deps;
+  for (const companyId of await listCompanies()) {
+    try {
+      const stores = await storesFor(companyId);
+      const handled2 = await reconcileChatExitFrame({
+        ...rest,
+        listRunningAssistantMessages: stores.listRunningAssistantMessages,
+        chatStore: stores.chatStore,
+        ...stores.getTurnForRun ? { getTurnForRun: stores.getTurnForRun } : {},
+        ...stores.items ? { items: stores.items } : {},
+        ...log3 ? { log: (m2) => log3(companyId ? `${m2}\uFF3B${companyId}\uFF3D` : m2) } : {}
+      });
+      if (handled2) return true;
+    } catch (err) {
+      onCompanyError?.(companyId, err);
+    }
+  }
+  return false;
+}
+async function reconcileSettledChatTurn(deps) {
+  const { plan, turn } = deps;
+  if (turn.status === "reserved" || turn.status === "running") return;
+  const succeeded = turn.status === "succeeded";
+  const completedAt = turn.completedAt ?? (/* @__PURE__ */ new Date()).toISOString();
+  const turnId = deps.items ? await resolveChatItemsTurnId(deps.items, plan.assistantMsgId, turn.id) : turn.id;
+  await finishPersistedRecoveryItems(
+    deps.items,
+    plan.chatSessionId,
+    turnId,
+    succeeded ? "completed" : "failed",
+    deps.log ?? (() => void 0)
+  );
+  await deps.chatStore.updateMessage(plan.assistantMsgId, {
+    status: succeeded ? "done" : "error",
+    completedAt
+  });
+  const run = await deps.trace.getRun(plan.runId);
+  if (run?.status === "running") {
+    await deps.trace.updateRun(plan.runId, {
+      status: turn.status,
+      endedAt: completedAt
+    });
+  }
+}
+async function recoverChatTurnsAcrossCompanies(deps) {
+  const result = await planChatTurnRecoveryAcrossCompanies(deps);
+  const recovered = [];
+  const log3 = deps.log ?? (() => void 0);
+  const retire = async (hit) => {
+    const { plan, turn, companyId, stores } = hit;
+    log3(`[chat-claim] company=${companyId ?? "<default>"} session=${plan.chatSessionId} run=${plan.runId} dispatch=${plan.dispatchId} \u7ED3\u8BBA=settled\uFF08\u4F9D\u636E\uFF1A\u540C\u516C\u53F8\u8F6E\u6B21 ${turn.id} \u5DF2 ${turn.status}\uFF0CcompletedAt=${turn.completedAt ?? "-"}\uFF09`);
+    deps.evict(plan.dispatchId);
+    try {
+      await reconcileSettledChatTurn({
+        plan,
+        turn,
+        chatStore: stores.chatStore,
+        trace: deps.trace,
+        ...stores.items ? { items: stores.items } : {},
+        log: log3
+      });
+    } catch (err) {
+      deps.onCompanyError?.(companyId, err);
+    }
+  };
+  for (const hit of result.settled) await retire(hit);
+  for (const { companyId, stores, plans } of result.groups) {
+    for (const plan of plans) {
+      try {
+        const itemsTurnId = stores.items ? await resolveChatItemsTurnId(stores.items, plan.assistantMsgId, plan.turnId ?? fallbackTurnId(plan.runId)) : plan.turnId ?? fallbackTurnId(plan.runId);
+        const turn = await stores.getTurnForRun?.(plan.chatSessionId, plan.runId);
+        if (turn && turn.status !== "reserved" && turn.status !== "running") {
+          const hit = { companyId, stores, plan, turn };
+          result.settled.push(hit);
+          await retire(hit);
+          continue;
+        }
+        const handle = deps.recover(plan);
+        const { done } = wireRecoveredChatTurn({
+          plan,
+          handle,
+          liveChat: deps.liveChat,
+          chatStore: stores.chatStore,
+          trace: deps.trace,
+          register: () => deps.register(plan, handle),
+          unregister: () => deps.unregister(plan),
+          ...deps.traceHealth ? { traceHealth: deps.traceHealth } : {},
+          ...stores.items ? { items: stores.items, itemsTurnId } : {},
+          log: log3
+        });
+        recovered.push({ companyId, plan, done });
+        log3(`[chat-recovery] \u91CD\u6302 chat \u8F6E\uFF1Acompany=${companyId ?? "<default>"} session=${plan.chatSessionId} run=${plan.runId} dispatch=${plan.dispatchId}`);
+      } catch (err) {
+        result.skipped.push({ companyId, error: String(err) });
+        deps.onCompanyError?.(companyId, err);
+      }
+    }
+  }
+  return { ...result, recovered };
+}
 var import_node_crypto45, asObj3, partsOf, maxPartSeq, exitFailed, exitErrorText, runTerminalPatch;
 var init_chat_recovery = __esm({
   "../server/src/chat-recovery.ts"() {
@@ -217856,9 +218375,32 @@ var init_service5 = __esm({
         const a = await this.opts.store.getActor(id);
         if (!a) throw new Error(`actor not found: ${id}`);
         await this.upsertActor({ ...a, status: "disabled" }, by);
+        await this.dropRuntimeBindingOfDeletedAgent(a.id, a.kind, by);
         if (a.status === "active") await this.opts.onActorDisabled?.(id, by);
         return a;
       }
+      /**
+       * 删掉 Agent 时把它跟 runtime 的绑定一起撤掉。
+       *
+       * 为什么必须做（2026-09-09 线上实测）：删除只写 `status='disabled'`，`actor_bindings` 那行
+       * 原样留着且仍是 `active`。而 `GET /api/actors` 会把已删 Agent 过滤掉、`GET /api/bindings` 不会——
+       * 运行时管理页拿两份数据对着算「运行 Agent」，于是已删的 Agent 继续占着一格，
+       * 名字还查不回来，页面上直接露出 `asst-xxx-cbf34f` 这种裸 id。didi 组织实测：yx_claude 上
+       * 12 条 active 绑定里 7 条的 Agent 早被删了（其中 5 条是助理）。
+       *
+       * 顺带修好另一处：`pickAssistantRuntime` 用「(nodeId,kind) 上的 active 绑定数」当负载做均衡，
+       * 已删 Agent 的残留绑定会把负载算高，把新助理往别的机器上赶。
+       *
+       * 只对 agent 生效：真人被移出组织是「离岗」不是删除，PRD 明确其助理照常在岗、账号回来还能接上。
+       * 幂等：removeBinding 对没有绑定的 actor 是 no-op，所以重复删也安全（存量脏数据也能靠再删一次修好）。
+       */
+      async dropRuntimeBindingOfDeletedAgent(id, kind, by) {
+        if (kind !== "agent") return;
+        const existing = await this.opts.store.getBinding(id);
+        if (!existing) return;
+        await this.opts.store.removeBinding(id);
+        await this.audit({ kind: "binding_change", actorId: id, by, at: this.now(), detail: { removed: true, reason: "agent_deleted" } });
+      }
       /**
        * 原子「若当前 active 则停用」（QA R10）：与 disableActor 的区别在于——
        * 只在 actor 当前**确为 active** 时才写，返回 `ok:true + before + seq`；已被并发者/别的路径先 disable
@@ -217882,6 +218424,7 @@ var init_service5 = __esm({
         if (!res.ok) return res;
         this.opts.onRolesChanged?.(id, []);
         await this.audit({ kind: "actor_upsert", actorId: id, by, at: this.now(), detail: { status: "disabled", roles: res.before.roles } });
+        await this.dropRuntimeBindingOfDeletedAgent(id, res.before.kind, by);
         await this.opts.onActorDisabled?.(id, by);
         return { ok: true, before: res.before, seq };
       }
@@ -218482,39 +219025,42 @@ ${input.description}
         const c = cfg ?? await this.opts.store.latestConfig(actorId);
         return new Set(c?.connectorIds ?? []);
       }
-      /** 设置某员工×连接器的连接记录（启用/停用）。无则创建，有则翻转 enabled。 */
-      async setActorConnectorEnabled(actorId, connectorId, enabled) {
-        const conn = { actorId, connectorId, enabled, updatedAt: this.now() };
+      /**
+       * 设置某员工×连接器的连接记录（启用/停用）。无则创建，有则翻转 enabled。
+       *
+       * `configuredBy` 只在**授权流程走完**时传（「谁为这名员工把它接上的」）。普通开关不传，
+       * 此时把已有值原样带回——**只增不抹**：翻一次开关不该把授权时记下的人擦掉。
+       * pg 侧另有 `COALESCE` 兜同一条，两层都做是因为内存 store 是整行替换。
+       */
+      async setActorConnectorEnabled(actorId, connectorId, enabled, configuredBy) {
+        const keep = configuredBy ?? (await this.opts.store.listActorConnectorConnections(actorId)).find((c) => c.connectorId === connectorId)?.configuredBy;
+        const conn = {
+          actorId,
+          connectorId,
+          enabled,
+          updatedAt: this.now(),
+          ...keep ? { configuredBy: keep } : {}
+        };
         await this.opts.store.upsertActorConnectorConnection(conn);
         return conn;
       }
-      listActorConnectorConnections(actorId) {
-        return this.opts.store.listActorConnectorConnections(actorId);
-      }
       /**
-       * 移除某员工与某连接器的连接（组织页连接器详情的「移除连接」，2026-09-09 原型 1600:5765）。
+       * 删除**一条**「员工 × 连接器」连接：连接记录 + 该员工这个连接器的**个人凭据变量**。
        *
-       * 删两样东西，缺一不可：
-       *   ① 这名员工**自己**那份连接器凭据（`scope=personal` 且 `connectorId` 命中的变量行）——
-       *      不删的话，「移除」之后 `actorConnected` 里还有它，卡片照样在，读作「删不掉」；
-       *   ② 「员工×连接器」的连接记录——不删的话 `effective` 里还有它（enabled=false），
-       *      卡片变成一张「已停用」的僵尸卡，而人要的是它消失。
+       * 与开关的区别（发起人 2026-09-09 定的，两颗按钮并存）：开关是「暂时不用」，凭据留着、
+       * 打开就能接着用；删除是「不要了」，凭据清掉、再要用得重走一遍授权。
        *
-       * **不碰组织那条 connector 行**（决策 0080 修订五的同一条理由）：组织级连接是别人配的资产，
-       * 一名员工点「移除连接」不该把全组织的连接拆掉。组织级的断开在「管理 > 连接器」。
-       * 于是：组织已连接时，移除个人连接后这名员工会**回落到组织默认**——卡片仍在，但身份那一行
-       * 变回组织账号。这是对的，不是没删干净。
-       *
-       * 幂等：没有个人凭据、没有记录时照样返回成功（`variablesDeleted: 0`）——重复点、并发点都不该报错。
+       * **只动这名员工自己的东西**：组织级变量（scope=global）一个不碰——那是别人也在用的。
+       * 飞书对话通道的下线不在这里做（本服务够不到 channelService），由路由层在删完凭据后补一刀。
        */
-      async removeActorConnector(actorId, connectorId) {
-        const rows = await this.opts.store.listVariables(actorId);
-        const mine = rows.filter(
-          (v2) => v2.scope === "personal" && v2.actorId === actorId && v2.connectorId === connectorId
-        );
-        for (const v2 of mine) await this.opts.store.deleteVariable(v2.key, actorId);
+      async deleteActorConnector(actorId, connectorId) {
+        const personal = (await this.opts.store.listVariables(actorId)).filter((v2) => v2.scope === "personal" && v2.actorId === actorId && v2.connectorId === connectorId);
+        for (const v2 of personal) await this.deleteVariable(v2.key, actorId);
         await this.opts.store.deleteActorConnectorConnection(actorId, connectorId);
-        return { removed: true, variablesDeleted: mine.length };
+        return { variablesDeleted: personal.length };
+      }
+      listActorConnectorConnections(actorId) {
+        return this.opts.store.listActorConnectorConnections(actorId);
       }
       /**
        * 员工连接器面板所需状态：连接记录 + 组织级已连接集合 + 该员工已授权（有个人 connector 变量）集合。
@@ -220483,14 +221029,9 @@ function actorsDomain(opts) {
       const { service } = await resolveCtx(req.auth.companyId);
       const b2 = req.body;
       if (typeof b2?.enabled !== "boolean") throw new ApiError(400, "BAD_REQUEST", "\u7F3A\u5C11 enabled (boolean)");
-      const conn = await service.setActorConnectorEnabled(req.params.id, req.params.connectorId, b2.enabled);
+      const conn = b2.enabled ? await service.setActorConnectorEnabled(req.params.id, req.params.connectorId, true, req.auth.actor) : await service.setActorConnectorEnabled(req.params.id, req.params.connectorId, false);
       return { status: 200, body: conn };
     });
-    router.delete("/api/actors/:id/connectors/:connectorId", async (req) => {
-      const { service } = await resolveCtx(req.auth.companyId);
-      const r = await service.removeActorConnector(req.params.id, req.params.connectorId);
-      return { status: 200, body: r };
-    });
     const requireVariableManager = (req) => {
       if (!isHumanActor(req.auth.actor)) {
         throw new ApiError(
@@ -225713,13 +226254,19 @@ function reviewSummary(snap, reviews, events) {
   const name = node2?.title ?? first.nodeId;
   const latest = latestActivityReviews(reviews, events);
   const requirements = snap.requirements.filter((r) => r.nodeId === first.nodeId && r.reviewerActorId === first.reviewerActorId);
-  const judgement = judgeWork({ requirements: requirements.length ? requirements : reviews, reviews });
+  for (const requirement of requirements) {
+    const current = reviews.find((r) => r.id === requirement.latestReviewId);
+    if (!current) continue;
+    const index2 = latest.findIndex((r) => r.reviewGroup === requirement.reviewGroup);
+    if (index2 >= 0) latest[index2] = current;
+  }
+  const judgement = judgeWork({ requirements: requirements.length ? requirements : latest, reviews: latest });
   const pending = latest.filter((r) => !r.cancelledAt && !r.verdict && reviewState(r) === "running");
   if (work?.acceptanceState === "accepted" || work?.acceptedAt || work?.acceptanceState !== "rejected" && judgement === "passed") {
     return { phase: "done", status: `\u300A${name}\u300B\u5BA1\u6838\u901A\u8FC7\u3002`, latest, pending: [] };
   }
   if (work?.acceptanceState === "rejected" || judgement === "rejected") {
-    return { phase: "done", status: "\u5BA1\u6838\u4E0D\u901A\u8FC7\u3002", latest, pending: [] };
+    return { phase: "done", status: `\u300A${name}\u300B\u5BA1\u6838\u4E0D\u901A\u8FC7\u3002`, latest, pending: [] };
   }
   const endedWork = !!(work?.cancelledAt || work?.deadAt);
   if (endedWork && latest.every((r) => !!r.cancelledAt && reviewState(r) !== "retry")) {
@@ -225749,6 +226296,66 @@ 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";
+  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))) ?? [];
+    const nodeTitle = titles.get(e.nodeId) || "\u5DF2\u79FB\u9664\u7684\u8282\u70B9";
+    const system = rec.actorId.startsWith("actor:system:");
+    const closureAdded = system && added.length > 0 && !removed.length && added.every((r) => r.source === "closure");
+    cards.push({
+      id: `wo:${rec.seq}`,
+      seq: rec.seq,
+      at: rec.createdAt,
+      updatedAt: rec.createdAt,
+      nodeId: e.nodeId,
+      nodeTitle,
+      executor: system ? { ...ref2(rec.actorId), name: "\u7CFB\u7EDF" } : ref2(rec.actorId),
+      ...rec.handActorId ? { handActor: ref2(rec.handActorId) } : {},
+      phase: "done",
+      status: closureAdded ? `\u4E3A\u300A${nodeTitle}\u300B\u8865\u5145\u4E86\u7ED3\u6848\u5BA1\u6838\u8981\u6C42\u3002` : `\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"),
+      artifacts: [],
+      actions: []
+    });
+    previous3.set(e.nodeId, after);
+  }
+  return cards;
+}
+var requirementKey;
+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]);
+  }
+});
+
 // ../server/src/domains/collab/workorder-manager.ts
 function resolveWorkorderManager(snap) {
   const nodes = snap.nodes;
@@ -225772,6 +226379,9 @@ var init_workorder_manager = __esm({
 function isPendingActor(id) {
   return typeof id === "string" && id.startsWith("pending:");
 }
+function isAgentActor(id) {
+  return typeof id === "string" && id.startsWith("actor:agent:");
+}
 function isDispatchLayerFailure(detail) {
   const reason = detail?.reason;
   return typeof reason === "string" && reason.startsWith("dispatch ");
@@ -226307,6 +226917,22 @@ function buildWorkorderActivity(input) {
     const created = events.filter((r) => r.event.kind === "review.create" && ids2.has(r.event.reviewId));
     const dates = summary.latest.flatMap((r) => [r.createdAt, r.startedAt, r.endedAt, r.decidedAt, r.cancelledAt, r.retryAt].filter((v2) => !!v2));
     const pending = summary.pending.filter((r) => r.reviewerActorId.startsWith("actor:human:") && (!input.viewerActorId || r.reviewerActorId === input.viewerActorId));
+    const groups = [...new Set(summary.latest.map((r) => r.reviewGroup))];
+    const reviewNotes = summary.latest.flatMap((r) => {
+      const text5 = r.note?.trim();
+      if (!text5) return [];
+      const rejected = r.verdict === "request_changes";
+      const label = ACTIVITY_COPY.reviewNoteLabel(rejected);
+      return [{
+        id: r.id,
+        // 同一个人担多个评审组时才标组号——单组标了纯属噪声（卡上本来就只有这一个人）。
+        label: groups.length > 1 ? `\u8BC4\u5BA1\u7EC4 ${groups.indexOf(r.reviewGroup) + 1} \xB7 ${label}` : label,
+        text: text5,
+        tone: rejected ? "reject" : "note"
+      }];
+    });
+    const revieweeId = workById.get(workId)?.assigneeActorId;
+    const reviewLine = reviewNotes.length && revieweeId && revieweeId !== reviewerId ? reviewThreadSessionId(revieweeId, reviewerId) : void 0;
     visibleReviews.set(cardId, {
       id: cardId,
       reviewWorkId: workId,
@@ -226320,8 +226946,13 @@ function buildWorkorderActivity(input) {
       executorId: reviewerId,
       phase: summary.phase,
       status: summary.status,
-      detail: summary.latest.length === 1 ? summary.latest[0].note ? `${summary.latest[0].verdict === "request_changes" ? "\u5BA1\u6838\u4E0D\u901A\u8FC7" : "\u5BA1\u6838\u610F\u89C1"}\uFF1A${summary.latest[0].note}` : void 0 : summary.latest.map((r) => `${nameOf(r.reviewerActorId)}\uFF08\u8BC4\u5BA1\u7EC4 ${[...new Set(summary.latest.map((r2) => r2.reviewGroup))].indexOf(r.reviewGroup) + 1}\uFF09\uFF1A${reviewLabel(r)}${r.note ? `
-${r.verdict === "request_changes" ? "\u5BA1\u6838\u4E0D\u901A\u8FC7" : "\u5BA1\u6838\u610F\u89C1"}\uFF1A${r.note}` : ""}`).join("\n\n"),
+      /* 同一人担多个责任组时，展开区留一份**逐组结论**（只有判定词、没有意见正文）——小状态只有
+         一句总判定，说不清哪个组过了哪个组没过。意见正文一律走下面的意见条。 */
+      ...summary.latest.length > 1 ? {
+        detail: summary.latest.map((r) => `${nameOf(r.reviewerActorId)}\uFF08\u8BC4\u5BA1\u7EC4 ${groups.indexOf(r.reviewGroup) + 1}\uFF09\uFF1A${reviewLabel(r)}`).join("\n")
+      } : {},
+      ...reviewNotes.length ? { reviewNotes } : {},
+      ...reviewLine ? { reviewThreadSessionId: reviewLine } : {},
       artifacts: artifactsByWork.get(workId) ?? [],
       actions: pending.length ? [
         { kind: "review", label: BUTTON.approve, target: first.nodeId, revisionId: workId, verdict: "approve" },
@@ -226361,7 +226992,7 @@ ${r.verdict === "request_changes" ? "\u5BA1\u6838\u4E0D\u901A\u8FC7" : "\u5BA1\u
     if (issueById.get(issueId)?.kind === "gap") {
       d.traceAvailable = true;
       d.traceWorkIds = gapOrigins.get(issueId);
-    } else {
+    } else if (!issueId.startsWith(REWORK_ANNOTATION_PREFIX)) {
       d.traceWorkIds = issueWorks.get(issueId);
     }
   }
@@ -226382,24 +227013,31 @@ ${r.verdict === "request_changes" ? "\u5BA1\u6838\u4E0D\u901A\u8FC7" : "\u5BA1\u
     }
     return void 0;
   };
-  const cards = drafts.map((d) => ({
-    id: d.id,
-    seq: d.seq,
-    at: d.at,
-    updatedAt: d.updatedAt,
-    ...d.nodeId ? { nodeId: d.nodeId, nodeTitle: nodeName(d.nodeId) } : {},
-    executor: ref2(d.executorId),
-    ...d.reviewWorkId ? { reviewWorkId: d.reviewWorkId, reviewers: d.reviewerIds?.map(ref2) } : {},
-    ...d.handActorId ? { handActor: ref2(d.handActorId) } : {},
-    phase: d.phase,
-    status: d.status,
-    ...d.detail ? { detail: d.detail } : {},
-    artifacts: d.artifacts,
-    actions: d.actions,
-    ...d.traceAvailable ? { traceAvailable: true } : {},
-    ...d.traceWorkIds?.length ? { traceWorkIds: d.traceWorkIds, traceAvailable: true } : {},
-    .../* @__PURE__ */ ((r) => r ? { runId: r, traceAvailable: true } : {})(runIdOfCard(d))
-  }));
+  const cards = drafts.map((d) => {
+    const traced = isAgentActor(d.executorId);
+    return {
+      id: d.id,
+      seq: d.seq,
+      at: d.at,
+      updatedAt: d.updatedAt,
+      ...d.nodeId ? { nodeId: d.nodeId, nodeTitle: nodeName(d.nodeId) } : {},
+      executor: ref2(d.executorId),
+      ...d.reviewWorkId ? { reviewWorkId: d.reviewWorkId, reviewers: d.reviewerIds?.map(ref2) } : {},
+      ...d.handActorId ? { handActor: ref2(d.handActorId) } : {},
+      phase: d.phase,
+      status: d.status,
+      ...d.detail ? { detail: d.detail } : {},
+      ...d.reviewNotes?.length ? { reviewNotes: d.reviewNotes } : {},
+      ...d.reviewThreadSessionId ? { reviewThreadSessionId: d.reviewThreadSessionId } : {},
+      artifacts: d.artifacts,
+      actions: d.actions,
+      ...traced && d.traceAvailable ? { traceAvailable: true } : {},
+      ...d.traceWorkIds?.length ? { traceWorkIds: d.traceWorkIds, ...traced ? { traceAvailable: true } : {} } : {},
+      .../* @__PURE__ */ ((r) => r ? { runId: r, traceAvailable: true } : {})(traced ? runIdOfCard(d) : void 0)
+    };
+  });
+  cards.push(...reviewRequirementActivity(snap, events, ref2));
+  cards.sort((a, b2) => a.updatedAt.localeCompare(b2.updatedAt) || a.seq - b2.seq || a.id.localeCompare(b2.id));
   return { workorderId, cards, truncated };
 }
 var ACTIVITY_EVENT_KINDS, ACTIVITY_EVENT_LIMIT, ACTIVITY_COPY, REWORK_ANNOTATION_PREFIX, ENGINE_RETRY_EXHAUSTED, BUTTON;
@@ -226409,9 +227047,12 @@ var init_activity2 = __esm({
     init_src();
     init_src4();
     init_review_activity();
+    init_review_requirement_activity();
     init_workorder_manager();
     ACTIVITY_EVENT_KINDS = [
       "plan.changed",
+      "plan.add_node",
+      "plan.update_review_requirements",
       "plan.update_spec",
       "plan.node_retry",
       "work.create",
@@ -226465,15 +227106,13 @@ var init_activity2 = __esm({
       doneAwaitingReview: (name) => `\u300A${name}\u300B\u5DF2\u5B8C\u6210\uFF0C\u7B49\u5F85\u5BA1\u6838\u3002`,
       done: (name) => `\u300A${name}\u300B\u5DF2\u5B8C\u6210\u3002`,
       finalDelivered: (acceptor) => `\u6700\u7EC8\u4EA4\u4ED8\u5DF2\u4E0A\u4F20\uFF0C\u7B49\u5F85 ${acceptor} \u9A8C\u6536\u3002`,
-      reviewPending: (name) => `\u8BF7\u786E\u8BA4\u300A${name}\u300B\u662F\u5426\u5BA1\u6838\u901A\u8FC7\u3002`,
-      reviewing: (name) => `\u6B63\u5728\u5BA1\u6838 \u300A${name}\u300B\u3002`,
-      reviewApproved: (name) => `\u300A${name}\u300B\u5BA1\u6838\u901A\u8FC7\u3002`,
-      reviewRejected: "\u5BA1\u6838\u4E0D\u901A\u8FC7\u3002",
-      reviewRejectedDetail: (note) => `\u5BA1\u6838\u4E0D\u901A\u8FC7\uFF1A${note}`,
-      reviewTimedOut: (name) => `\u300A${name}\u300B\u7684\u5BA1\u6838\u672A\u5728\u65F6\u9650\u5185\u5B8C\u6210\u3002`,
-      /** 评审**连败熔断**（`review.kill`，`engine/activate.ts` 只对 agent 评审员）——不是超时，
-          此前与 {@link reviewTimedOut} 共用一句，把被熔断的评审说成「未在时限内完成」。 */
-      reviewKilled: (name) => `\u300A${name}\u300B\u7684\u8BC4\u5BA1\u8FDE\u7EED\u5931\u8D25\uFF0C\u5DF2\u505C\u6B62\u3002`,
+      /* 🚨 审核卡那一族文案（待审 / 正在审 / 通过 / 不通过 / 超时 / 熔断）**不在这里**：
+         审核卡改成按「被审交付 × 评审人」合卡之后，它的小状态由 `review-activity.ts` 的
+         `reviewSummary()` 按该评审人的**有效判定**整句给出，不是逐事件套模板。这里此前留着一份
+         同名同义的副本，六个 key 全是零引用——我 2026-09-09 改「审核不通过」文案时先改到了这份
+         死副本上，页面纹丝不动。删掉，别再留第二个事实源。
+         留在这里的只有下面这一句——它不是小状态，是**审核意见条**上那个判定词，由本文件拼卡时用。 */
+      reviewNoteLabel: (rejected) => rejected ? "\u5BA1\u6838\u4E0D\u901A\u8FC7" : "\u5BA1\u6838\u610F\u89C1",
       acceptPending: "\u8BF7\u9A8C\u6536\u6700\u7EC8\u4EA4\u4ED8\u3002",
       accepted: "\u9A8C\u6536\u6700\u7EC8\u4EA4\u4ED8\u5DF2\u5B8C\u6210\u9A8C\u6536\u3002",
       acceptedNode: (name) => `\u300A${name}\u300B\u5DF2\u9A8C\u6536\u3002`,
@@ -227641,9 +228280,18 @@ function toAuditEntry(op) {
     summary: `${KIND_LABEL2[op.kind] ?? op.kind} \xB7 ${op.artifactId}`
   };
 }
+function nodeIdOfWorkId(workId) {
+  if (!workId || !workId.startsWith("wk:")) return null;
+  const body2 = workId.slice(3);
+  const cut = body2.lastIndexOf(":");
+  if (cut <= 0) return null;
+  if (!/^\d+$/.test(body2.slice(cut + 1))) return null;
+  const nodeId = body2.slice(0, cut);
+  return nodeId.startsWith("artifact:") ? nodeId : null;
+}
 function eventToAuditEntry(rec) {
   const ev = rec.event;
-  const artifactId = rec.nodeId ?? rec.workId ?? "";
+  const artifactId = rec.nodeId ?? nodeIdOfWorkId(rec.workId) ?? "";
   return {
     seq: rec.seq,
     at: rec.createdAt,
@@ -227653,7 +228301,11 @@ function eventToAuditEntry(rec) {
     summary: `${KIND_LABEL2[ev.kind] ?? ev.kind}${artifactId ? ` \xB7 ${artifactId}` : ""}`
   };
 }
-function enrichAudit(entry, model, titleOf) {
+function enrichAudit(entry, model, titleOf, workorderId) {
+  if (!entry.artifactId) {
+    const workspaceTitle2 = workorderId ? titleOf.get(workorderId) : void 0;
+    return { ...entry, ...workspaceTitle2 ? { workspaceTitle: workspaceTitle2 } : {}, visibility: "ok" };
+  }
   const a = model.artifacts.get(entry.artifactId);
   if (!a) return { ...entry, visibility: "deleted" };
   const workspaceTitle = titleOf.get(a.workspace);
@@ -227671,8 +228323,8 @@ async function buildAudit(source, q2 = {}, model) {
   const items = [];
   let lastCursor = null;
   let truncated = false;
-  const push2 = (entry, cursor) => {
-    items.push(model && titleOf ? enrichAudit(entry, model, titleOf) : entry);
+  const push2 = (entry, cursor, workorderId) => {
+    items.push(model && titleOf ? enrichAudit(entry, model, titleOf, workorderId) : entry);
     lastCursor = cursor;
   };
   const match = (actor, kind, at) => {
@@ -227683,30 +228335,33 @@ async function buildAudit(source, q2 = {}, model) {
     return true;
   };
   if (q2.latest) {
-    let collected = [];
+    const collected = [];
     if (source.engineStore) {
       const records = await source.engineStore.transaction((tx) => tx.listEvents(void 0, 0));
       for (const rec of records) {
         const ev = rec.event;
         if (!match(rec.actorId, ev.kind, rec.createdAt)) continue;
-        collected.push(eventToAuditEntry(rec));
+        collected.push({ entry: eventToAuditEntry(rec), workorderId: rec.workorderId });
       }
     } else if (source.oplog) {
       const src = source.oplog.readFilteredOps ? source.oplog.readFilteredOps({ ...q2.actor ? { actor: q2.actor } : {}, ...q2.kind ? { kind: q2.kind } : {} }, void 0, { latest: true }) : source.oplog.readAll();
       for await (const { op } of src) {
         if (!match(op.actor, op.kind, op.timestamp)) continue;
-        collected.push(toAuditEntry(op));
+        collected.push({ entry: toAuditEntry(op) });
       }
     }
     const tail = collected.slice(-limit).reverse();
-    return { items: model && titleOf ? tail.map((e) => enrichAudit(e, model, titleOf)) : tail, cursor: null };
+    return {
+      items: model && titleOf ? tail.map(({ entry, workorderId }) => enrichAudit(entry, model, titleOf, workorderId)) : tail.map(({ entry }) => entry),
+      cursor: null
+    };
   }
   if (source.engineStore) {
     const records = await source.engineStore.transaction((tx) => tx.listEvents(void 0, fromSeq));
     for (const rec of records) {
       const ev = rec.event;
       if (!match(rec.actorId, ev.kind, rec.createdAt)) continue;
-      push2(eventToAuditEntry(rec), String(rec.seq));
+      push2(eventToAuditEntry(rec), String(rec.seq), rec.workorderId);
       if (items.length >= limit) {
         truncated = true;
         break;
@@ -227752,6 +228407,30 @@ var init_audit = __esm({
       "workorder.paused": "\u6682\u505C\u6D3E\u53D1",
       "workorder.resumed": "\u6062\u590D\u6D3E\u53D1",
       "workorder.sealed": "\u5C01\u5B58",
+      // 其余新引擎事件 kind——缺标签时 summary 直接露英文 kind（生产实测：`plan.changed` 是量最大的
+      // 一类审计条目，界面上就写着「plan.changed」）。这张表按 EngineEvent 的 kind 全集补齐。
+      "plan.changed": "\u6539\u4EFB\u52A1\u56FE",
+      "plan.add_edge": "\u63A5\u4F9D\u8D56",
+      "plan.delete_edge": "\u65AD\u4F9D\u8D56",
+      "plan.update_review_requirements": "\u6539\u8BC4\u5BA1\u8981\u6C42",
+      "plan.update_fields": "\u6539\u5B57\u6BB5",
+      "work.started": "\u5F00\u5DE5",
+      "work.redispatch": "\u91CD\u6D3E",
+      "work.snapshot_recorded": "\u5B58\u5FEB\u7167",
+      "work.handoff_recorded": "\u8BB0\u4EA4\u63A5",
+      "work.reject": "\u6253\u56DE",
+      "work.content_edited": "\u6539\u5185\u5BB9",
+      "work.conclude": "\u5B9A\u7A3F",
+      "node.latest_proposed.rebased": "\u6362\u57FA\u7EBF",
+      "review.started": "\u5F00\u59CB\u8BC4\u5BA1",
+      "review.kill": "\u64A4\u8BC4\u5BA1",
+      "review.timeout": "\u8BC4\u5BA1\u8D85\u65F6",
+      "issue.resolution_proposed": "\u63D0\u89E3\u51B3\u65B9\u6848",
+      "issue.resolution_rejected": "\u9A73\u56DE\u89E3\u51B3\u65B9\u6848",
+      "workorder.created": "\u5EFA\u5DE5\u5355",
+      "workorder.root_set": "\u5B9A\u6839\u8282\u70B9",
+      "workorder.meta_changed": "\u6539\u5DE5\u5355\u4FE1\u606F",
+      "workorder.ping": "\u5524\u9192",
       // 旧 op kind（oplog 回退路径）
       spawn_artifact: "\u5EFA\u4EA7\u7269",
       propose_revision: "\u63D0\u4FEE\u8BA2",
@@ -229337,7 +230016,15 @@ function collabDomain(opts) {
       }
       const text5 = raw;
       try {
+        const snap = await kernel.getStore().transaction((tx) => tx.loadWorkorder(ws));
+        if (snap?.workorder.dispatchPaused && !isHumanActor(req.auth.actor)) {
+          return { status: 403, body: { error: { code: "forbidden", message: "\u6682\u505C\u671F\u95F4\u5F55\u5165\u5DE5\u5355\u6B63\u6587\u4EC5\u9650\u4EBA\u7C7B\u64CD\u4F5C" } } };
+        }
         const contentRef = await blobs.put(new TextEncoder().encode(text5));
+        if (snap?.workorder.dispatchPaused) {
+          await kernel.recordPausedRevision({ artifactId: rootId, actor: req.auth.actor, contentRef, note: "\u7F16\u8F91\u5DE5\u5355\u9875\u5934\u6B63\u6587" });
+          return { status: 200, body: { overview: text5, concluded: false } };
+        }
         await kernel.proposeRevision({ artifactId: rootId, actor: req.auth.actor, contentRef, reason: "\u7F16\u8F91\u5DE5\u5355\u9875\u5934\u6B63\u6587" });
         await kernel.advanceQueue(rootId, req.auth.actor);
         const result = await kernel.conclude({ artifactId: rootId, actor: req.auth.actor, note: "\u7F16\u8F91\u5DE5\u5355\u9875\u5934\u6B63\u6587" });
@@ -229345,7 +230032,7 @@ function collabDomain(opts) {
       } catch (err) {
         if (err instanceof KernelError) {
           return {
-            status: 400,
+            status: err.code === "revision-conflict" ? 409 : 400,
             body: { error: { code: err.code ?? "kernel_error", message: err.message } }
           };
         }
@@ -232404,12 +233091,83 @@ function buildCommentThread(input) {
     bubbles
   };
 }
+function isReviewThreadSessionId(sessionId) {
+  return typeof sessionId === "string" && sessionId.startsWith(REVIEW_THREAD_SESSION_PREFIX);
+}
+function partiesOfReviewThreadSessionId(sessionId) {
+  if (!isReviewThreadSessionId(sessionId)) return null;
+  const parts = sessionId.slice(REVIEW_THREAD_SESSION_PREFIX.length).split("|");
+  return parts.length === 2 && parts[0] && parts[1] ? [parts[0], parts[1]] : null;
+}
+function buildReviewThread(input) {
+  const parties = partiesOfReviewThreadSessionId(input.sessionId);
+  if (!parties || !input.snap) return null;
+  const [a, b2] = parties;
+  const works = new Map(input.snap.works.map((w2) => [w2.id, w2]));
+  const rows = input.snap.reviews.filter((r) => {
+    const reviewee = works.get(r.targetWorkId)?.assigneeActorId;
+    if (!reviewee || reviewee === r.reviewerActorId) return false;
+    const pair = [r.reviewerActorId, reviewee].sort();
+    return pair[0] === a && pair[1] === b2;
+  });
+  if (rows.length === 0) return null;
+  const { ref: ref2 } = input;
+  const nameOf = (id) => ref2(id).name?.trim() || "\u2014";
+  const mention = (author) => nameOf(author === a ? b2 : a);
+  const bubble = (o) => ({
+    id: o.id,
+    at: o.at,
+    author: ref2(o.author),
+    text: `@${mention(o.author)} ${o.body}`,
+    issueId: o.issueId,
+    kind: o.kind
+  });
+  const bubbles = [];
+  for (const workId of new Set(rows.map((r) => r.targetWorkId))) {
+    const w2 = works.get(workId);
+    const body2 = w2?.conclusion?.trim();
+    if (!w2 || !body2) continue;
+    bubbles.push(bubble({
+      id: `${workId}:delivered`,
+      at: w2.endedAt || w2.createdAt,
+      author: w2.assigneeActorId,
+      body: body2,
+      issueId: workId,
+      kind: "raised"
+    }));
+  }
+  for (const r of rows) {
+    const note = r.note?.trim();
+    if (!note) continue;
+    const label = r.verdict === "request_changes" ? "\u5BA1\u6838\u4E0D\u901A\u8FC7" : "\u5BA1\u6838\u610F\u89C1";
+    bubbles.push(bubble({
+      id: `${r.id}:verdict`,
+      at: r.decidedAt || r.endedAt || r.createdAt,
+      author: r.reviewerActorId,
+      body: `${label}\uFF1A${note}`,
+      issueId: r.targetWorkId,
+      kind: "reply"
+    }));
+  }
+  if (bubbles.length === 0) return null;
+  bubbles.sort((x2, y) => x2.at.localeCompare(y.at) || x2.id.localeCompare(y.id));
+  const first = rows[0];
+  const revieweeId = works.get(first.targetWorkId).assigneeActorId;
+  return {
+    sessionId: input.sessionId,
+    workorderId: input.workorderId,
+    executor: ref2(revieweeId),
+    coordinator: ref2(first.reviewerActorId),
+    bubbles
+  };
+}
 var init_gap_thread = __esm({
   "../server/src/domains/collab/gap-thread.ts"() {
     "use strict";
     init_src();
     init_workorder_manager();
     init_src();
+    init_src();
   }
 });
 
@@ -233047,12 +233805,12 @@ function createChatSessionsDomain(opts) {
     router.get("/api/workorders/:workorderId/gap-thread", async (req) => {
       const workorderId = req.params["workorderId"];
       const sessionId = req.query.get("session") ?? "";
-      if (!isGapThreadSessionId(sessionId) && !isCommentThreadSessionId(sessionId)) {
+      if (!isGapThreadSessionId(sessionId) && !isCommentThreadSessionId(sessionId) && !isReviewThreadSessionId(sessionId)) {
         throw new ApiError(404, "NOT_FOUND", "thread not found");
       }
       const { snap, ref: ref2 } = await gapThreadInputsFor(req, workorderId);
       const nodeOwner = (nodeId) => snap?.nodes?.find((n) => String(n.id) === nodeId)?.assigneeActorId ?? snap?.workorder.ownerActorId;
-      const view = !snap ? null : isCommentThreadSessionId(sessionId) ? buildCommentThread({ workorderId, snap, ref: ref2, sessionId, nodeOwner }) : buildGapThread({ workorderId, snap, ref: ref2, sessionId });
+      const view = !snap ? null : isReviewThreadSessionId(sessionId) ? buildReviewThread({ workorderId, snap, ref: ref2, sessionId }) : isCommentThreadSessionId(sessionId) ? buildCommentThread({ workorderId, snap, ref: ref2, sessionId, nodeOwner }) : buildGapThread({ workorderId, snap, ref: ref2, sessionId });
       if (!view) throw new ApiError(404, "NOT_FOUND", "gap thread not found");
       return { status: 200, body: view };
     });
@@ -237267,6 +238025,11 @@ var init_daemon_adapter = __esm({
           clearTimeout(entry.ackTimer);
           entry.ackTimer = void 0;
         }
+        const reapTimer = this.sessionReapTimers.get(dispatchId);
+        if (reapTimer) {
+          clearTimeout(reapTimer);
+          this.sessionReapTimers.delete(dispatchId);
+        }
         entry.exited = info;
         for (const w2 of entry.appendWaiters.splice(0)) {
           clearTimeout(w2.timer);
@@ -237362,6 +238125,10 @@ var init_daemon_adapter = __esm({
         for (const [dispatchId, entry] of this.pending) {
           if (entry.nodeId !== daemonId || entry.exited || present.has(dispatchId)) continue;
           if (this.hub.hasSession?.(dispatchId)) continue;
+          if (this.sessionReapTimers.has(dispatchId)) {
+            this.log(`[dispatch-delivery] ${dispatchId}\uFF1A\u8282\u70B9 ${daemonId} \u7A7A\u5E93\u5B58\u4E0D\u8986\u76D6\u72EC\u7ACB\u4F1A\u8BDD\u65AD\u7EBF\u5BBD\u9650\uFF0C\u7ED3\u8BBA=unknown\uFF08\u4F9D\u636E\uFF1A\u6570\u636E\u9762\u66FE\u8FDE\u63A5\uFF0C\u7B49\u5F85\u91CD\u8FDE\u6216\u539F ${this.sessionReapGraceMs}ms \u671F\u9650\uFF09`);
+            continue;
+          }
           absent.push(dispatchId);
         }
         for (const dispatchId of absent) {
@@ -237394,8 +238161,7 @@ var init_daemon_adapter = __esm({
        */
       onSessionDown(dispatchId) {
         if (this.sessionReapTimers.has(dispatchId)) return;
-        const entry = this.pending.get(dispatchId);
-        if (!entry || entry.exited) return;
+        if (this.settledDispatchIds.has(dispatchId)) return;
         const timer = setTimeout(() => {
           this.sessionReapTimers.delete(dispatchId);
           const e = this.pending.get(dispatchId);
@@ -238731,6 +239497,7 @@ ${ctx.nodeFault}
           env: { ...prov?.env ?? {}, OASIS_STAGE: "1", ...workspace ? { OASIS_WORKSPACE: workspace } : {} },
           ...prov?.wrapperPaths && prov.wrapperPaths.length > 0 ? { wrapperPaths: prov.wrapperPaths } : {},
           ...prov?.requiredTools && prov.requiredTools.length > 0 ? { requiredTools: prov.requiredTools } : {},
+          ...prov?.requiredToolVersions && Object.keys(prov.requiredToolVersions).length > 0 ? { requiredToolVersions: prov.requiredToolVersions } : {},
           ...prov?.connectorCreds && prov.connectorCreds.length > 0 ? { connectorCreds: prov.connectorCreds } : {}
         };
         this.deps.log?.(`[coordinator] ${logMsg}`);
@@ -239291,6 +240058,7 @@ var init_postgres_registry = __esm({
         updated_at   timestamptz NOT NULL,
         PRIMARY KEY (actor_id, connector_id)
       )`);
+        await pool.query(`ALTER TABLE "${s2}".actor_connector_connections ADD COLUMN IF NOT EXISTS configured_by text`);
         await pool.query(`
       CREATE TABLE IF NOT EXISTS "${s2}".skill_catalog (
         id          text PRIMARY KEY,            -- slug
@@ -239678,10 +240446,11 @@ var init_postgres_registry = __esm({
       }
       async upsertActorConnectorConnection(c) {
         await this.pool.query(
-          `INSERT INTO ${this.s}.actor_connector_connections (actor_id, connector_id, enabled, updated_at)
-       VALUES ($1, $2, $3, $4)
-       ON CONFLICT (actor_id, connector_id) DO UPDATE SET enabled = $3, updated_at = $4`,
-          [c.actorId, c.connectorId, c.enabled, c.updatedAt]
+          `INSERT INTO ${this.s}.actor_connector_connections (actor_id, connector_id, enabled, updated_at, configured_by)
+       VALUES ($1, $2, $3, $4, $5)
+       ON CONFLICT (actor_id, connector_id) DO UPDATE SET enabled = $3, updated_at = $4,
+         configured_by = COALESCE($5, ${this.s}.actor_connector_connections.configured_by)`,
+          [c.actorId, c.connectorId, c.enabled, c.updatedAt, c.configuredBy ?? null]
         );
       }
       async listActorConnectorConnections(actorId) {
@@ -239693,7 +240462,8 @@ var init_postgres_registry = __esm({
           actorId: row.actor_id,
           connectorId: row.connector_id,
           enabled: row.enabled,
-          updatedAt: new Date(row.updated_at).toISOString()
+          updatedAt: new Date(row.updated_at).toISOString(),
+          ...row.configured_by ? { configuredBy: row.configured_by } : {}
         }));
       }
       async listAllActorConnectorConnections() {
@@ -239704,7 +240474,8 @@ var init_postgres_registry = __esm({
           actorId: row.actor_id,
           connectorId: row.connector_id,
           enabled: row.enabled,
-          updatedAt: new Date(row.updated_at).toISOString()
+          updatedAt: new Date(row.updated_at).toISOString(),
+          ...row.configured_by ? { configuredBy: row.configured_by } : {}
         }));
       }
       async deleteActorConnectorConnection(actorId, connectorId) {
@@ -246157,6 +246928,21 @@ var init_postgres_chat_sessions = __esm({
         );
         return r.rows.map(rowToMessage);
       }
+      /** 按本 schema 中的会话 + run 精确找轮，不能用 activeTurn：已取消的轮已不占 active slot。 */
+      async getTurnForRun(sessionId, runId) {
+        const r = await this.pool.query(
+          `SELECT id, status, completed_at, last_error FROM ${this.s}.chat_session_turns
+        WHERE chat_session_id = $1 AND assistant_run_id = $2 ORDER BY reserved_at DESC LIMIT 1`,
+          [sessionId, runId]
+        );
+        const row = r.rows[0];
+        return row ? {
+          id: row.id,
+          status: row.status,
+          completedAt: row.completed_at == null ? null : new Date(row.completed_at).toISOString(),
+          lastError: row.last_error ?? null
+        } : null;
+      }
       async getSession(id) {
         const r = await this.pool.query(`SELECT * FROM ${this.s}.chat_sessions WHERE id = $1`, [id]);
         return r.rows[0] ? rowToSession(r.rows[0]) : null;
@@ -254703,6 +255489,98 @@ var init_chat_builtin_skills = __esm({
   }
 });
 
+// ../server/src/governance/connector-tool-versions.ts
+function connectorToolVersionsFile(dataDir) {
+  return (0, import_node_path25.join)(dataDir, "connector-tools", "versions.json");
+}
+function registryBase() {
+  const raw = process.env["npm_config_registry"] || process.env["NPM_CONFIG_REGISTRY"] || "https://registry.npmjs.org";
+  return raw.replace(/\/+$/, "");
+}
+async function fetchLatestNpmVersion(pkg) {
+  try {
+    const url = `${registryBase()}/${pkg.split("/").map(encodeURIComponent).join("%2F")}/latest`;
+    const res = await fetch(url, { headers: { accept: "application/json" }, signal: AbortSignal.timeout(NPM_PROBE_TIMEOUT_MS) });
+    if (!res.ok) return null;
+    const v2 = (await res.json()).version;
+    return typeof v2 === "string" && v2 ? v2 : null;
+  } catch {
+    return null;
+  }
+}
+async function readRegisteredToolVersions(dataDir) {
+  try {
+    const raw = JSON.parse(await (0, import_promises14.readFile)(connectorToolVersionsFile(dataDir), "utf8"));
+    if (!raw || typeof raw !== "object") return {};
+    const out = {};
+    for (const [k2, v2] of Object.entries(raw)) {
+      if (typeof v2 === "string" && v2) out[k2] = v2;
+    }
+    return out;
+  } catch {
+    return {};
+  }
+}
+async function writeRegisteredToolVersions(dataDir, versions) {
+  const file = connectorToolVersionsFile(dataDir);
+  await (0, import_promises14.mkdir)((0, import_node_path25.join)(dataDir, "connector-tools"), { recursive: true });
+  const tmp = `${file}.${process.pid}.tmp`;
+  await (0, import_promises14.writeFile)(tmp, `${JSON.stringify(versions, null, 2)}
+`, "utf8");
+  await (0, import_promises14.rename)(tmp, file);
+}
+async function refreshConnectorToolVersions(opts) {
+  const fetchLatest = opts.fetchLatest ?? fetchLatestNpmVersion;
+  const log3 = opts.log ?? (() => {
+  });
+  const versions = await readRegisteredToolVersions(opts.dataDir);
+  const results = [];
+  let changed = false;
+  for (const [tool, pkg] of Object.entries(NPM_TOOL_PACKAGES)) {
+    const before = versions[tool];
+    const latest = await fetchLatest(pkg);
+    if (!latest) {
+      results.push({ tool, pkg, ...before ? { from: before, to: before } : {}, outcome: "unreachable" });
+      log3(`[connector-tools] ${pkg} \u95EE\u4E0D\u5230\u6700\u65B0\u7248\uFF0C\u6CBF\u7528\u767B\u8BB0\u7248\u672C ${before ?? "\uFF08\u65E0\uFF09"}`);
+      continue;
+    }
+    if (before === latest) {
+      results.push({ tool, pkg, from: before, to: latest, outcome: "unchanged" });
+      continue;
+    }
+    versions[tool] = latest;
+    changed = true;
+    results.push({ tool, pkg, ...before ? { from: before } : {}, to: latest, outcome: "updated" });
+    log3(`[connector-tools] ${pkg} \u767B\u8BB0\u7248\u672C ${before ?? "\uFF08\u65E0\uFF09"} \u2192 ${latest}`);
+  }
+  if (changed) {
+    try {
+      await writeRegisteredToolVersions(opts.dataDir, versions);
+    } catch (err) {
+      log3(`[connector-tools] \u767B\u8BB0\u7248\u672C\u843D\u76D8\u5931\u8D25\uFF08\u672C\u8FDB\u7A0B\u5185\u4ECD\u751F\u6548\uFF09\uFF1A${String(err)}`);
+    }
+  }
+  return { versions, results };
+}
+function pickToolVersions(registered, tools) {
+  const out = {};
+  for (const t of tools) {
+    const v2 = registered[t];
+    if (v2) out[t] = v2;
+  }
+  return out;
+}
+var import_promises14, import_node_path25, NPM_PROBE_TIMEOUT_MS;
+var init_connector_tool_versions = __esm({
+  "../server/src/governance/connector-tool-versions.ts"() {
+    "use strict";
+    import_promises14 = require("node:fs/promises");
+    import_node_path25 = require("node:path");
+    init_src8();
+    NPM_PROBE_TIMEOUT_MS = 3e3;
+  }
+});
+
 // ../server/src/design/board-watch.ts
 function decideBoardLetter(c, nowMs, quietMs) {
   if (c.hasOpenWatchLetter) return false;
@@ -255498,6 +256376,7 @@ var init_src11 = __esm({
     init_builtin_skills();
     init_chat_builtin_skills();
     init_connector_skills();
+    init_connector_tool_versions();
     init_board_watch();
     init_ephemeral_project();
     init_run_settlement();
@@ -256360,6 +257239,7 @@ function materializeBuiltins(builtins, runtimeKind, opts) {
 var CONNECTOR_SKILL_SOURCES = [
   { connectorId: "feishu", baseUrl: FEISHU_WELL_KNOWN_SKILLS_BASE }
 ];
+var registeredToolVersions = {};
 async function readAllConnectorSkills(dataDir) {
   const out = [];
   for (const src of CONNECTOR_SKILL_SOURCES) {
@@ -256391,11 +257271,18 @@ async function refreshConnectorSkillsNow(dataDir, apply) {
     }
   }
   if (out.length > 0) apply(out);
+  try {
+    const { versions } = await refreshConnectorToolVersions({ dataDir, log: (m2) => console.log(m2) });
+    registeredToolVersions = versions;
+  } catch (err) {
+    console.warn(`[serve] connector CLI \u767B\u8BB0\u7248\u672C\u5237\u65B0\u5931\u8D25\uFF0C\u6CBF\u7528\u4E0A\u4E00\u4EFD\uFF1A${String(err)}`);
+  }
   return results;
 }
 function refreshConnectorSkillsInBackground(dataDir, apply) {
   void refreshConnectorSkillsNow(dataDir, apply);
 }
+var CONNECTOR_SKILL_REFRESH_MS = 24 * 60 * 6e4;
 var SESSION_TOKEN_GRACE_MS = 15 * 6e4;
 function makeResumeRetryProxy(first, spawnFallback) {
   const relay = () => {
@@ -256589,6 +257476,8 @@ async function buildActorProvision(service, actorId, scope, onBrokerRefused) {
     env,
     wrapperPaths: [oasisWrapperScript(), ...provision.wrapperPaths],
     requiredTools: provision.requiredTools,
+    // 只挑本次真要用的那几个：job 里不塞无关工具的版本号。
+    requiredToolVersions: pickToolVersions(registeredToolVersions, provision.requiredTools),
     connectorCreds: provision.connectorCreds,
     cleanup: provision.cleanup
   };
@@ -256992,6 +257881,7 @@ async function startServe(opts) {
     if (!cid || cid === defaultCompanyId) return "";
     return ` [${cid}]`;
   };
+  const engineSchemaFor = (companyId) => companyId === defaultCompanyId ? defaultCompanySchema : companyEngineDirName(companyId);
   let getEngine = async () => {
     throw new Error("company engine router not initialized");
   };
@@ -257097,7 +257987,7 @@ async function startServe(opts) {
     if (seeded > 0) console.log(`[serve] \u6536\u4EF6\u7BB1\u5DF2\u8BFB\u6C34\u4F4D\uFF1A\u64AD\u79CD ${seeded} \u6761\u5386\u53F2\u4F1A\u8BDD\uFF08ADR-0086 \u9996\u6B21\u4E0A\u7EBF\uFF09`);
     nodeStore = await PostgresNodeStore.open(pgPool, sharedSchema);
     nodeTokens = await PostgresNodeTokenStore.open(pgPool, sharedSchema);
-    console.log(`[serve] \u4E8B\u5B9E/\u72B6\u6001\u4F53\u7CFB\uFF1APostgres \u9ED8\u8BA4\u516C\u53F8 schema=${defaultCompanySchema}\uFF08oplog / registry / blobs / artifacts / chat\uFF09\uFF1B\u5171\u4EAB\u63A7\u5236\u9762 schema=${sharedSchema}\uFF08companies / nodes / model_prices / tenant_storage_*\uFF09`);
+    console.log(`[serve] \u4E8B\u5B9E/\u72B6\u6001\u4F53\u7CFB\uFF1APostgres \u9ED8\u8BA4\u516C\u53F8 schema=${defaultCompanySchema}\uFF08oplog / registry / blobs / artifacts / chat\uFF09\uFF1B\u5171\u4EAB\u63A7\u5236\u9762 schema=${sharedSchema}\uFF08companies / nodes / model_prices / tenant_storage_*\uFF09\uFF1Bchat \u6062\u590D/\u8BA4\u9886/\u6E05\u626B\uFF1A\u6309 active \u516C\u53F8\u9010\u5BB6\u6247\u51FA\uFF08\u9ED8\u8BA4\u516C\u53F8\u4F18\u5148\uFF09\uFF0C\u6BCF\u6B21\u5224\u5B9A\u7684\u516C\u53F8\u4E0E\u4F9D\u636E\u89C1 [chat-claim] / [chat-recovery] \u884C`);
   } else {
     projectStateStore = await FileProjectStateStore.open(path29.join(opts.dir, "artifact-document-projects.json"));
     artifactStateStore = await FileArtifactStateStore.open(path29.join(opts.dir, "artifact-document-state.json"));
@@ -257108,7 +257998,6 @@ async function startServe(opts) {
     console.log("[serve] \u8282\u70B9/\u8FD0\u884C\u65F6\u4F53\u7CFB\uFF1A\u672C\u5730 JSON dev store");
   }
   const chatRecoveryStore = platformChatRecovery ?? chatSessionStore;
-  const chatRecoveryItems = pgPool ? await PostgresChatItemStore.open(pgPool, defaultCompanySchema) : void 0;
   const knowledgeConfigStore = await FileKnowledgeConfigStore.open(path29.join(opts.dir, "knowledge.json"));
   const knowledgeRunStore = await FileKnowledgeRunStore.open(path29.join(opts.dir, "knowledge-runs.json"));
   const knowledgeDeploymentId = await loadOrCreateKnowledgeDeploymentId(path29.join(opts.dir, "knowledge-deployment-id"));
@@ -257777,10 +258666,17 @@ async function startServe(opts) {
   });
   console.log(`[serve] loaded ${builtinSkills.length} builtin skill(s): ${builtinSkills.map((s2) => s2.id).join(", ") || "(none)"}`);
   connectorSkills = await readAllConnectorSkills(opts.dir);
+  registeredToolVersions = await readRegisteredToolVersions(opts.dir);
   console.log(`[serve] connector skills\uFF08\u843D\u76D8\u526F\u672C\uFF09\uFF1A${connectorSkills.length} \u4E2A`);
   refreshConnectorSkillsInBackground(opts.dir, (s2) => {
     connectorSkills = s2;
   });
+  const connectorSkillTimer = setInterval(() => {
+    refreshConnectorSkillsInBackground(opts.dir, (s2) => {
+      connectorSkills = s2;
+    });
+  }, CONNECTOR_SKILL_REFRESH_MS);
+  connectorSkillTimer.unref?.();
   if (defaultCompanyMigration.createdCompany) {
     const seededAt = (/* @__PURE__ */ new Date()).toISOString();
     for (const devActor of ["actor:human:yx"]) {
@@ -257813,7 +258709,7 @@ async function startServe(opts) {
           id: c.id,
           // 默认公司的引擎表仍在共享 schema（ADR 0164 §D5 的 RP0，搬迁另立单）——这条映射
           // 搞错，默认公司的工单会一张都对不上，回填会把它们全判成「无证据」。
-          engineSchema: c.id === defaultCompanyId ? defaultCompanySchema : companyEngineDirName(c.id)
+          engineSchema: engineSchemaFor(c.id)
         }));
         const res = await backfillTenancyColumns(tenancyPool, { schema: defaultCompanySchema, companies: companies2, apply: true });
         const wrote = res.rows.reduce((n, r) => n + r.updated, 0);
@@ -257988,28 +258884,28 @@ async function startServe(opts) {
         const assistants2 = await PostgresAssistantBindStore.open(pgPool, loc.schemaName, { companyId });
         const humanPrefs2 = await PostgresHumanPrefsStore.open(pgPool, loc.schemaName);
         const ownedReadMarkers2 = await PostgresReadMarkerStore.open(pgPool, loc.schemaName, {
-          chatSessionsSchema: companyId === defaultCompanyId ? defaultCompanySchema : companyEngineDirName(companyId)
+          chatSessionsSchema: engineSchemaFor(companyId)
         });
         const ownedMemory2 = await PostgresActorMemoryStore.open(pgPool, loc.schemaName);
         const ownedDrafts2 = await PostgresWorkorderDraftStore.open(
           pgPool,
-          companyId === defaultCompanyId ? defaultCompanySchema : companyEngineDirName(companyId)
+          engineSchemaFor(companyId)
         );
         const ownedPlannerIssues2 = await PostgresWorkorderDraftPlannerIssuesStore.open(
           pgPool,
-          companyId === defaultCompanyId ? defaultCompanySchema : companyEngineDirName(companyId)
+          engineSchemaFor(companyId)
         );
         const ownedLedger2 = await PostgresDispatchStore.open(
           pgPool,
-          companyId === defaultCompanyId ? defaultCompanySchema : companyEngineDirName(companyId)
+          engineSchemaFor(companyId)
         );
         const ownedBlobs2 = await PostgresBlobStore.open(
           pgPool,
-          companyId === defaultCompanyId ? defaultCompanySchema : companyEngineDirName(companyId)
+          engineSchemaFor(companyId)
         );
         const ownedTrace2 = await PostgresTraceStore.open(
           tracePool,
-          companyId === defaultCompanyId ? defaultCompanySchema : companyEngineDirName(companyId)
+          engineSchemaFor(companyId)
         );
         return { owned: owned2, ownedOrgRegistry: ownedOrgRegistry2, types: types3, assistants: assistants2, humanPrefs: humanPrefs2, ownedReadMarkers: ownedReadMarkers2, ownedMemory: ownedMemory2, ownedDrafts: ownedDrafts2, ownedPlannerIssues: ownedPlannerIssues2, ownedLedger: ownedLedger2, ownedBlobs: ownedBlobs2, ownedTrace: ownedTrace2 };
       }
@@ -258265,7 +259161,7 @@ async function startServe(opts) {
     const id = companyId ?? defaultCompanyId;
     const hit = delegationStores.get(id);
     if (hit) return hit;
-    const schemaFor = id === defaultCompanyId ? defaultCompanySchema : companyEngineDirName(id);
+    const schemaFor = engineSchemaFor(id);
     const store = pgPool ? await PostgresDelegationStore.open(pgPool, schemaFor) : await FileDelegationStore.open(path29.join(opts.dir, `delegations-${companyEngineDirName(id)}.json`));
     delegationStores.set(id, store);
     return store;
@@ -258516,7 +259412,7 @@ async function startServe(opts) {
   const knowledgeGovernanceStoreFor = (companyId) => {
     const cached3 = knowledgeGovernanceStores.get(companyId);
     if (cached3) return cached3;
-    const knowledgeSchema = companyId === defaultCompanyId ? defaultCompanySchema : companyEngineDirName(companyId);
+    const knowledgeSchema = engineSchemaFor(companyId);
     const opened = pgDsn && pgPool ? withSchemaDdlLock(pgPool, knowledgeSchema, () => PostgresKnowledgeGovernanceStore.open(pgPool, knowledgeSchema, knowledgeSnapshotKey)) : FileKnowledgeGovernanceStore.open(path29.join(
       opts.dir,
       companyId === defaultCompanyId ? "knowledge-governance.json" : path29.join("companies", companyEngineDirName(companyId), "knowledge-governance.json")
@@ -258650,6 +259546,7 @@ async function startServe(opts) {
         env: provision.env,
         wrapperPaths: provision.wrapperPaths,
         ...provision.requiredTools.length > 0 ? { requiredTools: provision.requiredTools } : {},
+        ...Object.keys(provision.requiredToolVersions).length > 0 ? { requiredToolVersions: provision.requiredToolVersions } : {},
         ...provision.connectorCreds.length > 0 ? { connectorCreds: provision.connectorCreds } : {}
       });
       const chunks = [];
@@ -259635,7 +260532,7 @@ async function startServe(opts) {
             console.warn(`[trace] chat run ${traceRunId} \u7EED\u8D26\u5F02\u5E38: ${String(err)}`);
           });
         };
-        const provision = isolatedKnowledgeTurn ? { env: {}, wrapperPaths: [], requiredTools: [], connectorCreds: [], cleanup: async () => void 0 } : await buildActorProvision(actorService, actorId);
+        const provision = isolatedKnowledgeTurn ? { env: {}, wrapperPaths: [], requiredTools: [], requiredToolVersions: {}, connectorCreds: [], cleanup: async () => void 0 } : await buildActorProvision(actorService, actorId);
         const actorCtx = await buildActorContext(actorService, actorId).catch(() => null);
         const chatResolvedModel = sessionModelOverride ?? actorCtx?.config?.model ?? void 0;
         const chatModel = chatResolvedModel ?? await registryStore.getRuntimeConfig(`runtime:${binding.nodeId}:${binding.runtimeKind}`).then((c) => c?.model).catch(() => void 0) ?? void 0;
@@ -259775,6 +260672,7 @@ async function startServe(opts) {
           },
           wrapperPaths: provision.wrapperPaths,
           ...provision.requiredTools.length > 0 ? { requiredTools: provision.requiredTools } : {},
+          ...Object.keys(provision.requiredToolVersions).length > 0 ? { requiredToolVersions: provision.requiredToolVersions } : {},
           ...provision.connectorCreds.length > 0 ? { connectorCreds: provision.connectorCreds } : {},
           ...requiredConnectors.length > 0 ? { requiredConnectorSlugs: requiredConnectors } : {}
         });
@@ -259991,60 +260889,101 @@ async function startServe(opts) {
     });
   };
   {
-    const listRunningChatRows = chatRecoveryStore.listRunningAssistantMessages?.bind(chatRecoveryStore);
-    if (listRunningChatRows) {
+    const defaultListRunningChatRows = chatRecoveryStore.listRunningAssistantMessages?.bind(chatRecoveryStore);
+    if (defaultListRunningChatRows) {
+      const chatRecoveryCompanies = async () => {
+        if (!chatStoreRouter) return [void 0];
+        const active = (await controlPlaneStore.listCompanies()).filter((c) => c.status === "active").map((c) => c.id);
+        return [defaultCompanyId, ...active.filter((id) => id !== defaultCompanyId)];
+      };
+      const chatRecoveryPlanes = /* @__PURE__ */ new Map();
+      const chatRecoveryFor = async (companyId) => {
+        if (!pgPool || !platformChatRecovery) {
+          return { listRunningAssistantMessages: defaultListRunningChatRows, chatStore: chatSessionStore };
+        }
+        const id = companyId ?? defaultCompanyId;
+        const hit = chatRecoveryPlanes.get(id);
+        if (hit) return hit;
+        const sessions = id === defaultCompanyId ? platformChatRecovery : PlatformChatRecoveryStore.open(pgPool, engineSchemaFor(id));
+        const items = await chatItemsFor(id);
+        const plane = {
+          listRunningAssistantMessages: () => sessions.listRunningAssistantMessages(),
+          chatStore: sessions,
+          getTurnForRun: (sid, rid) => sessions.getTurnForRun(sid, rid),
+          ...items ? { items } : {}
+        };
+        chatRecoveryPlanes.set(id, plane);
+        return plane;
+      };
+      const chatRecoveryLastError = /* @__PURE__ */ new Map();
+      const chatRecoveryCompanyWarn = (label) => (companyId, err) => {
+        const key = `${label}::${companyId ?? "<default>"}`;
+        const msg = String(err);
+        if (chatRecoveryLastError.get(key) === msg) return;
+        chatRecoveryLastError.set(key, msg);
+        console.warn(`[chat-recovery] ${label}\uFF1A\u516C\u53F8 ${companyId ?? "<default>"} \u8FD9\u4E00\u8F6E\u5931\u8D25\uFF08\u5176\u4F59\u516C\u53F8\u7EE7\u7EED\uFF09\uFF1A${msg}`);
+      };
       let chatRecoveryChain = Promise.resolve();
       const enqueueChatRecovery = (label, step) => {
         chatRecoveryChain = chatRecoveryChain.then(step).catch((err) => console.error(`[chat-recovery] ${label}\u5931\u8D25: ${String(err)}`));
       };
-      const recoverChatTurns = async (daemonId, activeSessions) => {
-        if (!chatRemoteAdapter) return;
-        const plans = await planChatTurnRecovery({
-          activeSessions,
-          listRunningAssistantMessages: listRunningChatRows,
-          getRun: (id) => fanOutTrace.getRun(id),
-          isWired: (artifactId) => chatLiveSessions.has(`chat::${artifactId}`)
-        });
-        for (const plan of plans) {
-          const handle = chatRemoteAdapter.recover(plan.dispatchId, daemonId, plan.runtimeKind, plan.actor);
-          const jobKey = `chat::${plan.artifactId}`;
-          const itemsTurnId = chatRecoveryItems ? await resolveChatItemsTurnId(chatRecoveryItems, plan.assistantMsgId, fallbackTurnId(plan.runId)) : fallbackTurnId(plan.runId);
-          wireRecoveredChatTurn({
-            plan,
-            handle,
-            liveChat,
-            chatStore: chatRecoveryStore,
-            trace: runRoutedTrace,
-            register: () => chatLiveSessions.set(jobKey, {
-              artifactId: plan.artifactId,
-              sessionId: plan.runId,
-              dispatchId: plan.dispatchId,
-              kill: () => handle.kill()
-            }),
-            unregister: () => {
-              chatLiveSessions.delete(jobKey);
-            },
-            traceHealth,
-            ...chatRecoveryItems ? { items: chatRecoveryItems, itemsTurnId } : {},
-            log: (m2) => console.log(m2)
-          });
-          console.log(`[chat-recovery] \u91CD\u6302 chat \u8F6E\uFF1Asession=${plan.chatSessionId} run=${plan.runId} node=${daemonId}`);
-        }
-      };
+      const recoverChatTurns = async (daemonId, activeSessions, opts2) => recoverChatTurnsAcrossCompanies({
+        activeSessions,
+        listCompanies: chatRecoveryCompanies,
+        storesFor: chatRecoveryFor,
+        getRun: (id) => fanOutTrace.getRun(id),
+        isWired: (artifactId) => chatLiveSessions.has(`chat::${artifactId}`),
+        ...opts2.stopOnFirstHit ? { stopOnFirstHit: true } : {},
+        onCompanyError: chatRecoveryCompanyWarn(opts2.label),
+        liveChat,
+        trace: runRoutedTrace,
+        traceHealth,
+        recover: (plan) => chatRemoteAdapter.recover(plan.dispatchId, daemonId, plan.runtimeKind, plan.actor),
+        register: (plan, handle) => chatLiveSessions.set(`chat::${plan.artifactId}`, {
+          artifactId: plan.artifactId,
+          sessionId: plan.runId,
+          dispatchId: plan.dispatchId,
+          kill: () => handle.kill()
+        }),
+        unregister: (plan) => {
+          chatLiveSessions.delete(`chat::${plan.artifactId}`);
+        },
+        evict: (dispatchId) => {
+          if (!hub.evictSession(dispatchId, "reaped")) hub.dispatch(daemonId, { type: "kill", dispatchId });
+        },
+        log: (message) => console.log(message)
+      });
       hub.registerSessionClaimResolver?.(async (id) => {
         if (!id.jobArtifactId || !chatRemoteAdapter) return "unknown";
         const jobKey = `chat::${id.jobArtifactId}`;
-        if (chatLiveSessions.has(jobKey)) return "live";
+        if (chatLiveSessions.has(jobKey)) {
+          console.log(
+            `[chat-claim] dispatch=${id.dispatchId} artifact=${id.jobArtifactId} \u7ED3\u8BBA=live\uFF08\u4F9D\u636E\uFF1A\u672C\u8FDB\u7A0B\u5728\u9014\u8868\u91CC\u5DF2\u6709\u8FD9\u4E00\u8F6E\uFF0C\u65E0\u9700\u91CD\u6302\uFF09`
+          );
+          return "live";
+        }
+        let outcome;
         await new Promise((resolve10) => {
-          chatRecoveryChain = chatRecoveryChain.then(() => recoverChatTurns(id.nodeId, [
-            { dispatchId: id.dispatchId, sessionId: id.sessionId, jobArtifactId: id.jobArtifactId }
-          ])).catch((err) => {
+          chatRecoveryChain = chatRecoveryChain.then(async () => {
+            outcome = await recoverChatTurns(
+              id.nodeId,
+              [{ dispatchId: id.dispatchId, sessionId: id.sessionId, jobArtifactId: id.jobArtifactId }],
+              { label: "\u8BA4\u9886", stopOnFirstHit: true }
+            );
+          }).catch((err) => {
             console.error(`[chat-recovery] session_hello \u8BA4\u9886\u5931\u8D25: ${String(err)}`);
           }).then(() => {
             resolve10();
           });
         });
-        return chatLiveSessions.has(jobKey) ? "live" : "unknown";
+        if (outcome?.settled.some((hit2) => hit2.plan.dispatchId === id.dispatchId)) return "settled";
+        const live = chatLiveSessions.has(jobKey);
+        const hit = outcome?.recovered.find((r) => r.plan.artifactId === id.jobArtifactId);
+        const skipped = outcome?.skipped ?? [];
+        console.log(
+          `[chat-claim] dispatch=${id.dispatchId} artifact=${id.jobArtifactId} company=${hit ? hit.companyId ?? "<default>" : "-"} session=${hit?.plan.chatSessionId ?? "-"} run=${hit?.plan.runId ?? "-"} \u7ED3\u8BBA=${live ? "live" : "unknown"}\uFF08\u4F9D\u636E\uFF1A${live ? `\u5728\u8BE5\u516C\u53F8 schema \u91CC\u5BF9\u4E0A\u4E00\u6761 running assistant \u884C\u3001\u5176 run \u4ECD running\uFF0C\u5DF2\u91CD\u6302` : `\u626B\u8FC7 ${outcome?.scanned ?? 0} \u5BB6\u516C\u53F8\uFF0C\u65E0 running \u884C\u4E0E\u5B83\u5BF9\u4E0A` + (skipped.length ? `\uFF1B\u53E6\u6709 ${skipped.length} \u5BB6\u6CA1\u67E5\u6210\uFF08${skipped.map((x2) => x2.companyId ?? "<default>").join("\u3001")}\uFF09` : "")}\uFF09` + (live ? "" : "\u3002unknown \u53EA\u662F\u300C\u6211\u4E0D\u77E5\u9053\u300D\uFF0C\u5904\u7F6E\u4EA4\u51B7\u542F\u52A8\u5BBD\u9650\u90A3\u4E00\u7EA7")
+        );
+        return live ? "live" : "unknown";
       });
       hub.addMessageListener((daemonId, msg) => {
         if (msg.type !== "runtime_models") return;
@@ -260089,7 +261028,14 @@ async function startServe(opts) {
       });
       hub.addMessageListener((daemonId, msg) => {
         if (msg.type === "hello" && msg.meta.activeSessions?.length) {
-          enqueueChatRecovery("hello \u5BF9\u8D26", () => recoverChatTurns(daemonId, msg.meta.activeSessions));
+          enqueueChatRecovery("hello \u5BF9\u8D26", async () => {
+            const outcome = await recoverChatTurns(daemonId, msg.meta.activeSessions, { label: "hello \u5BF9\u8D26" });
+            if (outcome.recovered.length === 0 && outcome.skipped.length === 0) return;
+            const byCompany = outcome.recovered.map((r) => `${r.companyId ?? "<default>"}:${r.plan.chatSessionId}`).join("\u3001");
+            console.log(
+              `[chat-recovery] hello \u5BF9\u8D26\uFF1Anode=${daemonId} \u626B\u8FC7 ${outcome.scanned} \u5BB6\u516C\u53F8\uFF0C\u91CD\u6302 ${outcome.recovered.length} \u8F6E${byCompany ? `\uFF08${byCompany}\uFF09` : ""}` + (outcome.skipped.length ? `\uFF1B${outcome.skipped.length} \u5BB6\u6CA1\u67E5\u6210\uFF08${outcome.skipped.map((x2) => x2.companyId ?? "<default>").join("\u3001")}\uFF09` : "")
+            );
+          });
         } else if (msg.type === "session_started") {
           void ledgerForDispatch(msg.dispatchId).then((l) => l.markStarted(msg.dispatchId, { sessionRef: msg.sessionId, daemonId })).catch(ledgerWarn("markStarted"));
           const prodMapping = dispatchToWork.get(msg.dispatchId);
@@ -260135,16 +261081,16 @@ async function startServe(opts) {
           })).catch(ledgerWarn("close(exit)"));
           const dispatchOwnedAtReceipt = allDispatchers().some((d) => d.inFlightSessions().some((x2) => x2.sessionId === msg.dispatchId));
           enqueueChatRecovery("exit \u5BF9\u8D26", async () => {
-            const chatHandled = await reconcileChatExitFrame({
+            const chatHandled = await reconcileChatExitFrameAcrossCompanies({
               dispatchId: msg.dispatchId,
               info: msg.info,
               isOwned: (id) => [...chatLiveSessions.values()].some((c) => c.dispatchId === id),
               ownedRunId: (sid) => liveChat.runFor(sid),
-              listRunningAssistantMessages: listRunningChatRows,
               trace: runRoutedTrace,
-              chatStore: chatRecoveryStore,
+              listCompanies: chatRecoveryCompanies,
+              storesFor: chatRecoveryFor,
+              onCompanyError: chatRecoveryCompanyWarn("exit \u5BF9\u8D26"),
               drainStash: (id) => chatRemoteAdapter?.drainStash(id) ?? { frames: [] },
-              ...chatRecoveryItems ? { items: chatRecoveryItems } : {},
               log: (m2) => console.log(m2)
             });
             if (!chatHandled) {
@@ -260208,21 +261154,22 @@ async function startServe(opts) {
         }
       });
       const chatSweepTimer = setInterval(() => {
-        void sweepDanglingChatTurns({
-          listRunningAssistantMessages: listRunningChatRows,
+        void sweepDanglingChatTurnsAcrossCompanies({
+          listCompanies: chatRecoveryCompanies,
+          storesFor: chatRecoveryFor,
+          onCompanyError: chatRecoveryCompanyWarn("chat-sweep"),
           getRun: (id) => fanOutTrace.getRun(id),
           ownedRunId: (sid) => liveChat.runFor(sid),
-          listMessages: (sid) => chatRecoveryStore.listMessages(sid),
-          updateMessage: chatRecoveryStore.updateMessage.bind(chatRecoveryStore),
           now: Date.now(),
           // 提案 §6.2.9：委派台账**接进这一拍，不新写一套扫描**。
           // 这一拍闭合的是「run 已终态、assistant 行却还挂 running」的行；委派台账是同一类账，
           // 只是多一层——它还得回流。不接的话那条委派会永远显示「进行中」（刷新也不变），
           // 且「队列非空 ⇒ 不算完成」变成死锁：既看不到结果、也等不到失败。
-          // ⚠️ **必须带公司**：这一拍是进程级维护路径（跨公司扫本 schema 所有 running 行），
-          // 而委派台账按公司分 store。不带的话非默认公司那条委派会被拿去默认公司的库里查、
-          // 查不到、于是永远收敛不掉——症状是「刷新也不变的进行中」，且只在非默认公司出现。
-          // 反查那一步收在 `delegationSweepHook` 里（有它自己的测试），这里不再手写。
+          // ⚠️ **必须带公司**：委派台账按公司分 store，不带的话非默认公司那条委派会被拿去默认公司的
+          // 库里查、查不到、于是永远收敛不掉——症状是「刷新也不变的进行中」，且只在非默认公司出现。
+          // 扇出之后**公司是已知量**（这一行就是从那家的 schema 读出来的），由扇出层作为第四个参数
+          // 直接传给钩子，不再按会话反查一次——少一次点查，也少一条「读不到就按默认公司试一次」的
+          // 错误回落。回落那一跳仍收在 `delegationSweepHook` 里（dev 文件模式还需要它，有自己的测试）。
           onSessionClosed: delegationSweepHook({
             sessions: chatRecoveryStore,
             settle: (sid, reason, companyId) => server.settleDelegationFromSweep(sid, reason, companyId),
@@ -260251,6 +261198,20 @@ async function startServe(opts) {
       isOwned: (turn) => Boolean(turn.assistantRunId && liveChat.runFor(turn.chatSessionId) === turn.assistantRunId),
       now: Date.now(),
       noRunGraceMs: chatTurnOrphanGraceMs,
+      /* 轮次被判死之后把委派台账也收敛掉（2026-09-09 生产事故的第二道口子）。
+         此前只有 `sweepDanglingChatTurns` 那一拍挂了委派钩子，而它要先拿 assistant 行的 `run_id`
+         去查 run —— 子会话占位行的 `run_id` 一直是空的，那一拍整条跳过、钩子一次没调用：
+         三条委派的轮次 12:27–12:35 就 failed 了，台账到 13:10 还是 running，父会话永远"处理中"。
+         本拍是从轮次账本走的（`assistant_run_id` 一直有值），是"这一轮死没死"的权威来源。
+         `companyId` 由扇出那层填好 —— 台账按公司分 store，少了它会查到默认公司的库。
+         非委派会话调进去是空转：`settleFromSweep` 按 childSessionId 查不到记录就原样返回。 */
+      onTurnSettled: async ({ chatSessionId, status, reason, companyId }) => {
+        await server.settleDelegationFromSweep(
+          chatSessionId,
+          `\u5B50\u4F1A\u8BDD\u8FD9\u4E00\u8F6E\u88AB\u6062\u590D\u5668\u6536\u53E3\u4E3A ${status}\uFF08${reason}\uFF09`,
+          companyId
+        );
+      },
       log: (m2) => console.log(m2),
       onCompanyError: (companyId, err) => {
         const key = companyId ?? "<default>";
@@ -260724,14 +261685,22 @@ async function startServe(opts) {
               //（activate.ts：`latestAcceptId == null && !lastProposedRejected`），本模块拿不到，
               // 而两个方向的代价不对称——该续没续只是少一点上下文，不该续却续了就把返工要隔离的
               // 旧会话又接了回来。何况这条 work 从来没跑过，本就没有属于它的会话可续。
-              redispatch: (workId, workorderId) => engineIO.dispatchWork(workId, { workorderId, resumeEligible: false }),
+              // 补派进入同一工单事件队列：与 pause 的 apply/effect 串行，不能在检查后绕到 IO 直派。
+              redispatch: async (workId, workorderId) => {
+                await newKernel.getBus().submit({
+                  companyId,
+                  workorderId,
+                  actorId: SYSTEM_ACTOR2,
+                  event: { kind: "work.redispatch", workorderId, workId }
+                });
+              },
               now: Date.now(),
               graceMs: DISPATCH_DROP_GRACE_MS,
               backoffMs: DISPATCH_DROP_BACKOFF_MS,
               maxPerTick: DISPATCH_DROP_MAX_PER_TICK
             }).then((r) => {
               if (r.redispatched.length > 0) {
-                console.warn(`[dispatch-drop] \u8865\u6D3E ${r.redispatched.length} \u6761\u4ECE\u672A\u5F00\u5DE5\u7684 work\uFF1A${r.redispatched.join(", ")}`);
+                console.warn(`[dispatch-drop] \u5DF2\u8BF7\u6C42\u8865\u6D3E ${r.redispatched.length} \u6761\u4ECE\u672A\u5F00\u5DE5\u7684 work\uFF1A${r.redispatched.join(", ")}`);
               }
             }).catch((err) => console.error(`[dispatch-drop] tick \u5931\u8D25: ${String(err)}`));
           }, DISPATCH_DROP_SWEEP_TICK_MS);
@@ -262325,6 +263294,7 @@ ${nodeFault}` : "");
       if (gitTimer) clearInterval(gitTimer);
       if (coordTimer) clearInterval(coordTimer);
       if (livenessTimer) clearInterval(livenessTimer);
+      clearInterval(connectorSkillTimer);
       if (orphanSweepTimer) clearInterval(orphanSweepTimer);
       for (const t of dropSweepTimers) clearInterval(t);
       if (deadlineClockTimer) clearInterval(deadlineClockTimer);
@@ -262523,7 +263493,7 @@ async function runSession(dispatchId, job, deps) {
       }
     }
     if (job.requiredTools?.length) {
-      const missing = await ensureConnectorTools(job.requiredTools);
+      const missing = await ensureConnectorTools(job.requiredTools, { versions: job.requiredToolVersions });
       if (missing.length) log2("[node-cli]", `  connector tools still missing (agent may fail): ${missing.join(", ")}`);
     }
     const prepared = await prepareConnectorsForJob(job);
@@ -262832,17 +263802,19 @@ var SessionProcessState = class {
       }
       let done = false;
       const finish = () => {
-        if (!done) {
-          done = true;
-          resolve10();
-        }
+        if (done) return;
+        done = true;
+        clearTimeout(timer);
+        this.exitAckResolve = null;
+        resolve10();
       };
+      const timer = setTimeout(finish, EXIT_ACK_WAIT_MS);
       this.exitAckResolve = finish;
-      setTimeout(finish, EXIT_ACK_WAIT_MS).unref?.();
     });
   }
   teardown() {
     this.stopping = true;
+    this.exitAckResolve?.();
     if (this.watchdog) {
       clearInterval(this.watchdog);
       this.watchdog = null;
@@ -262924,7 +263896,7 @@ function detectRuntimes() {
 
 // ../cli/src/daemon/workdir-handler.ts
 var import_node_fs19 = __toESM(require("node:fs"), 1);
-var import_node_path25 = __toESM(require("node:path"), 1);
+var import_node_path26 = __toESM(require("node:path"), 1);
 init_src6();
 init_src();
 var WORKDIR_READ_MAX_BYTES2 = 2 * 1024 * 1024;
@@ -262943,10 +263915,10 @@ function isSensitiveSegment(segment) {
 }
 function relPathIsSensitive(rel) {
   if (!rel) return false;
-  return rel.split(import_node_path25.default.sep).some((seg) => seg.length > 0 && isSensitiveSegment(seg));
+  return rel.split(import_node_path26.default.sep).some((seg) => seg.length > 0 && isSensitiveSegment(seg));
 }
 function withinBase(p2, base) {
-  return p2 === base || p2.startsWith(base + import_node_path25.default.sep);
+  return p2 === base || p2.startsWith(base + import_node_path26.default.sep);
 }
 function normalizeRel(raw) {
   const trimmed = (raw ?? "").trim();
@@ -262963,7 +263935,7 @@ async function trustedCanonicalContainer(req, logicalBase, dirKind) {
   } catch {
     return null;
   }
-  return isLegacy ? import_node_path25.default.join(trustedRootReal, "oasis-chat-sessions") : import_node_path25.default.join(trustedRootReal, "sessions", dirKind);
+  return isLegacy ? import_node_path26.default.join(trustedRootReal, "oasis-chat-sessions") : import_node_path26.default.join(trustedRootReal, "sessions", dirKind);
 }
 async function resolveWithinWorkdir(req) {
   const dirKind = sessionDirKind(req.runtimeKind);
@@ -262981,11 +263953,11 @@ async function resolveWithinWorkdir(req) {
   } catch {
     return { ok: false, code: "NOT_FOUND" };
   }
-  if (import_node_path25.default.dirname(base) !== canonicalContainer) return { ok: false, code: "PATH_ESCAPE" };
+  if (import_node_path26.default.dirname(base) !== canonicalContainer) return { ok: false, code: "PATH_ESCAPE" };
   const rel = normalizeRel(req.path);
-  const requested = import_node_path25.default.resolve(base, rel);
+  const requested = import_node_path26.default.resolve(base, rel);
   if (!withinBase(requested, base)) return { ok: false, code: "PATH_ESCAPE" };
-  const cleanRel = base === requested ? "" : import_node_path25.default.relative(base, requested);
+  const cleanRel = base === requested ? "" : import_node_path26.default.relative(base, requested);
   if (relPathIsSensitive(cleanRel)) return { ok: false, code: "SENSITIVE" };
   let real;
   try {
@@ -262995,7 +263967,7 @@ async function resolveWithinWorkdir(req) {
     return { ok: false, code: "PATH_ESCAPE" };
   }
   if (!withinBase(real, base)) return { ok: false, code: "PATH_ESCAPE" };
-  const realRel = base === real ? "" : import_node_path25.default.relative(base, real);
+  const realRel = base === real ? "" : import_node_path26.default.relative(base, real);
   if (relPathIsSensitive(realRel)) return { ok: false, code: "SENSITIVE" };
   return { ok: true, base, real };
 }
@@ -263031,7 +264003,7 @@ async function handleWorkdirList(req) {
       const slice = truncated ? visible.slice(0, WORKDIR_LIST_MAX_ENTRIES) : visible;
       const entries = [];
       for (const d of slice) {
-        const abs = import_node_path25.default.join(anchor, d.name);
+        const abs = import_node_path26.default.join(anchor, d.name);
         try {
           const st = await import_node_fs19.default.promises.lstat(abs);
           if (st.isSymbolicLink()) continue;
@@ -263063,7 +264035,7 @@ async function verifyOpenedFd(fh, base, fallback) {
   const fdReal = await fdCanonicalPath(fh);
   if (fdReal === null) return { anchor: fallback };
   if (!withinBase(fdReal, base)) return { error: { ok: false, code: "PATH_ESCAPE" } };
-  const fdRel = base === fdReal ? "" : import_node_path25.default.relative(base, fdReal);
+  const fdRel = base === fdReal ? "" : import_node_path26.default.relative(base, fdReal);
   if (relPathIsSensitive(fdRel)) return { error: { ok: false, code: "SENSITIVE" } };
   return { anchor: `/proc/self/fd/${fh.fd}` };
 }
@@ -263152,7 +264124,7 @@ function looksBinary(bytes2) {
 function contentTypeFor(absPath, bytes2) {
   const sniffed = sniffContentType(bytes2);
   if (sniffed) return sniffed;
-  const ext = import_node_path25.default.extname(absPath).toLowerCase();
+  const ext = import_node_path26.default.extname(absPath).toLowerCase();
   if (EXT_CONTENT_TYPE[ext]) return EXT_CONTENT_TYPE[ext];
   return looksBinary(bytes2) ? "application/octet-stream" : "text/plain; charset=utf-8";
 }
@@ -263748,17 +264720,17 @@ var RuntimeRouterAdapter = class {
 // ../cli/src/daemon/reap-claude-projects.ts
 var import_node_fs20 = __toESM(require("node:fs"), 1);
 var import_node_os10 = __toESM(require("node:os"), 1);
-var import_node_path26 = __toESM(require("node:path"), 1);
+var import_node_path27 = __toESM(require("node:path"), 1);
 function claudeProjectSlug(cwd) {
   return cwd.replace(/[^a-zA-Z0-9]/g, "-");
 }
 function claudeProjectsRoot() {
-  const configDir = process.env["CLAUDE_CONFIG_DIR"] || import_node_path26.default.join(import_node_os10.default.homedir(), ".claude");
-  return import_node_path26.default.join(configDir, "projects");
+  const configDir = process.env["CLAUDE_CONFIG_DIR"] || import_node_path27.default.join(import_node_os10.default.homedir(), ".claude");
+  return import_node_path27.default.join(configDir, "projects");
 }
 function reapClaudeProjects(workdir, runtimeKind) {
   if (runtimeKind !== "claude" && runtimeKind !== "claude-code") return;
-  const dir = import_node_path26.default.join(claudeProjectsRoot(), claudeProjectSlug(workdir));
+  const dir = import_node_path27.default.join(claudeProjectsRoot(), claudeProjectSlug(workdir));
   if (!import_node_fs20.default.existsSync(dir)) return;
   try {
     import_node_fs20.default.rmSync(dir, { recursive: true, force: true });
@@ -263767,7 +264739,7 @@ function reapClaudeProjects(workdir, runtimeKind) {
 }
 function measureClaudeProjects(workdir, runtimeKind) {
   if (runtimeKind !== "claude" && runtimeKind !== "claude-code") return 0;
-  const dir = import_node_path26.default.join(claudeProjectsRoot(), claudeProjectSlug(workdir));
+  const dir = import_node_path27.default.join(claudeProjectsRoot(), claudeProjectSlug(workdir));
   return dirSizeBytes2(dir);
 }
 function dirSizeBytes2(dir) {
@@ -263779,7 +264751,7 @@ function dirSizeBytes2(dir) {
     return 0;
   }
   for (const e of entries) {
-    const p2 = import_node_path26.default.join(dir, e.name);
+    const p2 = import_node_path27.default.join(dir, e.name);
     if (e.isSymbolicLink()) continue;
     if (e.isDirectory()) {
       total += dirSizeBytes2(p2);
@@ -266190,7 +267162,7 @@ function fieldsFromFlags(flags, ownFlags) {
   }
   return Object.keys(fields).length > 0 ? fields : void 0;
 }
-function buildStageOp(cmd, flags, positional, readFile8 = (file) => fs39.readFileSync(file, "utf8")) {
+function buildStageOp(cmd, flags, positional, readFile9 = (file) => fs39.readFileSync(file, "utf8")) {
   switch (cmd) {
     case "link":
       return {
@@ -266212,7 +267184,7 @@ function buildStageOp(cmd, flags, positional, readFile8 = (file) => fs39.readFil
         ...flags.get("title") !== void 0 ? { title: flags.get("title") } : {},
         ...(flags.get("brief") ?? flags.get("description")) !== void 0 ? { description: flags.get("brief") ?? flags.get("description") } : {},
         ...flags.get("input") !== void 0 ? { inputs: flags.get("input").split(",").map((to) => ({ to: to.trim() })) } : {},
-        ...partsFile !== void 0 ? { parts: JSON.parse(readFile8(partsFile)) } : {},
+        ...partsFile !== void 0 ? { parts: JSON.parse(readFile9(partsFile)) } : {},
         ...fields !== void 0 ? { fields } : {}
       };
     }
@@ -269579,7 +270551,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.6" : "dev";
+var PKG_VERSION = true ? "2.2.8" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;