From b4d13793a3af2d75aaf33fe9793cbbf278958940 Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Fri, 24 Jul 2026 02:14:56 -0400 Subject: [PATCH] refac --- src/lib/components/chat/Chat.svelte | 1 + src/lib/components/chat/Messages.svelte | 2 ++ src/lib/components/chat/Messages/Message.svelte | 4 ++++ src/lib/components/chat/Messages/MultiResponseMessages.svelte | 2 ++ src/lib/components/chat/Messages/ResponseMessage.svelte | 3 ++- src/lib/components/chat/Messages/UserMessage.svelte | 3 ++- 6 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte index 7a34004800..e623e5d9bf 100644 --- a/src/lib/components/chat/Chat.svelte +++ b/src/lib/components/chat/Chat.svelte @@ -3881,6 +3881,7 @@ {mergeResponses} {chatActionHandler} {addMessages} + allowDelete={!(generating || taskIds?.length)} forkHandler={generating || taskIds?.length ? null : handleForkChat} topPadding={!embedded} bottomPadding={files.length > 0} diff --git a/src/lib/components/chat/Messages.svelte b/src/lib/components/chat/Messages.svelte index 31bc65832c..2f4ad5fec9 100644 --- a/src/lib/components/chat/Messages.svelte +++ b/src/lib/components/chat/Messages.svelte @@ -43,6 +43,7 @@ export let forkHandler: Function | null = null; export let readOnly = false; + export let allowDelete = true; export let compactPreview = false; export let editCodeBlock = true; @@ -555,6 +556,7 @@ {mergeResponses} {addMessages} {forkHandler} + {allowDelete} {triggerScroll} {readOnly} {compactPreview} diff --git a/src/lib/components/chat/Messages/Message.svelte b/src/lib/components/chat/Messages/Message.svelte index 71a441a4ff..c899c9dccd 100644 --- a/src/lib/components/chat/Messages/Message.svelte +++ b/src/lib/components/chat/Messages/Message.svelte @@ -42,6 +42,7 @@ export let forkHandler: Function | null = null; export let triggerScroll; export let readOnly = false; + export let allowDelete = true; export let compactPreview = false; export let editCodeBlock = true; export let topPadding = false; @@ -76,6 +77,7 @@ {showNextMessage} {editMessage} {deleteMessage} + {allowDelete} {readOnly} {compactPreview} {editCodeBlock} @@ -101,6 +103,7 @@ {actionMessage} {submitMessage} {deleteMessage} + {allowDelete} {continueResponse} {regenerateResponse} {addMessages} @@ -126,6 +129,7 @@ {actionMessage} {submitMessage} {deleteMessage} + {allowDelete} {continueResponse} {regenerateResponse} {mergeResponses} diff --git a/src/lib/components/chat/Messages/MultiResponseMessages.svelte b/src/lib/components/chat/Messages/MultiResponseMessages.svelte index acd35fff86..4edc7d1c94 100644 --- a/src/lib/components/chat/Messages/MultiResponseMessages.svelte +++ b/src/lib/components/chat/Messages/MultiResponseMessages.svelte @@ -28,6 +28,7 @@ export let isLastMessage; export let readOnly = false; + export let allowDelete = true; export let compactPreview = false; export let editCodeBlock = true; @@ -377,6 +378,7 @@ {saveMessage} {rateMessage} {deleteMessage} + {allowDelete} {actionMessage} {submitMessage} {continueResponse} diff --git a/src/lib/components/chat/Messages/ResponseMessage.svelte b/src/lib/components/chat/Messages/ResponseMessage.svelte index 9295ecd136..e2db3eac01 100644 --- a/src/lib/components/chat/Messages/ResponseMessage.svelte +++ b/src/lib/components/chat/Messages/ResponseMessage.svelte @@ -165,6 +165,7 @@ export let isLastMessage = true; export let readOnly = false; + export let allowDelete = true; export let compactPreview = false; export let editCodeBlock = true; export let topPadding = false; @@ -1482,7 +1483,7 @@ {/if} {#if $user?.role === 'admin' || ($user?.permissions?.chat?.delete_message ?? true)} - {#if siblings.length > 1} + {#if allowDelete && siblings.length > 1}