egaki 0.3.0 → 0.4.1

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,6 +16,12 @@ 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)',
@@ -25,7 +34,7 @@ export const PROVIDERS = {
     },
     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: {
@@ -70,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];
@@ -77,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) {
@@ -101,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"}

package/dist/login.js

@@ -1,9 +1,11 @@
 // Login command — interactive and non-interactive API key management.
 // Interactive mode uses clack prompts for provider selection and key input.
 // Non-interactive mode supports --provider + --key flags and stdin piping.
+// ChatGPT OAuth uses a browser flow instead of pasting a key.
 import { intro, outro, select, password, isCancel, cancel, log, note, } from '@clack/prompts';
 import pc from 'picocolors';
-import { PROVIDERS, saveProviderKey, removeProviderKey, getKeyStatus, readCredentials, } from './credentials.js';
+import { PROVIDERS, saveProviderKey, removeProviderKey, getKeyStatus, getChatGptAuth, saveChatGptAuth, } from './credentials.js';
+import { chatGptOAuthLogin, extractPlanType } from './chatgpt-auth.js';
 export async function loginInteractive() {
     intro(pc.bold('egaki login'));
     const providerOptions = Object.entries(PROVIDERS).map(([key, info]) => {
@@ -15,6 +17,11 @@ export async function loginInteractive() {
             if (status.source === 'stored') {
                 return pc.green('(saved)');
             }
+            if (status.source === 'oauth') {
+                const auth = getChatGptAuth();
+                const email = auth?.email;
+                return pc.green(`(signed in${email ? ` as ${email}` : ''})`);
+            }
             return pc.dim('(not configured)');
         })();
         // Highlight the egaki option as recommended
@@ -40,6 +47,13 @@ export async function loginInteractive() {
         log.error(`Unknown provider: ${provider}`);
         process.exit(1);
     }
+    // ChatGPT uses browser OAuth instead of key paste
+    if (provider === 'chatgpt') {
+        const auth = await chatGptOAuthLogin();
+        saveChatGptAuth(auth);
+        outro('Done — ChatGPT OAuth saved');
+        return;
+    }
     log.info(`${pc.dim('Env var:')} ${info.envVar} ${pc.dim('(also used by the CLI when set)')}`);
     log.info(`${pc.dim('Get key:')} ${info.hint}`);
     const key = await password({
@@ -59,13 +73,20 @@ export async function loginInteractive() {
     note(`You can also set ${pc.bold(info.envVar)} as an env var.\nThe CLI reads it automatically, so you can pass it inline too:\n  ${pc.dim(`${info.envVar}=... egaki generate "prompt"`)}`, 'Tip');
     outro('Done');
 }
-export function loginNonInteractive({ provider, key, }) {
+export async function loginNonInteractive({ provider, key, }) {
     const info = PROVIDERS[provider];
     if (!info) {
         const available = Object.keys(PROVIDERS).join(', ');
         console.error(pc.red(`Unknown provider: ${provider}. Available: ${available}`));
         process.exit(1);
     }
+    // ChatGPT uses browser OAuth — key flag is not needed
+    if (provider === 'chatgpt') {
+        const auth = await chatGptOAuthLogin();
+        saveChatGptAuth(auth);
+        console.log(pc.green('ChatGPT OAuth saved'));
+        return;
+    }
     if (!key || key.trim().length === 0) {
         console.error(pc.red('API key cannot be empty'));
         process.exit(1);
@@ -77,6 +98,25 @@ export function showLoginStatus() {
     console.log(pc.bold('Configured providers:\n'));
     for (const [key, info] of Object.entries(PROVIDERS)) {
         const status = getKeyStatus(key);
+        if (key === 'chatgpt') {
+            const auth = getChatGptAuth();
+            if (auth) {
+                const plan = extractPlanType(auth);
+                const email = auth.email ?? auth.accountId ?? 'unknown';
+                const expired = auth.expires < Date.now();
+                const expiryLabel = expired
+                    ? pc.yellow('(token expired, will auto-refresh)')
+                    : pc.dim(`(token valid)`);
+                console.log(`${pc.green('*')} ${info.label} ${pc.green('(signed in)')}`);
+                console.log(pc.dim(`  account: ${email}${plan ? `, plan: ${plan}` : ''}`));
+                console.log(`  ${expiryLabel}`);
+            }
+            else {
+                console.log(`${pc.dim('-')} ${info.label} ${pc.dim('(not signed in)')}`);
+                console.log(pc.dim(`  run: egaki login → select ChatGPT`));
+            }
+            continue;
+        }
         const icon = status.available ? pc.green('*') : pc.dim('-');
         const source = (() => {
             if (status.source === 'env') {
@@ -100,7 +140,8 @@ export function removeLogin(provider) {
         process.exit(1);
     }
     removeProviderKey(provider);
-    console.log(pc.green(`${info.label} key removed`));
+    const label = provider === 'chatgpt' ? 'ChatGPT OAuth' : info.label;
+    console.log(pc.green(`${label} key removed`));
 }
 // Read API key from stdin (for piping: echo "sk-xxx" | egaki login --provider google)
 export async function readKeyFromStdin() {

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

@@ -1 +1 @@
-{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,WAAW,CAAA;IACjB,kDAAkD;IAClD,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,WAAW,CAAA;IACjB,mCAAmC;IACnC,SAAS,EAAE,MAAM,CAAA;IACjB,oCAAoC;IACpC,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG,YAAY,CAAA;AAEnD,MAAM,MAAM,aAAa,GAAG;IAC1B,wCAAwC;IACxC,OAAO,EAAE,OAAO,CAAA;IAChB,mCAAmC;IACnC,UAAU,EAAE,OAAO,CAAA;IACnB,8BAA8B;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,mDAAmD;IACnD,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,kCAAkC;IAClC,IAAI,EAAE,OAAO,CAAA;IACb,uCAAuC;IACvC,cAAc,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,iEAAiE;IACjE,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,OAAO,GAAG,MAAM,CAAA;IAC1B,mDAAmD;IACnD,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,SAAS,CAAA;IACf,QAAQ,EAAE,aAAa,CAAA;CACxB,CAAA;AA+ED,eAAO,MAAM,OAAO,EAAE,UAAU,EAs4B/B,CAAA;AAMD,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAE5D"}
+{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,WAAW,CAAA;IACjB,kDAAkD;IAClD,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,WAAW,CAAA;IACjB,mCAAmC;IACnC,SAAS,EAAE,MAAM,CAAA;IACjB,oCAAoC;IACpC,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG,YAAY,CAAA;AAEnD,MAAM,MAAM,aAAa,GAAG;IAC1B,wCAAwC;IACxC,OAAO,EAAE,OAAO,CAAA;IAChB,mCAAmC;IACnC,UAAU,EAAE,OAAO,CAAA;IACnB,8BAA8B;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,mDAAmD;IACnD,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,kCAAkC;IAClC,IAAI,EAAE,OAAO,CAAA;IACb,uCAAuC;IACvC,cAAc,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,iEAAiE;IACjE,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,OAAO,GAAG,MAAM,CAAA;IAC1B,mDAAmD;IACnD,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,SAAS,CAAA;IACf,QAAQ,EAAE,aAAa,CAAA;CACxB,CAAA;AA+ED,eAAO,MAAM,OAAO,EAAE,UAAU,EAy6B/B,CAAA;AAMD,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAE5D"}

package/dist/model-catalog.js

@@ -437,9 +437,42 @@ export const CATALOG = [
             multipleImages: true,
         },
     },
-    // NOTE: chatgpt-image-latest exists in OpenAI's .d.ts types but it's a moving
-    // alias used by ChatGPT/Responses API, not a stable image endpoint model.
-    // Omitted until OpenAI stabilizes it as a first-class image generation target.
+    {
+        id: 'gpt-image-2',
+        name: 'GPT Image 2',
+        description: 'State-of-the-art image generation model with token-based pricing. ' +
+            'Cost varies by quality and size; $0.053 is the medium-quality 1024×1024 estimate.',
+        released: '2026-04-21',
+        ...openaiImage,
+        // Token-based pricing: $30/1M output image tokens. Medium quality 1024×1024 ≈ $0.053.
+        cost: { type: 'per-image', perImage: 0.053 },
+        features: {
+            editing: true,
+            inpainting: true,
+            aspectRatios: [],
+            sizes: ['1024x1024', '1536x1024', '1024x1536'],
+            seed: false,
+            multipleImages: true,
+        },
+    },
+    {
+        id: 'chatgpt-image-latest',
+        name: 'ChatGPT Image',
+        description: 'Rolling-latest alias that tracks the newest ChatGPT image model. Currently points ' +
+            'to gpt-image-2. Pricing may shift when the alias retargets to a newer model.',
+        released: '2026-01',
+        ...openaiImage,
+        // Matches gpt-image-2 medium quality 1024×1024 estimate.
+        cost: { type: 'per-image', perImage: 0.053 },
+        features: {
+            editing: true,
+            inpainting: true,
+            aspectRatios: [],
+            sizes: ['1024x1024', '1536x1024', '1024x1536'],
+            seed: false,
+            multipleImages: true,
+        },
+    },
     // ── Replicate ──────────────────────────────────────────────────────────
     {
         id: 'black-forest-labs/flux-1.1-pro',

package/dist/models.d.ts

@@ -9,6 +9,11 @@ export declare const DEFAULT_MODEL = "nano-banana-pro-preview";
 export declare const DEFAULT_VIDEO_MODEL = "veo-3.1-fast-generate-001";
 export declare function getModelConfig(modelId: string): AnyModelEntry;
 export declare function ensureProviderKey(providerName: string): void;
+/**
+ * ChatGPT OAuth image generation goes through the Codex backend instead of the
+ * OpenAI Image API, so OpenAI image models need the custom responses path.
+ */
+export declare function shouldUseResponsesApi(modelId: string): boolean;
 export declare function createImageModel(modelId: string): Promise<ImageModel>;
 export declare function createTextModel(modelId: string): Promise<LanguageModel>;
 export declare function createVideoModel(modelId: string): Promise<any>;

package/dist/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AAInD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAEpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAE/D,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,eAAe,CAAA;AACxD,YAAY,EAAE,UAAU,EAAE,eAAe,EAAE,CAAA;AAE3C,eAAO,MAAM,YAAY,EAA+B,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;AAC7E,eAAO,MAAM,YAAY,EAAqC,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;AAYnF,eAAO,MAAM,aAAa,4BAA4B,CAAA;AACtD,eAAO,MAAM,mBAAmB,8BAA8B,CAAA;AAE9D,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAO7D;AAuBD,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAiD5D;AAqDD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAsC3E;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,CAAC,CAqCxB;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAyCpE"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AAInD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAEpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAE/D,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,eAAe,CAAA;AACxD,YAAY,EAAE,UAAU,EAAE,eAAe,EAAE,CAAA;AAE3C,eAAO,MAAM,YAAY,EAA+B,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;AAC7E,eAAO,MAAM,YAAY,EAAqC,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;AAYnF,eAAO,MAAM,aAAa,4BAA4B,CAAA;AACtD,eAAO,MAAM,mBAAmB,8BAA8B,CAAA;AAE9D,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAO7D;AAuBD,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAiD5D;AAgDD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAI9D;AAOD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAsC3E;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,CAAC,CAqCxB;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAyCpE"}

package/dist/models.js

@@ -1,5 +1,5 @@
 import pc from 'picocolors';
-import { PROVIDERS, EGAKI_GATEWAY_URL } from './credentials.js';
+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';
 export const IMAGE_MODELS = CATALOG.map((m) => m.id);
@@ -128,6 +128,16 @@ async function createGatewayVideoModel(modelId, provider) {
     const gatewayModelId = `${provider}/${bareId}`;
     return gateway.video(gatewayModelId);
 }
+/**
+ * ChatGPT OAuth image generation goes through the Codex backend instead of the
+ * OpenAI Image API, so OpenAI image models need the custom responses path.
+ */
+export function shouldUseResponsesApi(modelId) {
+    const config = findModel(modelId);
+    if (!config)
+        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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egaki",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "type": "module",
   "main": "./dist/cli.js",
   "types": "./dist/cli.d.ts",
@@ -54,7 +54,8 @@
     "@ai-sdk/replicate": "2.0.20",
     "@clack/prompts": "^1.0.1",
     "ai": "6.0.103",
-    "goke": "^6.1.3",
+    "eventsource-parser": "^3.0.6",
+    "goke": "^6.6.1",
     "js-yaml": "^4.1.1",
     "picocolors": "^1.1.1",
     "string-dedent": "^3.0.2",