oasis_test 0.1.46 → 0.1.47

package/dist/index.js

@@ -34362,7 +34362,7 @@ function priceForModel(model) {
 function estimateRowCost(row) {
   return estimateUsageCost(row.effectiveModel, row);
 }
-function estimateUsageCost(model, usage) {
+function estimateUsageCostBreakdown(model, usage) {
   const price = priceForModel(model);
   if (!price) return null;
   const inputTokens = Math.max(usage.inputTokens ?? 0, 0);
@@ -34370,8 +34370,22 @@ function estimateUsageCost(model, usage) {
   const cacheReadTokens = Math.max(usage.cacheReadTokens ?? 0, 0);
   const cacheCreationTokens = Math.max(usage.cacheCreationTokens ?? 0, 0);
   const cacheReadPrice = price.cachedInputPerMillion ?? price.inputPerMillion * 0.1;
-  const cost = (inputTokens + cacheCreationTokens) * price.inputPerMillion / 1e6 + outputTokens * price.outputPerMillion / 1e6 + cacheReadTokens * cacheReadPrice / 1e6;
-  return { currency: price.currency, micros: Math.round(cost * 1e6) };
+  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
+  };
 }
 var FOREIGN_MODEL_MARKUP, usd, cny, MODEL_PRICES, PREFIX_PRICES;
 var init_model_pricing = __esm({
@@ -34486,6 +34500,30 @@ var init_model_pricing = __esm({
 });
 
 // ../server/src/domains/actors/stats.ts
+function emptyCostBreakdown() {
+  return {
+    inputUsdMicros: 0,
+    cacheUsdMicros: 0,
+    outputUsdMicros: 0,
+    inputCnyMicros: 0,
+    cacheCnyMicros: 0,
+    outputCnyMicros: 0
+  };
+}
+function addEstimatedBreakdown(target, model, usage) {
+  const estimated = estimateUsageCostBreakdown(model, usage);
+  if (!estimated) return false;
+  if (estimated.currency === "USD") {
+    target.inputUsdMicros += estimated.inputMicros;
+    target.cacheUsdMicros += estimated.cacheMicros;
+    target.outputUsdMicros += estimated.outputMicros;
+  } else {
+    target.inputCnyMicros += estimated.inputMicros;
+    target.cacheCnyMicros += estimated.cacheMicros;
+    target.outputCnyMicros += estimated.outputMicros;
+  }
+  return true;
+}
 async function actorStats(oplog, actorId, opts = {}) {
   const myRevisions = /* @__PURE__ */ new Set();
   const mergedTargets = /* @__PURE__ */ new Set();
@@ -34529,8 +34567,10 @@ async function actorStats(oplog, actorId, opts = {}) {
     approveRateGiven: reviewsGiven === 0 ? null : approvalsGiven / reviewsGiven,
     reworkReceived,
     tokenWeek: weeklyUsage.tokenWeek,
+    tokenWeekBreakdown: weeklyUsage.tokenWeekBreakdown,
     costWeekUsdMicros: weeklyUsage.costWeekUsdMicros,
     costWeekCnyMicros: weeklyUsage.costWeekCnyMicros,
+    costWeekBreakdown: weeklyUsage.costWeekBreakdown,
     usageWindow: { from, to },
     unpricedModels: weeklyUsage.unpricedModels
   };
@@ -34546,18 +34586,24 @@ async function listWeeklyRuns(trace, actorId, from, to) {
   return out;
 }
 function summarizeWeeklyRuns(runs) {
-  let tokenWeek = 0;
+  let input = 0;
+  let cache = 0;
+  let output = 0;
   let costWeekUsdMicros = 0;
   let costWeekCnyMicros = 0;
+  const costWeekBreakdown = emptyCostBreakdown();
   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);
+    const inputTokens = Math.max(usage.inputTokens ?? 0, 0);
+    const outputTokens = Math.max(usage.outputTokens ?? 0, 0);
     const cacheCreation = Math.max(usage.cacheCreationTokens ?? 0, 0);
     const cacheRead = Math.max(usage.cacheReadTokens ?? 0, 0);
-    tokenWeek += input + output + cacheCreation + cacheRead;
+    input += inputTokens;
+    cache += cacheCreation + cacheRead;
+    output += outputTokens;
+    const priced = addEstimatedBreakdown(costWeekBreakdown, run.effectiveModel ?? null, usage);
     const storedCost = Math.max(usage.costUsdMicros ?? 0, 0);
     if (storedCost > 0) {
       costWeekUsdMicros += storedCost;
@@ -34569,28 +34615,36 @@ function summarizeWeeklyRuns(runs) {
       else costWeekCnyMicros += estimated.micros;
       continue;
     }
-    if (input + output + cacheCreation + cacheRead > 0) {
+    if (!priced && inputTokens + outputTokens + cacheCreation + cacheRead > 0) {
       unpriced.add(run.effectiveModel ?? "unknown");
     }
   }
   return {
-    tokenWeek,
+    tokenWeek: input + cache + output,
+    tokenWeekBreakdown: { input, cache, output },
     costWeekUsdMicros,
     costWeekCnyMicros,
+    costWeekBreakdown,
     unpricedModels: [...unpriced].sort()
   };
 }
 function summarizeWeeklyUsage(rows) {
-  let tokenWeek = 0;
+  let input = 0;
+  let cache = 0;
+  let output = 0;
   let costWeekUsdMicros = 0;
   let costWeekCnyMicros = 0;
+  const costWeekBreakdown = emptyCostBreakdown();
   const unpriced = /* @__PURE__ */ new Set();
   for (const row of rows) {
-    const input = Math.max(row.inputTokens, 0);
-    const output = Math.max(row.outputTokens, 0);
+    const inputTokens = Math.max(row.inputTokens, 0);
+    const outputTokens = Math.max(row.outputTokens, 0);
     const cacheCreation = Math.max(row.cacheCreationTokens, 0);
     const cacheRead = Math.max(row.cacheReadTokens, 0);
-    tokenWeek += input + output + cacheCreation + cacheRead;
+    input += inputTokens;
+    cache += cacheCreation + cacheRead;
+    output += outputTokens;
+    const priced = addEstimatedBreakdown(costWeekBreakdown, row.effectiveModel, row);
     const storedCost = Math.max(row.costUsdMicros, 0);
     if (storedCost > 0) {
       costWeekUsdMicros += storedCost;
@@ -34602,14 +34656,16 @@ function summarizeWeeklyUsage(rows) {
       else costWeekCnyMicros += estimated.micros;
       continue;
     }
-    if (input + output + cacheCreation + cacheRead > 0) {
+    if (!priced && inputTokens + outputTokens + cacheCreation + cacheRead > 0) {
       unpriced.add(row.effectiveModel ?? "unknown");
     }
   }
   return {
-    tokenWeek,
+    tokenWeek: input + cache + output,
+    tokenWeekBreakdown: { input, cache, output },
     costWeekUsdMicros,
     costWeekCnyMicros,
+    costWeekBreakdown,
     unpricedModels: [...unpriced].sort()
   };
 }
@@ -40734,7 +40790,7 @@ Write-Host "  Remove : Unregister-ScheduledTask -TaskName 'OasisNode' -Confirm:$
 }
 function buildNpxCmd(p2) {
   const namePart = p2.nodeName ? ` --name ${p2.nodeName}` : "";
-  return `npx -y oasis_test@latest start --server-ws ${p2.gatewayUrl}${namePart} --enroll-token ${p2.token}`;
+  return `npm install -g --prefer-online --prefix ~/.oasis/npm-global oasis_test@latest && ~/.oasis/npm-global/bin/oasis start --server-ws ${p2.gatewayUrl}${namePart} --enroll-token ${p2.token}`;
 }
 var init_connect_script = __esm({
   "../server/src/domains/nodes/connect-script.ts"() {
@@ -58645,7 +58701,7 @@ ${res.warning}`);
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.46" : "dev";
+var PKG_VERSION = true ? "0.1.47" : "dev";
 var OASIS_DIR = path19.join(os11.homedir(), ".oasis");
 var CONFIG_FILE = path19.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path19.join(OASIS_DIR, "node.pid");

package/package.json

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