remote-claude 1.0.2 → 1.0.4

package/.env.example

@@ -18,6 +18,10 @@ ALLOWED_USERS=ou_xxxxx,ou_yyyyy
 # 支持多词命令，如：ccr code、/usr/local/bin/claude
 # CLAUDE_COMMAND=claude
 
+# Codex CLI 命令（可选，默认 codex）
+# 支持多词命令，如：/usr/local/bin/codex
+# CODEX_COMMAND=codex
+
 # 流式卡片配置（可选）
 # 单张卡片最多显示的 block 数量，超限自动冻结并创建新卡片（默认 50）
 # MAX_CARD_BLOCKS=50
@@ -30,3 +34,7 @@ ALLOWED_USERS=ou_xxxxx,ou_yyyyy
 # 支持: DEBUG / INFO / WARNING / ERROR
 # SERVER_LOG_LEVEL=INFO
 
+# SOCKS 代理兼容（可选）
+# 系统有 SOCKS 代理但飞书可直连时，设为 1 绕过代理
+# LARK_NO_PROXY=1
+

package/README.md

@@ -179,7 +179,6 @@ remote-claude attach <会话名>
       "im:message:recall",
       "im:message:update",
       "search:docs:read",
-      "search:suite_dataset:readonly",
       "sheets:spreadsheet.meta:read",
       "sheets:spreadsheet.meta:write_only",
       "sheets:spreadsheet:create",
@@ -191,7 +190,6 @@ remote-claude attach <会话名>
       "task:task:write",
       "task:task:writeonly",
       "task:tasklist:read",
-      "task:tasklist:writeonly",
       "wiki:wiki:readonly"
     ]
   }

package/bin/cdx

@@ -16,5 +16,13 @@ fi
 # 检查飞书配置
 source "$SCRIPT_DIR/scripts/check-env.sh" "$SCRIPT_DIR"
 
+# 会话名：第一个参数非 - 开头时作为自定义名，否则用 PWD_时间戳
+if [ -n "$1" ] && [[ "$1" != -* ]]; then
+    SESSION_NAME="$1"
+    shift
+else
+    SESSION_NAME="${PWD}_$(date +%m%d_%H%M%S)"
+fi
+
 uv run --project "$SCRIPT_DIR" python3 "$SCRIPT_DIR/remote_claude.py" lark start
-uv run --project "$SCRIPT_DIR" python3 "$SCRIPT_DIR/remote_claude.py" start "${PWD}_$(date +%m%d_%H%M%S)" --cli codex -- "$@"
+uv run --project "$SCRIPT_DIR" python3 "$SCRIPT_DIR/remote_claude.py" start "$SESSION_NAME" --cli codex -- "$@"

package/bin/cl

@@ -16,5 +16,13 @@ fi
 # 检查飞书配置
 source "$SCRIPT_DIR/scripts/check-env.sh" "$SCRIPT_DIR"
 
+# 会话名：第一个参数非 - 开头时作为自定义名，否则用 PWD_时间戳
+if [ -n "$1" ] && [[ "$1" != -* ]]; then
+    SESSION_NAME="$1"
+    shift
+else
+    SESSION_NAME="${PWD}_$(date +%m%d_%H%M%S)"
+fi
+
 uv run --project "$SCRIPT_DIR" python3 "$SCRIPT_DIR/remote_claude.py" lark start
-uv run --project "$SCRIPT_DIR" python3 "$SCRIPT_DIR/remote_claude.py" start "${PWD}_$(date +%m%d_%H%M%S)" -- --dangerously-skip-permissions --permission-mode=dontAsk "$@"
+uv run --project "$SCRIPT_DIR" python3 "$SCRIPT_DIR/remote_claude.py" start "$SESSION_NAME" -- --dangerously-skip-permissions --permission-mode=dontAsk "$@"

package/bin/cla

@@ -16,5 +16,13 @@ fi
 # 检查飞书配置
 source "$SCRIPT_DIR/scripts/check-env.sh" "$SCRIPT_DIR"
 
+# 会话名：第一个参数非 - 开头时作为自定义名，否则用 PWD_时间戳
+if [ -n "$1" ] && [[ "$1" != -* ]]; then
+    SESSION_NAME="$1"
+    shift
+else
+    SESSION_NAME="${PWD}_$(date +%m%d_%H%M%S)"
+fi
+
 uv run --project "$SCRIPT_DIR" python3 "$SCRIPT_DIR/remote_claude.py" lark start
-uv run --project "$SCRIPT_DIR" python3 "$SCRIPT_DIR/remote_claude.py" start "${PWD}_$(date +%m%d_%H%M%S)" -- "$@"
+uv run --project "$SCRIPT_DIR" python3 "$SCRIPT_DIR/remote_claude.py" start "$SESSION_NAME" -- "$@"

package/bin/cx

@@ -16,5 +16,13 @@ fi
 # 检查飞书配置
 source "$SCRIPT_DIR/scripts/check-env.sh" "$SCRIPT_DIR"
 
+# 会话名：第一个参数非 - 开头时作为自定义名，否则用 PWD_时间戳
+if [ -n "$1" ] && [[ "$1" != -* ]]; then
+    SESSION_NAME="$1"
+    shift
+else
+    SESSION_NAME="${PWD}_$(date +%m%d_%H%M%S)"
+fi
+
 uv run --project "$SCRIPT_DIR" python3 "$SCRIPT_DIR/remote_claude.py" lark start
-uv run --project "$SCRIPT_DIR" python3 "$SCRIPT_DIR/remote_claude.py" start "${PWD}_$(date +%m%d_%H%M%S)" --cli codex -- --dangerously-bypass-approvals-and-sandbox "$@"
+uv run --project "$SCRIPT_DIR" python3 "$SCRIPT_DIR/remote_claude.py" start "$SESSION_NAME" --cli codex -- --dangerously-bypass-approvals-and-sandbox "$@"

package/bin/remote-claude

@@ -17,25 +17,16 @@ fi
 if [ "$1" = "log" ]; then
     LOG_DIR="/tmp/remote-claude"
     if [ -n "$2" ]; then
-        # 指定 session 名，/ 和 . 替换为 _（与 _safe_filename 一致）
-        SESSION_SAFE=$(echo "$2" | tr '/.' '__')
-        LOG_FILE="$LOG_DIR/${SESSION_SAFE}_messages.log"
+        # 指定 session 名，/ . 空格替换为 _（与 _log_filename 一致）
+        SESSION_LOG=$(echo "$2" | tr '/. ' '___')
+        LOG_FILE="$LOG_DIR/${SESSION_LOG}_messages.log"
     else
-        # 找最后启动的 session（按创建时间排序，排除 lark.pid）
-        if [[ "$OSTYPE" == "darwin"* ]]; then
-            # macOS: stat -f "%B" 返回创建时间（秒）
-            LATEST_PID=$(ls "$LOG_DIR"/_*.pid 2>/dev/null | while read f; do
-                stat -f "%B:%N" "$f" 2>/dev/null
-            done | sort -rn | head -1 | cut -d: -f2)
-        else
-            # Linux: stat -c "%W" 返回创建时间（秒）
-            LATEST_PID=$(ls "$LOG_DIR"/_*.pid 2>/dev/null | while read f; do
-                stat -c "%W:%N" "$f" 2>/dev/null
-            done | sort -rn | head -1 | cut -d: -f2)
-        fi
-        if [ -n "$LATEST_PID" ]; then
-            SESSION_SAFE=$(basename "$LATEST_PID" .pid)
-            LOG_FILE="$LOG_DIR/${SESSION_SAFE}_messages.log"
+        # 找最后启动的 session（按 .name 文件修改时间排序）
+        LATEST_NAME=$(ls -t "$LOG_DIR"/*.name 2>/dev/null | head -1)
+        if [ -n "$LATEST_NAME" ]; then
+            SESSION_NAME=$(cat "$LATEST_NAME" 2>/dev/null)
+            SESSION_LOG=$(echo "$SESSION_NAME" | tr '/. ' '___')
+            LOG_FILE="$LOG_DIR/${SESSION_LOG}_messages.log"
         fi
     fi
 

package/client/client.py

@@ -111,7 +111,7 @@ class RemoteClient:
     async def run(self):
         """运行客户端"""
         if not await self.connect():
-            return
+            raise SystemExit(1)
 
         self.running = True
         _track_stats('terminal', 'connect', session_name=self.session_name)

package/init.sh

@@ -26,6 +26,16 @@ print_error() {
     echo -e "${RED}✗${NC} $1"
 }
 
+# 非交互 sudo：有免密 sudo 则执行（带 5 分钟超时），否则跳过
+_sudo_or_skip() {
+    if sudo -n true 2>/dev/null; then
+        timeout 300 sudo "$@"
+    else
+        print_warning "sudo 需要密码，跳过: sudo $*"
+        return 1
+    fi
+}
+
 print_header() {
     echo ""
     echo -e "${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
@@ -200,96 +210,22 @@ check_tmux() {
             brew install tmux 2>/dev/null || true
         elif [[ "$OS" == "Linux" ]]; then
             if command -v apt-get &> /dev/null; then
-                sudo apt-get update && sudo apt-get install -y tmux || true
+                _sudo_or_skip apt-get update && _sudo_or_skip apt-get install -y tmux || true
             elif command -v yum &> /dev/null; then
-                sudo yum install -y tmux || true
+                _sudo_or_skip yum install -y tmux || true
             elif command -v pacman &> /dev/null; then
-                sudo pacman -Sy --noconfirm tmux || true
+                _sudo_or_skip pacman -Sy --noconfirm tmux || true
             elif command -v apk &> /dev/null; then
-                sudo apk add --no-cache tmux || true
+                _sudo_or_skip apk add --no-cache tmux || true
             elif command -v zypper &> /dev/null; then
-                sudo zypper install -y tmux || true
+                _sudo_or_skip zypper install -y tmux || true
             else
-                print_warning "无法识别包管理器，尝试从源码编译 tmux..."
-                install_tmux_from_source
-                return
+                print_warning "无法识别包管理器，请手动安装 tmux 或运行 remote-claude deps"
             fi
         fi
         print_success "tmux 安装成功"
     }
 
-    install_tmux_from_source() {
-        local TMUX_VERSION_TAG="3.6a"
-        local TMUX_URL="https://github.com/tmux/tmux/releases/download/${TMUX_VERSION_TAG}/tmux-${TMUX_VERSION_TAG}.tar.gz"
-
-        print_warning "包管理器版本不满足要求，尝试从源码编译 tmux ${TMUX_VERSION_TAG}..."
-
-        # 安装编译依赖
-        if [[ "$OS" == "Darwin" ]]; then
-            brew install libevent ncurses pkg-config bison 2>/dev/null || true
-        elif command -v apt-get &> /dev/null; then
-            sudo apt-get install -y build-essential libevent-dev libncurses5-dev libncursesw5-dev bison pkg-config || true
-        elif command -v yum &> /dev/null; then
-            sudo yum groupinstall -y "Development Tools" || true
-            sudo yum install -y libevent-devel ncurses-devel bison || true
-        fi
-
-        # 确定安装前缀
-        local PREFIX="/usr/local"
-        if ! sudo -n true 2>/dev/null; then
-            print_warning "无 sudo 权限，将安装到 \$HOME/.local"
-            PREFIX="$HOME/.local"
-        fi
-
-        # 创建临时目录，编译完成后清理
-        local TMPDIR
-        TMPDIR=$(mktemp -d)
-        trap "rm -rf '$TMPDIR'" RETURN
-
-        print_warning "下载 tmux-${TMUX_VERSION_TAG}.tar.gz..."
-        if ! curl -fsSL "$TMUX_URL" -o "$TMPDIR/tmux.tar.gz"; then
-            print_warning "下载失败，请检查网络或手动安装 tmux ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
-            WARNINGS+=("tmux 源码下载失败，请手动安装 tmux ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+")
-            return
-        fi
-
-        tar -xzf "$TMPDIR/tmux.tar.gz" -C "$TMPDIR"
-        local SRC_DIR
-        SRC_DIR=$(find "$TMPDIR" -maxdepth 1 -type d -name "tmux-*" | head -1)
-
-        print_warning "编译 tmux（可能需要几分钟）..."
-        if ! (cd "$SRC_DIR" && ./configure --prefix="$PREFIX" && make -j"$(nproc 2>/dev/null || echo 2)"); then
-            print_warning "编译失败，请手动安装 tmux ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
-            WARNINGS+=("tmux 源码编译失败，请手动安装 tmux ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+")
-            return
-        fi
-
-        if [[ "$PREFIX" == "/usr/local" ]]; then
-            sudo make -C "$SRC_DIR" install || { WARNINGS+=("tmux make install 失败，请手动安装 tmux ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"); return; }
-        else
-            make -C "$SRC_DIR" install || { WARNINGS+=("tmux make install 失败，请手动安装 tmux ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"); return; }
-            # 若 $HOME/.local/bin 不在 PATH 中，自动写入 shell 配置
-            if [[ ":$PATH:" != *":$HOME/.local/bin:"* ]]; then
-                export PATH="$HOME/.local/bin:$PATH"
-                local _RC
-                if [[ "$(basename "$SHELL")" == "zsh" ]]; then
-                    _RC="$HOME/.zshrc"
-                else
-                    _RC="$HOME/.bashrc"
-                fi
-                local _PATH_LINE='export PATH="$HOME/.local/bin:$PATH"'
-                if ! grep -qF "$HOME/.local/bin" "$_RC" 2>/dev/null; then
-                    echo "" >> "$_RC"
-                    echo "# remote-claude: tmux 路径" >> "$_RC"
-                    echo "$_PATH_LINE" >> "$_RC"
-                    print_success "已自动将 \$HOME/.local/bin 加入 PATH（写入 $_RC）"
-                fi
-            fi
-        fi
-
-        print_success "tmux ${TMUX_VERSION_TAG} 源码编译安装完成（前缀：${PREFIX}）"
-    }
-
     check_version() {
         # tmux -V 输出格式：tmux 3.6 或 tmux 3.4a
         local ver_str
@@ -310,30 +246,27 @@ check_tmux() {
             print_success "$TMUX_VERSION 已安装（满足 >= ${REQUIRED_MAJOR}.${REQUIRED_MINOR}）"
             return
         else
-            print_warning "$TMUX_VERSION 版本过低，需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR} 或更高，正在升级..."
+            print_warning "$TMUX_VERSION 版本过低，需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR} 或更高，尝试通过包管理器升级..."
             install_tmux
-            # 升级后再次验证，版本仍不满足则走源码编译（跨平台）
-            if ! check_version; then
-                install_tmux_from_source
-                if check_version; then
-                    print_success "tmux 已升级至 $(tmux -V)"
-                else
-                    print_warning "源码编译后版本仍不满足要求（$(tmux -V)），需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
-                    WARNINGS+=("tmux 版本不满足要求（$(tmux -V)），需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+，请手动升级")
-                fi
-            else
+            if check_version; then
                 print_success "tmux 已升级至 $(tmux -V)"
+            else
+                print_warning "包管理器安装后版本仍不满足要求（$(tmux -V)），需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
+                print_info "请运行 'remote-claude deps' 从源码编译安装 tmux ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
+                WARNINGS+=("tmux 版本不满足要求（$(tmux -V)），需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+，请运行 remote-claude deps 升级")
             fi
         fi
     else
         print_warning "未找到 tmux，正在安装..."
         install_tmux
-        if ! check_version; then
-            install_tmux_from_source
-            if ! check_version; then
-                print_warning "源码编译后版本仍不满足要求（$(tmux -V)），需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
-                WARNINGS+=("tmux 版本不满足要求（$(tmux -V)），需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+，请手动升级")
-            fi
+        if command -v tmux &> /dev/null && check_version; then
+            print_success "tmux 已安装: $(tmux -V)"
+        else
+            local _cur_ver=""
+            command -v tmux &> /dev/null && _cur_ver="（当前: $(tmux -V)）"
+            print_warning "tmux 安装后版本仍不满足要求${_cur_ver}，需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
+            print_info "请运行 'remote-claude deps' 从源码编译安装 tmux ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
+            WARNINGS+=("tmux 版本不满足要求，需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+，请运行 remote-claude deps 升级")
         fi
     fi
 }

package/lark_client/card_builder.py

@@ -427,6 +427,7 @@ def _build_buttons_v2(options: List[Dict[str, str]]) -> List[Dict[str, Any]]:
                                     "value": {
                                         "action": "select_option",
                                         "value": opt["value"],
+                                        "needs_input": opt.get("needs_input", False),
                                         "total": str(total),
                                     }
                                 }
@@ -770,6 +771,16 @@ def build_stream_card(
 
 # === 辅助卡片（保留不变）===
 
+def _get_display_name(name: str, cwd: str = None) -> str:
+    """从会话名和 CWD 获取显示名。自定义会话名直接用，默认路径名取 CWD 末段。"""
+    is_default = bool(_re.search(r'_\d{4}_\d{6}$', name))
+    if not is_default:
+        return name
+    if cwd:
+        return cwd.rstrip("/").rsplit("/", 1)[-1] or name
+    return name
+
+
 def _build_session_list_elements(sessions: List[Dict], current_session: Optional[str], session_groups: Optional[Dict[str, str]], page: int = 0) -> List[Dict]:
     """构建会话列表元素（供 build_menu_card 复用）"""
     import os
@@ -793,10 +804,7 @@ def _build_session_list_elements(sessions: List[Dict], current_session: Optional
 
             status_icon = "🟢" if is_current else "⚪"
             current_label = "（当前）" if is_current else ""
-            if cwd:
-                short_name = cwd.rstrip("/").rsplit("/", 1)[-1] or name
-            else:
-                short_name = name
+            short_name = _get_display_name(name, cwd)
 
             # 构建4行内容：名字、cli类型、启动时间、目录
             lines = [f"{status_icon} **{short_name}**{current_label}"]
@@ -1022,22 +1030,50 @@ def build_dir_card(target, entries: List[Dict], sessions: List[Dict], tree: bool
 
         if is_dir and depth == 0:
             auto_session = _dir_session_name(full_path)
-            group_btn = {
-                "tag": "button",
-                "text": {"tag": "plain_text", "content": "进入群聊" if (session_groups and auto_session in session_groups) else "创建群聊"},
-                "type": "default",
-                "behaviors": [{"type": "open_url",
-                               "default_url": f"https://applink.feishu.cn/client/chat/open?openChatId={session_groups[auto_session]}",
-                               "android_url": f"https://applink.feishu.cn/client/chat/open?openChatId={session_groups[auto_session]}",
-                               "ios_url": f"https://applink.feishu.cn/client/chat/open?openChatId={session_groups[auto_session]}",
-                               "pc_url": f"https://applink.feishu.cn/client/chat/open?openChatId={session_groups[auto_session]}"}]
-                if (session_groups and auto_session in session_groups) else
-                [{"type": "callback", "value": {
-                    "action": "dir_new_group",
-                    "path": full_path,
-                    "session_name": auto_session
-                }}]
-            }
+            # 前缀匹配：找 session_groups 中精确匹配或以 auto_session + "_" 开头的条目（取最后一个，即最新的）
+            matched_group_cid = None
+            if session_groups:
+                for sn, cid in session_groups.items():
+                    if sn == auto_session or sn.startswith(auto_session + "_"):
+                        matched_group_cid = cid
+            if matched_group_cid:
+                action_btns = [
+                    {
+                        "tag": "button",
+                        "text": {"tag": "plain_text", "content": "进入群聊"},
+                        "type": "default",
+                        "behaviors": [{"type": "open_url",
+                                       "default_url": f"https://applink.feishu.cn/client/chat/open?openChatId={matched_group_cid}",
+                                       "android_url": f"https://applink.feishu.cn/client/chat/open?openChatId={matched_group_cid}",
+                                       "ios_url": f"https://applink.feishu.cn/client/chat/open?openChatId={matched_group_cid}",
+                                       "pc_url": f"https://applink.feishu.cn/client/chat/open?openChatId={matched_group_cid}"}]
+                    }
+                ]
+            else:
+                action_btns = [
+                    {
+                        "tag": "button",
+                        "text": {"tag": "plain_text", "content": "Claude群聊"},
+                        "type": "primary",
+                        "behaviors": [{"type": "callback", "value": {
+                            "action": "dir_new_group",
+                            "path": full_path,
+                            "session_name": auto_session,
+                            "cli_type": "claude"
+                        }}]
+                    },
+                    {
+                        "tag": "button",
+                        "text": {"tag": "plain_text", "content": "Codex群聊"},
+                        "type": "default",
+                        "behaviors": [{"type": "callback", "value": {
+                            "action": "dir_new_group",
+                            "path": full_path,
+                            "session_name": auto_session,
+                            "cli_type": "codex"
+                        }}]
+                    }
+                ]
             elements.append({
                 "tag": "column_set",
                 "flex_mode": "none",
@@ -1060,19 +1096,7 @@ def build_dir_card(target, entries: List[Dict], sessions: List[Dict], tree: bool
                         "tag": "column",
                         "width": "weighted",
                         "weight": 2,
-                        "elements": [
-                            {
-                                "tag": "button",
-                                "text": {"tag": "plain_text", "content": "Claude"},
-                                "type": "primary",
-                                "behaviors": [{"type": "callback", "value": {
-                                    "action": "dir_start",
-                                    "path": full_path,
-                                    "session_name": auto_session
-                                }}]
-                            },
-                            group_btn
-                        ]
+                        "elements": action_btns
                     }
                 ]
             })
@@ -1145,6 +1169,9 @@ def build_help_card() -> Dict[str, Any]:
 **群聊协作**
 • `/new-group <会话名>` - 创建专属群聊，多人共用同一 Claude
 
+**按键控制**
+• `/press <按键>` - 发送按键到会话（如 `/press ctrl+c`、`/press esc`、`/press ctrl+f`）
+
 **其他**
 • `/help` - 显示此帮助
 • `/menu` - 快捷操作面板"""

package/lark_client/config.py

@@ -48,3 +48,7 @@ LARK_LOG_LEVEL = {
     "WARNING": 30,
     "ERROR": 40,
 }.get(_LARK_LOG_LEVEL, 20)  # 默认 INFO
+
+# SOCKS 代理兼容（可选，默认 False）
+# 系统有 SOCKS 代理但飞书可直连时，设为 1 绕过代理
+LARK_NO_PROXY = os.getenv("LARK_NO_PROXY", "").strip() in ("1", "true", "yes")