feat: 网页端固定主用户，Matrix /new创建新会话，实时同步

main.py

@@ -83,15 +83,14 @@ async def admin(request: Request):
 
 # ==================== API路由 ====================
 
+# 固定主用户ID（与Matrix AI用户关联）
+MAIN_USER_ID = "main_user"
+
 @app.get("/api/conversations")
-async def get_conversations(user_id: str = None, db: Session = Depends(get_db)):
-    """获取会话列表"""
-    if not user_id:
-        # 临时用户ID（实际应用中应该从session获取）
-        user_id = "web_anonymous"
-    
+async def get_conversations(db: Session = Depends(get_db)):
+    """获取会话列表（使用固定主用户）"""
     conv_service = ConversationService(db)
-    user = conv_service.get_or_create_user(user_id, user_type='web')
+    user = conv_service.get_or_create_user(MAIN_USER_ID, display_name="主用户", user_type='web')
     conversations = conv_service.get_user_conversations(user.id)
     
     return {
@@ -106,15 +105,30 @@ async def get_conversations(user_id: str = None, db: Session = Depends(get_db)):
         ]
     }
 
+@app.get("/api/conversations/latest")
+async def get_latest_conversation(db: Session = Depends(get_db)):
+    """获取最新会话（用于Matrix同步）"""
+    conv_service = ConversationService(db)
+    user = conv_service.get_or_create_user(MAIN_USER_ID, display_name="主用户", user_type='web')
+    conversations = conv_service.get_user_conversations(user.id)
+    
+    if conversations:
+        latest = conversations[0]  # 已按更新时间倒序
+        return {
+            "conversation": {
+                "id": latest.conversation_id,
+                "title": latest.title or "新对话",
+                "updated_at": latest.updated_at.isoformat()
+            }
+        }
+    return {"conversation": None}
+
 
 @app.post("/api/conversations")
-async def create_conversation(user_id: str = None, db: Session = Depends(get_db)):
-    """创建新会话"""
-    if not user_id:
-        user_id = "web_anonymous"
-    
+async def create_conversation(db: Session = Depends(get_db)):
+    """创建新会话（使用固定主用户）"""
     conv_service = ConversationService(db)
-    user = conv_service.get_or_create_user(user_id, user_type='web')
+    user = conv_service.get_or_create_user(MAIN_USER_ID, display_name="主用户", user_type='web')
     conversation = conv_service.create_conversation(user.id)
     
     return {
@@ -165,10 +179,12 @@ async def delete_conversation(conversation_id: str, db: Session = Depends(get_db
 
 @app.websocket("/ws/{user_id}")
 async def websocket_endpoint(websocket: WebSocket, user_id: str, db: Session = Depends(get_db)):
-    """WebSocket连接 - 实时对话"""
-    await manager.connect(websocket, user_id)
+    """WebSocket连接 - 实时对话（所有连接使用主用户）"""
+    # 统一使用主用户ID
+    actual_user_id = MAIN_USER_ID
+    await manager.connect(websocket, actual_user_id)
     conv_service = ConversationService(db)
-    user = conv_service.get_or_create_user(user_id, user_type='web')
+    user = conv_service.get_or_create_user(MAIN_USER_ID, display_name="主用户", user_type='web')
     
     current_conversation_id = None
     
@@ -227,8 +243,8 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str, db: Session = D
                     source='web'
                 )
                 
-                # 通知用户消息已收到
-                await manager.send_to_user(user_id, {
+                # 广播用户消息（同步到所有客户端）
+                await manager.send_to_user(MAIN_USER_ID, {
                     "type": "user_message",
                     "conversation_id": conversation_id,
                     "message": {
@@ -255,14 +271,15 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str, db: Session = D
                         source='web'
                     )
                     
-                    # 发送AI回复
-                    await manager.send_to_user(user_id, {
+                    # 广播AI回复（同步到所有客户端）
+                    await manager.send_to_user(MAIN_USER_ID, {
                         "type": "assistant_message",
                         "conversation_id": conversation_id,
                         "message": {
                             "id": assistant_msg.id,
                             "role": "assistant",
                             "content": ai_response,
+                            "source": "web",
                             "created_at": assistant_msg.created_at.isoformat()
                         }
                     })
@@ -397,42 +414,58 @@ async def update_config(data: dict, db: Session = Depends(get_db)):
 
 # ==================== Matrix消息处理回调 ====================
 
-async def handle_matrix_message(conversation_id: str, user_message: str, user_id: str, room_id: str):
+async def handle_matrix_message(action: str, conversation_id: str = None, user_message: str = None, room_id: str = None, message_id: int = None):
     """处理从Matrix收到的消息"""
-    db = SessionLocal()
-    try:
-        conv_service = ConversationService(db)
-        
-        # 获取会话历史
-        history = conv_service.get_conversation_history(conversation_id, limit=20)
-        
-        # 调用AI
-        ai_response = await ai_service.chat(history)
-        
-        # 保存AI回复
-        conversation = conv_service.get_conversation(conversation_id)
-        if conversation:
-            conv_service.add_message(
-                conversation_id=conversation.id,
-                role='assistant',
-                content=ai_response,
-                source='matrix'
-            )
-        
-        # 发送到Matrix
-        await matrix_bot.send_message(room_id, ai_response)
-        
-        # 同时推送到网页端
-        await manager.send_to_user(user_id, {
-            "type": "assistant_message",
-            "conversation_id": conversation_id,
-            "message": {
-                "role": "assistant",
-                "content": ai_response,
-                "source": "matrix",
-                "created_at": datetime.utcnow().isoformat()
-            }
+    
+    if action == "new_conversation":
+        # 创建新会话 - 通知WebSocket客户端
+        await manager.send_to_user(MAIN_USER_ID, {
+            "type": "new_conversation",
+            "conversation_id": conversation_id
         })
+        return
+    
+    if action == "chat":
+        db = SessionLocal()
+        try:
+            conv_service = ConversationService(db)
+            
+            # 获取会话历史
+            history = conv_service.get_conversation_history(conversation_id, limit=20)
+            
+            # 调用AI
+            ai_response = await ai_service.chat(history)
+            
+            # 保存AI回复
+            conversation = conv_service.get_conversation(conversation_id)
+            if conversation:
+                assistant_msg = conv_service.add_message(
+                    conversation_id=conversation.id,
+                    role='assistant',
+                    content=ai_response,
+                    source='matrix'
+                )
+                
+                # 发送到Matrix
+                await matrix_bot.send_message(room_id, ai_response)
+                
+                # 同步到网页端WebSocket
+                await manager.send_to_user(MAIN_USER_ID, {
+                    "type": "assistant_message",
+                    "conversation_id": conversation_id,
+                    "message": {
+                        "id": assistant_msg.id,
+                        "role": "assistant",
+                        "content": ai_response,
+                        "source": "matrix",
+                        "created_at": assistant_msg.created_at.isoformat()
+                    }
+                })
+        except Exception as e:
+            logger.error(f"处理Matrix消息失败: {e}")
+            await matrix_bot.send_message(room_id, f"处理消息时出错: {str(e)}")
+        finally:
+            db.close()
     
     except Exception as e:
         logger.error(f"处理Matrix消息失败: {e}")