ima2-gen 1.1.7 → 1.1.9

package/bin/lib/browser-id.ts

@@ -0,0 +1,16 @@
+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.js

@@ -1,100 +1,108 @@
 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;
-  }
+    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, 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;
-  }
+    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 } = {}) {
-  if (serverFlag) {
-    const base = serverFlag.replace(/\/$/, "");
-    const health = await probe(base);
-    if (health) return { base, health };
-    const err = new Error(`server unreachable at ${base}`);
+    if (serverFlag) {
+        const base = serverFlag.replace(/\/$/, "");
+        const health = await probe(base);
+        if (health)
+            return { base, health };
+        const err = new Error(`server unreachable at ${base}`);
+        err.code = "SERVER_UNREACHABLE";
+        throw err;
+    }
+    const candidates = [];
+    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();
+    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 = new Error("server unreachable — is 'ima2 serve' running?");
     err.code = "SERVER_UNREACHABLE";
     throw err;
-  }
-  const candidates = [];
-  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();
-  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 = new Error("server unreachable — is 'ima2 serve' running?");
-  err.code = "SERVER_UNREACHABLE";
-  throw err;
 }
-
-export async function request(base, path, { method = "GET", body, timeoutMs = 180_000 } = {}) {
-  const res = await fetch(base + path, {
-    method,
-    headers: {
-      "Content-Type": "application/json",
-      "X-ima2-client": `cli/${CLI_VERSION}`,
-    },
-    body: body !== undefined ? JSON.stringify(body) : undefined,
-    signal: AbortSignal.timeout(timeoutMs),
-  });
-  const text = await res.text();
-  let json = null;
-  try { json = JSON.parse(text); } catch {}
-  if (!res.ok) {
-    const err = new Error(json?.error || `HTTP ${res.status}`);
-    err.status = res.status;
-    err.code = json?.code || null;
-    err.body = json || text;
-    throw err;
-  }
-  return json;
+export async function request(base, path, { method = "GET", body, headers: extraHeaders, raw = false, timeoutMs = 180_000, } = {}) {
+    const baseHeaders = 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 = null;
+    try {
+        json = JSON.parse(text);
+    }
+    catch { }
+    if (!res.ok) {
+        const err = 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;
 }
-
 export function normalizeGenerate(resp) {
-  if (!resp) return { images: [], elapsed: null, requestId: null };
-  if (Array.isArray(resp.images)) {
-    return {
-      images: resp.images.map((it) => ({ 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 };
+    if (!resp)
+        return { images: [], elapsed: null, requestId: null };
+    if (Array.isArray(resp.images)) {
+        return {
+            images: resp.images.map((it) => ({ 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) { CLI_VERSION = v; }

package/bin/lib/client.ts

@@ -0,0 +1,109 @@
+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, 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 = [];
+  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();
+  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, path, {
+  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;
+}
+
+export function normalizeGenerate(resp) {
+  if (!resp) return { images: [], elapsed: null, requestId: null };
+  if (Array.isArray(resp.images)) {
+    return {
+      images: resp.images.map((it) => ({ 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) { CLI_VERSION = v; }

package/bin/lib/error-hints.js

@@ -1,23 +1,20 @@
 const HINTS = {
-  SERVER_UNREACHABLE: "Start `ima2 serve`, or pass `--server <url>`.",
-  APIKEY_DISABLED: "Image generation is OAuth-only. Use Codex login/OAuth.",
-  IMAGE_MODEL_UNSUPPORTED:
-    "This model is visible but cannot generate images here. Use gpt-5.4 or gpt-5.4-mini.",
-  INVALID_IMAGE_MODEL: "Use one of: gpt-5.5, gpt-5.4, gpt-5.4-mini.",
-  OAUTH_UNAVAILABLE: "OAuth proxy is unavailable. Check `ima2 doctor` and restart `ima2 serve`.",
-  NETWORK_FAILED: "Network/proxy failed. This is not a moderation refusal.",
-  SAFETY_REFUSAL: "The image backend refused this generation.",
-  MODERATION_REFUSED: "The prompt or image was rejected by moderation.",
-  AUTH_CHATGPT_EXPIRED: "Run `npx @openai/codex login`, then restart `ima2 serve`.",
-  REF_TOO_LARGE: "Reference image is too large. Resize/compress it and retry.",
-  REF_NOT_BASE64: "Reference payload is invalid. Use a normal PNG/JPEG/WebP file.",
+    SERVER_UNREACHABLE: "Start `ima2 serve`, or pass `--server <url>`.",
+    APIKEY_DISABLED: "API-key generation is supported in current builds; switch providers or update the configured API key.",
+    IMAGE_MODEL_UNSUPPORTED: "This model is visible but cannot generate images here. Use gpt-5.4 or gpt-5.4-mini.",
+    INVALID_IMAGE_MODEL: "Use one of: gpt-5.5, gpt-5.4, gpt-5.4-mini.",
+    OAUTH_UNAVAILABLE: "OAuth proxy is unavailable. Check `ima2 doctor` and restart `ima2 serve`.",
+    NETWORK_FAILED: "Network/proxy failed. This is not a moderation refusal.",
+    SAFETY_REFUSAL: "The image backend refused this generation.",
+    MODERATION_REFUSED: "The prompt or image was rejected by moderation.",
+    AUTH_CHATGPT_EXPIRED: "Run `npx @openai/codex login`, then restart `ima2 serve`.",
+    REF_TOO_LARGE: "Reference image is too large. Resize/compress it and retry.",
+    REF_NOT_BASE64: "Reference payload is invalid. Use a normal PNG/JPEG/WebP file.",
 };
-
 export function hintForErrorCode(code) {
-  return code ? HINTS[code] || null : null;
+    return code ? HINTS[code] || null : null;
 }
-
 export function formatErrorWithHint(message, code) {
-  const hint = hintForErrorCode(code);
-  return hint ? `${message}\nHint: ${hint}` : message;
+    const hint = hintForErrorCode(code);
+    return hint ? `${message}\nHint: ${hint}` : message;
 }

package/bin/lib/error-hints.ts

@@ -0,0 +1,23 @@
+const HINTS = {
+  SERVER_UNREACHABLE: "Start `ima2 serve`, or pass `--server <url>`.",
+  APIKEY_DISABLED: "API-key generation is supported in current builds; switch providers or update the configured API key.",
+  IMAGE_MODEL_UNSUPPORTED:
+    "This model is visible but cannot generate images here. Use gpt-5.4 or gpt-5.4-mini.",
+  INVALID_IMAGE_MODEL: "Use one of: gpt-5.5, gpt-5.4, gpt-5.4-mini.",
+  OAUTH_UNAVAILABLE: "OAuth proxy is unavailable. Check `ima2 doctor` and restart `ima2 serve`.",
+  NETWORK_FAILED: "Network/proxy failed. This is not a moderation refusal.",
+  SAFETY_REFUSAL: "The image backend refused this generation.",
+  MODERATION_REFUSED: "The prompt or image was rejected by moderation.",
+  AUTH_CHATGPT_EXPIRED: "Run `npx @openai/codex login`, then restart `ima2 serve`.",
+  REF_TOO_LARGE: "Reference image is too large. Resize/compress it and retry.",
+  REF_NOT_BASE64: "Reference payload is invalid. Use a normal PNG/JPEG/WebP file.",
+};
+
+export function hintForErrorCode(code) {
+  return code ? HINTS[code] || null : null;
+}
+
+export function formatErrorWithHint(message, code) {
+  const hint = hintForErrorCode(code);
+  return hint ? `${message}\nHint: ${hint}` : message;
+}

package/bin/lib/files.js

@@ -1,39 +1,37 @@
 import { readFile, writeFile, mkdir } from "node:fs/promises";
-import { dirname, extname, basename, join } from "node:path";
-
+import { dirname, extname } from "node:path";
 const MIME = {
-  png: "image/png",
-  jpg: "image/jpeg",
-  jpeg: "image/jpeg",
-  webp: "image/webp",
+    png: "image/png",
+    jpg: "image/jpeg",
+    jpeg: "image/jpeg",
+    webp: "image/webp",
 };
-
 export async function fileToDataUri(path) {
-  const b64 = (await readFile(path)).toString("base64");
-  const ext = extname(path).slice(1).toLowerCase();
-  const mime = MIME[ext] || "image/png";
-  return `data:${mime};base64,${b64}`;
+    const b64 = (await readFile(path)).toString("base64");
+    const ext = extname(path).slice(1).toLowerCase();
+    const mime = MIME[ext] || "image/png";
+    return `data:${mime};base64,${b64}`;
 }
-
 export async function dataUriToFile(dataUri, outPath) {
-  const m = dataUri.match(/^data:([^;]+);base64,(.+)$/);
-  const raw = m ? m[2] : dataUri;
-  await mkdir(dirname(outPath) || ".", { recursive: true });
-  await writeFile(outPath, Buffer.from(raw, "base64"));
-  return outPath;
+    const m = dataUri.match(/^data:([^;]+);base64,(.+)$/);
+    const raw = m ? m[2] : dataUri;
+    await mkdir(dirname(outPath) || ".", { recursive: true });
+    await writeFile(outPath, Buffer.from(raw, "base64"));
+    return outPath;
 }
-
 export function defaultOutName(index, total, ext = "png") {
-  const now = new Date();
-  const pad = (n) => String(n).padStart(2, "0");
-  const stamp = `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`;
-  if (total <= 1) return `ima2-${stamp}.${ext}`;
-  return `ima2-${stamp}-${index}.${ext}`;
+    const now = new Date();
+    const pad = (n) => String(n).padStart(2, "0");
+    const stamp = `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`;
+    if (total <= 1)
+        return `ima2-${stamp}.${ext}`;
+    return `ima2-${stamp}-${index}.${ext}`;
 }
-
 export async function readStdin() {
-  if (process.stdin.isTTY) return "";
-  const chunks = [];
-  for await (const c of process.stdin) chunks.push(c);
-  return Buffer.concat(chunks).toString("utf-8").trim();
+    if (process.stdin.isTTY)
+        return "";
+    const chunks = [];
+    for await (const c of process.stdin)
+        chunks.push(c);
+    return Buffer.concat(chunks).toString("utf-8").trim();
 }

package/bin/lib/files.ts

@@ -0,0 +1,39 @@
+import { readFile, writeFile, mkdir } from "node:fs/promises";
+import { dirname, extname, basename, join } from "node:path";
+
+const MIME = {
+  png: "image/png",
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  webp: "image/webp",
+};
+
+export async function fileToDataUri(path) {
+  const b64 = (await readFile(path)).toString("base64");
+  const ext = extname(path).slice(1).toLowerCase();
+  const mime = MIME[ext] || "image/png";
+  return `data:${mime};base64,${b64}`;
+}
+
+export async function dataUriToFile(dataUri, outPath) {
+  const m = dataUri.match(/^data:([^;]+);base64,(.+)$/);
+  const raw = m ? m[2] : dataUri;
+  await mkdir(dirname(outPath) || ".", { recursive: true });
+  await writeFile(outPath, Buffer.from(raw, "base64"));
+  return outPath;
+}
+
+export function defaultOutName(index, total, ext = "png") {
+  const now = new Date();
+  const pad = (n) => String(n).padStart(2, "0");
+  const stamp = `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`;
+  if (total <= 1) return `ima2-${stamp}.${ext}`;
+  return `ima2-${stamp}-${index}.${ext}`;
+}
+
+export async function readStdin() {
+  if (process.stdin.isTTY) return "";
+  const chunks = [];
+  for await (const c of process.stdin) chunks.push(c);
+  return Buffer.concat(chunks).toString("utf-8").trim();
+}

package/bin/lib/output.js

@@ -1,58 +1,60 @@
 import { formatErrorWithHint } from "./error-hints.js";
-
 const isTty = process.stdout.isTTY && !process.env.NO_COLOR;
-
 export const color = {
-  dim:    (s) => (isTty ? `\x1b[2m${s}\x1b[0m` : s),
-  bold:   (s) => (isTty ? `\x1b[1m${s}\x1b[0m` : s),
-  red:    (s) => (isTty ? `\x1b[31m${s}\x1b[0m` : s),
-  green:  (s) => (isTty ? `\x1b[32m${s}\x1b[0m` : s),
-  yellow: (s) => (isTty ? `\x1b[33m${s}\x1b[0m` : s),
-  cyan:   (s) => (isTty ? `\x1b[36m${s}\x1b[0m` : s),
+    dim: (s) => (isTty ? `\x1b[2m${s}\x1b[0m` : s),
+    bold: (s) => (isTty ? `\x1b[1m${s}\x1b[0m` : s),
+    red: (s) => (isTty ? `\x1b[31m${s}\x1b[0m` : s),
+    green: (s) => (isTty ? `\x1b[32m${s}\x1b[0m` : s),
+    yellow: (s) => (isTty ? `\x1b[33m${s}\x1b[0m` : s),
+    cyan: (s) => (isTty ? `\x1b[36m${s}\x1b[0m` : s),
 };
-
 export function out(msg = "") { process.stdout.write(msg + "\n"); }
 export function err(msg = "") { process.stderr.write(msg + "\n"); }
-
 export function die(code, msg) {
-  if (msg) err(color.red("✗ ") + msg);
-  process.exit(code);
+    if (msg)
+        err(color.red("✗ ") + msg);
+    process.exit(code);
 }
-
 export function dieWithError(e) {
-  die(exitCodeForError(e), formatErrorWithHint(e?.message || String(e), e?.code));
+    die(exitCodeForError(e), formatErrorWithHint(e?.message || String(e), e?.code));
 }
-
 export function json(obj) {
-  process.stdout.write(JSON.stringify(obj) + "\n");
+    process.stdout.write(JSON.stringify(obj) + "\n");
 }
-
 export function table(rows, columns) {
-  if (rows.length === 0) return;
-  const widths = columns.map((c) =>
-    Math.max(c.label.length, ...rows.map((r) => {
-      const v = c.format ? c.format(r[c.key], r) : r[c.key];
-      return String(v ?? "").length;
-    })),
-  );
-  const pad = (s, w) => String(s ?? "").padEnd(w);
-  out(color.dim(columns.map((c, i) => pad(c.label, widths[i])).join("  ")));
-  out(color.dim(widths.map((w) => "─".repeat(w)).join("  ")));
-  for (const r of rows) {
-    out(columns.map((c, i) => pad(c.format ? c.format(r[c.key], r) : r[c.key], widths[i])).join("  "));
-  }
+    if (rows.length === 0)
+        return;
+    const widths = columns.map((c) => Math.max(c.label.length, ...rows.map((r) => {
+        const v = c.format ? c.format(r[c.key], r) : r[c.key];
+        return String(v ?? "").length;
+    })));
+    const pad = (s, w) => String(s ?? "").padEnd(w);
+    out(color.dim(columns.map((c, i) => pad(c.label, widths[i])).join("  ")));
+    out(color.dim(widths.map((w) => "─".repeat(w)).join("  ")));
+    for (const r of rows) {
+        out(columns.map((c, i) => pad(c.format ? c.format(r[c.key], r) : r[c.key], widths[i])).join("  "));
+    }
 }
-
 export function exitCodeForError(e) {
-  if (e.code === "SERVER_UNREACHABLE") return 3;
-  if (e.code === "APIKEY_DISABLED") return 4;
-  if (e.code === "AUTH_CHATGPT_EXPIRED" || e.code === "OAUTH_UNAVAILABLE") return 4;
-  if (e.code === "NETWORK_FAILED") return 6;
-  if (e.code === "REF_TOO_LARGE" || e.code === "REF_NOT_BASE64") return 5;
-  if (e.code === "SAFETY_REFUSAL") return 7;
-  if (e.code === "MODERATION_REFUSED") return 7;
-  if (e.name === "TimeoutError" || /abort/i.test(e.message || "")) return 8;
-  if (e.status >= 500) return 6;
-  if (e.status >= 400) return 5;
-  return 1;
+    if (e.code === "SERVER_UNREACHABLE")
+        return 3;
+    if (e.code === "APIKEY_DISABLED")
+        return 4;
+    if (e.code === "AUTH_CHATGPT_EXPIRED" || e.code === "OAUTH_UNAVAILABLE")
+        return 4;
+    if (e.code === "NETWORK_FAILED")
+        return 6;
+    if (e.code === "REF_TOO_LARGE" || e.code === "REF_NOT_BASE64")
+        return 5;
+    if (e.code === "SAFETY_REFUSAL")
+        return 7;
+    if (e.code === "MODERATION_REFUSED")
+        return 7;
+    if (e.name === "TimeoutError" || /abort/i.test(e.message || ""))
+        return 8;
+    if (e.status >= 500)
+        return 6;
+    if (e.status >= 400)
+        return 5;
+    return 1;
 }

package/bin/lib/output.ts

@@ -0,0 +1,58 @@
+import { formatErrorWithHint } from "./error-hints.js";
+
+const isTty = process.stdout.isTTY && !process.env.NO_COLOR;
+
+export const color = {
+  dim:    (s) => (isTty ? `\x1b[2m${s}\x1b[0m` : s),
+  bold:   (s) => (isTty ? `\x1b[1m${s}\x1b[0m` : s),
+  red:    (s) => (isTty ? `\x1b[31m${s}\x1b[0m` : s),
+  green:  (s) => (isTty ? `\x1b[32m${s}\x1b[0m` : s),
+  yellow: (s) => (isTty ? `\x1b[33m${s}\x1b[0m` : s),
+  cyan:   (s) => (isTty ? `\x1b[36m${s}\x1b[0m` : s),
+};
+
+export function out(msg = "") { process.stdout.write(msg + "\n"); }
+export function err(msg = "") { process.stderr.write(msg + "\n"); }
+
+export function die(code, msg) {
+  if (msg) err(color.red("✗ ") + msg);
+  process.exit(code);
+}
+
+export function dieWithError(e) {
+  die(exitCodeForError(e), formatErrorWithHint(e?.message || String(e), e?.code));
+}
+
+export function json(obj) {
+  process.stdout.write(JSON.stringify(obj) + "\n");
+}
+
+export function table(rows, columns) {
+  if (rows.length === 0) return;
+  const widths = columns.map((c) =>
+    Math.max(c.label.length, ...rows.map((r) => {
+      const v = c.format ? c.format(r[c.key], r) : r[c.key];
+      return String(v ?? "").length;
+    })),
+  );
+  const pad = (s, w) => String(s ?? "").padEnd(w);
+  out(color.dim(columns.map((c, i) => pad(c.label, widths[i])).join("  ")));
+  out(color.dim(widths.map((w) => "─".repeat(w)).join("  ")));
+  for (const r of rows) {
+    out(columns.map((c, i) => pad(c.format ? c.format(r[c.key], r) : r[c.key], widths[i])).join("  "));
+  }
+}
+
+export function exitCodeForError(e) {
+  if (e.code === "SERVER_UNREACHABLE") return 3;
+  if (e.code === "APIKEY_DISABLED") return 4;
+  if (e.code === "AUTH_CHATGPT_EXPIRED" || e.code === "OAUTH_UNAVAILABLE") return 4;
+  if (e.code === "NETWORK_FAILED") return 6;
+  if (e.code === "REF_TOO_LARGE" || e.code === "REF_NOT_BASE64") return 5;
+  if (e.code === "SAFETY_REFUSAL") return 7;
+  if (e.code === "MODERATION_REFUSED") return 7;
+  if (e.name === "TimeoutError" || /abort/i.test(e.message || "")) return 8;
+  if (e.status >= 500) return 6;
+  if (e.status >= 400) return 5;
+  return 1;
+}