Merge commit '60a636efd8e6002a69bae78105fb3ed37de7de46'

This commit is contained in:
gsxdsm
2026-05-20 16:20:26 -07:00
4 changed files with 141 additions and 17 deletions

View File

@@ -25,7 +25,7 @@ import {
TriangleAlert,
} from "lucide-react";
import { useChat, type ChatMessageInfo, type FailureInfo, type ToolCallInfo } from "../hooks/useChat";
import { useChatRooms } from "../hooks/useChatRooms";
import { RoomMessageDeliveredButReplyFailedError, useChatRooms } from "../hooks/useChatRooms";
import { useChatUnread } from "../hooks/useChatUnread";
import { useViewportMode } from "./Header";
import { updateGlobalSettings, type DiscoveredSkill } from "../api";
@@ -1718,6 +1718,14 @@ export function ChatView({ projectId, addToast, experimentalFeatures }: ChatView
try {
await rooms.sendRoomMessage(trimmed, { files: pendingAttachments.map((attachment) => attachment.file) });
} catch (error) {
if (error instanceof RoomMessageDeliveredButReplyFailedError) {
const message = error.message.trim()
? error.message
: "Message sent, but assistant reply failed";
addToast(`Message sent, but assistant reply failed: ${message}`, "error");
return;
}
setMessageInput(previousInput);
const message = error instanceof Error && error.message.trim()
? error.message