myagent-ai 1.2.1 → 1.2.2

package/config.py

@@ -270,8 +270,9 @@ class ConfigManager:
         """应用平台相关的默认值"""
         if not self._config.memory.db_path:
             self._config.memory.db_path = str(self.data_dir / "memory.db")
+        # data_dir 由 property 自动计算为 _data_dir / "data"，无需在此设置
         if not self._config.data_dir:
-            self._config.data_dir = str(self._config_dir)
+            self._config.data_dir = ""
 
         # 设置 Ollama base_url
         if self._config.llm.provider == "ollama" and not self._config.llm.base_url:

package/core/version.py

@@ -11,7 +11,7 @@ import subprocess
 from pathlib import Path
 
 # ── 基线版本（与 setup.py / package.json 保持一致） ──
-BASE_VERSION = "1.2.1"
+BASE_VERSION = "1.2.2"
 
 
 def _version_from_git() -> str:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/web/api_server.py

@@ -92,14 +92,14 @@ class ApiServer:
 
     def _setup_routes(self):
         r = self.app.router
+        # ── 系统状态 ──
         r.add_get("/api/status", self.handle_status)
         r.add_post("/api/shutdown", self.handle_shutdown)
+        # ── Agent 列表/创建 ──
         r.add_get("/api/agents", self.handle_list_agents)
         r.add_get("/api/agents/tree", self.handle_agents_tree)
         r.add_post("/api/agents", self.handle_create_agent)
-        r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}", self.handle_get_agent)
-        r.add_put("/api/agents/{name:[a-zA-Z0-9_/-]+}", self.handle_update_agent)
-        r.add_delete("/api/agents/{name:.+}", self.handle_delete_agent)
+        # ── Agent 子资源路由（必须在通用 {name} 路由之前注册） ──
         r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/soul", self.handle_get_soul)
         r.add_put("/api/agents/{name:[a-zA-Z0-9_/-]+}/soul", self.handle_set_soul)
         r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/identity", self.handle_get_identity)
@@ -109,6 +109,15 @@ class ApiServer:
         r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/sessions", self.handle_agent_sessions)
         r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/children", self.handle_list_children)
         r.add_post("/api/agents/{name:[a-zA-Z0-9_/-]+}/children", self.handle_create_child)
+        r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/bindings", self.handle_agent_bindings)
+        r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/knowledge", self.handle_list_agent_knowledge)
+        r.add_post("/api/agents/{name:[a-zA-Z0-9_/-]+}/knowledge/upload", self.handle_upload_agent_knowledge)
+        r.add_delete("/api/agents/{name:[a-zA-Z0-9_/-]+}/knowledge", self.handle_delete_agent_knowledge)
+        # ── Agent 通用 CRUD（放在子资源之后，name 不含斜杠避免吞掉子路由） ──
+        r.add_get("/api/agents/{name:[a-zA-Z0-9_\\-]+}", self.handle_get_agent)
+        r.add_put("/api/agents/{name:[a-zA-Z0-9_\\-]+}", self.handle_update_agent)
+        r.add_delete("/api/agents/{name:.+}", self.handle_delete_agent)
+        # ── 平台管理 ──
         r.add_get("/api/platforms", self.handle_list_platforms)
         r.add_post("/api/platforms", self.handle_add_platform)
         r.add_get("/api/platforms/{name}", self.handle_get_platform)
@@ -122,8 +131,7 @@ class ApiServer:
         r.add_post("/api/models", self.handle_add_model)
         r.add_put("/api/models/{model_id}", self.handle_update_model)
         r.add_delete("/api/models/{model_id}", self.handle_delete_model)
-        # ── Agent 绑定查询 ──
-        r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/bindings", self.handle_agent_bindings)
+        # ── 会话管理 ──
         r.add_get("/api/sessions", self.handle_list_sessions)
         r.add_get("/api/sessions/{sid}/messages", self.handle_get_messages)
         r.add_delete("/api/sessions/{sid}", self.handle_clear_session)
@@ -165,10 +173,6 @@ class ApiServer:
         r.add_get("/api/organization/knowledge/file", self.handle_read_org_knowledge)
         r.add_post("/api/organization/knowledge/upload", self.handle_upload_org_knowledge)
         r.add_delete("/api/organization/knowledge", self.handle_delete_org_knowledge)
-        # ── Agent 知识库 ──
-        r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/knowledge", self.handle_list_agent_knowledge)
-        r.add_post("/api/agents/{name:[a-zA-Z0-9_/-]+}/knowledge/upload", self.handle_upload_agent_knowledge)
-        r.add_delete("/api/agents/{name:[a-zA-Z0-9_/-]+}/knowledge", self.handle_delete_agent_knowledge)
         # ── 知识库 RAG 搜索 ──
         r.add_post("/api/knowledge/search", self.handle_knowledge_search)
         # ── 配置管理 (热重载/导入/导出) ──
@@ -1044,7 +1048,7 @@ class ApiServer:
         return web.json_response({"ok": True})
 
     async def handle_get_soul(self, request):
-        path = request.match_info["name"]
+        path = request.match_info.get("name", "")
         p = self._agent_dir(path) / "soul.md"
         if not p.parent.exists() or not (p.parent / "config.json").exists():
             return web.json_response({"error": "not found"}, status=404)