iris-chatbot 5.4.0 → 5.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iris-chatbot",
-  "version": "5.4.0",
+  "version": "5.5.0",
   "private": false,
   "description": "One-command installer for the Iris project template.",
   "bin": {

package/template/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

package/template/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "iris",
-  "version": "5.4.0",
+  "version": "5.5.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "iris",
-      "version": "5.4.0",
+      "version": "5.5.0",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.72.1",
         "clsx": "^2.1.1",

package/template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iris",
-  "version": "5.4.0",
+  "version": "5.5.0",
   "private": true,
   "description": "One-command installer for the Iris project template.",
   "engines": {

package/template/src/app/globals.css

@@ -152,6 +152,75 @@ button:focus-visible {
   gap: 8px;
 }
 
+.user-edit-shell {
+  display: flex;
+  flex-direction: column;
+  gap: 14px;
+  width: 100%;
+}
+
+.user-edit-textarea {
+  width: 100%;
+  min-height: 110px;
+  border: none;
+  background: transparent;
+  color: inherit;
+  line-height: 1.45;
+  resize: none;
+  outline: none;
+}
+
+.user-edit-textarea:focus,
+.user-edit-textarea:focus-visible {
+  outline: none;
+  border-color: transparent;
+  box-shadow: none;
+}
+
+.user-edit-textarea::placeholder {
+  color: color-mix(in srgb, currentColor 65%, transparent);
+}
+
+.user-edit-actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+}
+
+.user-edit-cancel,
+.user-edit-send {
+  height: 40px;
+  border-radius: 999px;
+  padding: 0 22px;
+  font-size: 14px;
+  border: 1px solid transparent;
+  transition: background 0.16s ease, color 0.16s ease, border-color 0.16s ease;
+}
+
+.user-edit-cancel {
+  background: rgba(22, 24, 28, 0.82);
+  color: #f2f4f8;
+}
+
+.user-edit-cancel:hover {
+  background: rgba(22, 24, 28, 0.95);
+}
+
+.user-edit-send {
+  background: #f2f2f2;
+  color: #101010;
+}
+
+.user-edit-send:hover {
+  background: #ffffff;
+}
+
+.user-edit-cancel:disabled,
+.user-edit-send:disabled {
+  opacity: 0.65;
+  cursor: not-allowed;
+}
+
 .user-attachment-row {
   display: flex;
   flex-wrap: wrap;

package/template/src/components/ChatView.tsx

@@ -369,6 +369,13 @@ type PendingAttachment = {
   kind: ChatAttachment["kind"];
 };
 
+type HandleSendOptions = {
+  parentMessageId?: string | null;
+  historyHeadMessageId?: string | null;
+  preUploadedAttachments?: ChatAttachment[];
+  suppressComposerReset?: boolean;
+};
+
 export default function ChatView({
   thread,
   messages,
@@ -1175,19 +1182,23 @@ export default function ChatView({
     };
   }, [handleTextSelection]);
 
-  const handleSend = useCallback(async (overrideInput?: string) => {
+  const handleSend = useCallback(async (overrideInput?: string, options?: HandleSendOptions) => {
     const resolvedThread =
       thread || (activeThreadId ? await db.threads.get(activeThreadId) : null);
     if (!resolvedThread) return;
     const trimmed = (overrideInput ?? input).trim();
-    const hasQuoted = Boolean(quotedContext);
-    const pendingComposerAttachments = pendingAttachments;
+    const resetComposer = options?.suppressComposerReset !== true;
+    const hasQuoted = resetComposer && Boolean(quotedContext);
+    const pendingComposerAttachments = options?.preUploadedAttachments ? [] : pendingAttachments;
+    const preUploadedAttachments = normalizeChatAttachments(options?.preUploadedAttachments);
+    const hasPreUploadedAttachments = preUploadedAttachments.length > 0;
     const hasPendingAttachments = pendingComposerAttachments.length > 0;
-    if (!trimmed && !hasQuoted && !hasPendingAttachments) return;
-    if (isUploadingAttachments) return;
+    if (!trimmed && !hasQuoted && !hasPendingAttachments && !hasPreUploadedAttachments) return;
+    if (isUploadingAttachments && hasPendingAttachments) return;
     let draftEditContextForRequest: PendingDraftContext | null = null;
     const sendTriggeredByMic =
-      typeof overrideInput === "string" || micModeRef.current !== "off";
+      !options &&
+      (typeof overrideInput === "string" || micModeRef.current !== "off");
     const stopMicAfterValidationFailure = () => {
       if (!sendTriggeredByMic) {
         return;
@@ -1222,7 +1233,10 @@ export default function ChatView({
     }
 
     const connectionAttachmentProvider = getAttachmentProviderForConnection(connectionPayload);
-    const currentPathMessages = buildPath(resolvedThread.headMessageId, messageMap);
+    const currentPathMessages = buildPath(
+      options?.historyHeadMessageId ?? resolvedThread.headMessageId,
+      messageMap,
+    );
     const existingAttachmentProviders = new Set<ChatAttachment["provider"]>();
     for (const message of currentPathMessages) {
       const attachments = normalizeChatAttachments(message.attachments);
@@ -1243,7 +1257,7 @@ export default function ChatView({
       stopMicAfterValidationFailure();
       return;
     }
-    if (hasPendingAttachments && !connectionAttachmentProvider) {
+    if ((hasPendingAttachments || hasPreUploadedAttachments) && !connectionAttachmentProvider) {
       setError("Attachments are only supported on OpenAI/OpenAI-compatible and Anthropic connections.");
       stopMicAfterValidationFailure();
       return;
@@ -1305,7 +1319,7 @@ export default function ChatView({
       return;
     }
 
-    let uploadedAttachments: ChatAttachment[] = [];
+    let uploadedAttachments: ChatAttachment[] = preUploadedAttachments;
     if (pendingComposerAttachments.length > 0) {
       setIsUploadingAttachments(true);
       try {
@@ -1326,10 +1340,11 @@ export default function ChatView({
         if (!uploadResponse.ok) {
           throw new Error(uploadPayload.error || "Failed to upload attachments.");
         }
-        uploadedAttachments = normalizeChatAttachments(uploadPayload.attachments);
-        if (uploadedAttachments.length !== pendingComposerAttachments.length) {
+        const newAttachments = normalizeChatAttachments(uploadPayload.attachments);
+        if (newAttachments.length !== pendingComposerAttachments.length) {
           throw new Error("One or more attachments were rejected during upload.");
         }
+        uploadedAttachments = [...uploadedAttachments, ...newAttachments];
         if (
           connectionAttachmentProvider &&
           uploadedAttachments.some(
@@ -1354,9 +1369,11 @@ export default function ChatView({
       (inflightThreadIdsRef.current.get(resolvedThread.id) ?? 0) + 1,
     );
     setError(null);
-    setInput("");
-    const capturedQuotedContext = quotedContext;
-    setQuotedContext(null);
+    if (resetComposer) {
+      setInput("");
+      setQuotedContext(null);
+    }
+    const capturedQuotedContext = hasQuoted ? quotedContext : null;
     setFocusedMessageId(null);
     pendingSendScrollThreadIdRef.current = resolvedThread.id;
     isUserNearBottomRef.current = true;
@@ -1371,16 +1388,19 @@ export default function ChatView({
         : `Explain this: "${capturedQuotedContext}"`
       : trimmed;
 
-    const isFirstMessage = resolvedThread.title === "New chat";
+    const isFirstMessage =
+      resolvedThread.title === "New chat" &&
+      (options?.parentMessageId ?? resolvedThread.headMessageId) === null;
 
     const { userMessage, assistantMessage } = await appendUserAndAssistant({
       thread: resolvedThread,
       content: contentToSend,
       attachments: uploadedAttachments,
+      parentId: options?.parentMessageId,
       provider: connection.kind === "builtin" ? connection.provider ?? connection.id : connection.id,
       model,
     });
-    if (pendingComposerAttachments.length > 0) {
+    if (resetComposer && pendingComposerAttachments.length > 0) {
       const sentAttachmentIds = new Set(
         pendingComposerAttachments.map((attachment) => attachment.id),
       );
@@ -1966,6 +1986,116 @@ export default function ChatView({
     toolEventsByMessage,
   ]);
 
+  const handleResendEditedUserMessage = useCallback(
+    async (messageId: string, nextContent: string) => {
+      const resolvedThread =
+        thread || (activeThreadId ? await db.threads.get(activeThreadId) : null);
+      if (!resolvedThread) {
+        return false;
+      }
+
+      const targetMessage = messageMap.get(messageId);
+      if (!targetMessage || targetMessage.role !== "user") {
+        setError("Could not edit that message.");
+        return false;
+      }
+
+      const isMessageInActivePath = threadMessages.some((message) => message.id === messageId);
+      if (!isMessageInActivePath) {
+        setError("That message is not in the active thread.");
+        return false;
+      }
+
+      const trimmedContent = nextContent.trim();
+      const existingAttachments = normalizeChatAttachments(targetMessage.attachments);
+      if (!trimmedContent && existingAttachments.length === 0) {
+        setError("Message cannot be empty.");
+        return false;
+      }
+
+      if (!settings) {
+        setError("Settings not loaded yet.");
+        return false;
+      }
+
+      if (!connection) {
+        setError("Select a model connection before sending a message.");
+        onOpenSettings();
+        return false;
+      }
+
+      const connectionPayload = toChatConnectionPayload(connection, settings);
+      const requiresApiKey =
+        connectionPayload.kind === "builtin" &&
+        (connectionPayload.provider === "openai" ||
+          connectionPayload.provider === "anthropic" ||
+          connectionPayload.provider === "google");
+      if (requiresApiKey && !connectionPayload.apiKey) {
+        setError("Add an API key in Settings before sending a message.");
+        onOpenSettings();
+        return false;
+      }
+
+      const connectionAttachmentProvider = getAttachmentProviderForConnection(connectionPayload);
+      const currentPathMessages = buildPath(messageId, messageMap);
+      const existingAttachmentProviders = new Set<ChatAttachment["provider"]>();
+      for (const message of currentPathMessages) {
+        const attachments = normalizeChatAttachments(message.attachments);
+        for (const attachment of attachments) {
+          existingAttachmentProviders.add(attachment.provider);
+        }
+      }
+      if (existingAttachmentProviders.size > 1) {
+        setError("This thread has mixed attachment providers. Start a new chat to continue.");
+        return false;
+      }
+      const existingProvider = [...existingAttachmentProviders][0] ?? null;
+      if (existingProvider && connectionAttachmentProvider !== existingProvider) {
+        setError(
+          `This thread has ${existingProvider} attachments. Switch back to that provider or start a new chat.`,
+        );
+        return false;
+      }
+      if (existingAttachments.length > 0 && !connectionAttachmentProvider) {
+        setError("Attachments are only supported on OpenAI/OpenAI-compatible and Anthropic connections.");
+        return false;
+      }
+
+      if (!model) {
+        setError("Select a model before sending a message.");
+        return false;
+      }
+
+      const threadLocked =
+        Boolean(streamingByThreadRef.current[resolvedThread.id]) ||
+        (inflightThreadIdsRef.current.get(resolvedThread.id) ?? 0) > 0;
+      if (threadLocked || isUploadingAttachments) {
+        setError("This thread is already responding.");
+        return false;
+      }
+
+      void handleSend(trimmedContent, {
+        parentMessageId: targetMessage.parentId,
+        historyHeadMessageId: messageId,
+        preUploadedAttachments: existingAttachments,
+        suppressComposerReset: true,
+      });
+      return true;
+    },
+    [
+      thread,
+      activeThreadId,
+      settings,
+      connection,
+      model,
+      onOpenSettings,
+      messageMap,
+      threadMessages,
+      isUploadingAttachments,
+      handleSend,
+    ],
+  );
+
   useEffect(() => {
     handleSendRef.current = handleSend;
   }, [handleSend]);
@@ -2054,6 +2184,7 @@ export default function ChatView({
               approvals={messageApprovals}
               onResolveApproval={handleApprovalDecision}
               approvalBusyIds={approvalBusyIds}
+              onResendEditedUserMessage={handleResendEditedUserMessage}
             />
           </div>
         );
@@ -2072,6 +2203,7 @@ export default function ChatView({
       toolApprovalsByMessage,
       handleApprovalDecision,
       approvalBusyIds,
+      handleResendEditedUserMessage,
       streamDraftByMessageId,
     ]
   );

package/template/src/components/MessageCard.tsx

@@ -14,7 +14,7 @@ import {
   PlusCircle,
   X,
 } from "lucide-react";
-import { memo, useMemo, useRef, useState } from "react";
+import { memo, useEffect, useMemo, useRef, useState } from "react";
 import type {
   ChatCitationSource,
   MessageNode,
@@ -118,6 +118,10 @@ function normalizeMarkdownStructure(content: string) {
   return normalized.join("\n").replace(/\n{3,}/g, "\n\n").trim();
 }
 
+function normalizeUserTextForEditor(content: string): string {
+  return content.replace(/\s+/g, " ").trim();
+}
+
 function stabilizeStreamingMarkdown(content: string) {
   let stable = content;
   const fenceMatches = stable.match(/```/g);
@@ -1242,6 +1246,7 @@ function MessageCard({
   approvals,
   onResolveApproval,
   approvalBusyIds,
+  onResendEditedUserMessage,
 }: {
   message: MessageNode;
   onAddThread: (message: MessageNode) => void;
@@ -1259,12 +1264,20 @@ function MessageCard({
     argsOverride?: Record<string, unknown>,
   ) => void;
   approvalBusyIds?: Record<string, boolean>;
+  onResendEditedUserMessage?: (messageId: string, content: string) => Promise<boolean>;
 }) {
   const [copied, setCopied] = useState(false);
   const [threadAdded, setThreadAdded] = useState(false);
   const [assistantCollapsed, setAssistantCollapsed] = useState(false);
   const [threadEditMode, setThreadEditMode] = useState(false);
+  const [isEditingUserMessage, setIsEditingUserMessage] = useState(false);
+  const [editedUserContent, setEditedUserContent] = useState("");
+  const [isSubmittingUserEdit, setIsSubmittingUserEdit] = useState(false);
+  const [userEditWidthPx, setUserEditWidthPx] = useState<number | null>(null);
+  const userMessageCardRef = useRef<HTMLDivElement | null>(null);
+  const userEditTextareaRef = useRef<HTMLTextAreaElement | null>(null);
   const isAssistant = message.role === "assistant";
+  const canEditUserMessage = !isAssistant && Boolean(onResendEditedUserMessage);
   const canAddThread = threads.length < 4;
   const shelfThreads = [
     ...(baseThreadId ? [{ id: baseThreadId, title: "Thread 1", isBase: true }] : []),
@@ -1284,6 +1297,8 @@ function MessageCard({
     () => (message.role === "user" ? normalizeChatAttachments(message.attachments) : []),
     [message.role, message.attachments],
   );
+  const canSubmitUserEdit =
+    editedUserContent.trim().length > 0 || userAttachments.length > 0;
   const sourcesOrderedByCitation = useMemo(
     () => reorderSourcesByCitationOrder(messageTextContent, messageSources),
     [messageTextContent, messageSources],
@@ -1342,9 +1357,65 @@ function MessageCard({
     return "Working on your request.";
   }, [messageTextContent, timelineItems, approvalItems]);
 
+  useEffect(() => {
+    if (!isEditingUserMessage) {
+      return;
+    }
+    requestAnimationFrame(() => {
+      const element = userEditTextareaRef.current;
+      if (!element) {
+        return;
+      }
+      element.focus();
+      const end = element.value.length;
+      element.setSelectionRange(end, end);
+    });
+  }, [isEditingUserMessage]);
+
+  const startUserMessageEdit = () => {
+    const cardWidth = userMessageCardRef.current?.getBoundingClientRect().width ?? null;
+    setUserEditWidthPx(cardWidth && Number.isFinite(cardWidth) ? Math.max(0, Math.round(cardWidth)) : null);
+    setEditedUserContent(normalizeUserTextForEditor(messageTextContent));
+    setIsEditingUserMessage(true);
+  };
+
+  const cancelUserMessageEdit = () => {
+    if (isSubmittingUserEdit) {
+      return;
+    }
+    setIsEditingUserMessage(false);
+    setEditedUserContent("");
+    setUserEditWidthPx(null);
+  };
+
+  const submitUserMessageEdit = async () => {
+    if (!onResendEditedUserMessage || isSubmittingUserEdit || !canSubmitUserEdit) {
+      return;
+    }
+    setIsSubmittingUserEdit(true);
+    try {
+      const success = await onResendEditedUserMessage(message.id, editedUserContent);
+      if (success) {
+        setIsEditingUserMessage(false);
+        setEditedUserContent("");
+        setUserEditWidthPx(null);
+      }
+    } finally {
+      setIsSubmittingUserEdit(false);
+    }
+  };
+
   return (
     <div className="message-stack group">
-      <div className={`${isAssistant ? "assistant-card" : "message-card user"} group`}>
+      <div
+        ref={!isAssistant ? userMessageCardRef : null}
+        className={`${isAssistant ? "assistant-card" : "message-card user"} group`}
+        style={
+          !isAssistant && isEditingUserMessage && userEditWidthPx
+            ? { width: `${userEditWidthPx}px` }
+            : undefined
+        }
+      >
         {isAssistant ? (
           <div className="assistant-collapse-row">
             <button
@@ -1441,7 +1512,52 @@ function MessageCard({
                   ))}
                 </div>
               ) : null}
-              {messageTextContent ? <p>{messageTextContent}</p> : null}
+              {isEditingUserMessage ? (
+                <div className="user-edit-shell">
+                  <textarea
+                    ref={userEditTextareaRef}
+                    value={editedUserContent}
+                    onChange={(event) => setEditedUserContent(event.target.value)}
+                    className="user-edit-textarea"
+                    placeholder="Edit your message"
+                    rows={4}
+                    disabled={isSubmittingUserEdit}
+                    onKeyDown={(event) => {
+                      if ((event.metaKey || event.ctrlKey) && event.key === "Enter") {
+                        event.preventDefault();
+                        void submitUserMessageEdit();
+                        return;
+                      }
+                      if (event.key === "Escape") {
+                        event.preventDefault();
+                        cancelUserMessageEdit();
+                      }
+                    }}
+                  />
+                  <div className="user-edit-actions">
+                    <button
+                      type="button"
+                      className="user-edit-cancel"
+                      onClick={cancelUserMessageEdit}
+                      disabled={isSubmittingUserEdit}
+                    >
+                      Cancel
+                    </button>
+                    <button
+                      type="button"
+                      className="user-edit-send"
+                      onClick={() => {
+                        void submitUserMessageEdit();
+                      }}
+                      disabled={isSubmittingUserEdit || !canSubmitUserEdit}
+                    >
+                      Send
+                    </button>
+                  </div>
+                </div>
+              ) : messageTextContent ? (
+                <p>{messageTextContent}</p>
+              ) : null}
             </div>
           )}
 
@@ -1594,61 +1710,73 @@ function MessageCard({
           </div>
         ) : null}
       </div>
-      <div
-        className={`message-actions ${isAssistant ? "assistant opacity-0 transition-opacity duration-150 hover:opacity-100" : "user"}`}
-      >
-        {isAssistant ? (
+      {isAssistant || !isEditingUserMessage ? (
+        <div
+          className={`message-actions ${isAssistant ? "assistant opacity-0 transition-opacity duration-150 hover:opacity-100" : "user"}`}
+        >
+          {isAssistant ? (
+            <button
+              className={`flex items-center justify-center gap-2 rounded-full border border-[var(--border)] px-4 py-2 text-xs text-[var(--text-muted)] transition ${canAddThread
+                ? "hover:border-[var(--border-strong)] hover:text-[var(--text-secondary)]"
+                : "opacity-60 cursor-not-allowed"
+                }`}
+              onClick={async () => {
+                if (!canAddThread) return;
+                await onAddThread(message);
+                setThreadAdded(true);
+                window.setTimeout(() => setThreadAdded(false), 1200);
+              }}
+              disabled={!canAddThread}
+            >
+              {threadAdded ? (
+                <Check className="h-4 w-4 text-[var(--accent)]" />
+              ) : (
+                <>
+                  <PlusCircle className="h-4 w-4" />
+                  Thread
+                </>
+              )}
+            </button>
+          ) : null}
           <button
-            className={`flex items-center justify-center gap-2 rounded-full border border-[var(--border)] px-4 py-2 text-xs text-[var(--text-muted)] transition ${canAddThread
-              ? "hover:border-[var(--border-strong)] hover:text-[var(--text-secondary)]"
-              : "opacity-60 cursor-not-allowed"
+            className={`flex items-center gap-2 rounded-full border border-[var(--border)] px-4 py-2 text-xs text-[var(--text-muted)] transition hover:border-[var(--border-strong)] hover:text-[var(--text-secondary)] ${isAssistant ? "" : "opacity-0 group-hover:opacity-100"
               }`}
             onClick={async () => {
-              if (!canAddThread) return;
-              await onAddThread(message);
-              setThreadAdded(true);
-              window.setTimeout(() => setThreadAdded(false), 1200);
+              await navigator.clipboard.writeText(messageTextContent);
+              setCopied(true);
+              window.setTimeout(() => setCopied(false), 1200);
             }}
-            disabled={!canAddThread}
           >
-            {threadAdded ? (
+            {copied ? (
               <Check className="h-4 w-4 text-[var(--accent)]" />
             ) : (
-              <>
-                <PlusCircle className="h-4 w-4" />
-                Thread
-              </>
+              <Copy className="h-4 w-4" />
             )}
           </button>
-        ) : null}
-        <button
-          className={`flex items-center gap-2 rounded-full border border-[var(--border)] px-4 py-2 text-xs text-[var(--text-muted)] transition hover:border-[var(--border-strong)] hover:text-[var(--text-secondary)] ${isAssistant ? "" : "opacity-0 group-hover:opacity-100"
-            }`}
-          onClick={async () => {
-            await navigator.clipboard.writeText(messageTextContent);
-            setCopied(true);
-            window.setTimeout(() => setCopied(false), 1200);
-          }}
-        >
-          {copied ? (
-            <Check className="h-4 w-4 text-[var(--accent)]" />
-          ) : (
-            <Copy className="h-4 w-4" />
-          )}
-        </button>
-        {canEditThreads ? (
-          <button
-            className={`flex items-center gap-2 rounded-full border px-4 py-2 text-xs transition ${threadEditMode
-              ? "border-[var(--accent-ring)] text-[var(--text-primary)]"
-              : "border-[var(--border)] text-[var(--text-muted)] hover:border-[var(--border-strong)] hover:text-[var(--text-secondary)]"
-              }`}
-            onClick={() => setThreadEditMode((prev) => !prev)}
-            aria-label="Edit threads"
-          >
-            <Pencil className="h-4 w-4" />
-          </button>
-        ) : null}
-      </div>
+          {canEditUserMessage ? (
+            <button
+              type="button"
+              className="flex items-center gap-2 rounded-full border border-[var(--border)] px-4 py-2 text-xs text-[var(--text-muted)] opacity-0 transition hover:border-[var(--border-strong)] hover:text-[var(--text-secondary)] group-hover:opacity-100"
+              onClick={startUserMessageEdit}
+              aria-label="Edit message"
+            >
+              <Pencil className="h-4 w-4" />
+            </button>
+          ) : null}
+          {canEditThreads ? (
+            <button
+              className={`flex items-center gap-2 rounded-full border px-4 py-2 text-xs transition ${threadEditMode
+                ? "border-[var(--accent-ring)] text-[var(--text-primary)]"
+                : "border-[var(--border)] text-[var(--text-muted)] hover:border-[var(--border-strong)] hover:text-[var(--text-secondary)]"
+                }`}
+              onClick={() => setThreadEditMode((prev) => !prev)}
+              aria-label="Edit threads"
+            >
+              <Pencil className="h-4 w-4" />
+            </button>
+          ) : null}
+        </div>
+      ) : null}
     </div>
   );
 }

package/template/src/lib/data.ts

@@ -294,10 +294,11 @@ export async function appendUserAndAssistant(params: {
   thread: Thread;
   content: string;
   attachments?: ChatAttachment[];
+  parentId?: string | null;
   provider: string;
   model: string;
 }) {
-  const { thread, content, attachments, provider, model } = params;
+  const { thread, content, attachments, parentId = thread.headMessageId, provider, model } = params;
   const now = Date.now();
   const userId = nanoid();
   const assistantId = nanoid();
@@ -305,7 +306,7 @@ export async function appendUserAndAssistant(params: {
   const userMessage: MessageNode = {
     id: userId,
     conversationId: thread.conversationId,
-    parentId: thread.headMessageId,
+    parentId,
     role: "user",
     content,
     ...(attachments?.length ? { attachments } : {}),