From d970882428a264d122b2f60fc91a4d72da912a93 Mon Sep 17 00:00:00 2001 From: Taylor Mullen Date: Thu, 17 Apr 2025 17:25:01 -0400 Subject: [PATCH] Fix build break (tool -> tools). - Without this we'd get a TS1261 about the name "tool" only differeing from "Tool" (the class) by case. --- packages/cli/src/core/gemini-client.ts | 2 +- packages/cli/src/core/history-updater.ts | 2 +- packages/cli/src/tools/edit.tool.ts | 2 +- packages/cli/src/tools/glob.tool.ts | 2 +- packages/cli/src/tools/grep.tool.ts | 2 +- packages/cli/src/tools/ls.tool.ts | 2 +- packages/cli/src/tools/read-file.tool.ts | 2 +- packages/cli/src/tools/terminal.tool.ts | 2 +- packages/cli/src/tools/tool-registry.ts | 2 +- packages/cli/src/tools/{Tool.ts => tools.ts} | 0 packages/cli/src/tools/write-file.tool.ts | 2 +- packages/cli/src/ui/components/messages/ToolMessage.tsx | 2 +- packages/cli/src/ui/types.ts | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename packages/cli/src/tools/{Tool.ts => tools.ts} (100%) diff --git a/packages/cli/src/core/gemini-client.ts b/packages/cli/src/core/gemini-client.ts index e41fda6f56..67812f8e39 100644 --- a/packages/cli/src/core/gemini-client.ts +++ b/packages/cli/src/core/gemini-client.ts @@ -10,7 +10,7 @@ import { CoreSystemPrompt } from './prompts.js'; import { type ToolCallEvent, type ToolCallConfirmationDetails, ToolCallStatus } from '../ui/types.js'; import process from 'node:process'; import { toolRegistry } from '../tools/tool-registry.js'; -import { ToolResult } from '../tools/tool.js'; +import { ToolResult } from '../tools/tools.js'; import { getFolderStructure } from '../utils/getFolderStructure.js'; import { GeminiEventType, GeminiStream } from './gemini-stream.js'; diff --git a/packages/cli/src/core/history-updater.ts b/packages/cli/src/core/history-updater.ts index 4013728f18..369454ff87 100644 --- a/packages/cli/src/core/history-updater.ts +++ b/packages/cli/src/core/history-updater.ts @@ -1,7 +1,7 @@ import { Part } from "@google/genai"; import { toolRegistry } from "../tools/tool-registry.js"; import { HistoryItem, IndividualToolCallDisplay, ToolCallEvent, ToolCallStatus, ToolConfirmationOutcome, ToolEditConfirmationDetails, ToolExecuteConfirmationDetails } from "../ui/types.js"; -import { ToolResultDisplay } from "../tools/tool.js"; +import { ToolResultDisplay } from "../tools/tools.js"; /** * Processes a tool call chunk and updates the history state accordingly. diff --git a/packages/cli/src/tools/edit.tool.ts b/packages/cli/src/tools/edit.tool.ts index 6b7f02cfe2..52ef4fe819 100644 --- a/packages/cli/src/tools/edit.tool.ts +++ b/packages/cli/src/tools/edit.tool.ts @@ -2,7 +2,7 @@ import fs from 'fs'; import path from 'path'; import * as Diff from 'diff'; import { SchemaValidator } from '../utils/schemaValidator.js'; -import { BaseTool, ToolResult } from './tool.js'; +import { BaseTool, ToolResult } from './tools.js'; import { ToolCallConfirmationDetails, ToolConfirmationOutcome, ToolEditConfirmationDetails } from '../ui/types.js'; import { makeRelative, shortenPath } from '../utils/paths.js'; import { ReadFileTool } from './read-file.tool.js'; diff --git a/packages/cli/src/tools/glob.tool.ts b/packages/cli/src/tools/glob.tool.ts index 5a427e75aa..b63aa1ccc1 100644 --- a/packages/cli/src/tools/glob.tool.ts +++ b/packages/cli/src/tools/glob.tool.ts @@ -2,7 +2,7 @@ import fs from 'fs'; import path from 'path'; import fg from 'fast-glob'; import { SchemaValidator } from '../utils/schemaValidator.js'; -import { BaseTool, ToolResult } from './tool.js'; +import { BaseTool, ToolResult } from './tools.js'; import { shortenPath, makeRelative } from '../utils/paths.js'; /** diff --git a/packages/cli/src/tools/grep.tool.ts b/packages/cli/src/tools/grep.tool.ts index 93c37f82f2..ed75890b2a 100644 --- a/packages/cli/src/tools/grep.tool.ts +++ b/packages/cli/src/tools/grep.tool.ts @@ -4,7 +4,7 @@ import path from 'path'; import { EOL } from 'os'; // Used for parsing grep output lines import { spawn } from 'child_process'; // Used for git grep and system grep import fastGlob from 'fast-glob'; // Used for JS fallback file searching -import { BaseTool, ToolResult } from './tool.js'; +import { BaseTool, ToolResult } from './tools.js'; import { SchemaValidator } from '../utils/schemaValidator.js'; import { makeRelative, shortenPath } from '../utils/paths.js'; diff --git a/packages/cli/src/tools/ls.tool.ts b/packages/cli/src/tools/ls.tool.ts index 9f3714f72d..6c4d58484a 100644 --- a/packages/cli/src/tools/ls.tool.ts +++ b/packages/cli/src/tools/ls.tool.ts @@ -1,6 +1,6 @@ import fs from 'fs'; import path from 'path'; -import { BaseTool, ToolResult } from './tool.js'; +import { BaseTool, ToolResult } from './tools.js'; import { SchemaValidator } from '../utils/schemaValidator.js'; import { makeRelative, shortenPath } from '../utils/paths.js'; diff --git a/packages/cli/src/tools/read-file.tool.ts b/packages/cli/src/tools/read-file.tool.ts index 64d59df0da..7cca339122 100644 --- a/packages/cli/src/tools/read-file.tool.ts +++ b/packages/cli/src/tools/read-file.tool.ts @@ -2,7 +2,7 @@ import fs from 'fs'; import path from 'path'; import { SchemaValidator } from '../utils/schemaValidator.js'; import { makeRelative, shortenPath } from '../utils/paths.js'; -import { BaseTool, ToolResult } from './tool.js'; +import { BaseTool, ToolResult } from './tools.js'; /** * Parameters for the ReadFile tool diff --git a/packages/cli/src/tools/terminal.tool.ts b/packages/cli/src/tools/terminal.tool.ts index fed1a752dc..eef9b7d492 100644 --- a/packages/cli/src/tools/terminal.tool.ts +++ b/packages/cli/src/tools/terminal.tool.ts @@ -3,7 +3,7 @@ import path from 'path'; import os from 'os'; import crypto from 'crypto'; import { promises as fs } from 'fs'; -import { BaseTool, ToolResult } from './tool.js'; +import { BaseTool, ToolResult } from './tools.js'; import { SchemaValidator } from '../utils/schemaValidator.js'; import { ToolCallConfirmationDetails, ToolConfirmationOutcome, ToolExecuteConfirmationDetails } from '../ui/types.js'; // Adjust path as needed import { BackgroundTerminalAnalyzer } from '../utils/BackgroundTerminalAnalyzer.js'; diff --git a/packages/cli/src/tools/tool-registry.ts b/packages/cli/src/tools/tool-registry.ts index d9f4504cab..4803039796 100644 --- a/packages/cli/src/tools/tool-registry.ts +++ b/packages/cli/src/tools/tool-registry.ts @@ -1,5 +1,5 @@ import { ToolListUnion, FunctionDeclaration } from '@google/genai'; -import { Tool } from './tool.js'; +import { Tool } from './tools.js'; class ToolRegistry { private tools: Map = new Map(); diff --git a/packages/cli/src/tools/Tool.ts b/packages/cli/src/tools/tools.ts similarity index 100% rename from packages/cli/src/tools/Tool.ts rename to packages/cli/src/tools/tools.ts diff --git a/packages/cli/src/tools/write-file.tool.ts b/packages/cli/src/tools/write-file.tool.ts index aa2b0d8527..78f1444064 100644 --- a/packages/cli/src/tools/write-file.tool.ts +++ b/packages/cli/src/tools/write-file.tool.ts @@ -1,6 +1,6 @@ import fs from 'fs'; import path from 'path'; -import { BaseTool, ToolResult } from './tool.js'; +import { BaseTool, ToolResult } from './tools.js'; import { SchemaValidator } from '../utils/schemaValidator.js'; import { makeRelative, shortenPath } from '../utils/paths.js'; import { ToolCallConfirmationDetails, ToolConfirmationOutcome, ToolEditConfirmationDetails } from '../ui/types.js'; diff --git a/packages/cli/src/ui/components/messages/ToolMessage.tsx b/packages/cli/src/ui/components/messages/ToolMessage.tsx index 4ad947c996..f8db54c43c 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/tool.js'; +import { ToolResultDisplay } from '../../../tools/tools.js'; import DiffRenderer from './DiffRenderer.js'; import { MarkdownRenderer } from '../../utils/MarkdownRenderer.js'; diff --git a/packages/cli/src/ui/types.ts b/packages/cli/src/ui/types.ts index e7c43c4457..f7dcb9d3ae 100644 --- a/packages/cli/src/ui/types.ts +++ b/packages/cli/src/ui/types.ts @@ -1,4 +1,4 @@ -import { ToolResultDisplay } from '../tools/tool.js'; +import { ToolResultDisplay } from "../tools/tools.js"; export enum ToolCallStatus { Pending,