oasis_test_v2 2.2.53 → 2.2.54

package/dist/index.js

@@ -3799,6 +3799,64 @@ function accumulateClaudeUsage(acc, p2) {
     if (acc.finalUsage || acc.costUsd != null) acc.saw = true;
   }
 }
+function newClaudeRunningUsage() {
+  return { byMessage: /* @__PURE__ */ new Map(), currentMessageId: null, lastKey: "" };
+}
+function mergeMessageMax(acc, messageId, snapshot) {
+  if (!snapshot) return;
+  const prev = acc.byMessage.get(messageId) ?? { input: 0, output: 0, cacheRead: 0, cacheCreation: 0 };
+  acc.byMessage.set(messageId, {
+    input: Math.max(prev.input, snapshot.input ?? 0),
+    output: Math.max(prev.output, snapshot.output ?? 0),
+    cacheRead: Math.max(prev.cacheRead, snapshot.cacheRead ?? 0),
+    cacheCreation: Math.max(prev.cacheCreation, snapshot.cacheCreation ?? 0)
+  });
+}
+function observeClaudeRunningUsage(acc, p2) {
+  if (stringOf(p2["parent_tool_use_id"])) return void 0;
+  if (p2["type"] === "assistant") {
+    const msg = objectOf(p2["message"]);
+    const id = stringOf(msg?.id);
+    if (!id) return void 0;
+    mergeMessageMax(acc, id, parseResultUsage(msg?.usage));
+    const model = stringOf(msg?.model);
+    if (model) acc.model = model;
+  } else if (p2["type"] === "stream_event") {
+    const event = objectOf(p2["event"]);
+    if (event?.type === "message_start") {
+      const msg = objectOf(event.message);
+      const id = stringOf(msg?.id);
+      if (!id) return void 0;
+      acc.currentMessageId = id;
+      mergeMessageMax(acc, id, parseResultUsage(msg?.usage));
+    } else if (event?.type === "message_delta" && acc.currentMessageId) {
+      mergeMessageMax(acc, acc.currentMessageId, parseResultUsage(event.usage));
+    } else {
+      return void 0;
+    }
+  } else {
+    return void 0;
+  }
+  if (acc.byMessage.size === 0) return void 0;
+  let input = 0, output = 0, cacheRead = 0, cacheCreation = 0;
+  for (const b2 of acc.byMessage.values()) {
+    input += b2.input;
+    output += b2.output;
+    cacheRead += b2.cacheRead;
+    cacheCreation += b2.cacheCreation;
+  }
+  const key2 = `${input}/${output}/${cacheRead}/${cacheCreation}`;
+  if (key2 === acc.lastKey || input + output + cacheRead + cacheCreation === 0) return void 0;
+  acc.lastKey = key2;
+  return {
+    inputTokens: input,
+    outputTokens: output,
+    totalTokens: input + output,
+    cacheReadTokens: cacheRead,
+    cacheCreationTokens: cacheCreation,
+    costUsdMicros: null
+  };
+}
 function buildClaudeUsage(acc) {
   if (!acc.saw) return void 0;
   const input = acc.finalUsage?.input ?? acc.input;
@@ -4117,6 +4175,8 @@ var init_claude_code = __esm({
         const STDERR_MAX_LINES = 40;
         const STDERR_MAX_BYTES = 4e3;
         const usageAcc = newClaudeUsageAcc();
+        const runningUsage = newClaudeRunningUsage();
+        const usageCheckpointCbs = [];
         let sessionModel;
         const outputCbs = [];
         const liveParser = createClaudeLiveParserState(`claude-live:${id}`, { readSubagentCalls: readSubagentTranscriptCalls });
@@ -4149,6 +4209,11 @@ var init_claude_code = __esm({
                 maybeCloseInputOnResult();
               }
               accumulateClaudeUsage(usageAcc, p2);
+              const running = observeClaudeRunningUsage(runningUsage, p2);
+              if (running) {
+                const model = runningUsage.model ?? sessionModel;
+                for (const cb of usageCheckpointCbs) cb({ usage: running, ...model ? { model } : {} });
+              }
               if (!sessionModel) {
                 if (p2["type"] === "system" && typeof p2["model"] === "string" && p2["model"]) sessionModel = p2["model"];
                 else if (p2["type"] === "assistant") {
@@ -4300,6 +4365,9 @@ var init_claude_code = __esm({
           onLiveEvent(cb) {
             liveEventCbs.push(cb);
           },
+          onUsageCheckpoint(cb) {
+            usageCheckpointCbs.push(cb);
+          },
           // ADR-0093 对话追加：把这条 user 输入作为一条 stream-json 消息续写进 stdin（同会话下一回合）。
           // 非 appendMode → unsupported；已退出/已在关 stdin → session-closing。
           get canAppendInput() {
@@ -4384,6 +4452,7 @@ function withResilience(inner, cfg = {}) {
       const telemetryCbs = [];
       const liveEventCbs = [];
       const normalizedCbs = [];
+      const usageCheckpointCbs = [];
       let supportsNormalized = false;
       const exitCbs = [];
       let outerId = null;
@@ -4451,6 +4520,9 @@ function withResilience(inner, cfg = {}) {
           bumpIdle();
           for (const cb of normalizedCbs) cb(event);
         });
+        handle.onUsageCheckpoint?.((checkpoint) => {
+          for (const cb of usageCheckpointCbs) cb(checkpoint);
+        });
         handle.onExit((info) => {
           if (done) return;
           done = true;
@@ -4531,6 +4603,11 @@ function withResilience(inner, cfg = {}) {
           onNormalizedProviderEvent: (cb) => {
             normalizedCbs.push(cb);
           },
+          // 运行中用量检查点：同四条流，走本层扇出——重跑换手后新 attempt 的检查点照样送到同一个订阅者。
+          // 换手后新 attempt 从 0 重新累计，与它最终交出的终值同口径（终值也只是最后一个 attempt 的）。
+          onUsageCheckpoint: (cb) => {
+            usageCheckpointCbs.push(cb);
+          },
           finishNormalizedTurn: (signal) => {
             activeHandle?.finishNormalizedTurn?.(signal);
           },
@@ -5806,6 +5883,8 @@ async function runProtocolSession(job, cfg) {
   const outputCbs = [];
   const telemetryCbs = [];
   const liveCbs = [];
+  const usageCbs = [];
+  let lastUsageKey = "";
   const appendByKey = /* @__PURE__ */ new Map();
   const exitCbs = [];
   const state = cfg.createState();
@@ -5881,6 +5960,14 @@ async function runProtocolSession(job, cfg) {
       const event = { kind: line2.kind, payload: line2.payload, seq: ++eventSeq, ts: (/* @__PURE__ */ new Date()).toISOString() };
       for (const cb of telemetryCbs) cb(event);
     }
+    if (cfg.runningUsage && usageCbs.length) {
+      const checkpoint = cfg.runningUsage(state);
+      const key2 = checkpoint ? JSON.stringify(checkpoint.usage) : "";
+      if (checkpoint && key2 !== lastUsageKey) {
+        lastUsageKey = key2;
+        for (const cb of usageCbs) cb(checkpoint);
+      }
+    }
     if (!started) pendingTurnMessages.push(message);
     else completeTurn(message);
   };
@@ -5974,6 +6061,9 @@ async function runProtocolSession(job, cfg) {
     onLiveEvent(cb) {
       liveCbs.push(cb);
     },
+    ...cfg.runningUsage ? { onUsageCheckpoint(cb) {
+      usageCbs.push(cb);
+    } } : {},
     get canAppendInput() {
       return !closing && started && !exited;
     },
@@ -6045,8 +6135,15 @@ function addCodexBuckets(acc, add) {
   acc.cacheWrite += add.cacheWrite;
   acc.output += add.output;
 }
-function codexUsageFromBuckets(b2) {
-  return usageFromBuckets(b2);
+function codexRunUsage(usageByTurn, runTurnIds) {
+  const usage = { input: 0, cacheRead: 0, cacheWrite: 0, output: 0 };
+  let sawUsage = false;
+  for (const entry of usageByTurn) {
+    if (entry.turnId !== void 0 && !runTurnIds.has(entry.turnId)) continue;
+    addCodexBuckets(usage, entry.buckets);
+    sawUsage = true;
+  }
+  return sawUsage ? usageFromBuckets(usage) : void 0;
 }
 function parseCodexSessionId(lines) {
   const first = lines[0];
@@ -6092,30 +6189,16 @@ function parseCodexTokenUsage(lines, sinceMs) {
   let sawWindowed = false;
   let sawTimestamp = false;
   for (const line2 of lines) {
-    if (!line2 || line2.indexOf("token_count") === -1) continue;
-    let o;
-    try {
-      o = JSON.parse(line2);
-    } catch {
-      continue;
-    }
-    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;
+    const row = readCodexTokenCountLine(line2);
+    if (!row) continue;
+    if (row.total) lastTotal = row.total;
+    if (row.turn) lastTurn = row.turn;
     if (sinceMs === void 0) continue;
-    const ts3 = typeof o.timestamp === "string" ? Date.parse(o.timestamp) : Number.NaN;
-    if (!Number.isFinite(ts3)) continue;
+    if (!Number.isFinite(row.ts)) continue;
     sawTimestamp = true;
-    if (ts3 < sinceMs || !turn) continue;
+    if (row.ts < sinceMs || !row.turn) continue;
     sawWindowed = true;
-    windowed.input += turn.input;
-    windowed.cacheRead += turn.cacheRead;
-    windowed.cacheWrite += turn.cacheWrite;
-    windowed.output += turn.output;
+    addCodexBuckets(windowed, row.turn);
   }
   if (sinceMs !== void 0 && sawTimestamp) {
     return sawWindowed ? usageFromBuckets(windowed) : void 0;
@@ -6123,6 +6206,25 @@ function parseCodexTokenUsage(lines, sinceMs) {
   if (sinceMs !== void 0 && lastTurn) return usageFromBuckets(lastTurn);
   return lastTotal ? usageFromBuckets(lastTotal) : void 0;
 }
+function readCodexTokenCountLine(line2) {
+  if (!line2 || line2.indexOf("token_count") === -1) return void 0;
+  let o;
+  try {
+    o = JSON.parse(line2);
+  } catch {
+    return void 0;
+  }
+  if (o?.type !== "event_msg" || o.payload?.type !== "token_count") return void 0;
+  const info = o.payload.info;
+  if (!info) return void 0;
+  const total = bucketsOf(info.total_token_usage);
+  const turn = bucketsOf(info.last_token_usage);
+  return {
+    ts: typeof o.timestamp === "string" ? Date.parse(o.timestamp) : Number.NaN,
+    ...turn ? { turn } : {},
+    ...total ? { total } : {}
+  };
+}
 function parseCodexModel(lines) {
   let model;
   for (const line2 of lines) {
@@ -6210,46 +6312,47 @@ function telemetryFromRolloutLines(lines, sinceMs) {
 }
 function scanCodexTelemetry(workdir, sinceMs, sessionsRoot = codexSessionsRoot(), preferSessionId) {
   try {
-    const files = listRecentRollouts(sessionsRoot, sinceMs);
-    const readLines = (f2) => {
-      try {
-        return fs8.readFileSync(f2, "utf8").split("\n");
-      } catch {
-        return null;
-      }
-    };
+    const found2 = locateCodexRollout(workdir, sinceMs, sessionsRoot, preferSessionId);
+    if (found2) return telemetryFromRolloutLines(found2.lines, sinceMs);
+  } catch {
+  }
+  return {};
+}
+function locateCodexRollout(workdir, sinceMs, sessionsRoot = codexSessionsRoot(), preferSessionId) {
+  const files = listRecentRollouts(sessionsRoot, sinceMs);
+  const readLines = (f2) => {
+    try {
+      return fs8.readFileSync(f2, "utf8").split("\n");
+    } catch {
+      return null;
+    }
+  };
+  for (const f2 of files) {
+    const lines = readLines(f2);
+    if (!lines) continue;
+    let meta;
+    try {
+      meta = JSON.parse(lines[0] ?? "");
+    } catch {
+      continue;
+    }
+    if (meta?.type === "session_meta" && meta.payload?.cwd === workdir) return { file: f2, lines };
+  }
+  if (preferSessionId) {
+    const suffix = `-${preferSessionId}.jsonl`;
     for (const f2 of files) {
+      const byName = f2.endsWith(suffix);
       const lines = readLines(f2);
       if (!lines) continue;
-      let meta;
-      try {
-        meta = JSON.parse(lines[0] ?? "");
-      } catch {
-        continue;
-      }
-      if (meta?.type === "session_meta" && meta.payload?.cwd === workdir) {
-        return telemetryFromRolloutLines(lines, sinceMs);
-      }
+      const sid = parseCodexSessionId(lines);
+      if (byName || sid === preferSessionId) return { file: f2, lines };
     }
-    if (preferSessionId) {
-      const suffix = `-${preferSessionId}.jsonl`;
-      for (const f2 of files) {
-        const byName = f2.endsWith(suffix);
-        const lines = readLines(f2);
-        if (!lines) continue;
-        const sid = parseCodexSessionId(lines);
-        if (byName || sid === preferSessionId) {
-          return telemetryFromRolloutLines(lines, sinceMs);
-        }
-      }
-      for (const f2 of findRolloutsBySessionId(sessionsRoot, preferSessionId)) {
-        const lines = readLines(f2);
-        if (lines) return telemetryFromRolloutLines(lines, sinceMs);
-      }
+    for (const f2 of findRolloutsBySessionId(sessionsRoot, preferSessionId)) {
+      const lines = readLines(f2);
+      if (lines) return { file: f2, lines };
     }
-  } catch {
   }
-  return {};
+  return void 0;
 }
 function createCodexNormalizeState() {
   return {
@@ -6465,7 +6568,7 @@ function codexTurnErrorMessage(value2) {
   const detail = typeof error2?.additionalDetails === "string" ? error2.additionalDetails.trim() : "";
   return [summary, detail].filter(Boolean).join("\n").slice(0, 4e3);
 }
-var import_node_child_process7, import_node_crypto9, fs8, os5, path10, readline2, CODEX_BLOCKED_FLAGS, CODEX_ARGV_PROMPT_MAX_BYTES, CODEX_APP_SERVER_BLOCKED_FLAGS, CodexAdapter;
+var import_node_child_process7, import_node_crypto9, fs8, os5, path10, readline2, CODEX_BLOCKED_FLAGS, CODEX_ARGV_PROMPT_MAX_BYTES, CodexRolloutUsageTail, CODEX_APP_SERVER_BLOCKED_FLAGS, CodexAdapter;
 var init_codex = __esm({
   "../adapters/src/codex/index.ts"() {
     "use strict";
@@ -6503,6 +6606,46 @@ var init_codex = __esm({
       // Multica 实证：codex --listen stdio:// 是 daemon↔CLI 传输协议；改会断链
     ]);
     CODEX_ARGV_PROMPT_MAX_BYTES = 1e5;
+    CodexRolloutUsageTail = class {
+      constructor(file, sinceMs) {
+        this.file = file;
+        this.sinceMs = sinceMs;
+      }
+      offset = 0;
+      rest = "";
+      acc = { input: 0, cacheRead: 0, cacheWrite: 0, output: 0 };
+      saw = false;
+      /** 读新追加的行，返回当前窗内累计；还没有任何窗内轮次返回 undefined。读失败抛给调用方（调用方吞）。 */
+      poll() {
+        const fd = fs8.openSync(this.file, "r");
+        try {
+          const size = fs8.fstatSync(fd).size;
+          if (size < this.offset) {
+            this.offset = 0;
+            this.rest = "";
+            this.saw = false;
+            this.acc.input = this.acc.cacheRead = this.acc.cacheWrite = this.acc.output = 0;
+          }
+          if (size > this.offset) {
+            const buf = Buffer.alloc(size - this.offset);
+            const n = fs8.readSync(fd, buf, 0, buf.length, this.offset);
+            this.offset += n;
+            const text6 = this.rest + buf.subarray(0, n).toString("utf8");
+            const lines = text6.split("\n");
+            this.rest = lines.pop() ?? "";
+            for (const line2 of lines) {
+              const row = readCodexTokenCountLine(line2);
+              if (!row?.turn || !Number.isFinite(row.ts) || row.ts < this.sinceMs) continue;
+              addCodexBuckets(this.acc, row.turn);
+              this.saw = true;
+            }
+          }
+        } finally {
+          fs8.closeSync(fd);
+        }
+        return this.saw ? usageFromBuckets(this.acc) : void 0;
+      }
+    };
     CODEX_APP_SERVER_BLOCKED_FLAGS = /* @__PURE__ */ new Map([
       ["app-server", "boolean"],
       ["--stdio", "boolean"],
@@ -6713,18 +6856,21 @@ ${task}` : task;
               }
             }
             model ??= state.threadModel ?? resolvedModel2;
-            const usage = { input: 0, cacheRead: 0, cacheWrite: 0, output: 0 };
-            let sawUsage = false;
-            for (const entry of state.usageByTurn) {
-              if (entry.turnId !== void 0 && !state.runTurnIds.has(entry.turnId)) continue;
-              addCodexBuckets(usage, entry.buckets);
-              sawUsage = true;
-            }
+            const usage = codexRunUsage(state.usageByTurn, state.runTurnIds);
             return {
-              ...sawUsage ? { usage: codexUsageFromBuckets(usage) } : {},
+              ...usage ? { usage } : {},
               ...model ? { model } : {}
             };
           },
+          // 运行中净累计（ADR usage-statistics-ledger D2）：与上面终值**同一个函数**算——同一套「只算本次
+          // run 发起的轮次」过滤、同一套累加，所以检查点永远 ≤ 终值、不会因为口径差推出负的段。
+          // 重放的上一轮通知先到、本轮 turnId 后才登记时，这一拍先不计它，登记后的下一拍补上（只增不减）。
+          runningUsage: (state) => {
+            const usage = codexRunUsage(state.usageByTurn, state.runTurnIds);
+            if (!usage) return void 0;
+            const model = state.threadModel ?? resolvedModel2;
+            return { usage, ...model ? { model } : {} };
+          },
           async append(input, state, send) {
             if (!state.threadId || !state.turnId || !state.active) return { accepted: false, reason: "session-closing" };
             if (input.interrupt) {
@@ -6935,8 +7081,39 @@ ${task}` : task;
         const callbacks = [];
         let exited;
         let killReason = null;
+        const usageCheckpointCbs = [];
+        let usageTail;
+        let usagePoll = null;
+        let lastUsageKey = "";
+        let locateAttemptsLeft = 8;
+        const pollRolloutUsage = () => {
+          if (exited || !usageCheckpointCbs.length) return;
+          try {
+            if (!usageTail) {
+              if (locateAttemptsLeft <= 0) return;
+              locateAttemptsLeft--;
+              const found2 = locateCodexRollout(dir, startedAtMs, codexSessionsRoot(), job.runtimeSessionId);
+              if (!found2) return;
+              usageTail = new CodexRolloutUsageTail(found2.file, startedAtMs);
+            }
+            const usage = usageTail.poll();
+            const key2 = usage ? JSON.stringify(usage) : "";
+            if (!usage || key2 === lastUsageKey) return;
+            lastUsageKey = key2;
+            const model = job.model ?? this.opts.model;
+            for (const cb of usageCheckpointCbs) cb({ usage, ...model ? { model } : {} });
+          } catch {
+          }
+        };
+        const stopUsagePoll = () => {
+          if (usagePoll) {
+            clearInterval(usagePoll);
+            usagePoll = null;
+          }
+        };
         const finish = (info) => {
           if (exited) return;
+          stopUsagePoll();
           if (job.workdirKey) {
             unlockWorkdir(dir);
             touchMetaExit(dir, { at: (/* @__PURE__ */ new Date()).toISOString(), ...info.reason ? { reason: info.reason } : {}, runId: id });
@@ -7017,6 +7194,14 @@ ${task}` : task;
           },
           onTelemetry(cb) {
             telemetryCbs.push(cb);
+          },
+          onUsageCheckpoint: (cb) => {
+            usageCheckpointCbs.push(cb);
+            const pollMs = this.opts.usagePollMs ?? 15e3;
+            if (!usagePoll && !exited && pollMs > 0) {
+              usagePoll = setInterval(pollRolloutUsage, pollMs);
+              usagePoll.unref?.();
+            }
           }
         };
       }
@@ -136609,11 +136794,11 @@ function headRejected(model, id) {
 function pinnedReviewerOf(model, artifactId, role) {
   let best = null;
   for (const attempt of model.concludeAttempts.get(artifactId) ?? []) {
-    const bucket = attempt.gate?.requirements.find(
+    const bucket2 = attempt.gate?.requirements.find(
       (r) => r.source === "type" && (r.roles ?? []).includes(role)
     );
-    if (!bucket) continue;
-    const eligible = new Set(bucket.eligible);
+    if (!bucket2) continue;
+    const eligible = new Set(bucket2.eligible);
     for (const rev of revisionsOf(model, artifactId)) {
       for (const v2 of model.reviews.get(rev.id) ?? []) {
         if (v2.seq <= attempt.seq) continue;
@@ -143140,9 +143325,9 @@ function groupRequirementsForPreview(rows) {
   const groups = /* @__PURE__ */ new Map();
   for (const r of rows) {
     const key2 = r.reviewGroup ?? (r.source === "manual" || r.source === "closure" ? r.actor : "default");
-    const bucket = groups.get(key2);
-    if (bucket) {
-      if (!bucket.eligible.includes(r.actor)) bucket.eligible.push(r.actor);
+    const bucket2 = groups.get(key2);
+    if (bucket2) {
+      if (!bucket2.eligible.includes(r.actor)) bucket2.eligible.push(r.actor);
     } else {
       groups.set(key2, { source: r.source, eligible: [r.actor] });
     }
@@ -214031,8 +214216,8 @@ var init_memory_trace_store = __esm({
           cost
         );
       }
-      accumulateRow(actorId, instanceId, runtimeKind, model, bucket, granularity, input, output, total, cacheRead, cacheCreation, cost) {
-        const key2 = `${actorId}|${instanceId ?? ""}|${model ?? ""}|${bucket}|${granularity}`;
+      accumulateRow(actorId, instanceId, runtimeKind, model, bucket2, granularity, input, output, total, cacheRead, cacheCreation, cost) {
+        const key2 = `${actorId}|${instanceId ?? ""}|${model ?? ""}|${bucket2}|${granularity}`;
         const existing = this.usageAggregates.get(key2);
         if (existing) {
           existing.runCount += 1;
@@ -214048,7 +214233,7 @@ var init_memory_trace_store = __esm({
             runtimeInstanceId: instanceId,
             runtimeKind,
             effectiveModel: model,
-            bucket,
+            bucket: bucket2,
             granularity,
             runCount: 1,
             inputTokens: input,
@@ -233099,9 +233284,9 @@ function buildOrganizationUsageSummary(input) {
     addUsage(total, usage);
     const key2 = bucketKey(formatter, run.startedAt, input.bucketKind);
     if (key2) {
-      const bucket = buckets.get(key2) ?? { key: key2, ...emptyUsage() };
-      addUsage(bucket, usage);
-      buckets.set(key2, bucket);
+      const bucket2 = buckets.get(key2) ?? { key: key2, ...emptyUsage() };
+      addUsage(bucket2, usage);
+      buckets.set(key2, bucket2);
     }
     const workspace = run.artifactId ? workspaceByArtifact.get(run.artifactId) : void 0;
     const workorder = workspace ? workorderById.get(workspace) : void 0;
@@ -233703,9 +233888,9 @@ function buildUsageOverview(input) {
       for (let i = a; i <= b2 && i < partial2.length; i += 1) partial2[i] = true;
     }
   }
-  const trend = input.resolved.buckets.map((bucket, i) => ({
-    start: bucket.start,
-    end: bucket.end,
+  const trend = input.resolved.buckets.map((bucket2, i) => ({
+    start: bucket2.start,
+    end: bucket2.end,
     amount: trendAcc[i].toAmount(),
     partial: partial2[i]
   }));
@@ -234788,9 +234973,9 @@ function collabDomain(opts) {
       }
       const from = req.query.get("from");
       const to = req.query.get("to");
-      const bucket = req.query.get("bucket");
+      const bucket2 = req.query.get("bucket");
       const timeZone = req.query.get("timeZone") ?? "UTC";
-      if (!from || !to || bucket !== "hour" && bucket !== "day") {
+      if (!from || !to || bucket2 !== "hour" && bucket2 !== "day") {
         return { status: 400, body: { error: { code: "bad_request", message: "from / to / bucket(hour|day) \u5FC5\u586B" } } };
       }
       const fromMs = Date.parse(from);
@@ -234821,7 +235006,7 @@ function collabDomain(opts) {
       }
       return {
         status: 200,
-        body: buildOrganizationUsageSummary({ model: kernel.model, runs, bucketKind: bucket, timeZone, runtimeHostnames, runtimeNodeNames })
+        body: buildOrganizationUsageSummary({ model: kernel.model, runs, bucketKind: bucket2, timeZone, runtimeHostnames, runtimeNodeNames })
       };
     });
     const usageCompanyOf = (req) => req.auth.companyId ?? opts.defaultCompanyId;
@@ -237998,10 +238183,10 @@ function runtimeUsageBucket(startedAt, granularity) {
 function bucketRuntimeRuns(runtimeInstanceId, runs, granularity) {
   const rows = /* @__PURE__ */ new Map();
   for (const run of runs) {
-    const bucket = runtimeUsageBucket(run.startedAt, granularity);
-    if (!bucket) continue;
+    const bucket2 = runtimeUsageBucket(run.startedAt, granularity);
+    if (!bucket2) continue;
     const model = resolvedModel(run.effectiveModel);
-    const key2 = `${bucket}\0${run.actorId}\0${model ?? ""}`;
+    const key2 = `${bucket2}\0${run.actorId}\0${model ?? ""}`;
     let row = rows.get(key2);
     if (!row) {
       row = {
@@ -238009,7 +238194,7 @@ function bucketRuntimeRuns(runtimeInstanceId, runs, granularity) {
         runtimeInstanceId,
         runtimeKind: run.runtimeKind,
         effectiveModel: model,
-        bucket,
+        bucket: bucket2,
         runCount: 0,
         inputTokens: 0,
         outputTokens: 0,
@@ -238078,9 +238263,9 @@ function runtimeUsageFromLedger(runtimeInstanceId, slice) {
   const rows = /* @__PURE__ */ new Map();
   const runById = new Map(slice.runs.map((r) => [r.id, r]));
   const rowOf = (bucketIndex2, run) => {
-    const bucket = bucketLabelOf(slice, bucketIndex2);
+    const bucket2 = bucketLabelOf(slice, bucketIndex2);
     const model = resolvedModel(run.effectiveModel);
-    const key2 = `${bucket}\0${run.actorId}\0${model ?? ""}`;
+    const key2 = `${bucket2}\0${run.actorId}\0${model ?? ""}`;
     let row = rows.get(key2);
     if (!row) {
       row = {
@@ -238088,7 +238273,7 @@ function runtimeUsageFromLedger(runtimeInstanceId, slice) {
         runtimeInstanceId,
         runtimeKind: run.runtimeKind,
         effectiveModel: model,
-        bucket,
+        bucket: bucket2,
         runCount: 0,
         inputTokens: 0,
         outputTokens: 0,
@@ -267494,15 +267679,15 @@ async function deadlineClockTick(deps, dedupe3) {
     const overdue = deps.now - deadline;
     if (overdue > result.oldestDueDelayMs) result.oldestDueDelayMs = overdue;
     const phase = overdue >= 0 ? "due" : "early";
-    const bucket = `${c.workId}@${deadline}@${phase}`;
-    if (dedupe3.has(c.workorderId, bucket)) {
+    const bucket2 = `${c.workId}@${deadline}@${phase}`;
+    if (dedupe3.has(c.workorderId, bucket2)) {
       result.deduped++;
       continue;
     }
     const buckets = toPing.get(c.workorderId) ?? [];
-    buckets.push(bucket);
+    buckets.push(bucket2);
     toPing.set(c.workorderId, buckets);
-    dedupe3.mark(c.workorderId, bucket);
+    dedupe3.mark(c.workorderId, bucket2);
   }
   if (page.nextCursor) result.backlog = toPing.size + result.deduped;
   for (const [workorderId, buckets] of toPing) {
@@ -274788,8 +274973,8 @@ async function startServe(opts) {
               const live = engineRouter.liveEntries().find((x2) => x2.engine.kernel.model.artifacts.has(artifactId));
               const engine2 = live?.engine ?? await getEngine(defaultCompanyId);
               if (!engine2.kernel.model.artifacts.has(artifactId)) continue;
-              const bucket = byEngine.get(engine2);
-              if (bucket) bucket.push(artifactId);
+              const bucket2 = byEngine.get(engine2);
+              if (bucket2) bucket2.push(artifactId);
               else byEngine.set(engine2, [artifactId]);
             }
             for (const [engine2, ids2] of byEngine) {
@@ -277295,6 +277480,108 @@ function isSessionLocked(lockPath) {
 init_src();
 init_src2();
 init_src8();
+
+// ../cli/src/daemon/usage-checkpoints.ts
+var USAGE_CHECKPOINT_MIN_INTERVAL_MS = 3e4;
+function bucket(value2) {
+  return typeof value2 === "number" && Number.isFinite(value2) ? value2 : null;
+}
+function maxBucket(a, b2) {
+  const x2 = bucket(a);
+  const y = bucket(b2);
+  if (x2 === null) return y;
+  if (y === null) return x2;
+  return Math.max(x2, y);
+}
+function mergeMonotonicUsage(prev, next) {
+  if (!prev) return next;
+  const inputTokens = maxBucket(prev.inputTokens, next.inputTokens);
+  const outputTokens = maxBucket(prev.outputTokens, next.outputTokens);
+  return {
+    inputTokens,
+    outputTokens,
+    totalTokens: inputTokens === null && outputTokens === null ? null : (inputTokens ?? 0) + (outputTokens ?? 0),
+    cacheReadTokens: maxBucket(prev.cacheReadTokens, next.cacheReadTokens),
+    cacheCreationTokens: maxBucket(prev.cacheCreationTokens, next.cacheCreationTokens),
+    costUsdMicros: maxBucket(prev.costUsdMicros, next.costUsdMicros)
+  };
+}
+var UsageCheckpointEmitter = class {
+  constructor(deps) {
+    this.deps = deps;
+    this.minIntervalMs = deps.minIntervalMs ?? USAGE_CHECKPOINT_MIN_INTERVAL_MS;
+    this.now = deps.now ?? Date.now;
+  }
+  usageSeq = 0;
+  latest = null;
+  lastSentKey = "";
+  lastSentAt = Number.NEGATIVE_INFINITY;
+  timer = null;
+  closed = false;
+  minIntervalMs;
+  now;
+  /** adapter 报来一次累计值。observedAt 取报来的这一刻——窗口末尾才发出去时，时刻仍是它被观测到的那一刻。 */
+  observe(checkpoint) {
+    if (this.closed) return;
+    const usage = mergeMonotonicUsage(this.latest?.usage ?? null, checkpoint.usage);
+    const model = checkpoint.model ?? this.latest?.model;
+    const changed = JSON.stringify(usage) !== JSON.stringify(this.latest?.usage ?? null);
+    if (!changed && model === this.latest?.model) return;
+    this.latest = { usage, ...model ? { model } : {}, observedAt: changed ? this.now() : this.latest.observedAt };
+    this.pump();
+  }
+  /** 退出前补发：还有没发出去的最新值就立刻发（不受节流），之后本 run 不再发任何检查点。 */
+  flush() {
+    if (this.closed) return;
+    this.clearTimer();
+    if (this.hasUnsent() && this.deps.accepts()) this.emit();
+    this.closed = true;
+  }
+  /** 已发出的检查点帧数（观测/测试用）。 */
+  get sent() {
+    return this.usageSeq;
+  }
+  hasUnsent() {
+    return this.latest !== null && JSON.stringify(this.latest.usage) !== this.lastSentKey;
+  }
+  pump() {
+    if (this.closed || !this.hasUnsent() || !this.deps.accepts()) return;
+    const wait = this.lastSentAt + this.minIntervalMs - this.now();
+    if (wait <= 0) {
+      this.clearTimer();
+      this.emit();
+      return;
+    }
+    if (this.timer) return;
+    this.timer = setTimeout(() => {
+      this.timer = null;
+      this.pump();
+    }, wait);
+    this.timer.unref?.();
+  }
+  emit() {
+    const latest = this.latest;
+    const frame = {
+      type: "session_usage",
+      dispatchId: this.deps.dispatchId,
+      usageSeq: ++this.usageSeq,
+      observedAt: new Date(latest.observedAt).toISOString(),
+      usage: latest.usage,
+      ...latest.model ? { model: latest.model } : {}
+    };
+    this.lastSentKey = JSON.stringify(latest.usage);
+    this.lastSentAt = this.now();
+    this.deps.send(frame);
+  }
+  clearTimer() {
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+  }
+};
+
+// ../cli/src/daemon/session-runner.ts
 async function preflightOasisAccess(job) {
   const base = job.server.url.replace(/\/+$/, "");
   try {
@@ -277351,12 +277638,21 @@ async function runSession(dispatchId, job, deps) {
       deps.sink.stream({ type: "session_live_event", dispatchId, event });
       normalizer.onLiveEvent(event);
     });
+    const acceptsUsageCheckpoints = deps.sink.acceptsUsageCheckpoints?.bind(deps.sink);
+    const usageCheckpoints = acceptsUsageCheckpoints && handle.onUsageCheckpoint ? new UsageCheckpointEmitter({
+      dispatchId,
+      accepts: acceptsUsageCheckpoints,
+      send: (frame) => deps.sink.stream(frame),
+      ...deps.usageCheckpointIntervalMs !== void 0 ? { minIntervalMs: deps.usageCheckpointIntervalMs } : {}
+    }) : null;
+    if (usageCheckpoints) handle.onUsageCheckpoint((checkpoint) => usageCheckpoints.observe(checkpoint));
     let restoreFailedBeforeStart = false;
     handle.onExit((info) => {
       if (info.fileRestoreError) restoreFailedBeforeStart = true;
       normalizer.turnFinished(isHealthySessionExit(info) ? "completed" : "failed");
       log2("[node-cli]", `  \u25A0 session_exited  id=${handle.id}  code=${info.code ?? "killed"}  total=${Date.now() - t0}ms`);
       if (info.transcriptRef) log2("[node-cli]", `  transcript: ${info.transcriptRef}`);
+      usageCheckpoints?.flush();
       deps.sink.keyFrame({ type: "session_exited", dispatchId, sessionId: handle.id, info });
       deps.onExited?.();
     });
@@ -277459,6 +277755,11 @@ var SessionProcessState = class {
   frameSeq = 0;
   /** 收到过带 `ackSeq` 的 ack = 本服务端会按帧号去重；只有它为真，重连才敢重放**全部**帧（含输出）。 */
   serverSupportsDedup = false;
+  /**
+   * 当前这根连接上的服务端 ping 声明过 `acceptsUsageCheckpoints`（ADR usage-statistics-ledger D2）。
+   * **按连接记**：连上/断开都清零，等这根连接上的下一个 ping 再说——重连到的可能是没升级的服务端。
+   */
+  serverAcceptsUsageCheckpoints = false;
   /** append_input 串行链——保证回帧次序 = 到达次序（server 侧按 FIFO 认领等待者）。 */
   appendChain = Promise.resolve();
   async run() {
@@ -277472,8 +277773,10 @@ var SessionProcessState = class {
       preflight: this.spec.preflight,
       sink: {
         keyFrame: (m2) => this.sendKeyFrame(m2),
-        stream: (m2) => this.sendStream(m2)
+        stream: (m2) => this.sendStream(m2),
+        acceptsUsageCheckpoints: () => this.connected && this.serverAcceptsUsageCheckpoints
       },
+      ...this.spec.limits?.usageCheckpointIntervalMs !== void 0 ? { usageCheckpointIntervalMs: this.spec.limits.usageCheckpointIntervalMs } : {},
       onHandle: (h) => {
         this.handle = h;
         if (this.stopping) {
@@ -277513,6 +277816,7 @@ var SessionProcessState = class {
     this.ws = ws;
     ws.on("open", () => {
       this.connected = true;
+      this.serverAcceptsUsageCheckpoints = false;
       this.unreachableSince = null;
       this.reconnectMs = RECONNECT_MIN_MS;
       log2("[session]", `${this.spec.dispatchId}: \u6570\u636E\u9762\u5DF2\u8FDE\u4E0A ${this.spec.auth.gatewayUrl}`);
@@ -277548,6 +277852,7 @@ var SessionProcessState = class {
     });
     ws.on("close", () => {
       this.connected = false;
+      this.serverAcceptsUsageCheckpoints = false;
       this.unreachableSince ??= Date.now();
       if (this.stopping) return;
       setTimeout(() => this.connect(), this.reconnectMs).unref?.();
@@ -277594,6 +277899,7 @@ var SessionProcessState = class {
         if (this.outbox.length === 0) this.exitAckResolve?.();
         return;
       case "ping":
+        this.serverAcceptsUsageCheckpoints = msg.acceptsUsageCheckpoints === true;
         this.rawSend({ type: "pong" });
         return;
       default:
@@ -277696,21 +278002,21 @@ var import_node_os9 = require("node:os");
 function object6(value2) {
   return value2 !== null && typeof value2 === "object" && !Array.isArray(value2) ? value2 : {};
 }
-function window2(bucket, minutes, used, reset) {
+function window2(bucket2, minutes, used, reset) {
   if (typeof minutes !== "number" || !Number.isFinite(minutes) || minutes <= 0 || typeof used !== "number" || !Number.isFinite(used) || used < 0 || used > 100) return [];
   const ms = typeof reset === "number" ? reset * 1e3 : typeof reset === "string" ? Date.parse(reset) : NaN;
   const resetsAt = Number.isFinite(ms) && Math.abs(ms) < 864e13 ? new Date(ms).toISOString() : void 0;
-  return [{ bucket, windowMinutes: minutes, usedPercent: used, ...resetsAt ? { resetsAt } : {} }];
+  return [{ bucket: bucket2, windowMinutes: minutes, usedPercent: used, ...resetsAt ? { resetsAt } : {} }];
 }
 function parseCodexQuota(value2) {
   const response = object6(value2);
   const buckets = response.rateLimitsByLimitId !== null && response.rateLimitsByLimitId !== void 0 ? object6(response.rateLimitsByLimitId) : { codex: response.rateLimits };
-  return Object.entries(buckets).slice(0, 16).flatMap(([bucket, raw]) => {
-    if (!/^[a-zA-Z0-9_.-]{1,80}$/.test(bucket)) return [];
+  return Object.entries(buckets).slice(0, 16).flatMap(([bucket2, raw]) => {
+    if (!/^[a-zA-Z0-9_.-]{1,80}$/.test(bucket2)) return [];
     const limits = object6(raw);
     return [limits.primary, limits.secondary].flatMap((v2) => {
       const w2 = object6(v2);
-      return window2(bucket, w2.windowDurationMins, w2.usedPercent, w2.resetsAt);
+      return window2(bucket2, w2.windowDurationMins, w2.usedPercent, w2.resetsAt);
     });
   });
 }
@@ -278508,6 +278814,12 @@ var DaemonWsClient = class {
     this.stop();
   }
   serverSupportsChunkedMessages = false;
+  /**
+   * 当前控制面连接上的服务端 ping 声明过 `acceptsUsageCheckpoints`（ADR usage-statistics-ledger D2）。
+   * 与 serverSupportsChunkedMessages 同口径：按连接记，新连接清零、等它自己的 ping。
+   * 只影响本进程内跑的会话（没有 sessionAuth 的回落路径）；独立会话进程看它自己那根连接。
+   */
+  serverAcceptsUsageCheckpoints = false;
   connect() {
     if (this.stopped) return;
     const ws = new import_websocket.default(this.serverUrl, {
@@ -278522,6 +278834,7 @@ var DaemonWsClient = class {
     });
     this.ws = ws;
     this.serverSupportsChunkedMessages = false;
+    this.serverAcceptsUsageCheckpoints = false;
     ws.on("open", () => {
       log2("[node-cli]", `connected  id=${this.daemonId}`);
       this.authRejectStreak = 0;
@@ -278559,6 +278872,7 @@ var DaemonWsClient = class {
         clearInterval(this.pingTimer);
         this.pingTimer = null;
       }
+      this.serverAcceptsUsageCheckpoints = false;
       if (this.stopped) return;
       const authRejected = this.lastErrorWasAuthReject;
       this.lastErrorWasAuthReject = false;
@@ -278624,7 +278938,8 @@ var DaemonWsClient = class {
           sink: {
             keyFrame: (m2) => this.sendKeyFrame(dispatchId, m2),
             // 流帧走 sendStream：断链期间有界暂存、重连补发（serve 重启窗口内的输出不再静默丢）。
-            stream: (m2) => this.sendStream(m2)
+            stream: (m2) => this.sendStream(m2),
+            acceptsUsageCheckpoints: () => this.ws?.readyState === import_websocket.default.OPEN && this.serverAcceptsUsageCheckpoints
           },
           onHandle: (handle) => {
             this.sessions.register(dispatchId, handle, {
@@ -278668,6 +278983,7 @@ var DaemonWsClient = class {
       }
       case "ping":
         this.serverSupportsChunkedMessages = msg.supportsChunkedMessages === true;
+        this.serverAcceptsUsageCheckpoints = msg.acceptsUsageCheckpoints === true;
         this.send({ type: "pong" });
         break;
       case "ack":
@@ -282023,10 +282339,10 @@ async function runCli(argv, println = console.log, progressln = console.error) {
         const byLabel = items.filter((x2) => (x2.label ?? "").toLowerCase() === lower);
         const byId = items.filter((x2) => x2.id.startsWith(ref2) || x2.id.replace(/-/g, "").startsWith(ref2));
         const byExpert = items.filter((x2) => (x2.expertName ?? "").toLowerCase() === lower || x2.expertActorId === ref2 || x2.expertActorId.endsWith(`:${ref2}`));
-        for (const bucket of [byLabel, byId, byExpert]) {
-          if (bucket.length === 1) return bucket[0];
-          if (bucket.length > 1) {
-            const lines = ["`" + ref2 + "` \u649E\u5230\u591A\u4E2A\u59D4\u6D3E\uFF0C\u6311\u4E00\u4E2A\u66F4\u5177\u4F53\u7684\u91CD\u53D1\uFF08\u7528 label \u6216 id \u524D\u7F00\uFF09\uFF1A", ...bucket.map(describe)];
+        for (const bucket2 of [byLabel, byId, byExpert]) {
+          if (bucket2.length === 1) return bucket2[0];
+          if (bucket2.length > 1) {
+            const lines = ["`" + ref2 + "` \u649E\u5230\u591A\u4E2A\u59D4\u6D3E\uFF0C\u6311\u4E00\u4E2A\u66F4\u5177\u4F53\u7684\u91CD\u53D1\uFF08\u7528 label \u6216 id \u524D\u7F00\uFF09\uFF1A", ...bucket2.map(describe)];
             throw new Error(lines.join("\n"));
           }
         }
@@ -284918,7 +285234,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.53" : "dev";
+var PKG_VERSION = true ? "2.2.54" : "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.53",
+  "version": "2.2.54",
   "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": "46614ef3a8da815b6d8cc5b25e93715780efec1c"
+    "sourceHead": "f63f447c49d3571103041e7a042fca92fe0ab371"
   }
 }