ima2-gen 1.1.13 → 1.1.16

package/bin/commands/gen.ts

@@ -8,8 +8,8 @@ import { createCliRequestId, recoverGeneratedOutputs, formatRecoveryHint } from
 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"]);
-const KNOWN_IMAGE_MODELS = new Set(["gpt-5.5", "gpt-5.4", "gpt-5.4-mini", "gpt-5.3-codex-spark"]);
+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: {
@@ -54,8 +54,8 @@ const HELP = `
         --stdin                              Read prompt from stdin
         --timeout <sec>                     Default: 180
         --server <url>                      Override server URL
-        --model <gpt-5.5|gpt-5.4|gpt-5.4-mini>
-        --provider <auto|oauth|api>         Provider for this request; api requires a configured API key
+        --model <gpt-5.5|gpt-5.4|gpt-5.4-mini|grok-imagine-image|grok-imagine-image-quality>
+        --provider <auto|oauth|api|grok>    Provider for this request; grok uses progrok proxy
         --mode <auto|direct>                Prompt handling mode. Default: auto
         --moderation <auto|low>             Default: low
         --session <id>                      Apply session style sheet if enabled
@@ -86,10 +86,10 @@ export default async function genCmd(argv: string[]) {
   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");
+    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");
+    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"]))) {

package/bin/commands/grok.js

@@ -0,0 +1,61 @@
+import { spawn } from "node:child_process";
+import { dirname, join, delimiter } from "node:path";
+import { fileURLToPath } from "node:url";
+import { color, die, out } from "../lib/output.js";
+import { resolveBin, isWin } from "../lib/platform.js";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const ROOT = join(__dirname, "..", "..");
+const HELP = `
+  ima2 grok <subcommand> [options]
+
+  Manage the bundled progrok runtime used by the Grok image provider.
+  No separate progrok install is required.
+
+  Subcommands:
+    login [--device-code]  Log in to xAI OAuth for the bundled proxy
+    logout                 Remove stored xAI credentials
+    status                 Show bundled progrok authentication status
+    models                 List available Grok models
+    proxy [options]        Start the bundled proxy directly
+
+  Notes:
+    ima2 serve auto-starts the bundled proxy on 127.0.0.1:18645 by default.
+    Use IMA2_NO_GROK_PROXY=1 to disable automatic proxy startup.
+`;
+function localBinPath() {
+    return join(ROOT, "node_modules", ".bin");
+}
+export default async function grokCmd(argv) {
+    const sub = argv[0];
+    if (!sub || sub === "--help" || sub === "-h") {
+        out(HELP);
+        return;
+    }
+    const env = {
+        ...process.env,
+        PATH: `${localBinPath()}${delimiter}${process.env.PATH || ""}`,
+    };
+    const child = isWin
+        ? spawn("cmd.exe", ["/d", "/s", "/c", `progrok ${argv.map((arg) => JSON.stringify(arg)).join(" ")}`], {
+            cwd: ROOT,
+            env,
+            stdio: "inherit",
+            windowsHide: true,
+        })
+        : spawn(resolveBin("progrok"), argv, {
+            cwd: ROOT,
+            env,
+            stdio: "inherit",
+            windowsHide: true,
+        });
+    child.on("error", (err) => {
+        die(1, `bundled progrok failed to start: ${err.message}`);
+    });
+    const code = await new Promise((resolve) => child.on("close", resolve));
+    if (code && code !== 0) {
+        die(code, `bundled progrok exited with code ${code}`);
+    }
+    if (sub === "login") {
+        out(color.green("✓ ") + "Grok OAuth is ready for ima2 serve");
+    }
+}

package/bin/commands/grok.ts

@@ -0,0 +1,67 @@
+import { spawn } from "node:child_process";
+import { dirname, join, delimiter } from "node:path";
+import { fileURLToPath } from "node:url";
+import { color, die, out } from "../lib/output.js";
+import { resolveBin, isWin } from "../lib/platform.js";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const ROOT = join(__dirname, "..", "..");
+const HELP = `
+  ima2 grok <subcommand> [options]
+
+  Manage the bundled progrok runtime used by the Grok image provider.
+  No separate progrok install is required.
+
+  Subcommands:
+    login [--device-code]  Log in to xAI OAuth for the bundled proxy
+    logout                 Remove stored xAI credentials
+    status                 Show bundled progrok authentication status
+    models                 List available Grok models
+    proxy [options]        Start the bundled proxy directly
+
+  Notes:
+    ima2 serve auto-starts the bundled proxy on 127.0.0.1:18645 by default.
+    Use IMA2_NO_GROK_PROXY=1 to disable automatic proxy startup.
+`;
+
+function localBinPath() {
+  return join(ROOT, "node_modules", ".bin");
+}
+
+export default async function grokCmd(argv: string[]) {
+  const sub = argv[0];
+  if (!sub || sub === "--help" || sub === "-h") {
+    out(HELP);
+    return;
+  }
+
+  const env = {
+    ...process.env,
+    PATH: `${localBinPath()}${delimiter}${process.env.PATH || ""}`,
+  };
+  const child = isWin
+    ? spawn("cmd.exe", ["/d", "/s", "/c", `progrok ${argv.map((arg) => JSON.stringify(arg)).join(" ")}`], {
+        cwd: ROOT,
+        env,
+        stdio: "inherit",
+        windowsHide: true,
+      })
+    : spawn(resolveBin("progrok"), argv, {
+        cwd: ROOT,
+        env,
+        stdio: "inherit",
+        windowsHide: true,
+      });
+
+  child.on("error", (err) => {
+    die(1, `bundled progrok failed to start: ${err.message}`);
+  });
+
+  const code = await new Promise<number | null>((resolve) => child.on("close", resolve));
+  if (code && code !== 0) {
+    die(code, `bundled progrok exited with code ${code}`);
+  }
+  if (sub === "login") {
+    out(color.green("✓ ") + "Grok OAuth is ready for ima2 serve");
+  }
+}

package/bin/commands/multimode.js

@@ -41,7 +41,7 @@ const HELP = `
     -d, --out-dir <dir>                 Output dir for multiple images
         --json
         --model <gpt-5.5|gpt-5.4|gpt-5.4-mini>
-        --provider <auto|oauth|api>     Provider for this request; api requires a configured API key
+        --provider <auto|oauth|api|grok>  Provider for this request; grok uses progrok proxy
         --mode <auto|direct>            Prompt handling mode. Default: auto
         --ref <file>                    Attach reference image (repeatable, max 5)
         --reasoning-effort <none|low|medium|high|xhigh>
@@ -60,11 +60,11 @@ export default async function multimodeCmd(argv) {
     const prompt = args.positional.join(" ");
     if (!prompt)
         die(2, "prompt required");
-    const VALID_PROVIDERS = new Set(["auto", "oauth", "api"]);
+    const VALID_PROVIDERS = new Set(["auto", "oauth", "api", "grok"]);
     const VALID_MODES = new Set(["auto", "direct"]);
     const VALID_REASONING = new Set(["none", "low", "medium", "high", "xhigh"]);
     if (args.provider && !VALID_PROVIDERS.has(String(args.provider))) {
-        die(2, "--provider must be one of: auto, oauth, api");
+        die(2, "--provider must be one of: auto, oauth, api, grok");
     }
     if (!VALID_MODES.has(String(args.mode)))
         die(2, "--mode must be one of: auto, direct");

package/bin/commands/multimode.ts

@@ -43,7 +43,7 @@ const HELP = `
     -d, --out-dir <dir>                 Output dir for multiple images
         --json
         --model <gpt-5.5|gpt-5.4|gpt-5.4-mini>
-        --provider <auto|oauth|api>     Provider for this request; api requires a configured API key
+        --provider <auto|oauth|api|grok>  Provider for this request; grok uses progrok proxy
         --mode <auto|direct>            Prompt handling mode. Default: auto
         --ref <file>                    Attach reference image (repeatable, max 5)
         --reasoning-effort <none|low|medium|high|xhigh>
@@ -60,11 +60,11 @@ export default async function multimodeCmd(argv: string[]) {
   const prompt = args.positional.join(" ");
   if (!prompt) die(2, "prompt required");
 
-  const VALID_PROVIDERS = new Set(["auto", "oauth", "api"]);
+  const VALID_PROVIDERS = new Set(["auto", "oauth", "api", "grok"]);
   const VALID_MODES = new Set(["auto", "direct"]);
   const VALID_REASONING = new Set(["none", "low", "medium", "high", "xhigh"]);
   if (args.provider && !VALID_PROVIDERS.has(String(args.provider))) {
-    die(2, "--provider must be one of: auto, oauth, api");
+    die(2, "--provider must be one of: auto, oauth, api, grok");
   }
   if (!VALID_MODES.has(String(args.mode))) die(2, "--mode must be one of: auto, direct");
   if (args["reasoning-effort"] && !VALID_REASONING.has(String(args["reasoning-effort"]))) {

package/bin/commands/node.js

@@ -8,11 +8,11 @@ const HELP = `
   ima2 node <subcommand> [options]
 
   Subcommands:
-    generate <prompt...> [--parent <nodeId>] [--ref <file>...] [--provider <auto|oauth|api>] [--no-stream] [...gen-style flags]
+    generate <prompt...> [--parent <nodeId>] [--ref <file>...] [--provider <auto|oauth|api|grok>] [--no-stream] [...gen-style flags]
     show <nodeId> [--json]
 
   Generate options:
-        --provider <auto|oauth|api>    Provider for this request; api requires a configured API key
+        --provider <auto|oauth|api|grok>  Provider for this request; grok uses progrok proxy
 `;
 const GEN_FLAGS = {
     quality: { short: "q", type: "string", default: "low" },
@@ -58,10 +58,10 @@ async function generateSub(argv) {
     if (!prompt)
         die(2, "prompt required");
     const refs = (Array.isArray(args.ref) ? args.ref : []);
-    const VALID_PROVIDERS = new Set(["auto", "oauth", "api"]);
+    const VALID_PROVIDERS = new Set(["auto", "oauth", "api", "grok"]);
     const VALID_REASONING = new Set(["none", "low", "medium", "high", "xhigh"]);
     if (args.provider && !VALID_PROVIDERS.has(String(args.provider))) {
-        die(2, "--provider must be one of: auto, oauth, api");
+        die(2, "--provider must be one of: auto, oauth, api, grok");
     }
     if (args["reasoning-effort"] && !VALID_REASONING.has(String(args["reasoning-effort"]))) {
         die(2, "--reasoning-effort must be one of: none, low, medium, high, xhigh");

package/bin/commands/node.ts

@@ -9,11 +9,11 @@ const HELP = `
   ima2 node <subcommand> [options]
 
   Subcommands:
-    generate <prompt...> [--parent <nodeId>] [--ref <file>...] [--provider <auto|oauth|api>] [--no-stream] [...gen-style flags]
+    generate <prompt...> [--parent <nodeId>] [--ref <file>...] [--provider <auto|oauth|api|grok>] [--no-stream] [...gen-style flags]
     show <nodeId> [--json]
 
   Generate options:
-        --provider <auto|oauth|api>    Provider for this request; api requires a configured API key
+        --provider <auto|oauth|api|grok>  Provider for this request; grok uses progrok proxy
 `;
 
 const GEN_FLAGS = {
@@ -54,10 +54,10 @@ async function generateSub(argv: string[]) {
   const prompt = args.positional.join(" ");
   if (!prompt) die(2, "prompt required");
   const refs = (Array.isArray(args.ref) ? args.ref : []) as string[];
-  const VALID_PROVIDERS = new Set(["auto", "oauth", "api"]);
+  const VALID_PROVIDERS = new Set(["auto", "oauth", "api", "grok"]);
   const VALID_REASONING = new Set(["none", "low", "medium", "high", "xhigh"]);
   if (args.provider && !VALID_PROVIDERS.has(String(args.provider))) {
-    die(2, "--provider must be one of: auto, oauth, api");
+    die(2, "--provider must be one of: auto, oauth, api, grok");
   }
   if (args["reasoning-effort"] && !VALID_REASONING.has(String(args["reasoning-effort"]))) {
     die(2, "--reasoning-effort must be one of: none, low, medium, high, xhigh");

package/bin/ima2.js

@@ -3,20 +3,17 @@ import { createInterface } from "readline/promises";
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
-import { createRequire } from "module";
 import { spawn, execSync } from "child_process";
 import { confirmDestructiveAction } from "./lib/destructive-confirm.js";
-import { buildHardeningDoctorLines } from "./lib/doctor-checks.js";
+import { doctor } from "./commands/doctor.js";
 import { openUrl, resolveBin } from "./lib/platform.js";
 import { maybePromptGithubStar } from "./lib/star-prompt.js";
-import { buildStorageDoctorLines } from "./lib/storage-doctor.js";
 import { ensureFreshUiDist } from "./lib/ui-build.js";
 import { detectCodexAuth } from "../lib/codexDetect.js";
 import { config as runtimeConfig } from "../config.js";
 import { errInfo } from "../lib/errInfo.js";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const ROOT = join(__dirname, "..");
-const requireFromRoot = createRequire(join(ROOT, "package.json"));
 // Config lives under runtimeConfig.storage.configDir (honors IMA2_CONFIG_DIR).
 // Legacy installs that stored config at <packageRoot>/.ima2/config.json will be
 // migrated on first write.
@@ -61,18 +58,6 @@ function advertisedServerUrl() {
     const adv = loadAdvertisement();
     return adv?.backend?.url || adv?.url || (adv?.port ? `http://localhost:${adv.port}` : null);
 }
-function missingRuntimeDeps() {
-    const deps = ["express", "better-sqlite3", "openai", "openai-oauth"];
-    return deps.filter((dep) => {
-        try {
-            requireFromRoot.resolve(dep);
-            return false;
-        }
-        catch {
-            return true;
-        }
-    });
-}
 async function setup() {
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     console.log("\n  ima2-gen — GPT Image 2 Generator\n");
@@ -200,93 +185,6 @@ async function showStatus() {
     }
     console.log("");
 }
-async function doctor() {
-    console.log(`\n  ${pkg.name} v${pkg.version} — Doctor\n`);
-    let ok = 0;
-    let fail = 0;
-    // Node version
-    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++;
-    }
-    // package.json exists
-    if (existsSync(join(ROOT, "package.json"))) {
-        console.log("  ✓ package.json found");
-        ok++;
-    }
-    else {
-        console.log("  ✗ package.json missing");
-        fail++;
-    }
-    // Runtime dependencies may be hoisted by npm, pnpm, or Yarn. Resolve the
-    // packages instead of requiring a package-local node_modules folder.
-    const missingDeps = missingRuntimeDeps();
-    if (missingDeps.length === 0) {
-        console.log("  ✓ runtime dependencies resolvable");
-        ok++;
-    }
-    else {
-        console.log(`  ✗ missing runtime dependencies: ${missingDeps.join(", ")}`);
-        fail++;
-    }
-    // .env
-    if (existsSync(join(ROOT, ".env"))) {
-        console.log("  ✓ .env file exists");
-        ok++;
-    }
-    else {
-        console.log("  ⚠ .env file not found (optional — copy from .env.example)");
-    }
-    // Config
-    const config = loadConfig();
-    if (config.provider) {
-        console.log(`  ✓ Configured: ${config.provider}`);
-        ok++;
-    }
-    else {
-        console.log("  ⚠ Not configured — run 'ima2 setup'");
-    }
-    // Port availability (simple check)
-    const adv = loadAdvertisement();
-    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(`  ℹ OAuth actual URL: ${adv.oauth.url} (${adv.oauth.status || "unknown"})`);
-        }
-    }
-    const hardeningLines = await buildHardeningDoctorLines({
-        root: ROOT,
-        configFile: CONFIG_FILE,
-        fileConfig: config,
-    });
-    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);
-    console.log(`\n  ${ok} passed, ${fail} failed\n`);
-    process.exit(fail > 0 ? 1 : 0);
-}
 function openBrowser() {
     const url = advertisedServerUrl() || `http://localhost:${runtimeConfig.server.port}`;
     const res = openUrl(url);
@@ -333,6 +231,7 @@ function showHelp() {
     billing        API usage / quota
     providers      Configured providers
     oauth <sub>    OAuth proxy status              (ima2 oauth --help)
+    grok <sub>     Bundled progrok login/status     (ima2 grok --help)
     config <sub>   Config get/set/ls/path/rm       (ima2 config --help)
     defaults <sub> Inspect/change model defaults   (ima2 defaults --help)
     capabilities   Agent capability metadata       (ima2 capabilities --help)
@@ -372,7 +271,7 @@ if (args.includes("-v") || args.includes("--version")) {
     process.exit(0);
 }
 if ((!command || args.includes("-h") || args.includes("--help"))
-    && !["gen", "edit", "ls", "show", "ps", "cancel", "session", "history", "prompt", "multimode", "node", "annotate", "canvas-versions", "metadata", "comfy", "cardnews", "inflight", "storage", "billing", "providers", "oauth", "config", "defaults", "capabilities", "skill", "ping"].includes(command)) {
+    && !["doctor", "gen", "edit", "ls", "show", "ps", "cancel", "session", "history", "prompt", "multimode", "node", "annotate", "canvas-versions", "metadata", "comfy", "cardnews", "inflight", "storage", "billing", "providers", "oauth", "grok", "config", "defaults", "capabilities", "skill", "ping"].includes(command)) {
     showHelp();
     process.exit(command ? 0 : 1);
 }
@@ -388,7 +287,7 @@ switch (command) {
         showStatus();
         break;
     case "doctor":
-        await doctor();
+        await doctor(args.slice(1));
         break;
     case "open":
         openBrowser();
@@ -434,6 +333,7 @@ switch (command) {
     case "defaults":
     case "capabilities":
     case "skill":
+    case "grok":
     case "ping": {
         const { setCliVersion } = await import("./lib/client.js");
         setCliVersion(pkg.version);

package/bin/ima2.ts

@@ -3,13 +3,11 @@ import { createInterface } from "readline/promises";
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
-import { createRequire } from "module";
 import { spawn, execSync } from "child_process";
 import { confirmDestructiveAction } from "./lib/destructive-confirm.js";
-import { buildHardeningDoctorLines } from "./lib/doctor-checks.js";
+import { doctor } from "./commands/doctor.js";
 import { openUrl, resolveBin } from "./lib/platform.js";
 import { maybePromptGithubStar } from "./lib/star-prompt.js";
-import { buildStorageDoctorLines } from "./lib/storage-doctor.js";
 import { ensureFreshUiDist } from "./lib/ui-build.js";
 import { detectCodexAuth } from "../lib/codexDetect.js";
 import { config as runtimeConfig } from "../config.js";
@@ -17,7 +15,6 @@ import { config as runtimeConfig } from "../config.js";
 import { errInfo } from "../lib/errInfo.js";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const ROOT = join(__dirname, "..");
-const requireFromRoot = createRequire(join(ROOT, "package.json"));
 // Config lives under runtimeConfig.storage.configDir (honors IMA2_CONFIG_DIR).
 // Legacy installs that stored config at <packageRoot>/.ima2/config.json will be
 // migrated on first write.
@@ -62,18 +59,6 @@ function advertisedServerUrl() {
   return adv?.backend?.url || adv?.url || (adv?.port ? `http://localhost:${adv.port}` : null);
 }
 
-function missingRuntimeDeps() {
-  const deps = ["express", "better-sqlite3", "openai", "openai-oauth"];
-  return deps.filter((dep) => {
-    try {
-      requireFromRoot.resolve(dep);
-      return false;
-    } catch {
-      return true;
-    }
-  });
-}
-
 async function setup() {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
 
@@ -221,97 +206,6 @@ async function showStatus() {
   console.log("");
 }
 
-async function doctor() {
-  console.log(`\n  ${pkg.name} v${pkg.version} — Doctor\n`);
-
-  let ok = 0;
-  let fail = 0;
-
-  // Node version
-  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++;
-  }
-
-  // package.json exists
-  if (existsSync(join(ROOT, "package.json"))) {
-    console.log("  ✓ package.json found");
-    ok++;
-  } else {
-    console.log("  ✗ package.json missing");
-    fail++;
-  }
-
-  // Runtime dependencies may be hoisted by npm, pnpm, or Yarn. Resolve the
-  // packages instead of requiring a package-local node_modules folder.
-  const missingDeps = missingRuntimeDeps();
-  if (missingDeps.length === 0) {
-    console.log("  ✓ runtime dependencies resolvable");
-    ok++;
-  } else {
-    console.log(`  ✗ missing runtime dependencies: ${missingDeps.join(", ")}`);
-    fail++;
-  }
-
-  // .env
-  if (existsSync(join(ROOT, ".env"))) {
-    console.log("  ✓ .env file exists");
-    ok++;
-  } else {
-    console.log("  ⚠ .env file not found (optional — copy from .env.example)");
-  }
-
-  // Config
-  const config = loadConfig();
-  if (config.provider) {
-    console.log(`  ✓ Configured: ${config.provider}`);
-    ok++;
-  } else {
-    console.log("  ⚠ Not configured — run 'ima2 setup'");
-  }
-
-  // Port availability (simple check)
-  const adv = loadAdvertisement();
-  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(`  ℹ OAuth actual URL: ${adv.oauth.url} (${adv.oauth.status || "unknown"})`);
-    }
-  }
-
-  const hardeningLines = await buildHardeningDoctorLines({
-    root: ROOT,
-    configFile: CONFIG_FILE,
-    fileConfig: config,
-  });
-  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);
-
-  console.log(`\n  ${ok} passed, ${fail} failed\n`);
-  process.exit(fail > 0 ? 1 : 0);
-}
-
 function openBrowser() {
   const url = advertisedServerUrl() || `http://localhost:${runtimeConfig.server.port}`;
   const res = openUrl(url);
@@ -358,6 +252,7 @@ function showHelp() {
     billing        API usage / quota
     providers      Configured providers
     oauth <sub>    OAuth proxy status              (ima2 oauth --help)
+    grok <sub>     Bundled progrok login/status     (ima2 grok --help)
     config <sub>   Config get/set/ls/path/rm       (ima2 config --help)
     defaults <sub> Inspect/change model defaults   (ima2 defaults --help)
     capabilities   Agent capability metadata       (ima2 capabilities --help)
@@ -400,7 +295,7 @@ if (args.includes("-v") || args.includes("--version")) {
 }
 
 if ((!command || args.includes("-h") || args.includes("--help"))
-    && !["gen", "edit", "ls", "show", "ps", "cancel", "session", "history", "prompt", "multimode", "node", "annotate", "canvas-versions", "metadata", "comfy", "cardnews", "inflight", "storage", "billing", "providers", "oauth", "config", "defaults", "capabilities", "skill", "ping"].includes(command)) {
+    && !["doctor", "gen", "edit", "ls", "show", "ps", "cancel", "session", "history", "prompt", "multimode", "node", "annotate", "canvas-versions", "metadata", "comfy", "cardnews", "inflight", "storage", "billing", "providers", "oauth", "grok", "config", "defaults", "capabilities", "skill", "ping"].includes(command)) {
   showHelp();
   process.exit(command ? 0 : 1);
 }
@@ -417,7 +312,7 @@ switch (command) {
     showStatus();
     break;
   case "doctor":
-    await doctor();
+    await doctor(args.slice(1));
     break;
   case "open":
     openBrowser();
@@ -461,6 +356,7 @@ switch (command) {
   case "defaults":
   case "capabilities":
   case "skill":
+  case "grok":
   case "ping": {
     const { setCliVersion } = await import("./lib/client.js");
     setCliVersion(pkg.version);

package/config.js

@@ -112,6 +112,7 @@ export const config = {
         restartDelayMs: pickInt(env.IMA2_OAUTH_RESTART_DELAY_MS, fileCfg.oauth?.restartDelayMs, 5000),
         // Provider-backed masked edit is off until upstream STEP-0 verification is recorded.
         maskedEditEnabled: pickBool(env.IMA2_OAUTH_MASKED_EDIT_ENABLED, fileCfg.oauth?.maskedEditEnabled, false),
+        forceImageToolChoice: pickBool(env.IMA2_OAUTH_FORCE_IMAGE_TOOL_CHOICE, fileCfg.oauth?.forceImageToolChoice, true),
         researchSuffix: pickStr(env.IMA2_RESEARCH_SUFFIX, fileCfg.oauth?.researchSuffix, "\n\nIf factual visual accuracy is required and the user's prompt or attached visual context is not already sufficient, use at least one concise web_search call for references before generating. If the user's prompt is already visually sufficient, do not search, rewrite, translate, summarize, or add clarifiers; pass the user's prompt through as the image_generation prompt argument."),
         validModeration: new Set(Array.isArray(fileCfg.oauth?.validModeration) && fileCfg.oauth.validModeration.length
             ? fileCfg.oauth.validModeration
@@ -163,6 +164,22 @@ export const config = {
         defaultSize: pickStr(env.IMA2_API_IMAGE_SIZE, fileCfg.apiProvider?.defaultSize, "1024x1024"),
         allowWebSearch: pickBool(env.IMA2_API_ALLOW_WEB_SEARCH, fileCfg.apiProvider?.allowWebSearch, true),
     },
+    grokProvider: {
+        proxyPort: pickInt(env.IMA2_GROK_PROXY_PORT, fileCfg.grokProvider?.proxyPort, 18645),
+        proxyHost: pickStr(env.IMA2_GROK_PROXY_HOST, fileCfg.grokProvider?.proxyHost, "127.0.0.1"),
+        autoStart: !pickBool(env.IMA2_NO_GROK_PROXY, fileCfg.grokProvider?.disableAutoStart, false),
+        restartDelayMs: pickInt(env.IMA2_GROK_RESTART_DELAY_MS, fileCfg.grokProvider?.restartDelayMs, 2000),
+        plannerModel: pickStr(env.IMA2_GROK_PLANNER_MODEL, fileCfg.grokProvider?.plannerModel, "grok-4.3"),
+        plannerTimeoutMs: pickInt(env.IMA2_GROK_PLANNER_TIMEOUT_MS, fileCfg.grokProvider?.plannerTimeoutMs, 60_000),
+        defaultImageModel: pickStr(env.IMA2_GROK_IMAGE_MODEL_DEFAULT, fileCfg.grokProvider?.defaultImageModel, "grok-imagine-image"),
+        generationTimeoutMs: pickInt(env.IMA2_GROK_GENERATION_TIMEOUT_MS, fileCfg.grokProvider?.generationTimeoutMs, 120_000),
+        statusTimeoutMs: pickInt(env.IMA2_GROK_STATUS_TIMEOUT_MS, fileCfg.grokProvider?.statusTimeoutMs, 3000),
+        defaultVideoModel: pickStr(env.IMA2_GROK_VIDEO_MODEL_DEFAULT, fileCfg.grokProvider?.defaultVideoModel, "grok-imagine-video"),
+        videoStartTimeoutMs: pickInt(env.IMA2_GROK_VIDEO_START_TIMEOUT_MS, fileCfg.grokProvider?.videoStartTimeoutMs, 60_000),
+        videoPollIntervalMs: pickInt(env.IMA2_GROK_VIDEO_POLL_INTERVAL_MS, fileCfg.grokProvider?.videoPollIntervalMs, 5_000),
+        videoTimeoutMs: pickInt(env.IMA2_GROK_VIDEO_TIMEOUT_MS, fileCfg.grokProvider?.videoTimeoutMs, 900_000),
+        videoDownloadTimeoutMs: pickInt(env.IMA2_GROK_VIDEO_DOWNLOAD_TIMEOUT_MS, fileCfg.grokProvider?.videoDownloadTimeoutMs, 120_000),
+    },
     log: {
         level: pickStr(env.IMA2_LOG_LEVEL, fileCfg.log?.level, defaultLogLevelForEnv(env)),
         pretty: env.NODE_ENV !== "production",