diff --git a/adapter/max/bot.py b/adapter/max/bot.py
index af857f7..2e539b1 100644
--- a/adapter/max/bot.py
+++ b/adapter/max/bot.py
@@ -22,6 +22,7 @@ class MaxSurface:
         self.token = os.environ["MAX_BOT_TOKEN"]
         self.api_url = os.environ.get("MAX_API_URL", "https://api.max.ru/v1")
         self.workspace_dir = os.environ.get("SURFACES_WORKSPACE_DIR", "/agents")
+        self.agent_base_url = os.environ.get("AGENT_BASE_URL", "")
 
         self.registry: AgentRegistry = load_from_env()
         self.store = ChatStore()
@@ -176,7 +177,8 @@ class MaxSurface:
             return self.chat_handler.handle_chats(user_id)
 
         elif command == "rename":
-            return self.chat_handler.handle_rename(max_chat_id, args)
+            new_name = " ".join(args) if args else ""
+            return self.chat_handler.handle_rename(max_chat_id, new_name)
 
         elif command == "archive":
             return self.chat_handler.handle_archive(max_chat_id)
@@ -188,7 +190,8 @@ class MaxSurface:
             return self.attach_handler.handle_list(max_chat_id)
 
         elif command == "remove":
-            return self.attach_handler.handle_remove(max_chat_id, args)
+            idx = args[0] if args else ""
+            return self.attach_handler.handle_remove(max_chat_id, idx)
 
         elif command == "help":
             return get_help()
@@ -218,7 +221,9 @@ class MaxSurface:
         if attachments:
             payload["attachments"] = [a[0] for a in attachments]
 
-        url = f"{agent.base_url}/chat/{agent.id}"
+        base = self.agent_base_url or agent.base_url.rstrip("/")
+        url = f"{base}/chat/{agent.id}"
+
         async with self.session.post(url, json=payload) as resp:
             data = await resp.json()
             return data.get("response", "")