From ca51f613ca9ba0a7b72f31479c8f5cf5c2dc75a6 Mon Sep 17 00:00:00 2001
From: YeonGyu-Kim <code.yeon.gyu@gmail.com>
Date: Mon, 18 May 2026 12:11:34 +0900
Subject: [PATCH] refactor(tools): remove native LSP tool registry wiring

---
 src/plugin/tool-registry.ts |  4 ----
 src/tools/index.ts          | 21 ---------------------
 2 files changed, 25 deletions(-)

diff --git a/src/plugin/tool-registry.ts b/src/plugin/tool-registry.ts
index 30c311c2e..4453e98f1 100644
--- a/src/plugin/tool-registry.ts
+++ b/src/plugin/tool-registry.ts
@@ -25,7 +25,6 @@ import * as openclawRuntimeDispatch from "../openclaw/runtime-dispatch"
 import type { PluginContext, ToolsRecord } from "./types"
 
 import {
-  builtinTools,
   createBackgroundTools,
   createCallOmoAgent,
   createLookAt,
@@ -53,7 +52,6 @@ import type { SkillContext } from "./skill-context"
 import { normalizeToolArgSchemas } from "./normalize-tool-arg-schemas"
 
 type ToolRegistryFactories = {
-  builtinTools: typeof builtinTools
   createBackgroundTools: typeof createBackgroundTools
   createCallOmoAgent: typeof createCallOmoAgent
   createLookAt: typeof createLookAt
@@ -86,7 +84,6 @@ type ToolRegistryFactories = {
 }
 
 const defaultToolRegistryFactories: ToolRegistryFactories = {
-  builtinTools,
   createBackgroundTools,
   createCallOmoAgent,
   createLookAt,
@@ -339,7 +336,6 @@ export function createToolRegistry(args: {
     : {}
 
   const allTools: Record<string, ToolDefinition> = {
-    ...factories.builtinTools,
     ...factories.createGrepTools(ctx),
     ...factories.createGlobTools(ctx),
     ...factories.createAstGrepTools(ctx),
diff --git a/src/tools/index.ts b/src/tools/index.ts
index fee18f604..af9ee0ce7 100644
--- a/src/tools/index.ts
+++ b/src/tools/index.ts
@@ -1,15 +1,3 @@
-import {
-  lsp_goto_definition,
-  lsp_find_references,
-  lsp_symbols,
-  lsp_diagnostics,
-  lsp_prepare_rename,
-  lsp_rename,
-  lspManager,
-} from "./lsp"
-
-export { lspManager }
-
 export { createAstGrepTools } from "./ast-grep"
 export { createGrepTools } from "./grep"
 export { createGlobTools } from "./glob"
@@ -54,12 +42,3 @@ export function createBackgroundTools(manager: BackgroundManager, client: Openco
     background_cancel: createBackgroundCancel(manager, cancelClient),
   }
 }
-
-export const builtinTools: Record<string, ToolDefinition> = {
-  lsp_goto_definition,
-  lsp_find_references,
-  lsp_symbols,
-  lsp_diagnostics,
-  lsp_prepare_rename,
-  lsp_rename,
-}