@@ -1083,10 +1083,21 @@ export async function waitForRevertedMessage(
   const threadAtom = environmentThreadDetails.stateAtom(threadRef);
   const readProjection = () => Option.getOrNull(appAtomRegistry.get(threadAtom).data);
   const initial = readProjection();
-  if (!initial?.messages.some((message) => message.id === messageId)) {
+  // Paged prompts live in turn items without a duplicate projection message.
+  const messageRunId =
+    initial?.messages.find((message) => message.id === messageId)?.runId ??
+    initial?.visibleTurnItems.find(
+      ({ visibility, sourceThreadId, item }) =>
+        visibility === "local" &&
+        sourceThreadId === initial.thread.id &&
+        item.threadId === initial.thread.id &&
+        item.type === "user_message" &&
+        item.messageId === messageId &&
+        initial.runs.some((run) => run.id === item.runId && run.threadId === initial.thread.id),
+    )?.item.runId;
+  if (messageRunId == null) {
     throw new Error("The message to rewind is no longer available.");
   }
-  const messageRunId = initial.messages.find((message) => message.id === messageId)?.runId;
   return new Promise<void>((resolve, reject) => {
     let settled = false;
     let accepted = false;
 
@@ -1182,7 +1182,7 @@ export default function ChatView(props: ChatViewProps) {
       messages: appAtomRegistry
         .get(environmentThreadDetails.visibleTurnItemsAtom(routeThreadDetailRef))
         .flatMap(({ item }) =>
-          item.type === "user_message"
+          item.type === "user_message" && !item.messageId.startsWith("async-answer:")
             ? [{ id: item.messageId, role: "user", text: item.text }]
             : [],
         ),
@@ -5752,7 +5752,7 @@ export default function ChatView(props: ChatViewProps) {
           createdAt: DateTime.formatIso(sourceMessage.createdAt),
           updatedAt: DateTime.formatIso(sourceMessage.updatedAt),
         }
-      : undefined;
+      : timelineMessages.find((message) => message.id === messageId);
     if (!message || message.role !== "user") return;
 
     if (!supportsConversationRollback) {