mirror of
https://github.com/siteboon/claudecodeui.git
synced 2026-07-02 18:43:08 +08:00
* fix(shell): hide prompt options on desktop * fix(chat): group continuous same-tool runs more consistently Consecutive tool calls (Edit, Read, Grep, etc.) grouped inconsistently: - The group threshold was 3, so a run of only 2 calls stayed ungrouped while a run of 3 collapsed — making two back-to-back edits look different from three. - A run was broken by any interleaved message, including ones that render nothing (reasoning hidden when showThinking is off). Providers like Codex interleave hidden reasoning between tool calls, so visually continuous edits intermittently failed to group. Lower TOOL_GROUP_THRESHOLD to 2 and skip non-rendered messages when extending a run, so any 2+ consecutive same-tool calls collapse reliably. ChatMessagesPane now passes showThinking into groupConsecutiveTools. * fix(chat): stabilize message scroll controls * fix: update command menu positioning * fix(chat): refine load all overlay behavior * fix(chat): hide load all prompt after final page * fix(chat): remove auto scroll quick setting * fix(chat): unify messages and composer into centered column Constrain both ChatMessagesPane content and ChatComposer to the same max-w-3xl centered column. Previously only the composer had a max-width, causing messages to fill the full width while the input stayed narrow, making them visually misaligned with large empty gutters on either side. * style(ui): rework light/dark theme to make it visually consistent Rework the color system around warm neutrals and route hardcoded surfaces through theme tokens for consistency. - Theme tokens (index.css, ThemeContext): warm cream light mode and neutral charcoal dark mode, replacing the pure-white/blue-tinted palette; update PWA theme-color meta - Code blocks: soft grey background in light mode via oneLight/oneDark, and drop the Tailwind Typography <pre> shell that framed the highlighter in a dark box - Dropdowns/panels: convert CommandMenu, Quick Settings, and the JSON response block from hardcoded gray/slate to popover/muted/border tokens - Git panel: Publish button purple -> primary blue - Composer: drop top padding so the input sits flush with the thread * fix: use app theme for code editor * style(chat): unify composer toolbar heights and declutter slash-command modal - Composer: give the permission-mode and token-usage buttons a fixed h-8 so every bottom-toolbar control shares one height - CommandResultModal: replace the blue gradient header (gradient fill, glow blobs, blue eyebrow + icon chip) with a clean neutral header on popover/muted tokens * fix(chat): header ellipsis, Codex logo on light theme, portal copy menu - MainContentTitle: truncate the session title with an ellipsis instead of horizontal-scrolling it - MessageComponent: use text-foreground for the provider logo chip so the currentColor Codex/OpenAI mark is visible on the light theme - MessageCopyControl: render the copy-format dropdown in a portal so it escapes the chat message's `contain: paint` clip box; anchor it to the trigger, flip above near the viewport bottom, close on scroll/resize * style(mcp): remove purple accents and portal the server form modal - Replace the purple provider-button colors, heading icon, and form submit button with the primary token (no purple in the MCP UI) - Portal the add/edit MCP server modal to document.body so its fixed overlay covers the full viewport, fixing the white band at the top caused by the Settings dialog's transformed tab content becoming the containing block * style(ui): use Merriweather serif for chat text and Encode Sans for the rest of the UI * fix: align activity indicator with composer input width Wrap ActivityIndicator in the same mx-auto max-w-3xl container as the text input so the "Analyzing…" label and Stop button stay within the input's boundaries instead of spanning the full window width. * style: improve thinking and stop button placements * style(auth): modernize login, setup, and onboarding screens * fix(chat): correct invalid dark-mode hover on AskUserQuestion options * fix: remove unnecessary auto expand tools * fix: resolve coderabbit comments * fix(chat): widen chat layout and sidebar titles * fix(branding): update CloudCLI wordmark styling --------- Co-authored-by: Simos Mikelatos <simosmik@gmail.com>
301 lines
11 KiB
TypeScript
301 lines
11 KiB
TypeScript
import { useTranslation } from 'react-i18next';
|
|
import { memo, useCallback, useMemo } from 'react';
|
|
import type { Dispatch, RefObject, SetStateAction } from 'react';
|
|
|
|
import type { ChatMessage } from '../../types/types';
|
|
import type {
|
|
Project,
|
|
ProjectSession,
|
|
LLMProvider,
|
|
ProviderModelsDefinition,
|
|
} from '../../../../types/app';
|
|
import { getIntrinsicMessageKey } from '../../utils/messageKeys';
|
|
import { groupConsecutiveTools, isToolGroupItem } from '../../utils/toolGrouping';
|
|
|
|
import MessageComponent from './MessageComponent';
|
|
import ProviderSelectionEmptyState from './ProviderSelectionEmptyState';
|
|
import ToolGroupContainer from './ToolGroupContainer';
|
|
import LoadAllMessagesOverlay from './LoadAllMessagesOverlay';
|
|
|
|
interface ChatMessagesPaneProps {
|
|
scrollContainerRef: RefObject<HTMLDivElement>;
|
|
onWheel: () => void;
|
|
onTouchMove: () => void;
|
|
isLoadingSessionMessages: boolean;
|
|
/** True while the viewed session has an active provider run in flight. */
|
|
isProcessing?: boolean;
|
|
chatMessages: ChatMessage[];
|
|
selectedSession: ProjectSession | null;
|
|
currentSessionId: string | null;
|
|
provider: LLMProvider;
|
|
setProvider: (provider: LLMProvider) => void;
|
|
textareaRef: RefObject<HTMLTextAreaElement>;
|
|
claudeModel: string;
|
|
setClaudeModel: (model: string) => void;
|
|
cursorModel: string;
|
|
setCursorModel: (model: string) => void;
|
|
codexModel: string;
|
|
setCodexModel: (model: string) => void;
|
|
geminiModel: string;
|
|
setGeminiModel: (model: string) => void;
|
|
opencodeModel: string;
|
|
setOpenCodeModel: (model: string) => void;
|
|
providerModelCatalog: Partial<Record<LLMProvider, ProviderModelsDefinition>>;
|
|
providerModelsLoading: boolean;
|
|
tasksEnabled: boolean;
|
|
isTaskMasterInstalled: boolean | null;
|
|
onShowAllTasks?: (() => void) | null;
|
|
setInput: Dispatch<SetStateAction<string>>;
|
|
isLoadingMoreMessages: boolean;
|
|
hasMoreMessages: boolean;
|
|
totalMessages: number;
|
|
sessionMessagesCount: number;
|
|
visibleMessageCount: number;
|
|
visibleMessages: ChatMessage[];
|
|
loadEarlierMessages: () => void;
|
|
loadAllMessages: () => void;
|
|
allMessagesLoaded: boolean;
|
|
isLoadingAllMessages: boolean;
|
|
loadAllJustFinished: boolean;
|
|
showLoadAllOverlay: boolean;
|
|
createDiff: any;
|
|
onFileOpen?: (filePath: string, diffInfo?: unknown) => void;
|
|
onShowSettings?: () => void;
|
|
onGrantToolPermission: (suggestion: { entry: string; toolName: string }) => { success: boolean };
|
|
showRawParameters?: boolean;
|
|
showThinking?: boolean;
|
|
selectedProject: Project;
|
|
}
|
|
|
|
function ChatMessagesPane({
|
|
scrollContainerRef,
|
|
onWheel,
|
|
onTouchMove,
|
|
isLoadingSessionMessages,
|
|
isProcessing = false,
|
|
chatMessages,
|
|
selectedSession,
|
|
currentSessionId,
|
|
provider,
|
|
setProvider,
|
|
textareaRef,
|
|
claudeModel,
|
|
setClaudeModel,
|
|
cursorModel,
|
|
setCursorModel,
|
|
codexModel,
|
|
setCodexModel,
|
|
geminiModel,
|
|
setGeminiModel,
|
|
opencodeModel,
|
|
setOpenCodeModel,
|
|
providerModelCatalog,
|
|
providerModelsLoading,
|
|
tasksEnabled,
|
|
isTaskMasterInstalled,
|
|
onShowAllTasks,
|
|
setInput,
|
|
isLoadingMoreMessages,
|
|
hasMoreMessages,
|
|
totalMessages,
|
|
sessionMessagesCount,
|
|
visibleMessageCount,
|
|
visibleMessages,
|
|
loadEarlierMessages,
|
|
loadAllMessages,
|
|
allMessagesLoaded,
|
|
isLoadingAllMessages,
|
|
loadAllJustFinished,
|
|
showLoadAllOverlay,
|
|
createDiff,
|
|
onFileOpen,
|
|
onShowSettings,
|
|
onGrantToolPermission,
|
|
showRawParameters,
|
|
showThinking,
|
|
selectedProject,
|
|
}: ChatMessagesPaneProps) {
|
|
const { t } = useTranslation('chat');
|
|
const groupedVisibleMessages = useMemo(
|
|
() => groupConsecutiveTools(visibleMessages, Boolean(showThinking)),
|
|
[visibleMessages, showThinking],
|
|
);
|
|
|
|
// Stable, deterministic keys for the messages rendered this pass.
|
|
//
|
|
// `normalizedToChatMessages` rebuilds fresh ChatMessage objects on every store
|
|
// update, so caching keys by object identity (or via a cross-render allocation
|
|
// Set) minted a brand-new key for the *same* logical message on each prepend —
|
|
// remounting the whole list, which disconnects the scroll-restore anchor and
|
|
// reflows heights, jumping the viewport to the bottom. Deriving keys purely
|
|
// from this render's ordered messages (intrinsic key, disambiguated by
|
|
// occurrence index on collision) yields the same key for the same message
|
|
// order, so React preserves existing DOM nodes and component state on prepend.
|
|
const messageKeyMap = useMemo(() => {
|
|
const keys = new WeakMap<ChatMessage, string>();
|
|
const occurrences = new Map<string, number>();
|
|
const assign = (message: ChatMessage) => {
|
|
const intrinsicKey = getIntrinsicMessageKey(message) ?? 'message-generated';
|
|
const seen = occurrences.get(intrinsicKey) ?? 0;
|
|
occurrences.set(intrinsicKey, seen + 1);
|
|
keys.set(message, seen === 0 ? intrinsicKey : `${intrinsicKey}__${seen}`);
|
|
};
|
|
for (const item of groupedVisibleMessages) {
|
|
if (isToolGroupItem(item)) {
|
|
item.messages.forEach(assign);
|
|
} else {
|
|
assign(item);
|
|
}
|
|
}
|
|
return keys;
|
|
}, [groupedVisibleMessages]);
|
|
|
|
const getMessageKey = useCallback(
|
|
(message: ChatMessage) =>
|
|
messageKeyMap.get(message) ?? getIntrinsicMessageKey(message) ?? 'message-generated',
|
|
[messageKeyMap],
|
|
);
|
|
|
|
return (
|
|
<div
|
|
ref={scrollContainerRef}
|
|
onWheel={onWheel}
|
|
onTouchMove={onTouchMove}
|
|
className="chat-messages-pane relative min-h-0 flex-1 overflow-y-auto overflow-x-hidden py-3 sm:py-4"
|
|
>
|
|
<div className="mx-auto w-full max-w-[54.25rem] space-y-3 px-4 sm:space-y-4">
|
|
{(isLoadingSessionMessages || isProcessing) && chatMessages.length === 0 ? (
|
|
<div className="mt-8 text-center text-gray-500 dark:text-gray-400">
|
|
<div className="flex items-center justify-center space-x-2">
|
|
<div className="h-4 w-4 animate-spin rounded-full border-b-2 border-gray-400" />
|
|
<p>{t('session.loading.sessionMessages')}</p>
|
|
</div>
|
|
</div>
|
|
) : chatMessages.length === 0 ? (
|
|
<ProviderSelectionEmptyState
|
|
selectedSession={selectedSession}
|
|
currentSessionId={currentSessionId}
|
|
provider={provider}
|
|
setProvider={setProvider}
|
|
textareaRef={textareaRef}
|
|
claudeModel={claudeModel}
|
|
setClaudeModel={setClaudeModel}
|
|
cursorModel={cursorModel}
|
|
setCursorModel={setCursorModel}
|
|
codexModel={codexModel}
|
|
setCodexModel={setCodexModel}
|
|
geminiModel={geminiModel}
|
|
setGeminiModel={setGeminiModel}
|
|
opencodeModel={opencodeModel}
|
|
setOpenCodeModel={setOpenCodeModel}
|
|
providerModelCatalog={providerModelCatalog}
|
|
providerModelsLoading={providerModelsLoading}
|
|
tasksEnabled={tasksEnabled}
|
|
isTaskMasterInstalled={isTaskMasterInstalled}
|
|
onShowAllTasks={onShowAllTasks}
|
|
setInput={setInput}
|
|
/>
|
|
) : (
|
|
<>
|
|
{/* Loading indicator for older messages (hide when load-all is active) */}
|
|
{isLoadingMoreMessages && !isLoadingAllMessages && !allMessagesLoaded && (
|
|
<div className="py-3 text-center text-gray-500 dark:text-gray-400">
|
|
<div className="flex items-center justify-center space-x-2">
|
|
<div className="h-4 w-4 animate-spin rounded-full border-b-2 border-gray-400" />
|
|
<p className="text-sm">{t('session.loading.olderMessages')}</p>
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{/* Indicator showing there are more messages to load (hide when all loaded) */}
|
|
{hasMoreMessages && !isLoadingMoreMessages && !allMessagesLoaded && (
|
|
<div className="border-b border-gray-200 py-2 text-center text-sm text-gray-500 dark:border-gray-700 dark:text-gray-400">
|
|
{totalMessages > 0 && (
|
|
<span>
|
|
{t('session.messages.showingOf', { shown: sessionMessagesCount, total: totalMessages })}{' '}
|
|
<span className="text-xs">{t('session.messages.scrollToLoad')}</span>
|
|
</span>
|
|
)}
|
|
</div>
|
|
)}
|
|
|
|
<LoadAllMessagesOverlay
|
|
showLoadAllOverlay={showLoadAllOverlay}
|
|
isLoadingAllMessages={isLoadingAllMessages}
|
|
loadAllJustFinished={loadAllJustFinished}
|
|
totalMessages={totalMessages}
|
|
onLoadAllMessages={loadAllMessages}
|
|
/>
|
|
|
|
{/* Legacy message count indicator (for non-paginated view) */}
|
|
{!hasMoreMessages && chatMessages.length > visibleMessageCount && (
|
|
<div className="border-b border-gray-200 py-2 text-center text-sm text-gray-500 dark:border-gray-700 dark:text-gray-400">
|
|
{t('session.messages.showingLast', { count: visibleMessageCount, total: chatMessages.length })} |
|
|
<button className="ml-1 text-blue-600 underline hover:text-blue-700" onClick={loadEarlierMessages}>
|
|
{t('session.messages.loadEarlier')}
|
|
</button>
|
|
{' | '}
|
|
<button
|
|
className="text-blue-600 underline hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300"
|
|
onClick={loadAllMessages}
|
|
>
|
|
{t('session.messages.loadAll')}
|
|
</button>
|
|
</div>
|
|
)}
|
|
|
|
{(() => {
|
|
let prevMessage: ChatMessage | null = null;
|
|
|
|
return groupedVisibleMessages.map((item) => {
|
|
if (isToolGroupItem(item)) {
|
|
const groupPrevMessage = prevMessage;
|
|
prevMessage = item.messages[item.messages.length - 1] || prevMessage;
|
|
|
|
return (
|
|
<ToolGroupContainer
|
|
key={`tool-group-${getMessageKey(item.messages[0])}`}
|
|
group={item}
|
|
prevMessage={groupPrevMessage}
|
|
createDiff={createDiff}
|
|
getMessageKey={getMessageKey}
|
|
onFileOpen={onFileOpen}
|
|
onShowSettings={onShowSettings}
|
|
onGrantToolPermission={onGrantToolPermission}
|
|
showRawParameters={showRawParameters}
|
|
showThinking={showThinking}
|
|
selectedProject={selectedProject}
|
|
provider={provider}
|
|
/>
|
|
);
|
|
}
|
|
|
|
const messagePrevMessage = prevMessage;
|
|
prevMessage = item;
|
|
|
|
return (
|
|
<MessageComponent
|
|
key={getMessageKey(item)}
|
|
message={item}
|
|
prevMessage={messagePrevMessage}
|
|
createDiff={createDiff}
|
|
onFileOpen={onFileOpen}
|
|
onShowSettings={onShowSettings}
|
|
onGrantToolPermission={onGrantToolPermission}
|
|
showRawParameters={showRawParameters}
|
|
showThinking={showThinking}
|
|
selectedProject={selectedProject}
|
|
provider={provider}
|
|
/>
|
|
);
|
|
});
|
|
})()}
|
|
</>
|
|
)}
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
export default memo(ChatMessagesPane);
|