mirror of
https://github.com/siteboon/claudecodeui.git
synced 2026-07-04 20:42:57 +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>
331 lines
10 KiB
TypeScript
331 lines
10 KiB
TypeScript
import React, { memo, useMemo, useCallback } from 'react';
|
|
|
|
import type { Project } from '../../../types/app';
|
|
import type { SubagentChildTool } from '../types/types';
|
|
|
|
import { getToolConfig } from './configs/toolConfigs';
|
|
import { OneLineDisplay, BashCommandDisplay, CollapsibleDisplay, ToolDiffViewer, MarkdownContent, FileListContent, TodoListContent, TaskListContent, TextContent, QuestionAnswerContent, SubagentContainer } from './components';
|
|
import { PlanDisplay } from './components/PlanDisplay';
|
|
import { ToolStatusBadge } from './components/ToolStatusBadge';
|
|
import type { ToolStatus } from './components/ToolStatusBadge';
|
|
|
|
type DiffLine = {
|
|
type: string;
|
|
content: string;
|
|
lineNum: number;
|
|
};
|
|
|
|
interface ToolRendererProps {
|
|
toolName: string;
|
|
toolInput: any;
|
|
toolResult?: any;
|
|
toolId?: string;
|
|
mode: 'input' | 'result';
|
|
onFileOpen?: (filePath: string, diffInfo?: any) => void;
|
|
createDiff?: (oldStr: string, newStr: string) => DiffLine[];
|
|
selectedProject?: Project | null;
|
|
showRawParameters?: boolean;
|
|
rawToolInput?: string;
|
|
isSubagentContainer?: boolean;
|
|
subagentState?: {
|
|
childTools: SubagentChildTool[];
|
|
currentToolIndex: number;
|
|
isComplete: boolean;
|
|
};
|
|
}
|
|
|
|
function getToolCategory(toolName: string): string {
|
|
if (['Edit', 'Write', 'ApplyPatch'].includes(toolName)) return 'edit';
|
|
if (['Grep', 'Glob'].includes(toolName)) return 'search';
|
|
if (toolName === 'Bash') return 'bash';
|
|
if (['TodoWrite', 'TodoRead'].includes(toolName)) return 'todo';
|
|
if (['TaskCreate', 'TaskUpdate', 'TaskList', 'TaskGet'].includes(toolName)) return 'task';
|
|
if (toolName === 'Task') return 'agent';
|
|
if (toolName === 'exit_plan_mode' || toolName === 'ExitPlanMode') return 'plan';
|
|
if (toolName === 'AskUserQuestion') return 'question';
|
|
return 'default';
|
|
}
|
|
|
|
// Exact denial messages from server/claude-sdk.js — other providers can't reliably signal denial
|
|
const CLAUDE_DENIAL_MESSAGES = [
|
|
'user denied tool use',
|
|
'tool disallowed by settings',
|
|
'permission request timed out',
|
|
'permission request cancelled',
|
|
];
|
|
|
|
function deriveToolStatus(toolResult: any): ToolStatus {
|
|
if (!toolResult) return 'running';
|
|
if (toolResult.isError) {
|
|
const content = String(toolResult.content || '').toLowerCase().trim();
|
|
if (CLAUDE_DENIAL_MESSAGES.some((msg) => content.includes(msg))) {
|
|
return 'denied';
|
|
}
|
|
return 'error';
|
|
}
|
|
return 'completed';
|
|
}
|
|
|
|
/**
|
|
* Main tool renderer router
|
|
* Routes to OneLineDisplay or CollapsibleDisplay based on tool config
|
|
*/
|
|
export const ToolRenderer: React.FC<ToolRendererProps> = memo(({
|
|
toolName,
|
|
toolInput,
|
|
toolResult,
|
|
toolId,
|
|
mode,
|
|
onFileOpen,
|
|
createDiff,
|
|
selectedProject,
|
|
showRawParameters = false,
|
|
rawToolInput,
|
|
isSubagentContainer,
|
|
subagentState
|
|
}) => {
|
|
const config = getToolConfig(toolName);
|
|
const displayConfig: any = mode === 'input' ? config.input : config.result;
|
|
|
|
const parsedData = useMemo(() => {
|
|
try {
|
|
const rawData = mode === 'input' ? toolInput : toolResult;
|
|
return typeof rawData === 'string' ? JSON.parse(rawData) : rawData;
|
|
} catch {
|
|
return mode === 'input' ? toolInput : toolResult;
|
|
}
|
|
}, [mode, toolInput, toolResult]);
|
|
|
|
// Only derive and show status badge on input renders
|
|
const toolStatus = useMemo(
|
|
() => mode === 'input' ? deriveToolStatus(toolResult) : undefined,
|
|
[mode, toolResult],
|
|
);
|
|
|
|
const handleAction = useCallback(() => {
|
|
if (displayConfig?.action === 'open-file' && onFileOpen) {
|
|
const value = displayConfig.getValue?.(parsedData) || '';
|
|
onFileOpen(value);
|
|
}
|
|
}, [displayConfig, parsedData, onFileOpen]);
|
|
|
|
// Route subagent containers to dedicated component (after hooks to satisfy Rules of Hooks)
|
|
if (isSubagentContainer && subagentState) {
|
|
if (mode === 'result') return null;
|
|
return (
|
|
<SubagentContainer
|
|
toolInput={toolInput}
|
|
toolResult={toolResult}
|
|
subagentState={subagentState}
|
|
/>
|
|
);
|
|
}
|
|
|
|
if (!displayConfig) return null;
|
|
|
|
// Bash renders as a Codex-style command row: the command on a single line with
|
|
// a chevron that expands to show the output inline. The combined view lives on
|
|
// the input render; the separate result section is suppressed in MessageComponent.
|
|
if (toolName === 'Bash' && mode === 'input') {
|
|
const command = typeof parsedData === 'object' && parsedData !== null && 'command' in parsedData
|
|
? String(parsedData.command || '')
|
|
: typeof toolInput === 'string'
|
|
? toolInput
|
|
: typeof rawToolInput === 'string'
|
|
? rawToolInput
|
|
: '';
|
|
const description = typeof parsedData === 'object' && parsedData !== null && 'description' in parsedData
|
|
? String(parsedData.description || '')
|
|
: undefined;
|
|
const output = typeof toolResult?.content === 'string'
|
|
? toolResult.content
|
|
: toolResult?.content != null
|
|
? String(toolResult.content)
|
|
: '';
|
|
return (
|
|
<BashCommandDisplay
|
|
command={command}
|
|
description={description}
|
|
output={output}
|
|
isError={Boolean(toolResult?.isError)}
|
|
status={toolStatus !== 'completed' ? toolStatus : undefined}
|
|
// Commands stay collapsed by default; only failures auto-expand so they
|
|
// remain visible.
|
|
defaultOpen={false}
|
|
/>
|
|
);
|
|
}
|
|
|
|
if (displayConfig.type === 'one-line') {
|
|
const value = displayConfig.getValue?.(parsedData) || '';
|
|
const secondary = displayConfig.getSecondary?.(parsedData);
|
|
|
|
return (
|
|
<OneLineDisplay
|
|
toolName={toolName}
|
|
toolResult={toolResult}
|
|
toolId={toolId}
|
|
icon={displayConfig.icon}
|
|
label={displayConfig.label}
|
|
value={value}
|
|
secondary={secondary}
|
|
action={displayConfig.action}
|
|
onAction={handleAction}
|
|
style={displayConfig.style}
|
|
wrapText={displayConfig.wrapText}
|
|
colorScheme={displayConfig.colorScheme}
|
|
resultId={mode === 'input' ? `tool-result-${toolId}` : undefined}
|
|
status={toolStatus !== 'completed' ? toolStatus : undefined}
|
|
/>
|
|
);
|
|
}
|
|
|
|
if (displayConfig.type === 'plan') {
|
|
const title = typeof displayConfig.title === 'function'
|
|
? displayConfig.title(parsedData)
|
|
: displayConfig.title || 'Plan';
|
|
|
|
const contentProps = displayConfig.getContentProps?.(parsedData, {
|
|
selectedProject,
|
|
createDiff,
|
|
onFileOpen
|
|
}) || {};
|
|
|
|
const isStreaming = mode === 'input' && !toolResult;
|
|
|
|
return (
|
|
<PlanDisplay
|
|
title={title}
|
|
content={contentProps.content || ''}
|
|
defaultOpen={displayConfig.defaultOpen ?? false}
|
|
isStreaming={isStreaming}
|
|
showRawParameters={mode === 'input' && showRawParameters}
|
|
rawContent={rawToolInput}
|
|
toolName={toolName}
|
|
toolId={toolId}
|
|
/>
|
|
);
|
|
}
|
|
|
|
if (displayConfig.type === 'collapsible') {
|
|
const title = typeof displayConfig.title === 'function'
|
|
? displayConfig.title(parsedData)
|
|
: displayConfig.title || 'Details';
|
|
|
|
const defaultOpen = displayConfig.defaultOpen !== undefined
|
|
? displayConfig.defaultOpen
|
|
: false;
|
|
|
|
const contentProps = displayConfig.getContentProps?.(parsedData, {
|
|
selectedProject,
|
|
createDiff,
|
|
onFileOpen
|
|
}) || {};
|
|
|
|
let contentComponent: React.ReactNode = null;
|
|
|
|
switch (displayConfig.contentType) {
|
|
case 'diff':
|
|
if (createDiff) {
|
|
contentComponent = (
|
|
<ToolDiffViewer
|
|
{...contentProps}
|
|
createDiff={createDiff}
|
|
onFileClick={() => onFileOpen?.(contentProps.filePath)}
|
|
/>
|
|
);
|
|
}
|
|
break;
|
|
|
|
case 'markdown':
|
|
contentComponent = <MarkdownContent content={contentProps.content || ''} />;
|
|
break;
|
|
|
|
case 'file-list':
|
|
contentComponent = (
|
|
<FileListContent
|
|
files={contentProps.files || []}
|
|
onFileClick={onFileOpen}
|
|
title={contentProps.title}
|
|
/>
|
|
);
|
|
break;
|
|
|
|
case 'todo-list':
|
|
if (contentProps.todos?.length > 0) {
|
|
contentComponent = (
|
|
<TodoListContent
|
|
todos={contentProps.todos}
|
|
isResult={contentProps.isResult}
|
|
/>
|
|
);
|
|
}
|
|
break;
|
|
|
|
case 'task':
|
|
contentComponent = <TaskListContent content={contentProps.content || ''} />;
|
|
break;
|
|
|
|
case 'question-answer':
|
|
contentComponent = (
|
|
<QuestionAnswerContent
|
|
questions={contentProps.questions || []}
|
|
answers={contentProps.answers || {}}
|
|
/>
|
|
);
|
|
break;
|
|
|
|
case 'text':
|
|
contentComponent = (
|
|
<TextContent
|
|
content={contentProps.content || ''}
|
|
format={contentProps.format || 'plain'}
|
|
/>
|
|
);
|
|
break;
|
|
|
|
case 'success-message': {
|
|
const msg = displayConfig.getMessage?.(parsedData) || 'Success';
|
|
contentComponent = (
|
|
<div className="flex items-center gap-1.5 text-xs text-green-600 dark:text-green-400">
|
|
<svg className="h-3 w-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 13l4 4L19 7" />
|
|
</svg>
|
|
{msg}
|
|
</div>
|
|
);
|
|
break;
|
|
}
|
|
}
|
|
|
|
const handleTitleClick = (toolName === 'Edit' || toolName === 'Write' || toolName === 'ApplyPatch') && contentProps.filePath && onFileOpen
|
|
? () => onFileOpen(contentProps.filePath, {
|
|
old_string: contentProps.oldContent,
|
|
new_string: contentProps.newContent
|
|
})
|
|
: undefined;
|
|
|
|
const badgeElement = toolStatus && toolStatus !== 'completed' ? <ToolStatusBadge status={toolStatus} /> : undefined;
|
|
|
|
return (
|
|
<CollapsibleDisplay
|
|
toolName={toolName}
|
|
toolId={toolId}
|
|
title={title}
|
|
defaultOpen={defaultOpen}
|
|
onTitleClick={handleTitleClick}
|
|
badge={badgeElement}
|
|
showRawParameters={mode === 'input' && showRawParameters}
|
|
rawContent={rawToolInput}
|
|
toolCategory={getToolCategory(toolName)}
|
|
>
|
|
{contentComponent}
|
|
</CollapsibleDisplay>
|
|
);
|
|
}
|
|
|
|
return null;
|
|
});
|
|
|
|
ToolRenderer.displayName = 'ToolRenderer';
|