remote-claude 1.0.2 → 1.0.4

package/remote_claude.py

@@ -252,6 +252,44 @@ def cmd_status(args):
     return 0
 
 
+WATCHDOG_SCRIPT = USER_DATA_DIR / "watchdog.sh"
+WATCHDOG_PID_FILE = USER_DATA_DIR / "watchdog.pid"
+
+
+def _start_watchdog():
+    """启动后台 watchdog（如果尚未运行）"""
+    if not WATCHDOG_SCRIPT.exists():
+        return  # 脚本不存在时静默跳过
+    # 检查是否已在运行
+    if WATCHDOG_PID_FILE.exists():
+        try:
+            pid = int(WATCHDOG_PID_FILE.read_text().strip())
+            os.kill(pid, 0)
+            return  # 已在运行
+        except (ProcessLookupError, ValueError, OSError):
+            pass
+    process = subprocess.Popen(
+        ["bash", str(WATCHDOG_SCRIPT)],
+        stdout=subprocess.DEVNULL,  # watchdog 通过 tee 自己写 $LOG，不需要 stdout 捕获
+        stderr=subprocess.DEVNULL,
+        start_new_session=True,
+    )
+    print(f"  watchdog: 已启动 (PID: {process.pid})")
+
+
+def _stop_watchdog():
+    """停止后台 watchdog"""
+    if not WATCHDOG_PID_FILE.exists():
+        return
+    try:
+        pid = int(WATCHDOG_PID_FILE.read_text().strip())
+        os.kill(pid, signal.SIGTERM)
+        print(f"  watchdog: 已停止 (PID: {pid})")
+    except (ProcessLookupError, ValueError, OSError):
+        pass
+    WATCHDOG_PID_FILE.unlink(missing_ok=True)
+
+
 def cmd_lark_start(args):
     """启动飞书客户端（守护进程）"""
     if is_lark_running():
@@ -296,6 +334,7 @@ def cmd_lark_start(args):
             print(f"  日志: {log_file}")
             print(f"\n使用 'python3 remote_claude.py lark status' 查看状态")
             print(f"使用 'python3 remote_claude.py lark stop' 停止")
+            _start_watchdog()
             return 0
         else:
             print("✗ 启动失败，请查看日志:")
@@ -342,6 +381,7 @@ def cmd_lark_stop(args):
         if not is_lark_running():
             print("✓ 飞书客户端已停止")
             cleanup_lark()
+            _stop_watchdog()
             return 0
         else:
             print("✗ 无法停止进程，请手动终止:")
@@ -351,6 +391,7 @@ def cmd_lark_stop(args):
     except ProcessLookupError:
         print("进程已不存在，清理残留文件")
         cleanup_lark()
+        _stop_watchdog()
         return 0
     except Exception as e:
         print(f"✗ 停止失败: {e}")
@@ -477,6 +518,184 @@ def cmd_update(args):
     return 0
 
 
+def cmd_deps(args):
+    """检查并安装依赖"""
+    import shutil
+
+    YELLOW = "\033[33m"
+    GREEN = "\033[32m"
+    RED = "\033[31m"
+    RESET = "\033[0m"
+
+    def print_ok(msg):
+        print(f"{GREEN}✓{RESET} {msg}")
+
+    def print_warn(msg):
+        print(f"{YELLOW}⚠{RESET} {msg}")
+
+    def print_err(msg):
+        print(f"{RED}✗{RESET} {msg}")
+
+    print(f"\n{GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━{RESET}")
+    print(f"{GREEN}  依赖检查{RESET}")
+    print(f"{GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━{RESET}\n")
+
+    # 检查 uv
+    uv_path = shutil.which("uv")
+    if uv_path:
+        r = subprocess.run(["uv", "--version"], capture_output=True, text=True)
+        print_ok(f"uv: {r.stdout.strip()}")
+    else:
+        print_err("uv: 未安装")
+
+    # 检查 claude CLI
+    claude_path = shutil.which("claude")
+    if claude_path:
+        print_ok("Claude CLI: 已安装")
+    else:
+        print_warn("Claude CLI: 未安装")
+
+    # 检查 codex CLI
+    codex_path = shutil.which("codex")
+    if codex_path:
+        print_ok("Codex CLI: 已安装")
+    else:
+        print_warn("Codex CLI: 未安装（可选）")
+
+    # 检查 tmux
+    REQUIRED_MAJOR = 3
+    REQUIRED_MINOR = 6
+
+    tmux_path = shutil.which("tmux")
+    tmux_ok = False
+    if tmux_path:
+        r = subprocess.run(["tmux", "-V"], capture_output=True, text=True)
+        ver_str = r.stdout.strip().split()[-1] if r.stdout.strip() else "0.0"
+        parts = ver_str.replace("a", "").replace("b", "").replace("c", "").split(".")
+        try:
+            major = int(parts[0])
+            minor = int(parts[1]) if len(parts) > 1 else 0
+        except ValueError:
+            major, minor = 0, 0
+        if major > REQUIRED_MAJOR or (major == REQUIRED_MAJOR and minor >= REQUIRED_MINOR):
+            print_ok(f"tmux: {r.stdout.strip()}（满足 >= {REQUIRED_MAJOR}.{REQUIRED_MINOR}）")
+            tmux_ok = True
+        else:
+            print_warn(f"tmux: {r.stdout.strip()}（需要 >= {REQUIRED_MAJOR}.{REQUIRED_MINOR}）")
+    else:
+        print_err("tmux: 未安装")
+
+    if tmux_ok:
+        print(f"\n{GREEN}所有关键依赖已满足。{RESET}")
+        return 0
+
+    # tmux 版本不满足，提供源码编译安装
+    print(f"\n{YELLOW}tmux 版本不满足要求，是否从源码编译安装 tmux 3.6a？{RESET}")
+    print(f"  安装位置: $HOME/.local（不需要 root 权限）")
+    print(f"  编译依赖安装可能需要 sudo 密码\n")
+
+    try:
+        answer = input("继续？[y/N]: ").strip().lower()
+    except (EOFError, KeyboardInterrupt):
+        print()
+        return 0
+
+    if answer not in ("y", "yes"):
+        print("已跳过 tmux 安装。")
+        return 0
+
+    # 安装编译依赖
+    print(f"\n{YELLOW}[1/4] 安装编译依赖...{RESET}")
+    os_name = os.uname().sysname
+    if os_name == "Darwin":
+        subprocess.run(["brew", "install", "libevent", "ncurses", "pkg-config", "bison"], check=False)
+    elif os_name == "Linux":
+        if shutil.which("apt-get"):
+            subprocess.run(["sudo", "apt-get", "update"], check=False)
+            subprocess.run(["sudo", "apt-get", "install", "-y",
+                          "build-essential", "libevent-dev", "libncurses5-dev",
+                          "libncursesw5-dev", "bison", "pkg-config"], check=False)
+        elif shutil.which("yum"):
+            subprocess.run(["sudo", "yum", "groupinstall", "-y", "Development Tools"], check=False)
+            subprocess.run(["sudo", "yum", "install", "-y",
+                          "libevent-devel", "ncurses-devel", "bison"], check=False)
+        else:
+            print_warn("无法识别包管理器，请手动安装编译依赖: libevent-dev ncurses-dev bison pkg-config")
+
+    # 下载源码
+    print(f"\n{YELLOW}[2/4] 下载 tmux 3.6a 源码...{RESET}")
+    import tempfile
+    tmpdir = tempfile.mkdtemp()
+    tarball = os.path.join(tmpdir, "tmux.tar.gz")
+    tmux_url = "https://github.com/tmux/tmux/releases/download/3.6a/tmux-3.6a.tar.gz"
+
+    r = subprocess.run(["curl", "-fsSL", tmux_url, "-o", tarball])
+    if r.returncode != 0:
+        print_err("下载失败，请检查网络连接。")
+        return 1
+
+    subprocess.run(["tar", "-xzf", tarball, "-C", tmpdir], check=True)
+    src_dir = os.path.join(tmpdir, "tmux-3.6a")
+
+    # 编译
+    prefix = os.path.join(os.path.expanduser("~"), ".local")
+    print(f"\n{YELLOW}[3/4] 编译 tmux（安装到 {prefix}）...{RESET}")
+
+    nproc = "2"
+    try:
+        r = subprocess.run(["nproc"], capture_output=True, text=True)
+        if r.returncode == 0:
+            nproc = r.stdout.strip()
+    except FileNotFoundError:
+        pass
+
+    r = subprocess.run(
+        f"./configure --prefix={prefix} && make -j{nproc} && make install",
+        shell=True, cwd=src_dir
+    )
+    if r.returncode != 0:
+        print_err("编译失败，请检查编译依赖是否已安装。")
+        return 1
+
+    # 清理临时目录
+    import shutil as _shutil
+    _shutil.rmtree(tmpdir, ignore_errors=True)
+
+    # 配置 PATH
+    print(f"\n{YELLOW}[4/4] 配置 PATH...{RESET}")
+    local_bin = os.path.join(prefix, "bin")
+    os.environ["PATH"] = f"{local_bin}:{os.environ.get('PATH', '')}"
+
+    if f"{local_bin}" not in os.environ.get("PATH", ""):
+        os.environ["PATH"] = f"{local_bin}:{os.environ['PATH']}"
+
+    # 写入 shell rc
+    shell_name = os.path.basename(os.environ.get("SHELL", "bash"))
+    rc_file = os.path.join(os.path.expanduser("~"), ".zshrc" if shell_name == "zsh" else ".bashrc")
+    path_line = 'export PATH="$HOME/.local/bin:$PATH"'
+    try:
+        rc_content = open(rc_file).read() if os.path.exists(rc_file) else ""
+        if "$HOME/.local/bin" not in rc_content:
+            with open(rc_file, "a") as f:
+                f.write(f"\n# remote-claude: tmux 路径\n{path_line}\n")
+            print_ok(f"已将 $HOME/.local/bin 写入 {rc_file}")
+    except Exception as e:
+        print_warn(f"无法写入 {rc_file}: {e}")
+
+    # 验证
+    tmux_bin = os.path.join(local_bin, "tmux")
+    if os.path.exists(tmux_bin):
+        r = subprocess.run([tmux_bin, "-V"], capture_output=True, text=True)
+        print(f"\n{GREEN}✓ tmux 安装成功: {r.stdout.strip()}{RESET}")
+        print(f"  路径: {tmux_bin}")
+        print(f"  请运行 source {rc_file} 或重新打开终端使 PATH 生效。")
+    else:
+        print_err("安装似乎未成功，请检查上方输出。")
+        return 1
+
+    return 0
+
+
 def cmd_lark(args):
     """飞书客户端管理（兼容旧命令）"""
     # 如果没有子命令，默认显示状态或启动
@@ -529,6 +748,9 @@ def main():
 
 更新:
   %(prog)s update                    更新到最新版本
+
+依赖管理:
+  %(prog)s deps                      检查依赖并安装（含 tmux 源码编译）
 """
     )
 
@@ -636,6 +858,10 @@ def main():
     update_parser = subparsers.add_parser("update", help="更新 remote-claude 到最新版本")
     update_parser.set_defaults(func=cmd_update)
 
+    # deps 命令
+    deps_parser = subparsers.add_parser("deps", help="检查并安装依赖（tmux 源码编译等）")
+    deps_parser.set_defaults(func=cmd_deps)
+
     args, remaining = parser.parse_known_args()
 
     if args.command is None:

package/server/parsers/claude_parser.py

@@ -258,6 +258,40 @@ def _get_row_text(screen: pyte.Screen, row: int) -> str:
     return ''.join(buf).rstrip()
 
 
+def _is_dim_fg(fg_color: str) -> bool:
+    """判断前景色是否为灰色/暗色（placeholder 风格）。"""
+    if not fg_color or fg_color == 'default':
+        return False
+    name = fg_color.lower().replace(' ', '').replace('-', '')
+    if name in ('brightblack', 'black'):  # bright_black = gray
+        return True
+    if len(fg_color) == 6:
+        try:
+            r, g, b = int(fg_color[0:2], 16), int(fg_color[2:4], 16), int(fg_color[4:6], 16)
+            L = 0.2126 * r + 0.7152 * g + 0.0722 * b
+            # 灰色调（R≈G≈B）且非纯白 → inactive/placeholder 颜色（如 999999 亮度 153 > 128）
+            if max(r, g, b) - min(r, g, b) <= 30 and L < 230:
+                return True
+            # 非灰色但较暗
+            return L < 128
+        except ValueError:
+            pass
+    return False
+
+
+def _option_label_is_dim(screen: pyte.Screen, row: int) -> bool:
+    """检查选项行 label 部分前景色是否为暗色（自由输入 placeholder 风格）。"""
+    text = _get_row_text(screen, row)
+    m = re.match(r'^[\s❯]*\d+[.)]\s+', text)
+    if not m:
+        return False
+    col = m.end()
+    buf_row = screen.buffer[row]
+    if col not in buf_row or not buf_row[col].data.strip():
+        return False
+    return _is_dim_fg(buf_row[col].fg)
+
+
 def _get_col0(screen: pyte.Screen, row: int) -> str:
     """获取指定行第一列字符（col=0）"""
     try:
@@ -874,6 +908,7 @@ class ClaudeParser(BaseParser):
 
         options: List[dict] = []
         current_opt: Optional[dict] = None
+        selected_value = ""
         ansi_raw_lines = [_get_row_ansi_text(screen, r) for r in input_rows + overflow]
 
         for row in all_option_rows:
@@ -891,7 +926,10 @@ class ClaudeParser(BaseParser):
                     'label': m.group(2).strip(),
                     'value': m.group(1),
                     'description': '',
+                    'needs_input': _option_label_is_dim(screen, row),  # 自由输入选项检测
                 }
+                if line.startswith('❯'):
+                    selected_value = m.group(1)
             elif current_opt is not None and line:
                 # 描述行
                 current_opt['description'] = (
@@ -905,6 +943,7 @@ class ClaudeParser(BaseParser):
             return OptionBlock(
                 sub_type='option', tag=tag, question=question, options=options,
                 ansi_raw='\n'.join(ansi_raw_lines).rstrip(),
+                selected_value=selected_value,
             )
         return None
 
@@ -1020,6 +1059,7 @@ class ClaudeParser(BaseParser):
                 content_lines = pre_option_contents[1:-1]
 
         # 只收集范围内的 options
+        selected_value = ""
         for i in range(first_opt_idx, last_opt_idx + 1):
             line, cat = classified[i]
             if cat == 'option':
@@ -1029,6 +1069,8 @@ class ClaudeParser(BaseParser):
                         'label': m.group(2).strip(),
                         'value': m.group(1),
                     })
+                    if line.startswith('❯'):
+                        selected_value = m.group(1)
 
         return OptionBlock(
             sub_type='permission',
@@ -1037,6 +1079,7 @@ class ClaudeParser(BaseParser):
             question=question,
             options=options,
             ansi_raw='\n'.join(ansi_lines).rstrip(),
+            selected_value=selected_value,
         )
 
     def _parse_agent_list_panel(

package/server/parsers/codex_parser.py

@@ -1256,6 +1256,7 @@ class CodexParser(BaseParser):
 
         options: List[dict] = []
         current_opt: Optional[dict] = None
+        selected_value = ""
         ansi_raw_lines = [_get_row_ansi_text(screen, r) for r in input_rows + overflow]
 
         for row in all_option_rows:
@@ -1274,6 +1275,8 @@ class CodexParser(BaseParser):
                     'value': m.group(1),
                     'description': '',
                 }
+                if line[0:1] in CODEX_PROMPT_CHARS or line.startswith('❯'):
+                    selected_value = m.group(1)
             elif current_opt is not None and line:
                 # 描述行
                 current_opt['description'] = (
@@ -1287,6 +1290,7 @@ class CodexParser(BaseParser):
             return OptionBlock(
                 sub_type='option', tag=tag, question=question, options=options,
                 ansi_raw='\n'.join(ansi_raw_lines).rstrip(),
+                selected_value=selected_value,
             )
         return None
 
@@ -1407,6 +1411,7 @@ class CodexParser(BaseParser):
                 content_lines = pre_option_contents[1:-1]
 
         # 只收集范围内的 options
+        selected_value = ""
         for i in range(first_opt_idx, last_opt_idx + 1):
             line, cat = classified[i]
             if cat == 'option':
@@ -1416,6 +1421,8 @@ class CodexParser(BaseParser):
                         'label': m.group(2).strip(),
                         'value': m.group(1),
                     })
+                    if line[0:1] in CODEX_PROMPT_CHARS or line.startswith('❯'):
+                        selected_value = m.group(1)
 
         return OptionBlock(
             sub_type='permission',
@@ -1424,6 +1431,7 @@ class CodexParser(BaseParser):
             question=question,
             options=options,
             ansi_raw='\n'.join(ansi_lines).rstrip(),
+            selected_value=selected_value,
         )
 
     def _parse_agent_list_panel(

package/server/server.py

@@ -9,6 +9,7 @@ Proxy Server
 """
 
 import asyncio
+import atexit
 import logging
 import os
 import pty
@@ -35,8 +36,8 @@ from utils.protocol import (
     encode_message, decode_message
 )
 from utils.session import (
-    get_socket_path, get_pid_file, ensure_socket_dir,
-    generate_client_id, cleanup_session, _safe_filename, get_env_file,
+    get_socket_path, get_pid_file, get_name_file, ensure_socket_dir,
+    generate_client_id, cleanup_session, _safe_filename, _log_filename, get_env_file,
     SOCKET_DIR
 )
 
@@ -184,12 +185,12 @@ class OutputWatcher:
         self._on_snapshot = on_snapshot  # 回调：写共享内存
         self._debug_screen = debug_screen  # --debug-screen 开启后才写 _screen.log
         self._debug_verbose = debug_verbose  # --debug-verbose 开启后输出 indicator/repr 等诊断信息
-        safe_name = _safe_filename(session_name)
-        self._debug_file = f"/tmp/remote-claude/{safe_name}_messages.log"
+        log_name = _log_filename(session_name)
+        self._debug_file = f"/tmp/remote-claude/{log_name}_messages.log"
         # PTY 原始字节流日志（仅 --debug-screen 开启时使用）
         self._raw_log_fd = None
         if debug_screen:
-            raw_log_path = f"/tmp/remote-claude/{safe_name}_pty_raw.log"
+            raw_log_path = f"/tmp/remote-claude/{log_name}_pty_raw.log"
             try:
                 self._raw_log_fd = open(raw_log_path, "a", encoding="ascii", buffering=1)
             except Exception:
@@ -663,7 +664,7 @@ class OutputWatcher:
         每个字符的 fg/bg 颜色通过 ANSI SGR 序列直接嵌入，
         cat _screen.log 即可在终端看到与 pyte 渲染一致的着色效果。
         """
-        base = f"/tmp/remote-claude/{_safe_filename(self._session_name)}"
+        base = f"/tmp/remote-claude/{_log_filename(self._session_name)}"
         try:
             # pyte 屏幕快照（覆盖写，只保留最新一帧）
             screen_path = base + "_screen.log"
@@ -803,12 +804,13 @@ class ProxyServer:
     """Proxy Server"""
 
     def __init__(self, session_name: str, claude_args: list = None,
-                 claude_cmd: str = "claude",
+                 claude_cmd: str = "claude", codex_cmd: str = "codex",
                  cli_type: str = "claude",
                  debug_screen: bool = False, debug_verbose: bool = False):
         self.session_name = session_name
         self.claude_args = claude_args or []
         self.claude_cmd = claude_cmd
+        self.codex_cmd = codex_cmd
         self.cli_type = cli_type
         self.debug_screen = debug_screen
         self.debug_verbose = debug_verbose
@@ -863,6 +865,9 @@ class ProxyServer:
         # 写入 PID 文件
         self.pid_file.write_text(str(os.getpid()))
 
+        # 写入会话名映射文件（供 list_active_sessions 恢复原始显示名）
+        get_name_file(self.session_name).write_text(self.session_name)
+
         # 启动 Unix Socket 服务器
         t2 = time.time()
         self.server = await asyncio.start_unix_server(
@@ -915,9 +920,9 @@ class ProxyServer:
         logger.info(f"已重定向 stderr 到 {error_log_path}")
 
         # 添加运行阶段日志文件
-        safe_name = _safe_filename(self.session_name)
+        log_name = _log_filename(self.session_name)
         runtime_handler = logging.FileHandler(
-            f"{SOCKET_DIR}/{safe_name}_server.log",
+            f"{SOCKET_DIR}/{log_name}_server.log",
             encoding="utf-8"
         )
         runtime_handler.setFormatter(logging.Formatter(
@@ -930,7 +935,7 @@ class ProxyServer:
         # DEBUG 级别时额外记录调试日志到独立文件
         if SERVER_LOG_LEVEL_MAP == logging.DEBUG:
             debug_handler = logging.FileHandler(
-                f"{SOCKET_DIR}/{safe_name}_debug.log",
+                f"{SOCKET_DIR}/{log_name}_debug.log",
                 encoding="utf-8"
             )
             debug_handler.setLevel(logging.DEBUG)
@@ -940,14 +945,14 @@ class ProxyServer:
             ))
             debug_handler._debug_handler = True  # 标记，方便后续清理
             root_logger.addHandler(debug_handler)
-            logger.info(f"已启用 DEBUG 日志: {safe_name}_debug.log")
+            logger.info(f"已启用 DEBUG 日志: {log_name}_debug.log")
 
-        logger.info(f"日志已切换到运行阶段: {safe_name}_server.log")
+        logger.info(f"日志已切换到运行阶段: {log_name}_server.log")
 
     def _get_effective_cmd(self) -> str:
-        """根据 cli_type 返回实际执行的命令（codex 时使用 'codex'，否则用 claude_cmd）"""
+        """根据 cli_type 返回实际执行的命令"""
         if self.cli_type == "codex":
-            return "codex"
+            return self.codex_cmd
         return self.claude_cmd
 
     def _start_pty(self):
@@ -1193,21 +1198,27 @@ class ProxyServer:
 
 
 def run_server(session_name: str, claude_args: list = None,
-               claude_cmd: str = "claude",
+               claude_cmd: str = "claude", codex_cmd: str = "codex",
                cli_type: str = "claude",
                debug_screen: bool = False, debug_verbose: bool = False):
     """运行服务器"""
     server = ProxyServer(session_name, claude_args, claude_cmd=claude_cmd,
-                         cli_type=cli_type,
+                         codex_cmd=codex_cmd, cli_type=cli_type,
                          debug_screen=debug_screen, debug_verbose=debug_verbose)
 
+    # atexit 兜底：任何退出路径（包括被 SIGKILL 以外的信号强杀）都记录日志
+    atexit.register(lambda: logger.warning("server 进程退出（atexit）[session=%s]", session_name))
+
     # 信号处理
     def signal_handler(signum, frame):
-        print("\n[Server] 收到退出信号")
+        sig_name = signal.Signals(signum).name if hasattr(signal, 'Signals') else str(signum)
+        logger.warning("收到退出信号: %s (signum=%d)", sig_name, signum)
+        print(f"\n[Server] 收到退出信号: {sig_name}")
         asyncio.create_task(server._shutdown())
 
     signal.signal(signal.SIGINT, signal_handler)
     signal.signal(signal.SIGTERM, signal_handler)
+    signal.signal(signal.SIGHUP, signal_handler)  # tmux 崩溃时也能优雅退出
 
     # 运行
     try:
@@ -1251,7 +1262,8 @@ if __name__ == "__main__":
     logging.getLogger().addHandler(startup_handler)
 
     claude_cmd = os.environ.get("CLAUDE_COMMAND", "claude")
-    logger.info(f"CLAUDE_COMMAND={claude_cmd!r}")
+    codex_cmd = os.environ.get("CODEX_COMMAND", "codex")
+    logger.info(f"CLAUDE_COMMAND={claude_cmd!r}, CODEX_COMMAND={codex_cmd!r}")
     run_server(args.session_name, args.claude_args, claude_cmd=claude_cmd,
-               cli_type=args.cli_type,
+               codex_cmd=codex_cmd, cli_type=args.cli_type,
                debug_screen=args.debug_screen, debug_verbose=args.debug_verbose)

package/utils/components.py

@@ -79,6 +79,7 @@ class OptionBlock:
     ansi_raw: str = ""         # 整个选项区域的 ANSI 原始文本
     indicator: str = ""        # 首列字符原文
     ansi_indicator: str = ""   # 带 ANSI 颜色的首列字符
+    selected_value: str = ""   # 当前 ❯ 光标所在选项的 value（数字字符串）
 
 
 # 向后兼容别名