@shapeshift-labs/frontier-lang-compiler 0.2.103 → 0.2.104

package/dist/internal/index-impl/createBidirectionalTargetChangeRecord.js

@@ -10,6 +10,8 @@ import { diffNativeSourceImports } from './diffNativeSourceImports.js';
 import { normalizeNativeDiffImport } from './normalizeNativeDiffImport.js';
 import { attachBidirectionalMatchPortability, classifyBidirectionalTargetPortability } from './bidirectionalTargetPortability.js';
 import { createRoundtripEvidence, createSemanticMergeAdmissionEvidence, summarizeSourceMapBackprojection } from './bidirectionalTargetRoundtripEvidence.js';
+import { createBidirectionalSourceEditProjection } from './bidirectionalSourceEditProjection.js';
+import { createSameLanguageTargetSourceProjection } from './bidirectionalSameLanguageSourceProjection.js';
 import {
   anchorsFromSourceSidecar,
   classifyBidirectionalReadiness,
@@ -86,6 +88,20 @@ export function createBidirectionalTargetChangeRecord(input = {}, options = {})
     ...array(targetPortability.reasonCodes),
     ...sourceAnchorMatches.flatMap((match) => match.reasonCodes)
   ]);
+  const sourceMapEditProjection = createBidirectionalSourceEditProjection({
+    id,
+    source,
+    targetChangeSet,
+    sourceAnchorMatches,
+    targetPortability,
+    reasons
+  });
+  const sourceEditProjection = sourceMapEditProjection.sourceEditScript ? sourceMapEditProjection : createSameLanguageTargetSourceProjection({
+    id,
+    source,
+    targetChangeSet,
+    generatedAt: input.generatedAt
+  });
   const evidenceId = input.evidenceId ?? `evidence_${idFragment(id)}_bidirectional_target_change`;
   const sourcePatchBundleId = input.sourcePatchBundleId ?? `semantic_patch_bundle_${idFragment(id)}_source_port`;
   const historyRecordId = input.historyRecordId ?? `semantic_history_${idFragment(id)}_target_change`;
@@ -101,7 +117,8 @@ export function createBidirectionalTargetChangeRecord(input = {}, options = {})
     targetPortability,
     readiness,
     reasons,
-    sourceMapBackprojection
+    sourceMapBackprojection,
+    sourceEditProjection
   });
   const semanticMergeAdmission = createSemanticMergeAdmissionEvidence({
     id,
@@ -113,7 +130,8 @@ export function createBidirectionalTargetChangeRecord(input = {}, options = {})
     targetPortability,
     readiness,
     reasons,
-    roundtripEvidence
+    roundtripEvidence,
+    sourceEditProjection
   });
   const bidirectionalEvidence = createBidirectionalEvidence({
     id,
@@ -131,9 +149,20 @@ export function createBidirectionalTargetChangeRecord(input = {}, options = {})
       ...bidirectionalEvidence.metadata,
       roundtripEvidenceId: roundtripEvidence.id,
       roundtripEvidence,
-      semanticMergeAdmission
+      semanticMergeAdmission,
+      sourceEditProjectionId: sourceEditProjection.sourceEditProjection?.id,
+      sourceEditReplayId: sourceEditProjection.sourceEditReplay?.id,
+      sourceEditScriptId: sourceEditProjection.sourceEditScript?.id,
+      sourceProjectionHintId: sourceEditProjection.sourceProjectionHint?.id,
+      sourceProjectionHint: sourceEditProjection.sourceProjectionHint
     }
-  }];
+  }, ...(sourceEditProjection.evidence ?? [])];
+  const sourceReplayStatus = sourceEditProjection.sourceEditReplay?.status;
+  const sourcePatchAdmission = sourceReplayStatus === 'accepted-clean'
+    ? { readiness: 'ready', reasonCodes: ['bidirectional-source-edit-replay-accepted-clean'] }
+    : sourceReplayStatus === 'already-applied'
+      ? { status: 'admitted', readiness: 'ready', reasonCodes: ['bidirectional-source-edit-replay-already-applied'] }
+      : { status: readiness === 'blocked' ? 'blocked' : 'needs-review', readiness };
   const sourceChangedRegions = sourceAnchorMatches.flatMap((match) => sourceRegionsForMatch(match, readiness));
   const sourcePatchBundle = createSemanticPatchBundleRecord({
     id: `${id}_source_port_projection`,
@@ -159,7 +188,10 @@ export function createBidirectionalTargetChangeRecord(input = {}, options = {})
     id: sourcePatchBundleId,
     patchId: targetChangeSet.patch?.id,
     mergeCandidateId: targetChangeSet.mergeCandidate?.id,
-    admission: { status: readiness === 'blocked' ? 'blocked' : 'needs-review', readiness },
+    semanticEditScripts: [sourceEditProjection.sourceEditScript].filter(Boolean),
+    semanticEditProjections: [sourceEditProjection.sourceEditProjection].filter(Boolean),
+    semanticEditReplays: [sourceEditProjection.sourceEditReplay].filter(Boolean),
+    admission: sourcePatchAdmission,
     metadata: {
       source: 'createBidirectionalTargetChangeRecord',
       targetChangeSetId: targetChangeSet.id,
@@ -169,6 +201,11 @@ export function createBidirectionalTargetChangeRecord(input = {}, options = {})
       sourceMapBackprojection,
       roundtripEvidenceId: roundtripEvidence.id,
       semanticMergeAdmission,
+      sourceEditScriptId: sourceEditProjection.sourceEditScript?.id,
+      sourceEditProjectionId: sourceEditProjection.sourceEditProjection?.id,
+      sourceEditReplayId: sourceEditProjection.sourceEditReplay?.id,
+      sourceProjectionHintId: sourceEditProjection.sourceProjectionHint?.id,
+      sourceProjectionHint: sourceEditProjection.sourceProjectionHint,
       autoMergeClaim: false,
       semanticEquivalenceClaim: false
     }
@@ -191,7 +228,7 @@ export function createBidirectionalTargetChangeRecord(input = {}, options = {})
       conflictKeys: targetChangeSet.mergeCandidate?.conflictKeys,
       metadata: { direction: 'target-to-source' }
     }] : [],
-    admission: { status: readiness === 'blocked' ? 'blocked' : 'needs-review', readiness, reasonCodes: reasons },
+    admission: { status: semanticMergeAdmission.status, readiness: semanticMergeAdmission.readiness, reasonCodes: semanticMergeAdmission.reasonCodes },
     replayLinks: targetChangeSet.patch ? [{
       id: `replay_${idFragment(targetChangeSet.patch.id)}`,
       kind: 'patch',
@@ -205,6 +242,11 @@ export function createBidirectionalTargetChangeRecord(input = {}, options = {})
       sourceMapBackprojection,
       roundtripEvidenceId: roundtripEvidence.id,
       semanticMergeAdmission,
+      sourceEditProjectionId: sourceEditProjection.sourceEditProjection?.id,
+      sourceEditReplayId: sourceEditProjection.sourceEditReplay?.id,
+      sourceEditScriptId: sourceEditProjection.sourceEditScript?.id,
+      sourceProjectionHintId: sourceEditProjection.sourceProjectionHint?.id,
+      sourceProjectionHint: sourceEditProjection.sourceProjectionHint,
       autoMergeClaim: false,
       semanticEquivalenceClaim: false
     }
@@ -222,6 +264,10 @@ export function createBidirectionalTargetChangeRecord(input = {}, options = {})
     sourceAnchorMatches,
     targetPortability,
     roundtripEvidence,
+    sourceEditScript: sourceEditProjection.sourceEditScript,
+    sourceEditProjection: sourceEditProjection.sourceEditProjection,
+    sourceEditReplay: sourceEditProjection.sourceEditReplay,
+    sourceProjectionHint: sourceEditProjection.sourceProjectionHint,
     sourcePatchBundle,
     historyRecord,
     evidence,
@@ -237,6 +283,8 @@ export function createBidirectionalTargetChangeRecord(input = {}, options = {})
       sourceMapBackedMatches: sourceAnchorMatches.filter((match) => match.sourceMapLinks.length > 0).length,
       sourceMapLinks: sourceMapBackprojection.sourceMapLinks,
       sourceMapMappingIds: sourceMapBackprojection.sourceMapMappingIds.length,
+      sourceEditScripts: sourceEditProjection.sourceEditScript ? 1 : 0,
+      sourceProjectionHints: sourceEditProjection.sourceProjectionHint ? 1 : 0,
       lineageResolutions: roundtripEvidence.lineageEvidence.lineageResolutionIds.length,
       targetPortabilityStatus: targetPortability.status,
       portableTargetRegions: targetPortability.status === 'portable' ? targetPortability.targetChangedRegions : 0,
@@ -246,10 +294,15 @@ export function createBidirectionalTargetChangeRecord(input = {}, options = {})
     metadata: {
       autoMergeClaim: false,
       semanticEquivalenceClaim: false,
-      reviewRequired: true,
+      reviewRequired: sourcePatchBundle.admission.reviewRequired,
       targetPortability,
       roundtripEvidenceId: roundtripEvidence.id,
       semanticMergeAdmission,
+      sourceEditScriptId: sourceEditProjection.sourceEditScript?.id,
+      sourceEditProjectionId: sourceEditProjection.sourceEditProjection?.id,
+      sourceEditReplayId: sourceEditProjection.sourceEditReplay?.id,
+      sourceProjectionHintId: sourceEditProjection.sourceProjectionHint?.id,
+      sourceProjectionHint: sourceEditProjection.sourceProjectionHint,
       ...input.metadata
     }
   };

package/dist/internal/index-impl/createLightweightNativeImport.js

@@ -53,6 +53,7 @@ export function createLightweightNativeImport(input) {
         signatureHash: hashSemanticValue([input.language, declaration.kind, declaration.name, declaration.fields ?? {}]),
         definitionSpan: declaration.span,
         metadata: {
+          ...declaration.metadata,
           ownershipRegionId: ownershipRegion.id,
           ownershipRegionKey: ownershipRegion.key,
           ownershipRegionKind: ownershipRegion.regionKind

package/dist/internal/index-impl/createNativeSourcePreservation.js

@@ -1,4 +1,13 @@
-import{countBy,idFragment,uniqueStrings}from'../../native-import-utils.js';import{detectNewlineStyle,scanPreservedSourceDirectives,scanPreservedSourceTokens}from'../../native-region-scanner.js';import{hashSemanticValue}from'@shapeshift-labs/frontier-lang-kernel';
+import { hashSemanticValue } from '@shapeshift-labs/frontier-lang-kernel';
+import { countBy, idFragment, uniqueStrings } from '../../native-import-utils.js';
+import {
+  detectNewlineStyle,
+  isJavaScriptTypeScriptSource,
+  scanJavaScriptTypeScriptSourceLedger,
+  scanPreservedSourceDirectives,
+  scanPreservedSourceTokens
+} from '../../native-region-scanner.js';
+
 export function createNativeSourcePreservation(options) {
   if (!options || typeof options.sourceText !== 'string') {
     throw new Error('createNativeSourcePreservation requires sourceText');
@@ -26,6 +35,14 @@ export function createNativeSourcePreservation(options) {
       maxDirectives: options.maxDirectives
     });
   const directives = directiveScan.directives;
+  const ledger = options.includeSourceLedger === false || !isJavaScriptTypeScriptSource(language, options.sourcePath)
+    ? undefined
+    : scanJavaScriptTypeScriptSourceLedger(sourceText, {
+      language,
+      sourcePath: options.sourcePath,
+      sourceHash,
+      maxLedgerSpans: options.maxLedgerSpans
+    });
   const triviaByKind = countBy(tokensAndTrivia.trivia.map((entry) => entry.kind ?? 'unknown'));
   const directivesByKind = countBy(directives.map((entry) => entry.kind ?? 'directive'));
   const directiveKinds = uniqueStrings(directives.map((entry) => entry.kind ?? 'directive'));
@@ -52,23 +69,32 @@ export function createNativeSourcePreservation(options) {
     tokens: tokensAndTrivia.tokens,
     trivia: tokensAndTrivia.trivia,
     directives,
+    ...(ledger ? { ledger } : {}),
     summary: {
       tokens: tokensAndTrivia.tokens.length,
       trivia: tokensAndTrivia.trivia.length,
       directives: directives.length,
       comments: tokensAndTrivia.trivia.filter((entry) => entry.kind === 'comment').length,
       whitespace: tokensAndTrivia.trivia.filter((entry) => entry.kind === 'whitespace' || entry.kind === 'newline').length,
+      ...(ledger ? {
+        ledger: ledger.summary,
+        sourceMapComments: ledger.summary.sourceMapComments,
+        protectedRegions: ledger.summary.protectedRegions,
+        importExportSpans: ledger.summary.importExportSpans,
+        braces: ledger.summary.braces
+      } : {}),
       triviaByKind,
       directivesByKind,
       directiveKinds,
       commentSpanIds,
       directiveSpanIds,
       exactSourceAvailable: options.includeSourceText !== false,
-      truncated: tokensAndTrivia.truncated || directiveScan.truncated
+      truncated: tokensAndTrivia.truncated || directiveScan.truncated || Boolean(ledger?.summary?.truncated)
     },
     metadata: {
       preservation: 'source-text-token-trivia-directive-evidence',
       tokenization: 'frontier-lightweight-lexical-scan',
+      ...(ledger ? { sourceLedger: 'frontier-lightweight-js-ts-source-ledger' } : {}),
       ...(declaredSourceHash ? {
         declaredSourceHash,
         sourceHashVerified: declaredSourceHash === computedSourceHash

package/dist/internal/index-impl/diffNativeSymbols.js

@@ -59,7 +59,7 @@ function nativeDiffSymbolHasOwnChange(symbol) {
 
 function nativeDiffSymbolIsMorePreciseNestedChange(candidate, container) {
   if (candidate.changeKind === 'unchanged') return false;
-  if (nativeDiffSymbolIsContainer(candidate)) return false;
+  if (nativeDiffSymbolIsContainer(candidate) && !nativeDiffSymbolIsMember(candidate)) return false;
   if ((candidate.ownershipKey ?? '') === (container.ownershipKey ?? '')) return false;
   if (!nativeDiffAnySpanContains(container, candidate)) return false;
   return nativeDiffNestedSymbolName(candidate, container) || nativeDiffSymbolIsMember(candidate);
@@ -118,5 +118,5 @@ function nativeDiffKind(value) {
   return String(value ?? '').toLowerCase();
 }
 
-const nativeDiffContainerKinds = new Set(['type', 'class', 'interface', 'trait', 'protocol', 'struct', 'enum', 'record']);
-const nativeDiffMemberKinds = new Set(['body', 'method', 'function', 'property', 'declaration']);
+const nativeDiffContainerKinds = new Set(['type', 'class', 'interface', 'trait', 'protocol', 'struct', 'enum', 'record', 'body', 'function', 'method', 'export']);
+const nativeDiffMemberKinds = new Set(['body', 'method', 'function', 'property', 'declaration', 'call', 'effect', 'controlflow', 'mutation']);

package/dist/internal/index-impl/nativeChangeProjectionSourceMapLinks.js

@@ -23,6 +23,8 @@ export function nativeChangeProjectionSourceMapLinks(imported, side, region, sym
         precision: mapping.precision,
         sourceSpan: mapping.sourceSpan,
         generatedSpan: mapping.generatedSpan,
+        sourceReplacementText: mapping.sourceReplacementText,
+        sourceReplacementTextHash: mapping.sourceReplacementTextHash ?? mapping.sourceReplacementHash,
         ownershipRegionId: mapping.ownershipRegionId,
         ownershipRegionKey: mapping.ownershipRegionKey,
         ownershipRegionKind: mapping.ownershipRegionKind

package/dist/internal/index-impl/projectSemanticEditScriptToSource.js

@@ -4,7 +4,9 @@ import { createSemanticImportSidecar } from './createSemanticImportSidecar.js';
 import { mapDiffSymbols } from './mapDiffSymbols.js';
 import { normalizeNativeDiffImport } from './normalizeNativeDiffImport.js';
 import { alreadyAppliedImportEditForOperation } from './semanticEditImportProjection.js';
+import { explicitSourceReplacementEditForOperation } from './semanticEditExplicitSourceReplacement.js';
 import { projectionEditRecord } from './semanticEditProjectionRecord.js';
+import { findCurrentSymbol } from './semanticEditReplayAnchors.js';
 import {
   insertionOffset,
   insertionReplacement,
@@ -23,7 +25,7 @@ export function projectSemanticEditScriptToSource(input = {}) {
   if (typeof workerSourceText !== 'string') reasonCodes.push('missing-worker-source-text');
   if (typeof headSourceText !== 'string') reasonCodes.push('missing-head-source-text');
   const language = normalizeNativeLanguageId(script.language);
-  const headSymbols = typeof headSourceText === 'string' && isJavaScriptLike(language)
+  const headSymbols = typeof headSourceText === 'string' && language
     ? sourceSymbolIndex({
       sourceText: headSourceText,
       sourcePath: input.headSourcePath ?? script.sourcePath,
@@ -42,7 +44,7 @@ export function projectSemanticEditScriptToSource(input = {}) {
     const edit = sourceEditForOperation(operation, workerSourceText, headSourceText, index, {
       headSourcePath: input.headSourcePath,
       headSymbols,
-      symbolIndexAvailable: isJavaScriptLike(language)
+      symbolIndexAvailable: headSymbols.length > 0
     });
     if (edit.ok) edits.push(edit.value);
     else reasonCodes.push(...edit.reasonCodes);
@@ -95,14 +97,16 @@ function sourceEditForOperation(operation, workerSourceText, headSourceText, ord
     return { ok: true, value: { ...identity, operationId: operation.id, order, start: 0, end: 0, replacement: '', current: '', alreadyApplied: true } };
   }
   if (operation.status !== 'portable') return { ok: false, reasonCodes: [`operation-not-portable:${operation.id}`] };
+  const explicit = explicitSourceReplacementEditForOperation(operation, identity, headSourceText, order);
+  if (explicit) return explicit;
   if (operation.changeKind === 'added' || String(operation.kind ?? '').startsWith('add')) {
     return insertionEditForOperation(operation, identity, workerSourceText, headSourceText, order, context);
   }
   if (operation.changeKind === 'removed' || String(operation.kind ?? '').startsWith('remove')) {
-    return removalEditForOperation(operation, identity, headSourceText, order);
+    return removalEditForOperation(operation, identity, headSourceText, order, context);
   }
   const workerOffsets = spanOffsets(workerSourceText, operation.spans?.worker);
-  const headOffsets = spanOffsets(headSourceText, operation.spans?.head ?? operation.spans?.base ?? operation.anchor?.sourceSpan);
+  const headOffsets = headOffsetsForOperation(operation, identity, headSourceText, context);
   const reasons = [];
   if (!workerOffsets) reasons.push(`worker-span-not-resolvable:${operation.id}`);
   if (!headOffsets) reasons.push(`head-span-not-resolvable:${operation.id}`);
@@ -118,9 +122,12 @@ function sourceEditForOperation(operation, workerSourceText, headSourceText, ord
   }
   if (reasons.length) return { ok: false, reasonCodes: reasons };
   const scoped = scopedBodyReplacement(operation, headSourceText, workerSourceText, headOffsets, workerOffsets);
-  const replacement = scoped
+  const rawReplacement = scoped
     ? workerSourceText.slice(scoped.worker.start, scoped.worker.end)
     : anchorReplacement;
+  const replacement = operation.metadata?.sourceBackprojection?.lineEndingStable
+    ? normalizeReplacementLineEndings(rawReplacement, anchorCurrent)
+    : rawReplacement;
   const current = scoped
     ? headSourceText.slice(scoped.head.start, scoped.head.end)
     : anchorCurrent;
@@ -147,8 +154,8 @@ function sourceEditForOperation(operation, workerSourceText, headSourceText, ord
     }
   };
 }
-function removalEditForOperation(operation, identity, headSourceText, order) {
-  const headOffsets = spanOffsets(headSourceText, operation.spans?.head ?? operation.spans?.base ?? operation.anchor?.sourceSpan);
+function removalEditForOperation(operation, identity, headSourceText, order, context) {
+  const headOffsets = headOffsetsForOperation(operation, identity, headSourceText, context);
   const reasons = [];
   if (!headOffsets) reasons.push(`head-span-not-resolvable:${operation.id}`);
   if (reasons.length) return { ok: false, reasonCodes: reasons };
@@ -173,6 +180,35 @@ function removalEditForOperation(operation, identity, headSourceText, order) {
     }
   };
 }
+
+function headOffsetsForOperation(operation, identity, headSourceText, context) {
+  const span = operation.spans?.head ?? operation.spans?.base ?? operation.anchor?.sourceSpan;
+  const spanRange = spanOffsets(headSourceText, span);
+  const symbol = context.symbolIndexAvailable ? findCurrentSymbol(identity, context.headSymbols) : undefined;
+  const symbolRange = spanOffsets(headSourceText, symbol?.sourceSpan);
+  if (!symbolRange) return spanRange;
+  if (!spanRange || sameRange(spanRange, symbolRange)) return symbolRange;
+  const expectedHash = operation.hashes?.headTextHash ?? operation.hashes?.baseTextHash;
+  if (expectedHash && rangeHash(headSourceText, symbolRange) === expectedHash) return symbolRange;
+  if (expectedHash && rangeHash(headSourceText, spanRange) === expectedHash) return spanRange;
+  return spanRange;
+}
+
+function rangeHash(sourceText, range) {
+  return range && typeof sourceText === 'string'
+    ? hashSemanticValue(sourceText.slice(range.start, range.end))
+    : undefined;
+}
+
+function sameRange(left, right) {
+  return left?.start === right?.start && left?.end === right?.end;
+}
+
+function normalizeReplacementLineEndings(replacement, current) {
+  const newline = current.includes('\r\n') ? '\r\n' : current.includes('\r') ? '\r' : '\n';
+  return String(replacement ?? '').replace(/\r\n/g, '\n').replace(/\r/g, '\n').replace(/\n/g, newline);
+}
+
 function insertionEditForOperation(operation, identity, workerSourceText, headSourceText, order, context) {
   const workerOffsets = spanOffsets(workerSourceText, operation.spans?.worker);
   const reasons = [];
@@ -263,7 +299,6 @@ function projectedSourcePath(script, edits) {
   return edits.map((edit) => edit.sourcePath).find(Boolean) ?? script.sourcePath;
 }
 
-function isJavaScriptLike(language) { return language === 'javascript' || language === 'typescript'; }
 function compactRecord(value) {
   return Object.fromEntries(Object.entries(value ?? {}).filter(([, entry]) => entry !== undefined && (!Array.isArray(entry) || entry.length > 0)));
 }

package/dist/internal/index-impl/replaySemanticEditLineEndings.js

@@ -0,0 +1,34 @@
+function replayReplacementText(edit, status, range, sourceText) {
+  const replacement = edit.replacementText;
+  if (status !== 'applied'
+    || typeof replacement !== 'string'
+    || !/[\r\n]/.test(replacement)
+    || typeof sourceText !== 'string') return replacement;
+  return replacement.replace(/\r\n/g, '\n').replace(/\r/g, '\n').replace(/\n/g, replayLineEnding(sourceText, range));
+}
+
+function replayLineEnding(sourceText, range) {
+  const offset = Math.max(0, Math.min(sourceText.length, range?.start ?? 0));
+  return lineEndingInText(range ? sourceText.slice(range.start, range.end) : '')
+    ?? nearbyLineEnding(sourceText, offset)
+    ?? lineEndingInText(sourceText)
+    ?? '\n';
+}
+
+function lineEndingInText(value) { return /\r\n|\r|\n/.exec(value)?.[0]; }
+
+function nearbyLineEnding(sourceText, offset) {
+  for (let distance = 0; distance <= sourceText.length; distance += 1) {
+    const ending = lineEndingAt(sourceText, offset - distance - 1) ?? lineEndingAt(sourceText, offset + distance);
+    if (ending) return ending;
+  }
+  return undefined;
+}
+
+function lineEndingAt(sourceText, index) {
+  const char = sourceText[index];
+  if (char === '\n') return sourceText[index - 1] === '\r' ? '\r\n' : '\n';
+  return char === '\r' ? sourceText[index + 1] === '\n' ? '\r\n' : '\r' : undefined;
+}
+
+export { replayReplacementText };

package/dist/internal/index-impl/replaySemanticEditProjection.js

@@ -3,7 +3,9 @@ import { idFragment, normalizeNativeLanguageId, uniqueStrings } from '../../nati
 import { createSemanticImportSidecar } from './createSemanticImportSidecar.js';
 import { mapDiffSymbols } from './mapDiffSymbols.js';
 import { normalizeNativeDiffImport } from './normalizeNativeDiffImport.js';
+import { replayReplacementText } from './replaySemanticEditLineEndings.js';
 import { replayDiagnostics, replayEditDiagnostics, replayEditsWithOverlapDiagnostics } from './semanticEditReplayDiagnostics.js';
+import { explicitSourceReplacementReplayRange } from './semanticEditReplaySourceReplacement.js';
 import {
   findCurrentSymbol,
   findInsertionAnchor,
@@ -22,14 +24,14 @@ export function replaySemanticEditProjection(input = {}) {
   const reasonCodes = baseReasonCodes(projection, currentSourceText);
   const currentHash = typeof currentSourceText === 'string' ? hashSemanticValue(currentSourceText) : undefined;
   if (input.currentSourceHash && currentHash !== input.currentSourceHash) reasonCodes.push('current-source-hash-mismatch');
-  const currentSymbols = currentSourceText && isJavaScriptLike(language)
+  const currentSymbols = currentSourceText && language
     ? currentSymbolIndex({ currentSourceText, sourcePath, language, parser: input.parser })
     : [];
   const replayedEdits = projection.status === 'projected' && typeof currentSourceText === 'string'
     ? (projection.edits ?? []).map((edit, index) => replayProjectionEdit(projectionEditWithOrder(edit, index), {
       currentSourceText,
       currentSymbols,
-      symbolIndexAvailable: isJavaScriptLike(language)
+      symbolIndexAvailable: currentSymbols.length > 0
     }))
     : [];
   const edits = replayEditsWithOverlapDiagnostics(replayedEdits);
@@ -80,20 +82,28 @@ function replayProjectionEdit(edit, context) {
   const headRange = { start: edit.headStart, end: edit.headEnd };
   const offset = checkRange(edit, headRange, context.currentSourceText, 'head-offset');
   const symbol = findCurrentSymbol(edit, context.currentSymbols);
-  const spanRange = currentSymbolEditRange(edit, spanOffsets(context.currentSourceText, symbol?.sourceSpan), context.currentSourceText);
+  const symbolRange = spanOffsets(context.currentSourceText, symbol?.sourceSpan);
+  const explicitRange = explicitSourceReplacementReplayRange(edit, symbolRange, context.currentSourceText);
+  const spanRange = explicitRange?.range ?? currentSymbolEditRange(edit, symbolRange, context.currentSourceText);
+  const reanchorReason = explicitRange?.reasonCode ?? 'offset-reanchored-by-symbol';
+  const explicitConflictReasons = explicitRange?.conflictReasonCodes ?? [];
   if (symbol && spanRange && !sameRange(headRange, spanRange)) {
     const moved = checkRange(edit, spanRange, context.currentSourceText, currentSymbolRangeLabel(edit));
-    if (moved) return replayEditRecord(edit, moved.status, replayAppliedRange(edit, moved.range, context.currentSourceText), [moved.reason, 'offset-reanchored-by-symbol'], context.currentSourceText);
+    if (moved) return replayEditRecord(edit, moved.status, replayAppliedRange(edit, moved.range, context.currentSourceText), [moved.reason, reanchorReason], context.currentSourceText);
+    if (offset && containedRange(headRange, spanRange)) {
+      return replayEditRecord(edit, offset.status, offset.range, [offset.reason, 'offset-contained-in-current-symbol'], context.currentSourceText);
+    }
     if (edit.editKind === 'delete' && offset && rangesOverlap(headRange, spanRange)) {
       return replayEditRecord(edit, offset.status, offset.range, [offset.reason], context.currentSourceText);
     }
-    return replayEditRecord(edit, 'conflict', spanRange, [`${currentSymbolRangeLabel(edit)}-content-mismatch`], context.currentSourceText);
+    return replayEditRecord(edit, 'conflict', spanRange, [`${currentSymbolRangeLabel(edit)}-content-mismatch`, ...explicitConflictReasons], context.currentSourceText);
   }
   if (offset) return replayEditRecord(edit, offset.status, offset.range, [offset.reason], context.currentSourceText);
   const anchored = checkRange(edit, spanRange, context.currentSourceText, currentSymbolRangeLabel(edit));
-  if (anchored) return replayEditRecord(edit, anchored.status, replayAppliedRange(edit, anchored.range, context.currentSourceText), [anchored.reason, 'offset-reanchored-by-symbol'], context.currentSourceText);
+  if (anchored) return replayEditRecord(edit, anchored.status, replayAppliedRange(edit, anchored.range, context.currentSourceText), [anchored.reason, reanchorReason], context.currentSourceText);
   return replayEditRecord(edit, symbol ? 'conflict' : 'stale', spanRange, [
-    symbol ? `${currentSymbolRangeLabel(edit)}-content-mismatch` : 'current-symbol-anchor-missing'
+    symbol ? `${currentSymbolRangeLabel(edit)}-content-mismatch` : 'current-symbol-anchor-missing',
+    ...explicitConflictReasons
   ], context.currentSourceText);
 }
 
@@ -148,6 +158,7 @@ function checkRange(edit, range, sourceText, label) {
 
 function replayEditRecord(edit, status, range, reasonCodes, sourceText) {
   const normalizedReasonCodes = reasonList(reasonCodes);
+  const replacementText = replayReplacementText(edit, status, range, sourceText);
   return compactRecord({
     operationId: edit.operationId,
     semanticKey: edit.semanticKey,
@@ -163,21 +174,25 @@ function replayEditRecord(edit, status, range, reasonCodes, sourceText) {
     status,
     start: range?.start,
     end: range?.end,
-    replacementBytes: edit.replacementBytes,
-    replacementText: edit.replacementText,
+    replacementBytes: typeof replacementText === 'string' ? replacementText.length : edit.replacementBytes,
+    replacementText,
     reasonCodes: normalizedReasonCodes,
     diagnostics: replayEditDiagnostics(edit, status, range, normalizedReasonCodes, sourceText)
   });
 }
 
 function currentSymbolIndex(input) {
-  const imported = normalizeNativeDiffImport({
-    language: input.language,
-    sourcePath: input.sourcePath,
-    sourceText: input.currentSourceText,
-    parser: input.parser
-  }, input, 'current');
-  return [...mapDiffSymbols(imported, createSemanticImportSidecar(imported)).values()];
+  try {
+    const imported = normalizeNativeDiffImport({
+      language: input.language,
+      sourcePath: input.sourcePath,
+      sourceText: input.currentSourceText,
+      parser: input.parser
+    }, input, 'current');
+    return [...mapDiffSymbols(imported, createSemanticImportSidecar(imported)).values()];
+  } catch {
+    return [];
+  }
 }
 
 function currentSymbolEditRange(edit, symbolRange, sourceText) {
@@ -187,6 +202,7 @@ function currentSymbolEditRange(edit, symbolRange, sourceText) {
 }
 
 function currentSymbolRangeLabel(edit) {
+  if (edit.sourceRangeKind === 'cross-language-explicit-source-replacement') return 'current-symbol-explicit-source-replacement';
   return edit.sourceRangeKind === 'body-content' ? 'current-symbol-body' : 'current-symbol-anchor';
 }
 
@@ -202,10 +218,11 @@ function replayStatus(reasonCodes, edits, projection) {
 
 function replayAdmission(status, reasonCodes, edits) {
   const apply = status === 'accepted-clean';
+  const skip = status === 'already-applied';
   return {
     status,
-    action: apply ? 'apply' : status === 'already-applied' ? 'skip' : status === 'stale' ? 'rerun-semantic-import' : status === 'blocked' ? 'block' : 'human-review',
-    reviewRequired: !apply,
+    action: apply ? 'apply' : skip ? 'skip' : status === 'stale' ? 'rerun-semantic-import' : status === 'blocked' ? 'block' : 'human-review',
+    reviewRequired: !(apply || skip),
     autoApplyCandidate: apply,
     autoMergeClaim: false,
     semanticEquivalenceClaim: false,
@@ -269,7 +286,10 @@ function rangesOverlap(left, right) {
   return Boolean(left && right && left.start < right.end && right.start < left.end);
 }
 
-function isJavaScriptLike(language) { return language === 'javascript' || language === 'typescript'; }
+function containedRange(inner, outer) {
+  return Boolean(inner && outer && outer.start <= inner.start && inner.end <= outer.end);
+}
+
 function reasonList(values) { return uniqueStrings((values ?? []).filter(Boolean)); }
 function lineEndingStableText(value) {
   if (typeof value !== 'string') return undefined;

package/dist/internal/index-impl/semanticEditBundleAdmission.js

@@ -1,4 +1,5 @@
 import { normalizeSemanticMergeReadiness, uniqueStrings } from '../../native-import-utils.js';
+import { summarizeSemanticSidecarQuality } from './semanticSidecarQuality.js';
 
 export const SemanticEditBundleAdmissionStatuses = Object.freeze([
   'none',
@@ -15,7 +16,7 @@ export function createSemanticEditBundleAdmission(input = {}, options = {}) {
   const projections = array(input.semanticEditProjections ?? input.projections ?? input.semanticEditProjection);
   const replays = array(input.semanticEditReplays ?? input.replays ?? input.semanticEditReplay);
   const evidence = evidenceRecords(input, options);
-  const summary = summarizeSemanticEditBundle(scripts, projections, replays, evidence);
+  const summary = summarizeSemanticEditBundle(scripts, projections, replays, evidence, input, options);
   const computedStatus = semanticEditBundleStatus(summary);
   const status = safeStatus(input.status ?? options.status, computedStatus, summary);
   const readiness = normalizeSemanticMergeReadiness(input.readiness ?? options.readiness ?? readinessForStatus(status))
@@ -45,7 +46,7 @@ export function createSemanticEditBundleAdmission(input = {}, options = {}) {
   });
 }
 
-function summarizeSemanticEditBundle(scripts, projections, replays, evidence) {
+function summarizeSemanticEditBundle(scripts, projections, replays, evidence, input, options) {
   const scriptStatusEntries = scripts.map((script) => script.admission?.status);
   const projectionStatusEntries = projections.flatMap((projection) => [projection.status, projection.admission?.status]);
   const replayStatusEntries = replays.map((replay) => replay.status);
@@ -54,6 +55,7 @@ function summarizeSemanticEditBundle(scripts, projections, replays, evidence) {
   const replayStatuses = uniqueStrings(strings(replayStatusEntries));
   const replayActions = uniqueStrings(strings(replays.map((replay) => replay.admission?.action)));
   const evidenceSummary = summarizeEvidence(evidence);
+  const sidecarQuality = summarizeSemanticSidecarQuality([input, options, ...scripts, ...projections, ...replays]);
   return {
     scripts: scripts.length,
     projections: projections.length,
@@ -82,11 +84,13 @@ function summarizeSemanticEditBundle(scripts, projections, replays, evidence) {
     failedTestEvidence: evidenceSummary.failed,
     conflictEvidence: evidenceSummary.conflict,
     staleEvidence: evidenceSummary.stale,
+    semanticSidecarQuality: sidecarQuality,
     reasonCodes: uniqueStrings([
       ...scripts.flatMap((script) => strings(script.admission?.reasonCodes)),
       ...projections.flatMap((projection) => strings(projection.admission?.reasonCodes)),
       ...replays.flatMap((replay) => strings(replay.admission?.reasonCodes)),
-      ...evidenceSummary.reasonCodes
+      ...evidenceSummary.reasonCodes,
+      ...sidecarQuality.warningCodes
     ])
   };
 }