fix(web): preserve unsaved queued-message edits across navigation

apps/web/src/components/ChatView.tsx

@@ -480,10 +480,12 @@ export default function ChatView(props: ChatViewProps) {
   const promptRef = useRef("");
   const localComposerRef = useRef<ChatComposerHandle | null>(null);
   const composerRef = useComposerHandleContext() ?? localComposerRef;
+  const threadStatus = useThreadStatus(routeThreadDetailRef);
   const queuedRunEdit = useQueuedRunEdit({
     environmentId,
     routeThreadRef,
     threadDraftTarget: baseComposerDraftTarget,
+    threadIsLive: threadStatus === "live",
     activeThreadId: serverThread !== null || draftThread !== null ? threadId : null,
     serverProjection,
     promptRef,
@@ -493,7 +495,6 @@ export default function ChatView(props: ChatViewProps) {
   const reportedModelSelection = serverProjection
     ? deriveReportedModelSelection(serverProjection)
     : null;
-  const threadStatus = useThreadStatus(routeThreadDetailRef);
   const threadSyncPhase = resolveThreadSyncPhase({
     detailExists: serverProjection !== null,
     shellExists: serverThread !== null,

apps/web/src/components/chat/queuedMessageEdit.test.ts

@@ -1,4 +1,4 @@
-import { EnvironmentId, ThreadId } from "@t3tools/contracts";
+import { EnvironmentId, MessageId, ThreadId } from "@t3tools/contracts";
 import { scopeThreadRef } from "@t3tools/client-runtime/environment";
 import { beforeEach, describe, expect, it } from "vite-plus/test";
 import {
@@ -86,6 +86,29 @@ describe("queued message file edits", () => {
     expect(store.getComposerDraft(editTarget)).toBeNull();
   });
 
+  it.each(["", "Separate draft"])(
+    "handles attachment-only removals without overwriting composer %j",
+    (separateDraft) => {
+      const store = useComposerDraftStore.getState();
+      store.setPrompt(threadTarget, separateDraft);
+      store.setPrompt(editTarget, "Original message");
+      store.setQueuedMessageEdit(editTarget, {
+        messageId: MessageId.make("message:queued"),
+        originalText: "Original message",
+        removedAttachmentIds: ["attachment:removed"],
+      });
+      expect(
+        recoverQueuedMessageEdit({ editTarget, threadTarget, originalText: "Original message" }),
+      ).toBe(separateDraft ? "discarded" : "kept");
+      expect(store.getComposerDraft(threadTarget)?.prompt).toBe(
+        separateDraft || "Original message",
+      );
+      expect(store.getComposerDraft(threadTarget)?.files).toEqual([]);
+      expect(store.getComposerDraft(threadTarget)?.queuedMessageEdit).toBeUndefined();
+      expect(store.getComposerDraft(editTarget)).toBeNull();
+    },
+  );
+
   it("does not overwrite a separate draft when the queued run leaves", () => {
     const store = useComposerDraftStore.getState();
     store.setPrompt(threadTarget, "Separate draft");

apps/web/src/components/chat/queuedMessageEdit.ts

@@ -16,9 +16,14 @@ export function recoverQueuedMessageEdit(input: {
   const draft = store.getComposerDraft(input.editTarget);
   const dirty =
     draft !== null &&
-    (draft.prompt !== input.originalText || draft.images.length > 0 || draft.files.length > 0);
+    (draft.prompt !== input.originalText ||
+      draft.images.length > 0 ||
+      draft.files.length > 0 ||
+      (draft.queuedMessageEdit?.removedAttachmentIds.length ?? 0) > 0);
   if (dirty && !composerDraftHasUserContent(store.getComposerDraft(input.threadTarget))) {
     store.moveComposerPromptAndImages(input.editTarget, input.threadTarget);
+    // A new composer draft keeps the edited content, not IDs belonging to the old queued message.
+    store.setQueuedMessageEdit(input.editTarget, undefined);
     return "kept";
   }
   store.clearComposerContent(input.editTarget);