@@ -2,6 +2,7 @@ package tools
22
33import (
44 "context"
5+ "errors"
56 "fmt"
67 "os"
78
@@ -36,7 +37,7 @@ func setupDestroyTool(s *server.MCPServer, cluster string, providerId cliClient.
3637 term .Debug ("Function invoked: cli.Connect" )
3738 client , err := cli .Connect (ctx , cluster )
3839 if err != nil {
39- return mcp .NewToolResultErrorFromErr ("Could not connect" , err ), nil
40+ return mcp .NewToolResultErrorFromErr ("Could not connect" , err ), err
4041 }
4142
4243 client .Track ("MCP Destroy Tool" )
@@ -45,15 +46,19 @@ func setupDestroyTool(s *server.MCPServer, cluster string, providerId cliClient.
4546 provider , err := cli .NewProvider (ctx , providerId , client )
4647 if err != nil {
4748 term .Error ("Failed to get new provider" , "error" , err )
48- return mcp .NewToolResultErrorFromErr ("Failed to get new provider" , err ), nil
49+ return mcp .NewToolResultErrorFromErr ("Failed to get new provider" , err ), err
4950 }
5051
51- wd , ok := request .Params .Arguments ["working_directory" ].(string )
52- if ! ok || wd != "" {
53- err := os .Chdir (wd )
54- if err != nil {
55- term .Error ("Failed to change working directory" , "error" , err )
56- }
52+ wd , err := request .RequireString ("working_directory" )
53+ if err != nil || wd == "" {
54+ term .Error ("Invalid working directory" , "error" , errors .New ("working_directory is required" ))
55+ return mcp .NewToolResultErrorFromErr ("Invalid working directory" , errors .New ("working_directory is required" )), err
56+ }
57+
58+ err = os .Chdir (wd )
59+ if err != nil {
60+ term .Error ("Failed to change working directory" , "error" , err )
61+ return mcp .NewToolResultErrorFromErr ("Failed to change working directory" , err ), err
5762 }
5863
5964 loader := configureLoader (request )
@@ -62,13 +67,13 @@ func setupDestroyTool(s *server.MCPServer, cluster string, providerId cliClient.
6267 projectName , err := cliClient .LoadProjectNameWithFallback (ctx , loader , provider )
6368 if err != nil {
6469 term .Error ("Failed to load project name" , "error" , err )
65- return mcp .NewToolResultErrorFromErr ("Failed to load project name" , err ), nil
70+ return mcp .NewToolResultErrorFromErr ("Failed to load project name" , err ), err
6671 }
6772
6873 err = canIUseProvider (ctx , client , projectName , provider )
6974 if err != nil {
7075 term .Error ("Failed to use provider" , "error" , err )
71- return mcp .NewToolResultErrorFromErr ("Failed to use provider" , err ), nil
76+ return mcp .NewToolResultErrorFromErr ("Failed to use provider" , err ), err
7277 }
7378
7479 term .Debug ("Function invoked: cli.ComposeDown" )
@@ -77,15 +82,15 @@ func setupDestroyTool(s *server.MCPServer, cluster string, providerId cliClient.
7782 if connect .CodeOf (err ) == connect .CodeNotFound {
7883 // Show a warning (not an error) if the service was not found
7984 term .Warn ("Project not found" , "error" , err )
80- return mcp .NewToolResultText ("Project not found, nothing to destroy. Please use a valid project name, compose file path or project directory." ), nil
85+ return mcp .NewToolResultText ("Project not found, nothing to destroy. Please use a valid project name, compose file path or project directory." ), err
8186 }
8287
8388 result := HandleTermsOfServiceError (err )
8489 if result != nil {
85- return result , nil
90+ return result , err
8691 }
8792
88- return mcp .NewToolResultErrorFromErr ("Failed to destroy project" , err ), nil
93+ return mcp .NewToolResultErrorFromErr ("Failed to destroy project" , err ), err
8994 }
9095
9196 return mcp .NewToolResultText (fmt .Sprintf ("Successfully destroyed project: %s, etag: %s" , projectName , deployment )), nil
0 commit comments