oasis_test 0.1.133 → 0.1.135

package/dist/index.js

@@ -971,9 +971,11 @@ var init_telemetry = __esm({
 });
 
 // ../contract/src/trace.ts
+var DISPLAY_CNY_PER_USD;
 var init_trace = __esm({
   "../contract/src/trace.ts"() {
     "use strict";
+    DISPLAY_CNY_PER_USD = 7.2;
   }
 });
 
@@ -1558,7 +1560,7 @@ var init_src2 = __esm({
     RESOLVED_GAP_AFTER_HEAD_EFFECTS = effects(WAKE, NEUTRAL, VETO, WAKE);
     PENDING_REVIEW_EFFECTS = effects(NEUTRAL, NEUTRAL, VETO, NEUTRAL);
     GAP_SOLUTION_DELIVERY_SINCE = "2026-09-01T00:00:00.000Z";
-    REPLY_ORIGIN_SINCE = "2026-09-04T00:00:00.000Z";
+    REPLY_ORIGIN_SINCE = "2026-09-05T00:00:00.000Z";
     ROUND_LIMIT_MARKER = "\u26A0\uFE0F \u56DE\u5408\u4E0A\u9650";
     LETTER_ROUND_LIMIT = 8;
   }
@@ -7210,7 +7212,7 @@ ${supplemental.taskAppend.trim()}
           ...provisioned?.env ?? {},
           ...spec.part !== void 0 ? { OASIS_PART: spec.part } : {}
         };
-        const resolvedModel3 = this.opts.resolveModel ? await this.opts.resolveModel(dispatchSpec.actor) : void 0;
+        const resolvedModel2 = this.opts.resolveModel ? await this.opts.resolveModel(dispatchSpec.actor) : void 0;
         const resolvedExtraArgs = this.opts.resolveExtraArgs ? await this.opts.resolveExtraArgs(dispatchSpec.actor) : void 0;
         this.assertSpawnAttemptCurrent(jobKey, attempt);
         const freshWorkdir = workdirKey !== void 0 && !priorConsistent;
@@ -7227,7 +7229,7 @@ ${supplemental.taskAppend.trim()}
           server: { url: serverUrl },
           limits,
           ...this.resilienceFields(),
-          ...resolvedModel3 ? { model: resolvedModel3 } : {},
+          ...resolvedModel2 ? { model: resolvedModel2 } : {},
           ...resolvedExtraArgs && resolvedExtraArgs.length > 0 ? { extraArgs: resolvedExtraArgs } : {},
           ...binding !== void 0 ? { binding } : {},
           ...runtimeSessionId !== void 0 ? { runtimeSessionId } : {},
@@ -154464,6 +154466,45 @@ var init_chat_item_ledger = __esm({
           }
         });
       }
+      /**
+       * B4：POST /api/chat 开轮时把 user 的**首条**提交也记进账本——桶按 itemId 索引的合并
+       * 模型这才闭环（否则空闲会话刷新看不到 user 历史，且服务端从不回填 clientSubmitId）。
+       *
+       * - `itemId` 用 `oasis-user-optim:${clientSubmitId}`（与 FE `beginOptimisticUser` 同规则）：
+       *   同一次点击的乐观桶位和服务端权威条自然对齐，不需要「双条+去重」的过渡态。
+       *   没给 clientSubmitId 时回落随机 id——旧客户端仍可用，只是 FE 侧没有乐观替换的钩子。
+       * - `payload.clientSubmitId` 也一并写进去——`chat-items-merge` 在 itemId 恰好不同时（跨版本
+       *   混部/异常路径）走 `retractSiblingOptimistic` 兜底，只剩一条 user 气泡。
+       * - `message_id` 绑到本轮建 assistant 行之前的 user 行——但这里没有 messageId 可给，
+       *   落 NULL 由 `bindMessage` 那侧不动它（它只回填 role='assistant' 的行）。
+       */
+      recordUserSubmission(input) {
+        const payload = {
+          role: "user",
+          text: input.text
+        };
+        if (input.attachments?.length) payload.attachments = input.attachments;
+        if (input.clientSubmitId) payload.clientSubmitId = input.clientSubmitId;
+        const deterministicId = input.clientSubmitId ? `oasis-user-optim:${input.clientSubmitId}` : void 0;
+        return this.insert({
+          kind: "text",
+          role: "user",
+          status: "completed",
+          origin: "server",
+          text: input.text,
+          attrs: {},
+          inContent: false,
+          persist: true,
+          forceNullMessage: true,
+          payload,
+          metadata: {
+            [CHAT_ITEM_META_LEGACY_CONTENT]: false,
+            ...input.clientSubmitId ? { clientSubmitId: input.clientSubmitId } : {},
+            ...input.attachments?.length ? { attachments: input.attachments } : {}
+          },
+          ...deterministicId ? { deterministicId } : {}
+        });
+      }
       /** 服务端合成的错误帧（session.done 抛 / exit 判失败）。不入正文，归 control。 */
       recordError(text5, extra) {
         this.insert({
@@ -154657,7 +154698,7 @@ var init_chat_item_ledger = __esm({
         }
       }
       insert(input) {
-        const id = this.newId();
+        const id = input.deterministicId ?? this.newId();
         const row = {
           id,
           seq: ++this.seqCounter,
@@ -157933,8 +157974,36 @@ function parseCodexSessionId(lines) {
   const id = o.payload?.id;
   return typeof id === "string" && id ? id : void 0;
 }
-function parseCodexTokenUsage(lines) {
-  let last;
+function bucketsOf(usage) {
+  if (!usage) return void 0;
+  return {
+    input: codexNum(usage["input_tokens"]),
+    // cache 字段名跨版本有两种
+    cacheRead: codexNum(usage["cached_input_tokens"]) || codexNum(usage["cache_read_input_tokens"]),
+    cacheWrite: codexNum(usage["cache_write_input_tokens"]),
+    // reasoning 计入 output（对齐 Multica：codex 的 output_tokens 不含 reasoning）。
+    output: codexNum(usage["output_tokens"]) + codexNum(usage["reasoning_output_tokens"])
+  };
+}
+function usageFromBuckets(b2) {
+  const inputFresh = Math.max(b2.input - b2.cacheRead, 0);
+  return {
+    inputTokens: inputFresh,
+    outputTokens: b2.output,
+    totalTokens: inputFresh + b2.output,
+    // = input+output（不含 cache，与 claude/OTLP 口径一致）
+    cacheReadTokens: b2.cacheRead,
+    cacheCreationTokens: b2.cacheWrite || null,
+    costUsdMicros: null
+    // codex rollout 无成本（订阅计划）
+  };
+}
+function parseCodexTokenUsage(lines, sinceMs) {
+  let lastTotal;
+  let lastTurn;
+  const windowed = { input: 0, cacheRead: 0, cacheWrite: 0, output: 0 };
+  let sawWindowed = false;
+  let sawTimestamp = false;
   for (const line of lines) {
     if (!line || line.indexOf("token_count") === -1) continue;
     let o;
@@ -157943,25 +158012,29 @@ function parseCodexTokenUsage(lines) {
     } catch {
       continue;
     }
-    if (o?.type === "event_msg" && o.payload?.type === "token_count" && o.payload.info?.total_token_usage) {
-      last = o.payload.info.total_token_usage;
-    }
-  }
-  if (!last) return void 0;
-  const cacheRead = codexNum(last["cached_input_tokens"]) || codexNum(last["cache_read_input_tokens"]);
-  const inputFresh = Math.max(codexNum(last["input_tokens"]) - cacheRead, 0);
-  const output = codexNum(last["output_tokens"]) + codexNum(last["reasoning_output_tokens"]);
-  return {
-    inputTokens: inputFresh,
-    outputTokens: output,
-    totalTokens: inputFresh + output,
-    // = input+output（不含 cache，与 claude/OTLP 口径一致）
-    cacheReadTokens: cacheRead,
-    cacheCreationTokens: null,
-    // codex 不报 cache 写入
-    costUsdMicros: null
-    // codex rollout 无成本
-  };
+    if (o?.type !== "event_msg" || o.payload?.type !== "token_count") continue;
+    const info = o.payload.info;
+    if (!info) continue;
+    const total = bucketsOf(info.total_token_usage);
+    if (total) lastTotal = total;
+    const turn = bucketsOf(info.last_token_usage);
+    if (turn) lastTurn = turn;
+    if (sinceMs === void 0) continue;
+    const ts3 = typeof o.timestamp === "string" ? Date.parse(o.timestamp) : Number.NaN;
+    if (!Number.isFinite(ts3)) continue;
+    sawTimestamp = true;
+    if (ts3 < sinceMs || !turn) continue;
+    sawWindowed = true;
+    windowed.input += turn.input;
+    windowed.cacheRead += turn.cacheRead;
+    windowed.cacheWrite += turn.cacheWrite;
+    windowed.output += turn.output;
+  }
+  if (sinceMs !== void 0 && sawTimestamp) {
+    return sawWindowed ? usageFromBuckets(windowed) : void 0;
+  }
+  if (sinceMs !== void 0 && lastTurn) return usageFromBuckets(lastTurn);
+  return lastTotal ? usageFromBuckets(lastTotal) : void 0;
 }
 function parseCodexModel(lines) {
   let model;
@@ -158019,8 +158092,27 @@ function listRecentRollouts(root, sinceMs) {
   walk(root);
   return found.sort((a, b2) => b2.m - a.m).map((x2) => x2.f);
 }
-function telemetryFromRolloutLines(lines) {
-  const usage = parseCodexTokenUsage(lines);
+function findRolloutsBySessionId(root, sessionId) {
+  const suffix = `-${sessionId}.jsonl`;
+  const found = [];
+  const walk = (d) => {
+    let ents;
+    try {
+      ents = fs10.readdirSync(d, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const ent of ents) {
+      const p2 = path11.join(d, ent.name);
+      if (ent.isDirectory()) walk(p2);
+      else if (ent.isFile() && ent.name.startsWith("rollout-") && ent.name.endsWith(suffix)) found.push(p2);
+    }
+  };
+  walk(root);
+  return found;
+}
+function telemetryFromRolloutLines(lines, sinceMs) {
+  const usage = parseCodexTokenUsage(lines, sinceMs);
   const model = parseCodexModel(lines);
   const sessionId = parseCodexSessionId(lines);
   return {
@@ -158049,7 +158141,7 @@ function scanCodexTelemetry(workdir, sinceMs, sessionsRoot = codexSessionsRoot()
         continue;
       }
       if (meta?.type === "session_meta" && meta.payload?.cwd === workdir) {
-        return telemetryFromRolloutLines(lines);
+        return telemetryFromRolloutLines(lines, sinceMs);
       }
     }
     if (preferSessionId) {
@@ -158060,9 +158152,13 @@ function scanCodexTelemetry(workdir, sinceMs, sessionsRoot = codexSessionsRoot()
         if (!lines) continue;
         const sid = parseCodexSessionId(lines);
         if (byName || sid === preferSessionId) {
-          return telemetryFromRolloutLines(lines);
+          return telemetryFromRolloutLines(lines, sinceMs);
         }
       }
+      for (const f2 of findRolloutsBySessionId(sessionsRoot, preferSessionId)) {
+        const lines = readLines(f2);
+        if (lines) return telemetryFromRolloutLines(lines, sinceMs);
+      }
     }
   } catch {
   }
@@ -158337,7 +158433,7 @@ var init_codex = __esm({
         return this.spawnExec(job);
       }
       async spawnAppServer(job) {
-        const resolvedModel3 = job.model ?? this.opts.model;
+        const resolvedModel2 = job.model ?? this.opts.model;
         const reasoningSummary = this.opts.reasoningSummary;
         const reasoningEffort = this.opts.reasoningEffort;
         return runProtocolSession(job, {
@@ -158356,7 +158452,7 @@ var init_codex = __esm({
             params: { clientInfo: { name: "oasis-adapter", version: "0.1.0" }, capabilities: {} }
           }),
           async start(send, currentJob, dir, task, state) {
-            const threadParams = currentJob.resumeRuntimeSession && currentJob.runtimeSessionId ? { threadId: currentJob.runtimeSessionId, cwd: dir, model: resolvedModel3 ?? null, approvalPolicy: "never", sandbox: "danger-full-access" } : { cwd: dir, model: resolvedModel3 ?? null, approvalPolicy: "never", sandbox: "danger-full-access" };
+            const threadParams = currentJob.resumeRuntimeSession && currentJob.runtimeSessionId ? { threadId: currentJob.runtimeSessionId, cwd: dir, model: resolvedModel2 ?? null, approvalPolicy: "never", sandbox: "danger-full-access" } : { cwd: dir, model: resolvedModel2 ?? null, approvalPolicy: "never", sandbox: "danger-full-access" };
             let thread;
             try {
               thread = await send({
@@ -158366,7 +158462,7 @@ var init_codex = __esm({
               });
             } catch (error2) {
               if (!(currentJob.resumeRuntimeSession && currentJob.runtimeSessionId)) throw error2;
-              thread = await send({ jsonrpc: "2.0", method: "thread/start", params: { cwd: dir, model: resolvedModel3 ?? null, approvalPolicy: "never", sandbox: "danger-full-access" } });
+              thread = await send({ jsonrpc: "2.0", method: "thread/start", params: { cwd: dir, model: resolvedModel2 ?? null, approvalPolicy: "never", sandbox: "danger-full-access" } });
             }
             const threadId = thread.thread?.id ?? thread.id;
             if (typeof threadId !== "string" || !threadId) throw new Error("codex app-server returned no thread id");
@@ -158383,7 +158479,7 @@ ${task}` : task;
               params: {
                 threadId,
                 input: [{ type: "text", text: text5 }],
-                ...resolvedModel3 ? { model: resolvedModel3 } : {},
+                ...resolvedModel2 ? { model: resolvedModel2 } : {},
                 ...reasoningSummary ? { summary: reasoningSummary } : {},
                 ...reasoningEffort ? { effort: reasoningEffort } : {}
               }
@@ -158646,7 +158742,7 @@ ${task}` : task;
         child.on("exit", (code2) => {
           clearTimeout(timer);
           const resumeSessionId = job.resumeRuntimeSession ? job.runtimeSessionId : void 0;
-          const telemetry = scanCodexTelemetry(dir, startedAtMs, codexSessionsRoot(), resumeSessionId);
+          const telemetry = scanCodexTelemetry(dir, startedAtMs, codexSessionsRoot(), job.runtimeSessionId);
           const model = telemetry.model ?? job.model ?? this.opts.model;
           const runtimeSessionId = telemetry.sessionId ?? resumeSessionId;
           const sawStreamError = streamErrorMessages.length > 0;
@@ -159437,7 +159533,7 @@ ${note}` : note };
         clientCapabilities: {}
       });
       const advertisedLoadSession = initRes?.agentCapabilities?.loadSession === true;
-      const resolvedModel3 = job.model ?? cfg.model;
+      const resolvedModel2 = job.model ?? cfg.model;
       let sessionId = "";
       let ambiguousResume = false;
       if (job.resumeRuntimeSession && job.runtimeSessionId && advertisedLoadSession) {
@@ -159447,10 +159543,10 @@ ${note}` : note };
             cwd: dir,
             sessionId: job.runtimeSessionId,
             mcpServers: [],
-            ...resolvedModel3 ? { model: resolvedModel3 } : {}
+            ...resolvedModel2 ? { model: resolvedModel2 } : {}
           });
           sessionId = extractSessionID(resumeRes);
-          actualModel = resolvedModel3 ?? extractCurrentModelID(resumeRes) ?? actualModel;
+          actualModel = resolvedModel2 ?? extractCurrentModelID(resumeRes) ?? actualModel;
           if (!sessionId) {
             sessionId = job.runtimeSessionId;
             ambiguousResume = true;
@@ -159463,22 +159559,22 @@ ${note}` : note };
         const sessionRes = await client.request("session/new", {
           cwd: dir,
           mcpServers: [],
-          ...resolvedModel3 ? { model: resolvedModel3 } : {}
+          ...resolvedModel2 ? { model: resolvedModel2 } : {}
         });
         sessionId = extractSessionID(sessionRes);
-        actualModel = resolvedModel3 ?? extractCurrentModelID(sessionRes) ?? actualModel;
+        actualModel = resolvedModel2 ?? extractCurrentModelID(sessionRes) ?? actualModel;
         if (!sessionId) throw new Error("session/new returned no sessionId");
       }
       capturedSessionId = sessionId;
-      if (resolvedModel3) {
+      if (resolvedModel2) {
         try {
-          await client.request("session/set_model", { sessionId, modelId: resolvedModel3 });
+          await client.request("session/set_model", { sessionId, modelId: resolvedModel2 });
         } catch (err) {
           throw new Error(
             `\u8BE5 ACP \u8FD0\u884C\u65F6\u4E0D\u652F\u6301\u5207\u6362\u6A21\u578B\uFF08session/set_model \u5931\u8D25\uFF09\uFF1A${err instanceof Error ? err.message : String(err)}`
           );
         }
-        actualModel = resolvedModel3;
+        actualModel = resolvedModel2;
       }
       const userText = job.systemPrompt ? `${job.systemPrompt}
 
@@ -159514,10 +159610,10 @@ ${task}` : task;
         const sessionRes = await client.request("session/new", {
           cwd: dir,
           mcpServers: [],
-          ...resolvedModel3 ? { model: resolvedModel3 } : {}
+          ...resolvedModel2 ? { model: resolvedModel2 } : {}
         });
         sessionId = extractSessionID(sessionRes);
-        actualModel = resolvedModel3 ?? extractCurrentModelID(sessionRes) ?? actualModel;
+        actualModel = resolvedModel2 ?? extractCurrentModelID(sessionRes) ?? actualModel;
         if (!sessionId) throw new Error("session/new returned no sessionId");
         capturedSessionId = sessionId;
         promptResult = await sendPrompt(userText);
@@ -195518,7 +195614,13 @@ function createAppJwt(appId, privateKeyPem, nowMs) {
   const signer = (0, import_node_crypto33.createSign)("RSA-SHA256");
   signer.update(`${header}.${payload}`);
   signer.end();
-  return `${header}.${payload}.${b64url(signer.sign(privateKeyPem))}`;
+  try {
+    return `${header}.${payload}.${b64url(signer.sign(privateKeyPem))}`;
+  } catch (e) {
+    throw new Error(
+      "github app: \u79C1\u94A5\u89E3\u6790\u5931\u8D25\u2014\u2014\u8FD9\u4E2A .pem \u8BFB\u4E0D\u51FA\u6765\uFF08\u591A\u534A\u662F\u4E0B\u8F7D\u4E0D\u5B8C\u6574\u6216\u88AB\u6539\u8FC7\uFF09\uFF0C\u8BF7\u5728 App \u8BBE\u7F6E\u9875\u91CD\u65B0\u751F\u6210\u4E00\u628A"
+    );
+  }
 }
 async function mintInstallationToken(args, deps = {}) {
   const d = { ...defaultDeps2, ...deps };
@@ -200290,7 +200392,7 @@ async function startOasisServer(opts) {
   const discussSessions = opts.discussSessions ?? /* @__PURE__ */ new Map();
   const reviewWaiters = /* @__PURE__ */ new Map();
   const terminalReviews = /* @__PURE__ */ new Map();
-  const notifyReviewResolved = (draftId, r, resume) => {
+  const notifyReviewResolved = (draftId, r, resume, storeFor) => {
     if (terminalReviews.has(draftId)) return;
     terminalReviews.set(draftId, r);
     if (terminalReviews.size > 512) {
@@ -200305,7 +200407,7 @@ async function startOasisServer(opts) {
     }
     if (resume?.origin) {
       const needsAgentDelivery = resume.kind === "command" && !hadWaiters;
-      void settleAuthorizationStatusLine(resume.origin, r, resume, draftId, needsAgentDelivery);
+      void settleAuthorizationStatusLine(resume.origin, r, resume, draftId, needsAgentDelivery, storeFor);
     }
   };
   const resolveEngine = opts.resolveEngine ?? (async () => ({ kernel: opts.kernel, oplog: opts.oplog, blobs: opts.blobs, ...opts.registry ? { registry: opts.registry } : {} }));
@@ -200382,8 +200484,13 @@ async function startOasisServer(opts) {
     }
     return void 0;
   }
-  const appendNowThroughQueue2 = async (sid, text5, clientKey, attachments) => {
-    const store = opts.chatSession;
+  const appendNowThroughQueue2 = async (sid, text5, clientKey, attachments, perCompanyStore) => {
+    if (perCompanyStore === null) {
+      throw new Error(
+        `appendNowThroughQueue: per-company chat store unresolved (sid=${sid})`
+      );
+    }
+    const store = perCompanyStore ?? opts.chatSession;
     if (!store?.enqueuePendingMessage || !store.listPendingMessages || !store.removePendingMessage) {
       return liveChat.append(sid, text5);
     }
@@ -200425,8 +200532,8 @@ async function startOasisServer(opts) {
     const label = ctx.effectLabel || ctx.command || "";
     return approved ? `\u547D\u4EE4\u5DF2\u7531 ${by} \u6279\u51C6\u5E76\u4EE5\u5176\u540D\u4E49\u6267\u884C${label ? `\uFF1A${label}` : ""}\u3002` : `\u547D\u4EE4\u5DF2\u88AB ${by} \u9A73\u56DE${reason ? `\uFF1A${reason}` : ""}\u3002`;
   };
-  const settleAuthorizationStatusLine = async (origin, resolution, ctx, draftId, needsAgentDelivery) => {
-    const store = opts.chatSession;
+  const settleAuthorizationStatusLine = async (origin, resolution, ctx, draftId, needsAgentDelivery, storeFor) => {
+    const store = storeFor ? await storeFor().catch(() => null) : opts.chatSession;
     if (!store) return;
     const session = await store.getSession(origin).catch(() => null);
     if (!session) {
@@ -201404,7 +201511,8 @@ async function startOasisServer(opts) {
               notifyReviewResolved(
                 draftId,
                 { status: "approved", command, effectLabel: review.command.effectLabel, authorizedBy: actor, receipt },
-                { origin: review.origin, kind: "command", authorizedBy: actor, effectLabel: review.command.effectLabel, command }
+                { origin: review.origin, kind: "command", authorizedBy: actor, effectLabel: review.command.effectLabel, command },
+                chatStoreNowOrNull
               );
               res.writeHead(200, { "content-type": "application/json" }).end(
                 JSON.stringify({ applied: 1, command, artifactId, draftId, draftedBy: review.proposedBy, authorizedBy: actor })
@@ -201420,7 +201528,8 @@ async function startOasisServer(opts) {
               // 状态条要的两样也得进 resume 上下文（不能只放在 resolution 里）：`effectLabel` 是改图卡的
               // 「改动摘要」（= plan.reason，见 diagnosis 口径 1），`authorizedBy` 是「谁批的」。
               // kind 仍传下去让三分支自行判定；改图卡到落库那一步就收手，**不**打开 chat 续跑。
-              { origin: review.origin, kind: review.kind ?? "graph-edit", authorizedBy: actor, effectLabel: review.plan.reason }
+              { origin: review.origin, kind: review.kind ?? "graph-edit", authorizedBy: actor, effectLabel: review.plan.reason },
+              chatStoreNowOrNull
             );
             res.writeHead(200, { "content-type": "application/json" }).end(
               JSON.stringify({ ...result, draftId, draftedBy: review.proposedBy, authorizedBy: actor })
@@ -201463,7 +201572,8 @@ async function startOasisServer(opts) {
                 ...review.command?.effectLabel || review.plan.reason ? { effectLabel: review.command?.effectLabel || review.plan.reason } : {},
                 ...review.command?.command ? { command: review.command.command } : {},
                 ...reason !== void 0 ? { reason } : {}
-              }
+              },
+              chatStoreNowOrNull
             );
             res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ rejected: true, draftId, annotated: touched.length }));
           } catch (err) {
@@ -202035,7 +202145,8 @@ async function startOasisServer(opts) {
         }
         if (req.method === "POST" && /^\/api\/chat-sessions\/[^/]+\/append$/.test(url.pathname)) {
           const sid = decodeURIComponent(url.pathname.split("/")[3] ?? "");
-          const cs = await (await chatStoreNowOrNull())?.getSession(sid).catch(() => null) ?? null;
+          const perCompanyStore = await chatStoreNowOrNull();
+          const cs = await perCompanyStore?.getSession(sid).catch(() => null) ?? null;
           if (!cs || cs.humanActorId !== actor) {
             res.writeHead(404, { "content-type": "application/json" }).end(JSON.stringify({ error: "CHAT_SESSION_NOT_FOUND" }));
             return;
@@ -202059,13 +202170,14 @@ async function startOasisServer(opts) {
             res.writeHead(400, { "content-type": "application/json" }).end(JSON.stringify({ error: "EMPTY_TEXT" }));
             return;
           }
-          const result = await appendNowThroughQueue2(sid, text5, clientKey, insertAttachments);
+          const result = await appendNowThroughQueue2(sid, text5, clientKey, insertAttachments, perCompanyStore);
           res.writeHead(result.accepted ? 200 : 409, { "content-type": "application/json" }).end(JSON.stringify(result));
           return;
         }
         if (url.pathname === "/api/chat" && req.method === "POST") {
           try {
             const body2 = JSON.parse(rawBody);
+            const clientSubmitId = typeof body2.clientSubmitId === "string" && body2.clientSubmitId ? body2.clientSubmitId : void 0;
             if (!body2.message) throw new Error("\u7F3A\u5C11 message");
             const requestedModel = typeof body2.model === "string" && body2.model.trim() ? body2.model.trim() : null;
             if (requestedModel && !body2.chatSessionId) {
@@ -202286,6 +202398,14 @@ async function startOasisServer(opts) {
                 ...assistantMsgId ? { messageId: assistantMsgId } : {},
                 log: (m2) => console.warn(m2)
               });
+              try {
+                itemLedger.recordUserSubmission({
+                  text: persistedUserMessage,
+                  ...clientSubmitId ? { clientSubmitId } : {},
+                  ...effectiveAttachments.length ? { attachments: effectiveAttachments } : {}
+                });
+              } catch {
+              }
               const normalizedSource = typeof session.onNormalizedProviderEvent === "function" ? {
                 onNormalizedProviderEvent: session.onNormalizedProviderEvent.bind(session),
                 finishTurn: (signal) => session.finishNormalizedTurn?.(signal)
@@ -203078,7 +203198,11 @@ async function startOasisServer(opts) {
             try {
               meta = await fetchAppSelfMetadata({ appId, privateKeyPem });
             } catch (e) {
-              bad(400, /HTTP 401/.test(String(e)) ? "App ID \u4E0E\u79C1\u94A5\u5BF9\u4E0D\u4E0A\u2014\u2014\u786E\u8BA4 App ID \u6284\u81EA\u540C\u4E00\u4E2A App \u7684\u8BBE\u7F6E\u9875" : `GitHub \u62D2\u7EDD\u4E86\u8FD9\u5BF9\u51ED\u636E\uFF1A${String(e)}`);
+              const msg = String(e);
+              bad(
+                400,
+                /HTTP 401/.test(msg) ? "App ID \u4E0E\u79C1\u94A5\u5BF9\u4E0D\u4E0A\u2014\u2014\u786E\u8BA4 App ID \u6284\u81EA\u540C\u4E00\u4E2A App \u7684\u8BBE\u7F6E\u9875" : /私钥解析失败/.test(msg) ? msg.replace(/^Error:\s*/, "").replace(/^github app:\s*/, "") : `GitHub \u62D2\u7EDD\u4E86\u8FD9\u5BF9\u51ED\u636E\uFF1A${msg}`
+              );
               return;
             }
             const excess = excessAppPermissions(meta.permissions);
@@ -215077,14 +215201,19 @@ function lookupInMap(map, prefixKeys, candidates) {
   if (!prefix) return null;
   return map instanceof Map ? map.get(prefix) ?? null : map[prefix] ?? null;
 }
+function stripBracketTier(model) {
+  return model.replace(/\[[^\]]*\]/g, "").trim();
+}
 function modelCandidates(model) {
   const normalized4 = model.trim().toLowerCase();
   if (!normalized4) return [];
-  return [
+  const base = [
     normalized4,
     normalized4.includes(":") ? normalized4.slice(normalized4.lastIndexOf(":") + 1) : "",
     normalized4.includes("/") ? normalized4.slice(normalized4.lastIndexOf("/") + 1) : ""
   ].filter(Boolean);
+  const stripped = base.map(stripBracketTier).filter((m2) => m2 && !base.includes(m2));
+  return [...base, ...new Set(stripped)];
 }
 function setModelPriceCacheLoader(loader) {
   cacheLoader = loader;
@@ -215154,10 +215283,11 @@ function displayCostUsdMicros(model, usage) {
   if (estimated.currency === "USD") return estimated.micros;
   return Math.round(estimated.micros / DISPLAY_CNY_PER_USD);
 }
-var FOREIGN_MODEL_MARKUP, usd, cny, MODEL_PRICES, STATIC_PREFIX_PRICES, CACHE_TTL_MS2, dbPrices, dbPrefixKeys, cacheLoadedAt, cacheLoader, cacheRefreshInFlight, DISPLAY_CNY_PER_USD;
+var FOREIGN_MODEL_MARKUP, usd, cny, MODEL_PRICES, STATIC_PREFIX_PRICES, CACHE_TTL_MS2, dbPrices, dbPrefixKeys, cacheLoadedAt, cacheLoader, cacheRefreshInFlight;
 var init_model_pricing = __esm({
   "../server/src/domains/actors/model-pricing.ts"() {
     "use strict";
+    init_src();
     FOREIGN_MODEL_MARKUP = 1.08;
     usd = (inputPerMillion, outputPerMillion, cachedInputPerMillion) => ({
       currency: "USD",
@@ -215269,7 +215399,80 @@ var init_model_pricing = __esm({
     cacheLoadedAt = 0;
     cacheLoader = null;
     cacheRefreshInFlight = null;
-    DISPLAY_CNY_PER_USD = 7.2;
+  }
+});
+
+// ../server/src/domains/usage/accounting.ts
+function nonNegative(v2) {
+  return Math.max(v2 ?? 0, 0);
+}
+function resolvedModel(model) {
+  const trimmed = model?.trim();
+  return trimmed ? trimmed : null;
+}
+function splitByWeight(total, w2) {
+  const sum = w2.input + w2.cache + w2.output;
+  if (total === 0) return { input: 0, cache: 0, output: 0 };
+  if (sum <= 0) return { input: 0, cache: 0, output: total };
+  const input = Math.round(total * w2.input / sum);
+  const cache = Math.round(total * w2.cache / sum);
+  return { input, cache, output: total - input - cache };
+}
+function toDisplayUsd(currency, micros) {
+  return currency === "USD" ? micros : Math.round(micros / DISPLAY_CNY_PER_USD);
+}
+function accountUsage(model, usage) {
+  const resolved = resolvedModel(model);
+  if (!resolved || !usage) return null;
+  const input = nonNegative(usage.inputTokens);
+  const output = nonNegative(usage.outputTokens);
+  const cache = nonNegative(usage.cacheReadTokens) + nonNegative(usage.cacheCreationTokens);
+  const tokens = { input, cache, output, total: input + cache + output };
+  const estimated = estimateUsageCostBreakdown(resolved, usage);
+  const weights = estimated ? { input: estimated.inputMicros, cache: estimated.cacheMicros, output: estimated.outputMicros } : null;
+  const reported = Math.max(usage.costUsdMicros ?? 0, 0);
+  if (reported > 0) {
+    const parts = weights && estimated?.currency === "USD" ? splitByWeight(reported, weights) : { input: 0, cache: 0, output: reported };
+    return {
+      tokens,
+      currency: "USD",
+      amountMicros: reported,
+      parts,
+      displayUsdMicros: reported,
+      displayParts: parts,
+      source: "reported"
+    };
+  }
+  if (estimated && weights) {
+    const amount = weights.input + weights.cache + weights.output;
+    const displayUsdMicros = toDisplayUsd(estimated.currency, amount);
+    return {
+      tokens,
+      currency: estimated.currency,
+      amountMicros: amount,
+      parts: weights,
+      displayUsdMicros,
+      displayParts: estimated.currency === "USD" ? weights : splitByWeight(displayUsdMicros, weights),
+      source: "estimated"
+    };
+  }
+  return {
+    tokens,
+    currency: "USD",
+    amountMicros: 0,
+    parts: { input: 0, cache: 0, output: 0 },
+    displayUsdMicros: 0,
+    displayParts: { input: 0, cache: 0, output: 0 },
+    source: "unpriced"
+  };
+}
+function isUnpriced(account) {
+  return account.source === "unpriced" && account.tokens.total > 0;
+}
+var init_accounting = __esm({
+  "../server/src/domains/usage/accounting.ts"() {
+    "use strict";
+    init_model_pricing();
   }
 });
 
@@ -215284,55 +215487,44 @@ function emptyCostBreakdown() {
     outputCnyMicros: 0
   };
 }
-function resolvedModel(model) {
-  const trimmed = model?.trim();
-  return trimmed ? trimmed : null;
-}
-function addBreakdownParts(target, currency, parts) {
-  if (currency === "USD") {
-    target.inputUsdMicros += parts.inputMicros;
-    target.cacheUsdMicros += parts.cacheMicros;
-    target.outputUsdMicros += parts.outputMicros;
+function emptySummary() {
+  return {
+    tokenWeek: 0,
+    tokenWeekBreakdown: { input: 0, cache: 0, output: 0 },
+    costWeekUsdMicros: 0,
+    costWeekCnyMicros: 0,
+    costWeekBreakdown: emptyCostBreakdown(),
+    unpricedModels: []
+  };
+}
+function addAccount(target, account) {
+  target.tokenWeekBreakdown.input += account.tokens.input;
+  target.tokenWeekBreakdown.cache += account.tokens.cache;
+  target.tokenWeekBreakdown.output += account.tokens.output;
+  target.tokenWeek += account.tokens.total;
+  if (account.currency === "USD") {
+    target.costWeekUsdMicros += account.amountMicros;
+    target.costWeekBreakdown.inputUsdMicros += account.parts.input;
+    target.costWeekBreakdown.cacheUsdMicros += account.parts.cache;
+    target.costWeekBreakdown.outputUsdMicros += account.parts.output;
   } else {
-    target.inputCnyMicros += parts.inputMicros;
-    target.cacheCnyMicros += parts.cacheMicros;
-    target.outputCnyMicros += parts.outputMicros;
-  }
-}
-function addAlignedCost(target, totals, model, usage) {
-  const storedCost = Math.max(usage.costUsdMicros ?? 0, 0);
-  const estimated = estimateUsageCostBreakdown(model, usage);
-  if (storedCost > 0) {
-    if (estimated && estimated.currency === "USD") {
-      const estTotal = estimated.inputMicros + estimated.cacheMicros + estimated.outputMicros;
-      let inputMicros = 0;
-      let cacheMicros = 0;
-      let outputMicros = storedCost;
-      if (estTotal > 0) {
-        const scale = storedCost / estTotal;
-        inputMicros = Math.round(estimated.inputMicros * scale);
-        cacheMicros = Math.round(estimated.cacheMicros * scale);
-        outputMicros = storedCost - inputMicros - cacheMicros;
-      }
-      addBreakdownParts(target, "USD", { inputMicros, cacheMicros, outputMicros });
-    } else {
-      addBreakdownParts(target, "USD", { inputMicros: 0, cacheMicros: 0, outputMicros: storedCost });
-    }
-    totals.usd += storedCost;
-    return true;
+    target.costWeekCnyMicros += account.amountMicros;
+    target.costWeekBreakdown.inputCnyMicros += account.parts.input;
+    target.costWeekBreakdown.cacheCnyMicros += account.parts.cache;
+    target.costWeekBreakdown.outputCnyMicros += account.parts.output;
   }
-  if (estimated) {
-    const estTotal = estimated.inputMicros + estimated.cacheMicros + estimated.outputMicros;
-    addBreakdownParts(target, estimated.currency, {
-      inputMicros: estimated.inputMicros,
-      cacheMicros: estimated.cacheMicros,
-      outputMicros: estimated.outputMicros
-    });
-    if (estimated.currency === "USD") totals.usd += estTotal;
-    else totals.cny += estTotal;
-    return true;
+}
+function summarize2(rows) {
+  const out = emptySummary();
+  const unpriced = /* @__PURE__ */ new Set();
+  for (const row of rows) {
+    const account = accountUsage(row.model, row.usage);
+    if (!account) continue;
+    addAccount(out, account);
+    if (isUnpriced(account)) unpriced.add(resolvedModel(row.model));
   }
-  return false;
+  out.unpricedModels = [...unpriced].sort();
+  return out;
 }
 async function actorStats(actorId, opts = {}) {
   const now = opts.now ?? /* @__PURE__ */ new Date();
@@ -215366,118 +215558,43 @@ async function listWeeklyRuns(trace, actorId, from, to) {
   return out;
 }
 function summarizeWeeklyRuns(runs) {
-  let input = 0;
-  let cache = 0;
-  let output = 0;
-  const totals = { usd: 0, cny: 0 };
-  const costWeekBreakdown = emptyCostBreakdown();
-  const unpriced = /* @__PURE__ */ new Set();
-  for (const run of runs) {
-    const model = resolvedModel(run.effectiveModel);
-    if (!model) continue;
-    const usage = run.usage;
-    if (!usage) continue;
-    const inputTokens = Math.max(usage.inputTokens ?? 0, 0);
-    const outputTokens = Math.max(usage.outputTokens ?? 0, 0);
-    const cacheCreation = Math.max(usage.cacheCreationTokens ?? 0, 0);
-    const cacheRead = Math.max(usage.cacheReadTokens ?? 0, 0);
-    input += inputTokens;
-    cache += cacheCreation + cacheRead;
-    output += outputTokens;
-    const priced = addAlignedCost(costWeekBreakdown, totals, model, usage);
-    if (!priced && inputTokens + outputTokens + cacheCreation + cacheRead > 0) {
-      unpriced.add(model);
-    }
-  }
-  return {
-    tokenWeek: input + cache + output,
-    tokenWeekBreakdown: { input, cache, output },
-    costWeekUsdMicros: totals.usd,
-    costWeekCnyMicros: totals.cny,
-    costWeekBreakdown,
-    unpricedModels: [...unpriced].sort()
-  };
+  return summarize2(runs.map((run) => ({ model: run.effectiveModel, usage: run.usage })));
 }
 function summarizeWeeklyUsage(rows) {
-  let input = 0;
-  let cache = 0;
-  let output = 0;
-  const totals = { usd: 0, cny: 0 };
-  const costWeekBreakdown = emptyCostBreakdown();
-  const unpriced = /* @__PURE__ */ new Set();
-  for (const row of rows) {
-    const model = resolvedModel(row.effectiveModel);
-    if (!model) continue;
-    const inputTokens = Math.max(row.inputTokens, 0);
-    const outputTokens = Math.max(row.outputTokens, 0);
-    const cacheCreation = Math.max(row.cacheCreationTokens, 0);
-    const cacheRead = Math.max(row.cacheReadTokens, 0);
-    input += inputTokens;
-    cache += cacheCreation + cacheRead;
-    output += outputTokens;
-    const priced = addAlignedCost(costWeekBreakdown, totals, model, row);
-    if (!priced && inputTokens + outputTokens + cacheCreation + cacheRead > 0) {
-      unpriced.add(model);
-    }
-  }
-  return {
-    tokenWeek: input + cache + output,
-    tokenWeekBreakdown: { input, cache, output },
-    costWeekUsdMicros: totals.usd,
-    costWeekCnyMicros: totals.cny,
-    costWeekBreakdown,
-    unpricedModels: [...unpriced].sort()
-  };
+  return summarize2(rows.map((row) => ({ model: row.effectiveModel, usage: row })));
 }
 var init_stats = __esm({
   "../server/src/domains/actors/stats.ts"() {
     "use strict";
-    init_model_pricing();
+    init_accounting();
   }
 });
 
 // ../server/src/domains/actors/list-usage.ts
-function resolvedModel2(model) {
-  const m2 = (model ?? "").trim();
-  return m2 === "" ? null : m2;
-}
 function aggregateUsageByActor(runs) {
   const out = /* @__PURE__ */ new Map();
   const unpriced = /* @__PURE__ */ new Map();
   for (const run of runs) {
-    const model = resolvedModel2(run.effectiveModel);
-    if (!model) continue;
-    const usage = run.usage;
-    if (!usage) continue;
-    const inputTokens = Math.max(usage.inputTokens ?? 0, 0);
-    const outputTokens = Math.max(usage.outputTokens ?? 0, 0);
-    const cacheCreation = Math.max(usage.cacheCreationTokens ?? 0, 0);
-    const cacheRead = Math.max(usage.cacheReadTokens ?? 0, 0);
-    const cacheTokens = cacheCreation + cacheRead;
+    const account = accountUsage(run.effectiveModel, run.usage);
+    if (!account) continue;
     let acc = out.get(run.actorId);
     if (!acc) {
       acc = emptyActorUsageWeek();
       out.set(run.actorId, acc);
     }
-    acc.tokenWeekBreakdown.input += inputTokens;
-    acc.tokenWeekBreakdown.cache += cacheTokens;
-    acc.tokenWeekBreakdown.output += outputTokens;
-    acc.tokenWeek += inputTokens + cacheTokens + outputTokens;
-    const stored = Math.max(usage.costUsdMicros ?? 0, 0);
-    const estimated = estimateUsageCostBreakdown(model, usage);
-    if (stored > 0) {
-      acc.costWeekUsdMicros += stored;
-    } else if (estimated) {
-      const total = estimated.inputMicros + estimated.cacheMicros + estimated.outputMicros;
-      if (estimated.currency === "USD") acc.costWeekUsdMicros += total;
-      else acc.costWeekCnyMicros += total;
-    } else if (inputTokens + outputTokens + cacheTokens > 0) {
+    acc.tokenWeekBreakdown.input += account.tokens.input;
+    acc.tokenWeekBreakdown.cache += account.tokens.cache;
+    acc.tokenWeekBreakdown.output += account.tokens.output;
+    acc.tokenWeek += account.tokens.total;
+    if (account.currency === "USD") acc.costWeekUsdMicros += account.amountMicros;
+    else acc.costWeekCnyMicros += account.amountMicros;
+    if (isUnpriced(account)) {
       let set = unpriced.get(run.actorId);
       if (!set) {
         set = /* @__PURE__ */ new Set();
         unpriced.set(run.actorId, set);
       }
-      set.add(model);
+      set.add(resolvedModel(run.effectiveModel));
     }
   }
   for (const [actorId, models] of unpriced) {
@@ -215502,7 +215619,7 @@ var emptyActorUsageWeek;
 var init_list_usage = __esm({
   "../server/src/domains/actors/list-usage.ts"() {
     "use strict";
-    init_model_pricing();
+    init_accounting();
     emptyActorUsageWeek = () => ({
       tokenWeek: 0,
       tokenWeekBreakdown: { input: 0, cache: 0, output: 0 },
@@ -215626,7 +215743,7 @@ function eventToEntry(rec) {
     ...s2
   };
 }
-function summarize2(kind, payload) {
+function summarize3(kind, payload) {
   const p2 = payload;
   switch (kind) {
     case "report_gap":
@@ -215686,7 +215803,7 @@ async function actorActivity(source, actorId, limit = 50) {
     for await (const { op } of source.oplog.readAll()) {
       if (op.actor !== actorId) continue;
       total++;
-      matched.push({ at: op.timestamp, kind: op.kind, target: op.target, ...summarize2(op.kind, op.payload) });
+      matched.push({ at: op.timestamp, kind: op.kind, target: op.target, ...summarize3(op.kind, op.payload) });
       if (matched.length > capped) matched.shift();
     }
   } else {
@@ -222733,26 +222850,15 @@ function emptyUsage() {
   };
 }
 function usageOf(run) {
-  if (!run.effectiveModel?.trim()) return null;
-  const input = Math.max(run.usage.inputTokens ?? 0, 0);
-  const cache = Math.max(run.usage.cacheReadTokens ?? 0, 0) + Math.max(run.usage.cacheCreationTokens ?? 0, 0);
-  const output = Math.max(run.usage.outputTokens ?? 0, 0);
-  const tokens = input + cache + output;
-  const costUsdMicros = Math.max(run.usage.costUsdMicros ?? 0, 0);
-  const denominator = tokens || 1;
-  const inputCost = Math.round(costUsdMicros * input / denominator);
-  const cacheCost = Math.round(costUsdMicros * cache / denominator);
+  const account = accountUsage(run.effectiveModel, run.usage);
+  if (!account) return null;
   return {
-    input,
-    cache,
-    output,
-    tokens,
-    costUsdMicros,
-    costParts: {
-      input: inputCost,
-      cache: cacheCost,
-      output: costUsdMicros - inputCost - cacheCost
-    }
+    input: account.tokens.input,
+    cache: account.tokens.cache,
+    output: account.tokens.output,
+    tokens: account.tokens.total,
+    costUsdMicros: account.displayUsdMicros,
+    costParts: { ...account.displayParts }
   };
 }
 function addUsage(target, addition) {
@@ -222805,6 +222911,7 @@ function buildOrganizationUsageSummary(input) {
   const rows = /* @__PURE__ */ new Map();
   const total = emptyUsage();
   let unpricedRunCount = 0;
+  const unpricedModels = /* @__PURE__ */ new Set();
   const orgEmployees = /* @__PURE__ */ new Map();
   const orgEmployeeWorkorders = /* @__PURE__ */ new Map();
   const runtimeTotals = /* @__PURE__ */ new Map();
@@ -222820,6 +222927,8 @@ function buildOrganizationUsageSummary(input) {
       unpricedRunCount += 1;
       continue;
     }
+    const account = accountUsage(run.effectiveModel, run.usage);
+    if (account && isUnpriced(account)) unpricedModels.add(resolvedModel(run.effectiveModel));
     addUsage(total, usage);
     const key = bucketKey(formatter, run.startedAt, input.bucketKind);
     if (key) {
@@ -223012,7 +223121,8 @@ function buildOrganizationUsageSummary(input) {
     workorders: normalizedWorkorderRows,
     employees: employeeRows,
     runtimes: runtimeRows,
-    unpricedRunCount
+    unpricedRunCount,
+    unpricedModels: [...unpricedModels].sort()
   };
 }
 var UNASSIGNED_ID;
@@ -223020,6 +223130,7 @@ var init_organization_usage = __esm({
   "../server/src/domains/collab/organization-usage.ts"() {
     "use strict";
     init_workorders();
+    init_accounting();
     UNASSIGNED_ID = "__unassigned__";
   }
 });
@@ -225361,8 +225472,6 @@ function renderCoordinatorView(view, taskBackground) {
     "unavailable"
   ];
   const attemptStates = [
-    "waiting",
-    "ready",
     "running",
     "stalled",
     "succeeded",
@@ -225374,7 +225483,12 @@ function renderCoordinatorView(view, taskBackground) {
     workStates,
     (state) => view.nodes.filter((node2) => node2.work.state === state).length
   );
-  const attemptProgress = visibleCounts(attemptStates, (state) => view.progress[state]);
+  const noAttemptCount = view.nodes.filter((node2) => node2.nodeState === null).length;
+  const attemptCounts = visibleCounts(attemptStates, (state) => view.progress[state]);
+  const attemptProgress = [
+    attemptCounts === "none" ? "" : attemptCounts,
+    noAttemptCount > 0 ? `\u65E0 attempt \u8BB0\u5F55 ${noAttemptCount}` : ""
+  ].filter(Boolean).join("; ") || "none";
   const lines = [
     "# Coordinator View",
     "",
@@ -225390,12 +225504,16 @@ function renderCoordinatorView(view, taskBackground) {
     "## Nodes"
   ];
   for (const node2 of view.nodes) {
+    lines.push(`### ${node2.title} (${node2.nodeId})`);
+    if (node2.sealed) lines.push(`- \u8282\u70B9: sealed(${node2.sealed.reason})`);
     lines.push(
-      `### ${node2.title} (${node2.nodeId})`,
       `- Work: ${node2.work.state}; Version: ${renderWorkVersion(node2.work)}`,
-      `- Attempt: ${node2.status}; continuity: ${node2.nodeState}; number: ${node2.attemptNo || "none"}`,
+      // nodeState === null 说的是「账本里没有这条记录」，不是「没在跑」——它和上面那行 Work 状态
+      // 必须并排出现：线上确有 Work running 而执行账本零 attempt 行的工单（ws:wo-9dc06583）。
+      node2.nodeState === null ? "- Attempt: \u6267\u884C\u8D26\u672C\u4E2D\u65E0 attempt \u8BB0\u5F55" : `- Attempt: ${node2.status}; continuity: ${node2.nodeState}; number: ${node2.attemptNo || "none"}`,
       `- Actor: ${node2.actorId ?? "unassigned"}; role: ${node2.role ?? "unassigned"}`
     );
+    if (node2.dependsOn.length > 0) lines.push(`- Depends on: ${node2.dependsOn.join(", ")}`);
     if (node2.conclusion?.trim()) lines.push(`- Conclusion: ${node2.conclusion.trim()}`);
     if (node2.recoverySource) {
       const source = node2.recoverySource;
@@ -225413,7 +225531,6 @@ function renderCoordinatorView(view, taskBackground) {
       }
       for (const risk of source.recoveryHandoff?.risks ?? []) lines.push(`    - Recovery risk: ${risk}`);
     }
-    if (node2.blockedBy.length > 0) lines.push(`- Blocked by: ${node2.blockedBy.join(", ")}`);
     if (node2.progress) {
       lines.push(`- Latest checkpoint: ${node2.progress.recoverability} at ${node2.progress.lastCheckpointAt}`);
       for (const step of node2.progress.pendingSteps) lines.push(`  - Pending: ${step}`);
@@ -225430,7 +225547,12 @@ function renderCoordinatorView(view, taskBackground) {
       ...node2.unresolvedIssues.map((value2) => `[unresolved] ${value2}`),
       ...node2.risks.map((value2) => `[risk] ${value2}`),
       ...node2.verificationGaps.map((value2) => `[verification] ${value2}`),
-      ...node2.nextActions.map((value2) => `[next] ${value2}`)
+      // [next] 只给 Agent 亲手写的下一步。system_reconstructed 的 nextActions 是系统从
+      // checkpoint.pendingSteps 抄回来的残留：节点已经跑成功了，那几条早就做完，却和 Agent 的计划
+      // 长得一模一样（ws:wo-ecce337b 的 smoke 节点五条「下一步」全是这么来的），协调者会当成还有活干。
+      // 同一道 handoffProducer === "agent" 判断，上面的 Technical notes 本来就有，这里之前漏了。
+      // 真正在跑/卡住的节点不会因此丢信息：那些 pendingSteps 由 node.progress 走 `- Pending:` 出。
+      ...node2.handoffProducer === "agent" ? node2.nextActions.map((value2) => `[next] ${value2}`) : []
     ];
     if (openItems.length > 0) {
       lines.push("- Open items:");
@@ -225438,10 +225560,7 @@ function renderCoordinatorView(view, taskBackground) {
     }
     lines.push("");
   }
-  lines.push("## Dependency blocks (Attempt continuity)");
-  if (view.dependencyBlocks.length === 0) lines.push("- None");
-  for (const block of view.dependencyBlocks) lines.push(`- ${block.nodeId} blocks: ${block.blocks.join(", ")}`);
-  lines.push("", "## Attention items");
+  lines.push("## Attention items");
   const unavailableWorkCount = view.nodes.filter((node2) => node2.work.state === "unavailable").length;
   const workAttention = view.nodes.filter((node2) => node2.work.state === "failed" || node2.work.state === "dead" || node2.work.state === "retry");
   if (unavailableWorkCount > 0) {
@@ -225452,8 +225571,7 @@ function renderCoordinatorView(view, taskBackground) {
       `- Work ${node2.nodeId} [${node2.work.state}]: current head ${node2.work.currentWorkId ?? "none"}; delivered ${node2.work.acceptedWorkId ?? "none"}.`
     );
   }
-  if (unavailableWorkCount === 0 && workAttention.length === 0 && view.todo.length === 0) lines.push("- None");
-  for (const item of view.todo) lines.push(`- Attempt P${item.priority} ${item.nodeId} [${item.nodeState}]: ${item.action}`);
+  if (unavailableWorkCount === 0 && workAttention.length === 0) lines.push("- None");
   return `${lines.join("\n")}
 `;
 }
@@ -225541,50 +225659,18 @@ function stateFromAttempt(attempt, handoff, checkpoint, now, stalledAfterMs, ope
   if (attempt.status === "no-output") return handoff?.unresolvedIssues.length ? "blocked" : "no_change";
   return "failed";
 }
-function reverseEdges(nodes) {
-  const out = /* @__PURE__ */ new Map();
-  for (const node2 of nodes) for (const upstream of node2.dependsOn) out.set(upstream, [...out.get(upstream) ?? [], node2.nodeId]);
-  return out;
-}
-function waitingDescendants(source, reverse, states) {
-  const found = /* @__PURE__ */ new Set();
-  const queue = [...reverse.get(source) ?? []];
-  while (queue.length) {
-    const nodeId = queue.shift();
-    if (found.has(nodeId) || states.get(nodeId) !== "waiting") continue;
-    found.add(nodeId);
-    queue.push(...reverse.get(nodeId) ?? []);
-  }
-  return [...found].sort();
-}
-function todoAction(node2) {
-  if (node2.handoffProducer === "agent" && node2.nextActions[0]) return `Agent Handoff: ${node2.nextActions[0]}`;
-  if (node2.nodeState === "ready") return "\u8282\u70B9 ready\uFF0C\u7B49\u5F85\u8C03\u5EA6";
-  if (node2.nodeState === "blocked" && node2.unresolvedIssues[0]) return `\u8282\u70B9 blocked\uFF1A${node2.unresolvedIssues[0]}`;
-  if (!node2.progress) return `\u8282\u70B9 ${node2.nodeState}\uFF0C\u65E0 checkpoint`;
-  if (node2.progress.recoverability === "full") return `\u8282\u70B9 ${node2.nodeState}\uFF0Ccheckpoint \u5B8C\u6574\u53EF\u6062\u590D`;
-  if (node2.progress.recoverability === "partial") return `\u8282\u70B9 ${node2.nodeState}\uFF0Ccheckpoint \u90E8\u5206\u53EF\u6062\u590D\uFF0C\u9700\u5173\u6CE8\u5DF2\u6709\u4EA7\u51FA`;
-  return `\u8282\u70B9 ${node2.nodeState}\uFF0Ccheckpoint \u4E0D\u53EF\u6062\u590D`;
-}
-var import_node_crypto56, DONE_STATES, BLOCKING_STATES, HANDOFF_OUTCOMES2, RESUME_EXTERNAL_EFFECT_LIMIT, RESUME_SNAPSHOT_PREFIX, RESUME_SNAPSHOT_SUFFIX, TODO_RANK, ExecutionContinuityService;
+var import_node_crypto56, BLOCKING_STATES, HANDOFF_OUTCOMES2, RESUME_EXTERNAL_EFFECT_LIMIT, RESUME_SNAPSHOT_PREFIX, RESUME_SNAPSHOT_SUFFIX, ExecutionContinuityService;
 var init_service8 = __esm({
   "../server/src/domains/execution-continuity/service.ts"() {
     "use strict";
     init_src();
     import_node_crypto56 = require("node:crypto");
     init_src5();
-    DONE_STATES = /* @__PURE__ */ new Set(["succeeded", "no_change"]);
     BLOCKING_STATES = /* @__PURE__ */ new Set(["stalled", "failed", "blocked"]);
     HANDOFF_OUTCOMES2 = /* @__PURE__ */ new Set(["succeeded", "no-output", "failed", "cancelled", "timeout", "orphaned"]);
     RESUME_EXTERNAL_EFFECT_LIMIT = 20;
     RESUME_SNAPSHOT_PREFIX = "<!-- oasis-resume-pack-snapshot:v1:";
     RESUME_SNAPSHOT_SUFFIX = " -->";
-    TODO_RANK = {
-      stalled: 0,
-      failed: 1,
-      blocked: 2,
-      ready: 3
-    };
     ExecutionContinuityService = class {
       mode;
       store;
@@ -225857,10 +225943,6 @@ var init_service8 = __esm({
           const attempt = latest.get(node2.nodeId);
           if (attempt) stateByNode.set(node2.nodeId, stateFromAttempt(attempt, handoffs.get(attempt.id) ?? null, checkpoints.get(attempt.id) ?? null, this.now(), this.stalledAfterMs));
         }
-        for (const node2 of graph) {
-          if (stateByNode.has(node2.nodeId)) continue;
-          stateByNode.set(node2.nodeId, node2.dependsOn.every((id) => DONE_STATES.has(stateByNode.get(id) ?? "waiting")) ? "ready" : "waiting");
-        }
         const nodes = graph.map((node2) => {
           const attempt = latest.get(node2.nodeId) ?? null;
           const handoff = attempt ? handoffs.get(attempt.id) ?? null : null;
@@ -225873,10 +225955,10 @@ var init_service8 = __esm({
             recoveryCheckpoint: recoverySnapshot.latestCheckpoint,
             recoveryHandoff: recoverySnapshot.previousHandoff
           } : null;
-          const nodeState = stateByNode.get(node2.nodeId);
+          const nodeState = stateByNode.get(node2.nodeId) ?? null;
           const wasRecovered = recoverySource !== null;
-          const executionState = wasRecovered && nodeState === "failed" ? "recovery_failed" : BLOCKING_STATES.has(nodeState) ? "awaiting_coordinator" : wasRecovered ? "recovered" : nodeState === "running" ? "running" : null;
-          const includeProgress = checkpoint && ["running", "stalled", "blocked", "failed"].includes(nodeState);
+          const executionState = wasRecovered && nodeState === "failed" ? "recovery_failed" : nodeState !== null && BLOCKING_STATES.has(nodeState) ? "awaiting_coordinator" : wasRecovered ? "recovered" : nodeState === "running" ? "running" : null;
+          const includeProgress = checkpoint && nodeState !== null && ["running", "stalled", "blocked", "failed"].includes(nodeState);
           return {
             nodeId: node2.nodeId,
             title: node2.title,
@@ -225903,18 +225985,15 @@ var init_service8 = __esm({
               recoverability: checkpoint.recoverability,
               lastCheckpointAt: checkpoint.createdAt
             } } : {},
-            blockedBy: nodeState === "waiting" ? node2.dependsOn.filter((id) => !DONE_STATES.has(stateByNode.get(id) ?? "waiting")) : [],
+            sealed: facts?.sealed ?? null,
+            // 纯透传的图事实，零派生：不看 attempt、不判断谁在等谁。见 CoordinatorNodeView.dependsOn。
+            dependsOn: node2.dependsOn,
             // 纯透传（展示层事实，见 CoordinatorNodeView.work/conclusion）。不参与本方法里任何
-            // Attempt nodeState / todo / dependencyBlocks / collaborationStatus 的派生。
+            // Attempt nodeState 的派生。
             ...facts?.conclusion?.trim() ? { conclusion: facts.conclusion.trim() } : {}
           };
         });
-        const reverse = reverseEdges(graph);
-        const dependencyBlocks = nodes.filter((node2) => BLOCKING_STATES.has(node2.nodeState)).map((node2) => ({ nodeId: node2.nodeId, blocks: waitingDescendants(node2.nodeId, reverse, stateByNode) })).filter((item) => item.blocks.length > 0).sort((a, b2) => b2.blocks.length - a.blocks.length || a.nodeId.localeCompare(b2.nodeId));
-        const todos = nodes.filter((node2) => node2.nodeState === "stalled" || node2.nodeState === "failed" || node2.nodeState === "blocked" || node2.nodeState === "ready").sort((a, b2) => TODO_RANK[a.nodeState] - TODO_RANK[b2.nodeState] || a.nodeId.localeCompare(b2.nodeId)).map((node2, index2) => ({ priority: index2 + 1, nodeId: node2.nodeId, nodeState: node2.nodeState, action: todoAction(node2) }));
         const progress = Object.fromEntries([
-          "waiting",
-          "ready",
           "running",
           "stalled",
           "succeeded",
@@ -225922,8 +226001,7 @@ var init_service8 = __esm({
           "blocked",
           "failed"
         ].map((state) => [state, nodes.filter((node2) => node2.nodeState === state).length]));
-        const collaborationStatus = nodes.length > 0 && nodes.every((node2) => DONE_STATES.has(node2.nodeState)) ? "completed" : nodes.some((node2) => BLOCKING_STATES.has(node2.nodeState)) ? "needs_coordination" : "in_progress";
-        return { workOrderId, mode: this.mode, collaborationStatus, progress, nodes, dependencyBlocks, todo: todos };
+        return { workOrderId, mode: this.mode, progress, nodes };
       }
     };
   }
@@ -226242,9 +226320,11 @@ function nodeCoordinatorFactsFromSnapshot(snapshot) {
     };
     const accepted = node2.latestAcceptId ? workById.get(node2.latestAcceptId) : void 0;
     const conclusion = accepted?.conclusion?.trim() || snapshot.works.filter((work2) => work2.nodeId === node2.id && work2.status === "success" && work2.conclusion?.trim()).sort((a, b2) => a.createdAt.localeCompare(b2.createdAt)).at(-1)?.conclusion?.trim();
+    const sealed = node2.cancelledAt ? { reason: node2.sealReason ?? "cancelled", at: node2.cancelledAt } : null;
     out[node2.id] = {
       work,
-      ...conclusion ? { conclusion } : {}
+      ...conclusion ? { conclusion } : {},
+      sealed
     };
   }
   return out;
@@ -226660,6 +226740,33 @@ function mapChatItemToSnapshotEntry(row) {
     payload: row.payload
   };
 }
+function synthesizeMessageItem(msg, seq) {
+  const attachments = Array.isArray(msg.attachments) ? msg.attachments.map((a) => ({
+    name: a.name,
+    ...a.blobRef !== void 0 ? { blobRef: a.blobRef } : {},
+    ...a.contentType !== void 0 ? { contentType: a.contentType } : {}
+  })) : void 0;
+  const clientSubmitId = typeof msg.clientSubmitId === "string" ? msg.clientSubmitId : void 0;
+  const role = msg.role === "user" || msg.role === "system" ? msg.role : "assistant";
+  const status = msg.status === "running" ? "streaming" : msg.status === "error" ? "failed" : "completed";
+  return {
+    itemId: `chat-message:${msg.id}`,
+    turnId: msg.runId ?? `chat-message-turn:${msg.id}`,
+    itemType: "message",
+    role,
+    status,
+    itemVersion: 0,
+    seq,
+    messageId: msg.id,
+    updatedAt: msg.completedAt ?? msg.createdAt,
+    payload: {
+      role,
+      text: msg.content ?? "",
+      ...attachments?.length ? { attachments } : {},
+      ...clientSubmitId ? { clientSubmitId } : {}
+    }
+  };
+}
 function throwWorkdirError(code2) {
   switch (code2) {
     case "PATH_ESCAPE":
@@ -226929,6 +227036,24 @@ function createChatSessionsDomain(opts) {
       }
       const snapshotEntries = [];
       let nextSinceVersion = sinceVersion;
+      const HISTORY_TURNS = 12;
+      const historicalEntries = [];
+      if (sinceVersion === 0) {
+        const listRecentTurns2 = store2.listRecentTurns;
+        const messages = listRecentTurns2 ? (await listRecentTurns2.call(store2, chatSessionId, HISTORY_TURNS).catch(() => ({ messages: [], hasMoreBefore: false }))).messages : windowMessagesByTurns(await store2.listMessages(chatSessionId).catch(() => []), HISTORY_TURNS).messages;
+        const coveredMessageIds = /* @__PURE__ */ new Set();
+        for (const msg of messages) {
+          if (!msg.id) continue;
+          const rows = await items.listItemsByMessage(msg.id).catch(() => []);
+          if (rows.length > 0) coveredMessageIds.add(msg.id);
+        }
+        let syntheticSeq = 0;
+        for (const msg of messages) {
+          if (!msg.id || coveredMessageIds.has(msg.id)) continue;
+          syntheticSeq += 1;
+          historicalEntries.push(synthesizeMessageItem(msg, syntheticSeq));
+        }
+      }
       if (turnId) {
         const rows = await items.listItemsByTurn(chatSessionId, turnId, { sinceTurnVersion: sinceVersion }).catch(() => []);
         for (const row of rows) {
@@ -226939,7 +227064,8 @@ function createChatSessionsDomain(opts) {
       const body2 = {
         chatSessionId,
         turnId,
-        items: snapshotEntries,
+        // 历史合成条在前，active turn 的 chat_items 在后——顺序即桶排序，桶按 seq 单调排列。
+        items: [...historicalEntries, ...snapshotEntries],
         nextSinceVersion,
         frameCursor: cursor ? { epoch: cursor.epoch, seq: cursor.seq } : { epoch: 0, seq: 0 },
         canAppend: cursor?.canAppend ?? false
@@ -227047,7 +227173,11 @@ function createChatSessionsDomain(opts) {
       };
       const wkKernel = opts.kernel;
       const allSummaries = buildWorkorderSummaries(wkKernel.model, resolver2, (wo) => byWo.get(wo) ?? null, (wo) => held.has(wo), void 0, void 0, (role) => wkKernel.actorForRole(role));
-      const items = allSummaries.filter((s2) => workOrderIds.includes(s2.id));
+      const summaryById = new Map(allSummaries.map((s2) => [s2.id, s2]));
+      const items = [...workOrderIds].reverse().flatMap((id) => {
+        const s2 = summaryById.get(id);
+        return s2 ? [s2] : [];
+      });
       return { status: 200, body: { items } };
     });
     router.get("/api/chat-broadcasts/pending", async (req) => {
@@ -230065,7 +230195,7 @@ function automationsDomain(opts) {
     }
     return out;
   };
-  const summarize3 = async (automation, req) => {
+  const summarize4 = async (automation, req) => {
     const [triggers, recent, canWrite] = await Promise.all([
       service.listTriggers(automation.id),
       service.listRuns(automation.id, { limit: RECENT_LIMIT2 }),
@@ -230158,13 +230288,13 @@ function automationsDomain(opts) {
     router.get("/api/automations", async (req) => {
       const includeArchived = req.query.get("includeArchived") === "1";
       const automations = await service.listAutomations(companyOf(req), { includeArchived });
-      const items = await Promise.all(automations.map((a) => summarize3(a, req)));
+      const items = await Promise.all(automations.map((a) => summarize4(a, req)));
       const body2 = { items };
       return { status: 200, body: body2 };
     });
     router.get("/api/automations/:id", async (req) => {
       const automation = await mustGet(req);
-      return { status: 200, body: await summarize3(automation, req) };
+      return { status: 200, body: await summarize4(automation, req) };
     });
     router.get("/api/automations/:id/runs", async (req) => {
       const automation = await mustGet(req);
@@ -230244,7 +230374,7 @@ function automationsDomain(opts) {
         ...triggers !== void 0 ? { triggers } : {}
       });
       const withTarget = createTargetSession ? await service.createChatTargetSession(created, req.auth.actor) : created;
-      return { status: 201, body: await summarize3(withTarget, req) };
+      return { status: 201, body: await summarize4(withTarget, req) };
     });
     router.patch("/api/automations/:id", async (req) => {
       const automation = await mustGet(req);
@@ -230291,7 +230421,7 @@ function automationsDomain(opts) {
         },
         req.auth.actor
       );
-      return { status: 200, body: await summarize3(updated, req) };
+      return { status: 200, body: await summarize4(updated, req) };
     });
     router.post("/api/automations/:id/chat-target-session", async (req) => {
       const automation = await mustGet(req);
@@ -230305,7 +230435,7 @@ function automationsDomain(opts) {
       if (!owner) throw new ApiError(400, "CHAT_TARGET_NO_OWNER", "\u89E3\u6790\u4E0D\u5230\u4EBA\u7C7B\u5F52\u5C5E\u8005\uFF0C\u65E0\u6CD5\u5EFA\u957F\u671F\u76EE\u6807\u4F1A\u8BDD");
       const withOwner = automation.ownerHumanActorId ? automation : await service.updateAutomation(automation.id, { ownerHumanActorId: owner }, req.auth.actor);
       const updated = await service.createChatTargetSession(withOwner, req.auth.actor);
-      return { status: 201, body: await summarize3(updated, req) };
+      return { status: 201, body: await summarize4(updated, req) };
     });
     router.post("/api/automations/:id/enabled", async (req) => {
       const automation = await mustGet(req);
@@ -230313,7 +230443,7 @@ function automationsDomain(opts) {
       const b2 = req.body ?? {};
       if (typeof b2.enabled !== "boolean") throw new ApiError(400, "BAD_REQUEST", "\u7F3A\u5C11 enabled\uFF08boolean\uFF09");
       const updated = await service.setEnabled(automation.id, b2.enabled, req.auth.actor);
-      return { status: 200, body: await summarize3(updated, req) };
+      return { status: 200, body: await summarize4(updated, req) };
     });
     router.post("/api/automations/:id/run-now", async (req) => {
       const automation = await mustGet(req);
@@ -232609,10 +232739,11 @@ ${ctx.nodeFault}
           ``,
           `## \u5B8C\u6574\u5DE5\u5355\u4E0A\u4E0B\u6587\u4E0E\u5168\u5C40\u6267\u884C\u72B6\u6001\uFF08\u5148\u8BFB \`execution/COORDINATOR_VIEW.md\`\uFF09`,
           `\u90A3\u4EFD\u6587\u4EF6\u5148\u7ED9\u51FA\u6743\u5A01\u4EFB\u52A1\u80CC\u666F\uFF08\u5B8C\u6574 brief \u6B63\u6587\u3001\u76EE\u6807\u3001\u9A8C\u6536\u6807\u51C6\u3001\u8303\u56F4/\u8303\u56F4\u5916\u4E8B\u9879\u3001\u7EA6\u675F\u548C\u7248\u672C\u6765\u6E90\uFF09\uFF0C`,
-          `\u518D\u7ED9\u51FA\u672C\u5DE5\u5355**\u6240\u6709\u8282\u70B9**\u7684\u4E00\u6B21\u6027\u5FEB\u7167\uFF1A\u5404\u8282\u70B9\u72B6\u6001\u3001\u5361\u5728\u8C01\u8EAB\u4E0A\u3001\u5DF2\u4EA4\u4ED8\u7684\u8282\u70B9\u4EA4\u4E86\u4EC0\u4E48`,
-          `\uFF08Conclusion = \u5DF2\u4EA4\u4ED8\u7248\u672C\u7684\u4E1A\u52A1\u5B8C\u6210\u6458\u8981\uFF09\u3001\u52A8\u4E86\u54EA\u4E9B\u4EA7\u7269\u4E0E\u7248\u672C\u3001\u4EE5\u53CA\u975E\u963B\u585E\u5F00\u653E\u9879\u3002`,
+          `\u518D\u7ED9\u51FA\u672C\u5DE5\u5355**\u6240\u6709\u8282\u70B9**\u7684\u4E00\u6B21\u6027\u4E8B\u5B9E\u5FEB\u7167\uFF1A\u6BCF\u4E2A\u8282\u70B9\u7684 Work \u72B6\u6001\u4E0E\u4EA4\u4ED8\u7248\u672C\u3001\u6700\u8FD1\u4E00\u8D9F Attempt`,
+          `\u8DD1\u6210\u4EC0\u4E48\u6837\u3001\u8282\u70B9\u662F\u5426\u5DF2\u79BB\u573A\uFF08sealed\uFF09\u3001\u5DF2\u4EA4\u4ED8\u7684\u8282\u70B9\u4EA4\u4E86\u4EC0\u4E48\uFF08Conclusion = \u5DF2\u4EA4\u4ED8\u7248\u672C\u7684\u4E1A\u52A1`,
+          `\u5B8C\u6210\u6458\u8981\uFF09\u3001\u52A8\u4E86\u54EA\u4E9B\u4EA7\u7269\u4E0E\u7248\u672C\uFF0C\u4EE5\u53CA\u5F00\u653E\u9879\u3002`,
           `\u82E5\u6587\u4EF6\u660E\u786E\u5199\u7740\u67D0\u9879\u672A\u63D0\u4F9B\u6216\u6B63\u6587\u4E0D\u53EF\u8BFB\uFF0C\u4E0D\u8981\u81EA\u884C\u8865\u9020\uFF1B\u7248\u672C\u4E0D\u4E00\u81F4\u65F6\u4FDD\u7559\u5DEE\u5F02\u5E76\u5411\u4EBA\u8BF4\u660E\u3002`,
-          `\u5224\u300C\u771F\u6B7B\u9501\u8FD8\u662F\u5065\u5EB7\u7B49\u5F85\u300D\u4E4B\u524D\u5148\u770B\u5B83\u2014\u2014\u53EA\u770B\u672C\u8282\u70B9\u90BB\u57DF\u5BB9\u6613\u628A\u300C\u4E0A\u6E38\u6B63\u5E38\u5728\u4EA7\u300D\u8BEF\u5224\u6210\u5361\u4F4F\u3002`,
+          `\u5B83\u53EA\u9648\u8FF0\u4E8B\u5B9E\uFF0C\u4E0D\u542B\u7CFB\u7EDF\u7ED9\u51FA\u7684\u4F18\u5148\u7EA7\u3001\u5F85\u529E\u6216\u5904\u7F6E\u5EFA\u8BAE\u2014\u2014\u600E\u4E48\u5904\u7F6E\u7531\u4F60\u5224\u65AD\u3002`,
           `Technical notes \u53EA\u8865\u5145 Agent \u7684\u6280\u672F\u4EA4\u63A5\uFF1BExecution diagnostic \u53EA\u8BF4\u660E\u4F1A\u8BDD\u600E\u4E48\u7ED3\u675F\uFF0C\u4E8C\u8005\u90FD\u4E0D\u66FF\u4EE3 Conclusion\u3002`,
           ``
         ].join("\n") : task;
@@ -243954,6 +244085,9 @@ var init_company_owned_registry_store = __esm({
 });
 
 // ../storage/src/tenant-cutover.ts
+function maxGate(a, b2) {
+  return GATE_RANK[a] >= GATE_RANK[b2] ? a : b2;
+}
 function rowToCutover(row) {
   return {
     companyId: row.company_id,
@@ -243966,7 +244100,7 @@ function rowToCutover(row) {
     updatedAt: new Date(row.updated_at).toISOString()
   };
 }
-var COMPANY_DATA_BUNDLES, LEGAL, CutoverIllegalTransitionError, CutoverGateOpenRollbackError, TenantCutoverStore;
+var COMPANY_DATA_BUNDLES, LEGAL, GATE_RANK, CutoverIllegalTransitionError, CutoverGateOpenRollbackError, TenantCutoverStore;
 var init_tenant_cutover = __esm({
   "../storage/src/tenant-cutover.ts"() {
     "use strict";
@@ -243989,6 +244123,12 @@ var init_tenant_cutover = __esm({
       frozen: ["company-primary", "legacy"],
       "company-primary": ["legacy"]
     };
+    GATE_RANK = {
+      "gate-closed": 0,
+      "gate-open": 1,
+      "contract-ready": 2,
+      contracted: 3
+    };
     CutoverIllegalTransitionError = class extends Error {
       constructor(from, to) {
         super(`\u975E\u6CD5\u5207\u6362 ${from} \u2192 ${to}`);
@@ -244090,19 +244230,37 @@ var init_tenant_cutover = __esm({
         }
         return rowToCutover(r.rows[0]);
       }
+      /**
+       * 该 bundle 的 **bundle-global** gate（ADR §7.1）：取这个 bundle 所有公司行里到过的最高档。
+       *
+       * 为什么不能只看单行：`markBundlePrimary` 给新公司插的行硬编 `gate-closed`，于是
+       * 「gate 已经全局打开、之后新建的公司」那一行是 gate-closed —— 拿它判回滚，就会
+       * **放行一次本该被永久禁止的回滚**（2026-09-04 生产实测：21 家 09-03 之后建的公司
+       * 在 skills 已 gate-open 的情况下，行上仍是 gate-closed）。
+       */
+      async bundleGate(bundle) {
+        const r = await this.pool.query(
+          `SELECT DISTINCT gate FROM ${this.s}.tenant_storage_cutover WHERE bundle=$1`,
+          [bundle]
+        );
+        let g2 = "gate-closed";
+        for (const row of r.rows) g2 = maxGate(g2, row.gate);
+        return g2;
+      }
       async casTransition(companyId, bundle, expectedEpoch, to, opts) {
         const cur = await this.get(companyId, bundle);
         if (cur.epoch !== expectedEpoch) {
           throw new Error(`cutover epoch \u4E0D\u5339\u914D\uFF1A\u671F\u671B ${expectedEpoch} \u5B9E\u9645 ${cur.epoch}`);
         }
-        if (to === "legacy" && (cur.gate === "gate-open" || cur.gate === "contract-ready" || cur.gate === "contracted")) {
+        const globalGate = maxGate(cur.gate, await this.bundleGate(bundle));
+        if (to === "legacy" && globalGate !== "gate-closed") {
           throw new CutoverGateOpenRollbackError();
         }
         if (cur.state !== to && !LEGAL[cur.state].includes(to)) {
           throw new CutoverIllegalTransitionError(cur.state, to);
         }
         const nextEpoch = cur.epoch + 1;
-        const gate = opts.gate ?? cur.gate;
+        const gate = maxGate(opts.gate ?? cur.gate, globalGate);
         const now = (/* @__PURE__ */ new Date()).toISOString();
         const updated = await this.pool.query(
           `INSERT INTO ${this.s}.tenant_storage_cutover
@@ -244125,28 +244283,44 @@ var init_tenant_cutover = __esm({
        * 与 markNewCompanyPrimary 的区别：那个是整包切，只对全新空公司成立；这个按 bundle 逐个来。
        */
       async markBundlePrimary(companyId, bundle, operator) {
+        const gate = await this.bundleGate(bundle);
         const r = await this.pool.query(
           `INSERT INTO ${this.s}.tenant_storage_cutover
          (company_id, bundle, state, epoch, gate, manifest_generation, journal_hwm, updated_at)
-       VALUES ($1,$2,'company-primary',1,'gate-closed',0,0,$3)
+       VALUES ($1,$2,'company-primary',1,$4,0,0,$3)
        ON CONFLICT (company_id, bundle) DO NOTHING`,
-          [companyId, bundle, (/* @__PURE__ */ new Date()).toISOString()]
+          [companyId, bundle, (/* @__PURE__ */ new Date()).toISOString(), gate]
         );
         return (r.rowCount ?? 0) > 0;
       }
-      /** 新公司：所有 4c bundle 直接 company-primary。 */
+      /** 新公司：所有 4c bundle 直接 company-primary（各自继承该 bundle 的全局 gate）。 */
       async markNewCompanyPrimary(companyId, operator) {
         for (const bundle of COMPANY_DATA_BUNDLES) {
           const now = (/* @__PURE__ */ new Date()).toISOString();
+          const gate = await this.bundleGate(bundle);
           await this.pool.query(
             `INSERT INTO ${this.s}.tenant_storage_cutover
            (company_id, bundle, state, epoch, gate, manifest_generation, journal_hwm, updated_at)
-         VALUES ($1,$2,'company-primary',1,'gate-closed',0,0,$3)
+         VALUES ($1,$2,'company-primary',1,$4,0,0,$3)
          ON CONFLICT (company_id, bundle) DO NOTHING`,
-            [companyId, bundle, now]
+            [companyId, bundle, now, gate]
           );
         }
       }
+      /**
+       * 把该 bundle 里落后于全局档的 gate 列一次性归一（修存量的 gate-closed 残行）。
+       * 只推进、绝不回退；返回被改的行数。
+       */
+      async normalizeBundleGate(bundle) {
+        const gate = await this.bundleGate(bundle);
+        if (gate === "gate-closed") return 0;
+        const r = await this.pool.query(
+          `UPDATE ${this.s}.tenant_storage_cutover SET gate=$2, updated_at=$3
+         WHERE bundle=$1 AND gate <> $2`,
+          [bundle, gate, (/* @__PURE__ */ new Date()).toISOString()]
+        );
+        return r.rowCount ?? 0;
+      }
       readsCompanySchema(row) {
         return row.state === "company-primary";
       }
@@ -245147,6 +245321,350 @@ var init_tenant_migration_operator = __esm({
   }
 });
 
+// ../storage/src/tenant-new-company-provision.ts
+async function provisionNewCompanyDataPlane(input) {
+  const legacySchema = input.legacySchema ?? "public";
+  const controlSchema = input.controlSchema ?? "public";
+  const operator = input.operator ?? "serve-provision";
+  const { pool, companyId, cutover } = input;
+  const loc = await input.locations.provision(companyId);
+  await provisionCompanyDataPlaneSchema(pool, loc.schemaName);
+  const report = {
+    companyId,
+    schemaName: loc.schemaName,
+    provisioned: [],
+    alreadyPrimary: [],
+    skipped: []
+  };
+  const eligible = async (b2) => {
+    const row = await cutover.get(companyId, b2);
+    if (row.state === "company-primary") {
+      report.alreadyPrimary.push(b2);
+      return false;
+    }
+    if (row.epoch !== 0) {
+      report.skipped.push({ bundle: b2, reason: `epoch=${row.epoch}\uFF08\u6709\u4EBA\u663E\u5F0F\u52A8\u8FC7\uFF0C\u81EA\u52A8\u8DEF\u5F84\u4E0D\u63A5\u7BA1\uFF09` });
+      return false;
+    }
+    return true;
+  };
+  const identityTodo = [];
+  for (const b2 of IDENTITY_BUNDLES) if (await eligible(b2)) identityTodo.push(b2);
+  if (identityTodo.length > 0) {
+    const owned = await CompanyOwnedRegistryStore.open(pool, loc.schemaName, companyId);
+    await runIdentityMigration({
+      pool,
+      target: owned,
+      roster: await input.roster(),
+      manifestId: `provision-i-${companyId}-${Date.now()}`,
+      legacySchema,
+      controlSchema
+    });
+    for (const b2 of identityTodo) {
+      await advanceCutover(cutover, companyId, b2, "company-primary", operator);
+      report.provisioned.push(b2);
+    }
+  }
+  if (await eligible("types")) {
+    await copyArtifactTypesIdempotent(
+      pool,
+      companyId,
+      loc.schemaName,
+      `provision-t-${companyId}-${Date.now()}`,
+      legacySchema,
+      controlSchema
+    );
+    await advanceCutover(
+      cutover,
+      companyId,
+      "types",
+      "company-primary",
+      operator,
+      { pool, companySchema: loc.schemaName, legacySchema }
+    );
+    report.provisioned.push("types");
+  }
+  if (await eligible("org-registry")) {
+    await copyOrgRegistryIdempotent(
+      pool,
+      companyId,
+      loc.schemaName,
+      `provision-o-${companyId}-${Date.now()}`,
+      { takeLegacyRows: false, legacySchema, controlSchema }
+    );
+    await advanceCutover(cutover, companyId, "org-registry", "company-primary", operator);
+    report.provisioned.push("org-registry");
+  }
+  if (await eligible("skills")) {
+    const n = await input.legacySkillCount();
+    if (n > 0) {
+      report.skipped.push({ bundle: "skills", reason: `legacy \u4FA7\u6709 ${n} \u6761\u6280\u80FD\u5B58\u91CF\uFF0C\u9700\u8D70 operator \u5168\u94FE` });
+    } else {
+      const marked = await cutover.markBundlePrimary(companyId, "skills", operator);
+      if (!marked) await advanceCutover(cutover, companyId, "skills", "company-primary", operator);
+      report.provisioned.push("skills");
+    }
+  }
+  const known = /* @__PURE__ */ new Set([
+    ...report.provisioned,
+    ...report.alreadyPrimary,
+    ...report.skipped.map((s2) => s2.bundle)
+  ]);
+  for (const b2 of COMPANY_DATA_BUNDLES) {
+    if (!known.has(b2)) report.skipped.push({ bundle: b2, reason: "\u672A\u88AB provisioning \u8986\u76D6\uFF08\u65B0\u589E bundle \u5FD8\u4E86\u63A5\u7EBF\uFF1F\uFF09" });
+  }
+  return report;
+}
+var IDENTITY_BUNDLES;
+var init_tenant_new_company_provision = __esm({
+  "../storage/src/tenant-new-company-provision.ts"() {
+    "use strict";
+    init_esm();
+    init_company_owned_registry_store();
+    init_company_data_plane_schema();
+    init_tenant_schema_mapping();
+    init_tenant_cutover();
+    init_tenant_migration_operator();
+    IDENTITY_BUNDLES = ["actors", "actor-config", "assistant"];
+  }
+});
+
+// ../storage/src/tenancy-attribution.ts
+function realCompanyId(v2) {
+  return typeof v2 === "string" && v2.trim().length > 0 ? v2 : null;
+}
+async function buildActorRosterIndex(pool, controlSchema = "public") {
+  const schemas = await pool.query(`
+    SELECT n.nspname FROM pg_namespace n JOIN pg_class c ON c.relnamespace = n.oid
+    WHERE n.nspname LIKE 'c\\_%' AND c.relname = 'actors' AND c.relkind = 'r'`);
+  const seen = /* @__PURE__ */ new Map();
+  const schemaToCompany = /* @__PURE__ */ new Map();
+  for (const r of (await pool.query(
+    `SELECT company_id, schema_name FROM ${quoteIdent2(controlSchema)}.tenant_storage_locations`
+  )).rows) {
+    schemaToCompany.set(r.schema_name, r.company_id);
+  }
+  for (const row of schemas.rows) {
+    const ns = row.nspname;
+    const company = schemaToCompany.get(ns);
+    if (!company) continue;
+    const hasRoster = await pool.query(
+      `SELECT 1 FROM information_schema.columns
+        WHERE table_schema=$1 AND table_name='actors' AND column_name='roster'`,
+      [ns]
+    );
+    const q = hasRoster.rowCount ? `SELECT id FROM ${quoteIdent2(ns)}.actors WHERE roster IS TRUE` : `SELECT id FROM ${quoteIdent2(ns)}.actors`;
+    for (const a of (await pool.query(q)).rows) {
+      const id = a.id;
+      if (!seen.has(id)) seen.set(id, /* @__PURE__ */ new Set());
+      seen.get(id).add(company);
+    }
+  }
+  const out = /* @__PURE__ */ new Map();
+  for (const [id, set] of seen) out.set(id, set.size === 1 ? [...set][0] : null);
+  return out;
+}
+function tally(rows, table) {
+  const byRung = {};
+  const byCompany = {};
+  for (const r of rows) {
+    byRung[r.rung] = (byRung[r.rung] ?? 0) + 1;
+    byCompany[r.companyId] = (byCompany[r.companyId] ?? 0) + 1;
+  }
+  return {
+    table,
+    total: rows.length,
+    byRung,
+    byCompany,
+    fallback: byRung["fallback-default"] ?? 0,
+    conflicts: rows.filter((r) => r.conflict).length
+  };
+}
+async function attributeAgentRuns(o) {
+  const ls = quoteIdent2(o.legacySchema ?? "public");
+  const roster = await buildActorRosterIndex(o.pool, o.legacySchema ?? "public");
+  const rows = await o.pool.query(`
+    SELECT r.id, r.actor_id, w.company_id AS wo_company, (w.id IS NOT NULL) AS wo_in_legacy
+    FROM ${ls}.agent_runs r
+    LEFT JOIN ${ls}.workorders w ON w.id = r.work_order_id`);
+  const out = [];
+  for (const r of rows.rows) {
+    const key = `agent_runs:${r.id}`;
+    const wo = realCompanyId(r.wo_company);
+    const byActor2 = roster.get(r.actor_id) ?? null;
+    const conflict = wo !== null && byActor2 !== null && wo !== byActor2 ? { rung: "actor-roster", companyId: byActor2 } : void 0;
+    if (wo !== null) {
+      out.push({ key, companyId: wo, rung: "workorder", ...conflict ? { conflict } : {} });
+      continue;
+    }
+    if (byActor2 !== null) {
+      out.push({ key, companyId: byActor2, rung: "actor-roster" });
+      continue;
+    }
+    if (r.wo_in_legacy) {
+      out.push({ key, companyId: o.defaultCompanyId, rung: "schema-identity" });
+      continue;
+    }
+    out.push({ key, companyId: o.defaultCompanyId, rung: "fallback-default" });
+  }
+  return out;
+}
+async function attributeByRun(o, table, joinColumn, keyColumns) {
+  const ls = quoteIdent2(o.legacySchema ?? "public");
+  const runs = /* @__PURE__ */ new Map();
+  for (const r of await attributeAgentRuns(o)) runs.set(r.key.slice("agent_runs:".length), r.companyId);
+  const keyExpr = keyColumns.map((c) => `COALESCE(${quoteIdent2(c)}::text,'\u2205')`).join(` || ':' || `);
+  const rows = await o.pool.query(
+    `SELECT ${keyExpr} AS k, ${quoteIdent2(joinColumn)}::text AS run FROM ${ls}.${quoteIdent2(table)}`
+  );
+  return rows.rows.map((r) => {
+    const c = runs.get(r.run);
+    return c ? { key: `${table}:${r.k}`, companyId: c, rung: "run" } : { key: `${table}:${r.k}`, companyId: o.defaultCompanyId, rung: "fallback-default" };
+  });
+}
+async function attributeDispatches(o) {
+  const ls = quoteIdent2(o.legacySchema ?? "public");
+  const roster = await buildActorRosterIndex(o.pool, o.legacySchema ?? "public");
+  const rows = await o.pool.query(`
+    SELECT d.id, d.actor_id, w.company_id AS wo_company, (w.id IS NOT NULL) AS wo_in_legacy
+    FROM ${ls}.dispatches d LEFT JOIN ${ls}.workorders w ON w.id = d.workorder_id`);
+  return rows.rows.map((r) => {
+    const key = `dispatches:${r.id}`;
+    const wo = realCompanyId(r.wo_company);
+    const a = roster.get(r.actor_id) ?? null;
+    const conflict = wo !== null && a !== null && wo !== a ? { rung: "actor-roster", companyId: a } : void 0;
+    if (wo !== null) return { key, companyId: wo, rung: "workorder", ...conflict ? { conflict } : {} };
+    if (a !== null) return { key, companyId: a, rung: "actor-roster" };
+    if (r.wo_in_legacy) return { key, companyId: o.defaultCompanyId, rung: "schema-identity" };
+    return { key, companyId: o.defaultCompanyId, rung: "fallback-default" };
+  });
+}
+async function attributeWorkorderDrafts(o) {
+  const ls = quoteIdent2(o.legacySchema ?? "public");
+  const rows = await o.pool.query(`
+    SELECT d.id, w.company_id, (w.id IS NOT NULL) AS wo_in_legacy FROM ${ls}.workorder_drafts d
+    LEFT JOIN ${ls}.workorders w ON w.id = d.workspace`);
+  return rows.rows.map((r) => {
+    const key = `workorder_drafts:${r.id}`;
+    const wo = realCompanyId(r.company_id);
+    if (wo !== null) return { key, companyId: wo, rung: "workorder" };
+    if (r.wo_in_legacy) return { key, companyId: o.defaultCompanyId, rung: "schema-identity" };
+    return { key, companyId: o.defaultCompanyId, rung: "fallback-default" };
+  });
+}
+async function attributeInboxReadMarkers(o) {
+  const ls = quoteIdent2(o.legacySchema ?? "public");
+  const roster = await buildActorRosterIndex(o.pool, o.legacySchema ?? "public");
+  const rows = await o.pool.query(`
+    SELECT i.actor_id, i.scope, s.company_id AS chat_company
+    FROM ${ls}.inbox_read_markers i
+    LEFT JOIN ${ls}.chat_sessions s
+      ON i.scope LIKE 'chat:%' AND s.id = substring(i.scope from 6)`);
+  return rows.rows.map((r) => {
+    const key = `inbox_read_markers:${r.actor_id}:${r.scope}`;
+    const chat = realCompanyId(r.chat_company);
+    if (chat !== null) return { key, companyId: chat, rung: "chat-session" };
+    const m2 = /(?:^|:)(company:[^:]+)$/.exec(String(r.scope));
+    if (m2) return { key, companyId: m2[1], rung: "scope-literal" };
+    const a = roster.get(r.actor_id);
+    if (a) return { key, companyId: a, rung: "actor-roster" };
+    return { key, companyId: o.defaultCompanyId, rung: "fallback-default" };
+  });
+}
+async function attributeActorMemories(o) {
+  const ls = quoteIdent2(o.legacySchema ?? "public");
+  const roster = await buildActorRosterIndex(o.pool, o.legacySchema ?? "public");
+  const rows = await o.pool.query(`SELECT mem_id, actor_id FROM ${ls}.actor_memories`);
+  return rows.rows.map((r) => {
+    const a = roster.get(r.actor_id);
+    return a ? { key: `actor_memories:${r.mem_id}`, companyId: a, rung: "actor-roster" } : { key: `actor_memories:${r.mem_id}`, companyId: o.defaultCompanyId, rung: "fallback-default" };
+  });
+}
+async function attributeBlobs(o) {
+  const ls = quoteIdent2(o.legacySchema ?? "public");
+  const refs = /* @__PURE__ */ new Map();
+  const add = (hash2, company) => {
+    if (!refs.has(hash2)) refs.set(hash2, /* @__PURE__ */ new Set());
+    refs.get(hash2).add(company);
+  };
+  const schemas = await o.pool.query(`
+    SELECT n.nspname FROM pg_namespace n JOIN pg_class c ON c.relnamespace = n.oid
+    WHERE n.nspname LIKE 'c\\_%' AND c.relname = 'skill_files' AND c.relkind='r'`);
+  const schemaToCompany = /* @__PURE__ */ new Map();
+  for (const r of (await o.pool.query(
+    `SELECT company_id, schema_name FROM ${ls}.tenant_storage_locations`
+  )).rows) {
+    schemaToCompany.set(r.schema_name, r.company_id);
+  }
+  for (const s2 of schemas.rows) {
+    const company = schemaToCompany.get(s2.nspname);
+    if (!company) continue;
+    for (const f2 of (await o.pool.query(
+      `SELECT DISTINCT blob_hash FROM ${quoteIdent2(s2.nspname)}.skill_files WHERE blob_hash IS NOT NULL`
+    )).rows) {
+      add(f2.blob_hash, company);
+    }
+  }
+  const legacyRefs = [
+    { sql: `SELECT f.blob_id AS h, w.company_id AS c FROM ${ls}.work_order_files f
+              JOIN ${ls}.workorders w ON w.id = f.work_order_id WHERE f.blob_id IS NOT NULL` },
+    { sql: `SELECT e.blob_ref AS h, w.company_id AS c FROM ${ls}.agent_run_events e
+              JOIN ${ls}.agent_runs r ON r.id = e.run_id
+              JOIN ${ls}.workorders w ON w.id = r.work_order_id WHERE e.blob_ref IS NOT NULL` }
+  ];
+  for (const q of legacyRefs) {
+    let res;
+    try {
+      res = await o.pool.query(q.sql);
+    } catch {
+      continue;
+    }
+    for (const r of res.rows) if (r.h && r.c) add(r.h, r.c);
+  }
+  const all2 = await o.pool.query(`SELECT hash FROM ${ls}.blobs`);
+  const out = [];
+  for (const b2 of all2.rows) {
+    const hash2 = b2.hash;
+    const owners = refs.get(hash2);
+    if (!owners || owners.size === 0) {
+      out.push({ key: `blobs:${hash2}`, companyId: o.defaultCompanyId, rung: "fallback-default" });
+      continue;
+    }
+    for (const c of owners) out.push({ key: `blobs:${hash2}@${c}`, companyId: c, rung: "referrer" });
+  }
+  return out;
+}
+async function inventoryZeroTenantTables(o) {
+  const reports = [];
+  reports.push(tally(await attributeAgentRuns(o), "agent_runs"));
+  const traceFollowers = [
+    ["agent_run_events", "run_id", ["run_id", "seq"]],
+    ["agent_tool_calls", "run_id", ["id"]],
+    ["agent_run_links", "run_id", ["run_id", "ref_type", "ref_id", "relation"]]
+  ];
+  for (const [t, j, k2] of traceFollowers) reports.push(tally(await attributeByRun(o, t, j, k2), t));
+  for (const [t, j, k2] of [
+    ["execution_checkpoints", "attempt_id", ["checkpoint_id"]],
+    ["node_handoffs", "attempt_id", ["handoff_id"]],
+    ["external_effects", "attempt_id", ["node_id", "attempt_id", "kind", "idempotency_key"]]
+  ]) {
+    reports.push(tally(await attributeByRun(o, t, j, k2), t));
+  }
+  reports.push(tally(await attributeDispatches(o), "dispatches"));
+  reports.push(tally(await attributeWorkorderDrafts(o), "workorder_drafts"));
+  reports.push(tally(await attributeInboxReadMarkers(o), "inbox_read_markers"));
+  reports.push(tally(await attributeActorMemories(o), "actor_memories"));
+  reports.push(tally(await attributeBlobs(o), "blobs"));
+  return reports;
+}
+var init_tenancy_attribution = __esm({
+  "../storage/src/tenancy-attribution.ts"() {
+    "use strict";
+    init_esm();
+    init_pg_ident();
+  }
+});
+
 // ../storage/src/knowledge-snapshot-crypto.ts
 function sealSnapshot(snapshot, key) {
   if (snapshot.content.startsWith(PREFIX3)) return structuredClone(snapshot);
@@ -245812,8 +246330,16 @@ __export(src_exports, {
   advanceCutover: () => advanceCutover,
   assertInstallersPresent: () => assertInstallersPresent,
   assertTypeCatalogCovered: () => assertTypeCatalogCovered,
+  attributeActorMemories: () => attributeActorMemories,
+  attributeAgentRuns: () => attributeAgentRuns,
+  attributeBlobs: () => attributeBlobs,
+  attributeByRun: () => attributeByRun,
+  attributeDispatches: () => attributeDispatches,
+  attributeInboxReadMarkers: () => attributeInboxReadMarkers,
+  attributeWorkorderDrafts: () => attributeWorkorderDrafts,
   backfillTenancyColumns: () => backfillTenancyColumns,
   backfillTypeRegistryFromFile: () => backfillTypeRegistryFromFile,
+  buildActorRosterIndex: () => buildActorRosterIndex,
   buildTrigger: () => buildTrigger,
   canonicalTypeDefHash: () => canonicalTypeDefHash,
   companySchemaName: () => companySchemaName,
@@ -245833,12 +246359,15 @@ __export(src_exports, {
   inventoryActorsByIds: () => inventoryActorsByIds,
   inventoryPublicSkills: () => inventoryPublicSkills,
   inventoryTenancy: () => inventoryTenancy,
+  inventoryZeroTenantTables: () => inventoryZeroTenantTables,
   isUniqueViolation: () => isUniqueViolation2,
   listTenancyCompanies: () => listTenancyCompanies,
+  maxGate: () => maxGate,
   missingTypeNames: () => missingTypeNames,
   moveTenancyRows: () => moveTenancyRows,
   payloadChecksum: () => payloadChecksum,
   provisionCompanyDataPlaneSchema: () => provisionCompanyDataPlaneSchema,
+  provisionNewCompanyDataPlane: () => provisionNewCompanyDataPlane,
   quoteIdent: () => quoteIdent2,
   renderTenancyInventoryMarkdown: () => renderTenancyInventoryMarkdown,
   renderTenancyMoveReport: () => renderTenancyMoveReport,
@@ -245883,6 +246412,8 @@ var init_src11 = __esm({
     init_cutover_aware_registry();
     init_tenant_cutover();
     init_tenant_migration_operator();
+    init_tenant_new_company_provision();
+    init_tenancy_attribution();
     init_postgres_knowledge();
   }
 });
@@ -248199,12 +248730,25 @@ async function startServe(opts) {
       companyId,
       ownedOrgRegistry
     });
-    const existing = await cutoverStore.get(companyId, "skills");
-    if (companyId !== defaultCompanyId && existing.state === "legacy" && existing.epoch === 0) {
-      const legacySkills = await scopedRegistryFor(companyId).listInstalledSkills();
-      if (legacySkills.length === 0) {
-        const marked = await cutoverStore.markBundlePrimary(companyId, "skills", "serve-provision");
-        if (marked) console.log(`[tenancy] ${companyId} \u7684 skills \u65E0 legacy \u5B58\u91CF\uFF0C\u5DF2\u76F4\u63A5\u7F6E\u4E3A company-primary`);
+    if (companyId !== defaultCompanyId) {
+      try {
+        const scoped = scopedRegistryFor(companyId);
+        const rep = await provisionNewCompanyDataPlane({
+          pool: pgPool,
+          companyId,
+          cutover: cutoverStore,
+          locations: locationStore,
+          roster: () => scoped.listActors(),
+          legacySkillCount: async () => (await scoped.listInstalledSkills()).length,
+          legacySchema: pgSchema,
+          controlSchema: pgSchema,
+          operator: "serve-provision"
+        });
+        if (rep.provisioned.length > 0) {
+          console.log(`[tenancy] ${companyId} provisioning\uFF1A\u5DF2\u7F6E company-primary=${rep.provisioned.join(",")}` + (rep.skipped.length > 0 ? ` \u8DF3\u8FC7=${rep.skipped.map((x2) => `${x2.bundle}(${x2.reason})`).join("; ")}` : ""));
+        }
+      } catch (e) {
+        console.error(`[tenancy] ${companyId} provisioning \u5931\u8D25\uFF0C\u672C\u6B21\u9000\u56DE legacy \u8DEF\u5F84\uFF1A${e.message}`);
       }
     }
     const plane = { overlay, types: types2, assistants, humanPrefs };
@@ -258728,7 +259272,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.133" : "dev";
+var PKG_VERSION = true ? "0.1.135" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;