@@ -74,6 +74,7 @@ vi.mock("../lib/attachmentUpload", () => ({ prepareTurnAttachments: vi.fn() }));
 vi.mock("../lib/uuid", () => ({ uuidv4: () => "uuid" }));
 vi.mock("./queued-run-edit", () => ({
   useQueuedRunEdit: () => null,
+  useQueuedRunEditSaving: () => false,
   getQueuedRunEdit: () => null,
   useSavedQueuedEditDrafts: () => [],
   useQueuedEditRecovery: () => null,
 
@@ -9394,11 +9394,13 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
         cause: "A guest's message cannot be edited. Cancel it instead.",
       });
     }
-    yield* ensureGoalCommandSupported(
-      command,
-      { text: command.text, attachments: command.attachments ?? queuedMessage.attachments },
-      queuedRun.providerInstanceId,
-    );
+    if (command.type === "queued-run.edit") {
+      yield* ensureGoalCommandSupported(
+        command,
+        { text: command.text, attachments: command.attachments ?? queuedMessage.attachments },
+        queuedRun.providerInstanceId,
+      );
+    }
     const queuedTurnItem = projection.turnItems.find(
       (candidate) => candidate.type === "user_message" && candidate.messageId === queuedMessage.id,
     );
 
@@ -389,6 +389,7 @@ export function useQueuedRunEdit(input: {
     clearEditDraft(editing.runId);
     focusComposerSoon();
   });
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- keeps the edit projection watch and recovery toast in sync with server ownership after navigation
   useEffect(() => {
     if (editing === null || activeThreadId !== editing.threadId || isSaving) return;
     watchQueuedEdit(routeThreadRef, threadDraftTarget, editing);