fix: 恢复消息流中 diff 高亮渲染功能

还原 commit 51b8ad46 删除的 diff highlight 显示:FileEdit/FileWrite 工具
执行成功后重新展示 StructuredDiffList,拒绝时重新展示高亮代码预览或
带上下文的 diff 视图。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
claude-code-best
2026-05-06 14:38:10 +08:00
parent c7efac6b8d
commit 12f5aedf99
4 changed files with 344 additions and 16 deletions

View File

@@ -1,23 +1,31 @@
import type { StructuredPatchHunk } from 'diff';
import * as React from 'react';
import { Text } from '@anthropic/ink';
import { useTerminalSize } from '../hooks/useTerminalSize.js';
import { Box, Text } from '@anthropic/ink';
import { count } from '../utils/array.js';
import { MessageResponse } from './MessageResponse.js';
import { StructuredDiffList } from './StructuredDiffList.js';
type Props = {
filePath: string;
structuredPatch: { lines: string[] }[];
structuredPatch: StructuredPatchHunk[];
firstLine: string | null;
fileContent?: string;
style?: 'condensed';
verbose: boolean;
previewHint?: string;
};
export function FileEditToolUpdatedMessage({
filePath: _filePath,
filePath,
structuredPatch,
firstLine,
fileContent,
style,
verbose,
previewHint,
}: Props): React.ReactNode {
const { columns } = useTerminalSize();
const numAdditions = structuredPatch.reduce((acc, hunk) => acc + count(hunk.lines, _ => _.startsWith('+')), 0);
const numRemovals = structuredPatch.reduce((acc, hunk) => acc + count(hunk.lines, _ => _.startsWith('-')), 0);
@@ -39,7 +47,7 @@ export function FileEditToolUpdatedMessage({
// Plan files: invert condensed behavior
// - Regular mode: just show the hint (user can type /plan to see full content)
// - Condensed mode (subagent view): show the text
// - Condensed mode (subagent view): show the diff
if (previewHint) {
if (style !== 'condensed' && !verbose) {
return (
@@ -52,5 +60,19 @@ export function FileEditToolUpdatedMessage({
return text;
}
return <MessageResponse>{text}</MessageResponse>;
return (
<MessageResponse>
<Box flexDirection="column">
<Text>{text}</Text>
<StructuredDiffList
hunks={structuredPatch}
dim={false}
width={columns - 12}
filePath={filePath}
firstLine={firstLine}
fileContent={fileContent}
/>
</Box>
</MessageResponse>
);
}

View File

@@ -1,17 +1,39 @@
import type { StructuredPatchHunk } from 'diff';
import { relative } from 'path';
import * as React from 'react';
import { useTerminalSize } from 'src/hooks/useTerminalSize.js';
import { getCwd } from 'src/utils/cwd.js';
import { Box, Text } from '@anthropic/ink';
import { HighlightedCode } from './HighlightedCode.js';
import { MessageResponse } from './MessageResponse.js';
import { StructuredDiffList } from './StructuredDiffList.js';
const MAX_LINES_TO_RENDER = 10;
type Props = {
file_path: string;
operation: 'write' | 'update';
// For updates - show diff
patch?: StructuredPatchHunk[];
firstLine: string | null;
fileContent?: string;
// For new file creation - show content preview
content?: string;
style?: 'condensed';
verbose: boolean;
};
export function FileEditToolUseRejectedMessage({ file_path, operation, style, verbose }: Props): React.ReactNode {
export function FileEditToolUseRejectedMessage({
file_path,
operation,
patch,
firstLine,
fileContent,
content,
style,
verbose,
}: Props): React.ReactNode {
const { columns } = useTerminalSize();
const text = (
<Box flexDirection="row">
<Text color="subtle">User rejected {operation} to </Text>
@@ -26,5 +48,42 @@ export function FileEditToolUseRejectedMessage({ file_path, operation, style, ve
return <MessageResponse>{text}</MessageResponse>;
}
return <MessageResponse>{text}</MessageResponse>;
// For new file creation, show content preview (dimmed)
if (operation === 'write' && content !== undefined) {
const lines = content.split('\n');
const numLines = lines.length;
const plusLines = numLines - MAX_LINES_TO_RENDER;
const truncatedContent = verbose ? content : lines.slice(0, MAX_LINES_TO_RENDER).join('\n');
return (
<MessageResponse>
<Box flexDirection="column">
{text}
<HighlightedCode code={truncatedContent || '(No content)'} filePath={file_path} width={columns - 12} dim />
{!verbose && plusLines > 0 && <Text dimColor> +{plusLines} lines</Text>}
</Box>
</MessageResponse>
);
}
// For updates, show diff
if (!patch || patch.length === 0) {
return <MessageResponse>{text}</MessageResponse>;
}
return (
<MessageResponse>
<Box flexDirection="column">
{text}
<StructuredDiffList
hunks={patch}
dim
width={columns - 12}
filePath={file_path}
firstLine={firstLine}
fileContent={fileContent}
/>
</Box>
</MessageResponse>
);
}