ima2-gen 1.1.21 → 1.1.22

package/bin/commands/defaults.ts

@@ -1,192 +0,0 @@
-import { config } from "../../config.js";
-import { parseArgs } from "../lib/args.js";
-import { resolveServer, request } from "../lib/client.js";
-import {
-  buildEffectiveConfig,
-  deleteNestedKey,
-  displayPath,
-  envOverrideForKey,
-  getNestedKey,
-  loadFileCfg,
-  restartNotice,
-  saveFileCfg,
-  setNestedKey,
-  CONFIG_FILE,
-} from "../lib/config-store.js";
-import { color, die, dieWithError, json, out } from "../lib/output.js";
-
-const MODEL_KEYS = ["imageModels.default", "apiProvider.defaultImageModel"] as const;
-const REASONING_KEYS = ["imageModels.reasoningEffort", "apiProvider.defaultReasoningEffort"] as const;
-
-const HELP = `
-  ima2 defaults [subcommand] [options]
-
-  Inspect or change persistent model/reasoning defaults.
-
-  Subcommands:
-    ls                         Show effective defaults
-    set model <model>          Persist default model for GPT OAuth and API paths
-    set reasoning <effort>     Persist default reasoning effort for GPT OAuth and API paths
-    reset model                Remove persisted model defaults
-    reset reasoning            Remove persisted reasoning defaults
-
-  Options:
-    --json                     Print JSON
-    --local                    Do not query running server
-    --server <url>             Query a specific running server for ls/default output
-`;
-
-const FLAGS = {
-  json: { type: "boolean" },
-  local: { type: "boolean" },
-  server: { type: "string" },
-  help: { short: "h", type: "boolean" },
-};
-
-function localDefaults() {
-  const effective = buildEffectiveConfig();
-  return {
-    ok: true,
-    source: "local",
-    server: null,
-    defaults: {
-      oauth: {
-        model: getNestedKey(effective, "imageModels.default"),
-        reasoningEffort: getNestedKey(effective, "imageModels.reasoningEffort"),
-      },
-      api: {
-        model: getNestedKey(effective, "apiProvider.defaultImageModel"),
-        reasoningEffort: getNestedKey(effective, "apiProvider.defaultReasoningEffort"),
-        size: getNestedKey(effective, "apiProvider.defaultSize"),
-        webSearchEnabled: getNestedKey(effective, "apiProvider.allowWebSearch"),
-      },
-    },
-  };
-}
-
-async function readDefaults(args: ReturnType<typeof parseArgs>) {
-  if (args.local) return localDefaults();
-  try {
-    const server = await resolveServer({ serverFlag: args.server });
-    const capabilities = await request(server.base, "/api/capabilities", { timeoutMs: 5000 });
-    return {
-      ok: true,
-      source: "server",
-      server: server.base,
-      defaults: capabilities.defaults,
-    };
-  } catch (error) {
-    if (args.server) throw error;
-    return localDefaults();
-  }
-}
-
-function printDefaults(payload: any): void {
-  out(`ima2 defaults (${payload.source})`);
-  out(`server: ${payload.server || "none"}`);
-  out("");
-  out(`oauth model: ${payload.defaults?.oauth?.model}`);
-  out(`oauth reasoning: ${payload.defaults?.oauth?.reasoningEffort}`);
-  out(`api model: ${payload.defaults?.api?.model}`);
-  out(`api reasoning: ${payload.defaults?.api?.reasoningEffort}`);
-  if (payload.defaults?.api?.size) out(`api size: ${payload.defaults.api.size}`);
-  if (payload.defaults?.api?.webSearchEnabled !== undefined) {
-    out(`api web search: ${payload.defaults.api.webSearchEnabled ? "enabled" : "disabled"}`);
-  }
-}
-
-function validateModel(value: string): void {
-  if (!config.imageModels.valid.has(value)) {
-    die(2, `model must be one of: ${Array.from(config.imageModels.valid).join(", ")}`);
-  }
-}
-
-function validateReasoning(value: string): void {
-  if (!config.imageModels.validReasoningEfforts.has(value)) {
-    die(2, `reasoning must be one of: ${Array.from(config.imageModels.validReasoningEfforts).join(", ")}`);
-  }
-}
-
-function warnOverrides(keys: readonly string[]): void {
-  for (const key of keys) {
-    const override = envOverrideForKey(key);
-    if (!override) continue;
-    out(color.yellow(`warning: env ${override.envVar}=${override.value} is currently overriding ${key}.`));
-  }
-}
-
-function setDefaults(keys: readonly string[], value: string): void {
-  const fileCfg = loadFileCfg();
-  for (const key of keys) setNestedKey(fileCfg, key, value);
-  saveFileCfg(fileCfg);
-  warnOverrides(keys);
-  out(color.green("✓ ") + `wrote ${keys.join(", ")}=${JSON.stringify(value)} to ${displayPath(CONFIG_FILE)}`);
-  out(color.dim(restartNotice()));
-}
-
-function resetDefaults(keys: readonly string[]): void {
-  const fileCfg = loadFileCfg();
-  let changed = false;
-  for (const key of keys) changed = deleteNestedKey(fileCfg, key) || changed;
-  if (!changed) {
-    out(color.dim(`(no persisted defaults found for ${keys.join(", ")})`));
-    return;
-  }
-  saveFileCfg(fileCfg);
-  out(color.green("✓ ") + `removed ${keys.join(", ")} from ${displayPath(CONFIG_FILE)}`);
-  out(color.dim(restartNotice()));
-}
-
-async function listSub(argv: string[]): Promise<void> {
-  const args = parseArgs(argv, { flags: FLAGS });
-  try {
-    const payload = await readDefaults(args);
-    if (args.json) json(payload);
-    else printDefaults(payload);
-  } catch (error) {
-    dieWithError(error);
-  }
-}
-
-async function setSub(argv: string[]): Promise<void> {
-  const args = parseArgs(argv, { flags: FLAGS });
-  const [target, value] = args.positional;
-  if (!target || !value) die(2, "usage: defaults set <model|reasoning> <value>");
-  if (target === "model") {
-    validateModel(value);
-    setDefaults(MODEL_KEYS, value);
-    return;
-  }
-  if (target === "reasoning") {
-    validateReasoning(value);
-    setDefaults(REASONING_KEYS, value);
-    return;
-  }
-  die(2, "target must be one of: model, reasoning");
-}
-
-async function resetSub(argv: string[]): Promise<void> {
-  const args = parseArgs(argv, { flags: FLAGS });
-  const target = args.positional[0];
-  if (target === "model") {
-    resetDefaults(MODEL_KEYS);
-    return;
-  }
-  if (target === "reasoning") {
-    resetDefaults(REASONING_KEYS);
-    return;
-  }
-  die(2, "usage: defaults reset <model|reasoning>");
-}
-
-export default async function defaultsCmd(argv: string[]) {
-  const sub = argv[0];
-  if (sub === "--help" || sub === "-h") {
-    out(HELP);
-    return;
-  }
-  if (!sub || sub === "ls" || sub.startsWith("-")) return listSub(sub === "ls" ? argv.slice(1) : argv);
-  if (sub === "set") return setSub(argv.slice(1));
-  if (sub === "reset") return resetSub(argv.slice(1));
-  die(2, `unknown subcommand: ${sub}\n${HELP}`);
-}

package/bin/commands/doctor.ts

@@ -1,202 +0,0 @@
-import { createRequire } from "module";
-import { existsSync, readFileSync } from "fs";
-import { dirname, join } from "path";
-import { fileURLToPath } from "url";
-import { buildHardeningDoctorLines } from "../lib/doctor-checks.js";
-import { buildStorageDoctorLines } from "../lib/storage-doctor.js";
-import { detectCodexAuth } from "../../lib/codexDetect.js";
-import { runImageDoctorProbe } from "../../lib/responsesDoctor.js";
-import { config as runtimeConfig } from "../../config.js";
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const ROOT = join(__dirname, "../..");
-const requireFromRoot = createRequire(join(ROOT, "package.json"));
-const CONFIG_FILE = runtimeConfig.storage.configFile;
-const LEGACY_CONFIG_FILE = join(ROOT, ".ima2", "config.json");
-
-let pkg = { version: "?", name: "ima2-gen" };
-try {
-  pkg = JSON.parse(readFileSync(join(ROOT, "package.json"), "utf-8"));
-} catch {}
-
-function loadConfig() {
-  if (existsSync(CONFIG_FILE)) {
-    return JSON.parse(readFileSync(CONFIG_FILE, "utf-8"));
-  }
-  if (existsSync(LEGACY_CONFIG_FILE)) {
-    try { return JSON.parse(readFileSync(LEGACY_CONFIG_FILE, "utf-8")); } catch {}
-  }
-  return {};
-}
-
-function missingRuntimeDeps() {
-  const deps = ["express", "better-sqlite3", "openai", "openai-oauth", "progrok/package.json"];
-  return deps.filter((dep) => {
-    try {
-      requireFromRoot.resolve(dep);
-      return false;
-    } catch {
-      return true;
-    }
-  }).map((dep) => dep === "progrok/package.json" ? "progrok" : dep);
-}
-
-function valueAfter(args: string[], name: string) {
-  const index = args.indexOf(name);
-  if (index === -1) return null;
-  return args[index + 1] || null;
-}
-
-function showImageProbeHelp() {
-  console.log(`
-  Usage: ima2 doctor image-probe [options]
-
-  Runs live, sanitized Responses probes for EMPTY_RESPONSE diagnosis.
-  The output never includes prompt text, auth tokens, URLs with credentials, or base64 image data.
-
-  Options:
-    --json                 Emit machine-readable JSON
-    --matrix               Add current-payload web_search/tool_choice probes
-    --provider <api|oauth> Override configured provider
-    --model <model>        Override image-capable Responses model
-    --size <size>          Default: 1024x1024
-    --quality <quality>    Default: low
-    --moderation <value>   Default: low
-    --prompt <text>        Override built-in cat prompt
-    --oauth-url <url>      Override GPT OAuth proxy URL
-    --timeout-ms <ms>      Per-probe timeout
-`);
-}
-
-async function imageProbe(args: string[]) {
-  if (args.includes("-h") || args.includes("--help")) {
-    showImageProbeHelp();
-    return;
-  }
-  const fileConfig = loadConfig();
-  const result = await runImageDoctorProbe({
-    provider: valueAfter(args, "--provider") || fileConfig.provider || "oauth",
-    apiKey: typeof fileConfig.apiKey === "string" ? fileConfig.apiKey : undefined,
-    oauthUrl: valueAfter(args, "--oauth-url") || undefined,
-    model: valueAfter(args, "--model") || runtimeConfig.imageModels?.default || "gpt-5.4-mini",
-    size: valueAfter(args, "--size") || "1024x1024",
-    quality: valueAfter(args, "--quality") || "low",
-    moderation: valueAfter(args, "--moderation") || "low",
-    prompt: valueAfter(args, "--prompt") || undefined,
-    matrix: args.includes("--matrix"),
-    timeoutMs: Number(valueAfter(args, "--timeout-ms")) || undefined,
-    ctx: { config: runtimeConfig },
-  });
-  if (args.includes("--json")) {
-    console.log(JSON.stringify(result, null, 2));
-    process.exit(result.summary.ok ? 0 : 1);
-  }
-  console.log(`\n  ${pkg.name} v${pkg.version} — Image Probe\n`);
-  console.log(`  Provider: ${result.provider}`);
-  console.log(`  Model: ${result.model}`);
-  console.log(`  Prompt: ${result.promptId} (${result.promptChars} chars, redacted)`);
-  for (const probe of result.probes) {
-    const mark = probe.ok ? "✓" : "✗";
-    const reason = probe.diagnosticReason ? ` — ${probe.diagnosticReason}` : "";
-    console.log(`  ${mark} ${probe.id}${reason}`);
-    console.log(
-      `      status=${probe.response.httpStatus ?? "n/a"} events=${probe.response.eventCount} images=${probe.response.imageResultCount} textChars=${probe.response.textOutputChars}`,
-    );
-  }
-  console.log(`\n  ${result.summary.passed} passed, ${result.summary.failed} failed\n`);
-  process.exit(result.summary.ok ? 0 : 1);
-}
-
-async function standardDoctor() {
-  console.log(`\n  ${pkg.name} v${pkg.version} — Doctor\n`);
-
-  let ok = 0;
-  let fail = 0;
-
-  const nodeVersion = process.version;
-  const nodeMajor = parseInt(nodeVersion.slice(1).split(".")[0]);
-  if (nodeMajor >= 20) {
-    console.log(`  ✓ Node.js ${nodeVersion} (>= 20)`);
-    ok++;
-  } else {
-    console.log(`  ✗ Node.js ${nodeVersion} (requires >= 20)`);
-    fail++;
-  }
-
-  if (existsSync(join(ROOT, "package.json"))) {
-    console.log("  ✓ package.json found");
-    ok++;
-  } else {
-    console.log("  ✗ package.json missing");
-    fail++;
-  }
-
-  const missingDeps = missingRuntimeDeps();
-  if (missingDeps.length === 0) {
-    console.log("  ✓ runtime dependencies resolvable");
-    ok++;
-  } else {
-    console.log(`  ✗ missing runtime dependencies: ${missingDeps.join(", ")}`);
-    fail++;
-  }
-
-  if (existsSync(join(ROOT, ".env"))) {
-    console.log("  ✓ .env file exists");
-    ok++;
-  } else {
-    console.log("  ⚠ .env file not found (optional — copy from .env.example)");
-  }
-
-  const fileConfig = loadConfig();
-  if (fileConfig.provider) {
-    console.log(`  ✓ Configured: ${fileConfig.provider}`);
-    ok++;
-  } else {
-    console.log("  ⚠ Not configured — run 'ima2 setup'");
-  }
-
-  const advPath = runtimeConfig.storage.advertiseFile;
-  const adv = existsSync(advPath) ? JSON.parse(readFileSync(advPath, "utf-8")) : null;
-  console.log(`  ℹ Preferred backend port: ${runtimeConfig.server.port}`);
-  if (adv?.backend || adv?.port) {
-    console.log(`  ℹ Backend actual URL: ${adv?.backend?.url || adv?.url || `http://localhost:${adv.port}`}`);
-    if (adv?.oauth) console.log(`  ℹ GPT OAuth actual URL: ${adv.oauth.url} (${adv.oauth.status || "unknown"})`);
-  }
-
-  const hardeningLines = await buildHardeningDoctorLines({
-    root: ROOT,
-    configFile: CONFIG_FILE,
-    fileConfig,
-  });
-  for (const line of hardeningLines) {
-    const prefix =
-      line.kind === "pass" ? "✓"
-      : line.kind === "fail" ? "✗"
-      : line.kind === "warn" ? "⚠"
-      : "ℹ";
-    console.log(`  ${prefix} ${line.text}`);
-    if (line.kind === "pass") ok++;
-    if (line.kind === "fail") fail++;
-  }
-
-  const storageLines = await buildStorageDoctorLines({
-    rootDir: ROOT,
-    config: runtimeConfig,
-  });
-  console.log("");
-  for (const line of storageLines) console.log(line);
-
-  const auth = detectCodexAuth();
-  if (auth.platform === "win32") console.log("  ℹ Windows GPT OAuth note: use WSL2 for Codex login.");
-
-  console.log(`\n  ${ok} passed, ${fail} failed\n`);
-  process.exit(fail > 0 ? 1 : 0);
-}
-
-export async function doctor(args: string[] = []) {
-  if (args[0] === "image-probe") {
-    await imageProbe(args.slice(1));
-    return;
-  }
-  await standardDoctor();
-}

package/bin/commands/edit.ts

@@ -1,150 +0,0 @@
-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";
-import { createCliRequestId, recoverGeneratedOutputs, formatRecoveryHint } from "../lib/recover-output.js";
-
-import { errInfo } from "../../lib/errInfo.js";
-const VALID_MODES = new Set(["auto", "direct"]);
-const VALID_MODERATION = new Set(["auto", "low"]);
-const VALID_PROVIDERS = new Set(["auto", "oauth", "api", "grok"]);
-const KNOWN_IMAGE_MODELS = new Set(["gpt-5.5", "gpt-5.4", "gpt-5.4-mini", "gpt-5.3-codex-spark", "grok-imagine-image", "grok-imagine-image-quality"]);
-
-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" },
-    provider: {             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|grok-imagine-image|grok-imagine-image-quality>
-        --provider <auto|oauth|api|grok>  Provider (oauth = GPT OAuth; grok = xAI Grok)
-        --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: string[]) {
-  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(String(args.mode))) die(2, "--mode must be one of: auto, direct");
-  if (!VALID_MODERATION.has(String(args.moderation))) die(2, "--moderation must be one of: auto, low");
-  if (args.provider && !VALID_PROVIDERS.has(String(args.provider))) {
-    die(2, "--provider must be one of: auto, oauth, api, grok");
-  }
-  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, grok-imagine-image, grok-imagine-image-quality");
-  }
-  const VALID_REASONING = new Set(["none", "low", "medium", "high", "xhigh"]);
-  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"]) {
-    die(2, "--web-search and --no-web-search are mutually exclusive");
-  }
-
-  let server;
-  try { server = await resolveServer({ serverFlag: args.server }); }
-  catch (e) {
-    const err = errInfo(e);
-    if (args.json) 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(String(args.timeout)) || 180) * 1000;
-  const explicitOut = args.out ? String(args.out) : null;
-  const requestId = createCliRequestId("req_cli_edit");
-
-  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,
-      requestId,
-    };
-    if (args["reasoning-effort"]) editBody.reasoningEffort = args["reasoning-effort"];
-    if (args.provider) editBody.provider = args.provider;
-    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,
-      headers: { "X-Request-Id": requestId },
-    });
-  } catch (e) {
-    const err = errInfo(e);
-    const isTimeout = err.name === "TimeoutError" || err.name === "AbortError";
-    if (isTimeout && explicitOut) {
-      const result = await recoverGeneratedOutputs(server.base, requestId, {
-        explicitOut,
-        expectedCount: 1,
-        json: Boolean(args.json),
-      });
-      if (result.recovered) {
-        if (args.json) {
-          json({ ok: true, requestId, recovered: true, path: result.paths[0] });
-        } else {
-          out(formatRecoveryHint(result));
-          out(color.green("✓ ") + result.paths[0] + color.dim(" (recovered)"));
-        }
-        return;
-      }
-      if (!args.json) out(formatRecoveryHint(result));
-    }
-    if (args.json) json({ ok: false, error: err.message, code: err.code, requestId });
-    dieWithError(e);
-  }
-
-  const image = resp.image;
-  if (!image) die(1, "server returned no image");
-  const target = explicitOut || `${config.storage.generatedDir}/${defaultOutName(0, 1)}`;
-  await dataUriToFile(image, String(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`));
-  }
-}