@shapeshift-labs/frontier-lang-compiler 0.2.150 → 0.2.151

package/dist/js-ts-safe-project-merge-graph-delta-compiler-details.js

@@ -0,0 +1,189 @@
+import { hashSemanticValue } from '@shapeshift-labs/frontier-lang-kernel';
+import { compactRecord } from './js-ts-safe-merge-context.js';
+
+function compilerTypeFingerprint(record) {
+  return hashSemanticValue({
+    kind: 'frontier.lang.projectGraphDelta.compilerPublicApiFingerprint',
+    compilerSymbolIdentityHash: record.compilerSymbolIdentityHash,
+    identityHash: record.identityHash,
+    apiSignatureHash: record.apiSignatureHash,
+    typeParameters: record.typeParameters,
+    typeParameterCount: record.typeParameterCount,
+    typeParameterDefaultCount: record.typeParameterDefaultCount,
+    typeParameterConstraintCount: record.typeParameterConstraintCount,
+    propertyCount: record.propertyCount, propertyOptionalCount: record.propertyOptionalCount,
+    propertyReadonlyCount: record.propertyReadonlyCount, indexSignatureCount: record.indexSignatureCount,
+    indexSignatureReadonlyCount: record.indexSignatureReadonlyCount,
+    constructorSignatureCount: record.constructorSignatureCount,
+    classHeritageCount: record.classHeritageCount,
+    assignabilityOracleCount: record.assignabilityOracleCount,
+    assignabilityOracleDirectionCount: record.assignabilityOracleDirectionCount,
+    assignabilityOracleHash: record.assignabilityOracleHash,
+    assignabilityOracle: record.assignabilityOracle,
+    privateClassMemberCount: record.privateClassMemberCount,
+    accessorFieldCount: record.accessorFieldCount,
+    privateClassMemberShapeHash: record.privateClassMemberShapeHash,
+    accessorFieldShapeHash: record.accessorFieldShapeHash,
+    classPrivateAccessorRuntimeHash: record.classPrivateAccessorRuntimeHash,
+    classPrivateAccessorRuntimeProof: record.classPrivateAccessorRuntimeProof,
+    classPrivateAccessorRuntimeProofReasonCodes: record.classPrivateAccessorRuntimeProofReasonCodes,
+    decoratorMetadataCount: record.decoratorMetadataCount,
+    decoratorMetadataHash: record.decoratorMetadataHash,
+    decoratorMetadata: record.decoratorMetadata,
+    enumMemberCount: record.enumMemberCount,
+    enumComputedMemberCount: record.enumComputedMemberCount,
+    enumRuntimeShapeHash: record.enumRuntimeShapeHash,
+    enumEmittedRuntimeShapeHash: record.enumEmittedRuntimeShapeHash,
+    advancedTypeShapeCount: record.advancedTypeShapeCount,
+    advancedTypeShapeKinds: record.advancedTypeShapeKinds,
+    typeReferenceTargetCount: record.typeReferenceTargetCount,
+    typeInferenceSyntaxCount: record.typeInferenceSyntaxCount,
+    typeInferenceSyntaxKinds: record.typeInferenceSyntaxKinds,
+    satisfiesExpressionCount: record.satisfiesExpressionCount,
+    asConstAssertionCount: record.asConstAssertionCount,
+    constTypeParameterCount: record.constTypeParameterCount,
+    typeInferenceSyntaxHash: record.typeInferenceSyntaxHash,
+    conditionalTypeCount: record.conditionalTypeCount, mappedTypeCount: record.mappedTypeCount,
+    indexedAccessTypeCount: record.indexedAccessTypeCount, keyofTypeOperatorCount: record.keyofTypeOperatorCount,
+    templateLiteralTypeCount: record.templateLiteralTypeCount, inferTypeCount: record.inferTypeCount,
+    unionTypeCount: record.unionTypeCount, intersectionTypeCount: record.intersectionTypeCount, tupleTypeCount: record.tupleTypeCount,
+    advancedTypeShapes: record.advancedTypeShapes,
+    typeText: record.typeText, apparentTypeText: record.apparentTypeText,
+    properties: record.properties, indexSignatures: record.indexSignatures,
+    callSignatures: record.callSignatures,
+    constructSignatures: record.constructSignatures,
+    typeEquivalenceCallSignatureSetHash: record.typeEquivalenceCallSignatureSetHash, typeEquivalenceConstructSignatureSetHash: record.typeEquivalenceConstructSignatureSetHash,
+    constructorSignatures: record.constructorSignatures,
+    classHeritage: record.classHeritage,
+    privateClassMembers: record.privateClassMembers,
+    accessorFieldMembers: record.accessorFieldMembers,
+    classMemberShapeProof: record.classMemberShapeProof,
+    enumMembers: record.enumMembers,
+    enumRuntimeShapeProof: record.enumRuntimeShapeProof,
+    typeEquivalenceConstructorSetHash: record.typeEquivalenceConstructorSetHash,
+    typeEquivalenceClassHeritageHash: record.typeEquivalenceClassHeritageHash,
+    typeEquivalenceAssignabilityOracleHash: record.typeEquivalenceAssignabilityOracleHash,
+    typeEquivalencePrivateClassMemberSetHash: record.typeEquivalencePrivateClassMemberSetHash,
+    typeEquivalenceAccessorFieldSetHash: record.typeEquivalenceAccessorFieldSetHash,
+    typeEquivalenceIndexSignatureSetHash: record.typeEquivalenceIndexSignatureSetHash,
+    typeEquivalenceEnumRuntimeShapeHash: record.typeEquivalenceEnumRuntimeShapeHash,
+    typeEquivalenceEnumEmittedRuntimeShapeHash: record.typeEquivalenceEnumEmittedRuntimeShapeHash,
+    typeEquivalenceConditionalTypeSetHash: record.typeEquivalenceConditionalTypeSetHash, typeEquivalenceIndexedAccessTypeSetHash: record.typeEquivalenceIndexedAccessTypeSetHash,
+    typeEquivalenceMappedTypeSetHash: record.typeEquivalenceMappedTypeSetHash, typeEquivalenceKeyofTypeOperatorSetHash: record.typeEquivalenceKeyofTypeOperatorSetHash,
+    typeEquivalenceTypeReferenceTargetSetHash: record.typeEquivalenceTypeReferenceTargetSetHash,
+    typeEquivalenceTemplateLiteralTypeSetHash: record.typeEquivalenceTemplateLiteralTypeSetHash, typeEquivalenceInferTypeSetHash: record.typeEquivalenceInferTypeSetHash,
+    typeEquivalenceUnionTypeSetHash: record.typeEquivalenceUnionTypeSetHash, typeEquivalenceIntersectionTypeSetHash: record.typeEquivalenceIntersectionTypeSetHash, typeEquivalenceTupleTypeSetHash: record.typeEquivalenceTupleTypeSetHash,
+    typeInferenceSyntax: record.typeInferenceSyntax,
+    flags: record.flags,
+    objectFlags: record.objectFlags,
+    intrinsicName: record.intrinsicName
+  });
+}
+
+function compilerTypeDetails(record) {
+  if (!record) return undefined;
+  return compactRecord({
+    sourcePath: record.sourcePath,
+    key: compilerTypeIdentityKey(record),
+    symbolId: record.symbolId,
+    symbolName: record.symbolName,
+    symbolKind: record.symbolKind,
+    fullyQualifiedName: record.fullyQualifiedName,
+    compilerSymbolIdentityHash: record.compilerSymbolIdentityHash,
+    typeIdentityHash: record.identityHash,
+    apiSignatureHash: record.apiSignatureHash,
+    typeText: record.typeText,
+    apparentTypeText: record.apparentTypeText,
+    typeParameters: record.typeParameters,
+    typeParameterCount: record.typeParameterCount,
+    typeParameterDefaultCount: record.typeParameterDefaultCount,
+    typeParameterConstraintCount: record.typeParameterConstraintCount,
+    propertyCount: record.propertyCount, propertyOptionalCount: record.propertyOptionalCount,
+    propertyReadonlyCount: record.propertyReadonlyCount, indexSignatureCount: record.indexSignatureCount,
+    indexSignatureReadonlyCount: record.indexSignatureReadonlyCount,
+    constructorSignatureCount: record.constructorSignatureCount,
+    classHeritageCount: record.classHeritageCount,
+    assignabilityOracleCount: record.assignabilityOracleCount,
+    assignabilityOracleDirectionCount: record.assignabilityOracleDirectionCount,
+    assignabilityOracleHash: record.assignabilityOracleHash,
+    assignabilityOracle: record.assignabilityOracle,
+    privateClassMemberCount: record.privateClassMemberCount,
+    accessorFieldCount: record.accessorFieldCount,
+    privateClassMemberShapeHash: record.privateClassMemberShapeHash,
+    accessorFieldShapeHash: record.accessorFieldShapeHash,
+    decoratorMetadataCount: record.decoratorMetadataCount,
+    decoratorMetadataHash: record.decoratorMetadataHash,
+    decoratorRuntimeExecutionHash: record.decoratorRuntimeExecutionHash,
+    decoratorRuntimeExecutionProof: record.decoratorRuntimeExecutionProof,
+    decoratorRuntimeExecutionProofReasonCodes: record.decoratorRuntimeExecutionProofReasonCodes,
+    enumKind: record.enumKind,
+    constEnum: record.constEnum,
+    enumMemberCount: record.enumMemberCount,
+    enumNumericMemberCount: record.enumNumericMemberCount,
+    enumStringMemberCount: record.enumStringMemberCount,
+    enumAutoMemberCount: record.enumAutoMemberCount,
+    enumComputedMemberCount: record.enumComputedMemberCount,
+    enumRuntimeShapeHash: record.enumRuntimeShapeHash,
+    enumEmittedRuntimeShapeHash: record.enumEmittedRuntimeShapeHash,
+    advancedTypeShapeCount: record.advancedTypeShapeCount,
+    advancedTypeShapeKinds: record.advancedTypeShapeKinds,
+    typeReferenceTargetCount: record.typeReferenceTargetCount,
+    typeReferenceTargets: record.typeReferenceTargets,
+    typeInferenceSyntaxCount: record.typeInferenceSyntaxCount,
+    typeInferenceSyntaxKinds: record.typeInferenceSyntaxKinds,
+    satisfiesExpressionCount: record.satisfiesExpressionCount,
+    asConstAssertionCount: record.asConstAssertionCount,
+    constTypeParameterCount: record.constTypeParameterCount,
+    typeInferenceSyntaxHash: record.typeInferenceSyntaxHash,
+    conditionalTypeCount: record.conditionalTypeCount, mappedTypeCount: record.mappedTypeCount,
+    indexedAccessTypeCount: record.indexedAccessTypeCount, keyofTypeOperatorCount: record.keyofTypeOperatorCount,
+    templateLiteralTypeCount: record.templateLiteralTypeCount, inferTypeCount: record.inferTypeCount,
+    unionTypeCount: record.unionTypeCount, intersectionTypeCount: record.intersectionTypeCount, tupleTypeCount: record.tupleTypeCount,
+    advancedTypeShapes: record.advancedTypeShapes,
+    properties: record.properties, indexSignatures: record.indexSignatures,
+    callSignatures: record.callSignatures,
+    constructSignatures: record.constructSignatures,
+    typeEquivalenceStatus: record.typeEquivalenceStatus,
+    typeEquivalenceReasonCodes: record.typeEquivalenceReasonCodes,
+    typeEquivalenceSignatureSetHash: record.typeEquivalenceSignatureSetHash,
+    typeEquivalenceCallSignatureSetHash: record.typeEquivalenceCallSignatureSetHash, typeEquivalenceConstructSignatureSetHash: record.typeEquivalenceConstructSignatureSetHash,
+    typeEquivalenceTypeParameterSetHash: record.typeEquivalenceTypeParameterSetHash,
+    typeEquivalencePropertySetHash: record.typeEquivalencePropertySetHash,
+    typeEquivalenceConstructorSetHash: record.typeEquivalenceConstructorSetHash,
+    typeEquivalenceClassHeritageHash: record.typeEquivalenceClassHeritageHash,
+    typeEquivalenceAssignabilityOracleHash: record.typeEquivalenceAssignabilityOracleHash,
+    typeEquivalencePrivateClassMemberSetHash: record.typeEquivalencePrivateClassMemberSetHash,
+    typeEquivalenceAccessorFieldSetHash: record.typeEquivalenceAccessorFieldSetHash,
+    typeEquivalenceIndexSignatureSetHash: record.typeEquivalenceIndexSignatureSetHash,
+    typeEquivalenceEnumRuntimeShapeHash: record.typeEquivalenceEnumRuntimeShapeHash,
+    typeEquivalenceEnumEmittedRuntimeShapeHash: record.typeEquivalenceEnumEmittedRuntimeShapeHash,
+    typeEquivalenceConditionalTypeSetHash: record.typeEquivalenceConditionalTypeSetHash, typeEquivalenceIndexedAccessTypeSetHash: record.typeEquivalenceIndexedAccessTypeSetHash,
+    typeEquivalenceMappedTypeSetHash: record.typeEquivalenceMappedTypeSetHash, typeEquivalenceKeyofTypeOperatorSetHash: record.typeEquivalenceKeyofTypeOperatorSetHash,
+    typeEquivalenceTypeReferenceTargetSetHash: record.typeEquivalenceTypeReferenceTargetSetHash,
+    typeEquivalenceTemplateLiteralTypeSetHash: record.typeEquivalenceTemplateLiteralTypeSetHash, typeEquivalenceInferTypeSetHash: record.typeEquivalenceInferTypeSetHash,
+    typeEquivalenceUnionTypeSetHash: record.typeEquivalenceUnionTypeSetHash, typeEquivalenceIntersectionTypeSetHash: record.typeEquivalenceIntersectionTypeSetHash, typeEquivalenceTupleTypeSetHash: record.typeEquivalenceTupleTypeSetHash,
+    typeInferenceSyntax: record.typeInferenceSyntax,
+    typeInferenceSyntaxProof: record.typeInferenceSyntaxProof,
+    enumMembers: record.enumMembers,
+    enumRuntimeShapeProof: record.enumRuntimeShapeProof,
+    typeEquivalenceProof: record.typeEquivalenceProof,
+    typeEquivalenceCheckerEvidence: record.typeEquivalenceCheckerEvidence,
+    constructorSignatures: record.constructorSignatures,
+    classHeritage: record.classHeritage,
+    privateClassMembers: record.privateClassMembers,
+    accessorFieldMembers: record.accessorFieldMembers,
+    classMemberShapeProof: record.classMemberShapeProof,
+    decoratorMetadata: record.decoratorMetadata,
+    decoratorMetadataProof: record.decoratorMetadataProof,
+    sourceHash: record.sourceHash,
+    evidenceIds: record.evidenceIds
+  });
+}
+
+function compilerTypeIdentityKey(record) { return stableKey(['compiler-public-type', record?.fullyQualifiedName ?? record?.localName ?? record?.symbolName ?? record?.symbolId]); }
+function stableKey(parts) {
+  const values = parts.map((part) => part === undefined || part === null ? '' : String(part));
+  return values.some(Boolean) ? values.join('#') : undefined;
+}
+
+export { compilerTypeDetails, compilerTypeFingerprint };

package/dist/js-ts-safe-project-merge-graph-delta-conflicts.js

@@ -1,7 +1,14 @@
-import { hashSemanticValue } from '@shapeshift-labs/frontier-lang-kernel';
 import { compactRecord } from './js-ts-safe-merge-context.js';
-
-function projectGraphDeltaConflicts(projectGraphDelta) {
+import { publicCompilerTypeDeltaConflicts } from './js-ts-safe-project-merge-graph-delta-compiler-conflicts.js';
+import { projectJsxPropDeltaConflicts, projectJsxRenderRiskDeltaConflicts } from './js-ts-safe-project-merge-jsx-graph-conflicts.js';
+import { projectRuntimeRegionDeltaConflicts } from './js-ts-safe-project-merge-runtime-region-conflicts.js';
+import { projectScopeUseDefDeltaConflicts } from './js-ts-safe-project-merge-scope-use-def-conflicts.js';
+import { projectSourceSpanDeltaConflicts } from './js-ts-safe-project-merge-source-span-conflicts.js';
+import { projectModuleDeclarationDeltaConflicts } from './js-ts-safe-project-merge-graph-delta-module-declarations.js';
+import { commonJsRuntimeInteropDelta, commonJsRuntimeInteropProofAssessment } from './js-ts-safe-project-merge-graph-delta-commonjs-interop.js';
+import { projectImportAttributeDeltaConflicts, projectPublicContractDeltaConflicts, projectReExportIdentityDeltaConflicts } from './js-ts-safe-project-merge-graph-delta-identity-conflicts.js';
+
+function projectGraphDeltaConflicts(projectGraphDelta, options = {}) {
   const limitConflicts = projectGraphDeltaLimitConflicts(projectGraphDelta);
   const baseGraph = projectGraphDelta?.stages?.base?.projectSymbolGraph;
   const workerGraph = projectGraphDelta?.stages?.worker?.projectSymbolGraph;
@@ -10,29 +17,17 @@ function projectGraphDeltaConflicts(projectGraphDelta) {
   if (!baseGraph || !workerGraph || !headGraph) return limitConflicts;
   return [
     ...limitConflicts,
-    ...changedIdentityConflicts({
-      code: 'project-public-contract-delta-conflict',
-      label: 'public contract',
-      baseRecords: baseGraph.publicContractRegions,
-      workerRecords: workerGraph.publicContractRegions,
-      headRecords: headGraph.publicContractRegions,
-      outputRecords: outputGraph?.publicContractRegions,
-      identityKey: publicContractIdentityKey,
-      fingerprint: publicContractFingerprint,
-      details: publicContractDetails
-    }),
-    ...changedIdentityConflicts({
-      code: 'project-re-export-identity-delta-conflict',
-      label: 're-export identity',
-      baseRecords: baseGraph.reExportIdentities,
-      workerRecords: workerGraph.reExportIdentities,
-      headRecords: headGraph.reExportIdentities,
-      outputRecords: outputGraph?.reExportIdentities,
-      identityKey: reExportIdentityKey,
-      fingerprint: reExportIdentityFingerprint,
-      details: reExportIdentityDetails
-    }),
-    ...projectImportTargetDeltaConflicts(projectGraphDelta)
+    ...projectPublicContractDeltaConflicts(baseGraph, workerGraph, headGraph, outputGraph),
+    ...publicCompilerTypeDeltaConflicts(baseGraph, workerGraph, headGraph, outputGraph, options),
+    ...projectSourceSpanDeltaConflicts(projectGraphDelta),
+    ...projectRuntimeRegionDeltaConflicts(projectGraphDelta, options),
+    ...projectScopeUseDefDeltaConflicts(projectGraphDelta),
+    ...projectJsxPropDeltaConflicts(projectGraphDelta),
+    ...projectJsxRenderRiskDeltaConflicts(projectGraphDelta, options),
+    ...projectReExportIdentityDeltaConflicts(baseGraph, workerGraph, headGraph, outputGraph),
+    ...projectModuleDeclarationDeltaConflicts(projectGraphDelta, options),
+    ...projectImportAttributeDeltaConflicts(baseGraph, workerGraph, headGraph, outputGraph),
+    ...projectImportTargetDeltaConflicts(projectGraphDelta, options)
   ];
 }
 
@@ -44,7 +39,15 @@ function addProjectGraphDeltaConflictSummary(projectGraphDelta, conflicts) {
       ...projectGraphDelta.summary,
       conflicts: conflicts.length,
       publicContractConflicts: conflicts.filter((conflict) => conflict.code === 'project-public-contract-delta-conflict').length,
+      sourceSpanConflicts: conflicts.filter((conflict) => conflict.code === 'project-source-span-delta-conflict').length,
+      compilerTypeConflicts: conflicts.filter((conflict) => conflict.code === 'project-public-compiler-type-delta-conflict').length,
+      runtimeRegionConflicts: conflicts.filter((conflict) => conflict.code === 'project-public-runtime-region-delta-conflict').length,
+      scopeUseDefConflicts: conflicts.filter(isScopeUseDefConflict).length,
+      jsxPropConflicts: conflicts.filter((conflict) => conflict.code === 'project-jsx-public-prop-delta-conflict').length,
+      jsxRenderRiskConflicts: conflicts.filter((conflict) => conflict.code === 'project-jsx-public-render-risk-delta-conflict').length,
       reExportIdentityConflicts: conflicts.filter((conflict) => conflict.code === 'project-re-export-identity-delta-conflict').length,
+      moduleDeclarationShapeConflicts: conflicts.filter((conflict) => conflict.code === 'project-module-declaration-shape-delta-conflict').length, exportAssignmentShapeConflicts: conflicts.filter((conflict) => conflict.code === 'project-export-assignment-shape-delta-conflict').length,
+      importAttributeConflicts: conflicts.filter((conflict) => conflict.code === 'project-import-attribute-delta-conflict').length,
       importTargetConflicts: conflicts.filter((conflict) => conflict.code === 'project-import-target-delta-conflict').length,
       limitConflicts: conflicts.filter((conflict) => conflict.gateId === 'project-graph-limit').length
     }
@@ -54,35 +57,9 @@ function addProjectGraphDeltaConflictSummary(projectGraphDelta, conflicts) {
 function projectGraphDeltaLimitConflicts(projectGraphDelta) {
   return Object.values(projectGraphDelta?.stages ?? {}).flatMap((stage) => stage?.limitConflicts ?? []);
 }
+function isScopeUseDefConflict(conflict) { return conflict.code === 'project-public-scope-use-def-delta-conflict' || conflict.code === 'project-public-scope-reference-delta-conflict'; }
 
-function changedIdentityConflicts(input) {
-  const base = recordsByIdentityKey(input.baseRecords, input.identityKey);
-  const worker = recordsByIdentityKey(input.workerRecords, input.identityKey);
-  const head = recordsByIdentityKey(input.headRecords, input.identityKey);
-  const output = recordsByIdentityKey(input.outputRecords, input.identityKey);
-  const keys = uniqueStrings([...base.keys(), ...worker.keys(), ...head.keys()]);
-  return keys.flatMap((identityKey) => {
-    const baseRecord = base.get(identityKey);
-    const workerRecord = worker.get(identityKey);
-    const headRecord = head.get(identityKey);
-    const baseFingerprint = optionalFingerprint(baseRecord, input.fingerprint);
-    const workerFingerprint = optionalFingerprint(workerRecord, input.fingerprint);
-    const headFingerprint = optionalFingerprint(headRecord, input.fingerprint);
-    if (baseFingerprint === workerFingerprint || baseFingerprint === headFingerprint || workerFingerprint === headFingerprint) return [];
-    return [projectGraphDeltaConflict({
-      code: input.code,
-      label: input.label,
-      identityKey,
-      baseRecord,
-      workerRecord,
-      headRecord,
-      outputRecord: output.get(identityKey),
-      details: input.details
-    })];
-  });
-}
-
-function projectImportTargetDeltaConflicts(projectGraphDelta) {
+function projectImportTargetDeltaConflicts(projectGraphDelta, options = {}) {
   const baseStage = projectGraphDelta?.stages?.base;
   const workerStage = projectGraphDelta?.stages?.worker;
   const headStage = projectGraphDelta?.stages?.head;
@@ -91,38 +68,23 @@ function projectImportTargetDeltaConflicts(projectGraphDelta) {
   const baseSymbolIds = semanticSymbolIds(baseStage);
   const headSymbolIds = semanticSymbolIds(headStage);
   const conflicts = [];
-  for (const [identityKey, edge] of importEdgesByIdentityKey(outputStage?.projectSymbolGraph?.importEdges)) {
+  const outputGraph = outputStage?.projectSymbolGraph;
+  for (const [identityKey, edge] of importEdgesByIdentityKey(outputGraph?.importEdges)) {
     if (!edge.resolvedTargetSymbolId) continue;
     const workerEdge = workerEdges.get(identityKey);
     if (!workerEdge || workerEdge.resolvedTargetSymbolId === edge.resolvedTargetSymbolId) continue;
     if (baseSymbolIds.has(edge.resolvedTargetSymbolId) || !headSymbolIds.has(edge.resolvedTargetSymbolId)) continue;
-    conflicts.push(projectImportTargetDeltaConflict(identityKey, edge, workerEdge));
+    const commonJsInteropDelta = commonJsRuntimeInteropDelta(identityKey, edge, workerEdge, outputGraph);
+    const commonJsProof = commonJsInteropDelta
+      ? commonJsRuntimeInteropProofAssessment(commonJsInteropDelta, options)
+      : undefined;
+    if (commonJsProof?.status === 'passed') continue;
+    conflicts.push(projectImportTargetDeltaConflict(identityKey, edge, workerEdge, commonJsProof));
   }
   return conflicts;
 }
 
-function projectGraphDeltaConflict(input) {
-  const sourcePath = input.workerRecord?.sourcePath ?? input.headRecord?.sourcePath ?? input.baseRecord?.sourcePath;
-  const conflictKey = `project-graph-delta#${input.label.replace(/\s+/g, '-')}#${input.identityKey}`;
-  return {
-    code: input.code,
-    gateId: 'project-graph-delta',
-    message: `Worker and head both changed ${input.label} ${JSON.stringify(input.identityKey)} in incompatible ways.`,
-    sourcePath,
-    details: compactRecord({
-      reasonCode: input.code,
-      conflictKey,
-      identityKey: input.identityKey,
-      sourcePath,
-      base: input.details(input.baseRecord),
-      worker: input.details(input.workerRecord),
-      head: input.details(input.headRecord),
-      output: input.details(input.outputRecord)
-    })
-  };
-}
-
-function projectImportTargetDeltaConflict(identityKey, edge, workerEdge) {
+function projectImportTargetDeltaConflict(identityKey, edge, workerEdge, commonJsProof) {
   return {
     code: 'project-import-target-delta-conflict',
     gateId: 'project-graph-delta',
@@ -137,105 +99,25 @@ function projectImportTargetDeltaConflict(identityKey, edge, workerEdge) {
       importedName: edge.importedName,
       localName: edge.localName,
       importKind: edge.importKind,
+      commonJs: edge.commonJs,
+      interopHelper: edge.interopHelper,
+      packageRuntimeCondition: edge.packageRuntimeCondition,
+      packageRuntimeConditionEdgeKind: edge.packageRuntimeConditionEdgeKind,
       resolvedModulePath: edge.resolvedModulePath,
       outputTargetSymbolId: edge.resolvedTargetSymbolId,
       workerTargetSymbolId: workerEdge.resolvedTargetSymbolId,
       workerResolutionKind: workerEdge.resolutionKind,
-      outputResolutionKind: edge.resolutionKind
+      outputResolutionKind: edge.resolutionKind,
+      routeId: commonJsProof?.routeId,
+      routeLane: commonJsProof?.routeLane,
+      routeNext: commonJsProof?.routeNext,
+      reasonCodes: commonJsProof?.reasonCodes,
+      commonJsRuntimeInteropProof: commonJsProof?.record,
+      semanticEquivalenceClaim: false
     })
   };
 }
 
-function recordsByIdentityKey(records, identityKey) {
-  const result = new Map();
-  for (const record of records ?? []) {
-    const key = identityKey(record);
-    if (!key || result.has(key)) continue;
-    result.set(key, record);
-  }
-  return result;
-}
-
-function publicContractIdentityKey(record) {
-  return firstString(
-    record?.key,
-    stableKey(['public-contract', record?.sourcePath, record?.apiSurfaceKind, record?.edgeKind, record?.moduleSpecifier, record?.exportedName ?? record?.symbolName ?? record?.symbolId])
-  );
-}
-
-function publicContractFingerprint(record) {
-  return hashSemanticValue({
-    kind: 'frontier.lang.projectGraphDelta.publicContractFingerprint',
-    contractHash: record.contractHash,
-    signatureHash: record.signatureHash,
-    symbolName: record.symbolName,
-    symbolKind: record.symbolKind,
-    apiSurfaceKind: record.apiSurfaceKind,
-    exportedName: record.exportedName,
-    moduleSpecifier: record.moduleSpecifier,
-    edgeKind: record.edgeKind
-  });
-}
-
-function publicContractDetails(record) {
-  if (!record) return undefined;
-  return compactRecord({
-    sourcePath: record.sourcePath,
-    key: publicContractIdentityKey(record),
-    symbolName: record.symbolName,
-    symbolKind: record.symbolKind,
-    apiSurfaceKind: record.apiSurfaceKind,
-    exportedName: record.exportedName,
-    moduleSpecifier: record.moduleSpecifier,
-    edgeKind: record.edgeKind,
-    signatureHash: record.signatureHash,
-    contractHash: record.contractHash,
-    sourceHash: record.sourceHash
-  });
-}
-
-function reExportIdentityKey(record) {
-  return stableKey(['re-export-identity', record?.sourcePath, record?.exportedName ?? record?.localName ?? record?.namespace ?? (record?.exportStar || record?.isExportStar ? '*' : undefined)]);
-}
-
-function reExportIdentityFingerprint(record) {
-  return hashSemanticValue({
-    kind: 'frontier.lang.projectGraphDelta.reExportIdentityFingerprint',
-    sourcePath: record.sourcePath,
-    moduleSpecifier: record.moduleSpecifier,
-    exportedName: record.exportedName,
-    importedName: record.importedName,
-    localName: record.localName,
-    namespace: record.namespace,
-    isTypeOnly: record.isTypeOnly,
-    exportStar: record.exportStar,
-    isExportStar: record.isExportStar,
-    originSymbolId: record.originSymbolId,
-    exportedSymbolId: record.exportedSymbolId,
-    localSymbolId: record.localSymbolId
-  });
-}
-
-function reExportIdentityDetails(record) {
-  if (!record) return undefined;
-  return compactRecord({
-    sourcePath: record.sourcePath,
-    key: reExportIdentityKey(record),
-    moduleSpecifier: record.moduleSpecifier,
-    exportedName: record.exportedName,
-    importedName: record.importedName,
-    localName: record.localName,
-    namespace: record.namespace,
-    isTypeOnly: record.isTypeOnly,
-    exportStar: record.exportStar,
-    isExportStar: record.isExportStar,
-    originSymbolId: record.originSymbolId,
-    exportedSymbolId: record.exportedSymbolId,
-    localSymbolId: record.localSymbolId,
-    sourceHash: record.sourceHash
-  });
-}
-
 function importEdgesByIdentityKey(records) {
   const result = new Map();
   for (const record of records ?? []) {
@@ -259,10 +141,6 @@ function projectImportTargetName(edge) {
   return String(name);
 }
 
-function optionalFingerprint(record, fingerprint) {
-  return record ? fingerprint(record) : undefined;
-}
-
 function semanticSymbolIds(stage) {
   return new Set((stage?.projectImport?.semanticIndex?.symbols ?? []).map((symbol) => symbol.id).filter(Boolean));
 }
@@ -272,15 +150,4 @@ function stableKey(parts) {
   return values.some(Boolean) ? values.join('#') : undefined;
 }
 
-function firstString(...values) {
-  for (const value of values) {
-    if (value !== undefined && value !== null && String(value)) return String(value);
-  }
-  return undefined;
-}
-
-function uniqueStrings(values) {
-  return [...new Set(values.filter((value) => typeof value === 'string' && value.length > 0))];
-}
-
 export { addProjectGraphDeltaConflictSummary, projectGraphDeltaConflicts };