@superdoc/mcp 1.3.0-next.6 → 1.3.0-next.7

package/dist/index.js

@@ -31318,7 +31318,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.16.0-next.6";
+var SDK_VERSION = "2.16.0-next.7";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { chmodSync, existsSync } from "node:fs";
@@ -413754,7 +413754,35 @@ async function bootstrapV2Room(input) {
       diagnostics
     };
   }
+  let supersededClaim = null;
+  if (input.supersedeClaim) {
+    const active = readBootstrapClaims(input.rootDoc).filter((claim) => claim.status === "pending");
+    if (classification.classification !== ROOM_CLASSIFICATION.v2Pending || active.length !== 1 || active[0]?.claimerId !== input.supersedeClaim.claimerId || active[0]?.claimedAt !== input.supersedeClaim.claimedAt || active[0]?.sha256Zip !== seed.sha256Zip || input.supersedeClaim.claimerId === input.claimerId) {
+      diagnostics.push({
+        code: COLLAB_V2_DIAGNOSTICS.COLLAB_V2_BOOTSTRAP_CLAIM_LOST,
+        message: "expired bootstrap claim changed before retry could take over"
+      });
+      return {
+        classification: ROOM_CLASSIFICATION.v2Pending,
+        committed: false,
+        snapshot: readRoomManifest(input.rootDoc).snapshot,
+        survivorClaimerId: active[0]?.claimerId ?? null,
+        diagnostics
+      };
+    }
+    supersededClaim = active[0] ?? null;
+  }
   const publishPendingBootstrap = () => {
+    if (supersededClaim) {
+      writeBootstrapClaim({
+        rootDoc: input.rootDoc,
+        claimerId: supersededClaim.claimerId,
+        claimedAt: supersededClaim.claimedAt,
+        sha256Zip: supersededClaim.sha256Zip,
+        byteLength: supersededClaim.byteLength,
+        status: "aborted"
+      });
+    }
     writeBootstrapClaim({
       rootDoc: input.rootDoc,
       claimerId: input.claimerId,
@@ -413763,22 +413791,24 @@ async function bootstrapV2Room(input) {
       byteLength: seed.byteLength,
       status: "pending"
     });
-    writeRoomManifestMeta({
-      rootDoc: input.rootDoc,
-      roomDocumentId: rootId,
-      createdAt,
-      createdBy: input.createdBy ?? null,
-      createdFrom: {
-        kind: "docx",
-        sha256Zip: seed.sha256Zip,
-        byteLength: seed.byteLength,
-        filename: input.filename ?? null,
-        migration: input.migration ?? null
-      },
-      bootstrapState: BOOTSTRAP_STATE.pending,
-      compatibilityPolicy: input.compatibilityPolicy ?? DEFAULT_COMPATIBILITY_POLICY,
-      schemaVersion
-    });
+    if (classification.classification !== ROOM_CLASSIFICATION.v2Pending) {
+      writeRoomManifestMeta({
+        rootDoc: input.rootDoc,
+        roomDocumentId: rootId,
+        createdAt,
+        createdBy: input.createdBy ?? null,
+        createdFrom: {
+          kind: "docx",
+          sha256Zip: seed.sha256Zip,
+          byteLength: seed.byteLength,
+          filename: input.filename ?? null,
+          migration: input.migration ?? null
+        },
+        bootstrapState: BOOTSTRAP_STATE.pending,
+        compatibilityPolicy: input.compatibilityPolicy ?? DEFAULT_COMPATIBILITY_POLICY,
+        schemaVersion
+      });
+    }
   };
   if (replacingExistingRoom) {
     input.rootDoc.transact(() => {
@@ -413786,7 +413816,7 @@ async function bootstrapV2Room(input) {
       publishPendingBootstrap();
     }, "collab-v2:replace:prepare-bootstrap");
   } else {
-    publishPendingBootstrap();
+    input.rootDoc.transact(publishPendingBootstrap, "collab-v2:create:prepare-bootstrap");
   }
   const waitForSettling = input.waitForSettling ?? DEFAULT_SETTLING_RESOLVER;
   await waitForSettling();
@@ -436119,6 +436149,8 @@ function createCollabV2SessionProjectionController(options) {
         subscription.unsubscribe();
       }
       for (const handle of options.projectionRegistry.listStories()) {
+        if (handle.rootDoc && handle.scope && getUnitScope(handle.rootDoc, handle.shardId) !== handle.scope)
+          continue;
         disposeStoryBlockIndex(shardReadTarget(handle));
       }
       if (SESSION_PROJECTION_CONTROLLERS.get(options.session) === controller) {
@@ -436727,6 +436759,7 @@ var init_session_controller = __esm(() => {
   init_runtime5();
   init_barrier();
   init_diagnostics2();
+  init_content3();
   init_story_para_id_allocator();
   init_revision_wid_allocator2();
   init_session_controller_origin();
@@ -437093,6 +437126,7 @@ async function bootstrapV2RoomFromDocx(input) {
     docxBytes: input.docxBytes,
     filename: input.filename ?? null,
     claimerId: input.claimerId,
+    ...input.supersedeClaim ? { supersedeClaim: input.supersedeClaim } : {},
     ...input.createdBy ? { createdBy: input.createdBy } : {},
     ...input.createdAt ? { createdAt: input.createdAt } : {},
     ...input.migration ? { migration: input.migration } : {},
@@ -437239,6 +437273,7 @@ async function bootstrapV2RoomFromDocxSingleDoc(input) {
     docxBytes: input.docxBytes,
     filename: input.filename ?? null,
     claimerId: input.claimerId,
+    ...input.supersedeClaim ? { supersedeClaim: input.supersedeClaim } : {},
     ...input.createdBy ? { createdBy: input.createdBy } : {},
     ...input.createdAt ? { createdAt: input.createdAt } : {},
     ...input.migration ? { migration: input.migration } : {},
@@ -437516,7 +437551,8 @@ function createHeadlessCollabRoomCoordinator(options) {
   const manifestObserver = () => {
     if (disposed)
       return;
-    if (observeReplacementCommits())
+    const replacementCommitted = observeReplacementCommits();
+    if (replacementCommitted)
       pruneReplacedRoomOrphans(options.rootDoc);
     const nextParts = getPackagePartsMap(options.rootDoc);
     const generationChanged = nextParts !== packageParts;
@@ -437526,7 +437562,7 @@ function createHeadlessCollabRoomCoordinator(options) {
       packageParts = nextParts;
       packageParts.observe(manifestObserver);
       meta3.observe(manifestObserver);
-      packageReplacementPending = true;
+      packageReplacementPending || (packageReplacementPending = replacementCommitted || Array.from(lock.entries()).some(([key2, value2]) => key2.startsWith("replaceFile:") && value2 != null && typeof value2 === "object" && (value2.state === "pending" || value2.state === "applying")));
     }
     syncCommittedRoomSourceIdentity();
     if (generationChanged)
@@ -441211,6 +441247,7 @@ function createHeadlessV2CollaborationRuntimeSkeleton(options) {
         docxBytes: request.docxBytes,
         filename: request.filename ?? null,
         claimerId: request.claimerId,
+        ...request.supersedeClaim ? { supersedeClaim: request.supersedeClaim } : {},
         ...request.createdBy ? { createdBy: request.createdBy } : {},
         ...request.createdAt ? { createdAt: request.createdAt } : {},
         ...request.migration ? { migration: request.migration } : {},
@@ -441293,6 +441330,7 @@ function createHeadlessV2SingleDocCollaborationRuntimeSkeleton(options) {
         docxBytes: request.docxBytes,
         filename: request.filename ?? null,
         claimerId: request.claimerId,
+        ...request.supersedeClaim ? { supersedeClaim: request.supersedeClaim } : {},
         ...request.createdBy ? { createdBy: request.createdBy } : {},
         ...request.createdAt ? { createdAt: request.createdAt } : {},
         ...request.migration ? { migration: request.migration } : {},
@@ -441411,6 +441449,7 @@ async function openV2CollaborativeDocumentSession(options) {
   const trace = createOpenTrace(options.runtime.rootId);
   const blobStore = runtimeBlobStore(options.runtime);
   const rootConn = options.runtime.connectRoot();
+  const bootstrapClaimerId = options.claimerId ?? `headless-open-${crypto.randomUUID()}`;
   await rootConn.waitForSync();
   await waitForDocUpdateSettling(rootConn.ydoc, settleMaxMs);
   trace.mark("root-sync");
@@ -441483,7 +441522,10 @@ async function openV2CollaborativeDocumentSession(options) {
       }
       const pendingCreate = openIntent.mode === "create" && validation.classification.classification === ROOM_CLASSIFICATION.v2Pending;
       const pendingRoomStalled = validation.classification.classification === ROOM_CLASSIFICATION.v2Pending && isPendingRoomStalled(rootConn.ydoc);
-      if (openIntent.mode === "join" || pendingCreate && !canResumePendingBootstrap(rootConn.ydoc, options.claimerId ?? DEFAULT_CLAIMER_ID, sha256Hex2(resolveBootstrapBytes(openIntent, options.buffer)))) {
+      const bootstrapSourceSha256 = openIntent.mode === "create" && pendingCreate ? sha256Hex2(resolveBootstrapBytes(openIntent, options.buffer)) : null;
+      const resumableClaim = bootstrapSourceSha256 !== null ? resumablePendingBootstrapClaim(rootConn.ydoc, bootstrapSourceSha256) : null;
+      const supersedeClaim = resumableClaim && options.profile === "browser" && options.claimerId === undefined ? { claimerId: resumableClaim.claimerId, claimedAt: resumableClaim.claimedAt } : null;
+      if (openIntent.mode === "join" || pendingCreate && resumableClaim?.claimerId !== bootstrapClaimerId && !supersedeClaim) {
         const isPending = validation.classification.classification === ROOM_CLASSIFICATION.v2Pending;
         throw new CollabV2DiagnosticError(isPending ? pendingRoomStalled ? COLLAB_V2_DIAGNOSTICS.COLLAB_V2_ROOM_BOOTSTRAP_STALLED : COLLAB_V2_DIAGNOSTICS.COLLAB_V2_ROOM_INITIALIZING : COLLAB_V2_DIAGNOSTICS.COLLAB_V2_ROOM_NOT_FOUND, isPending ? pendingRoomStalled ? "v2 collaboration room bootstrap appears stalled; this open did not modify the room" : "v2 collaboration room bootstrap is incomplete; open will not write into a pending room" : "no committed v2 collaboration room exists for join intent", redactForDiagnostics({
           classification: validation.classification.classification,
@@ -441492,17 +441534,22 @@ async function openV2CollaborativeDocumentSession(options) {
         }));
       }
       if (openIntent.mode === "create") {
-        stopBootstrapHeartbeat = startBootstrapHeartbeat(rootConn.ydoc, options.claimerId ?? DEFAULT_CLAIMER_ID, () => rootConn.state);
+        stopBootstrapHeartbeat = startBootstrapHeartbeat(rootConn.ydoc, bootstrapClaimerId, () => rootConn.state);
       }
       const bootstrapBytes = resolveBootstrapBytes(openIntent, options.buffer);
       bootstrap = await options.runtime.bootstrapFromDocx({
         docxBytes: bootstrapBytes,
         filename: options.filename ?? null,
-        claimerId: options.claimerId ?? DEFAULT_CLAIMER_ID,
+        claimerId: bootstrapClaimerId,
+        ...supersedeClaim ? { supersedeClaim } : {},
         ...options.createdBy ? { createdBy: options.createdBy } : {},
         ...options.createdAt ? { createdAt: options.createdAt } : {},
         ...options.migration ? { migration: options.migration } : {}
       });
+      if (bootstrap.bootstrap.diagnostics.some((diagnostic2) => diagnostic2.code === COLLAB_V2_DIAGNOSTICS.COLLAB_V2_BOOTSTRAP_CLAIM_LOST)) {
+        const roomCommitted = readRoomManifest(rootConn.ydoc).snapshot?.meta.bootstrapState === "committed";
+        throw new CollabV2DiagnosticError(roomCommitted ? COLLAB_V2_DIAGNOSTICS.COLLAB_V2_ROOM_ALREADY_EXISTS : COLLAB_V2_DIAGNOSTICS.COLLAB_V2_ROOM_INITIALIZING, roomCommitted ? "create intent targeted an already-committed v2 collaboration room" : "another creator is initializing this v2 collaboration room", { rootId: options.runtime.rootId });
+      }
       trace.mark("bootstrap");
       validation = options.runtime.validateLateJoin({
         compatibility: { supports: COLLAB_V2_ROOM_SCHEMA_VERSION },
@@ -441510,7 +441557,7 @@ async function openV2CollaborativeDocumentSession(options) {
       });
       trace.mark("post-bootstrap-validation");
     }
-    const expectedClaimerId = options.claimerId ?? DEFAULT_CLAIMER_ID;
+    const expectedClaimerId = bootstrapClaimerId;
     const ownsPreparedBootstrap = bootstrap?.bootstrap.prepared === true && bootstrap.bootstrap.survivorClaimerId === expectedClaimerId;
     if (!validation.ok && !ownsPreparedBootstrap) {
       throwLateJoinValidationFailure(validation, options.runtime.rootId);
@@ -441551,6 +441598,13 @@ async function openV2CollaborativeDocumentSession(options) {
       trace,
       retainImportedStorySources: options.retainImportedStorySources
     });
+    const assertCurrentRoomScopes = () => {
+      for (const handle of [...canonical.storyHandles.values(), ...canonical.projectionHandles.values()]) {
+        if (handle.scope && getUnitScope(rootConn.ydoc, handle.shardId) !== handle.scope) {
+          throw new CollabV2DiagnosticError(COLLAB_V2_DIAGNOSTICS.COLLAB_V2_ROOM_INITIALIZING, "room content changed during this open; check the committed room and reopen with join", { rootId: options.runtime.rootId });
+        }
+      }
+    };
     if (bootstrap?.bootstrap.prepared === true) {
       const finalized = finalizeV2RoomBootstrap({
         rootDoc: rootConn.ydoc,
@@ -441558,6 +441612,9 @@ async function openV2CollaborativeDocumentSession(options) {
         contentUnitIds: Array.from(canonical.contentUnitIds)
       });
       if (!finalized.committed) {
+        if (finalized.diagnostics.some((diagnostic2) => diagnostic2.code === COLLAB_V2_DIAGNOSTICS.COLLAB_V2_BOOTSTRAP_CLAIM_LOST)) {
+          throw new CollabV2DiagnosticError(COLLAB_V2_DIAGNOSTICS.COLLAB_V2_ROOM_INITIALIZING, "another creator is initializing this v2 collaboration room", { rootId: options.runtime.rootId });
+        }
         throw new CollabV2DiagnosticError(COLLAB_V2_DIAGNOSTICS.COLLAB_V2_ROOM_MANIFEST_CORRUPT, "single-doc collaboration bootstrap could not prove complete content before commit", redactForDiagnostics({
           rootId: options.runtime.rootId,
           diagnostics: finalized.diagnostics
@@ -441593,7 +441650,7 @@ async function openV2CollaborativeDocumentSession(options) {
       session,
       rootDoc: rootConn.ydoc,
       beforeBarrier() {
-        return coordinator?.waitForManifestSettled();
+        return coordinator?.waitForManifestSettled().then(assertCurrentRoomScopes);
       },
       packageMutationSync(prepared) {
         coordinator?.syncPreparedPackageMutation(prepared);
@@ -441663,6 +441720,7 @@ async function openV2CollaborativeDocumentSession(options) {
         await waitForProjectionDocsSettling(rootConn.ydoc, canonical, settleMaxMs);
         trace.mark("post-attach-settle");
       }
+      assertCurrentRoomScopes();
       const refreshed = collab.refresh();
       trace.mark("initial-refresh");
       trace.sessionSnapshot("after-initial-refresh", session);
@@ -441742,7 +441800,7 @@ async function openV2CollaborativeDocumentSession(options) {
     try {
       coordinator?.dispose();
     } catch {}
-    if (bootstrap?.bootstrap.prepared === true)
+    if (bootstrap?.bootstrap.prepared === true && bootstrap.bootstrap.survivorClaimerId === bootstrapClaimerId && readRoomManifest(rootConn.ydoc).snapshot?.meta.bootstrapState === "pending" && readBootstrapClaims(rootConn.ydoc).filter((claim) => claim.status === "pending").every((claim) => claim.claimerId === bootstrapClaimerId))
       abortBootstrapState(rootConn.ydoc);
     setLocalSelectionStoryHandles(options.runtime, null);
     await session?.dispose().catch(() => {
@@ -441848,24 +441906,35 @@ async function applyPreparedRoomReplacement(input) {
 function createReplacementOperationId(rootDoc) {
   return `${rootDoc.clientID.toString(36)}-${Date.now().toString(36)}-${(replacementSequence++).toString(36)}`;
 }
-function canResumePendingBootstrap(rootDoc, claimerId, sourceSha256) {
+function resumablePendingBootstrapClaim(rootDoc, sourceSha256) {
   const activeClaims = readBootstrapClaims(rootDoc).filter((claim) => claim.status === "pending");
-  if (activeClaims.length !== 1 || activeClaims[0]?.claimerId !== claimerId || activeClaims[0].sha256Zip !== sourceSha256) {
-    return false;
+  if (activeClaims.length !== 1 || activeClaims[0]?.sha256Zip !== sourceSha256) {
+    return null;
   }
   if (!isBootstrapLeaseExpired(rootDoc, activeClaims[0]))
-    return false;
+    return null;
   const content3 = rootDoc.getMap(ROOT_MAP.content);
   for (const [shardId, scope] of content3.entries()) {
     if (!(scope instanceof YMap))
-      return false;
-    if (scope.size === 0)
+      return null;
+    if (scope.size === 0 || isUntouchedPackagePartScope(scope))
       continue;
     const meta3 = scope.get("meta");
     if (!(meta3 instanceof YMap) || meta3.get("shardId") !== shardId || meta3.get(CONTENT_UNIT_META_KEY.seedComplete) !== true)
+      return null;
+  }
+  return activeClaims[0];
+}
+function isUntouchedPackagePartScope(scope) {
+  if (scope.size !== 5)
+    return false;
+  for (const key2 of [PACKAGE_PART_ROOT.meta, PACKAGE_PART_ROOT.records, PACKAGE_PART_ROOT.index, PACKAGE_PART_ROOT.opaque]) {
+    const child = scope.get(key2);
+    if (!(child instanceof YMap) || child.size !== 0)
       return false;
   }
-  return true;
+  const diagnostics = scope.get(PACKAGE_PART_ROOT.diagnostics);
+  return diagnostics instanceof YArray && diagnostics.length === 0;
 }
 function isPendingRoomStalled(rootDoc) {
   const claims = readBootstrapClaims(rootDoc).filter((claim) => claim.status === "pending");
@@ -442865,7 +442934,7 @@ function formatLateJoinValidationFailure(validation) {
   const diagnostics = validation.diagnostics.length > 0 ? validation.diagnostics.map((diagnostic2) => `${diagnostic2.code}: ${diagnostic2.message}`).join("; ") : "no diagnostics reported";
   return `v2 collaboration late-join validation failed (${validation.classification.classification}, ${readiness}): ${diagnostics}`;
 }
-var TEXT_DECODER11, DEFAULT_CLAIMER_ID = "headless-open", REPLACEMENT_REQUEST_KEY_PREFIX = "replaceFile:", REPLACEMENT_HEARTBEAT_INTERVAL_MS = 5000, REPLACEMENT_LEASE_TIMEOUT_MS = 30000, BOOTSTRAP_HEARTBEAT_INTERVAL_MS = 5000, BOOTSTRAP_LEASE_TIMEOUT_MS = 30000, BOOTSTRAP_LEASE_KEY_PREFIX = "bootstrapSeed:", SETTINGS_PART_URI7 = "/word/settings.xml", WEB_SETTINGS_PART_URI2 = "/word/webSettings.xml", COMMENTS_PART_URI6 = "/word/comments.xml", COMMENTS_EXTENDED_PART_URI6 = "/word/commentsExtended.xml", COMMENTS_IDS_PART_URI6 = "/word/commentsIds.xml", PEOPLE_PART_URI2 = "/word/people.xml", MEDIA_OWNER_URI2 = "/word/media", INLINE_BINARY_FAMILIES, OPAQUE_PART_FAMILIES, DEFAULT_OPEN_INTENT, POST_SYNC_SETTLE_MAX_MS = 1000, POST_SYNC_QUIET_WINDOW_MS = 20, replacementSequence = 0, replacementHeartbeatObservations;
+var TEXT_DECODER11, REPLACEMENT_REQUEST_KEY_PREFIX = "replaceFile:", REPLACEMENT_HEARTBEAT_INTERVAL_MS = 5000, REPLACEMENT_LEASE_TIMEOUT_MS = 30000, BOOTSTRAP_HEARTBEAT_INTERVAL_MS = 5000, BOOTSTRAP_LEASE_TIMEOUT_MS = 30000, BOOTSTRAP_LEASE_KEY_PREFIX = "bootstrapSeed:", SETTINGS_PART_URI7 = "/word/settings.xml", WEB_SETTINGS_PART_URI2 = "/word/webSettings.xml", COMMENTS_PART_URI6 = "/word/comments.xml", COMMENTS_EXTENDED_PART_URI6 = "/word/commentsExtended.xml", COMMENTS_IDS_PART_URI6 = "/word/commentsIds.xml", PEOPLE_PART_URI2 = "/word/people.xml", MEDIA_OWNER_URI2 = "/word/media", INLINE_BINARY_FAMILIES, OPAQUE_PART_FAMILIES, DEFAULT_OPEN_INTENT, POST_SYNC_SETTLE_MAX_MS = 1000, POST_SYNC_QUIET_WINDOW_MS = 20, replacementSequence = 0, replacementHeartbeatObservations;
 var init_collaboration_v2_open = __esm(() => {
   init_dist9();
   init_setup();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc/mcp",
-  "version": "1.3.0-next.6",
+  "version": "1.3.0-next.7",
   "description": "Model Context Protocol server for SuperDoc, giving an AI agent tools to read and edit .docx files.",
   "type": "module",
   "license": "AGPL-3.0",
@@ -24,13 +24,13 @@
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.26.0",
-    "@superdoc/sdk": "2.16.0-next.6",
+    "@superdoc/sdk": "2.16.0-next.7",
     "debug": "^4.4.3",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "superdoc": "2.19.0-next.5",
-    "@superdoc/docx-engine": "0.18.0-next.5",
+    "superdoc": "2.19.0-next.6",
+    "@superdoc/docx-engine": "0.18.0-next.6",
     "@superdoc/document-api": "0.1.0-alpha.0",
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",