oasis_test_v2 2.2.31 → 2.2.32

package/dist/index.js

@@ -1295,11 +1295,12 @@ var init_chat_session = __esm({
 });
 
 // ../contract/src/live-protocol.ts
-var NORMALIZED_PROVIDER_EVENT_VERSION;
+var NORMALIZED_PROVIDER_EVENT_VERSION, SUBAGENT_TASK_CODE;
 var init_live_protocol = __esm({
   "../contract/src/live-protocol.ts"() {
     "use strict";
     NORMALIZED_PROVIDER_EVENT_VERSION = 1;
+    SUBAGENT_TASK_CODE = "subagent_task";
   }
 });
 
@@ -23127,14 +23128,132 @@ var init_filter_extra_args = __esm({
 });
 
 // ../adapters/src/claude-code/index.ts
-function createClaudeLiveParserState(streamId) {
+function createClaudeLiveParserState(streamId, opts = {}) {
   return {
     streamId,
     turnNumber: 0,
     turnId: `claude-turn:${streamId}:0`,
-    blockIds: /* @__PURE__ */ new Map()
+    blockIds: /* @__PURE__ */ new Map(),
+    agentTasks: /* @__PURE__ */ new Map(),
+    subagentCalls: /* @__PURE__ */ new Map(),
+    ...opts.readSubagentUsage ? { readSubagentUsage: opts.readSubagentUsage } : {}
   };
 }
+function numberOf(value2) {
+  return typeof value2 === "number" && Number.isFinite(value2) ? value2 : void 0;
+}
+function subagentCallOf(message) {
+  const id = stringOf(message?.id);
+  const usage = parseResultUsage(message?.usage);
+  if (!id || !usage) return void 0;
+  return {
+    id,
+    call: {
+      model: stringOf(message?.model) ?? "unknown",
+      tokens: {
+        inputTokens: usage.input ?? 0,
+        outputTokens: usage.output ?? 0,
+        cacheReadTokens: usage.cacheRead ?? 0,
+        cacheCreationTokens: usage.cacheCreation ?? 0
+      }
+    }
+  };
+}
+function recordSubagentCall(calls, id, call) {
+  const prev = calls.get(id);
+  calls.set(id, prev ? {
+    model: call.model,
+    tokens: {
+      inputTokens: Math.max(prev.tokens.inputTokens, call.tokens.inputTokens),
+      outputTokens: Math.max(prev.tokens.outputTokens, call.tokens.outputTokens),
+      cacheReadTokens: Math.max(prev.tokens.cacheReadTokens, call.tokens.cacheReadTokens),
+      cacheCreationTokens: Math.max(prev.tokens.cacheCreationTokens, call.tokens.cacheCreationTokens)
+    }
+  } : call);
+}
+function byModelOf(calls) {
+  const out = {};
+  for (const { model, tokens } of calls.values()) {
+    const acc = out[model] ?? (out[model] = { inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreationTokens: 0 });
+    acc.inputTokens += tokens.inputTokens;
+    acc.outputTokens += tokens.outputTokens;
+    acc.cacheReadTokens += tokens.cacheReadTokens;
+    acc.cacheCreationTokens += tokens.cacheCreationTokens;
+  }
+  return out;
+}
+function readSubagentTranscriptUsage(outputFile) {
+  try {
+    const stat3 = fs7.statSync(outputFile);
+    if (!stat3.isFile() || stat3.size > SUBAGENT_TRANSCRIPT_MAX_BYTES) return void 0;
+    const calls = /* @__PURE__ */ new Map();
+    for (const line of fs7.readFileSync(outputFile, "utf8").split("\n")) {
+      if (!line.includes('"assistant"') || !line.includes('"usage"')) continue;
+      let parsed;
+      try {
+        parsed = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      if (parsed.type !== "assistant") continue;
+      const hit = subagentCallOf(objectOf(parsed.message));
+      if (hit) recordSubagentCall(calls, hit.id, hit.call);
+    }
+    return calls.size > 0 ? byModelOf(calls) : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function subagentTaskEvents(parsed, state) {
+  const taskId = stringOf(parsed.task_id);
+  if (!taskId) return [];
+  const emit = (toolUseId, task) => [
+    liveEvent(state, `${SUBAGENT_TASK_CODE}:${toolUseId}:${task.status}`, "control", "completed", {
+      code: SUBAGENT_TASK_CODE,
+      toolCallId: toolUseId,
+      task: jsonOf(task)
+    })
+  ];
+  if (parsed.subtype === "task_started") {
+    const toolUseId = stringOf(parsed.tool_use_id);
+    if (parsed.task_type !== "local_agent" || !toolUseId) return [];
+    const description = stringOf(parsed.description);
+    const subagentType = stringOf(parsed.subagent_type);
+    const info = {
+      ...description ? { description } : {},
+      ...subagentType ? { subagentType } : {},
+      background: parsed.is_backgrounded === true
+    };
+    state.agentTasks.set(taskId, { toolUseId, ...info });
+    return emit(toolUseId, { status: "running", ...info });
+  }
+  if (parsed.subtype === "task_notification") {
+    const known = state.agentTasks.get(taskId);
+    if (!known) return [];
+    state.agentTasks.delete(taskId);
+    const { toolUseId, ...info } = known;
+    const usage = objectOf(parsed.usage);
+    const summary = stringOf(parsed.summary);
+    const totalTokens = numberOf(usage?.total_tokens);
+    const toolUses = numberOf(usage?.tool_uses);
+    const durationMs3 = numberOf(usage?.duration_ms);
+    const outputFile = stringOf(parsed.output_file);
+    const fromTranscript = outputFile ? state.readSubagentUsage?.(outputFile) : void 0;
+    const streamCalls = state.subagentCalls.get(toolUseId);
+    state.subagentCalls.delete(toolUseId);
+    const tokenUsage = fromTranscript && Object.keys(fromTranscript).length > 0 ? { byModel: fromTranscript, source: "transcript" } : streamCalls?.size ? { byModel: byModelOf(streamCalls), source: "stream" } : void 0;
+    return emit(toolUseId, {
+      ...info,
+      status: SUBAGENT_TERMINAL[stringOf(parsed.status) ?? ""] ?? "completed",
+      ...summary ? { summary } : {},
+      ...totalTokens !== void 0 ? { totalTokens } : {},
+      ...toolUses !== void 0 ? { toolUses } : {},
+      ...durationMs3 !== void 0 ? { durationMs: durationMs3 } : {},
+      ...tokenUsage ? { usage: tokenUsage } : {}
+    });
+  }
+  return [];
+}
 function objectOf(value2) {
   return value2 !== null && typeof value2 === "object" && !Array.isArray(value2) ? value2 : void 0;
 }
@@ -23167,6 +23286,18 @@ function normalizeClaudeLiveLine(line, state) {
     const failed = parsed.is_error === true || parsed.subtype === "error";
     return [liveEvent(state, itemId, "control", failed ? "turn_failed" : "turn_completed", jsonOf(parsed))];
   }
+  if (parsed.type === "system") return subagentTaskEvents(parsed, state);
+  if (parsed.type === "assistant") {
+    const parent = stringOf(parsed.parent_tool_use_id);
+    const hit = parent ? subagentCallOf(objectOf(parsed.message)) : void 0;
+    if (parent && hit) {
+      const calls = state.subagentCalls.get(parent) ?? /* @__PURE__ */ new Map();
+      recordSubagentCall(calls, hit.id, hit.call);
+      state.subagentCalls.set(parent, calls);
+    }
+    return [];
+  }
+  if ((parsed.type === "user" || parsed.type === "stream_event") && stringOf(parsed.parent_tool_use_id)) return [];
   if (parsed.type === "user") {
     const content3 = Array.isArray(objectOf(parsed.message)?.content) ? objectOf(parsed.message).content : [];
     return content3.flatMap((block) => {
@@ -23237,19 +23368,21 @@ function normalizeClaudeStreamLine(line) {
     const message = parsed["message"];
     const content3 = Array.isArray(message?.content) ? message.content : [];
     const out = [];
+    const parentToolCallId = stringOf(parsed["parent_tool_use_id"]);
+    const sub = parentToolCallId ? { parentToolCallId } : {};
     for (const block of content3) {
       switch (block["type"]) {
         case "text":
-          if (type === "assistant") out.push({ kind: "message", payload: { text: block["text"] } });
+          if (type === "assistant") out.push({ kind: "message", payload: { text: block["text"], ...sub } });
           break;
         case "thinking":
-          out.push({ kind: "thought", payload: { text: block["thinking"] } });
+          out.push({ kind: "thought", payload: { text: block["thinking"], ...sub } });
           break;
         case "tool_use":
-          out.push({ kind: "tool_use", payload: { id: block["id"], name: block["name"], input: block["input"] } });
+          out.push({ kind: "tool_use", payload: { id: block["id"], name: block["name"], input: block["input"], ...sub } });
           break;
         case "tool_result":
-          out.push({ kind: "tool_result", payload: { tool_use_id: block["tool_use_id"], content: block["content"], is_error: block["is_error"] ?? false } });
+          out.push({ kind: "tool_result", payload: { tool_use_id: block["tool_use_id"], content: block["content"], is_error: block["is_error"] ?? false, ...sub } });
           break;
         default:
           break;
@@ -23400,7 +23533,7 @@ function classifyExit(result) {
   if (status === 429 || status === 529) return "rate-limit";
   return "error";
 }
-var import_node_child_process3, import_node_crypto8, fs7, path7, readline, CLAUDE_BLOCKED_FLAGS, ONE_SHOT_UNSAFE_TOOLS, ClaudeCodeAdapter;
+var import_node_child_process3, import_node_crypto8, fs7, path7, readline, CLAUDE_BLOCKED_FLAGS, SUBAGENT_TRANSCRIPT_MAX_BYTES, SUBAGENT_TERMINAL, ONE_SHOT_UNSAFE_TOOLS, ClaudeCodeAdapter;
 var init_claude_code = __esm({
   "../adapters/src/claude-code/index.ts"() {
     "use strict";
@@ -23415,6 +23548,7 @@ var init_claude_code = __esm({
     init_resume_classify();
     init_root_bypass();
     init_session_paths();
+    init_src();
     init_transcript();
     init_filter_extra_args();
     CLAUDE_BLOCKED_FLAGS = /* @__PURE__ */ new Map([
@@ -23445,6 +23579,13 @@ var init_claude_code = __esm({
       ["--include-partial-messages", "boolean"]
       // 同上
     ]);
+    SUBAGENT_TRANSCRIPT_MAX_BYTES = 32 * 1024 * 1024;
+    SUBAGENT_TERMINAL = {
+      completed: "completed",
+      failed: "failed",
+      killed: "stopped",
+      stopped: "stopped"
+    };
     ONE_SHOT_UNSAFE_TOOLS = ["ScheduleWakeup", "CronCreate", "CronDelete", "CronList"];
     ClaudeCodeAdapter = class {
       constructor(opts = {}) {
@@ -23670,7 +23811,7 @@ var init_claude_code = __esm({
         const usageAcc = newClaudeUsageAcc();
         let sessionModel;
         const outputCbs = [];
-        const liveParser = createClaudeLiveParserState(`claude-live:${id}`);
+        const liveParser = createClaudeLiveParserState(`claude-live:${id}`, { readSubagentUsage: readSubagentTranscriptUsage });
         if (this.opts.streamJson) {
           const rl = readline.createInterface({ input: child.stdout });
           rl.on("line", (line) => {
@@ -28919,6 +29060,14 @@ var init_keys = __esm({
 });
 
 // ../adapters/src/_core/normalizer/normalizer.ts
+function parentToolCallIdOf(payload) {
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return void 0;
+  const id = payload.parentToolCallId;
+  return typeof id === "string" && id !== "" ? id : void 0;
+}
+function textBlocksOf(blocks) {
+  return blocks.map((b2) => b2 && typeof b2 === "object" && typeof b2.text === "string" ? b2.text : "").filter(Boolean).join("\n");
+}
 var ProviderStreamNormalizer;
 var init_normalizer = __esm({
   "../adapters/src/_core/normalizer/normalizer.ts"() {
@@ -28955,6 +29104,8 @@ var init_normalizer = __esm({
       producedAny = false;
       /** Receipts wait for a whole output block; they never split its bytes. */
       pendingInputs = /* @__PURE__ */ new Map();
+      /** 子代理正文/思考块的序号（它们没有 provider id）。严格递增、turn 收尾清零。 */
+      subagentBlocks = 0;
       constructor(opts) {
         this.providerName = opts.providerName;
         this.hasLiveProtocol = opts.hasLiveProtocol === true;
@@ -28975,6 +29126,11 @@ var init_normalizer = __esm({
       }
       /** 遥测事件。 */
       onTelemetry(event) {
+        const parentToolCallId = parentToolCallIdOf(event.payload);
+        if (parentToolCallId) {
+          this.subagentItem(event, parentToolCallId);
+          return;
+        }
         if (this.hasLiveProtocol && event.kind !== "tool_use") return;
         if (event.kind === "message" && this.sawTextOutput) return;
         const part = chatPartFromTrajectoryEvent(event);
@@ -29008,6 +29164,17 @@ var init_normalizer = __esm({
           this.closeOpen("completed");
           return;
         }
+        if (event.itemType === "control" && payload.code === SUBAGENT_TASK_CODE && typeof payload.toolCallId === "string" && payload.task && typeof payload.task === "object") {
+          this.emitItem({
+            key: providerItemKey(this.providerName, event.itemId),
+            kind: "control",
+            role: "assistant",
+            origin: "live",
+            opShape: { op: "set_status", status: "completed" },
+            attrs: { code: SUBAGENT_TASK_CODE, toolCallId: payload.toolCallId, task: payload.task }
+          });
+          return;
+        }
         this.turnId = event.turnId || this.turnId;
         if (event.operation === "turn_completed" || event.operation === "turn_failed") {
           this.turnFinished(event.operation === "turn_failed" ? "failed" : "completed");
@@ -29041,11 +29208,52 @@ var init_normalizer = __esm({
         }
         if (event.operation === "completed" && event.itemType === "tool" && event.payload !== void 0) {
           const id = typeof payload.tool_use_id === "string" ? payload.tool_use_id : event.itemId;
-          const output = typeof payload.content === "string" ? payload.content : typeof payload.output === "string" ? payload.output : "";
+          const output = typeof payload.content === "string" ? payload.content : Array.isArray(payload.content) ? textBlocksOf(payload.content) : typeof payload.output === "string" ? payload.output : "";
           this.toolResult("live", id, void 0, output, payload.is_error === true);
           return;
         }
       }
+      /**
+       * 子代理内部的一块（带 parentToolCallId 的 telemetry）。子代理没有 partial stream，每块到达时
+       * 就是完整的，所以不走散文的「开一段 → 续写」，也不过认领闸、不关主线程开着的那段——后台子代理
+       * 与主线程并发时，主线程正文不能被它切成几截。
+       */
+      subagentItem(event, parentToolCallId) {
+        const part = chatPartFromTrajectoryEvent(event);
+        if (!part) return;
+        const sub = { parentToolCallId };
+        if (part.type === "text" || part.type === "thinking") {
+          const kind = part.type;
+          const key = providerItemKey(this.providerName, `sub:${parentToolCallId}:${kind}`, this.subagentBlocks++);
+          this.emitItem({ key, kind, role: "assistant", origin: "telemetry", opShape: { op: "set_text", text: part.text ?? "" }, attrs: sub });
+          this.emitItem({ key, kind, role: "assistant", origin: "telemetry", opShape: { op: "set_status", status: "completed" }, attrs: sub });
+          return;
+        }
+        if (part.type === "tool_use") {
+          const id = part.toolCallId;
+          this.emitItem({
+            key: id ? providerItemKey(this.providerName, `tool_use:${id}`) : this.nextFallbackKey("tool_call"),
+            kind: "tool_call",
+            role: "assistant",
+            origin: "telemetry",
+            opShape: { op: "patch_input", input: part.input ?? null },
+            attrs: { toolName: part.toolName ?? "tool", ...id ? { toolCallId: id } : {}, ...sub }
+          });
+          return;
+        }
+        if (part.type === "tool_result") {
+          const id = part.toolCallId;
+          const output = part.output ?? "";
+          this.emitItem({
+            key: id ? providerItemKey(this.providerName, `tool_result:${id}`) : this.nextFallbackKey("tool_result"),
+            kind: "tool_result",
+            role: "assistant",
+            origin: "telemetry",
+            opShape: { op: "set_text", text: output },
+            attrs: { output, isError: part.isError === true, ...id ? { toolCallId: id } : {}, ...sub }
+          });
+        }
+      }
       // ── turn 生命周期 ──────────────────────────────────────────────────────────
       /** turn 收尾：关掉开着的散文、清兜底 index、报一条 turn 信号（服务端据此清 itemKeyMap）。 */
       turnFinished(signal) {
@@ -29057,6 +29265,7 @@ var init_normalizer = __esm({
         this.closedKeys.clear();
         this.sawTextOutput = false;
         this.producedAny = false;
+        this.subagentBlocks = 0;
         if (!produced) return;
         this.emit({ normalizedVersion: NORMALIZED_PROVIDER_EVENT_VERSION, type: "turn", turnId: this.turnId, signal });
       }
@@ -29282,6 +29491,341 @@ var init_src6 = __esm({
   }
 });
 
+// ../server/src/domains/actors/model-pricing.ts
+function lookupInMap(map, prefixKeys, candidates) {
+  for (const candidate of candidates) {
+    const exact = map instanceof Map ? map.get(candidate) : map[candidate];
+    if (exact) return exact;
+  }
+  const prefix = prefixKeys.find((p2) => candidates.some((candidate) => candidate.startsWith(`${p2}-`) || candidate.startsWith(`${p2}:`)));
+  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 [];
+  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;
+}
+async function warmModelPriceCache() {
+  if (!cacheLoader) return 0;
+  try {
+    const next = await cacheLoader();
+    dbPrices = next;
+    dbPrefixKeys = [...next.keys()].sort((a, b2) => b2.length - a.length);
+    cacheLoadedAt = Date.now();
+    return next.size;
+  } catch (err) {
+    console.warn(`[model-pricing] \u9884\u70ED\u4EF7\u683C\u7F13\u5B58\u5931\u8D25\uFF0C\u6CBF\u7528\u9759\u6001\u5FEB\u7167\uFF1A${String(err)}`);
+    return 0;
+  }
+}
+function maybeRefreshCache() {
+  if (!cacheLoader) return;
+  if (dbPrices && Date.now() - cacheLoadedAt < CACHE_TTL_MS2) return;
+  if (cacheRefreshInFlight) return;
+  cacheRefreshInFlight = warmModelPriceCache().catch(() => 0).then(() => {
+    cacheRefreshInFlight = null;
+  });
+}
+function priceForModel(model) {
+  if (!model) return null;
+  const candidates = modelCandidates(model);
+  if (candidates.length === 0) return null;
+  maybeRefreshCache();
+  if (dbPrices && dbPrices.size > 0) {
+    const fromDb = lookupInMap(dbPrices, dbPrefixKeys, candidates);
+    if (fromDb) return fromDb;
+  }
+  return lookupInMap(MODEL_PRICES, STATIC_PREFIX_PRICES, candidates);
+}
+function estimateUsageCostBreakdown(model, usage) {
+  const price = priceForModel(model);
+  if (!price) return null;
+  const inputTokens = Math.max(usage.inputTokens ?? 0, 0);
+  const outputTokens = Math.max(usage.outputTokens ?? 0, 0);
+  const cacheReadTokens = Math.max(usage.cacheReadTokens ?? 0, 0);
+  const cacheCreationTokens = Math.max(usage.cacheCreationTokens ?? 0, 0);
+  const cacheReadPrice = price.cachedInputPerMillion ?? price.inputPerMillion * 0.1;
+  return {
+    currency: price.currency,
+    inputMicros: Math.round(inputTokens * price.inputPerMillion / 1e6 * 1e6),
+    cacheMicros: Math.round(
+      (cacheCreationTokens * price.inputPerMillion + cacheReadTokens * cacheReadPrice) / 1e6 * 1e6
+    ),
+    outputMicros: Math.round(outputTokens * price.outputPerMillion / 1e6 * 1e6)
+  };
+}
+function estimateUsageCost(model, usage) {
+  const breakdown = estimateUsageCostBreakdown(model, usage);
+  if (!breakdown) return null;
+  return {
+    currency: breakdown.currency,
+    micros: breakdown.inputMicros + breakdown.cacheMicros + breakdown.outputMicros
+  };
+}
+function displayCostUsdMicros(model, usage) {
+  const stored = Math.max(usage.costUsdMicros ?? 0, 0);
+  if (stored > 0) return stored;
+  const estimated = estimateUsageCost(model, usage);
+  if (!estimated || estimated.micros <= 0) return 0;
+  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;
+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",
+      inputPerMillion: inputPerMillion * FOREIGN_MODEL_MARKUP,
+      outputPerMillion: outputPerMillion * FOREIGN_MODEL_MARKUP,
+      ...cachedInputPerMillion !== void 0 ? { cachedInputPerMillion: cachedInputPerMillion * FOREIGN_MODEL_MARKUP } : {}
+    });
+    cny = (inputPerMillion, outputPerMillion, cachedInputPerMillion) => ({
+      currency: "CNY",
+      inputPerMillion,
+      outputPerMillion,
+      ...cachedInputPerMillion !== void 0 ? { cachedInputPerMillion } : {}
+    });
+    MODEL_PRICES = {
+      "gpt-5.5": usd(5, 30, 0.5),
+      "gpt-5.5-pro": usd(30, 180),
+      "chat-latest": usd(5, 30, 0.5),
+      "gpt-5.4-mini": usd(0.75, 4.5, 0.075),
+      "gpt-5.4-nano": usd(0.2, 1.25, 0.02),
+      "gpt-5.4": usd(2.5, 15, 0.25),
+      "gpt-5.4-pro": usd(30, 180),
+      "gpt-5.3-codex": usd(1.75, 14, 0.175),
+      "gpt-5.2": usd(1.75, 14, 0.175),
+      "gpt-5.2-chat-latest": usd(1.75, 14, 0.175),
+      "gpt-5.2-pro": usd(21, 168),
+      "gpt-5.2-codex": usd(1.75, 14, 0.175),
+      "gpt-5.1": usd(1.25, 10, 0.125),
+      "gpt-5.1-chat-latest": usd(1.25, 10, 0.125),
+      "gpt-5.1-codex": usd(1.25, 10, 0.125),
+      "gpt-5.1-codex-max": usd(1.25, 10, 0.125),
+      "gpt-5.1-codex-mini": usd(0.25, 2, 0.025),
+      "gpt-5-pro": usd(15, 120),
+      "gpt-5-codex": usd(1.25, 10, 0.125),
+      "gpt-5-search-api": usd(1.25, 10, 0.125),
+      "gpt-5": usd(1.25, 10, 0.125),
+      "gpt-5-mini": usd(0.25, 2, 0.025),
+      "gpt-5-nano": usd(0.05, 0.4, 5e-3),
+      "gpt-5-chat-latest": usd(1.25, 10, 0.125),
+      "gpt-4.1": usd(2, 8, 0.5),
+      "gpt-4.1-2025-04-14": usd(2, 8, 0.5),
+      "gpt-4.1-mini": usd(0.4, 1.6, 0.1),
+      "gpt-4.1-mini-2025-04-14": usd(0.4, 1.6, 0.1),
+      "gpt-4.1-nano": usd(0.1, 0.4, 0.025),
+      "gpt-4.1-nano-2025-04-14": usd(0.1, 0.4, 0.025),
+      "o4-mini": usd(1.1, 4.4, 0.275),
+      // o3 / o3-mini 在 codex 静态目录里可选，却一直不在价目快照里（费用记 0）。
+      // 这两行按 OpenAI 公开价填，不是智增增快照里的行；供应商价目表同步到时以 DB 为准。
+      "o3": usd(2, 8),
+      "o3-mini": usd(1.1, 4.4),
+      "claude-fable-5-1": usd(10, 50),
+      "claude-fable-5": usd(10, 50),
+      "claude-mythos-5-1": usd(10, 50),
+      "claude-mythos-5": usd(10, 50),
+      // claude-opus-5 是 Claude Code 当代默认款，却一直不在这张快照里：查不到价 → 费用记 0
+      // （与 2026-09-04 那次 `claude-opus-5[1m]` 记 0 同一类坑）。按 Opus 档 $5/$25 补上。
+      "claude-opus-5": usd(5, 25),
+      "claude-opus-4-8": usd(5, 25),
+      "claude-opus-4-7": usd(5, 25),
+      "claude-sonnet-5": usd(2, 10),
+      "claude-sonnet-4-6": usd(3, 15),
+      "claude-opus-4-6": usd(5, 25),
+      "claude-opus-4-5-20251101": usd(5, 25),
+      "claude-opus-4-5": usd(5, 25),
+      "claude-sonnet-4-5-20250929": usd(3, 15),
+      // 短名同样要有：前缀比对是「表里的键是模型名的前缀」，带日期的那行匹配不上不带日期的短名。
+      // claude-sonnet-4-5 从 2026-07-04 起就在目录里可选，却一直查不到价（费用记 0），本次一并补。
+      "claude-sonnet-4-5": usd(3, 15),
+      "claude-opus-4-1-20250805": usd(15, 75),
+      "claude-opus-4-20250514": usd(15, 75),
+      "claude-sonnet-4-20250514": usd(3, 15),
+      "claude-3-7-sonnet-20250219": usd(3, 15),
+      "claude-3-5-sonnet-20241022": usd(3, 15),
+      "claude-3-5-sonnet-20240620": usd(3, 15),
+      "claude-3-sonnet-20240229": usd(3, 15),
+      "claude-haiku-4-5-20251001": usd(1, 5),
+      // codebuddy 目录用点号写法（claude-sonnet-4.6），与上面的连字符写法是同一批模型，
+      // 但字符串对不上就查不到价 → 记 0。同价另起别名行。
+      "claude-sonnet-4.6": usd(3, 15),
+      "claude-opus-4.7": usd(5, 25),
+      "gemini-3.1-pro": usd(2, 12),
+      "gemini-3-pro-preview": usd(2, 12),
+      // Claude Code 回报的可能是不带日期的短名，短名匹配不上带日期的那行（前缀比对是「表里的键是模型名的前缀」）。
+      "claude-haiku-4-5": usd(1, 5),
+      "gemini-3.5-flash": usd(1.5, 9),
+      "gemini-3.1-pro-preview": usd(2, 12),
+      "gemini-3.1-pro-preview-customtools": usd(2, 12),
+      "gemini-3.1-flash-lite-preview": usd(0.25, 1.5),
+      "gemini-3-flash-preview": usd(0.5, 3),
+      "gemini-2.5-pro": usd(1.25, 10),
+      "gemini-2.5-flash": usd(0.3, 2.5),
+      "gemini-2.5-flash-lite": usd(0.1, 0.4),
+      "gemini-2.5-flash-preview-09-2025": usd(0.3, 2.5),
+      "gemini-2.0-flash": usd(0.1, 0.4),
+      "deepseek-v4-flash": cny(1, 2, 0.02),
+      "deepseek-v4-pro": cny(3, 6, 0.025),
+      "deepseek-chat": cny(2, 3),
+      "deepseek-reasoner": cny(2, 3),
+      "deepseek-v3.2": cny(2, 3),
+      "deepseek-coder": cny(2, 3),
+      "deepseek-r1": cny(4, 16),
+      "deepseek-r1-0528": cny(4, 16),
+      "deepseek-v3": cny(2, 8),
+      "deepseek-v3-0324": cny(2, 8),
+      "deepseek-v3.1": cny(4, 12),
+      "qwen3-max": cny(6, 24),
+      "qwen3-max-preview": cny(6, 24),
+      "qwen3-coder-plus": cny(4, 16),
+      "qwen3-235b-a22b": cny(4, 40),
+      "qwen3-32b": cny(2, 20),
+      "qwen3-30b-a3b": cny(1.5, 15),
+      "qwen3-14b": cny(1, 10),
+      "qwen3-8b": cny(0.5, 5),
+      "qwen3-4b": cny(0.3, 3),
+      "qwen3-1.7b": cny(0.3, 3),
+      "qwen3-0.6b": cny(0.3, 3),
+      "qwq-plus": cny(1.6, 4),
+      "qwq-plus-latest": cny(1.6, 4),
+      "qwq-plus-2025-03-05": cny(1.6, 4),
+      "kimi-k2.7-code": cny(6.5, 27),
+      "kimi-k2.6": cny(6.5, 27),
+      "kimi-k2.5": cny(4, 21),
+      "kimi-k2-0905-preview": cny(4, 16),
+      "kimi-k2-0711-preview": cny(4, 16),
+      "kimi-k2-turbo-preview": cny(8, 58)
+    };
+    STATIC_PREFIX_PRICES = Object.keys(MODEL_PRICES).sort((a, b2) => b2.length - a.length);
+    CACHE_TTL_MS2 = 5 * 6e4;
+    dbPrices = null;
+    dbPrefixKeys = [];
+    cacheLoadedAt = 0;
+    cacheLoader = null;
+    cacheRefreshInFlight = null;
+  }
+});
+
+// ../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();
+  }
+});
+
+// ../server/src/subagent-cost.ts
+function estimateSubagentCostUsdMicros(usage) {
+  if (!usage) return void 0;
+  const models = Object.entries(usage.byModel);
+  if (models.length === 0) return void 0;
+  let total = 0;
+  for (const [model, tokens] of models) {
+    const account = accountUsage(model, { ...tokens, costUsdMicros: null });
+    if (!account || account.source !== "estimated") return void 0;
+    total += account.displayUsdMicros;
+  }
+  return total;
+}
+function withSubagentCostEstimate(event) {
+  if (event.type !== "item" || event.attrs?.code !== SUBAGENT_TASK_CODE) return event;
+  const task = event.attrs.task;
+  if (!task?.usage || task.estimatedCostUsdMicros !== void 0) return event;
+  const estimatedCostUsdMicros = estimateSubagentCostUsdMicros(task.usage);
+  if (estimatedCostUsdMicros === void 0) return event;
+  return { ...event, attrs: { ...event.attrs, task: { ...task, estimatedCostUsdMicros } } };
+}
+var init_subagent_cost = __esm({
+  "../server/src/subagent-cost.ts"() {
+    "use strict";
+    init_src();
+    init_accounting();
+  }
+});
+
 // ../contract/src/chat-item.ts
 var CHAT_ITEM_TERMINAL_STATUSES, isTerminalChatItemStatus, CHAT_ITEM_META_LEGACY_CONTENT;
 var init_chat_item = __esm({
@@ -29305,8 +29849,9 @@ async function resolveChatItemsTurnId(items, messageId, fallback) {
   const existing = await items.listItemsByMessage(messageId).catch(() => []);
   return existing.length ? existing[existing.length - 1].turnId : fallback;
 }
-function projectsIntoContent(kind, role, origin, telemetryTextInContent) {
+function projectsIntoContent(kind, role, origin, telemetryTextInContent, attrs = {}) {
   if (kind !== "text" || role !== "assistant") return false;
+  if (attrs.parentToolCallId) return false;
   switch (origin) {
     case "stdout":
     case "live":
@@ -29322,6 +29867,7 @@ var init_chat_item_ledger = __esm({
   "../server/src/chat-item-ledger.ts"() {
     "use strict";
     init_src();
+    init_subagent_cost();
     init_chat_item();
     import_node_crypto15 = require("node:crypto");
     CHAT_ITEMS_DOUBLE_WRITE_ENV = "OASIS_CHAT_ITEMS_DOUBLE_WRITE";
@@ -29422,7 +29968,8 @@ var init_chat_item_ledger = __esm({
        * 应用一条归一层事件。**这是 provider 正文进入系统的唯一入口**（ADR D4(b)）——
        * `LiveChatRegistry.applyNormalizedEvent` 与两条恢复路都经它，别再开第二个口子。
        */
-      apply(event) {
+      apply(raw) {
+        const event = withSubagentCostEstimate(raw);
         if (event.type === "turn") {
           this.itemKeyMap.clear();
           this.lastTurnId = null;
@@ -29661,7 +30208,7 @@ var init_chat_item_ledger = __esm({
       // ── 内部：建行与应用 op ────────────────────────────────────────────────────
       createFrom(event) {
         const attrs = event.attrs ?? {};
-        const inContent = projectsIntoContent(event.kind, event.role, event.origin, this.telemetryTextInContent);
+        const inContent = projectsIntoContent(event.kind, event.role, event.origin, this.telemetryTextInContent, attrs);
         const text5 = event.opShape.op === "append_text" || event.opShape.op === "set_text" ? event.opShape.text : "";
         const status = event.kind === "text" || event.kind === "thinking" ? "streaming" : "completed";
         const id = this.insert({
@@ -29733,25 +30280,33 @@ var init_chat_item_ledger = __esm({
       }
       /** 按 kind 折出落库 payload。**唯一一处** payload 形状定义，别在别处再拼一遍。 */
       payloadOf(row) {
+        const parent = row.attrs.parentToolCallId ? { parentToolCallId: row.attrs.parentToolCallId } : {};
         switch (row.kind) {
           case "text":
           case "thinking":
-            return { text: row.text };
+            return { text: row.text, ...parent };
           case "tool_call":
             return {
               toolName: row.attrs.toolName ?? "tool",
               ...row.attrs.toolCallId ? { toolCallId: row.attrs.toolCallId } : {},
-              input: row.attrs.input ?? null
+              input: row.attrs.input ?? null,
+              ...parent
             };
           case "tool_result":
             return {
               ...row.attrs.toolCallId ? { toolCallId: row.attrs.toolCallId } : {},
               ...row.attrs.toolName ? { toolName: row.attrs.toolName } : {},
               output: row.attrs.output ?? row.text,
-              ...row.attrs.isError === true ? { isError: true } : {}
+              ...row.attrs.isError === true ? { isError: true } : {},
+              ...parent
             };
           case "control":
-            return { code: row.attrs.code ?? "control", ...row.attrs.note ? { note: row.attrs.note } : {} };
+            return {
+              code: row.attrs.code ?? "control",
+              ...row.attrs.note ? { note: row.attrs.note } : {},
+              ...row.attrs.code === SUBAGENT_TASK_CODE && row.attrs.toolCallId ? { toolCallId: row.attrs.toolCallId } : {},
+              ...row.attrs.code === SUBAGENT_TASK_CODE && row.attrs.task ? { task: row.attrs.task } : {}
+            };
         }
       }
       insert(input) {
@@ -160569,7 +161124,9 @@ function v3StartedPayload(role, attrs, itemType, kind) {
   if (attrs?.input !== void 0) base.input = attrs.input;
   if (attrs?.output !== void 0) base.output = attrs.output;
   if (attrs?.isError !== void 0) base.isError = attrs.isError;
+  if (attrs?.parentToolCallId) base.parentToolCallId = attrs.parentToolCallId;
   if (itemType === "control" && kind === "control" && attrs?.code) base.code = attrs.code;
+  if (itemType === "control" && attrs?.task) base.task = attrs.task;
   return base;
 }
 var DEFAULT_BUFFER_MAX, DEFAULT_GRACE_MS, DEFAULT_LIVE_COALESCE_MS, DEFAULT_LIVE_COALESCE_MAX_CHUNKS, DEFAULT_LIVE_COALESCE_MAX_CHARS, LiveChatRegistry;
@@ -160577,6 +161134,7 @@ var init_live_chat = __esm({
   "../server/src/live-chat.ts"() {
     "use strict";
     init_chat_item_ledger();
+    init_subagent_cost();
     DEFAULT_BUFFER_MAX = 4e3;
     DEFAULT_GRACE_MS = 6e4;
     DEFAULT_LIVE_COALESCE_MS = 24;
@@ -160744,7 +161302,8 @@ var init_live_chat = __esm({
        *
        * 账本坏掉不影响对话；v3 emit 抛异常也不影响 v2 通路与账本落盘——两条独立通路。
        */
-      applyNormalizedEvent(turn, event) {
+      applyNormalizedEvent(turn, raw) {
+        const event = withSubagentCostEstimate(raw);
         if (event.type === "item" && event.kind === "control" && event.attrs?.code === "input_consumed") {
           const key = event.attrs.clientMessageKey;
           if (key) turn.inputReceipts.get(key)?.consume();
@@ -207537,6 +208096,7 @@ ${composed}`;
                 session.onTelemetry?.((event) => {
                   if (hasLiveProtocol && event.kind !== "tool_use") return;
                   if (event.kind === "message" && sawTextOutput) return;
+                  if (typeof event.payload?.parentToolCallId === "string") return;
                   if (liveProtocol && live && !hasLiveProtocol) {
                     const payload = event.payload && typeof event.payload === "object" && !Array.isArray(event.payload) ? event.payload : {};
                     const itemId = event.kind === "tool_use" ? typeof payload.id === "string" ? payload.id : `${liveTurnId}:tool` : event.kind === "tool_result" ? typeof payload.tool_use_id === "string" ? payload.tool_use_id : `${liveTurnId}:tool` : event.kind === "thought" ? `${liveTurnId}:thinking` : `${liveTurnId}:message`;
@@ -211986,312 +212546,6 @@ var init_uncategorized_project = __esm({
   }
 });
 
-// ../server/src/domains/actors/model-pricing.ts
-function lookupInMap(map, prefixKeys, candidates) {
-  for (const candidate of candidates) {
-    const exact = map instanceof Map ? map.get(candidate) : map[candidate];
-    if (exact) return exact;
-  }
-  const prefix = prefixKeys.find((p2) => candidates.some((candidate) => candidate.startsWith(`${p2}-`) || candidate.startsWith(`${p2}:`)));
-  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 [];
-  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;
-}
-async function warmModelPriceCache() {
-  if (!cacheLoader) return 0;
-  try {
-    const next = await cacheLoader();
-    dbPrices = next;
-    dbPrefixKeys = [...next.keys()].sort((a, b2) => b2.length - a.length);
-    cacheLoadedAt = Date.now();
-    return next.size;
-  } catch (err) {
-    console.warn(`[model-pricing] \u9884\u70ED\u4EF7\u683C\u7F13\u5B58\u5931\u8D25\uFF0C\u6CBF\u7528\u9759\u6001\u5FEB\u7167\uFF1A${String(err)}`);
-    return 0;
-  }
-}
-function maybeRefreshCache() {
-  if (!cacheLoader) return;
-  if (dbPrices && Date.now() - cacheLoadedAt < CACHE_TTL_MS2) return;
-  if (cacheRefreshInFlight) return;
-  cacheRefreshInFlight = warmModelPriceCache().catch(() => 0).then(() => {
-    cacheRefreshInFlight = null;
-  });
-}
-function priceForModel(model) {
-  if (!model) return null;
-  const candidates = modelCandidates(model);
-  if (candidates.length === 0) return null;
-  maybeRefreshCache();
-  if (dbPrices && dbPrices.size > 0) {
-    const fromDb = lookupInMap(dbPrices, dbPrefixKeys, candidates);
-    if (fromDb) return fromDb;
-  }
-  return lookupInMap(MODEL_PRICES, STATIC_PREFIX_PRICES, candidates);
-}
-function estimateUsageCostBreakdown(model, usage) {
-  const price = priceForModel(model);
-  if (!price) return null;
-  const inputTokens = Math.max(usage.inputTokens ?? 0, 0);
-  const outputTokens = Math.max(usage.outputTokens ?? 0, 0);
-  const cacheReadTokens = Math.max(usage.cacheReadTokens ?? 0, 0);
-  const cacheCreationTokens = Math.max(usage.cacheCreationTokens ?? 0, 0);
-  const cacheReadPrice = price.cachedInputPerMillion ?? price.inputPerMillion * 0.1;
-  return {
-    currency: price.currency,
-    inputMicros: Math.round(inputTokens * price.inputPerMillion / 1e6 * 1e6),
-    cacheMicros: Math.round(
-      (cacheCreationTokens * price.inputPerMillion + cacheReadTokens * cacheReadPrice) / 1e6 * 1e6
-    ),
-    outputMicros: Math.round(outputTokens * price.outputPerMillion / 1e6 * 1e6)
-  };
-}
-function estimateUsageCost(model, usage) {
-  const breakdown = estimateUsageCostBreakdown(model, usage);
-  if (!breakdown) return null;
-  return {
-    currency: breakdown.currency,
-    micros: breakdown.inputMicros + breakdown.cacheMicros + breakdown.outputMicros
-  };
-}
-function displayCostUsdMicros(model, usage) {
-  const stored = Math.max(usage.costUsdMicros ?? 0, 0);
-  if (stored > 0) return stored;
-  const estimated = estimateUsageCost(model, usage);
-  if (!estimated || estimated.micros <= 0) return 0;
-  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;
-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",
-      inputPerMillion: inputPerMillion * FOREIGN_MODEL_MARKUP,
-      outputPerMillion: outputPerMillion * FOREIGN_MODEL_MARKUP,
-      ...cachedInputPerMillion !== void 0 ? { cachedInputPerMillion: cachedInputPerMillion * FOREIGN_MODEL_MARKUP } : {}
-    });
-    cny = (inputPerMillion, outputPerMillion, cachedInputPerMillion) => ({
-      currency: "CNY",
-      inputPerMillion,
-      outputPerMillion,
-      ...cachedInputPerMillion !== void 0 ? { cachedInputPerMillion } : {}
-    });
-    MODEL_PRICES = {
-      "gpt-5.5": usd(5, 30, 0.5),
-      "gpt-5.5-pro": usd(30, 180),
-      "chat-latest": usd(5, 30, 0.5),
-      "gpt-5.4-mini": usd(0.75, 4.5, 0.075),
-      "gpt-5.4-nano": usd(0.2, 1.25, 0.02),
-      "gpt-5.4": usd(2.5, 15, 0.25),
-      "gpt-5.4-pro": usd(30, 180),
-      "gpt-5.3-codex": usd(1.75, 14, 0.175),
-      "gpt-5.2": usd(1.75, 14, 0.175),
-      "gpt-5.2-chat-latest": usd(1.75, 14, 0.175),
-      "gpt-5.2-pro": usd(21, 168),
-      "gpt-5.2-codex": usd(1.75, 14, 0.175),
-      "gpt-5.1": usd(1.25, 10, 0.125),
-      "gpt-5.1-chat-latest": usd(1.25, 10, 0.125),
-      "gpt-5.1-codex": usd(1.25, 10, 0.125),
-      "gpt-5.1-codex-max": usd(1.25, 10, 0.125),
-      "gpt-5.1-codex-mini": usd(0.25, 2, 0.025),
-      "gpt-5-pro": usd(15, 120),
-      "gpt-5-codex": usd(1.25, 10, 0.125),
-      "gpt-5-search-api": usd(1.25, 10, 0.125),
-      "gpt-5": usd(1.25, 10, 0.125),
-      "gpt-5-mini": usd(0.25, 2, 0.025),
-      "gpt-5-nano": usd(0.05, 0.4, 5e-3),
-      "gpt-5-chat-latest": usd(1.25, 10, 0.125),
-      "gpt-4.1": usd(2, 8, 0.5),
-      "gpt-4.1-2025-04-14": usd(2, 8, 0.5),
-      "gpt-4.1-mini": usd(0.4, 1.6, 0.1),
-      "gpt-4.1-mini-2025-04-14": usd(0.4, 1.6, 0.1),
-      "gpt-4.1-nano": usd(0.1, 0.4, 0.025),
-      "gpt-4.1-nano-2025-04-14": usd(0.1, 0.4, 0.025),
-      "o4-mini": usd(1.1, 4.4, 0.275),
-      // o3 / o3-mini 在 codex 静态目录里可选，却一直不在价目快照里（费用记 0）。
-      // 这两行按 OpenAI 公开价填，不是智增增快照里的行；供应商价目表同步到时以 DB 为准。
-      "o3": usd(2, 8),
-      "o3-mini": usd(1.1, 4.4),
-      "claude-fable-5-1": usd(10, 50),
-      "claude-fable-5": usd(10, 50),
-      "claude-mythos-5-1": usd(10, 50),
-      "claude-mythos-5": usd(10, 50),
-      // claude-opus-5 是 Claude Code 当代默认款，却一直不在这张快照里：查不到价 → 费用记 0
-      // （与 2026-09-04 那次 `claude-opus-5[1m]` 记 0 同一类坑）。按 Opus 档 $5/$25 补上。
-      "claude-opus-5": usd(5, 25),
-      "claude-opus-4-8": usd(5, 25),
-      "claude-opus-4-7": usd(5, 25),
-      "claude-sonnet-5": usd(2, 10),
-      "claude-sonnet-4-6": usd(3, 15),
-      "claude-opus-4-6": usd(5, 25),
-      "claude-opus-4-5-20251101": usd(5, 25),
-      "claude-opus-4-5": usd(5, 25),
-      "claude-sonnet-4-5-20250929": usd(3, 15),
-      // 短名同样要有：前缀比对是「表里的键是模型名的前缀」，带日期的那行匹配不上不带日期的短名。
-      // claude-sonnet-4-5 从 2026-07-04 起就在目录里可选，却一直查不到价（费用记 0），本次一并补。
-      "claude-sonnet-4-5": usd(3, 15),
-      "claude-opus-4-1-20250805": usd(15, 75),
-      "claude-opus-4-20250514": usd(15, 75),
-      "claude-sonnet-4-20250514": usd(3, 15),
-      "claude-3-7-sonnet-20250219": usd(3, 15),
-      "claude-3-5-sonnet-20241022": usd(3, 15),
-      "claude-3-5-sonnet-20240620": usd(3, 15),
-      "claude-3-sonnet-20240229": usd(3, 15),
-      "claude-haiku-4-5-20251001": usd(1, 5),
-      // codebuddy 目录用点号写法（claude-sonnet-4.6），与上面的连字符写法是同一批模型，
-      // 但字符串对不上就查不到价 → 记 0。同价另起别名行。
-      "claude-sonnet-4.6": usd(3, 15),
-      "claude-opus-4.7": usd(5, 25),
-      "gemini-3.1-pro": usd(2, 12),
-      "gemini-3-pro-preview": usd(2, 12),
-      // Claude Code 回报的可能是不带日期的短名，短名匹配不上带日期的那行（前缀比对是「表里的键是模型名的前缀」）。
-      "claude-haiku-4-5": usd(1, 5),
-      "gemini-3.5-flash": usd(1.5, 9),
-      "gemini-3.1-pro-preview": usd(2, 12),
-      "gemini-3.1-pro-preview-customtools": usd(2, 12),
-      "gemini-3.1-flash-lite-preview": usd(0.25, 1.5),
-      "gemini-3-flash-preview": usd(0.5, 3),
-      "gemini-2.5-pro": usd(1.25, 10),
-      "gemini-2.5-flash": usd(0.3, 2.5),
-      "gemini-2.5-flash-lite": usd(0.1, 0.4),
-      "gemini-2.5-flash-preview-09-2025": usd(0.3, 2.5),
-      "gemini-2.0-flash": usd(0.1, 0.4),
-      "deepseek-v4-flash": cny(1, 2, 0.02),
-      "deepseek-v4-pro": cny(3, 6, 0.025),
-      "deepseek-chat": cny(2, 3),
-      "deepseek-reasoner": cny(2, 3),
-      "deepseek-v3.2": cny(2, 3),
-      "deepseek-coder": cny(2, 3),
-      "deepseek-r1": cny(4, 16),
-      "deepseek-r1-0528": cny(4, 16),
-      "deepseek-v3": cny(2, 8),
-      "deepseek-v3-0324": cny(2, 8),
-      "deepseek-v3.1": cny(4, 12),
-      "qwen3-max": cny(6, 24),
-      "qwen3-max-preview": cny(6, 24),
-      "qwen3-coder-plus": cny(4, 16),
-      "qwen3-235b-a22b": cny(4, 40),
-      "qwen3-32b": cny(2, 20),
-      "qwen3-30b-a3b": cny(1.5, 15),
-      "qwen3-14b": cny(1, 10),
-      "qwen3-8b": cny(0.5, 5),
-      "qwen3-4b": cny(0.3, 3),
-      "qwen3-1.7b": cny(0.3, 3),
-      "qwen3-0.6b": cny(0.3, 3),
-      "qwq-plus": cny(1.6, 4),
-      "qwq-plus-latest": cny(1.6, 4),
-      "qwq-plus-2025-03-05": cny(1.6, 4),
-      "kimi-k2.7-code": cny(6.5, 27),
-      "kimi-k2.6": cny(6.5, 27),
-      "kimi-k2.5": cny(4, 21),
-      "kimi-k2-0905-preview": cny(4, 16),
-      "kimi-k2-0711-preview": cny(4, 16),
-      "kimi-k2-turbo-preview": cny(8, 58)
-    };
-    STATIC_PREFIX_PRICES = Object.keys(MODEL_PRICES).sort((a, b2) => b2.length - a.length);
-    CACHE_TTL_MS2 = 5 * 6e4;
-    dbPrices = null;
-    dbPrefixKeys = [];
-    cacheLoadedAt = 0;
-    cacheLoader = null;
-    cacheRefreshInFlight = null;
-  }
-});
-
-// ../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();
-  }
-});
-
 // ../server/src/domains/actors/stats.ts
 function emptyCostBreakdown() {
   return {
@@ -274183,7 +274437,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.31" : "dev";
+var PKG_VERSION = true ? "2.2.32" : "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.31",
+  "version": "2.2.32",
   "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": "bbc56bf65b7e0c10506c3919f42c9c7d8b7c7342"
+    "sourceHead": "7e66896a0213e95be3142f0ac6972054b10ea1e3"
   }
 }