diff --git a/.gitignore b/.gitignore
index 926d0d3..9494e65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,63 @@
-# File chứa API Key
+# ==========================================
+# 1. API KEYS & CREDENTIALS (STRICT IGNORE)
+# ==========================================
 .openclaw/openclaw.json
-.openclaw/agents/
-.openclaw/credentials/
+.openclaw/agents/*
+!.openclaw/agents/.gitkeep
+.openclaw/credentials/*
+!.openclaw/credentials/.gitkeep
 .openclaw/*.bak*
 .openclaw/*.clobbered*
 
-# File thừa
-.openclaw/telegram/
-.openclaw/identity/
-.openclaw/completions/
-.openclaw/canvas/
+# ==========================================
+# 2. RUNTIME CACHE & TRASH
+# ==========================================
+.openclaw/telegram/*
+!.openclaw/telegram/.gitkeep
+.openclaw/identity/*
+!.openclaw/identity/.gitkeep
+.openclaw/completions/*
+!.openclaw/completions/.gitkeep
+.openclaw/canvas/*
+!.openclaw/canvas/.gitkeep
 .openclaw/update-check.json
 
-# Bỏ qua các file log chat/nháp/cache hàng ngày của Agent
-.openclaw/workspace/memory/
-.openclaw/workspace/logs/
-.openclaw/logs/
-.openclaw/cache/
-.openclaw/workspace/docs/superpowers/
-.openclaw/workspace/projects
+# ==========================================
+# 3. WORKSPACE ISOLATION (GIỮ KHUNG SƯỜN)
+# ==========================================
+.openclaw/workspace/memory/*
+!.openclaw/workspace/memory/.gitkeep
+
+.openclaw/workspace/logs/*
+!.openclaw/workspace/logs/.gitkeep
+
+.openclaw/logs/*
+!.openclaw/logs/.gitkeep
+
+.openclaw/cache/*
+!.openclaw/cache/.gitkeep
+
+.openclaw/workspace/docs/superpowers/*
+!.openclaw/workspace/docs/superpowers/.gitkeep
+
+.openclaw/workspace/projects/*
 !.openclaw/workspace/projects/.gitkeep
-.openclaw/workspace/.clawhub/
+
+.openclaw/workspace/.clawhub/*
+!.openclaw/workspace/.clawhub/.gitkeep
+
 .openclaw/workspace/package-lock.json
 
-# Bỏ qua các file chứa thiết bị kết nối
+# ==========================================
+# 4. HARDWARE & GATEWAY STATES
+# ==========================================
 .openclaw/devices/*
+!.openclaw/devices/.gitkeep
 
-# Bỏ qua các file trạng thái tạm thời của Gateway
 .openclaw/gateway/pending.json
 .openclaw/gateway/sessions.db
 
-# Bỏ qua các file môi trường
+# ==========================================
+# 5. ENVIRONMENT VARIABLES
+# ==========================================
 .env
diff --git a/.openclaw/agents/.gitkeep b/.openclaw/agents/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/cache/.gitkeep b/.openclaw/cache/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/canvas/.gitkeep b/.openclaw/canvas/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/completions/.gitkeep b/.openclaw/completions/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/credentials/.gitkeep b/.openclaw/credentials/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/devices/.gitkeep b/.openclaw/devices/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/identity/.gitkeep b/.openclaw/identity/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/logs/.gitkeep b/.openclaw/logs/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/telegram/.gitkeep b/.openclaw/telegram/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/workspace/.clawhub/.gitkeep b/.openclaw/workspace/.clawhub/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/workspace/docs/superpowers/.gitkeep b/.openclaw/workspace/docs/superpowers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/workspace/logs/.gitkeep b/.openclaw/workspace/logs/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/workspace/memory/.gitkeep b/.openclaw/workspace/memory/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/.openclaw/workspace/projects/.gitkeep b/.openclaw/workspace/projects/.gitkeep
new file mode 100644
index 0000000..e69de29