7 files changed, 6 insertions, 217 deletions
diff --git a/packages/cli/src/gemini.ts b/packages/cli/src/gemini.ts
index 97502399..8df10aba 100644
--- a/packages/cli/src/gemini.ts
+++ b/packages/cli/src/gemini.ts
@@ -7,26 +7,11 @@
 import React from 'react';
 import { render } from 'ink';
 import { App } from './ui/App.js';
-import { toolRegistry } from './tools/tool-registry.js';
 import { loadCliConfig } from './config/config.js';
-import {
-  LSTool,
-  ReadFileTool,
-  GrepTool,
-  GlobTool,
-  EditTool,
-  TerminalTool,
-  WriteFileTool,
-  WebFetchTool,
-} from '@gemini-code/server';
 
 async function main() {
   // Load configuration
   const config = loadCliConfig();
-
-  // Configure tools using the loaded config
-  registerTools(config.getTargetDir());
-
   // Render UI, passing necessary config values
   render(
     React.createElement(App, {
@@ -81,24 +66,3 @@ main().catch((error) => {
   }
   process.exit(1);
 });
-
-function registerTools(targetDir: string) {
-  const config = loadCliConfig();
-  const lsTool = new LSTool(targetDir);
-  const readFileTool = new ReadFileTool(targetDir);
-  const grepTool = new GrepTool(targetDir);
-  const globTool = new GlobTool(targetDir);
-  const editTool = new EditTool(targetDir);
-  const terminalTool = new TerminalTool(targetDir, config);
-  const writeFileTool = new WriteFileTool(targetDir);
-  const webFetchTool = new WebFetchTool();
-
-  toolRegistry.registerTool(lsTool);
-  toolRegistry.registerTool(readFileTool);
-  toolRegistry.registerTool(grepTool);
-  toolRegistry.registerTool(globTool);
-  toolRegistry.registerTool(editTool);
-  toolRegistry.registerTool(terminalTool);
-  toolRegistry.registerTool(writeFileTool);
-  toolRegistry.registerTool(webFetchTool);
-}
diff --git a/packages/cli/src/index.test.ts b/packages/cli/src/index.test.ts
deleted file mode 100644
index 9d65e38f..00000000
--- a/packages/cli/src/index.test.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect } from 'vitest';
-import { toolRegistry } from './tools/tool-registry.js';
-
-describe('cli tests', () => {
-  it('should have a tool registry', () => {
-    expect(toolRegistry).toBeDefined();
-    expect(typeof toolRegistry.registerTool).toBe('function');
-  });
-});
diff --git a/packages/cli/src/tools/tool-registry.ts b/packages/cli/src/tools/tool-registry.ts
deleted file mode 100644
index 1c82aa12..00000000
--- a/packages/cli/src/tools/tool-registry.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { ToolListUnion, FunctionDeclaration } from '@google/genai';
-import { Tool } from './tools.js';
-
-class ToolRegistry {
-  private tools: Map<string, Tool> = new Map();
-
-  /**
-   * Registers a tool definition.
-   * @param tool - The tool object containing schema and execution logic.
-   */
-  registerTool(tool: Tool): void {
-    if (this.tools.has(tool.name)) {
-      // Decide on behavior: throw error, log warning, or allow overwrite
-      console.warn(
-        `Tool with name "${tool.name}" is already registered. Overwriting.`,
-      );
-    }
-    this.tools.set(tool.name, tool);
-  }
-
-  /**
-   * Retrieves the list of tool schemas (FunctionDeclaration array).
-   * Extracts the declarations from the ToolListUnion structure.
-   * @returns An array of FunctionDeclarations.
-   */
-  getFunctionDeclarations(): FunctionDeclaration[] {
-    const declarations: FunctionDeclaration[] = [];
-    this.tools.forEach((tool) => {
-      declarations.push(tool.schema);
-    });
-    return declarations;
-  }
-
-  /**
-   * Deprecated/Internal? Retrieves schemas in the ToolListUnion format.
-   * Kept for reference, prefer getFunctionDeclarations.
-   */
-  getToolSchemas(): ToolListUnion {
-    const declarations = this.getFunctionDeclarations();
-    if (declarations.length === 0) {
-      return [];
-    }
-    return [{ functionDeclarations: declarations }];
-  }
-
-  /**
-   * Returns an array of all registered tool instances.
-   */
-  getAllTools(): Tool[] {
-    return Array.from(this.tools.values());
-  }
-
-  /**
-   * Optional: Get a list of registered tool names.
-   */
-  listAvailableTools(): string[] {
-    return Array.from(this.tools.keys());
-  }
-
-  /**
-   * Get the definition of a specific tool.
-   */
-  getTool(name: string): Tool | undefined {
-    return this.tools.get(name);
-  }
-}
-
-// Export a singleton instance of the registry
-export const toolRegistry = new ToolRegistry();
diff --git a/packages/cli/src/tools/tools.ts b/packages/cli/src/tools/tools.ts
deleted file mode 100644
index 27306a56..00000000
--- a/packages/cli/src/tools/tools.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { ToolCallConfirmationDetails } from '@gemini-code/server';
-import { FunctionDeclaration } from '@google/genai';
-
-/**
- * Interface representing the base Tool functionality
- */
-export interface Tool<
-  TParams = unknown,
-  TResult extends ToolResult = ToolResult,
-> {
-  /**
-   * The internal name of the tool (used for API calls)
-   */
-  name: string;
-
-  /**
-   * The user-friendly display name of the tool
-   */
-  displayName: string;
-
-  /**
-   * Description of what the tool does
-   */
-  description: string;
-
-  /**
-   * Function declaration schema from @google/genai
-   */
-  schema: FunctionDeclaration;
-
-  /**
-   * Validates the parameters for the tool
-   * @param params Parameters to validate
-   * @returns An error message string if invalid, null otherwise
-   */
-  validateToolParams(params: TParams): string | null;
-
-  /**
-   * Gets a pre-execution description of the tool operation
-   * @param params Parameters for the tool execution
-   * @returns A markdown string describing what the tool will do
-   * Optional for backward compatibility
-   */
-  getDescription(params: TParams): string;
-
-  /**
-   * Determines if the tool should prompt for confirmation before execution
-   * @param params Parameters for the tool execution
-   * @returns Whether execute should be confirmed.
-   */
-  shouldConfirmExecute(
-    params: TParams,
-  ): Promise<ToolCallConfirmationDetails | false>;
-
-  /**
-   * Executes the tool with the given parameters
-   * @param params Parameters for the tool execution
-   * @returns Result of the tool execution
-   */
-  execute(params: TParams): Promise<TResult>;
-}
-
-export interface ToolResult {
-  /**
-   * Content meant to be included in LLM history.
-   * This should represent the factual outcome of the tool execution.
-   */
-  llmContent: string;
-
-  /**
-   * Markdown string for user display.
-   * This provides a user-friendly summary or visualization of the result.
-   */
-  returnDisplay: ToolResultDisplay;
-}
-
-export type ToolResultDisplay = string | FileDiff;
-
-export interface FileDiff {
-  fileDiff: string;
-}
diff --git a/packages/cli/src/ui/components/messages/ToolMessage.tsx b/packages/cli/src/ui/components/messages/ToolMessage.tsx
index f21e1d28..53f31db2 100644
--- a/packages/cli/src/ui/components/messages/ToolMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolMessage.tsx
@@ -9,7 +9,7 @@ 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 { FileDiff, ToolResultDisplay } from '@gemini-code/server';
 import { Colors } from '../../colors.js';
 
 export const ToolMessage: React.FC<IndividualToolCallDisplay> = ({
diff --git a/packages/cli/src/ui/hooks/useGeminiStream.ts b/packages/cli/src/ui/hooks/useGeminiStream.ts
index 2728c394..ffdd9967 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.ts
+++ b/packages/cli/src/ui/hooks/useGeminiStream.ts
@@ -35,7 +35,6 @@ import {
   IndividualToolCallDisplay,
   ToolCallStatus,
 } from '../types.js';
-import { toolRegistry } from '../../tools/tool-registry.js';
 
 const addHistoryItem = (
   setHistory: React.Dispatch<React.SetStateAction<HistoryItem[]>>,
@@ -53,6 +52,7 @@ export const useGeminiStream = (
   setHistory: React.Dispatch<React.SetStateAction<HistoryItem[]>>,
   config: Config,
 ) => {
+  const toolRegistry = config.getToolRegistry();
   const [streamingState, setStreamingState] = useState<StreamingState>(
     StreamingState.Idle,
   );
diff --git a/packages/cli/src/ui/types.ts b/packages/cli/src/ui/types.ts
index 41b2a944..fe135909 100644
--- a/packages/cli/src/ui/types.ts
+++ b/packages/cli/src/ui/types.ts
@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ToolCallConfirmationDetails } from '@gemini-code/server';
-import { ToolResultDisplay } from '../tools/tools.js';
+import {
+  ToolCallConfirmationDetails,
+  ToolResultDisplay,
+} from '@gemini-code/server';
 
 // Only defining the state enum needed by the UI
 export enum StreamingState {