clawmoney 0.10.18 → 0.10.20

package/dist/relay/executor.js

@@ -100,24 +100,23 @@ export function parseClaudeOutput(raw) {
         // modelUsage is a dict: { "model-name": { inputTokens, outputTokens, cacheReadInputTokens, ... } }
         let inputTokens = 0;
         let outputTokens = 0;
-        let cachedTokens = 0;
+        let cacheCreationTokens = 0;
+        let cacheReadTokens = 0;
         let model = "";
         const modelUsage = obj.modelUsage;
         if (modelUsage) {
             for (const [modelName, usage] of Object.entries(modelUsage)) {
                 model = modelName;
-                // Total input = base + cache_creation + cache_read
-                inputTokens += (usage.inputTokens ?? 0)
-                    + (usage.cacheCreationInputTokens ?? 0)
-                    + (usage.cacheReadInputTokens ?? 0);
+                inputTokens += usage.inputTokens ?? 0;
                 outputTokens += usage.outputTokens ?? 0;
-                cachedTokens += usage.cacheReadInputTokens ?? 0;
+                cacheCreationTokens += usage.cacheCreationInputTokens ?? 0;
+                cacheReadTokens += usage.cacheReadInputTokens ?? 0;
             }
         }
         return {
             text,
             sessionId,
-            usage: { input_tokens: inputTokens, output_tokens: outputTokens, cached_tokens: cachedTokens || undefined },
+            usage: { input_tokens: inputTokens, output_tokens: outputTokens, cache_creation_tokens: cacheCreationTokens, cache_read_tokens: cacheReadTokens },
             model,
             costUsd,
         };
@@ -126,7 +125,7 @@ export function parseClaudeOutput(raw) {
         return {
             text: raw.trim().slice(0, 5000),
             sessionId: "",
-            usage: { input_tokens: 0, output_tokens: 0 },
+            usage: { input_tokens: 0, output_tokens: 0, cache_creation_tokens: 0, cache_read_tokens: 0 },
             model: "",
             costUsd: 0,
         };
@@ -173,7 +172,7 @@ export function parseCodexOutput(raw) {
     return {
         text: text || raw.trim().slice(0, 5000),
         sessionId: threadId,
-        usage: { input_tokens: inputTokens, output_tokens: outputTokens },
+        usage: { input_tokens: inputTokens, output_tokens: outputTokens, cache_creation_tokens: 0, cache_read_tokens: 0 },
         model,
         costUsd: 0,
     };
@@ -193,6 +192,7 @@ export function parseGeminiOutput(raw) {
         const sessionId = obj.session_id ?? "";
         let inputTokens = 0;
         let outputTokens = 0;
+        let cachedTokens = 0;
         let model = "";
         const stats = obj.stats;
         const models = stats?.models;
@@ -203,13 +203,14 @@ export function parseGeminiOutput(raw) {
                 if (tokens) {
                     inputTokens += tokens.input ?? tokens.prompt ?? 0;
                     outputTokens += tokens.candidates ?? tokens.output ?? 0;
+                    cachedTokens += tokens.cached ?? 0;
                 }
             }
         }
         return {
             text,
             sessionId,
-            usage: { input_tokens: inputTokens, output_tokens: outputTokens },
+            usage: { input_tokens: inputTokens - cachedTokens, output_tokens: outputTokens, cache_creation_tokens: 0, cache_read_tokens: cachedTokens },
             model,
             costUsd: 0,
         };
@@ -218,7 +219,7 @@ export function parseGeminiOutput(raw) {
         return {
             text: raw.trim().slice(0, 5000),
             sessionId: "",
-            usage: { input_tokens: 0, output_tokens: 0 },
+            usage: { input_tokens: 0, output_tokens: 0, cache_creation_tokens: 0, cache_read_tokens: 0 },
             model: "",
             costUsd: 0,
         };

package/dist/relay/pricing.d.ts

@@ -13,8 +13,13 @@ 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): {
+export interface CostBreakdown {
+    inputCost: number;
+    cacheCreationCost: number;
+    cacheReadCost: number;
+    outputCost: number;
     apiCost: number;
     relayCost: number;
     providerEarn: number;
-};
+}
+export declare function calculateCost(model: string, inputTokens: number, outputTokens: number, cacheCreationTokens?: number, cacheReadTokens?: number): CostBreakdown;

package/dist/relay/pricing.js

@@ -36,10 +36,18 @@ export const PLATFORM_FEE = 0.05; // 5%
 export function getModelPricing(model) {
     return API_PRICES[model] ?? DEFAULT_PRICING;
 }
-export function calculateCost(model, inputTokens, outputTokens) {
+// Cache pricing multipliers (relative to base input price)
+const CACHE_WRITE_MULTIPLIER = 1.25; // 5-minute cache write
+const CACHE_READ_MULTIPLIER = 0.10; // cache hit
+export function calculateCost(model, inputTokens, outputTokens, cacheCreationTokens = 0, cacheReadTokens = 0) {
     const p = getModelPricing(model);
-    const apiCost = (inputTokens * p.input + outputTokens * p.output) / 1_000_000;
+    const M = 1_000_000;
+    const inputCost = (inputTokens * p.input) / M;
+    const cacheCreationCost = (cacheCreationTokens * p.input * CACHE_WRITE_MULTIPLIER) / M;
+    const cacheReadCost = (cacheReadTokens * p.input * CACHE_READ_MULTIPLIER) / M;
+    const outputCost = (outputTokens * p.output) / M;
+    const apiCost = inputCost + cacheCreationCost + cacheReadCost + outputCost;
     const relayCost = apiCost * RELAY_DISCOUNT;
     const providerEarn = relayCost * (1 - PLATFORM_FEE);
-    return { apiCost, relayCost, providerEarn };
+    return { inputCost, cacheCreationCost, cacheReadCost, outputCost, apiCost, relayCost, providerEarn };
 }

package/dist/relay/provider.js

@@ -97,7 +97,9 @@ async function executeRelayRequest(request, config) {
     const { request_id, max_budget_usd } = request;
     const cliType = request.cli_type ?? config.relay.cli_type;
     const model = request.model ?? config.relay.model;
-    // Build prompt from messages (no --resume, full history as prompt)
+    const stateful = request.stateful ?? false;
+    const cliSessionId = request.cli_session_id ?? undefined;
+    // Build prompt from messages
     const prompt = request.messages
         ? messagesToPrompt(request.messages)
         : request.prompt ?? "";
@@ -107,33 +109,35 @@ async function executeRelayRequest(request, config) {
     const turns = request.messages
         ? request.messages.filter((m) => m.role === "user").length
         : 1;
+    const modeLabel = stateful
+        ? (cliSessionId ? `stateful[resume ${cliSessionId.slice(0, 8)}]` : "stateful[new]")
+        : "stateless";
     logger.info(`  ┌─ Request ${request_id.slice(0, 8)}`);
-    logger.info(`  │ CLI:    ${cliType} / ${model}`);
+    logger.info(`  │ CLI:    ${cliType} / ${model} (${modeLabel})`);
     logger.info(`  │ Turns:  ${turns}`);
     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);
+        // In stateful mode, pass cli_session_id so buildCliArgs adds --resume
+        const args = buildCliArgs(cliType, prompt, cliSessionId, 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;
-        const cachedT = parsed.usage.cached_tokens ?? 0;
-        const { apiCost, relayCost, providerEarn } = calculateCost(model, inT, outT);
+        const { input_tokens: inT, output_tokens: outT, cache_creation_tokens: cacheWriteT, cache_read_tokens: cacheReadT } = parsed.usage;
+        const cost = calculateCost(model, inT, outT, cacheWriteT, cacheReadT);
         const elapsedSec = (elapsedMs / 1000).toFixed(1);
         logger.info(`  │ Answer: ${answer}`);
-        logger.info(`  │ Tokens: ${inT} in (${cachedT} cached) / ${outT} out`);
+        logger.info(`  │ Tokens: input=${inT} cache_write=${cacheWriteT} cache_read=${cacheReadT} output=${outT}`);
         logger.info(`  │ Time:   ${elapsedSec}s`);
-        logger.info(`  │ Cost:   API $${apiCost.toFixed(4)} → Relay $${relayCost.toFixed(4)} → Earn $${providerEarn.toFixed(4)}`);
+        logger.info(`  │ Cost:   input=$${cost.inputCost.toFixed(4)} cache_w=$${cost.cacheCreationCost.toFixed(4)} cache_r=$${cost.cacheReadCost.toFixed(4)} output=$${cost.outputCost.toFixed(4)}`);
+        logger.info(`  │ Total:  API $${cost.apiCost.toFixed(4)} → Relay $${cost.relayCost.toFixed(4)} → Earn $${cost.providerEarn.toFixed(4)}`);
         logger.info(`  └─ Done`);
         return {
             event: "relay_response",
             request_id,
             content: parsed.text,
-            session_id: parsed.sessionId || undefined,
+            cli_session_id: parsed.sessionId || undefined,
             usage: parsed.usage,
             model_used: parsed.model || model,
             cost_usd: parsed.costUsd || undefined,

package/dist/relay/types.d.ts

@@ -8,6 +8,8 @@ export interface RelayRequest {
     }>;
     cli_type?: string;
     session_id?: string;
+    cli_session_id?: string | null;
+    stateful?: boolean;
     model?: string;
     max_budget_usd?: number;
 }
@@ -27,10 +29,12 @@ export interface RelayResponse {
     request_id: string;
     content: string;
     session_id?: string;
+    cli_session_id?: string;
     usage?: {
         input_tokens: number;
         output_tokens: number;
-        cached_tokens?: number;
+        cache_creation_tokens?: number;
+        cache_read_tokens?: number;
     };
     model_used?: string;
     cost_usd?: number;
@@ -43,7 +47,8 @@ export interface ParsedOutput {
     usage: {
         input_tokens: number;
         output_tokens: number;
-        cached_tokens?: number;
+        cache_creation_tokens: number;
+        cache_read_tokens: number;
     };
     model: string;
     costUsd: number;

package/package.json

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