clawmoney 0.10.16 → 0.10.18

package/dist/relay/executor.js

@@ -106,7 +106,10 @@ export function parseClaudeOutput(raw) {
         if (modelUsage) {
             for (const [modelName, usage] of Object.entries(modelUsage)) {
                 model = modelName;
-                inputTokens += usage.inputTokens ?? 0;
+                // Total input = base + cache_creation + cache_read
+                inputTokens += (usage.inputTokens ?? 0)
+                    + (usage.cacheCreationInputTokens ?? 0)
+                    + (usage.cacheReadInputTokens ?? 0);
                 outputTokens += usage.outputTokens ?? 0;
                 cachedTokens += usage.cacheReadInputTokens ?? 0;
             }

package/dist/relay/pricing.d.ts

@@ -0,0 +1,20 @@
+/**
+ * API pricing per million tokens (USD).
+ * Source: Official pricing pages (April 2026)
+ * - Anthropic: https://platform.claude.com/docs/en/docs/about-claude/pricing
+ * - OpenAI: https://developers.openai.com/api/docs/pricing
+ * - Google: https://ai.google.dev/gemini-api/docs/pricing
+ */
+export interface ModelPricing {
+    input: number;
+    output: number;
+}
+export declare const API_PRICES: Record<string, ModelPricing>;
+export declare const RELAY_DISCOUNT = 0.3;
+export declare const PLATFORM_FEE = 0.05;
+export declare function getModelPricing(model: string): ModelPricing;
+export declare function calculateCost(model: string, inputTokens: number, outputTokens: number): {
+    apiCost: number;
+    relayCost: number;
+    providerEarn: number;
+};

package/dist/relay/pricing.js

@@ -0,0 +1,45 @@
+/**
+ * API pricing per million tokens (USD).
+ * Source: Official pricing pages (April 2026)
+ * - Anthropic: https://platform.claude.com/docs/en/docs/about-claude/pricing
+ * - OpenAI: https://developers.openai.com/api/docs/pricing
+ * - Google: https://ai.google.dev/gemini-api/docs/pricing
+ */
+export const API_PRICES = {
+    // ── Anthropic (Claude) ──
+    "claude-opus-4-6": { input: 5, output: 25 },
+    "claude-opus-4-5": { input: 5, output: 25 },
+    "claude-sonnet-4-6": { input: 3, output: 15 },
+    "claude-sonnet-4-5": { input: 3, output: 15 },
+    "claude-haiku-4-5": { input: 1, output: 5 },
+    // ── OpenAI ──
+    "gpt-5.4": { input: 2.50, output: 15 },
+    "gpt-5.4-mini": { input: 0.75, output: 4.50 },
+    "gpt-5.4-nano": { input: 0.20, output: 1.25 },
+    "gpt-5.4-pro": { input: 30, output: 180 },
+    "gpt-5.3-codex": { input: 1.75, output: 14 },
+    "o3": { input: 5, output: 20 },
+    "o4-mini": { input: 4, output: 16 },
+    // ── Google (Gemini) ──
+    "gemini-2.5-pro": { input: 1.25, output: 10 },
+    "gemini-2.5-flash": { input: 0.30, output: 2.50 },
+    "gemini-2.5-flash-lite": { input: 0.10, output: 0.40 },
+    "gemini-3-flash-preview": { input: 0.50, output: 3 },
+    "gemini-3.1-pro-preview": { input: 2, output: 12 },
+};
+// Default fallback for unknown models
+const DEFAULT_PRICING = { input: 5, output: 25 };
+// Relay discount: consumers pay this fraction of API price
+export const RELAY_DISCOUNT = 0.30; // 30% of API price
+// Platform fee: this fraction goes to the platform
+export const PLATFORM_FEE = 0.05; // 5%
+export function getModelPricing(model) {
+    return API_PRICES[model] ?? DEFAULT_PRICING;
+}
+export function calculateCost(model, inputTokens, outputTokens) {
+    const p = getModelPricing(model);
+    const apiCost = (inputTokens * p.input + outputTokens * p.output) / 1_000_000;
+    const relayCost = apiCost * RELAY_DISCOUNT;
+    const providerEarn = relayCost * (1 - PLATFORM_FEE);
+    return { apiCost, relayCost, providerEarn };
+}

package/dist/relay/provider.js

@@ -4,6 +4,7 @@ import { homedir } from "node:os";
 import YAML from "yaml";
 import { RelayWsClient } from "./ws-client.js";
 import { spawnCli, buildCliArgs, parseCliOutput } from "./executor.js";
+import { calculateCost } from "./pricing.js";
 import { relayLogger as logger } from "./logger.js";
 const CONFIG_DIR = join(homedir(), ".clawmoney");
 const CONFIG_FILE = join(CONFIG_DIR, "config.yaml");
@@ -112,30 +113,21 @@ async function executeRelayRequest(request, config) {
     logger.info(`  │ Prompt: ${String(lastUserMsg).slice(0, 80)}`);
     try {
         // No session_id — each request is stateless, full history in prompt
+        const startMs = Date.now();
         const args = buildCliArgs(cliType, prompt, undefined, max_budget_usd, model);
         const raw = await spawnCli(cliType, args);
+        const elapsedMs = Date.now() - startMs;
         const parsed = parseCliOutput(cliType, raw);
         const answer = parsed.text.replace(/\n/g, " ").slice(0, 80);
         const inT = parsed.usage.input_tokens;
         const outT = parsed.usage.output_tokens;
-        // Cost calculation: API price vs relay price (30% of API)
-        const apiPrices = {
-            "claude-opus-4-6": [15, 75], // $/M in, $/M out
-            "claude-sonnet-4-6": [3, 15],
-            "claude-haiku-4-5": [0.8, 4],
-            "gpt-5": [10, 30],
-            "gpt-5.4": [10, 30],
-            "o3": [10, 40],
-            "gemini-2.5-pro": [1.25, 10],
-            "gemini-2.5-flash": [0.15, 0.6],
-        };
-        const [apiIn, apiOut] = apiPrices[model] ?? [5, 25];
-        const apiCost = (inT * apiIn + outT * apiOut) / 1_000_000;
-        const relayCost = apiCost * 0.3; // 30% of API price
-        const providerEarn = relayCost * 0.95; // 95% to provider
+        const cachedT = parsed.usage.cached_tokens ?? 0;
+        const { apiCost, relayCost, providerEarn } = calculateCost(model, inT, outT);
+        const elapsedSec = (elapsedMs / 1000).toFixed(1);
         logger.info(`  │ Answer: ${answer}`);
-        logger.info(`  │ Tokens: ${inT} in / ${outT} out`);
-        logger.info(`  │ API价:  $${apiCost.toFixed(4)} → Relay价: $${relayCost.toFixed(4)} → 赚: $${providerEarn.toFixed(4)}`);
+        logger.info(`  │ Tokens: ${inT} in (${cachedT} cached) / ${outT} out`);
+        logger.info(`  │ Time:   ${elapsedSec}s`);
+        logger.info(`  │ Cost:   API $${apiCost.toFixed(4)} → Relay $${relayCost.toFixed(4)} → Earn $${providerEarn.toFixed(4)}`);
         logger.info(`  └─ Done`);
         return {
             event: "relay_response",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawmoney",
-  "version": "0.10.16",
+  "version": "0.10.18",
   "description": "ClawMoney CLI -- Earn rewards with your AI agent",
   "type": "module",
   "bin": {