ima2-gen 1.1.21 → 1.1.23

package/bin/ima2.ts

@@ -1,430 +0,0 @@
-#!/usr/bin/env node
-import { createInterface } from "readline/promises";
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from "fs";
-import { join, dirname } from "path";
-import { fileURLToPath } from "url";
-import { spawn, execSync } from "child_process";
-import { confirmDestructiveAction } from "./lib/destructive-confirm.js";
-import { doctor } from "./commands/doctor.js";
-import { openUrl, resolveBin } from "./lib/platform.js";
-import { maybePromptGithubStar } from "./lib/star-prompt.js";
-import { ensureFreshUiDist } from "./lib/ui-build.js";
-import { detectCodexAuth } from "../lib/codexDetect.js";
-import { config as runtimeConfig } from "../config.js";
-
-import { errInfo } from "../lib/errInfo.js";
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const ROOT = join(__dirname, "..");
-// Config lives under runtimeConfig.storage.configDir (honors IMA2_CONFIG_DIR).
-// Legacy installs that stored config at <packageRoot>/.ima2/config.json will be
-// migrated on first write.
-const CONFIG_DIR = runtimeConfig.storage.configDir;
-const CONFIG_FILE = runtimeConfig.storage.configFile;
-const LEGACY_CONFIG_FILE = join(ROOT, ".ima2", "config.json");
-
-// Load package.json for version
-let pkg = { version: "?", name: "ima2-gen" };
-try {
-  pkg = JSON.parse(readFileSync(join(ROOT, "package.json"), "utf-8"));
-} catch {}
-
-function loadConfig() {
-  if (existsSync(CONFIG_FILE)) {
-    return JSON.parse(readFileSync(CONFIG_FILE, "utf-8"));
-  }
-  // One-time read from legacy location so users who set up on <1.0.4 don't lose auth.
-  if (existsSync(LEGACY_CONFIG_FILE)) {
-    try { return JSON.parse(readFileSync(LEGACY_CONFIG_FILE, "utf-8")); } catch {}
-  }
-  return {};
-}
-
-function saveConfig(config: Record<string, unknown>) {
-  mkdirSync(CONFIG_DIR, { recursive: true });
-  writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
-}
-
-function loadAdvertisement() {
-  const p = runtimeConfig.storage.advertiseFile;
-  if (!existsSync(p)) return null;
-  try {
-    return JSON.parse(readFileSync(p, "utf-8"));
-  } catch {
-    return null;
-  }
-}
-
-function advertisedServerUrl() {
-  const adv = loadAdvertisement();
-  return adv?.backend?.url || adv?.url || (adv?.port ? `http://localhost:${adv.port}` : null);
-}
-
-async function setup() {
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-
-  console.log("\n  ima2-gen — GPT Image 2 Generator\n");
-  console.log("  Choose authentication method:\n");
-  console.log("    1) GPT OAuth   — login with ChatGPT account (free, images only)");
-  console.log("    2) Grok OAuth  — login with xAI/Grok account (images + video)");
-  console.log("    3) Both        — GPT OAuth + Grok OAuth");
-  console.log("    4) API Key     — paste your OpenAI API key (paid)\n");
-
-  const choice = await rl.question("  Enter 1-4: ");
-  const config = loadConfig();
-
-  if (choice.trim() === "4") {
-    const key = await rl.question("  OpenAI API Key: ");
-    if (!key.startsWith("sk-")) {
-      console.log("  Invalid API key format. Expected sk-...");
-      rl.close();
-      process.exit(1);
-    }
-    config.provider = "api";
-    config.apiKey = key.trim();
-    saveConfig(config);
-    console.log("\n  API key saved. Starting server...\n");
-  } else if (choice.trim() === "2") {
-    config.provider = "grok";
-    config.oauth = config.oauth || {};
-    config.oauth.disableAutoStart = true;
-    delete config.apiKey;
-    saveConfig(config);
-    console.log("\n  Starting Grok OAuth login...\n");
-    try {
-      execSync(`node ${JSON.stringify(join(ROOT, "bin", "ima2.js"))} grok login --manual-paste`, { stdio: "inherit" });
-    } catch {
-      console.log("\n  Grok login failed or cancelled. You can retry with 'ima2 grok login'.\n");
-      rl.close();
-      process.exit(1);
-    }
-    console.log("  Grok configured. Run 'ima2 serve' to start.\n");
-  } else if (choice.trim() === "3") {
-    config.provider = "oauth";
-    delete config.apiKey;
-    if (config.oauth) delete config.oauth.disableAutoStart;
-    saveConfig(config);
-    console.log("\n  Setting up both GPT OAuth + Grok OAuth...\n");
-    // GPT OAuth
-    const auth = detectCodexAuth();
-    if (!auth.authed) {
-      console.log("  Running GPT OAuth login...\n");
-      try {
-        execSync(`${resolveBin("npx")} @openai/codex login`, { stdio: "inherit" });
-      } catch {
-        console.log("\n  GPT login failed. Continuing with Grok...\n");
-      }
-    } else {
-      console.log(`  GPT OAuth session found.\n`);
-    }
-    // Grok OAuth
-    console.log("  Running Grok OAuth login...\n");
-    try {
-      execSync(`node ${JSON.stringify(join(ROOT, "bin", "ima2.js"))} grok login --manual-paste`, { stdio: "inherit" });
-    } catch {
-      console.log("\n  Grok login failed. You can retry with 'ima2 grok login'.\n");
-    }
-    console.log("  Both providers configured.\n");
-  } else {
-    // Default: GPT OAuth (choice 1 or anything else)
-    config.provider = "oauth";
-    config.oauth = config.oauth || {};
-    config.oauth.disableAutoStart = false;
-    delete config.apiKey;
-    saveConfig(config);
-    console.log("\n  Starting GPT OAuth login...\n");
-
-    const auth = detectCodexAuth();
-    const hasAuth = auth.authed;
-
-    if (!hasAuth) {
-      if (auth.platform === "win32") {
-        console.log(
-          "  Windows note: OpenAI Codex has no documented native installer. Use WSL2 for best results.\n",
-        );
-      }
-      console.log("  Running 'codex login' — follow the browser prompt.\n");
-      try {
-        execSync(`${resolveBin("npx")} @openai/codex login`, { stdio: "inherit" });
-      } catch {
-        console.log("\n  Login failed or cancelled. You can retry with 'ima2 serve'.\n");
-        rl.close();
-        process.exit(1);
-      }
-    } else {
-      const how = auth.probe === "authed" ? "codex CLI" : "auth file";
-      console.log(`  Existing GPT OAuth session found (${how}).\n`);
-    }
-
-    saveConfig(config);
-    console.log("  GPT OAuth configured. Starting server...\n");
-  }
-
-  rl.close();
-  return config;
-}
-
-async function serve(serveArgs: string[] = []) {
-  try {
-    await maybePromptGithubStar();
-  } catch (e) {
-    const err = errInfo(e);
-    console.error(`[ima2] Star prompt skipped: ${err.message || err.raw}`);
-  }
-
-  let config = loadConfig();
-
-  if (!config.provider) {
-    config = await setup();
-  }
-
-  const uiDist = ensureFreshUiDist(ROOT);
-  if (!uiDist.ok) {
-    console.log(`\n  ${uiDist.error}`);
-    console.log(
-      uiDist.reason === "missing-source-and-dist"
-        ? "  This installation appears broken. Reinstall: npm i -g ima2-gen\n"
-        : "",
-    );
-    process.exit(1);
-  }
-
-  const env = { ...process.env };
-  const serveDev = serveArgs.includes("--dev");
-  if (serveDev) {
-    env.IMA2_DEV = "1";
-    env.IMA2_LOG_LEVEL = env.IMA2_LOG_LEVEL || "debug";
-  }
-
-  if (config.provider === "api" && config.apiKey) {
-    env.OPENAI_API_KEY = config.apiKey;
-  }
-
-  const serverPath = join(ROOT, "server.js");
-  const child = spawn("node", [serverPath], {
-    stdio: "inherit",
-    env,
-    cwd: ROOT,
-  });
-
-  child.on("exit", (code) => process.exit(code));
-
-  process.on("SIGINT", () => child.kill("SIGINT"));
-  process.on("SIGTERM", () => child.kill("SIGTERM"));
-}
-
-async function showStatus() {
-  const config = loadConfig();
-  console.log(`\n  ${pkg.name} v${pkg.version}\n`);
-  console.log(`  Config file: ${CONFIG_FILE}`);
-  console.log(`  Exists: ${existsSync(CONFIG_FILE) ? "yes" : "no"}\n`);
-  console.log(`  Generated dir: ${runtimeConfig.storage.generatedDir}`);
-  console.log(`  Advertised server: ${advertisedServerUrl() || "none"}\n`);
-
-  if (config.provider) {
-    console.log(`  Provider: ${config.provider}`);
-    if (config.provider === "api") {
-      const key = config.apiKey || "";
-      console.log(`  API Key: ${key ? key.slice(0, 8) + "..." + key.slice(-4) : "not set"}`);
-    }
-    console.log("");
-  } else {
-    console.log("  Status: not configured");
-    console.log("  Run 'ima2 setup' to configure.\n");
-  }
-
-  // Check OAuth auth files + codex CLI probe
-  const auth = detectCodexAuth();
-  console.log(`  GPT OAuth sessions:`);
-  console.log(`    ${auth.files.codex}          ${auth.fileHits.codex ? "✓" : "✗"}`);
-  console.log(`    ${auth.files.chatgpt}  ${auth.fileHits.chatgpt ? "✓" : "✗"}`);
-  if (auth.fileHits.xdgCodex) {
-    console.log(`    ${auth.files.xdgCodex}  ✓`);
-  }
-  const probeLabel =
-    auth.probe === "authed" ? "✓ authed"
-    : auth.probe === "unauthed" ? "✗ not logged in"
-    : "– codex CLI not found";
-  console.log(`    codex login status           ${probeLabel}`);
-  if (auth.platform === "win32") {
-    console.log("    (Windows: no native codex installer — use WSL2)");
-  }
-  console.log("");
-}
-
-function openBrowser() {
-  const url = advertisedServerUrl() || `http://localhost:${runtimeConfig.server.port}`;
-  const res = openUrl(url);
-  if (res.ok) {
-    console.log(`\n  Opening ${url} ...\n`);
-  } else {
-    console.log(`\n  Could not open browser. Visit: ${url}\n`);
-  }
-}
-
-function showHelp() {
-  console.log(`
-  ${pkg.name} v${pkg.version} — GPT Image 2 Generator
-
-  Usage: ima2 <command> [options]
-
-  Server commands:
-    serve [--dev]  Start the image generation server
-    setup, login   Configure API key or GPT OAuth (interactive)
-    status         Show current configuration status
-    doctor         Diagnose environment and setup
-    open           Open web UI in browser
-    reset          Reset configuration
-
-  Client commands (require a running 'ima2 serve'):
-    gen <prompt>   Generate image(s) from prompt  (ima2 gen --help)
-    video <prompt> Generate video via Grok        (ima2 video --help)
-    edit <file>    Edit an existing image         (ima2 edit --help)
-    ls             List recent history            (ima2 ls --help)
-    show <name>    Show one history item          (ima2 show --help)
-    session <sub>  Session/graph CRUD             (ima2 session --help)
-    history <sub>  History write-ops              (ima2 history --help)
-    prompt <sub>   Prompt library + folders + import (ima2 prompt --help)
-    multimode <prompt>   Multi-image SSE generation (ima2 multimode --help)
-    node <sub>     Node-mode generate/show          (ima2 node --help)
-    annotate <sub> Image annotations CRUD           (ima2 annotate --help)
-    canvas-versions <sub>  Canvas version save/update (ima2 canvas-versions --help)
-    metadata <file>  Read embedded metadata
-    comfy <sub>    ComfyUI workflow export          (ima2 comfy --help)
-    cardnews <sub> Card News templates/jobs/export  (ima2 cardnews --help)
-    ps             List active jobs               (ima2 ps --help)
-    cancel <id>    Mark an in-flight job canceled (ima2 cancel --help)
-    inflight <sub> Inflight jobs (ls / rm)         (ima2 inflight --help)
-    storage <sub>  Storage status / open-dir       (ima2 storage --help)
-    billing        API usage / quota
-    providers      Configured providers
-    oauth <sub>    GPT OAuth proxy status              (ima2 oauth --help)
-    grok <sub>     Bundled Grok auth/status         (ima2 grok --help)
-    config <sub>   Config get/set/ls/path/rm       (ima2 config --help)
-    defaults <sub> Inspect/change model defaults   (ima2 defaults --help)
-    capabilities   Agent capability metadata       (ima2 capabilities --help)
-    skill          Print packaged agent skill      (ima2 skill --help)
-    ping           Ping running server / check health
-
-  Options:
-    -v, --version  Show version
-    -h, --help     Show help
-
-  Server-aware subcommands accept:
-    --server <url>       Override discovered server URL
-    IMA2_SERVER          Same as --server for client commands
-    ~/.ima2/server.json  Auto-discovery file written by 'ima2 serve'
-    IMA2_CONFIG_DIR      Override config directory
-    IMA2_GENERATED_DIR   Override generated images directory
-    IMA2_CARD_NEWS=1     Enable Card News routes
-    IMA2_LOG_LEVEL       debug|info|warn|error
-
-  Examples:
-    ima2 serve                       Start server
-    ima2 serve --dev                 Start with verbose server diagnostics
-    ima2 gen "a shiba in space"      Generate from CLI
-    ima2 gen "merge" --ref a.png --ref b.png -q high -o out.png
-    ima2 video "a cat playing piano" --duration 10
-    ima2 ls -n 10                    Last 10 generations
-    ima2 skill                       Print agent usage skill
-    ima2 capabilities --json         Inspect supported models/options
-    ima2 defaults --json             Inspect running server defaults
-    ima2 ping                        Health check
-`);
-}
-
-// ── CLI ──
-const args = process.argv.slice(2);
-const command = args[0];
-
-if (args.includes("-v") || args.includes("--version")) {
-  console.log(pkg.version);
-  process.exit(0);
-}
-
-if ((!command || args.includes("-h") || args.includes("--help"))
-    && !["doctor", "gen", "video", "edit", "ls", "show", "ps", "cancel", "session", "history", "prompt", "multimode", "node", "annotate", "canvas-versions", "metadata", "comfy", "cardnews", "inflight", "storage", "billing", "providers", "oauth", "grok", "config", "defaults", "capabilities", "skill", "ping"].includes(command)) {
-  showHelp();
-  process.exit(command ? 0 : 1);
-}
-
-switch (command) {
-  case "serve":
-    serve(args.slice(1));
-    break;
-  case "setup":
-  case "login":
-    setup().then(() => console.log("  Done. Run 'ima2 serve' to start."));
-    break;
-  case "status":
-    showStatus();
-    break;
-  case "doctor":
-    await doctor(args.slice(1));
-    break;
-  case "open":
-    openBrowser();
-    break;
-  case "reset":
-    if (existsSync(CONFIG_FILE)) {
-      try {
-        const yes = args.includes("--yes") || args.includes("-y");
-        const confirmed = await confirmDestructiveAction("Reset all ima2 config?", yes);
-        if (!confirmed) {
-          console.log("  Aborted.");
-          break;
-        }
-      } catch (err) {
-        console.error(`  ${err instanceof Error ? err.message : String(err)}`);
-        process.exit(2);
-      }
-      writeFileSync(CONFIG_FILE, "{}");
-      console.log("  Config reset. Run 'ima2 serve' to reconfigure.");
-    } else {
-      console.log("  No config to reset.");
-    }
-    break;
-  case "gen":
-  case "video":
-  case "edit":
-  case "ls":
-  case "show":
-  case "ps":
-  case "cancel":
-  case "session":
-  case "history":
-  case "prompt":
-  case "multimode":
-  case "node":
-  case "annotate":
-  case "canvas-versions":
-  case "metadata":
-  case "comfy":
-  case "cardnews":
-  case "config":
-  case "defaults":
-  case "capabilities":
-  case "skill":
-  case "grok":
-  case "ping": {
-    const { setCliVersion } = await import("./lib/client.js");
-    setCliVersion(pkg.version);
-    const mod = await import(`./commands/${command}.js`);
-    await mod.default(args.slice(1));
-    break;
-  }
-  case "storage":
-  case "billing":
-  case "providers":
-  case "oauth":
-  case "inflight": {
-    const { setCliVersion } = await import("./lib/client.js");
-    setCliVersion(pkg.version);
-    const mod = await import("./commands/observability.js");
-    await mod.default([command, ...args.slice(1)]);
-    break;
-  }
-  default:
-    console.log(`  Unknown command: "${command}"`);
-    console.log("  Run 'ima2 --help' for usage.\n");
-    process.exit(1);
-}

package/bin/lib/args.ts

@@ -1,92 +0,0 @@
-// Tiny argv parser — no dependencies.
-// Supports: --long, --long=val, --long val, -s, -s val, repeatable flags, positional, --.
-
-export type FlagValue = string | string[] | boolean | undefined;
-
-export interface FlagDef {
-  type?: "string" | "boolean";
-  short?: string;
-  default?: string | boolean;
-  repeatable?: boolean;
-}
-
-export interface ParseSpec {
-  flags?: Record<string, FlagDef>;
-}
-
-export interface ParsedArgs {
-  positional: string[];
-  _unknown: string[];
-  [key: string]: FlagValue;
-}
-
-export function parseArgs(argv: string[], spec: any = {}): ParsedArgs {
-  const shortMap: any = {};
-  for (const [name, def] of Object.entries<any>(spec.flags || {})) {
-    if (def.short) shortMap[def.short] = name;
-  }
-
-  const out: any = { positional: [], _unknown: [] };
-  for (const [name, def] of Object.entries<any>(spec.flags || {})) {
-    if (def.repeatable) out[name] = [];
-    else if ("default" in def) out[name] = def.default;
-  }
-
-  let i = 0;
-  let doubleDashSeen = false;
-  while (i < argv.length) {
-    const a = argv[i];
-    if (doubleDashSeen) {
-      out.positional.push(a);
-      i++;
-      continue;
-    }
-    if (a === "--") {
-      doubleDashSeen = true;
-      i++;
-      continue;
-    }
-    if (a.startsWith("--")) {
-      const eq = a.indexOf("=");
-      const name = eq > -1 ? a.slice(2, eq) : a.slice(2);
-      const def = (spec.flags || {})[name];
-      if (!def) {
-        out._unknown.push(a);
-        i++;
-        continue;
-      }
-      if (def.type === "boolean") {
-        out[name] = true;
-        i++;
-      } else {
-        const val = eq > -1 ? a.slice(eq + 1) : argv[i + 1];
-        if (eq === -1) i++;
-        if (def.repeatable) out[name].push(val);
-        else out[name] = val;
-        i++;
-      }
-    } else if (a.startsWith("-") && a.length > 1 && !/^-\d/.test(a)) {
-      const short = a.slice(1);
-      const name = shortMap[short];
-      if (!name) {
-        out._unknown.push(a);
-        i++;
-        continue;
-      }
-      const def = spec.flags[name];
-      if (def.type === "boolean") {
-        out[name] = true;
-        i++;
-      } else {
-        const val = argv[i + 1];
-        if (def.repeatable) out[name].push(val);
-        else out[name] = val;
-        i += 2;
-      }
-    } else {
-      out.positional.push(a);
-      i++;
-    }
-  }
-  return out;
-}

package/bin/lib/browser-id.ts

@@ -1,16 +0,0 @@
-import { createHash } from "crypto";
-import { config } from "../../config.js";
-
-let cached: string | null = null;
-
-/**
- * Stable per-machine browser-id for CLI flows that share storage with the UI
- * but do not have a real browser. Derived from the config dir so two CLIs on
- * the same install share favorites/annotations, but different installs (e.g.
- * different IMA2_CONFIG_DIR) stay isolated.
- */
-export function getCliBrowserId(): string {
-  if (cached) return cached;
-  cached = "cli-" + createHash("sha1").update(config.storage.configDir).digest("hex").slice(0, 16);
-  return cached;
-}

package/bin/lib/client.ts

@@ -1,122 +0,0 @@
-import { readFileSync, existsSync } from "node:fs";
-import { join } from "node:path";
-import { homedir } from "node:os";
-
-export const DEFAULT_PORT = 3333;
-
-function readAdvertise() {
-  const p = process.env.IMA2_ADVERTISE_FILE ||
-    join(process.env.IMA2_CONFIG_DIR || join(homedir(), ".ima2"), "server.json");
-  if (!existsSync(p)) return null;
-  try {
-    return JSON.parse(readFileSync(p, "utf-8"));
-  } catch {
-    return null;
-  }
-}
-
-async function probe(base: string, timeoutMs = 600) {
-  try {
-    const r = await fetch(`${base}/api/health`, { signal: AbortSignal.timeout(timeoutMs) });
-    if (!r.ok) return null;
-    return await r.json();
-  } catch {
-    return null;
-  }
-}
-
-export async function resolveServer({ serverFlag }: any = {}) {
-  if (serverFlag) {
-    const base = serverFlag.replace(/\/$/, "");
-    const health = await probe(base);
-    if (health) return { base, health };
-    const err: any = new Error(`server unreachable at ${base}`);
-    err.code = "SERVER_UNREACHABLE";
-    throw err;
-  }
-  const candidates: string[] = [];
-  if (process.env.IMA2_SERVER) candidates.push(process.env.IMA2_SERVER.replace(/\/$/, ""));
-  const adv = readAdvertise();
-  if (adv?.backend?.url) candidates.push(String(adv.backend.url).replace(/\/$/, ""));
-  if (adv?.url) candidates.push(String(adv.url).replace(/\/$/, ""));
-  if (adv?.port) candidates.push(`http://localhost:${adv.port}`);
-  candidates.push(`http://localhost:${DEFAULT_PORT}`);
-
-  const seen = new Set<string>();
-  const uniq = candidates.filter((c) => !seen.has(c) && seen.add(c));
-
-  for (const base of uniq) {
-    const health = await probe(base);
-    if (health) return { base, health };
-  }
-  const err: any = new Error("server unreachable — is 'ima2 serve' running?");
-  err.code = "SERVER_UNREACHABLE";
-  throw err;
-}
-
-export async function request(base: string, path: string, {
-  method = "GET",
-  body,
-  headers: extraHeaders,
-  raw = false,
-  timeoutMs = 180_000,
-}: any = {}) {
-  const baseHeaders: Record<string, string> = raw
-    ? { "X-ima2-client": `cli/${CLI_VERSION}` }
-    : { "Content-Type": "application/json", "X-ima2-client": `cli/${CLI_VERSION}` };
-  const finalHeaders = { ...baseHeaders, ...(extraHeaders || {}) };
-  const res = await fetch(base + path, {
-    method,
-    headers: finalHeaders,
-    body: body === undefined ? undefined
-        : raw ? body
-        : JSON.stringify(body),
-    signal: AbortSignal.timeout(timeoutMs),
-  });
-  const text = await res.text();
-  let json: any = null;
-  try { json = JSON.parse(text); } catch {}
-  if (!res.ok) {
-    const err: any = new Error(json?.error?.message || json?.error || `HTTP ${res.status}`);
-    err.status = res.status;
-    err.code = json?.error?.code || json?.code || null;
-    err.body = json || text;
-    throw err;
-  }
-  return json;
-}
-
-interface RawImageItem {
-  image?: string;
-  filename?: string | null;
-}
-interface RawGenerateResponse {
-  image?: string;
-  images?: RawImageItem[];
-  filename?: string | null;
-  elapsed?: number | string | null;
-  requestId?: string | null;
-  [key: string]: unknown;
-}
-
-export function normalizeGenerate(resp: RawGenerateResponse | null | undefined) {
-  if (!resp) return { images: [], elapsed: null, requestId: null };
-  if (Array.isArray(resp.images)) {
-    return {
-      images: resp.images.map((it: RawImageItem) => ({ image: it.image, filename: it.filename })),
-      elapsed: resp.elapsed ?? null,
-      requestId: resp.requestId ?? null,
-    };
-  }
-  if (resp.image) {
-    return {
-      images: [{ image: resp.image, filename: resp.filename || null }],
-      elapsed: resp.elapsed ?? null,
-      requestId: resp.requestId ?? null,
-    };
-  }
-  return { images: [], elapsed: resp.elapsed ?? null, requestId: resp.requestId ?? null };
-}
-
-export let CLI_VERSION = "dev";
-export function setCliVersion(v: string) { CLI_VERSION = v; }