@treedy/lsp-mcp 0.1.6 → 0.1.7

package/dist/index.js

@@ -20670,11 +20670,31 @@ class BackendManager {
     if (state.status !== "ready") {
       throw new Error(`${language} backend is not ready: ${state.lastError}`);
     }
-    const result = await state.client.callTool({
-      name: toolName,
-      arguments: args
-    });
-    return result;
+    try {
+      const result = await state.client.callTool({
+        name: toolName,
+        arguments: args
+      });
+      return result;
+    } catch (error2) {
+      state.status = "error";
+      state.lastError = String(error2);
+      console.error(`[BackendManager] ${language} tool call failed, attempting restart:`, error2);
+      try {
+        await this.restartBackend(language);
+        const restarted = this.backends.get(language);
+        if (!restarted || restarted.status !== "ready") {
+          throw new Error(`${language} backend failed to restart`);
+        }
+        const result = await restarted.client.callTool({
+          name: toolName,
+          arguments: args
+        });
+        return result;
+      } catch (restartError) {
+        throw new Error(`${language} backend error after restart: ${restartError}`);
+      }
+    }
   }
   async getTools(language) {
     const state = await this.getBackend(language);
@@ -20748,6 +20768,7 @@ class BackendManager {
   async restartBackend(language) {
     const existing = this.backends.get(language);
     const oldVersion = existing?.serverInfo?.version ?? null;
+    const restartCount = (existing?.restartCount ?? 0) + 1;
     if (existing) {
       console.error(`[BackendManager] Stopping ${language} for update...`);
       try {
@@ -20760,6 +20781,7 @@ class BackendManager {
     }
     console.error(`[BackendManager] Starting fresh ${language} backend...`);
     const state = await this.startBackend(language);
+    state.restartCount = restartCount;
     const newVersion = state.serverInfo?.version ?? null;
     return { oldVersion, newVersion };
   }
@@ -21586,6 +21608,7 @@ var packageJson = require2("../package.json");
 var config2 = loadConfig();
 var backendManager = new BackendManager(config2);
 var startedBackends = new Set;
+var registeredTools = new Set;
 var server = new McpServer({
   name: "lsp-mcp",
   version: packageJson.version
@@ -21598,46 +21621,7 @@ function jsonSchemaToZod(schema) {
   }
   const required2 = new Set(schema.required || []);
   for (const [key, prop] of Object.entries(schema.properties)) {
-    let zodType;
-    switch (prop.type) {
-      case "string":
-        zodType = exports_external.string();
-        if (prop.enum) {
-          zodType = exports_external.enum(prop.enum);
-        }
-        break;
-      case "number":
-      case "integer":
-        zodType = exports_external.number();
-        if (prop.type === "integer") {
-          zodType = zodType.int();
-        }
-        if (prop.exclusiveMinimum !== undefined) {
-          zodType = zodType.gt(prop.exclusiveMinimum);
-        }
-        if (prop.minimum !== undefined) {
-          zodType = zodType.gte(prop.minimum);
-        }
-        if (prop.maximum !== undefined) {
-          zodType = zodType.lte(prop.maximum);
-        }
-        break;
-      case "boolean":
-        zodType = exports_external.boolean();
-        break;
-      case "array":
-        if (prop.items?.type === "string") {
-          zodType = exports_external.array(exports_external.string());
-        } else {
-          zodType = exports_external.array(exports_external.any());
-        }
-        break;
-      case "object":
-        zodType = exports_external.record(exports_external.any());
-        break;
-      default:
-        zodType = exports_external.any();
-    }
+    let zodType = schemaToZod(prop);
     if (prop.description) {
       zodType = zodType.describe(prop.description);
     }
@@ -21651,16 +21635,101 @@ function jsonSchemaToZod(schema) {
   }
   return result;
 }
+function schemaToZod(schema) {
+  if (!schema)
+    return exports_external.any();
+  if (schema.oneOf || schema.anyOf) {
+    const variants = schema.oneOf ?? schema.anyOf;
+    const mapped = variants.map((variant) => schemaToZod(variant));
+    if (mapped.length === 1)
+      return mapped[0];
+    if (mapped.length > 1)
+      return exports_external.union(mapped);
+    return exports_external.any();
+  }
+  if (schema.allOf) {
+    const variants = schema.allOf;
+    if (variants.length === 0)
+      return exports_external.any();
+    return variants.map((variant) => schemaToZod(variant)).reduce((acc, next) => exports_external.intersection(acc, next));
+  }
+  if (schema.enum && schema.type === "string") {
+    return exports_external.enum(schema.enum);
+  }
+  switch (schema.type) {
+    case "string": {
+      let zodType = exports_external.string();
+      if (schema.minLength !== undefined)
+        zodType = zodType.min(schema.minLength);
+      if (schema.maxLength !== undefined)
+        zodType = zodType.max(schema.maxLength);
+      if (schema.pattern) {
+        try {
+          zodType = zodType.regex(new RegExp(schema.pattern));
+        } catch {}
+      }
+      return zodType;
+    }
+    case "number":
+    case "integer": {
+      let zodType = exports_external.number();
+      if (schema.type === "integer") {
+        zodType = zodType.int();
+      }
+      if (schema.exclusiveMinimum !== undefined) {
+        zodType = zodType.gt(schema.exclusiveMinimum);
+      }
+      if (schema.minimum !== undefined) {
+        zodType = zodType.gte(schema.minimum);
+      }
+      if (schema.maximum !== undefined) {
+        zodType = zodType.lte(schema.maximum);
+      }
+      return zodType;
+    }
+    case "boolean":
+      return exports_external.boolean();
+    case "array":
+      return exports_external.array(schemaToZod(schema.items ?? {}));
+    case "object": {
+      if (schema.properties) {
+        const shape = {};
+        const required2 = new Set(schema.required || []);
+        for (const [key, prop] of Object.entries(schema.properties)) {
+          let propSchema = schemaToZod(prop);
+          if (prop.description) {
+            propSchema = propSchema.describe(prop.description);
+          }
+          if (prop.default !== undefined) {
+            propSchema = propSchema.default(prop.default);
+          }
+          if (!required2.has(key)) {
+            propSchema = propSchema.optional();
+          }
+          shape[key] = propSchema;
+        }
+        return exports_external.object(shape).passthrough();
+      }
+      return exports_external.record(exports_external.any());
+    }
+    default:
+      return exports_external.any();
+  }
+}
 function registerBackendTools(language, tools) {
   let count = 0;
   for (const tool of tools) {
     const namespacedName = `${language}_${tool.name}`;
+    if (registeredTools.has(namespacedName)) {
+      continue;
+    }
     const zodSchema = jsonSchemaToZod(tool.inputSchema);
     server.registerTool(namespacedName, {
       description: tool.description || `${language} ${tool.name} tool`,
       inputSchema: zodSchema
     }, async (args) => backendManager.callTool(language, tool.name, args));
     console.error(`[lsp-mcp] Registered ${namespacedName}`);
+    registeredTools.add(namespacedName);
     count++;
   }
   server.sendToolListChanged();
@@ -21677,7 +21746,7 @@ async function startAndRegisterBackend(language) {
     const tools = await backendManager.getTools(language);
     const count = registerBackendTools(language, tools);
     startedBackends.add(language);
-    console.error(`[lsp-mcp] ${language}: ${count} tools registered`);
+    console.error(`[lsp-mcp] ${language}: ${count} new tools registered`);
     return count;
   } catch (error2) {
     console.error(`[lsp-mcp] Failed to start ${language} backend:`, error2);
@@ -21687,14 +21756,10 @@ async function startAndRegisterBackend(language) {
 async function updateAndRestartBackend(language) {
   console.error(`[lsp-mcp] Updating ${language} backend...`);
   const result = await backendManager.restartBackend(language);
-  if (startedBackends.has(language)) {
-    console.error(`[lsp-mcp] ${language} backend updated, tools still available`);
-  } else {
-    const tools = await backendManager.getTools(language);
-    registerBackendTools(language, tools);
-    startedBackends.add(language);
-    console.error(`[lsp-mcp] ${language} backend updated and ${tools.length} tools registered`);
-  }
+  const tools = await backendManager.getTools(language);
+  const newlyRegistered = registerBackendTools(language, tools);
+  startedBackends.add(language);
+  console.error(`[lsp-mcp] ${language} backend updated (${newlyRegistered} new tools registered)`);
   return result;
 }
 server.registerTool("status", { description: "Get status of all LSP backends and server configuration" }, async () => status(backendManager, config2));
@@ -21792,6 +21857,7 @@ function preRegisterKnownTools() {
         }
         return backendManager.callTool(language, tool.name, args);
       });
+      registeredTools.add(namespacedName);
       totalCount++;
     }
     console.error(`[lsp-mcp] Pre-registered ${tools.length} ${language} tools`);
@@ -21852,4 +21918,4 @@ main().catch((error2) => {
   process.exit(1);
 });
 
-//# debugId=45E34912A1845F5D64756E2164756E21
+//# debugId=55BC37C22EC14E0664756E2164756E21