@iinm/plain-agent 1.4.0 → 1.5.0

package/.config/config.predefined.json

@@ -140,6 +140,16 @@
           "max_tokens": 32768,
           "thinking": { "type": "enabled", "budget_tokens": 16384 }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "input_tokens": 1.0,
+          "output_tokens": 5.0,
+          "cache_read_input_tokens": 0.1,
+          "cache_creation_input_tokens": 1.25
+        }
       }
     },
     {
@@ -157,6 +167,16 @@
           "max_tokens": 64000,
           "thinking": { "type": "enabled", "budget_tokens": 32768 }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "input_tokens": 1.0,
+          "output_tokens": 5.0,
+          "cache_read_input_tokens": 0.1,
+          "cache_creation_input_tokens": 1.25
+        }
       }
     },
     {
@@ -174,6 +194,16 @@
           "max_tokens": 32768,
           "thinking": { "type": "enabled", "budget_tokens": 16384 }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "input_tokens": 3,
+          "output_tokens": 15,
+          "cache_read_input_tokens": 0.3,
+          "cache_creation_input_tokens": 3.75
+        }
       }
     },
     {
@@ -191,6 +221,16 @@
           "max_tokens": 64000,
           "thinking": { "type": "enabled", "budget_tokens": 32768 }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "input_tokens": 3,
+          "output_tokens": 15,
+          "cache_read_input_tokens": 0.3,
+          "cache_creation_input_tokens": 3.75
+        }
       }
     },
     {
@@ -208,6 +248,16 @@
           "max_tokens": 32768,
           "thinking": { "type": "enabled", "budget_tokens": 16384 }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "input_tokens": 5,
+          "output_tokens": 25,
+          "cache_read_input_tokens": 0.5,
+          "cache_creation_input_tokens": 6.25
+        }
       }
     },
     {
@@ -225,6 +275,16 @@
           "max_tokens": 64000,
           "thinking": { "type": "enabled", "budget_tokens": 32768 }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "input_tokens": 5,
+          "output_tokens": 25,
+          "cache_read_input_tokens": 0.5,
+          "cache_creation_input_tokens": 6.25
+        }
       }
     },
 
@@ -242,6 +302,16 @@
           "max_tokens": 32768,
           "thinking": { "type": "enabled", "budget_tokens": 16384 }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "input_tokens": 1.0,
+          "output_tokens": 5.0,
+          "cache_read_input_tokens": 0.1,
+          "cache_creation_input_tokens": 1.25
+        }
       }
     },
     {
@@ -258,6 +328,16 @@
           "max_tokens": 64000,
           "thinking": { "type": "enabled", "budget_tokens": 32768 }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "input_tokens": 1.0,
+          "output_tokens": 5.0,
+          "cache_read_input_tokens": 0.1,
+          "cache_creation_input_tokens": 1.25
+        }
       }
     },
     {
@@ -274,6 +354,16 @@
           "max_tokens": 32768,
           "thinking": { "type": "enabled", "budget_tokens": 16384 }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "input_tokens": 3,
+          "output_tokens": 15,
+          "cache_read_input_tokens": 0.3,
+          "cache_creation_input_tokens": 3.75
+        }
       }
     },
     {
@@ -290,6 +380,16 @@
           "max_tokens": 64000,
           "thinking": { "type": "enabled", "budget_tokens": 32768 }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "input_tokens": 3,
+          "output_tokens": 15,
+          "cache_read_input_tokens": 0.3,
+          "cache_creation_input_tokens": 3.75
+        }
       }
     },
     {
@@ -306,6 +406,16 @@
           "max_tokens": 32768,
           "thinking": { "type": "enabled", "budget_tokens": 16384 }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "input_tokens": 5,
+          "output_tokens": 25,
+          "cache_read_input_tokens": 0.5,
+          "cache_creation_input_tokens": 6.25
+        }
       }
     },
     {
@@ -322,6 +432,16 @@
           "max_tokens": 64000,
           "thinking": { "type": "enabled", "budget_tokens": 32768 }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "input_tokens": 5,
+          "output_tokens": 25,
+          "cache_read_input_tokens": 0.5,
+          "cache_creation_input_tokens": 6.25
+        }
       }
     },
 
@@ -349,6 +469,15 @@
             }
           }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "promptTokenCount": 0.5,
+          "cachedContentTokenCount": -0.45,
+          "candidatesTokenCount": 3
+        }
       }
     },
     {
@@ -375,6 +504,15 @@
             }
           }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "promptTokenCount": 0.5,
+          "cachedContentTokenCount": -0.45,
+          "candidatesTokenCount": 3
+        }
       }
     },
     {
@@ -453,6 +591,15 @@
             }
           }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "promptTokenCount": 0.5,
+          "cachedContentTokenCount": -0.45,
+          "candidatesTokenCount": 3
+        }
       }
     },
     {
@@ -478,6 +625,15 @@
             }
           }
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "promptTokenCount": 0.5,
+          "cachedContentTokenCount": -0.45,
+          "candidatesTokenCount": 3
+        }
       }
     },
     {
@@ -699,6 +855,15 @@
         "config": {
           "model": "zai-org/glm-5-maas"
         }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "prompt_tokens": 1,
+          "completion_tokens": 3.2,
+          "prompt_tokens_details.cached_tokens": -0.9
+        }
       }
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iinm/plain-agent",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "A lightweight CLI-based coding agent",
   "license": "MIT",
   "type": "module",

package/src/agent.d.ts

@@ -9,6 +9,7 @@ import type {
 } from "./model";
 import type { Tool, ToolUseApprover } from "./tool";
 import type { AgentRole } from "./context/loadAgentRoles.mjs";
+import type { CostSummary, CostConfig } from "./costTracker.mjs";
 
 export type Agent = {
   userEventEmitter: UserEventEmitter;
@@ -19,6 +20,7 @@ export type Agent = {
 export type AgentCommands = {
   dumpMessages: () => Promise<void>;
   loadMessages: () => Promise<void>;
+  getCostSummary: () => CostSummary;
 };
 
 type UserEventMap = {
@@ -45,4 +47,5 @@ export type AgentConfig = {
   tools: Tool[];
   toolUseApprover: ToolUseApprover;
   agentRoles: Map<string, AgentRole>;
+  modelCostConfig?: CostConfig;
 };

package/src/agent.mjs

@@ -9,6 +9,7 @@ import { EventEmitter } from "node:events";
 import fs from "node:fs/promises";
 import { createAgentLoop } from "./agentLoop.mjs";
 import { createStateManager } from "./agentState.mjs";
+import { createCostTracker } from "./costTracker.mjs";
 import { MESSAGES_DUMP_FILE_PATH } from "./env.mjs";
 import { createSubagentManager } from "./subagent.mjs";
 import { createToolExecutor } from "./toolExecutor.mjs";
@@ -25,12 +26,19 @@ export function createAgent({
   tools,
   toolUseApprover,
   agentRoles,
+  modelCostConfig,
 }) {
   /** @type {UserEventEmitter} */
   const userEventEmitter = new EventEmitter();
   /** @type {AgentEventEmitter} */
   const agentEventEmitter = new EventEmitter();
 
+  const costTracker = createCostTracker(modelCostConfig);
+
+  agentEventEmitter.on("providerTokenUsage", (usage) => {
+    costTracker.recordUsage(usage);
+  });
+
   const stateManager = createStateManager(
     [
       {
@@ -154,6 +162,7 @@ export function createAgent({
     agentCommands: {
       dumpMessages,
       loadMessages,
+      getCostSummary: () => costTracker.calculateCost(),
     },
   };
 }

package/src/cliBatch.mjs

@@ -1,11 +1,14 @@
 /**
- * @import { UserEventEmitter, AgentEventEmitter } from "./agent"
+ * @import { UserEventEmitter, AgentEventEmitter, AgentCommands } from "./agent"
  */
 
+import { formatCostForBatch } from "./cliFormatter.mjs";
+
 /**
  * @typedef {object} BatchSessionOptions
  * @property {UserEventEmitter} userEventEmitter
  * @property {AgentEventEmitter} agentEventEmitter
+ * @property {AgentCommands} agentCommands
  * @property {string} task - Task instruction to execute
  * @property {string} sessionId
  * @property {string} modelName
@@ -23,6 +26,7 @@
 export async function startBatchSession({
   userEventEmitter,
   agentEventEmitter,
+  agentCommands,
   task,
   sessionId,
   modelName,
@@ -35,9 +39,12 @@ export async function startBatchSession({
 
   await new Promise((/** @type {(value?: void) => void} */ resolve) => {
     agentEventEmitter.on("turnEnd", async () => {
+      const costSummary = agentCommands.getCostSummary();
+
       outputEvent({
         type: "session_end",
         timestamp: new Date().toISOString(),
+        cost: formatCostForBatch(costSummary),
       });
       await onStop();
       resolve();

package/src/cliFormatter.mjs

@@ -206,3 +206,70 @@ export function formatProviderTokenUsage(usage) {
 
   return styleText("gray", outputLines.join("\n"));
 }
+
+/**
+ * Format cost summary for interactive display
+ * @param {import("./costTracker.mjs").CostSummary} summary
+ * @returns {string}
+ */
+export function formatCostSummary(summary) {
+  if (!summary || Object.keys(summary.breakdown).length === 0) {
+    return styleText("gray", "No token usage recorded yet.");
+  }
+
+  const lines = [];
+
+  // Header
+  lines.push(styleText("bold", "\nSession Cost Summary\n"));
+
+  // Tokens
+  lines.push(styleText("bold", "Tokens:"));
+
+  for (const [key, { tokens, cost }] of Object.entries(summary.breakdown)) {
+    const tokenStr = `${key}: ${tokens.toLocaleString()}`;
+
+    if (cost !== undefined) {
+      const costStr = `${cost.toFixed(4)} ${summary.currency}`;
+      lines.push(`  ${tokenStr.padEnd(30)} ${styleText("cyan", costStr)}`);
+    } else {
+      lines.push(`  ${tokenStr.padEnd(30)} ${styleText("gray", "N/A")}`);
+    }
+  }
+
+  // Total
+  lines.push("");
+  if (summary.totalCost !== undefined) {
+    lines.push(
+      styleText(
+        "bold",
+        `Total: ${summary.totalCost.toFixed(4)} ${summary.currency}`,
+      ),
+    );
+  } else {
+    lines.push(styleText("yellow", "Total: N/A (no cost configuration)"));
+  }
+
+  return lines.join("\n");
+}
+
+/**
+ * Format cost for batch mode JSON output
+ * @param {import("./costTracker.mjs").CostSummary} summary
+ */
+export function formatCostForBatch(summary) {
+  if (!summary || Object.keys(summary.breakdown).length === 0) {
+    return undefined;
+  }
+
+  return {
+    total: summary.totalCost,
+    currency: summary.currency,
+    unit: summary.unit,
+    breakdown: Object.fromEntries(
+      Object.entries(summary.breakdown).map(([key, { tokens, cost }]) => [
+        key,
+        { tokens, cost },
+      ]),
+    ),
+  };
+}

package/src/cliInteractive.mjs

@@ -8,6 +8,7 @@ import { execFileSync } from "node:child_process";
 import readline from "node:readline";
 import { styleText } from "node:util";
 import {
+  formatCostSummary,
   formatProviderTokenUsage,
   formatToolResult,
   formatToolUse,
@@ -47,6 +48,7 @@ const SLASH_COMMANDS = [
   },
   { name: "/dump", description: "Save current messages to a JSON file" },
   { name: "/load", description: "Load messages from a JSON file" },
+  { name: "/cost", description: "Display session cost and token usage" },
 ];
 
 /**
@@ -214,11 +216,12 @@ export function startInteractiveSession({
   onStop,
   claudeCodePlugins,
 }) {
-  /** @type {{ turn: boolean, multiLineBuffer: string[] | null, subagentName: string }} */
+  /** @type {{ turn: boolean, multiLineBuffer: string[] | null, subagentName: string, skipNextUserMessage: boolean }} */
   const state = {
     turn: true,
     multiLineBuffer: null,
     subagentName: "",
+    skipNextUserMessage: false,
   };
 
   /**
@@ -236,8 +239,8 @@ export function startInteractiveSession({
     console.log(message);
     console.log(styleText("gray", "</agent>"));
 
+    state.skipNextUserMessage = true;
     userEventEmitter.emit("userInput", [{ type: "text", text: message }]);
-    state.turn = false;
   }
 
   /**
@@ -252,6 +255,7 @@ export function startInteractiveSession({
 
     if (!prompt) {
       console.log(styleText("red", `\nPrompt not found: ${id}`));
+      state.turn = true;
       cli.prompt();
       return;
     }
@@ -265,8 +269,8 @@ export function startInteractiveSession({
     console.log(message);
     console.log(styleText("gray", "</prompt>"));
 
+    state.skipNextUserMessage = true;
     userEventEmitter.emit("userInput", [{ type: "text", text: message }]);
-    state.turn = false;
   }
 
   const getCliPrompt = (subagentName = "") =>
@@ -388,9 +392,13 @@ export function startInteractiveSession({
    * @returns {Promise<void>}
    */
   async function processInput(input) {
+    // Prevent concurrent input processing from multi-line paste
+    state.turn = false;
+
     const inputTrimmed = input.trim();
 
     if (inputTrimmed.length === 0) {
+      state.turn = true;
       cli.prompt();
       return;
     }
@@ -400,6 +408,7 @@ export function startInteractiveSession({
 
     if (["/help", "help"].includes(inputTrimmed.toLowerCase())) {
       console.log(`\n${HELP_MESSAGE}`);
+      state.turn = true;
       cli.prompt();
       return;
     }
@@ -408,6 +417,7 @@ export function startInteractiveSession({
       const fileRange = parseFileRange(inputTrimmed.slice(1));
       if (fileRange instanceof Error) {
         console.log(styleText("red", `\n${fileRange.message}`));
+        state.turn = true;
         cli.prompt();
         return;
       }
@@ -415,6 +425,7 @@ export function startInteractiveSession({
       const fileContent = await readFileRange(fileRange);
       if (fileContent instanceof Error) {
         console.log(styleText("red", `\n${fileContent.message}`));
+        state.turn = true;
         cli.prompt();
         return;
       }
@@ -425,19 +436,29 @@ export function startInteractiveSession({
 
       const messageWithContext = await loadUserMessageContext(fileContent);
 
+      state.skipNextUserMessage = true;
       userEventEmitter.emit("userInput", messageWithContext);
-      state.turn = false;
       return;
     }
 
     if (inputTrimmed.toLowerCase() === "/dump") {
       await agentCommands.dumpMessages();
+      state.turn = true;
       cli.prompt();
       return;
     }
 
     if (inputTrimmed.toLowerCase() === "/load") {
       await agentCommands.loadMessages();
+      state.turn = true;
+      cli.prompt();
+      return;
+    }
+
+    if (inputTrimmed.toLowerCase() === "/cost") {
+      const summary = agentCommands.getCostSummary();
+      console.log(formatCostSummary(summary));
+      state.turn = true;
       cli.prompt();
       return;
     }
@@ -457,6 +478,7 @@ export function startInteractiveSession({
           );
         }
       }
+      state.turn = true;
       cli.prompt();
       return;
     }
@@ -477,6 +499,7 @@ export function startInteractiveSession({
             );
           }
         }
+        state.turn = true;
         cli.prompt();
         return;
       }
@@ -485,6 +508,7 @@ export function startInteractiveSession({
         const match = inputTrimmed.match(/^\/prompts:([^ ]+)(?:\s+(.*))?$/);
         if (!match) {
           console.log(styleText("red", "\nInvalid prompt invocation format."));
+          state.turn = true;
           cli.prompt();
           return;
         }
@@ -497,6 +521,7 @@ export function startInteractiveSession({
       const match = inputTrimmed.match(/^\/agents:([^ ]+)(?:\s+(.*))?$/);
       if (!match) {
         console.log(styleText("red", "\nInvalid agent invocation format."));
+        state.turn = true;
         cli.prompt();
         return;
       }
@@ -521,6 +546,7 @@ export function startInteractiveSession({
               `\nUnsupported platform for /paste: ${process.platform}`,
             ),
           );
+          state.turn = true;
           cli.prompt();
           return;
         }
@@ -532,6 +558,7 @@ export function startInteractiveSession({
             `\nFailed to get clipboard content: ${errorMessage}`,
           ),
         );
+        state.turn = true;
         cli.prompt();
         return;
       }
@@ -543,8 +570,8 @@ export function startInteractiveSession({
       console.log(styleText("gray", "</paste>"));
 
       const messageWithContext = await loadUserMessageContext(combinedInput);
+      state.skipNextUserMessage = true;
       userEventEmitter.emit("userInput", messageWithContext);
-      state.turn = false;
       return;
     }
 
@@ -564,8 +591,8 @@ export function startInteractiveSession({
     }
 
     const messageWithContext = await loadUserMessageContext(inputTrimmed);
+    state.skipNextUserMessage = true;
     userEventEmitter.emit("userInput", messageWithContext);
-    state.turn = false;
   }
 
   cli.on("line", async (lineInput) => {
@@ -627,8 +654,9 @@ export function startInteractiveSession({
   });
 
   agentEventEmitter.on("message", (message) => {
-    // Skip user message
-    if (state.turn) {
+    // Skip user input message (echoing back what the user just sent)
+    if (state.skipNextUserMessage) {
+      state.skipNextUserMessage = false;
       return;
     }
     printMessage(message);

package/src/costTracker.mjs

@@ -0,0 +1,171 @@
+/**
+ * @import { ProviderTokenUsage } from "./model"
+ */
+
+/**
+ * @typedef {Object} TokenBreakdown
+ * @property {number} tokens - Token count
+ * @property {number | undefined} cost - Cost (undefined if no pricing)
+ */
+
+/**
+ * @typedef {Object} CostSummary
+ * @property {string} currency - Currency code (e.g., "USD")
+ * @property {string} unit - Unit size (e.g., "1M")
+ * @property {Record<string, TokenBreakdown>} breakdown - Token breakdown
+ * @property {number | undefined} totalCost - Total cost (undefined if no pricing)
+ */
+
+/**
+ * @typedef {Object} CostConfig
+ * @property {string} currency
+ * @property {string} unit
+ * @property {Record<string, number>} costs
+ */
+
+/**
+ * @typedef {Object} CostTracker
+ * @property {(usage: ProviderTokenUsage) => void} recordUsage - Record token usage
+ * @property {() => Record<string, number>} getAggregatedUsage - Get aggregated usage
+ * @property {() => CostSummary} calculateCost - Calculate cost summary
+ * @property {() => boolean} hasUsage - Check if any usage recorded
+ */
+
+/**
+ * Create a cost tracker for session token usage
+ * @param {CostConfig} [costConfig] - Optional cost configuration
+ * @returns {CostTracker}
+ */
+export function createCostTracker(costConfig) {
+  /** @type {ProviderTokenUsage[]} */
+  const usageHistory = [];
+
+  /**
+   * Record token usage from a provider
+   * @param {ProviderTokenUsage} usage
+   */
+  function recordUsage(usage) {
+    if (typeof usage === "object" && usage !== null) {
+      usageHistory.push(usage);
+    }
+  }
+
+  /**
+   * Get aggregated token usage
+   * @returns {Record<string, number>}
+   */
+  function getAggregatedUsage() {
+    return aggregateTokens(usageHistory);
+  }
+
+  /**
+   * Calculate cost summary
+   * @returns {CostSummary}
+   */
+  function calculateCost() {
+    const aggregated = aggregateTokens(usageHistory);
+    return calculateCostFromConfig(aggregated, costConfig);
+  }
+
+  /**
+   * Check if any usage recorded
+   * @returns {boolean}
+   */
+  function hasUsage() {
+    return usageHistory.length > 0;
+  }
+
+  return {
+    recordUsage,
+    getAggregatedUsage,
+    calculateCost,
+    hasUsage,
+  };
+}
+
+/**
+ * Aggregate token usage history by key
+ * @param {ProviderTokenUsage[]} usageHistory
+ * @returns {Record<string, number>}
+ */
+function aggregateTokens(usageHistory) {
+  /** @type {Record<string, number>} */
+  const aggregated = {};
+
+  for (const usage of usageHistory) {
+    recursivelySumValues(usage, [], aggregated);
+  }
+
+  return aggregated;
+}
+
+/**
+ * Recursively sum numeric values in token usage
+ * @param {ProviderTokenUsage} obj
+ * @param {string[]} path
+ * @param {Record<string, number>} result
+ */
+function recursivelySumValues(obj, path, result) {
+  for (const [key, value] of Object.entries(obj)) {
+    const currentPath = [...path, key];
+    const pathStr = currentPath.join(".");
+
+    if (typeof value === "number") {
+      result[pathStr] = (result[pathStr] || 0) + value;
+    } else if (
+      typeof value === "object" &&
+      value !== null &&
+      !Array.isArray(value)
+    ) {
+      recursivelySumValues(value, currentPath, result);
+    }
+  }
+}
+
+/**
+ * Calculate cost from aggregated tokens and config
+ * @param {Record<string, number>} aggregated
+ * @param {CostConfig | undefined} config
+ * @returns {CostSummary}
+ */
+function calculateCostFromConfig(aggregated, config) {
+  /** @type {Record<string, TokenBreakdown>} */
+  const breakdown = {};
+  let totalCost = 0;
+  const hasPricing = config?.costs;
+
+  for (const [key, tokens] of Object.entries(aggregated)) {
+    breakdown[key] = { tokens, cost: undefined };
+
+    if (!hasPricing || !config.costs[key]) {
+      continue;
+    }
+
+    const costValue = config.costs[key];
+    const unitSize = parseUnit(config.unit);
+
+    if (typeof costValue === "number") {
+      const cost = (tokens * costValue) / unitSize;
+      breakdown[key].cost = cost;
+      totalCost += cost;
+    }
+  }
+
+  return {
+    currency: config?.currency || "USD",
+    unit: config?.unit || "1M",
+    breakdown,
+    totalCost: hasPricing ? totalCost : undefined,
+  };
+}
+
+/**
+ * Parse unit string to number
+ * @param {string} unit
+ * @returns {number}
+ */
+function parseUnit(unit) {
+  if (unit === "1M") return 1_000_000;
+  if (unit === "1K") return 1_000;
+  return 1;
+}

package/src/main.mjs

@@ -223,6 +223,7 @@ if (cliArgs.subcommand.type === "install-claude-code-plugins") {
     tools: [...builtinTools, ...mcpTools],
     toolUseApprover,
     agentRoles,
+    modelCostConfig: modelDef.cost,
   });
 
   const sessionOptions = {

package/src/mcp.mjs

@@ -1,11 +1,11 @@
 /**
+ * @import { Client } from "@modelcontextprotocol/client";
  * @import { StructuredToolResultContent, Tool, ToolImplementation } from "./tool";
  * @import { MCPServerConfig } from "./config";
  */
 
 import { mkdir, open } from "node:fs/promises";
 import path from "node:path";
-import { Client } from "@modelcontextprotocol/client";
 import { AGENT_PROJECT_METADATA_DIR } from "./env.mjs";
 import { writeTmpFile } from "./tmpfile.mjs";
 import { noThrow } from "./utils/noThrow.mjs";

package/src/modelDefinition.d.ts

@@ -9,6 +9,7 @@ export type ModelDefinition = {
   variant: string;
   platform: PlatformConfig;
   model: ModelConfig;
+  cost?: CostConfig;
 };
 
 export type PlatformConfig =
@@ -76,3 +77,9 @@ export type ModelConfig =
       format: "bedrock-converse";
       config: BedrockConverseModelConfig;
     };
+
+export type CostConfig = {
+  currency: string;
+  unit: string;
+  costs: Record<string, number>;
+};

package/src/providers/anthropic.mjs

@@ -5,10 +5,6 @@
  */
 
 import { styleText } from "node:util";
-import { Sha256 } from "@aws-crypto/sha256-js";
-import { fromIni } from "@aws-sdk/credential-providers";
-import { HttpRequest } from "@smithy/protocol-http";
-import { SignatureV4 } from "@smithy/signature-v4";
 import { noThrow } from "../utils/noThrow.mjs";
 import { readBedrockStreamEvents } from "./platform/bedrock.mjs";
 import { getGoogleCloudAccessToken } from "./platform/googleCloud.mjs";
@@ -112,6 +108,11 @@ export async function callAnthropicModel(
 
     // bedrock + sso profile
     const runFetchForBedrock = async () => {
+      const { Sha256 } = await import("@aws-crypto/sha256-js");
+      const { fromIni } = await import("@aws-sdk/credential-providers");
+      const { HttpRequest } = await import("@smithy/protocol-http");
+      const { SignatureV4 } = await import("@smithy/signature-v4");
+
       const region =
         url.match(/bedrock-runtime\.([\w-]+)\.amazonaws\.com/)?.[1] ?? "";
       const urlParsed = new URL(url);

package/src/providers/bedrock.mjs

@@ -5,10 +5,6 @@
  */
 
 import { styleText } from "node:util";
-import { Sha256 } from "@aws-crypto/sha256-js";
-import { fromIni } from "@aws-sdk/credential-providers";
-import { HttpRequest } from "@smithy/protocol-http";
-import { SignatureV4 } from "@smithy/signature-v4";
 import { noThrow } from "../utils/noThrow.mjs";
 import { readBedrockStreamEvents } from "./platform/bedrock.mjs";
 
@@ -25,6 +21,11 @@ export async function callBedrockConverseModel(
   input,
   retryCount = 0,
 ) {
+  const { Sha256 } = await import("@aws-crypto/sha256-js");
+  const { fromIni } = await import("@aws-sdk/credential-providers");
+  const { HttpRequest } = await import("@smithy/protocol-http");
+  const { SignatureV4 } = await import("@smithy/signature-v4");
+
   return await noThrow(async () => {
     const messages = convertGenericMessageToBedrockFormat(input.messages);
     const cachedMessages = modelConfig.enablePromptCaching

package/src/providers/gemini.mjs

@@ -204,13 +204,15 @@ export function createCacheEnabledGeminiModelCaller(
 
       /** @type {ProviderTokenUsage} */
       const tokenUsage = {
-        input:
-          content.usageMetadata.promptTokenCount -
-          (content.usageMetadata.cachedContentTokenCount ?? 0),
-        cached: content.usageMetadata.cachedContentTokenCount ?? 0,
-        output: content.usageMetadata.candidatesTokenCount ?? 0,
-        thought: content.usageMetadata.thoughtsTokenCount ?? 0,
-        total: content.usageMetadata.totalTokenCount,
+        promptTokenCount: content.usageMetadata.promptTokenCount,
+        // nonCachedPromptTokenCount:
+        //   content.usageMetadata.promptTokenCount -
+        //   (content.usageMetadata.cachedContentTokenCount ?? 0),
+        cachedContentTokenCount:
+          content.usageMetadata.cachedContentTokenCount ?? 0,
+        candidatesTokenCount: content.usageMetadata.candidatesTokenCount ?? 0,
+        thoughtsTokenCount: content.usageMetadata.thoughtsTokenCount ?? 0,
+        totalTokenCount: content.usageMetadata.totalTokenCount,
       };
 
       const message = convertGeminiAssistantMessageToGenericFormat(content);

package/src/providers/openaiCompatible.mjs

@@ -5,10 +5,6 @@
  */
 
 import { styleText } from "node:util";
-import { Sha256 } from "@aws-crypto/sha256-js";
-import { fromIni } from "@aws-sdk/credential-providers";
-import { HttpRequest } from "@smithy/protocol-http";
-import { SignatureV4 } from "@smithy/signature-v4";
 import { noThrow } from "../utils/noThrow.mjs";
 import { retryOnError } from "../utils/retryOnError.mjs";
 import { readBedrockStreamEvents } from "./platform/bedrock.mjs";
@@ -112,6 +108,11 @@ export async function callOpenAICompatibleModel(
 
     // bedrock + sso profile
     const runFetchForBedrock = async () => {
+      const { Sha256 } = await import("@aws-crypto/sha256-js");
+      const { fromIni } = await import("@aws-sdk/credential-providers");
+      const { HttpRequest } = await import("@smithy/protocol-http");
+      const { SignatureV4 } = await import("@smithy/signature-v4");
+
       const region =
         url.match(/bedrock-runtime\.([\w-]+)\.amazonaws\.com/)?.[1] ?? "";
       const urlParsed = new URL(url);