@beyondwork/docx-react-component 1.0.28 → 1.0.30

package/src/io/docx-session.ts

@@ -23,6 +23,7 @@ import type {
 import { createCanonicalDocumentId } from "../core/state/editor-state.ts";
 import {
   createDetachedAnchor,
+  storyTargetsEqual,
   type EditorAnchorProjection as InternalEditorAnchorProjection,
 } from "../core/selection/mapping.ts";
 import { DOCX_MIME_TYPE } from "./opc/docx-package.ts";
@@ -42,6 +43,18 @@ import {
   resolveRelationshipTarget,
   type OpcRelationship,
 } from "./ooxml/part-manifest.ts";
+import {
+  buildWorkflowPayloadParts,
+  getDocumentBackedWorkflowMetadata,
+  parseWorkflowPayloadFromPackage,
+  WORKFLOW_PAYLOAD_CONTENT_TYPE,
+  WORKFLOW_PAYLOAD_CUSTOM_PROPS_CONTENT_TYPE,
+  WORKFLOW_PAYLOAD_CUSTOM_PROPS_PART_PATH,
+  WORKFLOW_PAYLOAD_CUSTOM_PROPS_RELATIONSHIP_TYPE,
+  WORKFLOW_PAYLOAD_ITEM_PROPS_CONTENT_TYPE,
+  WORKFLOW_PAYLOAD_ITEM_PROPS_PART_PATH,
+  WORKFLOW_PAYLOAD_PART_PATH,
+} from "./ooxml/workflow-payload.ts";
 import {
   classifyCorruptPackageError,
   createBrokenRelationshipIssue,
@@ -49,7 +62,11 @@ import {
 } from "./opc/corrupt-package.ts";
 import { createExportSession } from "./export/export-session.ts";
 import { serializeMainDocument } from "./export/serialize-main-document.ts";
-import { parseRevisionsFromDocumentXml, type ParsedRevisionsResult } from "./ooxml/parse-revisions.ts";
+import {
+  parseRevisionsFromDocumentXml,
+  parseRevisionsFromStoryXml,
+  type ParsedRevisionsResult,
+} from "./ooxml/parse-revisions.ts";
 import { parseCommentsFromOoxml } from "./ooxml/parse-comments.ts";
 import { parseNumberingXml } from "./ooxml/parse-numbering.ts";
 import {
@@ -59,7 +76,11 @@ import {
   serializeMergedCommentsXml,
 } from "./export/serialize-comments.ts";
 import { splitDocumentAtReviewBoundaries } from "./export/split-review-boundaries.ts";
-import { serializeRuntimeRevisionsIntoDocumentXml } from "./export/serialize-runtime-revisions.ts";
+import { splitStoryBlocksForRuntimeRevisions } from "./export/split-story-blocks-for-runtime-revisions.ts";
+import {
+  serializeRuntimeRevisionsIntoDocumentXml,
+  serializeRuntimeRevisionsIntoStoryXml,
+} from "./export/serialize-runtime-revisions.ts";
 import { createCommentStoreFromRuntimeComments } from "../review/store/runtime-comment-store.ts";
 import type { CommentThread } from "../review/store/comment-store.ts";
 import type { RevisionRecord as ReviewRevisionRecord } from "../review/store/revision-types.ts";
@@ -105,7 +126,9 @@ import { parseSettingsXml } from "./ooxml/parse-settings.ts";
 import { parseStylesXml, type ParseStylesResult } from "./ooxml/parse-styles.ts";
 import {
   serializeHeaderXml,
+  serializeHeaderXmlWithRevisions,
   serializeFooterXml,
+  serializeFooterXmlWithRevisions,
   WORD_HEADER_CONTENT_TYPE,
   WORD_FOOTER_CONTENT_TYPE,
 } from "./export/serialize-headers-footers.ts";
@@ -199,6 +222,7 @@ export interface LoadedDocxEditorSession {
 interface ImportedDocxState {
   sourceBytes: Uint8Array;
   sourcePackage: OpcPackage;
+  sourceDocumentXml: string;
   sourceDocumentPartPath: string;
   sourceDocumentRelationships: readonly OpcRelationship[];
   sourceDocumentAttributes: Record<string, string>;
@@ -265,6 +289,7 @@ export function loadDocxEditorSession(
       }),
     );
   }
+  const embeddedWorkflowMetadata = parseWorkflowPayloadFromPackage(sourcePackage);
 
   const mainDocumentPath = resolveMainDocumentPartPath(sourcePackage);
   const brokenRelationshipIssues = collectBrokenInternalRelationshipIssues(
@@ -403,6 +428,8 @@ export function loadDocxEditorSession(
       normalizedDocument.preservation.opaqueFragments,
       normalizedRevisions.revisions,
     );
+    const importedStoryRevisions: ReviewRevisionRecord[] = [];
+    const importedStoryRevisionDiagnostics: ParsedRevisionsResult["diagnostics"] = [];
     const subPartOpaqueState = createSubPartOpaqueImportState(
       normalizedDocument.preservation.opaqueFragments,
       normalizedDocument.diagnostics.warnings,
@@ -437,6 +464,7 @@ export function loadDocxEditorSession(
 
       const xml = decodeUtf8(partBytes);
       if (ref.kind === "header") {
+        const parsedHeaderRevisions = parseRevisionsFromStoryXml(xml);
         const parsed = parseHeaderXml(xml);
         parsedHeaders.push({
           variant: ref.variant,
@@ -451,8 +479,24 @@ export function loadDocxEditorSession(
             subPartOpaqueState,
           ),
         });
+        importedStoryRevisions.push(
+          ...parsedHeaderRevisions.revisions.map((revision): ReviewRevisionRecord => ({
+            ...revision,
+            metadata: {
+              ...revision.metadata,
+              storyTarget: {
+                kind: "header" as const,
+                relationshipId: ref.relationshipId,
+                variant: ref.variant,
+                ...(ref.sectionIndex !== undefined ? { sectionIndex: ref.sectionIndex } : {}),
+              },
+            },
+          })),
+        );
+        importedStoryRevisionDiagnostics.push(...parsedHeaderRevisions.diagnostics);
         sourceHeaderPaths.push({ partPath, relationshipId: ref.relationshipId });
       } else {
+        const parsedFooterRevisions = parseRevisionsFromStoryXml(xml);
         const parsed = parseFooterXml(xml);
         parsedFooters.push({
           variant: ref.variant,
@@ -467,6 +511,21 @@ export function loadDocxEditorSession(
             subPartOpaqueState,
           ),
         });
+        importedStoryRevisions.push(
+          ...parsedFooterRevisions.revisions.map((revision): ReviewRevisionRecord => ({
+            ...revision,
+            metadata: {
+              ...revision.metadata,
+              storyTarget: {
+                kind: "footer" as const,
+                relationshipId: ref.relationshipId,
+                variant: ref.variant,
+                ...(ref.sectionIndex !== undefined ? { sectionIndex: ref.sectionIndex } : {}),
+              },
+            },
+          })),
+        );
+        importedStoryRevisionDiagnostics.push(...parsedFooterRevisions.diagnostics);
         sourceFooterPaths.push({ partPath, relationshipId: ref.relationshipId });
       }
     }
@@ -624,6 +683,12 @@ export function loadDocxEditorSession(
             source: "review" as const,
             message: diagnostic.message,
           })),
+          ...importedStoryRevisionDiagnostics.map((diagnostic, index) => ({
+            diagnosticId: `diagnostic:story-revision-import-${index + 1}`,
+            warningId: `warning:story-revision-import-${diagnostic.revisionId}`,
+            source: "review" as const,
+            message: diagnostic.message,
+          })),
           ...normalizedComments.diagnostics.map((diagnostic, index) => ({
             diagnosticId: `diagnostic:comment-import-${index + 1}`,
             warningId: `warning:comment-import-${diagnostic.commentId}`,
@@ -635,7 +700,10 @@ export function loadDocxEditorSession(
       },
       review: {
         comments: toRuntimeCommentRecords(normalizedComments.threads),
-        revisions: toRuntimeRevisionRecords(normalizedRevisions.revisions),
+        revisions: toRuntimeRevisionRecords([
+          ...normalizedRevisions.revisions,
+          ...importedStoryRevisions,
+        ]),
       },
     });
     const compatibility = buildCompatibilityReport({
@@ -650,6 +718,7 @@ export function loadDocxEditorSession(
       compatibility: toPublicCompatibilityReport(compatibility),
       protectionSnapshot: importedProtectionSnapshot,
       sourcePackage: createPersistedSourcePackage(sourceBytes, options.sourceLabel),
+      workflowMetadata: embeddedWorkflowMetadata,
     });
     const snapshotIssues = validatePersistedEditorSnapshot(snapshot);
     if (snapshotIssues.length > 0) {
@@ -670,6 +739,7 @@ export function loadDocxEditorSession(
     const importedState: ImportedDocxState = {
       sourceBytes: new Uint8Array(sourceBytes),
       sourcePackage,
+      sourceDocumentXml,
       sourceDocumentPartPath: mainDocumentPath,
       sourceDocumentRelationships: documentPart.relationships,
       sourceDocumentAttributes: extractDocumentRootAttributes(sourceDocumentXml),
@@ -757,9 +827,23 @@ function exportDocxEditorSession(
   const signatureMatch = serializeCanonicalDocumentForExport(currentDocument) ===
       state.initialCanonicalSignature;
   const canReuse = canReuseSourceBytesForCurrentDocument(state, currentDocument);
+  const durableWorkflowMetadata = getDocumentBackedWorkflowMetadata(sessionState.workflowMetadata);
   const commentCount = Object.keys(currentDocument.review?.comments ?? {}).length;
+  const currentRevisions = toReviewRevisionRecords(currentDocument.review.revisions);
+  const hasActiveImportedPreserveOnlyRevisions = currentRevisions.some(
+    (revision) =>
+      revision.status === "active" &&
+      revision.metadata.source === "import" &&
+      typeof revision.metadata.preserveOnlyReason === "string" &&
+      revision.metadata.preserveOnlyReason.length > 0,
+  );
 
-  if (signatureMatch && canReuse) {
+  if (
+    signatureMatch &&
+    canReuse &&
+    durableWorkflowMetadata.definitions.length === 0 &&
+    durableWorkflowMetadata.entries.length === 0
+  ) {
     return {
       bytes: new Uint8Array(state.sourceBytes),
       mimeType: DOCX_MIME_TYPE,
@@ -781,29 +865,30 @@ function exportDocxEditorSession(
       `DOCX export is blocked because ${blockingCommentCount} preserve-only comment anchors cannot be safely remapped after runtime edits.`,
     );
   }
-  const currentRevisions = toReviewRevisionRecords(currentDocument.review.revisions);
   const actionableRevisions = currentRevisions.filter(
     (revision) => getRevisionActionability(revision) === "actionable",
   );
-  const secondaryStoryActionableRevisions = actionableRevisions.filter(
-    (revision) => revision.metadata.storyTarget?.kind && revision.metadata.storyTarget.kind !== "main",
+  const mainStoryActionableRevisions = actionableRevisions.filter((revision) =>
+    !revision.metadata.storyTarget?.kind || revision.metadata.storyTarget.kind === "main"
   );
-  if (secondaryStoryActionableRevisions.length > 0) {
-    throw new Error(
-      `DOCX export is blocked because ${secondaryStoryActionableRevisions.length} secondary-story tracked changes cannot yet be serialized safely.`,
-    );
-  }
   const commentThreads = Object.values(
     createCommentStoreFromRuntimeComments(currentDocument.review.comments).threads,
   );
   const ownedCommentThreads = commentThreads.filter(
     (thread) => !preservedCommentIds.has(thread.commentId),
   );
+  const revisionReadyMainContent = {
+    ...currentDocument.content,
+    children: splitStoryBlocksForRuntimeRevisions(
+      currentDocument.content.children,
+      mainStoryActionableRevisions,
+    ),
+  };
   const serialized = serializeMainDocument(
     splitDocumentAtReviewBoundaries(
-      currentDocument.content as never,
+      revisionReadyMainContent as never,
       ownedCommentThreads,
-      actionableRevisions,
+      mainStoryActionableRevisions,
     ) as never,
     currentDocument.preservation as never,
     state.sourceDocumentRelationships,
@@ -815,8 +900,7 @@ function exportDocxEditorSession(
   );
   const revisionDocument = serializeRuntimeRevisionsIntoDocumentXml(
     serialized.documentXml,
-    actionableRevisions,
-    serialized.paragraphBoundaries,
+    mainStoryActionableRevisions,
   );
   if (revisionDocument.skippedRevisionIds.length > 0) {
     throw new Error(
@@ -949,6 +1033,9 @@ function exportDocxEditorSession(
     state.sourceDocumentPartPath,
     APP_PROPERTIES_PART_PATH,
     CORE_PROPERTIES_PART_PATH,
+    WORKFLOW_PAYLOAD_PART_PATH,
+    WORKFLOW_PAYLOAD_ITEM_PROPS_PART_PATH,
+    WORKFLOW_PAYLOAD_CUSTOM_PROPS_PART_PATH,
     numberingPartPath,
     commentsPartPath,
     commentsExtendedPartPath,
@@ -957,9 +1044,18 @@ function exportDocxEditorSession(
     ...subPartOwnedPaths,
   ]);
 
+  const mainDocumentXmlForExport =
+    signatureMatch &&
+    durableWorkflowMetadata.definitions.length === 0 &&
+    durableWorkflowMetadata.entries.length === 0 &&
+    commentCount === 0 &&
+    hasActiveImportedPreserveOnlyRevisions
+      ? state.sourceDocumentXml
+      : protectedDocumentXml;
+
   exportSession.replaceOwnedPart({
     path: state.sourceDocumentPartPath,
-    bytes: new TextEncoder().encode(protectedDocumentXml),
+    bytes: new TextEncoder().encode(mainDocumentXmlForExport),
     contentType: MAIN_DOCUMENT_CONTENT_TYPE,
     relationships: nextRelationships,
   });
@@ -1023,36 +1119,128 @@ function exportDocxEditorSession(
   }
 
   if (exportedSubParts) {
+    const headersByPartPath = new Map<
+      string,
+      { header: (typeof exportedSubParts.headers)[number]; revisions: ReviewRevisionRecord[] }
+    >();
     for (const header of exportedSubParts.headers) {
+      const entry = headersByPartPath.get(header.partPath) ?? { header, revisions: [] };
+      const matchingRevisions = actionableRevisions.filter((revision) =>
+        storyTargetsEqual(revision.metadata.storyTarget ?? { kind: "main" }, {
+          kind: "header",
+          relationshipId: header.relationshipId,
+          variant: header.variant,
+          ...(header.sectionIndex !== undefined ? { sectionIndex: header.sectionIndex } : {}),
+        })
+      );
+      entry.revisions.push(...matchingRevisions);
+      if (matchingRevisions.length > 0) {
+        entry.header = header;
+      }
+      headersByPartPath.set(header.partPath, entry);
+    }
+    for (const { header, revisions } of headersByPartPath.values()) {
+      const serializedHeaderXml = serializeSecondaryStoryWithRuntimeRevisions(
+        serializeHeaderXmlWithRevisions(header, revisions),
+        revisions,
+        `header ${header.partPath}`,
+      );
       exportSession.replaceOwnedPart({
         path: header.partPath,
-        bytes: new TextEncoder().encode(serializeHeaderXml(header)),
+        bytes: new TextEncoder().encode(serializedHeaderXml),
         contentType:
           state.sourcePackage.parts.get(header.partPath)?.contentType ?? WORD_HEADER_CONTENT_TYPE,
       });
     }
+    const footersByPartPath = new Map<
+      string,
+      { footer: (typeof exportedSubParts.footers)[number]; revisions: ReviewRevisionRecord[] }
+    >();
     for (const footer of exportedSubParts.footers) {
+      const entry = footersByPartPath.get(footer.partPath) ?? { footer, revisions: [] };
+      const matchingRevisions = actionableRevisions.filter((revision) =>
+        storyTargetsEqual(revision.metadata.storyTarget ?? { kind: "main" }, {
+          kind: "footer",
+          relationshipId: footer.relationshipId,
+          variant: footer.variant,
+          ...(footer.sectionIndex !== undefined ? { sectionIndex: footer.sectionIndex } : {}),
+        })
+      );
+      entry.revisions.push(...matchingRevisions);
+      if (matchingRevisions.length > 0) {
+        entry.footer = footer;
+      }
+      footersByPartPath.set(footer.partPath, entry);
+    }
+    for (const { footer, revisions } of footersByPartPath.values()) {
+      const serializedFooterXml = serializeSecondaryStoryWithRuntimeRevisions(
+        serializeFooterXmlWithRevisions(footer, revisions),
+        revisions,
+        `footer ${footer.partPath}`,
+      );
       exportSession.replaceOwnedPart({
         path: footer.partPath,
-        bytes: new TextEncoder().encode(serializeFooterXml(footer)),
+        bytes: new TextEncoder().encode(serializedFooterXml),
         contentType:
           state.sourcePackage.parts.get(footer.partPath)?.contentType ?? WORD_FOOTER_CONTENT_TYPE,
       });
     }
     if (exportedSubParts.footnoteCollection) {
       if (state.sourceSubPartPaths.footnotesPartPath) {
+        const serializedFootnotesXml = serializeFootnotesXml(
+          exportedSubParts.footnoteCollection,
+          Object.fromEntries(
+            actionableRevisions
+              .filter((revision) => revision.metadata.storyTarget?.kind === "footnote")
+              .map((revision) =>
+                revision.metadata.storyTarget?.kind === "footnote"
+                  ? [revision.metadata.storyTarget.noteId, [] as ReviewRevisionRecord[]] as const
+                  : null,
+              )
+              .filter((entry): entry is readonly [string, ReviewRevisionRecord[]] => entry !== null)
+              .map(([noteId]) => [
+                noteId,
+                actionableRevisions.filter(
+                  (revision) =>
+                    revision.metadata.storyTarget?.kind === "footnote" &&
+                    revision.metadata.storyTarget.noteId === noteId,
+                ),
+              ]),
+          ),
+        );
         exportSession.replaceOwnedPart({
           path: state.sourceSubPartPaths.footnotesPartPath,
-          bytes: new TextEncoder().encode(serializeFootnotesXml(exportedSubParts.footnoteCollection)),
+          bytes: new TextEncoder().encode(serializedFootnotesXml),
           contentType:
             state.sourcePackage.parts.get(state.sourceSubPartPaths.footnotesPartPath)?.contentType ??
             WORD_FOOTNOTES_CONTENT_TYPE,
         });
       }
       if (state.sourceSubPartPaths.endnotesPartPath) {
+        const serializedEndnotesXml = serializeEndnotesXml(
+          exportedSubParts.footnoteCollection,
+          Object.fromEntries(
+            actionableRevisions
+              .filter((revision) => revision.metadata.storyTarget?.kind === "endnote")
+              .map((revision) =>
+                revision.metadata.storyTarget?.kind === "endnote"
+                  ? [revision.metadata.storyTarget.noteId, [] as ReviewRevisionRecord[]] as const
+                  : null,
+              )
+              .filter((entry): entry is readonly [string, ReviewRevisionRecord[]] => entry !== null)
+              .map(([noteId]) => [
+                noteId,
+                actionableRevisions.filter(
+                  (revision) =>
+                    revision.metadata.storyTarget?.kind === "endnote" &&
+                    revision.metadata.storyTarget.noteId === noteId,
+                ),
+              ]),
+          ),
+        );
         exportSession.replaceOwnedPart({
           path: state.sourceSubPartPaths.endnotesPartPath,
-          bytes: new TextEncoder().encode(serializeEndnotesXml(exportedSubParts.footnoteCollection)),
+          bytes: new TextEncoder().encode(serializedEndnotesXml),
           contentType:
             state.sourcePackage.parts.get(state.sourceSubPartPaths.endnotesPartPath)?.contentType ??
             WORD_ENDNOTES_CONTENT_TYPE,
@@ -1076,6 +1264,7 @@ function exportDocxEditorSession(
   }
 
   ensureHostMetadataParts(exportSession, state.sourcePackage, currentDocument);
+  ensureWorkflowPayloadParts(exportSession, sessionState, currentDocument, state.sourcePackage);
 
   return {
     bytes: exportSession.serialize(),
@@ -1455,6 +1644,7 @@ function createImportedSnapshot(input: {
   compatibility: PersistedEditorSnapshot["compatibility"];
   protectionSnapshot: ProtectionSnapshot;
   sourcePackage?: PersistedEditorSnapshot["sourcePackage"];
+  workflowMetadata?: PersistedEditorSnapshot["workflowMetadata"];
 }): PersistedEditorSnapshot {
   return {
     snapshotVersion: "persisted-editor-snapshot/2",
@@ -1470,6 +1660,7 @@ function createImportedSnapshot(input: {
     warningLog: input.compatibility.warnings,
     protectionSnapshot: input.protectionSnapshot,
     sourcePackage: input.sourcePackage,
+    workflowMetadata: input.workflowMetadata,
   };
 }
 
@@ -1685,6 +1876,12 @@ function normalizeImportedCommentThreads(
         ...thread,
         anchor: createDetachedAnchor(anchor.range, "importAmbiguity"),
         status: "detached",
+        metadata: {
+          ...thread.metadata,
+          detachedReason: "opaque-region",
+          actionabilityNote:
+            "The comment body is preserved. The anchor overlaps opaque content that the editor cannot safely modify.",
+        },
       };
     }
 
@@ -1706,6 +1903,12 @@ function normalizeImportedCommentThreads(
         ...thread,
         anchor: createDetachedAnchor(anchor.range, "importAmbiguity"),
         status: "detached",
+        metadata: {
+          ...thread.metadata,
+          detachedReason: "revision-overlap",
+          actionabilityNote:
+            "The comment body is preserved. The anchor overlaps preserve-only revision markup that the editor cannot safely modify.",
+        },
       };
     }
 
@@ -1824,14 +2027,14 @@ function collectCanonicalParagraphRanges(
 function measureCanonicalParagraph(paragraph: CanonicalDocumentEnvelope["content"]["children"][number] & { type: "paragraph" }): number {
   return paragraph.children.reduce<number>((size, child) => {
     if (child.type === "text") {
-      return size + child.text.length;
+      return size + Array.from(child.text).length;
     }
     if (child.type === "hyperlink") {
       return (
         size +
         child.children.reduce<number>((childSize, entry) => {
           if (entry.type === "text") {
-            return childSize + entry.text.length;
+            return childSize + Array.from(entry.text).length;
           }
           return childSize + 1;
         }, 0)
@@ -1964,9 +2167,15 @@ function toRuntimeRevisionRecords(
           source: revision.metadata.source,
           storyTarget: revision.metadata.storyTarget,
           preserveOnlyReason: revision.metadata.preserveOnlyReason,
+          suggestionId: revision.metadata.suggestionId,
+          semanticKind: revision.metadata.semanticKind,
+          linkedRevisionIds: revision.metadata.linkedRevisionIds,
+          predecessorSuggestionId: revision.metadata.predecessorSuggestionId,
           importedRevisionForm: revision.metadata.importedRevisionForm,
           originalRevisionType: revision.metadata.originalRevisionType,
           ooxmlRevisionId: revision.metadata.ooxmlRevisionId,
+          propertyChangeData: revision.metadata.propertyChangeData,
+          moveData: revision.metadata.moveData,
         },
         status: revision.status === "active" ? "open" : revision.status,
       } satisfies RuntimeRevisionRecord,
@@ -1988,14 +2197,38 @@ function toReviewRevisionRecords(
       source: revision.metadata?.source ?? "runtime",
       storyTarget: revision.metadata?.storyTarget,
       preserveOnlyReason: revision.metadata?.preserveOnlyReason,
+      suggestionId: revision.metadata?.suggestionId,
+      semanticKind: revision.metadata?.semanticKind,
+      linkedRevisionIds: revision.metadata?.linkedRevisionIds,
+      predecessorSuggestionId: revision.metadata?.predecessorSuggestionId,
       importedRevisionForm: revision.metadata?.importedRevisionForm,
       originalRevisionType: revision.metadata?.originalRevisionType,
       ooxmlRevisionId: revision.metadata?.ooxmlRevisionId,
+      propertyChangeData: revision.metadata?.propertyChangeData,
+      moveData: revision.metadata?.moveData,
     },
     status: revision.status === "open" ? "active" : revision.status,
   }));
 }
 
+function serializeSecondaryStoryWithRuntimeRevisions(
+  xml: string,
+  revisions: readonly ReviewRevisionRecord[],
+  label: string,
+): string {
+  if (revisions.length === 0) {
+    return xml;
+  }
+
+  const serialized = serializeRuntimeRevisionsIntoStoryXml(xml, revisions);
+  if (serialized.skippedRevisionIds.length > 0) {
+    throw new Error(
+      `DOCX export is blocked because ${serialized.skippedRevisionIds.length} active revisions overlap unsupported serialization boundaries in ${label}.`,
+    );
+  }
+  return serialized.documentXml;
+}
+
 export function stripCommentMarkup(
   documentXml: string,
   ownedCommentIds: readonly string[],
@@ -2399,7 +2632,12 @@ function toUint8Array(bytes: Uint8Array | ArrayBuffer): Uint8Array {
 }
 
 function serializeCanonicalDocumentForExport(document: CanonicalDocumentEnvelope): string {
-  return createCanonicalDocumentSignature(document);
+  return createCanonicalDocumentSignature({
+    ...document,
+    docId: "__export__",
+    createdAt: "__export__",
+    updatedAt: "__export__",
+  });
 }
 
 function canReuseSourceBytesForCurrentDocument(
@@ -2412,6 +2650,12 @@ function canReuseSourceBytesForCurrentDocument(
 
   const commentThreads = Object.values(document.review.comments);
   const hasLiveComments = commentThreads.some((thread) => thread.anchor.kind !== "detached");
+  const hasRuntimeAuthoredActiveRevisions = Object.values(document.review.revisions).some((revision) =>
+    revision.status === "open" && revision.metadata?.source === "runtime"
+  );
+  if (hasRuntimeAuthoredActiveRevisions) {
+    return false;
+  }
   if (!hasLiveComments) {
     return true;
   }
@@ -2471,6 +2715,55 @@ function ensureHostMetadataParts(
   });
 }
 
+function ensureWorkflowPayloadParts(
+  exportSession: ReturnType<typeof createExportSession>,
+  sessionState: EditorSessionState,
+  document: CanonicalDocumentEnvelope,
+  sourcePackage: OpcPackage,
+): void {
+  const payloadParts = buildWorkflowPayloadParts({
+    sourcePackage,
+    workflowMetadata: sessionState.workflowMetadata,
+    documentId: sessionState.documentId,
+    createdAt: document.createdAt,
+    updatedAt: document.updatedAt,
+    producerVersion: sessionState.editorBuild,
+  });
+  if (!payloadParts) {
+    return;
+  }
+
+  const payloadPart = sourcePackage.parts.get(payloadParts.payloadPartPath);
+  const itemPropsPart = sourcePackage.parts.get(payloadParts.itemPropsPartPath);
+  const customPropsPart = sourcePackage.parts.get(WORKFLOW_PAYLOAD_CUSTOM_PROPS_PART_PATH);
+
+  exportSession.replaceOwnedPart({
+    path: payloadParts.payloadPartPath,
+    bytes: new TextEncoder().encode(payloadParts.payloadPartXml),
+    contentType: payloadPart?.contentType ?? WORKFLOW_PAYLOAD_CONTENT_TYPE,
+    relationships: payloadParts.payloadRelationships,
+    compression: payloadPart?.compression,
+  });
+  exportSession.replaceOwnedPart({
+    path: payloadParts.itemPropsPartPath,
+    bytes: new TextEncoder().encode(payloadParts.itemPropsXml),
+    contentType: itemPropsPart?.contentType ?? WORKFLOW_PAYLOAD_ITEM_PROPS_CONTENT_TYPE,
+    compression: itemPropsPart?.compression,
+  });
+  exportSession.replaceOwnedPart({
+    path: WORKFLOW_PAYLOAD_CUSTOM_PROPS_PART_PATH,
+    bytes: new TextEncoder().encode(payloadParts.customPropertiesXml),
+    contentType: customPropsPart?.contentType ?? WORKFLOW_PAYLOAD_CUSTOM_PROPS_CONTENT_TYPE,
+    compression: customPropsPart?.compression,
+  });
+
+  exportSession.ensurePackageRelationship({
+    type: WORKFLOW_PAYLOAD_CUSTOM_PROPS_RELATIONSHIP_TYPE,
+    target: WORKFLOW_PAYLOAD_CUSTOM_PROPS_PART_PATH,
+    preferredId: "rIdBwWorkflowCustomProps",
+  });
+}
+
 function hasHostSafeMetadataPackageStructure(sourcePackage: OpcPackage): boolean {
   const corePropertiesPart = sourcePackage.parts.get(CORE_PROPERTIES_PART_PATH);
   const appPropertiesPart = sourcePackage.parts.get(APP_PROPERTIES_PART_PATH);
@@ -2819,7 +3112,7 @@ function collectProtectionRangesFromInlines(
 function measureParsedInlineNode(node: ParsedInlineNode): number {
   switch (node.type) {
     case "text":
-      return node.text.length;
+      return Array.from(node.text).length;
     case "tab":
     case "hard_break":
     case "column_break":