remote-claude 1.0.4 → 1.0.6

package/README.md

@@ -66,143 +66,21 @@ remote-claude attach <会话名>
 
 #### 4.1 配置飞书机器人
 
-1. 登录[飞书开放平台](https://open.feishu.cn/)，创建企业自建应用
-2. 获取 **App ID** 和 **App Secret**
-3. 用`cla`或`cl`启动一次claude(或用cx或cdx启动一次codex), 按照交互提示填入**App ID** 和 **App Secret**
-4. [飞书开放平台]的企业自建应用页面`添加应用能力`（机器人能力）
-5. 企业自建应用页面配置事件回调（如果第3步没启动成功这里配置不了）：
-  - `事件与回调` -> `事件配置` -> `订阅方式`右边的笔图标 -> `选择：使用长连接接收事件` -> `点击保存` -> `下面添加事件: 接收消息 v2.0 (im.message.receive_v1)`
-  - `事件与回调` -> `回调配置` -> `订阅方式`右边的笔图标 -> `选择：使用长连接接收回调` -> `点击保存` -> `下面添加回调: 卡片回传交互 (card.action.trigger)`
-6. 企业自建应用页面配置权限：
-  - `权限管理` -> `批量导入/导出权限` -> 导入以下内容
-```json
-{
-  "scopes": {
-    "tenant": [
-      "base:app:read",
-      "base:field:read",
-      "base:form:read",
-      "base:record:read",
-      "base:record:retrieve",
-      "base:table:read",
-      "board:whiteboard:node:read",
-      "calendar:calendar.free_busy:read",
-      "cardkit:card:write",
-      "contact:contact.base:readonly",
-      "contact:user.employee_id:readonly",
-      "contact:user.id:readonly",
-      "docs:document.comment:read",
-      "docs:document.content:read",
-      "docs:document.media:download",
-      "docs:document.media:upload",
-      "docs:document:import",
-      "docs:permission.member:auth",
-      "docs:permission.member:create",
-      "docs:permission.member:transfer",
-      "docx:document.block:convert",
-      "docx:document:create",
-      "docx:document:readonly",
-      "docx:document:write_only",
-      "drive:drive.metadata:readonly",
-      "drive:drive.search:readonly",
-      "drive:drive:version:readonly",
-      "drive:file:download",
-      "drive:file:upload",
-      "im:chat.members:read",
-      "im:chat.members:write_only",
-      "im:chat.tabs:read",
-      "im:chat.tabs:write_only",
-      "im:chat.top_notice:write_only",
-      "im:chat:create",
-      "im:chat:delete",
-      "im:chat:operate_as_owner",
-      "im:chat:read",
-      "im:chat:update",
-      "im:message.group_at_msg:readonly",
-      "im:message.group_msg",
-      "im:message.p2p_msg:readonly",
-      "im:message.reactions:read",
-      "im:message.reactions:write_only",
-      "im:message.urgent",
-      "im:message.urgent.status:write",
-      "im:message:readonly",
-      "im:message:recall",
-      "im:message:send_as_bot",
-      "im:message:update",
-      "im:resource",
-      "sheets:spreadsheet.meta:read",
-      "sheets:spreadsheet.meta:write_only",
-      "sheets:spreadsheet:create",
-      "sheets:spreadsheet:read",
-      "sheets:spreadsheet:write_only",
-      "space:document:delete",
-      "space:document:retrieve",
-      "wiki:wiki:readonly"
-    ],
-    "user": [
-      "base:app:read",
-      "base:field:read",
-      "base:record:read",
-      "base:record:retrieve",
-      "base:table:read",
-      "calendar:calendar.event:create",
-      "calendar:calendar.event:delete",
-      "calendar:calendar.event:read",
-      "calendar:calendar.event:reply",
-      "calendar:calendar.event:update",
-      "calendar:calendar.free_busy:read",
-      "calendar:calendar:read",
-      "cardkit:card:write",
-      "contact:user.base:readonly",
-      "contact:user.employee_id:readonly",
-      "contact:user.id:readonly",
-      "docs:document.comment:read",
-      "docs:document.content:read",
-      "docs:document.media:download",
-      "docs:document.media:upload",
-      "docx:document.block:convert",
-      "docx:document:create",
-      "docx:document:readonly",
-      "docx:document:write_only",
-      "im:chat.managers:write_only",
-      "im:chat.members:read",
-      "im:chat.members:write_only",
-      "im:chat.tabs:read",
-      "im:chat.tabs:write_only",
-      "im:chat.top_notice:write_only",
-      "im:chat:delete",
-      "im:chat:read",
-      "im:chat:update",
-      "im:message.reactions:read",
-      "im:message.reactions:write_only",
-      "im:message:readonly",
-      "im:message:recall",
-      "im:message:update",
-      "search:docs:read",
-      "sheets:spreadsheet.meta:read",
-      "sheets:spreadsheet.meta:write_only",
-      "sheets:spreadsheet:create",
-      "sheets:spreadsheet:read",
-      "sheets:spreadsheet:write_only",
-      "space:document:retrieve",
-      "task:task:read",
-      "task:task:readonly",
-      "task:task:write",
-      "task:task:writeonly",
-      "task:tasklist:read",
-      "wiki:wiki:readonly"
-    ]
-  }
-}
+运行向导，按提示操作即可（约 5 分钟）：
+
+```bash
+remote-claude lark init
 ```
-7. 企业自建应用页面: `创建版本` -> `发布到线上`
-8. 至此，完成飞书机器人配置
 
-#### 4.2 通过飞书机器人操作claude/codex
+向导会自动完成：扫码创建企业自建应用、开通所需权限、配置事件回调、写入本地配置。
+
+> **⚠ 向导最后一步会自动弹出发布页面**，按提示创建版本并发布后才能生效。
+> 未发布的应用在飞书中无法被搜索到。
+
+#### 4.2 通过飞书机器人操作 claude/codex
 
-1. 从飞书搜索刚刚创建的飞书机器人（第一次搜比较慢，如果搜不到可能是忘记发布了）
-2. 飞书中与机器人对话，可用命令: 
-  - `/menu` 展示菜单卡片，后续操作都操作这个卡片上的按钮即可
+1. 从飞书搜索刚创建的机器人（应用发布后才能搜到，发布约需 1 分钟生效）
+2. 飞书中与机器人对话，发送 `/menu` 展示菜单卡片，后续操作点卡片上的按钮即可
 
 ## 使用指南
 

package/bin/remote-claude

@@ -39,9 +39,4 @@ if [ "$1" = "log" ]; then
     exec tail -50f "$LOG_FILE"
 fi
 
-# lark 子命令：检查 .env 配置
-if [ "$1" = "lark" ]; then
-    source "$INSTALL_DIR/scripts/check-env.sh" "$INSTALL_DIR"
-fi
-
 exec uv run --project "$INSTALL_DIR" python3 "$INSTALL_DIR/remote_claude.py" "$@"

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,
@@ -896,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)
@@ -945,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
 
@@ -1163,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/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}")