diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 000000000..eaf6ad184
Binary files /dev/null and b/.DS_Store differ
diff --git a/src/main/java/emu/grasscutter/command/CommandMap.java b/src/main/java/emu/grasscutter/command/CommandMap.java
index 07deb84fd..a183c6ac3 100644
--- a/src/main/java/emu/grasscutter/command/CommandMap.java
+++ b/src/main/java/emu/grasscutter/command/CommandMap.java
@@ -79,6 +79,12 @@ public final class CommandMap {
         return this;
     }
 
+    public List<Command> getAnnotationsAsList() { return new LinkedList<>(this.annotations.values()); }
+
+    public HashMap<String, Command> getAnnotations() {
+        return new LinkedHashMap<>(this.annotations);
+    }
+
     /**
      * Returns a list of all registered commands.
      *
diff --git a/src/main/java/emu/grasscutter/tools/Tools.java b/src/main/java/emu/grasscutter/tools/Tools.java
index 7429c143f..d9923a656 100644
--- a/src/main/java/emu/grasscutter/tools/Tools.java
+++ b/src/main/java/emu/grasscutter/tools/Tools.java
@@ -13,16 +13,15 @@ import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.google.gson.reflect.TypeToken;
 
 import emu.grasscutter.GameConstants;
 import emu.grasscutter.Grasscutter;
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.ResourceLoader;
 import emu.grasscutter.data.def.AvatarData;
@@ -111,7 +110,21 @@ final class ToolsWithLanguageOption {
 			   
 			writer.println("// Grasscutter " + GameConstants.VERSION + " GM Handbook");
 			writer.println("// Created " + dtf.format(now) + System.lineSeparator() + System.lineSeparator());
-			
+
+			CommandMap cmdMap = new CommandMap(true);
+			List<Command> cmdList = new ArrayList<>(cmdMap.getAnnotationsAsList());
+
+			writer.println("// Commands");
+			for (Command cmd : cmdList) {
+				String cmdName = cmd.label();
+				while (cmdName.length() <= 15) {
+					cmdName = " " + cmdName;
+				}
+				writer.println(cmdName + " : " + cmd.description());
+			}
+
+			writer.println();
+
 			list = new ArrayList<>(GameData.getAvatarDataMap().keySet());
 			Collections.sort(list);