egaki 0.10.0 → 0.12.0

package/dist/cli/cli.js

@@ -7,19 +7,18 @@
 //   - imagen-* models → generateImage() with google.image()
 //   - all other models → generateText() with responseModalities: ['IMAGE']
 // The CLI auto-detects which path to use based on model ID prefix.
-import { goke } from 'goke';
+import { colors as pc, goke, isAgent, } from 'goke';
 import { z } from 'zod';
 import dedent from 'string-dedent';
 import { APICallError, NoImageGeneratedError, NoVideoGeneratedError, RetryError, } from 'ai';
 import { select, isCancel, cancel } from '@clack/prompts';
 import fs from 'node:fs';
 import path from 'node:path';
-import pc from 'picocolors';
 import pkg from '../../package.json' with { type: 'json' };
 import { injectCredentialsToEnv, PROVIDERS, getKeyStatus, } from './credentials.js';
 import { DEFAULT_MODEL, DEFAULT_VIDEO_MODEL, getModelConfig, } from './models.js';
 import { CATALOG, VIDEO_CATALOG, describeProviderValues, } from './model-catalog.js';
-import { loginInteractive, loginNonInteractive, showLoginStatus, removeLogin, readKeyFromStdin, } from './login.js';
+import { loginInteractive, loginNonInteractive, resolveLoginAction, showLoginStatus, removeLogin, readKeyFromStdin, } from './login.js';
 import { subscribeInteractive, subscribeNonInteractive, unsubscribe, showUsage, } from './subscription.js';
 import { generateImageUncached as generateImage, generateVideoUncached as generateVideo, calculateCost, ValidationError, } from './generate.js';
 import { generateSpeechUncached as generateSpeech, } from './speech-generate.js';
@@ -47,8 +46,8 @@ cli
     .command('login', dedent `
       Configure API keys for image generation providers.
       Interactive mode: shows a provider picker and secure key input.
-      Non-interactive mode: pass --provider and --key flags, or pipe key via stdin.
-      Keys are saved to ~/.config/egaki/credentials.json (mode 0600).
+      Non-interactive mode: pass \`--provider\` and \`--key\`, or pipe the key via stdin.
+      Browser OAuth runs in the background for AI agents and non-TTY shells.
     `)
     .option('-p, --provider [name]', z
     .string()
@@ -67,29 +66,84 @@ cli
     .example('egaki login --show')
     .example('# Remove a stored key')
     .example('egaki login --remove google')
-    .action(async (options) => {
-    if (options.show) {
-        showLoginStatus();
+    .action(async (options, ctx) => {
+    const action = resolveLoginAction({
+        options,
+        daemonProvider: ctx.daemon.isDaemon
+            ? ctx.process.env.EGAKI_LOGIN_PROVIDER
+            : undefined,
+        isAgent: isAgent || !process.stdin.isTTY,
+    });
+    if (action instanceof Error) {
+        ctx.console.error(action.message);
+        ctx.process.exit(1);
         return;
     }
-    if (options.remove) {
-        removeLogin(options.remove);
+    if (action.type === 'show') {
+        showLoginStatus({ loginRunning: await ctx.daemon.isRunning() });
         return;
     }
-    // Non-interactive: --provider + --key or stdin
-    if (options.provider) {
-        // OAuth providers use browser flow — skip key reading
-        if (options.provider === 'chatgpt' || options.provider === 'xai-oauth') {
-            await loginNonInteractive({ provider: options.provider, key: '' });
-            return;
-        }
-        const key = options.key || (await readKeyFromStdin());
-        await loginNonInteractive({ provider: options.provider, key });
+    if (action.type === 'remove') {
+        removeLogin(action.provider);
+        return;
+    }
+    if (action.type === 'oauth-daemon') {
+        await loginNonInteractive({
+            provider: action.provider,
+            key: '',
+            background: true,
+        });
+        return;
+    }
+    if (action.type === 'oauth-client') {
+        await startOAuthLogin({ provider: action.provider, ctx });
         return;
     }
-    // Interactive mode
-    await loginInteractive();
+    if (action.type === 'api-key') {
+        await loginNonInteractive({
+            provider: action.provider,
+            key: action.key || (await readKeyFromStdin()),
+        });
+        return;
+    }
+    await loginInteractive({
+        loginOAuth: (provider) => startOAuthLogin({ provider, ctx }),
+    });
 });
+cli
+    .command('login status <provider>', 'Check one provider login. Exits with status 1 when login is not complete.')
+    .example('egaki login status chatgpt')
+    .example('egaki login status xai-oauth')
+    .action(async (provider, _options, ctx) => {
+    const info = PROVIDERS[provider];
+    if (!info) {
+        ctx.console.error(`Unknown provider: ${provider}`);
+        ctx.process.exit(1);
+        return;
+    }
+    const status = getKeyStatus(provider);
+    if (status.available) {
+        ctx.console.log(`${info.label} is configured.`);
+        return;
+    }
+    const loginRunning = await ctx.daemon.forCommand('login').isRunning();
+    ctx.console.error(loginRunning
+        ? `An OAuth login is running, but ${info.label} is not configured yet.`
+        : `${info.label} is not configured.`);
+    ctx.process.exit(1);
+});
+async function startOAuthLogin({ provider, ctx, }) {
+    const runInBackground = isAgent || !process.stdin.isTTY;
+    await ctx.daemon.start({
+        attach: !runInBackground,
+        timeoutMs: 10 * 60 * 1000,
+        env: { EGAKI_LOGIN_PROVIDER: provider },
+    });
+    if (!runInBackground)
+        return;
+    ctx.console.log('Login is running in the background and the browser will open.');
+    ctx.console.log(`After approval, verify with: egaki login status ${provider}`);
+}
 // ─── subscribe command ───────────────────────────────────────────────────────
 cli
     .command('subscribe', dedent `
@@ -97,17 +151,18 @@ cli
       You can also use your own provider keys (Google/OpenAI/Replicate/Fal)
       via 'egaki login --provider <name> --key <key>' if you prefer BYOK.
       Egaki subscription avoids managing one key per provider.
-      Three plans: Starter ($9/mo, 100 credits), Pro ($29/mo, 500 credits),
-      Unlimited ($99/mo, 2000 credits). One credit ≈ one standard image.
+      Two plans: Plus ($29/mo) and Pro ($99/mo). Each plan includes a
+      monthly dollar budget of generation usage equal to its price;
+      generations count their marked-up provider cost against the budget.
       Interactive mode: pick a plan and get a checkout URL (email prefill optional).
       Non-interactive: --email is optional and only pre-fills checkout.
     `)
     .option('-e, --email [email]', z.string().describe('Optional email prefill for checkout (skips interactive prompt)'))
-    .option('--plan [plan]', z.string().describe('Plan ID: starter, pro, or unlimited (default: pro)'))
+    .option('--plan [plan]', z.enum(['plus', 'pro']).describe('Plan ID: plus ($29/mo) or pro ($99/mo)'))
     .example('# Interactive subscribe')
     .example('egaki subscribe')
     .example('# Non-interactive (for agents)')
-    .example('egaki subscribe --email user@example.com --plan pro')
+    .example('egaki subscribe --email user@example.com --plan plus')
     .example('# Non-interactive without email prefill')
     .example('egaki subscribe --plan pro')
     .action(async (options) => {
@@ -131,8 +186,8 @@ cli
 // ─── usage command ───────────────────────────────────────────────────────────
 cli
     .command('usage', dedent `
-      Show your current Egaki credit usage for this billing period.
-      Displays plan, credits used, credits remaining, and period info.
+      Show your current Egaki usage for this billing period.
+      Displays plan, dollars spent, remaining budget, and period info.
     `)
     .example('egaki usage')
     .action(async () => {
@@ -172,6 +227,15 @@ cli
     console.log(`  ${pc.dim('root:')} ${result.root}`);
     console.log(`  ${pc.dim('url:')}  ${pc.cyan(result.url)}`);
     console.log();
+    console.log(`  ${pc.dim('SDK available in browser console as')} ${pc.yellow('window.egakiSDK')}`);
+    console.log(`    ${pc.dim('.seekTo(frame)')}       ${pc.dim('jump to a frame')}`);
+    console.log(`    ${pc.dim('.screenshot()')}        ${pc.dim('capture frame as data URL')}`);
+    console.log(`    ${pc.dim('.filmstrip({...})')}     ${pc.dim('grid of frames across scenes')}`);
+    console.log(`    ${pc.dim('.export({...})')}        ${pc.dim('render MP4 via WebCodecs')}`);
+    console.log(`    ${pc.dim('.getInfo()')}            ${pc.dim('composition metadata')}`);
+    console.log();
+    console.log(`  ${pc.dim('Docs:')} ${pc.cyan('https://raw.githubusercontent.com/remorses/egaki/main/cli/skills/egaki/SKILL.md')}`);
+    console.log();
     if (options.open) {
         const { openUrlInBrowser } = await import('./open-browser.js');
         await openUrlInBrowser(result.url);
@@ -194,7 +258,7 @@ cli
     .option('-n, --count [n]', z.number().default(1).describe('Number of images to generate'))
     .option('--aspect-ratio [ratio]', z
     .string()
-    .describe('Aspect ratio for the generated image. Imagen supports: 1:1, 3:4, 4:3, 9:16, 16:9. Gemini supports additional ratios: 2:3, 3:2, 4:5, 5:4, 21:9'))
+    .describe('Aspect ratio for the generated image. Imagen supports: 1:1, 3:4, 4:3, 9:16, 16:9. Gemini supports additional ratios: 2:3, 3:2, 4:5, 5:4, 21:9. OpenAI models (gpt-image-*, dall-e-*) have no native aspect ratio parameter, so the ratio is snapped to the closest supported size and stated in the prompt text'))
     .option('--seed [seed]', z.number().describe('Seed for reproducible generation. Same seed + same prompt = same image'))
     .option('--image-size [size]', z
     .enum(['1K', '2K', '4K'])
@@ -320,7 +384,7 @@ cli
     .describe(`Video operation mode. ${describeProviderValues('mode', [VIDEO_CATALOG])}`))
     .option('--reference-images [path]', z
     .array(z.string())
-    .describe('Reference images for R2V generation, repeatable. xAI: 1-7 images. Seedance: 1-9 images (use @Image1 etc. in prompt)'))
+    .describe('Reference images for R2V generation, repeatable. xAI: 1-7 images (1-14 on grok-imagine-video-1.5). Seedance: 1-9 images (use @Image1 etc. in prompt)'))
     .option('--negative-prompt [text]', z
     .string()
     .describe('Describe what to avoid in the generated video (Fal models)'))
@@ -1012,6 +1076,7 @@ const UPLOAD_GATEWAY_BASE = 'https://egaki.org';
 /** Max upload size in bytes (must match gateway limit). */
 const MAX_UPLOAD_SIZE = 100 * 1024 * 1024;
 cli.help();
+cli.completions();
 cli.version(pkg.version);
 export { cli };
 async function runProviderCall(operation, call) {
@@ -1158,6 +1223,8 @@ const FEATURED_IMAGE_MODELS = [
     'gemini-2.5-flash-image',
     'gemini-3.1-flash-image-preview',
     'nano-banana-pro-preview',
+    'gpt-image-2.5-sunburst',
+    'gpt-image-2.5-flare',
     'gpt-image-2',
     'gpt-image-1.5',
     'chatgpt-image-latest',
@@ -1166,7 +1233,7 @@ const FEATURED_IMAGE_MODELS = [
     'flux-pro-1.1-ultra',
     'recraft-v4',
     'dall-e-3',
-    'grok-imagine-image-quality',
+    'grok-imagine-image-2.0',
 ];
 /**
  * Resolve the image model: show interactive picker in TTY, use default otherwise.

package/dist/cli/generate.d.ts

@@ -1,9 +1,9 @@
 import { ValidationError } from './models.js';
 export { ValidationError };
 /** Image model IDs from the catalog. Accepts arbitrary strings too. */
-export type ImageModelId = 'imagen-4.0-generate-001' | 'imagen-4.0-ultra-generate-001' | 'imagen-4.0-fast-generate-001' | 'gemini-2.0-flash-exp-image-generation' | 'gemini-2.5-flash-image' | 'gemini-3-pro-image-preview' | 'gemini-3.1-flash-image-preview' | 'vertex/imagen-4.0-generate-001' | 'vertex/imagen-4.0-ultra-generate-001' | 'vertex/imagen-4.0-fast-generate-001' | 'vertex/gemini-2.5-flash-image' | 'vertex/gemini-3-pro-image-preview' | 'vertex/gemini-3.1-flash-image-preview' | 'flux-kontext-max' | 'flux-kontext-pro' | 'flux-pro-1.0-fill' | 'flux-pro-1.1' | 'flux-pro-1.1-ultra' | 'flux-2-pro' | 'flux-2-max' | 'flux-2-flex' | 'flux-2-klein-9b' | 'flux-2-klein-4b' | 'recraft-v2' | 'recraft-v3' | 'recraft-v4' | 'recraft-v4-pro' | 'recraft-v4.1' | 'recraft-v4.1-pro' | 'recraft-v4.1-utility' | 'recraft-v4.1-utility-pro' | 'seedream-5.0-lite' | 'seedream-4.5' | 'seedream-4.0' | 'grok-imagine-image' | 'grok-imagine-image-quality' | 'dall-e-2' | 'dall-e-3' | 'gpt-image-1' | 'gpt-image-1-mini' | 'gpt-image-1.5' | 'gpt-image-2' | 'chatgpt-image-latest' | (string & {});
+export type ImageModelId = 'imagen-4.0-generate-001' | 'imagen-4.0-ultra-generate-001' | 'imagen-4.0-fast-generate-001' | 'gemini-2.0-flash-exp-image-generation' | 'gemini-2.5-flash-image' | 'gemini-3-pro-image-preview' | 'gemini-3.1-flash-image-preview' | 'vertex/imagen-4.0-generate-001' | 'vertex/imagen-4.0-ultra-generate-001' | 'vertex/imagen-4.0-fast-generate-001' | 'vertex/gemini-2.5-flash-image' | 'vertex/gemini-3-pro-image-preview' | 'vertex/gemini-3.1-flash-image-preview' | 'flux-kontext-max' | 'flux-kontext-pro' | 'flux-pro-1.0-fill' | 'flux-pro-1.1' | 'flux-pro-1.1-ultra' | 'flux-2-pro' | 'flux-2-max' | 'flux-2-flex' | 'flux-2-klein-9b' | 'flux-2-klein-4b' | 'recraft-v2' | 'recraft-v3' | 'recraft-v4' | 'recraft-v4-pro' | 'recraft-v4.1' | 'recraft-v4.1-pro' | 'recraft-v4.1-utility' | 'recraft-v4.1-utility-pro' | 'seedream-5.0-lite' | 'seedream-4.5' | 'seedream-4.0' | 'grok-imagine-image' | 'grok-imagine-image-2.0' | 'grok-imagine-image-quality' | 'dall-e-2' | 'dall-e-3' | 'gpt-image-1' | 'gpt-image-1-mini' | 'gpt-image-1.5' | 'gpt-image-2' | 'gpt-image-2.5-flare' | 'gpt-image-2.5-sunburst' | 'chatgpt-image-latest' | (string & {});
 /** Video model IDs from the catalog. Accepts arbitrary strings too. */
-export type VideoModelId = 'veo-3.1-generate-001' | 'veo-3.1-fast-generate-001' | 'veo-3.0-generate-001' | 'veo-3.0-fast-generate-001' | 'vertex/veo-3.1-generate-001' | 'vertex/veo-3.1-fast-generate-001' | 'grok-imagine-video' | 'grok-imagine-video-1.5' | 'kling-v3.0-t2v' | 'kling-v3.0-i2v' | 'kling-v3.0-motion-control' | 'kling-v2.6-t2v' | 'kling-v2.6-i2v' | 'kling-v2.6-motion-control' | 'kling-v2.5-turbo-t2v' | 'kling-v2.5-turbo-i2v' | 'wan-v2.6-t2v' | 'wan-v2.6-i2v' | 'wan-v2.6-i2v-flash' | 'wan-v2.6-r2v' | 'wan-v2.6-r2v-flash' | 'wan-v2.5-t2v-preview' | 'seedance-2.0' | 'seedance-2.0-fast' | 'seedance-v1.5-pro' | 'seedance-v1.0-pro' | 'seedance-v1.0-pro-fast' | 'seedance-v1.0-lite-t2v' | 'seedance-v1.0-lite-i2v' | 'luma-ray-2' | 'minimax-video' | 'hunyuan-video' | (string & {});
+export type VideoModelId = 'veo-3.1-generate-001' | 'veo-3.1-fast-generate-001' | 'veo-3.0-generate-001' | 'veo-3.0-fast-generate-001' | 'vertex/veo-3.1-generate-001' | 'vertex/veo-3.1-fast-generate-001' | 'grok-imagine-video' | 'grok-imagine-video-1.5' | 'grok-imagine-video-1.5-lite' | 'kling-v3.0-t2v' | 'kling-v3.0-i2v' | 'kling-v3.0-motion-control' | 'kling-v2.6-t2v' | 'kling-v2.6-i2v' | 'kling-v2.6-motion-control' | 'kling-v2.5-turbo-t2v' | 'kling-v2.5-turbo-i2v' | 'wan-v2.6-t2v' | 'wan-v2.6-i2v' | 'wan-v2.6-i2v-flash' | 'wan-v2.6-r2v' | 'wan-v2.6-r2v-flash' | 'wan-v2.5-t2v-preview' | 'seedance-2.0' | 'seedance-2.0-fast' | 'seedance-v1.5-pro' | 'seedance-v1.0-pro' | 'seedance-v1.0-pro-fast' | 'seedance-v1.0-lite-t2v' | 'seedance-v1.0-lite-i2v' | 'luma-ray-2' | 'minimax-video' | 'hunyuan-video' | (string & {});
 /** Common aspect ratios across providers. */
 export type AspectRatio = '1:1' | '3:4' | '4:3' | '9:16' | '16:9' | '2:3' | '3:2' | '4:5' | '5:4' | '9:21' | '21:9' | (string & {});
 /** Image quality presets (varies by provider). */
@@ -114,6 +114,14 @@ export declare function calculateCost(cost: {
     resolution?: string;
     hasVideoInput?: boolean;
 }, count?: number): number | null;
+/**
+ * Translate an aspect ratio request into a prompt prefix + concrete `size` for
+ * models that have no native aspect ratio parameter.
+ */
+export declare function aspectRatioFallback(prompt: string, aspectRatio: `${number}:${number}` | undefined, sizes: readonly string[]): {
+    prompt: string;
+    size?: `${number}x${number}`;
+};
 /**
  * Generate images from a text prompt. Auto-detects which generation strategy
  * to use (image API, text model, or ChatGPT Responses API) based on model ID.

package/dist/cli/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/cli/generate.ts"],"names":[],"mappings":"AAgCA,OAAO,EAQL,eAAe,EAChB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,eAAe,EAAE,CAAA;AAO1B,uEAAuE;AACvE,MAAM,MAAM,YAAY,GACpB,yBAAyB,GAAG,+BAA+B,GAAG,8BAA8B,GAC5F,uCAAuC,GAAG,wBAAwB,GAAG,4BAA4B,GAAG,gCAAgC,GACpI,gCAAgC,GAAG,sCAAsC,GAAG,qCAAqC,GACjH,+BAA+B,GAAG,mCAAmC,GAAG,uCAAuC,GAC/G,kBAAkB,GAAG,kBAAkB,GAAG,mBAAmB,GAAG,cAAc,GAAG,oBAAoB,GACrG,YAAY,GAAG,YAAY,GAAG,aAAa,GAAG,iBAAiB,GAAG,iBAAiB,GACnF,YAAY,GAAG,YAAY,GAAG,YAAY,GAAG,gBAAgB,GAAG,cAAc,GAAG,kBAAkB,GAAG,sBAAsB,GAAG,0BAA0B,GACzJ,mBAAmB,GAAG,cAAc,GAAG,cAAc,GACrD,oBAAoB,GAAG,4BAA4B,GACnD,UAAU,GAAG,UAAU,GAAG,aAAa,GAAG,kBAAkB,GAAG,eAAe,GAAG,aAAa,GAAG,sBAAsB,GACvH,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;AAEjB,uEAAuE;AACvE,MAAM,MAAM,YAAY,GACpB,sBAAsB,GAAG,2BAA2B,GAAG,sBAAsB,GAAG,2BAA2B,GAC3G,6BAA6B,GAAG,kCAAkC,GAClE,oBAAoB,GAAG,wBAAwB,GAC/C,gBAAgB,GAAG,gBAAgB,GAAG,2BAA2B,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,2BAA2B,GACrI,sBAAsB,GAAG,sBAAsB,GAC/C,cAAc,GAAG,cAAc,GAAG,oBAAoB,GAAG,cAAc,GAAG,oBAAoB,GAAG,sBAAsB,GACvH,cAAc,GAAG,mBAAmB,GAAG,mBAAmB,GAAG,mBAAmB,GAAG,wBAAwB,GAAG,wBAAwB,GAAG,wBAAwB,GACjK,YAAY,GAAG,eAAe,GAAG,eAAe,GAChD,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;AAEjB,6CAA6C;AAC7C,MAAM,MAAM,WAAW,GACnB,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GACzF,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;AAEjB,kDAAkD;AAClD,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;AAE1F,4BAA4B;AAC5B,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;AAIvE,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,sDAAsD;IACtD,KAAK,CAAC,EAAE,YAAY,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;IAC1B,SAAS,CAAC,EAAE,UAAU,CAAA;IACtB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,iBAAiB,CAAA;IAChC,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,qDAAqD;IACrD,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAA;CAC/B;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,aAAa,EAAE,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,KAAK,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACvD,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;IACpB,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,sDAAsD;IACtD,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC9B;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,4DAA4D;IAC5D,KAAK,CAAC,EAAE,YAAY,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,IAAI,CAAC,EAAE,YAAY,GAAG,cAAc,GAAG,oBAAoB,CAAA;IAC3D,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,+EAA+E;IAC/E,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,aAAa,EAAE,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;IACpB,yDAAyD;IACzD,SAAS,CAAC,EAAE,OAAO,EAAE,CAAA;CACtB;AAeD,KAAK,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;AAEnL,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE;IACJ,WAAW,CAAC,EAAE,GAAG,MAAM,IAAI,MAAM,EAAE,CAAA;IACnC,WAAW,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,GACA,qBAAqB,CAyCvB;AAED,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE;IACJ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,GACA,qBAAqB,GAAG,SAAS,CAuDnC;AAID,wBAAgB,aAAa,CAC3B,IAAI,EAAE;IACJ,IAAI,EAAE,WAAW,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;CACjB,GAAG;IACF,IAAI,EAAE,WAAW,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB,GAAG;IACF,IAAI,EAAE,kBAAkB,CAAA;IACxB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,KAAK,EAAE,KAAK,CAAC;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;CACtF,GAAG;IACF,IAAI,EAAE,SAAS,CAAA;CAChB,EACD,KAAK,EAAE;IACL,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,EACD,KAAK,GAAE,MAAU,GAChB,MAAM,GAAG,IAAI,CA0Bf;AAoED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,KAAK,GAAG,mBAAmB,CAAC,CAqD5G;AAID;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,KAAK,GAAG,mBAAmB,CAAC,CA8E5G;AA+RD,MAAM,WAAW,oBAAoB;IACnC,oEAAoE;IACpE,GAAG,EAAE,MAAM,CAAA;CACZ;AAOD,eAAO,MAAM,aAAa;WAAkD,MAAM;wBAehF,CAAA;AAIF,eAAO,MAAM,aAAa;WAAkD,MAAM;wBAehF,CAAA;AAIF,OAAO,EACL,cAAc,EACd,sBAAsB,EACtB,mBAAmB,EACnB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAA;AAI7B,OAAO,EACL,eAAe,EACf,uBAAuB,EACvB,0BAA0B,EAC1B,wBAAwB,EACxB,wBAAwB,EACxB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,oBAAoB,GAC1B,MAAM,6BAA6B,CAAA"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/cli/generate.ts"],"names":[],"mappings":"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"}

package/dist/cli/generate.js

@@ -19,7 +19,7 @@ import { createParser } from 'eventsource-parser';
 import { injectCredentialsToEnv, getChatGptAuth, saveChatGptAuth, } from './credentials.js';
 import { getModelConfig, createImageModel, createTextModel, createVideoModel, shouldUseResponsesApi, DEFAULT_MODEL, DEFAULT_VIDEO_MODEL, ValidationError, } from './models.js';
 export { ValidationError };
-import { getValidChatGptAuth } from './chatgpt-auth.js';
+import { chatGptReLoginMessage, getValidChatGptAuth, isRevokedChatGptAccessToken, refreshChatGptToken, resolveChatGptResponsesModel, } from './chatgpt-auth.js';
 export function buildImageProviderOptions(provider, opts) {
     switch (provider) {
         case 'google': {
@@ -38,7 +38,8 @@ export function buildImageProviderOptions(provider, opts) {
         }
         case 'xai': {
             const xaiOpts = {
-                ...(opts.quality ? { quality: opts.quality } : {}),
+                // 'auto' is xAI's server default; @ai-sdk/xai does not accept it, so omit the field.
+                ...(opts.quality && opts.quality !== 'auto' ? { quality: opts.quality } : {}),
                 ...(opts.resolution ? { resolution: opts.resolution } : {}),
                 ...(opts.outputFormat ? { output_format: opts.outputFormat } : {}),
             };
@@ -181,21 +182,70 @@ 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 isAspectRatio(input) {
     return /^\d+:\d+$/.test(input);
 }
+// ─── aspect ratio fallback for models without native support ─────────────────
+//
+// OpenAI image models (gpt-image-*, dall-e-*) reject `aspectRatio`: the AI SDK
+// pushes an "unsupported: aspectRatio" warning and the request falls back to a
+// square image. They accept a fixed `size` list instead, and they also honour a
+// plain-language ratio statement in the prompt text when picking the framing.
+// So for these models we do both: snap to the closest supported size AND state
+// the ratio in the prompt. The prompt hint matters because the supported sizes
+// are coarse (only 3:2 / 1:1 / 2:3), so a request like 16:9 has no exact match
+// and the composition has to come from the prompt.
+//
+// Models with a non-empty `features.aspectRatios` keep the native flag.
+const OPENAI_SIZES = ['1024x1024', '1536x1024', '1024x1536'];
+function ratioValue(aspectRatio) {
+    const [w, h] = aspectRatio.split(':').map(Number);
+    if (!w || !h)
+        return undefined;
+    return w / h;
+}
+function orientationLabel(ratio) {
+    if (ratio > 1.02)
+        return 'landscape';
+    if (ratio < 0.98)
+        return 'portrait';
+    return 'square';
+}
+/** Pick the supported WIDTHxHEIGHT whose ratio is closest to the requested one. */
+function closestSize(aspectRatio, sizes) {
+    const target = ratioValue(aspectRatio);
+    if (target === undefined || sizes.length === 0)
+        return undefined;
+    let best;
+    let bestDistance = Infinity;
+    for (const size of sizes) {
+        const [w, h] = size.split('x').map(Number);
+        if (!w || !h)
+            continue;
+        // Compare in log space so 2x-too-wide and 2x-too-tall are equally far off.
+        const distance = Math.abs(Math.log(w / h) - Math.log(target));
+        if (distance < bestDistance) {
+            bestDistance = distance;
+            best = size;
+        }
+    }
+    return best;
+}
+/**
+ * Translate an aspect ratio request into a prompt prefix + concrete `size` for
+ * models that have no native aspect ratio parameter.
+ */
+export function aspectRatioFallback(prompt, aspectRatio, sizes) {
+    if (!aspectRatio)
+        return { prompt };
+    const ratio = ratioValue(aspectRatio);
+    if (ratio === undefined)
+        return { prompt };
+    return {
+        prompt: `Image aspect ratio: ${aspectRatio}, ${orientationLabel(ratio)} orientation. ${prompt}`,
+        size: closestSize(aspectRatio, sizes),
+    };
+}
 /** Convert any thrown value into an Error instance. */
 function toError(err) {
     if (err instanceof Error)
@@ -336,12 +386,19 @@ export async function generateVideoUncached(opts) {
 }
 // ─── internal generation paths ───────────────────────────────────────────────
 async function generateWithImageModel(opts) {
-    const imagePrompt = opts.inputImages.length > 0
-        ? { text: opts.prompt, images: opts.inputImages, ...(opts.maskImage ? { mask: opts.maskImage } : {}) }
-        : opts.prompt;
     const config = getModelConfig(opts.model);
     if (config instanceof Error)
         return config;
+    // Models with an empty `aspectRatios` list have no native aspect ratio
+    // parameter, so the request is expressed through `size` + the prompt text.
+    const features = config.strategy === 'video' ? undefined : config.features;
+    const supportsNativeAspectRatio = (features?.aspectRatios?.length ?? 0) > 0;
+    const fallback = supportsNativeAspectRatio
+        ? { prompt: opts.prompt, size: undefined }
+        : aspectRatioFallback(opts.prompt, opts.aspectRatio, features?.sizes ?? []);
+    const imagePrompt = opts.inputImages.length > 0
+        ? { text: fallback.prompt, images: opts.inputImages, ...(opts.maskImage ? { mask: opts.maskImage } : {}) }
+        : fallback.prompt;
     const imageModel = await createImageModel(opts.model);
     if (imageModel instanceof Error)
         return imageModel;
@@ -359,7 +416,8 @@ async function generateWithImageModel(opts) {
             model: imageModel,
             prompt: imagePrompt,
             n: opts.count,
-            ...(opts.aspectRatio ? { aspectRatio: opts.aspectRatio } : {}),
+            ...(opts.aspectRatio && supportsNativeAspectRatio ? { aspectRatio: opts.aspectRatio } : {}),
+            ...(fallback.size ? { size: fallback.size } : {}),
             ...(opts.seed !== undefined ? { seed: opts.seed } : {}),
             providerOptions,
         });
@@ -453,10 +511,7 @@ async function generateWithResponsesApi(opts) {
     if (opts.maskImage) {
         return new ValidationError('ChatGPT image generation does not support mask yet.');
     }
-    const size = opts.aspectRatio ? chatGptImageSizeFromAspectRatio(opts.aspectRatio) : undefined;
-    if (opts.aspectRatio && !size) {
-        return new ValidationError('ChatGPT image generation only supports aspect ratios 1:1, 3:2, or 2:3.');
-    }
+    const { prompt, size } = aspectRatioFallback(opts.prompt, opts.aspectRatio, OPENAI_SIZES);
     const storedAuth = getChatGptAuth();
     if (!storedAuth?.accountId) {
         return new ValidationError('Missing ChatGPT account metadata. Please run `egaki login --provider chatgpt` again.');
@@ -465,49 +520,62 @@ async function generateWithResponsesApi(opts) {
     if (auth instanceof Error)
         return auth;
     const content = [
-        { type: 'input_text', text: opts.prompt },
+        { type: 'input_text', text: prompt },
         ...opts.inputImages.map((image) => ({
             type: 'input_image',
             image_url: imageBytesToDataUrl(image),
         })),
     ];
+    const responsesModel = await resolveChatGptResponsesModel({ auth });
+    if (responsesModel instanceof Error)
+        return responsesModel;
+    const requestBodyFor = (model) => JSON.stringify({
+        model,
+        instructions: 'You are Codex.',
+        input: [
+            {
+                type: 'message',
+                role: 'user',
+                content,
+            },
+        ],
+        tools: [
+            {
+                type: 'image_generation',
+                model: opts.model,
+                quality: 'auto',
+                output_format: 'png',
+                output_compression: 100,
+                moderation: 'auto',
+                size: size ?? 'auto',
+            },
+        ],
+        tool_choice: 'auto',
+        parallel_tool_calls: true,
+        stream: true,
+        store: false,
+        include: [],
+    });
+    const post = ({ access, accountId, body, }) => {
+        const headers = new Headers({
+            Authorization: `Bearer ${access}`,
+            'Content-Type': 'application/json',
+        });
+        if (accountId)
+            headers.set('ChatGPT-Account-ID', accountId);
+        return fetch('https://chatgpt.com/backend-api/codex/responses', {
+            method: 'POST',
+            headers,
+            body,
+        });
+    };
+    let activeModel = responsesModel;
     let response;
     try {
-        response = await fetch('https://chatgpt.com/backend-api/codex/responses', {
-            method: 'POST',
-            headers: {
-                Authorization: `Bearer ${auth.access}`,
-                ...(auth.accountId && { '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: opts.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: [],
-            }),
+        response = await post({
+            access: auth.access,
+            accountId: auth.accountId,
+            body: requestBodyFor(activeModel),
         });
     }
     catch (err) {
@@ -515,7 +583,52 @@ async function generateWithResponsesApi(opts) {
     }
     if (!response.ok || !response.body) {
         const body = await response.text().catch(() => '');
-        return new Error(`ChatGPT image generation failed: ${response.status}${body ? ` ${body}` : ''}`);
+        if (!(response.status === 400 && body.includes('not supported'))) {
+            if (!isRevokedChatGptAccessToken(response.status, body)) {
+                return new Error(`ChatGPT image generation failed: ${response.status}${body ? ` ${body}` : ''}`);
+            }
+            const refreshed = await refreshChatGptToken(auth);
+            if (refreshed instanceof Error)
+                return refreshed;
+            saveChatGptAuth(refreshed);
+            try {
+                response = await post({
+                    access: refreshed.access,
+                    accountId: refreshed.accountId,
+                    body: requestBodyFor(activeModel),
+                });
+            }
+            catch (err) {
+                return toError(err);
+            }
+        }
+        else {
+            const nextModel = await resolveChatGptResponsesModel({
+                auth,
+                exclude: [activeModel],
+            });
+            if (nextModel instanceof Error) {
+                return new Error(`ChatGPT image generation failed: ${response.status} ${body}`);
+            }
+            activeModel = nextModel;
+            try {
+                response = await post({
+                    access: auth.access,
+                    accountId: auth.accountId,
+                    body: requestBodyFor(activeModel),
+                });
+            }
+            catch (err) {
+                return toError(err);
+            }
+        }
+        if (!response.ok || !response.body) {
+            const retryBody = await response.text().catch(() => '');
+            if (isRevokedChatGptAccessToken(response.status, retryBody)) {
+                return new Error(chatGptReLoginMessage({ status: response.status, body: retryBody }));
+            }
+            return new Error(`ChatGPT image generation failed: ${response.status}${retryBody ? ` ${retryBody}` : ''}`);
+        }
     }
     let imageBase64;
     let revisedPrompt = null;

package/dist/cli/generate.test.js

@@ -2,7 +2,7 @@
 // Tests the error-as-value pattern and validation logic without
 // making actual API calls (no credentials needed).
 import { describe, it, expect } from 'vitest';
-import { generateImage, generateVideo, calculateCost, buildImageProviderOptions, buildVideoProviderOptions, ValidationError, } from './generate.js';
+import { generateImage, generateVideo, calculateCost, buildImageProviderOptions, buildVideoProviderOptions, aspectRatioFallback, ValidationError, } from './generate.js';
 describe('generateImage', () => {
     it('returns ValidationError for unknown model', async () => {
         const result = await generateImage({
@@ -110,6 +110,55 @@ describe('buildImageProviderOptions', () => {
         expect(opts).toEqual({});
     });
 });
+describe('aspectRatioFallback', () => {
+    const openaiSizes = ['1024x1024', '1536x1024', '1024x1536'];
+    it('leaves the prompt untouched when no aspect ratio is requested', () => {
+        expect(aspectRatioFallback('a sunset', undefined, openaiSizes)).toMatchInlineSnapshot(`
+      {
+        "prompt": "a sunset",
+      }
+    `);
+    });
+    it('prepends the ratio and picks the closest landscape size', () => {
+        expect(aspectRatioFallback('a sunset', '16:9', openaiSizes)).toMatchInlineSnapshot(`
+      {
+        "prompt": "Image aspect ratio: 16:9, landscape orientation. a sunset",
+        "size": "1536x1024",
+      }
+    `);
+    });
+    it('picks the closest portrait size', () => {
+        expect(aspectRatioFallback('a sunset', '9:16', openaiSizes)).toMatchInlineSnapshot(`
+      {
+        "prompt": "Image aspect ratio: 9:16, portrait orientation. a sunset",
+        "size": "1024x1536",
+      }
+    `);
+    });
+    it('picks the square size for 1:1', () => {
+        expect(aspectRatioFallback('a sunset', '1:1', openaiSizes)).toMatchInlineSnapshot(`
+      {
+        "prompt": "Image aspect ratio: 1:1, square orientation. a sunset",
+        "size": "1024x1024",
+      }
+    `);
+    });
+    it('still prepends the ratio when the model has no size list', () => {
+        expect(aspectRatioFallback('a sunset', '21:9', [])).toMatchInlineSnapshot(`
+      {
+        "prompt": "Image aspect ratio: 21:9, landscape orientation. a sunset",
+        "size": undefined,
+      }
+    `);
+    });
+    it('ignores malformed ratios', () => {
+        expect(aspectRatioFallback('a sunset', '0:0', openaiSizes)).toMatchInlineSnapshot(`
+      {
+        "prompt": "a sunset",
+      }
+    `);
+    });
+});
 describe('buildVideoProviderOptions', () => {
     it('builds xai edit-video options', () => {
         const opts = buildVideoProviderOptions('xai', {