Revert "Fix follow up message on shared conversation (#1963)"

This reverts commit 9642080.

Author: gary149

src/routes/conversation/[id]/+page.svelte

@@ -4,7 +4,7 @@
 	import { isAborted } from "$lib/stores/isAborted";
 	import { onMount } from "svelte";
 	import { page } from "$app/state";
-	import { beforeNavigate, invalidateAll, replaceState } from "$app/navigation";
+	import { beforeNavigate, goto, invalidateAll } from "$app/navigation";
 	import { base } from "$app/paths";
 	import { ERROR_MESSAGES, error } from "$lib/stores/errors";
 	import { findCurrentModel } from "$lib/utils/models";
@@ -37,7 +37,6 @@
 
 	let files: File[] = $state([]);
 
-	let conversationId = page.params.id;
 	let conversations = $state(data.conversations);
 	$effect(() => {
 		conversations = data.conversations;
@@ -242,7 +241,7 @@
 			const messageUpdatesAbortController = new AbortController();
 
 			const messageUpdatesIterator = await fetchMessageUpdates(
-				conversationId,
+				page.params.id,
 				{
 					base,
 					inputs: prompt,
@@ -303,13 +302,13 @@
 						$error = update.message ?? "An error has occurred";
 					}
 				} else if (update.type === MessageUpdateType.Title) {
-					const convInData = conversations.find(({ id }) => id === conversationId);
+					const convInData = conversations.find(({ id }) => id === page.params.id);
 					if (convInData) {
 						convInData.title = update.title;
 
 						$titleUpdate = {
 							title: update.title,
-							convId: conversationId,
+							convId: page.params.id,
 						};
 					}
 				} else if (update.type === MessageUpdateType.File) {
@@ -344,7 +343,7 @@
 	}
 
 	async function stopGeneration() {
-		await fetch(`${base}/conversation/${conversationId}/stop-generating`, {
+		await fetch(`${base}/conversation/${page.params.id}/stop-generating`, {
 			method: "POST",
 		}).then((r) => {
 			if (r.ok) {
@@ -368,7 +367,6 @@
 	}
 
 	onMount(async () => {
-		conversationId = page.params.id;
 		if ($pendingMessage) {
 			files = $pendingMessage.files;
 			await writeMessage({ prompt: $pendingMessage.content });
@@ -377,7 +375,7 @@
 
 		const streaming = isConversationStreaming(messages);
 		if (streaming) {
-			addBackgroundGeneration({ id: conversationId, startedAt: Date.now() });
+			addBackgroundGeneration({ id: page.params.id, startedAt: Date.now() });
 			$loading = true;
 		}
 	});
@@ -386,13 +384,12 @@
 		if (!data.shared) {
 			await writeMessage({ prompt: content });
 		} else {
-			try {
-				conversationId = await convFromShared();
-				replaceState(`${base}/conversation/${conversationId}`, page.state);
-				await writeMessage({ prompt: content });
-			} finally {
-				$loading = false;
-			}
+			await convFromShared()
+				.then(async (convId) => {
+					await goto(`${base}/conversation/${convId}`, { invalidateAll: true });
+				})
+				.then(async () => await writeMessage({ prompt: content }))
+				.finally(() => ($loading = false));
 		}
 	}
 
@@ -409,17 +406,19 @@
 				isRetry: true,
 			});
 		} else {
-			try {
-				const conversationId = await convFromShared();
-				replaceState(`${base}/conversation/${conversationId}`, page.state);
-				await writeMessage({
-					prompt: payload.content,
-					messageId: payload.id,
-					isRetry: true,
-				});
-			} finally {
-				$loading = false;
-			}
+			await convFromShared()
+				.then(async (convId) => {
+					await goto(`${base}/conversation/${convId}`, { invalidateAll: true });
+				})
+				.then(
+					async () =>
+						await writeMessage({
+							prompt: payload.content,
+							messageId: payload.id,
+							isRetry: true,
+						})
+				)
+				.finally(() => ($loading = false));
 		}
 	}
 
@@ -457,7 +456,7 @@
 		}
 
 		if (!streaming && browser) {
-			removeBackgroundGeneration(conversationId);
+			removeBackgroundGeneration(page.params.id);
 		}
 	});
 
@@ -472,21 +471,21 @@
 	});
 
 	beforeNavigate((navigation) => {
-		if (!conversationId) return;
+		if (!page.params.id) return;
 
 		const navigatingAway =
-			navigation.to?.route.id !== page.route.id || navigation.to?.params?.id !== conversationId;
+			navigation.to?.route.id !== page.route.id || navigation.to?.params?.id !== page.params.id;
 
 		if (loading && navigatingAway) {
-			addBackgroundGeneration({ id: conversationId, startedAt: Date.now() });
+			addBackgroundGeneration({ id: page.params.id, startedAt: Date.now() });
 		}
 
 		$isAborted = true;
 		$loading = false;
 	});
 
 	let title = $derived.by(() => {
-		const rawTitle = conversations.find((conv) => conv.id === conversationId)?.title ?? data.title;
+		const rawTitle = conversations.find((conv) => conv.id === page.params.id)?.title ?? data.title;
 		return rawTitle ? rawTitle.charAt(0).toUpperCase() + rawTitle.slice(1) : rawTitle;
 	});
 </script>