968e09f0b5
This commit resolves a bug where the `write-file` operation could fail to render content due to a missing filename. The fix involves: - Ensuring `fileName` is consistently passed to `DiffRenderer.tsx` through `ToolConfirmationMessage.tsx`, `ToolMessage.tsx`, and `useGeminiStream.ts`. - Modifying `edit.ts` and `write-file.ts` to include `fileName` in the `FileDiff` object. - Expanding the `FileDiff` interface in `tools.ts` to include `fileName`. Additionally, this commit enhances the diff rendering by: - Adding syntax highlighting based on file extension in `DiffRenderer.tsx`. - Adding more language mappings to `getLanguageFromExtension` in `DiffRenderer.tsx`. - Added lots of tests for all the above. Fixes https://b.corp.google.com/issues/418125982
119 lines
3.3 KiB
TypeScript
119 lines
3.3 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2025 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import React from 'react';
|
|
import { Box, Text, useInput } from 'ink';
|
|
import { DiffRenderer } from './DiffRenderer.js';
|
|
import { Colors } from '../../colors.js';
|
|
import {
|
|
ToolCallConfirmationDetails,
|
|
ToolEditConfirmationDetails,
|
|
ToolConfirmationOutcome,
|
|
ToolExecuteConfirmationDetails,
|
|
} from '@gemini-code/server';
|
|
import {
|
|
RadioButtonSelect,
|
|
RadioSelectItem,
|
|
} from '../shared/RadioButtonSelect.js';
|
|
|
|
export interface ToolConfirmationMessageProps {
|
|
confirmationDetails: ToolCallConfirmationDetails;
|
|
}
|
|
|
|
function isEditDetails(
|
|
props: ToolCallConfirmationDetails,
|
|
): props is ToolEditConfirmationDetails {
|
|
return (props as ToolEditConfirmationDetails).fileName !== undefined;
|
|
}
|
|
|
|
export const ToolConfirmationMessage: React.FC<
|
|
ToolConfirmationMessageProps
|
|
> = ({ confirmationDetails }) => {
|
|
const { onConfirm } = confirmationDetails;
|
|
|
|
useInput((_, key) => {
|
|
if (key.escape) {
|
|
onConfirm(ToolConfirmationOutcome.Cancel);
|
|
}
|
|
});
|
|
|
|
const handleSelect = (item: ToolConfirmationOutcome) => onConfirm(item);
|
|
|
|
let bodyContent: React.ReactNode | null = null; // Removed contextDisplay here
|
|
let question: string;
|
|
|
|
const options: Array<RadioSelectItem<ToolConfirmationOutcome>> = new Array<
|
|
RadioSelectItem<ToolConfirmationOutcome>
|
|
>();
|
|
|
|
if (isEditDetails(confirmationDetails)) {
|
|
// Body content is now the DiffRenderer, passing filename to it
|
|
// The bordered box is removed from here and handled within DiffRenderer
|
|
bodyContent = (
|
|
<DiffRenderer
|
|
diffContent={confirmationDetails.fileDiff}
|
|
filename={confirmationDetails.fileName}
|
|
/>
|
|
);
|
|
|
|
question = `Apply this change?`;
|
|
options.push(
|
|
{
|
|
label: 'Yes, allow once',
|
|
value: ToolConfirmationOutcome.ProceedOnce,
|
|
},
|
|
{
|
|
label: 'Yes, allow always',
|
|
value: ToolConfirmationOutcome.ProceedAlways,
|
|
},
|
|
{ label: 'No (esc)', value: ToolConfirmationOutcome.Cancel },
|
|
);
|
|
} else {
|
|
const executionProps =
|
|
confirmationDetails as ToolExecuteConfirmationDetails;
|
|
|
|
bodyContent = (
|
|
<Box flexDirection="column">
|
|
<Box paddingX={1} marginLeft={1}>
|
|
<Text color={Colors.AccentCyan}>{executionProps.command}</Text>
|
|
</Box>
|
|
</Box>
|
|
);
|
|
|
|
question = `Allow execution?`;
|
|
options.push(
|
|
{
|
|
label: 'Yes, allow once',
|
|
value: ToolConfirmationOutcome.ProceedOnce,
|
|
},
|
|
{
|
|
label: `Yes, allow always "${executionProps.rootCommand} ..."`,
|
|
value: ToolConfirmationOutcome.ProceedAlways,
|
|
},
|
|
{ label: 'No (esc)', value: ToolConfirmationOutcome.Cancel },
|
|
);
|
|
}
|
|
|
|
return (
|
|
<Box flexDirection="column" padding={1} minWidth="90%">
|
|
{/* Body Content (Diff Renderer or Command Info) */}
|
|
{/* No separate context display here anymore for edits */}
|
|
<Box flexGrow={1} flexShrink={1} overflow="hidden" marginBottom={1}>
|
|
{bodyContent}
|
|
</Box>
|
|
|
|
{/* Confirmation Question */}
|
|
<Box marginBottom={1} flexShrink={0}>
|
|
<Text>{question}</Text>
|
|
</Box>
|
|
|
|
{/* Select Input for Options */}
|
|
<Box flexShrink={0}>
|
|
<RadioButtonSelect items={options} onSelect={handleSelect} />
|
|
</Box>
|
|
</Box>
|
|
);
|
|
};
|