remote-claude 1.0.3 → 1.0.5

package/lark_client/lark_handler.py

@@ -153,8 +153,9 @@ class LarkHandler:
         self._chat_sessions.pop(chat_id, None)
         self._detached_slices.pop(chat_id, None)
 
-        def on_disconnect():
-            asyncio.create_task(self._on_disconnect(chat_id, session_name))
+        def on_disconnect(disconnected_bridge=None):
+            asyncio.create_task(self._on_disconnect(chat_id, session_name,
+                                                    disconnected_bridge=disconnected_bridge))
 
         bridge = SessionBridge(session_name, on_disconnect=on_disconnect)
         if await bridge.connect():
@@ -175,8 +176,15 @@ class LarkHandler:
         self._chat_sessions.pop(chat_id, None)
         self._poller.stop(chat_id)
 
-    async def _on_disconnect(self, chat_id: str, session_name: str):
+    async def _on_disconnect(self, chat_id: str, session_name: str,
+                              disconnected_bridge=None):
         """服务端关闭连接时的统一处理"""
+        # 防竞态：若当前 bridge 已被 _attach 替换为新实例，跳过清理
+        current_bridge = self._bridges.get(chat_id)
+        if disconnected_bridge is not None and current_bridge is not disconnected_bridge:
+            logger.info(f"会话 '{session_name}' 旧连接断线（已被替换），跳过清理")
+            return
+
         logger.info(f"会话 '{session_name}' 断线, chat_id={chat_id[:8]}...")
         _track_stats('lark', 'disconnect', session_name=session_name,
                      chat_id=chat_id)
@@ -184,14 +192,12 @@ class LarkHandler:
         self._bridges.pop(chat_id, None)
         self._chat_sessions.pop(chat_id, None)
         self._detached_slices.pop(chat_id, None)
-        self._remove_binding_by_chat(chat_id)
+        # 注意：不清除持久化绑定，socket 断连是临时状态，下次操作可自动恢复
+        # 只有用户主动 /detach 或 /kill 时才清除绑定
 
         if active_slice:
             await self._update_card_disconnected(chat_id, session_name, active_slice)
 
-        # 会话退出时自动解散绑定到该会话的所有专属群聊
-        await self._disband_groups_for_session(session_name, source="disconnect")
-
     # ── 消息入口 ────────────────────────────────────────────────────────────
 
     async def handle_message(self, user_id: str, chat_id: str, text: str,
@@ -249,6 +255,8 @@ class LarkHandler:
             await self._cmd_help(user_id, chat_id)
         elif command == "/menu":
             await self._cmd_menu(user_id, chat_id)
+        elif command == "/press":
+            await self._cmd_press(user_id, chat_id, args)
         else:
             await card_service.send_text(chat_id, f"未知命令: {command}\n使用 /help 查看帮助")
 
@@ -306,7 +314,7 @@ class LarkHandler:
         if card_id:
             await card_service.send_card(chat_id, card_id)
 
-    async def _cmd_start(self, user_id: str, chat_id: str, args: str):
+    async def _cmd_start(self, user_id: str, chat_id: str, args: str, cli_type: str = "claude"):
         """启动新会话"""
         parts = args.strip().split(maxsplit=1)
         if not parts:
@@ -348,10 +356,15 @@ class LarkHandler:
         script_dir = Path(__file__).parent.parent.absolute()
         server_script = script_dir / "server" / "server.py"
         cmd = ["uv", "run", "--project", str(script_dir), "python3", str(server_script), session_name]
+        if cli_type == "codex":
+            cmd += ["--cli-type", "codex"]
         if self._poller.get_bypass_enabled():
-            cmd += ["--", "--dangerously-skip-permissions", "--permission-mode=dontAsk"]
+            if cli_type == "codex":
+                cmd += ["--", "--dangerously-bypass-approvals-and-sandbox"]
+            else:
+                cmd += ["--", "--dangerously-skip-permissions", "--permission-mode=dontAsk"]
 
-        logger.info(f"启动会话: {session_name}, 工作目录: {work_dir}, 命令: {' '.join(cmd)}")
+        logger.info(f"启动会话: {session_name}, 工作目录: {work_dir}, cli_type: {cli_type}, 命令: {' '.join(cmd)}")
         _track_stats('lark', 'cmd_start', session_name=session_name, chat_id=chat_id)
 
         try:
@@ -408,7 +421,7 @@ class LarkHandler:
             self._starting_sessions.discard(session_name)
 
     async def _cmd_start_and_new_group(self, user_id: str, chat_id: str,
-                                       session_name: str, path: str):
+                                       session_name: str, path: str, cli_type: str = "claude"):
         """在指定目录启动会话并创建专属群聊"""
         work_path = Path(path).expanduser()
         if not work_path.is_dir():
@@ -426,8 +439,13 @@ class LarkHandler:
         script_dir = Path(__file__).parent.parent.absolute()
         server_script = script_dir / "server" / "server.py"
         cmd = ["uv", "run", "--project", str(script_dir), "python3", str(server_script), session_name]
+        if cli_type == "codex":
+            cmd += ["--cli-type", "codex"]
         if self._poller.get_bypass_enabled():
-            cmd += ["--", "--dangerously-skip-permissions", "--permission-mode=dontAsk"]
+            if cli_type == "codex":
+                cmd += ["--", "--dangerously-bypass-approvals-and-sandbox"]
+            else:
+                cmd += ["--", "--dangerously-skip-permissions", "--permission-mode=dontAsk"]
 
         try:
             env = _os.environ.copy()
@@ -732,7 +750,8 @@ class LarkHandler:
         session = next((s for s in sessions if s["name"] == session_name), None)
         pid = session.get("pid") if session else None
         cwd = self._get_pid_cwd(pid) if pid else None
-        dir_label = cwd.rstrip("/").rsplit("/", 1)[-1] if cwd else session_name
+        from .card_builder import _get_display_name
+        dir_label = _get_display_name(session_name, cwd)
 
         from . import config
         try:
@@ -883,34 +902,33 @@ class LarkHandler:
 
     # ── 消息转发 ─────────────────────────────────────────────────────────────
 
-    async def _forward_to_claude(self, user_id: str, chat_id: str, text: str):
-        """转发消息给 Claude（输出由 SharedMemoryPoller 自动推卡片）"""
+    async def _ensure_bridge(self, chat_id: str, user_id: str = None):
+        """获取 bridge，断连时尝试从持久化绑定自动恢复"""
         bridge = self._bridges.get(chat_id)
+        if bridge and bridge.running:
+            return bridge
+        # 尝试从持久化绑定恢复
+        saved_session = self._chat_bindings.get(chat_id)
+        if saved_session:
+            logger.info(f"自动恢复绑定: chat_id={chat_id[:8]}..., session={saved_session}")
+            ok = await self._attach(chat_id, saved_session, user_id=user_id)
+            if ok:
+                return self._bridges.get(chat_id)
+            # 恢复失败：会话已不存在，清除绑定
+            self._group_chat_ids.discard(chat_id)
+            self._save_group_chat_ids()
+            self._remove_binding_by_chat(chat_id, force=True)
+            await self._disband_groups_for_session(saved_session, source="lazy")
+        return None
 
-        if not bridge or not bridge.running:
-            # 尝试从持久化绑定自动恢复
-            saved_session = self._chat_bindings.get(chat_id)
-            if saved_session:
-                logger.info(f"自动恢复绑定: chat_id={chat_id[:8]}..., session={saved_session}")
-                ok = await self._attach(chat_id, saved_session, user_id=user_id)
-                if not ok:
-                    self._group_chat_ids.discard(chat_id)
-                    self._save_group_chat_ids()
-                    self._remove_binding_by_chat(chat_id, force=True)
-                    await card_service.send_text(
-                        chat_id, f"会话 '{saved_session}' 已不存在，请重新 /attach"
-                    )
-                    # 会话已不存在，解散绑定到该会话的所有专属群聊
-                    await self._disband_groups_for_session(saved_session, source="lazy")
-                    return
-                bridge = self._bridges.get(chat_id)
-            else:
-                await card_service.send_text(
-                    chat_id, "未连接到任何会话，请先使用 /attach <会话名> 连接"
-                )
-                return
+    async def _forward_to_claude(self, user_id: str, chat_id: str, text: str):
+        """转发消息给 Claude（输出由 SharedMemoryPoller 自动推卡片）"""
+        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_input(text)
@@ -932,8 +950,8 @@ class LarkHandler:
                      session_name=self._chat_sessions.get(chat_id, ''),
                      chat_id=chat_id, detail=option_value)
 
-        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
 
@@ -1033,6 +1051,105 @@ class LarkHandler:
 
     # ── 快捷键发送 ─────────────────────────────────────────────────────────────
 
+    @staticmethod
+    def _parse_key_combo(combo: str) -> Optional[bytes]:
+        """将用户输入的按键字符串解析为终端转义序列字节，解析失败返回 None"""
+        BASE_KEY_MAP = {
+            "up":       b"\x1b[A",
+            "down":     b"\x1b[B",
+            "right":    b"\x1b[C",
+            "left":     b"\x1b[D",
+            "enter":    b"\r",
+            "esc":      b"\x1b",
+            "tab":      b"\t",
+            "backspace": b"\x7f",
+            "delete":   b"\x1b[3~",
+            "space":    b" ",
+            "home":     b"\x1b[H",
+            "end":      b"\x1b[F",
+            "pageup":   b"\x1b[5~",
+            "pagedown": b"\x1b[6~",
+            "f1":  b"\x1bOP",   "f2":  b"\x1bOQ",  "f3":  b"\x1bOR",  "f4":  b"\x1bOS",
+            "f5":  b"\x1b[15~", "f6":  b"\x1b[17~","f7":  b"\x1b[18~","f8":  b"\x1b[19~",
+            "f9":  b"\x1b[20~", "f10": b"\x1b[21~","f11": b"\x1b[23~","f12": b"\x1b[24~",
+        }
+
+        s = combo.strip().lower()
+        parts = [p.strip() for p in s.split("+")]
+
+        mods = set()
+        keys = []
+        for p in parts:
+            if p in ("ctrl", "alt", "shift"):
+                mods.add(p)
+            else:
+                keys.append(p)
+
+        if len(keys) != 1:
+            return None
+        key = keys[0]
+
+        # ctrl+letter → \x01-\x1a
+        if mods == {"ctrl"}:
+            if len(key) == 1 and 'a' <= key <= 'z':
+                return bytes([ord(key) - ord('a') + 1])
+            # ctrl+[ = ESC, ctrl+\ = FS 等特殊控制字符
+            ctrl_special = {'[': b'\x1b', '\\': b'\x1c', ']': b'\x1d', '^': b'\x1e', '_': b'\x1f'}
+            if key in ctrl_special:
+                return ctrl_special[key]
+            return None
+
+        # alt+key → ESC prefix
+        if mods == {"alt"}:
+            base = BASE_KEY_MAP.get(key)
+            if base:
+                return b"\x1b" + base
+            if len(key) == 1:
+                return b"\x1b" + key.encode()
+            return None
+
+        # shift+tab / shift+enter
+        if mods == {"shift"}:
+            if key == "tab":
+                return b"\x1b[Z"
+            if key == "enter":
+                return b"\x1b[13;2u"
+            return None
+
+        # 无修饰键
+        if not mods:
+            return BASE_KEY_MAP.get(key)
+
+        return None
+
+    async def _cmd_press(self, user_id: str, chat_id: str, args: str):
+        """发送任意按键组合到会话"""
+        combo = args.strip()
+        if not combo:
+            await card_service.send_text(
+                chat_id,
+                "用法：`/press <按键>`\n"
+                "例如：`/press ctrl+c`、`/press esc`、`/press ctrl+f`、`/press alt+x`\n"
+                "支持：ctrl/alt/shift 修饰键，方向键 up/down/left/right，enter/esc/tab/backspace/delete/space/home/end/pageup/pagedown/f1-f12"
+            )
+            return
+
+        raw = LarkHandler._parse_key_combo(combo)
+        if raw is None:
+            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:
+            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}) 到会话")
+        else:
+            await card_service.send_text(chat_id, f"❌ 发送按键 `{combo}` 失败")
+
     async def send_raw_key(self, user_id: str, chat_id: str, key_name: str):
         """发送原始控制键到 Claude CLI"""
         _track_stats('lark', 'raw_key',
@@ -1051,9 +1168,9 @@ class LarkHandler:
             logger.warning(f"未知快捷键: {key_name}")
             return
 
-        bridge = self._bridges.get(chat_id)
-        if not bridge or not bridge.running:
-            logger.warning(f"send_raw_key: chat_id={chat_id[:8]}... 未连接会话")
+        bridge = await self._ensure_bridge(chat_id, user_id=user_id)
+        if not bridge:
+            logger.warning(f"send_raw_key: chat_id={chat_id[:8]}... 未连接会话（自动恢复失败）")
             return
 
         success = await bridge.send_raw(raw)

package/lark_client/main.py

@@ -250,16 +250,18 @@ def handle_card_action(event: P2CardActionTrigger) -> P2CardActionTriggerRespons
         if action_type == "dir_start":
             path = action_value.get("path", "")
             session_name = action_value.get("session_name", "")
-            print(f"[Lark] dir_start: path={path}, session={session_name}")
-            asyncio.create_task(handler._cmd_start(user_id, chat_id, f"{session_name} {path}"))
+            cli_type = action_value.get("cli_type", "claude")
+            print(f"[Lark] dir_start: path={path}, session={session_name}, cli_type={cli_type}")
+            asyncio.create_task(handler._cmd_start(user_id, chat_id, f"{session_name} {path}", cli_type=cli_type))
             return None
 
         # 目录卡片：在该目录启动会话并创建专属群聊
         if action_type == "dir_new_group":
             path = action_value.get("path", "")
             session_name = action_value.get("session_name", "")
-            print(f"[Lark] dir_new_group: path={path}, session={session_name}")
-            asyncio.create_task(handler._cmd_start_and_new_group(user_id, chat_id, session_name, path))
+            cli_type = action_value.get("cli_type", "claude")
+            print(f"[Lark] dir_new_group: path={path}, session={session_name}, cli_type={cli_type}")
+            asyncio.create_task(handler._cmd_start_and_new_group(user_id, chat_id, session_name, path, cli_type=cli_type))
             return None
 
         # /menu 卡片按钮

package/lark_client/session_bridge.py

@@ -183,12 +183,12 @@ class SessionBridge:
             except asyncio.CancelledError:
                 break
             except Exception as e:
-                logger.debug(f"读取错误: {e}")
+                logger.warning(f"读取错误: {e}")
                 break
 
         if self.on_disconnect and not self._manually_disconnected:
             try:
-                self.on_disconnect()
+                self.on_disconnect(self)  # 传递 bridge 实例，供上层验证身份
             except Exception as e:
                 logger.error(f"on_disconnect 回调异常: {e}")