@powerhousedao/reactor 6.0.0-dev.4 → 6.0.0-dev.41

package/dist/src/executor/simple-job-executor.js

@@ -1,10 +1,11 @@
-import { deriveOperationId, isUndoRedo } from "document-model/core";
-import { driveCollectionId } from "../cache/operation-index-types.js";
-import { OperationEventTypes, } from "../events/types.js";
-import { DocumentDeletedError, InvalidSignatureError, } from "../shared/errors.js";
+import { isUndoRedo } from "document-model/core";
+import { ReactorEventTypes } from "../events/types.js";
+import { DocumentDeletedError } from "../shared/errors.js";
 import { reshuffleByTimestamp } from "../utils/reshuffle.js";
-import { applyDeleteDocumentAction, applyUpgradeDocumentAction, createDocumentFromAction, getNextIndexForScope, } from "./util.js";
-const MAX_SKIP_THRESHOLD = 100;
+import { DocumentActionHandler } from "./document-action-handler.js";
+import { SignatureVerifier } from "./signature-verifier.js";
+import { buildErrorResult } from "./util.js";
+const MAX_SKIP_THRESHOLD = 1000;
 const documentScopeActions = [
     "CREATE_DOCUMENT",
     "DELETE_DOCUMENT",
@@ -14,42 +15,37 @@ const documentScopeActions = [
 ];
 /**
  * Simple job executor that processes a job by applying actions through document model reducers.
- *
- * @see docs/planning/Storage/IOperationStore.md for storage schema
- * @see docs/planning/Operations/index.md for operation structure
- * @see docs/planning/Jobs/reshuffle.md for skip mechanism details
  */
 export class SimpleJobExecutor {
     logger;
     registry;
-    documentStorage;
-    operationStorage;
     operationStore;
     eventBus;
     writeCache;
     operationIndex;
     documentMetaCache;
-    signatureVerifier;
+    collectionMembershipCache;
     config;
-    constructor(logger, registry, documentStorage, operationStorage, operationStore, eventBus, writeCache, operationIndex, documentMetaCache, config, signatureVerifier) {
+    signatureVerifierModule;
+    documentActionHandler;
+    constructor(logger, registry, operationStore, eventBus, writeCache, operationIndex, documentMetaCache, collectionMembershipCache, config, signatureVerifier) {
         this.logger = logger;
         this.registry = registry;
-        this.documentStorage = documentStorage;
-        this.operationStorage = operationStorage;
         this.operationStore = operationStore;
         this.eventBus = eventBus;
         this.writeCache = writeCache;
         this.operationIndex = operationIndex;
         this.documentMetaCache = documentMetaCache;
-        this.signatureVerifier = signatureVerifier;
+        this.collectionMembershipCache = collectionMembershipCache;
         this.config = {
             maxSkipThreshold: config.maxSkipThreshold ?? MAX_SKIP_THRESHOLD,
             maxConcurrency: config.maxConcurrency ?? 1,
             jobTimeoutMs: config.jobTimeoutMs ?? 30000,
             retryBaseDelayMs: config.retryBaseDelayMs ?? 100,
             retryMaxDelayMs: config.retryMaxDelayMs ?? 5000,
-            legacyStorageEnabled: config.legacyStorageEnabled ?? true,
         };
+        this.signatureVerifierModule = new SignatureVerifier(signatureVerifier);
+        this.documentActionHandler = new DocumentActionHandler(writeCache, operationStore, documentMetaCache, collectionMembershipCache, registry, logger);
     }
     /**
      * Execute a single job by applying all its actions through the appropriate reducers.
@@ -66,13 +62,15 @@ export class SimpleJobExecutor {
                     result.operationsWithContext[i].context.ordinal = ordinals[i];
                 }
                 if (result.operationsWithContext.length > 0) {
+                    const collectionMemberships = await this.getCollectionMembershipsForOperations(result.operationsWithContext);
                     const event = {
                         jobId: job.id,
                         operations: result.operationsWithContext,
                         jobMeta: job.meta,
+                        collectionMemberships,
                     };
                     this.eventBus
-                        .emit(OperationEventTypes.OPERATION_WRITTEN, event)
+                        .emit(ReactorEventTypes.JOB_WRITE_READY, event)
                         .catch(() => {
                         // TODO: Log error
                     });
@@ -94,14 +92,14 @@ export class SimpleJobExecutor {
             for (let i = 0; i < result.operationsWithContext.length; i++) {
                 result.operationsWithContext[i].context.ordinal = ordinals[i];
             }
+            const collectionMemberships = await this.getCollectionMembershipsForOperations(result.operationsWithContext);
             const event = {
                 jobId: job.id,
                 operations: result.operationsWithContext,
                 jobMeta: job.meta,
+                collectionMemberships,
             };
-            this.eventBus
-                .emit(OperationEventTypes.OPERATION_WRITTEN, event)
-                .catch(() => {
+            this.eventBus.emit(ReactorEventTypes.JOB_WRITE_READY, event).catch(() => {
                 // TODO: Log error
             });
         }
@@ -113,11 +111,17 @@ export class SimpleJobExecutor {
             duration: Date.now() - startTime,
         };
     }
+    async getCollectionMembershipsForOperations(operations) {
+        const documentIds = [
+            ...new Set(operations.map((op) => op.context.documentId)),
+        ];
+        return this.collectionMembershipCache.getCollectionsForDocuments(documentIds);
+    }
     async processActions(job, actions, startTime, indexTxn, skipValues, sourceOperations) {
         const generatedOperations = [];
         const operationsWithContext = [];
         try {
-            await this.verifyActionSignatures(job, actions);
+            await this.signatureVerifierModule.verifyActions(job.documentId, job.branch, actions);
         }
         catch (error) {
             return {
@@ -133,7 +137,7 @@ export class SimpleJobExecutor {
             const sourceOperation = sourceOperations?.[actionIndex];
             const isDocumentAction = documentScopeActions.includes(action.type);
             const result = isDocumentAction
-                ? await this.executeDocumentAction(job, action, startTime, indexTxn, skip)
+                ? await this.documentActionHandler.execute(job, action, startTime, indexTxn, skip)
                 : await this.executeRegularAction(job, action, startTime, indexTxn, skip, sourceOperation);
             const error = this.accumulateResultOrReturnError(result, generatedOperations, operationsWithContext);
             if (error !== null) {
@@ -151,414 +155,31 @@ export class SimpleJobExecutor {
             operationsWithContext,
         };
     }
-    /**
-     * Execute a document scope action (CREATE_DOCUMENT, DELETE_DOCUMENT, UPGRADE_DOCUMENT,
-     * ADD_RELATIONSHIP, REMOVE_RELATIONSHIP) by dispatching to the appropriate handler.
-     */
-    async executeDocumentAction(job, action, startTime, indexTxn, skip = 0) {
-        switch (action.type) {
-            case "CREATE_DOCUMENT":
-                return this.executeCreateDocumentAction(job, action, startTime, indexTxn, skip);
-            case "DELETE_DOCUMENT":
-                return this.executeDeleteDocumentAction(job, action, startTime, indexTxn);
-            case "UPGRADE_DOCUMENT":
-                return this.executeUpgradeDocumentAction(job, action, startTime, indexTxn, skip);
-            case "ADD_RELATIONSHIP":
-                return this.executeAddRelationshipAction(job, action, startTime, indexTxn);
-            case "REMOVE_RELATIONSHIP":
-                return this.executeRemoveRelationshipAction(job, action, startTime, indexTxn);
-            default:
-                return this.buildErrorResult(job, new Error(`Unknown document action type: ${action.type}`), startTime);
-        }
-    }
-    /**
-     * Execute a CREATE_DOCUMENT system action.
-     * This creates a new document in storage along with its initial operation.
-     * For a new document, the operation index is always 0.
-     */
-    async executeCreateDocumentAction(job, action, startTime, indexTxn, skip = 0) {
-        if (job.scope !== "document") {
-            return {
-                job,
-                success: false,
-                error: new Error(`CREATE_DOCUMENT must be in "document" scope, got "${job.scope}"`),
-                duration: Date.now() - startTime,
-            };
-        }
-        const document = createDocumentFromAction(action);
-        // Legacy: Store the document in storage
-        if (this.config.legacyStorageEnabled) {
-            try {
-                await this.documentStorage.create(document);
-            }
-            catch (error) {
-                return this.buildErrorResult(job, new Error(`Failed to create document in storage: ${error instanceof Error ? error.message : String(error)}`), startTime);
-            }
-        }
-        const operation = this.createOperation(action, 0, skip, {
-            documentId: document.header.id,
-            scope: job.scope,
-            branch: job.branch,
-        });
-        // Legacy: Write the CREATE_DOCUMENT operation to legacy storage
-        if (this.config.legacyStorageEnabled) {
-            try {
-                await this.operationStorage.addDocumentOperations(document.header.id, [operation], document);
-            }
-            catch (error) {
-                return this.buildErrorResult(job, new Error(`Failed to write CREATE_DOCUMENT operation to legacy storage: ${error instanceof Error ? error.message : String(error)}`), startTime);
-            }
-        }
-        // Compute resultingState for passing via context (not persisted)
-        // Include header and all scopes present in the document state (auth, document, etc.)
-        // but not global/local which aren't initialized by CREATE_DOCUMENT
-        const resultingStateObj = {
-            header: document.header,
-            ...document.state,
-        };
-        const resultingState = JSON.stringify(resultingStateObj);
-        const writeError = await this.writeOperationToStore(document.header.id, document.header.documentType, job.scope, job.branch, operation, job, startTime);
-        if (writeError !== null) {
-            return writeError;
-        }
-        this.updateDocumentRevision(document, job.scope, operation.index);
-        this.writeCacheState(document.header.id, job.scope, job.branch, operation.index, document);
-        indexTxn.write([
-            {
-                ...operation,
-                documentId: document.header.id,
-                documentType: document.header.documentType,
-                branch: job.branch,
-                scope: job.scope,
-            },
-        ]);
-        // collection membership has to be _after_ the write, as it requires the
-        // ordinal of the operation to be set
-        if (document.header.documentType === "powerhouse/document-drive") {
-            const collectionId = driveCollectionId(job.branch, document.header.id);
-            indexTxn.createCollection(collectionId);
-            indexTxn.addToCollection(collectionId, document.header.id);
-        }
-        this.documentMetaCache.putDocumentMeta(document.header.id, job.branch, {
-            state: document.state.document,
-            documentType: document.header.documentType,
-            documentScopeRevision: 1,
-        });
-        return this.buildSuccessResult(job, operation, document.header.id, document.header.documentType, resultingState, startTime);
-    }
-    /**
-     * Execute a DELETE_DOCUMENT system action.
-     * This deletes a document from legacy storage and writes the operation to IOperationStore.
-     * The operation index is determined from the document's current operation count.
-     */
-    async executeDeleteDocumentAction(job, action, startTime, indexTxn) {
-        const input = action.input;
-        if (!input.documentId) {
-            return this.buildErrorResult(job, new Error("DELETE_DOCUMENT action requires a documentId in input"), startTime);
-        }
-        const documentId = input.documentId;
-        let document;
-        try {
-            document = await this.writeCache.getState(documentId, job.scope, job.branch);
-        }
-        catch (error) {
-            return this.buildErrorResult(job, new Error(`Failed to fetch document before deletion: ${error instanceof Error ? error.message : String(error)}`), startTime);
-        }
-        // Check if document is already deleted
-        const documentState = document.state.document;
-        if (documentState.isDeleted) {
-            return this.buildErrorResult(job, new DocumentDeletedError(documentId, documentState.deletedAtUtcIso), startTime);
-        }
-        const nextIndex = getNextIndexForScope(document, job.scope);
-        const operation = this.createOperation(action, nextIndex, 0, {
-            documentId,
-            scope: job.scope,
-            branch: job.branch,
-        });
-        if (this.config.legacyStorageEnabled) {
-            try {
-                await this.documentStorage.delete(documentId);
-            }
-            catch (error) {
-                return this.buildErrorResult(job, new Error(`Failed to delete document from legacy storage: ${error instanceof Error ? error.message : String(error)}`), startTime);
-            }
-        }
-        // Mark the document as deleted in the state for read model indexing
-        applyDeleteDocumentAction(document, action);
-        // Compute resultingState for passing via context (not persisted)
-        // DELETE_DOCUMENT only affects header and document scopes
-        const resultingStateObj = {
-            header: document.header,
-            document: document.state.document,
-        };
-        const resultingState = JSON.stringify(resultingStateObj);
-        const writeError = await this.writeOperationToStore(documentId, document.header.documentType, job.scope, job.branch, operation, job, startTime);
-        if (writeError !== null) {
-            return writeError;
-        }
-        indexTxn.write([
-            {
-                ...operation,
-                documentId: documentId,
-                documentType: document.header.documentType,
-                branch: job.branch,
-                scope: job.scope,
-            },
-        ]);
-        this.documentMetaCache.putDocumentMeta(documentId, job.branch, {
-            state: document.state.document,
-            documentType: document.header.documentType,
-            documentScopeRevision: operation.index + 1,
-        });
-        return this.buildSuccessResult(job, operation, documentId, document.header.documentType, resultingState, startTime);
-    }
-    /**
-     * Execute an UPGRADE_DOCUMENT system action.
-     * Handles initial upgrades (version 0 to N), same-version no-ops, and multi-step upgrade chains.
-     * The operation index is determined from the document's current operation count.
-     */
-    async executeUpgradeDocumentAction(job, action, startTime, indexTxn, skip = 0) {
-        const input = action.input;
-        if (!input.documentId) {
-            return this.buildErrorResult(job, new Error("UPGRADE_DOCUMENT action requires a documentId in input"), startTime);
-        }
-        const documentId = input.documentId;
-        const fromVersion = input.fromVersion;
-        const toVersion = input.toVersion;
-        let document;
-        try {
-            document = await this.writeCache.getState(documentId, job.scope, job.branch);
-        }
-        catch (error) {
-            return this.buildErrorResult(job, new Error(`Failed to fetch document for upgrade: ${error instanceof Error ? error.message : String(error)}`), startTime);
-        }
-        const documentState = document.state.document;
-        if (documentState.isDeleted) {
-            return this.buildErrorResult(job, new DocumentDeletedError(documentId, documentState.deletedAtUtcIso), startTime);
-        }
-        const nextIndex = getNextIndexForScope(document, job.scope);
-        let upgradePath;
-        if (fromVersion > 0 && fromVersion < toVersion) {
-            try {
-                upgradePath = this.registry.computeUpgradePath(document.header.documentType, fromVersion, toVersion);
-            }
-            catch (error) {
-                return this.buildErrorResult(job, error instanceof Error ? error : new Error(String(error)), startTime);
-            }
-        }
-        if (fromVersion === toVersion && fromVersion > 0) {
-            return {
-                job,
-                success: true,
-                operations: [],
-                operationsWithContext: [],
-                duration: Date.now() - startTime,
-            };
-        }
-        try {
-            document = applyUpgradeDocumentAction(document, action, upgradePath);
-        }
-        catch (error) {
-            return this.buildErrorResult(job, error instanceof Error ? error : new Error(String(error)), startTime);
-        }
-        const operation = this.createOperation(action, nextIndex, skip, {
-            documentId,
-            scope: job.scope,
-            branch: job.branch,
-        });
-        // Write the updated document to legacy storage
-        if (this.config.legacyStorageEnabled) {
-            try {
-                await this.operationStorage.addDocumentOperations(documentId, [operation], document);
-            }
-            catch (error) {
-                return this.buildErrorResult(job, new Error(`Failed to write UPGRADE_DOCUMENT operation to legacy storage: ${error instanceof Error ? error.message : String(error)}`), startTime);
-            }
-        }
-        // Compute resultingState for passing via context (not persisted)
-        const resultingStateObj = {
-            header: document.header,
-            ...document.state,
-        };
-        const resultingState = JSON.stringify(resultingStateObj);
-        const writeError = await this.writeOperationToStore(documentId, document.header.documentType, job.scope, job.branch, operation, job, startTime);
-        if (writeError !== null) {
-            return writeError;
-        }
-        this.updateDocumentRevision(document, job.scope, operation.index);
-        this.writeCacheState(documentId, job.scope, job.branch, operation.index, document);
-        indexTxn.write([
-            {
-                ...operation,
-                documentId: documentId,
-                documentType: document.header.documentType,
-                branch: job.branch,
-                scope: job.scope,
-            },
-        ]);
-        this.documentMetaCache.putDocumentMeta(documentId, job.branch, {
-            state: document.state.document,
-            documentType: document.header.documentType,
-            documentScopeRevision: operation.index + 1,
-        });
-        return this.buildSuccessResult(job, operation, documentId, document.header.documentType, resultingState, startTime);
-    }
-    async executeAddRelationshipAction(job, action, startTime, indexTxn) {
-        if (job.scope !== "document") {
-            return this.buildErrorResult(job, new Error(`ADD_RELATIONSHIP must be in "document" scope, got "${job.scope}"`), startTime);
-        }
-        const input = action.input;
-        if (!input.sourceId || !input.targetId || !input.relationshipType) {
-            return this.buildErrorResult(job, new Error("ADD_RELATIONSHIP action requires sourceId, targetId, and relationshipType in input"), startTime);
-        }
-        if (input.sourceId === input.targetId) {
-            return this.buildErrorResult(job, new Error("ADD_RELATIONSHIP: sourceId and targetId cannot be the same (self-relationships not allowed)"), startTime);
-        }
-        let sourceDoc;
-        try {
-            sourceDoc = await this.writeCache.getState(input.sourceId, "document", job.branch);
-        }
-        catch (error) {
-            return this.buildErrorResult(job, new Error(`ADD_RELATIONSHIP: source document ${input.sourceId} not found: ${error instanceof Error ? error.message : String(error)}`), startTime);
-        }
-        const nextIndex = getNextIndexForScope(sourceDoc, job.scope);
-        const operation = this.createOperation(action, nextIndex, 0, {
-            documentId: input.sourceId,
-            scope: job.scope,
-            branch: job.branch,
-        });
-        const writeError = await this.writeOperationToStore(input.sourceId, sourceDoc.header.documentType, job.scope, job.branch, operation, job, startTime);
-        if (writeError !== null) {
-            return writeError;
-        }
-        sourceDoc.header.lastModifiedAtUtcIso =
-            operation.timestampUtcMs || new Date().toISOString();
-        this.updateDocumentRevision(sourceDoc, job.scope, operation.index);
-        sourceDoc.operations = {
-            ...sourceDoc.operations,
-            [job.scope]: [...(sourceDoc.operations[job.scope] ?? []), operation],
-        };
-        const scopeState = sourceDoc.state[job.scope];
-        const resultingStateObj = {
-            header: structuredClone(sourceDoc.header),
-            [job.scope]: scopeState === undefined ? {} : structuredClone(scopeState),
-        };
-        const resultingState = JSON.stringify(resultingStateObj);
-        this.writeCacheState(input.sourceId, job.scope, job.branch, operation.index, sourceDoc);
-        indexTxn.write([
-            {
-                ...operation,
-                documentId: input.sourceId,
-                documentType: sourceDoc.header.documentType,
-                branch: job.branch,
-                scope: job.scope,
-            },
-        ]);
-        // collection membership has to be _after_ the write, as it requires the
-        // ordinal of the operation to be set
-        if (sourceDoc.header.documentType === "powerhouse/document-drive") {
-            const collectionId = driveCollectionId(job.branch, input.sourceId);
-            indexTxn.addToCollection(collectionId, input.targetId);
-        }
-        this.documentMetaCache.putDocumentMeta(input.sourceId, job.branch, {
-            state: sourceDoc.state.document,
-            documentType: sourceDoc.header.documentType,
-            documentScopeRevision: operation.index + 1,
-        });
-        return this.buildSuccessResult(job, operation, input.sourceId, sourceDoc.header.documentType, resultingState, startTime);
-    }
-    async executeRemoveRelationshipAction(job, action, startTime, indexTxn) {
-        if (job.scope !== "document") {
-            return this.buildErrorResult(job, new Error(`REMOVE_RELATIONSHIP must be in "document" scope, got "${job.scope}"`), startTime);
-        }
-        const input = action.input;
-        if (!input.sourceId || !input.targetId || !input.relationshipType) {
-            return this.buildErrorResult(job, new Error("REMOVE_RELATIONSHIP action requires sourceId, targetId, and relationshipType in input"), startTime);
-        }
-        let sourceDoc;
-        try {
-            sourceDoc = await this.writeCache.getState(input.sourceId, "document", job.branch);
-        }
-        catch (error) {
-            return this.buildErrorResult(job, new Error(`REMOVE_RELATIONSHIP: source document ${input.sourceId} not found: ${error instanceof Error ? error.message : String(error)}`), startTime);
-        }
-        const nextIndex = getNextIndexForScope(sourceDoc, job.scope);
-        const operation = this.createOperation(action, nextIndex, 0, {
-            documentId: input.sourceId,
-            scope: job.scope,
-            branch: job.branch,
-        });
-        const writeError = await this.writeOperationToStore(input.sourceId, sourceDoc.header.documentType, job.scope, job.branch, operation, job, startTime);
-        if (writeError !== null) {
-            return writeError;
-        }
-        sourceDoc.header.lastModifiedAtUtcIso =
-            operation.timestampUtcMs || new Date().toISOString();
-        this.updateDocumentRevision(sourceDoc, job.scope, operation.index);
-        sourceDoc.operations = {
-            ...sourceDoc.operations,
-            [job.scope]: [...(sourceDoc.operations[job.scope] ?? []), operation],
-        };
-        const scopeState = sourceDoc.state[job.scope];
-        const resultingStateObj = {
-            header: structuredClone(sourceDoc.header),
-            [job.scope]: scopeState === undefined ? {} : structuredClone(scopeState),
-        };
-        const resultingState = JSON.stringify(resultingStateObj);
-        this.writeCacheState(input.sourceId, job.scope, job.branch, operation.index, sourceDoc);
-        indexTxn.write([
-            {
-                ...operation,
-                documentId: input.sourceId,
-                documentType: sourceDoc.header.documentType,
-                branch: job.branch,
-                scope: job.scope,
-            },
-        ]);
-        // collection membership has to be _after_ the write, as it requires the
-        // ordinal of the operation to be set
-        if (sourceDoc.header.documentType === "powerhouse/document-drive") {
-            const collectionId = driveCollectionId(job.branch, input.sourceId);
-            indexTxn.removeFromCollection(collectionId, input.targetId);
-        }
-        this.documentMetaCache.putDocumentMeta(input.sourceId, job.branch, {
-            state: sourceDoc.state.document,
-            documentType: sourceDoc.header.documentType,
-            documentScopeRevision: operation.index + 1,
-        });
-        return this.buildSuccessResult(job, operation, input.sourceId, sourceDoc.header.documentType, resultingState, startTime);
-    }
-    /**
-     * Execute a regular document action by applying it through the document model reducer.
-     * If sourceOperation is provided (for load jobs), its id and timestamp are preserved.
-     */
     async executeRegularAction(job, action, startTime, indexTxn, skip = 0, sourceOperation) {
         let docMeta;
         try {
             docMeta = await this.documentMetaCache.getDocumentMeta(job.documentId, job.branch);
         }
         catch (error) {
-            return this.buildErrorResult(job, error instanceof Error ? error : new Error(String(error)), startTime);
+            return buildErrorResult(job, error instanceof Error ? error : new Error(String(error)), startTime);
         }
         if (docMeta.state.isDeleted) {
-            return this.buildErrorResult(job, new DocumentDeletedError(job.documentId, docMeta.state.deletedAtUtcIso), startTime);
+            return buildErrorResult(job, new DocumentDeletedError(job.documentId, docMeta.state.deletedAtUtcIso), startTime);
         }
         let document;
         try {
             document = await this.writeCache.getState(job.documentId, job.scope, job.branch);
         }
         catch (error) {
-            return this.buildErrorResult(job, error instanceof Error ? error : new Error(String(error)), startTime);
+            return buildErrorResult(job, error instanceof Error ? error : new Error(String(error)), startTime);
         }
         let module;
         try {
-            // Use document version to get the correct module
-            // Version 0 means not yet upgraded - use latest version
             const moduleVersion = docMeta.state.version === 0 ? undefined : docMeta.state.version;
             module = this.registry.getModule(document.header.documentType, moduleVersion);
         }
         catch (error) {
-            return this.buildErrorResult(job, error instanceof Error ? error : new Error(String(error)), startTime);
+            return buildErrorResult(job, error instanceof Error ? error : new Error(String(error)), startTime);
         }
         let updatedDocument;
         try {
@@ -579,32 +200,35 @@ export class SimpleJobExecutor {
             if (error instanceof Error && error.stack) {
                 enhancedError.stack = `${contextMessage}\n\nOriginal stack trace:\n${error.stack}`;
             }
-            return this.buildErrorResult(job, enhancedError, startTime);
+            return buildErrorResult(job, enhancedError, startTime);
         }
         const scope = job.scope;
         const operations = updatedDocument.operations[scope];
         if (operations.length === 0) {
-            return this.buildErrorResult(job, new Error("No operation generated from action"), startTime);
+            return buildErrorResult(job, new Error("No operation generated from action"), startTime);
         }
         const newOperation = operations[operations.length - 1];
         if (!isUndoRedo(action)) {
             newOperation.skip = skip;
         }
-        if (this.config.legacyStorageEnabled) {
-            try {
-                await this.operationStorage.addDocumentOperations(job.documentId, [newOperation], updatedDocument);
-            }
-            catch (error) {
-                return this.buildErrorResult(job, error instanceof Error ? error : new Error(String(error)), startTime);
-            }
-        }
         const resultingState = JSON.stringify({
             ...updatedDocument.state,
             header: updatedDocument.header,
         });
-        const writeFailResult = await this.writeOperationToStore(job.documentId, document.header.documentType, scope, job.branch, newOperation, job, startTime);
-        if (writeFailResult !== null) {
-            return writeFailResult;
+        try {
+            await this.operationStore.apply(job.documentId, document.header.documentType, scope, job.branch, newOperation.index, (txn) => {
+                txn.addOperations(newOperation);
+            });
+        }
+        catch (error) {
+            this.logger.error("Error writing @Operation to IOperationStore: @Error", newOperation, error);
+            this.writeCache.invalidate(job.documentId, scope, job.branch);
+            return {
+                job,
+                success: false,
+                error: new Error(`Failed to write operation to IOperationStore: ${error instanceof Error ? error.message : String(error)}`),
+                duration: Date.now() - startTime,
+            };
         }
         updatedDocument.header.revision = {
             ...updatedDocument.header.revision,
@@ -640,20 +264,9 @@ export class SimpleJobExecutor {
             duration: Date.now() - startTime,
         };
     }
-    createOperation(action, index, skip = 0, context) {
-        const id = deriveOperationId(context.documentId, context.scope, context.branch, action.id);
-        return {
-            id,
-            index: index,
-            timestampUtcMs: action.timestampUtcMs || new Date().toISOString(),
-            hash: "",
-            skip: skip,
-            action: action,
-        };
-    }
     async executeLoadJob(job, startTime, indexTxn) {
         if (job.operations.length === 0) {
-            return this.buildErrorResult(job, new Error("Load job must include at least one operation"), startTime);
+            return buildErrorResult(job, new Error("Load job must include at least one operation"), startTime);
         }
         const scope = job.scope;
         let latestRevision = 0;
@@ -675,8 +288,8 @@ export class SimpleJobExecutor {
         }
         let conflictingOps = [];
         try {
-            const conflictingResult = await this.operationStore.getConflicting(job.documentId, scope, job.branch, minIncomingTimestamp, { limit: this.config.maxSkipThreshold + 1 });
-            if (conflictingResult.hasMore) {
+            const conflictingResult = await this.operationStore.getConflicting(job.documentId, scope, job.branch, minIncomingTimestamp, { cursor: "0", limit: this.config.maxSkipThreshold + 1 });
+            if (conflictingResult.nextCursor !== undefined) {
                 return {
                     job,
                     success: false,
@@ -685,16 +298,24 @@ export class SimpleJobExecutor {
                     duration: Date.now() - startTime,
                 };
             }
-            conflictingOps = conflictingResult.items;
+            conflictingOps = conflictingResult.results;
         }
         catch {
             conflictingOps = [];
         }
-        // Filter out operations that have been superseded by later operations with skip values.
-        // An operation at index N is superseded if there exists an operation at index M > N
-        // where (M - skip_M) <= N, meaning the later operation's logical index covers N.
+        let allOpsFromMinConflictingIndex = conflictingOps;
+        if (conflictingOps.length > 0) {
+            const minConflictingIndex = Math.min(...conflictingOps.map((op) => op.index));
+            try {
+                const allOpsResult = await this.operationStore.getSince(job.documentId, scope, job.branch, minConflictingIndex - 1, undefined, { cursor: "0", limit: this.config.maxSkipThreshold * 2 });
+                allOpsFromMinConflictingIndex = allOpsResult.results;
+            }
+            catch {
+                allOpsFromMinConflictingIndex = conflictingOps;
+            }
+        }
         const nonSupersededOps = conflictingOps.filter((op) => {
-            for (const laterOp of conflictingOps) {
+            for (const laterOp of allOpsFromMinConflictingIndex) {
                 if (laterOp.index > op.index && laterOp.skip > 0) {
                     const logicalIndex = laterOp.index - laterOp.skip;
                     if (logicalIndex <= op.index) {
@@ -704,9 +325,7 @@ export class SimpleJobExecutor {
             }
             return true;
         });
-        // All non-superseded conflicting operations need to be reshuffled
         const existingOpsToReshuffle = nonSupersededOps;
-        // Skip count is the number of existing operations that need to be rewound
         const skipCount = existingOpsToReshuffle.length;
         if (skipCount > this.config.maxSkipThreshold) {
             return {
@@ -717,8 +336,6 @@ export class SimpleJobExecutor {
                 duration: Date.now() - startTime,
             };
         }
-        // Filter out incoming operations that are duplicates (action already exists locally
-        // or appears multiple times in incoming)
         const existingActionIds = new Set(nonSupersededOps.map((op) => op.action.id));
         const seenIncomingActionIds = new Set();
         const incomingOpsToApply = job.operations.filter((op) => {
@@ -736,7 +353,6 @@ export class SimpleJobExecutor {
             ...operation,
             id: operation.id,
         })));
-        // For v2, all NOOPs have skip=1 - consecutive NOOPs are handled during state rebuild
         for (const operation of reshuffledOperations) {
             if (operation.action.type === "NOOP") {
                 operation.skip = 1;
@@ -765,123 +381,6 @@ export class SimpleJobExecutor {
             duration: Date.now() - startTime,
         };
     }
-    async writeOperationToStore(documentId, documentType, scope, branch, operation, job, startTime) {
-        try {
-            await this.operationStore.apply(documentId, documentType, scope, branch, operation.index, (txn) => {
-                txn.addOperations(operation);
-            });
-            return null;
-        }
-        catch (error) {
-            this.logger.error("Error writing @Operation to IOperationStore: @Error", operation, error);
-            this.writeCache.invalidate(documentId, scope, branch);
-            return {
-                job,
-                success: false,
-                error: new Error(`Failed to write operation to IOperationStore: ${error instanceof Error ? error.message : String(error)}`),
-                duration: Date.now() - startTime,
-            };
-        }
-    }
-    updateDocumentRevision(document, scope, operationIndex) {
-        document.header.revision = {
-            ...document.header.revision,
-            [scope]: operationIndex + 1,
-        };
-    }
-    writeCacheState(documentId, scope, branch, operationIndex, document) {
-        this.writeCache.putState(documentId, scope, branch, operationIndex, document);
-    }
-    buildSuccessResult(job, operation, documentId, documentType, resultingState, startTime) {
-        return {
-            job,
-            success: true,
-            operations: [operation],
-            operationsWithContext: [
-                {
-                    operation,
-                    context: {
-                        documentId: documentId,
-                        scope: job.scope,
-                        branch: job.branch,
-                        documentType: documentType,
-                        resultingState,
-                        ordinal: 0,
-                    },
-                },
-            ],
-            duration: Date.now() - startTime,
-        };
-    }
-    buildErrorResult(job, error, startTime) {
-        return {
-            job,
-            success: false,
-            error: error,
-            duration: Date.now() - startTime,
-        };
-    }
-    async verifyOperationSignatures(job, operations) {
-        if (!this.signatureVerifier) {
-            return;
-        }
-        for (let i = 0; i < operations.length; i++) {
-            const operation = operations[i];
-            const signer = operation.action.context?.signer;
-            if (!signer) {
-                continue;
-            }
-            if (signer.signatures.length === 0) {
-                throw new InvalidSignatureError(job.documentId, `Operation ${operation.id} at index ${operation.index} has signer but no signatures`);
-            }
-            const publicKey = signer.app.key;
-            let isValid = false;
-            try {
-                isValid = await this.signatureVerifier(operation, publicKey);
-            }
-            catch (error) {
-                const errorMessage = error instanceof Error ? error.message : String(error);
-                throw new InvalidSignatureError(job.documentId, `Operation ${operation.id} at index ${operation.index} verification failed: ${errorMessage}`);
-            }
-            if (!isValid) {
-                throw new InvalidSignatureError(job.documentId, `Operation ${operation.id} at index ${operation.index} signature verification returned false`);
-            }
-        }
-    }
-    async verifyActionSignatures(job, actions) {
-        if (!this.signatureVerifier) {
-            return;
-        }
-        for (const action of actions) {
-            const signer = action.context?.signer;
-            if (!signer) {
-                continue;
-            }
-            if (signer.signatures.length === 0) {
-                throw new InvalidSignatureError(job.documentId, `Action ${action.id} has signer but no signatures`);
-            }
-            const publicKey = signer.app.key;
-            let isValid = false;
-            try {
-                const tempOperation = {
-                    id: deriveOperationId(job.documentId, action.scope, job.branch, action.id),
-                    index: 0,
-                    timestampUtcMs: action.timestampUtcMs || new Date().toISOString(),
-                    hash: "",
-                    skip: 0,
-                    action: action,
-                };
-                isValid = await this.signatureVerifier(tempOperation, publicKey);
-            }
-            catch (error) {
-                const errorMessage = error instanceof Error ? error.message : String(error);
-                throw new InvalidSignatureError(job.documentId, `Action ${action.id} verification failed: ${errorMessage}`);
-            }
-            if (!isValid) {
-                throw new InvalidSignatureError(job.documentId, `Action ${action.id} signature verification returned false`);
-            }
-        }
-    }
     accumulateResultOrReturnError(result, generatedOperations, operationsWithContext) {
         if (!result.success) {
             return result;