fix: improve error messages for MCP file handling in server commands

Author: 35C4n0r

cmd/server/server.go

@@ -139,7 +139,7 @@ func runServer(ctx context.Context, logger *slog.Logger, argsToPass []string) er
 	acpMCPFile := viper.GetString(FlagMCPFile)
 
 	if acpMCPFile != "" && !experimentalACP {
-		return xerrors.Errorf("--mcp-file requires --experimental-acp requires to be set")
+		return xerrors.Errorf("--mcp-file requires --experimental-acp")
 	}
 
 	if experimentalACP && (saveState || loadState) {

x/acpio/acpio.go

@@ -194,20 +194,20 @@ func getSupportedMCPConfig(mcpFilePath string, logger *slog.Logger, initResp *ac
 
 	mcpFile, err := os.Open(mcpFilePath)
 	if err != nil {
-		return nil, xerrors.Errorf("Failed to open mcp file: %v", err)
+		return nil, xerrors.Errorf("Failed to open mcp file: %w", err)
 	}
 
 	defer func() {
 		if closeErr := mcpFile.Close(); closeErr != nil {
-			logger.Error("Failed to close mcp file", "error", err)
+			logger.Error("Failed to close mcp file", "path", mcpFilePath, "error", closeErr)
 		}
 	}()
 
 	var allMcpList McpConfig
 	decoder := json.NewDecoder(mcpFile)
 
 	if err = decoder.Decode(&allMcpList); err != nil {
-		return nil, xerrors.Errorf("Failed to decode mcp file: %v", err)
+		return nil, xerrors.Errorf("Failed to decode mcp file: %w", err)
 	}
 
 	// Only send the MCPs that are supported by the agents