@falai/agent 3.3.0 → 3.4.0

package/src/providers/ProviderAdapter.ts

@@ -27,9 +27,11 @@ import {
   streamWatch,
   streamWithBackupModels,
   watchChunks,
+  withFallbackProviders,
   withStreamRetry,
   type ChatMessage,
   type Effort,
+  type FallbackOptions,
   type JsonObjectSchema,
   type JsonWithToolsProbe,
   type ProbeOptions,
@@ -119,6 +121,12 @@ export interface ProviderAdapterInit {
   defaults?: RequestConfig;
   /** Tried in order after the primary. */
   backupModels?: string[];
+  /**
+   * Fallback providers to try if this provider fails/exhausts.
+   * Accepts both @falai/agent AiProviders (like ZaiProvider) and @providerkit/core Providers.
+   */
+  fallbacks?: Array<AiProvider | Provider>;
+  fallbackOptions?: FallbackOptions<Provider>;
   retryConfig?: { timeout?: number; retries?: number };
 }
 
@@ -212,6 +220,9 @@ interface Accumulator {
 }
 
 function fold(acc: Accumulator, chunk: ProviderChunk): string {
+  if (chunk.source) {
+    acc.model = chunk.source.model;
+  }
   if (chunk.usage) {
     acc.promptTokens = chunk.usage.inputTokens;
     acc.completionTokens = chunk.usage.outputTokens;
@@ -256,12 +267,31 @@ export abstract class ProviderAdapter implements AiProvider {
   protected readonly retryConfig: RetryConfig;
   private readonly defaults: ProviderAdapterInit["defaults"];
 
+  public get coreProvider(): Provider {
+    return this.provider;
+  }
+
   protected constructor(init: ProviderAdapterInit) {
     this.defaults = init.defaults;
-    this.provider = init.provider;
     this.primaryModel = init.model;
     this.backupModels = init.backupModels ?? [];
     this.retryConfig = resolveRetryConfig(init.retryConfig);
+
+    if (init.fallbacks && init.fallbacks.length > 0) {
+      const coreProviders: Provider[] = [
+        init.provider,
+        ...init.fallbacks.map((f) => {
+          if (f instanceof ProviderAdapter) return f.coreProvider;
+          if ("coreProvider" in f && (f as { coreProvider: Provider }).coreProvider) {
+            return (f as { coreProvider: Provider }).coreProvider;
+          }
+          return f as Provider;
+        }),
+      ];
+      this.provider = withFallbackProviders(coreProviders, init.fallbackOptions);
+    } else {
+      this.provider = init.provider;
+    }
   }
 
   /**

package/src/providers/ZaiProvider.ts

@@ -12,9 +12,9 @@
  * which is thinking ON.
  */
 
-import { createZaiCodingProvider } from "@providerkit/core";
+import { createZaiCodingProvider, type FallbackOptions, type Provider } from "@providerkit/core";
 
-import type { ProviderCapabilities } from "../types/ai.js";
+import type { AiProvider, ProviderCapabilities } from "../types/ai.js";
 import { ProviderAdapter, type RequestConfig } from "./ProviderAdapter.js";
 
 export interface ZaiProviderOptions {
@@ -22,8 +22,11 @@ export interface ZaiProviderOptions {
   apiKey: string;
   /** Model to use. Defaults to the fleet workhorse `glm-5.3-flash`. */
   model?: string;
-  /** Backup models to try if the primary fails (default: []) */
+  /** Backup models to try on this provider if the primary fails (default: []) */
   backupModels?: string[];
+  /** Fallback providers to try if this provider fails/exhausts */
+  fallbacks?: Array<AiProvider | Provider>;
+  fallbackOptions?: FallbackOptions<Provider>;
   /** Any endpoint speaking the Anthropic Messages dialect with the plan's
    *  auth. Defaults to the coding endpoint. */
   baseUrl?: string;
@@ -61,6 +64,8 @@ export class ZaiProvider extends ProviderAdapter {
       model,
       ...(options.config ? { defaults: options.config } : {}),
       ...(options.backupModels ? { backupModels: options.backupModels } : {}),
+      ...(options.fallbacks ? { fallbacks: options.fallbacks } : {}),
+      ...(options.fallbackOptions ? { fallbackOptions: options.fallbackOptions } : {}),
       ...(options.retryConfig ? { retryConfig: options.retryConfig } : {}),
     });
   }