ima2-gen 1.1.7 → 1.1.9

package/bin/commands/edit.js

@@ -3,28 +3,28 @@ 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";
-
 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"]);
-
 const SPEC = {
-  flags: {
-    prompt:  { short: "p", type: "string" },
-    quality: { short: "q", type: "string", default: "low" },
-    size:    { short: "s", type: "string", default: "1024x1024" },
-    out:     { short: "o", type: "string" },
-    json:    {              type: "boolean" },
-    timeout: {              type: "string", default: "180" },
-    server:  {              type: "string" },
-    model:   {              type: "string" },
-    mode:    {              type: "string", default: "auto" },
-    moderation: {            type: "string", default: "low" },
-    session: {              type: "string" },
-    help:    { short: "h", type: "boolean" },
-  },
+    flags: {
+        prompt: { short: "p", type: "string" },
+        quality: { short: "q", type: "string", default: "low" },
+        size: { short: "s", type: "string", default: "1024x1024" },
+        out: { short: "o", type: "string" },
+        json: { type: "boolean" },
+        timeout: { type: "string", default: "180" },
+        server: { type: "string" },
+        model: { type: "string" },
+        mode: { type: "string", default: "auto" },
+        moderation: { type: "string", default: "low" },
+        session: { type: "string" },
+        "reasoning-effort": { type: "string" },
+        "web-search": { type: "boolean" },
+        "no-web-search": { type: "boolean" },
+        help: { short: "h", type: "boolean" },
+    },
 };
-
 const HELP = `
   ima2 edit <file> --prompt "<text>" [options]
 
@@ -40,61 +40,86 @@ const HELP = `
         --mode <auto|direct>       Prompt handling mode. Default: auto
         --moderation <auto|low>    Default: low
         --session <id>             Apply session style sheet if enabled
+        --reasoning-effort <none|low|medium|high|xhigh>
+        --web-search / --no-web-search    Override default web-search toggle
 `;
-
 export default async function editCmd(argv) {
-  const args = parseArgs(argv, SPEC);
-  if (args.help) { out(HELP); return; }
-  const input = args.positional[0];
-  if (!input) die(2, "input image path required");
-  if (!args.prompt) die(2, "--prompt is required");
-  if (!VALID_MODES.has(args.mode)) die(2, "--mode must be one of: auto, direct");
-  if (!VALID_MODERATION.has(args.moderation)) die(2, "--moderation must be one of: auto, low");
-  if (args.model && !KNOWN_IMAGE_MODELS.has(args.model)) {
-    die(2, "--model must be one of: gpt-5.5, gpt-5.4, gpt-5.4-mini, gpt-5.3-codex-spark");
-  }
-
-  let server;
-  try { server = await resolveServer({ serverFlag: args.server }); }
-  catch (e) {
-    if (args.json) json({ ok: false, error: e.message, code: e.code, status: e.status });
-    dieWithError(e);
-  }
-
-  const imageDataUri = await fileToDataUri(input);
-  const imageB64 = imageDataUri.split(",")[1];
-
-  const timeoutMs = (parseInt(args.timeout) || 180) * 1000;
-  let resp;
-  try {
-    resp = await request(server.base, "/api/edit", {
-      method: "POST",
-      body: {
-        prompt: args.prompt,
-        image: imageB64,
-        quality: args.quality,
-        size: args.size,
-        model: args.model,
-        mode: args.mode,
-        moderation: args.moderation,
-        sessionId: args.session,
-      },
-      timeoutMs,
-    });
-  } catch (e) {
-    if (args.json) json({ ok: false, error: e.message, code: e.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);
-
-  if (args.json) {
-    json({ ok: true, path: target, requestId: resp.requestId, elapsed: resp.elapsed });
-  } else {
-    out(color.green("✓ ") + target);
-    if (resp.elapsed) out(color.dim(`elapsed ${resp.elapsed}s`));
-  }
+    const args = parseArgs(argv, SPEC);
+    if (args.help) {
+        out(HELP);
+        return;
+    }
+    const input = args.positional[0];
+    if (!input)
+        die(2, "input image path required");
+    if (!args.prompt)
+        die(2, "--prompt is required");
+    if (!VALID_MODES.has(args.mode))
+        die(2, "--mode must be one of: auto, direct");
+    if (!VALID_MODERATION.has(args.moderation))
+        die(2, "--moderation must be one of: auto, low");
+    if (args.model && !KNOWN_IMAGE_MODELS.has(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"])) {
+        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");
+    }
+    let server;
+    try {
+        server = await resolveServer({ serverFlag: args.server });
+    }
+    catch (e) {
+        if (args.json)
+            json({ ok: false, error: e.message, code: e.code, status: e.status });
+        dieWithError(e);
+    }
+    const imageDataUri = await fileToDataUri(input);
+    const imageB64 = imageDataUri.split(",")[1];
+    const timeoutMs = (parseInt(args.timeout) || 180) * 1000;
+    let resp;
+    try {
+        const editBody = {
+            prompt: args.prompt,
+            image: imageB64,
+            quality: args.quality,
+            size: args.size,
+            model: args.model,
+            mode: args.mode,
+            moderation: args.moderation,
+            sessionId: args.session,
+        };
+        if (args["reasoning-effort"])
+            editBody.reasoningEffort = args["reasoning-effort"];
+        if (args["no-web-search"])
+            editBody.webSearchEnabled = false;
+        else if (args["web-search"])
+            editBody.webSearchEnabled = true;
+        resp = await request(server.base, "/api/edit", {
+            method: "POST",
+            body: editBody,
+            timeoutMs,
+        });
+    }
+    catch (e) {
+        if (args.json)
+            json({ ok: false, error: e.message, code: e.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);
+    if (args.json) {
+        json({ ok: true, path: target, requestId: resp.requestId, elapsed: resp.elapsed });
+    }
+    else {
+        out(color.green("✓ ") + target);
+        if (resp.elapsed)
+            out(color.dim(`elapsed ${resp.elapsed}s`));
+    }
 }

package/bin/commands/edit.ts

@@ -0,0 +1,116 @@
+import { parseArgs } from "../lib/args.js";
+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";
+
+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"]);
+
+const SPEC = {
+  flags: {
+    prompt:  { short: "p", type: "string" },
+    quality: { short: "q", type: "string", default: "low" },
+    size:    { short: "s", type: "string", default: "1024x1024" },
+    out:     { short: "o", type: "string" },
+    json:    {              type: "boolean" },
+    timeout: {              type: "string", default: "180" },
+    server:  {              type: "string" },
+    model:   {              type: "string" },
+    mode:    {              type: "string", default: "auto" },
+    moderation: {            type: "string", default: "low" },
+    session: {              type: "string" },
+    "reasoning-effort": {  type: "string" },
+    "web-search":      {  type: "boolean" },
+    "no-web-search":   {  type: "boolean" },
+    help:    { short: "h", type: "boolean" },
+  },
+};
+
+const HELP = `
+  ima2 edit <file> --prompt "<text>" [options]
+
+  Edit an existing image (inpainting-style).
+
+  Options:
+    -p, --prompt <text>        Edit instruction (required)
+    -q, --quality <low|medium|high>
+    -s, --size <WxH>
+    -o, --out <file>
+        --json
+        --model <gpt-5.5|gpt-5.4|gpt-5.4-mini>
+        --mode <auto|direct>       Prompt handling mode. Default: auto
+        --moderation <auto|low>    Default: low
+        --session <id>             Apply session style sheet if enabled
+        --reasoning-effort <none|low|medium|high|xhigh>
+        --web-search / --no-web-search    Override default web-search toggle
+`;
+
+export default async function editCmd(argv) {
+  const args = parseArgs(argv, SPEC);
+  if (args.help) { out(HELP); return; }
+  const input = args.positional[0];
+  if (!input) die(2, "input image path required");
+  if (!args.prompt) die(2, "--prompt is required");
+  if (!VALID_MODES.has(args.mode)) die(2, "--mode must be one of: auto, direct");
+  if (!VALID_MODERATION.has(args.moderation)) die(2, "--moderation must be one of: auto, low");
+  if (args.model && !KNOWN_IMAGE_MODELS.has(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"])) {
+    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");
+  }
+
+  let server;
+  try { server = await resolveServer({ serverFlag: args.server }); }
+  catch (e) {
+    if (args.json) json({ ok: false, error: e.message, code: e.code, status: e.status });
+    dieWithError(e);
+  }
+
+  const imageDataUri = await fileToDataUri(input);
+  const imageB64 = imageDataUri.split(",")[1];
+
+  const timeoutMs = (parseInt(args.timeout) || 180) * 1000;
+  let resp;
+  try {
+    const editBody: any = {
+      prompt: args.prompt,
+      image: imageB64,
+      quality: args.quality,
+      size: args.size,
+      model: args.model,
+      mode: args.mode,
+      moderation: args.moderation,
+      sessionId: args.session,
+    };
+    if (args["reasoning-effort"]) editBody.reasoningEffort = args["reasoning-effort"];
+    if (args["no-web-search"]) editBody.webSearchEnabled = false;
+    else if (args["web-search"]) editBody.webSearchEnabled = true;
+    resp = await request(server.base, "/api/edit", {
+      method: "POST",
+      body: editBody,
+      timeoutMs,
+    });
+  } catch (e) {
+    if (args.json) json({ ok: false, error: e.message, code: e.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);
+
+  if (args.json) {
+    json({ ok: true, path: target, requestId: resp.requestId, elapsed: resp.elapsed });
+  } else {
+    out(color.green("✓ ") + target);
+    if (resp.elapsed) out(color.dim(`elapsed ${resp.elapsed}s`));
+  }
+}

package/bin/commands/gen.js

@@ -3,33 +3,33 @@ import { resolveServer, request, normalizeGenerate } from "../lib/client.js";
 import { fileToDataUri, dataUriToFile, defaultOutName, readStdin } from "../lib/files.js";
 import { out, die, dieWithError, color, json } from "../lib/output.js";
 import { config } from "../../config.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"]);
-
 const SPEC = {
-  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" },
-    "out-dir": { short: "d", type: "string" },
-    json:      {              type: "boolean" },
-    "no-save": {              type: "boolean" },
-    force:     {              type: "boolean" },
-    stdin:     {              type: "boolean" },
-    timeout:   {              type: "string", default: "180" },
-    server:    {              type: "string" },
-    model:     {              type: "string" },
-    mode:      {              type: "string", default: "auto" },
-    moderation: {              type: "string", default: "low" },
-    session:   {              type: "string" },
-    help:      { short: "h", type: "boolean" },
-  },
+    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" },
+        "out-dir": { short: "d", type: "string" },
+        json: { type: "boolean" },
+        "no-save": { type: "boolean" },
+        force: { type: "boolean" },
+        stdin: { type: "boolean" },
+        timeout: { type: "string", default: "180" },
+        server: { type: "string" },
+        model: { type: "string" },
+        mode: { type: "string", default: "auto" },
+        moderation: { type: "string", default: "low" },
+        session: { type: "string" },
+        "reasoning-effort": { type: "string" },
+        "web-search": { type: "boolean" },
+        "no-web-search": { type: "boolean" },
+        help: { short: "h", type: "boolean" },
+    },
 };
-
 const HELP = `
   ima2 gen <prompt...> [options]
 
@@ -51,6 +51,9 @@ const HELP = `
         --mode <auto|direct>                Prompt handling mode. Default: auto
         --moderation <auto|low>             Default: low
         --session <id>                      Apply session style sheet if enabled
+        --reasoning-effort <none|low|medium|high|xhigh>
+                                            Override server's reasoning effort
+        --web-search / --no-web-search      Override default web-search toggle
 
   Examples:
     ima2 gen "a shiba in space"
@@ -58,103 +61,122 @@ const HELP = `
     ima2 gen "merge" --ref a.png --ref b.png -q high -o out.png
     cat prompt.txt | ima2 gen --stdin -n 2 -d ./out
 `;
-
 export default async function genCmd(argv) {
-  const args = parseArgs(argv, SPEC);
-  if (args.help) { out(HELP); return; }
-
-  let prompt = args.positional.join(" ");
-  if (args.stdin) {
-    const piped = await readStdin();
-    if (piped) prompt = prompt ? `${prompt} ${piped}` : piped;
-  }
-  if (!prompt) die(2, "prompt is required (positional or via --stdin)");
-
-  const refs = args.ref || [];
-  if (refs.length > 5) die(2, "max 5 --ref attachments");
-  if (!VALID_MODES.has(args.mode)) die(2, "--mode must be one of: auto, direct");
-  if (!VALID_MODERATION.has(args.moderation)) die(2, "--moderation must be one of: auto, low");
-  if (args.model && !KNOWN_IMAGE_MODELS.has(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 n = Math.max(1, Math.min(8, parseInt(args.count) || 1));
-  const timeoutMs = (parseInt(args.timeout) || 180) * 1000;
-
-  let server;
-  try {
-    server = await resolveServer({ serverFlag: args.server });
-  } catch (e) {
-    if (args.json) json({ ok: false, error: e.message, code: e.code, status: e.status });
-    dieWithError(e);
-  }
-
-  const references = await Promise.all(refs.map((p) => fileToDataUri(p)));
-
-  const body = {
-    prompt,
-    quality: args.quality,
-    size: args.size,
-    n,
-    references,
-    model: args.model,
-    mode: args.mode,
-    moderation: args.moderation,
-    sessionId: args.session,
-  };
-
-  let resp;
-  try {
-    resp = await request(server.base, "/api/generate", { method: "POST", body, timeoutMs });
-  } catch (e) {
-    if (args.json) json({ ok: false, error: e.message, code: e.code, status: e.status });
-    dieWithError(e);
-  }
-
-  const norm = normalizeGenerate(resp);
-  if (norm.images.length === 0) die(1, "server returned no images");
-
-  // --no-save path
-  if (args["no-save"]) {
-    const totalBytes = norm.images.reduce((s, im) => s + im.image.length, 0);
-    if (process.stdout.isTTY && totalBytes > 2 * 1024 * 1024 && !args.force) {
-      die(2, "refusing to print >2MB of b64 to TTY; use --force or drop --no-save");
+    const args = parseArgs(argv, SPEC);
+    if (args.help) {
+        out(HELP);
+        return;
     }
-    for (const im of norm.images) out(im.image);
-    return;
-  }
-
-  // Save path
-  const outDir = args["out-dir"] || null;
-  const explicitOut = args.out || null;
-  if (explicitOut && norm.images.length > 1) {
-    die(2, "--out only supports a single image; use --out-dir for n>1");
-  }
-
-  const savedPaths = [];
-  for (let i = 0; i < norm.images.length; i++) {
-    const im = norm.images[i];
-    let target;
-    if (explicitOut) {
-      target = explicitOut;
-    } else if (outDir) {
-      target = `${outDir}/${defaultOutName(i, norm.images.length)}`;
-    } else {
-      target = `${config.storage.generatedDir}/${defaultOutName(i, norm.images.length)}`;
+    let prompt = args.positional.join(" ");
+    if (args.stdin) {
+        const piped = await readStdin();
+        if (piped)
+            prompt = prompt ? `${prompt} ${piped}` : piped;
+    }
+    if (!prompt)
+        die(2, "prompt is required (positional or via --stdin)");
+    const refs = args.ref || [];
+    if (refs.length > 5)
+        die(2, "max 5 --ref attachments");
+    if (!VALID_MODES.has(args.mode))
+        die(2, "--mode must be one of: auto, direct");
+    if (!VALID_MODERATION.has(args.moderation))
+        die(2, "--moderation must be one of: auto, low");
+    if (args.model && !KNOWN_IMAGE_MODELS.has(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"])) {
+        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 n = Math.max(1, Math.min(8, parseInt(args.count) || 1));
+    const timeoutMs = (parseInt(args.timeout) || 180) * 1000;
+    let server;
+    try {
+        server = await resolveServer({ serverFlag: args.server });
+    }
+    catch (e) {
+        if (args.json)
+            json({ ok: false, error: e.message, code: e.code, status: e.status });
+        dieWithError(e);
+    }
+    const references = await Promise.all(refs.map((p) => fileToDataUri(p)));
+    const body = {
+        prompt,
+        quality: args.quality,
+        size: args.size,
+        n,
+        references,
+        model: args.model,
+        mode: args.mode,
+        moderation: args.moderation,
+        sessionId: args.session,
+    };
+    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;
+    let resp;
+    try {
+        resp = await request(server.base, "/api/generate", { method: "POST", body, timeoutMs });
+    }
+    catch (e) {
+        if (args.json)
+            json({ ok: false, error: e.message, code: e.code, status: e.status });
+        dieWithError(e);
+    }
+    const norm = normalizeGenerate(resp);
+    if (norm.images.length === 0)
+        die(1, "server returned no images");
+    // --no-save path
+    if (args["no-save"]) {
+        const totalBytes = norm.images.reduce((s, im) => s + im.image.length, 0);
+        if (process.stdout.isTTY && totalBytes > 2 * 1024 * 1024 && !args.force) {
+            die(2, "refusing to print >2MB of b64 to TTY; use --force or drop --no-save");
+        }
+        for (const im of norm.images)
+            out(im.image);
+        return;
+    }
+    // Save path
+    const outDir = args["out-dir"] || null;
+    const explicitOut = args.out || null;
+    if (explicitOut && norm.images.length > 1) {
+        die(2, "--out only supports a single image; use --out-dir for n>1");
+    }
+    const savedPaths = [];
+    for (let i = 0; i < norm.images.length; i++) {
+        const im = norm.images[i];
+        let target;
+        if (explicitOut) {
+            target = explicitOut;
+        }
+        else if (outDir) {
+            target = `${outDir}/${defaultOutName(i, norm.images.length)}`;
+        }
+        else {
+            target = `${config.storage.generatedDir}/${defaultOutName(i, norm.images.length)}`;
+        }
+        await dataUriToFile(im.image, target);
+        savedPaths.push(target);
+    }
+    if (args.json) {
+        json({
+            ok: true,
+            requestId: norm.requestId,
+            elapsed: norm.elapsed,
+            images: savedPaths.map((p, i) => ({ path: p, filename: norm.images[i].filename })),
+        });
+    }
+    else {
+        for (const p of savedPaths)
+            out(color.green("✓ ") + p);
+        if (norm.elapsed)
+            out(color.dim(`elapsed ${norm.elapsed}s`));
     }
-    await dataUriToFile(im.image, target);
-    savedPaths.push(target);
-  }
-
-  if (args.json) {
-    json({
-      ok: true,
-      requestId: norm.requestId,
-      elapsed: norm.elapsed,
-      images: savedPaths.map((p, i) => ({ path: p, filename: norm.images[i].filename })),
-    });
-  } else {
-    for (const p of savedPaths) out(color.green("✓ ") + p);
-    if (norm.elapsed) out(color.dim(`elapsed ${norm.elapsed}s`));
-  }
 }