@superdoc-dev/cli 0.2.0-next.1 → 0.2.0-next.3

package/dist/index.js

@@ -656,7 +656,7 @@ var init_operation_definitions = __esm(() => {
     },
     "format.apply": {
       memberPath: "format.apply",
-      description: "Apply explicit mark changes (bold, italic, underline, strike) to the target range using boolean patch semantics.",
+      description: "Apply explicit inline style changes (bold, italic, underline, strike) to the target range using boolean patch semantics.",
       requiresDocumentContext: true,
       metadata: mutationOperation({
         idempotency: "conditional",
@@ -825,7 +825,7 @@ var init_operation_definitions = __esm(() => {
         supportsDryRun: false,
         supportsTrackedMode: false,
         possibleFailureCodes: ["INVALID_TARGET", "NO_OP"],
-        throws: [...T_NOT_FOUND_COMMAND, "INVALID_TARGET"]
+        throws: [...T_NOT_FOUND_COMMAND, "INVALID_TARGET", "INVALID_INPUT"]
       }),
       referenceDocPath: "comments/patch.mdx",
       referenceGroup: "comments"
@@ -886,8 +886,8 @@ var init_operation_definitions = __esm(() => {
       referenceDocPath: "track-changes/get.mdx",
       referenceGroup: "trackChanges"
     },
-    "review.decide": {
-      memberPath: "review.decide",
+    "trackChanges.decide": {
+      memberPath: "trackChanges.decide",
       description: "Accept or reject a tracked change (by ID or scope: all).",
       requiresDocumentContext: true,
       metadata: mutationOperation({
@@ -895,10 +895,10 @@ var init_operation_definitions = __esm(() => {
         supportsDryRun: false,
         supportsTrackedMode: false,
         possibleFailureCodes: ["NO_OP"],
-        throws: T_NOT_FOUND_COMMAND
+        throws: [...T_NOT_FOUND_COMMAND, "INVALID_INPUT", "INVALID_TARGET"]
       }),
-      referenceDocPath: "review/decide.mdx",
-      referenceGroup: "review"
+      referenceDocPath: "track-changes/decide.mdx",
+      referenceGroup: "trackChanges"
     },
     "query.match": {
       memberPath: "query.match",
@@ -1580,7 +1580,7 @@ var init_schemas = __esm(() => {
     "format.apply": {
       input: objectSchema({
         target: textAddressSchema,
-        marks: (() => {
+        inline: (() => {
           const markProperties = Object.fromEntries(MARK_KEYS.map((key) => [key, { type: "boolean" }]));
           return {
             type: "object",
@@ -1589,7 +1589,7 @@ var init_schemas = __esm(() => {
             minProperties: 1
           };
         })()
-      }, ["target", "marks"]),
+      }, ["target", "inline"]),
       output: textMutationResultSchemaFor("format.apply"),
       success: textMutationSuccessSchema,
       failure: textMutationFailureSchemaFor("format.apply")
@@ -1757,7 +1757,7 @@ var init_schemas = __esm(() => {
       input: objectSchema({ id: { type: "string" } }, ["id"]),
       output: trackChangeInfoSchema
     },
-    "review.decide": {
+    "trackChanges.decide": {
       input: {
         type: "object",
         properties: {
@@ -1772,9 +1772,9 @@ var init_schemas = __esm(() => {
         required: ["decision", "target"],
         additionalProperties: false
       },
-      output: receiptResultSchemaFor("review.decide"),
+      output: receiptResultSchemaFor("trackChanges.decide"),
       success: receiptSuccessSchema,
-      failure: receiptFailureResultSchemaFor("review.decide")
+      failure: receiptFailureResultSchemaFor("trackChanges.decide")
     },
     "query.match": {
       input: objectSchema({
@@ -1893,14 +1893,9 @@ var init_reference_doc_map = __esm(() => {
     },
     trackChanges: {
       title: "Track Changes",
-      description: "Tracked-change inspection operations.",
+      description: "Tracked-change inspection and review operations.",
       pagePath: "track-changes/index.mdx"
     },
-    review: {
-      title: "Review",
-      description: "Accept or reject tracked changes.",
-      pagePath: "review/index.mdx"
-    },
     query: {
       title: "Query",
       description: "Deterministic selector-based queries for mutation targeting.",
@@ -1918,6 +1913,9 @@ var init_reference_doc_map = __esm(() => {
     operations: OPERATION_IDS.filter((id) => OPERATION_DEFINITIONS[id].referenceGroup === key)
   }));
 });
+
+// ../../packages/document-api/src/contract/reference-aliases.ts
+var init_reference_aliases = () => {};
 // ../../packages/document-api/src/contract/index.ts
 var init_contract = __esm(() => {
   init_types2();
@@ -1925,6 +1923,7 @@ var init_contract = __esm(() => {
   init_schemas();
   init_operation_map();
   init_reference_doc_map();
+  init_reference_aliases();
 });
 
 // ../../packages/document-api/src/capabilities/capabilities.ts
@@ -2017,7 +2016,12 @@ function validateCreateCommentInput(input) {
     }
     return;
   }
-  if (hasTarget && !isTextAddress(target)) {
+  if (!hasTarget) {
+    throw new DocumentApiValidationError("INVALID_TARGET", "comments.create requires a target for root comments.", {
+      field: "target"
+    });
+  }
+  if (!isTextAddress(target)) {
     throw new DocumentApiValidationError("INVALID_TARGET", "target must be a text address object.", {
       field: "target",
       value: target
@@ -2037,6 +2041,14 @@ function validatePatchCommentInput(input) {
       value: commentId
     });
   }
+  const mutationFields = ["text", "target", "status", "isInternal"];
+  const providedFields = mutationFields.filter((f) => input[f] !== undefined);
+  if (providedFields.length === 0) {
+    throw new DocumentApiValidationError("INVALID_INPUT", "comments.patch requires exactly one mutation field (text, target, status, or isInternal).", { allowedFields: [...mutationFields] });
+  }
+  if (providedFields.length > 1) {
+    throw new DocumentApiValidationError("INVALID_INPUT", `comments.patch accepts exactly one mutation field per call, got ${providedFields.length}: ${providedFields.join(", ")}.`, { providedFields: [...providedFields] });
+  }
   const { status } = input;
   if (status !== undefined && status !== "resolved") {
     throw new DocumentApiValidationError("INVALID_TARGET", `status must be "resolved", got "${String(status)}".`, {
@@ -2060,20 +2072,19 @@ function executeCommentsCreate(adapter, input, options) {
 }
 function executeCommentsPatch(adapter, input, options) {
   validatePatchCommentInput(input);
-  let lastReceipt = { success: true };
   if (input.text !== undefined) {
-    lastReceipt = adapter.edit({ commentId: input.commentId, text: input.text }, options);
+    return adapter.edit({ commentId: input.commentId, text: input.text }, options);
   }
   if (input.target !== undefined) {
-    lastReceipt = adapter.move({ commentId: input.commentId, target: input.target }, options);
+    return adapter.move({ commentId: input.commentId, target: input.target }, options);
   }
   if (input.status === "resolved") {
-    lastReceipt = adapter.resolve({ commentId: input.commentId }, options);
+    return adapter.resolve({ commentId: input.commentId }, options);
   }
   if (input.isInternal !== undefined) {
-    lastReceipt = adapter.setInternal({ commentId: input.commentId, isInternal: input.isInternal }, options);
+    return adapter.setInternal({ commentId: input.commentId, isInternal: input.isInternal }, options);
   }
-  return lastReceipt;
+  return { success: true };
 }
 function executeCommentsDelete(adapter, input, options) {
   return adapter.remove({ commentId: input.commentId }, options);
@@ -2153,7 +2164,7 @@ function validateStyleApplyInput(input) {
     throw new DocumentApiValidationError("INVALID_INPUT", "format.apply input must be a non-null object.");
   }
   assertNoUnknownFields(input, STYLE_APPLY_INPUT_ALLOWED_KEYS, "format.apply");
-  const { target, marks } = input;
+  const { target, inline } = input;
   if (target === undefined) {
     throw new DocumentApiValidationError("INVALID_TARGET", "format.apply requires a target.");
   }
@@ -2163,30 +2174,30 @@ function validateStyleApplyInput(input) {
       value: target
     });
   }
-  if (marks === undefined || marks === null) {
-    throw new DocumentApiValidationError("INVALID_INPUT", "format.apply requires a marks object.");
+  if (inline === undefined || inline === null) {
+    throw new DocumentApiValidationError("INVALID_INPUT", "format.apply requires an inline object.");
   }
-  if (!isRecord(marks)) {
-    throw new DocumentApiValidationError("INVALID_INPUT", "marks must be a non-null object.", {
-      field: "marks",
-      value: marks
+  if (!isRecord(inline)) {
+    throw new DocumentApiValidationError("INVALID_INPUT", "inline must be a non-null object.", {
+      field: "inline",
+      value: inline
     });
   }
-  const markKeys = Object.keys(marks);
-  if (markKeys.length === 0) {
-    throw new DocumentApiValidationError("INVALID_INPUT", "marks must include at least one known key.");
+  const inlineKeys = Object.keys(inline);
+  if (inlineKeys.length === 0) {
+    throw new DocumentApiValidationError("INVALID_INPUT", "inline must include at least one known key.");
   }
-  for (const key of markKeys) {
+  for (const key of inlineKeys) {
     if (!MARK_KEY_SET.has(key)) {
-      throw new DocumentApiValidationError("INVALID_INPUT", `Unknown mark key "${key}". Known keys: bold, italic, underline, strike.`, {
-        field: "marks",
+      throw new DocumentApiValidationError("INVALID_INPUT", `Unknown inline style key "${key}". Known keys: bold, italic, underline, strike.`, {
+        field: "inline",
         key
       });
     }
-    const value = marks[key];
+    const value = inline[key];
     if (typeof value !== "boolean") {
-      throw new DocumentApiValidationError("INVALID_INPUT", `Mark "${key}" must be a boolean, got ${typeof value}.`, {
-        field: "marks",
+      throw new DocumentApiValidationError("INVALID_INPUT", `Inline style "${key}" must be a boolean, got ${typeof value}.`, {
+        field: "inline",
         key,
         value
       });
@@ -2202,7 +2213,7 @@ var init_format = __esm(() => {
   init_style_policy_types();
   init_errors2();
   init_validation_primitives();
-  STYLE_APPLY_INPUT_ALLOWED_KEYS = new Set(["target", "marks"]);
+  STYLE_APPLY_INPUT_ALLOWED_KEYS = new Set(["target", "inline"]);
 });
 
 // ../../packages/document-api/src/get-node/get-node.ts
@@ -2429,17 +2440,39 @@ function executeTrackChangesList(adapter, input) {
 function executeTrackChangesGet(adapter, input) {
   return adapter.get(input);
 }
-function executeReviewDecide(adapter, input, options) {
-  const isAll = "scope" in input.target && input.target.scope === "all";
+function executeTrackChangesDecide(adapter, rawInput, options) {
+  const raw = rawInput;
+  if (typeof raw !== "object" || raw == null) {
+    throw new DocumentApiValidationError("INVALID_INPUT", "trackChanges.decide input must be a non-null object.", {
+      value: raw
+    });
+  }
+  const input = raw;
+  if (input.decision !== "accept" && input.decision !== "reject") {
+    throw new DocumentApiValidationError("INVALID_INPUT", `trackChanges.decide decision must be "accept" or "reject", got "${String(input.decision)}".`, { field: "decision", value: input.decision });
+  }
+  if (typeof input.target !== "object" || input.target == null) {
+    throw new DocumentApiValidationError("INVALID_TARGET", 'trackChanges.decide target must be an object with { id: string } or { scope: "all" }.', { field: "target", value: input.target });
+  }
+  const target = input.target;
+  const isAll = target.scope === "all";
+  if (!isAll) {
+    if (typeof target.id !== "string" || target.id.length === 0) {
+      throw new DocumentApiValidationError("INVALID_TARGET", 'trackChanges.decide target must have { id: string } or { scope: "all" }.', { field: "target", value: input.target });
+    }
+  }
   if (input.decision === "accept") {
     if (isAll)
       return adapter.acceptAll({}, options);
-    return adapter.accept({ id: input.target.id }, options);
+    return adapter.accept({ id: target.id }, options);
   }
   if (isAll)
     return adapter.rejectAll({}, options);
-  return adapter.reject({ id: input.target.id }, options);
+  return adapter.reject({ id: target.id }, options);
 }
+var init_track_changes = __esm(() => {
+  init_errors2();
+});
 
 // ../../packages/document-api/src/invoke/invoke.ts
 function buildDispatchTable(api) {
@@ -2470,7 +2503,7 @@ function buildDispatchTable(api) {
     "comments.list": (input) => api.comments.list(input),
     "trackChanges.list": (input) => api.trackChanges.list(input),
     "trackChanges.get": (input) => api.trackChanges.get(input),
-    "review.decide": (input, options) => api.review.decide(input, options),
+    "trackChanges.decide": (input, options) => api.trackChanges.decide(input, options),
     "query.match": (input) => api.query.match(input),
     "mutations.preview": (input) => api.mutations.preview(input),
     "mutations.apply": (input) => api.mutations.apply(input),
@@ -2533,16 +2566,16 @@ function createDocumentApi(adapters) {
     },
     format: {
       bold(input, options) {
-        return executeStyleApply(adapters.format, { ...input, marks: { bold: true } }, options);
+        return executeStyleApply(adapters.format, { ...input, inline: { bold: true } }, options);
       },
       italic(input, options) {
-        return executeStyleApply(adapters.format, { ...input, marks: { italic: true } }, options);
+        return executeStyleApply(adapters.format, { ...input, inline: { italic: true } }, options);
       },
       underline(input, options) {
-        return executeStyleApply(adapters.format, { ...input, marks: { underline: true } }, options);
+        return executeStyleApply(adapters.format, { ...input, inline: { underline: true } }, options);
       },
       strikethrough(input, options) {
-        return executeStyleApply(adapters.format, { ...input, marks: { strike: true } }, options);
+        return executeStyleApply(adapters.format, { ...input, inline: { strike: true } }, options);
       },
       apply(input, options) {
         return executeStyleApply(adapters.format, input, options);
@@ -2554,11 +2587,9 @@ function createDocumentApi(adapters) {
       },
       get(input) {
         return executeTrackChangesGet(adapters.trackChanges, input);
-      }
-    },
-    review: {
+      },
       decide(input, options) {
-        return executeReviewDecide(adapters.trackChanges, input, options);
+        return executeTrackChangesDecide(adapters.trackChanges, input, options);
       }
     },
     create: {
@@ -2628,6 +2659,7 @@ var init_src = __esm(() => {
   init_lists();
   init_replace();
   init_create();
+  init_track_changes();
   init_capabilities();
   init_lists_types();
   init_errors2();
@@ -3278,7 +3310,7 @@ var init_operation_hints = __esm(() => {
     "comments.list": "listed comments",
     "trackChanges.list": "listed tracked changes",
     "trackChanges.get": "resolved tracked change",
-    "review.decide": "reviewed tracked change",
+    "trackChanges.decide": "reviewed tracked change",
     "query.match": "matched selectors",
     "mutations.preview": "previewed mutations",
     "mutations.apply": "applied mutations",
@@ -3311,7 +3343,7 @@ var init_operation_hints = __esm(() => {
     "comments.list": "commentList",
     "trackChanges.list": "trackChangeList",
     "trackChanges.get": "trackChangeInfo",
-    "review.decide": "trackChangeMutationReceipt",
+    "trackChanges.decide": "trackChangeMutationReceipt",
     "query.match": "plain",
     "mutations.preview": "plain",
     "mutations.apply": "plain",
@@ -3344,7 +3376,7 @@ var init_operation_hints = __esm(() => {
     "comments.list": "result",
     "trackChanges.list": "result",
     "trackChanges.get": "change",
-    "review.decide": "receipt",
+    "trackChanges.decide": "receipt",
     "query.match": "result",
     "mutations.preview": "result",
     "mutations.apply": "result",
@@ -3383,7 +3415,7 @@ var init_operation_hints = __esm(() => {
     "comments.list": "comments",
     "trackChanges.list": "trackChanges",
     "trackChanges.get": "trackChanges",
-    "review.decide": "trackChanges",
+    "trackChanges.decide": "trackChanges",
     "query.match": "query",
     "mutations.preview": "general",
     "mutations.apply": "general",
@@ -3695,8 +3727,6 @@ function deriveCategoryFromDocApi(docApiId) {
   if (group === "core" || group === "mutations") {
     return COMMAND_CATALOG[docApiId].mutates ? "mutation" : "query";
   }
-  if (group === "review")
-    return "trackChanges";
   return group;
 }
 function cliCategory(cliOpId) {
@@ -18015,7 +18045,7 @@ var init_constants_DBKi0Amm_es = __esm(() => {
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-D9XMPi6H.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-Cf1y7bFA.es.js
 function getExtensionConfigField(extension, field, context = { name: "" }) {
   const fieldValue = extension.config[field];
   if (typeof fieldValue === "function")
@@ -35250,6 +35280,16 @@ var isRegExp = (value) => {
         i2++;
         continue;
       }
+      const childElements = node2.elements || [];
+      if (childElements.length > 0) {
+        for (const child of childElements) {
+          if (Array.isArray(child.elements))
+            child.elements = preProcessPageFieldsOnly(child.elements, depth + 1).processedNodes;
+          processedNodes.push(child);
+        }
+        i2++;
+        continue;
+      }
     }
     if (fldType === "begin") {
       const fieldInfo = scanFieldSequence(nodes, i2);
@@ -35271,6 +35311,12 @@ var isRegExp = (value) => {
         continue;
       }
     }
+    if (node2.name === "w:r" && node2.elements?.some((el) => el.name === "w:pgNum")) {
+      const processedField = preProcessPageInstruction([], "", node2.elements.find((el) => el.name === "w:rPr") || null);
+      processedNodes.push(...processedField);
+      i2++;
+      continue;
+    }
     if (Array.isArray(node2.elements))
       node2.elements = preProcessPageFieldsOnly(node2.elements, depth + 1).processedNodes;
     processedNodes.push(node2);
@@ -41750,7 +41796,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_D9XMPi6H_es = __esm(() => {
+var init_SuperConverter_Cf1y7bFA_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
@@ -87138,9 +87184,9 @@ var init_remark_gfm_RDxetNVS_es = __esm(() => {
   emptyOptions4 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/src-0vZP1_ru.es.js
-var exports_src_0vZP1_ru_es = {};
-__export(exports_src_0vZP1_ru_es, {
+// ../../packages/superdoc/dist/chunks/src-eL3w4G7e.es.js
+var exports_src_eL3w4G7e_es = {};
+__export(exports_src_eL3w4G7e_es, {
   zt: () => defineMark,
   z: () => cM,
   yt: () => removeAwarenessStates,
@@ -93916,7 +93962,9 @@ function validateCreateCommentInput2(input2) {
       throw new DocumentApiValidationError2("INVALID_TARGET", "Cannot combine parentCommentId with target. Replies do not take a target.", { fields: ["parentCommentId", "target"] });
     return;
   }
-  if (hasTarget && !isTextAddress2(target))
+  if (!hasTarget)
+    throw new DocumentApiValidationError2("INVALID_TARGET", "comments.create requires a target for root comments.", { field: "target" });
+  if (!isTextAddress2(target))
     throw new DocumentApiValidationError2("INVALID_TARGET", "target must be a text address object.", {
       field: "target",
       value: target
@@ -93933,6 +93981,17 @@ function validatePatchCommentInput2(input2) {
       field: "commentId",
       value: commentId
     });
+  const mutationFields = [
+    "text",
+    "target",
+    "status",
+    "isInternal"
+  ];
+  const providedFields = mutationFields.filter((f) => input2[f] !== undefined);
+  if (providedFields.length === 0)
+    throw new DocumentApiValidationError2("INVALID_INPUT", "comments.patch requires exactly one mutation field (text, target, status, or isInternal).", { allowedFields: [...mutationFields] });
+  if (providedFields.length > 1)
+    throw new DocumentApiValidationError2("INVALID_INPUT", `comments.patch accepts exactly one mutation field per call, got ${providedFields.length}: ${providedFields.join(", ")}.`, { providedFields: [...providedFields] });
   const { status } = input2;
   if (status !== undefined && status !== "resolved")
     throw new DocumentApiValidationError2("INVALID_TARGET", `status must be "resolved", got "${String(status)}".`, {
@@ -93956,25 +94015,24 @@ function executeCommentsCreate2(adapter, input2, options) {
 }
 function executeCommentsPatch2(adapter, input2, options) {
   validatePatchCommentInput2(input2);
-  let lastReceipt = { success: true };
   if (input2.text !== undefined)
-    lastReceipt = adapter.edit({
+    return adapter.edit({
       commentId: input2.commentId,
       text: input2.text
     }, options);
   if (input2.target !== undefined)
-    lastReceipt = adapter.move({
+    return adapter.move({
       commentId: input2.commentId,
       target: input2.target
     }, options);
   if (input2.status === "resolved")
-    lastReceipt = adapter.resolve({ commentId: input2.commentId }, options);
+    return adapter.resolve({ commentId: input2.commentId }, options);
   if (input2.isInternal !== undefined)
-    lastReceipt = adapter.setInternal({
+    return adapter.setInternal({
       commentId: input2.commentId,
       isInternal: input2.isInternal
     }, options);
-  return lastReceipt;
+  return { success: true };
 }
 function executeCommentsDelete2(adapter, input2, options) {
   return adapter.remove({ commentId: input2.commentId }, options);
@@ -94045,7 +94103,7 @@ function validateStyleApplyInput2(input2) {
   if (!isRecord3(input2))
     throw new DocumentApiValidationError2("INVALID_INPUT", "format.apply input must be a non-null object.");
   assertNoUnknownFields2(input2, STYLE_APPLY_INPUT_ALLOWED_KEYS2, "format.apply");
-  const { target, marks } = input2;
+  const { target, inline } = input2;
   if (target === undefined)
     throw new DocumentApiValidationError2("INVALID_TARGET", "format.apply requires a target.");
   if (!isTextAddress2(target))
@@ -94053,26 +94111,26 @@ function validateStyleApplyInput2(input2) {
       field: "target",
       value: target
     });
-  if (marks === undefined || marks === null)
-    throw new DocumentApiValidationError2("INVALID_INPUT", "format.apply requires a marks object.");
-  if (!isRecord3(marks))
-    throw new DocumentApiValidationError2("INVALID_INPUT", "marks must be a non-null object.", {
-      field: "marks",
-      value: marks
-    });
-  const markKeys$1 = Object.keys(marks);
-  if (markKeys$1.length === 0)
-    throw new DocumentApiValidationError2("INVALID_INPUT", "marks must include at least one known key.");
-  for (const key$1 of markKeys$1) {
+  if (inline === undefined || inline === null)
+    throw new DocumentApiValidationError2("INVALID_INPUT", "format.apply requires an inline object.");
+  if (!isRecord3(inline))
+    throw new DocumentApiValidationError2("INVALID_INPUT", "inline must be a non-null object.", {
+      field: "inline",
+      value: inline
+    });
+  const inlineKeys = Object.keys(inline);
+  if (inlineKeys.length === 0)
+    throw new DocumentApiValidationError2("INVALID_INPUT", "inline must include at least one known key.");
+  for (const key$1 of inlineKeys) {
     if (!MARK_KEY_SET2.has(key$1))
-      throw new DocumentApiValidationError2("INVALID_INPUT", `Unknown mark key "${key$1}". Known keys: bold, italic, underline, strike.`, {
-        field: "marks",
+      throw new DocumentApiValidationError2("INVALID_INPUT", `Unknown inline style key "${key$1}". Known keys: bold, italic, underline, strike.`, {
+        field: "inline",
         key: key$1
       });
-    const value = marks[key$1];
+    const value = inline[key$1];
     if (typeof value !== "boolean")
-      throw new DocumentApiValidationError2("INVALID_INPUT", `Mark "${key$1}" must be a boolean, got ${typeof value}.`, {
-        field: "marks",
+      throw new DocumentApiValidationError2("INVALID_INPUT", `Inline style "${key$1}" must be a boolean, got ${typeof value}.`, {
+        field: "inline",
         key: key$1,
         value
       });
@@ -94263,16 +94321,38 @@ function executeTrackChangesList2(adapter, input2) {
 function executeTrackChangesGet2(adapter, input2) {
   return adapter.get(input2);
 }
-function executeReviewDecide2(adapter, input2, options) {
-  const isAll = "scope" in input2.target && input2.target.scope === "all";
+function executeTrackChangesDecide2(adapter, rawInput, options) {
+  const raw = rawInput;
+  if (typeof raw !== "object" || raw == null)
+    throw new DocumentApiValidationError2("INVALID_INPUT", "trackChanges.decide input must be a non-null object.", { value: raw });
+  const input2 = raw;
+  if (input2.decision !== "accept" && input2.decision !== "reject")
+    throw new DocumentApiValidationError2("INVALID_INPUT", `trackChanges.decide decision must be "accept" or "reject", got "${String(input2.decision)}".`, {
+      field: "decision",
+      value: input2.decision
+    });
+  if (typeof input2.target !== "object" || input2.target == null)
+    throw new DocumentApiValidationError2("INVALID_TARGET", 'trackChanges.decide target must be an object with { id: string } or { scope: "all" }.', {
+      field: "target",
+      value: input2.target
+    });
+  const target = input2.target;
+  const isAll = target.scope === "all";
+  if (!isAll) {
+    if (typeof target.id !== "string" || target.id.length === 0)
+      throw new DocumentApiValidationError2("INVALID_TARGET", 'trackChanges.decide target must have { id: string } or { scope: "all" }.', {
+        field: "target",
+        value: input2.target
+      });
+  }
   if (input2.decision === "accept") {
     if (isAll)
       return adapter.acceptAll({}, options);
-    return adapter.accept({ id: input2.target.id }, options);
+    return adapter.accept({ id: target.id }, options);
   }
   if (isAll)
     return adapter.rejectAll({}, options);
-  return adapter.reject({ id: input2.target.id }, options);
+  return adapter.reject({ id: target.id }, options);
 }
 function buildDispatchTable2(api) {
   return {
@@ -94302,7 +94382,7 @@ function buildDispatchTable2(api) {
     "comments.list": (input2) => api.comments.list(input2),
     "trackChanges.list": (input2) => api.trackChanges.list(input2),
     "trackChanges.get": (input2) => api.trackChanges.get(input2),
-    "review.decide": (input2, options) => api.review.decide(input2, options),
+    "trackChanges.decide": (input2, options) => api.trackChanges.decide(input2, options),
     "query.match": (input2) => api.query.match(input2),
     "mutations.preview": (input2) => api.mutations.preview(input2),
     "mutations.apply": (input2) => api.mutations.apply(input2),
@@ -94357,25 +94437,25 @@ function createDocumentApi2(adapters) {
       bold(input2, options) {
         return executeStyleApply$1(adapters.format, {
           ...input2,
-          marks: { bold: true }
+          inline: { bold: true }
         }, options);
       },
       italic(input2, options) {
         return executeStyleApply$1(adapters.format, {
           ...input2,
-          marks: { italic: true }
+          inline: { italic: true }
         }, options);
       },
       underline(input2, options) {
         return executeStyleApply$1(adapters.format, {
           ...input2,
-          marks: { underline: true }
+          inline: { underline: true }
         }, options);
       },
       strikethrough(input2, options) {
         return executeStyleApply$1(adapters.format, {
           ...input2,
-          marks: { strike: true }
+          inline: { strike: true }
         }, options);
       },
       apply(input2, options) {
@@ -94388,11 +94468,11 @@ function createDocumentApi2(adapters) {
       },
       get(input2) {
         return executeTrackChangesGet2(adapters.trackChanges, input2);
+      },
+      decide(input2, options) {
+        return executeTrackChangesDecide2(adapters.trackChanges, input2, options);
       }
     },
-    review: { decide(input2, options) {
-      return executeReviewDecide2(adapters.trackChanges, input2, options);
-    } },
     create: {
       paragraph(input2, options) {
         return executeCreateParagraph2(adapters.create, input2, options);
@@ -96392,22 +96472,22 @@ function executeStyleApply2(editor, tr, target, step, mapping) {
   const markEntries = [
     [
       "bold",
-      step.args.marks.bold,
+      step.args.inline.bold,
       schema.marks.bold
     ],
     [
       "italic",
-      step.args.marks.italic,
+      step.args.inline.italic,
       schema.marks.italic
     ],
     [
       "underline",
-      step.args.marks.underline,
+      step.args.inline.underline,
       schema.marks.underline
     ],
     [
       "strike",
-      step.args.marks.strike,
+      step.args.inline.strike,
       schema.marks.strike
     ]
   ];
@@ -96495,22 +96575,22 @@ function executeSpanStyleApply(editor, tr, target, step, mapping) {
   const markEntries = [
     [
       "bold",
-      step.args.marks.bold,
+      step.args.inline.bold,
       schema.marks.bold
     ],
     [
       "italic",
-      step.args.marks.italic,
+      step.args.inline.italic,
       schema.marks.italic
     ],
     [
       "underline",
-      step.args.marks.underline,
+      step.args.inline.underline,
       schema.marks.underline
     ],
     [
       "strike",
-      step.args.marks.strike,
+      step.args.inline.strike,
       schema.marks.strike
     ]
   ];
@@ -97155,7 +97235,7 @@ function styleApplyWrapper(editor, input2, options) {
         message: "format.apply requires a non-collapsed target range."
       }
     };
-  const markKeys$1 = Object.keys(input2.marks).filter((k$1) => input2.marks[k$1] !== undefined);
+  const markKeys$1 = Object.keys(input2.inline).filter((k$1) => input2.inline[k$1] !== undefined);
   for (const key$1 of markKeys$1) {
     const schemaName = MARK_KEY_TO_SCHEMA_NAME[key$1];
     if (schemaName)
@@ -97179,7 +97259,7 @@ function styleApplyWrapper(editor, input2, options) {
         id: stepId,
         op: "format.apply",
         where: STUB_WHERE,
-        args: { marks: input2.marks }
+        args: { inline: input2.inline }
       },
       targets: [{
         kind: "range",
@@ -107021,24 +107101,26 @@ function normalizeClientPoint(options, clientX, clientY) {
   const baseX = (clientX - rect.left + scrollLeft) / options.zoom;
   const baseY = (clientY - rect.top + scrollTop) / options.zoom;
   let adjustedX = baseX;
-  let adjustedY = baseY;
+  let detectedPageIndex;
+  let pageLocalY;
   const doc$2 = options.visibleHost.ownerDocument ?? document;
   const hitChain = typeof doc$2.elementsFromPoint === "function" ? doc$2.elementsFromPoint(clientX, clientY) : [];
   const pageEl = Array.isArray(hitChain) ? hitChain.find((el) => el?.classList?.contains("superdoc-page")) : null;
   if (pageEl) {
     const pageIndex = Number(pageEl.dataset.pageIndex ?? "NaN");
     if (Number.isFinite(pageIndex)) {
+      detectedPageIndex = pageIndex;
       const pageOffsetX = options.getPageOffsetX(pageIndex);
       if (pageOffsetX != null)
         adjustedX = baseX - pageOffsetX;
-      const pageOffsetY = options.getPageOffsetY(pageIndex);
-      if (pageOffsetY != null)
-        adjustedY = baseY - pageOffsetY;
+      pageLocalY = (clientY - pageEl.getBoundingClientRect().top) / options.zoom;
     }
   }
   return {
     x: adjustedX,
-    y: adjustedY
+    y: baseY,
+    pageIndex: detectedPageIndex,
+    pageLocalY
   };
 }
 function denormalizeClientPoint(options, layoutX, layoutY, pageIndex, height) {
@@ -107410,7 +107492,9 @@ function publishSectionMetadata(sectionRanges, options) {
       footerRefs: section.footerRefs,
       numbering: section.numbering,
       titlePg: section.titlePg,
-      vAlign: section.vAlign
+      vAlign: section.vAlign,
+      margins: section.margins,
+      pageSize: section.pageSize
     });
   });
 }
@@ -116191,6 +116275,84 @@ async function measureListBlock(block, constraints) {
     totalHeight
   };
 }
+function buildSectionContentWidth(section, fallback) {
+  const pageW = section.pageSize?.w ?? fallback.pageWidth;
+  const marginL = section.margins?.left ?? fallback.margins.left;
+  const marginR = section.margins?.right ?? fallback.margins.right;
+  return pageW - marginL - marginR;
+}
+function buildConstraintsForSection(section, fallback, minWidth) {
+  const pageW = section.pageSize?.w ?? fallback.pageWidth;
+  const marginL = section.margins?.left ?? fallback.margins.left;
+  const marginR = section.margins?.right ?? fallback.margins.right;
+  const contentWidth = pageW - marginL - marginR;
+  const maxWidth = pageW - marginL;
+  return {
+    width: minWidth ? Math.min(Math.max(contentWidth, minWidth), maxWidth) : contentWidth,
+    height: fallback.height,
+    pageWidth: pageW,
+    margins: {
+      left: marginL,
+      right: marginR
+    }
+  };
+}
+function getTableWidthSpec(blocks2) {
+  let result;
+  let maxResolvedWidth = 0;
+  for (const block of blocks2) {
+    if (block.kind !== "table")
+      continue;
+    const tableWidth = block.attrs?.tableWidth;
+    const widthValue = tableWidth?.width ?? tableWidth?.value;
+    if (tableWidth?.type === "pct" && typeof widthValue === "number" && widthValue > 0) {
+      if (!result || result.type !== "pct" || widthValue > result.value) {
+        result = {
+          type: "pct",
+          value: widthValue
+        };
+        maxResolvedWidth = Infinity;
+      }
+    } else if ((tableWidth?.type === "px" || tableWidth?.type === "pixel") && typeof widthValue === "number") {
+      if (widthValue > maxResolvedWidth) {
+        maxResolvedWidth = widthValue;
+        result = {
+          type: "px",
+          value: widthValue
+        };
+      }
+    } else if (block.columnWidths && block.columnWidths.length > 0) {
+      const gridTotal = block.columnWidths.reduce((sum, w2) => sum + w2, 0);
+      if (gridTotal > maxResolvedWidth) {
+        maxResolvedWidth = gridTotal;
+        result = {
+          type: "grid",
+          value: gridTotal
+        };
+      }
+    }
+  }
+  return result;
+}
+function resolveTableMinWidth(spec, contentWidth) {
+  if (!spec)
+    return 0;
+  if (spec.type === "pct")
+    return contentWidth * (spec.value / OOXML_PCT_DIVISOR);
+  return spec.value;
+}
+function resolveRIdPerSection(sectionMetadata, kind) {
+  const result = /* @__PURE__ */ new Map;
+  let inherited;
+  for (const section of sectionMetadata) {
+    const rId = (kind === "header" ? section.headerRefs : section.footerRefs)?.default;
+    if (rId)
+      inherited = rId;
+    if (inherited)
+      result.set(section.sectionIndex, inherited);
+  }
+  return result;
+}
 async function layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetadata, deps) {
   deps.headerLayoutsByRId.clear();
   deps.footerLayoutsByRId.clear();
@@ -116205,42 +116367,127 @@ async function layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetad
       totalPages
     };
   };
-  if (headerBlocksByRId)
-    for (const [rId, blocks2] of headerBlocksByRId) {
-      if (!blocks2 || blocks2.length === 0)
-        continue;
-      try {
-        const batchResult = await layoutHeaderFooterWithCache({ default: blocks2 }, constraints, (block, c$3) => measureBlock(block, c$3), undefined, undefined, pageResolver);
-        if (batchResult.default)
-          deps.headerLayoutsByRId.set(rId, {
-            kind: "header",
-            type: "default",
-            layout: batchResult.default.layout,
-            blocks: batchResult.default.blocks,
-            measures: batchResult.default.measures
-          });
-      } catch (error) {
-        console.warn(`[PresentationEditor] Failed to layout header rId=${rId}:`, error);
-      }
+  if (sectionMetadata.length > 1 && sectionMetadata.some((s2) => s2.margins || s2.pageSize)) {
+    await layoutWithPerSectionConstraints("header", headerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.headerLayoutsByRId);
+    await layoutWithPerSectionConstraints("footer", footerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.footerLayoutsByRId);
+  } else {
+    await layoutBlocksByRId("header", headerBlocksByRId, constraints, pageResolver, deps.headerLayoutsByRId);
+    await layoutBlocksByRId("footer", footerBlocksByRId, constraints, pageResolver, deps.footerLayoutsByRId);
+  }
+}
+async function layoutBlocksByRId(kind, blocksByRId, constraints, pageResolver, layoutsByRId) {
+  if (!blocksByRId)
+    return;
+  for (const [rId, blocks2] of blocksByRId) {
+    if (!blocks2 || blocks2.length === 0)
+      continue;
+    try {
+      const batchResult = await layoutHeaderFooterWithCache({ default: blocks2 }, constraints, (block, c$3) => measureBlock(block, c$3), undefined, undefined, pageResolver);
+      if (batchResult.default)
+        layoutsByRId.set(rId, {
+          kind,
+          type: "default",
+          layout: batchResult.default.layout,
+          blocks: batchResult.default.blocks,
+          measures: batchResult.default.measures
+        });
+    } catch (error) {
+      console.warn(`[PresentationEditor] Failed to layout ${kind} rId=${rId}:`, error);
     }
-  if (footerBlocksByRId)
-    for (const [rId, blocks2] of footerBlocksByRId) {
-      if (!blocks2 || blocks2.length === 0)
+  }
+}
+function cloneHeaderFooterLayout(layout) {
+  return {
+    ...layout,
+    pages: layout.pages.map((page) => ({
+      ...page,
+      fragments: page.fragments.map((f) => ({ ...f }))
+    }))
+  };
+}
+function adjustFramePositionsForContentWidth(layout, blocks2, effectiveWidth, contentWidth) {
+  if (effectiveWidth <= contentWidth)
+    return;
+  const widthDiff = effectiveWidth - contentWidth;
+  const blockById = /* @__PURE__ */ new Map;
+  for (const block of blocks2)
+    blockById.set(block.id, block);
+  for (const page of layout.pages)
+    for (const fragment of page.fragments) {
+      if (fragment.kind !== "para")
         continue;
-      try {
-        const batchResult = await layoutHeaderFooterWithCache({ default: blocks2 }, constraints, (block, c$3) => measureBlock(block, c$3), undefined, undefined, pageResolver);
-        if (batchResult.default)
-          deps.footerLayoutsByRId.set(rId, {
-            kind: "footer",
+      const block = blockById.get(fragment.blockId);
+      if (!block || block.kind !== "paragraph")
+        continue;
+      const frame = block.attrs?.frame;
+      if (!frame || frame.wrap !== "none")
+        continue;
+      if (frame.xAlign === "right")
+        fragment.x -= widthDiff;
+      else if (frame.xAlign === "center")
+        fragment.x -= widthDiff / 2;
+    }
+}
+async function layoutWithPerSectionConstraints(kind, blocksByRId, sectionMetadata, fallbackConstraints, pageResolver, layoutsByRId) {
+  if (!blocksByRId)
+    return;
+  const rIdPerSection = resolveRIdPerSection(sectionMetadata, kind);
+  const tableWidthSpecByRId = /* @__PURE__ */ new Map;
+  for (const [rId, blocks2] of blocksByRId) {
+    const spec = getTableWidthSpec(blocks2);
+    if (spec)
+      tableWidthSpecByRId.set(rId, spec);
+  }
+  const groups = /* @__PURE__ */ new Map;
+  for (const section of sectionMetadata) {
+    const rId = rIdPerSection.get(section.sectionIndex);
+    if (!rId || !blocksByRId.has(rId))
+      continue;
+    const contentWidth = buildSectionContentWidth(section, fallbackConstraints);
+    const sectionConstraints = buildConstraintsForSection(section, fallbackConstraints, resolveTableMinWidth(tableWidthSpecByRId.get(rId), contentWidth) || undefined);
+    const effectiveWidth = sectionConstraints.width;
+    const groupKey = `${rId}::w${effectiveWidth}`;
+    let group = groups.get(groupKey);
+    if (!group) {
+      group = {
+        sectionConstraints,
+        sectionIndices: [],
+        rId,
+        effectiveWidth
+      };
+      groups.set(groupKey, group);
+    }
+    group.sectionIndices.push(section.sectionIndex);
+  }
+  for (const [, group] of groups) {
+    const blocks2 = blocksByRId.get(group.rId);
+    if (!blocks2 || blocks2.length === 0)
+      continue;
+    try {
+      const batchResult = await layoutHeaderFooterWithCache({ default: blocks2 }, group.sectionConstraints, (block, c$3) => measureBlock(block, c$3), undefined, undefined, pageResolver);
+      if (batchResult.default)
+        for (const sectionIndex of group.sectionIndices) {
+          const contentWidth = buildSectionContentWidth(sectionMetadata.find((s2) => s2.sectionIndex === sectionIndex), fallbackConstraints);
+          const needsFrameAdjust = group.effectiveWidth > contentWidth;
+          let layout = batchResult.default.layout;
+          if (needsFrameAdjust) {
+            layout = cloneHeaderFooterLayout(layout);
+            adjustFramePositionsForContentWidth(layout, batchResult.default.blocks, group.effectiveWidth, contentWidth);
+          }
+          const result = {
+            kind,
             type: "default",
-            layout: batchResult.default.layout,
+            layout,
             blocks: batchResult.default.blocks,
-            measures: batchResult.default.measures
-          });
-      } catch (error) {
-        console.warn(`[PresentationEditor] Failed to layout footer rId=${rId}:`, error);
-      }
+            measures: batchResult.default.measures,
+            effectiveWidth: needsFrameAdjust ? group.effectiveWidth : undefined
+          };
+          layoutsByRId.set(`${group.rId}::s${sectionIndex}`, result);
+        }
+    } catch (error) {
+      console.warn(`[PresentationEditor] Failed to layout ${kind} rId=${group.rId}:`, error);
     }
+  }
 }
 function dropCursor(options = {}) {
   return new Plugin({ view(editorView) {
@@ -143463,11 +143710,13 @@ var Node$13 = class Node$14 {
       return;
     }
     if ((this.#deps.getHeaderFooterSession()?.session?.mode ?? "body") !== "body") {
-      if (this.#handleClickInHeaderFooterMode(event, x2, y$1))
+      if (this.#handleClickInHeaderFooterMode(event, x2, y$1, normalizedPoint.pageIndex, normalizedPoint.pageLocalY))
         return;
     }
-    if (this.#callbacks.hitTestHeaderFooterRegion?.(x2, y$1))
+    if (this.#callbacks.hitTestHeaderFooterRegion?.(x2, y$1, normalizedPoint.pageIndex, normalizedPoint.pageLocalY)) {
+      event.preventDefault();
       return;
+    }
     const viewportHost = this.#deps.getViewportHost();
     const pageGeometryHelper = this.#deps.getPageGeometryHelper();
     const rawHit = clickToPosition(layoutState.layout, layoutState.blocks, layoutState.measures, {
@@ -143694,15 +143943,10 @@ var Node$13 = class Node$14 {
     }
     if (!this.#deps.getLayoutState().layout)
       return;
-    const viewportHost = this.#deps.getViewportHost();
-    const visibleHost = this.#deps.getVisibleHost();
-    const zoom = this.#deps.getZoom();
-    const rect = viewportHost.getBoundingClientRect();
-    const scrollLeft = visibleHost.scrollLeft ?? 0;
-    const scrollTop = visibleHost.scrollTop ?? 0;
-    const x2 = (event.clientX - rect.left + scrollLeft) / zoom;
-    const y$1 = (event.clientY - rect.top + scrollTop) / zoom;
-    const region = this.#callbacks.hitTestHeaderFooterRegion?.(x2, y$1);
+    const normalized = this.#callbacks.normalizeClientPoint?.(event.clientX, event.clientY);
+    if (!normalized)
+      return;
+    const region = this.#callbacks.hitTestHeaderFooterRegion?.(normalized.x, normalized.y, normalized.pageIndex, normalized.pageLocalY);
     if (region) {
       event.preventDefault();
       event.stopPropagation();
@@ -143956,15 +144200,15 @@ var Node$13 = class Node$14 {
       document.activeElement.blur();
     this.#focusEditorAtFirstPosition();
   }
-  #handleClickInHeaderFooterMode(event, x2, y$1) {
+  #handleClickInHeaderFooterMode(event, x2, y$1, pageIndex, pageLocalY) {
     const activeEditorHost = this.#deps?.getHeaderFooterSession()?.overlayManager?.getActiveEditorHost?.();
     if (activeEditorHost && (activeEditorHost.contains(event.target) || activeEditorHost === event.target))
       return true;
-    if (!this.#callbacks.hitTestHeaderFooterRegion?.(x2, y$1)) {
+    if (!this.#callbacks.hitTestHeaderFooterRegion?.(x2, y$1, pageIndex, pageLocalY)) {
       this.#callbacks.exitHeaderFooterMode?.();
       return false;
     }
-    return true;
+    return false;
   }
   #handleInlineImageClick(event, targetImg, rawHit, doc$2, epochMapper) {
     if (!targetImg)
@@ -144166,7 +144410,7 @@ var Node$13 = class Node$14 {
       this.#callbacks.clearHoverRegion?.();
       return;
     }
-    const region = this.#callbacks.hitTestHeaderFooterRegion?.(normalized.x, normalized.y);
+    const region = this.#callbacks.hitTestHeaderFooterRegion?.(normalized.x, normalized.y, normalized.pageIndex, normalized.pageLocalY);
     if (!region) {
       this.#callbacks.clearHoverRegion?.();
       return;
@@ -144936,6 +145180,7 @@ var Node$13 = class Node$14 {
     pm.style.minHeight = "100%";
     pm.style.outline = "none";
     pm.style.border = "none";
+    pm.classList.add("sd-header-footer");
     pm.setAttribute("role", "textbox");
     pm.setAttribute("aria-multiline", true);
     pm.setAttribute("aria-label", `${type} content area. Double click to start typing.`);
@@ -145178,7 +145423,7 @@ var Node$13 = class Node$14 {
         position: "absolute",
         pointerEvents: "auto",
         visibility: "hidden",
-        overflow: "hidden",
+        overflow: "visible",
         boxSizing: "border-box"
       });
       if (decorationContainer)
@@ -145605,12 +145850,14 @@ var Node$13 = class Node$14 {
       const actualPageHeight = page.size?.h ?? pageHeight;
       const headerPayload = this.#headerDecorationProvider?.(page.number, margins, page);
       const headerBox = this.#computeDecorationBox("header", margins, actualPageHeight);
+      const displayPageNumber = page.numberText ?? String(page.number);
       this.#headerRegions.set(pageIndex, {
         kind: "header",
         headerId: headerPayload?.headerId,
         sectionType: headerPayload?.sectionType ?? this.#computeExpectedSectionType("header", page, sectionFirstPageNumbers),
         pageIndex,
         pageNumber: page.number,
+        displayPageNumber,
         localX: headerPayload?.hitRegion?.x ?? headerBox.x,
         localY: headerPayload?.hitRegion?.y ?? headerBox.offset,
         width: headerPayload?.hitRegion?.width ?? headerBox.width,
@@ -145625,6 +145872,7 @@ var Node$13 = class Node$14 {
         sectionType: footerPayload?.sectionType ?? this.#computeExpectedSectionType("footer", page, sectionFirstPageNumbers),
         pageIndex,
         pageNumber: page.number,
+        displayPageNumber,
         localX: footerPayload?.hitRegion?.x ?? footerBox.x,
         localY: footerPayload?.hitRegion?.y ?? footerBox.offset,
         width: footerPayload?.hitRegion?.width ?? footerBox.width,
@@ -145634,16 +145882,29 @@ var Node$13 = class Node$14 {
       });
     });
   }
-  hitTestRegion(x2, y$1, layout) {
+  hitTestRegion(x2, y$1, layout, knownPageIndex, knownPageLocalY) {
     if (!layout)
       return null;
     const layoutOptions = this.#deps?.getLayoutOptions() ?? {};
-    const pageHeight = layout.pageSize?.h ?? layoutOptions.pageSize?.h ?? this.#options.defaultPageSize.h;
+    const defaultPageHeight = layout.pageSize?.h ?? layoutOptions.pageSize?.h ?? this.#options.defaultPageSize.h;
     const pageGap = layout.pageGap ?? 0;
-    if (pageHeight <= 0)
+    if (defaultPageHeight <= 0)
       return null;
-    const pageIndex = Math.max(0, Math.floor(y$1 / (pageHeight + pageGap)));
-    const pageLocalY = y$1 - pageIndex * (pageHeight + pageGap);
+    let pageIndex;
+    let pageLocalY;
+    if (knownPageIndex != null && knownPageLocalY != null) {
+      pageIndex = knownPageIndex;
+      pageLocalY = knownPageLocalY;
+    } else if (knownPageIndex != null) {
+      pageIndex = knownPageIndex;
+      let pageTopY = 0;
+      for (let i$1 = 0;i$1 < pageIndex && i$1 < layout.pages.length; i$1++)
+        pageTopY += (layout.pages[i$1].size?.h ?? defaultPageHeight) + pageGap;
+      pageLocalY = y$1 - pageTopY;
+    } else {
+      pageIndex = Math.max(0, Math.floor(y$1 / (defaultPageHeight + pageGap)));
+      pageLocalY = y$1 - pageIndex * (defaultPageHeight + pageGap);
+    }
     const headerRegion = this.#headerRegions.get(pageIndex);
     if (headerRegion && this.#pointInRegion(headerRegion, x2, pageLocalY))
       return headerRegion;
@@ -145731,6 +145992,15 @@ var Node$13 = class Node$14 {
         this.clearHover();
         return;
       }
+      if (this.#session.mode !== "body") {
+        if (this.#activeEditor) {
+          this.#activeEditor.setEditable(false);
+          this.#activeEditor.setOptions({ documentMode: "viewing" });
+        }
+        this.#overlayManager.hideEditingOverlay();
+        this.#activeEditor = null;
+        this.#session = { mode: "body" };
+      }
       const descriptor = this.#resolveDescriptorForRegion(region);
       if (!descriptor) {
         console.warn("[HeaderFooterSessionManager] No descriptor found for region:", region);
@@ -145785,7 +146055,7 @@ var Node$13 = class Node$14 {
         });
         return;
       }
-      const layout = this.#headerLayoutResults?.[0]?.layout;
+      const bodyPageCount = this.#deps?.getBodyPageCount() ?? 1;
       let editor;
       try {
         editor = await this.#headerFooterManager.ensureEditor(descriptor, {
@@ -145793,7 +146063,7 @@ var Node$13 = class Node$14 {
           availableWidth: region.width,
           availableHeight: region.height,
           currentPageNumber: region.pageNumber,
-          totalPageCount: layout?.pages?.length ?? 1
+          totalPageCount: bodyPageCount
         });
       } catch (editorError) {
         console.error("[HeaderFooterSessionManager] Error creating editor:", editorError);
@@ -146246,8 +146516,10 @@ var Node$13 = class Node$14 {
       }
       if (!headerFooterType)
         return null;
-      if (sectionRId && layoutsByRId.has(sectionRId)) {
-        const rIdLayout = layoutsByRId.get(sectionRId);
+      const compositeKey = sectionRId ? `${sectionRId}::s${sectionIndex}` : undefined;
+      const rIdLayoutKey = compositeKey && layoutsByRId.has(compositeKey) && compositeKey || sectionRId && layoutsByRId.has(sectionRId) && sectionRId || undefined;
+      if (rIdLayoutKey) {
+        const rIdLayout = layoutsByRId.get(rIdLayoutKey);
         if (!rIdLayout)
           console.warn(`[HeaderFooterSessionManager] Inconsistent state: layoutsByRId.has('${sectionRId}') returned true but get() returned undefined`);
         else {
@@ -146258,6 +146530,7 @@ var Node$13 = class Node$14 {
             const margins$1 = pageMargins ?? layout.pages[0]?.margins ?? layoutOptions.margins ?? defaultMargins;
             const decorationMargins$1 = kind === "footer" ? this.#stripFootnoteReserveFromBottomMargin(margins$1, page ?? null) : margins$1;
             const box$1 = this.#computeDecorationBox(kind, decorationMargins$1, pageHeight$1);
+            const effectiveWidth = rIdLayout.effectiveWidth ?? box$1.width;
             const rawLayoutHeight$1 = rIdLayout.layout.height ?? 0;
             const metrics$1 = this.#computeMetrics(kind, rawLayoutHeight$1, box$1, pageHeight$1, margins$1?.footer ?? 0);
             const layoutMinY$1 = rIdLayout.layout.minY ?? 0;
@@ -146270,20 +146543,20 @@ var Node$13 = class Node$14 {
               contentHeight: metrics$1.layoutHeight > 0 ? metrics$1.layoutHeight : metrics$1.containerHeight,
               offset: metrics$1.offset,
               marginLeft: box$1.x,
-              contentWidth: box$1.width,
+              contentWidth: effectiveWidth,
               headerId: sectionRId,
               sectionType: headerFooterType,
               minY: layoutMinY$1,
               box: {
                 x: box$1.x,
                 y: metrics$1.offset,
-                width: box$1.width,
+                width: effectiveWidth,
                 height: metrics$1.containerHeight
               },
               hitRegion: {
                 x: box$1.x,
                 y: metrics$1.offset,
-                width: box$1.width,
+                width: effectiveWidth,
                 height: metrics$1.containerHeight
               }
             };
@@ -148858,7 +149131,7 @@ var Node$13 = class Node$14 {
       };
     case "total-page-number":
       return {
-        text: editor.options.parentEditor?.currentTotalPages || "1",
+        text: editor.options.totalPageCount || editor.options.parentEditor?.currentTotalPages || "1",
         className: "sd-editor-auto-total-pages",
         dataId: "auto-total-pages",
         ariaLabel: "Total page count node"
@@ -148920,6 +149193,10 @@ var Node$13 = class Node$14 {
     if (!incomingType || incomingType !== currentType)
       return false;
     this.node = node3;
+    const attrs = getNodeAttributes(this.node.type.name, this.editor);
+    const newText = String(attrs.text);
+    if (this.dom.textContent !== newText)
+      this.dom.textContent = newText;
     return true;
   }
 }, getMarksFromNeighbors = (currentPos, view) => {
@@ -152068,9 +152345,9 @@ var Node$13 = class Node$14 {
     trackedChanges: context.trackedChanges ?? []
   });
 }, _hoisted_1$6, _hoisted_2$1, _hoisted_3, _hoisted_4, ContextMenu_default, _hoisted_1$5, BasicUpload_default, _hoisted_1$4, MIN_WIDTH = 200, PPI = 96, alignment = "flex-end", Ruler_default, GenericPopover_default, _hoisted_1$3, RESIZE_HANDLE_WIDTH_PX = 9, RESIZE_HANDLE_OFFSET_PX = 4, DRAG_OVERLAY_EXTENSION_PX = 1000, MIN_DRAG_OVERLAY_WIDTH_PX = 2000, THROTTLE_INTERVAL_MS = 16, MIN_RESIZE_DELTA_PX = 1, TableResizeOverlay_default, _hoisted_1$2, OVERLAY_EXPANSION_PX = 2000, RESIZE_HANDLE_SIZE_PX = 12, MOUSE_MOVE_THROTTLE_MS = 16, DIMENSION_CHANGE_THRESHOLD_PX = 1, Z_INDEX_OVERLAY = 10, Z_INDEX_HANDLE = 15, Z_INDEX_GUIDELINE = 20, ImageResizeOverlay_default, LINK_CLICK_DEBOUNCE_MS = 300, CURSOR_UPDATE_TIMEOUT_MS = 10, LinkClickHandler_default, _hoisted_1$1, _hoisted_2, DOCX2 = "application/vnd.openxmlformats-officedocument.wordprocessingml.document", TABLE_RESIZE_HOVER_THRESHOLD = 8, TABLE_RESIZE_THROTTLE_MS = 16, SuperEditor_default, _hoisted_1, SuperInput_default, SlashMenu, Extensions;
-var init_src_0vZP1_ru_es = __esm(() => {
+var init_src_eL3w4G7e_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_D9XMPi6H_es();
+  init_SuperConverter_Cf1y7bFA_es();
   init_jszip_ChlR43oI_es();
   init_uuid_2IzDu5nl_es();
   init_constants_DBKi0Amm_es();
@@ -160298,7 +160575,7 @@ function print() { __p += __j.call(arguments, '') }
     },
     "format.apply": {
       memberPath: "format.apply",
-      description: "Apply explicit mark changes (bold, italic, underline, strike) to the target range using boolean patch semantics.",
+      description: "Apply explicit inline style changes (bold, italic, underline, strike) to the target range using boolean patch semantics.",
       requiresDocumentContext: true,
       metadata: mutationOperation2({
         idempotency: "conditional",
@@ -160479,7 +160756,11 @@ function print() { __p += __j.call(arguments, '') }
         supportsDryRun: false,
         supportsTrackedMode: false,
         possibleFailureCodes: ["INVALID_TARGET", "NO_OP"],
-        throws: [...T_NOT_FOUND_COMMAND2, "INVALID_TARGET"]
+        throws: [
+          ...T_NOT_FOUND_COMMAND2,
+          "INVALID_TARGET",
+          "INVALID_INPUT"
+        ]
       }),
       referenceDocPath: "comments/patch.mdx",
       referenceGroup: "comments"
@@ -160536,8 +160817,8 @@ function print() { __p += __j.call(arguments, '') }
       referenceDocPath: "track-changes/get.mdx",
       referenceGroup: "trackChanges"
     },
-    "review.decide": {
-      memberPath: "review.decide",
+    "trackChanges.decide": {
+      memberPath: "trackChanges.decide",
       description: "Accept or reject a tracked change (by ID or scope: all).",
       requiresDocumentContext: true,
       metadata: mutationOperation2({
@@ -160545,10 +160826,14 @@ function print() { __p += __j.call(arguments, '') }
         supportsDryRun: false,
         supportsTrackedMode: false,
         possibleFailureCodes: ["NO_OP"],
-        throws: T_NOT_FOUND_COMMAND2
+        throws: [
+          ...T_NOT_FOUND_COMMAND2,
+          "INVALID_INPUT",
+          "INVALID_TARGET"
+        ]
       }),
-      referenceDocPath: "review/decide.mdx",
-      referenceGroup: "review"
+      referenceDocPath: "track-changes/decide.mdx",
+      referenceGroup: "trackChanges"
     },
     "query.match": {
       memberPath: "query.match",
@@ -161097,7 +161382,7 @@ function print() { __p += __j.call(arguments, '') }
     text: { type: "string" }
   }, ["target", "text"]), textMutationResultSchemaFor2("replace"), textMutationFailureSchemaFor2("replace"), objectSchema2({ target: textAddressSchema2 }, ["target"]), textMutationResultSchemaFor2("delete"), textMutationFailureSchemaFor2("delete"), objectSchema2({
     target: textAddressSchema2,
-    marks: (() => {
+    inline: (() => {
       return {
         type: "object",
         properties: Object.fromEntries(MARK_KEYS2.map((key$1) => [key$1, { type: "boolean" }])),
@@ -161105,7 +161390,7 @@ function print() { __p += __j.call(arguments, '') }
         minProperties: 1
       };
     })()
-  }, ["target", "marks"]), textMutationResultSchemaFor2("format.apply"), textMutationFailureSchemaFor2("format.apply"), objectSchema2({
+  }, ["target", "inline"]), textMutationResultSchemaFor2("format.apply"), textMutationFailureSchemaFor2("format.apply"), objectSchema2({
     at: { oneOf: [
       objectSchema2({ kind: { const: "documentStart" } }, ["kind"]),
       objectSchema2({ kind: { const: "documentEnd" } }, ["kind"]),
@@ -161170,7 +161455,7 @@ function print() { __p += __j.call(arguments, '') }
       "delete",
       "format"
     ] }
-  }), objectSchema2({ id: { type: "string" } }, ["id"]), objectSchema2({ id: { type: "string" } }, ["id"]), objectSchema2({ scope: { enum: ["all"] } }, ["scope"]), receiptResultSchemaFor2("review.decide"), receiptFailureResultSchemaFor2("review.decide"), objectSchema2({
+  }), 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,
     require: { enum: [
@@ -161310,14 +161595,9 @@ function print() { __p += __j.call(arguments, '') }
     },
     trackChanges: {
       title: "Track Changes",
-      description: "Tracked-change inspection operations.",
+      description: "Tracked-change inspection and review operations.",
       pagePath: "track-changes/index.mdx"
     },
-    review: {
-      title: "Review",
-      description: "Accept or reject tracked changes.",
-      pagePath: "review/index.mdx"
-    },
     query: {
       title: "Query",
       description: "Deterministic selector-based queries for mutation targeting.",
@@ -161362,7 +161642,7 @@ function print() { __p += __j.call(arguments, '') }
     "status",
     "isInternal"
   ]);
-  STYLE_APPLY_INPUT_ALLOWED_KEYS2 = new Set(["target", "marks"]);
+  STYLE_APPLY_INPUT_ALLOWED_KEYS2 = new Set(["target", "inline"]);
   DELETE_INPUT_ALLOWED_KEYS2 = new Set(["target"]);
   INSERT_INPUT_ALLOWED_KEYS2 = new Set(["text", "target"]);
   REPLACE_INPUT_ALLOWED_KEYS2 = new Set(["text", "target"]);
@@ -161387,7 +161667,7 @@ function print() { __p += __j.call(arguments, '') }
       "setCommentInternal"
     ],
     "comments.delete": ["removeComment"],
-    "review.decide": [
+    "trackChanges.decide": [
       "acceptTrackedChangeById",
       "rejectTrackedChangeById",
       "acceptAllTrackedChanges",
@@ -170686,8 +170966,10 @@ function print() { __p += __j.call(arguments, '') }
             updateOptions.availableWidth = options.availableWidth;
           if (options.availableHeight !== undefined)
             updateOptions.availableHeight = options.availableHeight;
-          if (Object.keys(updateOptions).length > 0)
+          if (Object.keys(updateOptions).length > 0) {
             existing.editor.setOptions(updateOptions);
+            this.#refreshPageNumberDisplay(existing.editor);
+          }
         }
         return existing.editor;
       }
@@ -170718,6 +171000,25 @@ function print() { __p += __j.call(arguments, '') }
       this.#pendingCreations.set(descriptor.id, creationPromise);
       return creationPromise;
     }
+    #refreshPageNumberDisplay(editor) {
+      const container = editor.view?.dom;
+      if (!container)
+        return;
+      const opts = editor.options;
+      const parentEditor = opts.parentEditor;
+      const currentPage = String(opts.currentPageNumber || "1");
+      const totalPages = String(opts.totalPageCount || parentEditor?.currentTotalPages || "1");
+      const pageNumberEls = container.querySelectorAll('[data-id="auto-page-number"]');
+      const totalPagesEls = container.querySelectorAll('[data-id="auto-total-pages"]');
+      pageNumberEls.forEach((el) => {
+        if (el.textContent !== currentPage)
+          el.textContent = currentPage;
+      });
+      totalPagesEls.forEach((el) => {
+        if (el.textContent !== totalPages)
+          el.textContent = totalPages;
+      });
+    }
     getEditor(descriptor) {
       if (!descriptor?.id)
         return null;
@@ -172398,7 +172699,7 @@ function print() { __p += __j.call(arguments, '') }
         goToAnchor: (href) => this.goToAnchor(href),
         emit: (event, payload) => this.emit(event, payload),
         normalizeClientPoint: (clientX, clientY) => this.#normalizeClientPoint(clientX, clientY),
-        hitTestHeaderFooterRegion: (x2, y$1) => this.#hitTestHeaderFooterRegion(x2, y$1),
+        hitTestHeaderFooterRegion: (x2, y$1, pageIndex, pageLocalY) => this.#hitTestHeaderFooterRegion(x2, y$1, pageIndex, pageLocalY),
         exitHeaderFooterMode: () => this.#exitHeaderFooterMode(),
         activateHeaderFooterRegion: (region) => this.#activateHeaderFooterRegion(region),
         createDefaultHeaderFooter: (region) => this.#createDefaultHeaderFooter(region),
@@ -172521,7 +172822,8 @@ function print() { __p += __j.call(arguments, '') }
         scheduleRerender: () => this.#scheduleRerender(),
         setPendingDocChange: () => {
           this.#pendingDocChange = true;
-        }
+        },
+        getBodyPageCount: () => this.#layoutState?.layout?.pages?.length ?? 1
       });
       this.#headerFooterSession.setCallbacks({
         onModeChanged: (session) => {
@@ -173437,8 +173739,8 @@ function print() { __p += __j.call(arguments, '') }
     #updateDecorationProviders(layout) {
       this.#headerFooterSession?.updateDecorationProviders(layout);
     }
-    #hitTestHeaderFooterRegion(x2, y$1) {
-      return this.#headerFooterSession?.hitTestRegion(x2, y$1, this.#layoutState.layout) ?? null;
+    #hitTestHeaderFooterRegion(x2, y$1, pageIndex, pageLocalY) {
+      return this.#headerFooterSession?.hitTestRegion(x2, y$1, this.#layoutState.layout, pageIndex, pageLocalY) ?? null;
     }
     #activateHeaderFooterRegion(region) {
       this.#headerFooterSession?.activateRegion(region);
@@ -178190,7 +178492,7 @@ function print() { __p += __j.call(arguments, '') }
         const { schema } = state;
         if (!schema.nodes?.["total-page-number"])
           return false;
-        const currentPages = editor?.options?.parentEditor?.currentTotalPages || 1;
+        const currentPages = editor?.options?.totalPageCount || editor?.options?.parentEditor?.currentTotalPages || 1;
         const pageNumberNode = {
           type: "total-page-number",
           content: [{
@@ -183515,8 +183817,8 @@ function print() { __p += __j.call(arguments, '') }
     return isObjectLike_default(value) && hasOwnProperty$8.call(value, "callee") && !propertyIsEnumerable$1.call(value, "callee");
   };
   stubFalse_default = stubFalse;
-  freeExports$2 = typeof exports_src_0vZP1_ru_es == "object" && exports_src_0vZP1_ru_es && !exports_src_0vZP1_ru_es.nodeType && exports_src_0vZP1_ru_es;
-  freeModule$2 = freeExports$2 && typeof module_src_0vZP1_ru_es == "object" && module_src_0vZP1_ru_es && !module_src_0vZP1_ru_es.nodeType && module_src_0vZP1_ru_es;
+  freeExports$2 = typeof exports_src_eL3w4G7e_es == "object" && exports_src_eL3w4G7e_es && !exports_src_eL3w4G7e_es.nodeType && exports_src_eL3w4G7e_es;
+  freeModule$2 = freeExports$2 && typeof module_src_eL3w4G7e_es == "object" && module_src_eL3w4G7e_es && !module_src_eL3w4G7e_es.nodeType && module_src_eL3w4G7e_es;
   Buffer$1 = freeModule$2 && freeModule$2.exports === freeExports$2 ? _root_default.Buffer : undefined;
   isBuffer_default = (Buffer$1 ? Buffer$1.isBuffer : undefined) || stubFalse_default;
   typedArrayTags = {};
@@ -183524,8 +183826,8 @@ function print() { __p += __j.call(arguments, '') }
   typedArrayTags[argsTag$1] = typedArrayTags[arrayTag$1] = typedArrayTags[arrayBufferTag$1] = typedArrayTags[boolTag$1] = typedArrayTags[dataViewTag$2] = typedArrayTags[dateTag$1] = typedArrayTags[errorTag$1] = typedArrayTags[funcTag] = typedArrayTags[mapTag$2] = typedArrayTags[numberTag$1] = typedArrayTags[objectTag$3] = typedArrayTags[regexpTag$1] = typedArrayTags[setTag$2] = typedArrayTags[stringTag$1] = typedArrayTags[weakMapTag$1] = false;
   _baseIsTypedArray_default = baseIsTypedArray;
   _baseUnary_default = baseUnary;
-  freeExports$1 = typeof exports_src_0vZP1_ru_es == "object" && exports_src_0vZP1_ru_es && !exports_src_0vZP1_ru_es.nodeType && exports_src_0vZP1_ru_es;
-  freeModule$1 = freeExports$1 && typeof module_src_0vZP1_ru_es == "object" && module_src_0vZP1_ru_es && !module_src_0vZP1_ru_es.nodeType && module_src_0vZP1_ru_es;
+  freeExports$1 = typeof exports_src_eL3w4G7e_es == "object" && exports_src_eL3w4G7e_es && !exports_src_eL3w4G7e_es.nodeType && exports_src_eL3w4G7e_es;
+  freeModule$1 = freeExports$1 && typeof module_src_eL3w4G7e_es == "object" && module_src_eL3w4G7e_es && !module_src_eL3w4G7e_es.nodeType && module_src_eL3w4G7e_es;
   freeProcess = freeModule$1 && freeModule$1.exports === freeExports$1 && _freeGlobal_default.process;
   _nodeUtil_default = function() {
     try {
@@ -183630,8 +183932,8 @@ function print() { __p += __j.call(arguments, '') }
   Stack.prototype.has = _stackHas_default;
   Stack.prototype.set = _stackSet_default;
   _Stack_default = Stack;
-  freeExports = typeof exports_src_0vZP1_ru_es == "object" && exports_src_0vZP1_ru_es && !exports_src_0vZP1_ru_es.nodeType && exports_src_0vZP1_ru_es;
-  freeModule = freeExports && typeof module_src_0vZP1_ru_es == "object" && module_src_0vZP1_ru_es && !module_src_0vZP1_ru_es.nodeType && module_src_0vZP1_ru_es;
+  freeExports = typeof exports_src_eL3w4G7e_es == "object" && exports_src_eL3w4G7e_es && !exports_src_eL3w4G7e_es.nodeType && exports_src_eL3w4G7e_es;
+  freeModule = freeExports && typeof module_src_eL3w4G7e_es == "object" && module_src_eL3w4G7e_es && !module_src_eL3w4G7e_es.nodeType && module_src_eL3w4G7e_es;
   Buffer4 = freeModule && freeModule.exports === freeExports ? _root_default.Buffer : undefined;
   allocUnsafe = Buffer4 ? Buffer4.allocUnsafe : undefined;
   _cloneBuffer_default = cloneBuffer;
@@ -191250,8 +191552,8 @@ var init_zipper_BJHqrQMq_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_0vZP1_ru_es();
-  init_SuperConverter_D9XMPi6H_es();
+  init_src_eL3w4G7e_es();
+  init_SuperConverter_Cf1y7bFA_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
   init_constants_DBKi0Amm_es();
@@ -191408,7 +191710,7 @@ var init_capabilities_adapter = __esm(() => {
     "comments.create": ["addComment", "setTextSelection", "addCommentReply"],
     "comments.patch": ["editComment", "moveComment", "resolveComment", "setCommentInternal"],
     "comments.delete": ["removeComment"],
-    "review.decide": [
+    "trackChanges.decide": [
       "acceptTrackedChangeById",
       "rejectTrackedChangeById",
       "acceptAllTrackedChanges",
@@ -198013,10 +198315,10 @@ function executeStyleApply3(editor, tr, target, step, mapping) {
   const { schema } = editor.state;
   let changed = false;
   const markEntries = [
-    ["bold", step.args.marks.bold, schema.marks.bold],
-    ["italic", step.args.marks.italic, schema.marks.italic],
-    ["underline", step.args.marks.underline, schema.marks.underline],
-    ["strike", step.args.marks.strike, schema.marks.strike]
+    ["bold", step.args.inline.bold, schema.marks.bold],
+    ["italic", step.args.inline.italic, schema.marks.italic],
+    ["underline", step.args.inline.underline, schema.marks.underline],
+    ["strike", step.args.inline.strike, schema.marks.strike]
   ];
   for (const [, value, markType] of markEntries) {
     if (value === undefined || !markType)
@@ -198106,10 +198408,10 @@ function executeSpanStyleApply2(editor, tr, target, step, mapping) {
   const absFrom = mapping.map(firstSeg.absFrom, 1);
   const absTo = mapping.map(lastSeg.absTo, -1);
   const markEntries = [
-    ["bold", step.args.marks.bold, schema.marks.bold],
-    ["italic", step.args.marks.italic, schema.marks.italic],
-    ["underline", step.args.marks.underline, schema.marks.underline],
-    ["strike", step.args.marks.strike, schema.marks.strike]
+    ["bold", step.args.inline.bold, schema.marks.bold],
+    ["italic", step.args.inline.italic, schema.marks.italic],
+    ["underline", step.args.inline.underline, schema.marks.underline],
+    ["strike", step.args.inline.strike, schema.marks.strike]
   ];
   for (const [, value, markType] of markEntries) {
     if (value === undefined || !markType)
@@ -198717,7 +199019,7 @@ function styleApplyWrapper2(editor, input2, options) {
       failure: { code: "INVALID_TARGET", message: "format.apply requires a non-collapsed target range." }
     };
   }
-  const markKeys2 = Object.keys(input2.marks).filter((k3) => input2.marks[k3] !== undefined);
+  const markKeys2 = Object.keys(input2.inline).filter((k3) => input2.inline[k3] !== undefined);
   for (const key2 of markKeys2) {
     const schemaName = MARK_KEY_TO_SCHEMA_NAME2[key2];
     if (schemaName) {
@@ -198736,7 +199038,7 @@ function styleApplyWrapper2(editor, input2, options) {
     id: stepId,
     op: "format.apply",
     where: STUB_WHERE2,
-    args: { marks: input2.marks }
+    args: { inline: input2.inline }
   };
   const target = {
     kind: "range",
@@ -219339,6 +219641,18 @@ var SKIP_FIELD_PROCESSING_NODE_NAMES3, shouldSkipFieldProcessing3 = (node3) => S
         i4++;
         continue;
       }
+      const childElements = node3.elements || [];
+      if (childElements.length > 0) {
+        for (const child of childElements) {
+          if (Array.isArray(child.elements)) {
+            const childResult = preProcessPageFieldsOnly2(child.elements, depth + 1);
+            child.elements = childResult.processedNodes;
+          }
+          processedNodes.push(child);
+        }
+        i4++;
+        continue;
+      }
     }
     if (fldType === "begin") {
       const fieldInfo = scanFieldSequence2(nodes, i4);
@@ -219364,6 +219678,13 @@ var SKIP_FIELD_PROCESSING_NODE_NAMES3, shouldSkipFieldProcessing3 = (node3) => S
         }
       }
     }
+    if (node3.name === "w:r" && node3.elements?.some((el) => el.name === "w:pgNum")) {
+      const rPr = node3.elements.find((el) => el.name === "w:rPr") || null;
+      const processedField = preProcessPageInstruction2([], "", rPr);
+      processedNodes.push(...processedField);
+      i4++;
+      continue;
+    }
     if (Array.isArray(node3.elements)) {
       const childResult = preProcessPageFieldsOnly2(node3.elements, depth + 1);
       node3.elements = childResult.processedNodes;
@@ -238980,7 +239301,7 @@ var resolveTrackChangeId = (input2, context) => {
 var init_special_handlers = __esm(() => {
   PRE_INVOKE_HOOKS = {
     "trackChanges.get": resolveTrackChangeId,
-    "review.decide": resolveReviewDecideId
+    "trackChanges.decide": resolveReviewDecideId
   };
   POST_INVOKE_HOOKS = {
     "trackChanges.list": normalizeTrackChangesListIds,
@@ -239609,7 +239930,7 @@ var init_helper_commands = __esm(() => {
     {
       tokens: ["format", "bold"],
       canonicalOperationId: "format.apply",
-      defaultInput: { marks: { bold: true } },
+      defaultInput: { inline: { bold: true } },
       description: "Apply bold formatting to a text range.",
       category: "format",
       mutates: true,
@@ -239621,7 +239942,7 @@ var init_helper_commands = __esm(() => {
     {
       tokens: ["format", "italic"],
       canonicalOperationId: "format.apply",
-      defaultInput: { marks: { italic: true } },
+      defaultInput: { inline: { italic: true } },
       description: "Apply italic formatting to a text range.",
       category: "format",
       mutates: true,
@@ -239630,7 +239951,7 @@ var init_helper_commands = __esm(() => {
     {
       tokens: ["format", "underline"],
       canonicalOperationId: "format.apply",
-      defaultInput: { marks: { underline: true } },
+      defaultInput: { inline: { underline: true } },
       description: "Apply underline formatting to a text range.",
       category: "format",
       mutates: true,
@@ -239639,7 +239960,7 @@ var init_helper_commands = __esm(() => {
     {
       tokens: ["format", "strikethrough"],
       canonicalOperationId: "format.apply",
-      defaultInput: { marks: { strike: true } },
+      defaultInput: { inline: { strike: true } },
       description: "Apply strikethrough formatting to a text range.",
       category: "format",
       mutates: true,
@@ -239647,7 +239968,7 @@ var init_helper_commands = __esm(() => {
     },
     {
       tokens: ["track-changes", "accept"],
-      canonicalOperationId: "review.decide",
+      canonicalOperationId: "trackChanges.decide",
       defaultInput: { decision: "accept" },
       description: "Accept a tracked change by ID.",
       category: "trackChanges",
@@ -239658,7 +239979,7 @@ var init_helper_commands = __esm(() => {
     },
     {
       tokens: ["track-changes", "reject"],
-      canonicalOperationId: "review.decide",
+      canonicalOperationId: "trackChanges.decide",
       defaultInput: { decision: "reject" },
       description: "Reject a tracked change by ID.",
       category: "trackChanges",
@@ -239669,7 +239990,7 @@ var init_helper_commands = __esm(() => {
     },
     {
       tokens: ["track-changes", "accept-all"],
-      canonicalOperationId: "review.decide",
+      canonicalOperationId: "trackChanges.decide",
       defaultInput: { decision: "accept", target: { scope: "all" } },
       description: "Accept all tracked changes.",
       category: "trackChanges",
@@ -239678,7 +239999,7 @@ var init_helper_commands = __esm(() => {
     },
     {
       tokens: ["track-changes", "reject-all"],
-      canonicalOperationId: "review.decide",
+      canonicalOperationId: "trackChanges.decide",
       defaultInput: { decision: "reject", target: { scope: "all" } },
       description: "Reject all tracked changes.",
       category: "trackChanges",