@codehz/ai 0.2.3 → 0.3.0

package/src/helpers/request-mapper.ts

@@ -1,18 +1,10 @@
 import { AIRequestError } from "../core/errors.js";
 import { contentBlocksToText } from "./mapping.js";
 
-import type { AdapterCapabilities, ContentBlock, InstructionBlock, ToolResultItem } from "../types/index.js";
-
-export type ProviderProfile = {
-  readonly kind: string;
-  readonly instructionsMode: "system_message" | "instructions_field" | "none";
-  readonly supportedBlockTypes: ReadonlyArray<ContentBlock["type"]>;
-  readonly reasoningBlockTypes: ReadonlyArray<ContentBlock["type"]>;
-  readonly capabilities: AdapterCapabilities;
-};
+import type { ContentBlock, InstructionBlock, ToolCallItem } from "../types/index.js";
 
 export class NormalizedRequestMapper {
-  constructor(readonly profile: ProviderProfile) {}
+  constructor(readonly kind: string) {}
 
   mapInstructions(instructions: string | InstructionBlock[]): string {
     return typeof instructions === "string"
@@ -21,27 +13,28 @@ export class NormalizedRequestMapper {
   }
 
   ensureTextBlocks(blocks: ContentBlock[], field: string): ContentBlock[] {
-    return this.ensureBlocks(blocks, field, this.profile.supportedBlockTypes, "only text/json blocks are supported");
+    return this.ensureBlocks(blocks, field, ["text", "json"], "only text/json blocks are supported");
   }
 
   ensureReasoningBlocks(blocks: ContentBlock[], field: string): Array<Extract<ContentBlock, { type: "text" }>> {
-    return this.ensureBlocks(
-      blocks,
-      field,
-      this.profile.reasoningBlockTypes,
-      "reasoning only supports text blocks",
-    ) as Array<Extract<ContentBlock, { type: "text" }>>;
+    return this.ensureBlocks(blocks, field, ["text"], "reasoning only supports text blocks") as Array<
+      Extract<ContentBlock, { type: "text" }>
+    >;
   }
 
-  assertToolResultOutcome(outcome: ToolResultItem["outcome"]): void {
-    if (this.profile.capabilities.toolResultOutcomes.includes(outcome)) return;
+  parseToolArguments(item: ToolCallItem): Record<string, unknown> {
+    try {
+      const parsed: unknown = JSON.parse(item.argumentsText);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        return parsed as Record<string, unknown>;
+      }
+    } catch {
+      // handled below
+    }
 
-    const outcomes = this.profile.capabilities.toolResultOutcomes;
-    const supported = outcomes.map((value) => `"${value}"`).join(" and ");
-    const verb = outcomes.length > 1 ? "are" : "is";
     throw new AIRequestError(
-      `${this.profile.kind} does not preserve tool_result outcome "${outcome}"; only ${supported} ${verb} supported`,
-      "UNSUPPORTED_TOOL_RESULT_OUTCOME",
+      `${this.kind} requires tool_call argumentsText to be a valid JSON object`,
+      "TOOL_CALL_ARGUMENTS_INVALID",
     );
   }
 
@@ -61,7 +54,7 @@ export class NormalizedRequestMapper {
       const block = blocks[i];
       if (block && !supportedTypes.includes(block.type)) {
         throw new AIRequestError(
-          `${this.profile.kind} does not support ${field}[${i}] of type "${block.type}"; ${description}`,
+          `${this.kind} does not support ${field}[${i}] of type "${block.type}"; ${description}`,
           "UNSUPPORTED_CONTENT_BLOCK",
         );
       }

package/src/index.ts

@@ -1,5 +1,5 @@
 /**
- * nano-ai — 统一流式 AI 客户端
+ * @codehz/ai — 统一流式 AI 客户端
  *
  * 对外只暴露一个 canonical 主入口：client.stream()
  */

package/src/types/adapter.ts

@@ -21,20 +21,9 @@ export type NormalizedRequest = AIRequest & {
 
 // ── Adapter 接口 ──────────────────────────────────────────────
 
-export type StreamingCapability = "native" | "synthetic" | "none";
-
-export type AdapterCapabilities = {
-  readonly textStreaming: StreamingCapability;
-  readonly reasoningStreaming: StreamingCapability;
-  readonly toolCallStreaming: StreamingCapability;
-  readonly replay: "canonical" | "opaque" | "none";
-  readonly usage: "stream" | "final" | "none";
-  readonly toolResultOutcomes: ReadonlyArray<"success" | "error" | "rejected">;
-};
-
 export interface BackendAdapter {
   readonly kind: "chat-completions" | "messages" | "responses" | "ollama" | "mock";
-  readonly capabilities: AdapterCapabilities;
+  readonly isSyntheticStream: boolean;
   stream(request: NormalizedRequest): AsyncIterable<AIStreamEvent>;
 }
 
@@ -44,6 +33,8 @@ export type CreateAIClientOptions = {
   adapter: BackendAdapter;
   model: string;
   defaults?: Partial<AIRequest>;
+  /** 全局默认 AbortSignal，当 request.signal 未设置时生效。 */
+  signal?: AbortSignal;
 };
 
 export interface AIClient {

package/src/types/index.ts

@@ -46,12 +46,4 @@ export type {
 } from "./events.js";
 
 // Adapter 协议和 client 类型
-export type {
-  AdapterCapabilities,
-  StreamingCapability,
-  BackendAdapter,
-  FetchFn,
-  NormalizedRequest,
-  CreateAIClientOptions,
-  AIClient,
-} from "./adapter.js";
+export type { BackendAdapter, FetchFn, NormalizedRequest, CreateAIClientOptions, AIClient } from "./adapter.js";

package/src/types/items.ts

@@ -27,7 +27,6 @@ export type ToolCallItem = {
   id: string;
   name: string;
   argumentsText: string;
-  argumentsJson?: unknown;
 };
 
 export type ToolResultItem = {

package/src/types/request.ts

@@ -36,4 +36,6 @@ export type AIRequest = {
   metadata?: Record<string, string>;
   temperature?: number;
   maxOutputTokens?: number;
+  /** AbortSignal 用于打断请求。abort 时 fetch 调用会被取消，流迭代器抛出 AbortError。 */
+  signal?: AbortSignal;
 };