@vellumai/assistant 0.7.3 → 0.8.1

package/src/cli/commands/gateway.ts

@@ -8,6 +8,7 @@
 import type { Command } from "commander";
 
 import { cliIpcCall } from "../../ipc/cli-client.js";
+import { registerCommand } from "../lib/register-command.js";
 import { log } from "../logger.js";
 
 // -- Types --------------------------------------------------------------------
@@ -56,7 +57,11 @@ function colorLevel(name: string, levelNum: number): string {
 // -- Registration -------------------------------------------------------------
 
 export function registerGatewayCommand(program: Command): void {
-  const gateway = program.command("gateway").description("Gateway management");
+  registerCommand(program, {
+    name: "gateway",
+    transport: "ipc",
+    description: "Gateway management",
+    build: (gateway) => {
 
   gateway.addHelpText(
     "after",
@@ -180,4 +185,6 @@ Examples:
         process.stdout.write(dim + "\n");
       }
     });
+    },
+  });
 }

package/src/cli/commands/image-generation.ts

@@ -4,14 +4,8 @@ import { join } from "node:path";
 
 import { Command } from "commander";
 
-import { getConfig } from "../../config/loader.js";
-import { resolveImageGenCredentials } from "../../media/image-credentials.js";
-import {
-  generateImage,
-  type ImageGenCredentials,
-  mapImageGenError,
-  providerForModel,
-} from "../../media/image-service.js";
+import { cliIpcCall, exitFromIpcResult } from "../../ipc/cli-client.js";
+import { registerCommand } from "../lib/register-command.js";
 import { log } from "../logger.js";
 
 // ---------------------------------------------------------------------------
@@ -60,13 +54,14 @@ function mimeForExtension(filePath: string): string {
 // ---------------------------------------------------------------------------
 
 export function registerImageGenerationCommand(program: Command): void {
-  const imageGen = program
-    .command("image-generation")
-    .description("AI image generation and editing");
-
-  imageGen.addHelpText(
-    "after",
-    `
+  registerCommand(program, {
+    name: "image-generation",
+    transport: "ipc",
+    description: "AI image generation and editing",
+    build: (imageGen) => {
+      imageGen.addHelpText(
+        "after",
+        `
 Modes:
   managed    — Uses platform-managed credentials (requires login to Vellum).
   your-own   — Uses your own Gemini or OpenAI API key depending on the configured model.
@@ -81,33 +76,33 @@ Examples:
   $ assistant image-generation generate --prompt "Remove background" --mode edit --source photo.png
   $ assistant image-generation generate --prompt "Logo design" --variants 3 --output-dir ./output
   $ assistant image-generation generate --prompt "A cat" --json`,
-  );
-
-  const generate = imageGen
-    .command("generate")
-    .description("Generate or edit images using AI")
-    .requiredOption(
-      "--prompt <text>",
-      "Description of the image to generate or edits to apply",
-    )
-    .option("--mode <mode>", "generate (default) or edit", "generate")
-    .option(
-      "--source <path...>",
-      "Source image file path for edit mode (repeatable)",
-    )
-    .option("--model <model-id>", "Model override")
-    .option(
-      "--variants <n>",
-      "Number of variants (1-4, default 1)",
-      (v: string) => parseInt(v, 10),
-      1,
-    )
-    .option("--output-dir <dir>", "Directory to save images")
-    .option("--json", "Output structured JSON");
-
-  generate.addHelpText(
-    "after",
-    `
+      );
+
+      const generate = imageGen
+        .command("generate")
+        .description("Generate or edit images using AI")
+        .requiredOption(
+          "--prompt <text>",
+          "Description of the image to generate or edits to apply",
+        )
+        .option("--mode <mode>", "generate (default) or edit", "generate")
+        .option(
+          "--source <path...>",
+          "Source image file path for edit mode (repeatable)",
+        )
+        .option("--model <model-id>", "Model override")
+        .option(
+          "--variants <n>",
+          "Number of variants (1-4, default 1)",
+          (v: string) => parseInt(v, 10),
+          1,
+        )
+        .option("--output-dir <dir>", "Directory to save images")
+        .option("--json", "Output structured JSON");
+
+      generate.addHelpText(
+        "after",
+        `
 Notes:
   Edit mode (--mode edit) requires at least one --source image file.
   Output files are named image-1.png, image-2.png, etc. (extension matches MIME type).
@@ -120,180 +115,137 @@ Examples:
   $ assistant image-generation generate --prompt "Logo variations" --variants 4 --output-dir ./logos
   $ assistant image-generation generate --prompt "A robot" --model gemini-3-pro-image-preview --json
   $ assistant image-generation generate --prompt "A robot" --model gpt-image-2 --json`,
-  );
-
-  generate.action(async (opts) => {
-    const jsonOutput = opts.json === true;
-    const prompt: string = opts.prompt;
-    const mode: "generate" | "edit" =
-      opts.mode === "edit" ? "edit" : "generate";
-    const sourcePaths: string[] | undefined = opts.source;
-    const modelOverride: string | undefined = opts.model;
-    const rawVariants = opts.variants ?? 1;
-    const variants: number = Number.isNaN(rawVariants)
-      ? 1
-      : Math.max(1, Math.min(rawVariants, 4));
-    const outputDir: string = opts.outputDir ?? os.tmpdir();
-
-    // --- Validate edit mode requires --source ---
-    if (mode === "edit" && (!sourcePaths || sourcePaths.length === 0)) {
-      const msg = "Edit mode requires at least one --source image file.";
-      if (jsonOutput) {
-        process.stdout.write(JSON.stringify({ ok: false, error: msg }) + "\n");
-      } else {
-        log.error(msg);
-      }
-      process.exitCode = 1;
-      return;
-    }
-
-    // --- Resolve credentials ---
-    const config = getConfig();
-    const svc = config.services["image-generation"];
-
-    // Derive provider from the explicit `--model` override when supplied so
-    // that `--model gpt-image-2` routes to OpenAI even when config.provider
-    // is `gemini` (and vice-versa). Without this, the Gemini service would
-    // silently downgrade unknown models to its default.
-    const provider = providerForModel(modelOverride, svc.provider);
-
-    const { credentials, errorHint } = await resolveImageGenCredentials({
-      provider,
-      mode: svc.mode,
-    });
-
-    if (!credentials) {
-      const baseHint =
-        errorHint ?? "No credentials available for image generation.";
-      // The shared hint in image-credentials.ts is UI-neutral (it points at
-      // "Settings > Models & Services"), which is correct for tool surfaces
-      // but drops the actionable CLI command. Prepend the exact command for
-      // each mode so CLI users see a next-step they can copy-paste.
-      const hint =
-        svc.mode === "managed"
-          ? `${baseHint}\n  Run 'assistant auth login' to authenticate, or set services.image-generation.mode to 'your-own' in config.`
-          : `Run: assistant keys set ${provider} <key>\n${baseHint}`;
-      if (jsonOutput) {
-        process.stdout.write(JSON.stringify({ ok: false, error: hint }) + "\n");
-      } else {
-        log.error(hint);
-      }
-      process.exitCode = 1;
-      return;
-    }
+      );
+
+      generate.action(async (opts) => {
+        const jsonOutput = opts.json === true;
+        const prompt: string = opts.prompt;
+        const mode: "generate" | "edit" =
+          opts.mode === "edit" ? "edit" : "generate";
+        const sourcePaths: string[] | undefined = opts.source;
+        const modelOverride: string | undefined = opts.model;
+        const rawVariants = opts.variants ?? 1;
+        const variants: number = Number.isNaN(rawVariants)
+          ? 1
+          : Math.max(1, Math.min(rawVariants, 4));
+        const outputDir: string = opts.outputDir ?? os.tmpdir();
+
+        // Validate edit mode requires --source
+        if (mode === "edit" && (!sourcePaths || sourcePaths.length === 0)) {
+          const msg = "Edit mode requires at least one --source image file.";
+          if (jsonOutput) {
+            process.stdout.write(
+              JSON.stringify({ ok: false, error: msg }) + "\n",
+            );
+          } else {
+            log.error(msg);
+          }
+          process.exitCode = 1;
+          return;
+        }
 
-    const resolvedCredentials: ImageGenCredentials = credentials;
+        // Read source images from disk + base64-encode (stays in CLI)
+        let sourceImages:
+          | Array<{ mimeType: string; dataBase64: string }>
+          | undefined;
+
+        if (mode === "edit" && sourcePaths && sourcePaths.length > 0) {
+          const errors: string[] = [];
+          const validImages: Array<{ mimeType: string; dataBase64: string }> =
+            [];
+
+          for (const filePath of sourcePaths) {
+            if (!existsSync(filePath)) {
+              errors.push(`File not found: ${filePath}`);
+              continue;
+            }
+            try {
+              const file = Bun.file(filePath);
+              const buffer = Buffer.from(await file.arrayBuffer());
+              const mimeType =
+                file.type !== "application/octet-stream"
+                  ? file.type
+                  : mimeForExtension(filePath);
+              validImages.push({ mimeType, dataBase64: buffer.toString("base64") });
+            } catch (err) {
+              errors.push(
+                `Could not read ${filePath}: ${(err as Error).message}`,
+              );
+            }
+          }
+
+          if (validImages.length === 0) {
+            const errorMsg = `No source images could be read.\n${errors.join("\n")}`;
+            if (jsonOutput) {
+              process.stdout.write(
+                JSON.stringify({ ok: false, error: errorMsg }) + "\n",
+              );
+            } else {
+              log.error(errorMsg);
+            }
+            process.exitCode = 1;
+            return;
+          }
+          sourceImages = validImages;
+        }
 
-    // --- Read source images for edit mode ---
-    let sourceImages:
-      | Array<{ mimeType: string; dataBase64: string }>
-      | undefined;
+        // Call daemon via IPC
+        const r = await cliIpcCall<{
+          images: Array<{ mimeType: string; dataBase64: string; title?: string }>;
+          text?: string;
+          resolvedModel: string;
+        }>("image_generation_generate", {
+          body: {
+            prompt,
+            mode,
+            model: modelOverride,
+            variants,
+            ...(sourceImages && { sourceImages }),
+          },
+        });
 
-    if (mode === "edit" && sourcePaths && sourcePaths.length > 0) {
-      const errors: string[] = [];
-      const validImages: Array<{ mimeType: string; dataBase64: string }> = [];
+        if (!r.ok) return exitFromIpcResult({ ok: false, error: r.error, statusCode: r.statusCode }, generate);
 
-      for (const filePath of sourcePaths) {
-        if (!existsSync(filePath)) {
-          errors.push(`File not found: ${filePath}`);
-          continue;
+        // Write images to disk (stays in CLI)
+        if (!existsSync(outputDir)) {
+          mkdirSync(outputDir, { recursive: true });
         }
-        try {
-          const file = Bun.file(filePath);
-          const buffer = Buffer.from(await file.arrayBuffer());
-          const mimeType =
-            file.type !== "application/octet-stream"
-              ? file.type
-              : mimeForExtension(filePath);
-          validImages.push({
-            mimeType,
-            dataBase64: buffer.toString("base64"),
+
+        const imageOutputs: Array<{
+          path: string;
+          mimeType: string;
+          sizeBytes: number;
+        }> = [];
+
+        for (let i = 0; i < r.result!.images.length; i++) {
+          const img = r.result!.images[i];
+          const ext = extensionForMime(img.mimeType);
+          const fileName = `image-${i + 1}.${ext}`;
+          const filePath = join(outputDir, fileName);
+          const buffer = Buffer.from(img.dataBase64, "base64");
+          writeFileSync(filePath, buffer);
+          imageOutputs.push({
+            path: filePath,
+            mimeType: img.mimeType,
+            sizeBytes: buffer.length,
           });
-        } catch (err) {
-          errors.push(`Could not read ${filePath}: ${(err as Error).message}`);
         }
-      }
 
-      if (validImages.length === 0) {
-        const errorMsg = `No source images could be read.\n${errors.join("\n")}`;
+        // Output
         if (jsonOutput) {
-          process.stdout.write(
-            JSON.stringify({ ok: false, error: errorMsg }) + "\n",
-          );
+          const output: Record<string, unknown> = {
+            ok: true,
+            images: imageOutputs,
+            model: r.result!.resolvedModel,
+          };
+          if (r.result!.text) output.text = r.result!.text;
+          process.stdout.write(JSON.stringify(output) + "\n");
         } else {
-          log.error(errorMsg);
+          for (const img of imageOutputs) {
+            process.stdout.write(img.path + "\n");
+          }
         }
-        process.exitCode = 1;
-        return;
-      }
-      sourceImages = validImages;
-    }
-
-    // --- Resolve model ---
-    const model = modelOverride ?? svc.model;
-
-    // --- Generate image ---
-    try {
-      const result = await generateImage(provider, resolvedCredentials, {
-        prompt,
-        mode,
-        sourceImages,
-        model,
-        variants,
       });
-
-      // --- Ensure output directory exists ---
-      if (!existsSync(outputDir)) {
-        mkdirSync(outputDir, { recursive: true });
-      }
-
-      // --- Write images to disk ---
-      const imageOutputs: Array<{
-        path: string;
-        mimeType: string;
-        sizeBytes: number;
-      }> = [];
-
-      for (let i = 0; i < result.images.length; i++) {
-        const img = result.images[i];
-        const ext = extensionForMime(img.mimeType);
-        const fileName = `image-${i + 1}.${ext}`;
-        const filePath = join(outputDir, fileName);
-        const buffer = Buffer.from(img.dataBase64, "base64");
-        writeFileSync(filePath, buffer);
-        imageOutputs.push({
-          path: filePath,
-          mimeType: img.mimeType,
-          sizeBytes: buffer.length,
-        });
-      }
-
-      // --- Output ---
-      if (jsonOutput) {
-        const output: Record<string, unknown> = {
-          ok: true,
-          images: imageOutputs,
-          model: result.resolvedModel,
-        };
-        if (result.text) {
-          output.text = result.text;
-        }
-        process.stdout.write(JSON.stringify(output) + "\n");
-      } else {
-        for (const img of imageOutputs) {
-          process.stdout.write(img.path + "\n");
-        }
-      }
-    } catch (error) {
-      const errorMsg = mapImageGenError(provider, error);
-      if (jsonOutput) {
-        process.stdout.write(
-          JSON.stringify({ ok: false, error: errorMsg }) + "\n",
-        );
-      } else {
-        log.error(errorMsg);
-      }
-      process.exitCode = 1;
-    }
+    },
   });
 }