egaki 0.4.1 → 0.6.0

package/dist/models.js

@@ -1,7 +1,7 @@
 import pc from 'picocolors';
-import { PROVIDERS, EGAKI_GATEWAY_URL, shouldUseChatGptBackend } from './credentials.js';
-import { CATALOG, findModel } from './model-catalog.js';
-import { VIDEO_CATALOG, findVideoModel } from './video-model-catalog.js';
+import { PROVIDERS, EGAKI_GATEWAY_URL, shouldUseChatGptBackend, shouldUseXaiOAuth, getXaiAuth, saveXaiAuth, } from './credentials.js';
+import { getValidXaiAuth } from './xai-auth.js';
+import { CATALOG, VIDEO_CATALOG, findModel, findVideoModel, findAnyModel, } from './model-catalog.js';
 export const IMAGE_MODELS = CATALOG.map((m) => m.id);
 export const VIDEO_MODELS = VIDEO_CATALOG.map((m) => m.id);
 /**
@@ -17,36 +17,111 @@ function stripProviderPrefix(modelId) {
 export const DEFAULT_MODEL = 'nano-banana-pro-preview';
 export const DEFAULT_VIDEO_MODEL = 'veo-3.1-fast-generate-001';
 export function getModelConfig(modelId) {
-    const entry = findModel(modelId) ?? findVideoModel(modelId);
+    const entry = findAnyModel(modelId);
     if (!entry) {
         console.error(pc.red(`Unknown model: ${modelId}`));
         process.exit(1);
     }
     return entry;
 }
-/**
- * Check if the egaki gateway API key is available (from env or stored credentials).
- */
+// Vertex is the only provider that uses a prefix (vertex/model-id) in the catalog
+// but expects a bare model ID in its SDK. Replicate and fal use slashes as part
+// of the actual model name (e.g. fal-ai/flux/schnell, black-forest-labs/flux-1.1-pro).
+// stripProviderPrefix is called inside the Vertex lambdas only.
+const PROVIDER_SDKS = {
+    google: {
+        image: async (id) => (await import('@ai-sdk/google')).google.image(id),
+        text: async (id) => (await import('@ai-sdk/google')).google(id),
+        video: async (id) => (await import('@ai-sdk/google')).google.video(id),
+    },
+    vertex: {
+        image: async (id) => (await import('@ai-sdk/google-vertex')).vertex.image(stripProviderPrefix(id)),
+        text: async (id) => (await import('@ai-sdk/google-vertex')).vertex(stripProviderPrefix(id)),
+        video: async (id) => (await import('@ai-sdk/google-vertex')).vertex.video(stripProviderPrefix(id)),
+    },
+    openai: {
+        image: async (id) => (await import('@ai-sdk/openai')).openai.image(id),
+    },
+    replicate: {
+        image: async (id) => (await import('@ai-sdk/replicate')).replicate.image(id),
+    },
+    fal: {
+        image: async (id) => (await import('@ai-sdk/fal')).fal.image(id),
+        video: async (id) => (await import('@ai-sdk/fal')).fal.video(id),
+    },
+    xai: {
+        image: async (id) => {
+            const xaiProvider = await getXaiProviderInstance();
+            return xaiProvider.image(id);
+        },
+        video: async (id) => {
+            const xaiProvider = await getXaiProviderInstance();
+            return xaiProvider.video(id);
+        },
+    },
+    // Providers routed exclusively through the egaki gateway (no direct SDK).
+    // They only need catalog entries and gateway routing, no local SDK factory.
+    // bfl, recraft, klingai, alibaba — all handled by the gateway fallback.
+};
+// ─── xAI provider instance ───────────────────────────────────────────────────
+// Creates an @ai-sdk/xai provider instance with either a direct API key or
+// OAuth tokens from the Grok Build subscription. OAuth tokens are injected via
+// a custom fetch that replaces the Authorization header on every request.
+async function getXaiProviderInstance() {
+    const { createXai } = await import('@ai-sdk/xai');
+    // Direct API key path (env or stored)
+    if (!shouldUseXaiOAuth()) {
+        return createXai({
+            apiKey: process.env['XAI_API_KEY'],
+        });
+    }
+    // OAuth path: inject bearer token via custom fetch
+    const storedAuth = getXaiAuth();
+    if (!storedAuth) {
+        console.error(pc.red('Missing xAI OAuth tokens. Please run `egaki login` and select xAI Grok Build.'));
+        process.exit(1);
+    }
+    const auth = await getValidXaiAuth(storedAuth, saveXaiAuth);
+    if (auth instanceof Error) {
+        console.error(pc.red(auth.message));
+        process.exit(1);
+    }
+    return createXai({
+        // Dummy key to satisfy the SDK's apiKey requirement; the custom fetch
+        // overrides the Authorization header with the real OAuth token.
+        apiKey: 'xai-oauth-placeholder',
+        fetch: async (input, init) => {
+            const headers = new Headers(input instanceof Request ? input.headers : undefined);
+            if (init?.headers) {
+                const initHeaders = new Headers(init.headers);
+                initHeaders.forEach((value, key) => headers.set(key, value));
+            }
+            headers.set('authorization', `Bearer ${auth.access}`);
+            return fetch(input, { ...init, headers });
+        },
+    });
+}
+// ─── key checking ────────────────────────────────────────────────────────────
 function hasEgakiKey() {
     const info = PROVIDERS['egaki'];
     if (!info)
         return false;
     return Boolean(process.env[info.envVar]);
 }
-/**
- * Check if a direct provider key is available for the given provider.
- */
 function hasDirectProviderKey(providerName) {
     const info = PROVIDERS[providerName];
     if (!info)
         return false;
-    return Boolean(process.env[info.envVar]);
+    if (Boolean(process.env[info.envVar]))
+        return true;
+    // xAI OAuth counts as having a direct provider key since we use @ai-sdk/xai directly
+    if (providerName === 'xai' && shouldUseXaiOAuth())
+        return true;
+    return false;
 }
-// Check that the provider's API key is available before making API calls.
+// Check that the provider's API key or OAuth login is available before making API calls.
 // Prints a user-friendly error with instructions on how to configure it.
-// Prioritizes egaki subscription over individual provider keys.
 export function ensureProviderKey(providerName) {
-    // If direct provider key exists, we're good
     if (hasDirectProviderKey(providerName))
         return;
     // Vertex models require a direct key — the upstream Vercel AI Gateway
@@ -62,7 +137,6 @@ export function ensureProviderKey(providerName) {
         console.error('');
         process.exit(1);
     }
-    // If egaki key exists, we'll route through the gateway
     if (hasEgakiKey())
         return;
     const info = PROVIDERS[providerName];
@@ -85,26 +159,16 @@ export function ensureProviderKey(providerName) {
     console.error('');
     process.exit(1);
 }
-/**
- * Create a gateway-backed image model using createGateway from the AI SDK.
- * The model ID is sent as provider/model format to the gateway.
- */
+// ─── gateway model factories ─────────────────────────────────────────────────
 async function createGatewayImageModel(modelId, provider) {
     const { createGateway } = await import('ai');
     const gateway = createGateway({
         apiKey: process.env['EGAKI_API_KEY'],
         baseURL: EGAKI_GATEWAY_URL,
     });
-    // Gateway expects provider/model format for routing.
-    // For models that already have a prefix (e.g. vertex/imagen-4.0), strip it
-    // and use the catalog provider. For bare IDs, prepend the provider.
     const bareId = stripProviderPrefix(modelId);
-    const gatewayModelId = `${provider}/${bareId}`;
-    return gateway.image(gatewayModelId);
+    return gateway.image(`${provider}/${bareId}`);
 }
-/**
- * Create a gateway-backed text model using createGateway from the AI SDK.
- */
 async function createGatewayTextModel(modelId, provider) {
     const { createGateway } = await import('ai');
     const gateway = createGateway({
@@ -112,12 +176,8 @@ async function createGatewayTextModel(modelId, provider) {
         baseURL: EGAKI_GATEWAY_URL,
     });
     const bareId = stripProviderPrefix(modelId);
-    const gatewayModelId = `${provider}/${bareId}`;
-    return gateway(gatewayModelId);
+    return gateway(`${provider}/${bareId}`);
 }
-/**
- * Create a gateway-backed video model using createGateway from the AI SDK.
- */
 async function createGatewayVideoModel(modelId, provider) {
     const { createGateway } = await import('ai');
     const gateway = createGateway({
@@ -125,9 +185,9 @@ async function createGatewayVideoModel(modelId, provider) {
         baseURL: EGAKI_GATEWAY_URL,
     });
     const bareId = stripProviderPrefix(modelId);
-    const gatewayModelId = `${provider}/${bareId}`;
-    return gateway.video(gatewayModelId);
+    return gateway.video(`${provider}/${bareId}`);
 }
+// ─── ChatGPT OAuth routing ───────────────────────────────────────────────────
 /**
  * ChatGPT OAuth image generation goes through the Codex backend instead of the
  * OpenAI Image API, so OpenAI image models need the custom responses path.
@@ -138,44 +198,69 @@ export function shouldUseResponsesApi(modelId) {
         return false;
     return config.provider === 'openai' && config.strategy === 'image' && shouldUseChatGptBackend();
 }
-// Lazily import the provider and create the right model instance.
-// This avoids loading all provider SDKs upfront — only the one needed
-// for the selected model gets imported.
-//
-// Priority: direct provider key > egaki gateway > error
+/**
+ * Determine which auth source will be used for a given provider.
+ * Returns the auth type for logging. Does NOT check if the key is valid.
+ */
+function resolveAuthSource(providerName) {
+    const info = PROVIDERS[providerName];
+    // xAI has special OAuth handling
+    if (providerName === 'xai') {
+        if (process.env['XAI_API_KEY'] && !shouldUseXaiOAuth()) {
+            return { type: 'api-key', label: 'XAI_API_KEY' };
+        }
+        if (shouldUseXaiOAuth()) {
+            return { type: 'oauth', label: 'xAI Grok Build OAuth' };
+        }
+    }
+    // ChatGPT OAuth
+    if (providerName === 'openai' && shouldUseChatGptBackend()) {
+        return { type: 'oauth', label: 'ChatGPT OAuth' };
+    }
+    // Direct provider env var
+    if (info && process.env[info.envVar]) {
+        return { type: 'api-key', label: info.envVar };
+    }
+    // Egaki gateway
+    if (hasEgakiKey()) {
+        return { type: 'egaki-gateway' };
+    }
+    // Should not reach here if ensureProviderKey passed
+    return { type: 'api-key', label: 'unknown' };
+}
+function logAuthSource(source) {
+    switch (source.type) {
+        case 'api-key':
+            console.error(pc.dim(`Auth: ${source.label}`));
+            break;
+        case 'oauth':
+            console.error(pc.dim(`Auth: ${source.label}`));
+            break;
+        case 'egaki-gateway':
+            console.error(pc.dim('Auth: Egaki subscription (gateway)'));
+            break;
+    }
+}
+// ─── public model factories ──────────────────────────────────────────────────
+// Priority for xAI: explicit XAI_API_KEY > xai-oauth tokens > egaki gateway > error.
+// Priority for others: direct provider key > egaki gateway > error.
+// Uses PROVIDER_SDKS map for direct provider creation, eliminating switch blocks.
 export async function createImageModel(modelId) {
     const config = getModelConfig(modelId);
     ensureProviderKey(config.provider);
-    // If the user has a direct provider key, use the provider SDK directly
+    const authSource = resolveAuthSource(config.provider);
+    logAuthSource(authSource);
     if (hasDirectProviderKey(config.provider)) {
-        switch (config.provider) {
-            case 'google': {
-                const { google } = await import('@ai-sdk/google');
-                return google.image(modelId);
-            }
-            case 'vertex': {
-                const { vertex } = await import('@ai-sdk/google-vertex');
-                return vertex.image(stripProviderPrefix(modelId));
-            }
-            case 'openai': {
-                const { openai } = await import('@ai-sdk/openai');
-                return openai.image(modelId);
-            }
-            case 'replicate': {
-                const { replicate } = await import('@ai-sdk/replicate');
-                return replicate.image(modelId);
-            }
-            case 'fal': {
-                const { fal } = await import('@ai-sdk/fal');
-                return fal.image(modelId);
-            }
+        const factory = PROVIDER_SDKS[config.provider]?.image;
+        if (factory) {
+            return factory(modelId);
         }
+        console.error(pc.red(`Direct image generation is not supported for provider: ${config.provider}.`));
+        process.exit(1);
     }
-    // Fall back to egaki gateway
     if (hasEgakiKey()) {
         return createGatewayImageModel(modelId, config.provider);
     }
-    // Should not reach here — ensureProviderKey would have exited
     console.error(pc.red(`No API key available for provider: ${config.provider}`));
     process.exit(1);
 }
@@ -186,24 +271,16 @@ export async function createTextModel(modelId) {
         process.exit(1);
     }
     ensureProviderKey(config.provider);
-    // Direct provider key takes priority
+    const authSource = resolveAuthSource(config.provider);
+    logAuthSource(authSource);
     if (hasDirectProviderKey(config.provider)) {
-        switch (config.provider) {
-            case 'google': {
-                const { google } = await import('@ai-sdk/google');
-                return google(modelId);
-            }
-            case 'vertex': {
-                const { vertex } = await import('@ai-sdk/google-vertex');
-                return vertex(stripProviderPrefix(modelId));
-            }
-            default:
-                // Only Google/Vertex support generateText with responseModalities for images
-                console.error(pc.red(`Text+image generation is only supported for Google/Vertex models, got provider: ${config.provider}`));
-                process.exit(1);
+        const factory = PROVIDER_SDKS[config.provider]?.text;
+        if (factory) {
+            return factory(modelId);
         }
+        console.error(pc.red(`Text+image generation is not supported for provider: ${config.provider}`));
+        process.exit(1);
     }
-    // Fall back to egaki gateway
     if (hasEgakiKey()) {
         return createGatewayTextModel(modelId, config.provider);
     }
@@ -217,27 +294,16 @@ export async function createVideoModel(modelId) {
         process.exit(1);
     }
     ensureProviderKey(config.provider);
-    // Direct provider key takes priority
+    const authSource = resolveAuthSource(config.provider);
+    logAuthSource(authSource);
     if (hasDirectProviderKey(config.provider)) {
-        switch (config.provider) {
-            case 'google': {
-                const { google } = await import('@ai-sdk/google');
-                return google.video(modelId);
-            }
-            case 'vertex': {
-                const { vertex } = await import('@ai-sdk/google-vertex');
-                return vertex.video(stripProviderPrefix(modelId));
-            }
-            case 'fal': {
-                const { fal } = await import('@ai-sdk/fal');
-                return fal.video(modelId);
-            }
-            default:
-                console.error(pc.red(`Direct video generation is only supported for Google, Vertex, and Fal keys, got provider: ${config.provider}`));
-                process.exit(1);
+        const factory = PROVIDER_SDKS[config.provider]?.video;
+        if (factory) {
+            return factory(modelId);
         }
+        console.error(pc.red(`Direct video generation is not supported for provider: ${config.provider}. Use an egaki subscription instead.`));
+        process.exit(1);
     }
-    // Fall back to egaki gateway
     if (hasEgakiKey()) {
         return createGatewayVideoModel(modelId, config.provider);
     }

package/dist/video-model-catalog.d.ts

@@ -1,52 +1,2 @@
-export type VideoDurationPricingTier = {
-    /** USD per second for this variant */
-    costPerSecond: number;
-    /** Optional resolution discriminator (e.g. 720p, 1080p, 4k) */
-    resolution?: string;
-    /** Optional mode discriminator (e.g. std, pro) */
-    mode?: string;
-    /** Optional audio discriminator */
-    audio?: boolean;
-};
-export type PerVideoSecondCost = {
-    type: 'per-video-second';
-    /** Fallback duration when request does not specify one (seconds) */
-    defaultDurationSec: number;
-    tiers: VideoDurationPricingTier[];
-};
-export type UnknownVideoCost = {
-    type: 'unknown';
-};
-export type VideoModelCost = PerVideoSecondCost | UnknownVideoCost;
-export type VideoModelFeatures = {
-    /** Supports text prompt to video generation */
-    textToVideo: boolean;
-    /** Supports image-to-video prompt object ({ image, text }) */
-    imageToVideo: boolean;
-    /** Optional capabilities exposed by provider */
-    capabilities: Array<'t2v' | 'i2v' | 'r2v' | 'motion-control' | 'editing'>;
-    /** Optional supported aspect ratios */
-    aspectRatios?: string[];
-    /** Optional supported resolutions */
-    resolutions?: string[];
-    /** Optional duration range in seconds */
-    durationRangeSec?: {
-        min: number;
-        max: number;
-    };
-    seed: boolean;
-    multipleVideos: boolean;
-};
-export type VideoModelEntry = {
-    id: string;
-    name: string;
-    description?: string;
-    provider: string;
-    strategy: 'video';
-    released: string;
-    cost: VideoModelCost;
-    features: VideoModelFeatures;
-};
-export declare const VIDEO_CATALOG: VideoModelEntry[];
-export declare function findVideoModel(id: string): VideoModelEntry | undefined;
+export { VIDEO_CATALOG, findVideoModel, type VideoModelEntry, type VideoModelFeatures, type VideoModelCost, type PerVideoSecondCost, type UnknownCost as UnknownVideoCost, type VideoDurationPricingTier, } from './model-catalog.js';
 //# sourceMappingURL=video-model-catalog.d.ts.map

package/dist/video-model-catalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"video-model-catalog.d.ts","sourceRoot":"","sources":["../src/video-model-catalog.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,wBAAwB,GAAG;IACrC,sCAAsC;IACtC,aAAa,EAAE,MAAM,CAAA;IACrB,+DAA+D;IAC/D,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,kDAAkD;IAClD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,mCAAmC;IACnC,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,kBAAkB,CAAA;IACxB,oEAAoE;IACpE,kBAAkB,EAAE,MAAM,CAAA;IAC1B,KAAK,EAAE,wBAAwB,EAAE,CAAA;CAClC,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,SAAS,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;AAElE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,+CAA+C;IAC/C,WAAW,EAAE,OAAO,CAAA;IACpB,8DAA8D;IAC9D,YAAY,EAAE,OAAO,CAAA;IACrB,gDAAgD;IAChD,YAAY,EAAE,KAAK,CAAC,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,gBAAgB,GAAG,SAAS,CAAC,CAAA;IACzE,uCAAuC;IACvC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,qCAAqC;IACrC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,yCAAyC;IACzC,gBAAgB,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;IAC/C,IAAI,EAAE,OAAO,CAAA;IACb,cAAc,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,cAAc,CAAA;IACpB,QAAQ,EAAE,kBAAkB,CAAA;CAC7B,CAAA;AAID,eAAO,MAAM,aAAa,EAAE,eAAe,EA0S1C,CAAA;AAID,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAEtE"}
+{"version":3,"file":"video-model-catalog.d.ts","sourceRoot":"","sources":["../src/video-model-catalog.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,cAAc,EACd,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,WAAW,IAAI,gBAAgB,EACpC,KAAK,wBAAwB,GAC9B,MAAM,oBAAoB,CAAA"}