ima2-gen 1.1.8 → 1.1.9

package/bin/ima2.js

@@ -5,13 +5,12 @@ import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import { createRequire } from "module";
 import { spawn, execSync } from "child_process";
-import { networkInterfaces, homedir } from "os";
+import { homedir } from "os";
 import { openUrl, resolveBin } from "./lib/platform.js";
 import { maybePromptGithubStar } from "./lib/star-prompt.js";
 import { buildStorageDoctorLines } from "./lib/storage-doctor.js";
 import { detectCodexAuth } from "../lib/codexDetect.js";
 import { config as runtimeConfig } from "../config.js";
-
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const ROOT = join(__dirname, "..");
 const HOME = homedir();
@@ -22,295 +21,275 @@ const requireFromRoot = createRequire(join(ROOT, "package.json"));
 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 {}
-
+    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 {};
+    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) {
-  mkdirSync(CONFIG_DIR, { recursive: true });
-  writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
+    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;
-  }
+    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);
+    const adv = loadAdvertisement();
+    return adv?.backend?.url || adv?.url || (adv?.port ? `http://localhost:${adv.port}` : null);
 }
-
 function missingRuntimeDeps() {
-  const deps = ["express", "better-sqlite3", "openai", "openai-oauth"];
-  return deps.filter((dep) => {
-    try {
-      requireFromRoot.resolve(dep);
-      return false;
-    } catch {
-      return true;
-    }
-  });
+    const deps = ["express", "better-sqlite3", "openai", "openai-oauth"];
+    return deps.filter((dep) => {
+        try {
+            requireFromRoot.resolve(dep);
+            return false;
+        }
+        catch {
+            return true;
+        }
+    });
 }
-
 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) API Key  — paste your OpenAI API key (paid)");
-  console.log("    2) OAuth    — login with ChatGPT account (free)\n");
-
-  const choice = await rl.question("  Enter 1 or 2: ");
-  const config = loadConfig();
-
-  if (choice.trim() === "1") {
-    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);
+    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) API Key  — paste your OpenAI API key (paid)");
+    console.log("    2) OAuth    — login with ChatGPT account (free)\n");
+    const choice = await rl.question("  Enter 1 or 2: ");
+    const config = loadConfig();
+    if (choice.trim() === "1") {
+        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");
     }
-    config.provider = "api";
-    config.apiKey = key.trim();
-    saveConfig(config);
-    console.log("\n  API key saved. Starting server...\n");
-  } else {
-    config.provider = "oauth";
-    delete config.apiKey;
-    saveConfig(config);
-    console.log("\n  Starting OAuth login...\n");
-
-    // Check if codex auth exists (file OR keyring via `codex login status`)
-    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 OAuth session found (${how}).\n`);
+    else {
+        config.provider = "oauth";
+        delete config.apiKey;
+        saveConfig(config);
+        console.log("\n  Starting OAuth login...\n");
+        // Check if codex auth exists (file OR keyring via `codex login status`)
+        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 OAuth session found (${how}).\n`);
+        }
+        saveConfig(config);
+        console.log("  OAuth configured. Starting server...\n");
     }
-
-    saveConfig(config);
-    console.log("  OAuth configured. Starting server...\n");
-  }
-
-  rl.close();
-  return config;
+    rl.close();
+    return config;
 }
-
 async function serve(serveArgs = []) {
-  try {
-    await maybePromptGithubStar();
-  } catch (err) {
-    console.error(`[ima2] Star prompt skipped: ${err?.message || err}`);
-  }
-
-  let config = loadConfig();
-
-  if (!config.provider) {
-    config = await setup();
-  }
-
-  // Ensure ui/dist exists — if missing, auto-build (dev) or error (installed pkg)
-  const distIndex = join(ROOT, "ui", "dist", "index.html");
-  if (!existsSync(distIndex)) {
-    const hasUiSrc = existsSync(join(ROOT, "ui", "package.json"));
-    if (hasUiSrc) {
-      console.log("\n  ui/dist missing — running 'npm run build' first...\n");
-      try {
-        execSync(`${resolveBin("npm")} run build`, { stdio: "inherit", cwd: ROOT });
-      } catch {
-        console.log("\n  Build failed. Try: cd ui && npm install && npm run build\n");
-        process.exit(1);
-      }
-    } else {
-      console.log("\n  ui/dist not found and ui/ source is missing.");
-      console.log("  This installation appears broken. Reinstall: npm i -g ima2-gen\n");
-      process.exit(1);
+    try {
+        await maybePromptGithubStar();
     }
-  }
-
-  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"));
+    catch (err) {
+        console.error(`[ima2] Star prompt skipped: ${err?.message || err}`);
+    }
+    let config = loadConfig();
+    if (!config.provider) {
+        config = await setup();
+    }
+    // Ensure ui/dist exists — if missing, auto-build (dev) or error (installed pkg)
+    const distIndex = join(ROOT, "ui", "dist", "index.html");
+    if (!existsSync(distIndex)) {
+        const hasUiSrc = existsSync(join(ROOT, "ui", "package.json"));
+        if (hasUiSrc) {
+            console.log("\n  ui/dist missing — running 'npm run build' first...\n");
+            try {
+                execSync(`${resolveBin("npm")} run build`, { stdio: "inherit", cwd: ROOT });
+            }
+            catch {
+                console.log("\n  Build failed. Try: cd ui && npm install && npm run build\n");
+                process.exit(1);
+            }
+        }
+        else {
+            console.log("\n  ui/dist not found and ui/ source is missing.");
+            console.log("  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`);
-
-  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"}`);
+    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`);
+    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(`  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("");
-  } 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(`  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("");
 }
-
 async function doctor() {
-  console.log(`\n  ${pkg.name} v${pkg.version} — Doctor\n`);
-
-  let ok = 0;
-  let fail = 0;
-
-  // Node version
-  const nodeVersion = process.version;
-  const nodeMajor = parseInt(nodeVersion.slice(1).split(".")[0]);
-  if (nodeMajor >= 20) {
-    console.log(`  ✓ Node.js ${nodeVersion} (>= 20)`);
-    ok++;
-  } else {
-    console.log(`  ✗ Node.js ${nodeVersion} (requires >= 20)`);
-    fail++;
-  }
-
-  // package.json exists
-  if (existsSync(join(ROOT, "package.json"))) {
-    console.log("  ✓ package.json found");
-    ok++;
-  } else {
-    console.log("  ✗ package.json missing");
-    fail++;
-  }
-
-  // Runtime dependencies may be hoisted by npm, pnpm, or Yarn. Resolve the
-  // packages instead of requiring a package-local node_modules folder.
-  const missingDeps = missingRuntimeDeps();
-  if (missingDeps.length === 0) {
-    console.log("  ✓ runtime dependencies resolvable");
-    ok++;
-  } else {
-    console.log(`  ✗ missing runtime dependencies: ${missingDeps.join(", ")}`);
-    fail++;
-  }
-
-  // .env
-  if (existsSync(join(ROOT, ".env"))) {
-    console.log("  ✓ .env file exists");
-    ok++;
-  } else {
-    console.log("  ⚠ .env file not found (optional — copy from .env.example)");
-  }
-
-  // Config
-  const config = loadConfig();
-  if (config.provider) {
-    console.log(`  ✓ Configured: ${config.provider}`);
-    ok++;
-  } else {
-    console.log("  ⚠ Not configured — run 'ima2 setup'");
-  }
-
-  // Port availability (simple check)
-  const adv = loadAdvertisement();
-  console.log(`  ℹ Preferred backend port: ${runtimeConfig.server.port}`);
-  if (adv?.backend || adv?.port) {
-    console.log(`  ℹ Backend actual URL: ${adv?.backend?.url || adv?.url || `http://localhost:${adv.port}`}`);
-    if (adv?.oauth) {
-      console.log(`  ℹ OAuth actual URL: ${adv.oauth.url} (${adv.oauth.status || "unknown"})`);
+    console.log(`\n  ${pkg.name} v${pkg.version} — Doctor\n`);
+    let ok = 0;
+    let fail = 0;
+    // Node version
+    const nodeVersion = process.version;
+    const nodeMajor = parseInt(nodeVersion.slice(1).split(".")[0]);
+    if (nodeMajor >= 20) {
+        console.log(`  ✓ Node.js ${nodeVersion} (>= 20)`);
+        ok++;
     }
-  }
-
-  const storageLines = await buildStorageDoctorLines({
-    rootDir: ROOT,
-    config: runtimeConfig,
-  });
-  console.log("");
-  for (const line of storageLines) console.log(line);
-
-  console.log(`\n  ${ok} passed, ${fail} failed\n`);
-  process.exit(fail > 0 ? 1 : 0);
+    else {
+        console.log(`  ✗ Node.js ${nodeVersion} (requires >= 20)`);
+        fail++;
+    }
+    // package.json exists
+    if (existsSync(join(ROOT, "package.json"))) {
+        console.log("  ✓ package.json found");
+        ok++;
+    }
+    else {
+        console.log("  ✗ package.json missing");
+        fail++;
+    }
+    // Runtime dependencies may be hoisted by npm, pnpm, or Yarn. Resolve the
+    // packages instead of requiring a package-local node_modules folder.
+    const missingDeps = missingRuntimeDeps();
+    if (missingDeps.length === 0) {
+        console.log("  ✓ runtime dependencies resolvable");
+        ok++;
+    }
+    else {
+        console.log(`  ✗ missing runtime dependencies: ${missingDeps.join(", ")}`);
+        fail++;
+    }
+    // .env
+    if (existsSync(join(ROOT, ".env"))) {
+        console.log("  ✓ .env file exists");
+        ok++;
+    }
+    else {
+        console.log("  ⚠ .env file not found (optional — copy from .env.example)");
+    }
+    // Config
+    const config = loadConfig();
+    if (config.provider) {
+        console.log(`  ✓ Configured: ${config.provider}`);
+        ok++;
+    }
+    else {
+        console.log("  ⚠ Not configured — run 'ima2 setup'");
+    }
+    // Port availability (simple check)
+    const adv = loadAdvertisement();
+    console.log(`  ℹ Preferred backend port: ${runtimeConfig.server.port}`);
+    if (adv?.backend || adv?.port) {
+        console.log(`  ℹ Backend actual URL: ${adv?.backend?.url || adv?.url || `http://localhost:${adv.port}`}`);
+        if (adv?.oauth) {
+            console.log(`  ℹ OAuth actual URL: ${adv.oauth.url} (${adv.oauth.status || "unknown"})`);
+        }
+    }
+    const storageLines = await buildStorageDoctorLines({
+        rootDir: ROOT,
+        config: runtimeConfig,
+    });
+    console.log("");
+    for (const line of storageLines)
+        console.log(line);
+    console.log(`\n  ${ok} passed, ${fail} failed\n`);
+    process.exit(fail > 0 ? 1 : 0);
 }
-
 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`);
-  }
+    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(`
+    console.log(`
   ${pkg.name} v${pkg.version} — GPT Image 2 Generator
 
   Usage: ima2 <command> [options]
@@ -328,8 +307,24 @@ function showHelp() {
     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>    OAuth proxy status              (ima2 oauth --help)
+    config <sub>   Config get/set/ls/path/rm       (ima2 config --help)
     ping           Ping running server / check health
 
   Options:
@@ -345,62 +340,81 @@ function showHelp() {
     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);
+    console.log(pkg.version);
+    process.exit(0);
 }
-
 if ((!command || args.includes("-h") || args.includes("--help"))
-    && !["gen", "edit", "ls", "show", "ps", "cancel", "ping"].includes(command)) {
-  showHelp();
-  process.exit(command ? 0 : 1);
+    && !["gen", "edit", "ls", "show", "ps", "cancel", "session", "history", "prompt", "multimode", "node", "annotate", "canvas-versions", "metadata", "comfy", "cardnews", "inflight", "storage", "billing", "providers", "oauth", "config", "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();
-    break;
-  case "open":
-    openBrowser();
-    break;
-  case "reset":
-    if (existsSync(CONFIG_FILE)) {
-      writeFileSync(CONFIG_FILE, "{}");
-      console.log("  Config reset. Run 'ima2 serve' to reconfigure.");
-    } else {
-      console.log("  No config to reset.");
+    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();
+        break;
+    case "open":
+        openBrowser();
+        break;
+    case "reset":
+        if (existsSync(CONFIG_FILE)) {
+            writeFileSync(CONFIG_FILE, "{}");
+            console.log("  Config reset. Run 'ima2 serve' to reconfigure.");
+        }
+        else {
+            console.log("  No config to reset.");
+        }
+        break;
+    case "gen":
+    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 "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;
     }
-    break;
-  case "gen":
-  case "edit":
-  case "ls":
-  case "show":
-  case "ps":
-  case "cancel":
-  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;
-  }
-  default:
-    console.log(`  Unknown command: "${command}"`);
-    console.log("  Run 'ima2 --help' for usage.\n");
-    process.exit(1);
+    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);
 }