remote-claude 1.0.6 → 1.0.8

package/bin/cdx

@@ -13,9 +13,6 @@ if ! command -v uv &>/dev/null; then
     [ -f "$HOME/.local/bin/uv" ] && export PATH="$HOME/.local/bin:$PATH"
 fi
 
-# 检查飞书配置
-source "$SCRIPT_DIR/scripts/check-env.sh" "$SCRIPT_DIR"
-
 # 会话名：第一个参数非 - 开头时作为自定义名，否则用 PWD_时间戳
 if [ -n "$1" ] && [[ "$1" != -* ]]; then
     SESSION_NAME="$1"

package/bin/cl

@@ -13,9 +13,6 @@ if ! command -v uv &>/dev/null; then
     [ -f "$HOME/.local/bin/uv" ] && export PATH="$HOME/.local/bin:$PATH"
 fi
 
-# 检查飞书配置
-source "$SCRIPT_DIR/scripts/check-env.sh" "$SCRIPT_DIR"
-
 # 会话名：第一个参数非 - 开头时作为自定义名，否则用 PWD_时间戳
 if [ -n "$1" ] && [[ "$1" != -* ]]; then
     SESSION_NAME="$1"

package/bin/cla

@@ -13,9 +13,6 @@ if ! command -v uv &>/dev/null; then
     [ -f "$HOME/.local/bin/uv" ] && export PATH="$HOME/.local/bin:$PATH"
 fi
 
-# 检查飞书配置
-source "$SCRIPT_DIR/scripts/check-env.sh" "$SCRIPT_DIR"
-
 # 会话名：第一个参数非 - 开头时作为自定义名，否则用 PWD_时间戳
 if [ -n "$1" ] && [[ "$1" != -* ]]; then
     SESSION_NAME="$1"

package/bin/cx

@@ -13,9 +13,6 @@ if ! command -v uv &>/dev/null; then
     [ -f "$HOME/.local/bin/uv" ] && export PATH="$HOME/.local/bin:$PATH"
 fi
 
-# 检查飞书配置
-source "$SCRIPT_DIR/scripts/check-env.sh" "$SCRIPT_DIR"
-
 # 会话名：第一个参数非 - 开头时作为自定义名，否则用 PWD_时间戳
 if [ -n "$1" ] && [[ "$1" != -* ]]; then
     SESSION_NAME="$1"

package/lark_client/lark_handler.py

@@ -87,42 +87,61 @@ class LarkHandler:
         self._detached_slices: Dict[str, CardSlice] = {}
         # 正在启动中的会话名集合（防止并发点击触发竞态）
         self._starting_sessions: set = set()
+        logger.info(
+            f"LarkHandler 初始化: bindings={len(self._chat_bindings)}, "
+            f"groups={len(self._group_chat_ids)}, "
+            f"binding_details={{{', '.join(f'{k[:8]}...→{v}' for k, v in self._chat_bindings.items())}}}"
+        )
 
     # ── 持久化绑定 ──────────────────────────────────────────────────────────
 
-    def _load_chat_bindings(self) -> Dict[str, str]:
+    def _load_json_file(self, path: Path):
+        """原子读取 JSON 文件，损坏时尝试从 .tmp 备份恢复"""
         try:
-            if self._CHAT_BINDINGS_FILE.exists():
-                return json.loads(self._CHAT_BINDINGS_FILE.read_text())
+            if path.exists():
+                content = path.read_text()
+                if content.strip():
+                    return json.loads(content)
+        except json.JSONDecodeError as e:
+            logger.warning(f"文件 {path.name} JSON 损坏: {e}，尝试恢复备份")
+            tmp_path = path.with_suffix('.json.tmp')
+            if tmp_path.exists():
+                try:
+                    content = tmp_path.read_text()
+                    if content.strip():
+                        result = json.loads(content)
+                        logger.warning(f"从 {tmp_path.name} 恢复成功")
+                        return result
+                except Exception:
+                    pass
         except Exception:
             pass
-        return {}
+        return None
 
-    def _save_chat_bindings(self):
+    def _atomic_write_json(self, path: Path, data):
+        """原子写入 JSON 文件：先写 .tmp 再 rename"""
         try:
             ensure_user_data_dir()
-            self._CHAT_BINDINGS_FILE.write_text(
-                json.dumps(self._chat_bindings, ensure_ascii=False)
-            )
+            text = json.dumps(data, ensure_ascii=False)
+            tmp_path = path.with_suffix('.json.tmp')
+            tmp_path.write_text(text)
+            tmp_path.rename(path)
         except Exception as e:
-            logger.warning(f"保存绑定失败: {e}")
+            logger.warning(f"保存 {path.name} 失败: {e}")
+
+    def _load_chat_bindings(self) -> Dict[str, str]:
+        result = self._load_json_file(self._CHAT_BINDINGS_FILE)
+        return result if result is not None else {}
+
+    def _save_chat_bindings(self):
+        self._atomic_write_json(self._CHAT_BINDINGS_FILE, self._chat_bindings)
 
     def _load_group_chat_ids(self) -> set:
-        try:
-            if self._LARK_GROUP_IDS_FILE.exists():
-                return set(json.loads(self._LARK_GROUP_IDS_FILE.read_text()))
-        except Exception:
-            pass
-        return set()
+        result = self._load_json_file(self._LARK_GROUP_IDS_FILE)
+        return set(result) if result is not None else set()
 
     def _save_group_chat_ids(self):
-        try:
-            ensure_user_data_dir()
-            self._LARK_GROUP_IDS_FILE.write_text(
-                json.dumps(list(self._group_chat_ids), ensure_ascii=False)
-            )
-        except Exception as e:
-            logger.warning(f"保存群聊 ID 失败: {e}")
+        self._atomic_write_json(self._LARK_GROUP_IDS_FILE, list(self._group_chat_ids))
 
     def _remove_binding_by_chat(self, chat_id: str, force: bool = False):
         """移除 chat_id 的绑定。
@@ -131,6 +150,9 @@ class LarkHandler:
         """
         if not force and chat_id in self._group_chat_ids:
             return
+        session = self._chat_bindings.get(chat_id)
+        if session is not None:
+            logger.info(f"移除绑定: chat_id={chat_id[:8]}..., session={session}, force={force}")
         self._chat_bindings.pop(chat_id, None)
         self._save_chat_bindings()
 
@@ -139,6 +161,11 @@ class LarkHandler:
     async def _attach(self, chat_id: str, session_name: str,
                       user_id: Optional[str] = None) -> bool:
         """统一 attach 逻辑（私聊/群聊共用）"""
+        logger.info(
+            f"[ATTACH] 开始: chat_id={chat_id[:8]}..., session={session_name}, "
+            f"old_session={self._chat_sessions.get(chat_id)}, "
+            f"old_bridge={'有' if chat_id in self._bridges else '无'}"
+        )
         # 在断开旧连接之前，先更新旧流式卡片为已断开状态
         old_session = self._chat_sessions.get(chat_id)
         old_slice = self._poller.stop_and_get_active_slice(chat_id)
@@ -165,11 +192,15 @@ class LarkHandler:
                                notify_user_id=user_id)
             _track_stats('lark', 'attach', session_name=session_name,
                          chat_id=chat_id)
+            logger.info(f"[ATTACH] 成功: chat_id={chat_id[:8]}..., session={session_name}")
             return True
+        logger.warning(f"[ATTACH] 失败: chat_id={chat_id[:8]}..., session={session_name}")
         return False
 
     async def _detach(self, chat_id: str):
         """统一 detach 逻辑（私聊/群聊共用）"""
+        session_name = self._chat_sessions.get(chat_id, "未知")
+        logger.info(f"[DETACH] chat_id={chat_id[:8]}..., session={session_name}")
         bridge = self._bridges.pop(chat_id, None)
         if bridge:
             await bridge.disconnect()
@@ -185,7 +216,12 @@ class LarkHandler:
             logger.info(f"会话 '{session_name}' 旧连接断线（已被替换），跳过清理")
             return
 
-        logger.info(f"会话 '{session_name}' 断线, chat_id={chat_id[:8]}...")
+        bridge_running = disconnected_bridge.running if disconnected_bridge else "N/A"
+        logger.info(f"会话 '{session_name}' 断线, chat_id={chat_id[:8]}..., bridge_running={bridge_running}")
+        logger.info(
+            f"[DISCONNECT] 状态快照: bridges={[k[:8] for k in self._bridges]}, "
+            f"sessions={{{', '.join(f'{k[:8]}→{v}' for k, v in self._chat_sessions.items())}}}"
+        )
         _track_stats('lark', 'disconnect', session_name=session_name,
                      chat_id=chat_id)
         active_slice = self._poller.stop_and_get_active_slice(chat_id)
@@ -196,7 +232,12 @@ class LarkHandler:
         # 只有用户主动 /detach 或 /kill 时才清除绑定
 
         if active_slice:
-            await self._update_card_disconnected(chat_id, session_name, active_slice)
+            updated = await self._update_card_disconnected(chat_id, session_name, active_slice)
+            if not updated:
+                # 就地更新失败 → 降级发新卡片，确保用户看到断开状态
+                logger.warning(f"断线卡片就地更新失败，降级发送新卡: {chat_id[:8]}...")
+                card = build_stream_card([], disconnected=True, session_name=session_name)
+                await card_service.create_and_send_card(chat_id, card)
 
     # ── 消息入口 ────────────────────────────────────────────────────────────
 
@@ -280,6 +321,7 @@ class LarkHandler:
 
         ok = await self._attach(chat_id, session_name, user_id=user_id)
         if ok:
+            logger.info(f"[BINDING] 写入: chat_id={chat_id[:8]}..., session={session_name}, source=cmd_attach")
             self._chat_bindings[chat_id] = session_name
             self._save_chat_bindings()
             if message_id:
@@ -406,6 +448,7 @@ class LarkHandler:
 
             ok = await self._attach(chat_id, session_name, user_id=user_id)
             if ok:
+                logger.info(f"[BINDING] 写入: chat_id={chat_id[:8]}..., session={session_name}, source=cmd_start")
                 self._chat_bindings[chat_id] = session_name
                 self._save_chat_bindings()
             else:
@@ -520,6 +563,7 @@ class LarkHandler:
 
         # 清理所有残留绑定（包括已断开的群聊，其绑定在断开时被保留）
         for cid in [c for c, s in list(self._chat_bindings.items()) if s == session_name]:
+            logger.info(f"[KILL] 清理残留绑定: chat_id={cid[:8]}..., session={session_name}, is_group={'是' if cid in self._group_chat_ids else '否'}")
             self._group_chat_ids.discard(cid)
             self._chat_bindings.pop(cid, None)
         self._save_chat_bindings()
@@ -547,7 +591,7 @@ class LarkHandler:
 
     async def _update_card_disconnected(self, chat_id: str, session_name: str,
                                         active_slice: 'CardSlice') -> bool:
-        """读取最新 blocks 并就地更新卡片为断开状态（disconnected=True）。Best-effort，不降级发新卡。"""
+        """读取最新 blocks 并就地更新卡片为断开状态（disconnected=True）。返回是否成功。"""
         blocks = []
         try:
             import sys as _sys
@@ -795,6 +839,7 @@ class LarkHandler:
             self._save_chat_bindings()
             self._group_chat_ids.add(group_chat_id)
             self._save_group_chat_ids()
+            logger.info(f"创建群聊成功: group_chat_id={group_chat_id[:8]}..., session={session_name}")
             # 立即 attach，让新群即刻开始接收 Claude 输出
             await self._attach(group_chat_id, session_name, user_id=user_id)
 
@@ -885,6 +930,7 @@ class LarkHandler:
                 logger.error(f"解散群 API 失败: {feishu_msg}")
 
             # 无论 Feishu delete 是否成功，都清理本地绑定
+            logger.info(f"[DISBAND] 单群解散: group_chat_id={group_chat_id[:8]}..., session={session_name}")
             self._group_chat_ids.discard(group_chat_id)
             self._save_group_chat_ids()
             self._remove_binding_by_chat(group_chat_id, force=True)
@@ -907,6 +953,8 @@ class LarkHandler:
         bridge = self._bridges.get(chat_id)
         if bridge and bridge.running:
             return bridge
+        if bridge and not bridge.running:
+            logger.info(f"bridge 存在但已停止: chat_id={chat_id[:8]}..., session={self._chat_sessions.get(chat_id)}")
         # 尝试从持久化绑定恢复
         saved_session = self._chat_bindings.get(chat_id)
         if saved_session:
@@ -914,11 +962,28 @@ class LarkHandler:
             ok = await self._attach(chat_id, saved_session, user_id=user_id)
             if ok:
                 return self._bridges.get(chat_id)
-            # 恢复失败：会话已不存在，清除绑定
+            # 区分临时失败和永久失败
+            sessions = list_active_sessions()
+            if any(s["name"] == saved_session for s in sessions):
+                # 会话存在但连接失败 → 临时性故障，保留绑定供重试
+                logger.warning(f"自动恢复失败（临时性）: session={saved_session}, 保留绑定")
+                return None
+            # 会话已不存在 → 永久失败，级联清除
+            logger.warning(f"会话 '{saved_session}' 已不存在，清除绑定: chat_id={chat_id[:8]}...")
+            # 1. 先停止当前 chat_id 的轮询器和 bridge
+            self._poller.stop(chat_id)
+            stale_bridge = self._bridges.pop(chat_id, None)
+            if stale_bridge:
+                await stale_bridge.disconnect()
+            self._chat_sessions.pop(chat_id, None)
+            self._detached_slices.pop(chat_id, None)
+            # 2. 清除绑定
             self._group_chat_ids.discard(chat_id)
-            self._save_group_chat_ids()
             self._remove_binding_by_chat(chat_id, force=True)
+            # 3. 解散同会话的其他群聊（内部会清理各自的轮询器/bridge/绑定）
             await self._disband_groups_for_session(saved_session, source="lazy")
+            # 4. 确保持久化保存（disband 按绑定匹配遍历，已在上面移除绑定，确保保存）
+            self._save_group_chat_ids()
         return None
 
     async def _forward_to_claude(self, user_id: str, chat_id: str, text: str):
@@ -1139,14 +1204,15 @@ class LarkHandler:
             await card_service.send_text(chat_id, f"❌ 无法解析按键：`{combo}`\n使用 `/press` 查看支持的按键格式")
             return
 
-        bridge = self._bridges.get(chat_id)
-        if not bridge or not bridge.running:
+        bridge = await self._ensure_bridge(chat_id, user_id=user_id)
+        if not bridge:
             await card_service.send_text(chat_id, "❌ 当前未连接到会话，请先使用 /attach 连接")
             return
 
         success = await bridge.send_raw(raw)
         if success:
             logger.info(f"[press] 发送按键 {combo!r} ({raw!r}) 到会话")
+            self._poller.kick(chat_id)
         else:
             await card_service.send_text(chat_id, f"❌ 发送按键 `{combo}` 失败")
 
@@ -1241,6 +1307,7 @@ class LarkHandler:
 
     async def disconnect_all_for_shutdown(self) -> None:
         """lark stop 时清理所有活跃流式卡片（更新为已断开状态）"""
+        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:
             session_name = self._chat_sessions.get(chat_id, "")

package/lark_client/session_bridge.py

@@ -99,6 +99,7 @@ class SessionBridge:
 
     async def disconnect(self):
         """断开连接"""
+        logger.info(f"主动断开: session={self.session_name}, running={self.running}")
         self._manually_disconnected = True
         self.running = False
         if self._read_task:
@@ -173,6 +174,7 @@ class SessionBridge:
             try:
                 msg = await asyncio.wait_for(self._read_message(), timeout=1.0)
                 if msg is None:
+                    logger.info(f"read_loop 收到 EOF: session={self.session_name}")
                     self.running = False
                     break
                 if msg.type == MessageType.INPUT and self.on_input:
@@ -183,7 +185,7 @@ class SessionBridge:
             except asyncio.CancelledError:
                 break
             except Exception as e:
-                logger.warning(f"读取错误: {e}")
+                logger.warning(f"读取错误: session={self.session_name}, error={e}")
                 break
 
         if self.on_disconnect and not self._manually_disconnected:

package/lark_client/shared_memory_poller.py

@@ -113,12 +113,13 @@ class SharedMemoryPoller:
         self._rapid_until.pop(chat_id, None)
 
         tracker = self._trackers.pop(chat_id, None)
+        session_name = tracker.session_name if tracker else "N/A"
         if tracker and tracker.reader:
             try:
                 tracker.reader.close()
             except Exception:
                 pass
-        logger.info(f"轮询器停止: chat_id={chat_id[:8]}...")
+        logger.info(f"轮询器停止: chat_id={chat_id[:8]}..., session={session_name}")
 
     def stop_and_get_active_slice(self, chat_id: str) -> Optional['CardSlice']:
         """停止轮询并返回活跃（未冻结）CardSlice，原子操作。供 detach/disconnect 就地更新卡片使用。"""
@@ -143,7 +144,8 @@ class SharedMemoryPoller:
             except Exception:
                 pass
 
-        logger.info(f"轮询器停止(含活跃切片): chat_id={chat_id[:8]}..., active={'有' if active else '无'}")
+        session_name = tracker.session_name if tracker else "N/A"
+        logger.info(f"轮询器停止(含活跃切片): chat_id={chat_id[:8]}..., session={session_name}, active={'有' if active else '无'}")
         return active
 
     def _on_task_done(self, task: asyncio.Task, chat_id: str) -> None:

package/package.json

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

package/remote_claude.py

@@ -34,7 +34,7 @@ from utils.session import (
     tmux_kill_session,
     list_active_sessions, is_session_active, cleanup_session,
     is_lark_running, get_lark_pid, get_lark_status, get_lark_pid_file,
-    save_lark_status, cleanup_lark,
+    save_lark_status, cleanup_lark, kill_all_lark_processes,
     USER_DATA_DIR, ensure_user_data_dir, get_lark_log_file,
     get_env_snapshot_path,
 )
@@ -214,10 +214,28 @@ def cmd_list(args):
     return 0
 
 
+def _find_session_by_pid(pid: int):
+    """通过 PID 查找对应会话名"""
+    for session in list_active_sessions():
+        if session.get("pid") == pid:
+            return session["name"]
+    return None
+
+
 def cmd_kill(args):
     """终止会话"""
     session_name = args.name
 
+    # 若参数是纯数字，按 PID 反查会话名
+    if session_name.isdigit():
+        pid = int(session_name)
+        matched = _find_session_by_pid(pid)
+        if not matched:
+            print(f"错误: 未找到 PID={pid} 对应的会话")
+            return 1
+        session_name = matched
+        print(f"PID {pid} 对应会话: {session_name}")
+
     # 检查会话是否存在
     if not is_session_active(session_name) and not tmux_session_exists(session_name):
         print(f"错误: 会话 '{session_name}' 不存在")
@@ -307,6 +325,11 @@ def cmd_lark_start(args):
     ensure_socket_dir()
     ensure_user_data_dir()
 
+    # 启动前清理残留进程
+    stale = kill_all_lark_processes()
+    if stale:
+        print(f"  清理了 {len(stale)} 个残留进程: {stale}")
+
     # 启动守护进程（使用 -m 模块方式运行，确保相对导入正常工作）
     log_file = get_lark_log_file()
 
@@ -364,8 +387,11 @@ def cmd_lark_stop(args):
     print(f"正在停止飞书客户端 (PID: {pid})...")
 
     try:
-        # 发送 SIGTERM 信号
-        os.kill(pid, signal.SIGTERM)
+        # 杀整个进程组（uv 父进程 + Python 子进程一起杀）
+        try:
+            os.killpg(os.getpgid(pid), signal.SIGTERM)
+        except (ProcessLookupError, PermissionError):
+            os.kill(pid, signal.SIGTERM)  # 降级
 
         # 等待进程退出
         for i in range(50):  # 最多等待 5 秒
@@ -375,9 +401,17 @@ def cmd_lark_stop(args):
         else:
             # 如果还没退出，强制终止
             print("进程未响应，强制终止...")
-            os.kill(pid, signal.SIGKILL)
+            try:
+                os.killpg(os.getpgid(pid), signal.SIGKILL)
+            except (ProcessLookupError, PermissionError):
+                os.kill(pid, signal.SIGKILL)
             time.sleep(0.5)
 
+        # 清理所有残留 lark_client 进程
+        stale = kill_all_lark_processes()
+        if stale:
+            print(f"  清理了 {len(stale)} 个残留进程: {stale}")
+
         if not is_lark_running():
             print("✓ 飞书客户端已停止")
             cleanup_lark()
@@ -389,6 +423,10 @@ def cmd_lark_stop(args):
             return 1
 
     except ProcessLookupError:
+        # 清理所有残留 lark_client 进程
+        stale = kill_all_lark_processes()
+        if stale:
+            print(f"  清理了 {len(stale)} 个残留进程: {stale}")
         print("进程已不存在，清理残留文件")
         cleanup_lark()
         _stop_watchdog()
@@ -817,7 +855,7 @@ def main():
 
     # kill 命令
     kill_parser = subparsers.add_parser("kill", help="终止会话")
-    kill_parser.add_argument("name", help="会话名称")
+    kill_parser.add_argument("name", help="会话名称或 PID")
     kill_parser.set_defaults(func=cmd_kill)
 
     # status 命令

package/utils/session.py

@@ -519,6 +519,47 @@ def save_lark_status(pid: int):
     status_file.write_text(json.dumps(status_data))
 
 
+def kill_all_lark_processes(exclude_pid: int = None) -> list:
+    """查找并杀死所有 lark_client 相关进程（排除指定 PID）
+
+    返回被杀死的 PID 列表
+    """
+    import signal
+    import time
+    killed = []
+
+    # 查找所有 lark_client.main 相关进程
+    try:
+        result = subprocess.run(
+            ["pgrep", "-f", "lark_client.main"],
+            capture_output=True, text=True, timeout=5
+        )
+        pids = [int(p) for p in result.stdout.strip().split('\n') if p.strip()]
+    except Exception:
+        return killed
+
+    for pid in pids:
+        if pid == exclude_pid or pid == os.getpid():
+            continue
+        try:
+            os.kill(pid, signal.SIGTERM)
+            killed.append(pid)
+        except (ProcessLookupError, PermissionError):
+            pass
+
+    # 等待退出，必要时 SIGKILL
+    if killed:
+        time.sleep(1)
+        for pid in killed:
+            try:
+                os.kill(pid, 0)  # 检查是否还活着
+                os.kill(pid, signal.SIGKILL)
+            except (ProcessLookupError, PermissionError):
+                pass
+
+    return killed
+
+
 def cleanup_lark():
     """清理飞书客户端残留文件"""
     pid_file = get_lark_pid_file()