remote-claude 1.0.8 → 1.0.9

package/lark_client/lark_handler.py

@@ -87,6 +87,8 @@ class LarkHandler:
         self._detached_slices: Dict[str, CardSlice] = {}
         # 正在启动中的会话名集合（防止并发点击触发竞态）
         self._starting_sessions: set = set()
+        # Session 健康检查后台任务
+        self._health_check_task: Optional[asyncio.Task] = None
         logger.info(
             f"LarkHandler 初始化: bindings={len(self._chat_bindings)}, "
             f"groups={len(self._group_chat_ids)}, "
@@ -161,6 +163,7 @@ class LarkHandler:
     async def _attach(self, chat_id: str, session_name: str,
                       user_id: Optional[str] = None) -> bool:
         """统一 attach 逻辑（私聊/群聊共用）"""
+        self._ensure_health_check_started()
         logger.info(
             f"[ATTACH] 开始: chat_id={chat_id[:8]}..., session={session_name}, "
             f"old_session={self._chat_sessions.get(chat_id)}, "
@@ -244,6 +247,7 @@ class LarkHandler:
     async def handle_message(self, user_id: str, chat_id: str, text: str,
                               chat_type: str = "p2p"):
         """处理用户消息（群聊/私聊统一路由）"""
+        self._ensure_health_check_started()
         logger.info(f"收到消息: user={user_id[:8]}..., chat={chat_id[:8]}..., type={chat_type}, text={text[:50]}")
         text = text.strip()
 
@@ -913,6 +917,68 @@ class LarkHandler:
             self._save_chat_bindings()
             self._save_group_chat_ids()
 
+    # ── Session 健康检查 ─────────────────────────────────────────────────────
+
+    HEALTH_CHECK_INTERVAL = 30  # 秒
+
+    def _ensure_health_check_started(self):
+        """懒启动健康检查后台任务（首次收到消息时调用）"""
+        if self._health_check_task is None or self._health_check_task.done():
+            self._health_check_task = asyncio.create_task(self._health_check_loop())
+            logger.info("Session 健康检查后台任务已启动")
+
+    async def _health_check_loop(self):
+        """定期检查绑定的 session 是否仍然存活"""
+        while True:
+            await asyncio.sleep(self.HEALTH_CHECK_INTERVAL)
+            try:
+                await self._session_health_check()
+            except Exception as e:
+                logger.error(f"健康检查异常: {e}", exc_info=True)
+
+    async def _session_health_check(self):
+        """扫描所有绑定关系，对已死亡 session 自动解散群聊、清理私聊绑定"""
+        bound_sessions = set(self._chat_bindings.values())
+        if not bound_sessions:
+            return
+
+        active = {s["name"] for s in list_active_sessions()}
+        dead_sessions = bound_sessions - active
+        if not dead_sessions:
+            return
+
+        for session_name in dead_sessions:
+            logger.info(f"[health-check] 检测到 session '{session_name}' 已关闭")
+
+            # 记录受影响的 chat_id（在 disband 修改 dict 之前）
+            affected_chats = [
+                cid for cid, sname in list(self._chat_bindings.items())
+                if sname == session_name
+            ]
+
+            # 解散群聊（复用已有逻辑，内部会清理群聊的绑定/轮询/bridge）
+            await self._disband_groups_for_session(session_name, source="health-check")
+
+            # 处理私聊绑定（非群聊的 chat_id）
+            cleaned_private = False
+            for cid in affected_chats:
+                if cid in self._group_chat_ids:
+                    continue  # 群聊已由 _disband_groups_for_session 处理
+                if self._chat_bindings.get(cid) != session_name:
+                    continue  # 已被其他逻辑清理
+                logger.info(f"[health-check] 清理私聊绑定: chat_id={cid[:8]}..., session={session_name}")
+                self._poller.stop(cid)
+                bridge = self._bridges.pop(cid, None)
+                if bridge:
+                    await bridge.disconnect()
+                self._chat_sessions.pop(cid, None)
+                self._detached_slices.pop(cid, None)
+                self._remove_binding_by_chat(cid, force=True)
+                cleaned_private = True
+
+            if cleaned_private:
+                self._save_chat_bindings()
+
     async def _cmd_disband_group(self, user_id: str, chat_id: str, session_name: str,
                                   message_id: Optional[str] = None):
         """解散与指定会话绑定的专属群聊"""
@@ -1010,6 +1076,7 @@ class LarkHandler:
         发箭头键导航到目标选项，每步从共享内存读取 selected_value 确认是否到位，
         到位后发 Enter 确认。避免数字键在溢出选项上无效的问题。
         """
+        self._ensure_health_check_started()
         logger.info(f"处理选项选择: user={user_id[:8]}..., option={option_value}, total={option_total}")
         _track_stats('lark', 'option_select',
                      session_name=self._chat_sessions.get(chat_id, ''),
@@ -1307,6 +1374,9 @@ class LarkHandler:
 
     async def disconnect_all_for_shutdown(self) -> None:
         """lark stop 时清理所有活跃流式卡片（更新为已断开状态）"""
+        # 停止健康检查
+        if self._health_check_task and not self._health_check_task.done():
+            self._health_check_task.cancel()
         logger.info(f"[SHUTDOWN] 开始清理: bridges={len(self._bridges)}, sessions={len(self._chat_sessions)}")
         chat_ids = list(self._bridges.keys())
         for chat_id in chat_ids:

package/lark_client/main.py

@@ -11,6 +11,8 @@ import logging
 import os
 import signal
 import sys
+import threading
+import time
 import urllib.request
 from pathlib import Path
 
@@ -155,6 +157,7 @@ def handle_card_action(event: P2CardActionTrigger) -> P2CardActionTriggerRespons
         action_value = action.value or {}
 
         print(f"[Lark] 收到卡片动作: user={user_id[:8]}..., action={action_value}")
+        handler._ensure_health_check_started()
 
         # 检查用户白名单
         if not check_user_allowed(user_id):
@@ -399,6 +402,17 @@ class LarkBot:
         print("\n机器人已启动，等待消息...")
         print("在飞书中发送 /help 查看使用说明\n")
 
+        # 在 ws_client.start() 阻塞前，保存事件循环引用，通过守护线程延迟启动健康检查
+        # （无需等待消息，15 秒后 WS 已连接就自动启动）
+        _loop = asyncio.get_event_loop()
+        def _deferred_health_check_start():
+            time.sleep(15)
+            try:
+                _loop.call_soon_threadsafe(handler._ensure_health_check_started)
+            except Exception as e:
+                print(f"[Lark] 健康检查启动失败: {e}")
+        threading.Thread(target=_deferred_health_check_start, daemon=True).start()
+
         # 启动 WebSocket（阻塞）
         self.ws_client.start()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remote-claude",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "双端共享 Claude CLI 工具",
   "bin": {
     "remote-claude": "bin/remote-claude",