@@ -758,6 +758,9 @@ function worktreeSetupPending(
   );
 }
 
+const QUEUED_RUN_BEING_EDITED =
+  "This queued message is being edited. Save or cancel the edit first.";
+
 function nextQueuedRun(
   projection: Pick<OrchestrationV2ThreadProjection, "runs" | "messages">,
 ): OrchestrationV2Run | undefined {
@@ -9279,6 +9282,13 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
         cause: `Queued run ${command.queuedRunId} is not queued.`,
       });
     }
+    if (queuedRun.editing === true) {
+      return yield* new OrchestratorDispatchError({
+        commandId: command.commandId,
+        commandType: command.type,
+        cause: QUEUED_RUN_BEING_EDITED,
+      });
+    }
     const queuedRootNode =
       queuedRun.rootNodeId === null
         ? undefined
@@ -13156,6 +13166,13 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
               cause: "A queued user message can only be sent now while the thread is stopped.",
             });
           }
+          if (selectedRun.editing === true) {
+            return yield* new OrchestratorDispatchError({
+              commandId: command.commandId,
+              commandType: command.type,
+              cause: QUEUED_RUN_BEING_EDITED,
+            });
+          }
         }
         const nextRun = selectedRun ?? queuedRunsInDeliveryOrder(projection)[0];
         if (
 
@@ -5829,7 +5829,16 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
         ["completed", "queued", "queued"],
       );
 
-      // Sending another message now keeps the edit hold.
+      // Another device cannot send the edited message, but can send the others.
+      const rejected = yield* orchestrator
+        .dispatch({
+          type: "queued-run.start",
+          commandId: CommandId.make(`${threadId}:send-edited`),
+          threadId,
+          runId: edited!.id,
+        })
+        .pipe(Effect.flip);
+      assert.equal(rejected._tag, "OrchestratorDispatchError");
       yield* orchestrator.dispatch({
         type: "queued-run.start",
         commandId: CommandId.make(`${threadId}:send-behind`),