@fluidframework/task-manager 2.60.0 → 2.61.0-355054

package/dist/taskManager.js

@@ -6,10 +6,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskManagerClass = void 0;
 const client_utils_1 = require("@fluid-internal/client-utils");
-const internal_1 = require("@fluidframework/core-utils/internal");
-const internal_2 = require("@fluidframework/driver-definitions/internal");
-const internal_3 = require("@fluidframework/driver-utils/internal");
-const internal_4 = require("@fluidframework/shared-object-base/internal");
+const internal_1 = require("@fluidframework/container-definitions/internal");
+const internal_2 = require("@fluidframework/core-utils/internal");
+const internal_3 = require("@fluidframework/driver-definitions/internal");
+const internal_4 = require("@fluidframework/driver-utils/internal");
+const internal_5 = require("@fluidframework/shared-object-base/internal");
+function assertIsTaskManagerOperation(op) {
+    (0, internal_2.assert)(typeof op === "object" &&
+        op !== null &&
+        "taskId" in op &&
+        typeof op.taskId === "string" &&
+        "type" in op &&
+        (op.type === "volunteer" || op.type === "abandon" || op.type === "complete"), "Not a TaskManager operation");
+}
 const snapshotFileName = "header";
 /**
  * Placeholder clientId for detached scenarios.
@@ -21,7 +30,7 @@ const placeholderClientId = "placeholder";
  * @sealed
  * @legacy @beta
  */
-class TaskManagerClass extends internal_4.SharedObject {
+class TaskManagerClass extends internal_5.SharedObject {
     /**
      * Returns the clientId. Will return a placeholder if the runtime is detached and not yet assigned a clientId.
      */
@@ -58,7 +67,9 @@ class TaskManagerClass extends internal_4.SharedObject {
         this.connectionWatcher = new client_utils_1.EventEmitter();
         // completedWatcher emits an event whenever the local client receives a completed op.
         this.completedWatcher = new client_utils_1.EventEmitter();
-        this.messageId = -1;
+        // rollbackWatcher emits an event whenever a pending op is rolled back.
+        this.rollbackWatcher = new client_utils_1.EventEmitter();
+        this.nextPendingMessageId = 0;
         /**
          * Tracks the most recent pending op for a given task
          */
@@ -67,60 +78,47 @@ class TaskManagerClass extends internal_4.SharedObject {
          * Tracks tasks that are this client is currently subscribed to.
          */
         this.subscribedTasks = new Set();
-        /**
-         * Map to track tasks that have pending complete ops.
-         */
-        this.pendingCompletedTasks = new Map();
         this.opWatcher.on("volunteer", (taskId, clientId, local, messageId) => {
-            // We're tracking local ops from this connection. Filter out local ops during "connecting"
-            // state since these were sent on the prior connection and were already cleared from the latestPendingOps.
-            if (runtime.connected && local) {
-                const pendingOp = this.latestPendingOps.get(taskId);
-                (0, internal_1.assert)(pendingOp !== undefined, 0x07b /* "Unexpected op" */);
-                // Need to check the id, since it's possible to volunteer and abandon multiple times before the acks
-                if (messageId === pendingOp.messageId) {
-                    (0, internal_1.assert)(pendingOp.type === "volunteer", 0x07c /* "Unexpected op type" */);
-                    // Delete the pending, because we no longer have an outstanding op
+            if (local) {
+                const latestPendingOps = this.latestPendingOps.get(taskId);
+                (0, internal_2.assert)(latestPendingOps !== undefined, "No pending ops for task");
+                const pendingOp = latestPendingOps.shift();
+                (0, internal_2.assert)(pendingOp !== undefined && pendingOp.messageId === messageId, "Unexpected op");
+                (0, internal_2.assert)(pendingOp.type === "volunteer", 0x07c /* "Unexpected op type" */);
+                if (latestPendingOps.length === 0) {
                     this.latestPendingOps.delete(taskId);
                 }
             }
             this.addClientToQueue(taskId, clientId);
         });
         this.opWatcher.on("abandon", (taskId, clientId, local, messageId) => {
-            if (runtime.connected && local) {
-                const pendingOp = this.latestPendingOps.get(taskId);
-                (0, internal_1.assert)(pendingOp !== undefined, 0x07d /* "Unexpected op" */);
-                // Need to check the id, since it's possible to abandon and volunteer multiple times before the acks
-                if (messageId === pendingOp.messageId) {
-                    (0, internal_1.assert)(pendingOp.type === "abandon", 0x07e /* "Unexpected op type" */);
-                    // Delete the pending, because we no longer have an outstanding op
+            if (local) {
+                const latestPendingOps = this.latestPendingOps.get(taskId);
+                (0, internal_2.assert)(latestPendingOps !== undefined, "No pending ops for task");
+                const pendingOp = latestPendingOps.shift();
+                (0, internal_2.assert)(pendingOp !== undefined && pendingOp.messageId === messageId, "Unexpected op");
+                (0, internal_2.assert)(pendingOp.type === "abandon", 0x07e /* "Unexpected op type" */);
+                if (latestPendingOps.length === 0) {
                     this.latestPendingOps.delete(taskId);
                 }
+                this.abandonWatcher.emit("abandon", taskId, messageId);
             }
             this.removeClientFromQueue(taskId, clientId);
         });
         this.opWatcher.on("complete", (taskId, clientId, local, messageId) => {
-            if (runtime.connected && local) {
-                const pendingOp = this.latestPendingOps.get(taskId);
-                (0, internal_1.assert)(pendingOp !== undefined, 0x400 /* Unexpected op */);
-                // Need to check the id, since it's possible to complete multiple times before the acks
-                if (messageId === pendingOp.messageId) {
-                    (0, internal_1.assert)(pendingOp.type === "complete", 0x401 /* Unexpected op type */);
-                    // Delete the pending, because we no longer have an outstanding op
+            if (local) {
+                const latestPendingOps = this.latestPendingOps.get(taskId);
+                (0, internal_2.assert)(latestPendingOps !== undefined, "No pending ops for task");
+                const pendingOp = latestPendingOps.shift();
+                (0, internal_2.assert)(pendingOp !== undefined && pendingOp.messageId === messageId, "Unexpected op");
+                (0, internal_2.assert)(pendingOp.type === "complete", 0x401 /* Unexpected op type */);
+                if (latestPendingOps.length === 0) {
                     this.latestPendingOps.delete(taskId);
                 }
-                // Remove complete op from this.pendingCompletedTasks
-                const pendingIds = this.pendingCompletedTasks.get(taskId);
-                (0, internal_1.assert)(pendingIds !== undefined && pendingIds.length > 0, 0x402 /* pendingIds is empty */);
-                const removed = pendingIds.shift();
-                (0, internal_1.assert)(removed === messageId, 0x403 /* Removed complete op id does not match */);
-            }
-            // For clients in queue, we need to remove them from the queue and raise the proper events.
-            if (!local) {
-                this.taskQueues.delete(taskId);
-                this.completedWatcher.emit("completed", taskId);
-                this.emit("completed", taskId);
             }
+            this.taskQueues.delete(taskId);
+            this.completedWatcher.emit("completed", taskId, messageId);
+            this.emit("completed", taskId);
         });
         runtime.getQuorum().on("removeMember", (clientId) => {
             this.removeClientFromAllQueues(clientId);
@@ -143,18 +141,16 @@ class TaskManagerClass extends internal_4.SharedObject {
             }
         });
         this.connectionWatcher.on("disconnect", () => {
-            (0, internal_1.assert)(this.clientId !== undefined, 0x1d3 /* "Missing client id on disconnect" */);
-            // We don't modify the taskQueues on disconnect (they still reflect the latest known consensus state).
-            // After reconnect these will get cleaned up by observing the clientLeaves.
-            // However we do need to recognize that we lost the lock if we had it.  Calls to .queued() and
-            // .assigned() are also connection-state-aware to be consistent.
+            (0, internal_2.assert)(this.clientId !== undefined, 0x1d3 /* "Missing client id on disconnect" */);
+            // Emit "lost" for any tasks we were assigned to.
             for (const [taskId, clientQueue] of this.taskQueues.entries()) {
                 if (this.isAttached() && clientQueue[0] === this.clientId) {
                     this.emit("lost", taskId);
                 }
             }
-            // All of our outstanding ops will be for the old clientId even if they get ack'd
-            this.latestPendingOps.clear();
+            // Remove this client from all queues to reflect the new state, since being disconnected automatically removes
+            // this client from all queues.
+            this.removeClientFromAllQueues(this.clientId);
         });
     }
     submitVolunteerOp(taskId) {
@@ -164,10 +160,16 @@ class TaskManagerClass extends internal_4.SharedObject {
         };
         const pendingOp = {
             type: "volunteer",
-            messageId: ++this.messageId,
+            messageId: this.nextPendingMessageId++,
         };
         this.submitLocalMessage(op, pendingOp.messageId);
-        this.latestPendingOps.set(taskId, pendingOp);
+        const latestPendingOps = this.latestPendingOps.get(taskId);
+        if (latestPendingOps === undefined) {
+            this.latestPendingOps.set(taskId, [pendingOp]);
+        }
+        else {
+            latestPendingOps.push(pendingOp);
+        }
     }
     submitAbandonOp(taskId) {
         const op = {
@@ -176,10 +178,16 @@ class TaskManagerClass extends internal_4.SharedObject {
         };
         const pendingOp = {
             type: "abandon",
-            messageId: ++this.messageId,
+            messageId: this.nextPendingMessageId++,
         };
         this.submitLocalMessage(op, pendingOp.messageId);
-        this.latestPendingOps.set(taskId, pendingOp);
+        const latestPendingOps = this.latestPendingOps.get(taskId);
+        if (latestPendingOps === undefined) {
+            this.latestPendingOps.set(taskId, [pendingOp]);
+        }
+        else {
+            latestPendingOps.push(pendingOp);
+        }
     }
     submitCompleteOp(taskId) {
         const op = {
@@ -188,23 +196,25 @@ class TaskManagerClass extends internal_4.SharedObject {
         };
         const pendingOp = {
             type: "complete",
-            messageId: ++this.messageId,
+            messageId: this.nextPendingMessageId++,
         };
-        if (this.pendingCompletedTasks.has(taskId)) {
-            this.pendingCompletedTasks.get(taskId)?.push(pendingOp.messageId);
+        this.submitLocalMessage(op, pendingOp.messageId);
+        const latestPendingOps = this.latestPendingOps.get(taskId);
+        if (latestPendingOps === undefined) {
+            this.latestPendingOps.set(taskId, [pendingOp]);
         }
         else {
-            this.pendingCompletedTasks.set(taskId, [pendingOp.messageId]);
+            latestPendingOps.push(pendingOp);
         }
-        this.submitLocalMessage(op, pendingOp.messageId);
-        this.latestPendingOps.set(taskId, pendingOp);
     }
     /**
      * {@inheritDoc ITaskManager.volunteerForTask}
      */
     async volunteerForTask(taskId) {
-        // If we have the lock, resolve immediately
-        if (this.assigned(taskId)) {
+        // If we are both queued and assigned, then we have the lock and do not
+        // have any pending abandon/complete ops. In this case we can resolve
+        // true immediately.
+        if (this.queuedOptimistically(taskId) && this.assigned(taskId)) {
             return true;
         }
         if (this.readOnlyInfo.readonly === true) {
@@ -213,9 +223,9 @@ class TaskManagerClass extends internal_4.SharedObject {
                 : new Error("Attempted to volunteer in read-only state");
             throw error;
         }
-        if (!this.isAttached()) {
+        if (this.isDetached()) {
             // Simulate auto-ack in detached scenario
-            (0, internal_1.assert)(this.clientId !== undefined, 0x472 /* clientId should not be undefined */);
+            (0, internal_2.assert)(this.clientId !== undefined, 0x472 /* clientId should not be undefined */);
             this.addClientToQueue(taskId, this.clientId);
             return true;
         }
@@ -224,6 +234,25 @@ class TaskManagerClass extends internal_4.SharedObject {
         }
         // This promise works even if we already have an outstanding volunteer op.
         const lockAcquireP = new Promise((resolve, reject) => {
+            // If we don't send an op (meaning the latest pending op is "volunteer"), nextPendingMessageId
+            // will be greater than that prior "volunteer" op's messageId.  This is OK because
+            // we only use it to filter stale abandon/complete, and not when determining if we
+            // acquired the lock.
+            const nextPendingMessageId = this.nextPendingMessageId;
+            const setupListeners = () => {
+                this.queueWatcher.on("queueChange", checkIfAcquiredLock);
+                this.abandonWatcher.on("abandon", checkIfAbandoned);
+                this.connectionWatcher.on("disconnect", rejectOnDisconnect);
+                this.completedWatcher.on("completed", checkIfCompleted);
+                this.rollbackWatcher.on("rollback", checkIfRolledBack);
+            };
+            const removeListeners = () => {
+                this.queueWatcher.off("queueChange", checkIfAcquiredLock);
+                this.abandonWatcher.off("abandon", checkIfAbandoned);
+                this.connectionWatcher.off("disconnect", rejectOnDisconnect);
+                this.completedWatcher.off("completed", checkIfCompleted);
+                this.rollbackWatcher.off("rollback", checkIfRolledBack);
+            };
             const checkIfAcquiredLock = (eventTaskId) => {
                 if (eventTaskId !== taskId) {
                     return;
@@ -231,47 +260,48 @@ class TaskManagerClass extends internal_4.SharedObject {
                 // Also check pending ops here because it's possible we are currently in the queue from a previous
                 // lock attempt, but have an outstanding abandon AND the outstanding volunteer for this lock attempt.
                 // If we reach the head of the queue based on the previous lock attempt, we don't want to resolve.
-                if (this.assigned(taskId) && !this.latestPendingOps.has(taskId)) {
-                    this.queueWatcher.off("queueChange", checkIfAcquiredLock);
-                    this.abandonWatcher.off("abandon", checkIfAbandoned);
-                    this.connectionWatcher.off("disconnect", rejectOnDisconnect);
-                    this.completedWatcher.off("completed", checkIfCompleted);
+                if (this.assigned(taskId)) {
+                    removeListeners();
                     resolve(true);
                 }
             };
-            const checkIfAbandoned = (eventTaskId) => {
+            const checkIfAbandoned = (eventTaskId, messageId) => {
                 if (eventTaskId !== taskId) {
                     return;
                 }
-                this.queueWatcher.off("queueChange", checkIfAcquiredLock);
-                this.abandonWatcher.off("abandon", checkIfAbandoned);
-                this.connectionWatcher.off("disconnect", rejectOnDisconnect);
-                this.completedWatcher.off("completed", checkIfCompleted);
+                if (messageId !== undefined && messageId <= nextPendingMessageId) {
+                    // Ignore abandon events that were for abandon ops that were sent prior to our current volunteer attempt.
+                    return;
+                }
+                removeListeners();
                 reject(new Error("Abandoned before acquiring task assignment"));
             };
             const rejectOnDisconnect = () => {
-                this.queueWatcher.off("queueChange", checkIfAcquiredLock);
-                this.abandonWatcher.off("abandon", checkIfAbandoned);
-                this.connectionWatcher.off("disconnect", rejectOnDisconnect);
-                this.completedWatcher.off("completed", checkIfCompleted);
+                removeListeners();
                 reject(new Error("Disconnected before acquiring task assignment"));
             };
-            const checkIfCompleted = (eventTaskId) => {
+            const checkIfCompleted = (eventTaskId, messageId) => {
                 if (eventTaskId !== taskId) {
                     return;
                 }
-                this.queueWatcher.off("queueChange", checkIfAcquiredLock);
-                this.abandonWatcher.off("abandon", checkIfAbandoned);
-                this.connectionWatcher.off("disconnect", rejectOnDisconnect);
-                this.completedWatcher.off("completed", checkIfCompleted);
+                if (messageId !== undefined && messageId <= nextPendingMessageId) {
+                    // Ignore abandon events that were for abandon ops that were sent prior to our current volunteer attempt.
+                    return;
+                }
+                removeListeners();
                 resolve(false);
             };
-            this.queueWatcher.on("queueChange", checkIfAcquiredLock);
-            this.abandonWatcher.on("abandon", checkIfAbandoned);
-            this.connectionWatcher.on("disconnect", rejectOnDisconnect);
-            this.completedWatcher.on("completed", checkIfCompleted);
+            const checkIfRolledBack = (eventTaskId) => {
+                if (eventTaskId !== taskId) {
+                    return;
+                }
+                removeListeners();
+                resolve(false);
+            };
+            setupListeners();
         });
-        if (!this.queued(taskId)) {
+        if (!this.queuedOptimistically(taskId)) {
+            // Only send the volunteer op if we are not already queued.
             this.submitVolunteerOp(taskId);
         }
         return lockAcquireP;
@@ -286,56 +316,83 @@ class TaskManagerClass extends internal_4.SharedObject {
         if (this.readOnlyInfo.readonly === true && this.readOnlyInfo.permissions === true) {
             throw new Error("Attempted to subscribe with read-only permissions");
         }
+        let volunteerOpMessageId;
         const submitVolunteerOp = () => {
+            volunteerOpMessageId = this.nextPendingMessageId;
             this.submitVolunteerOp(taskId);
         };
+        const setupListeners = () => {
+            this.abandonWatcher.on("abandon", checkIfAbandoned);
+            this.connectionWatcher.on("disconnect", disconnectHandler);
+            this.completedWatcher.on("completed", checkIfCompleted);
+            this.rollbackWatcher.on("rollback", checkIfRolledBack);
+        };
+        const removeListeners = () => {
+            this.abandonWatcher.off("abandon", checkIfAbandoned);
+            this.connectionWatcher.off("disconnect", disconnectHandler);
+            this.connectionWatcher.off("connect", submitVolunteerOp);
+            this.completedWatcher.off("completed", checkIfCompleted);
+            this.rollbackWatcher.off("rollback", checkIfRolledBack);
+        };
         const disconnectHandler = () => {
             // Wait to be connected again and then re-submit volunteer op
             this.connectionWatcher.once("connect", submitVolunteerOp);
         };
-        const checkIfAbandoned = (eventTaskId) => {
+        const checkIfAbandoned = (eventTaskId, messageId) => {
             if (eventTaskId !== taskId) {
                 return;
             }
-            this.abandonWatcher.off("abandon", checkIfAbandoned);
-            this.connectionWatcher.off("disconnect", disconnectHandler);
-            this.connectionWatcher.off("connect", submitVolunteerOp);
-            this.completedWatcher.off("completed", checkIfCompleted);
+            // abandonWatcher emits twice for a local abandon() call. When initially called it
+            // will emit with undefined messageId. It will emit a second time when the op is
+            // ack'd and processed, this time with the messageId for the ack.
+            // This condition accounts ensures we don't ignore the initial abandon() emit and
+            // only ignore emits associated with ack'd abandon ops that were sent prior to the
+            // current volunteer attempt.
+            if (messageId !== undefined &&
+                volunteerOpMessageId !== undefined &&
+                messageId <= volunteerOpMessageId) {
+                // Ignore abandon events that were for abandon ops that were sent prior to our current volunteer attempt.
+                return;
+            }
+            removeListeners();
             this.subscribedTasks.delete(taskId);
         };
-        const checkIfCompleted = (eventTaskId) => {
+        const checkIfCompleted = (eventTaskId, messageId) => {
             if (eventTaskId !== taskId) {
                 return;
             }
-            this.abandonWatcher.off("abandon", checkIfAbandoned);
-            this.connectionWatcher.off("disconnect", disconnectHandler);
-            this.connectionWatcher.off("connect", submitVolunteerOp);
-            this.completedWatcher.off("completed", checkIfCompleted);
+            if (messageId !== undefined &&
+                volunteerOpMessageId !== undefined &&
+                messageId <= volunteerOpMessageId) {
+                // Ignore abandon events that were for abandon ops that were sent prior to our current volunteer attempt.
+                return;
+            }
+            removeListeners();
             this.subscribedTasks.delete(taskId);
         };
-        this.abandonWatcher.on("abandon", checkIfAbandoned);
-        this.connectionWatcher.on("disconnect", disconnectHandler);
-        this.completedWatcher.on("completed", checkIfCompleted);
-        if (!this.isAttached()) {
+        const checkIfRolledBack = (eventTaskId) => {
+            if (eventTaskId !== taskId) {
+                return;
+            }
+            removeListeners();
+            this.subscribedTasks.delete(taskId);
+        };
+        setupListeners();
+        if (this.isDetached()) {
             // Simulate auto-ack in detached scenario
-            (0, internal_1.assert)(this.clientId !== undefined, 0x473 /* clientId should not be undefined */);
+            (0, internal_2.assert)(this.clientId !== undefined, 0x473 /* clientId should not be undefined */);
             this.addClientToQueue(taskId, this.clientId);
             // Because we volunteered with placeholderClientId, we need to wait for when we attach and are assigned
             // a real clientId. At that point we should re-enter the queue with a real volunteer op (assuming we are
             // connected).
             this.runtime.once("attached", () => {
-                if (this.queued(taskId)) {
-                    // If we are already queued, then we were able to replace the placeholderClientId with our real
-                    // clientId and no action is required.
-                    return;
-                }
-                else if (this.connected) {
+                // We call scrubClientsNotInQuorum() in case our clientId changed during the attach process.
+                this.scrubClientsNotInQuorum();
+                if (this.connected) {
                     submitVolunteerOp();
                 }
                 else {
-                    this.connectionWatcher.once("connect", () => {
-                        submitVolunteerOp();
-                    });
+                    this.connectionWatcher.once("connect", submitVolunteerOp);
                 }
             });
         }
@@ -343,7 +400,8 @@ class TaskManagerClass extends internal_4.SharedObject {
             // If we are disconnected (and attached), wait to be connected and submit volunteer op
             disconnectHandler();
         }
-        else if (!this.assigned(taskId) && !this.queued(taskId)) {
+        else if (!this.queuedOptimistically(taskId)) {
+            // We don't need to send a second volunteer op if we just sent one.
             submitVolunteerOp();
         }
         this.subscribedTasks.add(taskId);
@@ -353,23 +411,19 @@ class TaskManagerClass extends internal_4.SharedObject {
      */
     abandon(taskId) {
         // Always allow abandon if the client is subscribed to allow clients to unsubscribe while disconnected.
-        // Otherwise, we should check to make sure the client is both connected queued for the task before sending an
-        // abandon op.
-        if (!this.subscribed(taskId) && !this.queued(taskId)) {
+        // Otherwise, we should check to make sure the client is optimistically queued for the task before trying to abandon.
+        if (!this.queuedOptimistically(taskId) && !this.subscribed(taskId)) {
             // Nothing to do
             return;
         }
-        if (!this.isAttached()) {
+        if (this.isDetached()) {
             // Simulate auto-ack in detached scenario
-            (0, internal_1.assert)(this.clientId !== undefined, 0x474 /* clientId is undefined */);
+            (0, internal_2.assert)(this.clientId !== undefined, 0x474 /* clientId is undefined */);
             this.removeClientFromQueue(taskId, this.clientId);
             this.abandonWatcher.emit("abandon", taskId);
             return;
         }
-        // If we're subscribed but not queued, we don't need to submit an abandon op (probably offline)
-        if (this.queued(taskId)) {
-            this.submitAbandonOp(taskId);
-        }
+        this.submitAbandonOp(taskId);
         this.abandonWatcher.emit("abandon", taskId);
     }
     /**
@@ -380,9 +434,7 @@ class TaskManagerClass extends internal_4.SharedObject {
             return false;
         }
         const currentAssignee = this.taskQueues.get(taskId)?.[0];
-        return (currentAssignee !== undefined &&
-            currentAssignee === this.clientId &&
-            !this.latestPendingOps.has(taskId));
+        return currentAssignee !== undefined && currentAssignee === this.clientId;
     }
     /**
      * {@inheritDoc ITaskManager.queued}
@@ -391,12 +443,8 @@ class TaskManagerClass extends internal_4.SharedObject {
         if (this.isAttached() && !this.connected) {
             return false;
         }
-        (0, internal_1.assert)(this.clientId !== undefined, 0x07f /* "clientId undefined" */);
-        const clientQueue = this.taskQueues.get(taskId);
-        // If we have no queue for the taskId, then no one has signed up for it.
-        return (((clientQueue?.includes(this.clientId) ?? false) &&
-            !this.latestPendingOps.has(taskId)) ||
-            this.latestPendingOps.get(taskId)?.type === "volunteer");
+        (0, internal_2.assert)(this.clientId !== undefined, 0x07f /* "clientId undefined" */);
+        return this.taskQueues.get(taskId)?.includes(this.clientId) ?? false;
     }
     /**
      * {@inheritDoc ITaskManager.subscribed}
@@ -413,15 +461,16 @@ class TaskManagerClass extends internal_4.SharedObject {
         }
         // If we are detached we will simulate auto-ack for the complete op. Therefore we only need to send the op if
         // we are attached. Additionally, we don't need to check if we are connected while detached.
-        if (this.isAttached()) {
-            if (!this.connected) {
-                throw new Error("Attempted to complete task in disconnected state");
-            }
-            this.submitCompleteOp(taskId);
+        if (this.isDetached()) {
+            this.taskQueues.delete(taskId);
+            this.completedWatcher.emit("completed", taskId);
+            this.emit("completed", taskId);
+            return;
         }
-        this.taskQueues.delete(taskId);
-        this.completedWatcher.emit("completed", taskId);
-        this.emit("completed", taskId);
+        if (!this.connected) {
+            throw new Error("Attempted to complete task in disconnected state");
+        }
+        this.submitCompleteOp(taskId);
     }
     /**
      * {@inheritDoc ITaskManager.canVolunteer}
@@ -458,13 +507,13 @@ class TaskManagerClass extends internal_4.SharedObject {
             }
         }
         const content = [...filteredMap.entries()];
-        return (0, internal_4.createSingleBlobSummary)(snapshotFileName, JSON.stringify(content));
+        return (0, internal_5.createSingleBlobSummary)(snapshotFileName, JSON.stringify(content));
     }
     /**
      * {@inheritDoc @fluidframework/shared-object-base#SharedObject.loadCore}
      */
     async loadCore(storage) {
-        const content = await (0, internal_3.readAndParse)(storage, snapshotFileName);
+        const content = await (0, internal_4.readAndParse)(storage, snapshotFileName);
         for (const [taskId, clientIdQueue] of content) {
             this.taskQueues.set(taskId, clientIdQueue);
         }
@@ -484,12 +533,22 @@ class TaskManagerClass extends internal_4.SharedObject {
     onConnect() {
         this.connectionWatcher.emit("connect");
     }
-    //
     /**
      * Override resubmit core to avoid resubmission on reconnect.  On disconnect we accept our removal from the
      * queues, and leave it up to the user to decide whether they want to attempt to re-enter a queue on reconnect.
+     * However, we do need to update latestPendingOps to account for the ops we will no longer be processing.
      */
-    reSubmitCore() { }
+    reSubmitCore(content, localOpMetadata) {
+        assertIsTaskManagerOperation(content);
+        const pendingOps = this.latestPendingOps.get(content.taskId);
+        (0, internal_2.assert)(pendingOps !== undefined, "No pending ops for task on resubmit attempt");
+        const pendingOpIndex = pendingOps.findIndex((op) => op.messageId === localOpMetadata && op.type === content.type);
+        (0, internal_2.assert)(pendingOpIndex !== -1, "Could not match pending op on resubmit attempt");
+        pendingOps.splice(pendingOpIndex, 1);
+        if (pendingOps.length === 0) {
+            this.latestPendingOps.delete(content.taskId);
+        }
+    }
     /**
      * Process a task manager operation
      *
@@ -500,7 +559,7 @@ class TaskManagerClass extends internal_4.SharedObject {
      */
     processCore(message, local, localOpMetadata) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
-        if (message.type === internal_2.MessageType.Operation) {
+        if (message.type === internal_3.MessageType.Operation) {
             const op = message.contents;
             const messageId = localOpMetadata;
             switch (op.type) {
@@ -523,11 +582,6 @@ class TaskManagerClass extends internal_4.SharedObject {
         }
     }
     addClientToQueue(taskId, clientId) {
-        const pendingIds = this.pendingCompletedTasks.get(taskId);
-        if (pendingIds !== undefined && pendingIds.length > 0) {
-            // Ignore the volunteer op if we know this task is about to be completed
-            return;
-        }
         // Ensure that the clientId exists in the quorum, or it is placeholderClientId (detached scenario)
         if (this.runtime.getQuorum().getMembers().has(clientId) ||
             this.clientId === placeholderClientId) {
@@ -537,6 +591,12 @@ class TaskManagerClass extends internal_4.SharedObject {
                 clientQueue = [];
                 this.taskQueues.set(taskId, clientQueue);
             }
+            if (clientQueue.includes(clientId)) {
+                // We shouldn't re-add the client if it's already in the queue.
+                // This may be possible in scenarios where a client was added in
+                // while detached.
+                return;
+            }
             const oldLockHolder = clientQueue[0];
             clientQueue.push(clientId);
             const newLockHolder = clientQueue[0];
@@ -574,11 +634,17 @@ class TaskManagerClass extends internal_4.SharedObject {
      * transitioning from detached to attached and this.runtime.clientId is defined.
      */
     replacePlaceholderInAllQueues() {
-        (0, internal_1.assert)(this.runtime.clientId !== undefined, 0x475 /* this.runtime.clientId should be defined */);
+        (0, internal_2.assert)(this.runtime.clientId !== undefined, 0x475 /* this.runtime.clientId should be defined */);
         for (const clientQueue of this.taskQueues.values()) {
             const clientIdIndex = clientQueue.indexOf(placeholderClientId);
             if (clientIdIndex !== -1) {
-                clientQueue[clientIdIndex] = this.runtime.clientId;
+                if (clientQueue.includes(this.runtime.clientId)) {
+                    // If the real clientId is already in the queue, just remove the placeholder.
+                    clientQueue.splice(clientIdIndex, 1);
+                }
+                else {
+                    clientQueue[clientIdIndex] = this.runtime.clientId;
+                }
             }
         }
     }
@@ -599,25 +665,55 @@ class TaskManagerClass extends internal_4.SharedObject {
             }
         }
     }
-    applyStashedOp(content) {
-        const taskOp = content;
-        switch (taskOp.type) {
-            case "abandon": {
-                this.abandon(taskOp.taskId);
-                break;
-            }
-            case "complete": {
-                this.complete(taskOp.taskId);
-                break;
-            }
-            case "volunteer": {
-                this.subscribeToTask(taskOp.taskId);
-                break;
-            }
-            default: {
-                (0, internal_1.unreachableCase)(taskOp);
-            }
+    /**
+     * Checks whether this client is currently assigned or in queue to become assigned, while also accounting
+     * for the latest pending ops.
+     */
+    queuedOptimistically(taskId) {
+        if (this.isAttached() && !this.connected) {
+            return false;
         }
+        (0, internal_2.assert)(this.clientId !== undefined, 0x07f /* "clientId undefined" */);
+        const inQueue = this.taskQueues.get(taskId)?.includes(this.clientId) ?? false;
+        const latestPendingOps = this.latestPendingOps.get(taskId);
+        const latestPendingOp = latestPendingOps !== undefined && latestPendingOps.length > 0
+            ? latestPendingOps[latestPendingOps.length - 1]
+            : undefined;
+        const isPendingVolunteer = latestPendingOp?.type === "volunteer";
+        const isPendingAbandonOrComplete = latestPendingOp?.type === "abandon" || latestPendingOp?.type === "complete";
+        // We return true if the client is either in queue already or the latest pending op for this task is a volunteer op.
+        // But we should always return false if the latest pending op is an abandon or complete op.
+        return (inQueue && !isPendingAbandonOrComplete) || isPendingVolunteer;
+    }
+    /**
+     * Returns true if the client is detached.
+     * This is distinct from !this.isAttached() because `isAttached()` also checks if `this._isBoundToContext`
+     * is true. We use `isDetached()` to determine if we should simulate auto-ack behavior for ops, which is
+     * mainly concerned with if we have been assigned a real clientId yet.
+     */
+    isDetached() {
+        return this.runtime.attachState === internal_1.AttachState.Detached;
+    }
+    applyStashedOp(content) {
+        // We don't apply any stashed ops since during the rehydration process. Since we lose any assigned tasks
+        // during rehydration we cannot be assigned any tasks. Additionally, without the in-memory state of the
+        // previous dds, we also cannot re-volunteer based on a previous subscribeToTask() call. Since we are
+        // unable to be assigned to any tasks, there is no reason to process abandon/complete ops either.
+    }
+    /**
+     * {@inheritDoc @fluidframework/shared-object-base#SharedObject.rollback}
+     */
+    rollback(content, localOpMetadata) {
+        (0, internal_2.assert)(typeof localOpMetadata === "number", "Expect localOpMetadata to be a number");
+        assertIsTaskManagerOperation(content);
+        const latestPendingOps = this.latestPendingOps.get(content.taskId);
+        (0, internal_2.assert)(latestPendingOps !== undefined, "No pending ops when trying to rollback");
+        const pendingOpToRollback = latestPendingOps.pop();
+        (0, internal_2.assert)(pendingOpToRollback !== undefined && pendingOpToRollback.messageId === localOpMetadata, "pending op mismatch");
+        if (latestPendingOps.length === 0) {
+            this.latestPendingOps.delete(content.taskId);
+        }
+        this.rollbackWatcher.emit("rollback", content.taskId);
     }
 }
 exports.TaskManagerClass = TaskManagerClass;