From 81f0f618f7ecc439e67447bf98065d87e22483c0 Mon Sep 17 00:00:00 2001 From: Taylor Mullen Date: Mon, 21 Apr 2025 10:53:11 -0400 Subject: Fix Gemini Code's (GC) smarts. - The tl;dr; is that GC couldn't see what the user was saying when tool call events happened in response. The rason why this was happening was because we were instantly invoking tools that the model told us to invoke and then instantly re-requesting. This resulted in the bug because the genai APIs can't update the chat history before a full response has been completed (doesn't know how to update if it's incomplete). - To address the above issue I had to do quite the large refactor. The gist is that now turns truly drive everything on the server (vs. a server client split). This ensured that when we got tool invocations we could control when/how re-requesting would happen and then also ensure that history was updated. This change also meant that the server would act as an event publisher to enable the client to react to events rather than try and weave in complex logic between the events. - A BIG change that this changeset incudes is the removal of all of the CLI tools in favor of the server tools. - Removed some dead code as part of this - **NOTE: Confirmations are still broken (they were broken prior to this); however, I've set them up to be able to work in the future, I'll dot hat in a follow up to be less breaking to others.** Fixes https://b.corp.google.com/issues/412320087 --- packages/cli/src/ui/components/messages/ToolMessage.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'packages/cli/src/ui/components/messages/ToolMessage.tsx') diff --git a/packages/cli/src/ui/components/messages/ToolMessage.tsx b/packages/cli/src/ui/components/messages/ToolMessage.tsx index 372d5ffe..f33ed6cb 100644 --- a/packages/cli/src/ui/components/messages/ToolMessage.tsx +++ b/packages/cli/src/ui/components/messages/ToolMessage.tsx @@ -7,16 +7,15 @@ import React from 'react'; import { Box, Text } from 'ink'; import Spinner from 'ink-spinner'; +import { IndividualToolCallDisplay, ToolCallStatus } from '../../types.js'; +import { DiffRenderer } from './DiffRenderer.js'; +import { FileDiff, ToolResultDisplay } from '../../../tools/tools.js'; +import { Colors } from '../../colors.js'; import { - IndividualToolCallDisplay, - ToolCallStatus, ToolCallConfirmationDetails, ToolEditConfirmationDetails, ToolExecuteConfirmationDetails, -} from '../../types.js'; -import { DiffRenderer } from './DiffRenderer.js'; -import { FileDiff, ToolResultDisplay } from '../../../tools/tools.js'; -import { Colors } from '../../colors.js'; +} from '@gemini-code/server'; export const ToolMessage: React.FC = ({ callId, -- cgit v1.2.3