ima2-gen 1.1.7 → 1.1.9

package/bin/commands/node.ts

@@ -0,0 +1,157 @@
+import { parseArgs } from "../lib/args.js";
+import { resolveServer, request } from "../lib/client.js";
+import { streamSse } from "../lib/sse.js";
+import { fileToDataUri, dataUriToFile, defaultOutName } from "../lib/files.js";
+import { out, die, color, json, exitCodeForError } from "../lib/output.js";
+import { config } from "../../config.js";
+
+const HELP = `
+  ima2 node <subcommand> [options]
+
+  Subcommands:
+    generate <prompt...> [--parent <nodeId>] [--ref <file>...] [--no-stream] [...gen-style flags]
+    show <nodeId> [--json]
+`;
+
+const GEN_FLAGS = {
+  quality: { short: "q", type: "string", default: "low" },
+  size:    { short: "s", type: "string", default: "1024x1024" },
+  count:   { short: "n", type: "string", default: "1" },
+  ref:     { type: "string", repeatable: true },
+  out:     { short: "o", type: "string" },
+  json:    { type: "boolean" },
+  timeout: { type: "string", default: "600" },
+  server:  { type: "string" },
+  model:   { type: "string" },
+  parent:  { type: "string" },
+  "reasoning-effort": { type: "string" },
+  "web-search":    { type: "boolean" },
+  "no-web-search": { type: "boolean" },
+  moderation: { type: "string", default: "low" },
+  session: { type: "string" },
+  "no-stream": { type: "boolean" },
+  help: { short: "h", type: "boolean" },
+};
+
+const SHOW_FLAGS = {
+  json: { type: "boolean" },
+  server: { type: "string" },
+  help: { short: "h", type: "boolean" },
+};
+
+async function getServer(args) {
+  try { return await resolveServer({ serverFlag: args.server }); }
+  catch (e: any) { die(exitCodeForError(e), e.message); throw e; }
+}
+
+async function generateSub(argv) {
+  const args = parseArgs(argv, { flags: GEN_FLAGS });
+  if (args.help) { out(HELP); return; }
+  const prompt = args.positional.join(" ");
+  if (!prompt) die(2, "prompt required");
+  const refs = args.ref || [];
+  const VALID_REASONING = new Set(["none", "low", "medium", "high", "xhigh"]);
+  if (args["reasoning-effort"] && !VALID_REASONING.has(args["reasoning-effort"])) {
+    die(2, "--reasoning-effort must be one of: none, low, medium, high, xhigh");
+  }
+  if (args["web-search"] && args["no-web-search"]) {
+    die(2, "--web-search and --no-web-search are mutually exclusive");
+  }
+  const references = await Promise.all(refs.map((p) => fileToDataUri(p)));
+  const server = await getServer(args);
+  const body: any = {
+    prompt,
+    quality: args.quality,
+    size: args.size,
+    n: Math.max(1, Math.min(8, parseInt(args.count) || 1)),
+    references,
+    moderation: args.moderation,
+    sessionId: args.session,
+  };
+  if (args.model) body.model = args.model;
+  if (args.parent) body.parentNodeId = args.parent;
+  if (args["reasoning-effort"]) body.reasoningEffort = args["reasoning-effort"];
+  if (args["no-web-search"]) body.webSearchEnabled = false;
+  else if (args["web-search"]) body.webSearchEnabled = true;
+
+  if (args["no-stream"]) {
+    const resp: any = await request(server.base, "/api/node/generate", {
+      method: "POST",
+      body,
+      timeoutMs: (parseInt(args.timeout) || 600) * 1000,
+    }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
+    if (args.json) { json(resp); return; }
+    out(color.green("✓ node ") + (resp?.node?.id || "(no id)"));
+    return;
+  }
+
+  const ac = new AbortController();
+  const onSig = () => { ac.abort(); process.exit(130); };
+  process.once("SIGINT", onSig); process.once("SIGTERM", onSig);
+
+  const url = `${server.base}/api/node/generate`;
+  const images: any[] = [];
+  let doneInfo: any = null;
+  try {
+    for await (const ev of streamSse(url, { body, signal: ac.signal })) {
+      switch (ev.event) {
+        case "phase":
+          if (!args.json) out(color.dim(`[phase] ${ev.data.phase || ev.data}`));
+          break;
+        case "partial":
+          if (!args.json) out(color.dim(`[partial #${ev.data.index ?? "?"}]`));
+          break;
+        case "image":
+          images.push(ev.data);
+          if (!args.json) out(color.green(`✓ image ${images.length}`));
+          break;
+        case "done":
+          doneInfo = ev.data;
+          break;
+        case "error":
+          die(1, `node generate error: ${ev.data.error || ev.data}${ev.data.code ? ` (${ev.data.code})` : ""}`);
+      }
+    }
+  } catch (e: any) {
+    if (e.name === "AbortError") return;
+    die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`);
+  }
+
+  const savedPaths: string[] = [];
+  for (let i = 0; i < images.length; i++) {
+    const im = images[i];
+    if (!im.image) continue;
+    const target = args.out && i === 0
+      ? args.out
+      : `${config.storage.generatedDir}/${defaultOutName(i, images.length)}`;
+    await dataUriToFile(im.image, target);
+    savedPaths.push(target);
+  }
+  if (args.json) {
+    json({ ok: true, paths: savedPaths, doneInfo });
+  } else {
+    for (const p of savedPaths) out(color.green("✓ ") + p);
+  }
+}
+
+async function showSub(argv) {
+  const args = parseArgs(argv, { flags: SHOW_FLAGS });
+  const id = args.positional[0];
+  if (!id) die(2, "nodeId required");
+  const server = await getServer(args);
+  const resp = await request(server.base, `/api/node/${encodeURIComponent(id)}`).catch((e) => die(exitCodeForError(e), e.message));
+  json(resp);
+}
+
+const SUB: Record<string, (argv: any[]) => Promise<void>> = {
+  generate: generateSub,
+  show: showSub,
+};
+
+export default async function nodeCmd(argv) {
+  const sub = argv[0];
+  if (!sub || sub === "--help" || sub === "-h") { out(HELP); return; }
+  const handler = SUB[sub];
+  if (!handler) die(2, `unknown subcommand: ${sub}\n${HELP}`);
+  return handler(argv.slice(1));
+}

package/bin/commands/observability.js

@@ -0,0 +1,201 @@
+import { parseArgs } from "../lib/args.js";
+import { resolveServer, request } from "../lib/client.js";
+import { out, die, color, json, table, exitCodeForError } from "../lib/output.js";
+const HELP = `
+  ima2 <domain> <subcommand> [options]
+
+  Storage:
+    storage status [--json]                  Storage inspection
+    storage open                             Open generated-dir in OS file manager
+
+  Billing / Providers / OAuth:
+    billing [--json]                         API usage / quota
+    providers [--json]                       Configured providers
+    oauth status [--json]                    OAuth proxy state
+
+  Inflight jobs:
+    inflight ls [--kind <k>] [--session <id>] [--terminal] [--json]
+    inflight rm <requestId> [--json]         Force-remove a stuck job
+
+  Options:
+    --json          Output raw JSON
+    --server <url>  Override server URL
+`;
+const FLAGS = {
+    json: { type: "boolean" },
+    server: { type: "string" },
+    kind: { type: "string" },
+    session: { type: "string" },
+    terminal: { type: "boolean" },
+    help: { short: "h", type: "boolean" },
+};
+async function getServer(args) {
+    try {
+        return await resolveServer({ serverFlag: args.server });
+    }
+    catch (e) {
+        die(exitCodeForError(e), e.message);
+        throw e;
+    }
+}
+async function storageStatusSub(argv) {
+    const args = parseArgs(argv, { flags: FLAGS });
+    const server = await getServer(args);
+    const resp = await request(server.base, "/api/storage/status")
+        .catch((e) => die(exitCodeForError(e), e.message));
+    if (args.json) {
+        json(resp);
+        return;
+    }
+    out(JSON.stringify(resp, null, 2));
+}
+async function storageOpenSub(argv) {
+    const args = parseArgs(argv, { flags: FLAGS });
+    const server = await getServer(args);
+    await request(server.base, "/api/storage/open-generated-dir", { method: "POST" })
+        .catch((e) => die(exitCodeForError(e), e.message));
+    out(color.green("✓ ") + "opened generated directory");
+}
+async function billingSub(argv) {
+    const args = parseArgs(argv, { flags: FLAGS });
+    const server = await getServer(args);
+    const resp = await request(server.base, "/api/billing")
+        .catch((e) => die(exitCodeForError(e), e.message));
+    if (args.json) {
+        json(resp);
+        return;
+    }
+    out(JSON.stringify(resp, null, 2));
+}
+async function providersSub(argv) {
+    const args = parseArgs(argv, { flags: FLAGS });
+    const server = await getServer(args);
+    const resp = await request(server.base, "/api/providers")
+        .catch((e) => die(exitCodeForError(e), e.message));
+    if (args.json) {
+        json(resp);
+        return;
+    }
+    out(JSON.stringify(resp, null, 2));
+}
+async function oauthStatusSub(argv) {
+    const args = parseArgs(argv, { flags: FLAGS });
+    const server = await getServer(args);
+    const resp = await request(server.base, "/api/oauth/status")
+        .catch((e) => die(exitCodeForError(e), e.message));
+    if (args.json) {
+        json(resp);
+        return;
+    }
+    out(JSON.stringify(resp, null, 2));
+}
+async function inflightLsSub(argv) {
+    const args = parseArgs(argv, { flags: FLAGS });
+    const server = await getServer(args);
+    const qs = new URLSearchParams();
+    if (args.kind)
+        qs.set("kind", args.kind);
+    if (args.session)
+        qs.set("sessionId", args.session);
+    if (args.terminal)
+        qs.set("includeTerminal", "1");
+    const path = `/api/inflight${qs.toString() ? `?${qs}` : ""}`;
+    const resp = await request(server.base, path)
+        .catch((e) => die(exitCodeForError(e), e.message));
+    const jobs = resp.jobs || resp.items || [];
+    const terminalJobs = resp.terminalJobs || [];
+    if (args.json) {
+        json(args.terminal ? { jobs, terminalJobs } : { jobs });
+        return;
+    }
+    if (jobs.length === 0 && terminalJobs.length === 0) {
+        out(color.dim(args.terminal ? "(no active or terminal jobs)" : "(no active jobs)"));
+        return;
+    }
+    const now = Date.now();
+    if (jobs.length > 0) {
+        out(color.bold("Active jobs"));
+        table(jobs, [
+            { key: "requestId", label: "ID", format: (v) => String(v || "").slice(0, 10) },
+            { key: "kind", label: "KIND" },
+            { key: "phase", label: "PHASE" },
+            { key: "startedAt", label: "AGE", format: (v) => v ? `${Math.round((now - v) / 1000)}s` : "" },
+            { key: "prompt", label: "PROMPT", format: (v) => {
+                    const s = String(v || "").replace(/\s+/g, " ");
+                    return s.length > 40 ? s.slice(0, 37) + "…" : s;
+                } },
+        ]);
+    }
+    if (terminalJobs.length > 0) {
+        if (jobs.length > 0)
+            out("");
+        out(color.bold("Terminal jobs"));
+        table(terminalJobs, [
+            { key: "requestId", label: "ID", format: (v) => String(v || "").slice(0, 10) },
+            { key: "kind", label: "KIND" },
+            { key: "status", label: "STATUS" },
+            { key: "finishedAt", label: "AGE", format: (v) => v ? `${Math.round((now - v) / 1000)}s` : "" },
+            { key: "prompt", label: "PROMPT", format: (v) => {
+                    const s = String(v || "").replace(/\s+/g, " ");
+                    return s.length > 40 ? s.slice(0, 37) + "…" : s;
+                } },
+        ]);
+    }
+}
+async function inflightRmSub(argv) {
+    const args = parseArgs(argv, { flags: FLAGS });
+    const requestId = args.positional[0];
+    if (!requestId)
+        die(2, "requestId required");
+    const server = await getServer(args);
+    await request(server.base, `/api/inflight/${encodeURIComponent(requestId)}`, { method: "DELETE" })
+        .catch((e) => die(exitCodeForError(e), e.message));
+    if (args.json) {
+        json({ ok: true, requestId });
+        return;
+    }
+    out(color.green("✓ ") + `removed ${requestId}`);
+}
+export default async function observabilityCmd(argv) {
+    const domain = argv[0];
+    const rest = argv.slice(1);
+    if (!domain || domain === "--help" || domain === "-h") {
+        out(HELP);
+        return;
+    }
+    if (rest[0] === "--help" || rest[0] === "-h") {
+        out(HELP);
+        return;
+    }
+    if (domain === "storage") {
+        const sub = rest[0];
+        if (!sub || sub === "--help" || sub === "-h") {
+            out(HELP);
+            return;
+        }
+        if (sub === "status")
+            return storageStatusSub(rest.slice(1));
+        if (sub === "open")
+            return storageOpenSub(rest.slice(1));
+        die(2, `unknown subcommand: storage ${sub}\n${HELP}`);
+    }
+    if (domain === "billing")
+        return billingSub(rest);
+    if (domain === "providers")
+        return providersSub(rest);
+    if (domain === "oauth") {
+        const sub = rest[0];
+        if (!sub || sub === "status")
+            return oauthStatusSub(rest.slice(sub === "status" ? 1 : 0));
+        die(2, `unknown subcommand: oauth ${sub}\n${HELP}`);
+    }
+    if (domain === "inflight") {
+        const sub = rest[0];
+        if (!sub || sub === "ls")
+            return inflightLsSub(sub === "ls" ? rest.slice(1) : rest);
+        if (sub === "rm")
+            return inflightRmSub(rest.slice(1));
+        die(2, `unknown subcommand: inflight ${sub}\n${HELP}`);
+    }
+    die(2, `unknown domain: ${domain}\n${HELP}`);
+}

package/bin/commands/observability.ts

@@ -0,0 +1,176 @@
+import { parseArgs } from "../lib/args.js";
+import { resolveServer, request } from "../lib/client.js";
+import { out, die, color, json, table, exitCodeForError } from "../lib/output.js";
+
+const HELP = `
+  ima2 <domain> <subcommand> [options]
+
+  Storage:
+    storage status [--json]                  Storage inspection
+    storage open                             Open generated-dir in OS file manager
+
+  Billing / Providers / OAuth:
+    billing [--json]                         API usage / quota
+    providers [--json]                       Configured providers
+    oauth status [--json]                    OAuth proxy state
+
+  Inflight jobs:
+    inflight ls [--kind <k>] [--session <id>] [--terminal] [--json]
+    inflight rm <requestId> [--json]         Force-remove a stuck job
+
+  Options:
+    --json          Output raw JSON
+    --server <url>  Override server URL
+`;
+
+const FLAGS = {
+  json:     { type: "boolean" },
+  server:   { type: "string" },
+  kind:     { type: "string" },
+  session:  { type: "string" },
+  terminal: { type: "boolean" },
+  help:     { short: "h", type: "boolean" },
+};
+
+async function getServer(args) {
+  try { return await resolveServer({ serverFlag: args.server }); }
+  catch (e: any) { die(exitCodeForError(e), e.message); throw e; }
+}
+
+async function storageStatusSub(argv) {
+  const args = parseArgs(argv, { flags: FLAGS });
+  const server = await getServer(args);
+  const resp = await request(server.base, "/api/storage/status")
+    .catch((e) => die(exitCodeForError(e), e.message));
+  if (args.json) { json(resp); return; }
+  out(JSON.stringify(resp, null, 2));
+}
+
+async function storageOpenSub(argv) {
+  const args = parseArgs(argv, { flags: FLAGS });
+  const server = await getServer(args);
+  await request(server.base, "/api/storage/open-generated-dir", { method: "POST" })
+    .catch((e) => die(exitCodeForError(e), e.message));
+  out(color.green("✓ ") + "opened generated directory");
+}
+
+async function billingSub(argv) {
+  const args = parseArgs(argv, { flags: FLAGS });
+  const server = await getServer(args);
+  const resp = await request(server.base, "/api/billing")
+    .catch((e) => die(exitCodeForError(e), e.message));
+  if (args.json) { json(resp); return; }
+  out(JSON.stringify(resp, null, 2));
+}
+
+async function providersSub(argv) {
+  const args = parseArgs(argv, { flags: FLAGS });
+  const server = await getServer(args);
+  const resp = await request(server.base, "/api/providers")
+    .catch((e) => die(exitCodeForError(e), e.message));
+  if (args.json) { json(resp); return; }
+  out(JSON.stringify(resp, null, 2));
+}
+
+async function oauthStatusSub(argv) {
+  const args = parseArgs(argv, { flags: FLAGS });
+  const server = await getServer(args);
+  const resp = await request(server.base, "/api/oauth/status")
+    .catch((e) => die(exitCodeForError(e), e.message));
+  if (args.json) { json(resp); return; }
+  out(JSON.stringify(resp, null, 2));
+}
+
+async function inflightLsSub(argv) {
+  const args = parseArgs(argv, { flags: FLAGS });
+  const server = await getServer(args);
+  const qs = new URLSearchParams();
+  if (args.kind) qs.set("kind", args.kind);
+  if (args.session) qs.set("sessionId", args.session);
+  if (args.terminal) qs.set("includeTerminal", "1");
+  const path = `/api/inflight${qs.toString() ? `?${qs}` : ""}`;
+  const resp = await request(server.base, path)
+    .catch((e) => die(exitCodeForError(e), e.message));
+  const jobs = resp.jobs || resp.items || [];
+  const terminalJobs = resp.terminalJobs || [];
+  if (args.json) {
+    json(args.terminal ? { jobs, terminalJobs } : { jobs });
+    return;
+  }
+  if (jobs.length === 0 && terminalJobs.length === 0) {
+    out(color.dim(args.terminal ? "(no active or terminal jobs)" : "(no active jobs)"));
+    return;
+  }
+  const now = Date.now();
+  if (jobs.length > 0) {
+    out(color.bold("Active jobs"));
+    table(jobs, [
+      { key: "requestId", label: "ID", format: (v) => String(v || "").slice(0, 10) },
+      { key: "kind",      label: "KIND" },
+      { key: "phase",     label: "PHASE" },
+      { key: "startedAt", label: "AGE", format: (v) => v ? `${Math.round((now - v) / 1000)}s` : "" },
+      { key: "prompt",    label: "PROMPT", format: (v) => {
+        const s = String(v || "").replace(/\s+/g, " ");
+        return s.length > 40 ? s.slice(0, 37) + "…" : s;
+      } },
+    ]);
+  }
+  if (terminalJobs.length > 0) {
+    if (jobs.length > 0) out("");
+    out(color.bold("Terminal jobs"));
+    table(terminalJobs, [
+      { key: "requestId",  label: "ID",     format: (v) => String(v || "").slice(0, 10) },
+      { key: "kind",       label: "KIND" },
+      { key: "status",     label: "STATUS" },
+      { key: "finishedAt", label: "AGE", format: (v) => v ? `${Math.round((now - v) / 1000)}s` : "" },
+      { key: "prompt",     label: "PROMPT", format: (v) => {
+        const s = String(v || "").replace(/\s+/g, " ");
+        return s.length > 40 ? s.slice(0, 37) + "…" : s;
+      } },
+    ]);
+  }
+}
+
+async function inflightRmSub(argv) {
+  const args = parseArgs(argv, { flags: FLAGS });
+  const requestId = args.positional[0];
+  if (!requestId) die(2, "requestId required");
+  const server = await getServer(args);
+  await request(server.base, `/api/inflight/${encodeURIComponent(requestId)}`, { method: "DELETE" })
+    .catch((e) => die(exitCodeForError(e), e.message));
+  if (args.json) { json({ ok: true, requestId }); return; }
+  out(color.green("✓ ") + `removed ${requestId}`);
+}
+
+export default async function observabilityCmd(argv) {
+  const domain = argv[0];
+  const rest = argv.slice(1);
+  if (!domain || domain === "--help" || domain === "-h") { out(HELP); return; }
+  if (rest[0] === "--help" || rest[0] === "-h") { out(HELP); return; }
+
+  if (domain === "storage") {
+    const sub = rest[0];
+    if (!sub || sub === "--help" || sub === "-h") { out(HELP); return; }
+    if (sub === "status") return storageStatusSub(rest.slice(1));
+    if (sub === "open")   return storageOpenSub(rest.slice(1));
+    die(2, `unknown subcommand: storage ${sub}\n${HELP}`);
+  }
+
+  if (domain === "billing")   return billingSub(rest);
+  if (domain === "providers") return providersSub(rest);
+
+  if (domain === "oauth") {
+    const sub = rest[0];
+    if (!sub || sub === "status") return oauthStatusSub(rest.slice(sub === "status" ? 1 : 0));
+    die(2, `unknown subcommand: oauth ${sub}\n${HELP}`);
+  }
+
+  if (domain === "inflight") {
+    const sub = rest[0];
+    if (!sub || sub === "ls") return inflightLsSub(sub === "ls" ? rest.slice(1) : rest);
+    if (sub === "rm")          return inflightRmSub(rest.slice(1));
+    die(2, `unknown subcommand: inflight ${sub}\n${HELP}`);
+  }
+
+  die(2, `unknown domain: ${domain}\n${HELP}`);
+}

package/bin/commands/ping.js

@@ -1,28 +1,34 @@
 import { parseArgs } from "../lib/args.js";
 import { resolveServer } from "../lib/client.js";
 import { out, die, color, json, exitCodeForError } from "../lib/output.js";
-
 const SPEC = {
-  flags: {
-    json:   { type: "boolean" },
-    server: { type: "string" },
-    help:   { short: "h", type: "boolean" },
-  },
+    flags: {
+        json: { type: "boolean" },
+        server: { type: "string" },
+        help: { short: "h", type: "boolean" },
+    },
 };
-
 export default async function pingCmd(argv) {
-  const args = parseArgs(argv, SPEC);
-  if (args.help) { out("ima2 ping [--json]"); return; }
-
-  try {
-    const { base, health } = await resolveServer({ serverFlag: args.server });
-    if (args.json) {
-      json({ ok: true, base, ...health });
-    } else {
-      out(color.green("✓ ") + `${base}  v${health.version}  uptime ${health.uptimeSec}s  activeJobs ${health.activeJobs}`);
+    const args = parseArgs(argv, SPEC);
+    if (args.help) {
+        out("ima2 ping [--json]");
+        return;
+    }
+    try {
+        const { base, health } = await resolveServer({ serverFlag: args.server });
+        const h = health;
+        if (args.json) {
+            json({ ok: true, base, ...h });
+        }
+        else {
+            out(color.green("✓ ") + `${base}  v${h.version}  uptime ${h.uptimeSec}s  activeJobs ${h.activeJobs}`);
+        }
+    }
+    catch (e) {
+        if (args.json) {
+            json({ ok: false, error: e.message });
+            process.exit(exitCodeForError(e));
+        }
+        die(exitCodeForError(e), e.message);
     }
-  } catch (e) {
-    if (args.json) { json({ ok: false, error: e.message }); process.exit(exitCodeForError(e)); }
-    die(exitCodeForError(e), e.message);
-  }
 }

package/bin/commands/ping.ts

@@ -0,0 +1,29 @@
+import { parseArgs } from "../lib/args.js";
+import { resolveServer } from "../lib/client.js";
+import { out, die, color, json, exitCodeForError } from "../lib/output.js";
+
+const SPEC = {
+  flags: {
+    json:   { type: "boolean" },
+    server: { type: "string" },
+    help:   { short: "h", type: "boolean" },
+  },
+};
+
+export default async function pingCmd(argv) {
+  const args = parseArgs(argv, SPEC);
+  if (args.help) { out("ima2 ping [--json]"); return; }
+
+  try {
+    const { base, health } = await resolveServer({ serverFlag: args.server });
+    const h: any = health;
+    if (args.json) {
+      json({ ok: true, base, ...h });
+    } else {
+      out(color.green("✓ ") + `${base}  v${h.version}  uptime ${h.uptimeSec}s  activeJobs ${h.activeJobs}`);
+    }
+  } catch (e) {
+    if (args.json) { json({ ok: false, error: e.message }); process.exit(exitCodeForError(e)); }
+    die(exitCodeForError(e), e.message);
+  }
+}