diff --git a/agents/asistente2/agent.go b/agents/asistente-2/agent.go
similarity index 100%
rename from agents/asistente2/agent.go
rename to agents/asistente-2/agent.go
diff --git a/agents/asistente2/config.yaml b/agents/asistente-2/config.yaml
similarity index 92%
rename from agents/asistente2/config.yaml
rename to agents/asistente-2/config.yaml
index ccef07d..b8c83b2 100644
--- a/agents/asistente2/config.yaml
+++ b/agents/asistente-2/config.yaml
@@ -109,6 +109,16 @@ tools:
       port: 0
       tools: []
 
+  memory:
+    enabled: true
+
+# ============================================
+# MEMORIA — ventana de conversación + hechos
+# ============================================
+memory:
+  enabled: true
+  window_size: 30
+
 # ============================================
 # MATRIX — CONEXIÓN Y ROOMS
 # ============================================
@@ -120,7 +130,7 @@ matrix:
 
   encryption:
     enabled: true
-    store_path: "./agents/asistente2/data/crypto/"
+    store_path: "./agents/asistente-2/data/crypto/"
     pickle_key_env: PICKLE_KEY_ASISTENTE_2
     trust_mode: tofu
     recovery_key_env: SSSS_RECOVERY_KEY_ASISTENTE_2
@@ -186,7 +196,7 @@ security:
 
   audit:
     enabled: false
-    log_file: "./data/audit.log"
+    log_file: "./agents/asistente-2/data/audit.log"
     log_to_room: ""
     include: []
 
@@ -206,7 +216,7 @@ observability:
     level: info
     format: json
     output: stdout
-    file: "./data/asistente2.log"
+    file: "./agents/asistente-2/data/asistente-2.log"
 
   metrics:
     enabled: false
@@ -256,7 +266,7 @@ resilience:
 storage:
   state:
     backend: sqlite
-    path: "./data/asistente2.db"
+    path: "./agents/asistente-2/data/asistente-2.db"
 
   cache:
     enabled: true
@@ -266,5 +276,5 @@ storage:
 
   history:
     backend: sqlite
-    path: "./data/history.db"
+    path: "./agents/asistente-2/data/history.db"
     retention: 168h   # 7 días
diff --git a/agents/asistente2/prompts/system.md b/agents/asistente-2/prompts/system.md
similarity index 100%
rename from agents/asistente2/prompts/system.md
rename to agents/asistente-2/prompts/system.md
diff --git a/agents/assistant/agent.go b/agents/assistant-bot/agent.go
similarity index 91%
rename from agents/assistant/agent.go
rename to agents/assistant-bot/agent.go
index a80bcb7..87af43b 100644
--- a/agents/assistant/agent.go
+++ b/agents/assistant-bot/agent.go
@@ -19,8 +19,7 @@ func Rules() []decision.Rule {
 					Content: "Soy tu asistente. Escríbeme directamente lo que necesitas:\n" +
 						"- Preguntas, explicaciones, resúmenes\n" +
 						"- Ayuda con código\n" +
-						"- Redacción de textos\n\n" +
-						"Para tareas de infraestructura, habla con @devops-bot.",
+						"- Redacción de textos",
 				},
 			}},
 		},
diff --git a/agents/assistant/config.yaml b/agents/assistant-bot/config.yaml
similarity index 90%
rename from agents/assistant/config.yaml
rename to agents/assistant-bot/config.yaml
index 9218c4e..55a29b2 100644
--- a/agents/assistant/config.yaml
+++ b/agents/assistant-bot/config.yaml
@@ -31,7 +31,7 @@ personality:
 
   behavior:
     proactive: false
-    ask_confirmation: false      # el assistant no pide confirmación, solo el devops
+    ask_confirmation: false
     show_reasoning: false
     thread_replies: true
     typing_indicator: true
@@ -64,8 +64,8 @@ llm:
     memory_messages: 30          # mantiene 30 mensajes de historia por room/DM
 
   tool_use:
-    enabled: false               # el assistant no usa tools por ahora
-    max_iterations: 3
+    enabled: true
+    max_iterations: 5
     parallel_calls: false
 
   rate_limit:
@@ -110,6 +110,16 @@ tools:
       port: 0
       tools: []
 
+  memory:
+    enabled: true
+
+# ============================================
+# MEMORIA — ventana de conversación + hechos
+# ============================================
+memory:
+  enabled: true
+  window_size: 30
+
 # ============================================
 # MATRIX — CONEXIÓN Y ROOMS
 # ============================================
@@ -121,7 +131,7 @@ matrix:
 
   encryption:
     enabled: true
-    store_path: "./agents/assistant/data/crypto/"
+    store_path: "./agents/assistant-bot/data/crypto/"
     pickle_key_env: PICKLE_KEY_ASSISTANT_BOT
     trust_mode: tofu
     recovery_key_env: SSSS_RECOVERY_KEY_ASSISTANT_BOT
@@ -143,15 +153,12 @@ matrix:
 # COMUNICACIÓN INTER-AGENTES
 # ============================================
 agents:
-  peers:
-    - id: devops-bot
-      capabilities: [deploy, ssh, healthcheck]
-      room: ""    # sin room interno por ahora
+  peers: []
 
   delegation:
-    enabled: false              # el assistant no delega aún
+    enabled: false
     can_delegate_to: []
-    can_receive_from: [devops-bot]
+    can_receive_from: []
     max_delegation_depth: 1
     timeout: 30s
 
@@ -187,7 +194,7 @@ security:
 
   audit:
     enabled: false
-    log_file: "./data/audit.log"
+    log_file: "./agents/assistant-bot/data/audit.log"
     log_to_room: ""
     include: []
 
@@ -207,7 +214,7 @@ observability:
     level: info
     format: json
     output: stdout
-    file: "./data/assistant.log"
+    file: "./agents/assistant-bot/data/assistant.log"
 
   metrics:
     enabled: false
@@ -257,7 +264,7 @@ resilience:
 storage:
   state:
     backend: sqlite
-    path: "./data/assistant.db"
+    path: "./agents/assistant-bot/data/assistant.db"
 
   cache:
     enabled: true
@@ -267,5 +274,5 @@ storage:
 
   history:
     backend: sqlite
-    path: "./data/history.db"
+    path: "./agents/assistant-bot/data/history.db"
     retention: 168h   # 7 días
diff --git a/agents/assistant/prompts/assistant-system.md b/agents/assistant-bot/prompts/assistant-system.md
similarity index 85%
rename from agents/assistant/prompts/assistant-system.md
rename to agents/assistant-bot/prompts/assistant-system.md
index 7d89400..c2bcd7b 100644
--- a/agents/assistant/prompts/assistant-system.md
+++ b/agents/assistant-bot/prompts/assistant-system.md
@@ -11,8 +11,7 @@ Eres un asistente conversacional amigable y directo. Operas en Matrix, respondie
 
 ## Limitaciones
 - No tienes acceso a internet ni herramientas externas en esta configuración
-- No ejecutas comandos ni accedes a servidores (eso es tarea del devops-bot)
-- Si alguien pide algo que requiere infraestructura, redirige al devops-bot
+- No ejecutas comandos ni accedes a servidores
 
 ## Estilo
 - Respuestas concisas por defecto. Si necesitas extensión, pregunta primero.
diff --git a/cmd/launcher/main.go b/cmd/launcher/main.go
index 2dc8119..7187d7b 100644
--- a/cmd/launcher/main.go
+++ b/cmd/launcher/main.go
@@ -18,9 +18,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/enmanuel/agents/agents"
-	assistantagent "github.com/enmanuel/agents/agents/assistant"
-	asistente2agent "github.com/enmanuel/agents/agents/asistente2"
-	devopsagent "github.com/enmanuel/agents/agents/devops"
+	assistantagent "github.com/enmanuel/agents/agents/assistant-bot"
+	asistente2agent "github.com/enmanuel/agents/agents/asistente-2"
 	"github.com/enmanuel/agents/internal/config"
 	"github.com/enmanuel/agents/pkg/decision"
 )
@@ -30,7 +29,6 @@ import (
 var rulesRegistry = map[string]func() []decision.Rule{
 	"assistant-bot": assistantagent.Rules,
 	"asistente-2":   asistente2agent.Rules,
-	"devops-bot":    devopsagent.Rules,
 }
 
 func main() {