myagent-ai 1.24.0 → 1.24.2

package/agents/main_agent.py

@@ -716,6 +716,10 @@ class MainAgent(BaseAgent):
                 _attachment_meta["images"] = context.metadata["user_image_files"]
             if context.metadata.get("user_file_files"):
                 _attachment_meta["files"] = context.metadata["user_file_files"]
+            # [v1.24.1] 保存 agent_path 到用户消息 metadata，用于会话列表按 agent 筛选
+            _agent_path = context.metadata.get("agent_override_path", "")
+            if _agent_path:
+                _attachment_meta["agent_path"] = _agent_path
             self.memory.add_session(
                 session_id=context.session_id,
                 role="user",

package/package.json

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

package/start.js

@@ -641,7 +641,13 @@ function cmdUninstall() {
     if (IS_WIN) {
       execSync('taskkill /F /IM python.exe /FI "WINDOWTITLE eq myagent*" 2>nul', { encoding: "utf8", timeout: 5000 });
     } else {
-      execSync("pkill -f 'myagent|main.py' 2>/dev/null", { encoding: "utf8", timeout: 10000 });
+      // 排除当前进程 PID，避免 pkill 杀掉 uninstall 脚本自身
+      const selfPid = process.pid;
+      execSync(
+        `pgrep -f 'myagent|main.py' | grep -v '^${selfPid}$' | xargs -r kill 2>/dev/null; sleep 1; ` +
+        `pgrep -f 'myagent|main.py' | grep -v '^${selfPid}$' | xargs -r kill -9 2>/dev/null`,
+        { encoding: "utf8", timeout: 10000 }
+      );
     }
   } catch (_) {}
 

package/web/api_server.py

@@ -4180,21 +4180,34 @@ window.addEventListener('beforeunload', function() {{
     async def handle_list_sessions(self, request):
         if not self.core.memory: return web.json_response([])
         agent = request.query.get("agent", "")
+        conn = self.core.memory._get_conn()
+        _hidden = ('llm_output', 'llm_input', 'tool_result_raw', 'conversation_insight')
         # 只统计用户可见的消息数（排除 llm_output 和 conversation_insight）
         if agent:
             prefix = f"{agent}_"
-            rows = self.core.memory._get_conn().execute(
-                "SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories "
-                "WHERE category = 'session' AND role != '' "
-                "AND key NOT IN ('llm_output', 'llm_input', 'tool_result_raw', 'conversation_insight') "
-                "AND session_id LIKE ? GROUP BY session_id ORDER BY last DESC LIMIT 100",
-                (prefix + "%",)).fetchall()
+            # [v1.24.1] 兼容两种会话 ID 格式：
+            #   旧格式: {agent}_web_{timestamp} → session_id LIKE 'default_%'
+            #   新格式: sess_{uuid} → 通过用户消息 metadata 中的 agent_path 关联
+            metadata_agent_pattern = '%"agent_path":"' + agent + '"%'
+            # 先找出属于该 agent 的所有 session_id（子查询），再统计消息数
+            rows = conn.execute(
+                "SELECT m.session_id, COUNT(*) as cnt, MAX(m.created_at) as last FROM memories m "
+                "WHERE m.category = 'session' AND m.role != '' "
+                "AND m.key NOT IN (?,?,?,?) "
+                "AND m.session_id IN ("
+                "  SELECT DISTINCT session_id FROM memories "
+                "  WHERE category = 'session' "
+                "  AND (session_id LIKE ? OR (session_id LIKE 'sess_%' AND metadata LIKE ?))"
+                ") "
+                "GROUP BY m.session_id ORDER BY last DESC LIMIT 100",
+                (*_hidden, prefix + "%", metadata_agent_pattern)).fetchall()
         else:
-            rows = self.core.memory._get_conn().execute(
+            rows = conn.execute(
                 "SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories "
                 "WHERE category = 'session' AND role != '' "
-                "AND key NOT IN ('llm_output', 'llm_input', 'tool_result_raw', 'conversation_insight') "
-                "GROUP BY session_id ORDER BY last DESC LIMIT 100").fetchall()
+                "AND key NOT IN (?,?,?,?) "
+                "GROUP BY session_id ORDER BY last DESC LIMIT 100",
+                (*_hidden,)).fetchall()
         sessions = [{"id": r["session_id"], "messages": r["cnt"], "last": r["last"]} for r in rows]
         # 批量获取自定义会话名称
         sids = [s["id"] for s in sessions]
@@ -4225,11 +4238,25 @@ window.addEventListener('beforeunload', function() {{
         if not self.core.memory:
             return web.json_response({"agent": name, "sessions": []})
         prefix = f"{name}_"
-        rows = self.core.memory._get_conn().execute(
-            "SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories "
-            "WHERE category = 'session' AND session_id LIKE ? GROUP BY session_id ORDER BY last DESC LIMIT 100",
-            (prefix + "%",)).fetchall()
-        sessions = [{"id": r["session_id"], "messages": r["cnt"], "last": r["last"]} for r in rows]
+        metadata_agent_pattern = '%"agent_path":"' + name + '"%'
+        conn = self.core.memory._get_conn()
+        # [v1.24.1] 兼容旧格式 (agent_xxx) 和新格式 (sess_xxx)
+        rows = conn.execute(
+            "SELECT DISTINCT session_id FROM memories "
+            "WHERE category = 'session' "
+            "AND (session_id LIKE ? OR (session_id LIKE 'sess_%' AND metadata LIKE ?)) "
+            "LIMIT 100",
+            (prefix + "%", metadata_agent_pattern)).fetchall()
+        matched_sids = [r["session_id"] for r in rows]
+        sessions = []
+        if matched_sids:
+            placeholders = ",".join(["?"] * len(matched_sids))
+            count_rows = conn.execute(
+                f"SELECT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories "
+                f"WHERE category = 'session' AND session_id IN ({placeholders}) "
+                f"GROUP BY session_id ORDER BY last DESC",
+                matched_sids).fetchall()
+            sessions = [{"id": r["session_id"], "messages": r["cnt"], "last": r["last"]} for r in count_rows]
         # 批量获取自定义会话名称
         sids = [s["id"] for s in sessions]
         name_map = self.core.memory.list_session_names(sids) if sids else {}

package/web/ui/chat/chat.js

@@ -3,7 +3,7 @@
 
 (function() {
   var base = new URL('.', window.location.href).href;
-  var v = '?v=14';
+  var v = '?v=15';
   var scripts = [
     'groupchat.js',   // 群聊模块（状态 + API + 渲染 + 发送）
     'flow_engine.js', // 文本处理流引擎（SSE 流式 + 大文本 + 执行事件）

package/web/ui/chat/chat_container.html

@@ -4,7 +4,7 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
 <title>MyAgent - AI 助手</title>
-<link rel="stylesheet" href="chat.css?v=12">
+<link rel="stylesheet" href="chat.css?v=13">
 </head>
 <body>
 <div class="app">
@@ -377,6 +377,6 @@
 <div id="groupModalContainer"></div>
 
 <!-- Load JS scripts (no HTML fragments to fetch) -->
-<script src="chat.js?v=10"></script>
+<script src="chat.js?v=11"></script>
 </body>
 </html>

package/web/ui/chat/chat_main.js

@@ -2453,6 +2453,16 @@ async function loadSessions() {
     // 默认选中最新 session
     targetSessionId = state.sessions[0].id;
   }
+  // [v1.24.1] 强制恢复：如果 URL 或 localStorage 有 session ID，但不在 session 列表中
+  // （可能因为 sess_xxx 格式的新会话未匹配到旧格式 LIKE 查询），仍然尝试直接加载
+  if (!targetSessionId) {
+    var fallbackSession = urlSession || state._pendingSessionRestore;
+    if (fallbackSession && fallbackSession !== '__new__') {
+      targetSessionId = fallbackSession;
+      state._pendingSessionRestore = null;
+      console.log('[loadSessions] Session not in list, force restoring:', targetSessionId);
+    }
+  }
 
   if (targetSessionId) {
     await selectSession(targetSessionId);