From 2c8d42d99765b105a69cf929917e01c5fb967b74 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Wed, 26 Nov 2025 20:18:40 -0500
Subject: [PATCH] roll back vtsls

---
 packages/opencode/src/lsp/server.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/opencode/src/lsp/server.ts b/packages/opencode/src/lsp/server.ts
index 44752fd50..af96a02d8 100644
--- a/packages/opencode/src/lsp/server.ts
+++ b/packages/opencode/src/lsp/server.ts
@@ -82,13 +82,12 @@ export namespace LSPServer {
 
   export const Typescript: Info = {
     id: "typescript",
-    root: NearestRoot(
-      ["package-lock.json", "bun.lockb", "bun.lock", "pnpm-lock.yaml", "yarn.lock"],
-      ["deno.json", "deno.jsonc"],
-    ),
+    root: NearestRoot(["tsconfig.json", "package.json", "jsconfig.json", ".git"], ["deno.json", "deno.jsonc"]),
     extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts"],
     async spawn(root) {
-      const proc = spawn(BunProc.which(), ["x", "@vtsls/language-server", "--stdio"], {
+      const tsserver = await Bun.resolve("typescript/lib/tsserver.js", root).catch(() => {})
+      if (!tsserver) return
+      const proc = spawn(BunProc.which(), ["x", "typescript-language-server", "--stdio"], {
         cwd: root,
         env: {
           ...process.env,
@@ -97,6 +96,11 @@ export namespace LSPServer {
       })
       return {
         process: proc,
+        initialization: {
+          tsserver: {
+            path: tsserver,
+          },
+        },
       }
     },
   }