oasis_test 0.1.43 → 0.1.45

package/dist/index.js

@@ -34318,14 +34318,159 @@ ${input.description}
   }
 });
 
+// ../server/src/domains/actors/model-pricing.ts
+function priceForModel(model) {
+  if (!model) return null;
+  const normalized = model.trim().toLowerCase();
+  if (!normalized) return null;
+  const candidates = [
+    normalized,
+    normalized.includes(":") ? normalized.slice(normalized.lastIndexOf(":") + 1) : "",
+    normalized.includes("/") ? normalized.slice(normalized.lastIndexOf("/") + 1) : ""
+  ].filter(Boolean);
+  for (const candidate of candidates) {
+    const exact = MODEL_PRICES[candidate];
+    if (exact) return exact;
+  }
+  const prefix = PREFIX_PRICES.find((p2) => candidates.some((candidate) => candidate.startsWith(`${p2}-`) || candidate.startsWith(`${p2}:`)));
+  return prefix ? MODEL_PRICES[prefix] : null;
+}
+function estimateRowCost(row) {
+  return estimateUsageCost(row.effectiveModel, row);
+}
+function estimateUsageCost(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 cost = (inputTokens + cacheCreationTokens) * price.inputPerMillion / 1e6 + outputTokens * price.outputPerMillion / 1e6 + cacheReadTokens * (price.cachedInputPerMillion ?? price.inputPerMillion) / 1e6;
+  return { currency: price.currency, micros: Math.round(cost * 1e6) };
+}
+var FOREIGN_MODEL_MARKUP, usd, cny, MODEL_PRICES, PREFIX_PRICES;
+var init_model_pricing = __esm({
+  "../server/src/domains/actors/model-pricing.ts"() {
+    "use strict";
+    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),
+      "claude-fable-5": usd(10, 50),
+      "claude-mythos-5": usd(10, 50),
+      "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-sonnet-4-5-20250929": 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),
+      "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)
+    };
+    PREFIX_PRICES = Object.keys(MODEL_PRICES).sort((a, b2) => b2.length - a.length);
+  }
+});
+
 // ../server/src/domains/actors/stats.ts
-async function actorStats(oplog, actorId) {
+async function actorStats(oplog, actorId, opts = {}) {
   const myRevisions = /* @__PURE__ */ new Set();
   const mergedTargets = /* @__PURE__ */ new Set();
   let produced = 0;
   let reviewsGiven = 0;
   let approvalsGiven = 0;
   let reworkReceived = 0;
+  const now = opts.now ?? /* @__PURE__ */ new Date();
+  const from = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1e3).toISOString();
+  const to = now.toISOString();
   for await (const { op } of oplog.readAll()) {
     if (op.kind === "propose_revision" && op.actor === actorId) {
       produced++;
@@ -34345,18 +34490,99 @@ async function actorStats(oplog, actorId) {
   }
   let merged = 0;
   for (const rev of myRevisions) if (mergedTargets.has(rev)) merged++;
+  const weeklyUsage = opts.usage?.listRuns ? summarizeWeeklyRuns(await listWeeklyRuns(opts.usage, actorId, from, to)) : summarizeWeeklyUsage(opts.usage?.queryUsageStats ? await opts.usage.queryUsageStats({
+    actorIds: [actorId],
+    from,
+    to,
+    granularity: "hour"
+  }) : []);
   return {
     actorId,
     produced,
     merged,
     reviewsGiven,
     approveRateGiven: reviewsGiven === 0 ? null : approvalsGiven / reviewsGiven,
-    reworkReceived
+    reworkReceived,
+    tokenWeek: weeklyUsage.tokenWeek,
+    costWeekUsdMicros: weeklyUsage.costWeekUsdMicros,
+    costWeekCnyMicros: weeklyUsage.costWeekCnyMicros,
+    usageWindow: { from, to },
+    unpricedModels: weeklyUsage.unpricedModels
+  };
+}
+async function listWeeklyRuns(trace, actorId, from, to) {
+  const out = [];
+  let cursor;
+  do {
+    const page = await trace.listRuns({ actorId, from, to, limit: 500, ...cursor ? { cursor } : {} });
+    out.push(...page.items);
+    cursor = page.nextCursor ?? void 0;
+  } while (cursor);
+  return out;
+}
+function summarizeWeeklyRuns(runs) {
+  let tokenWeek = 0;
+  let costWeekUsdMicros = 0;
+  let costWeekCnyMicros = 0;
+  const unpriced = /* @__PURE__ */ new Set();
+  for (const run of runs) {
+    const usage = run.usage;
+    if (!usage) continue;
+    const input = Math.max(usage.inputTokens ?? 0, 0);
+    const output = Math.max(usage.outputTokens ?? 0, 0);
+    tokenWeek += input + output;
+    const estimated = estimateUsageCost(run.effectiveModel, usage);
+    if (estimated) {
+      if (estimated.currency === "USD") costWeekUsdMicros += estimated.micros;
+      else costWeekCnyMicros += estimated.micros;
+      continue;
+    }
+    const storedCost = Math.max(usage.costUsdMicros ?? 0, 0);
+    if (storedCost > 0) {
+      costWeekUsdMicros += storedCost;
+    } else if (input + output > 0) {
+      unpriced.add(run.effectiveModel ?? "unknown");
+    }
+  }
+  return {
+    tokenWeek,
+    costWeekUsdMicros,
+    costWeekCnyMicros,
+    unpricedModels: [...unpriced].sort()
+  };
+}
+function summarizeWeeklyUsage(rows) {
+  let tokenWeek = 0;
+  let costWeekUsdMicros = 0;
+  let costWeekCnyMicros = 0;
+  const unpriced = /* @__PURE__ */ new Set();
+  for (const row of rows) {
+    const input = Math.max(row.inputTokens, 0);
+    const output = Math.max(row.outputTokens, 0);
+    tokenWeek += input + output;
+    const estimated = estimateRowCost(row);
+    if (estimated) {
+      if (estimated.currency === "USD") costWeekUsdMicros += estimated.micros;
+      else costWeekCnyMicros += estimated.micros;
+      continue;
+    }
+    if (row.costUsdMicros > 0) {
+      costWeekUsdMicros += row.costUsdMicros;
+    } else if (input + output > 0) {
+      unpriced.add(row.effectiveModel ?? "unknown");
+    }
+  }
+  return {
+    tokenWeek,
+    costWeekUsdMicros,
+    costWeekCnyMicros,
+    unpricedModels: [...unpriced].sort()
   };
 }
 var init_stats = __esm({
   "../server/src/domains/actors/stats.ts"() {
     "use strict";
+    init_model_pricing();
   }
 });
 
@@ -34894,7 +35120,10 @@ function actorsDomain(opts) {
     router.get("/api/actors/:id/stats", async (req) => {
       const { oplog } = await resolveCtx(req.auth.companyId);
       if (!oplog) throw new ApiError(501, "NOT_IMPLEMENTED", "\u7EDF\u8BA1\u6570\u636E\u6E90\u672A\u63A5\u5165");
-      return { status: 200, body: await actorStats(oplog, req.params.id) };
+      return {
+        status: 200,
+        body: await actorStats(oplog, req.params.id, { usage: opts.trace?.() })
+      };
     });
     router.get("/api/actors/:id/activity", async (req) => {
       const { oplog } = await resolveCtx(req.auth.companyId);
@@ -35043,7 +35272,7 @@ function createActorsDomain(opts) {
   return {
     service: defaultCtx.service,
     resolveCtx,
-    register: actorsDomain({ resolveCtx, ...opts.listBuiltinSkills ? { listBuiltinSkills: opts.listBuiltinSkills } : {} })
+    register: actorsDomain({ resolveCtx, ...opts.trace ? { trace: opts.trace } : {}, ...opts.listBuiltinSkills ? { listBuiltinSkills: opts.listBuiltinSkills } : {} })
   };
 }
 var import_node_crypto8;
@@ -38870,6 +39099,19 @@ function parseArgsJSON(argsText) {
 function extractSessionID(result) {
   return result?.sessionId ?? "";
 }
+function extractCurrentModelID(result) {
+  const r = record4(result);
+  const models = record4(r?.["models"]);
+  return firstString(
+    models?.["currentModelId"],
+    models?.["current_model_id"],
+    r?.["currentModelId"],
+    r?.["current_model_id"],
+    r?.["modelId"],
+    r?.["model_id"],
+    r?.["model"]
+  );
+}
 function extractStopReason(result) {
   return result?.stopReason ?? "";
 }
@@ -39002,6 +39244,7 @@ async function runACPSession(job, cfg) {
             ...resolvedModel ? { model: resolvedModel } : {}
           });
           sessionId = extractSessionID(resumeRes);
+          actualModel = resolvedModel ?? extractCurrentModelID(resumeRes) ?? actualModel;
           if (!sessionId) {
             sessionId = job.runtimeSessionId;
             ambiguousResume = true;
@@ -39017,6 +39260,7 @@ async function runACPSession(job, cfg) {
           ...resolvedModel ? { model: resolvedModel } : {}
         });
         sessionId = extractSessionID(sessionRes);
+        actualModel = resolvedModel ?? extractCurrentModelID(sessionRes) ?? actualModel;
         if (!sessionId) throw new Error("session/new returned no sessionId");
       }
       capturedSessionId = sessionId;
@@ -39029,6 +39273,20 @@ async function runACPSession(job, cfg) {
 ---
 
 ${task}` : task;
+      if (job.resumeRuntimeSession && job.runtimeSessionId && advertisedLoadSession) {
+        const start = Date.now();
+        let lastCount = client.notificationCount;
+        let lastChange = start;
+        while (Date.now() - start < 1200) {
+          await new Promise((r) => setTimeout(r, 25));
+          if (client.notificationCount !== lastCount) {
+            lastCount = client.notificationCount;
+            lastChange = Date.now();
+          } else if (Date.now() - lastChange >= 250) {
+            break;
+          }
+        }
+      }
       streamingCurrentTurn = true;
       let promptResult = await client.request("session/prompt", {
         sessionId,
@@ -39041,6 +39299,7 @@ ${task}` : task;
           ...resolvedModel ? { model: resolvedModel } : {}
         });
         sessionId = extractSessionID(sessionRes);
+        actualModel = resolvedModel ?? extractCurrentModelID(sessionRes) ?? actualModel;
         if (!sessionId) throw new Error("session/new returned no sessionId");
         capturedSessionId = sessionId;
         promptResult = await client.request("session/prompt", {
@@ -39177,7 +39436,9 @@ var init_acp = __esm({
         const params = raw["params"];
         if (!params?.update) return;
         const [updateType, updateData] = normalizeACPUpdate(params.update);
-        if (!updateType || !this.acceptNotification()) return;
+        if (!updateType) return;
+        this.notificationCount++;
+        if (!this.acceptNotification()) return;
         switch (updateType) {
           case "agent_message_chunk":
             this.handleAgentMessage(updateData);
@@ -39228,9 +39489,9 @@ var init_acp = __esm({
         this.onTelemetry({ kind, payload, seq: ++this.seq, ts: (/* @__PURE__ */ new Date()).toISOString() });
       }
       appendText(kind, text) {
-        if (kind === "message") this.onOutput(text);
         const other = kind === "message" ? "thought" : "message";
         this.flushTextBuffer(other);
+        if (kind === "message") this.onOutput(text);
         const existing = this.textBuffers.get(kind);
         if (existing) existing.text += text;
         else this.textBuffers.set(kind, { text, startedAt: (/* @__PURE__ */ new Date()).toISOString() });
@@ -54917,11 +55178,13 @@ async function startServe(opts) {
   let getEngine = async () => {
     throw new Error("company engine router not initialized");
   };
+  let traceStoreForActors;
   const actors = createActorsDomain({
     store: registryStore,
     oplog,
     kernel,
     blobs: assets,
+    trace: () => traceStoreForActors,
     audit: registryAudit,
     // CO-302 数据面隔离（actors 域试点）：按当前公司取其引擎，用各自 registry 服务该域请求。
     // engineRouter 在下方（行 ~411）以 const 声明；此箭头只在请求时调用，那时已初始化，闭包引用合法
@@ -55000,6 +55263,7 @@ async function startServe(opts) {
     traceStore = await FileTraceStore.open(path16.join(opts.dir, "trace"));
     console.log("[serve] \u8FD0\u884C\u8F68\u8FF9\u4F53\u7CFB\uFF1A\u672C\u5730 ndjson dev store");
   }
+  traceStoreForActors = traceStore;
   const trace = createTraceDomain({ store: traceStore });
   const traceStoreSink = new TraceStoreSink({ store: traceStore, runtimeKind: "auto" });
   const automationStore = pgPool ? await PostgresAutomationStore.open(pgPool, pgSchema) : new MemoryAutomationStore();
@@ -58146,7 +58410,7 @@ ${res.warning}`);
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.43" : "dev";
+var PKG_VERSION = true ? "0.1.45" : "dev";
 var OASIS_DIR = path18.join(os10.homedir(), ".oasis");
 var CONFIG_FILE = path18.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path18.join(OASIS_DIR, "node.pid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.43",
+  "version": "0.1.45",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"