Ctrl+Shift+R: regenerate assistant

src/apps/chat/AppChat.tsx

@@ -9,6 +9,7 @@ import { useModelsStore } from '~/modules/llms/store-llms';
 
 import { ConfirmationModal } from '~/common/components/ConfirmationModal';
 import { createDMessage, DMessage, useChatStore } from '~/common/state/store-chats';
+import { useGlobalShortcut } from '~/common/components/useGlobalShortcut';
 import { useLayoutPluggable } from '~/common/layout/store-applayout';
 
 import { ChatDrawerItems } from './components/applayout/ChatDrawerItems';
@@ -134,6 +135,19 @@ export function AppChat() {
       return await handleExecuteConversation(chatModeId, conversationId, [...conversation.messages, createDMessage('user', userText)]);
   };
 
+  const handleRegenerateAssistant = async () => {
+    const conversation = activeConversationId ? _findConversation(activeConversationId) : null;
+    if (conversation?.messages?.length) {
+      const lastMessage = conversation.messages[conversation.messages.length - 1];
+      if (lastMessage.role === 'assistant') {
+        const newMessages = [...conversation.messages];
+        newMessages.pop();
+        return await handleExecuteConversation('immediate', conversation.id, newMessages);
+      }
+    }
+  };
+  useGlobalShortcut('r', true, true, handleRegenerateAssistant);
+
 
   const handleClearConversation = (conversationId: string) => setClearConfirmationId(conversationId);
 

src/apps/chat/components/message/ChatMessage.tsx

@@ -25,10 +25,11 @@ import { CloseableMenu } from '~/common/components/CloseableMenu';
 import { DMessage } from '~/common/state/store-chats';
 import { InlineError } from '~/common/components/InlineError';
 import { InlineTextarea } from '~/common/components/InlineTextarea';
+import { KeyStroke } from '~/common/components/KeyStroke';
 import { Link } from '~/common/components/Link';
 import { SystemPurposeId, SystemPurposes } from '../../../../data';
 import { copyToClipboard } from '~/common/util/copyToClipboard';
-import { cssRainbowColorKeyframes } from '~/common/theme';
+import { cssRainbowColorKeyframes, hideOnMobile } from '~/common/theme';
 import { prettyBaseModel } from '~/common/util/modelUtils';
 import { useUIPreferencesStore } from '~/common/state/store-ui';
 
@@ -446,7 +447,15 @@ export function ChatMessage(props: { message: DMessage, diffText?: string, showD
           {!!props.onMessageRunFrom && (
             <MenuItem onClick={handleMenuRunAgain}>
               <ListItemDecorator>{fromAssistant ? <ReplayIcon /> : <FastForwardIcon />}</ListItemDecorator>
-              {fromAssistant ? 'Retry' : 'Run from here'}
+              {!fromAssistant
+                ? 'Run from here'
+                : !props.isBottom
+                  ? 'Retry from here'
+                  : <Box sx={{ flexGrow: 1, display: 'flex', justifyContent: 'space-between', gap: 1 }}>
+                    Retry
+                    <KeyStroke light combo='Ctrl + Shift + R' sx={hideOnMobile} />
+                  </Box>
+              }
             </MenuItem>
           )}
           {isImaginable && isImaginableEnabled && (

src/common/components/KeyStroke.tsx

@@ -1,13 +1,14 @@
 import * as React from 'react';
 
 import { Chip } from '@mui/joy';
+import { SxProps } from '@mui/system';
 
 /**
  * Shows a shortcut combo in a nicely presented dark box.
  */
-export function KeyStroke(props: { combo: string }) {
+export function KeyStroke(props: { combo: string, light?: boolean, sx?: SxProps }) {
   return (
-    <Chip variant='solid' color='neutral'>
+    <Chip variant={props.light ? 'outlined' : 'solid'} color='neutral' sx={props.sx}>
       {props.combo}
     </Chip>
     // <Box sx={{