Fix bug #23075: LSP workspaceSymbol is always send with empty query

Author: VladD2

packages/opencode/src/lsp/client.ts

@@ -130,10 +130,27 @@ export async function create(input: { serverID: string; server: LSPServer.Handle
       settings: input.server.initialization,
     })
   }
+  
+  const files: Record<string, {
+    version: number;
+    lineCount: number;
+    lastLineLength: number;
+  }> = {};
 
-  const files: {
-    [path: string]: number
-  } = {}
+  function getMeta(str: string) {
+    let lineCount = 0;
+    let lastIndex = -1;
+    while (true) {
+      const matchIndex = str.indexOf('\n', lastIndex + 1);
+      if (matchIndex === -1) break;
+      lineCount++;
+      lastIndex = matchIndex;
+    }
+    return {
+      lineCount: lineCount + 1,
+      lastLineLength: str.length - lastIndex - 1
+    };
+  }
 
   const result = {
     root: input.root,
@@ -150,8 +167,8 @@ export async function create(input: { serverID: string; server: LSPServer.Handle
         const extension = path.extname(request.path)
         const languageId = LANGUAGE_EXTENSIONS[extension] ?? "plaintext"
 
-        const version = files[request.path]
-        if (version !== undefined) {
+        const fileInfo = files[request.path]
+        if (fileInfo !== undefined) {
           log.info("workspace/didChangeWatchedFiles", request)
           await connection.sendNotification("workspace/didChangeWatchedFiles", {
             changes: [
@@ -162,8 +179,7 @@ export async function create(input: { serverID: string; server: LSPServer.Handle
             ],
           })
 
-          const next = version + 1
-          files[request.path] = next
+          const next = fileInfo.version + 1
           log.info("textDocument/didChange", {
             path: request.path,
             version: next,
@@ -173,8 +189,25 @@ export async function create(input: { serverID: string; server: LSPServer.Handle
               uri: pathToFileURL(request.path).href,
               version: next,
             },
-            contentChanges: [{ text }],
+            contentChanges: [{
+              // Explicitly range-replace the entire document to satisfy LSP servers 
+              // that require Incremental sync (like Roslyn) while we are sending full text.
+              range: {
+                start: { line: 0, character: 0 },
+                end: {
+                  line: fileInfo.lineCount - 1,
+                  character: fileInfo.lastLineLength
+                }
+              },
+              text: text
+            }],
           })
+
+          const meta = getMeta(text)
+          files[request.path] = {
+            version: next,
+            ...meta
+          }
           return
         }
 
@@ -198,7 +231,12 @@ export async function create(input: { serverID: string; server: LSPServer.Handle
             text,
           },
         })
-        files[request.path] = 0
+
+        const meta = getMeta(text)
+        files[request.path] = {
+          version: 0,
+          ...meta
+        }
         return
       },
     },

packages/opencode/src/tool/lsp.ts

@@ -31,24 +31,34 @@ export const LspTool = Tool.define(
       description: DESCRIPTION,
       parameters: z.object({
         operation: z.enum(operations).describe("The LSP operation to perform"),
-        filePath: z.string().describe("The absolute or relative path to the file"),
-        line: z.number().int().min(1).describe("The line number (1-based, as shown in editors)"),
-        character: z.number().int().min(1).describe("The character offset (1-based, as shown in editors)"),
+        filePath: z.string().optional().describe("The absolute or relative path to the file. Required for all operations except workspaceSymbol."),
+        line: z.number().int().min(1).optional().describe("The line number (1-based, as shown in editors). Required for: goToDefinition, findReferences, hover, goToImplementation, prepareCallHierarchy, incomingCalls, outgoingCalls."),
+        character: z.number().int().min(1).optional().describe("The character offset (1-based, as shown in editors). Required for: goToDefinition, findReferences, hover, goToImplementation, prepareCallHierarchy, incomingCalls, outgoingCalls."),
+        query: z.string().optional().describe("Search query. Required for workspaceSymbol operation."),
       }),
       execute: (
-        args: { operation: (typeof operations)[number]; filePath: string; line: number; character: number },
+        args: { operation: (typeof operations)[number]; filePath?: string; line?: number; character?: number; query?: string },
         ctx: Tool.Context,
       ) =>
         Effect.gen(function* () {
+          // Handle workspaceSymbol without file validation
+          if (args.operation === "workspaceSymbol") {
+            const result: unknown[] = yield* lsp.workspaceSymbol(args.query || "")
+            return {
+              title: `workspaceSymbol "${args.query || ''}"`,
+              metadata: { result },
+              output: result.length === 0 ? `No workspace symbols found matching query "${args.query || ''}"` : JSON.stringify(result, null, 2),
+            }
+          }
+
+          if (!args.filePath) {
+            throw new Error(`filePath is required for operation '${args.operation}'`)
+          }
+
           const file = path.isAbsolute(args.filePath) ? args.filePath : path.join(Instance.directory, args.filePath)
           yield* assertExternalDirectoryEffect(ctx, file)
           yield* ctx.ask({ permission: "lsp", patterns: ["*"], always: ["*"], metadata: {} })
 
-          const uri = pathToFileURL(file).href
-          const position = { file, line: args.line - 1, character: args.character - 1 }
-          const relPath = path.relative(Instance.worktree, file)
-          const title = `${args.operation} ${relPath}:${args.line}:${args.character}`
-
           const exists = yield* fs.existsSafe(file)
           if (!exists) throw new Error(`File not found: ${file}`)
 
@@ -57,6 +67,26 @@ export const LspTool = Tool.define(
 
           yield* lsp.touchFile(file, true)
 
+          const uri = pathToFileURL(file).href
+          const relPath = path.relative(Instance.worktree, file)
+
+          // Handle documentSymbol without line/character validation
+          if (args.operation === "documentSymbol") {
+            const result: unknown[] = yield* lsp.documentSymbol(uri)
+            return {
+              title: `documentSymbol ${relPath}`,
+              metadata: { result },
+              output: result.length === 0 ? `No document symbols found` : JSON.stringify(result, null, 2),
+            }
+          }
+
+          if (args.line === undefined || args.character === undefined) {
+            throw new Error(`line and character are required for operation '${args.operation}'`)
+          }
+
+          const position = { file, line: args.line - 1, character: args.character - 1 }
+          const title = `${args.operation} ${relPath}:${args.line}:${args.character}`
+
           const result: unknown[] = yield* (() => {
             switch (args.operation) {
               case "goToDefinition":
@@ -65,10 +95,6 @@ export const LspTool = Tool.define(
                 return lsp.references(position)
               case "hover":
                 return lsp.hover(position)
-              case "documentSymbol":
-                return lsp.documentSymbol(uri)
-              case "workspaceSymbol":
-                return lsp.workspaceSymbol("")
               case "goToImplementation":
                 return lsp.implementation(position)
               case "prepareCallHierarchy":
@@ -77,6 +103,8 @@ export const LspTool = Tool.define(
                 return lsp.incomingCalls(position)
               case "outgoingCalls":
                 return lsp.outgoingCalls(position)
+              default:
+                throw new Error(`Unknown operation: ${args.operation}`)
             }
           })()