@codehz/ai 0.2.3 → 0.2.4

package/package.json

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

package/src/adapters/chat-completions.ts

@@ -398,6 +398,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

@@ -422,6 +422,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");

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 = {
@@ -290,7 +292,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 +323,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 +484,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 +494,7 @@ export class MockAdapter extends AdapterBase {
         replay: record.replay.map(cloneItem),
         toolCalls: record.toolCalls.map(cloneItem),
       })),
+      signal,
     };
   }
 }

package/src/adapters/ollama.ts

@@ -351,6 +351,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");

package/src/adapters/responses.ts

@@ -330,6 +330,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");

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/helpers/adapter-base.ts

@@ -65,6 +65,9 @@ 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" },

package/src/index.ts

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

package/src/types/adapter.ts

@@ -44,6 +44,8 @@ export type CreateAIClientOptions = {
   adapter: BackendAdapter;
   model: string;
   defaults?: Partial<AIRequest>;
+  /** 全局默认 AbortSignal，当 request.signal 未设置时生效。 */
+  signal?: AbortSignal;
 };
 
 export interface AIClient {

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;
 };