fix(patch): cherry-pick fb99b95 to release/v0.15.0-preview.5-pr-13018 [CONFLICTS]#13022
Conversation
…ders that are 10+ lines for no good reason so we need to add back this truncation until we fix them. (#13018) # Conflicts: # packages/cli/src/ui/components/messages/ToolGroupMessage.test.tsx # packages/cli/src/ui/components/messages/__snapshots__/ToolGroupMessage.test.tsx.snap
Summary of ChangesHello @gemini-cli-robot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request is an automated cherry-pick intended to re-introduce header truncation for tool messages, addressing previous display issues with excessively long headers. However, the cherry-pick encountered merge conflicts, necessitating manual intervention to resolve them before the changes can be fully integrated and a new preview version released. Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request contains unresolved merge conflicts in test and snapshot files. The presence of conflict markers (<<<<<<<, =======, >>>>>>>) makes these files syntactically invalid, which will cause the build and tests to fail. These conflicts must be resolved before the pull request can be considered for merging.
| <<<<<<< HEAD | ||
| ======= | ||
|
|
||
| it('renders header when scrolled', () => { | ||
| const toolCalls = [ | ||
| createToolCall({ | ||
| callId: '1', | ||
| name: 'tool-1', | ||
| description: | ||
| 'Description 1. This is a long description that will need to be truncated if the terminal width is small.', | ||
| resultDisplay: 'line1\nline2\nline3\nline4\nline5', | ||
| }), | ||
| createToolCall({ | ||
| callId: '2', | ||
| name: 'tool-2', | ||
| description: 'Description 2', | ||
| resultDisplay: 'line1\nline2', | ||
| }), | ||
| ]; | ||
| const { lastFrame, unmount } = renderWithProviders( | ||
| <Scrollable height={10} hasFocus={true} scrollToBottom={true}> | ||
| <ToolGroupMessage {...baseProps} toolCalls={toolCalls} /> | ||
| </Scrollable>, | ||
| ); | ||
| expect(lastFrame()).toMatchSnapshot(); | ||
| unmount(); | ||
| }); | ||
|
|
||
| it('renders tool call with outputFile', () => { | ||
| const toolCalls = [ | ||
| createToolCall({ | ||
| callId: 'tool-output-file', | ||
| name: 'tool-with-file', | ||
| description: 'Tool that saved output to file', | ||
| status: ToolCallStatus.Success, | ||
| outputFile: '/path/to/output.txt', | ||
| }), | ||
| ]; | ||
| const { lastFrame, unmount } = renderWithProviders( | ||
| <ToolGroupMessage {...baseProps} toolCalls={toolCalls} />, | ||
| ); | ||
| expect(lastFrame()).toMatchSnapshot(); | ||
| unmount(); | ||
| }); | ||
| >>>>>>> fb99b953 (Switch back to truncating headers. Unfortunately we have too many headers that are 10+ lines for no good reason so we need to add back this truncation until we fix them. (#13018)) |
There was a problem hiding this comment.
This file contains unresolved merge conflict markers. These markers (<<<<<<< HEAD, =======, >>>>>>>) make the file syntactically incorrect and will cause the build or tests to fail. Please resolve the conflicts by removing the markers and choosing the correct code to keep.
|
Size Change: +75 B (0%) Total Size: 20.5 MB ℹ️ View Unchanged
|
SandyTao520
merged commit 24b5eec
into
release/v0.15.0-preview.5-pr-13018
SandyTao520
deleted the
hotfix/v0.15.0-preview.5/0.15.0-preview.6/preview/cherry-pick-fb99b95/pr-13018
branch
4 participants
This PR automatically cherry-picks commit fb99b95 to patch version v0.15.0-preview.5 in the preview release to create version 0.15.0-preview.6.
This cherry-pick resulted in merge conflicts that need manual resolution.
🔧 Next Steps:
📋 Files with conflicts:
The commit has been created with conflict markers for easier manual resolution.
🚨 Important: