@within-7/minto 0.2.0 → 0.3.3

package/dist/services/claude.js

@@ -6,6 +6,7 @@ import chalk from "chalk";
 import { randomUUID } from "crypto";
 import "dotenv/config";
 import { addToTotalCost } from "../cost-tracker.js";
+import { recordTokenUsage } from "@core/tokenStatsManager";
 import models from "../constants/models.js";
 import { getToolDescriptionAsync } from "../Tool.js";
 import {
@@ -543,9 +544,24 @@ function convertOpenAIResponseToAnthropic(response, _tools) {
       const tool = toolCall.function;
       const toolName = tool?.name;
       let toolArgs = {};
+      let parseError = null;
       try {
         toolArgs = tool?.arguments ? JSON.parse(tool.arguments) : {};
       } catch (e) {
+        parseError = e instanceof Error ? e.message : String(e);
+        debugLogger.warn("TOOL_ARGUMENTS_PARSE_ERROR", {
+          toolName,
+          rawArguments: tool?.arguments?.substring(0, 200),
+          // Limit log size
+          errorMessage: parseError
+        });
+      }
+      if (parseError && Object.keys(toolArgs).length === 0) {
+        debugLogger.error("TOOL_CALL_EMPTY_ARGUMENTS", {
+          toolName,
+          parseError,
+          suggestion: "Model may have sent malformed JSON. The tool call will likely fail validation."
+        });
       }
       contentBlocks.push({
         type: "tool_use",
@@ -1177,12 +1193,17 @@ async function queryAnthropicNative(messages, systemPrompt, maxThinkingTokens, t
                     try {
                       block.input = JSON.parse(jsonStr);
                     } catch (error) {
+                      const errorMsg = error instanceof Error ? error.message : String(error);
                       debugLogger.error("JSON_PARSE_ERROR", {
                         blockIndex: stopIndex,
-                        jsonStr,
-                        error: error instanceof Error ? error.message : String(error)
+                        jsonStr: jsonStr.length > 500 ? jsonStr.slice(0, 500) + "..." : jsonStr,
+                        error: errorMsg
                       });
-                      block.input = {};
+                      block.input = {
+                        __parse_error__: true,
+                        __error_message__: `JSON parse failed: ${errorMsg}`,
+                        __raw_json_preview__: jsonStr.length > 200 ? jsonStr.slice(0, 200) + "..." : jsonStr
+                      };
                     }
                     inputJSONBuffers.delete(stopIndex);
                   }
@@ -1323,6 +1344,21 @@ async function queryAnthropicNative(messages, systemPrompt, maxThinkingTokens, t
     const costUSD = inputTokens / 1e6 * getModelInputTokenCostUSD(model) + outputTokens / 1e6 * getModelOutputTokenCostUSD(model) + cacheCreationInputTokens / 1e6 * getModelInputTokenCostUSD(model) + cacheReadInputTokens / 1e6 * (getModelInputTokenCostUSD(model) * 0.1);
     assistantMessage.costUSD = costUSD;
     addToTotalCost(costUSD, durationMs);
+    recordTokenUsage(
+      {
+        inputTokens,
+        outputTokens,
+        cacheCreationTokens: cacheCreationInputTokens,
+        cacheReadTokens: cacheReadInputTokens
+      },
+      costUSD,
+      model,
+      toolUseContext ? {
+        agentId: toolUseContext.agentId,
+        toolUseId: toolUseContext.toolUseId,
+        model
+      } : void 0
+    );
     return assistantMessage;
   } catch (error) {
     return getAssistantMessageFromError(error);
@@ -1592,6 +1628,21 @@ async function queryOpenAI(messages, systemPrompt, maxThinkingTokens, tools, sig
   const cacheCreationInputTokens = response.usage?.prompt_token_details?.cached_tokens ?? 0;
   const costUSD = inputTokens / 1e6 * SONNET_COST_PER_MILLION_INPUT_TOKENS + outputTokens / 1e6 * SONNET_COST_PER_MILLION_OUTPUT_TOKENS + cacheReadInputTokens / 1e6 * SONNET_COST_PER_MILLION_PROMPT_CACHE_READ_TOKENS + cacheCreationInputTokens / 1e6 * SONNET_COST_PER_MILLION_PROMPT_CACHE_WRITE_TOKENS;
   addToTotalCost(costUSD, durationMsIncludingRetries);
+  recordTokenUsage(
+    {
+      inputTokens,
+      outputTokens,
+      cacheCreationTokens: cacheCreationInputTokens,
+      cacheReadTokens: cacheReadInputTokens
+    },
+    costUSD,
+    model,
+    toolUseContext ? {
+      agentId: toolUseContext.agentId,
+      toolUseId: toolUseContext.toolUseId,
+      model
+    } : void 0
+  );
   logLLMInteraction({
     systemPrompt: systemPrompt.join("\n"),
     messages: [...openaiSystem, ...openaiMessages],