diff --git a/packages/core/src/tools/descriptions/checkpoint_create.txt b/packages/core/src/tools/descriptions/checkpoint/checkpoint_create.txt
similarity index 100%
rename from packages/core/src/tools/descriptions/checkpoint_create.txt
rename to packages/core/src/tools/descriptions/checkpoint/checkpoint_create.txt
diff --git a/packages/core/src/tools/descriptions/checkpoint_diff.txt b/packages/core/src/tools/descriptions/checkpoint/checkpoint_diff.txt
similarity index 100%
rename from packages/core/src/tools/descriptions/checkpoint_diff.txt
rename to packages/core/src/tools/descriptions/checkpoint/checkpoint_diff.txt
diff --git a/packages/core/src/tools/descriptions/checkpoint_list.txt b/packages/core/src/tools/descriptions/checkpoint/checkpoint_list.txt
similarity index 100%
rename from packages/core/src/tools/descriptions/checkpoint_list.txt
rename to packages/core/src/tools/descriptions/checkpoint/checkpoint_list.txt
diff --git a/packages/core/src/tools/descriptions/checkpoint_restore.txt b/packages/core/src/tools/descriptions/checkpoint/checkpoint_restore.txt
similarity index 100%
rename from packages/core/src/tools/descriptions/checkpoint_restore.txt
rename to packages/core/src/tools/descriptions/checkpoint/checkpoint_restore.txt
diff --git a/packages/core/src/tools/descriptions/undo.txt b/packages/core/src/tools/descriptions/checkpoint/undo.txt
similarity index 100%
rename from packages/core/src/tools/descriptions/undo.txt
rename to packages/core/src/tools/descriptions/checkpoint/undo.txt
diff --git a/packages/core/src/tools/descriptions/repo_map.txt b/packages/core/src/tools/descriptions/repomap/repo_map.txt
similarity index 100%
rename from packages/core/src/tools/descriptions/repo_map.txt
rename to packages/core/src/tools/descriptions/repomap/repo_map.txt
diff --git a/packages/core/src/tools/load_description.ts b/packages/core/src/tools/load_description.ts
index 12b30ac..3a7fc97 100644
--- a/packages/core/src/tools/load_description.ts
+++ b/packages/core/src/tools/load_description.ts
@@ -40,6 +40,14 @@ const TOOL_CATEGORY_MAP: Record<string, string> = {
   // task
   task: 'task',
   agent_output: 'task',
+  // checkpoint
+  checkpoint_create: 'checkpoint',
+  checkpoint_list: 'checkpoint',
+  checkpoint_diff: 'checkpoint',
+  checkpoint_restore: 'checkpoint',
+  undo: 'checkpoint',
+  // repomap
+  repo_map: 'repomap',
 };
 
 export function loadDescription(toolName: string): string {