Built editor into CLI tools, neko fixes