oasis_test_v2 2.2.68 → 2.2.69

package/dist/index.js

@@ -444,13 +444,14 @@ function isUnread(eventAt, marker) {
 function isChatSessionUnread(session, marker) {
   return session.lastTurnQuality !== void 0 && isUnread(session.touchedAt, marker);
 }
-var chatScope, letterScope, INBOX_BASELINE_SCOPE;
+var chatScope, letterScope, INBOX_BASELINE_SCOPE, INBOX_READ_ALL_SCOPE;
 var init_inbox_read = __esm({
   "../contract/src/inbox-read.ts"() {
     "use strict";
     chatScope = (sessionId) => `chat:${sessionId}`;
     letterScope = (annotationId) => `letter:${annotationId}`;
     INBOX_BASELINE_SCOPE = "inbox-baseline";
+    INBOX_READ_ALL_SCOPE = "inbox-read-all";
   }
 });
 
@@ -125858,7 +125859,7 @@ function isReplyWork(w2) {
 function replyIssueIdOf(w2) {
   return w2.lane === "reply" ? w2.replyToIssueId ?? null : null;
 }
-var BUSINESS_HANDOFF_POLICY_FIELD, BUSINESS_HANDOFF_POLICY_EXEMPT, DEFAULT_CONFIG, deriveWorkId, deriveReviewId, deriveReplyId;
+var BUSINESS_HANDOFF_POLICY_FIELD, BUSINESS_HANDOFF_POLICY_EXEMPT, DEFAULT_CONFIG, deriveWorkId, deriveReviewId, ENGINE_SYSTEM_ACTOR, REVIEW_EXHAUSTED_ESC_PREFIX, deriveReplyId;
 var init_model = __esm({
   "../engine/src/model.ts"() {
     "use strict";
@@ -125871,6 +125872,8 @@ var init_model = __esm({
     };
     deriveWorkId = (nodeId, version2) => `wk:${nodeId}:${version2}`;
     deriveReviewId = (workId, reviewer, group) => `rv:${workId}:${reviewer}:${group}`;
+    ENGINE_SYSTEM_ACTOR = "actor:system:engine";
+    REVIEW_EXHAUSTED_ESC_PREFIX = "esc:review-exhausted:";
     deriveReplyId = (issueId, salt) => `ir:${issueId}:${salt}`;
   }
 });
@@ -126414,6 +126417,7 @@ var init_kill = __esm({
 function scan(state, ctx) {
   if (state.workorder.dispatchPaused) return { events: [], terminated: false };
   const events = [];
+  closeSettledReviewEscalations(state, events);
   for (const node2 of state.liveNodes()) {
     const lw = node2.latestWorkId ? state.work(node2.latestWorkId) : null;
     const continuationPolicy = node2.assigneeActorId ? ctx.continuationPolicies?.get(node2.assigneeActorId) : null;
@@ -126942,6 +126946,55 @@ function reviewMaxRetriesOf(policy) {
   const act = policy.resolve({ executor: "agent", scenario: "review" }).timeoutAction;
   return act.kind === "kill-rebuild" ? act.maxRetries : AGENT_REVIEW_MAX_RETRIES;
 }
+function pushReviewExhaustedEscalation(state, nodeId, workId, reviewId, reviewerActorId, rounds, events) {
+  const node2 = state.node(nodeId);
+  if (!node2) return;
+  if (node2.latestAcceptId === workId) return;
+  const escId = `${REVIEW_EXHAUSTED_ESC_PREFIX}${reviewId}`;
+  if (state.allIssues().some((i) => i.id === escId)) return;
+  events.push({
+    kind: "issue.create",
+    workorderId: state.workorder.id,
+    issueId: escId,
+    issueKind: "escalation",
+    body: `\u300A${node2.title}\u300B\u7684\u8BC4\u5BA1\u8FDE\u7EED ${rounds} \u6B21\u5931\u8D25\uFF0C\u8FD9\u4E00\u8F6E\u8BC4\u5BA1\u6536\u4E0D\u9F50\u2014\u2014\u9700\u8981\u6709\u4EBA\u91CD\u5F00\u3002
+
+\u672B\u6B21\u8BC4\u5BA1\u4F1A\u8BDD\u7ED3\u675F\u65F6\u6CA1\u6709\u6295\u7968\uFF1B\u62A5\u9519\u539F\u8BDD\u89C1\u8FD9\u4E2A\u8282\u70B9\u7684\u6267\u884C\u8F68\u8FF9\u3002`,
+    aboutNodeId: nodeId,
+    aboutWorkId: workId,
+    raisedByNodeId: null,
+    authorActorId: reviewerActorId,
+    handActorId: null,
+    recipients: [state.workorder.ownerActorId],
+    attachments: [],
+    intent: "advisory"
+  });
+}
+function closeSettledReviewEscalations(state, events) {
+  for (const issue2 of state.allIssues()) {
+    if (issue2.resolvedAt !== null || issue2.kind !== "escalation") continue;
+    const id = issue2.id;
+    if (!id.startsWith(REVIEW_EXHAUSTED_ESC_PREFIX)) continue;
+    const node2 = issue2.aboutNodeId ? state.node(issue2.aboutNodeId) : void 0;
+    if (!node2 || node2.cancelledAt) continue;
+    const lw = node2.latestWorkId ? state.work(node2.latestWorkId) : null;
+    if (lw && workState(lw, hasOutput(lw, state.artifactsOf(lw.id).length)) === "dead") continue;
+    const review = state.review(id.slice(REVIEW_EXHAUSTED_ESC_PREFIX.length));
+    if (!review) continue;
+    const head = state.requirementsOf(node2.id).find((r) => r.reviewGroup === review.reviewGroup)?.latestReviewId ?? null;
+    const note = head !== review.id ? "\u8BC4\u5BA1\u5DF2\u91CD\u65B0\u5B89\u6392" : node2.latestAcceptId === review.targetWorkId ? "\u8FD9\u4E00\u7248\u5DF2\u9A8C\u6536" : null;
+    if (note === null) continue;
+    events.push({
+      kind: "issue.resolve",
+      workorderId: state.workorder.id,
+      issueId: issue2.id,
+      state: "resolved",
+      by: SYSTEM_ENGINE_ACTOR,
+      note,
+      viaWorkId: null
+    });
+  }
+}
 function processReviews(state, nodeId, workId, ctx, events) {
   const policy = ctx.policy ?? CODE_DEFAULT_POLICY;
   const reqs = state.requirementsOf(nodeId);
@@ -127003,15 +127056,19 @@ function processReviews(state, nodeId, workId, ctx, events) {
       }
     } else if (info.status === "failed") {
       const req = reqs.find((r) => r.reviewGroup === g2);
-      const overLimit = reviewRetriesExhausted(g2, reviews, { policy }) !== null;
+      const exhausted = reviewRetriesExhausted(g2, reviews, { policy });
+      const overLimit = exhausted !== null;
       if (overLimit && classify(req.reviewerActorId) === "agent") {
         const lrId = req.latestReviewId;
-        if (lrId) events.push({
-          kind: "review.kill",
-          workorderId: state.workorder.id,
-          reviewId: lrId,
-          reason: "exhausted"
-        });
+        if (lrId) {
+          events.push({
+            kind: "review.kill",
+            workorderId: state.workorder.id,
+            reviewId: lrId,
+            reason: "exhausted"
+          });
+          pushReviewExhaustedEscalation(state, nodeId, workId, lrId, req.reviewerActorId, exhausted.rounds, events);
+        }
       } else if (!overLimit) {
         events.push({
           kind: "review.create",
@@ -127202,6 +127259,7 @@ function assessConvergence(state, ctx) {
   const anyUnfinished = state.liveNodes().some((n) => !n.latestAcceptId);
   return { stuck: !anyRunning && !anyBlockingIssue && allIdle && anyUnfinished, codes };
 }
+var SYSTEM_ENGINE_ACTOR;
 var init_activate = __esm({
   "../engine/src/activate.ts"() {
     "use strict";
@@ -127216,6 +127274,7 @@ var init_activate = __esm({
     init_model();
     init_views2();
     init_kill();
+    SYSTEM_ENGINE_ACTOR = ENGINE_SYSTEM_ACTOR;
   }
 });
 
@@ -135090,6 +135149,7 @@ var init_issue = __esm({
   "../engine/src/handlers/issue.ts"() {
     "use strict";
     init_plan();
+    init_model();
     init_letters();
     issueCreate = {
       name: "issue/create",
@@ -135181,7 +135241,8 @@ var init_issue = __esm({
         }
         if (issue2.resolvedAt !== null) return;
         const humanResolution = e.by.startsWith("actor:human:") && e.by === ctx.actorId;
-        if (e.semanticsVersion === 2 && issue2.kind === "escalation" && !humanResolution) {
+        const engineSelfClosure = e.by === ENGINE_SYSTEM_ACTOR && ctx.actorId === ENGINE_SYSTEM_ACTOR && issue2.id.startsWith(REVIEW_EXHAUSTED_ESC_PREFIX);
+        if (e.semanticsVersion === 2 && issue2.kind === "escalation" && !humanResolution && !engineSelfClosure) {
           throw new Error("\u5173\u95ED\u5347\u7EA7\u9700\u8981\u4EBA\u660E\u786E\u786E\u8BA4\uFF1Bagent \u8BF7\u63D0\u4EA4\u5173\u95ED\u6388\u6743\u7533\u8BF7");
         }
         state.updateIssue(e.issueId, {
@@ -213900,7 +213961,10 @@ ${composed}`;
                 auth: {
                   actor,
                   ...companyId !== void 0 ? { companyId } : {},
-                  ...dispatch && Object.keys(dispatch).length > 0 ? { dispatch } : {}
+                  ...dispatch && Object.keys(dispatch).length > 0 ? { dispatch } : {},
+                  // 签名 scopes 原样透出（ADR 0609 D1）：部署级 operator-token 靠它被认出来。
+                  // 只来自签名 token；cookie / 简单 token 没有这一项。
+                  ...domainClaims?.scopes ? { scopes: domainClaims.scopes } : {}
                 },
                 raw: req
               });
@@ -214351,6 +214415,18 @@ var init_tokens = __esm({
   }
 });
 
+// ../server/src/auth/operator.ts
+function isOperatorRequest(auth) {
+  return auth.scopes?.includes(OPERATOR_SCOPE) === true;
+}
+var OPERATOR_SCOPE;
+var init_operator = __esm({
+  "../server/src/auth/operator.ts"() {
+    "use strict";
+    OPERATOR_SCOPE = "oasis:operator";
+  }
+});
+
 // ../server/src/session-dataplane-token.ts
 function createDataplaneTokenIssuer(opts = {}) {
   const secret = readOrCreateSecret2(opts.secretFile);
@@ -233203,6 +233279,7 @@ var init_review_requirement_activity = __esm({
 // ../server/src/domains/collab/activity.ts
 function escalationKindOf(issueId, authorActorId) {
   if (issueId.startsWith(RETRY_EXHAUSTED_ESC_PREFIX)) return "retry_exhausted";
+  if (issueId.startsWith(REVIEW_EXHAUSTED_ESC_PREFIX2)) return "review_exhausted";
   return isSystemActorId(authorActorId) ? "output_stall" : "manual";
 }
 function parseStopLossFacts(kind, body2) {
@@ -234111,8 +234188,12 @@ function buildWorkorderActivity(input) {
         const gapId = issueById.get(id)?.gapId;
         return typeof gapId === "string" && !!issueById.get(gapId);
       };
-      const head = kind === "retry_exhausted" ? ACTIVITY_COPY.escalationHeadRetryExhausted(nodeName(latest.nodeId)) : kind === "output_stall" ? ACTIVITY_COPY.escalationHeadOutputStall(nodeName(latest.nodeId)) : gapBehind(latest.id) ? ACTIVITY_COPY.escalationHeadGapEscalated(nameOf(latest.authorId), nodeName(latest.nodeId)) : ACTIVITY_COPY.escalationHeadManual(nameOf(stuckActor));
-      const howTo = kind === "retry_exhausted" ? ACTIVITY_COPY.escalationHowToRetryExhausted : kind === "output_stall" ? ACTIVITY_COPY.escalationHowToOutputStall : void 0;
+      const lastReviewFailure = kind === "review_exhausted" ? (input.runFailures ?? []).filter((f2) => f2.nodeId === latest.nodeId && f2.actorId === latest.authorId && f2.startedAt <= latest.at && f2.message.trim()).sort((a, b2) => a.startedAt.localeCompare(b2.startedAt)).at(-1)?.message : void 0;
+      const head = kind === "retry_exhausted" ? ACTIVITY_COPY.escalationHeadRetryExhausted(nodeName(latest.nodeId)) : kind === "review_exhausted" ? ACTIVITY_COPY.escalationHeadReviewExhausted(
+        nodeName(latest.nodeId),
+        lastReviewFailure ? firstSentence(lastReviewFailure) : void 0
+      ) : kind === "output_stall" ? ACTIVITY_COPY.escalationHeadOutputStall(nodeName(latest.nodeId)) : gapBehind(latest.id) ? ACTIVITY_COPY.escalationHeadGapEscalated(nameOf(latest.authorId), nodeName(latest.nodeId)) : ACTIVITY_COPY.escalationHeadManual(nameOf(stuckActor));
+      const howTo = kind === "retry_exhausted" ? ACTIVITY_COPY.escalationHowToRetryExhausted : kind === "review_exhausted" ? ACTIVITY_COPY.escalationHowToReviewExhausted : kind === "output_stall" ? ACTIVITY_COPY.escalationHowToOutputStall : void 0;
       const closing = issueById.get(latest.id);
       const closeEvent = plainResolveEvents.get(latest.id);
       const closedBy = text5(closing?.resolvedBy) ?? closeEvent?.by ?? target;
@@ -234434,7 +234515,7 @@ function buildWorkorderActivity(input) {
   cards.sort((a, b2) => a.at.localeCompare(b2.at) || a.seq - b2.seq || a.id.localeCompare(b2.id));
   return { workorderId, cards, truncated };
 }
-var ACTIVITY_EVENT_KINDS, LEGACY_PAUSE_REASON, ACTIVITY_EVENT_LIMIT, UPSTREAM_ACK_NOTE_CAP, ACTIVITY_COPY, REWORK_ANNOTATION_PREFIX, RECOVERY_ANNOTATION_PREFIX, ENGINE_RETRY_EXHAUSTED, BUTTON, PHASE_LABEL, COORDINATOR_CARD_PREFIX, RETRY_EXHAUSTED_ESC_PREFIX, isStopLoss;
+var ACTIVITY_EVENT_KINDS, LEGACY_PAUSE_REASON, ACTIVITY_EVENT_LIMIT, UPSTREAM_ACK_NOTE_CAP, ACTIVITY_COPY, REWORK_ANNOTATION_PREFIX, RECOVERY_ANNOTATION_PREFIX, ENGINE_RETRY_EXHAUSTED, BUTTON, PHASE_LABEL, COORDINATOR_CARD_PREFIX, RETRY_EXHAUSTED_ESC_PREFIX, REVIEW_EXHAUSTED_ESC_PREFIX2, isStopLoss;
 var init_activity2 = __esm({
   "../server/src/domains/collab/activity.ts"() {
     "use strict";
@@ -234578,6 +234659,8 @@ var init_activity2 = __esm({
          同一件事，只换后半句（「等 @X 处理」→「X 已处理：…」）。 */
       escalationHeadRetryExhausted: (node2) => `\u300A${node2}\u300B\u91CD\u8BD5\u5DF2\u7528\u5C3D\uFF0C`,
       escalationHeadOutputStall: (node2) => `\u7CFB\u7EDF\u6B62\u635F\uFF1A\u300A${node2}\u300B\u505C\u4F4F\u4E86\uFF0C`,
+      /** 评审连败熔断（Bug 0212）：卡住的是**这一轮评审**，不是那一版活——话不能写成「执行异常」。 */
+      escalationHeadReviewExhausted: (node2, lastReason) => `\u300A${node2}\u300B\u7684\u8BC4\u5BA1\u8FDE\u7740\u6CA1\u8DD1\u6210\uFF0C\u8FD9\u4E00\u8F6E\u6536\u4E0D\u9F50${lastReason ? `\uFF08\u672B\u6B21\uFF1A${lastReason}\uFF09` : ""}\uFF0C`,
       /** 人工上报里**关联着缺口**的那一档：协调者接了缺口、补不了，于是升级给人（四种停法的第二种）。 */
       escalationHeadGapEscalated: (coordinator, node2) => `${coordinator} \u8865\u4E0D\u4E86\u300A${node2}\u300B\u7684\u7F3A\u53E3\uFF0C`,
       /** 其余人工上报：主语是卡住的那个执行人（异常是它的，不是上报作者的）。 */
@@ -234593,6 +234676,8 @@ var init_activity2 = __esm({
       /** 「你要做什么」那半句——两种系统止损各一份（F6 的立论就在这里：执行者一样，只有话不一样）。 */
       escalationHowToRetryExhausted: "\u5904\u7406\u5E76\u5173\u6389\u8FD9\u6761\u4E0A\u62A5\u540E\uFF0C\u8FD9\u4E00\u6B65\u4F1A\u81EA\u52A8\u91CD\u8BD5\uFF1B\u591A\u534A\u662F\u989D\u5EA6 / \u767B\u5F55\u8FC7\u671F / \u9650\u6D41\u8FD9\u7C7B\u73AF\u5883\u95EE\u9898\uFF0C\u5148\u770B\u8F68\u8FF9\u518D\u51B3\u5B9A\u91CD\u8BD5\u3002",
       escalationHowToOutputStall: "\u5904\u7406\u5E76\u5173\u6389\u8FD9\u6761\u4E0A\u62A5\u540E\uFF0C\u8FD9\u4E00\u6B65\u4F1A\u81EA\u52A8\u91CD\u8BD5\uFF1B\u4E0D\u67E5\u6E05\u539F\u56E0\u5C31\u91CD\u8BD5\u4F1A\u7EE7\u7EED\u7A7A\u70E7\uFF0C\u5148\u8FDB\u8BA8\u8BBA\u623F\u3002",
+      /** 评审熔断那一份：关掉之后重开的是**评审**，不是这一步的活（活已经交了，等的是审）。 */
+      escalationHowToReviewExhausted: "\u5904\u7406\u5E76\u5173\u6389\u8FD9\u6761\u4E0A\u62A5\u540E\uFF0C\u8FD9\u4E00\u8F6E\u8BC4\u5BA1\u4F1A\u81EA\u52A8\u91CD\u5F00\uFF1B\u591A\u534A\u662F\u8BC4\u5BA1\u5458\u7684\u8FD0\u884C\u73AF\u5883\u51FA\u4E86\u95EE\u9898\uFF08\u989D\u5EA6 / \u767B\u5F55\u8FC7\u671F / \u9650\u6D41\uFF09\uFF0C\u5148\u770B\u8F68\u8FF9\u518D\u51B3\u5B9A\u3002",
       /** 关掉了：接着开头那半句说「谁处理的、怎么处理的」。没写处置说明就只说「已处理」。
        *  处置说明常常是人自己写的一整段、末尾自带句号——**别再补一个**，否则卡面收在「。。」上。 */
       escalationHandled: (head, by, note) => `${head}${by} \u5DF2\u5904\u7406${note ? `\uFF1A${note}` : ""}${note && /[。！？.!?]$/.test(note) ? "" : "\u3002"}`,
@@ -234782,7 +234867,8 @@ var init_activity2 = __esm({
     };
     COORDINATOR_CARD_PREFIX = "coordinator:";
     RETRY_EXHAUSTED_ESC_PREFIX = "esc:retry-exhausted:";
-    isStopLoss = (kind) => kind !== "manual";
+    REVIEW_EXHAUSTED_ESC_PREFIX2 = "esc:review-exhausted:";
+    isStopLoss = (kind) => kind === "retry_exhausted" || kind === "output_stall";
   }
 });
 
@@ -235482,6 +235568,15 @@ function backfillInboxUnread(items, markers) {
     item.unread = !Number.isFinite(effective) ? true : sinceMs > effective;
   }
 }
+function applyReadAllWatermark(items, markers) {
+  const at = markers.find((m2) => m2.scope === INBOX_READ_ALL_SCOPE)?.readAt;
+  const atMs = at ? Date.parse(at) : Number.NaN;
+  if (!Number.isFinite(atMs)) return;
+  for (const item of items) {
+    const sinceMs = Date.parse(item.since);
+    if (Number.isFinite(sinceMs) && sinceMs <= atMs) item.unread = false;
+  }
+}
 var C_ACTION_LABEL;
 var init_inbox = __esm({
   "../server/src/domains/collab/inbox.ts"() {
@@ -236060,6 +236155,16 @@ var init_notification_store = __esm({
         }
         if (changed) this.save();
       }
+      async markAllRead(recipient, at) {
+        let n = 0;
+        for (const [id, r] of this.rows) {
+          if (r.recipient !== recipient || r.readAt) continue;
+          this.rows.set(id, { ...r, readAt: at });
+          n++;
+        }
+        if (n > 0) this.save();
+        return n;
+      }
       async countUnread(recipient) {
         let pending = 0;
         let all2 = 0;
@@ -236250,6 +236355,13 @@ var init_notification_store = __esm({
           [recipient, [...ids2], at]
         );
       }
+      async markAllRead(recipient, at) {
+        const r = await this.sql.query(
+          `UPDATE ${this.t} SET read_at = $2::timestamptz WHERE recipient = $1 AND read_at IS NULL`,
+          [recipient, at]
+        );
+        return r.rowCount ?? 0;
+      }
       async countUnread(recipient) {
         const r = await this.sql.query(
           `SELECT count(*) FILTER (WHERE status = 'pending')::int AS pending, count(*)::int AS "all"
@@ -236780,7 +236892,7 @@ var init_workorder_metrics = __esm({
 });
 
 // ../server/src/domains/usage/statistics-model.ts
-var UsageQueryError;
+var UsageQueryError, ZERO_USAGE_AMOUNT;
 var init_statistics_model = __esm({
   "../server/src/domains/usage/statistics-model.ts"() {
     "use strict";
@@ -236791,6 +236903,13 @@ var init_statistics_model = __esm({
         this.name = "UsageQueryError";
       }
     };
+    ZERO_USAGE_AMOUNT = {
+      tokens: { input: 0, cache: 0, cacheRead: 0, cacheCreation: 0, output: 0, total: 0 },
+      costUsdMicros: 0,
+      costParts: { input: 0, cacheRead: 0, cacheCreation: 0, output: 0, unsplit: 0 },
+      costKnown: "full",
+      costUnknownTokens: 0
+    };
   }
 });
 
@@ -237166,6 +237285,11 @@ function bucketIndex(starts, ms) {
   }
   return ans;
 }
+function pushView(map, key2, v2) {
+  const list2 = map.get(key2);
+  if (list2) list2.push(v2);
+  else map.set(key2, [v2]);
+}
 function getCell(map, key2) {
   let c = map.get(key2);
   if (!c) {
@@ -237403,12 +237527,15 @@ function attributed(facts, relations) {
   const taskCells = /* @__PURE__ */ new Map();
   const taskActorCells = /* @__PURE__ */ new Map();
   const convSessionCells = /* @__PURE__ */ new Map();
+  const convViews = /* @__PURE__ */ new Map();
+  const taskViews = /* @__PURE__ */ new Map();
   const unlinked = new Cell();
   for (const v2 of facts.views) {
     if (!v2.relevant) continue;
     const attr = runAttribution(relations, v2.run, memo);
     if (attr.kind === "task") {
       getCell(taskCells, attr.workorderId).addView(v2);
+      pushView(taskViews, attr.workorderId, v2);
       let byActor2 = taskActorCells.get(attr.workorderId);
       if (!byActor2) {
         byActor2 = /* @__PURE__ */ new Map();
@@ -237422,6 +237549,7 @@ function attributed(facts, relations) {
         convSessionCells.set(attr.rootSessionId, bySession);
       }
       getCell(bySession, attr.sessionId).addView(v2);
+      pushView(convViews, attr.rootSessionId, v2);
     } else unlinked.addView(v2);
   }
   const taskAmount = /* @__PURE__ */ new Map();
@@ -237453,8 +237581,13 @@ function attributed(facts, relations) {
   }
   const conversations = [];
   const convGroupAcc = /* @__PURE__ */ new Map();
+  const treeViews = /* @__PURE__ */ new Map();
   for (const rootId of /* @__PURE__ */ new Set([...convSessionCells.keys(), ...tasksByRoot.keys()])) {
     const root = relations.sessions.get(rootId);
+    treeViews.set(rootId, [
+      ...convViews.get(rootId) ?? [],
+      ...(tasksByRoot.get(rootId) ?? []).flatMap((workorderId) => taskViews.get(workorderId) ?? [])
+    ]);
     const group = new Cell();
     const rows = [];
     const sessionRows = [];
@@ -237576,9 +237709,83 @@ function attributed(facts, relations) {
     { amount: a.amount, name: a.name, id: a.projectId ?? "" },
     { amount: b2.amount, name: b2.name, id: b2.projectId ?? "" }
   ));
-  return { conversations, tasks, projects };
+  return { conversations, tasks, projects, treeViews };
+}
+function deriveTreeDuration(views, now) {
+  const nowMs = now.getTime();
+  const spans = [];
+  let countedRuns = 0;
+  let unstartedRuns = 0;
+  let inProgress = false;
+  let firstMs = Infinity;
+  let lastMs = -Infinity;
+  let runtimeMs = 0;
+  for (const v2 of views) {
+    const startMs = v2.run.runtimeStartedAt ? Date.parse(v2.run.runtimeStartedAt) : NaN;
+    if (!Number.isFinite(startMs)) {
+      unstartedRuns += 1;
+      continue;
+    }
+    const endedMs = v2.run.endedAt ? Date.parse(v2.run.endedAt) : NaN;
+    const running = !Number.isFinite(endedMs) && !isRunEnded(v2.run);
+    if (running) inProgress = true;
+    const rawEnd = Number.isFinite(endedMs) ? endedMs : running ? nowMs : startMs;
+    const end = Math.max(rawEnd, startMs);
+    countedRuns += 1;
+    runtimeMs += end - startMs;
+    spans.push({ start: startMs, end });
+    if (startMs < firstMs) firstMs = startMs;
+    if (end > lastMs) lastMs = end;
+  }
+  if (countedRuns === 0) return { ...ZERO_DURATION, unstartedRuns };
+  spans.sort((a, b2) => a.start - b2.start || a.end - b2.end);
+  let activeMs = 0;
+  let curStart = spans[0].start;
+  let curEnd = spans[0].end;
+  for (const span of spans.slice(1)) {
+    if (span.start > curEnd) {
+      activeMs += curEnd - curStart;
+      curStart = span.start;
+      curEnd = span.end;
+    } else if (span.end > curEnd) curEnd = span.end;
+  }
+  activeMs += curEnd - curStart;
+  return {
+    firstStartedAt: new Date(firstMs).toISOString(),
+    lastEndedAt: new Date(lastMs).toISOString(),
+    inProgress,
+    wallClockMs: lastMs - firstMs,
+    runtimeMs,
+    activeMs,
+    countedRuns,
+    unstartedRuns
+  };
 }
-var UNKNOWN_AGENT_NAME, UNREGISTERED_RUNTIME_NAME, UNSPECIFIED_PROJECT_NAME, UNLINKED_ROW_TITLE, UNTITLED_CONVERSATION, BUCKET_KEYS, AmountAcc, FlagAcc, Cell, collator, ModelCells;
+function buildChatSessionUsage(sessionId, input) {
+  const facts = computeFacts(input);
+  const lists = attributed(facts, input.relations);
+  const attr = sessionAttribution(input.relations, sessionId, /* @__PURE__ */ new Map());
+  const rootId = attr.kind === "conversation" ? attr.rootSessionId : sessionId;
+  const session = input.relations.sessions.get(rootId);
+  const group = lists.conversations.find((g2) => g2.sessionId === rootId) ?? {
+    sessionId: rootId,
+    title: session?.title || UNTITLED_CONVERSATION,
+    projectId: session?.projectId ?? null,
+    createdAt: session?.createdAt ?? null,
+    amount: ZERO_USAGE_AMOUNT,
+    flags: { inProgress: false, usagePending: false, costUnknownRuns: 0 },
+    rows: []
+  };
+  return {
+    companyId: input.companyId,
+    sessionId,
+    window: input.resolved.window,
+    generatedAt: input.now.toISOString(),
+    group,
+    duration: deriveTreeDuration(lists.treeViews.get(rootId) ?? [], input.now)
+  };
+}
+var UNKNOWN_AGENT_NAME, UNREGISTERED_RUNTIME_NAME, UNSPECIFIED_PROJECT_NAME, UNLINKED_ROW_TITLE, UNTITLED_CONVERSATION, BUCKET_KEYS, AmountAcc, FlagAcc, Cell, collator, ModelCells, ZERO_DURATION;
 var init_statistics = __esm({
   "../server/src/domains/usage/statistics.ts"() {
     "use strict";
@@ -237586,6 +237793,7 @@ var init_statistics = __esm({
     init_uncategorized_project();
     init_model_pricing();
     init_accounting();
+    init_statistics_model();
     UNKNOWN_AGENT_NAME = "\u672A\u77E5 Agent";
     UNREGISTERED_RUNTIME_NAME = "\u672A\u767B\u8BB0\u8FD0\u884C\u65F6";
     UNSPECIFIED_PROJECT_NAME = UNCATEGORIZED_PROJECT_NAME;
@@ -237704,6 +237912,16 @@ var init_statistics = __esm({
         return [...this.cells].map(([model, c]) => ({ model, runCount: c.runCount, amount: c.amount.toAmount(), flags: c.flags.toFlags() })).filter((r) => r.runCount > 0 || r.amount.tokens.total > 0 || r.amount.costUsdMicros > 0 || r.amount.costKnown !== "full").sort((a, b2) => b2.amount.tokens.total - a.amount.tokens.total || b2.runCount - a.runCount || (a.model === null ? 1 : b2.model === null ? -1 : collator.compare(a.model, b2.model)));
       }
     };
+    ZERO_DURATION = {
+      firstStartedAt: null,
+      lastEndedAt: null,
+      inProgress: false,
+      wallClockMs: null,
+      runtimeMs: 0,
+      activeMs: 0,
+      countedRuns: 0,
+      unstartedRuns: 0
+    };
   }
 });
 
@@ -237959,6 +238177,22 @@ function createUsageReadService(deps) {
       logRequest({ companyId, op: "breakdown", range: r.query.range, dimension, runs: r.runs.length, companyScoped: r.target.companyScoped, startedMs });
       return body2;
     },
+    async conversationUsage(companyId, sessionId, raw) {
+      const startedMs = Date.now();
+      const loads = requestLoads(companyId);
+      const r = await readLedger(companyId, { ...raw, range: raw.range ?? "all" }, loads);
+      const relations = await loadRelations(companyId, loads);
+      const body2 = buildChatSessionUsage(sessionId, {
+        companyId,
+        resolved: r.resolved,
+        runs: r.runs,
+        coverage: r.coverage,
+        now: r.now,
+        relations
+      });
+      logRequest({ companyId, op: "conversation", range: r.query.range, runs: r.runs.length, companyScoped: r.target.companyScoped, startedMs });
+      return body2;
+    },
     async runtimeLedger(companyId, runtimeInstanceId, raw) {
       const startedMs = Date.now();
       const loads = requestLoads(companyId);
@@ -238936,6 +239170,7 @@ function collabDomain(opts) {
         backfillInboxUnread(waitingItems, markers);
       }
       const items = mergeInbox(kernelItems, [...chatItems, ...waitingItems]);
+      if (myReadMarkers) applyReadAllWatermark(items, markers);
       return { status: 200, body: { items: myReadMarkers ? withEscalationAttention(items, req.auth.companyId ?? opts.defaultCompanyId ?? "", markers, Date.now(), opts.escalationReminders) : items } };
     });
     router.post("/api/inbox/escalations/:id/acknowledge", async (req) => {
@@ -239205,6 +239440,28 @@ function collabDomain(opts) {
       await marks.markRead(me, scope2, (/* @__PURE__ */ new Date()).toISOString());
       return { status: 200, body: { ok: true } };
     });
+    router.post("/api/inbox/read-all", async (req) => {
+      const me = req.auth.actor;
+      if (!isHumanActor(me)) {
+        return { status: 403, body: { error: { code: "human_only", message: "\u53EA\u6709\u4EBA\u7C7B\u8EAB\u4EFD\u53EF\u4EE5\u6807\u8BB0\u5DF2\u8BFB" } } };
+      }
+      const marks = opts.resolveReadMarkers ? await opts.resolveReadMarkers(req.auth.companyId).catch(() => void 0) : opts.readMarkers;
+      let ledger;
+      if (opts.resolveNotificationLedger) {
+        try {
+          ledger = await opts.resolveNotificationLedger(req.auth.companyId);
+        } catch (err) {
+          console.warn(`[notifications] \u65E0\u53EF\u4FE1\u516C\u53F8\u4E0A\u4E0B\u6587\uFF0C\u4E0D\u6807\u5DF2\u8BFB\uFF08\u4E0D\u56DE\u843D\u9ED8\u8BA4\u516C\u53F8\uFF09: ${String(err)}`);
+        }
+      }
+      if (!marks && !ledger) {
+        return { status: 503, body: { error: { code: "unavailable", message: "\u5DF2\u8BFB\u6C34\u4F4D\u4E0E\u901A\u77E5\u53F0\u8D26\u90FD\u4E0D\u53EF\u7528" } } };
+      }
+      const readAt = (/* @__PURE__ */ new Date()).toISOString();
+      const notifications = ledger ? await ledger.markAllRead(me, readAt) : 0;
+      if (marks) await marks.markRead(me, INBOX_READ_ALL_SCOPE, readAt);
+      return { status: 200, body: { ok: true, readAt, notifications } };
+    });
     router.get("/api/audit", async (req) => {
       const { engineStore, oplog, kernel } = await resolveCtx(req.auth.companyId);
       const q2 = req.query;
@@ -244601,6 +244858,7 @@ function parseFilters(q2) {
   const actorId = q2.get("actorId");
   const artifactId = q2.get("artifactId");
   const projectId2 = q2.get("projectId");
+  const chatSessionId = q2.get("chatSessionId");
   const runtimeKind = q2.get("runtimeKind");
   const status = q2.get("status");
   const rootRunId = q2.get("rootRunId");
@@ -244611,6 +244869,7 @@ function parseFilters(q2) {
   if (actorId) f2.actorId = actorId;
   if (artifactId) f2.artifactId = artifactId;
   if (projectId2) f2.projectId = projectId2;
+  if (chatSessionId) f2.chatSessionId = chatSessionId;
   if (runtimeKind) f2.runtimeKind = runtimeKind;
   if (status) f2.status = status;
   if (rootRunId) f2.rootRunId = rootRunId;
@@ -246581,9 +246840,12 @@ function createChatSessionsDomain(opts) {
     }
     return manager ? manager : null;
   }
-  function ensureSessionReadable(session, actor, kernel) {
+  function ownsSessionOrOperator(session, auth) {
+    return session.humanActorId === auth.actor || isOperatorRequest(auth);
+  }
+  function ensureSessionReadable(session, auth, kernel) {
     if (!session) throw new ApiError(404, "NOT_FOUND", "session not found");
-    if (session.humanActorId === actor) return session;
+    if (ownsSessionOrOperator(session, auth)) return session;
     if (session.workspace) {
       const coordinator = coordinatorOfWorkspace(kernel, session.workspace);
       if (coordinator && session.aiActorId === coordinator) return session;
@@ -246748,7 +247010,7 @@ function createChatSessionsDomain(opts) {
     router.get("/api/chat-sessions/:id", async (req) => {
       const store2 = await storeFor(req);
       const [raw, kernel] = await Promise.all([store2.getSession(req.params.id), kernelFor(req)]);
-      const session = ensureSessionReadable(raw, req.auth.actor, kernel);
+      const session = ensureSessionReadable(raw, req.auth, kernel);
       const [window3, curRuntimeId] = await Promise.all([
         listRecentTurns(store2, session.id, parseTurns(req.query?.get("turns"))),
         currentRuntimeId(req.auth.companyId, session.aiActorId)
@@ -246889,7 +247151,7 @@ function createChatSessionsDomain(opts) {
       if (!items) throw new ApiError(404, "NOT_FOUND", "\u672C\u5B9E\u4F8B\u672A\u63A5 chat_items \u5FEB\u7167\u8BFB\u53E3");
       const store2 = await storeFor(req);
       const [session, kernel] = await Promise.all([store2.getSession(req.params.id), kernelFor(req)]);
-      ensureSessionReadable(session, req.auth.actor, kernel);
+      ensureSessionReadable(session, req.auth, kernel);
       const chatSessionId = req.params.id;
       const sinceVersion = Math.max(0, Number(req.query?.get("sinceVersion") ?? "0") || 0);
       const beforeOrdRaw = Number(req.query?.get("beforeOrd") ?? "0") || 0;
@@ -247060,7 +247322,7 @@ function createChatSessionsDomain(opts) {
     router.get("/api/chat-sessions/:id/delegations", async (req) => {
       const store2 = await storeFor(req);
       const session = await store2.getSession(req.params.id);
-      if (!session || session.humanActorId !== req.auth.actor) throw new ApiError(404, "NOT_FOUND", "session not found");
+      if (!session || !ownsSessionOrOperator(session, req.auth)) throw new ApiError(404, "NOT_FOUND", "session not found");
       const wiring = opts.delegations;
       if (!wiring || !wiring.enabled()) return { status: 200, body: { items: [] } };
       const companyId = session.companyId ?? req.auth.companyId ?? void 0;
@@ -247126,7 +247388,7 @@ function createChatSessionsDomain(opts) {
     router.get("/api/chat-sessions/:id/work-orders", async (req) => {
       const store2 = await storeFor(req);
       const session = await store2.getSession(req.params.id);
-      if (!session || session.humanActorId !== req.auth.actor) throw new ApiError(404, "NOT_FOUND", "session not found");
+      if (!session || !ownsSessionOrOperator(session, req.auth)) throw new ApiError(404, "NOT_FOUND", "session not found");
       const workOrderIds = await store2.listWorkOrdersForSession(req.params.id);
       const wkKernel = await kernelFor(req);
       if (!wkKernel || workOrderIds.length === 0) return { status: 200, body: { items: [] } };
@@ -247149,6 +247411,29 @@ function createChatSessionsDomain(opts) {
       });
       return { status: 200, body: { items } };
     });
+    router.get("/api/chat-sessions/:id/usage", async (req) => {
+      const store2 = await storeFor(req);
+      const session = await store2.getSession(req.params.id);
+      if (!session || !ownsSessionOrOperator(session, req.auth)) throw new ApiError(404, "NOT_FOUND", "session not found");
+      const companyId = req.auth.companyId ?? session.companyId ?? opts.defaultCompanyId;
+      if (!opts.usageRead || !companyId) {
+        return { status: 503, body: { error: { code: "usage_ledger_unavailable", message: "\u4F7F\u7528\u4E0E\u7EDF\u8BA1\u6570\u636E\u6E90\u672A\u63A5\u5165" } } };
+      }
+      try {
+        return {
+          status: 200,
+          body: await opts.usageRead.conversationUsage(companyId, session.id, {
+            range: req.query.get("range") ?? void 0,
+            asOf: req.query.get("asOf") ?? void 0,
+            timeZone: req.query.get("timeZone") ?? void 0
+          })
+        };
+      } catch (err) {
+        const mapped = usageErrorResponse(err);
+        if (mapped) return mapped;
+        throw err;
+      }
+    });
     router.get("/api/chat-broadcasts/pending", async (req) => {
       if (!opts.broadcastOps) throw new ApiError(404, "NOT_FOUND", "\u672C\u5B9E\u4F8B\u672A\u542F\u7528\u5DE5\u5355\u7EC8\u6001\u64AD\u62A5");
       const store2 = await storeFor(req);
@@ -247605,6 +247890,8 @@ var init_chat_sessions2 = __esm({
     init_persistent_files();
     init_files_view();
     init_router();
+    init_operator();
+    init_usage_read();
     init_collab();
     init_gap_thread();
     init_escalation_opening();
@@ -258375,6 +258662,7 @@ var init_postgres_trace = __esm({
         if (filter.actorId) push2((n) => `r.actor_id = $${n}`, filter.actorId);
         if (filter.artifactId) push2((n) => `r.artifact_id = $${n}`, filter.artifactId);
         if (filter.projectId) push2((n) => `r.project_id = $${n}`, filter.projectId);
+        if (filter.chatSessionId) push2((n) => `r.chat_session_id = $${n}`, filter.chatSessionId);
         if (filter.runtimeKind) push2((n) => `r.runtime_kind = $${n}`, filter.runtimeKind);
         if (filter.status) push2((n) => `r.status = $${n}`, filter.status);
         if (filter.rootRunId) push2((n) => `r.root_run_id = $${n}`, filter.rootRunId);
@@ -258493,7 +258781,7 @@ var init_postgres_trace = __esm({
        */
       async listRunFailures(workOrderId) {
         const r = await this.pool.query(
-          `SELECT node_id, error_message, COALESCE(started_at, created_at) AS at
+          `SELECT node_id, actor_id, error_message, COALESCE(started_at, created_at) AS at
          FROM ${this.s}.agent_runs
         WHERE work_order_id = $1 AND node_id IS NOT NULL
           AND error_message IS NOT NULL AND error_message <> ''
@@ -258502,6 +258790,7 @@ var init_postgres_trace = __esm({
         );
         return r.rows.map((row) => ({
           nodeId: row.node_id,
+          actorId: row.actor_id ?? null,
           startedAt: new Date(row.at).toISOString(),
           message: row.error_message
         }));
@@ -272632,6 +272921,7 @@ __export(src_exports2, {
   NdjsonOplogStore: () => NdjsonOplogStore,
   NodeHealthTracker: () => NodeHealthTracker,
   NotificationLedgerWorker: () => NotificationLedgerWorker,
+  OPERATOR_SCOPE: () => OPERATOR_SCOPE,
   ORPHANED_TURN_ASSISTANT_NOTICE: () => ORPHANED_TURN_ASSISTANT_NOTICE,
   OUTPUT_COPY_LIMITS: () => OUTPUT_COPY_LIMITS,
   PARENT_CONVERSATION_PATH: () => PARENT_CONVERSATION_PATH,
@@ -272868,6 +273158,7 @@ __export(src_exports2, {
   isKnowledgeQueryPlanV2: () => isKnowledgeQueryPlanV2,
   isLocationFailureCode: () => isLocationFailureCode,
   isNodeHealthy: () => isNodeHealthy,
+  isOperatorRequest: () => isOperatorRequest,
   isRunTerminalStatus: () => isRunTerminalStatus,
   isRuntimeDrifted: () => isRuntimeDrifted,
   isRuntimeRunReader: () => isRuntimeRunReader,
@@ -273097,6 +273388,7 @@ var init_src11 = __esm({
     "use strict";
     init_server3();
     init_tokens();
+    init_operator();
     init_session_dataplane_token();
     init_dev_store();
     init_control_plane_file_store();
@@ -276768,7 +277060,7 @@ async function startServe(opts) {
   const issuer = createTokenIssuer({ secretFile: path28.join(opts.dir, "session-token-secret") });
   const apiActivity = createApiActivityLedger();
   const operatorActor = `actor:human:${os8.userInfo().username}`;
-  const operatorToken = issuer.issue(operatorActor);
+  const operatorToken = issuer.issue(operatorActor, { scopes: [OPERATOR_SCOPE] });
   fs34.writeFileSync(path28.join(opts.dir, "operator-token"), operatorToken, { mode: 384 });
   let nodeTokens = createNodeTokenStore(path28.join(opts.dir, "node-tokens.json"));
   const enrollTokens = createEnrollTokenStore(30 * 60 * 1e3, path28.join(opts.dir, "enroll-tokens.json"));
@@ -279200,7 +279492,11 @@ async function startServe(opts) {
         resolveChatItems: (companyId) => chatItemsFor(companyId),
         liveChat,
         // ADR-0587：列表行派生 `unread`，与 collab 域收件箱读同一份按公司的水位（无 PG 时闭包自己回落单实例）。
-        resolveReadMarkers: readMarkerStoreFor
+        resolveReadMarkers: readMarkerStoreFor,
+        // ADR 0609 D4：`GET /api/chat-sessions/:id/usage` 的取数口——**与 collab 域是同一个实例**，
+        // 按会话取数与组织统计因此永远同一份账本、同一套归属，不会出现两条路各算各的。
+        usageRead,
+        defaultCompanyId
       })] : []
     ],
     workorderDrafts,
@@ -279747,7 +280043,9 @@ async function startServe(opts) {
         ...c.dispatchId !== void 0 ? { dispatchId: c.dispatchId } : {},
         // ADR-0078 D3：写入围栏的钥匙
         ...c.artifactId !== void 0 ? { artifactId: c.artifactId } : {},
-        ...c.sessionId !== void 0 ? { sessionId: c.sessionId } : {}
+        ...c.sessionId !== void 0 ? { sessionId: c.sessionId } : {},
+        // ADR 0609 D1：签名 scopes 透给域路由，`isOperatorRequest` 据此认出部署级 operator-token。
+        ...c.scopes !== void 0 ? { scopes: c.scopes } : {}
       } : null;
     },
     /**
@@ -288074,7 +288372,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.68" ? "2.2.68" : "dev";
+var CLI_VERSION = "2.2.69" ? "2.2.69" : "dev";
 function apiHeaders(token, company) {
   const headers = {
     authorization: `Bearer ${token}`,
@@ -291880,7 +292178,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.68" : "dev";
+var PKG_VERSION = true ? "2.2.69" : "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.68",
+  "version": "2.2.69",
   "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": "c84c49eb61b038824f5eb651f7653d8fcf31e318"
+    "sourceHead": "ac031d8ccbeea2dca6ecc80ad012b61de5ca2888"
   }
 }