@superdoc-dev/cli 0.2.0-next.142 → 0.2.0-next.143

package/dist/index.js

@@ -660,18 +660,17 @@ function isTextAddress(value) {
     return false;
   return range.start <= range.end;
 }
-function isSDAddress(value) {
+function isBlockNodeAddress(value) {
   if (!isRecord(value))
     return false;
-  if (typeof value.kind !== "string" || !SD_ADDRESS_KINDS.has(value.kind))
+  if (value.kind !== "block")
+    return false;
+  if (typeof value.nodeType !== "string" || !BLOCK_NODE_TYPES_SET.has(value.nodeType))
     return false;
-  if (typeof value.stability !== "string" || !SD_ADDRESS_STABILITIES.has(value.stability))
+  if (typeof value.nodeId !== "string")
     return false;
   return true;
 }
-function isValidTarget(value) {
-  return isTextAddress(value) || isSDAddress(value);
-}
 function assertNoUnknownFields(input, allowlist, operationName) {
   for (const key of Object.keys(input)) {
     if (!allowlist.has(key)) {
@@ -697,12 +696,12 @@ function validateNestingPolicyValue(value) {
     throw new DocumentApiValidationError("INVALID_INPUT", `nestingPolicy.tables must be one of: forbid, allow. Got "${String(value.tables)}".`, { field: "nestingPolicy.tables", value: value.tables });
   }
 }
-var SD_ADDRESS_KINDS, SD_ADDRESS_STABILITIES, NESTING_POLICY_ALLOWED_KEYS;
+var BLOCK_NODE_TYPES_SET, NESTING_POLICY_ALLOWED_KEYS;
 var init_validation_primitives = __esm(() => {
+  init_base();
   init_placement();
   init_errors2();
-  SD_ADDRESS_KINDS = new Set(["content", "inline", "annotation", "section"]);
-  SD_ADDRESS_STABILITIES = new Set(["stable", "ephemeral"]);
+  BLOCK_NODE_TYPES_SET = new Set(BLOCK_NODE_TYPES);
   NESTING_POLICY_ALLOWED_KEYS = new Set(["tables"]);
 });
 
@@ -1419,8 +1418,8 @@ var init_operation_definitions = __esm(() => {
     },
     insert: {
       memberPath: "insert",
-      description: "Insert inline content at a text position within an existing block, or at the end of the document when target is omitted. " + "This is NOT for creating sibling blocks — use create.paragraph, create.heading, or lists.insert for that. " + "Accepts two input shapes: legacy string-based (value + type) or structural SDFragment (content). " + "Supports text (default), markdown, and html content types via the `type` field in legacy mode. " + "Structural mode accepts an SDFragment with typed nodes (paragraphs, tables, images, etc.).",
-      expectedResult: "Returns a TextMutationReceipt with applied status; receipt reports NO_OP if the insertion point is invalid or content is empty.",
+      description: "Insert content into the document. Two input shapes: " + "legacy string-based (value + type) inserts inline content at a text position within an existing block; " + "structural SDFragment (content) inserts one or more blocks as siblings relative to a BlockNodeAddress target. " + "When target is omitted, content appends at the end of the document. " + "Legacy mode supports text (default), markdown, and html content types via the `type` field. " + "Structural mode uses `placement` (before/after/insideStart/insideEnd) to position relative to the target block.",
+      expectedResult: "Returns an SDMutationReceipt with applied status; resolution reports a TextAddress for legacy text insertion or a BlockNodeAddress for structural insertion. Receipt reports NO_OP if the insertion point is invalid or content is empty.",
       requiresDocumentContext: true,
       metadata: mutationOperation({
         idempotency: "non-idempotent",
@@ -1458,7 +1457,7 @@ var init_operation_definitions = __esm(() => {
     },
     replace: {
       memberPath: "replace",
-      description: "Replace content at a contiguous document selection. " + "Text path accepts a SelectionTarget or ref plus replacement text. " + "Structural path accepts an SDAddress, SelectionTarget, or ref plus SDFragment content.",
+      description: "Replace content at a contiguous document selection. " + "Text path accepts a SelectionTarget or ref plus replacement text. " + "Structural path accepts a BlockNodeAddress (replaces whole block), SelectionTarget (expands to full covered block boundaries), or ref plus SDFragment content.",
       expectedResult: "Returns an SDMutationReceipt with applied status; receipt reports NO_OP if the target range already contains identical content.",
       requiresDocumentContext: true,
       metadata: mutationOperation({
@@ -7552,7 +7551,7 @@ function buildInternalContractSchemas() {
     operations
   };
 }
-var nodeTypeValues, blockNodeTypeValues, deletableBlockNodeTypeValues, inlineNodeTypeValues, knownTargetKindValues, SHARED_DEFS, rangeSchema, positionSchema, inlineAnchorSchema, targetKindSchema, textAddressSchema, textTargetSchema, blockNodeAddressSchema, deletableBlockNodeAddressSchema, paragraphAddressSchema, headingAddressSchema, listItemAddressSchema, paragraphTargetSchema, sectionAddressSchema, inlineNodeAddressSchema, nodeAddressSchema, commentAddressSchema, trackedChangeAddressSchema, entityAddressSchema, selectionTargetSchema, targetLocatorSchema, deleteBehaviorSchema, resolvedHandleSchema, pageInfoSchema, receiptSuccessSchema, textMutationRangeSchema, textMutationResolutionSchema, textMutationSuccessSchema, matchRunSchema, matchBlockSchema, trackChangeRefSchema, createParagraphSuccessSchema, createHeadingSuccessSchema, headingLevelSchema, listsInsertSuccessSchema, listsMutateItemSuccessSchema, listsExitSuccessSchema, nodeSummarySchema, nodeInfoSchema, matchContextSchema, unknownNodeDiagnosticSchema, textSelectorSchema, nodeSelectorSchema, selectorShorthandSchema, sdTextSelectorSchema, sdNodeSelectorSchema, sdSelectorSchema, sdAddressSchema, sdReadOptionsSchema, sdFindInputSchema, sdNodeResultSchema, sdFindResultSchema, sdMutationResolutionSchema, sdMutationSuccessSchema, documentInfoCountsSchema, documentInfoOutlineItemSchema, documentInfoCapabilitiesSchema, documentInfoSchema, listKindSchema, listInsertPositionSchema, listItemInfoSchema, listItemDomainItemSchema, listsListResultSchema, sectionBreakTypeSchema, sectionOrientationSchema, sectionVerticalAlignSchema, sectionDirectionSchema, sectionHeaderFooterKindSchema, sectionHeaderFooterVariantSchema, sectionLineNumberRestartSchema, sectionPageNumberFormatSchema, sectionRangeDomainSchema, sectionPageMarginsSchema, sectionHeaderFooterMarginsSchema, sectionPageSetupSchema, sectionColumnsSchema, sectionLineNumberingSchema, sectionPageNumberingSchema, sectionHeaderFooterRefsSchema, sectionBorderSpecSchema, sectionPageBordersSchema, sectionInfoSchema, sectionResolvedHandleSchema, sectionDomainItemSchema, sectionsListResultSchema, sectionMutationSuccessSchema, documentMutationSuccessSchema, paragraphMutationTargetSchema, paragraphMutationSuccessSchema, createSectionBreakSuccessSchema, commentInfoSchema, commentDomainItemSchema, commentsListResultSchema, trackChangeInfoSchema, trackChangeDomainItemSchema, trackChangesListResultSchema, capabilityReasonCodeSchema, capabilityReasonsSchema, capabilityFlagSchema, operationRuntimeCapabilitySchema, operationCapabilitiesSchema, inlinePropertyCapabilitySchema, inlinePropertyCapabilitiesByKeySchema, formatCapabilitiesSchema, planEngineCapabilitiesSchema, capabilitiesOutputSchema, strictEmptyObjectSchema, insertInputSchema, tableLocatorSchema, _tableScopedRowLocatorSchema, _tableScopedColumnLocatorSchema, mergeRangeLocatorSchema, mixedRowLocatorOneOf, tableCreateLocationSchema, tableMutationSuccessSchema, createTableSuccessSchema, tableMutationFailureCodes, tableMutationFailureSchema, tableMutationResultSchema, createTableResultSchema, historyActionSuccessSchema, historyActionFailureSchema, formatInlineAliasOperationSchemas, tocMutationFailureCodes, tocMutationFailureSchema, tocMutationSuccessSchema, tocEntryMutationFailureCodes, tocEntryMutationFailureSchema, tocEntryMutationSuccessSchema, hyperlinkTargetSchema, hyperlinkReadPropertiesSchema, hyperlinkDestinationSchema, hyperlinkSpecSchema, hyperlinkPatchSchema, hyperlinkDomainSchema, hyperlinkMutationSuccessSchema, hyperlinkMutationFailureCodes, hyperlinkMutationFailureSchema, hyperlinkInfoSchema, contentControlTargetSchema, contentControlMutationSuccessSchema, contentControlMutationFailureSchema, ccListResultSchema, ccInfoSchema, refListQuerySchema, discoveryOutputSchema, receiptFailureSchema, refFailureSchema, bookmarkAddressSchema, bookmarkMutation, footnoteAddressSchema, footnoteConfigScopeSchema, footnoteNumberingSchema, footnoteMutation, footnoteConfig, crossRefAddressSchema, crossRefTargetSchema, crossRefDisplaySchema, crossRefMutation, indexAddressSchema, indexEntryAddressSchema, indexConfigSchema, indexEntryDataSchema, indexEntryPatchSchema, indexMutation, indexEntryMutation, captionAddressSchema, captionMutation, captionConfig, fieldAddressSchema, fieldMutation, citationAddressSchema, citationSourceAddressSchema, bibliographyAddressSchema, citationMutation, citationSourceMutation, bibliographyMutation, citationPersonSchema, citationSourceFieldsSchema, tocCreateLocationSchema, authoritiesAddressSchema, authorityEntryAddressSchema, authoritiesConfigSchema, authorityEntryDataSchema, authorityEntryPatchSchema, authoritiesMutation, authorityEntryMutation, operationSchemas;
+var nodeTypeValues, blockNodeTypeValues, deletableBlockNodeTypeValues, inlineNodeTypeValues, knownTargetKindValues, SHARED_DEFS, rangeSchema, positionSchema, inlineAnchorSchema, targetKindSchema, textAddressSchema, textTargetSchema, blockNodeAddressSchema, deletableBlockNodeAddressSchema, paragraphAddressSchema, headingAddressSchema, listItemAddressSchema, paragraphTargetSchema, sectionAddressSchema, inlineNodeAddressSchema, nodeAddressSchema, commentAddressSchema, trackedChangeAddressSchema, entityAddressSchema, selectionTargetSchema, targetLocatorSchema, deleteBehaviorSchema, resolvedHandleSchema, pageInfoSchema, receiptSuccessSchema, textMutationRangeSchema, textMutationResolutionSchema, textMutationSuccessSchema, matchRunSchema, matchBlockSchema, trackChangeRefSchema, createParagraphSuccessSchema, createHeadingSuccessSchema, headingLevelSchema, listsInsertSuccessSchema, listsMutateItemSuccessSchema, listsExitSuccessSchema, nodeSummarySchema, nodeInfoSchema, matchContextSchema, unknownNodeDiagnosticSchema, textSelectorSchema, nodeSelectorSchema, selectorShorthandSchema, sdTextSelectorSchema, sdNodeSelectorSchema, sdSelectorSchema, sdReadOptionsSchema, sdFindInputSchema, sdNodeResultSchema, sdFindResultSchema, sdMutationResolutionSchema, sdMutationSuccessSchema, documentInfoCountsSchema, documentInfoOutlineItemSchema, documentInfoCapabilitiesSchema, documentInfoSchema, listKindSchema, listInsertPositionSchema, listItemInfoSchema, listItemDomainItemSchema, listsListResultSchema, sectionBreakTypeSchema, sectionOrientationSchema, sectionVerticalAlignSchema, sectionDirectionSchema, sectionHeaderFooterKindSchema, sectionHeaderFooterVariantSchema, sectionLineNumberRestartSchema, sectionPageNumberFormatSchema, sectionRangeDomainSchema, sectionPageMarginsSchema, sectionHeaderFooterMarginsSchema, sectionPageSetupSchema, sectionColumnsSchema, sectionLineNumberingSchema, sectionPageNumberingSchema, sectionHeaderFooterRefsSchema, sectionBorderSpecSchema, sectionPageBordersSchema, sectionInfoSchema, sectionResolvedHandleSchema, sectionDomainItemSchema, sectionsListResultSchema, sectionMutationSuccessSchema, documentMutationSuccessSchema, paragraphMutationTargetSchema, paragraphMutationSuccessSchema, createSectionBreakSuccessSchema, commentInfoSchema, commentDomainItemSchema, commentsListResultSchema, trackChangeInfoSchema, trackChangeDomainItemSchema, trackChangesListResultSchema, capabilityReasonCodeSchema, capabilityReasonsSchema, capabilityFlagSchema, operationRuntimeCapabilitySchema, operationCapabilitiesSchema, inlinePropertyCapabilitySchema, inlinePropertyCapabilitiesByKeySchema, formatCapabilitiesSchema, planEngineCapabilitiesSchema, capabilitiesOutputSchema, strictEmptyObjectSchema, sdFragmentSchema, placementSchema, nestingPolicySchema, insertInputSchema, tableLocatorSchema, _tableScopedRowLocatorSchema, _tableScopedColumnLocatorSchema, mergeRangeLocatorSchema, mixedRowLocatorOneOf, tableCreateLocationSchema, tableMutationSuccessSchema, createTableSuccessSchema, tableMutationFailureCodes, tableMutationFailureSchema, tableMutationResultSchema, createTableResultSchema, historyActionSuccessSchema, historyActionFailureSchema, formatInlineAliasOperationSchemas, tocMutationFailureCodes, tocMutationFailureSchema, tocMutationSuccessSchema, tocEntryMutationFailureCodes, tocEntryMutationFailureSchema, tocEntryMutationSuccessSchema, hyperlinkTargetSchema, hyperlinkReadPropertiesSchema, hyperlinkDestinationSchema, hyperlinkSpecSchema, hyperlinkPatchSchema, hyperlinkDomainSchema, hyperlinkMutationSuccessSchema, hyperlinkMutationFailureCodes, hyperlinkMutationFailureSchema, hyperlinkInfoSchema, contentControlTargetSchema, contentControlMutationSuccessSchema, contentControlMutationFailureSchema, ccListResultSchema, ccInfoSchema, refListQuerySchema, discoveryOutputSchema, receiptFailureSchema, refFailureSchema, bookmarkAddressSchema, bookmarkMutation, footnoteAddressSchema, footnoteConfigScopeSchema, footnoteNumberingSchema, footnoteMutation, footnoteConfig, crossRefAddressSchema, crossRefTargetSchema, crossRefDisplaySchema, crossRefMutation, indexAddressSchema, indexEntryAddressSchema, indexConfigSchema, indexEntryDataSchema, indexEntryPatchSchema, indexMutation, indexEntryMutation, captionAddressSchema, captionMutation, captionConfig, fieldAddressSchema, fieldMutation, citationAddressSchema, citationSourceAddressSchema, bibliographyAddressSchema, citationMutation, citationSourceMutation, bibliographyMutation, citationPersonSchema, citationSourceFieldsSchema, tocCreateLocationSchema, authoritiesAddressSchema, authorityEntryAddressSchema, authoritiesConfigSchema, authorityEntryDataSchema, authorityEntryPatchSchema, authoritiesMutation, authorityEntryMutation, operationSchemas;
 var init_schemas = __esm(() => {
   init_command_catalog();
   init_types2();
@@ -7890,23 +7889,12 @@ var init_schemas = __esm(() => {
   }, ["type", "pattern"]);
   sdNodeSelectorSchema = objectSchema({
     type: { const: "node" },
-    kind: { enum: ["content", "inline"] },
-    nodeKind: { type: "string" }
+    kind: { enum: ["block", "inline"] },
+    nodeType: { type: "string" }
   }, ["type"]);
   sdSelectorSchema = {
     oneOf: [sdTextSelectorSchema, sdNodeSelectorSchema]
   };
-  sdAddressSchema = objectSchema({
-    kind: { enum: ["content", "inline", "annotation", "section"] },
-    stability: { enum: ["stable", "ephemeral"] },
-    nodeId: { type: "string" },
-    anchor: objectSchema({
-      start: objectSchema({ blockId: { type: "string" }, offset: { type: "integer" } }, ["blockId", "offset"]),
-      end: objectSchema({ blockId: { type: "string" }, offset: { type: "integer" } }, ["blockId", "offset"])
-    }),
-    evaluatedRevision: { type: "string" },
-    path: arraySchema({ oneOf: [{ type: "string" }, { type: "integer" }] })
-  }, ["kind", "stability"]);
   sdReadOptionsSchema = objectSchema({
     includeResolved: { type: "boolean" },
     includeProvenance: { type: "boolean" },
@@ -7914,14 +7902,14 @@ var init_schemas = __esm(() => {
   });
   sdFindInputSchema = objectSchema({
     select: sdSelectorSchema,
-    within: sdAddressSchema,
+    within: blockNodeAddressSchema,
     limit: { type: "integer" },
     offset: { type: "integer" },
     options: sdReadOptionsSchema
   }, ["select"]);
   sdNodeResultSchema = objectSchema({
     node: { type: "object" },
-    address: sdAddressSchema,
+    address: nodeAddressSchema,
     context: { type: "object" }
   }, ["node", "address"]);
   sdFindResultSchema = objectSchema({
@@ -7931,10 +7919,10 @@ var init_schemas = __esm(() => {
     items: arraySchema(sdNodeResultSchema)
   }, ["total", "limit", "offset", "items"]);
   sdMutationResolutionSchema = objectSchema({
-    requestedTarget: sdAddressSchema,
-    target: sdAddressSchema,
+    target: { oneOf: [textAddressSchema, blockNodeAddressSchema] },
+    range: textMutationRangeSchema,
     selectionTarget: selectionTargetSchema
-  }, ["target"]);
+  }, ["target", "range"]);
   sdMutationSuccessSchema = objectSchema({
     success: { const: true },
     resolution: sdMutationResolutionSchema,
@@ -8241,11 +8229,28 @@ var init_schemas = __esm(() => {
     planEngine: planEngineCapabilitiesSchema
   }, ["global", "format", "operations", "planEngine"]);
   strictEmptyObjectSchema = objectSchema({});
-  insertInputSchema = objectSchema({
-    target: textAddressSchema,
-    value: { type: "string" },
-    type: { type: "string", enum: ["text", "markdown", "html"] }
-  }, ["value"]);
+  sdFragmentSchema = {
+    oneOf: [{ type: "object" }, { type: "array", items: { type: "object" } }]
+  };
+  placementSchema = { enum: ["before", "after", "insideStart", "insideEnd"] };
+  nestingPolicySchema = objectSchema({
+    tables: { enum: ["forbid", "allow"] }
+  });
+  insertInputSchema = {
+    oneOf: [
+      objectSchema({
+        target: textAddressSchema,
+        value: { type: "string" },
+        type: { type: "string", enum: ["text", "markdown", "html"] }
+      }, ["value"]),
+      objectSchema({
+        target: blockNodeAddressSchema,
+        content: sdFragmentSchema,
+        placement: placementSchema,
+        nestingPolicy: nestingPolicySchema
+      }, ["content"])
+    ]
+  };
   tableLocatorSchema = {
     ...objectSchema({
       target: blockNodeAddressSchema,
@@ -8710,14 +8715,14 @@ var init_schemas = __esm(() => {
           {
             oneOf: [
               objectSchema({
-                target: { oneOf: [sdAddressSchema, textAddressSchema, selectionTargetSchema] },
-                content: { type: "object" },
-                nestingPolicy: { type: "object" }
+                target: { oneOf: [blockNodeAddressSchema, selectionTargetSchema] },
+                content: sdFragmentSchema,
+                nestingPolicy: nestingPolicySchema
               }, ["target", "content"]),
               objectSchema({
                 ref: { type: "string" },
-                content: { type: "object" },
-                nestingPolicy: { type: "object" }
+                content: sdFragmentSchema,
+                nestingPolicy: nestingPolicySchema
               }, ["ref", "content"])
             ]
           }
@@ -9786,7 +9791,7 @@ var init_schemas = __esm(() => {
     "query.match": {
       input: objectSchema({
         select: { oneOf: [textSelectorSchema, nodeSelectorSchema] },
-        within: nodeAddressSchema,
+        within: blockNodeAddressSchema,
         require: { enum: ["any", "first", "exactlyOne", "all"] },
         mode: { enum: ["strict", "candidates"] },
         includeNodes: { type: "boolean" },
@@ -9796,7 +9801,7 @@ var init_schemas = __esm(() => {
       output: (() => {
         const textMatchItemSchema = discoveryItemSchema({
           matchKind: { const: "text" },
-          address: nodeAddressSchema,
+          address: blockNodeAddressSchema,
           target: selectionTargetSchema,
           snippet: { type: "string" },
           highlightRange: rangeSchema,
@@ -9815,13 +9820,13 @@ var init_schemas = __esm(() => {
       const selectWhereSchema = objectSchema({
         by: { const: "select", type: "string" },
         select: { oneOf: [textSelectorSchema, nodeSelectorSchema] },
-        within: nodeAddressSchema,
+        within: blockNodeAddressSchema,
         require: { enum: ["first", "exactlyOne", "all"] }
       }, ["by", "select", "require"]);
       const refWhereSchema = objectSchema({
         by: { const: "ref", type: "string" },
         ref: { type: "string" },
-        within: nodeAddressSchema
+        within: blockNodeAddressSchema
       }, ["by", "ref"]);
       const targetWhereSchema = objectSchema({
         by: { const: "target", type: "string" },
@@ -9831,13 +9836,13 @@ var init_schemas = __esm(() => {
       const insertWhereSchema = objectSchema({
         by: { const: "select", type: "string" },
         select: { oneOf: [textSelectorSchema, nodeSelectorSchema] },
-        within: nodeAddressSchema,
+        within: blockNodeAddressSchema,
         require: { enum: ["first", "exactlyOne"] }
       }, ["by", "select", "require"]);
       const assertWhereSchema = objectSchema({
         by: { const: "select", type: "string" },
         select: { oneOf: [textSelectorSchema, nodeSelectorSchema] },
-        within: nodeAddressSchema
+        within: blockNodeAddressSchema
       }, ["by", "select"]);
       const replacementBlockSchema = objectSchema({ text: { type: "string" } }, ["text"]);
       const replacementPayloadSchema = {
@@ -10983,7 +10988,7 @@ var init_schemas = __esm(() => {
     "images.removeCaption": imagesMutationSchemaSet(objectSchema({ imageId: { type: "string" } }, ["imageId"])),
     "hyperlinks.list": {
       input: objectSchema({
-        within: nodeAddressSchema,
+        within: blockNodeAddressSchema,
         hrefPattern: { type: "string" },
         anchor: { type: "string" },
         textPattern: { type: "string" },
@@ -12161,6 +12166,9 @@ var init_comments = __esm(() => {
 function executeFind(adapter, input) {
   return adapter.find(input);
 }
+var init_find = __esm(() => {
+  init_errors2();
+});
 
 // ../../packages/document-api/src/format/format.ts
 function validateTargetLocator(input, operation) {
@@ -12850,29 +12858,18 @@ var init_fragment_validator = __esm(() => {
 });
 
 // ../../packages/document-api/src/receipt-bridge.ts
-function textAddressToSDAddress(textAddr) {
+function buildResolution(resolution) {
   return {
-    kind: "content",
-    stability: "stable",
-    nodeId: textAddr.blockId,
-    anchor: {
-      start: { blockId: textAddr.blockId, offset: textAddr.range.start },
-      end: { blockId: textAddr.blockId, offset: textAddr.range.end }
-    }
-  };
-}
-function buildSDResolution(resolution) {
-  return {
-    ...resolution.requestedTarget ? { requestedTarget: textAddressToSDAddress(resolution.requestedTarget) } : {},
-    target: textAddressToSDAddress(resolution.target),
-    ...resolution.selectionTarget ? { selectionTarget: resolution.selectionTarget } : undefined
+    target: resolution.target,
+    range: resolution.range,
+    ...resolution.selectionTarget ? { selectionTarget: resolution.selectionTarget } : {}
   };
 }
 function textReceiptToSDReceipt(receipt2) {
   if (receipt2.success) {
     return {
       success: true,
-      resolution: receipt2.resolution ? buildSDResolution(receipt2.resolution) : undefined
+      resolution: receipt2.resolution ? buildResolution(receipt2.resolution) : undefined
     };
   }
   const failure = {
@@ -12897,7 +12894,22 @@ function textReceiptToSDReceipt(receipt2) {
   return {
     success: false,
     failure,
-    resolution: receipt2.resolution ? buildSDResolution(receipt2.resolution) : undefined
+    resolution: receipt2.resolution ? buildResolution(receipt2.resolution) : undefined
+  };
+}
+function buildStructuralReceipt(success, params, failure) {
+  const resolution = {
+    target: params.target,
+    range: params.range,
+    ...params.selectionTarget ? { selectionTarget: params.selectionTarget } : {}
+  };
+  if (success) {
+    return { success: true, resolution };
+  }
+  return {
+    success: false,
+    failure: { code: failure?.code ?? "INTERNAL_ERROR", message: failure?.message ?? "" },
+    resolution
   };
 }
 
@@ -12954,8 +12966,8 @@ function validateStructuralInsertInput(input) {
   }
   assertNoUnknownFields(input, STRUCTURAL_INSERT_ALLOWED_KEYS, "insert");
   const { target, content, placement: placement2, nestingPolicy } = input;
-  if (target !== undefined && !isValidTarget(target)) {
-    throw new DocumentApiValidationError("INVALID_TARGET", "target must be a valid address (SDAddress or TextAddress).", {
+  if (target !== undefined && !isBlockNodeAddress(target)) {
+    throw new DocumentApiValidationError("INVALID_TARGET", 'target must be a BlockNodeAddress ({ kind: "block", nodeType, nodeId }).', {
       field: "target",
       value: target
     });
@@ -13188,8 +13200,11 @@ function validateStructuralReplaceInput(input) {
       fields: ["target", "ref"]
     });
   }
-  if (hasTarget && !isSDAddress(target) && !isTextAddress(target) && !isSelectionTarget(target)) {
-    throw new DocumentApiValidationError("INVALID_TARGET", "target must be a valid address (SDAddress, TextAddress, or SelectionTarget).", { field: "target", value: target });
+  if (hasTarget && !isBlockNodeAddress(target) && !isSelectionTarget(target)) {
+    throw new DocumentApiValidationError("INVALID_TARGET", "target must be a BlockNodeAddress or SelectionTarget.", {
+      field: "target",
+      value: target
+    });
   }
   if (hasRef && typeof refValue !== "string") {
     throw new DocumentApiValidationError("INVALID_TARGET", "ref must be a string.", {
@@ -16409,7 +16424,11 @@ function createDocumentApi(adapters) {
     },
     query: {
       match(input) {
-        return adapters.query.match(input);
+        if (!input || typeof input !== "object") {
+          throw new DocumentApiValidationError("INVALID_INPUT", "query.match requires a QueryMatchInput or selector object.", { value: input });
+        }
+        const normalized = "select" in input ? input : { select: input };
+        return adapters.query.match(normalized);
       }
     },
     ranges: {
@@ -16452,6 +16471,7 @@ var init_src = __esm(() => {
   init_errors2();
   init_ranges();
   init_comments();
+  init_find();
   init_format();
   init_inline_run_patch();
   init_styles();
@@ -38780,7 +38800,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-BParsWaS.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-voJQZ_PC.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -39594,18 +39614,17 @@ function isTextAddress2(value) {
     return false;
   return range.start <= range.end;
 }
-function isSDAddress2(value) {
+function isBlockNodeAddress2(value) {
   if (!isRecord3(value))
     return false;
-  if (typeof value.kind !== "string" || !SD_ADDRESS_KINDS2.has(value.kind))
+  if (value.kind !== "block")
+    return false;
+  if (typeof value.nodeType !== "string" || !BLOCK_NODE_TYPES_SET2.has(value.nodeType))
     return false;
-  if (typeof value.stability !== "string" || !SD_ADDRESS_STABILITIES2.has(value.stability))
+  if (typeof value.nodeId !== "string")
     return false;
   return true;
 }
-function isValidTarget2(value) {
-  return isTextAddress2(value) || isSDAddress2(value);
-}
 function assertNoUnknownFields3(input, allowlist, operationName) {
   for (const key of Object.keys(input))
     if (!allowlist.has(key))
@@ -42005,35 +42024,18 @@ function validateLegacyInlineContent2(item, parentType) {
       throw new DocumentApiValidationError2("INVALID_PAYLOAD", `Inline image content in ${parentType} requires a non-empty "src" string field.`, { field: "src" });
   }
 }
-function textAddressToSDAddress2(textAddr) {
+function buildResolution2(resolution) {
   return {
-    kind: "content",
-    stability: "stable",
-    nodeId: textAddr.blockId,
-    anchor: {
-      start: {
-        blockId: textAddr.blockId,
-        offset: textAddr.range.start
-      },
-      end: {
-        blockId: textAddr.blockId,
-        offset: textAddr.range.end
-      }
-    }
-  };
-}
-function buildSDResolution2(resolution) {
-  return {
-    ...resolution.requestedTarget ? { requestedTarget: textAddressToSDAddress2(resolution.requestedTarget) } : {},
-    target: textAddressToSDAddress2(resolution.target),
-    ...resolution.selectionTarget ? { selectionTarget: resolution.selectionTarget } : undefined
+    target: resolution.target,
+    range: resolution.range,
+    ...resolution.selectionTarget ? { selectionTarget: resolution.selectionTarget } : {}
   };
 }
 function textReceiptToSDReceipt2(receipt2) {
   if (receipt2.success)
     return {
       success: true,
-      resolution: receipt2.resolution ? buildSDResolution2(receipt2.resolution) : undefined
+      resolution: receipt2.resolution ? buildResolution2(receipt2.resolution) : undefined
     };
   const failure = {
     code: "INTERNAL_ERROR",
@@ -42056,7 +42058,27 @@ function textReceiptToSDReceipt2(receipt2) {
   return {
     success: false,
     failure,
-    resolution: receipt2.resolution ? buildSDResolution2(receipt2.resolution) : undefined
+    resolution: receipt2.resolution ? buildResolution2(receipt2.resolution) : undefined
+  };
+}
+function buildStructuralReceipt2(success, params, failure) {
+  const resolution = {
+    target: params.target,
+    range: params.range,
+    ...params.selectionTarget ? { selectionTarget: params.selectionTarget } : {}
+  };
+  if (success)
+    return {
+      success: true,
+      resolution
+    };
+  return {
+    success: false,
+    failure: {
+      code: failure?.code ?? "INTERNAL_ERROR",
+      message: failure?.message ?? ""
+    },
+    resolution
   };
 }
 function isStructuralInsertInput2(input) {
@@ -42104,8 +42126,8 @@ function validateStructuralInsertInput2(input) {
     throw new DocumentApiValidationError2("INVALID_INPUT", '"type" field is only valid with legacy string input ("value"), not with structural "content".', { field: "type" });
   assertNoUnknownFields3(input, STRUCTURAL_INSERT_ALLOWED_KEYS2, "insert");
   const { target, content: content$2, placement: placement2, nestingPolicy } = input;
-  if (target !== undefined && !isValidTarget2(target))
-    throw new DocumentApiValidationError2("INVALID_TARGET", "target must be a valid address (SDAddress or TextAddress).", {
+  if (target !== undefined && !isBlockNodeAddress2(target))
+    throw new DocumentApiValidationError2("INVALID_TARGET", 'target must be a BlockNodeAddress ({ kind: "block", nodeType, nodeId }).', {
       field: "target",
       value: target
     });
@@ -42305,8 +42327,8 @@ function validateStructuralReplaceInput2(input) {
     throw new DocumentApiValidationError2("INVALID_INPUT", 'Structural replace must provide either "target" or "ref", not both.', { fields: ["target", "ref"] });
   if (!hasTarget && !hasRef)
     throw new DocumentApiValidationError2("INVALID_TARGET", "Structural replace requires a target or ref.", { fields: ["target", "ref"] });
-  if (hasTarget && !isSDAddress2(target) && !isTextAddress2(target) && !isSelectionTarget2(target))
-    throw new DocumentApiValidationError2("INVALID_TARGET", "target must be a valid address (SDAddress, TextAddress, or SelectionTarget).", {
+  if (hasTarget && !isBlockNodeAddress2(target) && !isSelectionTarget2(target))
+    throw new DocumentApiValidationError2("INVALID_TARGET", "target must be a BlockNodeAddress or SelectionTarget.", {
       field: "target",
       value: target
     });
@@ -45167,7 +45189,10 @@ function createDocumentApi2(adapters) {
       }
     },
     query: { match(input) {
-      return adapters.query.match(input);
+      if (!input || typeof input !== "object")
+        throw new DocumentApiValidationError2("INVALID_INPUT", "query.match requires a QueryMatchInput or selector object.", { value: input });
+      const normalized = "select" in input ? input : { select: input };
+      return adapters.query.match(normalized);
     } },
     ranges: { resolve(input) {
       return executeResolveRange2(adapters.ranges, input);
@@ -63483,7 +63508,7 @@ var isRegExp = (value) => {
 }, decode$72 = (attrs) => {
   const { pos } = attrs || {};
   return pos?.toString();
-}, attributes_default$6, DocumentApiValidationError2, NODE_TYPES2, BLOCK_NODE_TYPES2, DELETABLE_BLOCK_NODE_TYPES2, INLINE_NODE_TYPES2, SELECTION_EDGE_NODE_TYPES2, MARK_KEYS2, INLINE_DIRECTIVES2, SD_CONTENT_NODE_KINDS2, SD_INLINE_NODE_KINDS2, PLACEMENT_VALUES2, TABLE_NESTING_POLICY_VALUES2, DEFAULT_NESTING_POLICY2, SD_ADDRESS_KINDS2, SD_ADDRESS_STABILITIES2, NESTING_POLICY_ALLOWED_KEYS2, schemaBooleanOrNull2 = () => ({ oneOf: [{ type: "boolean" }, { type: "null" }] }), schemaStringOrNull2 = () => ({ oneOf: [{
+}, attributes_default$6, DocumentApiValidationError2, NODE_TYPES2, BLOCK_NODE_TYPES2, DELETABLE_BLOCK_NODE_TYPES2, INLINE_NODE_TYPES2, SELECTION_EDGE_NODE_TYPES2, MARK_KEYS2, INLINE_DIRECTIVES2, SD_CONTENT_NODE_KINDS2, SD_INLINE_NODE_KINDS2, PLACEMENT_VALUES2, TABLE_NESTING_POLICY_VALUES2, DEFAULT_NESTING_POLICY2, BLOCK_NODE_TYPES_SET2, NESTING_POLICY_ALLOWED_KEYS2, schemaBooleanOrNull2 = () => ({ oneOf: [{ type: "boolean" }, { type: "null" }] }), schemaStringOrNull2 = () => ({ oneOf: [{
   type: "string",
   minLength: 1
 }, { type: "null" }] }), schemaNumberOrNull2 = () => ({ oneOf: [{ type: "number" }, { type: "null" }] }), schemaObjectOrNull2 = (properties) => ({ oneOf: [{
@@ -63523,7 +63548,7 @@ var isRegExp = (value) => {
   tracked: false,
   carrier: runAttributeCarrier2(runPropertyKey ?? key),
   schema
-}), INLINE_PROPERTY_REGISTRY2, INLINE_PROPERTY_KEY_SET2, INLINE_PROPERTY_BY_KEY2, UNDERLINE_OBJECT_ALLOWED_KEYS2, SHADING_ALLOWED_KEYS2, BORDER_ALLOWED_KEYS2, FIT_TEXT_ALLOWED_KEYS2, LANG_ALLOWED_KEYS2, RFONTS_ALLOWED_KEYS2, EAST_ASIAN_LAYOUT_ALLOWED_KEYS2, STYLISTIC_SET_ALLOWED_KEYS2, VERT_ALIGN_VALUES2, NONE_FAILURES2, NONE_THROWS2, T_NOT_FOUND2, T_NOT_FOUND_CAPABLE2, T_PLAN_ENGINE2, T_NOT_FOUND_COMMAND2, T_NOT_FOUND_COMMAND_TRACKED2, T_IMAGE_COMMAND2, T_CC_READ2, T_CC_MUTATION2, T_CC_TYPED2, T_CC_TYPED_READ2, T_CC_RAW2, T_QUERY_MATCH2, T_SECTION_CREATE2, T_SECTION_READ2, T_PARAGRAPH_MUTATION2, T_SECTION_MUTATION2, T_SECTION_SETTINGS_MUTATION2, T_HEADER_FOOTER_MUTATION2, T_REF_READ_LIST2, T_REF_MUTATION2, T_REF_MUTATION_REMOVE2, T_REF_INSERT2, FORMAT_INLINE_ALIAS_OPERATION_DEFINITIONS2, OPERATION_DEFINITIONS2, OPERATION_IDS2, COMMAND_CATALOG3, PARAGRAPH_ALIGNMENTS2, TAB_STOP_ALIGNMENTS2, TAB_STOP_LEADERS2, BORDER_SIDES2, CLEAR_BORDER_SIDES2, LINE_RULES2, PARAGRAPH_BLOCK_TYPES2, SET_STYLE_KEYS2, CLEAR_STYLE_KEYS2, RESET_DIRECT_FORMATTING_KEYS2, SET_ALIGNMENT_KEYS2, CLEAR_ALIGNMENT_KEYS2, SET_INDENTATION_KEYS2, CLEAR_INDENTATION_KEYS2, SET_SPACING_KEYS2, CLEAR_SPACING_KEYS2, SET_KEEP_OPTIONS_KEYS2, SET_OUTLINE_LEVEL_KEYS2, SET_FLOW_OPTIONS_KEYS2, SET_TAB_STOP_KEYS2, CLEAR_TAB_STOP_KEYS2, CLEAR_ALL_TAB_STOPS_KEYS2, SET_BORDER_KEYS2, CLEAR_BORDER_KEYS2, SET_SHADING_KEYS2, CLEAR_SHADING_KEYS2, ST_ON_OFF_ON_VALUES2, ST_ON_OFF_OFF_VALUES2, ST_UNDERLINE_VALUES2, ST_UNDERLINE_VALUE_SET2, ST_VERTICAL_ALIGN_RUN2, ST_EM2, ST_TEXT_ALIGNMENT2, ST_TEXT_DIRECTION2, ST_TEXTBOX_TIGHT_WRAP2, ST_TEXT_TRANSFORM2, ST_JUSTIFICATION2, FONT_FAMILY_SCHEMA2, COLOR_SCHEMA2, SPACING_SCHEMA2, INDENT_SCHEMA2, UNDERLINE_SCHEMA2, BORDER_PROPERTIES_SCHEMA2, SHADING_SCHEMA2, LANG_SCHEMA2, EAST_ASIAN_LAYOUT_SCHEMA2, FIT_TEXT_SCHEMA2, NUMBERING_PROPERTIES_SCHEMA2, FRAME_PR_SCHEMA2, PARAGRAPH_BORDERS_SCHEMA2, TAB_STOP_SCHEMA2, PROPERTY_REGISTRY3, ALLOWED_KEYS_BY_CHANNEL2, PROPERTY_INDEX2, EXCLUDED_KEYS2, INPUT_ALLOWED_KEYS2, TARGET_ALLOWED_KEYS2, OPTIONS_ALLOWED_KEYS2, VALID_CHANNELS2, Z_ORDER_RELATIVE_HEIGHT_MAX2 = 4294967295, nodeTypeValues2, blockNodeTypeValues2, deletableBlockNodeTypeValues2, inlineNodeTypeValues2, rangeSchema2, textAddressSchema2, textTargetSchema2, blockNodeAddressSchema2, deletableBlockNodeAddressSchema2, paragraphAddressSchema2, headingAddressSchema2, listItemAddressSchema2, paragraphTargetSchema2, sectionAddressSchema2, nodeAddressSchema2, commentAddressSchema2, trackedChangeAddressSchema2, entityAddressSchema2, selectionTargetSchema2, deleteBehaviorSchema2, resolvedHandleSchema2, pageInfoSchema2, receiptSuccessSchema2, textMutationResolutionSchema2, textMutationSuccessSchema2, matchBlockSchema2, trackChangeRefSchema2, createParagraphSuccessSchema2, createHeadingSuccessSchema2, headingLevelSchema2, listsInsertSuccessSchema2, listsMutateItemSuccessSchema2, textSelectorSchema2, nodeSelectorSchema2, sdSelectorSchema2, sdAddressSchema2, sdMutationResolutionSchema2, sdMutationSuccessSchema2, documentInfoCountsSchema2, documentInfoOutlineItemSchema2, documentInfoCapabilitiesSchema2, listKindSchema2, listInsertPositionSchema2, sectionBreakTypeSchema2, sectionOrientationSchema2, sectionVerticalAlignSchema2, sectionDirectionSchema2, sectionHeaderFooterKindSchema2, sectionHeaderFooterVariantSchema2, sectionLineNumberRestartSchema2, sectionPageNumberFormatSchema2, sectionRangeDomainSchema2, sectionPageMarginsSchema2, sectionHeaderFooterMarginsSchema2, sectionPageSetupSchema2, sectionColumnsSchema2, sectionLineNumberingSchema2, sectionPageNumberingSchema2, sectionHeaderFooterRefsSchema2, sectionBorderSpecSchema2, sectionPageBordersSchema2, sectionMutationSuccessSchema2, documentMutationSuccessSchema2, paragraphMutationTargetSchema2, paragraphMutationSuccessSchema2, createSectionBreakSuccessSchema2, capabilityReasonsSchema2, capabilityFlagSchema2, operationRuntimeCapabilitySchema2, operationCapabilitiesSchema2, inlinePropertyCapabilitySchema2, formatCapabilitiesSchema2, planEngineCapabilitiesSchema2, tableCreateLocationSchema2, formatInlineAliasOperationSchemas2, tocMutationFailureSchema2, tocMutationSuccessSchema2, tocEntryMutationFailureSchema2, tocEntryMutationSuccessSchema2, hyperlinkTargetSchema2, hyperlinkReadPropertiesSchema2, hyperlinkSpecSchema2, hyperlinkPatchSchema2, hyperlinkDomainSchema2, hyperlinkMutationSuccessSchema2, hyperlinkMutationFailureSchema2, contentControlTargetSchema2, contentControlMutationSuccessSchema2, contentControlMutationFailureSchema2, ccListResultSchema2, ccInfoSchema2, refFailureSchema2, bookmarkAddressSchema2, bookmarkMutation2, footnoteAddressSchema2, footnoteConfigScopeSchema2, footnoteNumberingSchema2, footnoteMutation2, footnoteConfig2, crossRefAddressSchema2, crossRefTargetSchema2, crossRefDisplaySchema2, crossRefMutation2, indexAddressSchema2, indexEntryAddressSchema2, indexConfigSchema2, indexEntryDataSchema2, indexEntryPatchSchema2, indexMutation2, indexEntryMutation2, captionAddressSchema2, captionMutation2, captionConfig2, fieldAddressSchema2, fieldMutation2, citationAddressSchema2, citationSourceAddressSchema2, bibliographyAddressSchema2, citationMutation2, citationSourceMutation2, bibliographyMutation2, citationPersonSchema2, citationSourceFieldsSchema2, tocCreateLocationSchema2, authoritiesAddressSchema2, authorityEntryAddressSchema2, authoritiesConfigSchema2, authorityEntryDataSchema2, authorityEntryPatchSchema2, authoritiesMutation2, authorityEntryMutation2, GROUP_METADATA2, STEP_OP_CATALOG_UNFROZEN2, PUBLIC_STEP_OP_CATALOG_UNFROZEN2, PUBLIC_MUTATION_STEP_OP_IDS2, PUBLIC_MUTATION_STEP_OP_SET2, CAPABILITY_REASON_CODES2, VALID_EDGE_VALUES2, VALID_EDGE_NODE_TYPES2, VALID_DOCUMENT_EDGES2, VALID_REF_BOUNDARIES2, VALID_ANCHOR_KINDS2, RESOLVE_RANGE_ALLOWED_KEYS2, CREATE_COMMENT_ALLOWED_KEYS2, PATCH_COMMENT_ALLOWED_KEYS2, STYLE_APPLY_INPUT_ALLOWED_KEYS2, INLINE_ALIAS_INPUT_ALLOWED_KEYS2, DELETE_INPUT_ALLOWED_KEYS2, VALID_BEHAVIORS2, CONTENT_KIND_SET2, INLINE_KIND_SET2, LEGACY_TOP_LEVEL_TYPES2, LEGACY_INSERT_ALLOWED_KEYS2, STRUCTURAL_INSERT_ALLOWED_KEYS2, VALID_INSERT_TYPES2, TEXT_REPLACE_ALLOWED_KEYS2, STRUCTURAL_REPLACE_ALLOWED_KEYS2, SECTION_BREAK_TYPES$1, SUPPORTED_DELETE_NODE_TYPES2, REJECTED_DELETE_NODE_TYPES2, VALID_BLOCK_NODE_TYPES2, TABLE_LOCATOR_OPS2, ROW_LOCATOR_OPS2, COLUMN_LOCATOR_OPS2, MERGE_RANGE_LOCATOR_OPS2, HEADER_FOOTER_KINDS$1, HEADER_FOOTER_VARIANTS$1, DEFAULT_SECTIONS_LIST_LIMIT2 = 250, SECTION_BREAK_TYPES3, SECTION_ORIENTATIONS2, SECTION_VERTICAL_ALIGNS2, SECTION_DIRECTIONS2, HEADER_FOOTER_KINDS3, HEADER_FOOTER_VARIANTS3, LINE_NUMBER_RESTARTS2, PAGE_NUMBER_FORMATS2, PAGE_BORDER_DISPLAYS2, PAGE_BORDER_OFFSET_FROM_VALUES2, PAGE_BORDER_Z_ORDER_VALUES2, VALID_WRAP_TYPES2, VALID_WRAP_SIDES2, VALID_IMAGE_SIZE_UNITS2, PATCH_FIELDS2, ADAPTER_GATED_PREFIXES2, _buffers, _defaultCollectionId = null, _nextCollectionId = 1, generateV2HandlerEntity = (handlerName, translator$215) => ({
+}), INLINE_PROPERTY_REGISTRY2, INLINE_PROPERTY_KEY_SET2, INLINE_PROPERTY_BY_KEY2, UNDERLINE_OBJECT_ALLOWED_KEYS2, SHADING_ALLOWED_KEYS2, BORDER_ALLOWED_KEYS2, FIT_TEXT_ALLOWED_KEYS2, LANG_ALLOWED_KEYS2, RFONTS_ALLOWED_KEYS2, EAST_ASIAN_LAYOUT_ALLOWED_KEYS2, STYLISTIC_SET_ALLOWED_KEYS2, VERT_ALIGN_VALUES2, NONE_FAILURES2, NONE_THROWS2, T_NOT_FOUND2, T_NOT_FOUND_CAPABLE2, T_PLAN_ENGINE2, T_NOT_FOUND_COMMAND2, T_NOT_FOUND_COMMAND_TRACKED2, T_IMAGE_COMMAND2, T_CC_READ2, T_CC_MUTATION2, T_CC_TYPED2, T_CC_TYPED_READ2, T_CC_RAW2, T_QUERY_MATCH2, T_SECTION_CREATE2, T_SECTION_READ2, T_PARAGRAPH_MUTATION2, T_SECTION_MUTATION2, T_SECTION_SETTINGS_MUTATION2, T_HEADER_FOOTER_MUTATION2, T_REF_READ_LIST2, T_REF_MUTATION2, T_REF_MUTATION_REMOVE2, T_REF_INSERT2, FORMAT_INLINE_ALIAS_OPERATION_DEFINITIONS2, OPERATION_DEFINITIONS2, OPERATION_IDS2, COMMAND_CATALOG3, PARAGRAPH_ALIGNMENTS2, TAB_STOP_ALIGNMENTS2, TAB_STOP_LEADERS2, BORDER_SIDES2, CLEAR_BORDER_SIDES2, LINE_RULES2, PARAGRAPH_BLOCK_TYPES2, SET_STYLE_KEYS2, CLEAR_STYLE_KEYS2, RESET_DIRECT_FORMATTING_KEYS2, SET_ALIGNMENT_KEYS2, CLEAR_ALIGNMENT_KEYS2, SET_INDENTATION_KEYS2, CLEAR_INDENTATION_KEYS2, SET_SPACING_KEYS2, CLEAR_SPACING_KEYS2, SET_KEEP_OPTIONS_KEYS2, SET_OUTLINE_LEVEL_KEYS2, SET_FLOW_OPTIONS_KEYS2, SET_TAB_STOP_KEYS2, CLEAR_TAB_STOP_KEYS2, CLEAR_ALL_TAB_STOPS_KEYS2, SET_BORDER_KEYS2, CLEAR_BORDER_KEYS2, SET_SHADING_KEYS2, CLEAR_SHADING_KEYS2, ST_ON_OFF_ON_VALUES2, ST_ON_OFF_OFF_VALUES2, ST_UNDERLINE_VALUES2, ST_UNDERLINE_VALUE_SET2, ST_VERTICAL_ALIGN_RUN2, ST_EM2, ST_TEXT_ALIGNMENT2, ST_TEXT_DIRECTION2, ST_TEXTBOX_TIGHT_WRAP2, ST_TEXT_TRANSFORM2, ST_JUSTIFICATION2, FONT_FAMILY_SCHEMA2, COLOR_SCHEMA2, SPACING_SCHEMA2, INDENT_SCHEMA2, UNDERLINE_SCHEMA2, BORDER_PROPERTIES_SCHEMA2, SHADING_SCHEMA2, LANG_SCHEMA2, EAST_ASIAN_LAYOUT_SCHEMA2, FIT_TEXT_SCHEMA2, NUMBERING_PROPERTIES_SCHEMA2, FRAME_PR_SCHEMA2, PARAGRAPH_BORDERS_SCHEMA2, TAB_STOP_SCHEMA2, PROPERTY_REGISTRY3, ALLOWED_KEYS_BY_CHANNEL2, PROPERTY_INDEX2, EXCLUDED_KEYS2, INPUT_ALLOWED_KEYS2, TARGET_ALLOWED_KEYS2, OPTIONS_ALLOWED_KEYS2, VALID_CHANNELS2, Z_ORDER_RELATIVE_HEIGHT_MAX2 = 4294967295, nodeTypeValues2, blockNodeTypeValues2, deletableBlockNodeTypeValues2, inlineNodeTypeValues2, rangeSchema2, textAddressSchema2, textTargetSchema2, blockNodeAddressSchema2, deletableBlockNodeAddressSchema2, paragraphAddressSchema2, headingAddressSchema2, listItemAddressSchema2, paragraphTargetSchema2, sectionAddressSchema2, nodeAddressSchema2, commentAddressSchema2, trackedChangeAddressSchema2, entityAddressSchema2, selectionTargetSchema2, deleteBehaviorSchema2, resolvedHandleSchema2, pageInfoSchema2, receiptSuccessSchema2, textMutationRangeSchema2, textMutationResolutionSchema2, textMutationSuccessSchema2, matchBlockSchema2, trackChangeRefSchema2, createParagraphSuccessSchema2, createHeadingSuccessSchema2, headingLevelSchema2, listsInsertSuccessSchema2, listsMutateItemSuccessSchema2, textSelectorSchema2, nodeSelectorSchema2, sdMutationResolutionSchema2, sdMutationSuccessSchema2, documentInfoCountsSchema2, documentInfoOutlineItemSchema2, documentInfoCapabilitiesSchema2, listKindSchema2, listInsertPositionSchema2, sectionBreakTypeSchema2, sectionOrientationSchema2, sectionVerticalAlignSchema2, sectionDirectionSchema2, sectionHeaderFooterKindSchema2, sectionHeaderFooterVariantSchema2, sectionLineNumberRestartSchema2, sectionPageNumberFormatSchema2, sectionRangeDomainSchema2, sectionPageMarginsSchema2, sectionHeaderFooterMarginsSchema2, sectionPageSetupSchema2, sectionColumnsSchema2, sectionLineNumberingSchema2, sectionPageNumberingSchema2, sectionHeaderFooterRefsSchema2, sectionBorderSpecSchema2, sectionPageBordersSchema2, sectionMutationSuccessSchema2, documentMutationSuccessSchema2, paragraphMutationTargetSchema2, paragraphMutationSuccessSchema2, createSectionBreakSuccessSchema2, capabilityReasonsSchema2, capabilityFlagSchema2, operationRuntimeCapabilitySchema2, operationCapabilitiesSchema2, inlinePropertyCapabilitySchema2, formatCapabilitiesSchema2, planEngineCapabilitiesSchema2, sdFragmentSchema2, placementSchema2, nestingPolicySchema2, tableCreateLocationSchema2, formatInlineAliasOperationSchemas2, tocMutationFailureSchema2, tocMutationSuccessSchema2, tocEntryMutationFailureSchema2, tocEntryMutationSuccessSchema2, hyperlinkTargetSchema2, hyperlinkReadPropertiesSchema2, hyperlinkSpecSchema2, hyperlinkPatchSchema2, hyperlinkDomainSchema2, hyperlinkMutationSuccessSchema2, hyperlinkMutationFailureSchema2, contentControlTargetSchema2, contentControlMutationSuccessSchema2, contentControlMutationFailureSchema2, ccListResultSchema2, ccInfoSchema2, refFailureSchema2, bookmarkAddressSchema2, bookmarkMutation2, footnoteAddressSchema2, footnoteConfigScopeSchema2, footnoteNumberingSchema2, footnoteMutation2, footnoteConfig2, crossRefAddressSchema2, crossRefTargetSchema2, crossRefDisplaySchema2, crossRefMutation2, indexAddressSchema2, indexEntryAddressSchema2, indexConfigSchema2, indexEntryDataSchema2, indexEntryPatchSchema2, indexMutation2, indexEntryMutation2, captionAddressSchema2, captionMutation2, captionConfig2, fieldAddressSchema2, fieldMutation2, citationAddressSchema2, citationSourceAddressSchema2, bibliographyAddressSchema2, citationMutation2, citationSourceMutation2, bibliographyMutation2, citationPersonSchema2, citationSourceFieldsSchema2, tocCreateLocationSchema2, authoritiesAddressSchema2, authorityEntryAddressSchema2, authoritiesConfigSchema2, authorityEntryDataSchema2, authorityEntryPatchSchema2, authoritiesMutation2, authorityEntryMutation2, GROUP_METADATA2, STEP_OP_CATALOG_UNFROZEN2, PUBLIC_STEP_OP_CATALOG_UNFROZEN2, PUBLIC_MUTATION_STEP_OP_IDS2, PUBLIC_MUTATION_STEP_OP_SET2, CAPABILITY_REASON_CODES2, VALID_EDGE_VALUES2, VALID_EDGE_NODE_TYPES2, VALID_DOCUMENT_EDGES2, VALID_REF_BOUNDARIES2, VALID_ANCHOR_KINDS2, RESOLVE_RANGE_ALLOWED_KEYS2, CREATE_COMMENT_ALLOWED_KEYS2, PATCH_COMMENT_ALLOWED_KEYS2, STYLE_APPLY_INPUT_ALLOWED_KEYS2, INLINE_ALIAS_INPUT_ALLOWED_KEYS2, DELETE_INPUT_ALLOWED_KEYS2, VALID_BEHAVIORS2, CONTENT_KIND_SET2, INLINE_KIND_SET2, LEGACY_TOP_LEVEL_TYPES2, LEGACY_INSERT_ALLOWED_KEYS2, STRUCTURAL_INSERT_ALLOWED_KEYS2, VALID_INSERT_TYPES2, TEXT_REPLACE_ALLOWED_KEYS2, STRUCTURAL_REPLACE_ALLOWED_KEYS2, SECTION_BREAK_TYPES$1, SUPPORTED_DELETE_NODE_TYPES2, REJECTED_DELETE_NODE_TYPES2, VALID_BLOCK_NODE_TYPES2, TABLE_LOCATOR_OPS2, ROW_LOCATOR_OPS2, COLUMN_LOCATOR_OPS2, MERGE_RANGE_LOCATOR_OPS2, HEADER_FOOTER_KINDS$1, HEADER_FOOTER_VARIANTS$1, DEFAULT_SECTIONS_LIST_LIMIT2 = 250, SECTION_BREAK_TYPES3, SECTION_ORIENTATIONS2, SECTION_VERTICAL_ALIGNS2, SECTION_DIRECTIONS2, HEADER_FOOTER_KINDS3, HEADER_FOOTER_VARIANTS3, LINE_NUMBER_RESTARTS2, PAGE_NUMBER_FORMATS2, PAGE_BORDER_DISPLAYS2, PAGE_BORDER_OFFSET_FROM_VALUES2, PAGE_BORDER_Z_ORDER_VALUES2, VALID_WRAP_TYPES2, VALID_WRAP_SIDES2, VALID_IMAGE_SIZE_UNITS2, PATCH_FIELDS2, ADAPTER_GATED_PREFIXES2, _buffers, _defaultCollectionId = null, _nextCollectionId = 1, generateV2HandlerEntity = (handlerName, translator$215) => ({
   handlerName,
   handler: (params) => {
     const { nodes } = params;
@@ -75603,7 +75628,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_BParsWaS_es = __esm(() => {
+var init_SuperConverter_voJQZ_PC_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
@@ -78149,13 +78174,7 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
   ]);
   TABLE_NESTING_POLICY_VALUES2 = new Set(["forbid", "allow"]);
   DEFAULT_NESTING_POLICY2 = Object.freeze({ tables: "forbid" });
-  SD_ADDRESS_KINDS2 = new Set([
-    "content",
-    "inline",
-    "annotation",
-    "section"
-  ]);
-  SD_ADDRESS_STABILITIES2 = new Set(["stable", "ephemeral"]);
+  BLOCK_NODE_TYPES_SET2 = new Set(BLOCK_NODE_TYPES2);
   NESTING_POLICY_ALLOWED_KEYS2 = new Set(["tables"]);
   UNDERLINE_OBJECT_SCHEMA2 = {
     type: "object",
@@ -78647,8 +78666,8 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
     },
     insert: {
       memberPath: "insert",
-      description: "Insert inline content at a text position within an existing block, or at the end of the document when target is omitted. This is NOT for creating sibling blocks — use create.paragraph, create.heading, or lists.insert for that. Accepts two input shapes: legacy string-based (value + type) or structural SDFragment (content). Supports text (default), markdown, and html content types via the `type` field in legacy mode. Structural mode accepts an SDFragment with typed nodes (paragraphs, tables, images, etc.).",
-      expectedResult: "Returns a TextMutationReceipt with applied status; receipt reports NO_OP if the insertion point is invalid or content is empty.",
+      description: "Insert content into the document. Two input shapes: legacy string-based (value + type) inserts inline content at a text position within an existing block; structural SDFragment (content) inserts one or more blocks as siblings relative to a BlockNodeAddress target. When target is omitted, content appends at the end of the document. Legacy mode supports text (default), markdown, and html content types via the `type` field. Structural mode uses `placement` (before/after/insideStart/insideEnd) to position relative to the target block.",
+      expectedResult: "Returns an SDMutationReceipt with applied status; resolution reports a TextAddress for legacy text insertion or a BlockNodeAddress for structural insertion. Receipt reports NO_OP if the insertion point is invalid or content is empty.",
       requiresDocumentContext: true,
       metadata: mutationOperation2({
         idempotency: "non-idempotent",
@@ -78686,7 +78705,7 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
     },
     replace: {
       memberPath: "replace",
-      description: "Replace content at a contiguous document selection. Text path accepts a SelectionTarget or ref plus replacement text. Structural path accepts an SDAddress, SelectionTarget, or ref plus SDFragment content.",
+      description: "Replace content at a contiguous document selection. Text path accepts a SelectionTarget or ref plus replacement text. Structural path accepts a BlockNodeAddress (replaces whole block), SelectionTarget (expands to full covered block boundaries), or ref plus SDFragment content.",
       expectedResult: "Returns an SDMutationReceipt with applied status; receipt reports NO_OP if the target range already contains identical content.",
       requiresDocumentContext: true,
       metadata: mutationOperation2({
@@ -84458,7 +84477,7 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
   resolvedHandleSchema2 = ref2("ResolvedHandle");
   pageInfoSchema2 = ref2("PageInfo");
   receiptSuccessSchema2 = ref2("ReceiptSuccess");
-  ref2("TextMutationRange");
+  textMutationRangeSchema2 = ref2("TextMutationRange");
   textMutationResolutionSchema2 = ref2("TextMutationResolution");
   textMutationSuccessSchema2 = ref2("TextMutationSuccess");
   ref2("MatchRun");
@@ -84540,41 +84559,18 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
     kind: { enum: ["block", "inline"] }
   }, ["type"]);
   objectSchema2({ nodeType: { enum: [...nodeTypeValues2] } }, ["nodeType"]);
-  sdSelectorSchema2 = { oneOf: [objectSchema2({
-    type: { const: "text" },
-    pattern: { type: "string" },
-    mode: { enum: ["contains", "regex"] },
-    caseSensitive: { type: "boolean" }
-  }, ["type", "pattern"]), objectSchema2({
-    type: { const: "node" },
-    kind: { enum: ["content", "inline"] },
-    nodeKind: { type: "string" }
-  }, ["type"])] };
-  sdAddressSchema2 = objectSchema2({
-    kind: { enum: [
-      "content",
-      "inline",
-      "annotation",
-      "section"
-    ] },
-    stability: { enum: ["stable", "ephemeral"] },
-    nodeId: { type: "string" },
-    anchor: objectSchema2({
-      start: objectSchema2({
-        blockId: { type: "string" },
-        offset: { type: "integer" }
-      }, ["blockId", "offset"]),
-      end: objectSchema2({
-        blockId: { type: "string" },
-        offset: { type: "integer" }
-      }, ["blockId", "offset"])
-    }),
-    evaluatedRevision: { type: "string" },
-    path: arraySchema2({ oneOf: [{ type: "string" }, { type: "integer" }] })
-  }, ["kind", "stability"]);
   objectSchema2({
-    select: sdSelectorSchema2,
-    within: sdAddressSchema2,
+    select: { oneOf: [objectSchema2({
+      type: { const: "text" },
+      pattern: { type: "string" },
+      mode: { enum: ["contains", "regex"] },
+      caseSensitive: { type: "boolean" }
+    }, ["type", "pattern"]), objectSchema2({
+      type: { const: "node" },
+      kind: { enum: ["block", "inline"] },
+      nodeType: { type: "string" }
+    }, ["type"])] },
+    within: blockNodeAddressSchema2,
     limit: { type: "integer" },
     offset: { type: "integer" },
     options: objectSchema2({
@@ -84598,7 +84594,7 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
     },
     items: arraySchema2(objectSchema2({
       node: { type: "object" },
-      address: sdAddressSchema2,
+      address: nodeAddressSchema2,
       context: { type: "object" }
     }, ["node", "address"]))
   }, [
@@ -84608,10 +84604,10 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
     "items"
   ]);
   sdMutationResolutionSchema2 = objectSchema2({
-    requestedTarget: sdAddressSchema2,
-    target: sdAddressSchema2,
+    target: { oneOf: [textAddressSchema2, blockNodeAddressSchema2] },
+    range: textMutationRangeSchema2,
     selectionTarget: selectionTargetSchema2
-  }, ["target"]);
+  }, ["target", "range"]);
   sdMutationSuccessSchema2 = objectSchema2({
     success: { const: true },
     resolution: sdMutationResolutionSchema2,
@@ -85082,6 +85078,17 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
     "planEngine"
   ]);
   objectSchema2({});
+  sdFragmentSchema2 = { oneOf: [{ type: "object" }, {
+    type: "array",
+    items: { type: "object" }
+  }] };
+  placementSchema2 = { enum: [
+    "before",
+    "after",
+    "insideStart",
+    "insideEnd"
+  ] };
+  nestingPolicySchema2 = objectSchema2({ tables: { enum: ["forbid", "allow"] } });
   objectSchema2({
     target: textAddressSchema2,
     value: { type: "string" },
@@ -85093,7 +85100,12 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
         "html"
       ]
     }
-  }, ["value"]);
+  }, ["value"]), objectSchema2({
+    target: blockNodeAddressSchema2,
+    content: sdFragmentSchema2,
+    placement: placementSchema2,
+    nestingPolicy: nestingPolicySchema2
+  }, ["content"]);
   ({ ...objectSchema2({
     target: blockNodeAddressSchema2,
     nodeId: { type: "string" }
@@ -85668,17 +85680,13 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
     "lossy",
     "diagnostics"
   ]), receiptResultSchemaFor2("clearContent"), receiptFailureResultSchemaFor2("clearContent"), sdMutationResultSchemaFor2("insert"), sdMutationFailureSchemaFor2("insert"), { ...targetLocatorWithPayload2({ text: { type: "string" } }, ["text"]) }, objectSchema2({
-    target: { oneOf: [
-      sdAddressSchema2,
-      textAddressSchema2,
-      selectionTargetSchema2
-    ] },
-    content: { type: "object" },
-    nestingPolicy: { type: "object" }
+    target: { oneOf: [blockNodeAddressSchema2, selectionTargetSchema2] },
+    content: sdFragmentSchema2,
+    nestingPolicy: nestingPolicySchema2
   }, ["target", "content"]), objectSchema2({
     ref: { type: "string" },
-    content: { type: "object" },
-    nestingPolicy: { type: "object" }
+    content: sdFragmentSchema2,
+    nestingPolicy: nestingPolicySchema2
   }, ["ref", "content"]), sdMutationResultSchemaFor2("replace"), sdMutationFailureSchemaFor2("replace"), { ...targetLocatorWithPayload2({ behavior: deleteBehaviorSchema2 }) }, textMutationResultSchemaFor2("delete"), textMutationFailureSchemaFor2("delete"), { ...targetLocatorWithPayload2({ inline: buildInlineRunPatchSchema2() }, ["inline"]) }, textMutationResultSchemaFor2("format.apply"), textMutationFailureSchemaFor2("format.apply"), { ...formatInlineAliasOperationSchemas2 }, objectSchema2({
     offset: {
       type: "number",
@@ -86479,7 +86487,7 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
     ] }
   }), objectSchema2({ id: { type: "string" } }, ["id"]), objectSchema2({ id: { type: "string" } }, ["id"]), objectSchema2({ scope: { enum: ["all"] } }, ["scope"]), receiptResultSchemaFor2("trackChanges.decide"), receiptFailureResultSchemaFor2("trackChanges.decide"), objectSchema2({
     select: { oneOf: [textSelectorSchema2, nodeSelectorSchema2] },
-    within: nodeAddressSchema2,
+    within: blockNodeAddressSchema2,
     require: { enum: [
       "any",
       "first",
@@ -86499,7 +86507,7 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
   }, ["select"]), (() => {
     const textMatchItemSchema = discoveryItemSchema2({
       matchKind: { const: "text" },
-      address: nodeAddressSchema2,
+      address: blockNodeAddressSchema2,
       target: selectionTargetSchema2,
       snippet: { type: "string" },
       highlightRange: rangeSchema2,
@@ -86539,7 +86547,7 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
           type: "string"
         },
         select: { oneOf: [textSelectorSchema2, nodeSelectorSchema2] },
-        within: nodeAddressSchema2,
+        within: blockNodeAddressSchema2,
         require: { enum: [
           "first",
           "exactlyOne",
@@ -86556,7 +86564,7 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
           type: "string"
         },
         ref: { type: "string" },
-        within: nodeAddressSchema2
+        within: blockNodeAddressSchema2
       }, ["by", "ref"]),
       objectSchema2({
         by: {
@@ -86572,7 +86580,7 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
         type: "string"
       },
       select: { oneOf: [textSelectorSchema2, nodeSelectorSchema2] },
-      within: nodeAddressSchema2,
+      within: blockNodeAddressSchema2,
       require: { enum: ["first", "exactlyOne"] }
     }, [
       "by",
@@ -86585,7 +86593,7 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
         type: "string"
       },
       select: { oneOf: [textSelectorSchema2, nodeSelectorSchema2] },
-      within: nodeAddressSchema2
+      within: blockNodeAddressSchema2
     }, ["by", "select"]);
     const replacementBlockSchema = objectSchema2({ text: { type: "string" } }, ["text"]);
     const replacementPayloadSchema = { oneOf: [objectSchema2({ text: { type: "string" } }, ["text"]), objectSchema2({ blocks: arraySchema2(replacementBlockSchema) }, ["blocks"])] };
@@ -87844,7 +87852,7 @@ var init_SuperConverter_BParsWaS_es = __esm(() => {
     imageId: { type: "string" },
     text: { type: "string" }
   }, ["imageId", "text"])), imagesMutationSchemaSet2(objectSchema2({ imageId: { type: "string" } }, ["imageId"])), objectSchema2({
-    within: nodeAddressSchema2,
+    within: blockNodeAddressSchema2,
     hrefPattern: { type: "string" },
     anchor: { type: "string" },
     textPattern: { type: "string" },
@@ -136045,7 +136053,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-DLZxEXCY.es.js
+// ../../packages/superdoc/dist/chunks/src-D_53T9-x.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -144647,11 +144655,6 @@ function assertUnambiguous(matches2, blockId) {
       matchCount: matches2.length
     });
 }
-function findInlineWithinTextBlock(index2, blockId) {
-  const matches2 = findTextBlockCandidates(index2, blockId);
-  assertUnambiguous(matches2, blockId);
-  return matches2[0];
-}
 function resolveTextTarget(editor, target) {
   const matches2 = findTextBlockCandidates(getBlockIndex(editor), target.blockId);
   assertUnambiguous(matches2, target.blockId);
@@ -144835,42 +144838,20 @@ function resolveWithinScope(index2, query2, diagnostics) {
       ok: true,
       range: undefined
     };
-  if (query2.within.kind === "block") {
-    const within$1 = findBlockById(index2, query2.within);
-    if (!within$1) {
-      addDiagnostic2(diagnostics, `Within block "${query2.within.nodeType}" with id "${query2.within.nodeId}" was not found in the document.`);
-      return { ok: false };
-    }
-    return {
-      ok: true,
-      range: {
-        start: within$1.pos,
-        end: within$1.end
-      }
-    };
-  }
-  if (query2.within.anchor.start.blockId !== query2.within.anchor.end.blockId) {
-    addDiagnostic2(diagnostics, "Inline within anchors that span multiple blocks are not supported.");
-    return { ok: false };
-  }
-  const block = findInlineWithinTextBlock(index2, query2.within.anchor.start.blockId);
-  if (!block) {
-    addDiagnostic2(diagnostics, `Within inline anchor block "${query2.within.anchor.start.blockId}" was not found in the document.`);
-    return { ok: false };
-  }
-  const resolved = resolveTextRangeInBlock(block.node, block.pos, {
-    start: query2.within.anchor.start.offset,
-    end: query2.within.anchor.end.offset
-  });
-  if (!resolved) {
-    addDiagnostic2(diagnostics, "Inline within anchor offsets could not be resolved in the target block.");
+  let within$1 = findBlockById(index2, query2.within);
+  if (!within$1 && query2.within.kind === "block")
+    try {
+      within$1 = findBlockByNodeIdOnly(index2, query2.within.nodeId);
+    } catch {}
+  if (!within$1) {
+    addDiagnostic2(diagnostics, `Within block "${query2.within.nodeType}" with id "${query2.within.nodeId}" was not found in the document.`);
     return { ok: false };
   }
   return {
     ok: true,
     range: {
-      start: resolved.from,
-      end: resolved.to
+      start: within$1.pos,
+      end: within$1.end
     }
   };
 }
@@ -147336,7 +147317,7 @@ function buildTextContext(editor, address2, matchFrom, matchTo, textRanges) {
     textRanges: textRanges?.length ? textRanges : undefined
   };
 }
-function toTextAddress$1(editor, block, range) {
+function toTextAddress$2(editor, block, range) {
   const blockStart = block.pos + 1;
   const blockEnd = block.end - 1;
   if (range.from < blockStart || range.to > blockEnd)
@@ -147603,7 +147584,7 @@ function executeTextSelector(editor, index2, query2, diagnostics) {
         return;
       if (!source)
         source = block;
-      return toTextAddress$1(editor, block, range);
+      return toTextAddress$2(editor, block, range);
     }).filter((range) => Boolean(range));
     if (!source)
       source = findCandidateByPos(textBlocks, match$1.from) ?? findBlockByPos(index2, match$1.from);
@@ -148600,39 +148581,50 @@ function translateToInternalQuery(input2) {
   const { select: select2, within: within$1, limit, offset: offset$1 } = input2;
   if (within$1)
     validateWithinAddress(within$1);
-  if (select2.type === "text")
-    return {
-      select: {
-        type: "text",
-        pattern: select2.pattern,
-        ...select2.mode != null && { mode: select2.mode },
-        ...select2.caseSensitive != null && { caseSensitive: select2.caseSensitive }
-      },
-      limit,
-      offset: offset$1,
-      includeNodes: true
-    };
+  if (select2.type === "node") {
+    const raw = select2;
+    if ("nodeKind" in raw && raw.nodeKind != null)
+      throw new DocumentApiAdapterError("INVALID_INPUT", `"nodeKind" is no longer supported on node selectors. Use "nodeType" instead: { type: 'node', nodeType: '${String(raw.nodeKind)}' }.`, {
+        field: "select.nodeKind",
+        value: raw.nodeKind
+      });
+    if (raw.kind === "content")
+      throw new DocumentApiAdapterError("INVALID_INPUT", `kind: 'content' is no longer supported on node selectors. Use kind: 'block' instead.`, {
+        field: "select.kind",
+        value: raw.kind
+      });
+  }
   return {
-    select: {
-      type: "node",
-      ...select2.nodeKind != null && { nodeType: select2.nodeKind },
-      ...select2.kind === "content" && { kind: "block" },
-      ...select2.kind === "inline" && { kind: "inline" }
-    },
+    select: select2,
     limit,
     offset: offset$1,
     includeNodes: true
   };
 }
-function validateWithinAddress(sdAddress) {
-  if (sdAddress.kind === "content" && sdAddress.nodeId)
-    return { nodeId: sdAddress.nodeId };
-  throw new DocumentApiAdapterError("INVALID_TARGET", `"within" scope requires a content-kind SDAddress with a nodeId. Got kind="${sdAddress.kind}".`, {
+function validateWithinAddress(address2) {
+  if (address2.kind === "block" && "nodeId" in address2 && typeof address2.nodeId === "string")
+    return {
+      nodeId: address2.nodeId,
+      nodeType: address2.nodeType
+    };
+  throw new DocumentApiAdapterError("INVALID_TARGET", '"within" scope requires a BlockNodeAddress with a nodeId.', {
     field: "within",
-    value: sdAddress
+    value: address2
   });
 }
-function resolveWithinNodeType(index2, nodeId) {
+function resolveWithinAddress(index2, nodeId, expectedNodeType) {
+  if (expectedNodeType) {
+    const match$2 = findBlockByIdStrict(index2, {
+      kind: "block",
+      nodeType: expectedNodeType,
+      nodeId
+    });
+    return {
+      kind: "block",
+      nodeType: match$2.nodeType,
+      nodeId: match$2.nodeId
+    };
+  }
   const match$1 = findBlockByNodeIdOnly(index2, nodeId);
   return {
     kind: "block",
@@ -148640,28 +148632,6 @@ function resolveWithinNodeType(index2, nodeId) {
     nodeId: match$1.nodeId
   };
 }
-function toSDAddress(address2) {
-  if (address2.kind === "block")
-    return {
-      kind: "content",
-      stability: "stable",
-      nodeId: address2.nodeId
-    };
-  return {
-    kind: "inline",
-    stability: "ephemeral",
-    anchor: {
-      start: {
-        blockId: address2.anchor.start.blockId,
-        offset: address2.anchor.start.offset
-      },
-      end: {
-        blockId: address2.anchor.end.blockId,
-        offset: address2.anchor.end.offset
-      }
-    }
-  };
-}
 function projectMatchToSDNodeResult(editor, address2, blockIndex) {
   if (address2.kind === "block") {
     const candidate = blockIndex.byId.get(`${address2.nodeType}:${address2.nodeId}`);
@@ -148671,12 +148641,12 @@ function projectMatchToSDNodeResult(editor, address2, blockIndex) {
         return null;
       return {
         node: projectContentNode(found2.node),
-        address: toSDAddress(address2)
+        address: address2
       };
     }
     return {
       node: projectContentNode(candidate.node),
-      address: toSDAddress(address2)
+      address: address2
     };
   }
   const inlineCandidate = findInlineByAnchor(getInlineIndex(editor), address2);
@@ -148684,13 +148654,13 @@ function projectMatchToSDNodeResult(editor, address2, blockIndex) {
     if (inlineCandidate.node)
       return {
         node: projectInlineNode(inlineCandidate.node),
-        address: toSDAddress(address2)
+        address: address2
       };
     const markProjected = projectMarkBasedInline(editor, inlineCandidate);
     if (markProjected)
       return {
         node: markProjected,
-        address: toSDAddress(address2)
+        address: address2
       };
   }
   return {
@@ -148698,15 +148668,15 @@ function projectMatchToSDNodeResult(editor, address2, blockIndex) {
       kind: "run",
       run: { text: resolveTextByBlockId(editor, address2.anchor) }
     },
-    address: toSDAddress(address2)
+    address: address2
   };
 }
 function sdFindAdapter(editor, input2) {
   const query2 = translateToInternalQuery(input2);
   const index2 = getBlockIndex(editor);
   if (input2.within) {
-    const { nodeId } = validateWithinAddress(input2.within);
-    query2.within = resolveWithinNodeType(index2, nodeId);
+    const { nodeId, nodeType } = validateWithinAddress(input2.within);
+    query2.within = resolveWithinAddress(index2, nodeId, nodeType);
   }
   const diagnostics = [];
   const isInlineSelector = query2.select.type !== "text" && isInlineQuery(query2.select);
@@ -148731,41 +148701,29 @@ function findBlocksByTypeAndId(blockIndex, nodeType, nodeId) {
     return [byIdMatch];
   return blockIndex.candidates.filter((candidate) => candidate.nodeType === nodeType && candidate.nodeId === nodeId);
 }
-function buildBlockAddress(nodeId) {
-  return {
-    kind: "content",
-    stability: "stable",
-    nodeId
-  };
-}
 function buildInlineAddress(address2) {
-  return {
-    kind: "inline",
-    stability: "ephemeral",
-    anchor: {
-      start: {
-        blockId: address2.anchor.start.blockId,
-        offset: address2.anchor.start.offset
-      },
-      end: {
-        blockId: address2.anchor.end.blockId,
-        offset: address2.anchor.end.offset
-      }
-    }
-  };
+  return address2;
 }
 function getNodeAdapter(editor, address2) {
   const blockIndex = getBlockIndex(editor);
   if (address2.kind === "block") {
     const matches2 = findBlocksByTypeAndId(blockIndex, address2.nodeType, address2.nodeId);
-    if (matches2.length === 0)
-      throw new DocumentApiAdapterError("TARGET_NOT_FOUND", `Node "${address2.nodeType}" not found for id "${address2.nodeId}".`);
     if (matches2.length > 1)
       throw new DocumentApiAdapterError("TARGET_NOT_FOUND", `Multiple nodes share ${address2.nodeType} id "${address2.nodeId}".`);
-    const candidate$1 = matches2[0];
+    let candidate$1 = matches2[0];
+    if (!candidate$1)
+      try {
+        candidate$1 = findBlockByNodeIdOnly(blockIndex, address2.nodeId);
+      } catch {}
+    if (!candidate$1)
+      throw new DocumentApiAdapterError("TARGET_NOT_FOUND", `Node "${address2.nodeType}" not found for id "${address2.nodeId}".`);
     return {
       node: projectContentNode(candidate$1.node),
-      address: buildBlockAddress(address2.nodeId)
+      address: {
+        kind: "block",
+        nodeType: candidate$1.nodeType,
+        nodeId: candidate$1.nodeId
+      }
     };
   }
   const candidate = findInlineByAnchor(getInlineIndex(editor), address2);
@@ -148815,10 +148773,14 @@ function resolveBlockById(editor, nodeId, nodeType) {
 }
 function getNodeByIdAdapter(editor, input2) {
   const { nodeId, nodeType } = input2;
-  const { candidate } = resolveBlockById(editor, nodeId, nodeType);
+  const { candidate, resolvedType } = resolveBlockById(editor, nodeId, nodeType);
   return {
     node: projectContentNode(candidate.node),
-    address: buildBlockAddress(nodeId)
+    address: {
+      kind: "block",
+      nodeType: resolvedType,
+      nodeId: candidate.nodeId
+    }
   };
 }
 function getTextAdapter(editor, _input) {
@@ -152047,36 +152009,52 @@ function buildMarksFromLegacyRun(schema, run2) {
     marks.push(schema.marks.highlight.create({ color: run2.highlight }));
   return marks;
 }
-function resolveInsertTarget(editor, target) {
-  if (!target)
-    return resolveDocumentEndTarget(editor);
-  const index2 = getBlockIndex(editor);
-  let candidate;
+function findBlockByTarget(index2, target, operationName) {
+  const nodeId = target.kind === "block" ? target.nodeId : target.blockId;
   try {
-    candidate = findBlockByNodeIdOnly(index2, target.blockId);
+    if (target.kind === "block") {
+      const typed = findBlockById(index2, target);
+      if (typed)
+        return typed;
+      return findBlockByNodeIdOnly(index2, nodeId);
+    }
+    return findBlockByNodeIdOnly(index2, nodeId);
   } catch {
-    throw new DocumentApiAdapterError("TARGET_NOT_FOUND", `Cannot resolve insert target for block "${target.blockId}".`);
+    throw new DocumentApiAdapterError("TARGET_NOT_FOUND", `Cannot resolve ${operationName} target for block "${nodeId}".`);
   }
+}
+function resolveInsertTarget(editor, target) {
+  if (!target)
+    return resolveDocumentEndTarget(editor);
+  const candidate = findBlockByTarget(getBlockIndex(editor), target, "insert");
   return {
     insertPos: candidate.end,
     structuralEnd: false,
-    effectiveTarget: target,
+    effectiveTarget: target.kind === "block" ? {
+      kind: "text",
+      blockId: target.nodeId,
+      range: {
+        start: 0,
+        end: 0
+      }
+    } : target,
     targetNode: candidate.node,
     targetNodePos: candidate.pos
   };
 }
 function resolveReplaceTarget(editor, target) {
-  const index2 = getBlockIndex(editor);
-  let candidate;
-  try {
-    candidate = findBlockByNodeIdOnly(index2, target.blockId);
-  } catch {
-    throw new DocumentApiAdapterError("TARGET_NOT_FOUND", `Cannot resolve replace target for block "${target.blockId}".`);
-  }
+  const candidate = findBlockByTarget(getBlockIndex(editor), target, "replace");
   return {
     from: candidate.pos,
     to: candidate.end,
-    effectiveTarget: target
+    effectiveTarget: target.kind === "block" ? {
+      kind: "text",
+      blockId: target.nodeId,
+      range: {
+        start: 0,
+        end: 0
+      }
+    } : target
   };
 }
 function resolveDocumentEndTarget(editor) {
@@ -152317,17 +152295,16 @@ function ensureTableSeparators(jsonNodes) {
     if (jsonNodes[i$1].type === "table" && jsonNodes[i$1 + 1].type === "table")
       jsonNodes.splice(i$1 + 1, 0, { type: "paragraph" });
 }
-function narrowToTextAddress(target) {
+function targetBlockId$1(target) {
+  return target.kind === "block" ? target.nodeId : target.blockId;
+}
+function toTextAddress$1(target) {
   if (target.kind === "text")
     return target;
-  const sd = target;
   return {
     kind: "text",
-    blockId: sd.nodeId ?? "",
-    range: sd.anchor ? {
-      start: sd.anchor.start.offset,
-      end: sd.anchor.end.offset
-    } : {
+    blockId: target.nodeId,
+    range: {
       start: 0,
       end: 0
     }
@@ -152668,6 +152645,8 @@ function buildSelectionResolutionFromOutcome(stepOutcome, compiled, stepId) {
   return buildSelectionResolutionFromCompiled(compiled, stepId);
 }
 function insertStructuredWrapper(editor, input2, options) {
+  if (isStructuralInsertInput2(input2) && input2.target)
+    return executeStructuralInsertDirect(editor, input2, options);
   return textReceiptToSDReceipt2(insertStructuredInner(editor, input2, options));
 }
 function insertStructuredInner(editor, input2, options) {
@@ -152856,14 +152835,13 @@ function insertStructuredInner(editor, input2, options) {
 function executeStructuralInsertWrapper(editor, input2, options) {
   const { content: content3, target, placement: placement2, nestingPolicy } = input2;
   const mode = options?.changeMode ?? "direct";
-  const textTarget = target ? narrowToTextAddress(target) : undefined;
   let resolved;
   try {
-    resolved = resolveInsertTarget(editor, textTarget);
+    resolved = resolveInsertTarget(editor, target);
   } catch (err) {
     if (err instanceof DocumentApiAdapterError)
       throw err;
-    throw new DocumentApiAdapterError("TARGET_NOT_FOUND", `Cannot resolve insert target${textTarget ? ` for block "${textTarget.blockId}"` : ""}.`);
+    throw new DocumentApiAdapterError("TARGET_NOT_FOUND", `Cannot resolve insert target${target ? ` for block "${target.nodeId}"` : ""}.`);
   }
   const effectiveTarget = resolved.effectiveTarget ?? {
     kind: "text",
@@ -152879,7 +152857,6 @@ function executeStructuralInsertWrapper(editor, input2, options) {
   else
     insertPos = resolved.insertPos;
   const resolution = buildTextMutationResolution({
-    requestedTarget: textTarget,
     target: effectiveTarget,
     range: {
       from: insertPos,
@@ -152890,7 +152867,7 @@ function executeStructuralInsertWrapper(editor, input2, options) {
   try {
     if (options?.dryRun) {
       executeStructuralInsert(editor, {
-        target: textTarget,
+        target,
         content: content3,
         placement: placement2,
         nestingPolicy,
@@ -152904,7 +152881,7 @@ function executeStructuralInsertWrapper(editor, input2, options) {
     }
     if (!(executeDomainCommand(editor, () => {
       return executeStructuralInsert(editor, {
-        target: textTarget,
+        target,
         content: content3,
         placement: placement2,
         nestingPolicy,
@@ -152939,10 +152916,78 @@ function executeStructuralInsertWrapper(editor, input2, options) {
     };
   }
 }
+function executeStructuralInsertDirect(editor, input2, options) {
+  const { content: content3, target, placement: placement2, nestingPolicy } = input2;
+  const mode = options?.changeMode ?? "direct";
+  let resolved;
+  try {
+    resolved = resolveInsertTarget(editor, target);
+  } catch (err) {
+    if (err instanceof DocumentApiAdapterError)
+      throw err;
+    throw new DocumentApiAdapterError("TARGET_NOT_FOUND", `Cannot resolve insert target for block "${target.nodeId}".`);
+  }
+  let insertPos;
+  if (resolved.targetNode && resolved.targetNodePos !== undefined)
+    insertPos = resolvePlacement(editor.state.doc, resolved.targetNodePos, resolved.targetNode, placement2);
+  else
+    insertPos = resolved.insertPos;
+  const receiptParams = {
+    target,
+    range: {
+      from: insertPos,
+      to: insertPos
+    }
+  };
+  try {
+    if (options?.dryRun) {
+      executeStructuralInsert(editor, {
+        target,
+        content: content3,
+        placement: placement2,
+        nestingPolicy,
+        changeMode: mode,
+        dryRun: true
+      });
+      return buildStructuralReceipt2(true, receiptParams);
+    }
+    if (executeDomainCommand(editor, () => {
+      return executeStructuralInsert(editor, {
+        target,
+        content: content3,
+        placement: placement2,
+        nestingPolicy,
+        changeMode: mode
+      }).success;
+    }, {
+      expectedRevision: options?.expectedRevision,
+      changeMode: mode
+    }).steps[0]?.effect !== "changed")
+      return buildStructuralReceipt2(false, receiptParams, {
+        code: "INVALID_TARGET",
+        message: "Structural insert failed."
+      });
+    return buildStructuralReceipt2(true, receiptParams);
+  } catch (err) {
+    if (err instanceof DocumentApiAdapterError)
+      throw err;
+    return buildStructuralReceipt2(false, receiptParams, {
+      code: "INVALID_TARGET",
+      message: `Structural insert failed: ${err instanceof Error ? err.message : String(err)}`
+    });
+  }
+}
 function replaceStructuredWrapper(editor, input2, options) {
   if (!isStructuralReplaceInput2(input2))
     throw new DocumentApiAdapterError("INVALID_INPUT", 'replaceStructured requires structural content input with a "content" field.');
-  return textReceiptToSDReceipt2(executeStructuralReplaceWrapper(editor, input2, options));
+  const blockTarget = input2.target && "kind" in input2.target && input2.target.kind === "block" ? input2.target : undefined;
+  const textReceipt = executeStructuralReplaceWrapper(editor, input2, options);
+  if (!blockTarget)
+    return textReceiptToSDReceipt2(textReceipt);
+  const sdReceipt = textReceiptToSDReceipt2(textReceipt);
+  if (sdReceipt.resolution)
+    sdReceipt.resolution.target = blockTarget;
+  return sdReceipt;
 }
 function resolveStructuralLocator(editor, input2) {
   const { target, ref: ref$1 } = input2;
@@ -152971,7 +153016,7 @@ function resolveStructuralLocator(editor, input2) {
         effectiveSelectionTarget: buildEffectiveSelectionTarget(expanded)
       };
     }
-    return { textTarget: narrowToTextAddress(target) };
+    return { textTarget: target };
   }
   if (ref$1 !== undefined) {
     if (ref$1.startsWith("text:"))
@@ -153141,7 +153186,7 @@ function executeStructuralReplaceWrapper(editor, input2, options) {
     } catch (err) {
       if (err instanceof DocumentApiAdapterError)
         throw err;
-      throw new DocumentApiAdapterError("TARGET_NOT_FOUND", `Cannot resolve replace target for block "${textTarget.blockId}".`);
+      throw new DocumentApiAdapterError("TARGET_NOT_FOUND", `Cannot resolve replace target for block "${targetBlockId$1(textTarget)}".`);
     }
     effectiveRange = {
       from: resolvedBlock.from,
@@ -153150,13 +153195,13 @@ function executeStructuralReplaceWrapper(editor, input2, options) {
   }
   const coveredText = editor.state.doc.textBetween(effectiveRange.from, effectiveRange.to, `
 `, "");
+  const textAddr = toTextAddress$1(textTarget);
   let resolution;
   if (effectiveSelectionTarget)
     resolution = selectionTargetToResolution(effectiveSelectionTarget, effectiveRange, coveredText);
   else
     resolution = buildTextMutationResolution({
-      requestedTarget: isRefBased ? undefined : textTarget,
-      target: textTarget,
+      target: textAddr,
       range: effectiveRange,
       text: coveredText
     });
@@ -221875,9 +221920,9 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_DLZxEXCY_es = __esm(() => {
+var init_src_D_53T9_x_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_BParsWaS_es();
+  init_SuperConverter_voJQZ_PC_es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_CMPtQbp7_es();
@@ -255725,8 +255770,8 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_DLZxEXCY_es();
-  init_SuperConverter_BParsWaS_es();
+  init_src_D_53T9_x_es();
+  init_SuperConverter_voJQZ_PC_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
   init_constants_CMPtQbp7_es();
@@ -257196,11 +257241,6 @@ function assertUnambiguous2(matches2, blockId) {
     });
   }
 }
-function findInlineWithinTextBlock2(index2, blockId) {
-  const matches2 = findTextBlockCandidates2(index2, blockId);
-  assertUnambiguous2(matches2, blockId);
-  return matches2[0];
-}
 function resolveTextTarget2(editor, target) {
   const index2 = getBlockIndex2(editor);
   const matches2 = findTextBlockCandidates2(index2, target.blockId);
@@ -257367,32 +257407,17 @@ function dedupeDiagnostics2(diagnostics) {
 function resolveWithinScope2(index2, query2, diagnostics) {
   if (!query2.within)
     return { ok: true, range: undefined };
-  if (query2.within.kind === "block") {
-    const within2 = findBlockById2(index2, query2.within);
-    if (!within2) {
-      addDiagnostic3(diagnostics, `Within block "${query2.within.nodeType}" with id "${query2.within.nodeId}" was not found in the document.`);
-      return { ok: false };
-    }
-    return { ok: true, range: { start: within2.pos, end: within2.end } };
-  }
-  if (query2.within.anchor.start.blockId !== query2.within.anchor.end.blockId) {
-    addDiagnostic3(diagnostics, "Inline within anchors that span multiple blocks are not supported.");
-    return { ok: false };
-  }
-  const block = findInlineWithinTextBlock2(index2, query2.within.anchor.start.blockId);
-  if (!block) {
-    addDiagnostic3(diagnostics, `Within inline anchor block "${query2.within.anchor.start.blockId}" was not found in the document.`);
-    return { ok: false };
+  let within2 = findBlockById2(index2, query2.within);
+  if (!within2 && query2.within.kind === "block") {
+    try {
+      within2 = findBlockByNodeIdOnly2(index2, query2.within.nodeId);
+    } catch {}
   }
-  const resolved = resolveTextRangeInBlock2(block.node, block.pos, {
-    start: query2.within.anchor.start.offset,
-    end: query2.within.anchor.end.offset
-  });
-  if (!resolved) {
-    addDiagnostic3(diagnostics, "Inline within anchor offsets could not be resolved in the target block.");
+  if (!within2) {
+    addDiagnostic3(diagnostics, `Within block "${query2.within.nodeType}" with id "${query2.within.nodeId}" was not found in the document.`);
     return { ok: false };
   }
-  return { ok: true, range: { start: resolved.from, end: resolved.to } };
+  return { ok: true, range: { start: within2.pos, end: within2.end } };
 }
 function scopeByRange2(candidates, range) {
   if (!range)
@@ -266654,62 +266679,38 @@ function translateToInternalQuery2(input2) {
   const { select: select2, within: within2, limit, offset: offset2 } = input2;
   if (within2)
     validateWithinAddress2(within2);
-  if (select2.type === "text") {
-    return {
-      select: {
-        type: "text",
-        pattern: select2.pattern,
-        ...select2.mode != null && { mode: select2.mode },
-        ...select2.caseSensitive != null && { caseSensitive: select2.caseSensitive }
-      },
-      limit,
-      offset: offset2,
-      includeNodes: true
-    };
+  if (select2.type === "node") {
+    const raw = select2;
+    if ("nodeKind" in raw && raw.nodeKind != null) {
+      throw new DocumentApiAdapterError3("INVALID_INPUT", `"nodeKind" is no longer supported on node selectors. Use "nodeType" instead: ` + `{ type: 'node', nodeType: '${String(raw.nodeKind)}' }.`, { field: "select.nodeKind", value: raw.nodeKind });
+    }
+    if (raw.kind === "content") {
+      throw new DocumentApiAdapterError3("INVALID_INPUT", `kind: 'content' is no longer supported on node selectors. Use kind: 'block' instead.`, { field: "select.kind", value: raw.kind });
+    }
   }
-  const nodeSelect = {
-    type: "node",
-    ...select2.nodeKind != null && { nodeType: select2.nodeKind },
-    ...select2.kind === "content" && { kind: "block" },
-    ...select2.kind === "inline" && { kind: "inline" }
-  };
   return {
-    select: nodeSelect,
+    select: select2,
     limit,
     offset: offset2,
     includeNodes: true
   };
 }
-function validateWithinAddress2(sdAddress) {
-  if (sdAddress.kind === "content" && sdAddress.nodeId) {
-    return { nodeId: sdAddress.nodeId };
+function validateWithinAddress2(address2) {
+  if (address2.kind === "block" && "nodeId" in address2 && typeof address2.nodeId === "string") {
+    return { nodeId: address2.nodeId, nodeType: address2.nodeType };
   }
-  throw new DocumentApiAdapterError3("INVALID_TARGET", `"within" scope requires a content-kind SDAddress with a nodeId. Got kind="${sdAddress.kind}".`, { field: "within", value: sdAddress });
-}
-function resolveWithinNodeType2(index2, nodeId) {
-  const match2 = findBlockByNodeIdOnly2(index2, nodeId);
-  return {
-    kind: "block",
-    nodeType: match2.nodeType,
-    nodeId: match2.nodeId
-  };
+  throw new DocumentApiAdapterError3("INVALID_TARGET", '"within" scope requires a BlockNodeAddress with a nodeId.', {
+    field: "within",
+    value: address2
+  });
 }
-function toSDAddress2(address2) {
-  if (address2.kind === "block") {
-    return {
-      kind: "content",
-      stability: "stable",
-      nodeId: address2.nodeId
-    };
+function resolveWithinAddress2(index2, nodeId, expectedNodeType) {
+  if (expectedNodeType) {
+    const match3 = findBlockByIdStrict2(index2, { kind: "block", nodeType: expectedNodeType, nodeId });
+    return { kind: "block", nodeType: match3.nodeType, nodeId: match3.nodeId };
   }
-  return {
-    kind: "inline",
-    stability: "ephemeral",
-    anchor: {
-      start: { blockId: address2.anchor.start.blockId, offset: address2.anchor.start.offset },
-      end: { blockId: address2.anchor.end.blockId, offset: address2.anchor.end.offset }
-    }
-  };
+  const match2 = findBlockByNodeIdOnly2(index2, nodeId);
+  return { kind: "block", nodeType: match2.nodeType, nodeId: match2.nodeId };
 }
 function projectMatchToSDNodeResult2(editor, address2, blockIndex) {
   if (address2.kind === "block") {
@@ -266720,12 +266721,12 @@ function projectMatchToSDNodeResult2(editor, address2, blockIndex) {
         return null;
       return {
         node: projectContentNode2(found3.node),
-        address: toSDAddress2(address2)
+        address: address2
       };
     }
     return {
       node: projectContentNode2(candidate.node),
-      address: toSDAddress2(address2)
+      address: address2
     };
   }
   const inlineIndex = getInlineIndex2(editor);
@@ -266734,26 +266735,26 @@ function projectMatchToSDNodeResult2(editor, address2, blockIndex) {
     if (inlineCandidate.node) {
       return {
         node: projectInlineNode2(inlineCandidate.node),
-        address: toSDAddress2(address2)
+        address: address2
       };
     }
     const markProjected = projectMarkBasedInline2(editor, inlineCandidate);
     if (markProjected) {
-      return { node: markProjected, address: toSDAddress2(address2) };
+      return { node: markProjected, address: address2 };
     }
   }
   const resolvedText = resolveTextByBlockId2(editor, address2.anchor);
   return {
     node: { kind: "run", run: { text: resolvedText } },
-    address: toSDAddress2(address2)
+    address: address2
   };
 }
 function sdFindAdapter2(editor, input2) {
   const query2 = translateToInternalQuery2(input2);
   const index2 = getBlockIndex2(editor);
   if (input2.within) {
-    const { nodeId } = validateWithinAddress2(input2.within);
-    query2.within = resolveWithinNodeType2(index2, nodeId);
+    const { nodeId, nodeType } = validateWithinAddress2(input2.within);
+    query2.within = resolveWithinAddress2(index2, nodeId, nodeType);
   }
   const diagnostics = [];
   const isInlineSelector = query2.select.type !== "text" && isInlineQuery2(query2.select);
@@ -266797,37 +266798,28 @@ function findBlocksByTypeAndId2(blockIndex, nodeType, nodeId) {
     return [byIdMatch];
   return blockIndex.candidates.filter((candidate) => candidate.nodeType === nodeType && candidate.nodeId === nodeId);
 }
-function buildBlockAddress2(nodeId) {
-  return {
-    kind: "content",
-    stability: "stable",
-    nodeId
-  };
-}
 function buildInlineAddress2(address2) {
-  return {
-    kind: "inline",
-    stability: "ephemeral",
-    anchor: {
-      start: { blockId: address2.anchor.start.blockId, offset: address2.anchor.start.offset },
-      end: { blockId: address2.anchor.end.blockId, offset: address2.anchor.end.offset }
-    }
-  };
+  return address2;
 }
 function getNodeAdapter2(editor, address2) {
   const blockIndex = getBlockIndex2(editor);
   if (address2.kind === "block") {
     const matches3 = findBlocksByTypeAndId2(blockIndex, address2.nodeType, address2.nodeId);
-    if (matches3.length === 0) {
-      throw new DocumentApiAdapterError3("TARGET_NOT_FOUND", `Node "${address2.nodeType}" not found for id "${address2.nodeId}".`);
-    }
     if (matches3.length > 1) {
       throw new DocumentApiAdapterError3("TARGET_NOT_FOUND", `Multiple nodes share ${address2.nodeType} id "${address2.nodeId}".`);
     }
-    const candidate2 = matches3[0];
+    let candidate2 = matches3[0];
+    if (!candidate2) {
+      try {
+        candidate2 = findBlockByNodeIdOnly2(blockIndex, address2.nodeId);
+      } catch {}
+    }
+    if (!candidate2) {
+      throw new DocumentApiAdapterError3("TARGET_NOT_FOUND", `Node "${address2.nodeType}" not found for id "${address2.nodeId}".`);
+    }
     return {
       node: projectContentNode2(candidate2.node),
-      address: buildBlockAddress2(address2.nodeId)
+      address: { kind: "block", nodeType: candidate2.nodeType, nodeId: candidate2.nodeId }
     };
   }
   const inlineIndex = getInlineIndex2(editor);
@@ -266875,13 +266867,14 @@ function resolveBlockById2(editor, nodeId, nodeType) {
 }
 function getNodeByIdAdapter2(editor, input2) {
   const { nodeId, nodeType } = input2;
-  const { candidate } = resolveBlockById2(editor, nodeId, nodeType);
+  const { candidate, resolvedType } = resolveBlockById2(editor, nodeId, nodeType);
   return {
     node: projectContentNode2(candidate.node),
-    address: buildBlockAddress2(nodeId)
+    address: { kind: "block", nodeType: resolvedType, nodeId: candidate.nodeId }
   };
 }
 var init_get_node_adapter = __esm(() => {
+  init_node_address_resolver();
   init_index_cache();
   init_inline_address_resolver();
   init_sd_projection();
@@ -327933,37 +327926,41 @@ var init_node_materializer = __esm(() => {
 });
 
 // ../../packages/super-editor/src/document-api-adapters/structural-write-engine/target-resolver.ts
+function findBlockByTarget2(index3, target, operationName) {
+  const nodeId = target.kind === "block" ? target.nodeId : target.blockId;
+  try {
+    if (target.kind === "block") {
+      const typed = findBlockById2(index3, target);
+      if (typed)
+        return typed;
+      return findBlockByNodeIdOnly2(index3, nodeId);
+    }
+    return findBlockByNodeIdOnly2(index3, nodeId);
+  } catch {
+    throw new DocumentApiAdapterError3("TARGET_NOT_FOUND", `Cannot resolve ${operationName} target for block "${nodeId}".`);
+  }
+}
 function resolveInsertTarget2(editor, target) {
   if (!target) {
     return resolveDocumentEndTarget2(editor);
   }
   const index3 = getBlockIndex2(editor);
-  let candidate;
-  try {
-    candidate = findBlockByNodeIdOnly2(index3, target.blockId);
-  } catch {
-    throw new DocumentApiAdapterError3("TARGET_NOT_FOUND", `Cannot resolve insert target for block "${target.blockId}".`);
-  }
+  const candidate = findBlockByTarget2(index3, target, "insert");
   return {
     insertPos: candidate.end,
     structuralEnd: false,
-    effectiveTarget: target,
+    effectiveTarget: target.kind === "block" ? { kind: "text", blockId: target.nodeId, range: { start: 0, end: 0 } } : target,
     targetNode: candidate.node,
     targetNodePos: candidate.pos
   };
 }
 function resolveReplaceTarget2(editor, target) {
   const index3 = getBlockIndex2(editor);
-  let candidate;
-  try {
-    candidate = findBlockByNodeIdOnly2(index3, target.blockId);
-  } catch {
-    throw new DocumentApiAdapterError3("TARGET_NOT_FOUND", `Cannot resolve replace target for block "${target.blockId}".`);
-  }
+  const candidate = findBlockByTarget2(index3, target, "replace");
   return {
     from: candidate.pos,
     to: candidate.end,
-    effectiveTarget: target
+    effectiveTarget: target.kind === "block" ? { kind: "text", blockId: target.nodeId, range: { start: 0, end: 0 } } : target
   };
 }
 function resolveDocumentEndTarget2(editor) {
@@ -328261,15 +328258,13 @@ function ensureTableSeparators2(jsonNodes) {
     }
   }
 }
-function narrowToTextAddress2(target) {
+function targetBlockId2(target) {
+  return target.kind === "block" ? target.nodeId : target.blockId;
+}
+function toTextAddress3(target) {
   if (target.kind === "text")
     return target;
-  const sd = target;
-  return {
-    kind: "text",
-    blockId: sd.nodeId ?? "",
-    range: sd.anchor ? { start: sd.anchor.start.offset, end: sd.anchor.end.offset } : { start: 0, end: 0 }
-  };
+  return { kind: "text", blockId: target.nodeId, range: { start: 0, end: 0 } };
 }
 function normalizeWriteLocator2(request) {
   const hasBlockId = request.blockId !== undefined;
@@ -328560,6 +328555,9 @@ function buildSelectionResolutionFromOutcome2(stepOutcome, compiled, stepId) {
   return buildSelectionResolutionFromCompiled2(compiled, stepId);
 }
 function insertStructuredWrapper2(editor, input2, options) {
+  if (isStructuralInsertInput(input2) && input2.target) {
+    return executeStructuralInsertDirect2(editor, input2, options);
+  }
   return textReceiptToSDReceipt(insertStructuredInner2(editor, input2, options));
 }
 function insertStructuredInner2(editor, input2, options) {
@@ -328730,14 +328728,13 @@ function insertStructuredInner2(editor, input2, options) {
 function executeStructuralInsertWrapper2(editor, input2, options) {
   const { content: content5, target, placement: placement2, nestingPolicy } = input2;
   const mode = options?.changeMode ?? "direct";
-  const textTarget = target ? narrowToTextAddress2(target) : undefined;
   let resolved;
   try {
-    resolved = resolveInsertTarget2(editor, textTarget);
+    resolved = resolveInsertTarget2(editor, target);
   } catch (err) {
     if (err instanceof DocumentApiAdapterError3)
       throw err;
-    throw new DocumentApiAdapterError3("TARGET_NOT_FOUND", `Cannot resolve insert target${textTarget ? ` for block "${textTarget.blockId}"` : ""}.`);
+    throw new DocumentApiAdapterError3("TARGET_NOT_FOUND", `Cannot resolve insert target${target ? ` for block "${target.nodeId}"` : ""}.`);
   }
   const effectiveTarget = resolved.effectiveTarget ?? {
     kind: "text",
@@ -328752,7 +328749,6 @@ function executeStructuralInsertWrapper2(editor, input2, options) {
   }
   const resolvedRange = { from: insertPos, to: insertPos };
   const resolution = buildTextMutationResolution2({
-    requestedTarget: textTarget,
     target: effectiveTarget,
     range: resolvedRange,
     text: ""
@@ -328760,7 +328756,7 @@ function executeStructuralInsertWrapper2(editor, input2, options) {
   try {
     if (options?.dryRun) {
       executeStructuralInsert2(editor, {
-        target: textTarget,
+        target,
         content: content5,
         placement: placement2,
         nestingPolicy,
@@ -328771,7 +328767,7 @@ function executeStructuralInsertWrapper2(editor, input2, options) {
     }
     const receipt2 = executeDomainCommand2(editor, () => {
       const result = executeStructuralInsert2(editor, {
-        target: textTarget,
+        target,
         content: content5,
         placement: placement2,
         nestingPolicy,
@@ -328799,11 +328795,77 @@ function executeStructuralInsertWrapper2(editor, input2, options) {
     };
   }
 }
+function executeStructuralInsertDirect2(editor, input2, options) {
+  const { content: content5, target, placement: placement2, nestingPolicy } = input2;
+  const mode = options?.changeMode ?? "direct";
+  let resolved;
+  try {
+    resolved = resolveInsertTarget2(editor, target);
+  } catch (err) {
+    if (err instanceof DocumentApiAdapterError3)
+      throw err;
+    throw new DocumentApiAdapterError3("TARGET_NOT_FOUND", `Cannot resolve insert target for block "${target.nodeId}".`);
+  }
+  let insertPos;
+  if (resolved.targetNode && resolved.targetNodePos !== undefined) {
+    insertPos = resolvePlacement2(editor.state.doc, resolved.targetNodePos, resolved.targetNode, placement2);
+  } else {
+    insertPos = resolved.insertPos;
+  }
+  const range = { from: insertPos, to: insertPos };
+  const receiptParams = { target, range };
+  try {
+    if (options?.dryRun) {
+      executeStructuralInsert2(editor, {
+        target,
+        content: content5,
+        placement: placement2,
+        nestingPolicy,
+        changeMode: mode,
+        dryRun: true
+      });
+      return buildStructuralReceipt(true, receiptParams);
+    }
+    const receipt2 = executeDomainCommand2(editor, () => {
+      const result = executeStructuralInsert2(editor, {
+        target,
+        content: content5,
+        placement: placement2,
+        nestingPolicy,
+        changeMode: mode
+      });
+      return result.success;
+    }, { expectedRevision: options?.expectedRevision, changeMode: mode });
+    if (receipt2.steps[0]?.effect !== "changed") {
+      return buildStructuralReceipt(false, receiptParams, {
+        code: "INVALID_TARGET",
+        message: "Structural insert failed."
+      });
+    }
+    return buildStructuralReceipt(true, receiptParams);
+  } catch (err) {
+    if (err instanceof DocumentApiAdapterError3)
+      throw err;
+    const message = err instanceof Error ? err.message : String(err);
+    return buildStructuralReceipt(false, receiptParams, {
+      code: "INVALID_TARGET",
+      message: `Structural insert failed: ${message}`
+    });
+  }
+}
 function replaceStructuredWrapper2(editor, input2, options) {
   if (!isStructuralReplaceInput(input2)) {
     throw new DocumentApiAdapterError3("INVALID_INPUT", 'replaceStructured requires structural content input with a "content" field.');
   }
-  return textReceiptToSDReceipt(executeStructuralReplaceWrapper2(editor, input2, options));
+  const blockTarget = input2.target && "kind" in input2.target && input2.target.kind === "block" ? input2.target : undefined;
+  const textReceipt = executeStructuralReplaceWrapper2(editor, input2, options);
+  if (!blockTarget)
+    return textReceiptToSDReceipt(textReceipt);
+  const sdReceipt = textReceiptToSDReceipt(textReceipt);
+  if (sdReceipt.resolution) {
+    sdReceipt.resolution.target = blockTarget;
+  }
+  return sdReceipt;
 }
 function resolveStructuralLocator2(editor, input2) {
   const { target, ref: ref4 } = input2;
@@ -328827,7 +328889,7 @@ function resolveStructuralLocator2(editor, input2) {
         effectiveSelectionTarget: buildEffectiveSelectionTarget2(expanded)
       };
     }
-    return { textTarget: narrowToTextAddress2(target) };
+    return { textTarget: target };
   }
   if (ref4 !== undefined) {
     if (ref4.startsWith("text:")) {
@@ -328976,19 +329038,19 @@ function executeStructuralReplaceWrapper2(editor, input2, options) {
     } catch (err) {
       if (err instanceof DocumentApiAdapterError3)
         throw err;
-      throw new DocumentApiAdapterError3("TARGET_NOT_FOUND", `Cannot resolve replace target for block "${textTarget.blockId}".`);
+      throw new DocumentApiAdapterError3("TARGET_NOT_FOUND", `Cannot resolve replace target for block "${targetBlockId2(textTarget)}".`);
     }
     effectiveRange = { from: resolvedBlock.from, to: resolvedBlock.to };
   }
   const coveredText = editor.state.doc.textBetween(effectiveRange.from, effectiveRange.to, `
 `, "");
+  const textAddr = toTextAddress3(textTarget);
   let resolution;
   if (effectiveSelectionTarget) {
     resolution = selectionTargetToResolution2(effectiveSelectionTarget, effectiveRange, coveredText);
   } else {
     resolution = buildTextMutationResolution2({
-      requestedTarget: isRefBased ? undefined : textTarget,
-      target: textTarget,
+      target: textAddr,
       range: effectiveRange,
       text: coveredText
     });
@@ -329230,7 +329292,7 @@ function resolveImportedId2(candidate) {
   const attrs = candidate.attrs ?? {};
   return toNonEmptyString2(attrs.importedId);
 }
-function toTextAddress3(candidate) {
+function toTextAddress4(candidate) {
   const { start: start2, end } = candidate.anchor;
   if (start2.blockId !== end.blockId)
     return null;
@@ -329252,7 +329314,7 @@ function listCommentAnchors2(editor) {
     const commentId = resolveCommentId2(candidate);
     if (!commentId)
       continue;
-    const target = toTextAddress3(candidate);
+    const target = toTextAddress4(candidate);
     if (!target)
       continue;
     const dedupeKey = `${commentId}|${target.blockId}:${target.range.start}:${target.range.end}`;
@@ -337227,7 +337289,7 @@ var init_tables_adapter = __esm(() => {
 });
 
 // ../../packages/super-editor/src/document-api-adapters/plan-engine/register-executors.ts
-function targetBlockId2(t) {
+function targetBlockId3(t) {
   return t?.kind === "range" ? t.blockId : "";
 }
 function selectionTargetToRange2(t) {
@@ -337408,7 +337470,7 @@ function registerBuiltInExecutors2() {
           op: step3.op,
           effect: "noop",
           matchCount: targets.length,
-          data: { domain: "table", tableId: targetBlockId2(targets[0]) }
+          data: { domain: "table", tableId: targetBlockId3(targets[0]) }
         };
       }
       const handler3 = step3._handler;
@@ -337434,7 +337496,7 @@ function registerBuiltInExecutors2() {
           data: { domain: "table", tableId: "" }
         };
       }
-      const input2 = buildTableInput2(step3.op, targetBlockId2(targets[0]), step3.args);
+      const input2 = buildTableInput2(step3.op, targetBlockId3(targets[0]), step3.args);
       const result = adapterFn(ctx2.editor, input2, { changeMode: ctx2.changeMode });
       if (result.success)
         ctx2.commandDispatched = true;
@@ -337443,7 +337505,7 @@ function registerBuiltInExecutors2() {
         op: step3.op,
         effect: result.success ? "changed" : "noop",
         matchCount: result.success ? 1 : 0,
-        data: { domain: "table", tableId: targetBlockId2(targets[0]) }
+        data: { domain: "table", tableId: targetBlockId3(targets[0]) }
       };
     }
   });
@@ -337552,7 +337614,7 @@ function registerBuiltInExecutors2() {
           op: step3.op,
           effect: "noop",
           matchCount: _targets.length,
-          data: { domain: "table", tableId: targetBlockId2(_targets[0]) }
+          data: { domain: "table", tableId: targetBlockId3(_targets[0]) }
         };
       }
       const handler3 = step3._handler;
@@ -401145,15 +401207,14 @@ function validateQuerySelect(value2, path3) {
     };
   }
   if (type2 === "node") {
-    expectOnlyKeys(obj, ["type", "nodeKind", "kind", "nodeType"], path3);
-    const rawNodeKind = obj.nodeKind ?? obj.nodeType;
-    const nodeKind = rawNodeKind != null ? String(rawNodeKind) : undefined;
-    if (obj.kind != null && obj.kind !== "content" && obj.kind !== "inline" && !NODE_KINDS2.has(obj.kind)) {
-      throw new CliError("VALIDATION_ERROR", `${path3}.kind must be "content", "inline", "block", or "inline".`);
+    expectOnlyKeys(obj, ["type", "nodeType", "kind"], path3);
+    const nodeType2 = obj.nodeType != null ? String(obj.nodeType) : undefined;
+    if (obj.kind != null && !NODE_KINDS2.has(obj.kind)) {
+      throw new CliError("VALIDATION_ERROR", `${path3}.kind must be "block" or "inline".`);
     }
     return {
       type: "node",
-      nodeKind,
+      nodeType: nodeType2,
       kind: obj.kind
     };
   }
@@ -401163,7 +401224,7 @@ function validateQuerySelect(value2, path3) {
   expectOnlyKeys(obj, ["type"], path3);
   return {
     type: "node",
-    nodeKind: type2
+    nodeType: type2
   };
 }
 function validateQuery(value2, path3 = "query") {
@@ -401173,12 +401234,11 @@ function validateQuery(value2, path3 = "query") {
     select: validateQuerySelect(obj.select, `${path3}.select`)
   };
   if (obj.within != null) {
-    const within2 = expectRecord(obj.within, `${path3}.within`);
-    if (within2.kind === "content" && typeof within2.nodeId === "string") {
-      query3.within = within2;
-    } else {
-      query3.within = validateNodeAddress(obj.within, `${path3}.within`);
+    const within2 = validateNodeAddress(obj.within, `${path3}.within`);
+    if (within2.kind !== "block") {
+      throw new CliError("VALIDATION_ERROR", `${path3}.within must be a BlockNodeAddress (kind: "block").`);
     }
+    query3.within = within2;
   }
   if (obj.limit != null) {
     query3.limit = expectNonNegativeInteger(obj.limit, `${path3}.limit`);
@@ -401226,7 +401286,7 @@ function buildFlatFindQueryDraft(parsed) {
     return {
       select: {
         type: "node",
-        nodeKind: getStringOption(parsed, "node-type"),
+        nodeType: getStringOption(parsed, "node-type"),
         kind: getStringOption(parsed, "kind")
       },
       limit: getNumberOption(parsed, "limit"),
@@ -401236,7 +401296,7 @@ function buildFlatFindQueryDraft(parsed) {
   const kind2 = getStringOption(parsed, "kind");
   const select2 = kind2 ? {
     type: "node",
-    nodeKind: selectorType,
+    nodeType: selectorType,
     kind: kind2
   } : {
     type: selectorType