Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions scripts/check_react_compiler_coverage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ const HOT_COMPONENTS: Record<string, readonly string[]> = {
* so fixing a component forces its removal here.
*/
const KNOWN_SKIPPED: ReadonlySet<string> = new Set([
"src/browser/features/Messages/MessageRenderer.tsx#MessageRenderer",
"src/browser/features/Messages/AssistantMessage.tsx#AssistantMessage",
"src/browser/components/ProjectSidebar/ProjectSidebar.tsx#ProjectSidebarInner",
"src/browser/components/AppLoader/AppLoader.tsx#UserPreferencesStartupGate",
"src/browser/features/RightSidebar/RightSidebar.tsx#RightSidebarComponent",
Expand Down
32 changes: 18 additions & 14 deletions src/browser/features/Messages/AssistantMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { ModelDisplay } from "./ModelDisplay";
import { ModelFallbackBadge } from "./ModelFallbackBadge";
import { AutoModelRoutingBadge } from "./AutoModelRoutingBadge";
import { TypewriterMarkdown } from "./TypewriterMarkdown";
import { runWithCatch } from "@/browser/utils/compilerSafeControlFlow";

interface AssistantMessageProps {
message: DisplayedMessage & { type: "assistant" };
Expand Down Expand Up @@ -100,22 +101,25 @@ export const AssistantMessage: React.FC<AssistantMessageProps> = ({
return;
}

try {
// Response-level forks branch from this assistant turn instead of cloning the entire
// transcript, so users can explore alternatives without carrying over later replies.
const result = await forkWorkspace({
client: api,
sourceWorkspaceId: workspaceId,
sourceMessageId: message.historyId,
});
await runWithCatch(
async () => {
// Response-level forks branch from this assistant turn instead of cloning the entire
// transcript, so users can explore alternatives without carrying over later replies.
const result = await forkWorkspace({
client: api,
sourceWorkspaceId: workspaceId,
sourceMessageId: message.historyId,
});

if (!result.success) {
forkError.showError(message.historyId, result.error ?? "Failed to fork chat");
if (!result.success) {
forkError.showError(message.historyId, result.error ?? "Failed to fork chat");
}
},
(error) => {
const messageText = error instanceof Error ? error.message : "Failed to fork chat";
forkError.showError(message.historyId, messageText);
}
} catch (error) {
const messageText = error instanceof Error ? error.message : "Failed to fork chat";
forkError.showError(message.historyId, messageText);
}
);
};

// Scratch chats cannot be forked (the backend rejects it), so hide the
Expand Down
4 changes: 2 additions & 2 deletions src/browser/features/Messages/MessageRenderer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function getTranscriptQuoteText(message: DisplayedMessage): string | null {
// Memoized to prevent unnecessary re-renders when parent (AIView) updates
export const MessageRenderer = React.memo<MessageRendererProps>(
({
message,
message: messageProp,
className,
onEditUserMessage,
workspaceId,
Expand All @@ -90,7 +90,7 @@ export const MessageRenderer = React.memo<MessageRendererProps>(
taskReportLinking,
userMessageNavigation,
}) => {
message = useStreamingMessageDelta(workspaceId, message);
const message = useStreamingMessageDelta(workspaceId, messageProp);
let renderedMessage: React.ReactNode;

// Route based on message type
Expand Down
Loading