diff --git a/src/bus/message.rs b/src/bus/message.rs
index 03175f1..9f89faa 100644
--- a/src/bus/message.rs
+++ b/src/bus/message.rs
@@ -573,7 +573,7 @@ mod tests {
                 },
                 ToolCall {
                     id: "call-2".to_string(),
-                    name: "file_read".to_string(),
+                    name: "read".to_string(),
                     arguments: json!({"path": "README.md"}),
                 },
             ],
@@ -599,10 +599,10 @@ mod tests {
             outbound[0].content,
             "calculator\nargs: {\"expression\":\"1 + 1\"}"
         );
-        assert_eq!(outbound[1].tool_name.as_deref(), Some("file_read"));
+        assert_eq!(outbound[1].tool_name.as_deref(), Some("read"));
         assert_eq!(
             outbound[1].content,
-            "file_read\nargs: {\"path\":\"README.md\"}"
+            "read\nargs: {\"path\":\"README.md\"}"
         );
     }
 
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 8f1d87e..f522da3 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -140,9 +140,9 @@ fn default_task_ttl_hours() -> u64 {
 
 fn default_task_allowed_tools() -> Vec<String> {
     vec![
-        "file_read".to_string(),
-        "file_edit".to_string(),
-        "file_write".to_string(),
+        "read".to_string(),
+        "edit".to_string(),
+        "write".to_string(),
         "bash".to_string(),
         "http_request".to_string(),
         "web_fetch".to_string(),
diff --git a/src/gateway/session.rs b/src/gateway/session.rs
index 7bc6877..0e86f29 100644
--- a/src/gateway/session.rs
+++ b/src/gateway/session.rs
@@ -697,6 +697,7 @@ mod tests {
         HashSet::new(),
                 "Asia/Shanghai".to_string(),
         HashSet::new(),
+                Default::default(),
             )
             .build(),
         );
@@ -744,6 +745,7 @@ mod tests {
         HashSet::new(),
                 "Asia/Shanghai".to_string(),
         HashSet::new(),
+                Default::default(),
             )
             .build(),
         );
@@ -1693,6 +1695,7 @@ mod tests {
         HashSet::new(),
                 "Asia/Shanghai".to_string(),
         HashSet::new(),
+                Default::default(),
             )
             .build(),
         );
@@ -1732,6 +1735,7 @@ mod tests {
         HashSet::new(),
                 "Asia/Shanghai".to_string(),
         HashSet::new(),
+                Default::default(),
             )
             .build(),
         );
@@ -1804,6 +1808,7 @@ mod tests {
         HashSet::new(),
                 "Asia/Shanghai".to_string(),
         HashSet::new(),
+                Default::default(),
             )
             .build(),
         );
@@ -1854,7 +1859,8 @@ mod tests {
             Arc::new(NoopSessionMessageSender),
             HashSet::new(),
             "Asia/Shanghai".to_string(),
-        HashSet::new(),
+            HashSet::new(),
+            Default::default(),
         )
         .build();
 
diff --git a/src/gateway/tool_registry_factory.rs b/src/gateway/tool_registry_factory.rs
index 2740e34..63b304f 100644
--- a/src/gateway/tool_registry_factory.rs
+++ b/src/gateway/tool_registry_factory.rs
@@ -72,13 +72,13 @@ impl ToolRegistryFactory {
         if self.is_enabled("get_time") {
             registry.register(TimeTool::new(self.default_timezone.clone()));
         }
-        if self.is_enabled("file_read") {
+        if self.is_enabled("read") {
             registry.register(FileReadTool::new());
         }
-        if self.is_enabled("file_write") {
+        if self.is_enabled("write") {
             registry.register(FileWriteTool::new());
         }
-        if self.is_enabled("file_edit") {
+        if self.is_enabled("edit") {
             registry.register(FileEditTool::new());
         }
         if self.is_enabled("memory_search") {
@@ -144,13 +144,13 @@ impl ToolRegistryFactory {
         if self.is_enabled("get_time") {
             registry.register(TimeTool::new(self.default_timezone.clone()));
         }
-        if self.is_enabled("file_read") {
+        if self.is_enabled("read") {
             registry.register(FileReadTool::new());
         }
-        if self.is_enabled("file_write") {
+        if self.is_enabled("write") {
             registry.register(FileWriteTool::new());
         }
-        if self.is_enabled("file_edit") {
+        if self.is_enabled("edit") {
             registry.register(FileEditTool::new());
         }
         if self.is_enabled("bash") {
diff --git a/src/storage/mod.rs b/src/storage/mod.rs
index 389d83c..f1831ae 100644
--- a/src/storage/mod.rs
+++ b/src/storage/mod.rs
@@ -2228,7 +2228,7 @@ mod tests {
         let store = SessionStore::in_memory().unwrap();
         let session = store.create_cli_session(Some("tool-result")).unwrap();
 
-        let tool_message = ChatMessage::tool("call_9", "file_write", "saved to /tmp/output.txt");
+        let tool_message = ChatMessage::tool("call_9", "write", "saved to /tmp/output.txt");
         store.append_message(&session.id, &tool_message).unwrap();
 
         let messages = store.load_messages(&session.id).unwrap();
@@ -2236,7 +2236,7 @@ mod tests {
         assert_eq!(messages[0].role, "tool");
         assert_eq!(messages[0].content, "saved to /tmp/output.txt");
         assert_eq!(messages[0].tool_call_id.as_deref(), Some("call_9"));
-        assert_eq!(messages[0].tool_name.as_deref(), Some("file_write"));
+        assert_eq!(messages[0].tool_name.as_deref(), Some("write"));
         assert!(messages[0].tool_calls.is_none());
     }
 
diff --git a/src/tools/file_edit.rs b/src/tools/file_edit.rs
index a097988..b3eefcb 100644
--- a/src/tools/file_edit.rs
+++ b/src/tools/file_edit.rs
@@ -83,7 +83,7 @@ impl Default for FileEditTool {
 #[async_trait]
 impl Tool for FileEditTool {
     fn name(&self) -> &str {
-        "file_edit"
+        "edit"
     }
 
     fn description(&self) -> &str {
diff --git a/src/tools/file_read.rs b/src/tools/file_read.rs
index bca881c..a44c59f 100644
--- a/src/tools/file_read.rs
+++ b/src/tools/file_read.rs
@@ -57,7 +57,7 @@ impl Default for FileReadTool {
 #[async_trait]
 impl Tool for FileReadTool {
     fn name(&self) -> &str {
-        "file_read"
+        "read"
     }
 
     fn description(&self) -> &str {
diff --git a/src/tools/file_write.rs b/src/tools/file_write.rs
index fc95d29..15ca360 100644
--- a/src/tools/file_write.rs
+++ b/src/tools/file_write.rs
@@ -54,7 +54,7 @@ impl Default for FileWriteTool {
 #[async_trait]
 impl Tool for FileWriteTool {
     fn name(&self) -> &str {
-        "file_write"
+        "write"
     }
 
     fn description(&self) -> &str {
diff --git a/src/tools/task/runtime.rs b/src/tools/task/runtime.rs
index d0f1da6..6c3db11 100644
--- a/src/tools/task/runtime.rs
+++ b/src/tools/task/runtime.rs
@@ -34,9 +34,9 @@ impl Default for SubAgentRuntimeConfig {
     fn default() -> Self {
         Self {
             allowed_tools: HashSet::from([
-                "file_read".to_string(),
-                "file_edit".to_string(),
-                "file_write".to_string(),
+                "read".to_string(),
+                "edit".to_string(),
+                "write".to_string(),
                 "bash".to_string(),
                 "http_request".to_string(),
                 "web_fetch".to_string(),