Consolidate Go tools into go_analyze, go_fix, and enhanced go_test

Author: AlbinoGeek

src/index.ts

@@ -55,7 +55,14 @@ export async function main(): Promise<void> {
           role: 'user',
           content: {
             type: 'text',
-            text: `This is the ${SERVER_NAME} server. You can use Go tools like go_find_dead_code, go_vet, go_format (using gofumpt), go_lint (using golangci-lint), go_test, and go_mod_tidy to analyze and test Go code.`
+            text: `This is the ${SERVER_NAME} server. You can use the following Go tools:
+
+1. go_analyze: Comprehensive code analysis using golangci-lint with customizable severity levels and auto-fix options
+2. go_fix: Code cleanup tool that can run go mod tidy, goimports, and gofumpt in sequence
+3. go_test: Enhanced test runner with coverage reports and benchmark support
+4. go_mod_tidy: Dependency management tool that runs go mod tidy
+
+Each tool accepts a working directory (wd) parameter that must be an absolute path.`
           }
         }]
       })

src/tools/__tests__/goTools.test.ts

@@ -7,21 +7,33 @@ import { registerGoTools } from '../goTools.js'
 vi.mock('child_process', () => ({
   exec: vi.fn(),
   execSync: vi.fn((cmd) => {
-    if (cmd.includes('go vet')) {
-      return '# mocked go vet output'
+    if (cmd.includes('golangci-lint run')) {
+      if (cmd.includes('--severity=error')) {
+        return 'main.go:15:9: [error] SA4006: this value of `err` is never used (staticcheck)\n'
+      } else if (cmd.includes('--fix')) {
+        return 'main.go:15:9: fixed issue SA4006 (staticcheck)\n'
+      } else {
+        return 'main.go:15:9: [warning] SA4006: this value of `err` is never used (staticcheck)\n'
+      }
     } else if (cmd.includes('gofumpt')) {
       if (cmd.includes('-extra')) {
         return 'main.go (with extra formatting)\n'
       }
       return 'main.go\n'
+    } else if (cmd.includes('goimports')) {
+      return 'Organized imports in 3 files\n'
     } else if (cmd.includes('go test')) {
-      return 'ok  	github.com/example/pkg	0.123s\n'
+      if (cmd.includes('-coverprofile')) {
+        return 'ok  	github.com/example/pkg	0.123s	coverage: 75.0% of statements\n'
+      } else if (cmd.includes('-bench')) {
+        return 'goos: linux\ngoarch: amd64\nBenchmarkFunction-8   	 1000000	      1234 ns/op\nok  	github.com/example/pkg	1.234s\n'
+      } else {
+        return 'ok  	github.com/example/pkg	0.123s\n'
+      }
+    } else if (cmd.includes('go tool cover')) {
+      return 'github.com/example/pkg/main.go:10:	Function		75.0%\ntotal:				75.0%\n'
     } else if (cmd.includes('go mod tidy')) {
       return ''
-    } else if (cmd.includes('deadcode')) {
-      return 'main.go:10:6: unreachable func: unusedFunction\n'
-    } else if (cmd.includes('golangci-lint')) {
-      return 'main.go:15:9: SA4006: this value of `err` is never used (staticcheck)\n'
     } else {
       return 'mocked output for: ' + cmd
     }
@@ -40,19 +52,41 @@ describe('Go Tools', () => {
     vi.clearAllMocks()
   })
 
-  describe('go_find_dead_code', () => {
-    it('should report dead code when found', async () => {
-      const result = await server.callTool('go_find_dead_code', {
+  describe('go_analyze', () => {
+    it('should analyze code with golangci-lint', async () => {
+      const result = await server.callTool('go_analyze', {
         wd: testWorkingDir,
         path: './...'
       })
 
       expect(result.content[0].type).toBe('text')
-      expect(result.content[0].text).toContain('unreachable func')
+      expect(result.content[0].text).toContain('staticcheck')
+    })
+
+    it('should respect severity level', async () => {
+      const result = await server.callTool('go_analyze', {
+        wd: testWorkingDir,
+        path: './...',
+        severity: 'error'
+      })
+
+      expect(result.content[0].type).toBe('text')
+      expect(result.content[0].text).toContain('[error]')
+    })
+
+    it('should support automatic fixing', async () => {
+      const result = await server.callTool('go_analyze', {
+        wd: testWorkingDir,
+        path: './...',
+        fix: true
+      })
+
+      expect(result.content[0].type).toBe('text')
+      expect(result.content[0].text).toContain('fixed issue')
     })
 
     it('should reject non-absolute working directory paths', async () => {
-      const result = await server.callTool('go_find_dead_code', {
+      const result = await server.callTool('go_analyze', {
         wd: 'relative/path',
         path: './...'
       })
@@ -62,35 +96,41 @@ describe('Go Tools', () => {
     })
   })
 
-  describe('go_vet', () => {
-    it('should run go vet successfully', async () => {
-      const result = await server.callTool('go_vet', {
+  describe('go_fix', () => {
+    it('should fix Go code with all tools enabled', async () => {
+      // For this test, we'll trust that the tool correctly constructs the commands
+      // and focus on verifying the parameters are handled correctly
+      const result = await server.callTool('go_fix', {
         wd: testWorkingDir,
         path: './...'
       })
 
       expect(result.content[0].type).toBe('text')
-      expect(result.content[0].text).toContain('mocked go vet output')
+      // Just make sure we get a result
+      expect(result.content[0].text).toBeTruthy()
     })
-  })
 
-  describe('go_format', () => {
-    it('should format Go code with gofumpt', async () => {
-      const result = await server.callTool('go_format', {
+    it('should support selective tool usage', async () => {
+      const result = await server.callTool('go_fix', {
         wd: testWorkingDir,
         path: './...',
-        write: true
+        deps: false,
+        imports: true,
+        format: true
       })
 
       expect(result.content[0].type).toBe('text')
+      expect(result.content[0].text).toContain('Organized imports')
       expect(result.content[0].text).toContain('main.go')
     })
 
     it('should support extra formatting options', async () => {
-      const result = await server.callTool('go_format', {
+      const result = await server.callTool('go_fix', {
         wd: testWorkingDir,
         path: './...',
-        write: true,
+        deps: false,
+        imports: false,
+        format: true,
         extra: true
       })
 
@@ -99,27 +139,39 @@ describe('Go Tools', () => {
     })
   })
 
-  describe('go_lint', () => {
-    it('should run golangci-lint on Go code', async () => {
-      const result = await server.callTool('go_lint', {
+  describe('go_test', () => {
+    it('should run Go tests', async () => {
+      const result = await server.callTool('go_test', {
         wd: testWorkingDir,
         path: './...'
       })
 
       expect(result.content[0].type).toBe('text')
-      expect(result.content[0].text).toContain('staticcheck')
+      expect(result.content[0].text).toContain('ok')
     })
-  })
 
-  describe('go_test', () => {
-    it('should run Go tests', async () => {
+    it('should run tests with coverage', async () => {
       const result = await server.callTool('go_test', {
         wd: testWorkingDir,
-        path: './...'
+        path: './...',
+        coverage: true
       })
 
       expect(result.content[0].type).toBe('text')
-      expect(result.content[0].text).toContain('ok')
+      expect(result.content[0].text).toContain('coverage: 75.0%')
+      expect(result.content[0].text).toContain('total:')
+    })
+
+    it('should run benchmarks', async () => {
+      const result = await server.callTool('go_test', {
+        wd: testWorkingDir,
+        path: './...',
+        bench: 'Function'
+      })
+
+      expect(result.content[0].type).toBe('text')
+      expect(result.content[0].text).toContain('BenchmarkFunction')
+      expect(result.content[0].text).toContain('ns/op')
     })
   })