@beyondwork/docx-react-component 1.0.124 → 1.0.126

package/dist/runtime/document-runtime.cjs

@@ -5525,7 +5525,7 @@ function createParagraphEditableTarget(paragraph, kind, storyKey2, blockPath, ta
     context: { storyKey: storyKey2, insideSdt: contentControl !== void 0 },
     ...tableTarget
   }) : void 0;
-  const listAddress = tableIdentity === void 0 && paragraph.numbering !== void 0 ? createCanonicalAddress({
+  const listAddress = paragraph.numbering !== void 0 ? createCanonicalAddress({
     addressKind: "list-item-text",
     storyKey: storyKey2,
     staleCheckKind: "paragraph",
@@ -5559,6 +5559,7 @@ function createParagraphEditableTarget(paragraph, kind, storyKey2, blockPath, ta
     ...contentControl !== void 0 ? { contentControl } : {},
     ...tableIdentity !== void 0 ? { table: tableIdentity } : {},
     ...editableOwner !== void 0 ? { editableOwner } : {},
+    ...listAddress !== void 0 ? { listAddress } : {},
     ...tableIdentity !== void 0 ? {
       canonicalAddress: createTableTargetCanonicalAddress(
         tableIdentity,
@@ -6422,6 +6423,9 @@ function validateEditableTargetRef(value, path = "$") {
   if (record.canonicalAddress !== void 0) {
     validateTargetCanonicalAddress(record.canonicalAddress, `${path}.canonicalAddress`, issues);
   }
+  if (record.listAddress !== void 0) {
+    validateTargetCanonicalAddress(record.listAddress, `${path}.listAddress`, issues);
+  }
   const staleCheck = asPlainObject(record.staleCheck, `${path}.staleCheck`, issues);
   if (staleCheck) {
     if (staleCheck.paragraphTextHash !== void 0) {
@@ -9047,6 +9051,7 @@ function mergeLevelDefinition(base, override, startOverride, fallbackLevel) {
   );
   const runProperties = override?.runProperties ?? base?.runProperties;
   const restartAfterLevel = override?.restartAfterLevel ?? base?.restartAfterLevel;
+  const picBulletId = override?.picBulletId ?? base?.picBulletId;
   return {
     level,
     format,
@@ -9057,7 +9062,8 @@ function mergeLevelDefinition(base, override, startOverride, fallbackLevel) {
     ...override?.suffix ?? base?.suffix ? { suffix: override?.suffix ?? base?.suffix } : {},
     ...paragraphGeometry ? { paragraphGeometry } : {},
     ...runProperties ? { runProperties } : {},
-    ...restartAfterLevel !== void 0 ? { restartAfterLevel } : {}
+    ...restartAfterLevel !== void 0 ? { restartAfterLevel } : {},
+    ...picBulletId !== void 0 ? { picBulletId } : {}
   };
 }
 function withDefaultStartAt(level) {
@@ -9185,7 +9191,7 @@ function resolveHangingWidth(indentation) {
 // src/runtime/formatting/numbering/prefix.ts
 function createNumberingPrefixResolver(catalog) {
   const sequenceStates = /* @__PURE__ */ new Map();
-  function resolveInternal(numbering, paragraph) {
+  function resolveInternal(numbering, paragraph, options = {}) {
     const resolved = resolveNumberingDefinitionSet(
       catalog,
       paragraph?.numbering ?? numbering,
@@ -9198,29 +9204,44 @@ function createNumberingPrefixResolver(catalog) {
     if (!resolvedNumbering) {
       return null;
     }
-    const sequenceState = getSequenceState(sequenceStates, resolvedNumbering.numberingInstanceId);
-    advanceSequence(sequenceState, resolved.effectiveLevel.level, resolved.effectiveLevels);
+    const advance = options.advance !== false;
+    const sequenceState = getSequenceState(
+      sequenceStates,
+      resolvedNumbering.numberingInstanceId,
+      { create: advance }
+    );
+    if (!sequenceState) {
+      return null;
+    }
+    const workingState = advance ? sequenceState : cloneSequenceState(sequenceState);
+    advanceSequence(workingState, resolved.effectiveLevel.level, resolved.effectiveLevels);
+    const currentCounter = workingState.counters[resolved.effectiveLevel.level];
     const effectiveLevelDefs = resolved.effectiveLevel.isLegalNumbering ? new Map(
       Array.from(resolved.effectiveLevels.entries()).map(([level, definition]) => [
         level,
         { ...definition, format: "decimal" }
       ])
     ) : resolved.effectiveLevels;
+    const picBulletId = resolved.effectiveLevel.picBulletId;
     const text = renderLevelText(
       resolved.effectiveLevel.text,
-      sequenceState.counters,
+      workingState.counters,
       effectiveLevelDefs
     );
-    if (resolved.effectiveLevel.format !== "none" && text === null) {
+    if (picBulletId == null && resolved.effectiveLevel.format !== "none" && text === null) {
       return null;
     }
     const visibleText = resolved.effectiveLevel.format === "none" ? null : text;
-    const picBulletId = resolved.effectiveLevel.picBulletId;
+    const formatPosture = getNumberingFormatPosture(
+      resolved.effectiveLevel.format,
+      currentCounter
+    );
     const picBulletMediaId = picBulletId != null ? catalog.numPicBullets?.[picBulletId]?.mediaId : void 0;
     return {
       text: visibleText,
       level: resolved.effectiveLevel.level,
       format: resolved.effectiveLevel.format,
+      ...formatPosture !== void 0 ? { formatPosture } : {},
       startAt: resolved.effectiveLevel.startAt ?? DEFAULT_NUMBERING_START_AT,
       ...resolved.effectiveLevel.suffix ? { suffix: resolved.effectiveLevel.suffix } : {},
       ...resolved.effectiveLevel.paragraphStyleId ? { paragraphStyleId: resolved.effectiveLevel.paragraphStyleId } : {},
@@ -9231,23 +9252,26 @@ function createNumberingPrefixResolver(catalog) {
     };
   }
   return {
-    resolve(numbering) {
-      const result = resolveInternal(numbering);
+    resolve(numbering, options) {
+      const result = resolveInternal(numbering, void 0, options);
       return result?.text ?? null;
     },
-    resolveDetailed(numbering, paragraph) {
-      return resolveInternal(numbering, paragraph);
+    resolveDetailed(numbering, paragraph, options) {
+      return resolveInternal(numbering, paragraph, options);
     },
-    resolveParagraph(paragraph) {
-      return resolveInternal(paragraph.numbering, paragraph);
+    resolveParagraph(paragraph, options) {
+      return resolveInternal(paragraph.numbering, paragraph, options);
     }
   };
 }
-function getSequenceState(states, numberingInstanceId) {
+function getSequenceState(states, numberingInstanceId, options = { create: true }) {
   const existing = states.get(numberingInstanceId);
   if (existing) {
     return existing;
   }
+  if (options.create === false) {
+    return { counters: [], lastLevel: null };
+  }
   const created = {
     counters: [],
     lastLevel: null
@@ -9255,6 +9279,12 @@ function getSequenceState(states, numberingInstanceId) {
   states.set(numberingInstanceId, created);
   return created;
 }
+function cloneSequenceState(state) {
+  return {
+    counters: [...state.counters],
+    lastLevel: state.lastLevel
+  };
+}
 function advanceSequence(state, currentLevel, levelDefinitions) {
   for (let level = currentLevel + 1; level < state.counters.length; level += 1) {
     if (shouldResetDeeperLevel(level, currentLevel, levelDefinitions)) {
@@ -9286,6 +9316,25 @@ function shouldResetDeeperLevel(level, triggeringLevel, levelDefinitions) {
 function getLevelStartAt(level, levelDefinitions) {
   return levelDefinitions.get(level)?.startAt ?? DEFAULT_NUMBERING_START_AT;
 }
+function getNumberingFormatPosture(format, value) {
+  if (!isSupportedNumberingFormat(format)) {
+    return {
+      status: "approximated",
+      requestedFormat: format,
+      renderedFormat: "decimal",
+      reason: "unsupported-numbering-format-decimal-fallback"
+    };
+  }
+  if (value !== void 0 && ((format === "upperRoman" || format === "lowerRoman") && (value <= 0 || value >= 4e3) || (format === "cardinalText" || format === "ordinalText") && (!Number.isInteger(value) || value < 1 || value > 999) || (format === "upperLetter" || format === "lowerLetter" || format === "chicago") && value < 1)) {
+    return {
+      status: "approximated",
+      requestedFormat: format,
+      renderedFormat: "decimal",
+      reason: "numbering-format-range-decimal-fallback"
+    };
+  }
+  return void 0;
+}
 function renderLevelText(text, counters, levelDefinitions) {
   if (!text) {
     return null;
@@ -10128,6 +10177,7 @@ function toNumberingLayoutInput(numbering) {
     associatedTabStops: toLayoutTabStops(numbering.geometry.tabStops, "numbering"),
     level: numbering.level,
     format: numbering.format,
+    ...numbering.formatPosture !== void 0 ? { formatPosture: { ...numbering.formatPosture } } : {},
     startAt: numbering.startAt,
     ...numbering.isLegalNumbering ? { isLegalNumbering: true } : {},
     ...numbering.picBulletMediaId ? { pictureBulletMediaId: numbering.picBulletMediaId } : {}
@@ -10357,13 +10407,10 @@ var FormattingContextImpl = class {
     const effectiveNumbering = this.resolveEffectiveParagraphNumbering(para);
     if (!effectiveNumbering) return null;
     if (!emitGeometry) {
-      if (advance) this.numbering.resolve(effectiveNumbering);
+      this.numbering.resolve(effectiveNumbering, { advance });
       return null;
     }
-    if (!advance) {
-      console.warn("[formatting-context] resolveParagraphNumbering({advance:false}) is not supported; counter always advances");
-    }
-    return this.numbering.resolveDetailed(effectiveNumbering, para);
+    return this.numbering.resolveDetailed(effectiveNumbering, para, { advance });
   }
   resolveNumberingLayoutInput(para, options = {}) {
     return toNumberingLayoutInput(this.resolveParagraphNumbering(para, options));
@@ -12639,6 +12686,7 @@ function toSurfaceResolvedNumbering(numbering) {
   return {
     level: numbering.level,
     format: numbering.format,
+    ...numbering.formatPosture !== void 0 ? { formatPosture: { ...numbering.formatPosture } } : {},
     ...numbering.text !== null ? { text: numbering.text } : {},
     startAt: numbering.startAt,
     ...numbering.paragraphStyleId ? { paragraphStyleId: numbering.paragraphStyleId } : {},
@@ -13653,7 +13701,7 @@ function parseCanonicalTextLeafPath(path) {
     if (normalized[offset] !== "/") return null;
     offset += 1;
   }
-  return tokens.some((token) => token.kind === "txbx") ? tokens : null;
+  return tokens.length > 0 ? tokens : null;
 }
 function parseCanonicalHyperlinkPath(path) {
   const blockStart = path.indexOf("/block[");
@@ -18870,22 +18918,43 @@ function rangesOverlap2(leftFrom, leftTo, rightFrom, rightTo) {
 }
 
 // src/core/commands/list-commands.ts
-function toggleNumberedList(document2, paragraphIndexes, context) {
-  return toggleListKind(document2, paragraphIndexes, "numbered", context);
+function toggleNumberedList(document2, paragraphIndexes, context, options = {}) {
+  return toggleListKind(document2, paragraphIndexes, "numbered", context, options);
 }
-function toggleBulletedList(document2, paragraphIndexes, context) {
-  return toggleListKind(document2, paragraphIndexes, "bulleted", context);
+function toggleBulletedList(document2, paragraphIndexes, context, options = {}) {
+  return toggleListKind(document2, paragraphIndexes, "bulleted", context, options);
 }
-function indentListItems(document2, paragraphIndexes, context) {
-  return adjustListLevels(document2, paragraphIndexes, 1, context);
+function indentListItems(document2, paragraphIndexes, context, options = {}) {
+  return adjustListLevels(document2, paragraphIndexes, 1, context, options);
 }
-function outdentListItems(document2, paragraphIndexes, context) {
-  return adjustListLevels(document2, paragraphIndexes, -1, context);
+function outdentListItems(document2, paragraphIndexes, context, options = {}) {
+  return adjustListLevels(document2, paragraphIndexes, -1, context, options);
 }
-function restartNumbering(document2, paragraphIndex, context, startAt = 1) {
+function restartNumbering(document2, paragraphIndex, context, startAt = 1, options = {}) {
   const working = cloneEnvelope(document2, context.timestamp);
   const paragraphs = captureEditableParagraphs(working);
-  const target = paragraphs[paragraphIndex];
+  const resolved = resolveListCommandParagraphIndexes(
+    working,
+    paragraphs,
+    [paragraphIndex],
+    context,
+    normalizeListCommandTargets(options)
+  );
+  if (resolved.blockedReason) {
+    return {
+      document: working,
+      affectedParagraphIndexes: [],
+      blockedReason: resolved.blockedReason
+    };
+  }
+  const resolvedParagraphIndex = resolved.paragraphIndexes[0];
+  if (resolvedParagraphIndex === void 0) {
+    return {
+      document: working,
+      affectedParagraphIndexes: []
+    };
+  }
+  const target = paragraphs[resolvedParagraphIndex];
   if (!target?.numbering) {
     return {
       document: working,
@@ -18910,7 +18979,7 @@ function restartNumbering(document2, paragraphIndex, context, startAt = 1) {
     })
   };
   const affectedParagraphIndexes = [];
-  for (let index = paragraphIndex; index < paragraphs.length; index += 1) {
+  for (let index = resolvedParagraphIndex; index < paragraphs.length; index += 1) {
     const paragraph = paragraphs[index];
     if (!paragraph?.numbering) {
       break;
@@ -18931,10 +19000,31 @@ function restartNumbering(document2, paragraphIndex, context, startAt = 1) {
     createdNumberingInstanceId: numberingInstanceId
   };
 }
-function continueNumbering(document2, paragraphIndex, context) {
+function continueNumbering(document2, paragraphIndex, context, options = {}) {
   const working = cloneEnvelope(document2, context.timestamp);
   const paragraphs = captureEditableParagraphs(working);
-  const target = paragraphs[paragraphIndex];
+  const resolved = resolveListCommandParagraphIndexes(
+    working,
+    paragraphs,
+    [paragraphIndex],
+    context,
+    normalizeListCommandTargets(options)
+  );
+  if (resolved.blockedReason) {
+    return {
+      document: working,
+      affectedParagraphIndexes: [],
+      blockedReason: resolved.blockedReason
+    };
+  }
+  const resolvedParagraphIndex = resolved.paragraphIndexes[0];
+  if (resolvedParagraphIndex === void 0) {
+    return {
+      document: working,
+      affectedParagraphIndexes: []
+    };
+  }
+  const target = paragraphs[resolvedParagraphIndex];
   if (!target?.numbering) {
     return {
       document: working,
@@ -18953,7 +19043,7 @@ function continueNumbering(document2, paragraphIndex, context) {
   const compatibleInstanceId = findPreviousCompatibleInstance(
     paragraphs,
     catalog,
-    paragraphIndex,
+    resolvedParagraphIndex,
     currentKind
   );
   if (!compatibleInstanceId || compatibleInstanceId === currentInstanceId) {
@@ -18963,7 +19053,7 @@ function continueNumbering(document2, paragraphIndex, context) {
     };
   }
   const affectedParagraphIndexes = [];
-  for (let index = paragraphIndex; index < paragraphs.length; index += 1) {
+  for (let index = resolvedParagraphIndex; index < paragraphs.length; index += 1) {
     const paragraph = paragraphs[index];
     if (!paragraph?.numbering) {
       break;
@@ -18984,10 +19074,24 @@ function continueNumbering(document2, paragraphIndex, context) {
     createdNumberingInstanceId: compatibleInstanceId
   };
 }
-function toggleListKind(document2, paragraphIndexes, kind, context) {
+function toggleListKind(document2, paragraphIndexes, kind, context, options) {
   const working = cloneEnvelope(document2, context.timestamp);
   const paragraphs = captureEditableParagraphs(working);
-  const normalizedIndexes = normalizeParagraphIndexes(paragraphs, paragraphIndexes);
+  const resolved = resolveListCommandParagraphIndexes(
+    working,
+    paragraphs,
+    paragraphIndexes,
+    context,
+    normalizeListCommandTargets(options)
+  );
+  if (resolved.blockedReason) {
+    return {
+      document: working,
+      affectedParagraphIndexes: [],
+      blockedReason: resolved.blockedReason
+    };
+  }
+  const normalizedIndexes = resolved.paragraphIndexes;
   if (normalizedIndexes.length === 0) {
     return {
       document: working,
@@ -19024,10 +19128,24 @@ function toggleListKind(document2, paragraphIndexes, kind, context) {
     createdNumberingInstanceId: numberingInstanceId
   };
 }
-function adjustListLevels(document2, paragraphIndexes, delta, context) {
+function adjustListLevels(document2, paragraphIndexes, delta, context, options) {
   const working = cloneEnvelope(document2, context.timestamp);
   const paragraphs = captureEditableParagraphs(working);
-  const affectedParagraphIndexes = normalizeParagraphIndexes(paragraphs, paragraphIndexes).filter(
+  const resolved = resolveListCommandParagraphIndexes(
+    working,
+    paragraphs,
+    paragraphIndexes,
+    context,
+    normalizeListCommandTargets(options)
+  );
+  if (resolved.blockedReason) {
+    return {
+      document: working,
+      affectedParagraphIndexes: [],
+      blockedReason: resolved.blockedReason
+    };
+  }
+  const affectedParagraphIndexes = resolved.paragraphIndexes.filter(
     (index) => Boolean(paragraphs[index]?.numbering)
   );
   for (const index of affectedParagraphIndexes) {
@@ -19045,6 +19163,121 @@ function adjustListLevels(document2, paragraphIndexes, delta, context) {
     affectedParagraphIndexes
   };
 }
+function normalizeListCommandTargets(options) {
+  if (options.editableTargets !== void 0) return options.editableTargets;
+  return options.editableTarget ? [options.editableTarget] : [];
+}
+function resolveListCommandParagraphIndexes(document2, paragraphs, paragraphIndexes, context, editableTargets) {
+  if (editableTargets.length === 0) {
+    return { paragraphIndexes: normalizeParagraphIndexes(paragraphs, paragraphIndexes) };
+  }
+  const currentTargets = collectEditableTargetRefs(document2, context.editableTargetCache);
+  const paragraphIndexByTargetKey = /* @__PURE__ */ new Map();
+  let paragraphIndex = 0;
+  for (const target of currentTargets) {
+    if (!isParagraphTextTarget(target)) continue;
+    if (!paragraphIndexByTargetKey.has(target.targetKey)) {
+      paragraphIndexByTargetKey.set(target.targetKey, paragraphIndex);
+      paragraphIndex += 1;
+    }
+  }
+  const resolvedIndexes = [];
+  for (const target of editableTargets) {
+    const blockedReason = validateListCommandTarget(target, currentTargets, context);
+    if (blockedReason) return { paragraphIndexes: [], blockedReason };
+    const current = findCurrentListCommandTarget(target, currentTargets);
+    if (!current) {
+      return {
+        paragraphIndexes: [],
+        blockedReason: {
+          code: "list_target_not_found",
+          message: "List editable target no longer resolves in the current canonical document."
+        }
+      };
+    }
+    if (!sameResolvedListCommandTarget(target, current)) {
+      return {
+        paragraphIndexes: [],
+        blockedReason: {
+          code: "list_target_stale",
+          message: "List editable target is stale for the current canonical document."
+        }
+      };
+    }
+    const currentIndex = paragraphIndexByTargetKey.get(current.targetKey);
+    if (currentIndex === void 0) {
+      return {
+        paragraphIndexes: [],
+        blockedReason: {
+          code: "list_target_position_unavailable",
+          message: "List editable target resolved but could not be mapped to a current paragraph."
+        }
+      };
+    }
+    resolvedIndexes.push(currentIndex);
+  }
+  return { paragraphIndexes: normalizeParagraphIndexes(paragraphs, resolvedIndexes) };
+}
+function validateListCommandTarget(target, currentTargets, context) {
+  const shapeIssues = validateEditableTargetRef(target);
+  if (shapeIssues.length > 0) {
+    return {
+      code: "list_target_malformed",
+      message: `List editable target is malformed: ${shapeIssues[0]?.path ?? "$"}.`
+    };
+  }
+  if (context.activeStoryKey !== void 0 && target.storyKey !== context.activeStoryKey) {
+    return {
+      code: "list_target_wrong_story",
+      message: "List editable target does not belong to the active story."
+    };
+  }
+  if (target.commandFamily !== "text-leaf" || target.listAddress === void 0) {
+    return {
+      code: "list_target_required",
+      message: "List commands require a validated list item editable target."
+    };
+  }
+  if (target.editability !== "editable" || target.posture.blockers.length > 0) {
+    return {
+      code: "list_target_non_editable",
+      message: target.posture.blockers.length > 0 ? `List editable target is not editable: ${target.posture.blockers.join(", ")}.` : "List editable target is not editable."
+    };
+  }
+  if (!findCurrentListCommandTarget(target, currentTargets)) {
+    return {
+      code: "list_target_not_found",
+      message: "List editable target no longer resolves in the current canonical document."
+    };
+  }
+  return void 0;
+}
+function findCurrentListCommandTarget(target, currentTargets) {
+  return currentTargets.find(
+    (candidate) => isParagraphTextTarget(candidate) && candidate.listAddress !== void 0 && (candidate.targetKey === target.targetKey || candidate.listAddress.addressKey === target.listAddress?.addressKey)
+  );
+}
+function sameResolvedListCommandTarget(left, right) {
+  return left.kind === right.kind && left.storyKey === right.storyKey && left.blockPath === right.blockPath && left.leafPath === right.leafPath && left.commandFamily === right.commandFamily && left.editability === right.editability && left.staleCheck.paragraphTextHash === right.staleCheck.paragraphTextHash && left.staleCheck.paragraphTextLength === right.staleCheck.paragraphTextLength && left.staleCheck.inlineCount === right.staleCheck.inlineCount && left.staleCheck.blockType === right.staleCheck.blockType && left.listAddress?.addressKey === right.listAddress?.addressKey && left.listAddress?.resolver?.staleHash === right.listAddress?.resolver?.staleHash && jsonStable(left.sourceRef) === jsonStable(right.sourceRef);
+}
+function isParagraphTextTarget(target) {
+  return target.commandFamily === "text-leaf" && target.staleCheck.blockType === "paragraph" && target.leafPath.endsWith("/inline");
+}
+function jsonStable(value) {
+  return JSON.stringify(sortJson(value));
+}
+function sortJson(value) {
+  if (Array.isArray(value)) return value.map(sortJson);
+  if (value && typeof value === "object") {
+    const record = value;
+    const sorted = {};
+    for (const key of Object.keys(record).sort()) {
+      sorted[key] = sortJson(record[key]);
+    }
+    return sorted;
+  }
+  return value;
+}
 function ensureDefaultInstance(catalog, kind) {
   const existing = Object.values(catalog.instances).find(
     (instance) => getListKind(catalog, instance.numberingInstanceId) === kind
@@ -19817,7 +20050,7 @@ function validateResult(result, context) {
   return { ...result, selection: validated };
 }
 function getPostMutationMaxOffset(result, context) {
-  if (typeof context.activeStorySize !== "number" || context.textTarget?.kind === "text-leaf") {
+  if (typeof context.activeStorySize !== "number" || isTargetLocalTextLeaf(context.textTarget)) {
     return result.storyText.length;
   }
   let storySize = context.activeStorySize;
@@ -19826,6 +20059,9 @@ function getPostMutationMaxOffset(result, context) {
   }
   return Math.max(result.storyText.length, storySize);
 }
+function isTargetLocalTextLeaf(textTarget) {
+  return textTarget?.kind === "text-leaf" && textTarget.blockPath.includes("/txbx/");
+}
 var editLayer = {
   applyTextInsert(doc, selection, text, context, formatting) {
     return validateResult(insertText(doc, selection, text, context, formatting), context);
@@ -20088,6 +20324,13 @@ function withCommandTextTarget(context, command) {
     textTarget: command.textTarget
   };
 }
+function listCommandContext(context) {
+  return {
+    timestamp: context.timestamp,
+    ...context.activeStoryKey !== void 0 ? { activeStoryKey: context.activeStoryKey } : {},
+    ...context.editableTargetCache !== void 0 ? { editableTargetCache: context.editableTargetCache } : {}
+  };
+}
 function executeEditorCommand(state, command, context) {
   switch (command.type) {
     case "selection.set":
@@ -20729,7 +20972,17 @@ function executeEditorCommand(state, command, context) {
       });
     }
     case "list.toggle": {
-      const result = command.kind === "bulleted" ? toggleBulletedList(state.document, command.paragraphIndexes, { timestamp: context.timestamp }) : toggleNumberedList(state.document, command.paragraphIndexes, { timestamp: context.timestamp });
+      const result = command.kind === "bulleted" ? toggleBulletedList(
+        state.document,
+        command.paragraphIndexes ?? [],
+        listCommandContext(context),
+        { editableTargets: command.editableTargets }
+      ) : toggleNumberedList(
+        state.document,
+        command.paragraphIndexes ?? [],
+        listCommandContext(context),
+        { editableTargets: command.editableTargets }
+      );
       return buildDocumentReplaceTransaction(state, context, {
         changed: result.affectedParagraphIndexes.length > 0,
         document: result.document,
@@ -20737,7 +20990,12 @@ function executeEditorCommand(state, command, context) {
       });
     }
     case "list.indent": {
-      const result = indentListItems(state.document, command.paragraphIndexes, { timestamp: context.timestamp });
+      const result = indentListItems(
+        state.document,
+        command.paragraphIndexes ?? [],
+        listCommandContext(context),
+        { editableTargets: command.editableTargets }
+      );
       return buildDocumentReplaceTransaction(state, context, {
         changed: result.affectedParagraphIndexes.length > 0,
         document: result.document,
@@ -20745,7 +21003,12 @@ function executeEditorCommand(state, command, context) {
       });
     }
     case "list.outdent": {
-      const result = outdentListItems(state.document, command.paragraphIndexes, { timestamp: context.timestamp });
+      const result = outdentListItems(
+        state.document,
+        command.paragraphIndexes ?? [],
+        listCommandContext(context),
+        { editableTargets: command.editableTargets }
+      );
       return buildDocumentReplaceTransaction(state, context, {
         changed: result.affectedParagraphIndexes.length > 0,
         document: result.document,
@@ -20755,9 +21018,10 @@ function executeEditorCommand(state, command, context) {
     case "list.restart-numbering": {
       const result = restartNumbering(
         state.document,
-        command.paragraphIndex,
-        { timestamp: context.timestamp },
-        command.startAt
+        command.paragraphIndex ?? -1,
+        listCommandContext(context),
+        command.startAt,
+        { editableTarget: command.editableTarget }
       );
       return buildDocumentReplaceTransaction(state, context, {
         changed: result.affectedParagraphIndexes.length > 0,
@@ -20768,8 +21032,9 @@ function executeEditorCommand(state, command, context) {
     case "list.continue-numbering": {
       const result = continueNumbering(
         state.document,
-        command.paragraphIndex,
-        { timestamp: context.timestamp }
+        command.paragraphIndex ?? -1,
+        listCommandContext(context),
+        { editableTarget: command.editableTarget }
       );
       return buildDocumentReplaceTransaction(state, context, {
         changed: result.affectedParagraphIndexes.length > 0,
@@ -24742,7 +25007,7 @@ function buildFormattingDebugEntry(inputs) {
 }
 
 // src/runtime/layout/layout-engine-version.ts
-var LAYOUT_ENGINE_VERSION = 87;
+var LAYOUT_ENGINE_VERSION = 88;
 
 // src/runtime/layout/compat-input-ledger.ts
 var DEFAULT_COMPATIBILITY_MODE = 15;
@@ -24968,6 +25233,27 @@ function hitTestRegion(index, region, point) {
     (target2) => target2.regionId === region.regionId
   );
   const containing = targets.filter((target2) => containsPoint(target2.rect, point));
+  const generatedTarget = containing.find(
+    (target2) => target2.generatedContentKind === "numbering-marker"
+  );
+  if (generatedTarget) {
+    const anchorHit2 = firstLineAnchor(index, generatedTarget)?.runtimeOffset !== void 0 ? {
+      runtimeOffset: firstLineAnchor(index, generatedTarget).runtimeOffset,
+      assoc: "before"
+    } : resolveLineAnchorHit(index, generatedTarget, point);
+    return {
+      pageIndex: generatedTarget.pageIndex,
+      regionKind: generatedTarget.regionKind,
+      blockId: generatedTarget.blockId,
+      fragmentId: generatedTarget.fragmentId,
+      lineIndex: generatedTarget.lineIndex,
+      runtimeOffset: anchorHit2?.runtimeOffset ?? 0,
+      assoc: "before",
+      generatedContentKind: generatedTarget.generatedContentKind,
+      generatedContentBoundary: generatedTarget.generatedContentBoundary?.policy,
+      semanticEntryId: generatedTarget.targetId.startsWith("hit:") ? generatedTarget.targetId.slice("hit:".length) : generatedTarget.targetId
+    };
+  }
   const target = nearestTarget(containing, point) ?? nearestTarget(targets, point);
   if (!target) return null;
   const anchorHit = resolveLineAnchorHit(index, target, point);
@@ -25344,6 +25630,7 @@ function projectGeometryIndexFromFrame(frame, options) {
           identities,
           storyKey: storyKey2,
           entries: semanticEntries,
+          hitTargets,
           projectedBlocksByStory,
           projectedCommandTargetsByKey,
           precision,
@@ -25614,6 +25901,7 @@ function appendBlockSemanticEntries(input) {
     identities,
     storyKey: storyKey2,
     entries,
+    hitTargets,
     projectedBlocksByStory,
     projectedCommandTargetsByKey,
     precision,
@@ -25643,6 +25931,7 @@ function appendBlockSemanticEntries(input) {
     block,
     sourceIdentity: sliceIdentity,
     entries,
+    hitTargets,
     projectedCommandTargetsByKey,
     precision,
     frameCompleteness,
@@ -25824,6 +26113,7 @@ function appendFragmentLayoutObjectSemanticEntries(input) {
     block,
     sourceIdentity,
     entries,
+    hitTargets,
     projectedCommandTargetsByKey,
     precision,
     frameCompleteness,
@@ -25908,18 +26198,57 @@ function appendFragmentLayoutObjectSemanticEntries(input) {
     }
     return;
   }
-  if (layoutObject.kind === "numbered-paragraph") {
-    const markerProjection = resolveNumberingMarkerProjection(block);
+  const numberingRows = layoutObject.numberingRows && layoutObject.numberingRows.length > 0 ? layoutObject.numberingRows : layoutObject.kind === "numbered-paragraph" && layoutObject.numbering ? [layoutObject.numbering] : [];
+  for (let index = 0; index < numberingRows.length; index += 1) {
+    const numbering = numberingRows[index];
+    const markerProjection = resolveNumberingMarkerProjection(block, numbering);
+    const entryId = layoutObject.kind === "numbered-paragraph" && index === 0 ? `semantic:numbering-marker:${base.sliceId}` : `semantic:numbering-marker:${base.sliceId}:${stableGeometryId(
+      numbering.numberingLayoutId ?? numbering.numberingKey ?? String(index)
+    )}`;
+    const source = numberingSourceIdentity(numbering, sourceIdentity);
     entries.push({
       ...base,
-      entryId: `semantic:numbering-marker:${base.sliceId}`,
+      entryId,
       kind: "numbering-marker",
       layoutObjectId: layoutObject.objectId,
+      numberingLayoutId: numbering.numberingLayoutId,
+      numberingKey: numbering.numberingKey,
+      numberingTargetKey: numbering.targetKey,
+      numberingTargetKind: numbering.targetKind,
+      numberingCanonicalAddressKey: numbering.canonicalAddressKey,
+      numberingListAddressKey: numbering.listAddressKey,
+      numberingMarkerText: numbering.markerText,
+      numberingMarkerSuffix: numbering.markerSuffix,
+      numberingFormat: numbering.format,
+      numberingFormatPosture: numbering.formatPosture,
+      numberingUnavailableReasons: numbering.unavailableReasons,
+      markerGlyphRect: markerProjection.rect,
+      markerLaneRect: markerProjection.markerLaneRect,
+      textColumnRect: markerProjection.textColumnRect,
+      markerBoundary: markerProjection.markerBoundary,
       rect: markerProjection.rect,
       status: markerProjection.status,
       precision: markerProjection.precision,
       frameCompleteness,
-      ...sourceIdentity ? { sourceIdentity } : {}
+      ...source ? { sourceIdentity: source } : {}
+    });
+    hitTargets.push({
+      targetId: `hit:${entryId}`,
+      pageId: base.pageId,
+      pageIndex: base.pageIndex,
+      regionId: base.regionId,
+      regionKind: base.regionKind,
+      blockId: base.blockId,
+      fragmentId: base.fragmentId,
+      lineIndex: firstLineIndex(block),
+      rect: markerProjection.rect,
+      precision: markerProjection.precision,
+      generatedContentKind: "numbering-marker",
+      generatedContentBoundary: {
+        policy: "snap-to-authored-text",
+        authoredTextStartsAtPx: markerProjection.markerBoundary.authoredTextStartsAtPx,
+        selectionPolicy: "exclude-generated-marker"
+      }
     });
     recordPrecision(precision, markerProjection.precision);
   }
@@ -26010,8 +26339,8 @@ function bookmarkRangeSourceIdentity(fact, fallback) {
     joinKind: "block-scoped"
   };
 }
-function resolveNumberingMarkerProjection(block) {
-  const metadata = resolveNumberingMarkerProjectionMetadata(block);
+function resolveNumberingMarkerProjection(block, numbering) {
+  const metadata = resolveNumberingMarkerProjectionMetadata(block, numbering);
   const blockFrame = block.frame;
   if (metadata.markerLane && metadata.measuredWidthTwips !== void 0) {
     const markerLane = metadata.markerLane;
@@ -26022,14 +26351,25 @@ function resolveNumberingMarkerProjection(block) {
     const rawRightPx = rawLeftPx + markerLane.widthTwips * pxPerTwip;
     const leftPx = clamp3(rawLeftPx, blockLeftPx, blockRightPx);
     const rightPx = clamp3(rawRightPx, leftPx, blockRightPx);
-    return {
-      rect: {
-        leftPx,
-        topPx: blockFrame.topPx,
-        widthPx: rightPx - leftPx,
-        heightPx: blockFrame.heightPx,
-        space: "frame",
-        precision: metadata.precision
+    const markerLaneRect = {
+      leftPx,
+      topPx: blockFrame.topPx,
+      widthPx: rightPx - leftPx,
+      heightPx: blockFrame.heightPx,
+      space: "frame",
+      precision: metadata.precision
+    };
+    const textColumnRect = metadata.textColumn ? projectTextColumnRect(blockFrame, metadata.measuredWidthTwips, metadata.textColumn) : void 0;
+    return {
+      rect: markerLaneRect,
+      markerLaneRect,
+      ...textColumnRect ? { textColumnRect } : {},
+      markerBoundary: {
+        generatedContent: "numbering-marker",
+        caretPolicy: "snap-to-authored-text",
+        selectionPolicy: "exclude-marker-unless-list-item-action",
+        coordinateSpace: "frame-px",
+        ...textColumnRect ? { authoredTextStartsAtPx: textColumnRect.leftPx } : {}
       },
       precision: metadata.precision,
       status: metadata.status
@@ -26048,20 +26388,28 @@ function resolveNumberingMarkerProjection(block) {
       space: "frame",
       precision: metadata.precision
     },
+    markerBoundary: {
+      generatedContent: "numbering-marker",
+      caretPolicy: "snap-to-authored-text",
+      selectionPolicy: "exclude-marker-unless-list-item-action",
+      coordinateSpace: "frame-px"
+    },
     precision: metadata.precision,
     status: metadata.status
   };
 }
-function resolveNumberingMarkerProjectionMetadata(block) {
+function resolveNumberingMarkerProjectionMetadata(block, numbering) {
   const blockFrame = block.frame;
   const layoutObject = block.fragment.layoutObject;
-  const markerLane = layoutObject?.kind === "numbered-paragraph" ? layoutObject.numbering?.markerLane : void 0;
+  const markerLane = numbering?.markerLane ?? (layoutObject?.kind === "numbered-paragraph" ? layoutObject.numbering?.markerLane : void 0);
+  const textColumn = numbering?.textColumn ?? (layoutObject?.kind === "numbered-paragraph" ? layoutObject.numbering?.textColumn : void 0);
   const measuredWidthTwips = layoutObject?.measuredExtentTwips.widthTwips;
   if (markerLane && markerLane.widthTwips > 0 && measuredWidthTwips !== void 0 && measuredWidthTwips > 0 && Number.isFinite(blockFrame.widthPx)) {
     return {
       precision: "within-tolerance",
       status: "realized",
       markerLane,
+      ...textColumn ? { textColumn } : {},
       measuredWidthTwips
     };
   }
@@ -26070,6 +26418,42 @@ function resolveNumberingMarkerProjectionMetadata(block) {
     status: "requires-rehydration"
   };
 }
+function projectTextColumnRect(blockFrame, measuredWidthTwips, textColumn) {
+  if (measuredWidthTwips <= 0 || !Number.isFinite(blockFrame.widthPx)) {
+    return void 0;
+  }
+  const pxPerTwip = blockFrame.widthPx / measuredWidthTwips;
+  const leftPx = blockFrame.leftPx + textColumn.startTwips * pxPerTwip;
+  const rightInsetPx = (textColumn.rightTwips ?? 0) * pxPerTwip;
+  const rightPx = blockFrame.leftPx + blockFrame.widthPx - rightInsetPx;
+  if (rightPx < leftPx) return void 0;
+  return {
+    leftPx,
+    topPx: blockFrame.topPx,
+    widthPx: rightPx - leftPx,
+    heightPx: blockFrame.heightPx,
+    space: "frame",
+    precision: "within-tolerance"
+  };
+}
+function numberingSourceIdentity(numbering, fallback) {
+  const storyKey2 = numbering.storyKey ?? fallback?.storyKey;
+  if (!storyKey2) return fallback;
+  return {
+    storyKey: storyKey2,
+    ...numbering.sourceBlockPath ?? fallback?.blockPath ? { blockPath: numbering.sourceBlockPath ?? fallback?.blockPath } : {},
+    ...numbering.numberingKey ?? fallback?.scopeKey ? { scopeKey: numbering.numberingKey ?? fallback?.scopeKey } : {},
+    ...numbering.numberingInstanceId ?? fallback?.scopeId ? { scopeId: numbering.numberingInstanceId ?? fallback?.scopeId } : {},
+    ...numbering.numberingSourceRef ?? numbering.sourceRef ?? fallback?.sourceRef ? { sourceRef: numbering.numberingSourceRef ?? numbering.sourceRef ?? fallback?.sourceRef } : {},
+    joinKind: "block-scoped"
+  };
+}
+function stableGeometryId(value) {
+  return value.replace(/[^A-Za-z0-9_.:-]+/gu, "_");
+}
+function firstLineIndex(block) {
+  return block.lines[0]?.line.lineIndex ?? 0;
+}
 function countBlockSemanticEntries(block) {
   const counts = createPrecisionCounts();
   const layoutObject = block.fragment.layoutObject;
@@ -32259,6 +32643,24 @@ function refusalIdForPostureBlocker(target, blocker) {
       return "editable_target_opaque_content";
     case "synthetic-layout-cell":
       return "editable_target_synthetic_layout_cell";
+    case "list-text-readback-missing":
+      return "list_text_readback_missing";
+    case "list-structure-command-missing":
+      return "list_structure_command_missing";
+    case "list-target-stale":
+      return "list_target_stale";
+    case "list-secondary-story-unsupported":
+      return "list_secondary_story_unsupported";
+    case "list-table-target-missing":
+      return "list_table_target_missing";
+    case "list-export-persistence-missing":
+      return "list_export_persistence_missing";
+    case "numbering-format-unsupported":
+      return "numbering_format_unsupported";
+    case "picture-bullet-preserve-only":
+      return "picture_bullet_preserve_only";
+    case "marker-geometry-unavailable":
+      return "marker_geometry_unavailable";
     case "unmodeled-target":
       return target.commandFamily === "link-bookmark" ? "editable_target_linked_content_unmodeled" : "editable_target_unmodeled";
   }
@@ -32281,12 +32683,42 @@ function auditCategoryForPostureBlocker(target, blocker) {
       return target.commandFamily === "link-bookmark" ? "linked-content" : "unsupported-command";
     case "synthetic-layout-cell":
       return "synthetic-cell";
+    case "list-target-stale":
+      return "stale-ref";
+    case "picture-bullet-preserve-only":
+    case "list-export-persistence-missing":
+      return "preserve-only";
+    case "list-text-readback-missing":
+    case "list-structure-command-missing":
+    case "list-secondary-story-unsupported":
+    case "list-table-target-missing":
+    case "numbering-format-unsupported":
+    case "marker-geometry-unavailable":
+      return "unsupported-command";
   }
 }
 function messageForPostureBlocker(blocker) {
   switch (blocker) {
     case "synthetic-layout-cell":
       return "Hidden vertical-merge continuation or synthetic layout cells are not editable targets.";
+    case "list-text-readback-missing":
+      return "List text edits need an authoritative list-item text target before mutation.";
+    case "list-structure-command-missing":
+      return "List structure changes need a supported list command envelope before mutation.";
+    case "list-target-stale":
+      return "List target identity is stale for the current canonical document.";
+    case "list-secondary-story-unsupported":
+      return "List edits in this secondary story are not yet supported.";
+    case "list-table-target-missing":
+      return "Table-contained list item is missing a command-safe list target.";
+    case "list-export-persistence-missing":
+      return "List mutation is blocked until export/reopen persistence is available.";
+    case "numbering-format-unsupported":
+      return "Numbering format is unsupported for this list command.";
+    case "picture-bullet-preserve-only":
+      return "Picture bullet lists are preserve-only until picture bullet mutation is supported.";
+    case "marker-geometry-unavailable":
+      return "List marker geometry is unavailable for this target.";
     default:
       return void 0;
   }
@@ -33539,6 +33971,21 @@ function compileParagraphScope(entry, options = {}) {
     partial: true
   };
 }
+function storyKeyFromHandle(handle) {
+  const target = handle.storyTarget;
+  if (target.kind === "main") return "main";
+  return null;
+}
+function textLeafEditableTargetHint(entry, semanticBlockRange) {
+  const storyKey2 = storyKeyFromHandle(entry.handle);
+  if (!storyKey2) return void 0;
+  return {
+    kind: "text-leaf",
+    storyKey: storyKey2,
+    blockPath: `${storyKey2}/block[${entry.blockIndex}]`,
+    semanticBlockRange
+  };
+}
 function compileParagraphReplacement(entry, proposed, options) {
   if (proposed.operation !== "replace" && proposed.operation !== "insert-before" && proposed.operation !== "insert-after") {
     return null;
@@ -33594,6 +34041,7 @@ function compileParagraphReplacement(entry, proposed, options) {
         {
           kind: stepKind,
           summary: stepKind === "text-replace" ? actionSummary : `suggest-mode ${actionSummary}`,
+          ...textLeafEditableTargetHint(entry, blockRange) ? { editableTargetHint: textLeafEditableTargetHint(entry, blockRange) } : {},
           range: { from: operationRange.from, to: operationRange.to },
           text,
           ...proposed.formatting ? { formatting: proposed.formatting } : {}
@@ -33621,6 +34069,7 @@ function compileParagraphReplacement(entry, proposed, options) {
         {
           kind: "fragment-replace",
           summary: actionSummary,
+          ...textLeafEditableTargetHint(entry, blockRange) ? { editableTargetHint: textLeafEditableTargetHint(entry, blockRange) } : {},
           range: { from: operationRange.from, to: operationRange.to },
           fragment
         }
@@ -35543,14 +35992,17 @@ function paragraphHasBookmarkId(paragraph, bookmarkId) {
 function commandActionHandleForAddress(commandFamily, address) {
   return address ? `scope-command:${commandFamily}:${address.addressKey}` : void 0;
 }
-function withCommandAction(evidence, target) {
-  if (evidence.status !== "supported" || !target.canonicalAddress) return evidence;
+function withCommandAction(evidence, target, canonicalAddress = target.canonicalAddress) {
+  if (evidence.status !== "supported" || !canonicalAddress) return evidence;
   return {
     ...evidence,
-    actionHandle: commandActionHandleForAddress(target.commandFamily, target.canonicalAddress),
-    canonicalAddress: target.canonicalAddress
+    actionHandle: commandActionHandleForAddress(target.commandFamily, canonicalAddress),
+    canonicalAddress
   };
 }
+function commandAddressForTarget(target, scopeKind) {
+  return scopeKind === "list-item" && target.listAddress !== void 0 ? target.listAddress : target.canonicalAddress;
+}
 function runtimeTextCommandEvidence(target, workflowBlockers) {
   const shapeIssues = validateEditableTargetRef(target);
   if (shapeIssues.length > 0) {
@@ -35603,6 +36055,9 @@ var TABLE_TEXT_TARGET_KINDS2 = /* @__PURE__ */ new Set([
 var LIST_TEXT_TARGET_KINDS2 = /* @__PURE__ */ new Set([
   "paragraph-text",
   "sdt-paragraph-text",
+  "table-cell-paragraph-text",
+  "nested-table-cell-paragraph-text",
+  "sdt-table-cell-paragraph-text",
   "secondary-story-paragraph-text"
 ]);
 function tableTextScopeReplacementPosture(target) {
@@ -35653,7 +36108,7 @@ function runtimeCommandEvidence(target, workflowBlockers, textCommand, scopeKind
       intents: commandIntentsForTarget(target, scopeKind),
       reason: textCommand.reason,
       ...textCommand.blockers ? { blockers: textCommand.blockers } : {}
-    }, target);
+    }, target, commandAddressForTarget(target, scopeKind));
   }
   if (target.commandFamily === "comment-revision") {
     const isOpen = target.review?.status === "open";
@@ -43626,8 +44081,9 @@ function projectSurfaceBlocksToPageFragments(surface, pages, splits, columnByBlo
   const perPageCounter = /* @__PURE__ */ new Map();
   const fieldRegionsByParagraphIndex = buildFieldRegionsByParagraphIndex(fieldRegions);
   const generatedTargets = buildGeneratedTargets(editableTargets);
+  const numberingTargets = buildNumberingTargets(editableTargets);
   const bookmarkRanges = buildBookmarkRanges(editableTargets);
-  const numberingByParagraphIndex = buildNumberingByParagraphIndex(numberingInputs);
+  const numberingIndex = buildNumberingInputIndex(numberingInputs);
   const pushFragment = (pageIndex, fragment) => {
     const existing = byPage.get(pageIndex);
     if (existing) {
@@ -43663,8 +44119,9 @@ function projectSurfaceBlocksToPageFragments(surface, pages, splits, columnByBlo
           },
           fieldRegionsByParagraphIndex,
           generatedTargets,
+          numberingTargets,
           bookmarkRanges,
-          numberingByParagraphIndex,
+          numberingIndex,
           blockPath
         );
         continue;
@@ -43685,8 +44142,9 @@ function projectSurfaceBlocksToPageFragments(surface, pages, splits, columnByBlo
         },
         fieldRegionsByParagraphIndex,
         generatedTargets,
+        numberingTargets,
         bookmarkRanges,
-        numberingByParagraphIndex,
+        numberingIndex,
         blockPath
       );
       continue;
@@ -43718,8 +44176,9 @@ function projectSurfaceBlocksToPageFragments(surface, pages, splits, columnByBlo
         paginationRole: "whole",
         fieldRegionsByParagraphIndex,
         generatedTargets,
+        numberingTargets,
         bookmarkRanges,
-        numberingByParagraphIndex,
+        numberingIndex,
         blockPath
       }),
       ...columnIndex !== void 0 ? { columnIndex } : {}
@@ -43866,7 +44325,7 @@ function buildRunAnchorsForLine(input) {
   }
   return anchors;
 }
-function emitSlicedParagraph(block, slices, emit, fieldRegionsByParagraphIndex = /* @__PURE__ */ new Map(), generatedTargets = [], bookmarkRanges = [], numberingByParagraphIndex = /* @__PURE__ */ new Map(), blockPath) {
+function emitSlicedParagraph(block, slices, emit, fieldRegionsByParagraphIndex = /* @__PURE__ */ new Map(), generatedTargets = [], numberingTargets = [], bookmarkRanges = [], numberingIndex = EMPTY_NUMBERING_INPUT_INDEX, blockPath) {
   for (let i = 0; i < slices.length; i += 1) {
     const slice = slices[i];
     const heightTwips = slice.heightTwips ?? estimateSliceHeightFromLines(slice.lineRange);
@@ -43891,8 +44350,9 @@ function emitSlicedParagraph(block, slices, emit, fieldRegionsByParagraphIndex =
         paginationRole: slice.lineRange.from > 0 ? "continuation" : "slice",
         fieldRegionsByParagraphIndex,
         generatedTargets,
+        numberingTargets,
         bookmarkRanges,
-        numberingByParagraphIndex,
+        numberingIndex,
         blockPath
       })
     };
@@ -43913,7 +44373,7 @@ function estimateSliceHeightFromLines(lineRange) {
   const lines = Math.max(0, lineRange.to - lineRange.from);
   return lines * 240;
 }
-function emitSlicedTable(block, slices, emit, fieldRegionsByParagraphIndex = /* @__PURE__ */ new Map(), generatedTargets = [], bookmarkRanges = [], numberingByParagraphIndex = /* @__PURE__ */ new Map(), blockPath) {
+function emitSlicedTable(block, slices, emit, fieldRegionsByParagraphIndex = /* @__PURE__ */ new Map(), generatedTargets = [], numberingTargets = [], bookmarkRanges = [], numberingIndex = EMPTY_NUMBERING_INPUT_INDEX, blockPath) {
   for (let i = 0; i < slices.length; i += 1) {
     const slice = slices[i];
     const heightTwips = slice.heightTwips ?? estimateSliceHeightFromRows(slice.rowRange);
@@ -43937,8 +44397,9 @@ function emitSlicedTable(block, slices, emit, fieldRegionsByParagraphIndex = /*
         paginationRole: slice.rowRange.from > 0 ? "continuation" : "slice",
         fieldRegionsByParagraphIndex,
         generatedTargets,
+        numberingTargets,
         bookmarkRanges,
-        numberingByParagraphIndex,
+        numberingIndex,
         blockPath
       }),
       ...slice.columnIndex !== void 0 ? { columnIndex: slice.columnIndex } : {}
@@ -44012,7 +44473,8 @@ function buildFragmentLayoutObject(input) {
   const numberingRows = collectNumberingLayoutFactsForBlock(
     input.block,
     input.blockPath,
-    input.numberingByParagraphIndex
+    input.numberingIndex,
+    input.numberingTargets
   );
   const numbering = input.block.kind === "paragraph" ? numberingRows[0] : void 0;
   const fieldRegions = collectFieldRegionLayoutFacts(
@@ -44183,6 +44645,11 @@ function buildGeneratedTargets(targets) {
     (target) => target.kind === "field-result-text" || target.kind === "hyperlink-text" || target.kind === "hyperlink-destination" || target.kind === "bookmark-anchor" || target.kind === "bookmark-content-range"
   );
 }
+function buildNumberingTargets(targets) {
+  return targets.filter(
+    (target) => target.listAddress !== void 0 || target.canonicalAddress?.addressKind === "list-item-text"
+  );
+}
 function buildBookmarkRanges(targets) {
   const anchors = /* @__PURE__ */ new Map();
   const contentRanges = /* @__PURE__ */ new Map();
@@ -44230,14 +44697,27 @@ function buildBookmarkRanges(targets) {
   }
   return ranges;
 }
-function buildNumberingByParagraphIndex(numberingInputs) {
+var EMPTY_NUMBERING_INPUT_INDEX = {
+  byNumberingKey: /* @__PURE__ */ new Map(),
+  byBlockPath: /* @__PURE__ */ new Map(),
+  byParagraphIndex: /* @__PURE__ */ new Map()
+};
+function buildNumberingInputIndex(numberingInputs) {
+  const byNumberingKey = /* @__PURE__ */ new Map();
+  const byBlockPath = /* @__PURE__ */ new Map();
   const byParagraph = /* @__PURE__ */ new Map();
   for (const input of numberingInputs) {
+    if (!byNumberingKey.has(input.numberingKey)) {
+      byNumberingKey.set(input.numberingKey, input);
+    }
+    if (!byBlockPath.has(input.blockPath)) {
+      byBlockPath.set(input.blockPath, input);
+    }
     if (!byParagraph.has(input.paragraphIndex)) {
       byParagraph.set(input.paragraphIndex, input);
     }
   }
-  return byParagraph;
+  return { byNumberingKey, byBlockPath, byParagraphIndex: byParagraph };
 }
 function collectBookmarkRangeLayoutFacts(fragmentId, blockPath, bookmarkRanges) {
   if (!blockPath || !bookmarkRanges || bookmarkRanges.length === 0) return [];
@@ -44318,6 +44798,7 @@ function collectNumberingLayoutFacts(block) {
     ...block.numbering?.numberingInstanceId !== void 0 ? { numberingInstanceId: block.numbering.numberingInstanceId } : {},
     ...block.numbering?.level !== void 0 ? { level: block.numbering.level } : {},
     ...block.resolvedNumbering?.format !== void 0 ? { format: block.resolvedNumbering.format } : {},
+    ...block.resolvedNumbering?.formatPosture !== void 0 ? { formatPosture: { ...block.resolvedNumbering.formatPosture } } : {},
     ...block.numberingPrefix !== void 0 ? { markerText: block.numberingPrefix } : {},
     ...block.numberingSuffix !== void 0 ? { markerSuffix: block.numberingSuffix } : {},
     ...block.resolvedNumbering?.geometry.markerJustification !== void 0 ? { markerJustification: block.resolvedNumbering.geometry.markerJustification } : {},
@@ -44345,15 +44826,21 @@ function collectNumberingLayoutFacts(block) {
     } : {}
   };
 }
-function collectNumberingLayoutFactsForBlock(block, blockPath, numberingByParagraphIndex) {
+function collectNumberingLayoutFactsForBlock(block, blockPath, numberingIndex, numberingTargets = []) {
   const rows = [];
   const seen = /* @__PURE__ */ new Set();
   visitParagraphBlocks(block, (paragraph, context) => {
     const numbering = collectNumberingLayoutFacts(paragraph);
     if (!numbering) return;
     const paragraphIndex = parseParagraphBlockIndex(paragraph.blockId);
-    const canonical = paragraphIndex !== void 0 ? numberingByParagraphIndex?.get(paragraphIndex) : void 0;
     const numberingKey = context.path !== void 0 ? `main:${context.path}:numbering` : void 0;
+    const canonical = lookupNumberingInput(
+      numberingIndex,
+      numberingKey,
+      context.path,
+      paragraphIndex
+    );
+    const target = findNumberingTarget(numberingTargets, context.path);
     const numberingLayoutId = numberingKey ?? [
       "numbering",
       paragraph.blockId,
@@ -44362,6 +44849,7 @@ function collectNumberingLayoutFactsForBlock(block, blockPath, numberingByParagr
     ].join(":");
     if (seen.has(numberingLayoutId)) return;
     seen.add(numberingLayoutId);
+    const unavailableReasons = collectNumberingUnavailableReasons(numbering, canonical);
     rows.push({
       numberingLayoutId,
       ...numberingKey !== void 0 ? { numberingKey } : {},
@@ -44369,6 +44857,10 @@ function collectNumberingLayoutFactsForBlock(block, blockPath, numberingByParagr
       ...canonical?.blockPath !== void 0 ? { sourceBlockPath: canonical.blockPath } : context.path !== void 0 ? { sourceBlockPath: context.path } : {},
       sourceBlockId: paragraph.blockId,
       ...paragraphIndex !== void 0 ? { paragraphIndex } : {},
+      ...target?.targetKey !== void 0 ? { targetKey: target.targetKey } : {},
+      ...target?.kind !== void 0 ? { targetKind: target.kind } : {},
+      ...target?.canonicalAddress?.addressKey !== void 0 ? { canonicalAddressKey: target.canonicalAddress.addressKey } : {},
+      ...target?.listAddress?.addressKey !== void 0 ? { listAddressKey: target.listAddress.addressKey } : {},
       ...canonical?.sourceRef !== void 0 ? { sourceRef: { ...canonical.sourceRef } } : {},
       ...canonical?.numberingSourceRef !== void 0 ? { numberingSourceRef: { ...canonical.numberingSourceRef } } : {},
       ...canonical?.numberingOrigin !== void 0 ? { numberingOrigin: canonical.numberingOrigin } : {},
@@ -44376,11 +44868,41 @@ function collectNumberingLayoutFactsForBlock(block, blockPath, numberingByParagr
       ...canonical?.numberingInstanceSourceRef !== void 0 ? { numberingInstanceSourceRef: { ...canonical.numberingInstanceSourceRef } } : {},
       ...canonical?.abstractNumberingId !== void 0 ? { abstractNumberingId: canonical.abstractNumberingId } : {},
       ...canonical?.abstractNumberingSourceRef !== void 0 ? { abstractNumberingSourceRef: { ...canonical.abstractNumberingSourceRef } } : {},
-      ...numbering
+      ...numbering,
+      ...unavailableReasons.length > 0 ? { unavailableReasons } : {}
     });
   }, blockPath);
   return rows;
 }
+function findNumberingTarget(numberingTargets, blockPath) {
+  if (blockPath === void 0) return void 0;
+  return numberingTargets.find((target) => target.blockPath === blockPath);
+}
+function lookupNumberingInput(numberingIndex, numberingKey, blockPath, paragraphIndex) {
+  if (!numberingIndex) return void 0;
+  if (numberingKey !== void 0) {
+    const byKey = numberingIndex.byNumberingKey.get(numberingKey);
+    if (byKey !== void 0) return byKey;
+  }
+  if (blockPath !== void 0) {
+    const byPath = numberingIndex.byBlockPath.get(blockPath);
+    if (byPath !== void 0) return byPath;
+  }
+  return paragraphIndex !== void 0 ? numberingIndex.byParagraphIndex.get(paragraphIndex) : void 0;
+}
+function collectNumberingUnavailableReasons(numbering, canonical) {
+  const reasons = [];
+  if (canonical === void 0) {
+    reasons.push("canonical-numbering-input-missing");
+  }
+  if (numbering.markerLane === void 0) {
+    reasons.push("numbering-marker-lane-unavailable");
+  }
+  if (numbering.textColumn === void 0) {
+    reasons.push("numbering-text-column-unavailable");
+  }
+  return reasons;
+}
 function findPageIndexForOffset(pages, offset) {
   for (let i = 0; i < pages.length; i += 1) {
     const page = pages[i];
@@ -48354,6 +48876,16 @@ function createLayoutFacet(input) {
   function currentGraph() {
     return engine.getPageGraph(getQueryInput());
   }
+  function fullGraphForViewportIndependentReads() {
+    const query = getQueryInput();
+    if (!query.viewportPageWindow) {
+      return engine.getPageGraph(query);
+    }
+    return engine.getPageGraph({
+      document: query.document,
+      ...query.viewState ? { viewState: query.viewState } : {}
+    });
+  }
   function currentMapper() {
     return engine.getFragmentMapper(getQueryInput());
   }
@@ -48491,7 +49023,7 @@ function createLayoutFacet(input) {
       return graph.sections.map((section) => toPublicSectionNode(graph, section.index)).filter((node) => node !== null);
     },
     getPageForOffset(offset, story) {
-      const graph = currentGraph();
+      const graph = fullGraphForViewportIndependentReads();
       const page = findPageForOffsetAndStory(graph, offset, story);
       return page ? toPublicPageNode(page, graph) : null;
     },
@@ -48803,7 +49335,7 @@ function createLayoutFacet(input) {
       return null;
     },
     getBlockHeightsTwips() {
-      const graph = currentGraph();
+      const graph = fullGraphForViewportIndependentReads();
       if (blockHeightsCache.revision === graph.revision && blockHeightsCache.map) {
         return blockHeightsCache.map;
       }
@@ -52259,7 +52791,8 @@ function rejectCommand(code, message) {
   };
 }
 function sameResolvedTarget2(left, right) {
-  return left.kind === right.kind && left.storyKey === right.storyKey && left.blockPath === right.blockPath && left.leafPath === right.leafPath && left.commandFamily === right.commandFamily && left.editability === right.editability && sameTextTargetStaleCheck(left, right) && left.staleCheck.inlineCount === right.staleCheck.inlineCount && left.staleCheck.targetHash === right.staleCheck.targetHash && left.staleCheck.targetTextLength === right.staleCheck.targetTextLength && left.staleCheck.childCount === right.staleCheck.childCount && left.staleCheck.blockType === right.staleCheck.blockType && left.staleCheck.wordParaId === right.staleCheck.wordParaId && left.staleCheck.wordTextId === right.staleCheck.wordTextId && jsonStable(left.staleCheck.sourceRef) === jsonStable(right.staleCheck.sourceRef) && jsonStable(left.sourceRef) === jsonStable(right.sourceRef) && jsonStable(left.table) === jsonStable(right.table) && jsonStable(left.editableOwner) === jsonStable(right.editableOwner);
+  const textTargetLengthDrift = hasTextTargetLengthDrift(left, right);
+  return left.kind === right.kind && left.storyKey === right.storyKey && left.blockPath === right.blockPath && left.leafPath === right.leafPath && left.commandFamily === right.commandFamily && left.editability === right.editability && sameTextTargetStaleCheck(left, right) && left.staleCheck.inlineCount === right.staleCheck.inlineCount && left.staleCheck.targetHash === right.staleCheck.targetHash && left.staleCheck.targetTextLength === right.staleCheck.targetTextLength && left.staleCheck.childCount === right.staleCheck.childCount && left.staleCheck.blockType === right.staleCheck.blockType && left.staleCheck.wordParaId === right.staleCheck.wordParaId && left.staleCheck.wordTextId === right.staleCheck.wordTextId && (textTargetLengthDrift || jsonStable2(left.staleCheck.sourceRef) === jsonStable2(right.staleCheck.sourceRef)) && (textTargetLengthDrift || jsonStable2(left.sourceRef) === jsonStable2(right.sourceRef)) && jsonStable2(left.table) === jsonStable2(right.table) && jsonStable2(left.editableOwner) === jsonStable2(right.editableOwner);
 }
 function sameTextTargetStaleCheck(left, right) {
   if (left.staleCheck.paragraphTextHash === right.staleCheck.paragraphTextHash && left.staleCheck.paragraphTextLength === right.staleCheck.paragraphTextLength) {
@@ -52267,6 +52800,9 @@ function sameTextTargetStaleCheck(left, right) {
   }
   return left.commandFamily === "text-leaf" && left.staleCheck.paragraphTextLength !== void 0 && right.staleCheck.paragraphTextLength !== void 0 && left.staleCheck.paragraphTextLength !== right.staleCheck.paragraphTextLength;
 }
+function hasTextTargetLengthDrift(left, right) {
+  return left.commandFamily === "text-leaf" && left.staleCheck.paragraphTextLength !== void 0 && right.staleCheck.paragraphTextLength !== void 0 && left.staleCheck.paragraphTextLength !== right.staleCheck.paragraphTextLength;
+}
 function locateTargetRange(document2, surface, target) {
   if (target.kind === "hyperlink-text") {
     return locateHyperlinkDisplayRange(document2, surface, target);
@@ -52297,19 +52833,19 @@ function locateTargetRange(document2, surface, target) {
     if (!sdt || sdt.kind !== "sdt_block") return null;
     const paragraph = sdt.children[sdtPath.childIndex];
     if (!paragraph || paragraph.kind !== "paragraph") return null;
-    return { from: paragraph.from, to: paragraph.to };
+    return textLeafTargetRange(target, paragraph.from, paragraph.to);
   }
   const paragraphPath = parseTopLevelParagraphPath(target.blockPath);
   if (paragraphPath) {
     const paragraph = surface[paragraphPath.blockIndex];
     if (!paragraph || paragraph.kind !== "paragraph") return null;
-    return { from: paragraph.from, to: paragraph.to };
+    return textLeafTargetRange(target, paragraph.from, paragraph.to);
   }
   const secondaryParagraphPath = parseSecondaryStoryParagraphPath(target.blockPath);
   if (secondaryParagraphPath) {
     const paragraph = surface[secondaryParagraphPath.blockIndex];
     if (!paragraph || paragraph.kind !== "paragraph") return null;
-    return { from: paragraph.from, to: paragraph.to };
+    return textLeafTargetRange(target, paragraph.from, paragraph.to);
   }
   if (target.kind === "textbox-paragraph-text") {
     return {
@@ -52325,6 +52861,18 @@ function locateTargetRange(document2, surface, target) {
   }
   return null;
 }
+function textLeafTargetRange(target, from, to) {
+  return {
+    from,
+    to,
+    textTarget: {
+      kind: "text-leaf",
+      blockPath: target.blockPath,
+      paragraphStart: from,
+      paragraphEnd: to
+    }
+  };
+}
 function locateHyperlinkDisplayRange(document2, surface, target) {
   const canonical = resolveHyperlinkDisplayPath(document2, target.blockPath);
   if (!canonical) return null;
@@ -52546,7 +53094,7 @@ function resolveBlockPathInSurfaceBlocks2(blocks, tokens, tokenIndex, hasVertica
     hasVerticalMergeContinuation || cell.verticalMerge === "continue"
   );
 }
-function jsonStable(value) {
+function jsonStable2(value) {
   return value === void 0 ? "" : JSON.stringify(value);
 }
 
@@ -52683,20 +53231,20 @@ function tableAnchorCell(table) {
   };
 }
 function sameResolvedTableStructureTarget(left, right) {
-  return left.kind === right.kind && left.storyKey === right.storyKey && left.blockPath === right.blockPath && left.leafPath === right.leafPath && left.commandFamily === right.commandFamily && left.editability === right.editability && left.staleCheck.targetHash === right.staleCheck.targetHash && left.staleCheck.childCount === right.staleCheck.childCount && left.staleCheck.blockType === right.staleCheck.blockType && jsonStable2(left.staleCheck.sourceRef) === jsonStable2(right.staleCheck.sourceRef) && jsonStable2(left.sourceRef) === jsonStable2(right.sourceRef) && jsonStable2(left.table) === jsonStable2(right.table);
+  return left.kind === right.kind && left.storyKey === right.storyKey && left.blockPath === right.blockPath && left.leafPath === right.leafPath && left.commandFamily === right.commandFamily && left.editability === right.editability && left.staleCheck.targetHash === right.staleCheck.targetHash && left.staleCheck.childCount === right.staleCheck.childCount && left.staleCheck.blockType === right.staleCheck.blockType && jsonStable3(left.staleCheck.sourceRef) === jsonStable3(right.staleCheck.sourceRef) && jsonStable3(left.sourceRef) === jsonStable3(right.sourceRef) && jsonStable3(left.table) === jsonStable3(right.table);
 }
-function jsonStable2(value) {
-  return JSON.stringify(sortJson(value));
+function jsonStable3(value) {
+  return JSON.stringify(sortJson2(value));
 }
-function sortJson(value) {
+function sortJson2(value) {
   if (Array.isArray(value)) {
-    return value.map(sortJson);
+    return value.map(sortJson2);
   }
   if (value && typeof value === "object") {
     const record = value;
     const sorted = {};
     for (const key of Object.keys(record).sort()) {
-      sorted[key] = sortJson(record[key]);
+      sorted[key] = sortJson2(record[key]);
     }
     return sorted;
   }
@@ -52705,6 +53253,8 @@ function sortJson(value) {
 
 // src/runtime/document-runtime.ts
 var CANONICAL_BLOCK_REFS_SYMBOL2 = /* @__PURE__ */ Symbol.for("wre.canonical-block-refs");
+var LOCAL_TEXT_PATCH_MAX_SHIFTED_SURFACE_NODES = 5e3;
+var LOCAL_TEXT_PATCH_MAX_SHIFTED_NODES_PER_BLOCK = 256;
 function getLocalTextPatchMetadata(mapping) {
   const metadata = mapping.metadata?.localTextPatch;
   if (!metadata || typeof metadata !== "object") {
@@ -52877,8 +53427,10 @@ function createDocumentRuntime(options) {
   void upgradeMeasurementProvider(layoutEngine, fontLoader);
   let renderKernelRef = null;
   let runtimeRef = null;
+  const normalizedInitialSurfaceViewportRanges = options.initialSurfaceViewportBlockRanges && options.initialSurfaceViewportBlockRanges.length > 0 ? normalizeViewportRanges(options.initialSurfaceViewportBlockRanges) : null;
+  let initialSurfaceViewportBlockRanges = normalizedInitialSurfaceViewportRanges && normalizedInitialSurfaceViewportRanges.length > 0 ? normalizedInitialSurfaceViewportRanges : null;
   let viewportBlockRanges = null;
-  let viewportRangesKey = serializeViewportRanges(null);
+  let viewportRangesKey = serializeViewportRanges(viewportBlockRanges);
   let viewportBlocksPerPageEstimate = null;
   const EDITING_CORRIDOR_BLOCK_RADIUS = 8;
   const getRuntimeForLayoutFacet = () => {
@@ -53118,10 +53670,11 @@ function createDocumentRuntime(options) {
   const cachedContextAnalyticsSnapshots = /* @__PURE__ */ new Map();
   let lastEmittedContextAnalyticsSnapshots;
   function getCachedFullSurface(document2, nextActiveStory) {
-    const activeStoryKey = storyTargetKey(nextActiveStory);
-    if (cachedFullSurface && cachedFullSurface.content === document2.content && cachedFullSurface.subParts === document2.subParts && cachedFullSurface.styles === document2.styles && cachedFullSurface.numbering === document2.numbering && cachedFullSurface.media === document2.media && cachedFullSurface.preservation === document2.preservation && cachedFullSurface.review === document2.review && cachedFullSurface.effectiveMarkupModeProvider === effectiveMarkupModeProvider && cachedFullSurface.activeStoryKey === activeStoryKey) {
-      return cachedFullSurface.snapshot;
+    const cached = getReusableCachedFullSurface(document2, nextActiveStory);
+    if (cached) {
+      return cached;
     }
+    const activeStoryKey = storyTargetKey(nextActiveStory);
     const snapshot = createEditorSurfaceSnapshot(document2, state.selection, nextActiveStory, {
       viewportBlockRanges: null,
       editableTargetsByBlockPath: getEditableTargetsByBlockPath(document2),
@@ -53143,6 +53696,13 @@ function createDocumentRuntime(options) {
     };
     return snapshot;
   }
+  function getReusableCachedFullSurface(document2, nextActiveStory) {
+    const activeStoryKey = storyTargetKey(nextActiveStory);
+    if (cachedFullSurface && cachedFullSurface.content === document2.content && cachedFullSurface.subParts === document2.subParts && cachedFullSurface.styles === document2.styles && cachedFullSurface.numbering === document2.numbering && cachedFullSurface.media === document2.media && cachedFullSurface.preservation === document2.preservation && cachedFullSurface.review === document2.review && cachedFullSurface.effectiveMarkupModeProvider === effectiveMarkupModeProvider && cachedFullSurface.activeStoryKey === activeStoryKey) {
+      return cachedFullSurface.snapshot;
+    }
+    return void 0;
+  }
   function getCachedSurface(document2, nextActiveStory, options2 = {}) {
     const activeStoryKey = storyTargetKey(nextActiveStory);
     const surfaceViewportRanges = "viewportBlockRangesOverride" in options2 ? options2.viewportBlockRangesOverride ?? null : viewportBlockRanges;
@@ -53153,12 +53713,20 @@ function createDocumentRuntime(options) {
     }
     const snapshot = createEditorSurfaceSnapshot(document2, state.selection, nextActiveStory, {
       viewportBlockRanges: surfaceViewportRanges,
-      editableTargetsByBlockPath: options2.editableTargetsByBlockPathOverride ?? getEditableTargetsByBlockPath(document2),
+      editableTargetsByBlockPath: options2.editableTargetsByBlockPathOverride ?? getEditableTargetsByBlockPathForRanges(
+        document2,
+        activeStoryKey,
+        surfaceViewportRanges
+      ),
       ...effectiveMarkupModeProvider ? { getEffectiveMarkupMode: effectiveMarkupModeProvider } : {}
     });
     recordPerfSample("snapshot.surface");
     incrementInvalidationCounter("runtime.snapshot.surfaceMisses");
-    const enrichedSnapshot = options2.enrichCulledPlaceholders === false ? snapshot : enrichCulledPlaceholdersWithHeights(snapshot);
+    const enrichedSnapshot = options2.enrichCulledPlaceholders === false ? snapshot : enrichCulledPlaceholdersWithHeights(
+      snapshot,
+      document2,
+      nextActiveStory
+    );
     if (surfaceViewportRanges === null) {
       cachedFullSurface = {
         content: document2.content,
@@ -53216,7 +53784,7 @@ function createDocumentRuntime(options) {
     }
     return -1;
   }
-  function cachePatchedLocalTextSurface(surface) {
+  function cachePatchedLocalTextSurface(surface, fullSurfaceForCache) {
     const activeStoryKey = storyTargetKey(activeStory);
     const rangesKey = serializeViewportRanges(surface.viewportBlockRanges);
     cachedSurface = {
@@ -53232,7 +53800,8 @@ function createDocumentRuntime(options) {
       viewportRangesKey: rangesKey,
       snapshot: surface
     };
-    if (surface.viewportBlockRanges === null) {
+    const fullSurface = fullSurfaceForCache ?? (surface.viewportBlockRanges === null ? surface : void 0);
+    if (fullSurface) {
       cachedFullSurface = {
         content: state.document.content,
         subParts: state.document.subParts,
@@ -53243,11 +53812,15 @@ function createDocumentRuntime(options) {
         review: state.document.review,
         effectiveMarkupModeProvider,
         activeStoryKey,
-        snapshot: surface
+        snapshot: fullSurface
       };
     }
     cachedSurfaceFingerprint = `${activeStoryKey}|${rangesKey}|${String(state.selection.anchor)}:${String(state.selection.head)}`;
   }
+  function createLocalTextCorridorSurfaceFromFullSurface(fullSurface) {
+    const ranges = getSelectionCorridorViewportRanges(fullSurface);
+    return ranges ? createViewportCulledSurfaceFromFullSurface(fullSurface, ranges) : fullSurface;
+  }
   function tryPatchLocalTextSurface(previousSurface, mapping) {
     const tTotal0 = performance.now();
     try {
@@ -53283,6 +53856,13 @@ function createDocumentRuntime(options) {
         perfCounters.increment("surface.localText.patchMiss");
         return null;
       }
+      const shiftBudget = estimateLocalTextPatchShiftBudget(previousSurface.blocks, blockIndex + 1);
+      perfCounters.increment("surface.localText.shiftedBlocks", shiftBudget.shiftedBlocks);
+      perfCounters.increment("surface.localText.shiftedNodes", shiftBudget.shiftedNodes);
+      if (!shiftBudget.withinBudget) {
+        perfCounters.increment("surface.localText.patchBudgetFallback");
+        return null;
+      }
       const segmentIndex = block.segments.findIndex(
         (segment2) => segment2.kind === "text" && editFrom >= segment2.from && editTo <= segment2.to
       );
@@ -53390,7 +53970,83 @@ function createDocumentRuntime(options) {
         };
     }
   }
-  function enrichCulledPlaceholdersWithHeights(snapshot) {
+  function estimateLocalTextPatchShiftBudget(blocks, startIndex) {
+    const shiftedBlocks = Math.max(0, blocks.length - startIndex);
+    let shiftedNodes = 0;
+    for (let index = startIndex; index < blocks.length; index += 1) {
+      const shiftedBlockNodes = countSurfaceShiftNodesUpTo(
+        blocks[index],
+        Math.min(
+          LOCAL_TEXT_PATCH_MAX_SHIFTED_NODES_PER_BLOCK,
+          LOCAL_TEXT_PATCH_MAX_SHIFTED_SURFACE_NODES - shiftedNodes
+        ) + 1
+      );
+      shiftedNodes += shiftedBlockNodes;
+      if (shiftedBlockNodes > LOCAL_TEXT_PATCH_MAX_SHIFTED_NODES_PER_BLOCK) {
+        return {
+          shiftedBlocks,
+          shiftedNodes,
+          withinBudget: false
+        };
+      }
+      if (shiftedNodes > LOCAL_TEXT_PATCH_MAX_SHIFTED_SURFACE_NODES) {
+        return {
+          shiftedBlocks,
+          shiftedNodes,
+          withinBudget: false
+        };
+      }
+    }
+    return {
+      shiftedBlocks,
+      shiftedNodes,
+      withinBudget: true
+    };
+  }
+  function countSurfaceShiftNodesUpTo(block, limit) {
+    if (limit <= 0) {
+      return 1;
+    }
+    switch (block.kind) {
+      case "paragraph":
+        return 1 + block.segments.length;
+      case "opaque_block":
+        return 1;
+      case "sdt_block": {
+        let total = 1;
+        for (const child of block.children) {
+          total += countSurfaceShiftNodesUpTo(child, limit - total);
+          if (total > limit) {
+            return total;
+          }
+        }
+        return total;
+      }
+      case "table": {
+        let total = 1;
+        for (const row2 of block.rows) {
+          total += 1;
+          if (total > limit) {
+            return total;
+          }
+          for (const cell of row2.cells) {
+            total += 1;
+            if (total > limit) {
+              return total;
+            }
+            for (const child of cell.content) {
+              total += countSurfaceShiftNodesUpTo(child, limit - total);
+              if (total > limit) {
+                return total;
+              }
+            }
+          }
+        }
+        return total;
+      }
+    }
+  }
+  function enrichCulledPlaceholdersWithHeights(snapshot, document2, nextActiveStory, fullSurfaceForPlaceholders) {
     let heights;
     try {
       heights = layoutFacet.getBlockHeightsTwips();
@@ -53398,17 +54054,19 @@ function createDocumentRuntime(options) {
       return snapshot;
     }
     if (heights.size === 0) return snapshot;
+    const fullSurface = fullSurfaceForPlaceholders ?? getReusableCachedFullSurface(document2, nextActiveStory);
+    if (!fullSurface) return snapshot;
     let changed = false;
     const enrichedBlocks = snapshot.blocks.map((block) => {
       if (block.kind !== "opaque_block" || block.state !== "placeholder-culled") {
         return block;
       }
-      const realBlockIdFromOffset = resolveBlockIdFromRuntimeOffset(
-        layoutFacet,
-        block.from
+      const realBlock = resolveFullSurfaceBlockForPlaceholder(
+        fullSurface,
+        block
       );
-      if (!realBlockIdFromOffset) return block;
-      const heightTwips = heights.get(realBlockIdFromOffset);
+      if (!realBlock) return block;
+      const heightTwips = heights.get(realBlock.blockId);
       if (typeof heightTwips !== "number" || heightTwips <= 0) return block;
       changed = true;
       return { ...block, placeholderHeightTwips: heightTwips };
@@ -53416,13 +54074,20 @@ function createDocumentRuntime(options) {
     if (!changed) return snapshot;
     return { ...snapshot, blocks: enrichedBlocks };
   }
-  function resolveBlockIdFromRuntimeOffset(facet, runtimeOffset) {
-    try {
-      const frag = facet.getFragmentForOffset?.(runtimeOffset);
-      return frag?.blockId ?? null;
-    } catch {
-      return null;
+  function resolveFullSurfaceBlockForPlaceholder(fullSurface, placeholder) {
+    const index = parsePlaceholderCulledIndex(placeholder.blockId);
+    if (index !== null) {
+      return fullSurface.blocks[index] ?? null;
     }
+    return fullSurface.blocks.find(
+      (block) => block.from === placeholder.from && block.to === placeholder.to
+    ) ?? null;
+  }
+  function parsePlaceholderCulledIndex(blockId) {
+    const match = /^placeholder-culled-(\d+)$/.exec(blockId);
+    if (!match) return null;
+    const index = Number(match[1]);
+    return Number.isSafeInteger(index) ? index : null;
   }
   function getCachedFieldSnapshot(document2) {
     const blockCount = document2.content.children.length;
@@ -53987,7 +54652,14 @@ function createDocumentRuntime(options) {
       revisionToken: state.revisionToken
     });
     perfCounters.increment("refresh.all");
-    const surface = timeFacet("surface", () => getCachedSurface(state.document, activeStory));
+    const firstSurfaceViewportBlockRanges = initialSurfaceViewportBlockRanges;
+    initialSurfaceViewportBlockRanges = null;
+    const surface = timeFacet(
+      "surface",
+      () => firstSurfaceViewportBlockRanges ? getCachedSurface(state.document, activeStory, {
+        viewportBlockRangesOverride: firstSurfaceViewportBlockRanges
+      }) : getCachedSurface(state.document, activeStory)
+    );
     const snapshot = {
       documentId: state.documentId,
       sessionId: state.sessionId,
@@ -54085,8 +54757,10 @@ function createDocumentRuntime(options) {
     if (options2.forceProjection) {
       cachedFullSurface = void 0;
     }
-    const newSurface = viewportBlockRanges !== null && options2.forceProjection !== true ? createViewportCulledSurfaceFromFullSurface(
-      getCachedFullSurface(state.document, activeStory),
+    const reusableFullSurface = viewportBlockRanges !== null && options2.forceProjection !== true ? getReusableCachedFullSurface(state.document, activeStory) : void 0;
+    const derivedFromFull = viewportBlockRanges !== null && reusableFullSurface !== void 0;
+    const projectedSurface = derivedFromFull ? createViewportCulledSurfaceFromFullSurface(
+      reusableFullSurface,
       viewportBlockRanges
     ) : createEditorSurfaceSnapshot(
       state.document,
@@ -54094,11 +54768,21 @@ function createDocumentRuntime(options) {
       activeStory,
       {
         viewportBlockRanges,
-        editableTargetsByBlockPath: getEditableTargetsByBlockPath(state.document),
+        editableTargetsByBlockPath: getEditableTargetsByBlockPathForRanges(
+          state.document,
+          activeStoryKey,
+          viewportBlockRanges
+        ),
         ...effectiveMarkupModeProvider ? { getEffectiveMarkupMode: effectiveMarkupModeProvider } : {}
       }
     );
-    if (viewportBlockRanges !== null && options2.forceProjection !== true) {
+    const newSurface = viewportBlockRanges !== null ? enrichCulledPlaceholdersWithHeights(
+      projectedSurface,
+      state.document,
+      activeStory,
+      reusableFullSurface
+    ) : projectedSurface;
+    if (derivedFromFull) {
       perfCounters.increment("runtime.viewport.derivedSurfaceRefreshes");
     } else {
       recordPerfSample("snapshot.surface");
@@ -54642,6 +55326,8 @@ function createDocumentRuntime(options) {
           documentMode: workflowCoordinator.getEffectiveDocumentMode(commandSelection),
           defaultAuthorId: defaultAuthorId ?? void 0,
           renderSnapshot: cachedRenderSnapshot,
+          activeStoryKey: canonicalEditableTargetStoryKey(activeStory),
+          editableTargetCache: editableTargetBlockCache,
           ...resolvedFragmentTextTarget ? { textTarget: resolvedFragmentTextTarget } : {}
         };
         const preSelection = commandSelection;
@@ -55169,12 +55855,86 @@ function createDocumentRuntime(options) {
       }
     },
     applyScopeReplacement(plan) {
+      const resolveEditableTargetHint = (hint) => {
+        if (!hint) return void 0;
+        const activeStoryKey = storyTargetKey(activeStory);
+        if (hint.storyKey !== activeStoryKey) return null;
+        const currentTargets = collectEditableTargetRefs(
+          state.document,
+          editableTargetBlockCache
+        );
+        const target = currentTargets.find(
+          (target2) => target2.storyKey === hint.storyKey && target2.blockPath === hint.blockPath && target2.commandFamily === "text-leaf"
+        );
+        if (!target) return null;
+        const fallbackTextTarget = {
+          kind: "text-leaf",
+          blockPath: target.blockPath,
+          paragraphStart: hint.semanticBlockRange.from,
+          paragraphEnd: hint.semanticBlockRange.to
+        };
+        const resolved = resolveEditableTextTarget({
+          document: state.document,
+          surface: cachedRenderSnapshot.surface?.blocks ?? [],
+          target,
+          activeStoryKey,
+          editableTargetCache: editableTargetBlockCache
+        });
+        if (resolved.kind === "rejected") {
+          return {
+            textTarget: fallbackTextTarget,
+            range: hint.semanticBlockRange
+          };
+        }
+        return {
+          target,
+          textTarget: resolved.textTarget ?? fallbackTextTarget,
+          range: resolved.range
+        };
+      };
+      const mapSemanticStepRangeToEditableTarget = (stepRange, hint, editableRange) => {
+        if (!hint || !editableRange) return stepRange;
+        const semanticFrom = hint.semanticBlockRange.from;
+        const semanticTo = hint.semanticBlockRange.to;
+        const localFrom = Math.max(0, stepRange.from - semanticFrom);
+        const localTo = Math.max(localFrom, stepRange.to - semanticFrom);
+        const semanticLength = Math.max(0, semanticTo - semanticFrom);
+        const editableLength = Math.max(0, editableRange.to - editableRange.from);
+        if (semanticLength === editableLength) {
+          return {
+            from: editableRange.from + localFrom,
+            to: editableRange.from + localTo
+          };
+        }
+        if (stepRange.from === semanticFrom && stepRange.to === semanticTo) {
+          return editableRange;
+        }
+        return stepRange;
+      };
       for (const step of plan.steps) {
         if (step.kind === "text-replace" && step.range && typeof step.text === "string") {
+          const editableTarget = resolveEditableTargetHint(step.editableTargetHint);
+          if (editableTarget === null) {
+            emit({
+              type: "command_blocked",
+              documentId: state.documentId,
+              command: "applyScopeReplacement",
+              reasons: [{
+                code: "unsupported_surface",
+                message: "Scope replacement editable target no longer resolves."
+              }]
+            });
+            continue;
+          }
+          const dispatchRange = mapSemanticStepRangeToEditableTarget(
+            step.range,
+            step.editableTargetHint,
+            editableTarget?.range
+          );
           const anchor = {
             kind: "range",
-            from: step.range.from,
-            to: step.range.to,
+            from: dispatchRange.from,
+            to: dispatchRange.to,
             assoc: { start: -1, end: 1 }
           };
           const timestamp = clock();
@@ -55183,6 +55943,8 @@ function createDocumentRuntime(options) {
               {
                 type: "text.insert",
                 text: step.text,
+                ...editableTarget?.target ? { editableTarget: editableTarget.target } : {},
+                ...editableTarget?.textTarget ? { textTarget: editableTarget.textTarget } : {},
                 ...step.formatting ? { formatting: step.formatting } : {},
                 origin: createOrigin("api", timestamp)
               },
@@ -55220,10 +55982,28 @@ function createDocumentRuntime(options) {
             emitError(toRuntimeError(error));
           }
         } else if (step.kind === "text-insert-tracked" && step.range && typeof step.text === "string") {
+          const editableTarget = resolveEditableTargetHint(step.editableTargetHint);
+          if (editableTarget === null) {
+            emit({
+              type: "command_blocked",
+              documentId: state.documentId,
+              command: "applyScopeReplacement",
+              reasons: [{
+                code: "unsupported_surface",
+                message: "Scope replacement editable target no longer resolves."
+              }]
+            });
+            continue;
+          }
+          const dispatchRange = mapSemanticStepRangeToEditableTarget(
+            step.range,
+            step.editableTargetHint,
+            editableTarget?.range
+          );
           const anchor = {
             kind: "range",
-            from: step.range.from,
-            to: step.range.to,
+            from: dispatchRange.from,
+            to: dispatchRange.to,
             assoc: { start: -1, end: 1 }
           };
           const timestamp = clock();
@@ -55232,6 +56012,8 @@ function createDocumentRuntime(options) {
               {
                 type: "text.insert",
                 text: step.text,
+                ...editableTarget?.target ? { editableTarget: editableTarget.target } : {},
+                ...editableTarget?.textTarget ? { textTarget: editableTarget.textTarget } : {},
                 ...step.formatting ? { formatting: step.formatting } : {},
                 origin: createOrigin("api", timestamp)
               },
@@ -55246,10 +56028,28 @@ function createDocumentRuntime(options) {
             emitError(toRuntimeError(error));
           }
         } else if (step.kind === "text-delete-tracked" && step.range && step.range.to > step.range.from) {
+          const editableTarget = resolveEditableTargetHint(step.editableTargetHint);
+          if (editableTarget === null) {
+            emit({
+              type: "command_blocked",
+              documentId: state.documentId,
+              command: "applyScopeReplacement",
+              reasons: [{
+                code: "unsupported_surface",
+                message: "Scope replacement editable target no longer resolves."
+              }]
+            });
+            continue;
+          }
+          const dispatchRange = mapSemanticStepRangeToEditableTarget(
+            step.range,
+            step.editableTargetHint,
+            editableTarget?.range
+          );
           const anchor = {
             kind: "range",
-            from: step.range.from,
-            to: step.range.to,
+            from: dispatchRange.from,
+            to: dispatchRange.to,
             assoc: { start: -1, end: 1 }
           };
           const timestamp = clock();
@@ -55257,6 +56057,8 @@ function createDocumentRuntime(options) {
             applyTextCommandInActiveStory(
               {
                 type: "text.delete-forward",
+                ...editableTarget?.target ? { editableTarget: editableTarget.target } : {},
+                ...editableTarget?.textTarget ? { textTarget: editableTarget.textTarget } : {},
                 origin: createOrigin("api", timestamp)
               },
               {
@@ -56777,9 +57579,13 @@ function createDocumentRuntime(options) {
       applyViewportRanges(getSelectionCorridorViewportRanges(cachedRenderSnapshot.surface));
     }
     const tValidation0 = performance.now();
-    const patchedLocalTextSurface = useLocalTextCommitSnapshot ? tryPatchLocalTextSurface(cachedRenderSnapshot.surface, transaction.mapping) : null;
+    const patchedFullLocalTextSurface = useLocalTextCommitSnapshot ? tryPatchLocalTextSurface(cachedRenderSnapshot.surface, transaction.mapping) : null;
+    const patchedLocalTextSurface = patchedFullLocalTextSurface ? createLocalTextCorridorSurfaceFromFullSurface(patchedFullLocalTextSurface) : null;
     if (patchedLocalTextSurface) {
-      cachePatchedLocalTextSurface(patchedLocalTextSurface);
+      cachePatchedLocalTextSurface(
+        patchedLocalTextSurface,
+        patchedFullLocalTextSurface ?? void 0
+      );
       perfCounters.increment("commit.localTextValidation.storySizeOnly");
     }
     const localTextViewportRanges = useLocalTextCommitSnapshot && !patchedLocalTextSurface ? getSelectionCorridorViewportRanges(cachedRenderSnapshot.surface) : void 0;
@@ -56819,7 +57625,8 @@ function createDocumentRuntime(options) {
     cachedRenderSnapshot = useLocalTextCommitSnapshot ? refreshLocalTextCommitSnapshot(surfaceForValidation, transaction.mapping) : refreshRenderSnapshot();
     perfCounters.increment("commit.refresh.us", Math.round((performance.now() - tRefresh0) * 1e3));
     const tNotify0 = performance.now();
-    deferNextContextAnalyticsEmit = useLocalTextCommitSnapshot;
+    const shouldDeferContextAnalyticsEmit = transaction.markDirty && transaction.mapping.steps.length > 0;
+    deferNextContextAnalyticsEmit = shouldDeferContextAnalyticsEmit;
     try {
       notify(previous, state, {
         ...transaction,
@@ -57120,6 +57927,8 @@ function createDocumentRuntime(options) {
       documentMode: textOptions.documentModeOverride ?? workflowCoordinator.getEffectiveDocumentMode(selection),
       defaultAuthorId: defaultAuthorId ?? void 0,
       renderSnapshot: cachedRenderSnapshot,
+      activeStoryKey: canonicalEditableTargetStoryKey(activeStory),
+      editableTargetCache: editableTargetBlockCache,
       activeStorySize: cachedRenderSnapshot.surface?.storySize,
       textTarget,
       rejectTargetlessTableStructureInsert: true
@@ -57420,7 +58229,9 @@ function createDocumentRuntime(options) {
         timestamp: clock(),
         documentMode: workflowCoordinator.getEffectiveDocumentMode(state.selection),
         defaultAuthorId: defaultAuthorId ?? void 0,
-        renderSnapshot: cachedRenderSnapshot
+        renderSnapshot: cachedRenderSnapshot,
+        activeStoryKey: canonicalEditableTargetStoryKey(activeStory),
+        editableTargetCache: editableTargetBlockCache
       };
       try {
         const transaction = executeEditorCommand(