ima2-gen 1.1.9 → 1.1.10

package/README.md

@@ -1,5 +1,9 @@
 # ima2-gen
 
+<p align="center">
+  <img src="assets/logo.png" alt="ima2-gen logo" width="240">
+</p>
+
 [![npm version](https://img.shields.io/npm/v/ima2-gen)](https://www.npmjs.com/package/ima2-gen)
 [![Node.js](https://img.shields.io/badge/node-%3E%3D20-brightgreen)](https://nodejs.org/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)

package/bin/commands/annotate.js

@@ -31,6 +31,8 @@ async function getServer(args) {
 async function resolveBody(value) {
     if (!value)
         return null;
+    if (typeof value !== "string")
+        return null;
     let text;
     if (value === "-")
         text = await readStdin();
@@ -72,7 +74,7 @@ async function getSub(argv) {
     const browserId = getCliBrowserId();
     const resp = await request(server.base, `/api/annotations/${encodeURIComponent(filename)}`, {
         headers: { "X-Ima2-Browser-Id": browserId },
-    }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
+    }).catch((e) => { const err = e; die(exitCodeForError(e), `${err.message}${err.code ? ` (${err.code})` : ""}`); });
     json(resp);
 }
 async function setSub(argv) {
@@ -89,7 +91,7 @@ async function setSub(argv) {
         method: "PUT",
         body,
         headers: { "X-Ima2-Browser-Id": browserId },
-    }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
+    }).catch((e) => { const err = e; die(exitCodeForError(e), `${err.message}${err.code ? ` (${err.code})` : ""}`); });
     if (args.json) {
         json(resp);
         return;
@@ -116,7 +118,7 @@ async function rmSub(argv) {
     await request(server.base, `/api/annotations/${encodeURIComponent(filename)}`, {
         method: "DELETE",
         headers: { "X-Ima2-Browser-Id": browserId },
-    }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
+    }).catch((e) => { const err = e; die(exitCodeForError(e), `${err.message}${err.code ? ` (${err.code})` : ""}`); });
     out(color.green("✓ deleted"));
 }
 const SUB = {

package/bin/commands/annotate.ts

@@ -1,5 +1,5 @@
 import { readFile } from "fs/promises";
-import { parseArgs } from "../lib/args.js";
+import { parseArgs, type ParsedArgs } from "../lib/args.js";
 import { resolveServer, request } from "../lib/client.js";
 import { readStdin } from "../lib/files.js";
 import { out, die, color, json, exitCodeForError } from "../lib/output.js";
@@ -22,14 +22,15 @@ const FLAGS = {
   help: { short: "h", type: "boolean" },
 };
 
-async function getServer(args) {
+async function getServer(args: ParsedArgs) {
   try { return await resolveServer({ serverFlag: args.server }); }
   catch (e: any) { die(exitCodeForError(e), e.message); throw e; }
 }
 
-async function resolveBody(value): Promise<any> {
+async function resolveBody(value: unknown): Promise<any> {
   if (!value) return null;
-  let text;
+  if (typeof value !== "string") return null;
+  let text: string;
   if (value === "-") text = await readStdin();
   else if (value.startsWith("@")) text = await readFile(value.slice(1), "utf-8");
   else text = value;
@@ -41,7 +42,7 @@ async function readLine(): Promise<string> {
   return new Promise((resolve) => {
     let buf = "";
     process.stdin.setEncoding("utf-8");
-    const onData = (chunk) => {
+    const onData = (chunk: Buffer | string) => {
       buf += chunk;
       const nl = buf.indexOf("\n");
       if (nl !== -1) {
@@ -55,7 +56,7 @@ async function readLine(): Promise<string> {
   });
 }
 
-async function getSub(argv) {
+async function getSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const filename = args.positional[0];
   if (!filename) die(2, "filename required");
@@ -63,11 +64,11 @@ async function getSub(argv) {
   const browserId = getCliBrowserId();
   const resp = await request(server.base, `/api/annotations/${encodeURIComponent(filename)}`, {
     headers: { "X-Ima2-Browser-Id": browserId },
-  }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
+  }).catch((e: unknown) => { const err = e as { message?: string; code?: string }; die(exitCodeForError(e), `${err.message}${err.code ? ` (${err.code})` : ""}`); });
   json(resp);
 }
 
-async function setSub(argv) {
+async function setSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const filename = args.positional[0];
   if (!filename) die(2, "filename required");
@@ -79,12 +80,12 @@ async function setSub(argv) {
     method: "PUT",
     body,
     headers: { "X-Ima2-Browser-Id": browserId },
-  }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
+  }).catch((e: unknown) => { const err = e as { message?: string; code?: string }; die(exitCodeForError(e), `${err.message}${err.code ? ` (${err.code})` : ""}`); });
   if (args.json) { json(resp); return; }
   out(color.green("✓ annotation saved"));
 }
 
-async function rmSub(argv) {
+async function rmSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const filename = args.positional[0];
   if (!filename) die(2, "filename required");
@@ -99,7 +100,7 @@ async function rmSub(argv) {
   await request(server.base, `/api/annotations/${encodeURIComponent(filename)}`, {
     method: "DELETE",
     headers: { "X-Ima2-Browser-Id": browserId },
-  }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
+  }).catch((e: unknown) => { const err = e as { message?: string; code?: string }; die(exitCodeForError(e), `${err.message}${err.code ? ` (${err.code})` : ""}`); });
   out(color.green("✓ deleted"));
 }
 
@@ -109,7 +110,7 @@ const SUB: Record<string, (argv: any[]) => Promise<void>> = {
   rm: rmSub,
 };
 
-export default async function annotateCmd(argv) {
+export default async function annotateCmd(argv: string[]) {
   const sub = argv[0];
   if (!sub || sub === "--help" || sub === "-h") { out(HELP); return; }
   const handler = SUB[sub];

package/bin/commands/cancel.js

@@ -1,6 +1,7 @@
 import { parseArgs } from "../lib/args.js";
 import { resolveServer, request } from "../lib/client.js";
 import { out, die, dieWithError, color, json } from "../lib/output.js";
+import { errInfo } from "../../lib/errInfo.js";
 const SPEC = {
     flags: {
         json: { type: "boolean" },
@@ -27,8 +28,9 @@ export default async function cancelCmd(argv) {
         server = await resolveServer({ serverFlag: args.server });
     }
     catch (e) {
+        const err = errInfo(e);
         if (args.json)
-            json({ ok: false, requestId, error: e.message, code: e.code, status: e.status });
+            json({ ok: false, requestId, error: err.message, code: err.code, status: err.status });
         dieWithError(e);
     }
     try {
@@ -38,8 +40,9 @@ export default async function cancelCmd(argv) {
         });
     }
     catch (e) {
+        const err = errInfo(e);
         if (args.json)
-            json({ ok: false, requestId, error: e.message, code: e.code, status: e.status });
+            json({ ok: false, requestId, error: err.message, code: err.code, status: err.status });
         dieWithError(e);
     }
     if (args.json)

package/bin/commands/cancel.ts

@@ -2,6 +2,7 @@ import { parseArgs } from "../lib/args.js";
 import { resolveServer, request } from "../lib/client.js";
 import { out, die, dieWithError, color, json } from "../lib/output.js";
 
+import { errInfo } from "../../lib/errInfo.js";
 const SPEC = {
   flags: {
     json: { type: "boolean" },
@@ -16,7 +17,7 @@ const HELP = `
   Mark an in-flight job as canceled in the local ima2 server registry.
 `;
 
-export default async function cancelCmd(argv) {
+export default async function cancelCmd(argv: string[]) {
   const args = parseArgs(argv, SPEC);
   if (args.help) { out(HELP); return; }
 
@@ -26,7 +27,8 @@ export default async function cancelCmd(argv) {
   let server;
   try { server = await resolveServer({ serverFlag: args.server }); }
   catch (e) {
-    if (args.json) json({ ok: false, requestId, error: e.message, code: e.code, status: e.status });
+    const err = errInfo(e);
+    if (args.json) json({ ok: false, requestId, error: err.message, code: err.code, status: err.status });
     dieWithError(e);
   }
 
@@ -36,7 +38,8 @@ export default async function cancelCmd(argv) {
       timeoutMs: 30_000,
     });
   } catch (e) {
-    if (args.json) json({ ok: false, requestId, error: e.message, code: e.code, status: e.status });
+    const err = errInfo(e);
+    if (args.json) json({ ok: false, requestId, error: err.message, code: err.code, status: err.status });
     dieWithError(e);
   }
 

package/bin/commands/canvas-versions.js

@@ -31,9 +31,9 @@ async function getServer(args) {
 function buildHeaders(args) {
     const h = { "Content-Type": "image/png" };
     if (args.source)
-        h["X-Ima2-Canvas-Source-Filename"] = args.source;
+        h["X-Ima2-Canvas-Source-Filename"] = String(args.source);
     if (args.prompt)
-        h["X-Ima2-Canvas-Prompt"] = args.prompt;
+        h["X-Ima2-Canvas-Prompt"] = String(args.prompt);
     return h;
 }
 async function saveSub(argv) {
@@ -48,7 +48,7 @@ async function saveSub(argv) {
         body: buf,
         raw: true,
         headers: buildHeaders(args),
-    }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
+    }).catch((e) => { const err = e; die(exitCodeForError(e), `${err.message}${err.code ? ` (${err.code})` : ""}`); });
     if (args.json) {
         json(resp);
         return;
@@ -67,7 +67,7 @@ async function updateSub(argv) {
         body: buf,
         raw: true,
         headers: buildHeaders(args),
-    }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
+    }).catch((e) => { const err = e; die(exitCodeForError(e), `${err.message}${err.code ? ` (${err.code})` : ""}`); });
     if (args.json) {
         json(resp);
         return;

package/bin/commands/canvas-versions.ts

@@ -1,5 +1,5 @@
 import { readFile } from "fs/promises";
-import { parseArgs } from "../lib/args.js";
+import { parseArgs, type ParsedArgs } from "../lib/args.js";
 import { resolveServer, request } from "../lib/client.js";
 import { out, die, color, json, exitCodeForError } from "../lib/output.js";
 
@@ -22,19 +22,19 @@ const FLAGS = {
   help: { short: "h", type: "boolean" },
 };
 
-async function getServer(args) {
+async function getServer(args: ParsedArgs) {
   try { return await resolveServer({ serverFlag: args.server }); }
   catch (e: any) { die(exitCodeForError(e), e.message); throw e; }
 }
 
-function buildHeaders(args) {
+function buildHeaders(args: ParsedArgs) {
   const h: Record<string, string> = { "Content-Type": "image/png" };
-  if (args.source) h["X-Ima2-Canvas-Source-Filename"] = args.source;
-  if (args.prompt) h["X-Ima2-Canvas-Prompt"] = args.prompt;
+  if (args.source) h["X-Ima2-Canvas-Source-Filename"] = String(args.source);
+  if (args.prompt) h["X-Ima2-Canvas-Prompt"] = String(args.prompt);
   return h;
 }
 
-async function saveSub(argv) {
+async function saveSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const file = args.positional[0];
   if (!file) die(2, "image file required");
@@ -45,12 +45,12 @@ async function saveSub(argv) {
     body: buf,
     raw: true,
     headers: buildHeaders(args),
-  }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
+  }).catch((e: unknown) => { const err = e as { message?: string; code?: string }; die(exitCodeForError(e), `${err.message}${err.code ? ` (${err.code})` : ""}`); });
   if (args.json) { json(resp); return; }
   out(color.green("✓ saved canvas version"));
 }
 
-async function updateSub(argv) {
+async function updateSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const [filename, file] = args.positional;
   if (!filename || !file) die(2, "usage: canvas-versions update <filename> <imagefile>");
@@ -61,7 +61,7 @@ async function updateSub(argv) {
     body: buf,
     raw: true,
     headers: buildHeaders(args),
-  }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
+  }).catch((e: unknown) => { const err = e as { message?: string; code?: string }; die(exitCodeForError(e), `${err.message}${err.code ? ` (${err.code})` : ""}`); });
   if (args.json) { json(resp); return; }
   out(color.green("✓ updated"));
 }
@@ -71,7 +71,7 @@ const SUB: Record<string, (argv: any[]) => Promise<void>> = {
   update: updateSub,
 };
 
-export default async function canvasVersionsCmd(argv) {
+export default async function canvasVersionsCmd(argv: string[]) {
   const sub = argv[0];
   if (!sub || sub === "--help" || sub === "-h") { out(HELP); return; }
   const handler = SUB[sub];

package/bin/commands/cardnews.js

@@ -51,6 +51,8 @@ async function getServer(args) {
 function parseData(raw) {
     if (!raw)
         return {};
+    if (typeof raw !== "string")
+        return {};
     try {
         return JSON.parse(raw);
     }
@@ -201,7 +203,7 @@ async function jobRetrySub(argv) {
     const server = await getServer(args);
     const body = {};
     if (args.cards)
-        body.cardIds = args.cards.split(",").map((s) => s.trim()).filter(Boolean);
+        body.cardIds = String(args.cards).split(",").map((s) => s.trim()).filter(Boolean);
     const resp = await request(server.base, `/api/cardnews/jobs/${encodeURIComponent(jobId)}/retry`, { method: "POST", body })
         .catch((e) => die(exitCodeForError(e), e.message));
     if (args.json) {

package/bin/commands/cardnews.ts

@@ -1,4 +1,4 @@
-import { parseArgs } from "../lib/args.js";
+import { parseArgs, type ParsedArgs } from "../lib/args.js";
 import { resolveServer, request } from "../lib/client.js";
 import { out, die, color, json, exitCodeForError } from "../lib/output.js";
 import { config as runtimeConfig } from "../../config.js";
@@ -43,18 +43,19 @@ function ensureCardNewsEnabled() {
   }
 }
 
-async function getServer(args) {
+async function getServer(args: ParsedArgs) {
   try { return await resolveServer({ serverFlag: args.server }); }
   catch (e: any) { die(exitCodeForError(e), e.message); throw e; }
 }
 
-function parseData(raw: string | undefined): any {
+function parseData(raw: unknown): any {
   if (!raw) return {};
+  if (typeof raw !== "string") return {};
   try { return JSON.parse(raw); }
   catch { die(2, `--data must be valid JSON`); }
 }
 
-async function templatesSub(argv) {
+async function templatesSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   if (args.help) { out(HELP); return; }
   ensureCardNewsEnabled();
@@ -72,7 +73,7 @@ async function templatesSub(argv) {
   out(JSON.stringify(roleTemplates, null, 2));
 }
 
-async function templatePreviewSub(argv) {
+async function templatePreviewSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const templateId = args.positional[0];
   if (!templateId) die(2, "templateId required");
@@ -84,7 +85,7 @@ async function templatePreviewSub(argv) {
   out(JSON.stringify(resp, null, 2));
 }
 
-async function setsSub(argv) {
+async function setsSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   ensureCardNewsEnabled();
   const server = await getServer(args);
@@ -94,7 +95,7 @@ async function setsSub(argv) {
   out(JSON.stringify(resp, null, 2));
 }
 
-async function setShowSub(argv) {
+async function setShowSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const setId = args.positional[0];
   if (!setId) die(2, "setId required");
@@ -106,7 +107,7 @@ async function setShowSub(argv) {
   out(JSON.stringify(resp, null, 2));
 }
 
-async function setManifestSub(argv) {
+async function setManifestSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const setId = args.positional[0];
   if (!setId) die(2, "setId required");
@@ -118,7 +119,7 @@ async function setManifestSub(argv) {
   out(JSON.stringify(resp, null, 2));
 }
 
-async function draftSub(argv) {
+async function draftSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   ensureCardNewsEnabled();
   const server = await getServer(args);
@@ -129,7 +130,7 @@ async function draftSub(argv) {
   out(JSON.stringify(resp, null, 2));
 }
 
-async function generateSub(argv) {
+async function generateSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   ensureCardNewsEnabled();
   const server = await getServer(args);
@@ -140,7 +141,7 @@ async function generateSub(argv) {
   out(JSON.stringify(resp, null, 2));
 }
 
-async function jobCreateSub(argv) {
+async function jobCreateSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   ensureCardNewsEnabled();
   const server = await getServer(args);
@@ -151,7 +152,7 @@ async function jobCreateSub(argv) {
   out(JSON.stringify(resp, null, 2));
 }
 
-async function jobShowSub(argv) {
+async function jobShowSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const jobId = args.positional[0];
   if (!jobId) die(2, "jobId required");
@@ -163,14 +164,14 @@ async function jobShowSub(argv) {
   out(JSON.stringify(resp, null, 2));
 }
 
-async function jobRetrySub(argv) {
+async function jobRetrySub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const jobId = args.positional[0];
   if (!jobId) die(2, "jobId required");
   ensureCardNewsEnabled();
   const server = await getServer(args);
   const body: any = {};
-  if (args.cards) body.cardIds = args.cards.split(",").map((s) => s.trim()).filter(Boolean);
+  if (args.cards) body.cardIds = String(args.cards).split(",").map((s: string) => s.trim()).filter(Boolean);
   const resp = await request(server.base, `/api/cardnews/jobs/${encodeURIComponent(jobId)}/retry`, { method: "POST", body })
     .catch((e) => die(exitCodeForError(e), e.message));
   if (args.json) { json(resp); return; }
@@ -178,7 +179,7 @@ async function jobRetrySub(argv) {
   if (resp && typeof resp === "object" && Object.keys(resp).length > 0) out(JSON.stringify(resp, null, 2));
 }
 
-async function cardRegenerateSub(argv) {
+async function cardRegenerateSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const cardId = args.positional[0];
   if (!cardId) die(2, "cardId required");
@@ -192,7 +193,7 @@ async function cardRegenerateSub(argv) {
   if (resp && typeof resp === "object" && Object.keys(resp).length > 0) out(JSON.stringify(resp, null, 2));
 }
 
-async function exportSub(argv) {
+async function exportSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   ensureCardNewsEnabled();
   const server = await getServer(args);
@@ -206,7 +207,7 @@ async function exportSub(argv) {
 
 type Sub = (argv: any[]) => Promise<void>;
 
-export default async function cardnewsCmd(argv) {
+export default async function cardnewsCmd(argv: string[]) {
   const sub = argv[0];
   if (!sub || sub === "--help" || sub === "-h") { out(HELP); return; }
 

package/bin/commands/comfy.js

@@ -31,8 +31,8 @@ async function exportSub(argv) {
     const resp = await request(server.base, "/api/comfy/export-image", {
         method: "POST",
         body: { filename },
-    }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
-    const target = args.out || `${filename}.workflow.json`;
+    }).catch((e) => { const err = e; die(exitCodeForError(e), `${err.message}${err.code ? ` (${err.code})` : ""}`); });
+    const target = String(args.out || `${filename}.workflow.json`);
     if (!args.force) {
         try {
             await access(target);

package/bin/commands/comfy.ts

@@ -18,7 +18,7 @@ const FLAGS = {
   help: { short: "h", type: "boolean" },
 };
 
-async function exportSub(argv) {
+async function exportSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const filename = args.positional[0];
   if (!filename) die(2, "filename required");
@@ -28,8 +28,8 @@ async function exportSub(argv) {
   const resp: any = await request(server.base, "/api/comfy/export-image", {
     method: "POST",
     body: { filename },
-  }).catch((e) => die(exitCodeForError(e), `${e.message}${e.code ? ` (${e.code})` : ""}`));
-  const target = args.out || `${filename}.workflow.json`;
+  }).catch((e: unknown) => { const err = e as { message?: string; code?: string }; die(exitCodeForError(e), `${err.message}${err.code ? ` (${err.code})` : ""}`); });
+  const target = String(args.out || `${filename}.workflow.json`);
   if (!args.force) {
     try {
       await access(target);
@@ -45,7 +45,7 @@ const SUB: Record<string, (argv: any[]) => Promise<void>> = {
   export: exportSub,
 };
 
-export default async function comfyCmd(argv) {
+export default async function comfyCmd(argv: string[]) {
   const sub = argv[0];
   if (!sub || sub === "--help" || sub === "-h") { out(HELP); return; }
   const handler = SUB[sub];

package/bin/commands/config.ts

@@ -156,11 +156,11 @@ function displayPath(p: string): string {
   return home && p.startsWith(home) ? p.replace(home, "~") : p;
 }
 
-async function pathSub(_argv) {
+async function pathSub(_argv: string[]) {
   out(CONFIG_FILE);
 }
 
-async function lsSub(argv) {
+async function lsSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   if (args.effective) {
     const eff = buildEffectiveConfig();
@@ -173,7 +173,7 @@ async function lsSub(argv) {
   }
 }
 
-async function getSub(argv) {
+async function getSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const key = args.positional[0];
   if (!key) die(2, "key required. Usage: config get <dotted.key>");
@@ -188,7 +188,7 @@ async function getSub(argv) {
   }
 }
 
-async function setSub(argv) {
+async function setSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const [key, rawValue] = args.positional;
   if (!key || rawValue === undefined) die(2, "usage: config set <key> <value>");
@@ -227,7 +227,7 @@ async function setSub(argv) {
   out(color.dim("note: server must be restarted to pick up config changes (run `ima2 serve`)"));
 }
 
-async function rmSub(argv) {
+async function rmSub(argv: string[]) {
   const args = parseArgs(argv, { flags: FLAGS });
   const key = args.positional[0];
   if (!key) die(2, "key required. Usage: config rm <key>");
@@ -256,7 +256,7 @@ const SUB: Record<string, Sub> = {
   rm:   rmSub,
 };
 
-export default async function configCmd(argv) {
+export default async function configCmd(argv: string[]) {
   const sub = argv[0];
   if (!sub || sub === "--help" || sub === "-h") { out(HELP); return; }
   const handler = SUB[sub];

package/bin/commands/edit.js

@@ -3,6 +3,7 @@ import { resolveServer, request } from "../lib/client.js";
 import { fileToDataUri, dataUriToFile, defaultOutName } from "../lib/files.js";
 import { out, die, dieWithError, color, json } from "../lib/output.js";
 import { config } from "../../config.js";
+import { errInfo } from "../../lib/errInfo.js";
 const VALID_MODES = new Set(["auto", "direct"]);
 const VALID_MODERATION = new Set(["auto", "low"]);
 const KNOWN_IMAGE_MODELS = new Set(["gpt-5.5", "gpt-5.4", "gpt-5.4-mini", "gpt-5.3-codex-spark"]);
@@ -54,15 +55,15 @@ export default async function editCmd(argv) {
         die(2, "input image path required");
     if (!args.prompt)
         die(2, "--prompt is required");
-    if (!VALID_MODES.has(args.mode))
+    if (!VALID_MODES.has(String(args.mode)))
         die(2, "--mode must be one of: auto, direct");
-    if (!VALID_MODERATION.has(args.moderation))
+    if (!VALID_MODERATION.has(String(args.moderation)))
         die(2, "--moderation must be one of: auto, low");
-    if (args.model && !KNOWN_IMAGE_MODELS.has(args.model)) {
+    if (args.model && !KNOWN_IMAGE_MODELS.has(String(args.model))) {
         die(2, "--model must be one of: gpt-5.5, gpt-5.4, gpt-5.4-mini, gpt-5.3-codex-spark");
     }
     const VALID_REASONING = new Set(["none", "low", "medium", "high", "xhigh"]);
-    if (args["reasoning-effort"] && !VALID_REASONING.has(args["reasoning-effort"])) {
+    if (args["reasoning-effort"] && !VALID_REASONING.has(String(args["reasoning-effort"]))) {
         die(2, "--reasoning-effort must be one of: none, low, medium, high, xhigh");
     }
     if (args["web-search"] && args["no-web-search"]) {
@@ -73,13 +74,14 @@ export default async function editCmd(argv) {
         server = await resolveServer({ serverFlag: args.server });
     }
     catch (e) {
+        const err = errInfo(e);
         if (args.json)
-            json({ ok: false, error: e.message, code: e.code, status: e.status });
+            json({ ok: false, error: err.message, code: err.code, status: err.status });
         dieWithError(e);
     }
     const imageDataUri = await fileToDataUri(input);
     const imageB64 = imageDataUri.split(",")[1];
-    const timeoutMs = (parseInt(args.timeout) || 180) * 1000;
+    const timeoutMs = (parseInt(String(args.timeout)) || 180) * 1000;
     let resp;
     try {
         const editBody = {
@@ -105,15 +107,16 @@ export default async function editCmd(argv) {
         });
     }
     catch (e) {
+        const err = errInfo(e);
         if (args.json)
-            json({ ok: false, error: e.message, code: e.code });
+            json({ ok: false, error: err.message, code: err.code });
         dieWithError(e);
     }
     const image = resp.image;
     if (!image)
         die(1, "server returned no image");
     const target = args.out || `${config.storage.generatedDir}/${defaultOutName(0, 1)}`;
-    await dataUriToFile(image, target);
+    await dataUriToFile(image, String(target));
     if (args.json) {
         json({ ok: true, path: target, requestId: resp.requestId, elapsed: resp.elapsed });
     }