egaki 0.2.0 → 0.4.0

package/dist/cli.js

@@ -14,12 +14,14 @@ import { generateImage as aiGenerateImage, generateText, experimental_generateVi
 import fs from 'node:fs';
 import path from 'node:path';
 import pc from 'picocolors';
+import { createParser } from 'eventsource-parser';
 import pkg from '../package.json' with { type: 'json' };
-import { injectCredentialsToEnv, PROVIDERS } from './credentials.js';
-import { IMAGE_MODELS, VIDEO_MODELS, DEFAULT_MODEL, DEFAULT_VIDEO_MODEL, getModelConfig, createImageModel, createTextModel, createVideoModel, } from './models.js';
+import { injectCredentialsToEnv, PROVIDERS, getChatGptAuth, saveChatGptAuth, getKeyStatus, } from './credentials.js';
+import { IMAGE_MODELS, VIDEO_MODELS, DEFAULT_MODEL, DEFAULT_VIDEO_MODEL, getModelConfig, createImageModel, createTextModel, createVideoModel, shouldUseResponsesApi, } from './models.js';
 import { VIDEO_CATALOG } from './video-model-catalog.js';
 import { loginInteractive, loginNonInteractive, showLoginStatus, removeLogin, readKeyFromStdin, } from './login.js';
 import { subscribeInteractive, subscribeNonInteractive, unsubscribe, showUsage, } from './subscription.js';
+import { getValidChatGptAuth } from './chatgpt-auth.js';
 const cli = goke('egaki');
 process.title = 'egaki';
 // Print clean error output for unhandled rejections (e.g. AI SDK APICallError).
@@ -55,6 +57,7 @@ cli
     .example('egaki login')
     .example('# Non-interactive login with flags')
     .example('egaki login --provider google --key AIza...')
+    .example('egaki login --provider vertex --key AIza...')
     .example('# Pipe key from stdin (useful in CI/scripts)')
     .example('echo "AIza..." | egaki login --provider google')
     .example('# Show configured providers')
@@ -72,8 +75,13 @@ cli
     }
     // Non-interactive: --provider + --key or stdin
     if (options.provider) {
+        // ChatGPT uses browser OAuth — skip key reading
+        if (options.provider === 'chatgpt') {
+            await loginNonInteractive({ provider: options.provider, key: '' });
+            return;
+        }
         const key = options.key || (await readKeyFromStdin());
-        loginNonInteractive({ provider: options.provider, key });
+        await loginNonInteractive({ provider: options.provider, key });
         return;
     }
     // Interactive mode
@@ -170,34 +178,59 @@ cli
     .example('egaki image "fill with flowers" --input photo.jpg --mask mask.png')
     .example('# Generate with Gemini multimodal at 4K')
     .example('egaki image "dreamy landscape" -m gemini-2.5-flash-image --image-size 4K')
+    .example('# Route through Vertex AI (Google Cloud billing)')
+    .example('egaki image "product photo on marble" -m vertex/imagen-4.0-generate-001')
     .example('# Generate multiple images')
     .example('egaki image "abstract art" -n 4 -o art.png')
     .example('# Pipe to another tool')
     .example('egaki image "logo design" --stdout | convert - -resize 512x512 logo.png')
     .action(async (prompt, options) => {
-    // Inject stored API keys as env vars before calling the AI SDK
+    // Inject stored API keys as env vars before calling the AI SDK.
     injectCredentialsToEnv();
-    const model = options.model;
-    const outputPath = options.output;
+    // goke infers schema .default() values via Zod's input type, which leaves
+    // options.model / options.output / options.count as `T | undefined` even
+    // though the runtime always resolves them. Apply the same defaults here.
+    const model = options.model ?? DEFAULT_MODEL;
+    const outputPath = options.output ?? 'egaki-output.png';
+    const count = options.count ?? 1;
     const config = getModelConfig(model);
+    const parsedAspectRatio = parseAspectRatioOption(options.aspectRatio);
     if (!options.stdout) {
         console.error(pc.dim(`Model: ${model}`));
         console.error(pc.dim(`Prompt: ${prompt}`));
-        console.error(pc.dim(config.strategy === 'image'
-            ? 'Mode: Image API (generateImage)'
-            : 'Mode: Text+Image (generateText)'));
     }
     const inputImages = await readInputImages(options.input);
     const maskImage = options.mask
         ? await readInputSource(options.mask)
         : undefined;
-    if (config.strategy === 'image') {
+    // When using ChatGPT OAuth with OpenAI image models, route through the
+    // Responses API + imageGeneration tool instead of the Image API.
+    // The Codex OAuth client lacks the `api.model.images.request` scope.
+    const useResponsesApi = config.strategy === 'image' && shouldUseResponsesApi(model);
+    if (useResponsesApi) {
+        if (!options.stdout) {
+            console.error(pc.dim('Mode: Responses API (ChatGPT OAuth)'));
+        }
+        await generateWithResponsesApi({
+            prompt,
+            model,
+            outputPath,
+            count,
+            aspectRatio: parsedAspectRatio,
+            seed: options.seed,
+            inputImages,
+            maskImage,
+            json: options.json || false,
+            stdout: options.stdout || false,
+        });
+    }
+    else if (config.strategy === 'image') {
         await generateWithImageModel({
             prompt,
             model,
             outputPath,
-            count: options.count,
-            aspectRatio: options.aspectRatio,
+            count,
+            aspectRatio: parsedAspectRatio,
             seed: options.seed,
             inputImages,
             maskImage,
@@ -250,14 +283,18 @@ cli
     .example('egaki video "A paper airplane gliding through clouds" -o airplane.mp4')
     .example('# Generate with Veo model + duration')
     .example('egaki video "cinematic rainy street at night" -m veo-3.1-fast-generate-001 --duration 6')
+    .example('# Route through Vertex AI (Google Cloud billing)')
+    .example('egaki video "storm over mountains" -m vertex/veo-3.1-fast-generate-001 --duration 6')
     .example('# Image-to-video (model support required)')
     .example('egaki video "animate subtle camera pan" --model luma-ray-2 --input frame.png -o animated.mp4')
     .example('# Generate multiple videos')
     .example('egaki video "waves crashing on cliffs" -n 2 -o waves.mp4')
     .action(async (prompt, options) => {
     injectCredentialsToEnv();
-    const model = options.model;
-    const outputPath = options.output;
+    // Apply the same .default(...) values goke's input-type inference drops.
+    const model = options.model ?? DEFAULT_VIDEO_MODEL;
+    const outputPath = options.output ?? 'egaki-output.mp4';
+    const count = options.count ?? 1;
     const config = getModelConfig(model);
     if (config.strategy !== 'video') {
         console.error(pc.red(`Model ${model} is not a video model`));
@@ -275,7 +312,7 @@ cli
         prompt,
         model,
         outputPath,
-        count: options.count,
+        count,
         aspectRatio: options.aspectRatio,
         resolution: options.resolution,
         duration: options.duration,
@@ -301,6 +338,7 @@ cli
     .action(async (options) => {
     const { CATALOG } = await import('./model-catalog.js');
     const yaml = await import('js-yaml');
+    const providerStatuses = Object.fromEntries(Object.keys(PROVIDERS).map((provider) => [provider, getKeyStatus(provider)]));
     let models = options.type === 'video'
         ? VIDEO_CATALOG
         : options.type === 'image'
@@ -318,6 +356,7 @@ cli
         name: m.name,
         ...(m.description ? { description: m.description } : {}),
         provider: m.provider,
+        auth: providerStatuses[m.provider] ?? { available: false, source: 'none' },
         strategy: m.strategy,
         released: m.released,
         cost: formatCatalogCost(m.cost),
@@ -385,7 +424,10 @@ async function generateWithImageModel({ prompt, model, outputPath, count, aspect
     const imagePrompt = inputImages.length > 0
         ? { text: prompt, images: inputImages, ...(maskImage ? { mask: maskImage } : {}) }
         : prompt;
+    const config = getModelConfig(model);
     const imageModel = await createImageModel(model);
+    // Use the correct providerOptions key based on provider (google vs vertex)
+    const providerOptionsKey = config.provider === 'vertex' ? 'vertex' : 'google';
     if (!stdout) {
         console.error(pc.cyan('Generating...'));
     }
@@ -396,7 +438,7 @@ async function generateWithImageModel({ prompt, model, outputPath, count, aspect
         ...(aspectRatio ? { aspectRatio } : {}),
         ...(seed !== undefined ? { seed } : {}),
         providerOptions: {
-            google: {
+            [providerOptionsKey]: {
                 ...(allowPeople ? { personGeneration: 'allow_all' } : {}),
                 ...(aspectRatio ? { aspectRatio } : {}),
             },
@@ -421,7 +463,6 @@ async function generateWithImageModel({ prompt, model, outputPath, count, aspect
         console.error(pc.green(`Saved: ${filePath}`));
         savedFiles.push(filePath);
     }
-    const config = getModelConfig(model);
     const cost = calculateCost(config.cost, result.usage, result.images.length);
     if (cost != null) {
         console.error(pc.dim(`Cost: ${formatCost(cost)}`));
@@ -441,6 +482,8 @@ async function generateWithImageModel({ prompt, model, outputPath, count, aspect
 // Generate using generateText with responseModalities (Gemini multimodal models)
 async function generateWithTextModel({ prompt, model, outputPath, inputImages, imageSize, aspectRatio, json, stdout, }) {
     const textModel = await createTextModel(model);
+    const config = getModelConfig(model);
+    const providerOptionsKey = config.provider === 'vertex' ? 'vertex' : 'google';
     if (!stdout) {
         console.error(pc.cyan('Generating...'));
     }
@@ -463,7 +506,7 @@ async function generateWithTextModel({ prompt, model, outputPath, inputImages, i
         model: textModel,
         ...(messages ? { messages } : { prompt }),
         providerOptions: {
-            google: {
+            [providerOptionsKey]: {
                 responseModalities: ['TEXT', 'IMAGE'],
                 ...(imageSize || aspectRatio
                     ? {
@@ -501,7 +544,6 @@ async function generateWithTextModel({ prompt, model, outputPath, inputImages, i
         console.error(pc.green(`Saved: ${filePath}`));
         savedFiles.push(filePath);
     }
-    const config = getModelConfig(model);
     const cost = calculateCost(config.cost, result.usage, imageFiles.length);
     if (cost != null) {
         console.error(pc.dim(`Cost: ${formatCost(cost)}`));
@@ -521,6 +563,148 @@ async function generateWithTextModel({ prompt, model, outputPath, inputImages, i
         console.log(JSON.stringify(output, null, 2));
     }
 }
+// Generate using the OpenAI Responses API with imageGeneration tool.
+// Used when auth comes from ChatGPT OAuth (no Image API scope).
+async function generateWithResponsesApi({ prompt, model, outputPath, count, aspectRatio, seed, inputImages, maskImage, json, stdout, }) {
+    if (count !== 1) {
+        console.error(pc.red('ChatGPT image generation currently supports exactly one output image.'));
+        process.exit(1);
+    }
+    if (seed !== undefined) {
+        console.error(pc.red('ChatGPT image generation does not support --seed.'));
+        process.exit(1);
+    }
+    if (maskImage) {
+        console.error(pc.red('ChatGPT image generation does not support --mask yet.'));
+        process.exit(1);
+    }
+    const size = aspectRatio ? chatGptImageSizeFromAspectRatio(aspectRatio) : undefined;
+    if (aspectRatio && !size) {
+        console.error(pc.red('ChatGPT image generation only supports --aspect-ratio 1:1, 3:2, or 2:3.'));
+        process.exit(1);
+    }
+    const storedAuth = getChatGptAuth();
+    if (!storedAuth?.accountId) {
+        console.error(pc.red('Missing ChatGPT account metadata. Please run `egaki login --provider chatgpt` again.'));
+        process.exit(1);
+    }
+    const auth = await getValidChatGptAuth(storedAuth, saveChatGptAuth);
+    if (auth instanceof Error) {
+        console.error(pc.red(auth.message));
+        process.exit(1);
+    }
+    if (!stdout) {
+        console.error(pc.cyan('Generating...'));
+    }
+    const content = [
+        { type: 'input_text', text: prompt },
+        ...inputImages.map((image) => ({
+            type: 'input_image',
+            image_url: imageBytesToDataUrl(image),
+        })),
+    ];
+    const response = await fetch('https://chatgpt.com/backend-api/codex/responses', {
+        method: 'POST',
+        headers: {
+            Authorization: `Bearer ${auth.access}`,
+            'ChatGPT-Account-ID': auth.accountId,
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+            model: 'gpt-5.4',
+            instructions: 'You are Codex.',
+            input: [
+                {
+                    type: 'message',
+                    role: 'user',
+                    content,
+                },
+            ],
+            tools: [
+                {
+                    type: 'image_generation',
+                    model,
+                    size: 'auto',
+                    quality: 'auto',
+                    output_format: 'png',
+                    output_compression: 100,
+                    moderation: 'auto',
+                    ...(size ? { size } : {}),
+                },
+            ],
+            tool_choice: 'auto',
+            parallel_tool_calls: true,
+            stream: true,
+            store: false,
+            include: [],
+        }),
+    });
+    if (!response.ok || !response.body) {
+        const body = await response.text().catch(() => '');
+        console.error(pc.red(`ChatGPT image generation failed: ${response.status}`));
+        if (body)
+            console.error(pc.dim(body));
+        process.exit(1);
+    }
+    let imageBase64;
+    let revisedPrompt = null;
+    const processSseMessage = (message) => {
+        if (!message.data)
+            return;
+        try {
+            const event = JSON.parse(message.data);
+            if (event.type === 'response.image_generation_call.partial_image' &&
+                event.partial_image_b64 &&
+                !imageBase64) {
+                imageBase64 = event.partial_image_b64;
+            }
+            if (event.type === 'response.output_item.done' &&
+                event.item?.type === 'image_generation_call') {
+                if (event.item.result)
+                    imageBase64 = event.item.result;
+                revisedPrompt = event.item.revised_prompt ?? revisedPrompt;
+            }
+        }
+        catch {
+            // Ignore keepalive and partial parse noise.
+        }
+    };
+    const parser = createParser({
+        onEvent: processSseMessage,
+    });
+    const decoder = new TextDecoder();
+    for await (const chunk of response.body) {
+        parser.feed(decoder.decode(chunk, { stream: true }));
+    }
+    parser.feed(decoder.decode());
+    if (!imageBase64) {
+        console.error(pc.red('No images generated.'));
+        process.exit(1);
+    }
+    const imageBytes = Buffer.from(imageBase64, 'base64');
+    const mediaType = 'image/png';
+    if (stdout) {
+        process.stdout.write(imageBytes);
+        return;
+    }
+    const savedFiles = [];
+    const filePath = ensureExtension(outputPath, extensionFromMediaType(mediaType));
+    fs.writeFileSync(filePath, imageBytes);
+    console.error(pc.green(`Saved: ${filePath}`));
+    savedFiles.push(filePath);
+    if (revisedPrompt && !json) {
+        console.error(pc.dim(`Revised prompt: ${revisedPrompt}`));
+    }
+    if (json) {
+        const output = {
+            model,
+            files: savedFiles,
+            count: 1,
+            revisedPrompt,
+        };
+        console.log(JSON.stringify(output, null, 2));
+    }
+}
 // Generate using experimental_generateVideo (video models)
 async function generateWithVideoModel({ prompt, model, outputPath, count, aspectRatio, resolution, duration, fps, seed, inputImage, json, stdout, }) {
     const videoModel = await createVideoModel(model);
@@ -640,6 +824,40 @@ function extensionFromMediaType(mediaType) {
     };
     return map[mediaType] || (mediaType.startsWith('video/') ? '.mp4' : '.png');
 }
+function inferImageMediaType(image) {
+    if (image.length >= 8 && image[0] === 0x89 && image[1] === 0x50 && image[2] === 0x4e && image[3] === 0x47) {
+        return 'image/png';
+    }
+    if (image.length >= 3 && image[0] === 0xff && image[1] === 0xd8 && image[2] === 0xff) {
+        return 'image/jpeg';
+    }
+    if (image.length >= 12 &&
+        image[0] === 0x52 && image[1] === 0x49 && image[2] === 0x46 && image[3] === 0x46 &&
+        image[8] === 0x57 && image[9] === 0x45 && image[10] === 0x42 && image[11] === 0x50) {
+        return 'image/webp';
+    }
+    if (image.length >= 6 &&
+        image[0] === 0x47 && image[1] === 0x49 && image[2] === 0x46 && image[3] === 0x38) {
+        return 'image/gif';
+    }
+    return 'image/png';
+}
+function imageBytesToDataUrl(image) {
+    const mediaType = inferImageMediaType(image);
+    return `data:${mediaType};base64,${Buffer.from(image).toString('base64')}`;
+}
+function chatGptImageSizeFromAspectRatio(aspectRatio) {
+    switch (aspectRatio) {
+        case '1:1':
+            return '1024x1024';
+        case '3:2':
+            return '1536x1024';
+        case '2:3':
+            return '1024x1536';
+        default:
+            return undefined;
+    }
+}
 function normalizeResolutionKey(input) {
     if (!input)
         return undefined;
@@ -652,6 +870,15 @@ function normalizeResolutionKey(input) {
         return '480p';
     return normalized;
 }
+function isAspectRatio(input) {
+    return /^\d+:\d+$/.test(input);
+}
+function parseAspectRatioOption(input) {
+    if (!input || !isAspectRatio(input)) {
+        return undefined;
+    }
+    return input;
+}
 function ensureExtension(filePath, ext) {
     const parsed = path.parse(filePath);
     if (parsed.ext) {

package/dist/credentials.d.ts

@@ -1,18 +1,31 @@
-export declare const PROVIDERS: Record<string, {
+import type { ChatGptAuth } from './chatgpt-auth.js';
+export type ProviderInfo = {
     envVar: string;
     label: string;
     hint: string;
-}>;
+    /** If true, this provider uses OAuth instead of a plain API key */
+    oauth?: boolean;
+};
+export declare const PROVIDERS: Record<string, ProviderInfo>;
 export declare const EGAKI_GATEWAY_URL = "https://egaki.org/v3/ai";
-export type Credentials = Record<string, string>;
+/** A credential value is either a plain API key string or a ChatGPT OAuth object. */
+export type CredentialValue = string | ChatGptAuth;
+export type Credentials = Record<string, CredentialValue>;
 export declare function readCredentials(): Credentials;
 export declare function writeCredentials(creds: Credentials): void;
 export declare function saveProviderKey(provider: string, key: string): void;
+export declare function saveChatGptAuth(auth: ChatGptAuth): void;
+export declare function getChatGptAuth(): ChatGptAuth | undefined;
 export declare function removeProviderKey(provider: string): void;
 export declare function getProviderKey(provider: string): string | undefined;
 export declare function injectCredentialsToEnv(): void;
+/**
+ * Returns true when the current run should use the ChatGPT/Codex backend flow
+ * for OpenAI image models instead of a direct OpenAI API key.
+ */
+export declare function shouldUseChatGptBackend(): boolean;
 export declare function getKeyStatus(provider: string): {
     available: boolean;
-    source: 'env' | 'stored' | 'none';
+    source: 'env' | 'stored' | 'oauth' | 'none';
 };
 //# sourceMappingURL=credentials.d.ts.map

package/dist/credentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,SAAS,EAAE,MAAM,CAC5B,MAAM,EACN;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CA2BhD,CAAA;AAED,eAAO,MAAM,iBAAiB,4BAA4B,CAAA;AAa1D,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAEhD,wBAAgB,eAAe,IAAI,WAAW,CAO7C;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAOzD;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAInE;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAIxD;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGnE;AAKD,wBAAgB,sBAAsB,IAAI,IAAI,CAW7C;AAID,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG;IAC9C,SAAS,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAA;CAClC,CAaA"}
+{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,mEAAmE;IACnE,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAKD,eAAO,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAqClD,CAAA;AAED,eAAO,MAAM,iBAAiB,4BAA4B,CAAA;AAa1D,qFAAqF;AACrF,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,WAAW,CAAA;AAClD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;AAEzD,wBAAgB,eAAe,IAAI,WAAW,CAO7C;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAOzD;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAInE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,CAIvD;AAED,wBAAgB,cAAc,IAAI,WAAW,GAAG,SAAS,CAOxD;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAIxD;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAInE;AAKD,wBAAgB,sBAAsB,IAAI,IAAI,CAa7C;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAID,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG;IAC9C,SAAS,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAA;CAC5C,CAuBA"}

package/dist/credentials.js

@@ -1,6 +1,9 @@
 // Credential storage for egaki.
 // Reads and writes API keys from ~/.config/egaki/credentials.json.
 // Keys are stored per-provider and injected as env vars at runtime.
+//
+// Most providers store a plain API key string. The 'chatgpt' provider stores
+// a structured ChatGptAuth object with OAuth tokens for the Codex backend flow.
 import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
@@ -13,14 +16,25 @@ export const PROVIDERS = {
         label: 'Egaki (all models, one subscription)',
         hint: 'Subscribe at https://egaki.org/buy or run: egaki subscribe',
     },
+    chatgpt: {
+        envVar: 'OPENAI_API_KEY',
+        label: 'ChatGPT (use your subscription)',
+        hint: 'Sign in with your ChatGPT account via browser',
+        oauth: true,
+    },
     google: {
         envVar: 'GOOGLE_GENERATIVE_AI_API_KEY',
         label: 'Google AI (Gemini, Imagen)',
         hint: 'Get your key at https://aistudio.google.com/apikey',
     },
+    vertex: {
+        envVar: 'GOOGLE_VERTEX_API_KEY',
+        label: 'Google Vertex AI (Gemini, Imagen, Veo via Google Cloud)',
+        hint: 'Get an API key at https://console.cloud.google.com/apis/credentials',
+    },
     openai: {
         envVar: 'OPENAI_API_KEY',
-        label: 'OpenAI (DALL-E)',
+        label: 'OpenAI (API key)',
         hint: 'Get your key at https://platform.openai.com/api-keys',
     },
     replicate: {
@@ -65,6 +79,19 @@ export function saveProviderKey(provider, key) {
     creds[provider] = key;
     writeCredentials(creds);
 }
+export function saveChatGptAuth(auth) {
+    const creds = readCredentials();
+    creds['chatgpt'] = auth;
+    writeCredentials(creds);
+}
+export function getChatGptAuth() {
+    const creds = readCredentials();
+    const val = creds['chatgpt'];
+    if (val && typeof val === 'object') {
+        return val;
+    }
+    return undefined;
+}
 export function removeProviderKey(provider) {
     const creds = readCredentials();
     delete creds[provider];
@@ -72,23 +99,33 @@ export function removeProviderKey(provider) {
 }
 export function getProviderKey(provider) {
     const creds = readCredentials();
-    return creds[provider];
+    const val = creds[provider];
+    return typeof val === 'string' ? val : undefined;
 }
-// Inject all stored credentials as env vars so the AI SDK
-// providers pick them up automatically. Env vars already set
-// by the user take precedence (we don't overwrite them).
+// Inject all stored non-ChatGPT credentials as env vars so the AI SDK
+// providers pick them up automatically. Env vars already set by the user take
+// precedence (we don't overwrite them).
 export function injectCredentialsToEnv() {
     const creds = readCredentials();
-    for (const [provider, key] of Object.entries(creds)) {
+    for (const [provider, value] of Object.entries(creds)) {
         const info = PROVIDERS[provider];
-        if (!info) {
+        if (!info)
             continue;
-        }
-        if (!process.env[info.envVar]) {
-            process.env[info.envVar] = key;
+        // Skip ChatGPT OAuth entries — handled separately
+        if (provider === 'chatgpt')
+            continue;
+        if (typeof value === 'string' && !process.env[info.envVar]) {
+            process.env[info.envVar] = value;
         }
     }
 }
+/**
+ * Returns true when the current run should use the ChatGPT/Codex backend flow
+ * for OpenAI image models instead of a direct OpenAI API key.
+ */
+export function shouldUseChatGptBackend() {
+    return !process.env['OPENAI_API_KEY'] && Boolean(getChatGptAuth());
+}
 // Check if a provider has a key available (from env or stored credentials).
 // Returns the source of the key for display purposes.
 export function getKeyStatus(provider) {
@@ -96,6 +133,14 @@ export function getKeyStatus(provider) {
     if (!info) {
         return { available: false, source: 'none' };
     }
+    // ChatGPT OAuth is a special case
+    if (provider === 'chatgpt') {
+        const auth = getChatGptAuth();
+        if (auth) {
+            return { available: true, source: 'oauth' };
+        }
+        return { available: false, source: 'none' };
+    }
     if (process.env[info.envVar]) {
         return { available: true, source: 'env' };
     }

package/dist/login.d.ts

@@ -2,7 +2,7 @@ export declare function loginInteractive(): Promise<void>;
 export declare function loginNonInteractive({ provider, key, }: {
     provider: string;
     key: string;
-}): void;
+}): Promise<void>;
 export declare function showLoginStatus(): void;
 export declare function removeLogin(provider: string): void;
 export declare function readKeyFromStdin(): Promise<string>;

package/dist/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../src/login.ts"],"names":[],"mappings":"AAsBA,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAqEtD;AAED,wBAAgB,mBAAmB,CAAC,EAClC,QAAQ,EACR,GAAG,GACJ,EAAE;IACD,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,IAAI,CAiBP;AAED,wBAAgB,eAAe,IAAI,IAAI,CAqBtC;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAYlD;AAGD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAMxD"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../src/login.ts"],"names":[],"mappings":"AAyBA,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAkFtD;AAED,wBAAsB,mBAAmB,CAAC,EACxC,QAAQ,EACR,GAAG,GACJ,EAAE;IACD,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBhB;AAED,wBAAgB,eAAe,IAAI,IAAI,CAyCtC;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAalD;AAGD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAMxD"}