ima2-gen 1.1.21 → 1.1.22

package/routes/cardNews.ts

@@ -1,211 +0,0 @@
-import type { Express, Request, Response } from "express";
-import { listImageTemplates, readTemplatePreview } from "../lib/cardNewsTemplateStore.js";
-import { listRoleTemplates } from "../lib/cardNewsRoleTemplateStore.js";
-import { createCardNewsDraft } from "../lib/cardNewsPlanner.js";
-import { generateCardNewsSet } from "../lib/cardNewsGenerator.js";
-import {
-  createCardNewsJob,
-  finishCardNewsJob,
-  getCardNewsJob,
-  getCardNewsJobPlan,
-  retryCardNewsJob,
-  updateCardNewsJob,
-  updateCardNewsJobCard,
-} from "../lib/cardNewsJobStore.js";
-import { listCardNewsSets, readCardNewsManifest, readCardNewsSetPlan } from "../lib/cardNewsManifestStore.js";
-
-import { errInfo } from "../lib/errInfo.js";
-import { requireRuntimeContext, type RouteRuntimeContext, type RuntimeContext } from "../lib/runtimeContext.js";
-
-interface CardLike {
-  id?: string;
-  cardId?: string;
-  status?: string;
-  error?: { message?: string } | string | null;
-  headline?: string;
-  body?: string;
-  textFields?: unknown;
-  imageFilename?: string | null;
-  generatedAt?: string | number | null;
-  setId?: string;
-}
-
-function sendError(res: Response, err: unknown) {
-  const info = errInfo(err);
-  const status = info.status || 500;
-  res.status(status).json({
-    error: {
-      code: info.code || "CARD_NEWS_ERROR",
-      message: info.message || "Card News request failed",
-    },
-  });
-}
-
-function runCardNewsJob(ctx: RuntimeContext, jobId: string, plan: unknown) {
-  setImmediate(async () => {
-    try {
-      updateCardNewsJob(jobId, { status: "running" });
-      await generateCardNewsSet(ctx, plan as Parameters<typeof generateCardNewsSet>[1], {
-        onCardStart: (card: CardLike) => {
-          updateCardNewsJobCard(jobId, card.cardId ?? "", { status: "generating", error: undefined });
-        },
-        onCardDone: (card: CardLike) => {
-          const url = card.imageFilename && card.setId
-            ? `/generated/cardnews/${encodeURIComponent(card.setId)}/${encodeURIComponent(card.imageFilename)}`
-            : undefined;
-          const errStr = card.error
-            ? (typeof card.error === "object" && card.error && "message" in card.error
-              ? card.error.message
-              : (typeof card.error === "string" ? card.error : undefined))
-            : undefined;
-          updateCardNewsJobCard(jobId, card.cardId ?? "", {
-            status: card.status || "generated",
-            error: errStr,
-            headline: card.headline,
-            body: card.body,
-            textFields: Array.isArray(card.textFields) ? card.textFields : [],
-            imageFilename: card.imageFilename || undefined,
-            generatedAt: card.generatedAt || undefined,
-            url,
-          });
-        },
-      });
-      finishCardNewsJob(jobId);
-    } catch (e) {
-      const err = errInfo(e);
-      updateCardNewsJob(jobId, {
-        status: "error",
-        error: err.message || "Card News job failed",
-      });
-    }
-  });
-}
-
-export function registerCardNewsRoutes(app: Express, ctxRaw: RouteRuntimeContext) {
-  const ctx = requireRuntimeContext(ctxRaw);
-  app.get("/api/cardnews/image-templates", async (_req: Request, res: Response) => {
-    try {
-      res.json({ templates: await listImageTemplates(ctx) });
-    } catch (err) {
-      sendError(res, err);
-    }
-  });
-
-  app.get("/api/cardnews/image-templates/:templateId/preview", async (req: Request<{ templateId: string }>, res: Response) => {
-    try {
-      const buf = await readTemplatePreview(ctx, req.params.templateId);
-      res.type("image/png").send(buf);
-    } catch (err) {
-      sendError(res, err);
-    }
-  });
-
-  app.get("/api/cardnews/role-templates", (_req: Request, res: Response) => {
-    res.json({ templates: listRoleTemplates() });
-  });
-
-  app.get("/api/cardnews/sets", async (_req: Request, res: Response) => {
-    try {
-      res.json({ sets: await listCardNewsSets(ctx) });
-    } catch (err) {
-      sendError(res, err);
-    }
-  });
-
-  app.get("/api/cardnews/sets/:setId", async (req: Request<{ setId: string }>, res: Response) => {
-    try {
-      res.json({ plan: await readCardNewsSetPlan(ctx, req.params.setId) });
-    } catch (err) {
-      sendError(res, err);
-    }
-  });
-
-  app.get("/api/cardnews/sets/:setId/manifest", async (req: Request<{ setId: string }>, res: Response) => {
-    try {
-      const manifest = await readCardNewsManifest(ctx, req.params.setId);
-      if (req.query.download === "1") {
-        res.setHeader("Content-Disposition", `attachment; filename="${req.params.setId}-manifest.json"`);
-      }
-      res.type("application/json").send(JSON.stringify(manifest, null, 2));
-    } catch (err) {
-      sendError(res, err);
-    }
-  });
-
-  app.post("/api/cardnews/draft", async (req: Request, res: Response) => {
-    try {
-      res.json(await createCardNewsDraft(ctx, (req.body ?? {}) as Parameters<typeof createCardNewsDraft>[1]));
-    } catch (err) {
-      sendError(res, err);
-    }
-  });
-
-  app.post("/api/cardnews/generate", async (req: Request, res: Response) => {
-    try {
-      const result = await generateCardNewsSet(ctx, (req.body ?? {}) as Parameters<typeof generateCardNewsSet>[1]);
-      res.json(result);
-    } catch (err) {
-      sendError(res, err);
-    }
-  });
-
-  app.post("/api/cardnews/jobs", (req: Request, res: Response) => {
-    try {
-      const body = (req.body ?? {}) as Parameters<typeof createCardNewsJob>[0];
-      const summary = createCardNewsJob(body);
-      runCardNewsJob(ctx, summary.jobId, body);
-      res.status(202).json(summary);
-    } catch (err) {
-      sendError(res, err);
-    }
-  });
-
-  app.get("/api/cardnews/jobs/:jobId", (req: Request<{ jobId: string }>, res: Response) => {
-    const job = getCardNewsJob(req.params.jobId);
-    if (!job) {
-      res.status(404).json({ error: { code: "CARD_NEWS_JOB_NOT_FOUND", message: "Job not found" } });
-      return;
-    }
-    res.json(job);
-  });
-
-  app.post("/api/cardnews/jobs/:jobId/retry", (req: Request<{ jobId: string }>, res: Response) => {
-    const plan = getCardNewsJobPlan(req.params.jobId);
-    const body = (req.body ?? {}) as { cardIds?: string[] };
-    const job = retryCardNewsJob(req.params.jobId, body.cardIds || []);
-    if (!job) {
-      res.status(404).json({ error: { code: "CARD_NEWS_JOB_NOT_FOUND", message: "Job not found" } });
-      return;
-    }
-    if (plan) {
-      const wanted = new Set(body.cardIds || []);
-      const planObj = plan as { cards?: Array<{ id: string }> } & Record<string, unknown>;
-      runCardNewsJob(ctx, req.params.jobId, {
-        ...planObj,
-        cards: (planObj.cards || []).filter((card: { id: string }) => wanted.has(card.id)),
-      });
-    }
-    res.status(202).json(job);
-  });
-
-  app.post("/api/cardnews/cards/:cardId/regenerate", async (req: Request<{ cardId: string }>, res: Response) => {
-    try {
-      const body = (req.body ?? {}) as { cards?: CardLike[]; card?: CardLike } & Record<string, unknown>;
-      const cards = Array.isArray(body.cards)
-        ? body.cards.filter((card: CardLike) => card.id === req.params.cardId || card.cardId === req.params.cardId)
-        : body.card ? [body.card] : [];
-      const result = await generateCardNewsSet(ctx, { ...body, cards } as Parameters<typeof generateCardNewsSet>[1]);
-      res.json(result);
-    } catch (err) {
-      sendError(res, err);
-    }
-  });
-
-  app.post("/api/cardnews/export", (_req: Request, res: Response) => {
-    res.status(202).json({
-      ok: true,
-      status: "planned",
-      message: "Card News export is planned after the dev MVP generation slice.",
-    });
-  });
-}

package/routes/comfy.ts

@@ -1,43 +0,0 @@
-import type { Express, Request, Response } from "express";
-import { exportImageToComfy, isComfyBridgeError } from "../lib/comfyBridge.js";
-import { requireRuntimeContext, type RouteRuntimeContext } from "../lib/runtimeContext.js";
-
-const ALLOWED_BODY_KEYS = new Set(["filename"]);
-
-function hasExactBodyShape(body: unknown): body is { filename: string } {
-  if (!body || typeof body !== "object" || Array.isArray(body)) return false;
-  const obj = body as Record<string, unknown>;
-  const keys = Object.keys(obj);
-  return keys.length === 1 && ALLOWED_BODY_KEYS.has(keys[0]) && typeof obj.filename === "string";
-}
-
-function errorPayload(code: string, message: string) {
-  return {
-    ok: false,
-    error: { code, message },
-  };
-}
-
-export function registerComfyRoutes(app: Express, ctxRaw: RouteRuntimeContext) {
-  const ctx = requireRuntimeContext(ctxRaw);
-  app.post("/api/comfy/export-image", async (req: Request, res: Response) => {
-    try {
-      if (!hasExactBodyShape(req.body)) {
-        return res.status(400).json(errorPayload(
-          "COMFY_IMAGE_INVALID",
-          "Request body must contain exactly one filename.",
-        ));
-      }
-      const result = await exportImageToComfy(ctx, { filename: req.body.filename });
-      return res.json(result);
-    } catch (error) {
-      if (isComfyBridgeError(error)) {
-        return res.status((error as any).status).json(errorPayload((error as any).code, error.message));
-      }
-      return res.status(502).json(errorPayload(
-        "COMFY_UPLOAD_FAILED",
-        "Could not upload image to ComfyUI.",
-      ));
-    }
-  });
-}

package/routes/edit.ts

@@ -1,352 +0,0 @@
-import { mkdir, writeFile } from "fs/promises";
-import { join } from "path";
-import { randomBytes } from "crypto";
-import type { Express, Request, Response } from "express";
-import { detectImageMimeFromB64 } from "../lib/refs.js";
-import { classifyUpstreamError } from "../lib/errorClassify.js";
-import { normalizeOAuthParams } from "../lib/oauthNormalize.js";
-import { resolveProviderOptions } from "../lib/providerOptions.js";
-import { editViaResponses } from "../lib/responsesImageAdapter.js";
-import { editViaGrok } from "../lib/grokImageAdapter.js";
-import { startJob, finishJob, registerJobAbortController, isJobCanceled } from "../lib/inflight.js";
-import {
-  isGenerationCanceledError,
-  makeGenerationCanceledError,
-  throwIfJobCanceled,
-} from "../lib/generationCancel.js";
-import { logEvent, logError } from "../lib/logger.js";
-import { hasPngAlphaChannel, parsePngInfo } from "../lib/pngInfo.js";
-import { invalidateHistoryIndex } from "../lib/historyIndex.js";
-
-import { errInfo } from "../lib/errInfo.js";
-import { requireRuntimeContext, type RouteRuntimeContext, type RuntimeContext } from "../lib/runtimeContext.js";
-function validateModeration(ctx: RuntimeContext, moderation: unknown) {
-  if (typeof moderation !== "string" || !ctx.config.oauth.validModeration.has(moderation)) {
-    return { error: "moderation must be one of: auto, low" };
-  }
-  return { moderation };
-}
-
-function imageFormatFromMime(mime: string | null | undefined): "png" | "jpeg" | "webp" {
-  if (mime === "image/jpeg") return "jpeg";
-  if (mime === "image/webp") return "webp";
-  return "png";
-}
-
-const MAX_EDIT_MASK_BYTES = 16 * 1024 * 1024;
-const BASE64_RE = /^[A-Za-z0-9+/]+={0,2}$/;
-
-function stripPngDataUrl(value: unknown): string {
-  if (typeof value !== "string") return "";
-  return value.replace(/^data:image\/png;base64,/, "");
-}
-
-interface PngDecodeResult {
-  b64?: string;
-  buffer?: Buffer;
-  info?: ReturnType<typeof parsePngInfo>;
-  error?: string;
-  code?: string;
-}
-
-function decodePngDataUrl(value: unknown, invalidCode: string, pngCode: string): PngDecodeResult {
-  const b64 = stripPngDataUrl(value).replace(/\s+/g, "");
-  if (!b64 || b64.length % 4 !== 0 || !BASE64_RE.test(b64)) {
-    return { error: "image must be valid base64", code: invalidCode };
-  }
-  const buffer = Buffer.from(b64, "base64");
-  if (buffer.length === 0 || buffer.toString("base64").replace(/=+$/, "") !== b64.replace(/=+$/, "")) {
-    return { error: "image must be valid base64", code: invalidCode };
-  }
-  const info = parsePngInfo(buffer);
-  if (info.error) return { error: "image must be a PNG image", code: pngCode };
-  return { b64, buffer, info };
-}
-
-interface MaskValidationResult {
-  mask?: string | null;
-  maskBytes?: number;
-  error?: string;
-  code?: string;
-}
-
-function validateEditMask(imageB64: unknown, mask: unknown): MaskValidationResult {
-  if (mask == null) return { mask: null, maskBytes: 0 };
-  if (typeof mask !== "string" || mask.length === 0) {
-    return { error: "mask must be a PNG data URL or base64 string", code: "INVALID_EDIT_MASK" };
-  }
-  const maskCheck = decodePngDataUrl(mask, "INVALID_EDIT_MASK_BASE64", "INVALID_EDIT_MASK_PNG");
-  if (maskCheck.error || !maskCheck.buffer || !maskCheck.info) return maskCheck;
-  if (maskCheck.buffer.length > MAX_EDIT_MASK_BYTES) {
-    return { error: "mask is too large", code: "EDIT_MASK_TOO_LARGE" };
-  }
-  if (!hasPngAlphaChannel(maskCheck.info)) {
-    return { error: "mask PNG must include an alpha channel", code: "EDIT_MASK_NO_ALPHA" };
-  }
-  const imageCheck = decodePngDataUrl(imageB64, "INVALID_EDIT_IMAGE_BASE64", "INVALID_EDIT_IMAGE_PNG");
-  if (imageCheck.error || !imageCheck.info) return imageCheck;
-  if (imageCheck.info.width !== maskCheck.info.width || imageCheck.info.height !== maskCheck.info.height) {
-    return { error: "mask dimensions must match image dimensions", code: "EDIT_MASK_DIMENSION_MISMATCH" };
-  }
-  return { mask: maskCheck.b64, maskBytes: maskCheck.buffer.length };
-}
-
-export function registerEditRoutes(app: Express, ctxRaw: RouteRuntimeContext) {
-  const ctx = requireRuntimeContext(ctxRaw);
-  app.post("/api/edit", async (req: Request, res: Response) => {
-    const requestId = typeof req.body?.requestId === "string" ? req.body.requestId : req.id;
-    let finishStatus = "completed";
-    let finishHttpStatus;
-    let finishErrorCode;
-    let finishMeta = {};
-    let finishCanceled = false;
-    const cancelController = new AbortController();
-    try {
-      const {
-        prompt,
-        image: imageB64,
-        mask: rawMask,
-        quality: rawQuality = "medium",
-        size = "1024x1024",
-        moderation = "low",
-        provider = "oauth",
-        mode: promptMode = "auto",
-        model: rawModel,
-        reasoningEffort: rawReasoningEffort,
-        webSearchEnabled: rawWebSearchEnabled = true,
-      } = req.body;
-      const { quality, warnings: qualityWarnings } = normalizeOAuthParams({ provider, quality: rawQuality });
-      const providerOptions = resolveProviderOptions(ctx, {
-        provider,
-        rawModel,
-        rawReasoningEffort,
-        rawSize: size,
-        rawWebSearchEnabled,
-      });
-      if (providerOptions.error) {
-        finishStatus = "error";
-        finishHttpStatus = providerOptions.status;
-        finishErrorCode = providerOptions.code;
-        return res.status(providerOptions.status).json({ error: providerOptions.error, code: providerOptions.code });
-      }
-      const imageModel = providerOptions.model;
-      const reasoningEffort = providerOptions.reasoningEffort;
-      const effectiveSize = providerOptions.size;
-      const webSearchEnabled = providerOptions.webSearchEnabled;
-      const activeProvider = providerOptions.provider;
-      const sessionId = typeof req.body?.sessionId === "string" ? req.body.sessionId : null;
-      const normalizedPromptMode = promptMode === "direct" ? "direct" : "auto";
-
-      startJob({
-        requestId,
-        kind: "classic",
-        prompt,
-        meta: {
-          kind: "edit",
-          sessionId,
-          quality,
-          model: imageModel,
-          size: effectiveSize,
-        },
-      });
-      registerJobAbortController(requestId, cancelController);
-
-      if (!prompt || !imageB64) {
-        finishStatus = "error";
-        finishHttpStatus = 400;
-        finishErrorCode = "INVALID_EDIT_INPUT";
-        return res.status(400).json({ error: "Prompt and image are required" });
-      }
-      if (activeProvider === "grok" && rawMask) {
-        finishStatus = "error";
-        finishHttpStatus = 400;
-        finishErrorCode = "GROK_MASK_UNSUPPORTED";
-        return res.status(400).json({ error: "Grok provider does not support mask editing", code: "GROK_MASK_UNSUPPORTED" });
-      }
-      const maskCheck: any = validateEditMask(imageB64, rawMask);
-      if (maskCheck.error) {
-        finishStatus = "error";
-        finishHttpStatus = 400;
-        finishErrorCode = maskCheck.code;
-        return res.status(400).json({ error: maskCheck.error, code: maskCheck.code });
-      }
-      const moderationCheck = validateModeration(ctx, moderation);
-      if (moderationCheck.error) {
-        finishStatus = "error";
-        finishHttpStatus = 400;
-        finishErrorCode = "INVALID_MODERATION";
-        return res.status(400).json({ error: moderationCheck.error });
-      }
-
-      logEvent("edit", "request", {
-        requestId,
-        client: req.get("x-ima2-client") || "ui",
-        provider: activeProvider,
-        quality,
-        model: imageModel,
-        size: effectiveSize,
-        moderation,
-        sessionId,
-        promptChars: typeof prompt === "string" ? prompt.length : 0,
-        promptMode: normalizedPromptMode,
-        webSearchEnabled,
-        inputImageChars: typeof imageB64 === "string" ? imageB64.length : 0,
-        maskPresent: Boolean(maskCheck.mask),
-        maskBytes: maskCheck.maskBytes ?? 0,
-      });
-      const startTime = Date.now();
-      let resultB64: string;
-      let usage: Record<string, number> | null;
-      let revisedPrompt: string | undefined;
-      let webSearchCalls = 0;
-      let resultMimeFromProvider: string | undefined;
-
-      if (activeProvider === "grok") {
-        const grokModel = quality === "high" ? "grok-imagine-image-quality" : imageModel;
-        const r = await editViaGrok(prompt, imageB64, ctx, {
-          model: grokModel,
-          size: effectiveSize,
-          signal: cancelController.signal,
-          requestId,
-        });
-        resultB64 = r.b64;
-        usage = r.usage;
-        revisedPrompt = r.revisedPrompt;
-        webSearchCalls = r.webSearchCalls;
-        resultMimeFromProvider = r.mime;
-      } else {
-        const r = await editViaResponses(
-          activeProvider,
-          prompt,
-          imageB64,
-          quality,
-          effectiveSize,
-          moderation,
-          normalizedPromptMode,
-          ctx,
-          requestId,
-          {
-            model: imageModel,
-            reasoningEffort,
-            webSearchEnabled,
-            mask: maskCheck.mask,
-            signal: cancelController.signal,
-          },
-        );
-        resultB64 = r.b64;
-        usage = r.usage ?? null;
-        revisedPrompt = r.revisedPrompt ?? undefined;
-        webSearchCalls = r.webSearchCalls ?? 0;
-      }
-      throwIfJobCanceled(requestId);
-
-      const elapsed = +((Date.now() - startTime) / 1000).toFixed(1);
-      await mkdir(ctx.config.storage.generatedDir, { recursive: true });
-      throwIfJobCanceled(requestId);
-      const editMime = activeProvider === "grok"
-        ? (resultMimeFromProvider || detectImageMimeFromB64(resultB64) || "image/png")
-        : "image/png";
-      const editExt = activeProvider === "grok" ? imageFormatFromMime(editMime) : "png";
-      const filename = `${Date.now()}_${randomBytes(ctx.config.ids.generatedHexBytes).toString("hex")}.${editExt}`;
-      await writeFile(join(ctx.config.storage.generatedDir, filename), Buffer.from(resultB64, "base64"));
-      const meta = {
-        prompt,
-        userPrompt: prompt,
-        revisedPrompt: revisedPrompt || null,
-        promptMode: normalizedPromptMode,
-        quality,
-        size: effectiveSize,
-        moderation,
-        model: imageModel,
-        reasoningEffort,
-        elapsed,
-        format: editExt,
-        provider: activeProvider,
-        kind: "edit",
-        requestId,
-        createdAt: Date.now(),
-        usage: usage || null,
-        webSearchCalls,
-        webSearchEnabled,
-      };
-      await writeFile(join(ctx.config.storage.generatedDir, filename + ".json"), JSON.stringify(meta)).catch(() => {});
-      invalidateHistoryIndex();
-      finishHttpStatus = 200;
-      finishMeta = { filename, imageChars: resultB64.length };
-      logEvent("edit", "saved", {
-        requestId,
-        filename,
-        imageChars: resultB64.length,
-        elapsedMs: Date.now() - startTime,
-      });
-
-      res.json({
-        image: `data:${editMime};base64,${resultB64}`,
-        elapsed,
-        reasoningEffort,
-        filename,
-        usage,
-        provider: activeProvider,
-        model: activeProvider === "grok" ? (quality === "high" ? "grok-imagine-image-quality" : imageModel) : imageModel,
-        moderation,
-        warnings: qualityWarnings,
-        revisedPrompt: revisedPrompt || null,
-        promptMode: normalizedPromptMode,
-        webSearchCalls,
-        webSearchEnabled,
-      });
-    } catch (e) {
-      const err = errInfo(e);
-      const ext = (err.raw && typeof err.raw === "object" ? err.raw as Record<string, unknown> : {});
-      const fallbackCode = err.code || classifyUpstreamError(err.message);
-      if (isGenerationCanceledError(err.raw) || isJobCanceled(requestId)) {
-        const canceled = makeGenerationCanceledError();
-        finishCanceled = true;
-        finishHttpStatus = canceled.status;
-        finishErrorCode = canceled.code;
-        return res.status(canceled.status).json({
-          error: canceled.message,
-          code: canceled.code,
-          requestId,
-        });
-      }
-      finishStatus = "error";
-      finishHttpStatus = err.status || 500;
-      finishErrorCode = fallbackCode || "EDIT_FAILED";
-      logError("edit", "error", err.raw, { requestId, code: finishErrorCode });
-      res.status(err.status || 500).json({
-        error: err.message,
-        code: fallbackCode,
-        upstreamCode: ext.upstreamCode || null,
-        upstreamType: ext.upstreamType || null,
-        upstreamParam: ext.upstreamParam || null,
-        diagnosticReason: ext.diagnosticReason || null,
-        retryKind: ext.retryKind || null,
-        initialEventCount: ext.initialEventCount ?? null,
-        initialEventTypes: ext.initialEventTypes || null,
-        referencesDroppedOnRetry: ext.referencesDroppedOnRetry ?? null,
-        developerPromptDroppedOnRetry: ext.developerPromptDroppedOnRetry ?? null,
-        webSearchDroppedOnRetry: ext.webSearchDroppedOnRetry ?? null,
-        fallbackEventCount: ext.fallbackEventCount ?? null,
-        fallbackEventTypes: ext.fallbackEventTypes || null,
-        fallbackImageCallSeen: ext.fallbackImageCallSeen ?? null,
-        fallbackImageResultCount: ext.fallbackImageResultCount ?? null,
-        errorEventCount: ext.eventCount ?? null,
-        eventTypes: ext.eventTypes || null,
-        webSearchCalls: ext.webSearchCalls ?? null,
-        responseDiagnostics: ext.responseDiagnostics || null,
-        toolTypes: ext.toolTypes || null,
-        toolChoiceKind: ext.toolChoiceKind || null,
-        requestId,
-      });
-    } finally {
-      finishJob(requestId, {
-        canceled: finishCanceled,
-        status: finishStatus,
-        httpStatus: finishHttpStatus,
-        errorCode: finishErrorCode,
-        meta: finishMeta,
-      });
-    }
-  });
-}