Merge pull request #1 from Grigory-Rylov/opencode-appname-fixes

feat: opencode app-name support, build setup, and per-app dir fix

Author: Grigory-Rylov

.mimocode/plans/1781675933910-neon-mountain.md

@@ -15,9 +15,10 @@
     "thinking_peer_id": 2000000506,
     "llama_server_path": "llama-server",
     "llama_server_host": "http://localhost:8081",  # URL удалённого llama-server
-    "opencode_config_path": "~/.config/lildax/config.json",
+    "opencode_config_path": "~/.config/opencode/config.json",
     "models": [],
     "default_model": "qwen3.5-122b",
+    "allowed_folders": ["/tmp"],
 }
 
 
@@ -46,7 +47,7 @@ def load_config(config_path: str = "config.json") -> dict:
 )
 parser.add_argument(
     "--opencode-bin", type=str, default=None,
-    help="Path to opencode binary (lildax). Overrides opencode_bin_path from config."
+    help="Path to opencode binary. Overrides opencode_bin_path from config."
 )
 parser.add_argument(
     "--llama-host", type=str, default=None,
@@ -64,7 +65,7 @@ def load_config(config_path: str = "config.json") -> dict:
 
 # ---------- Глобальные константы из конфигурации ----------
 VK_TOKEN = CONFIG["vk_token"]
-OPENCODE_URL = "http://127.0.0.1:4098" #CONFIG["opencode_url"]
+OPENCODE_URL = CONFIG["opencode_url"]
 SESSION_FILE = Path(CONFIG["session_file"])
 VK_API_VERSION = CONFIG["vk_api_version"]
 LONGPOLL_WAIT = CONFIG["longpoll_wait"]
@@ -76,6 +77,8 @@ def load_config(config_path: str = "config.json") -> dict:
 LLAMA_SERVER_HOST = CONFIG.get("llama_server_host", "http://localhost:8081")
 MCP_SERVERS = CONFIG.get("mcp_servers", {})
 SUBAGENT_PREFIX = CONFIG.get("subagent_prefix", "[subagent] ")
+OPENCODE_APP_NAME = CONFIG.get("opencode-app-name")
+ALLOWED_FOLDERS = CONFIG.get("allowed_folders", ["/tmp"])
 
 if not VK_TOKEN:
     raise ValueError("VK_TOKEN is required in config file")
@@ -151,6 +154,8 @@ def switch_config(config_name: str) -> bool:
     current_module.LLAMA_SERVER_HOST = new_config.get("llama_server_host", "http://localhost:8081")
     current_module.MCP_SERVERS = new_config.get("mcp_servers", {})
     current_module.SUBAGENT_PREFIX = new_config.get("subagent_prefix", "[subagent] ")
+    current_module.OPENCODE_APP_NAME = new_config.get("opencode-app-name")
+    current_module.ALLOWED_FOLDERS = new_config.get("allowed_folders", ["/tmp"])
     current_module.OPENCODE_BIN = Path(new_config["opencode_bin_path"])
     if not current_module.OPENCODE_BIN.is_absolute():
         current_module.OPENCODE_BIN = (SCRIPT_DIR / current_module.OPENCODE_BIN).resolve()

bot/config.py

@@ -1,5 +1,9 @@
 """
 HTTP клиент для OpenCode API
+
+Использует opencode API (/session/...) вместо v2 API (/api/session/...).
+v2 API был для lildax и использует SessionExecution.noopLayer - agent loop не работает.
+opencode API использует SessionPrompt с реальным agent loop.
 """
 import json
 from typing import Dict, List, Optional
@@ -42,11 +46,11 @@ def session(self) -> ClientSession:
     async def create_session(self, model: str = None) -> str:
         """Создаёт новую сессию и возвращает её ID."""
         data = model_to_api_format(model or config.CLI_MODEL)
-        async with self.session.post(f"{self.base_url}/api/session", json=data) as resp:
+        # opencode API: POST /session
+        async with self.session.post(f"{self.base_url}/session", json=data) as resp:
             resp.raise_for_status()
             resp_data = await resp.json()
-            # API возвращает {data: {id: ...}}
-            session_id = resp_data.get("data", resp_data).get("id")
+            session_id = resp_data.get("id", resp_data.get("data", {}).get("id"))
             logger.debug(f"Created OpenCode session {session_id}")
             return session_id
 
@@ -55,41 +59,47 @@ async def get_session_messages(
     ) -> Optional[List[dict]]:
         """Получает сообщения сессии."""
         try:
-            url = f"{self.base_url}/api/session/{session_id}/message?limit={limit}"
+            # opencode API: GET /session/:sessionID/message
+            url = f"{self.base_url}/session/{session_id}/message?limit={limit}"
             async with self.session.get(url) as resp:
                 if resp.status != 200:
                     return None
                 resp_data = await resp.json()
-                # API возвращает {data: [...], cursor: {...}}
-                return resp_data.get("data", resp_data)
+                return resp_data if isinstance(resp_data, list) else resp_data.get("data", resp_data)
         except Exception as e:
             logger.warning(f"Failed to fetch messages for {session_id}: {e}")
             return None
 
     async def send_prompt(
         self, session_id: str, text: str
     ) -> bool:
-        """Отправляет промпт в сессию."""
-        url = f"{self.base_url}/api/session/{session_id}/prompt"
-        # API требует формат {prompt: {text: "..."}}
-        data = {"prompt": {"text": text}}
+        """Отправляет промпт в сессию.
+
+        Использует /session/:sessionID/prompt_async endpoint opencode API,
+        который реально запускает agent loop.
+        """
+        # opencode API: POST /session/:sessionID/prompt_async
+        # Формат: {parts: [{type: "text", text: "..."}]}
+        url = f"{self.base_url}/session/{session_id}/prompt_async"
+        data = {"parts": [{"type": "text", "text": text}]}
         async with self.session.post(url, json=data) as resp:
-            if resp.status == 200:
+            if resp.status in (200, 204):
                 logger.debug(f"Prompt sent for session {session_id}")
                 return True
-            logger.error(f"Failed to send prompt: {resp.status}")
+            text = await resp.text()
+            logger.error(f"Failed to send prompt: {resp.status} - {text}")
             return False
 
     # ---------- Разрешения ----------
 
     async def get_pending_permissions(self) -> List[dict]:
         """Получает список ожидающих разрешений."""
         try:
-            async with self.session.get(f"{self.base_url}/api/permission/request") as resp:
+            # opencode API: GET /permission/request (если есть)
+            async with self.session.get(f"{self.base_url}/permission/request") as resp:
                 if resp.status != 200:
                     return []
                 resp_data = await resp.json()
-                # API возвращает {location: {...}, data: [...]}
                 return resp_data.get("data", resp_data)
         except Exception as e:
             logger.warning(f"Error fetching permissions: {e}")
@@ -104,8 +114,9 @@ async def send_permission_response(
         """
         reply_map = {"always": "always", "once": "once", "never": "reject"}
         reply = reply_map.get(response, response)
-        url = f"{self.base_url}/api/session/{session_id}/permission/{permission_id}/reply"
-        data = {"reply": reply}
+        # opencode API: POST /session/:sessionID/permissions/:permissionID
+        url = f"{self.base_url}/session/{session_id}/permissions/{permission_id}"
+        data = {"response": reply}
         async with self.session.post(url, json=data) as resp:
             if resp.status in (200, 204):
                 logger.debug(f"Permission {permission_id} answered: {reply}")
@@ -118,11 +129,10 @@ async def send_permission_response(
     async def get_pending_questions(self) -> List[dict]:
         """Получает список ожидающих вопросов."""
         try:
-            async with self.session.get(f"{self.base_url}/api/question/request") as resp:
+            async with self.session.get(f"{self.base_url}/question/request") as resp:
                 if resp.status != 200:
                     return []
                 resp_data = await resp.json()
-                # API возвращает {location: {...}, data: [...]}
                 return resp_data.get("data", resp_data)
         except Exception as e:
             logger.warning(f"Error fetching questions: {e}")
@@ -132,7 +142,7 @@ async def send_question_answer(
         self, session_id: str, question_id: str, answer: str
     ) -> bool:
         """Отправляет ответ на вопрос."""
-        url = f"{self.base_url}/api/session/{session_id}/question/{question_id}/reply"
+        url = f"{self.base_url}/session/{session_id}/question/{question_id}/reply"
         data = {"answers": [[answer]]}
         async with self.session.post(url, json=data) as resp:
             if resp.status in (200, 204):
@@ -146,12 +156,12 @@ async def send_question_answer(
     async def get_all_sessions(self) -> List[dict]:
         """Получает список всех сессий."""
         try:
-            async with self.session.get(f"{self.base_url}/api/session") as resp:
+            # opencode API: GET /session
+            async with self.session.get(f"{self.base_url}/session") as resp:
                 if resp.status != 200:
                     return []
                 resp_data = await resp.json()
-                # API возвращает {data: [...], cursor: {...}}
-                return resp_data.get("data", resp_data)
+                return resp_data if isinstance(resp_data, list) else resp_data.get("data", resp_data)
         except Exception as e:
             logger.warning(f"Error fetching sessions list: {e}")
             return []
@@ -164,7 +174,8 @@ async def get_child_sessions(self, parent_id: str) -> List[dict]:
     async def delete_session(self, session_id: str) -> bool:
         """Удаляет сессию по ID."""
         try:
-            async with self.session.delete(f"{self.base_url}/api/session/{session_id}") as resp:
+            # opencode API: DELETE /session/:sessionID
+            async with self.session.delete(f"{self.base_url}/session/{session_id}") as resp:
                 if resp.status in (200, 204):
                     logger.debug(f"Deleted session {session_id}")
                     return True