@flame0510/project-aether 1.9.1 → 1.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flame0510/project-aether",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "Rev4a — Revolution for Agents. OpenClaw agent fleet orchestrator.",
   "keywords": [
     "openclaw",

package/scripts/refresh-model-pricing.mjs

@@ -86,7 +86,12 @@ function round(n) {
 function serialisePricing(pricing) {
   const num = (n) => String(n);
   const body = Object.entries(pricing)
-    .map(([id, p]) => `  ${JSON.stringify(id)}: {\n    "input": ${num(p.input)},\n    "output": ${num(p.output)}\n  }`)
+    .map(([id, p]) => {
+      const rates = [['input', p.input], ['output', p.output], ['cacheRead', p.cacheRead], ['cacheWrite', p.cacheWrite]]
+        .filter(([, v]) => v !== undefined)
+        .map(([k, v]) => `    "${k}": ${num(v)}`);
+      return `  ${JSON.stringify(id)}: {\n${rates.join(',\n')}\n  }`;
+    })
     .join(',\n');
   return `{\n${body}\n}\n`;
 }
@@ -243,11 +248,18 @@ async function main() {
     } else {
       const current = pricing[m.id];
       const next = { input: round(input), output: round(output) };
-      if (!current || current.input !== next.input || current.output !== next.output) {
+      // Cache rates when OpenRouter publishes them: OpenClaw prices cached tokens with
+      // these, and without one they fall back to the input rate (lib/model-pricing.ts).
+      const cacheRead = perMillion(up.pricing?.input_cache_read);
+      const cacheWrite = perMillion(up.pricing?.input_cache_write);
+      if (cacheRead !== null) next.cacheRead = round(cacheRead);
+      if (cacheWrite !== null) next.cacheWrite = round(cacheWrite);
+      const show = (x) => `${x.input}/${x.output}` + (x.cacheRead !== undefined ? ` cache ${x.cacheRead}` : '');
+      if (!current || ['input', 'output', 'cacheRead', 'cacheWrite'].some((k) => current[k] !== next[k])) {
         priceChanges.push({
           id: m.id,
-          from: current ? `$${current.input}/$${current.output}` : '(none)',
-          to: `$${next.input}/$${next.output}`,
+          from: current ? show(current) : '(none)',
+          to: show(next),
         });
         pricing[m.id] = next;
       }

package/lib/billing.ts

@@ -1,100 +0,0 @@
-import type { ModelCost } from '@/lib/types';
-
-export type BillingMode = 'usage' | 'fixed' | 'credits' | 'unknown';
-
-/**
- * Economic dollar costs should only include providers we actually bill per usage.
- * Today that is primarily OpenRouter, plus a small set of explicit pay-per-use aliases
- * stored without provider prefixes in older rows.
- */
-const BILLABLE_MODEL_PREFIXES = ['openrouter/'] as const;
-const BILLABLE_ALIAS_PREFIXES = ['deepseek', 'deepseek4', 'or-', 'openrouter', 'qwen', 'kimi', 'glm'] as const;
-const NON_BILLABLE_ALIAS_PATTERNS = [
-  /^gpt-5(\.|-|$)/,
-  /^codex(\.|-|$)/,
-  /^claude(\.|-|$)/,
-  /^claude-cli(\/|$)/,
-  /^anthropic(\/|$)/,
-  /^openai-codex(\/|$)/,
-  /^github-copilot(\/|$)/,
-] as const;
-
-export interface BillingBucket {
-  mode: BillingMode;
-  cost_usd: number;
-  sessions: number;
-  tokens_in: number;
-  tokens_out: number;
-  models: ModelCost[];
-}
-
-export interface BillingSummary {
-  usageBasedCost: number;
-  dbEstimatedCost: number;
-  buckets: Record<BillingMode, BillingBucket>;
-  usageModels: ModelCost[];
-  fixedModels: ModelCost[];
-  creditModels: ModelCost[];
-  unknownModels: ModelCost[];
-}
-
-export function isBillableDollarModel(model?: string | null): boolean {
-  const m = (model ?? '').trim().toLowerCase();
-  if (!m || m === 'unknown') return false;
-  if (BILLABLE_MODEL_PREFIXES.some((prefix) => m.startsWith(prefix))) return true;
-  if (NON_BILLABLE_ALIAS_PATTERNS.some((pattern) => pattern.test(m))) return false;
-  if (m.includes('/')) return false;
-  return BILLABLE_ALIAS_PREFIXES.some((prefix) => m.startsWith(prefix));
-}
-
-export function classifyBillingModel(model?: string | null): BillingMode {
-  const m = (model ?? '').toLowerCase();
-  if (!m || m === 'unknown') return 'unknown';
-  if (isBillableDollarModel(m)) return 'usage';
-  if (m.startsWith('openai-codex/')) return 'fixed';
-  if (m.startsWith('anthropic/') || m.includes('claude-cli')) return 'fixed';
-  if (m.startsWith('github-copilot/')) return 'credits';
-
-  // Rev4a DB often stores model aliases without provider prefix.
-  if (/^gpt-5\.(2|3|4|5)(-codex|-mini|-pro)?$/.test(m)) return 'fixed';
-  if (/^claude-(haiku|sonnet|opus)-/.test(m)) return 'fixed';
-  if (/^gemini-.*(flash|pro)/.test(m)) return 'credits';
-
-  // Known OpenRouter/free/usage-style aliases seen in this workspace.
-  if (/^(deepseek|deepseek4|or-|openrouter|qwen|kimi|glm)/.test(m)) return 'usage';
-  return 'unknown';
-}
-
-function emptyBucket(mode: BillingMode): BillingBucket {
-  return { mode, cost_usd: 0, sessions: 0, tokens_in: 0, tokens_out: 0, models: [] };
-}
-
-export function summarizeBilling(models: ModelCost[]): BillingSummary {
-  const buckets: Record<BillingMode, BillingBucket> = {
-    usage: emptyBucket('usage'),
-    fixed: emptyBucket('fixed'),
-    credits: emptyBucket('credits'),
-    unknown: emptyBucket('unknown'),
-  };
-
-  for (const model of models) {
-    const mode = classifyBillingModel(model.model);
-    const bucket = buckets[mode];
-    const cost = Number(model.cost_usd ?? 0);
-    bucket.cost_usd += cost;
-    bucket.sessions += Number(model.sessions ?? 0);
-    bucket.tokens_in += Number(model.tokens_in ?? 0);
-    bucket.tokens_out += Number(model.tokens_out ?? 0);
-    bucket.models.push(model);
-  }
-
-  return {
-    usageBasedCost: buckets.usage.cost_usd,
-    dbEstimatedCost: models.reduce((sum, model) => sum + Number(model.cost_usd ?? 0), 0),
-    buckets,
-    usageModels: buckets.usage.models,
-    fixedModels: buckets.fixed.models,
-    creditModels: buckets.credits.models,
-    unknownModels: buckets.unknown.models,
-  };
-}