@codehz/ai 0.2.3 → 0.3.0

package/package.json

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

package/src/adapters/chat-completions.ts

@@ -24,7 +24,6 @@ import { emitMalformedStreamWarning } from "../helpers/adapter-auxiliary.js";
 import { assertOpaqueReplayEnvelope, providerHttpError } from "../helpers/adapter-security.js";
 import { usageFromChatCompletions } from "../helpers/usage-mapping.js";
 import { NormalizedRequestMapper, splitLines, IncrementalStreamParser } from "../helpers/index.js";
-import type { ProviderProfile } from "../helpers/index.js";
 
 import type { NormalizedRequest, AIStreamEvent, EventFactory, OutputItem, FetchFn } from "../index.js";
 
@@ -118,24 +117,7 @@ type ReasoningFieldName = "reasoning" | "reasoning_content";
 
 const REASONING_FIELDS: readonly ReasoningFieldName[] = ["reasoning_content", "reasoning"];
 
-// ── ProviderProfile & Mapper ────────────────────────────────────
-
-const profile: ProviderProfile = {
-  kind: "chat-completions",
-  instructionsMode: "system_message",
-  supportedBlockTypes: ["text", "json"] as const,
-  reasoningBlockTypes: ["text"] as const,
-  capabilities: {
-    textStreaming: "native",
-    reasoningStreaming: "native",
-    toolCallStreaming: "native",
-    replay: "opaque",
-    usage: "final",
-    toolResultOutcomes: ["success"],
-  },
-};
-
-const mapper = new NormalizedRequestMapper(profile);
+const mapper = new NormalizedRequestMapper("chat-completions");
 
 function extractReasoningText(value: unknown): string {
   if (typeof value === "string") return value;
@@ -251,7 +233,7 @@ function buildAssistantReplayMessage(params: {
 
 export class ChatCompletionsAdapter extends AdapterBase {
   readonly kind = "chat-completions" as const;
-  readonly capabilities = profile.capabilities;
+  readonly isSyntheticStream = false;
 
   private apiKey: string;
   private baseUrl: string;
@@ -303,7 +285,6 @@ export class ChatCompletionsAdapter extends AdapterBase {
           break;
         }
         case "tool_result": {
-          mapper.assertToolResultOutcome(item.outcome);
           messages.push({
             role: "tool",
             tool_call_id: item.callId,
@@ -323,7 +304,7 @@ export class ChatCompletionsAdapter extends AdapterBase {
         }
         case "opaque": {
           // Try to restore from opaque replay
-          if (item.purpose !== "replay") break;
+          if (item.source !== "chat.completions" || item.purpose !== "replay") break;
           assertOpaqueReplayEnvelope(item.payload);
           const payload = item.payload as Record<string, unknown>;
           if (payload.role === "assistant" && typeof payload.content === "string") {
@@ -398,6 +379,7 @@ export class ChatCompletionsAdapter extends AdapterBase {
           Authorization: `Bearer ${this.apiKey}`,
         },
         body: JSON.stringify(providerRequest),
+        signal: request.signal,
       });
     } catch (err) {
       throw new AIProviderError(err instanceof Error ? err.message : String(err), "PROVIDER_ERROR");

package/src/adapters/messages.ts

@@ -27,7 +27,6 @@ import { emitMalformedStreamWarning } from "../helpers/adapter-auxiliary.js";
 import { assertOpaqueReplayEnvelope, providerHttpError } from "../helpers/adapter-security.js";
 import { usageFromAnthropicMessages } from "../helpers/usage-mapping.js";
 import { NormalizedRequestMapper, splitSSEFrames, IncrementalStreamParser } from "../helpers/index.js";
-import type { ProviderProfile } from "../helpers/index.js";
 
 import type { NormalizedRequest, AIStreamEvent, EventFactory, OutputItem, FetchFn } from "../index.js";
 
@@ -73,24 +72,7 @@ type MessagesAPITool = {
   input_schema: Record<string, unknown>;
 };
 
-// ── ProviderProfile & Mapper ────────────────────────────────────
-
-const profile: ProviderProfile = {
-  kind: "messages",
-  instructionsMode: "system_message",
-  supportedBlockTypes: ["text", "json"] as const,
-  reasoningBlockTypes: ["text"] as const,
-  capabilities: {
-    textStreaming: "native",
-    reasoningStreaming: "native",
-    toolCallStreaming: "synthetic",
-    replay: "opaque",
-    usage: "stream",
-    toolResultOutcomes: ["success", "error"],
-  },
-};
-
-const mapper = new NormalizedRequestMapper(profile);
+const mapper = new NormalizedRequestMapper("messages");
 
 function isMessagesReplayContentBlock(value: unknown): value is MessagesAPIContentBlock {
   if (!value || typeof value !== "object" || !("type" in value)) return false;
@@ -177,10 +159,10 @@ function synthesizeItemId(kind: "msg" | "reason" | "reason-redacted", blockIndex
   return `${kind}-${blockIndex}-${responseId}`;
 }
 
-function parseToolUseInput(input: string): Record<string, unknown> {
+function parseProviderToolUseInput(input: string): Record<string, unknown> {
   try {
-    const parsed = JSON.parse(input);
-    return parsed && typeof parsed === "object" ? (parsed as Record<string, unknown>) : {};
+    const parsed: unknown = JSON.parse(input);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? (parsed as Record<string, unknown>) : {};
   } catch {
     return {};
   }
@@ -251,7 +233,7 @@ function buildStreamMetadata(options: {
 
 export class MessagesAdapter extends AdapterBase {
   readonly kind = "messages" as const;
-  readonly capabilities = profile.capabilities;
+  readonly isSyntheticStream = false;
 
   private apiKey: string;
   private apiVersion: string;
@@ -302,7 +284,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: mapper.parseToolArguments(item),
           };
 
           if (lastMsg && lastMsg.role === "assistant" && typeof lastMsg.content !== "string") {
@@ -313,7 +295,6 @@ export class MessagesAdapter extends AdapterBase {
           break;
         }
         case "tool_result": {
-          mapper.assertToolResultOutcome(item.outcome);
           const content = mapper
             .ensureTextBlocks(item.content, `tool_result ${item.callId} content`)
             .map(blockToText)
@@ -322,7 +303,7 @@ export class MessagesAdapter extends AdapterBase {
             type: "tool_result",
             tool_use_id: item.callId,
             content,
-            is_error: item.outcome === "error",
+            is_error: item.outcome !== "success",
           };
           if (pendingToolResultMessage && typeof pendingToolResultMessage.content !== "string") {
             pendingToolResultMessage.content.push(block);
@@ -346,7 +327,7 @@ export class MessagesAdapter extends AdapterBase {
         }
         case "opaque": {
           // 尝试从 opaque replay item 中提取 assistant message
-          if (item.purpose !== "replay") break;
+          if (item.source !== "messages" || item.purpose !== "replay") break;
           assertOpaqueReplayEnvelope(item.payload);
           const payload = item.payload as Record<string, unknown>;
           if (payload.role === "assistant" && "content" in payload) {
@@ -422,6 +403,7 @@ export class MessagesAdapter extends AdapterBase {
           "anthropic-version": this.apiVersion,
         },
         body: JSON.stringify(providerRequest),
+        signal: request.signal,
       });
     } catch (err) {
       throw new AIProviderError(err instanceof Error ? err.message : String(err), "PROVIDER_ERROR");
@@ -625,7 +607,7 @@ export class MessagesAdapter extends AdapterBase {
                   type: "tool_use",
                   id: currentItemId,
                   name: currentToolName,
-                  input: parseToolUseInput(currentArgsText || argsBuffer),
+                  input: parseProviderToolUseInput(currentArgsText || argsBuffer),
                 });
               }
 

package/src/adapters/mock.ts

@@ -68,6 +68,8 @@ export type MockHandlerContext = {
   previousReplay: ReplayItem[];
   pendingToolCalls: readonly ToolCallItem[];
   history: readonly MockHistoryRecord[];
+  /** 请求的 AbortSignal，handler 可检查 signal.aborted 提前退出。 */
+  signal?: AbortSignal;
 };
 
 export type MockWarningStep = {
@@ -118,7 +120,6 @@ export type MockToolCallStep = {
   id: string;
   name: string;
   argumentsText: string;
-  argumentsJson?: unknown;
   streamArguments?: boolean;
   stream?: MockTextStreamOptions | false;
 };
@@ -264,14 +265,7 @@ export function assertMockRequest(
 
 export class MockAdapter extends AdapterBase {
   readonly kind = "mock" as const;
-  readonly capabilities = {
-    textStreaming: "synthetic",
-    reasoningStreaming: "synthetic",
-    toolCallStreaming: "synthetic",
-    replay: "canonical",
-    usage: "final",
-    toolResultOutcomes: ["success", "error", "rejected"],
-  } as const;
+  readonly isSyntheticStream = true;
 
   private readonly handler: MockHandler;
   private readonly providerMetadata?: Record<string, unknown>;
@@ -290,7 +284,7 @@ export class MockAdapter extends AdapterBase {
 
   protected async buildRequest(request: NormalizedRequest): Promise<MockProviderRequest> {
     const turnIndex = this.cursor;
-    const context = this.buildHandlerContext(turnIndex);
+    const context = this.buildHandlerContext(turnIndex, request.signal);
     const remainingPendingToolCalls = consumePendingToolCalls(this.pendingToolCalls, request.input);
     const handlerResult = this.handler(request, context);
 
@@ -321,6 +315,9 @@ export class MockAdapter extends AdapterBase {
       let stepCount = 0;
 
       for await (const step of mockRequest.handlerResult) {
+        // 若 signal 已 abort，停止消费 handler 并返回
+        if (request.signal?.aborted) return;
+
         stepCount += 1;
 
         switch (step.type) {
@@ -479,7 +476,7 @@ export class MockAdapter extends AdapterBase {
     );
   }
 
-  private buildHandlerContext(turnIndex: number): MockHandlerContext {
+  private buildHandlerContext(turnIndex: number, signal?: AbortSignal): MockHandlerContext {
     return {
       turnIndex,
       previousReplay: this.previousReplay.map(cloneItem),
@@ -489,6 +486,7 @@ export class MockAdapter extends AdapterBase {
         replay: record.replay.map(cloneItem),
         toolCalls: record.toolCalls.map(cloneItem),
       })),
+      signal,
     };
   }
 }
@@ -566,7 +564,6 @@ function createToolCallFromStep(step: MockToolCallStep): ToolCallItem {
     id: step.id,
     name: step.name,
     argumentsText: step.argumentsText,
-    argumentsJson: step.argumentsJson,
   };
 }
 

package/src/adapters/ollama.ts

@@ -30,7 +30,6 @@ import { emitMalformedStreamWarning } from "../helpers/adapter-auxiliary.js";
 import { assertOpaqueReplayEnvelope, providerHttpError } from "../helpers/adapter-security.js";
 import { usageFromOllama } from "../helpers/usage-mapping.js";
 import { NormalizedRequestMapper, splitLines, IncrementalStreamParser } from "../helpers/index.js";
-import type { ProviderProfile } from "../helpers/index.js";
 
 import type { NormalizedRequest, AIStreamEvent, EventFactory, OutputItem, FetchFn } from "../index.js";
 
@@ -82,44 +81,7 @@ type OllamaTool = {
   };
 };
 
-// ── ProviderProfile & Mapper ────────────────────────────────────
-
-const profile: ProviderProfile = {
-  kind: "ollama",
-  instructionsMode: "system_message",
-  supportedBlockTypes: ["text", "json"] as const,
-  reasoningBlockTypes: ["text"] as const,
-  capabilities: {
-    textStreaming: "native",
-    reasoningStreaming: "none",
-    toolCallStreaming: "synthetic",
-    replay: "opaque",
-    usage: "final",
-    toolResultOutcomes: ["success"],
-  },
-};
-
-const mapper = new NormalizedRequestMapper(profile);
-
-function parseOllamaToolArguments(item: import("../index.js").ToolCallItem): Record<string, unknown> {
-  if (item.argumentsJson && typeof item.argumentsJson === "object" && item.argumentsJson !== null) {
-    return item.argumentsJson as Record<string, unknown>;
-  }
-
-  try {
-    const parsed = JSON.parse(item.argumentsText);
-    if (parsed && typeof parsed === "object") {
-      return parsed as Record<string, unknown>;
-    }
-  } catch {
-    // fall through
-  }
-
-  throw new AIRequestError(
-    "ollama tool_call argumentsText must be valid JSON object when argumentsJson is absent",
-    "TOOL_CALL_ARGUMENTS_INVALID",
-  );
-}
+const mapper = new NormalizedRequestMapper("ollama");
 
 // ── Ollama 流式 chunk ─────────────────────────────────────────
 
@@ -179,7 +141,7 @@ function toWireOllamaToolCalls(toolCalls: OllamaReplayToolCall[]): OllamaToolCal
 
 export class OllamaAdapter extends AdapterBase {
   readonly kind = "ollama" as const;
-  readonly capabilities = profile.capabilities;
+  readonly isSyntheticStream = false;
 
   private baseUrl: string;
   private apiKey: string | undefined;
@@ -195,10 +157,6 @@ export class OllamaAdapter extends AdapterBase {
   // ── buildRequest ──────────────────────────────────────────
 
   protected buildRequest(request: NormalizedRequest): OllamaChatRequest {
-    if (request.toolChoice && request.toolChoice !== "auto") {
-      throw new AIRequestError("ollama does not support explicit toolChoice", "UNSUPPORTED_TOOL_CHOICE");
-    }
-
     const messages: OllamaMessage[] = [];
     /** Local-only name → call id queue for best-effort tool_result association (not sent to Ollama). */
     const callIdsByName = new Map<string, string[]>();
@@ -224,7 +182,7 @@ export class OllamaAdapter extends AdapterBase {
           const tc: OllamaToolCall = {
             function: {
               name: item.name,
-              arguments: parseOllamaToolArguments(item),
+              arguments: mapper.parseToolArguments(item),
             },
           };
           const queue = callIdsByName.get(item.name) ?? [];
@@ -238,7 +196,6 @@ export class OllamaAdapter extends AdapterBase {
           break;
         }
         case "tool_result": {
-          mapper.assertToolResultOutcome(item.outcome);
           // Best-effort: consume matching id from name queue when present (no wire call_id)
           const queue = callIdsByName.get(item.toolName);
           if (queue && queue.length > 0) {
@@ -302,8 +259,16 @@ export class OllamaAdapter extends AdapterBase {
       stream: true,
     };
 
-    if (request.tools && request.tools.length > 0) {
-      body.tools = request.tools.map(
+    const toolChoice = request.toolChoice;
+    const selectedTools =
+      toolChoice === "none"
+        ? []
+        : toolChoice && typeof toolChoice === "object"
+          ? request.tools?.filter((tool) => tool.name === toolChoice.name)
+          : request.tools;
+
+    if (selectedTools && selectedTools.length > 0) {
+      body.tools = selectedTools.map(
         (t): OllamaTool => ({
           type: "function",
           function: {
@@ -333,6 +298,14 @@ export class OllamaAdapter extends AdapterBase {
   ): AsyncIterable<AIStreamEvent> {
     const auxiliary = this.createAuxiliaryState(request);
     let completedEmitted = false;
+    if (request.toolChoice && request.toolChoice !== "auto") {
+      yield factory.responseWarning(
+        request.toolChoice === "none"
+          ? "Ollama toolChoice none was mapped by omitting tools"
+          : `Ollama cannot force tool choice; only tool "${request.toolChoice.name}" was provided as a best-effort constraint`,
+        WarningCode.CAPABILITY_DOWNGRADE,
+      );
+    }
     if (request.metadata) {
       yield factory.responseWarning("Request metadata is not supported by the Ollama adapter", "UNSUPPORTED_METADATA");
     }
@@ -351,6 +324,7 @@ export class OllamaAdapter extends AdapterBase {
         method: "POST",
         headers,
         body: JSON.stringify(providerRequest),
+        signal: request.signal,
       });
     } catch (err) {
       throw new AIProviderError(err instanceof Error ? err.message : String(err), "PROVIDER_ERROR");
@@ -390,7 +364,7 @@ export class OllamaAdapter extends AdapterBase {
     let hasMessageStarted = false;
 
     // tool_calls 累积（于 final chunk 到达）
-    let pendingToolCalls: Array<{ id: string; name: string; argumentsText: string; argumentsJson?: unknown }> = [];
+    let pendingToolCalls: Array<{ id: string; name: string; argumentsText: string }> = [];
     let toolCallIndex = 0;
     const buildResponse = this.buildResponse.bind(this);
 
@@ -414,7 +388,7 @@ export class OllamaAdapter extends AdapterBase {
             content: accumulatedContent,
             tool_calls: pendingToolCalls.map((tc) => ({
               id: tc.id,
-              function: { name: tc.name, arguments: tc.argumentsJson },
+              function: { name: tc.name, arguments: JSON.parse(tc.argumentsText) as Record<string, unknown> },
             })),
           }),
         );
@@ -503,7 +477,6 @@ export class OllamaAdapter extends AdapterBase {
                 id: tcId,
                 name: tc.function.name,
                 argumentsText: argsText,
-                argumentsJson: tc.function.arguments,
               });
             }
           }
@@ -535,7 +508,7 @@ export class OllamaAdapter extends AdapterBase {
 
             // 发出 tool_call 完成事件
             for (const pending of pendingToolCalls) {
-              const toolCall = toolCallItem(pending.id, pending.name, pending.argumentsText, pending.argumentsJson);
+              const toolCall = toolCallItem(pending.id, pending.name, pending.argumentsText);
               yield factory.toolCallStarted(pending.id, pending.name);
               yield factory.toolCallDelta(pending.id, { argumentsText: pending.argumentsText });
               yield factory.toolCallCompleted(pending.id);
@@ -610,7 +583,7 @@ export class OllamaAdapter extends AdapterBase {
       }
 
       for (const pending of pendingToolCalls) {
-        const toolCall = toolCallItem(pending.id, pending.name, pending.argumentsText, pending.argumentsJson);
+        const toolCall = toolCallItem(pending.id, pending.name, pending.argumentsText);
         yield factory.toolCallStarted(pending.id, pending.name);
         yield factory.toolCallDelta(pending.id, { argumentsText: pending.argumentsText });
         yield factory.toolCallCompleted(pending.id);

package/src/adapters/responses.ts

@@ -25,7 +25,6 @@ import { emitMalformedStreamWarning } from "../helpers/adapter-auxiliary.js";
 import { assertOpaqueReplayEnvelope, providerHttpError } from "../helpers/adapter-security.js";
 import { usageFromOpenAIResponses } from "../helpers/usage-mapping.js";
 import { NormalizedRequestMapper, splitSSEFrames, IncrementalStreamParser } from "../helpers/index.js";
-import type { ProviderProfile } from "../helpers/index.js";
 
 import type { NormalizedRequest, AIStreamEvent, EventFactory, OutputItem, FetchFn } from "../index.js";
 
@@ -72,24 +71,7 @@ type ResponsesTool = {
   input_schema: Record<string, unknown>;
 };
 
-// ── ProviderProfile & Mapper ────────────────────────────────────
-
-const profile: ProviderProfile = {
-  kind: "responses",
-  instructionsMode: "instructions_field",
-  supportedBlockTypes: ["text", "json"] as const,
-  reasoningBlockTypes: ["text"] as const,
-  capabilities: {
-    textStreaming: "native",
-    reasoningStreaming: "native",
-    toolCallStreaming: "native",
-    replay: "opaque",
-    usage: "final",
-    toolResultOutcomes: ["success"],
-  },
-};
-
-const mapper = new NormalizedRequestMapper(profile);
+const mapper = new NormalizedRequestMapper("responses");
 
 // ── SSE 事件类型 ──────────────────────────────────────────────
 
@@ -99,8 +81,8 @@ type ResponsesSSEEvent =
   | { type: "response.output_text.done"; data: { item_id: string; text: string } }
   | { type: "response.reasoning.delta"; data: { item_id: string; delta: string } }
   | { type: "response.reasoning.done"; data: { item_id: string; text: string } }
-  | { type: "response.tool_call.delta"; data: { item_id: string; delta: { arguments?: string } } }
-  | { type: "response.tool_call.done"; data: { item_id: string; arguments?: string; name?: string } }
+  | { type: "response.function_call_arguments.delta"; data: { item_id: string; delta: string } }
+  | { type: "response.function_call_arguments.done"; data: { item_id: string; arguments: string } }
   | { type: "response.completed"; data: { response: ResponsesAPIResponse } }
   | { type: "response.failed"; data: { response: ResponsesAPIResponse } }
   | { type: "response.incomplete"; data: { response: ResponsesAPIResponse } }
@@ -115,8 +97,6 @@ const KNOWN_RESPONSES_SSE_TYPES = new Set([
   "response.output_text.done",
   "response.reasoning.delta",
   "response.reasoning.done",
-  "response.tool_call.delta",
-  "response.tool_call.done",
   "response.function_call_arguments.delta",
   "response.function_call_arguments.done",
   "response.content_part.added",
@@ -187,7 +167,7 @@ function canonicalToResponsesBlock(b: import("../index.js").ContentBlock): Respo
 
 export class ResponsesAdapter extends AdapterBase {
   readonly kind = "responses" as const;
-  readonly capabilities = profile.capabilities;
+  readonly isSyntheticStream = false;
 
   private apiKey: string;
   private baseUrl: string;
@@ -242,7 +222,6 @@ export class ResponsesAdapter extends AdapterBase {
           break;
         }
         case "tool_result": {
-          mapper.assertToolResultOutcome(item.outcome);
           const output = mapper
             .ensureTextBlocks(item.content, `tool_result ${item.callId} content`)
             .map(blockToText)
@@ -330,6 +309,7 @@ export class ResponsesAdapter extends AdapterBase {
           Authorization: `Bearer ${this.apiKey}`,
         },
         body: JSON.stringify(providerRequest),
+        signal: request.signal,
       });
     } catch (err) {
       throw new AIProviderError(err instanceof Error ? err.message : String(err), "PROVIDER_ERROR");
@@ -369,6 +349,7 @@ export class ResponsesAdapter extends AdapterBase {
     let completedEmitted = false;
     let unknownEventsWarned = false;
     const messageItemsWithDelta = new Set<string>();
+    const toolCallNames = new Map<string, string>();
 
     try {
       while (true) {
@@ -407,9 +388,12 @@ export class ResponsesAdapter extends AdapterBase {
               case "reasoning":
                 yield factory.reasoningStarted(item.id, "full");
                 break;
-              case "function_call":
-                yield factory.toolCallStarted(item.id, ((item as Record<string, unknown>).name as string) ?? "unknown");
+              case "function_call": {
+                const name = typeof item.name === "string" ? item.name : "unknown";
+                toolCallNames.set(item.id, name);
+                yield factory.toolCallStarted(item.id, name);
                 break;
+              }
             }
             continue;
           }
@@ -444,17 +428,15 @@ export class ResponsesAdapter extends AdapterBase {
             continue;
           }
 
-          if (sseEvent.type === "response.tool_call.delta") {
-            const data = sseEvent.data as { item_id: string; delta: { arguments?: string } };
-            if (data.delta.arguments) {
-              yield factory.toolCallDelta(data.item_id, { argumentsText: data.delta.arguments });
-            }
+          if (sseEvent.type === "response.function_call_arguments.delta") {
+            const data = sseEvent.data as { item_id: string; delta: string };
+            if (data.delta) yield factory.toolCallDelta(data.item_id, { argumentsText: data.delta });
             continue;
           }
 
-          if (sseEvent.type === "response.tool_call.done") {
-            const data = sseEvent.data as { item_id: string; arguments?: string; name?: string };
-            const tcItem = toolCallItem(data.item_id, data.name ?? "unknown", data.arguments ?? "");
+          if (sseEvent.type === "response.function_call_arguments.done") {
+            const data = sseEvent.data as { item_id: string; arguments: string };
+            const tcItem = toolCallItem(data.item_id, toolCallNames.get(data.item_id) ?? "unknown", data.arguments);
             yield factory.toolCallCompleted(data.item_id);
             output.push(tcItem);
             continue;

package/src/core/client.ts

@@ -8,11 +8,13 @@ import type { AIRequest, AIStreamEvent, AIClient, CreateAIClientOptions } from "
 import { normalizeRequest } from "./normalize.js";
 
 export function createAIClient(options: CreateAIClientOptions): AIClient {
-  const { adapter, model, defaults } = options;
+  const { adapter, model, defaults, signal: defaultSignal } = options;
 
   const client: AIClient = {
     stream(request: AIRequest): AsyncIterable<AIStreamEvent> {
-      const normalized = normalizeRequest(request, { model, defaults });
+      // 合并 client 级别的默认 signal 和请求级别的 signal
+      const signal = mergeAbortSignals(defaultSignal, request.signal);
+      const normalized = normalizeRequest({ ...request, signal }, { model, defaults });
       return adapter.stream(normalized);
     },
   };
@@ -20,4 +22,15 @@ export function createAIClient(options: CreateAIClientOptions): AIClient {
   return client;
 }
 
+/**
+ * 合并多个 AbortSignal：任一 signal abort 即触发。
+ * 如果没有 signal 需要合并则返回 undefined。
+ */
+function mergeAbortSignals(...signals: (AbortSignal | undefined)[]): AbortSignal | undefined {
+  const valid = signals.filter((s): s is AbortSignal => s != null);
+  if (valid.length === 0) return undefined;
+  if (valid.length === 1) return valid[0];
+  return AbortSignal.any(valid);
+}
+
 export type { AIClient, CreateAIClientOptions } from "../types/index.js";

package/src/core/validation.ts

@@ -136,6 +136,25 @@ function validateInputItem(item: unknown, field: string, issues: ValidationIssue
           "TOOL_CALL_ARGUMENTS_INVALID",
           `${field}.argumentsText must be a string`,
         );
+      } else {
+        try {
+          const parsed: unknown = JSON.parse(item.argumentsText);
+          if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+            pushIssue(
+              issues,
+              `${field}.argumentsText`,
+              "TOOL_CALL_ARGUMENTS_INVALID",
+              `${field}.argumentsText must encode a JSON object`,
+            );
+          }
+        } catch {
+          pushIssue(
+            issues,
+            `${field}.argumentsText`,
+            "TOOL_CALL_ARGUMENTS_INVALID",
+            `${field}.argumentsText must encode a JSON object`,
+          );
+        }
       }
       return;
     case "tool_result":

package/src/helpers/adapter-base.ts

@@ -56,7 +56,7 @@ export type StreamResult = {
 
 export abstract class AdapterBase implements BackendAdapter {
   abstract readonly kind: "chat-completions" | "messages" | "responses" | "ollama" | "mock";
-  abstract readonly capabilities: import("../types/index.js").AdapterCapabilities;
+  abstract readonly isSyntheticStream: boolean;
 
   /**
    * stream 模板方法：
@@ -65,9 +65,12 @@ export abstract class AdapterBase implements BackendAdapter {
    * 3. 委托 runStream 发射全部流事件（含 response.completed）
    */
   async *stream(request: NormalizedRequest): AsyncIterable<AIStreamEvent> {
+    // 若请求已被 abort，不发出任何事件
+    request.signal?.throwIfAborted();
+
     const factory = createEventFactory({
       responseId: request.requestId,
-      backend: { kind: this.kind, isSynthetic: this.capabilities.textStreaming === "synthetic" },
+      backend: { kind: this.kind, isSynthetic: this.isSyntheticStream },
     });
 
     yield factory.responseStarted(request.model);
@@ -148,7 +151,7 @@ export abstract class AdapterBase implements BackendAdapter {
         requestId: request.requestId,
         rawResponseId: result.rawResponseId,
         adapter: this.kind,
-        isSyntheticStream: this.capabilities.textStreaming === "synthetic",
+        isSyntheticStream: this.isSyntheticStream,
         metadataSources: result.metadataSources,
         warnings,
       },

package/src/helpers/index.ts

@@ -58,4 +58,3 @@ export { IncrementalStreamParser, splitLines, splitSSEFrames } from "./increment
 export type { StreamSplitResult, StreamParseResult } from "./incremental-stream-parser.js";
 
 export { NormalizedRequestMapper } from "./request-mapper.js";
-export type { ProviderProfile } from "./request-mapper.js";

package/src/helpers/mapping.ts

@@ -100,13 +100,12 @@ export function reasoningItem(
   };
 }
 
-export function toolCallItem(id: string, name: string, argumentsText: string, argumentsJson?: unknown): ToolCallItem {
+export function toolCallItem(id: string, name: string, argumentsText: string): ToolCallItem {
   return {
     type: "tool_call",
     id,
     name,
     argumentsText,
-    argumentsJson,
   };
 }