@codehz/ai 0.1.6 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codehz/ai",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "type": "module",
   "module": "dist/index.mjs",
   "exports": {

package/src/adapters/messages.ts

@@ -273,6 +273,7 @@ export class MessagesAdapter extends AdapterBase {
   protected buildRequest(request: NormalizedRequest): MessagesAPIRequest {
     const messages: MessagesAPIMessage[] = [];
     let systemPrompt: string | undefined;
+    let pendingToolResultMessage: MessagesAPIMessage | undefined;
 
     // 处理 instructions → system prompt
     if (request.instructions) {
@@ -281,6 +282,10 @@ export class MessagesAdapter extends AdapterBase {
 
     // 处理 input items
     for (const item of request.input) {
+      if (item.type !== "tool_result") {
+        pendingToolResultMessage = undefined;
+      }
+
       switch (item.type) {
         case "message": {
           const role = item.role === "user" ? "user" : "assistant";
@@ -320,7 +325,12 @@ export class MessagesAdapter extends AdapterBase {
             content,
             is_error: item.outcome === "error",
           };
-          messages.push({ role: "user", content: [block] });
+          if (pendingToolResultMessage && typeof pendingToolResultMessage.content !== "string") {
+            pendingToolResultMessage.content.push(block);
+          } else {
+            pendingToolResultMessage = { role: "user", content: [block] };
+            messages.push(pendingToolResultMessage);
+          }
           break;
         }
         case "reasoning": {

package/src/helpers/usage-mapping.ts

@@ -102,21 +102,21 @@ export function usageFromAnthropicMessages(raw: {
   cache_read_input_tokens?: number;
   [key: string]: unknown;
 }): Partial<Usage> {
-  const inputTokens = num(raw.input_tokens);
+  const uncachedInputTokens = num(raw.input_tokens);
   const outputTokens = num(raw.output_tokens);
   const cacheWriteInputTokens = num(raw.cache_creation_input_tokens);
   const cachedInputTokens = num(raw.cache_read_input_tokens);
 
-  const inputParts = [inputTokens, cacheWriteInputTokens, cachedInputTokens].filter(
+  const inputParts = [uncachedInputTokens, cacheWriteInputTokens, cachedInputTokens].filter(
     (n): n is number => n !== undefined,
   );
-  const summedInput = inputParts.length > 0 ? inputParts.reduce((sum, n) => sum + n, 0) : undefined;
+  const inputTokens = inputParts.length > 0 ? inputParts.reduce((sum, n) => sum + n, 0) : undefined;
   const totalTokens =
-    summedInput !== undefined && outputTokens !== undefined ? summedInput + outputTokens : undefined;
+    inputTokens !== undefined && outputTokens !== undefined ? inputTokens + outputTokens : undefined;
 
   let billableInputTokens: number | undefined;
-  if (inputTokens !== undefined || cacheWriteInputTokens !== undefined) {
-    billableInputTokens = (inputTokens ?? 0) + (cacheWriteInputTokens ?? 0);
+  if (uncachedInputTokens !== undefined || cacheWriteInputTokens !== undefined) {
+    billableInputTokens = (uncachedInputTokens ?? 0) + (cacheWriteInputTokens ?? 0);
   }
 
   return record({