oasis_test_v2 2.2.17 → 2.2.18

package/dist/index.js

@@ -5737,6 +5737,26 @@ CREATE TABLE IF NOT EXISTS ${q2}.event_handler_log (
   PRIMARY KEY (event_seq, handler_name)
 );
 
+-- \u5F85\u4EBA\u786E\u8BA4\u7684 intervention \u8349\u6848\u5361\uFF08\u547D\u4EE4\u6388\u6743\u5361 / \u6539\u56FE\u5361\uFF09\u3002
+--
+-- \u4E3A\u4EC0\u4E48\u8981\u843D\u5E93\uFF082026-09-11 \u5B9E\u5F55\uFF09\uFF1A\u65E7\u5F15\u64CE\u628A\u8D77\u8349\u8BB0\u6210\u4E00\u6761 propose_intervention op \u8FDB oplog\uFF0C
+-- \u91CD\u542F replay \u5C31 fold \u56DE pendingReviews\uFF1B\u51B3\u7B56 0130 \u9000\u5F79 oplog \u65F6\u8FD9\u4E00\u6BB5\u53EA\u642C\u4E86\u5185\u5B58 Map\uFF0C
+-- \u6CE8\u91CA\u8FD8\u5199\u7740\u300C\u77ED\u751F\u547D\u5468\u671F\u3001\u91CD\u542F\u4E22\u53EF\u63A5\u53D7\u300D\u3002\u4F46\u8FD9\u5F20\u5361\u7684\u8BED\u4E49\u662F**\u7B49\u4E00\u4E2A\u771F\u4EBA\u6765\u70B9**\uFF0C\u5BFF\u547D\u7531\u4EBA\u51B3\u5B9A\uFF0C
+-- \u4E0D\u7531\u8FDB\u7A0B\u51B3\u5B9A\u3002v2 \u4E0A 31 \u5C0F\u65F6\u91CD\u542F\u4E86 158 \u6B21\uFF08\u22485 \u6B21/\u5C0F\u65F6\uFF09\uFF0C\u5B9E\u6D4B\u4E00\u5F20\u5361\u8D77\u8349 24 \u79D2\u540E\u5C31\u88AB\u91CD\u542F\u62B9\u6389\uFF0C
+-- \u534F\u8C03\u8005\u5374\u4ECD\u5728\u5BF9\u8BDD\u91CC\u8BA9\u4EBA\u300C\u53BB\u6536\u4EF6\u7BB1\u627E\u90A3\u5F20\u5361\u300D\u2014\u2014\u804A\u5929\u9875\u548C\u6536\u4EF6\u7BB1\u8BFB\u7684\u662F\u540C\u4E00\u4EFD\u5185\u5B58\uFF0C\u4E00\u8D77\u53D8\u7A7A\u3002
+--
+-- card \u5217\u7528 jsonb \u6574\u5B58\uFF1A\u5361\u4F53\u7684\u5F62\u72B6\u5F52 core\uFF08KernelBridge.draftCards\uFF09\u7BA1\uFF0C\u5F15\u64CE\u53EA\u8D1F\u8D23\u5B58\u53D6\uFF0C
+-- \u4E0D\u8BA4\u91CC\u9762\u7684\u4E1A\u52A1\u5B57\u6BB5\u2014\u2014\u5426\u5219\u6BCF\u52A0\u4E00\u4E2A\u5B57\u6BB5\u90FD\u8981\u52A8 DDL\uFF0C\u800C\u5F15\u64CE\u4E0D\u8BE5\u77E5\u9053 InterventionPlan \u662F\u4EC0\u4E48\u3002
+-- \u7D22\u5F15\u4F4D\u53EA\u7559\u6392\u969C\u8981\u7528\u7684\u90A3\u4E24\u5217\u3002\u4E0D\u52A0 workorder_id \u5916\u952E\uFF1A\u5361\u53EF\u4EE5\u6307\u5411\u4E00\u4E2A\u521A\u88AB\u4F5C\u5E9F\u7684\u8282\u70B9\uFF0C
+-- \u5916\u952E\u4F1A\u8BA9\u300C\u8D77\u8349\u300D\u8FD9\u4E00\u6B65\u76F4\u63A5\u5931\u8D25\uFF0C\u6BD4\u7559\u4E00\u6761\u5B64\u513F\u5361\u7CDF\u5F97\u591A\u3002
+CREATE TABLE IF NOT EXISTS ${q2}.intervention_drafts (
+  draft_id     text PRIMARY KEY,
+  workorder_id text,
+  created_at   timestamptz NOT NULL,
+  card         jsonb NOT NULL
+);
+CREATE INDEX IF NOT EXISTS intervention_drafts_wo_idx ON ${q2}.intervention_drafts (workorder_id);
+
 -- \u2500\u2500 \u8FC1\u79FB\uFF1A\u65E2\u6709\u90E8\u7F72\u7684\u5217\u589E\u91CF\uFF08CREATE TABLE IF NOT EXISTS \u4E0D\u52A0\u5217\uFF0C\u8FD9\u91CC\u8865\uFF09\u2500\u2500
 -- \u2605 review_requirements.source \u6269\u4E3A\u56DB\u503C\uFF08+'closure'\uFF09\uFF1A\u7ED3\u6848\u4EBA\u95F8\u7531 scan \u5728\u6536\u53E3\u90A3\u4E00\u523B\u5199\u5165\uFF0C\u4E0E manual \u5206\u5BB6\u3002
 --   \u5199\u6CD5\u4E0E\u4E0B\u65B9 works_lane_check \u540C\u6B3E\uFF08\u5148\u5220\u540E\u52A0\uFF0C\u6210\u5BF9\u5E42\u7B49\uFF09\u3002
@@ -11278,6 +11298,38 @@ var init_store_postgres = __esm({
           createdAt: iso(r.createdAt)
         }));
       }
+      /* ── intervention 草案卡（见 store.ts 的接口注释）。与上面两口钟同类：直连 pool 的窄读写，
+            标识符位一律经 quoteIdent——带连字符的公司 schema 裸拼会 syntax error。 ── */
+      async listInterventionDrafts() {
+        const res = await this.pool.query(
+          `SELECT draft_id AS "draftId", workorder_id AS "workorderId", created_at AS "createdAt", card
+         FROM ${quoteIdent(this.schema)}.intervention_drafts
+        ORDER BY created_at`
+        );
+        return res.rows.map((r) => ({
+          draftId: r.draftId,
+          workorderId: r.workorderId ?? null,
+          createdAt: iso(r.createdAt),
+          card: r.card
+        }));
+      }
+      async saveInterventionDraft(record8) {
+        await this.pool.query(
+          `INSERT INTO ${quoteIdent(this.schema)}.intervention_drafts (draft_id, workorder_id, created_at, card)
+            VALUES ($1, $2, $3::timestamptz, $4::jsonb)
+       ON CONFLICT (draft_id) DO UPDATE
+              SET workorder_id = EXCLUDED.workorder_id,
+                  created_at   = EXCLUDED.created_at,
+                  card         = EXCLUDED.card`,
+          [record8.draftId, record8.workorderId, record8.createdAt, JSON.stringify(record8.card ?? null)]
+        );
+      }
+      async deleteInterventionDraft(draftId) {
+        await this.pool.query(
+          `DELETE FROM ${quoteIdent(this.schema)}.intervention_drafts WHERE draft_id = $1`,
+          [draftId]
+        );
+      }
     };
     PgTx = class {
       constructor(c, s2) {
@@ -15588,7 +15640,7 @@ ${m2.spec.split("\n").map((l) => `  > ${l}`).join("\n")}`);
       `- \u7F3A\u4E00\u4E2A**\u8FD8\u4E0D\u5B58\u5728\u7684\u524D\u7F6E** \u2192 \`oasis gap\` \u4EA4\u4E0A\u53BB\uFF0C**\u522B\u786C\u7F16**\uFF1B\u5DF2\u505A\u5B8C\u7684\u90E8\u5206\u7167\u5E38 \`propose\`\uFF0C\u4F46\u8FD9\u4E00\u8F6E \`conclude\` \u4F1A\u88AB\u62D2\uFF0C\u63D0\u4EA4\u5B8C\u5373\u6536\u5DE5\u2014\u2014\u524D\u7F6E\u5C31\u7EEA\u540E\u7CFB\u7EDF\u4F1A\u5E26\u7740\u89E3\u6CD5\u8BF4\u660E\u91CD\u65B0\u5524\u8D77\u4F60\u3002`,
       `- \u5BF9**\u4E0A\u6E38**\u6709\u610F\u89C1\u2014\u2014\u6709\u7591\u95EE\u3001\u8981\u5B83\u6539\u3001\u5224\u5B83\u6CA1\u8FBE\u6807 \u2192 \`oasis annotate <\u4E0A\u6E38id> --body "<\u8BF4\u6E05\u695A>"\` \u540E**\u6536\u5DE5**\u3002\u5199\u7ED9\u4E0A\u6E38\u7684\u8BC4\u8BBA\u81EA\u52A8\u5E26\u963B\u585E\u529B\uFF1A**\u5B83\u7B54\u590D\u524D\u4E0D\u80FD\u6536\u5C3E**\uFF0C\u7B54\u590D\u540E\u7CFB\u7EDF\u91CD\u6D3E\u4F60\u3002`,
       ...args.part === void 0 ? [`- \u6D3B\u592A\u5927 / \u53EF\u5E76\u884C \u2192 \`oasis add-revision\` \u62C6\u6210\u5B50\u90E8\u4EF6\u6D3E\u51FA\u53BB\uFF0C\u522B\u4E00\u4EBA\u4E00\u4F1A\u8BDD\u786C\u625B\u3002`] : [],
-      ...batchedContinuation && args.part === void 0 ? [`- \u957F\u4EFB\u52A1\u5DF2\u5141\u8BB8\u5206\u6279\u7EED\u8DD1\uFF1A\u4E00\u6279\u6709\u8FDB\u5C55\u4F46\u6574\u4F53\u672A\u5B8C\u6210\u65F6\uFF0C\u6309\u300C\u600E\u4E48\u63D0\u4EA4\u300D\u91CC\u7684 propose \u547D\u4EE4\u8FFD\u52A0 \`--checkpoint --continue\`\uFF0Creason \u5199\u6E05\u672C\u6279\u5B8C\u6210\u4E86\u4EC0\u4E48\u3001\u5269\u4EC0\u4E48\u3001\u4E0B\u6279\u4ECE\u54EA\u7EE7\u7EED\uFF0C\u7136\u540E\u6536\u5DE5\uFF1B\u7CFB\u7EDF\u4F1A\u6D3E\u53D1\u4E0B\u4E00\u8F6E\u6B63\u5F0F session\u3002\u5168\u90E8\u5B8C\u6210\u65F6\u7167\u5E38 propose \u540E \`oasis conclude ${artifactId}\`\u3002`] : [],
+      ...batchedContinuation && args.part === void 0 ? [`- \u957F\u4EFB\u52A1\u5DF2\u5141\u8BB8\u5206\u6279\u7EED\u8DD1\uFF1A\u4E00\u6279\u6709\u8FDB\u5C55\u4F46\u6574\u4F53\u672A\u5B8C\u6210\u65F6\uFF0C\u6309\u300C\u600E\u4E48\u63D0\u4EA4\u300D\u91CC\u7684 propose \u547D\u4EE4\u8FFD\u52A0 \`--checkpoint --continue\`\uFF0Creason \u5199\u6E05\u672C\u6279\u5B8C\u6210\u4E86\u4EC0\u4E48\u3001\u5269\u4EC0\u4E48\u3001\u4E0B\u6279\u4ECE\u54EA\u7EE7\u7EED\uFF0C\u7136\u540E\u6536\u5DE5\uFF1B\u7CFB\u7EDF\u4F1A\u6D3E\u53D1\u4E0B\u4E00\u8F6E\u6B63\u5F0F session\u3002\u5168\u90E8\u5B8C\u6210\u65F6\u7167\u5E38 propose \u540E \`oasis conclude ${artifactId} --note "<\u4EA4\u4ED8\u7ED3\u8BBA>"\`\u3002`] : [],
       `- \u5199\u5165\u53EA\u8D70 \`oasis propose\`\uFF0C\u771F\u6B63\u5B8C\u6574\u4E86\u624D \`oasis conclude\`\uFF1B\u5361\u6CA1\u5361\u4F4F\u3001\u8FDB\u5EA6\u90FD\u662F\u7CFB\u7EDF\u7B97\u7684\uFF0C\u522B\u81EA\u5DF1\u7EF4\u62A4\u3002`,
       `- \u4F46**\u7B80\u5355\u3001\u81EA\u8DB3\u3001\u4E0D\u4F9D\u8D56\u672A\u5B9A\u51B3\u7B56\u7684\u4EFB\u52A1**\uFF08\u5982\u6539\u4E2A\u80CC\u666F\u8272\uFF09\u2192 \u76F4\u63A5\u505A\uFF0C\u5224\u65AD\u6743\u5728\u4F60\u3002`,
       ...typeDef?.recommendedInputs && typeDef.recommendedInputs.length > 0 ? [`- \u672C\u7C7B\u578B\u5E38\u89C1\u4E0A\u6E38\u4F9D\u8D56\uFF08\u63A8\u8350\uFF0C\u975E\u5F3A\u5236\uFF09\uFF1A${typeDef.recommendedInputs.join("\u3001")}\u2014\u2014\u4F9D\u8D56\u5176\u4E2D\u67D0\u4E2A\u800C\u5B83\u8FD8\u6CA1\u6709\uFF0C\u6309\u4E0A\u9762 gap \u89C4\u5219\u62A5\u7F3A\u53E3\u3002`] : []
@@ -19353,8 +19405,14 @@ var init_kernel_bridge = __esm({
       /** 下一轮刷新是否顺带重扫一小片"不脏"的工单。只由 `refreshModel({ resync: true })`（读模型时钟）置位。 */
       resyncRequested = false;
       /**
-       * intervention 待授权卡（内存态）。旧引擎存 oplog + fold 出 pendingReviews；新引擎无 oplog，
-       * 用内存 map 承载同样的「propose → 人等确认 → apply-draft/reject」流。短生命周期、重启丢可接受。
+       * intervention 待授权卡。内存 map 是**读路径的缓存**，真源在库里（`intervention_drafts` 表，
+       * 见 engine/schema.ts）——`open()` 启动时 rehydrate，propose 写库，apply/reject 删库。
+       *
+       * 旧引擎把起草记成一条 `propose_intervention` op 进 oplog，重启 replay 就 fold 回 pendingReviews；
+       * 决策 0130 退役 oplog 时这一段只搬了内存 Map，注释写着「短生命周期、重启丢可接受」。
+       * 2026-09-11 实录证伪了这句：v2 上 31 小时重启 158 次，一张卡起草 24 秒后就被抹掉，
+       * 而协调者仍在对话里让人「去收件箱找那张卡」——聊天页和收件箱读的是同一份 `pendingReviews`，
+       * 一起变空。这张卡的寿命由**等它的那个人**决定，不由进程决定，所以必须落库。
        */
       draftCards = /* @__PURE__ */ new Map();
       model;
@@ -19374,6 +19432,14 @@ var init_kernel_bridge = __esm({
           for (const record8 of records) kernel.markWorkorderDirty(record8.workorderId);
         });
         bus.onApplied((wid) => kernel.markWorkorderDirty(wid));
+        try {
+          for (const rec of await store.listInterventionDrafts()) {
+            const card2 = rec.card;
+            kernel.draftCards.set(rec.draftId, { ...card2, at: card2?.at || rec.createdAt });
+          }
+        } catch (err) {
+          console.warn(`[kernel-bridge] open \u6062\u590D\u5F85\u6388\u6743\u5361\u5931\u8D25\uFF08\u672C\u6B21\u91CD\u542F\u7684\u5B58\u91CF\u5361\u4F1A\u4E22\uFF09\uFF1A${String(err)}`);
+        }
         try {
           const all2 = await store.transaction((tx) => tx.listAllWorkorders());
           for (const id of all2) kernel.trackedWorkorders.add(id);
@@ -19384,6 +19450,39 @@ var init_kernel_bridge = __esm({
         return kernel;
       }
       /* ─────────────────────── 内部工具 ─────────────────────── */
+      /**
+       * 起草落库。**写失败不阻断起草**——卡已经在内存里、已经显示给人了，这时候抛错会让
+       * `oasis force-conclude` 整条命令失败，比"这张卡撑不过下次重启"糟得多。退化成本次改动之前的行为。
+       */
+      async persistDraftCard(draftId, card2) {
+        try {
+          await this.store.saveInterventionDraft({
+            draftId,
+            workorderId: this.workorderOfCard(card2),
+            createdAt: card2.at,
+            card: card2
+          });
+        } catch (err) {
+          console.warn(`[kernel-bridge] \u5F85\u6388\u6743\u5361\u843D\u5E93\u5931\u8D25 ${draftId}\uFF08\u91CD\u542F\u540E\u4F1A\u4E22\uFF09\uFF1A${String(err)}`);
+        }
+      }
+      /** 卡已终局（人点了确认或驳回）→ 删库。失败只记日志：内存已出队，残留行会在下次 rehydrate 后
+       *  被 apply/reject 的「卡不存在」分支挡掉，不会让已执行的命令被再执行一次。 */
+      async forgetDraftCard(draftId) {
+        try {
+          await this.store.deleteInterventionDraft(draftId);
+        } catch (err) {
+          console.warn(`[kernel-bridge] \u5F85\u6388\u6743\u5361\u5220\u5E93\u5931\u8D25 ${draftId}\uFF1A${String(err)}`);
+        }
+      }
+      /** 卡挂在哪张工单下（排障列用，允许为空）。锚点可能指向一个模型里已经没有的产物。 */
+      workorderOfCard(card2) {
+        const fromPlan = card2.plan?.workspace;
+        if (fromPlan) return fromPlan;
+        const anchor = card2.anchor;
+        if (!anchor) return null;
+        return this.model.artifacts.get(anchor)?.workspace ?? null;
+      }
       /** artifactId → 所属 workorderId（从 model 查）。 */
       wo(artifactId) {
         const a = this.model.artifacts.get(artifactId);
@@ -19554,7 +19653,8 @@ var init_kernel_bridge = __esm({
             workspace: cardWs,
             advisory: [],
             downstreamClosure: [],
-            at: "",
+            // 真实起草时刻。曾经恒为 ""：收件箱那行因此时间列印 "-"、排序键空串最小、恒沉到列表最后一行。
+            at: card2.at ?? "",
             // ★ anchor 也兜底到 plan ops 的产物 id——inbox change-confirm 用 r.anchor 找「anchor owner 的
             // 人类上级」（leadOf(r.anchor)）；graph-edit 卡之前恒空、boss 收不到卡（collab-inbox-audit 实测）。
             anchor: anchorId || card2.anchor || "",
@@ -21007,30 +21107,33 @@ var init_kernel_bridge = __esm({
       async proposeIntervention(plan, actor, opts) {
         const preview2 = await previewIntervention(this.model, plan, { schema: this.schema, roleIndex: this.roleIndex });
         const draftId = `draft:${(0, import_node_crypto3.randomUUID)()}`;
-        this.draftCards.set(draftId, {
+        const card2 = {
           kind: "graph-edit",
           plan,
           proposedBy: actor,
           origin: opts?.origin,
           parentMessageId: opts?.parentMessageId,
           changeClass: preview2.changeClass,
-          nonMonotonicOps: preview2.nonMonotonicOps
-        });
+          nonMonotonicOps: preview2.nonMonotonicOps,
+          at: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        this.draftCards.set(draftId, card2);
+        await this.persistDraftCard(draftId, card2);
         await this.refreshModel();
         return { draftId, changeClass: preview2.changeClass, nonMonotonicOps: preview2.nonMonotonicOps };
       }
       async proposeCommandAuthorization(args) {
         const originNorm = args.origin ?? null;
         const argsJson = JSON.stringify(args.args ?? {});
-        for (const [id, card2] of this.draftCards) {
-          if (card2.kind !== "command" || card2.command !== args.command) continue;
-          if ((card2.origin ?? null) !== originNorm) continue;
-          if (JSON.stringify(card2.commandArgs ?? {}) !== argsJson) continue;
+        for (const [id, card3] of this.draftCards) {
+          if (card3.kind !== "command" || card3.command !== args.command) continue;
+          if ((card3.origin ?? null) !== originNorm) continue;
+          if (JSON.stringify(card3.commandArgs ?? {}) !== argsJson) continue;
           await this.refreshModel();
           return { draftId: id };
         }
         const draftId = `draft:${(0, import_node_crypto3.randomUUID)()}`;
-        this.draftCards.set(draftId, {
+        const card2 = {
           kind: "command",
           command: args.command,
           commandArgs: args.args,
@@ -21038,8 +21141,11 @@ var init_kernel_bridge = __esm({
           anchor: args.artifactId,
           proposedBy: args.actor,
           origin: args.origin,
-          parentMessageId: args.parentMessageId
-        });
+          parentMessageId: args.parentMessageId,
+          at: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        this.draftCards.set(draftId, card2);
+        await this.persistDraftCard(draftId, card2);
         await this.refreshModel();
         return { draftId };
       }
@@ -21068,11 +21174,13 @@ var init_kernel_bridge = __esm({
           throw new Error(`\u547D\u4EE4\u6388\u6743\uFF1A\u6682\u4E0D\u652F\u6301\u6267\u884C ${card2.command}`);
         }
         this.draftCards.delete(args.draftId);
+        await this.forgetDraftCard(args.draftId);
         await this.refreshModel();
         return { command: card2.command, artifactId };
       }
       async rejectIntervention(args) {
         this.draftCards.delete(args.draftId);
+        await this.forgetDraftCard(args.draftId);
         await this.refreshModel();
       }
       /**
@@ -21383,6 +21491,7 @@ var init_kernel_bridge = __esm({
         }
         if (typeof plan.resolvesProposal === "string") {
           this.draftCards.delete(plan.resolvesProposal);
+          await this.forgetDraftCard(plan.resolvesProposal);
           await this.refreshModel();
         }
         return {
@@ -221047,7 +221156,7 @@ async function actorStats(actorId, opts = {}) {
   const now = opts.now ?? /* @__PURE__ */ new Date();
   const from = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1e3).toISOString();
   const to = now.toISOString();
-  const weeklyUsage = opts.usage?.listRuns ? summarizeWeeklyRuns(await listWeeklyRuns(opts.usage, actorId, from, to)) : summarizeWeeklyUsage(opts.usage?.queryUsageStats ? await opts.usage.queryUsageStats({
+  const weeklyUsage = opts.usage?.listRuns ? summarizeWeeklyRuns(await listWeeklyRuns(opts.usage, actorId, from, to, opts.artifactIds)) : summarizeWeeklyUsage(!opts.artifactIds && opts.usage?.queryUsageStats ? await opts.usage.queryUsageStats({
     actorIds: [actorId],
     from,
     to,
@@ -221055,6 +221164,8 @@ async function actorStats(actorId, opts = {}) {
   }) : []);
   return {
     actorId,
+    usageAvailable: !!(opts.usage?.listRuns || !opts.artifactIds && opts.usage?.queryUsageStats),
+    ...opts.model ? { participatingTaskCount: participatingTaskCount(opts.model, actorId) } : {},
     tokenWeek: weeklyUsage.tokenWeek,
     tokenWeekBreakdown: weeklyUsage.tokenWeekBreakdown,
     costWeekUsdMicros: weeklyUsage.costWeekUsdMicros,
@@ -221064,12 +221175,12 @@ async function actorStats(actorId, opts = {}) {
     unpricedModels: weeklyUsage.unpricedModels
   };
 }
-async function listWeeklyRuns(trace, actorId, from, to) {
+async function listWeeklyRuns(trace, actorId, from, to, artifactIds) {
   const out = [];
   let cursor;
   do {
     const page = await trace.listRuns({ actorId, from, to, limit: 500, ...cursor ? { cursor } : {} });
-    out.push(...page.items);
+    out.push(...page.items.filter((run) => !artifactIds || run.artifactId != null && artifactIds.has(run.artifactId)));
     cursor = page.nextCursor ?? void 0;
   } while (cursor);
   return out;
@@ -221080,6 +221191,13 @@ function summarizeWeeklyRuns(runs) {
 function summarizeWeeklyUsage(rows) {
   return summarize2(rows.map((row) => ({ model: row.effectiveModel, usage: row })));
 }
+function participatingTaskCount(model, actorId) {
+  const workorders = /* @__PURE__ */ new Set();
+  for (const artifact of model.artifacts.values()) {
+    if (artifact.owner === actorId) workorders.add(artifact.workspace);
+  }
+  return workorders.size;
+}
 var init_stats = __esm({
   "../server/src/domains/actors/stats.ts"() {
     "use strict";
@@ -222415,9 +222533,16 @@ function actorsDomain(opts) {
       throw new ApiError(400, "BAD_REQUEST", "\u4F20 enabled\uFF08\u5F00\u5173\uFF09/ appliedToAll\uFF08\u5168\u5458\u751F\u6548\uFF09/ name\xB7description\uFF08\u66F4\u65B0\u5143\u6570\u636E\uFF09");
     });
     router.get("/api/actors/:id/stats", async (req) => {
+      const ctx = await resolveCtx(req.auth.companyId);
+      if (!await ctx.service.getActor(req.params.id)) throw new ApiError(404, "NOT_FOUND", "\u6CA1\u6709\u8FD9\u4E2A\u5458\u5DE5");
+      const model = ctx.getModel?.();
       return {
         status: 200,
-        body: await actorStats(req.params.id, { usage: opts.trace?.() })
+        body: await actorStats(req.params.id, {
+          usage: req.auth.companyId && !model ? void 0 : opts.trace?.(),
+          model,
+          ...req.auth.companyId ? { artifactIds: new Set(model?.artifacts.keys() ?? []) } : {}
+        })
       };
     });
     router.get("/api/actors/:id/running-tasks", async (req) => {
@@ -222975,6 +223100,7 @@ function createActorsDomain(opts) {
   const engineStoreOf = (k2) => k2?.getStore?.();
   const defaultCtx = {
     service: buildService(opts.store, opts.kernel, opts.blobs),
+    ...opts.kernel?.model ? { getModel: () => opts.kernel.model } : {},
     ...opts.oplog !== void 0 ? { oplog: opts.oplog } : {},
     ...engineStoreOf(opts.kernel) !== void 0 ? { engineStore: engineStoreOf(opts.kernel) } : {},
     ...opts.blobs !== void 0 ? { blobs: opts.blobs } : {}
@@ -222988,6 +223114,7 @@ function createActorsDomain(opts) {
     const blobs = engine.assets ?? engine.blobs;
     const ctx = {
       service: buildService(engine.registry, engine.kernel, blobs),
+      getModel: () => engine.kernel.model,
       oplog: engine.oplog,
       ...engineStoreOf(engine.kernel) !== void 0 ? { engineStore: engineStoreOf(engine.kernel) } : {},
       blobs
@@ -224873,8 +225000,10 @@ function buildWorkorderActivity(input) {
       ] : []
     });
   }
+  const openedSeq = events.find((rec) => rec.event.kind === "work.create")?.seq;
+  const beforeOpen = (seq) => openedSeq !== void 0 && seq < openedSeq;
   const drafts = [
-    ...standalone,
+    ...standalone.filter((d) => !beforeOpen(d.seq)),
     ...executionCards,
     ...visibleReviews.values(),
     ...issueCards.values(),
@@ -224950,7 +225079,7 @@ function buildWorkorderActivity(input) {
       .../* @__PURE__ */ ((r) => r ? { runId: r, traceAvailable: true } : {})(traced ? runIdOfCard(d) : void 0)
     };
   });
-  cards.push(...reviewRequirementActivity(snap, events, ref2));
+  cards.push(...reviewRequirementActivity(snap, events, ref2).filter((c) => !beforeOpen(c.seq)));
   cards.sort((a, b2) => a.updatedAt.localeCompare(b2.updatedAt) || a.seq - b2.seq || a.id.localeCompare(b2.id));
   return { workorderId, cards, truncated };
 }
@@ -225620,6 +225749,12 @@ function buildInbox(model, me, leadOf, resolveActor, markers = [], slaMs, nowIso
       actionRequired: true,
       summary: changeConfirmSummary(r),
       draftId: r.draftId,
+      // ★ 落点（2026-09-11）：带上起草它的那段对话，让前端把这一行跳回**卡真正渲染着的地方**。
+      // 此前这一行恒跳「任务详情 ?tab=activity」，而全仓库渲染待审卡的只有 chat 页与任务页的协调者
+      // 对话（都按 origin=会话 id 查），动态 tab 里一行渲染代码都没有——于是收件箱这条路
+      // 「找得到那一行、却点不到确认键」。origin 缺省（自主会话起草、没人在场）时不带，
+      // 仍回落工单详情。
+      ...r.origin ? { chatSessionId: r.origin } : {},
       ...anchorArt ? { title: nodeLabel(anchorArt) } : {},
       detail: `${actorName(r.proposedBy) || "\u7BA1\u7406\u8005"}\uFF1A${r.command?.effectLabel ?? firstSentence(r.plan.reason)}`,
       ...r.kind !== "command" && opCount > 0 ? { impact: `\u6D89\u53CA ${opCount} \u5904\u6539\u52A8${r.nonMonotonicOps.length > 0 ? " \xB7 \u542B\u9500\u6BC1\u6027" : ""}` } : {},
@@ -253379,6 +253514,17 @@ var init_cutover_aware_trace = __esm({
         if (row.state === "frozen") throw new BundleFrozenError("trace");
         return this.o.cutover.readsCompanySchema(row) ? this.o.owned : this.o.legacy;
       }
+      /**
+       * 这家公司的 trace 当前**物理落在哪**：切走了就是它自己的引擎 schema，没切走就是那个
+       * 所有未切公司共用的 legacy store。
+       *
+       * 给 {@link FanOutTraceStore} 去重用。判据**不在调用方重算**——就是 {@link pick} 那一条
+       * （`cutover.get` + `readsCompanySchema`），照抄一遍就是又造一处会分叉的实现。
+       */
+      async storageKey() {
+        const row = await this.o.cutover.get(this.o.companyId, "trace");
+        return this.o.cutover.readsCompanySchema(row) ? `owned:${this.o.companyId}` : "legacy";
+      }
       // ── run ──────────────────────────────────────────────────────────────────
       async createRun(input) {
         return (await this.pickWritable()).createRun(input);
@@ -253496,10 +253642,43 @@ var init_cutover_aware_trace = __esm({
       constructor(o) {
         this.o = o;
       }
-      async first(op, fn) {
+      /**
+       * 本次要查的物理落点清单——**同一个 store 只出现一次**。
+       *
+       * 为什么必须去重：`trace` 是按 (公司, bundle) 逐个切的，没切走的公司**全部共用同一个
+       * legacy store**（读同一张 `public.agent_runs`）。此前 `union` 直接按公司逐家拼接，于是
+       * 一条 run 在库里只有一行，却被取回 N 份（N = 未切走的公司数）。
+       *
+       * 2026-09-11 v2 生产实证（`ws:wo-9f4652cd`）：35 家公司、其中 33 家 trace 未切走，
+       * 动态卡的「执行轨迹」抽屉里同一轮 attempt 出现 **33 次**；`listEvents` 更狠——那一轮
+       * `agent_run_events` 有 1158 行，扇出后返回 ≈3.8 万行，还附带 33 条一模一样的 SQL。
+       * 不是显示层重复，是响应体和查询量一起炸。
+       *
+       * 去重键由 store 自己报，不在这里按 cutover 状态重算（见 `storageKey` 的注释）。
+       * 也不能按 `storeFor` 返回的对象做身份去重：`openCompanyPlane` 给每家各造了一个
+       * `CutoverAwareTraceStore` 包装实例，33 个不同对象包着同一个 legacy store。
+       */
+      async targets(op) {
+        const out = [];
+        const seen = /* @__PURE__ */ new Set();
         for (const cid of await this.o.listCompanies()) {
           try {
-            const r = await fn(await this.o.storeFor(cid));
+            if (this.o.storageKeyFor) {
+              const key = await this.o.storageKeyFor(cid);
+              if (seen.has(key)) continue;
+              seen.add(key);
+            }
+            out.push({ cid, store: await this.o.storeFor(cid) });
+          } catch (err) {
+            this.o.onError?.(cid, op, err);
+          }
+        }
+        return out;
+      }
+      async first(op, fn) {
+        for (const { cid, store } of await this.targets(op)) {
+          try {
+            const r = await fn(store);
             if (r != null) return r;
           } catch (err) {
             this.o.onError?.(cid, op, err);
@@ -253509,20 +253688,26 @@ var init_cutover_aware_trace = __esm({
       }
       async union(op, fn) {
         const out = [];
-        for (const cid of await this.o.listCompanies()) {
+        for (const { cid, store } of await this.targets(op)) {
           try {
-            out.push(...await fn(await this.o.storeFor(cid)));
+            out.push(...await fn(store));
           } catch (err) {
             this.o.onError?.(cid, op, err);
           }
         }
         return out;
       }
-      /** 这个 run 属于哪一家。写侧要先拿它，别直接写。 */
+      /**
+       * 这个 run 属于哪一家。写侧要先拿它，别直接写。
+       *
+       * ⚠ 未切走的那批公司共用一张 legacy 表，这里**判不出真正的归属**——它们都「有」这条 run，
+       * 返回的是名单里第一家。去重不改变这个答案（第一家仍是第一家），只是把 N 次重复查询收成一次。
+       * 要真正判准归属，得等 `trace` bundle 切完、每家各有自己的 schema。
+       */
       async companyOfRun(runId) {
-        for (const cid of await this.o.listCompanies()) {
+        for (const { cid, store } of await this.targets("companyOfRun")) {
           try {
-            if (await (await this.o.storeFor(cid)).getRun(runId)) return cid;
+            if (await store.getRun(runId)) return cid;
           } catch (err) {
             this.o.onError?.(cid, "companyOfRun", err);
           }
@@ -256328,6 +256513,11 @@ var init_default_company_schema_move = __esm({
       "chat_sessions",
       "event_handler_log",
       "events",
+      // 待人确认的 intervention 草案卡（2026-09-11 落库）。与 events/workorders 同族：锚在本公司的
+      // 工单与产物上、不跨公司读，所以**整表搬**。不进 ENGINE_SCHEMA_BUNDLE_TABLES——那份是
+      // legacy 里混着所有公司行的表（dispatches/blobs/trace 一族），只能逐行按归属复制；
+      // 这张表在默认公司 schema 里只有总部自己的卡。
+      "intervention_drafts",
       "issue_attachments",
       "issue_recipients",
       "issue_replies",
@@ -260362,6 +260552,15 @@ async function startServe(opts) {
   const fanOutTrace = new FanOutTraceStore({
     listCompanies: async () => pgPool ? (await controlPlaneStore.listCompanies()).filter((c) => c.status === "active").map((c) => c.id) : [defaultCompanyId],
     storeFor: (cid) => traceStoreFor(cid),
+    /**
+     * 去重键：`trace` 未切走的公司全部共用同一个 legacy store，扇出只该查它一次。
+     * 由 store 自己报落点，这里不按 cutover 状态重算（见 FanOutTraceStore.targets 的注释）。
+     * 非 PG / 非 cutover-aware 的路径没有这个方法 ⇒ 退回按公司逐家查，行为不变。
+     */
+    storageKeyFor: async (cid) => {
+      const s2 = await traceStoreFor(cid);
+      return typeof s2.storageKey === "function" ? s2.storageKey() : cid;
+    },
     onError: (cid, op, err) => console.warn(`[trace] ${cid} \u7684 ${op} \u5931\u8D25\uFF08\u5176\u4F59\u516C\u53F8\u7EE7\u7EED\uFF09\uFF1A${String(err)}`)
   });
   const traceSinkCache = /* @__PURE__ */ new Map();
@@ -268370,6 +268569,28 @@ var ASYNC_AUTH_MESSAGE = "\u5DF2\u63D0\u4EA4\u4EBA\u5DE5\u5BA1\u6838\uFF1B\u5148
 function asyncAuthorizationReturn(data) {
   return data !== void 0 ? { message: ASYNC_AUTH_MESSAGE, data } : { message: ASYNC_AUTH_MESSAGE };
 }
+var AUTH_CARD_GONE_MESSAGE = "\u8FD9\u5F20\u5F85\u6388\u6743\u5361\u5DF2\u7ECF\u4E0D\u5728\u5F85\u5904\u7406\u5217\u8868\u91CC\u4E86\u2014\u2014\u53EF\u80FD\u5DF2\u88AB\u4EBA\u5904\u7F6E\uFF0C\u4E5F\u53EF\u80FD\u5DF2\u5931\u6548\u3002**\u522B\u518D\u8BA9\u7528\u6237\u53BB\u6536\u4EF6\u7BB1\u627E\u8FD9\u5F20\u5361**\uFF1A\u5148\u7528\u53EA\u8BFB\u547D\u4EE4\u6838\u5BF9\u5F53\u524D\u72B6\u6001\uFF08\u5982 `oasis status <\u8282\u70B9>`\uFF09\uFF0C\u786E\u8BA4\u8FD9\u4EF6\u4E8B\u6CA1\u751F\u6548\uFF0C\u518D\u91CD\u65B0\u53D1\u8D77\u540C\u4E00\u6761\u547D\u4EE4\u3002";
+function authorizationGoneReturn(draftId) {
+  return { message: AUTH_CARD_GONE_MESSAGE, data: { outcome: "authorization-gone", draftId } };
+}
+async function draftStillPending(base, headers, draftId) {
+  try {
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => ctrl.abort(), 5e3);
+    timer.unref?.();
+    try {
+      const res = await fetch(`${base}/api/view?name=intervention-drafts`, { headers, signal: ctrl.signal });
+      if (!res.ok) return null;
+      const body2 = await res.json();
+      if (!Array.isArray(body2.data)) return null;
+      return body2.data.some((d) => d?.id === draftId);
+    } finally {
+      clearTimeout(timer);
+    }
+  } catch {
+    return null;
+  }
+}
 function renderGraphLines(graph) {
   const closureIds = new Set(graph.nodes.filter((n) => n.type === DELIVERY_SUMMARY_ARTIFACT_TYPE).map((n) => n.id));
   const out = ["\n\u8282\u70B9\uFF08\u6539\u56FE\u5F15\u7528\u7528\u8FD9\u4E9B id\uFF09:"];
@@ -268391,6 +268612,10 @@ function resolveAuthWaitMs() {
 }
 async function waitForCommandAuthorization(base, headers, draftId, fallback) {
   const asyncFallback = asyncAuthorizationReturn(fallback.data);
+  const giveUp = async () => {
+    const pending = await draftStillPending(base, headers, draftId);
+    return pending === false ? authorizationGoneReturn(draftId) : asyncFallback;
+  };
   const timeoutMs = resolveAuthWaitMs();
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
@@ -268448,12 +268673,13 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
             data: { outcome: "denied", draftId }
           };
         }
-        return asyncFallback;
+        if (p2.status === "gone") return authorizationGoneReturn(draftId);
+        return await giveUp();
       }
     }
-    return asyncFallback;
+    return await giveUp();
   } catch {
-    return asyncFallback;
+    return await giveUp();
   } finally {
     clearTimeout(timer);
     clearInterval(progress);
@@ -271958,7 +272184,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.17" : "dev";
+var PKG_VERSION = true ? "2.2.18" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;

package/package.json

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