@shapeshift-labs/frontier-lang-compiler 0.2.163 → 0.2.164

package/dist/js-ts-safe-project-merge-missing-evidence.js

@@ -1,5 +1,7 @@
 import { HtmlCssProjectMergeMissingSignals, htmlCssProjectMergeAdmissionMatrixRows, htmlCssProjectMergeMatrixProofStatus, htmlCssProjectMergeMissingEvidenceItems, htmlCssProjectMergeMissingEvidenceRoutes } from './js-ts-safe-project-merge-html-css-matrix.js';
+import { sourceTextMergeMatrixProofStatus, sourceTextMergeMissingEvidenceItem } from './js-ts-safe-project-merge-source-text-candidate.js';
 const ProjectMergeMissingSignals = Object.freeze({
+  sourceTextMergeCandidate: 'source-text-merge-candidate-not-produced',
   outputDiagnosticsGate: 'output-diagnostics-gate-not-run',
   declarationGate: 'declaration-gate-not-run',
   qualityGates: 'quality-gates-not-run',
@@ -17,6 +19,7 @@ const ProjectMergeMissingSignals = Object.freeze({
 });
 
 const ProjectMergeMissingEvidenceRoutes = Object.freeze({
+  [ProjectMergeMissingSignals.sourceTextMergeCandidate]: route('produce-source-text-merge-candidate', 'source-files', 'run-conservative-three-way-source-merge'),
   [ProjectMergeMissingSignals.outputDiagnosticsGate]: route('run-output-diagnostics', 'project-output', 'supply-output-diagnostics'),
   [ProjectMergeMissingSignals.declarationGate]: route('emit-output-declarations', 'project-output', 'supply-declaration-output'),
   [ProjectMergeMissingSignals.qualityGates]: route('attach-quality-gates', 'quality-gates', 'attach-passing-quality-gates'),
@@ -34,6 +37,7 @@ const ProjectMergeMissingEvidenceRoutes = Object.freeze({
 });
 
 const ProjectMergeAdmissionMatrixRows = Object.freeze([
+  matrixRow('source-text-merge-candidate', 'baseline', ['source-text-merge-candidate'], [ProjectMergeMissingSignals.sourceTextMergeCandidate]),
   matrixRow('parser-source-span-trivia', 'partial', ['source-span-roundtrip'], [ProjectMergeMissingSignals.sourceSpanRoundtrip, ProjectMergeMissingSignals.semanticArtifacts]),
   matrixRow('scope-use-def-graph', 'partial', ['project-graph-delta'], [ProjectMergeMissingSignals.projectGraphEvidence, ProjectMergeMissingSignals.projectGraphDeltaEvidence]),
   matrixRow('module-export-import-graph', 'partial', ['project-graph-delta'], [ProjectMergeMissingSignals.projectGraphEvidence, ProjectMergeMissingSignals.projectGraphDeltaEvidence]),
@@ -54,6 +58,8 @@ const ProjectMergeAdmissionMatrixRows = Object.freeze([
 
 function missingEvidenceItems(summary, context = {}) {
   const items = [];
+  const sourceTextMissing = sourceTextMergeMissingEvidenceItem(summary, ProjectMergeMissingSignals.sourceTextMergeCandidate, missingEvidenceItem);
+  if (sourceTextMissing) items.push(sourceTextMissing);
   if (!context.hasProjectGraphEvidence) items.push(missingEvidenceItem({
     code: ProjectMergeMissingSignals.projectGraphEvidence,
     scope: 'project-graph',
@@ -254,6 +260,8 @@ function matrixProofStatus(level, summary, proofEvidence) {
   if (levelStatuses[level]) return levelStatuses[level];
   const htmlCssStatus = htmlCssProjectMergeMatrixProofStatus(level, summary);
   if (htmlCssStatus) return htmlCssStatus;
+  const sourceTextStatus = sourceTextMergeMatrixProofStatus(level, summary);
+  if (sourceTextStatus) return sourceTextStatus;
   if (level === 'project-graph-delta') return summary.projectGraphDeltaEvidenceIncluded ? (summary.projectGraphDeltaConflicts ? 'failed' : 'passed') : 'missing';
   if (level === 'project-graph-evidence') return summary.projectGraphConflicts ? 'failed' : summary.projectGraphEvidenceIncluded || summary.projectGraphDeltaEvidenceIncluded ? 'passed' : 'missing';
   if (level === 'css-module-use-site-graph') return summary.projectGraphCssModuleUseSiteConflicts ? 'failed' : summary.projectGraphCssModuleUseSiteGraphs ? 'passed' : summary.projectGraphEvidenceIncluded ? 'absent' : 'missing';
@@ -292,12 +300,10 @@ function countField(items, field) {
 
 function countRoute(items, field = 'id') {
   const counts = {};
-  for (const item of items) {
-    const key = field === 'lane' ? item?.routeLane ?? item?.route?.lane : item?.routeId ?? item?.route?.id;
-    if (key) counts[key] = (counts[key] ?? 0) + 1;
-  }
+  for (const item of items) countRouteItem(counts, item, field);
   return counts;
 }
+function countRouteItem(counts, item, field) { const key = field === 'lane' ? item?.routeLane ?? item?.route?.lane : item?.routeId ?? item?.route?.id; if (key) counts[key] = (counts[key] ?? 0) + 1; }
 
 function route(id, lane, next) { return Object.freeze({ id, lane, next }); }
 function shouldRecommendRerun(missingEvidence = [], options = {}) {
@@ -307,13 +313,7 @@ function shouldRecommendRerun(missingEvidence = [], options = {}) {
   if (reasonCodes.length) return reasonCodes.every((code) => rerunReasonCodes.has(code));
   return missingEvidence[0]?.action === 'rerun-gate' && missingEvidence[0]?.kind === 'quality-gate';
 }
-function isSemanticEquivalenceMissing(item) {
-  return item?.proofLevel === 'semantic-equivalence-unknown'
-    || item?.code === ProjectMergeMissingSignals.semanticEquivalenceProof;
-}
-
-function compactRecord(record) {
-  return Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined));
-}
+function isSemanticEquivalenceMissing(item) { return item?.proofLevel === 'semantic-equivalence-unknown' || item?.code === ProjectMergeMissingSignals.semanticEquivalenceProof; }
+function compactRecord(record) { return Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined)); }
 
 export { compactMissingEvidenceTelemetry, confidenceRecommendedAction, createProjectMergeAdmissionMatrixAudit, missingEvidenceItems, missingEvidenceRouteForSignal, missingEvidenceSignals, prioritizedMissingEvidence };

package/dist/js-ts-safe-project-merge-source-text-candidate.js

@@ -0,0 +1,68 @@
+function sourceTextMergeSummary(files = []) {
+  const mergedFiles = files.filter((file) => file.status === 'merged');
+  const blockedFiles = files.filter((file) => file.status === 'blocked');
+  const outputFiles = files.filter((file) => typeof file.outputSourceText === 'string');
+  return {
+    mergedFiles: mergedFiles.length,
+    blockedFiles: blockedFiles.length,
+    outputFiles: outputFiles.length,
+    sourceTextMergeCandidateFiles: mergedFiles.length,
+    sourceTextMergeBlockedFiles: blockedFiles.length,
+    sourceTextMergeOutputFiles: outputFiles.length,
+    sourceTextMergeCandidateStatus: files.length ? (blockedFiles.length ? 'failed' : 'passed') : 'absent'
+  };
+}
+
+function sourceTextMergeCandidateEvidenceRecord(id, summary) {
+  const passed = summary.sourceTextMergeCandidateStatus === 'passed';
+  const failed = summary.sourceTextMergeCandidateStatus === 'failed';
+  return {
+    id: `${id}_source_text_merge_candidate`,
+    kind: 'js-ts-source-text-merge-candidate',
+    level: 'source-text-merge-candidate',
+    status: passed ? 'passed' : failed ? 'failed' : 'skipped',
+    scope: 'source-files',
+    summary: sourceTextMergeCandidateEvidenceSummary(summary, passed, failed),
+    metadata: compactRecord({
+      files: summary.files,
+      sourceTextMergeCandidateFiles: summary.sourceTextMergeCandidateFiles,
+      sourceTextMergeBlockedFiles: summary.sourceTextMergeBlockedFiles,
+      sourceTextMergeOutputFiles: summary.sourceTextMergeOutputFiles,
+      outputFiles: summary.outputFiles,
+      autoMergeClaim: false,
+      semanticEquivalenceClaim: false
+    })
+  };
+}
+
+function sourceTextMergeMissingEvidenceItem(summary, signal, missingEvidenceItem) {
+  if (!summary.files || summary.sourceTextMergeCandidateFiles || summary.sourceTextMergeBlockedFiles) return undefined;
+  return missingEvidenceItem({
+    code: signal,
+    scope: 'source-files',
+    kind: 'source-text-merge-candidate',
+    proofLevel: 'source-text-merge-candidate',
+    action: 'review',
+    summary: 'No concrete source text merge candidate was produced; run the conservative source merge substrate before semantic graph admission.',
+    suggestedInput: { baseFiles: {}, workerFiles: {}, headFiles: {} }
+  });
+}
+
+function sourceTextMergeMatrixProofStatus(level, summary) {
+  if (level !== 'source-text-merge-candidate') return undefined;
+  if (!summary.files) return 'absent';
+  if (summary.sourceTextMergeBlockedFiles) return 'failed';
+  return summary.sourceTextMergeCandidateFiles === summary.files ? 'passed' : 'missing';
+}
+
+function sourceTextMergeCandidateEvidenceSummary(summary, passed, failed) {
+  if (passed) return `Produced concrete source merge candidates for ${summary.sourceTextMergeCandidateFiles} file(s).`;
+  if (failed) return `Source merge candidate blocked for ${summary.sourceTextMergeBlockedFiles} file(s) before semantic admission.`;
+  return 'No source files were available for source text merge candidate production.';
+}
+
+function compactRecord(record) {
+  return Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined));
+}
+
+export { sourceTextMergeCandidateEvidenceRecord, sourceTextMergeMatrixProofStatus, sourceTextMergeMissingEvidenceItem, sourceTextMergeSummary };

package/dist/js-ts-safe-project-merge-summary.js

@@ -1,6 +1,7 @@
 import { compactMissingEvidenceTelemetry, confidenceRecommendedAction, createProjectMergeAdmissionMatrixAudit, missingEvidenceItems, missingEvidenceSignals, prioritizedMissingEvidence } from './js-ts-safe-project-merge-missing-evidence.js';
 import { failedEvidenceMissingItems, fileAdmissionEvidenceRecords } from './js-ts-safe-project-merge-evidence-routing.js'; import { compactProjectMergeRoutingCalibration } from './js-ts-safe-project-merge-routing-calibration.js';
 import { htmlCssProjectSummary } from './js-ts-safe-project-merge-html-css-summary.js';
+import { sourceTextMergeCandidateEvidenceRecord, sourceTextMergeSummary } from './js-ts-safe-project-merge-source-text-candidate.js';
 
 function projectSummary(files, graphConflicts = [], hasProjectGraphDelta = false, outputDiagnosticsGate = undefined, outputDeclarationGate = undefined, outputQualityGate = undefined, moveRenameSummary = undefined, proofEvidence = undefined, symbolRenameSummary = undefined, splitMergeSummary = undefined, projectSymbolGraph = undefined) {
   const byOperation = {};
@@ -11,9 +12,7 @@ function projectSummary(files, graphConflicts = [], hasProjectGraphDelta = false
   const proofLevelStatuses = proofEvidence?.summary?.levelStatuses ?? {};
   return {
     files: files.length,
-    mergedFiles: files.filter((file) => file.status === 'merged').length,
-    blockedFiles: files.filter((file) => file.status === 'blocked').length,
-    outputFiles: files.filter((file) => typeof file.outputSourceText === 'string').length,
+    ...sourceTextMergeSummary(files),
     ...htmlCssProjectSummary(files),
     projectGraphConflicts: graphConflicts.length,
     projectGraphDeltaEvidenceIncluded: hasProjectGraphDelta ? 1 : 0, projectGraphEvidenceIncluded: projectSymbolGraph || hasProjectGraphDelta ? 1 : 0,
@@ -113,6 +112,7 @@ function projectSummaryWithConfidenceEvidence(summary, evidence = [], confidence
 
 function projectEvidence(id, status, summary, context = {}) {
   return uniqueRecords([
+    sourceTextMergeCandidateEvidenceRecord(id, summary),
     projectMergeEvidenceRecord(id, status, summary, context),
     graphEvidenceRecord(id, summary, context),
     ...fileAdmissionEvidenceRecords(context.fileResults),
@@ -168,6 +168,9 @@ function projectConfidence(id, status, summary, evidence = [], reasonCodes = [],
       mergedFiles: summary.mergedFiles,
       blockedFiles: summary.blockedFiles,
       outputFiles: summary.outputFiles,
+      sourceTextMergeCandidateStatus: summary.sourceTextMergeCandidateStatus,
+      sourceTextMergeCandidateFiles: summary.sourceTextMergeCandidateFiles,
+      sourceTextMergeBlockedFiles: summary.sourceTextMergeBlockedFiles,
       projectGraphConflicts: summary.projectGraphConflicts,
       outputDiagnosticConflicts: summary.outputDiagnosticConflicts,
       outputDeclarationConflicts: summary.outputDeclarationConflicts,
@@ -293,6 +296,7 @@ function confidenceLevel(score, status) {
 function compactConfidenceDimensions(status, summary, context, routingCalibration = {}) {
   return compactRecord({
     merge: status === 'merged' ? 'merged' : 'blocked',
+    sourceText: summary.sourceTextMergeCandidateStatus ?? 'absent',
     graph: context.hasProjectGraphEvidence ? (summary.projectGraphConflicts ? 'failed' : 'passed') : 'missing',
     diagnostics: gateConfidenceDimension(context.outputDiagnosticsGate),
     declarations: gateConfidenceDimension(context.outputDeclarationGate),
@@ -303,14 +307,7 @@ function compactConfidenceDimensions(status, summary, context, routingCalibratio
 
 function gateConfidenceDimension(gate) { return !gate ? 'missing' : gate.status === 'passed' ? 'passed' : gate.status === 'skipped' ? 'missing' : 'failed'; }
 
-function uniqueRecords(records) {
-  const seen = new Set();
-  return records.filter((record) => {
-    if (!record?.id || seen.has(record.id)) return false;
-    seen.add(record.id);
-    return true;
-  });
-}
+function uniqueRecords(records) { const seen = new Set(); return records.filter((record) => !record?.id || seen.has(record.id) ? false : (seen.add(record.id), true)); }
 
 function uniqueStrings(values) { return [...new Set(values.filter((value) => typeof value === 'string' && value.length > 0))]; }
 function compactRecord(record) { return Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined)); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-compiler",
-  "version": "0.2.163",
+  "version": "0.2.164",
   "description": "Compiler facade for Frontier Lang source documents and language projection adapters.",
   "type": "module",
   "main": "./dist/index.js",