@codehz/ai 0.1.3 → 0.1.5

package/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@codehz/ai",
+  "version": "0.1.5",
   "type": "module",
   "module": "dist/index.mjs",
   "exports": {
@@ -26,6 +27,5 @@
     "oxlint": "^1.73.0",
     "tsdown": "^0.22.3",
     "typescript": "^6"
-  },
-  "version": "0.1.3"
+  }
 }

package/src/adapters/chat-completions.ts

@@ -279,23 +279,17 @@ export class ChatCompletionsAdapter extends AdapterBase {
     for (const item of request.input) {
       switch (item.type) {
         case "message": {
-          const role =
-            item.role === "developer"
-              ? "system"
-              : item.role === "system"
-              ? "system"
-                : item.role === "user"
-                  ? "user"
-                  : "assistant";
+          const role = item.role;
           const text = contentBlocksToChatText(item.content, `input message (${item.role}) content`);
           messages.push({ role, content: text || null });
           break;
         }
         case "tool_call": {
           // 只允许附着到尾部 assistant turn，否则新建一个
-          const lastAssistant = messages.length > 0 && messages[messages.length - 1]?.role === "assistant"
-            ? messages[messages.length - 1]
-            : null;
+          const lastAssistant =
+            messages.length > 0 && messages[messages.length - 1]?.role === "assistant"
+              ? messages[messages.length - 1]
+              : null;
           const tc: ChatToolCall = {
             id: item.id,
             type: "function",

package/src/adapters/index.ts

@@ -22,11 +22,13 @@ export type { OllamaAdapterOptions } from "./ollama.js";
 export { MockAdapter } from "./mock.js";
 export type {
   MockAdapterOptions,
+  MockHistoryRecord,
   MockTextStreamOptions,
   MockInputExpectation,
   MockRequestExpectation,
-  MockTurnContext,
-  MockTurnValidator,
+  MockHandlerContext,
+  MockHandler,
+  MockStaticHandler,
   MockWarningStep,
   MockAuxiliaryStep,
   MockMessageStep,
@@ -38,5 +40,5 @@ export type {
   MockInterruptStep,
   MockThrowStep,
   MockStep,
-  MockTurn,
 } from "./mock.js";
+export { assertMockRequest, withMockStreaming } from "./mock.js";

package/src/adapters/messages.ts

@@ -105,7 +105,7 @@ function ensureMessagesReasoningBlocks(
   });
 }
 
-function instructionsToMessagesText(instructions: string | import("../index.js").ContentBlock[]): string {
+function instructionsToMessagesText(instructions: string | import("../index.js").InstructionBlock[]): string {
   return typeof instructions === "string"
     ? instructions
     : contentBlocksToText(ensureMessagesTextBlocks(instructions, "instructions"));
@@ -162,6 +162,11 @@ function rollbackTrailingAssistantMessages(messages: MessagesAPIMessage[]): void
   }
 }
 
+/** 用 response 级别的命名空间合成 content block 的 item ID，避免多轮工具循环 ID 碰撞 */
+function synthesizeItemId(kind: "msg" | "reason" | "reason-redacted", blockIndex: number, responseId: string): string {
+  return `${kind}-${blockIndex}-${responseId}`;
+}
+
 function parseToolUseInput(input: string): Record<string, unknown> {
   try {
     const parsed = JSON.parse(input);
@@ -272,14 +277,6 @@ export class MessagesAdapter extends AdapterBase {
     for (const item of request.input) {
       switch (item.type) {
         case "message": {
-          if (item.role === "system" || item.role === "developer") {
-            // Anthropic 不支持 system/developer role 在 messages 中
-            // 合并到 system prompt
-            const text = contentBlocksToText(ensureMessagesTextBlocks(item.content, `input message (${item.role}) content`));
-            systemPrompt = systemPrompt ? `${systemPrompt}\n${text}` : text;
-            break;
-          }
-
           const role = item.role === "user" ? "user" : "assistant";
           const supportedContent = ensureMessagesTextBlocks(item.content, `input message (${item.role}) content`);
           if (supportedContent.length === 1 && supportedContent[0]?.type === "text") {
@@ -296,9 +293,7 @@ export class MessagesAdapter extends AdapterBase {
             type: "tool_use",
             id: item.id,
             name: item.name,
-            input:
-              (item.argumentsJson as Record<string, unknown> | undefined) ??
-              parseToolUseInput(item.argumentsText),
+            input: (item.argumentsJson as Record<string, unknown> | undefined) ?? parseToolUseInput(item.argumentsText),
           };
 
           if (lastMsg && lastMsg.role === "assistant" && typeof lastMsg.content !== "string") {
@@ -345,7 +340,11 @@ export class MessagesAdapter extends AdapterBase {
                   typeof b === "object" &&
                   b !== null &&
                   "type" in b &&
-                  (b.type === "text" || b.type === "thinking" || b.type === "redacted_thinking" || b.type === "tool_use" || b.type === "tool_result"),
+                  (b.type === "text" ||
+                    b.type === "thinking" ||
+                    b.type === "redacted_thinking" ||
+                    b.type === "tool_use" ||
+                    b.type === "tool_result"),
               );
               if (isValidContent) {
                 rollbackTrailingAssistantMessages(messages);
@@ -404,7 +403,10 @@ export class MessagesAdapter extends AdapterBase {
     const auxiliary = this.createAuxiliaryState(request);
 
     if (request.metadata) {
-      yield factory.responseWarning("Request metadata is not supported by the Messages adapter", "UNSUPPORTED_METADATA");
+      yield factory.responseWarning(
+        "Request metadata is not supported by the Messages adapter",
+        "UNSUPPORTED_METADATA",
+      );
     }
 
     const response = await this.fetchFn(`${this.baseUrl}/messages`, {
@@ -449,11 +451,14 @@ export class MessagesAdapter extends AdapterBase {
     // 完成响应数据
     let stopReason: string | undefined;
     let stopSequence: string | null | undefined;
-    let rawResponseId: string | undefined;
+    let rawResponseId = "";
 
     if (request.include?.providerMetadata !== "off") {
       const headerMetadata = pickProviderHeaders(response.headers);
-      auxiliary.recordProviderMetadata("header", Object.keys(headerMetadata).length > 0 ? { headers: headerMetadata } : undefined);
+      auxiliary.recordProviderMetadata(
+        "header",
+        Object.keys(headerMetadata).length > 0 ? { headers: headerMetadata } : undefined,
+      );
     }
 
     try {
@@ -503,7 +508,7 @@ export class MessagesAdapter extends AdapterBase {
               switch (block.type) {
                 case "text": {
                   currentItemType = "message";
-                  currentItemId = `msg-${block.type}-${currentContentBlockIndex}`;
+                  currentItemId = synthesizeItemId("msg", currentContentBlockIndex, rawResponseId);
                   textBuffer = "";
                   yield factory.messageStarted(currentItemId);
                   break;
@@ -511,7 +516,7 @@ export class MessagesAdapter extends AdapterBase {
                 case "thinking": {
                   hasStreamedReasoning = true;
                   currentItemType = "reasoning";
-                  currentItemId = `reason-${currentContentBlockIndex}`;
+                  currentItemId = synthesizeItemId("reason", currentContentBlockIndex, rawResponseId);
                   currentThinkingVisibility = "full";
                   thinkingBuffer = "";
                   yield factory.reasoningStarted(currentItemId, "full");
@@ -520,7 +525,7 @@ export class MessagesAdapter extends AdapterBase {
                 case "redacted_thinking": {
                   hasStreamedReasoning = true;
                   currentItemType = "reasoning";
-                  currentItemId = `reason-redacted-${currentContentBlockIndex}`;
+                  currentItemId = synthesizeItemId("reason-redacted", currentContentBlockIndex, rawResponseId);
                   currentThinkingVisibility = "redacted";
                   const data = (block as unknown as { data: string }).data;
                   yield factory.reasoningStarted(currentItemId, "redacted");
@@ -613,9 +618,9 @@ export class MessagesAdapter extends AdapterBase {
               if (u) {
                 auxiliary.recordUsage(
                   {
-                  inputTokens: u.input_tokens,
-                  outputTokens: u.output_tokens,
-                  totalTokens: u.input_tokens + u.output_tokens,
+                    inputTokens: u.input_tokens,
+                    outputTokens: u.output_tokens,
+                    totalTokens: u.input_tokens + u.output_tokens,
                   },
                   "stream",
                   u,