@shapeshift-labs/frontier-lang-compiler 0.2.156 → 0.2.158

package/dist/declarations/js-ts-project-merge-summary.d.ts

@@ -0,0 +1,16 @@
+import type { JsTsProjectMergeProofLevel } from './js-ts-project-merge-proof-levels.js';
+import type { JsTsProjectSafeMergeMissingEvidenceTelemetry } from './js-ts-project-merge-confidence.js';
+
+export interface JsTsProjectSafeMergeSummary {
+  readonly files: number; readonly mergedFiles: number; readonly blockedFiles: number; readonly outputFiles: number;
+  readonly htmlFiles:number; readonly cssFiles:number; readonly htmlCssFiles:number; readonly htmlMergedFiles:number; readonly cssMergedFiles:number; readonly htmlCssMergedFiles:number; readonly htmlBlockedFiles:number; readonly cssBlockedFiles:number; readonly htmlCssBlockedFiles:number; readonly htmlCssBrowserRuntimeProofs:number;
+  readonly projectGraphConflicts: number; readonly projectGraphDeltaEvidenceIncluded: number; readonly outputProjectGraphConflicts:number; readonly projectGraphCssModuleUseSiteConflicts:number; readonly projectGraphDeltaConflicts: number; readonly projectGraphLimitConflicts: number; readonly projectGraphPublicContractConflicts: number; readonly projectGraphSourceSpanConflicts: number;
+  readonly projectGraphCompilerTypeConflicts: number; readonly projectGraphRuntimeRegionConflicts: number; readonly projectGraphScopeUseDefConflicts: number; readonly projectGraphJsxPropConflicts: number; readonly projectGraphJsxRenderRiskConflicts: number; readonly projectGraphReExportIdentityConflicts: number; readonly projectGraphModuleDeclarationShapeConflicts: number; readonly projectGraphExportAssignmentShapeConflicts: number;
+  readonly projectGraphImportAttributeConflicts: number; readonly projectGraphImportTargetConflicts: number; readonly outputDiagnostics: number; readonly outputDiagnosticConflicts: number; readonly outputDiagnosticErrors: number; readonly outputDiagnosticWarnings: number; readonly outputDeclarations: number; readonly outputDeclarationBytes: number; readonly outputDeclarationConflicts: number; readonly outputDeclarationDiagnosticErrors: number; readonly outputQualityGates: number; readonly outputQualityGateConflicts: number;
+  readonly proofEvidenceRecords: number; readonly proofEvidencePassed: number; readonly proofEvidenceFailed: number; readonly proofEvidenceSkipped: number; readonly proofEvidenceUnknown: number; readonly proofEvidenceMissing: number; readonly proofEvidenceMissingLevels: readonly JsTsProjectMergeProofLevel[]; readonly semanticEquivalenceLevel: 'semantic-equivalence-unknown' | string;
+  readonly evidenceRecords: number; readonly passedEvidenceRecords: number; readonly failedEvidenceRecords: number; readonly unknownEvidenceRecords: number; readonly confidenceScore: number; readonly confidenceLevel: string; readonly confidenceDimensions: Readonly<Record<string,string>>; readonly missingEvidenceMatrix: JsTsProjectSafeMergeMissingEvidenceTelemetry; readonly missingSignals: number;
+  readonly nextMissingEvidenceCode?: string; readonly nextMissingEvidenceKind?: string; readonly nextMissingEvidenceScope?: string; readonly nextMissingProofLevel?: string; readonly nextMissingEvidenceAction?: string; readonly nextMissingEvidenceRouteId?: string; readonly nextMissingEvidenceRouteLane?: string; readonly nextMissingEvidenceRouteNext?: string;
+  readonly projectMoveRenameClassifications: number; readonly projectFileMoveRenameClassifications: number; readonly projectSymbolMoveClassifications: number; readonly projectExportedSymbolMoveClassifications: number; readonly projectImportedSymbolMoveClassifications: number; readonly projectSymbolMoveAdmissions: number; readonly projectExportedSymbolMoveAdmissions: number; readonly projectImportedSymbolMoveAdmissions: number; readonly projectCrossFileSymbolRenameClassifications: number; readonly projectCrossFileSymbolRenameAdmissions: number;
+  readonly projectSplitMergeClassifications: number; readonly projectModuleSplitClassifications: number; readonly projectModuleMergeClassifications: number; readonly projectClassSplitClassifications: number; readonly projectClassMergeClassifications: number; readonly projectSplitMergeAdmissions: number; readonly projectModuleSplitAdmissions: number; readonly projectModuleMergeAdmissions: number; readonly projectClassSplitAdmissions: number; readonly projectClassMergeAdmissions: number;
+  readonly semanticArtifactFiles: number; readonly operations: Readonly<Record<string,number>>;
+}

package/dist/declarations/js-ts-safe-project-merge.d.ts

@@ -12,6 +12,7 @@ import type { JsTsProjectMergeQualityGate as QualityGate, JsTsProjectMergeQualit
 import type { JsTsProjectMergeProofEvidence, JsTsProjectMergeProofEvidenceStatus, JsTsProjectMergeProofLevel } from './js-ts-project-merge-proof-levels.js';
 import type { JsTsProjectSafeMergeAdmissionRoute, JsTsProjectSafeMergeAdmissionRouteSummary } from './js-ts-project-merge-admission-routes.js';
 import type { JsTsProjectSafeMergeConfidenceSummary, JsTsProjectSafeMergeMissingEvidenceTelemetry } from './js-ts-project-merge-confidence.js';
+import type { JsTsProjectSafeMergeSummary } from './js-ts-project-merge-summary.js';
 import type { JsTsProjectCommonJsRuntimeInteropProof } from './js-ts-project-merge-commonjs-interop.js';
 import type { JsTsProjectGlobalAugmentationCompatibilityProof } from './js-ts-project-merge-global-augmentation.js'; import type { JsTsProjectJsxRenderReturnBranchProof } from './js-ts-project-merge-jsx-render-branch.js'; import type { JsTsProjectSemanticEquivalenceProof } from './js-ts-project-merge-semantic-equivalence-proof.js';
 import type { ParserTriviaEvidenceInput } from './source-preservation.js';
@@ -20,12 +21,14 @@ export type { JsTsProjectMergeQualityGate, JsTsProjectMergeQualityGateDecision,
 export type { JsTsProjectMergeProofEvidence, JsTsProjectMergeProofEvidenceRecord, JsTsProjectMergeProofEvidenceRecordStatus, JsTsProjectMergeProofEvidenceStatus, JsTsProjectMergeProofEvidenceSummary, JsTsProjectMergeProofLevel, JsTsProjectMergeProofMissingEvidence } from './js-ts-project-merge-proof-levels.js';
 export type { JsTsProjectSafeMergeAdmissionRoute, JsTsProjectSafeMergeAdmissionRouteSummary } from './js-ts-project-merge-admission-routes.js';
 export type { JsTsProjectSafeMergeConfidenceSummary, JsTsProjectSafeMergeMissingEvidence, JsTsProjectSafeMergeMissingEvidenceRoute, JsTsProjectSafeMergeMissingEvidenceTelemetry, JsTsProjectSafeMergeRecommendedAction } from './js-ts-project-merge-confidence.js';
+export type { JsTsProjectSafeMergeSummary } from './js-ts-project-merge-summary.js';
 export type { JsTsProjectCommonJsRuntimeInteropProof } from './js-ts-project-merge-commonjs-interop.js';
 export type { JsTsProjectGlobalAugmentationCompatibilityProof } from './js-ts-project-merge-global-augmentation.js'; export type { JsTsProjectJsxRenderReturnBranchArmOrigin, JsTsProjectJsxRenderReturnBranchControlKind, JsTsProjectJsxRenderReturnBranchProof } from './js-ts-project-merge-jsx-render-branch.js';
 
 export type JsTsProjectSafeMergeStatus = 'merged' | 'blocked';
 export type JsTsProjectSafeMergeFileStatus = 'merged' | 'blocked';
 export type JsTsProjectSafeMergeFileOperation = 'merged-source' | 'merged-source-and-members' | 'worker-added' | 'head-only' | 'both-added-identical' | 'worker-deleted' | 'head-deleted-worker-unchanged' | 'blocked-merge' | 'blocked-file-presence' | string;
+export type JsTsProjectHtmlCssMergeOptions = Readonly<Record<string, unknown>>;
 
 export interface JsTsProjectSafeMergeEvidenceRecord { readonly id: string; readonly kind: string; readonly status: 'passed' | 'failed' | 'skipped' | 'unknown' | string; readonly level?: string; readonly scope?: string; readonly summary?: string; readonly metadata?: Record<string, unknown>; }
 
@@ -105,6 +108,8 @@ export interface JsTsProjectSafeMergeInput {
   readonly commonJsRuntimeInteropProofs?: readonly JsTsProjectCommonJsRuntimeInteropProof[];
   readonly globalAugmentationCompatibilityProof?: JsTsProjectGlobalAugmentationCompatibilityProof;
   readonly globalAugmentationCompatibilityProofs?: readonly JsTsProjectGlobalAugmentationCompatibilityProof[]; readonly jsxRenderReturnBranchProof?: JsTsProjectJsxRenderReturnBranchProof; readonly jsxRenderReturnBranchProofs?: readonly JsTsProjectJsxRenderReturnBranchProof[]; readonly externalSemanticEquivalenceProof?: JsTsProjectSemanticEquivalenceProof; readonly semanticEquivalenceProof?: JsTsProjectSemanticEquivalenceProof;
+  readonly htmlMergeOptions?: JsTsProjectHtmlCssMergeOptions; readonly markupMergeOptions?: JsTsProjectHtmlCssMergeOptions; readonly htmlMergeOptionsByPath?: Readonly<Record<string,JsTsProjectHtmlCssMergeOptions>>; readonly markupMergeOptionsByPath?: Readonly<Record<string,JsTsProjectHtmlCssMergeOptions>>;
+  readonly cssMergeOptions?: JsTsProjectHtmlCssMergeOptions; readonly styleMergeOptions?: JsTsProjectHtmlCssMergeOptions; readonly cssMergeOptionsByPath?: Readonly<Record<string,JsTsProjectHtmlCssMergeOptions>>; readonly styleMergeOptionsByPath?: Readonly<Record<string,JsTsProjectHtmlCssMergeOptions>>;
   readonly moduleResolution?: NativeProjectModuleResolutionOptions;
   readonly tsconfig?: JsTsProjectTsconfigInput | NativeProjectModuleResolutionOptions;
   readonly projectReferences?: JsTsProjectReferencesInput;
@@ -169,7 +174,7 @@ export interface JsTsProjectSafeMergeFileResult {
   readonly baseHash?: string;
   readonly workerHash?: string;
   readonly headHash?: string;
-  readonly result?: JsTsSafeMergeResult;
+  readonly result?: JsTsSafeMergeResult | Record<string, unknown>;
   readonly semanticArtifacts?: JsTsSafeMergeSemanticArtifacts;
   readonly conflicts: readonly JsTsSafeMergeConflict[];
   readonly admission: JsTsSafeMergeAdmission;
@@ -272,37 +277,7 @@ export interface JsTsProjectSafeMergeResult {
   readonly outputQualityGate?: QualityGate;
   readonly conflicts: readonly JsTsSafeMergeConflict[];
   readonly admission: JsTsProjectSafeMergeAdmission; readonly proofEvidence: JsTsProjectMergeProofEvidence; readonly confidence: JsTsProjectSafeMergeConfidenceSummary; readonly evidence: readonly JsTsProjectSafeMergeEvidenceRecord[];
-  readonly summary: {
-    readonly files: number;
-    readonly mergedFiles: number;
-    readonly blockedFiles: number;
-    readonly outputFiles: number;
-    readonly projectGraphConflicts: number;
-    readonly projectGraphDeltaEvidenceIncluded: number;
-    outputProjectGraphConflicts:number; projectGraphCssModuleUseSiteConflicts:number;
-    readonly projectGraphDeltaConflicts: number;
-    readonly projectGraphLimitConflicts: number;
-    readonly projectGraphPublicContractConflicts: number;
-    readonly projectGraphSourceSpanConflicts: number;
-    readonly projectGraphCompilerTypeConflicts: number; readonly projectGraphRuntimeRegionConflicts: number; readonly projectGraphScopeUseDefConflicts: number; readonly projectGraphJsxPropConflicts: number; readonly projectGraphJsxRenderRiskConflicts: number;
-    readonly projectGraphReExportIdentityConflicts: number; readonly projectGraphModuleDeclarationShapeConflicts: number; readonly projectGraphExportAssignmentShapeConflicts: number;
-    readonly projectGraphImportAttributeConflicts: number;
-    readonly projectGraphImportTargetConflicts: number;
-    readonly outputDiagnostics: number;
-    readonly outputDiagnosticConflicts: number;
-    readonly outputDiagnosticErrors: number;
-    readonly outputDiagnosticWarnings: number;
-    readonly outputDeclarations: number;
-    readonly outputDeclarationBytes: number;
-    readonly outputDeclarationConflicts: number;
-    readonly outputDeclarationDiagnosticErrors: number;
-    readonly outputQualityGates: number; readonly outputQualityGateConflicts: number;
-    readonly proofEvidenceRecords: number; readonly proofEvidencePassed: number; readonly proofEvidenceFailed: number; readonly proofEvidenceSkipped: number; readonly proofEvidenceUnknown: number; readonly proofEvidenceMissing: number; readonly proofEvidenceMissingLevels: readonly JsTsProjectMergeProofLevel[]; readonly semanticEquivalenceLevel: 'semantic-equivalence-unknown' | string; readonly evidenceRecords: number; readonly passedEvidenceRecords: number; readonly failedEvidenceRecords: number; readonly unknownEvidenceRecords: number; readonly confidenceScore: number; readonly confidenceLevel: string; readonly confidenceDimensions: Readonly<Record<string,string>>; readonly missingEvidenceMatrix: JsTsProjectSafeMergeMissingEvidenceTelemetry; readonly missingSignals: number; readonly nextMissingEvidenceCode?: string; readonly nextMissingEvidenceKind?: string; readonly nextMissingEvidenceScope?: string; readonly nextMissingProofLevel?: string; readonly nextMissingEvidenceAction?: string; readonly nextMissingEvidenceRouteId?: string; readonly nextMissingEvidenceRouteLane?: string; readonly nextMissingEvidenceRouteNext?: string;
-    readonly projectMoveRenameClassifications: number; readonly projectFileMoveRenameClassifications: number; readonly projectSymbolMoveClassifications: number; readonly projectExportedSymbolMoveClassifications: number; readonly projectImportedSymbolMoveClassifications: number; readonly projectSymbolMoveAdmissions: number; readonly projectExportedSymbolMoveAdmissions: number; readonly projectImportedSymbolMoveAdmissions: number; readonly projectCrossFileSymbolRenameClassifications: number; readonly projectCrossFileSymbolRenameAdmissions: number;
-    readonly projectSplitMergeClassifications: number; readonly projectModuleSplitClassifications: number; readonly projectModuleMergeClassifications: number; readonly projectClassSplitClassifications: number; readonly projectClassMergeClassifications: number; readonly projectSplitMergeAdmissions: number; readonly projectModuleSplitAdmissions: number; readonly projectModuleMergeAdmissions: number; readonly projectClassSplitAdmissions: number; readonly projectClassMergeAdmissions: number;
-    readonly semanticArtifactFiles: number;
-    readonly operations: Readonly<Record<string,number>>;
-  };
+  readonly summary: JsTsProjectSafeMergeSummary;
   readonly metadata?: Record<string, unknown> & {
     readonly projectMoveRenameClassifications?: {
       readonly classifications: number;

package/dist/js-ts-safe-project-merge-html-css-matrix.js

@@ -0,0 +1,38 @@
+const HtmlCssProjectMergeMissingSignals = Object.freeze({
+  htmlStructuralMerge: 'html-structural-merge-proof-blocked',
+  cssCascadeMerge: 'css-cascade-merge-proof-blocked',
+  htmlCssBrowserRuntimeProof: 'html-css-browser-runtime-proof-not-available'
+});
+
+function htmlCssProjectMergeMissingEvidenceRoutes(route, signals) {
+  return {
+    [signals.htmlStructuralMerge]: route('admit-html-structural-merge', 'layout-markup-graph', 'supply-html-parser-reference-and-boundary-evidence'),
+    [signals.cssCascadeMerge]: route('admit-css-cascade-merge', 'layout-style-graph', 'supply-css-parser-cascade-and-scope-evidence'),
+    [signals.htmlCssBrowserRuntimeProof]: route('prove-html-css-browser-runtime', 'browser-proof', 'attach-browser-runtime-proof-bundle')
+  };
+}
+
+function htmlCssProjectMergeAdmissionMatrixRows(matrixRow, signals) {
+  return [
+    matrixRow('html-structural-merge-admission', 'partial', ['html-structural-merge'], [signals.htmlStructuralMerge]),
+    matrixRow('css-cascade-merge-admission', 'partial', ['css-cascade-merge'], [signals.cssCascadeMerge]),
+    matrixRow('html-css-browser-runtime-proof', 'bounded-evidence', ['browser-runtime-proof'], [signals.htmlCssBrowserRuntimeProof])
+  ];
+}
+
+function htmlCssProjectMergeMissingEvidenceItems(summary, signals, missingEvidenceItem) {
+  const items = [];
+  if (summary.htmlBlockedFiles) items.push(missingEvidenceItem({ code: signals.htmlStructuralMerge, scope: 'layout-markup-graph', kind: 'html-structural-merge-proof', proofLevel: 'html-structural-merge', action: 'review', summary: `HTML project merge has ${summary.htmlBlockedFiles} blocked file(s); supply parser/source-span evidence, stable element identity, and runtime-boundary proof before admission.` }));
+  if (summary.cssBlockedFiles) items.push(missingEvidenceItem({ code: signals.cssCascadeMerge, scope: 'layout-style-graph', kind: 'css-cascade-merge-proof', proofLevel: 'css-cascade-merge', action: 'review', summary: `CSS project merge has ${summary.cssBlockedFiles} blocked file(s); supply parser/cascade/scope evidence and keep browser claims false until runtime proof passes.` }));
+  if (summary.htmlCssMergedFiles && !summary.htmlCssBrowserRuntimeProofs) items.push(missingEvidenceItem({ code: signals.htmlCssBrowserRuntimeProof, scope: 'browser-proof', kind: 'browser-runtime-proof', proofLevel: 'browser-runtime-proof', action: 'review', summary: 'HTML/CSS structural source merge was available, but browser DOM/cascade/layout/runtime proof was not attached; keep browser equivalence claims false.', suggestedInput: { browserRuntimeProof: true } }));
+  return items;
+}
+
+function htmlCssProjectMergeMatrixProofStatus(level, summary) {
+  if (level === 'html-structural-merge') return summary.htmlFiles ? (summary.htmlBlockedFiles ? 'failed' : summary.htmlMergedFiles ? 'passed' : 'missing') : 'absent';
+  if (level === 'css-cascade-merge') return summary.cssFiles ? (summary.cssBlockedFiles ? 'failed' : summary.cssMergedFiles ? 'passed' : 'missing') : 'absent';
+  if (level === 'browser-runtime-proof') return summary.htmlCssFiles ? (summary.htmlCssBrowserRuntimeProofs ? 'passed' : 'missing') : 'absent';
+  return undefined;
+}
+
+export { HtmlCssProjectMergeMissingSignals, htmlCssProjectMergeAdmissionMatrixRows, htmlCssProjectMergeMatrixProofStatus, htmlCssProjectMergeMissingEvidenceItems, htmlCssProjectMergeMissingEvidenceRoutes };

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

@@ -0,0 +1,21 @@
+function htmlCssProjectSummary(files) {
+  const htmlFiles = files.filter(isHtmlProjectFile), cssFiles = files.filter(isCssProjectFile), htmlCssFiles = [...htmlFiles, ...cssFiles];
+  return {
+    htmlFiles: htmlFiles.length, cssFiles: cssFiles.length, htmlCssFiles: htmlCssFiles.length,
+    htmlMergedFiles: htmlFiles.filter(isMerged).length, cssMergedFiles: cssFiles.filter(isMerged).length, htmlCssMergedFiles: htmlCssFiles.filter(isMerged).length,
+    htmlBlockedFiles: htmlFiles.filter(isBlocked).length, cssBlockedFiles: cssFiles.filter(isBlocked).length, htmlCssBlockedFiles: htmlCssFiles.filter(isBlocked).length,
+    htmlCssBrowserRuntimeProofs: htmlCssFiles.filter(hasBrowserRuntimeProof).length
+  };
+}
+
+function isHtmlProjectFile(file) { return String(file?.language ?? '').toLowerCase() === 'html' || /\.html?$/i.test(stripQuery(file?.sourcePath)); }
+function isCssProjectFile(file) { return String(file?.language ?? '').toLowerCase() === 'css' || stripQuery(file?.sourcePath).toLowerCase().endsWith('.css'); }
+function isMerged(file) { return file.status === 'merged'; }
+function isBlocked(file) { return file.status === 'blocked'; }
+function stripQuery(sourcePath) { return String(sourcePath ?? '').replace(/[?#].*$/, ''); }
+function hasBrowserRuntimeProof(file) {
+  const admission = file?.result?.admission ?? file?.admission ?? {};
+  return admission.browserRuntimeEquivalenceClaim === true || admission.browserCascadeEquivalenceClaim === true || admission.browserRenderEquivalenceClaim === true;
+}
+
+export { htmlCssProjectSummary };

package/dist/js-ts-safe-project-merge-html-css.js

@@ -0,0 +1,50 @@
+import { safeMergeCssSource } from '@shapeshift-labs/frontier-lang-css';
+import { safeMergeHtmlSource } from '@shapeshift-labs/frontier-lang-html';
+import { compactRecord } from './js-ts-safe-merge-context.js';
+import { hashText, safeId } from './js-ts-safe-project-merge-core.js';
+
+function projectFileLanguage(file, input) {
+  return file.language ?? inferLanguageFromPath(file.sourcePath) ?? input.language ?? 'typescript';
+}
+
+function maybeMergeHtmlCssProjectFile(options) {
+  const { file, input, projectId, context, base, worker, head, sourceInput } = options;
+  const language = String(context.language ?? '').toLowerCase();
+  const merge = language === 'html' ? safeMergeHtmlSource : language === 'css' ? safeMergeCssSource : undefined;
+  if (!merge) return undefined;
+  const result = merge({ ...sourceInput, ...htmlCssMergeOptionsForProjectFile(input, file.sourcePath, language), ...context, id: `${projectId}_${safeId(file.sourcePath)}`, baseSourceText: base, workerSourceText: worker, headSourceText: head });
+  return result.status === 'merged' ? mergedHtmlCssFile(file, context, result, language) : blockedHtmlCssFile(file, context, result);
+}
+
+function inferLanguageFromPath(sourcePath) {
+  const path = String(sourcePath ?? '').toLowerCase().replace(/[?#].*$/, '');
+  if (path.endsWith('.html') || path.endsWith('.htm')) return 'html';
+  if (path.endsWith('.css')) return 'css';
+  if (path.endsWith('.tsx')) return 'tsx';
+  if (path.endsWith('.jsx')) return 'jsx';
+  if (path.endsWith('.ts') || path.endsWith('.mts') || path.endsWith('.cts')) return 'typescript';
+  if (path.endsWith('.js') || path.endsWith('.mjs') || path.endsWith('.cjs')) return 'javascript';
+  return undefined;
+}
+
+function htmlCssMergeOptionsForProjectFile(input, sourcePath, language) {
+  const byPath = language === 'html' ? input.htmlMergeOptionsByPath ?? input.markupMergeOptionsByPath : input.cssMergeOptionsByPath ?? input.styleMergeOptionsByPath;
+  return compactRecord({ ...(language === 'css' ? input.cssMergeOptions ?? input.styleMergeOptions : input.htmlMergeOptions ?? input.markupMergeOptions), ...(byPath?.[sourcePath] ?? {}) });
+}
+
+function mergedHtmlCssFile(file, context, result, language) {
+  return compactRecord({
+    kind: 'frontier.lang.jsTsProjectSafeMergeFile', version: 1, sourcePath: file.sourcePath, language: context.language, status: 'merged', operation: `merged-${language}-source`,
+    outputSourceText: result.mergedSourceText, outputHash: hashText(result.mergedSourceText), baseHash: hashText(file.baseSourceText), workerHash: hashText(file.workerSourceText), headHash: hashText(file.headSourceText),
+    result, semanticArtifacts: result.semanticArtifacts, conflicts: [], admission: result.admission, summary: result.summary, conflictKeys: [`source#${file.sourcePath}`]
+  });
+}
+
+function blockedHtmlCssFile(file, context, result) {
+  return compactRecord({
+    kind: 'frontier.lang.jsTsProjectSafeMergeFile', version: 1, sourcePath: file.sourcePath, language: context.language, status: 'blocked', operation: 'blocked-merge',
+    result, conflicts: result.conflicts ?? [], admission: result.admission, summary: result.summary, conflictKeys: [`source#${file.sourcePath}`]
+  });
+}
+
+export { maybeMergeHtmlCssProjectFile, projectFileLanguage };

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

@@ -1,3 +1,4 @@
+import { HtmlCssProjectMergeMissingSignals, htmlCssProjectMergeAdmissionMatrixRows, htmlCssProjectMergeMatrixProofStatus, htmlCssProjectMergeMissingEvidenceItems, htmlCssProjectMergeMissingEvidenceRoutes } from './js-ts-safe-project-merge-html-css-matrix.js';
 const ProjectMergeMissingSignals = Object.freeze({
   outputDiagnosticsGate: 'output-diagnostics-gate-not-run',
   declarationGate: 'declaration-gate-not-run',
@@ -10,6 +11,7 @@ const ProjectMergeMissingSignals = Object.freeze({
   semanticEditReplayProof: 'semantic-edit-replay-proof-not-produced',
   semanticEditReplayOutputMismatch: 'semantic-edit-replay-proof-output-mismatch',
   unsupportedJsTsSurface: 'unsupported-js-ts-surface-proof-not-available',
+  ...HtmlCssProjectMergeMissingSignals,
   cssModuleUseSiteGraph: 'css-module-use-site-graph-proof-blocked',
   semanticEquivalenceProof: 'semantic-equivalence-proof-not-available'
 });
@@ -26,6 +28,7 @@ const ProjectMergeMissingEvidenceRoutes = Object.freeze({
   [ProjectMergeMissingSignals.semanticEditReplayProof]: route('produce-semantic-edit-replay-proof', 'source-files', 'run-semantic-edit-replay-diagnostics'),
   [ProjectMergeMissingSignals.semanticEditReplayOutputMismatch]: route('reject-semantic-edit-replay-output-mismatch', 'source-files', 'inspect-semantic-edit-replay-output-binding'),
   [ProjectMergeMissingSignals.unsupportedJsTsSurface]: route('prove-unsupported-js-ts-surface', 'semantic-proof', 'supply-unsupported-surface-evidence'),
+  ...htmlCssProjectMergeMissingEvidenceRoutes(route, ProjectMergeMissingSignals),
   [ProjectMergeMissingSignals.cssModuleUseSiteGraph]: route('prove-css-module-use-site-graph', 'layout-style-graph', 'supply-css-module-transform-and-use-site-proof'),
   [ProjectMergeMissingSignals.semanticEquivalenceProof]: route('external-semantic-equivalence-proof', 'semantic-proof', 'attach-external-equivalence-proof')
 });
@@ -39,6 +42,7 @@ const ProjectMergeAdmissionMatrixRows = Object.freeze([
   matrixRow('control-flow-effect-graph', 'partial', ['source-span-roundtrip', 'focused-test-passed'], [ProjectMergeMissingSignals.sourceSpanRoundtrip, ProjectMergeMissingSignals.semanticArtifacts, ProjectMergeMissingSignals.qualityGates, ProjectMergeMissingSignals.focusedTestGate]),
   matrixRow('generic-semantic-edit-admission', 'partial', ['source-span-roundtrip', 'semantic-edit-replay-clean'], [ProjectMergeMissingSignals.sourceSpanRoundtrip, ProjectMergeMissingSignals.semanticArtifacts, ProjectMergeMissingSignals.semanticEditReplayProof, ProjectMergeMissingSignals.semanticEditReplayOutputMismatch]),
   matrixRow('unsupported-js-ts-surface-coverage', 'partial', ['unsupported-js-ts-surface-review'], [ProjectMergeMissingSignals.unsupportedJsTsSurface]),
+  ...htmlCssProjectMergeAdmissionMatrixRows(matrixRow, ProjectMergeMissingSignals),
   matrixRow('css-modules-use-site-graph', 'partial', ['css-module-use-site-graph', 'css-module-transform-proof', 'project-graph-evidence'], [ProjectMergeMissingSignals.cssModuleUseSiteGraph]),
   matrixRow('semantic-equivalence-proof', 'bounded-evidence', ['semantic-equivalence-external', 'semantic-equivalence-unknown'], [ProjectMergeMissingSignals.semanticEquivalenceProof]),
   matrixRow('cross-file-symbol-rename', 'partial', ['diagnostics-clean', 'declaration-output-stable', 'project-graph-delta'], [ProjectMergeMissingSignals.outputDiagnosticsGate, ProjectMergeMissingSignals.declarationGate, ProjectMergeMissingSignals.projectGraphEvidence, ProjectMergeMissingSignals.projectGraphDeltaEvidence]),
@@ -135,6 +139,7 @@ function missingEvidenceItems(summary, context = {}) {
     summary: `CSS Module use-site graph has ${summary.projectGraphCssModuleUseSiteConflicts} blocker(s); supply generated class maps, bundler transform identity, source-map proof, and narrow use-site evidence before admission.`,
     suggestedInput: { includeOutputProjectSymbolGraph: true, cssModuleEvidence: true }
   }));
+  items.push(...htmlCssProjectMergeMissingEvidenceItems(summary, ProjectMergeMissingSignals, missingEvidenceItem));
   return items;
 }
 
@@ -247,6 +252,8 @@ function matrixProofStatuses(proofLevels, summary, proofEvidence) {
 function matrixProofStatus(level, summary, proofEvidence) {
   const levelStatuses = proofEvidence?.summary?.levelStatuses ?? summary.proofEvidenceLevelStatuses ?? {};
   if (levelStatuses[level]) return levelStatuses[level];
+  const htmlCssStatus = htmlCssProjectMergeMatrixProofStatus(level, summary);
+  if (htmlCssStatus) return htmlCssStatus;
   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';
@@ -309,12 +316,4 @@ function compactRecord(record) {
   return Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined));
 }
 
-export {
-  compactMissingEvidenceTelemetry,
-  confidenceRecommendedAction,
-  createProjectMergeAdmissionMatrixAudit,
-  missingEvidenceItems,
-  missingEvidenceRouteForSignal,
-  missingEvidenceSignals,
-  prioritizedMissingEvidence
-};
+export { compactMissingEvidenceTelemetry, confidenceRecommendedAction, createProjectMergeAdmissionMatrixAudit, missingEvidenceItems, missingEvidenceRouteForSignal, missingEvidenceSignals, prioritizedMissingEvidence };

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

@@ -1,5 +1,6 @@
 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';
 
 function projectSummary(files, graphConflicts = [], hasProjectGraphDelta = false, outputDiagnosticsGate = undefined, outputDeclarationGate = undefined, outputQualityGate = undefined, moveRenameSummary = undefined, proofEvidence = undefined, symbolRenameSummary = undefined, splitMergeSummary = undefined, projectSymbolGraph = undefined) {
   const byOperation = {};
@@ -13,6 +14,7 @@ function projectSummary(files, graphConflicts = [], hasProjectGraphDelta = false
     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,
+    ...htmlCssProjectSummary(files),
     projectGraphConflicts: graphConflicts.length,
     projectGraphDeltaEvidenceIncluded: hasProjectGraphDelta ? 1 : 0, projectGraphEvidenceIncluded: projectSymbolGraph || hasProjectGraphDelta ? 1 : 0,
     outputProjectGraphConflicts: outputConflicts.length, projectGraphCssModuleUseSiteConflicts: cssModuleConflicts.length,
@@ -285,9 +287,7 @@ function confidenceScore(status, summary, evidence, context) {
 
 function confidenceLevel(score, status) {
   if (status !== 'merged' || score < 35) return 'blocked';
-  if (score >= 90) return 'high';
-  if (score >= 70) return 'medium';
-  return 'low';
+  return score >= 90 ? 'high' : score >= 70 ? 'medium' : 'low';
 }
 
 function compactConfidenceDimensions(status, summary, context, routingCalibration = {}) {

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

@@ -19,6 +19,7 @@ import { applyProjectMoveRenameClassifications, classifyProjectMoveRenames } fro
 import { applyProjectSymbolRenameClassifications, classifyProjectSymbolRenames } from './js-ts-safe-project-merge-symbol-rename.js';
 import { applyProjectSplitMergeClassifications, classifyProjectSplitMerges } from './js-ts-safe-project-merge-split-merge.js';
 import { projectConfidence, projectEvidence, projectSummary, projectSummaryWithConfidenceEvidence } from './js-ts-safe-project-merge-summary.js';
+import { maybeMergeHtmlCssProjectFile, projectFileLanguage } from './js-ts-safe-project-merge-html-css.js';
 
 function safeMergeJsTsProject(input = {}) {
   const id = String(input.id ?? 'js_ts_project_safe_merge');
@@ -215,7 +216,7 @@ function mergeProjectFile(file, input, projectId, projectSymbolRenames) {
   const base = file.baseSourceText;
   const worker = file.workerDeleted ? undefined : file.workerSourceText ?? base;
   const head = file.headDeleted ? undefined : file.headSourceText ?? base;
-  const context = { sourcePath: file.sourcePath, language: file.language ?? input.language ?? 'typescript' };
+  const context = { sourcePath: file.sourcePath, language: projectFileLanguage(file, input) };
   if (!file.sourcePath) return blockedFile(file, context, 'missing-source-path');
   const ambientBlock = maybeBlockAmbientProjectFile(file, context, input);
   if (ambientBlock) return ambientBlock;
@@ -242,6 +243,8 @@ function mergeProjectFile(file, input, projectId, projectSymbolRenames) {
       ? syntheticFile(file, context, undefined, 'head-deleted-worker-unchanged')
       : blockedFile(file, context, 'head-file-delete-conflict');
   }
+  const nonJsTsMerge = maybeMergeHtmlCssProjectFile({ file, input, projectId, context, base, worker, head, sourceInput: sourceMergeInputForProjectFile(input) });
+  if (nonJsTsMerge) return nonJsTsMerge;
   const result = safeMergeJsTsSource({
     ...sourceMergeInputForProjectFile(input),
     ...context,
@@ -286,17 +289,7 @@ function allowsProjectSymbolRenameForFile(input, projectSymbolRenames, sourcePat
 }
 
 function sourceMergeInputForProjectFile(input) {
-  const {
-    outputDiagnostics,
-    outputSyntaxDiagnostics,
-    mergedOutputSyntaxDiagnostics,
-    syntaxDiagnostics,
-    requireOutputSyntaxDiagnostics,
-    requireOutputSyntaxGate,
-    requireMergedOutputSyntaxDiagnostics,
-    requireSyntaxGate,
-    ...sourceInput
-  } = input;
+  const { outputDiagnostics, outputSyntaxDiagnostics, mergedOutputSyntaxDiagnostics, syntaxDiagnostics, requireOutputSyntaxDiagnostics, requireOutputSyntaxGate, requireMergedOutputSyntaxDiagnostics, requireSyntaxGate, ...sourceInput } = input;
   return sourceInput;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-compiler",
-  "version": "0.2.156",
+  "version": "0.2.158",
   "description": "Compiler facade for Frontier Lang source documents and language projection adapters.",
   "type": "module",
   "main": "./dist/index.js",
@@ -63,7 +63,8 @@
   "dependencies": {
     "@shapeshift-labs/frontier-lang-c": "0.2.9",
     "@shapeshift-labs/frontier-lang-checker": "0.3.8",
-    "@shapeshift-labs/frontier-lang-css": "^0.1.5",
+    "@shapeshift-labs/frontier-lang-css": "^0.1.6",
+    "@shapeshift-labs/frontier-lang-html": "^0.1.4",
     "@shapeshift-labs/frontier-lang-javascript": "0.2.9",
     "@shapeshift-labs/frontier-lang-kernel": "0.3.12",
     "@shapeshift-labs/frontier-lang-parser": "0.3.8",