From 81ba61df7f967f141cd8abc57d58a3612dfd4c2b Mon Sep 17 00:00:00 2001
From: Jaana Dogan <jbd@google.com>
Date: Thu, 17 Apr 2025 12:03:02 -0700
Subject: Improve readability issues

This is only the first change of many changes.

* Remove redundant autogenerated comments
* Use the recommended file name style
* Use camelCase for variable names
* Don't introduce submodules for relevant types
* Don't introduce constants like modules, these are implementation details
* Remove empty files
---
 packages/cli/src/ui/App.tsx                             | 2 +-
 packages/cli/src/ui/components/messages/ToolMessage.tsx | 2 +-
 packages/cli/src/ui/hooks/useGeminiStream.ts            | 6 +++---
 packages/cli/src/ui/hooks/useLoadingIndicator.ts        | 2 +-
 packages/cli/src/ui/types.ts                            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'packages/cli/src/ui')

diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx
index 32dcaac0..9a2ee49d 100644
--- a/packages/cli/src/ui/App.tsx
+++ b/packages/cli/src/ui/App.tsx
@@ -9,7 +9,7 @@ import HistoryDisplay from './components/HistoryDisplay.js';
 import LoadingIndicator from './components/LoadingIndicator.js';
 import InputPrompt from './components/InputPrompt.js';
 import Footer from './components/Footer.js';
-import { StreamingState } from '../core/StreamingState.js';
+import { StreamingState } from '../core/gemini-stream.js';
 import { PartListUnion } from '@google/genai';
 
 interface AppProps {
diff --git a/packages/cli/src/ui/components/messages/ToolMessage.tsx b/packages/cli/src/ui/components/messages/ToolMessage.tsx
index 38bc3de1..4ad947c9 100644
--- a/packages/cli/src/ui/components/messages/ToolMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolMessage.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
 import { ToolCallStatus } from '../../types.js';
-import { ToolResultDisplay } from '../../../tools/ToolResult.js';
+import { ToolResultDisplay } from '../../../tools/tool.js';
 import DiffRenderer from './DiffRenderer.js';
 import { MarkdownRenderer } from '../../utils/MarkdownRenderer.js';
 
diff --git a/packages/cli/src/ui/hooks/useGeminiStream.ts b/packages/cli/src/ui/hooks/useGeminiStream.ts
index 71972fbe..c65422ca 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.ts
+++ b/packages/cli/src/ui/hooks/useGeminiStream.ts
@@ -1,10 +1,10 @@
 import { useState, useRef, useCallback, useEffect } from 'react';
 import { useInput } from 'ink';
-import { GeminiClient } from '../../core/GeminiClient.js';
+import { GeminiClient } from '../../core/gemini-client.js';
 import { type Chat, type PartListUnion } from '@google/genai';
 import { HistoryItem } from '../types.js';
-import { processGeminiStream } from '../../core/geminiStreamProcessor.js';
-import { StreamingState } from '../../core/StreamingState.js';
+import { processGeminiStream } from '../../core/gemini-stream.js';
+import { StreamingState } from '../../core/gemini-stream.js';
 
 const addHistoryItem = (
     setHistory: React.Dispatch<React.SetStateAction<HistoryItem[]>>,
diff --git a/packages/cli/src/ui/hooks/useLoadingIndicator.ts b/packages/cli/src/ui/hooks/useLoadingIndicator.ts
index f1ab4552..8f440327 100644
--- a/packages/cli/src/ui/hooks/useLoadingIndicator.ts
+++ b/packages/cli/src/ui/hooks/useLoadingIndicator.ts
@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef } from 'react';
 import { WITTY_LOADING_PHRASES, PHRASE_CHANGE_INTERVAL_MS } from '../constants.js';
-import { StreamingState } from '../../core/StreamingState.js';
+import { StreamingState } from '../../core/gemini-stream.js';
 
 export const useLoadingIndicator = (streamingState: StreamingState) => {
 	const [elapsedTime, setElapsedTime] = useState(0);
diff --git a/packages/cli/src/ui/types.ts b/packages/cli/src/ui/types.ts
index 0b5dd246..e7c43c44 100644
--- a/packages/cli/src/ui/types.ts
+++ b/packages/cli/src/ui/types.ts
@@ -1,4 +1,4 @@
-import { ToolResultDisplay } from "../tools/ToolResult.js";
+import { ToolResultDisplay } from '../tools/tool.js';
 
 export enum ToolCallStatus {
     Pending,
-- 
cgit v1.2.3