@enslo/sd-metadata 1.5.0 → 1.6.1

package/dist/index.js

@@ -4,6 +4,14 @@ var Result = {
   error: (error) => ({ ok: false, error })
 };
 
+// src/utils/object.ts
+function trimObject(obj) {
+  const result = Object.fromEntries(
+    Object.entries(obj).filter(([, value]) => value !== void 0)
+  );
+  return Object.keys(result).length === 0 ? void 0 : result;
+}
+
 // src/parsers/a1111.ts
 function parseA1111(entries) {
   const parametersEntry = entries.find(
@@ -24,21 +32,8 @@ function parseA1111(entries) {
   const version = settingsMap.get("Version");
   const app = settingsMap.get("App");
   const software = detectSoftwareVariant(version, app);
-  const metadata = {
-    software,
-    prompt,
-    negativePrompt,
-    width,
-    height
-  };
   const modelName = settingsMap.get("Model");
   const modelHash = settingsMap.get("Model hash");
-  if (modelName || modelHash) {
-    metadata.model = {
-      name: modelName,
-      hash: modelHash
-    };
-  }
   const sampler = settingsMap.get("Sampler");
   const scheduler = settingsMap.get("Schedule type");
   const steps = parseNumber(settingsMap.get("Steps"));
@@ -47,29 +42,30 @@ function parseA1111(entries) {
   );
   const seed = parseNumber(settingsMap.get("Seed"));
   const clipSkip = parseNumber(settingsMap.get("Clip skip"));
-  if (sampler !== void 0 || scheduler !== void 0 || steps !== void 0 || cfg !== void 0 || seed !== void 0 || clipSkip !== void 0) {
-    metadata.sampling = {
+  const hiresScale = parseNumber(settingsMap.get("Hires upscale"));
+  const upscaler = settingsMap.get("Hires upscaler");
+  const hiresSteps = parseNumber(settingsMap.get("Hires steps"));
+  const denoise = parseNumber(settingsMap.get("Denoising strength"));
+  const hiresSize = settingsMap.get("Hires size");
+  const [hiresWidth] = parseSize(hiresSize ?? "");
+  const scale = hiresScale ?? (hiresWidth > 0 ? hiresWidth / width : void 0);
+  return Result.ok({
+    software,
+    prompt,
+    negativePrompt,
+    width,
+    height,
+    model: trimObject({ name: modelName, hash: modelHash }),
+    sampling: trimObject({
       sampler,
       scheduler,
       steps,
       cfg,
       seed,
       clipSkip
-    };
-  }
-  const hiresScale = parseNumber(settingsMap.get("Hires upscale"));
-  const upscaler = settingsMap.get("Hires upscaler");
-  const hiresSteps = parseNumber(settingsMap.get("Hires steps"));
-  const denoise = parseNumber(settingsMap.get("Denoising strength"));
-  const hiresSize = settingsMap.get("Hires size");
-  if ([hiresScale, hiresSize, upscaler, hiresSteps, denoise].some(
-    (v) => v !== void 0
-  )) {
-    const [hiresWidth] = parseSize(hiresSize ?? "");
-    const scale = hiresScale ?? hiresWidth / width;
-    metadata.hires = { scale, upscaler, steps: hiresSteps, denoise };
-  }
-  return Result.ok(metadata);
+    }),
+    hires: trimObject({ scale, upscaler, steps: hiresSteps, denoise })
+  });
 }
 function parseParametersText(text) {
   const negativeIndex = text.indexOf("Negative prompt:");
@@ -133,13 +129,6 @@ function detectSoftwareVariant(version, app) {
   return "sd-webui";
 }
 
-// src/utils/entries.ts
-function buildEntryRecord(entries) {
-  return Object.freeze(
-    Object.fromEntries(entries.map((e) => [e.keyword, e.text]))
-  );
-}
-
 // src/utils/json.ts
 function parseJson(text) {
   try {
@@ -152,7 +141,37 @@ function parseJson(text) {
   }
 }
 
+// src/utils/entries.ts
+function buildEntryRecord(entries) {
+  return Object.freeze(
+    Object.fromEntries(entries.map((e) => [e.keyword, e.text]))
+  );
+}
+function extractFromCommentJson(entryRecord, key) {
+  if (!entryRecord.Comment?.startsWith("{")) return void 0;
+  const parsed = parseJson(entryRecord.Comment);
+  if (!parsed.ok) return void 0;
+  const value = parsed.value[key];
+  if (typeof value === "string") return value;
+  if (typeof value === "object" && value !== null) return JSON.stringify(value);
+  return void 0;
+}
+
 // src/parsers/comfyui.ts
+var CIVITAI_EXTENSION_KEYS = ["extra", "extraMetadata", "resource-stack"];
+var COMFYUI_NODE_KEYS = {
+  sampler: ["Sampler"],
+  positiveClip: ["PositiveCLIP_Base"],
+  negativeClip: ["NegativeCLIP_Base"],
+  latentImage: ["EmptyLatentImage"],
+  checkpoint: ["CheckpointLoader_Base"],
+  hiresModelUpscale: [
+    "HiresFix_ModelUpscale_UpscaleModelLoader",
+    "PostUpscale_ModelUpscale_UpscaleModelLoader"
+  ],
+  hiresImageScale: ["HiresFix_ImageScale", "PostUpscale_ImageScale"],
+  hiresSampler: ["HiresFix_Sampler"]
+};
 function parseComfyUI(entries) {
   const entryRecord = buildEntryRecord(entries);
   const promptText = findPromptJson(entryRecord);
@@ -167,99 +186,35 @@ function parseComfyUI(entries) {
     });
   }
   const prompt = parsed.value;
-  const nodes = Object.values(prompt);
-  if (!nodes.some((node) => "class_type" in node)) {
+  if (!Object.values(prompt).some((node) => "class_type" in node)) {
     return Result.error({ type: "unsupportedFormat" });
   }
-  const ksampler = findNode(prompt, ["Sampler"]);
-  const positiveClip = findNode(prompt, ["PositiveCLIP_Base"]);
-  const negativeClip = findNode(prompt, ["NegativeCLIP_Base"]);
-  const clipPositiveText = extractText(positiveClip);
-  const clipNegativeText = extractText(negativeClip);
-  const latentImage = findNode(prompt, ["EmptyLatentImage"]);
-  const latentWidth = latentImage ? Number(latentImage.inputs.width) || 0 : 0;
-  const latentHeight = latentImage ? Number(latentImage.inputs.height) || 0 : 0;
-  const extraMeta = extractExtraMetadata(prompt);
-  const positiveText = clipPositiveText || extraMeta?.prompt || "";
-  const negativeText = clipNegativeText || extraMeta?.negativePrompt || "";
-  const width = latentWidth || extraMeta?.width || 0;
-  const height = latentHeight || extraMeta?.height || 0;
-  const metadata = {
+  const nodes = Object.fromEntries(
+    Object.entries(prompt).filter(
+      ([key]) => !CIVITAI_EXTENSION_KEYS.includes(key)
+    )
+  );
+  const comfyMetadata = extractComfyUIMetadata(prompt);
+  const civitaiMetadata = extractCivitaiMetadata(
+    extractExtraMetadata(prompt, entryRecord)
+  );
+  const merged = mergeMetadata(civitaiMetadata, comfyMetadata);
+  return Result.ok({
     software: "comfyui",
-    prompt: positiveText,
-    negativePrompt: negativeText,
-    width,
-    height,
-    nodes: prompt
-    // Store the parsed node graph
-  };
-  const checkpoint = findNode(prompt, ["CheckpointLoader_Base"])?.inputs?.ckpt_name;
-  if (checkpoint) {
-    metadata.model = { name: String(checkpoint) };
-  } else if (extraMeta?.baseModel) {
-    metadata.model = { name: extraMeta.baseModel };
-  }
-  if (ksampler) {
-    metadata.sampling = {
-      seed: ksampler.inputs.seed,
-      steps: ksampler.inputs.steps,
-      cfg: ksampler.inputs.cfg,
-      sampler: ksampler.inputs.sampler_name,
-      scheduler: ksampler.inputs.scheduler
-    };
-  } else if (extraMeta) {
-    metadata.sampling = {
-      seed: extraMeta.seed,
-      steps: extraMeta.steps,
-      cfg: extraMeta.cfgScale,
-      sampler: extraMeta.sampler
-    };
-  }
-  const hiresModel = findNode(prompt, [
-    "HiresFix_ModelUpscale_UpscaleModelLoader",
-    "PostUpscale_ModelUpscale_UpscaleModelLoader"
-  ])?.inputs;
-  const hiresScale = findNode(prompt, [
-    "HiresFix_ImageScale",
-    "PostUpscale_ImageScale"
-  ])?.inputs;
-  const hiresSampler = findNode(prompt, ["HiresFix_Sampler"])?.inputs;
-  if (hiresModel && hiresScale) {
-    const hiresWidth = hiresScale.width;
-    const scale = latentWidth > 0 ? Math.round(hiresWidth / latentWidth * 100) / 100 : void 0;
-    if (hiresSampler) {
-      metadata.hires = {
-        upscaler: hiresModel.model_name,
-        scale,
-        steps: hiresSampler.steps,
-        denoise: hiresSampler.denoise
-      };
-    } else {
-      metadata.upscale = {
-        upscaler: hiresModel.model_name,
-        scale
-      };
-    }
-  }
-  if (extraMeta?.transformations) {
-    const upscaleTransform = extraMeta.transformations.find(
-      (t) => t.type === "upscale"
-    );
-    if (upscaleTransform) {
-      const originalWidth = extraMeta.width ?? width;
-      if (originalWidth > 0 && upscaleTransform.upscaleWidth) {
-        const scale = upscaleTransform.upscaleWidth / originalWidth;
-        metadata.upscale = {
-          scale: Math.round(scale * 100) / 100
-        };
-      }
-    }
-  }
-  return Result.ok(metadata);
+    nodes,
+    ...merged
+  });
+}
+function cleanJsonString(json) {
+  return json.replace(/\0+$/, "").replace(/:\s*NaN\b/g, ": null");
+}
+function calculateScale(targetWidth, baseWidth) {
+  if (baseWidth <= 0 || targetWidth <= 0) return void 0;
+  return Math.round(targetWidth / baseWidth * 100) / 100;
 }
 function findPromptJson(entryRecord) {
   if (entryRecord.prompt) {
-    return entryRecord.prompt.replace(/:\s*NaN\b/g, ": null");
+    return cleanJsonString(entryRecord.prompt);
   }
   const candidates = [
     entryRecord.Comment,
@@ -273,7 +228,7 @@ function findPromptJson(entryRecord) {
   for (const candidate of candidates) {
     if (!candidate) continue;
     if (candidate.startsWith("{")) {
-      const cleaned = candidate.replace(/\0+$/, "").replace(/:\s*NaN\b/g, ": null");
+      const cleaned = cleanJsonString(candidate);
       const parsed = parseJson(cleaned);
       if (!parsed.ok) continue;
       if (parsed.value.prompt && typeof parsed.value.prompt === "object") {
@@ -293,14 +248,174 @@ function findNode(prompt, keys) {
 function extractText(node) {
   return typeof node?.inputs.text === "string" ? node.inputs.text : "";
 }
-function extractExtraMetadata(prompt) {
+function extractPromptTexts(prompt) {
+  const positiveClip = findNode(prompt, COMFYUI_NODE_KEYS.positiveClip);
+  const negativeClip = findNode(prompt, COMFYUI_NODE_KEYS.negativeClip);
+  return {
+    promptText: extractText(positiveClip),
+    negativeText: extractText(negativeClip)
+  };
+}
+function extractDimensions(prompt) {
+  const latentImage = findNode(prompt, COMFYUI_NODE_KEYS.latentImage);
+  return {
+    width: latentImage ? Number(latentImage.inputs.width) || 0 : 0,
+    height: latentImage ? Number(latentImage.inputs.height) || 0 : 0
+  };
+}
+function extractSamplingFromKSampler(ksampler) {
+  if (!ksampler) return void 0;
+  return {
+    seed: ksampler.inputs.seed,
+    steps: ksampler.inputs.steps,
+    cfg: ksampler.inputs.cfg,
+    sampler: ksampler.inputs.sampler_name,
+    scheduler: ksampler.inputs.scheduler
+  };
+}
+function extractModelFromCheckpoint(checkpoint) {
+  if (!checkpoint?.inputs?.ckpt_name) return void 0;
+  return { name: String(checkpoint.inputs.ckpt_name) };
+}
+function extractComfyUIMetadata(prompt) {
+  const { promptText, negativeText } = extractPromptTexts(prompt);
+  const { width, height } = extractDimensions(prompt);
+  const ksampler = findNode(prompt, COMFYUI_NODE_KEYS.sampler);
+  const checkpoint = findNode(prompt, COMFYUI_NODE_KEYS.checkpoint);
+  const hiresModel = findNode(
+    prompt,
+    COMFYUI_NODE_KEYS.hiresModelUpscale
+  )?.inputs;
+  const hiresScale = findNode(
+    prompt,
+    COMFYUI_NODE_KEYS.hiresImageScale
+  )?.inputs;
+  const hiresSampler = findNode(prompt, COMFYUI_NODE_KEYS.hiresSampler)?.inputs;
+  return trimObject({
+    prompt: promptText || void 0,
+    negativePrompt: negativeText || void 0,
+    width: width > 0 ? width : void 0,
+    height: height > 0 ? height : void 0,
+    model: extractModelFromCheckpoint(checkpoint),
+    sampling: extractSamplingFromKSampler(ksampler),
+    ...buildHiresOrUpscale(hiresModel, hiresScale, hiresSampler, width)
+  });
+}
+function buildHiresOrUpscale(hiresModel, hiresScale, hiresSampler, baseWidth) {
+  if (!hiresModel || !hiresScale) return {};
+  const hiresWidth = hiresScale.width;
+  const scale = calculateScale(hiresWidth, baseWidth);
+  if (hiresSampler) {
+    return {
+      hires: {
+        upscaler: hiresModel.model_name,
+        scale,
+        steps: hiresSampler.steps,
+        denoise: hiresSampler.denoise
+      }
+    };
+  }
+  return {
+    upscale: {
+      upscaler: hiresModel.model_name,
+      scale
+    }
+  };
+}
+function extractExtraMetadata(prompt, entryRecord) {
   const extraMetaField = prompt.extraMetadata;
-  if (typeof extraMetaField !== "string") return void 0;
-  const parsed = parseJson(extraMetaField);
-  return parsed.ok ? parsed.value : void 0;
+  if (typeof extraMetaField === "string") {
+    const parsed = parseJson(extraMetaField);
+    if (parsed.ok) return parsed.value;
+  }
+  if (entryRecord?.extraMetadata) {
+    const parsed = parseJson(entryRecord.extraMetadata);
+    if (parsed.ok) return parsed.value;
+  }
+  return void 0;
+}
+function extractCivitaiMetadata(extraMeta) {
+  if (!extraMeta) return void 0;
+  const upscale = buildCivitaiUpscale(extraMeta);
+  const sampling = buildCivitaiSampling(extraMeta);
+  return trimObject({
+    prompt: extraMeta.prompt,
+    negativePrompt: extraMeta.negativePrompt,
+    width: extraMeta.width,
+    height: extraMeta.height,
+    model: extraMeta.baseModel ? { name: extraMeta.baseModel } : void 0,
+    ...sampling,
+    ...upscale
+  });
+}
+function buildCivitaiUpscale(extraMeta) {
+  if (!extraMeta.transformations) return {};
+  const upscaleTransform = extraMeta.transformations.find(
+    (t) => t.type === "upscale"
+  );
+  if (!upscaleTransform?.upscaleWidth) return {};
+  const scale = calculateScale(
+    upscaleTransform.upscaleWidth,
+    extraMeta.width ?? 0
+  );
+  if (scale === void 0) return {};
+  return {
+    upscale: { scale }
+  };
+}
+function buildCivitaiSampling(extraMeta) {
+  if (extraMeta.seed === void 0 && extraMeta.steps === void 0 && extraMeta.cfgScale === void 0 && extraMeta.sampler === void 0) {
+    return {};
+  }
+  return {
+    sampling: {
+      seed: extraMeta.seed,
+      steps: extraMeta.steps,
+      cfg: extraMeta.cfgScale,
+      sampler: extraMeta.sampler
+    }
+  };
+}
+function mergeMetadata(base, override) {
+  const merged = { ...base, ...override };
+  return {
+    // Required fields with defaults
+    prompt: merged.prompt ?? "",
+    negativePrompt: merged.negativePrompt ?? "",
+    width: merged.width ?? 0,
+    height: merged.height ?? 0,
+    // Optional fields - only include if defined
+    ...trimObject({
+      model: merged.model,
+      sampling: merged.sampling,
+      hires: merged.hires,
+      upscale: merged.upscale
+    })
+  };
 }
 
 // src/parsers/detect.ts
+var MARKERS = {
+  // Unique chunk keywords
+  INVOKEAI: "invokeai_metadata",
+  TENSORART: "generation_data",
+  STABILITY_MATRIX: "smproj",
+  EASYDIFFUSION: "use_stable_diffusion_model",
+  CIVITAI_EXTRA: "extraMetadata",
+  // Content patterns
+  SWARMUI: "sui_image_params",
+  SWARM_VERSION: "swarm_version",
+  COMFYUI_NODE: "class_type",
+  NOVELAI_SCHEDULE: "noise_schedule",
+  NOVELAI_V4: "v4_prompt",
+  NOVELAI_UNCOND: "uncond_scale",
+  CIVITAI_NS: "civitai:",
+  CIVITAI_RESOURCES: "Civitai resources:",
+  RUINED_FOOOCUS: "RuinedFooocus",
+  HF_MODEL: '"Model"',
+  HF_RESOLUTION: '"resolution"',
+  FOOOCUS_BASE: '"base_model"'
+};
 function detectSoftware(entries) {
   const entryRecord = buildEntryRecord(entries);
   const uniqueResult = detectUniqueKeywords(entryRecord);
@@ -317,20 +432,23 @@ function detectUniqueKeywords(entryRecord) {
   if (entryRecord.Software?.startsWith("NovelAI")) {
     return "novelai";
   }
-  if ("invokeai_metadata" in entryRecord) {
+  if (MARKERS.INVOKEAI in entryRecord) {
     return "invokeai";
   }
-  if ("generation_data" in entryRecord) {
+  if (MARKERS.TENSORART in entryRecord) {
     return "tensorart";
   }
-  if ("smproj" in entryRecord) {
+  if (MARKERS.STABILITY_MATRIX in entryRecord) {
     return "stability-matrix";
   }
   if ("negative_prompt" in entryRecord || "Negative Prompt" in entryRecord) {
     return "easydiffusion";
   }
+  if (MARKERS.CIVITAI_EXTRA in entryRecord) {
+    return "civitai";
+  }
   const parameters = entryRecord.parameters;
-  if (parameters?.includes("sui_image_params")) {
+  if (parameters?.includes(MARKERS.SWARMUI)) {
     return "swarmui";
   }
   const comment = entryRecord.Comment;
@@ -342,15 +460,18 @@ function detectUniqueKeywords(entryRecord) {
 function detectFromCommentJson(comment) {
   try {
     const parsed = JSON.parse(comment);
-    if ("invokeai_metadata" in parsed) {
+    if (MARKERS.INVOKEAI in parsed) {
       return "invokeai";
     }
-    if ("generation_data" in parsed) {
+    if (MARKERS.TENSORART in parsed) {
       return "tensorart";
     }
-    if ("smproj" in parsed) {
+    if (MARKERS.STABILITY_MATRIX in parsed) {
       return "stability-matrix";
     }
+    if (MARKERS.CIVITAI_EXTRA in parsed) {
+      return "civitai";
+    }
     if ("prompt" in parsed && "workflow" in parsed) {
       const workflow = parsed.workflow;
       const prompt = parsed.prompt;
@@ -360,12 +481,12 @@ function detectFromCommentJson(comment) {
         return "comfyui";
       }
     }
-    if ("sui_image_params" in parsed) {
+    if (MARKERS.SWARMUI in parsed) {
       return "swarmui";
     }
     if ("prompt" in parsed && "parameters" in parsed) {
       const params = String(parsed.parameters || "");
-      if (params.includes("sui_image_params") || params.includes("swarm_version")) {
+      if (params.includes(MARKERS.SWARMUI) || params.includes(MARKERS.SWARM_VERSION)) {
         return "swarmui";
       }
     }
@@ -383,10 +504,13 @@ function detectComfyUIEntries(entryRecord) {
   if ("prompt" in entryRecord) {
     const promptText = entryRecord.prompt;
     if (promptText?.startsWith("{")) {
-      if (promptText.includes("sui_image_params")) {
+      if (promptText.includes(MARKERS.SWARMUI)) {
         return "swarmui";
       }
-      if (promptText.includes("class_type")) {
+      if (promptText.includes(`"${MARKERS.CIVITAI_EXTRA}"`)) {
+        return "civitai";
+      }
+      if (promptText.includes(MARKERS.COMFYUI_NODE)) {
         return "comfyui";
       }
     }
@@ -400,25 +524,25 @@ function detectFromTextContent(text) {
   return detectFromA1111Format(text);
 }
 function detectFromJsonFormat(json) {
-  if (json.includes("sui_image_params")) {
+  if (json.includes(MARKERS.SWARMUI)) {
     return "swarmui";
   }
-  if (json.includes('"software":"RuinedFooocus"') || json.includes('"software": "RuinedFooocus"')) {
+  if (json.includes(`"software":"${MARKERS.RUINED_FOOOCUS}"`) || json.includes(`"software": "${MARKERS.RUINED_FOOOCUS}"`)) {
     return "ruined-fooocus";
   }
-  if (json.includes('"use_stable_diffusion_model"')) {
+  if (json.includes(`"${MARKERS.EASYDIFFUSION}"`)) {
     return "easydiffusion";
   }
-  if (json.includes("civitai:") || json.includes('"resource-stack"')) {
+  if (json.includes(MARKERS.CIVITAI_NS) || json.includes(`"${MARKERS.CIVITAI_EXTRA}"`)) {
     return "civitai";
   }
-  if (json.includes('"v4_prompt"') || json.includes('"noise_schedule"') || json.includes('"uncond_scale"') || json.includes('"Software":"NovelAI"') || json.includes('\\"noise_schedule\\"') || json.includes('\\"v4_prompt\\"')) {
+  if (json.includes(`"${MARKERS.NOVELAI_V4}"`) || json.includes(`"${MARKERS.NOVELAI_SCHEDULE}"`) || json.includes(`"${MARKERS.NOVELAI_UNCOND}"`) || json.includes('"Software":"NovelAI"') || json.includes(`\\"${MARKERS.NOVELAI_SCHEDULE}\\"`) || json.includes(`\\"${MARKERS.NOVELAI_V4}\\"`)) {
     return "novelai";
   }
-  if (json.includes('"Model"') && json.includes('"resolution"')) {
+  if (json.includes(MARKERS.HF_MODEL) && json.includes(MARKERS.HF_RESOLUTION)) {
     return "hf-space";
   }
-  if (json.includes('"prompt"') && json.includes('"base_model"')) {
+  if (json.includes('"prompt"') && json.includes(MARKERS.FOOOCUS_BASE)) {
     return "fooocus";
   }
   if (json.includes('"prompt"') || json.includes('"nodes"')) {
@@ -427,7 +551,7 @@ function detectFromJsonFormat(json) {
   return null;
 }
 function detectFromA1111Format(text) {
-  if (text.includes("sui_image_params") || text.includes("swarm_version")) {
+  if (text.includes(MARKERS.SWARMUI) || text.includes(MARKERS.SWARM_VERSION)) {
     return "swarmui";
   }
   const versionMatch = text.match(/Version:\s*([^\s,]+)/);
@@ -446,7 +570,7 @@ function detectFromA1111Format(text) {
   if (text.includes("App: SD.Next") || text.includes("App:SD.Next")) {
     return "sd-next";
   }
-  if (text.includes("Civitai resources:")) {
+  if (text.includes(MARKERS.CIVITAI_RESOURCES)) {
     return "civitai";
   }
   if (text.includes("Steps:") && text.includes("Sampler:")) {
@@ -606,33 +730,23 @@ function parseHfSpace(entries) {
     negativePrompt: json.negative_prompt ?? "",
     width,
     height,
-    model: {
+    model: trimObject({
       name: json.Model,
       hash: json["Model hash"]
-    },
-    sampling: {
+    }),
+    sampling: trimObject({
       sampler: json.sampler,
       steps: json.num_inference_steps,
       cfg: json.guidance_scale,
       seed: json.seed
-    }
+    })
   };
   return Result.ok(metadata);
 }
 
 // src/parsers/invokeai.ts
 function extractInvokeAIMetadata(entryRecord) {
-  if (entryRecord.invokeai_metadata) {
-    return entryRecord.invokeai_metadata;
-  }
-  if (!entryRecord.Comment) {
-    return void 0;
-  }
-  const commentParsed = parseJson(entryRecord.Comment);
-  if (!commentParsed.ok || !("invokeai_metadata" in commentParsed.value)) {
-    return void 0;
-  }
-  return JSON.stringify(commentParsed.value.invokeai_metadata);
+  return entryRecord.invokeai_metadata ?? extractFromCommentJson(entryRecord, "invokeai_metadata");
 }
 function parseInvokeAI(entries) {
   const entryRecord = buildEntryRecord(entries);
@@ -650,28 +764,23 @@ function parseInvokeAI(entries) {
   const data = parsed.value;
   const width = data.width ?? 0;
   const height = data.height ?? 0;
-  const metadata = {
+  return Result.ok({
     software: "invokeai",
     prompt: data.positive_prompt ?? "",
     negativePrompt: data.negative_prompt ?? "",
     width,
-    height
-  };
-  if (data.model?.name || data.model?.hash) {
-    metadata.model = {
-      name: data.model.name,
-      hash: data.model.hash
-    };
-  }
-  if (data.seed !== void 0 || data.steps !== void 0 || data.cfg_scale !== void 0 || data.scheduler !== void 0) {
-    metadata.sampling = {
+    height,
+    model: trimObject({
+      name: data.model?.name,
+      hash: data.model?.hash
+    }),
+    sampling: trimObject({
       seed: data.seed,
       steps: data.steps,
       cfg: data.cfg_scale,
       sampler: data.scheduler
-    };
-  }
-  return Result.ok(metadata);
+    })
+  });
 }
 
 // src/parsers/novelai.ts
@@ -699,35 +808,31 @@ function parseNovelAI(entries) {
   const height = comment.height ?? 0;
   const prompt = comment.v4_prompt?.caption?.base_caption ?? comment.prompt ?? "";
   const negativePrompt = comment.v4_negative_prompt?.caption?.base_caption ?? comment.uc ?? "";
-  const metadata = {
+  const charCaptions = comment.v4_prompt?.caption?.char_captions;
+  const characterPrompts = charCaptions && charCaptions.length > 0 ? charCaptions.map((cc) => {
+    if (!cc.char_caption) return null;
+    return {
+      prompt: cc.char_caption,
+      center: cc.centers?.[0]
+    };
+  }).filter((cp) => cp !== null) : void 0;
+  return Result.ok({
     software: "novelai",
     prompt,
     negativePrompt,
     width,
-    height
-  };
-  if (comment.steps !== void 0 || comment.scale !== void 0 || comment.seed !== void 0 || comment.noise_schedule !== void 0 || comment.sampler !== void 0) {
-    metadata.sampling = {
+    height,
+    sampling: trimObject({
       steps: comment.steps,
       cfg: comment.scale,
       seed: comment.seed,
       sampler: comment.sampler,
       scheduler: comment.noise_schedule
-    };
-  }
-  const charCaptions = comment.v4_prompt?.caption?.char_captions;
-  if (charCaptions && charCaptions.length > 0) {
-    metadata.characterPrompts = charCaptions.map((cc) => {
-      if (!cc.char_caption) return null;
-      return {
-        prompt: cc.char_caption,
-        center: cc.centers?.[0]
-      };
-    }).filter((cp) => cp !== null);
-    metadata.useCoords = comment.v4_prompt?.use_coords;
-    metadata.useOrder = comment.v4_prompt?.use_order;
-  }
-  return Result.ok(metadata);
+    }),
+    characterPrompts,
+    useCoords: characterPrompts ? comment.v4_prompt?.use_coords : void 0,
+    useOrder: characterPrompts ? comment.v4_prompt?.use_order : void 0
+  });
 }
 
 // src/parsers/ruined-fooocus.ts
@@ -777,43 +882,18 @@ function parseStabilityMatrix(entries) {
   if (!comfyResult.ok || comfyResult.value.software !== "comfyui") {
     return Result.error({ type: "unsupportedFormat" });
   }
-  const metadata = {
+  const jsonText = entryRecord["parameters-json"] ?? extractFromCommentJson(entryRecord, "parameters-json");
+  const parsed = jsonText ? parseJson(jsonText) : void 0;
+  const data = parsed?.ok ? parsed.value : void 0;
+  return Result.ok({
     ...comfyResult.value,
-    software: "stability-matrix"
-  };
-  let jsonText = entryRecord["parameters-json"];
-  if (!jsonText && entryRecord.Comment?.startsWith("{")) {
-    const commentParsed = parseJson(
-      entryRecord.Comment
-    );
-    if (commentParsed.ok) {
-      const commentData = commentParsed.value;
-      if (typeof commentData["parameters-json"] === "string") {
-        jsonText = commentData["parameters-json"];
-      } else if (typeof commentData["parameters-json"] === "object") {
-        jsonText = JSON.stringify(commentData["parameters-json"]);
-      }
-    }
-  }
-  if (jsonText) {
-    const parsed = parseJson(jsonText);
-    if (parsed.ok) {
-      const data = parsed.value;
-      if (data.PositivePrompt !== void 0) {
-        metadata.prompt = data.PositivePrompt;
-      }
-      if (data.NegativePrompt !== void 0) {
-        metadata.negativePrompt = data.NegativePrompt;
-      }
-      if (data.ModelName !== void 0 || data.ModelHash !== void 0) {
-        metadata.model = {
-          name: data.ModelName,
-          hash: data.ModelHash
-        };
-      }
-    }
-  }
-  return Result.ok(metadata);
+    software: "stability-matrix",
+    // Override prompts from parameters-json (more complete than workflow)
+    prompt: data?.PositivePrompt ?? comfyResult.value.prompt,
+    negativePrompt: data?.NegativePrompt ?? comfyResult.value.negativePrompt,
+    // Override model if either name or hash is provided
+    model: data?.ModelName !== void 0 || data?.ModelHash !== void 0 ? { name: data?.ModelName, hash: data?.ModelHash } : comfyResult.value.model
+  });
 }
 
 // src/parsers/swarmui.ts
@@ -852,67 +932,37 @@ function parseSwarmUI(entries) {
   }
   const width = params.width ?? 0;
   const height = params.height ?? 0;
-  const metadata = {
+  const promptSource = entryRecord.prompt || entryRecord.Make;
+  const promptParsed = promptSource ? parseJson(promptSource) : void 0;
+  const nodes = promptParsed?.ok ? promptParsed.value : void 0;
+  return Result.ok({
     software: "swarmui",
     prompt: params.prompt ?? "",
     negativePrompt: params.negativeprompt ?? "",
     width,
-    height
-  };
-  const promptSource = entryRecord.prompt || entryRecord.Make;
-  if (promptSource) {
-    const promptParsed = parseJson(promptSource);
-    if (promptParsed.ok) {
-      metadata.nodes = promptParsed.value;
-    }
-  }
-  if (params.model) {
-    metadata.model = {
-      name: params.model
-    };
-  }
-  if (params.seed !== void 0 || params.steps !== void 0 || params.cfgscale !== void 0 || params.sampler !== void 0 || params.scheduler !== void 0) {
-    metadata.sampling = {
+    height,
+    nodes,
+    model: trimObject({ name: params.model }),
+    sampling: trimObject({
       seed: params.seed,
       steps: params.steps,
       cfg: params.cfgscale,
       sampler: params.sampler,
       scheduler: params.scheduler
-    };
-  }
-  if (params.refinerupscale !== void 0 || params.refinerupscalemethod !== void 0 || params.refinercontrolpercentage !== void 0) {
-    metadata.hires = {
+    }),
+    hires: trimObject({
       scale: params.refinerupscale,
       upscaler: params.refinerupscalemethod,
       denoise: params.refinercontrolpercentage
-    };
-  }
-  return Result.ok(metadata);
+    })
+  });
 }
 
 // src/parsers/tensorart.ts
 function parseTensorArt(entries) {
   const entryRecord = buildEntryRecord(entries);
-  let dataText = entryRecord.generation_data;
-  let promptChunk = entryRecord.prompt;
-  if (!dataText && entryRecord.Comment?.startsWith("{")) {
-    const commentParsed = parseJson(
-      entryRecord.Comment
-    );
-    if (commentParsed.ok) {
-      const commentData = commentParsed.value;
-      if (typeof commentData.generation_data === "string") {
-        dataText = commentData.generation_data;
-      } else if (typeof commentData.generation_data === "object") {
-        dataText = JSON.stringify(commentData.generation_data);
-      }
-      if (typeof commentData.prompt === "string") {
-        promptChunk = commentData.prompt;
-      } else if (typeof commentData.prompt === "object") {
-        promptChunk = JSON.stringify(commentData.prompt);
-      }
-    }
-  }
+  const dataText = entryRecord.generation_data ?? extractFromCommentJson(entryRecord, "generation_data");
+  const promptChunk = entryRecord.prompt ?? extractFromCommentJson(entryRecord, "prompt");
   if (!dataText) {
     return Result.error({ type: "unsupportedFormat" });
   }
@@ -937,30 +987,26 @@ function parseTensorArt(entries) {
       message: "Invalid JSON in prompt chunk"
     });
   }
-  const metadata = {
+  const baseSeed = data.seed ? Number(data.seed) : void 0;
+  const seed = baseSeed === -1 ? findActualSeed(promptParsed.value) : baseSeed;
+  return Result.ok({
     software: "tensorart",
     prompt: data.prompt ?? "",
     negativePrompt: data.negativePrompt ?? "",
     width,
     height,
-    nodes: promptParsed.value
-  };
-  if (data.baseModel?.modelFileName || data.baseModel?.hash) {
-    metadata.model = {
-      name: data.baseModel.modelFileName,
-      hash: data.baseModel.hash
-    };
-  }
-  if (data.seed !== void 0 || data.steps !== void 0 || data.cfgScale !== void 0 || data.clipSkip !== void 0) {
-    const baseSeed = data.seed ? Number(data.seed) : void 0;
-    metadata.sampling = {
-      seed: baseSeed === -1 ? findActualSeed(promptParsed.value) : baseSeed,
+    nodes: promptParsed.value,
+    model: trimObject({
+      name: data.baseModel?.modelFileName,
+      hash: data.baseModel?.hash
+    }),
+    sampling: trimObject({
+      seed,
       steps: data.steps,
       cfg: data.cfgScale,
       clipSkip: data.clipSkip
-    };
-  }
-  return Result.ok(metadata);
+    })
+  });
 }
 function findActualSeed(nodes) {
   const samplerNode = findSamplerNode(nodes);
@@ -987,8 +1033,16 @@ function parseMetadata(entries) {
       return parseHfSpace(entries);
     case "civitai": {
       const comfyResult = parseComfyUI(entries);
-      if (comfyResult.ok) return comfyResult;
-      return parseA1111(entries);
+      if (comfyResult.ok) {
+        comfyResult.value.software = "civitai";
+        return comfyResult;
+      }
+      const a1111Result = parseA1111(entries);
+      if (a1111Result.ok) {
+        a1111Result.value.software = "civitai";
+        return a1111Result;
+      }
+      return a1111Result;
     }
     case "comfyui": {
       const comfyResult = parseComfyUI(entries);
@@ -1644,7 +1698,7 @@ function sourceToKeyword(source) {
 }
 
 // src/api/read.ts
-function read(input) {
+function read(input, options) {
   const data = toUint8Array(input);
   const format = detectFormat(data);
   if (!format) {
@@ -1661,7 +1715,7 @@ function read(input) {
     return { status: "unrecognized", raw };
   }
   const metadata = parseResult.value;
-  if (metadata.width === 0 || metadata.height === 0) {
+  if (!options?.strict && (metadata.width === 0 || metadata.height === 0)) {
     const dims = HELPERS[format].readDimensions(data);
     if (dims) {
       metadata.width = metadata.width || dims.width;
@@ -1852,6 +1906,43 @@ function convertA1111SegmentsToPng(segments) {
   return createEncodedChunk("parameters", userComment.data, "dynamic");
 }
 
+// src/converters/civitai.ts
+function convertCivitaiPngToSegments(chunks) {
+  const parametersChunk = chunks.find((c) => c.keyword === "parameters");
+  if (parametersChunk && !parametersChunk.text.trimStart().startsWith("{")) {
+    return convertA1111PngToSegments(chunks);
+  }
+  const data = {};
+  for (const chunk of chunks) {
+    if (chunk.keyword === "prompt") {
+      const parsed = parseJson(chunk.text);
+      if (parsed.ok && typeof parsed.value === "object" && parsed.value) {
+        Object.assign(data, parsed.value);
+      }
+    } else if (chunk.keyword === "extraMetadata") {
+      data[chunk.keyword] = chunk.text;
+    } else {
+      const parsed = parseJson(chunk.text);
+      data[chunk.keyword] = parsed.ok ? parsed.value : chunk.text;
+    }
+  }
+  return [
+    {
+      source: { type: "exifUserComment" },
+      data: JSON.stringify(data)
+    }
+  ];
+}
+function convertCivitaiSegmentsToPng(segments) {
+  const userComment = findSegment(segments, "exifUserComment");
+  if (!userComment) return [];
+  const isJson = userComment.data.trimStart().startsWith("{");
+  if (!isJson) {
+    return convertA1111SegmentsToPng(segments);
+  }
+  return createEncodedChunk("prompt", userComment.data, "text-utf8-raw");
+}
+
 // src/converters/base-json.ts
 function convertKvPngToSegments(chunks) {
   const data = {};
@@ -2101,7 +2192,7 @@ function convertMetadata(parseResult, targetFormat) {
     });
   }
   const raw = parseResult.raw;
-  if (raw.format === "png" && targetFormat === "png" || raw.format === "jpeg" && targetFormat === "jpeg" || raw.format === "webp" && targetFormat === "webp") {
+  if (raw.format === targetFormat) {
     return Result.ok(raw);
   }
   const software = parseResult.metadata.software;
@@ -2166,15 +2257,20 @@ var convertHfSpace = createFormatConverter(
   createPngToSegments("parameters"),
   createSegmentsToPng("parameters", "text-unicode-escape")
 );
+var convertCivitai = createFormatConverter(
+  convertCivitaiPngToSegments,
+  convertCivitaiSegmentsToPng
+);
 var softwareConverters = {
   // NovelAI
   novelai: convertNovelai,
-  // A1111-format (sd-webui, forge, forge-neo, civitai, sd-next)
+  // A1111-format (sd-webui, forge, forge-neo, sd-next)
   "sd-webui": convertA1111,
   "sd-next": convertA1111,
   forge: convertA1111,
   "forge-neo": convertA1111,
-  civitai: convertA1111,
+  // CivitAI Orchestration format
+  civitai: convertCivitai,
   // ComfyUI-format (comfyui, tensorart, stability-matrix)
   comfyui: convertComfyUI,
   tensorart: convertComfyUI,