@vibgrate/cli 2026.4.10-2 → 2026.4.10

package/dist/cli.js

@@ -572,61 +572,113 @@ function validateFactLine(line) {
   } catch {
     return { valid: false, error: `Invalid JSON: ${line.substring(0, 80)}...` };
   }
-  const obj = parsed;
-  if (obj.factType === "Models" || obj.factType === "References") {
-    if (obj.payload === void 0 || obj.payload === null) {
-      return { valid: false, error: `Preamble ${obj.factType} missing payload` };
-    }
-    return { valid: true };
-  }
-  if (typeof obj.factId !== "string" || !obj.factId) {
+  const envelope = parsed;
+  if (typeof envelope.factId !== "string" || !envelope.factId) {
     return { valid: false, error: "Missing or invalid factId" };
   }
-  if (typeof obj.m === "string") {
-    if (obj.payload === void 0 || obj.payload === null) {
-      return { valid: false, error: "Compressed fact missing payload" };
-    }
-    return { valid: true };
-  }
-  if (typeof obj.factType !== "string" || !obj.factType) {
+  if (typeof envelope.factType !== "string" || !envelope.factType) {
     return { valid: false, error: "Missing or invalid factType" };
   }
-  if (typeof obj.language !== "string") {
+  if (typeof envelope.language !== "string") {
     return { valid: false, error: "Missing or invalid language" };
   }
-  if (typeof obj.scanner !== "string") {
+  if (typeof envelope.scanner !== "string") {
     return { valid: false, error: "Missing or invalid scanner" };
   }
-  if (typeof obj.scannerVersion !== "string") {
+  if (typeof envelope.scannerVersion !== "string") {
     return { valid: false, error: "Missing or invalid scannerVersion" };
   }
-  if (typeof obj.emittedAt !== "string") {
+  if (typeof envelope.emittedAt !== "string") {
     return { valid: false, error: "Missing or invalid emittedAt" };
   }
-  if (obj.payload === void 0 || obj.payload === null) {
+  if (envelope.payload === void 0 || envelope.payload === null) {
     return { valid: false, error: "Missing payload" };
   }
-  return { valid: true };
+  return { valid: true, fact: envelope };
 }
-function splitHcsOutput(lines) {
-  const preamble = [];
-  const facts = [];
+function decompressHcsLines(lines) {
+  if (lines.length === 0) return lines;
+  let modelsLine = null;
+  let refsLine = null;
+  const contentLines = [];
   for (const line of lines) {
     let parsed;
     try {
       parsed = JSON.parse(line);
     } catch {
-      facts.push(line);
+      contentLines.push(line);
       continue;
     }
     const obj = parsed;
-    if (obj.factType === "Models" || obj.factType === "References") {
-      preamble.push(line);
+    if (obj.factType === "Models" && !modelsLine) {
+      modelsLine = obj;
+    } else if (obj.factType === "References" && !refsLine) {
+      refsLine = obj;
     } else {
-      facts.push(line);
+      contentLines.push(line);
+    }
+  }
+  if (!modelsLine) return lines;
+  const emittedAt = typeof modelsLine.emittedAt === "string" ? modelsLine.emittedAt : (/* @__PURE__ */ new Date()).toISOString();
+  const modelsPayload = modelsLine.payload;
+  const modelMap = /* @__PURE__ */ new Map();
+  for (const m of modelsPayload?.models ?? []) {
+    if (m.id) modelMap.set(m.id, m);
+  }
+  const refsPayload = refsLine?.payload;
+  const refMap = /* @__PURE__ */ new Map();
+  for (const r of refsPayload?.references ?? []) {
+    if (r.id && r.value) refMap.set(r.id, r.value);
+  }
+  const sortedRefs = [...refMap.entries()].sort((a, b) => b[0].length - a[0].length);
+  function expandRefs(text) {
+    for (const [token, value] of sortedRefs) {
+      text = text.split(token).join(value);
+    }
+    return text;
+  }
+  const expanded = [];
+  for (const line of contentLines) {
+    let parsed;
+    try {
+      parsed = JSON.parse(line);
+    } catch {
+      expanded.push(line);
+      continue;
+    }
+    const obj = parsed;
+    if (typeof obj.factType === "string") {
+      expanded.push(line);
+      continue;
     }
+    if (typeof obj.factId !== "string" || typeof obj.m !== "string") {
+      expanded.push(line);
+      continue;
+    }
+    const model = modelMap.get(obj.m);
+    if (!model) {
+      expanded.push(line);
+      continue;
+    }
+    const payloadJson = expandRefs(JSON.stringify(obj.payload));
+    let payload;
+    try {
+      payload = JSON.parse(payloadJson);
+    } catch {
+      payload = obj.payload;
+    }
+    const fullEnvelope = {
+      factId: obj.factId,
+      factType: model.factType ?? "",
+      language: model.language ?? "",
+      scanner: model.scanner ?? "",
+      scannerVersion: model.scannerVersion ?? "",
+      emittedAt: model.emittedAt ?? emittedAt,
+      payload
+    };
+    expanded.push(JSON.stringify(fullEnvelope));
   }
-  return { preamble, facts };
+  return expanded;
 }
 function resolveHcsWorkerBin() {
   const base = import.meta.dirname ?? path6.dirname(new URL(import.meta.url).pathname);
@@ -1244,7 +1296,6 @@ var extractCommand = new Command5("extract").description("Analyze source code an
   );
   const progress = new ProgressTracker(runnableLanguages);
   const sem = new Semaphore(concurrency);
-  const allPreamble = [];
   const allFacts = [];
   const allErrors = [];
   let hasSchemaFailure = false;
@@ -1270,12 +1321,15 @@ var extractCommand = new Command5("extract").description("Analyze source code an
       if (result.exitCode === EXIT_TIMEOUT) {
         hasTimeout = true;
       }
-      const { preamble, facts } = splitHcsOutput(result.facts);
-      allPreamble.push(...preamble);
+      const decompressedFacts = decompressHcsLines(result.facts);
       let langFactCount = 0;
-      for (const line of [...preamble, ...facts]) {
+      for (const line of decompressedFacts) {
         const validation = validateFactLine(line);
-        if (!validation.valid) {
+        if (validation.valid) {
+          allFacts.push(line);
+          langFactCount++;
+          progress.onFact();
+        } else {
           hasSchemaFailure = true;
           allErrors.push(`[${language}] Schema validation: ${validation.error}`);
           if (opts.verbose) {
@@ -1284,13 +1338,6 @@ var extractCommand = new Command5("extract").description("Analyze source code an
           }
         }
       }
-      for (const line of facts) {
-        if (validateFactLine(line).valid) {
-          allFacts.push(line);
-          langFactCount++;
-          progress.onFact();
-        }
-      }
       progress.setLanguageFactCount(language, langFactCount);
       if (result.errors.length > 0) {
         allErrors.push(...result.errors.map((e) => `[${language}] ${e}`));
@@ -1304,8 +1351,7 @@ var extractCommand = new Command5("extract").description("Analyze source code an
   const elapsed = ((Date.now() - startTime) / 1e3).toFixed(1);
   progress.finish(elapsed);
   allFacts.sort();
-  const allLines = [...allPreamble, ...allFacts];
-  const ndjsonOutput = allLines.join("\n") + (allLines.length > 0 ? "\n" : "");
+  const ndjsonOutput = allFacts.map((f) => f).join("\n") + (allFacts.length > 0 ? "\n" : "");
   if (opts.out) {
     const outPath = path6.resolve(opts.out);
     await fs2.writeFile(outPath, ndjsonOutput, "utf-8");
@@ -1315,7 +1361,7 @@ var extractCommand = new Command5("extract").description("Analyze source code an
     process.stdout.write(ndjsonOutput);
   }
   if (opts.push && dsn && allFacts.length > 0) {
-    const pushOk = await pushFacts(allLines, dsn, opts.verbose ?? false);
+    const pushOk = await pushFacts(allFacts, dsn, opts.verbose ?? false);
     if (!pushOk) {
       process.exit(EXIT_PUSH_FAILURE);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibgrate/cli",
-  "version": "2026.4.10-2",
+  "version": "2026.4.10",
   "description": "CLI for measuring upgrade drift across Node, .NET, Python & Java projects",
   "type": "module",
   "bin": {