remote-claude 0.2.9 → 0.2.10

package/lark_client/lark_handler.py

@@ -318,15 +318,20 @@ class LarkHandler:
         server_script = script_dir / "server" / "server.py"
         cmd = [sys.executable, str(server_script), session_name]
 
-        logger.info(f"启动会话: {session_name}, 工作目录: {work_dir}, 命令: {cmd}")
+        logger.info(f"启动会话: {session_name}, 工作目录: {work_dir}, 命令: {' '.join(cmd)}")
         _track_stats('lark', 'cmd_start', session_name=session_name, chat_id=chat_id)
 
         try:
             import os as _os
+            from datetime import datetime as _datetime
             env = _os.environ.copy()
             env.pop("CLAUDECODE", None)
 
-            subprocess.Popen(
+            from utils.session import USER_DATA_DIR
+            log_path = USER_DATA_DIR / "startup.log"
+            start_time = _datetime.now()
+
+            proc = subprocess.Popen(
                 cmd,
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL,
@@ -335,13 +340,38 @@ class LarkHandler:
                 env=env,
             )
 
+            def _read_log_since(since):
+                if not log_path.exists():
+                    return ""
+                lines = []
+                for line in log_path.read_text(encoding="utf-8").splitlines():
+                    try:
+                        ts = _datetime.strptime(line[:23], "%Y-%m-%d %H:%M:%S.%f")
+                        if ts >= since:
+                            lines.append(line)
+                    except ValueError:
+                        if lines:
+                            lines.append(line)
+                return "\n".join(lines)
+
             socket_path = get_socket_path(session_name)
-            for _ in range(120):
+            for i in range(120):
                 await asyncio.sleep(0.1)
                 if socket_path.exists():
                     break
+                if (i + 1) % 10 == 0:
+                    elapsed = (i + 1) // 10
+                    rc = proc.poll()
+                    if rc is not None:
+                        log_content = _read_log_since(start_time)
+                        logger.warning(f"会话启动失败: server 进程已退出 (exitcode={rc}, elapsed={elapsed}s)\n{log_content}")
+                        await card_service.send_text(chat_id, f"错误: Server 进程意外退出 (code={rc})\n\n{log_content}")
+                        return
+                    logger.info(f"等待 server socket... ({elapsed}s)")
             else:
-                await card_service.send_text(chat_id, "错误: 会话启动超时")
+                log_content = _read_log_since(start_time)
+                logger.error(f"会话启动超时 (12s), session={session_name}\n{log_content}")
+                await card_service.send_text(chat_id, f"错误: 会话启动超时 (12s)\n\n{log_content}")
                 return
 
             ok = await self._attach(chat_id, session_name)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remote-claude",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "双端共享 Claude CLI 工具",
   "bin": {
     "remote-claude": "bin/remote-claude",
@@ -33,7 +33,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/yuyangzi/remote_claude.git"
+    "url": "git+https://github.com/yyzybb537/remote_claude.git"
   },
   "keywords": [
     "claude",

package/remote_claude.py

@@ -11,11 +11,13 @@ Remote Claude - 双端共享 Claude CLI 工具
 """
 
 import argparse
+import logging
 import os
 import sys
 import subprocess
 import time
 import signal
+from datetime import datetime
 from pathlib import Path
 
 # 确保项目根目录在 sys.path 中，以便 import client / server 子模块
@@ -31,7 +33,7 @@ from utils.session import (
     is_lark_running, get_lark_pid, get_lark_status, get_lark_pid_file,
     save_lark_status, cleanup_lark,
     USER_DATA_DIR, ensure_user_data_dir, get_lark_log_file,
-    get_env_snapshot_path
+    get_env_snapshot_path,
 )
 
 
@@ -91,7 +93,22 @@ def cmd_start(args):
 
     server_cmd = f"{env_prefix}uv run --project '{SCRIPT_DIR}' python3 '{server_script}'{debug_flag}{debug_verbose_flag}{cli_type_flag} -- '{session_name}' {claude_args_str}"
 
-    print(f"启动会话: {session_name}")
+    # 配置启动日志（写文件 + stdout）
+    _log_path = USER_DATA_DIR / "startup.log"
+    _start_logger = logging.getLogger('Start')
+    if not _start_logger.handlers:
+        _handler_file = logging.FileHandler(_log_path, encoding="utf-8")
+        _handler_file.setFormatter(logging.Formatter(
+            "%(asctime)s.%(msecs)03d [%(name)s] %(levelname)s %(message)s",
+            datefmt="%Y-%m-%d %H:%M:%S",
+        ))
+        _start_logger.addHandler(_handler_file)
+        _start_logger.setLevel(logging.INFO)
+        _start_logger.propagate = False
+
+    start_time = datetime.now()
+    _start_logger.info(f"启动会话: {session_name}")
+    _start_logger.info(f"server_cmd: {server_cmd}")
 
     # 创建 tmux 会话，运行 server（detached，仅后台）
     if not tmux_create_session(session_name, server_cmd, detached=True):
@@ -100,12 +117,30 @@ def cmd_start(args):
 
     # 等待 server 启动
     socket_path = get_socket_path(session_name)
-    for _ in range(50):  # 最多等待 5 秒
+    for i in range(50):  # 最多等待 5 秒
         if socket_path.exists():
             break
         time.sleep(0.1)
+        if (i + 1) % 10 == 0:
+            elapsed = (i + 1) // 10
+            print(f"等待 Server 启动... ({elapsed}s)")
     else:
-        print("错误: Server 启动超时")
+        print("错误: Server 启动超时 (5s)")
+        # 过滤出本次启动后的日志行
+        if _log_path.exists():
+            lines = []
+            for line in _log_path.read_text(encoding="utf-8").splitlines():
+                try:
+                    ts = datetime.strptime(line[:23], "%Y-%m-%d %H:%M:%S.%f")
+                    if ts >= start_time:
+                        lines.append(line)
+                except ValueError:
+                    if lines:  # 多行日志的续行，附到上一条
+                        lines.append(line)
+            if lines:
+                print(f"--- Server 日志 ({_log_path}) ---")
+                print("\n".join(lines))
+                print("-------------------")
         tmux_kill_session(session_name)
         return 1
 

package/server/server.py

@@ -9,6 +9,7 @@ Proxy Server
 """
 
 import asyncio
+import logging
 import os
 import pty
 import signal
@@ -35,9 +36,12 @@ from utils.protocol import (
 )
 from utils.session import (
     get_socket_path, get_pid_file, ensure_socket_dir,
-    generate_client_id, cleanup_session, _safe_filename, get_env_file
+    generate_client_id, cleanup_session, _safe_filename, get_env_file,
+    SOCKET_DIR
 )
 
+logger = logging.getLogger('Server')
+
 # 加载用户 .env 配置（支持 CLAUDE_COMMAND 等）
 try:
     from dotenv import load_dotenv
@@ -64,6 +68,11 @@ class _FrameObs:
     status_line: Optional[object]  # 本帧的 StatusLine（None=无）
     block_blink: bool = False      # 本帧最后一个 OutputBlock 是否 is_streaming=True
     has_background_agents: bool = False  # 底部栏是否有后台 agent 信息
+    # 用于字符变化检测（增强闪烁判断）
+    last_ob_start_row: int = -1          # 最后 OutputBlock 的起始行号（跨帧识别同一 block）
+    last_ob_indicator_char: str = ''     # 指示符字符值（pyte char.data）
+    last_ob_indicator_fg: str = ''       # 指示符前景色（pyte char.fg）
+    last_ob_indicator_bold: bool = False # 指示符 bold 属性（影响显示亮度）
 
 
 @dataclass
@@ -154,6 +163,9 @@ class OutputWatcher:
 
     def feed(self, data: bytes):
         self._renderer.feed(data)  # 直接喂持久化 screen，不再缓存原始字节
+        # 诊断日志：记录 PTY 数据到达
+        if data:
+            logger.debug(f"[diag-feed] len={len(data)} data={data[:50]!r}")
         try:
             loop = asyncio.get_running_loop()
         except RuntimeError:
@@ -185,6 +197,8 @@ class OutputWatcher:
 
     async def _flush(self):
         self._pending = False
+        # 诊断日志：记录 flush 触发时间和帧窗口大小
+        logger.debug(f"[diag-flush] ts={time.time():.6f} window_size={len(self._frame_window)}")
         try:
             from utils.components import StatusLine, BottomBar, Divider, OutputBlock, AgentPanelBlock, OptionBlock
 
@@ -224,10 +238,24 @@ class OutputWatcher:
             # 4a. 记录原始帧观测（必须用未平滑的原始值）
             last_ob_blink = False
             last_ob_content = ''
+            last_ob_start_row = -1
+            last_ob_indicator_char = ''
+            last_ob_indicator_fg = ''
+            last_ob_indicator_bold = False
             for b in reversed(visible_blocks):
                 if isinstance(b, OutputBlock):
                     last_ob_blink = b.is_streaming
                     last_ob_content = b.content[:40]
+                    last_ob_start_row = b.start_row
+                    # 直接读 pyte screen buffer 获取原始字符属性（用于变化检测）
+                    if b.start_row >= 0:
+                        try:
+                            char = self._renderer.screen.buffer[b.start_row][0]
+                            last_ob_indicator_char = str(getattr(char, 'data', ''))
+                            last_ob_indicator_fg = str(getattr(char, 'fg', ''))
+                            last_ob_indicator_bold = bool(getattr(char, 'bold', False))
+                        except (KeyError, IndexError):
+                            pass
                     break
             if last_ob_blink:
                 _blink_log = open(f"/tmp/remote-claude/{self._session_name}_blink.log", "a")
@@ -241,6 +269,10 @@ class OutputWatcher:
                 status_line=raw_status_line,
                 block_blink=last_ob_blink,
                 has_background_agents=getattr(raw_bottom_bar, 'has_background_agents', False) if raw_bottom_bar else False,
+                last_ob_start_row=last_ob_start_row,
+                last_ob_indicator_char=last_ob_indicator_char,
+                last_ob_indicator_fg=last_ob_indicator_fg,
+                last_ob_indicator_bold=last_ob_indicator_bold,
             ))
             cutoff = now - self.WINDOW_SECONDS
             while self._frame_window and self._frame_window[0].ts < cutoff:
@@ -262,9 +294,27 @@ class OutputWatcher:
                 None
             )
 
-            # 4c. block blink 平滑：窗口内任意帧有 blink → streaming
-            #     修改 visible_blocks 中最后一个 OutputBlock（平滑后再合并）
+            # 4c. block blink 平滑：两种触发路径
+            # 路径1：窗口内任意帧有 pyte blink 属性
             window_block_active = any(o.block_blink for o in window_list)
+
+            # 路径2：窗口内同一 block 的指示符字符值/颜色/bold 有变化（增强闪烁判断）
+            if not window_block_active and last_ob_start_row >= 0:
+                same_block = [o for o in window_list if o.last_ob_start_row == last_ob_start_row]
+                if len(same_block) >= 2:
+                    chars = {o.last_ob_indicator_char for o in same_block if o.last_ob_indicator_char}
+                    fgs   = {o.last_ob_indicator_fg   for o in same_block if o.last_ob_indicator_fg}
+                    bolds = {o.last_ob_indicator_bold for o in same_block}
+                    if len(chars) > 1 or len(fgs) > 1 or len(bolds) > 1:
+                        window_block_active = True
+                        # 记录字符变化触发原因
+                        _blink_log = open(f"/tmp/remote-claude/{self._session_name}_blink.log", "a")
+                        _blink_log.write(
+                            f"[{time.strftime('%H:%M:%S')}] char-change row={last_ob_start_row}"
+                            f"  chars={chars}  fgs={fgs}  bolds={bolds}\n"
+                        )
+                        _blink_log.close()
+
             if window_block_active:
                 for b in reversed(visible_blocks):
                     if isinstance(b, OutputBlock):
@@ -303,6 +353,16 @@ class OutputWatcher:
                 layout_mode=self._parser.last_layout_mode,
                 cli_type=self._cli_type,
             )
+            # 诊断日志：检测最终输出中是否有同时存在 status_line 和 SystemBlock 的情况
+            if display_status:
+                status_prefix = display_status.raw[:30] if hasattr(display_status, 'raw') else str(display_status)[:30]
+                has_systemblock_with_status = any(
+                    b.__class__.__name__ == 'SystemBlock' and
+                    hasattr(b, 'content') and status_prefix in b.content
+                    for b in all_blocks
+                )
+                if has_systemblock_with_status:
+                    logger.debug(f"[diag-output] BOTH status_line and SystemBlock present! status_line={status_prefix!r}")
             self.last_window = window
 
             # 7. 输出
@@ -342,7 +402,7 @@ class OutputWatcher:
                     lines.append(f"      ansi_raw={sl.ansi_raw[:120]!r}")
                     lines.append(f"      ansi_render: {sl.ansi_indicator} {sl.ansi_raw[:120]}\x1b[0m")
                 else:
-                    lines.append(f"status_line: {sl.ansi_indicator} {sl.ansi_raw[:120]}\x1b[0m")
+                    lines.append(f"status_line: {sl.ansi_raw[:120]}\x1b[0m")
             else:
                 lines.append("status_line: None")
             # BottomBar
@@ -529,7 +589,7 @@ class ClientConnection:
             self.writer.write(data)
             await self.writer.drain()
         except Exception as e:
-            print(f"[Server] 发送消息失败 ({self.client_id}): {e}")
+            logger.warning(f"发送消息失败 ({self.client_id}): {e}")
 
     async def read_message(self) -> Optional[Message]:
         """读取一条消息"""
@@ -540,7 +600,7 @@ class ClientConnection:
                 try:
                     return decode_message(line)
                 except Exception as e:
-                    print(f"[Server] 解析消息失败: {e}")
+                    logger.warning(f"解析消息失败: {e}")
                     continue
 
             # 读取更多数据
@@ -608,6 +668,8 @@ class ProxyServer:
 
     async def start(self):
         """启动服务器"""
+        t0 = time.time()
+        logger.info(f"正在启动 (session={self.session_name})")
         ensure_socket_dir()
 
         # 清理旧的 socket 文件
@@ -615,12 +677,15 @@ class ProxyServer:
             self.socket_path.unlink()
 
         # 启动 PTY
+        t1 = time.time()
         self._start_pty()
+        logger.info(f"PTY 已启动 ({(time.time()-t1)*1000:.0f}ms)")
 
         # 写入 PID 文件
         self.pid_file.write_text(str(os.getpid()))
 
         # 启动 Unix Socket 服务器
+        t2 = time.time()
         self.server = await asyncio.start_unix_server(
             self._handle_client,
             path=str(self.socket_path)
@@ -628,7 +693,7 @@ class ProxyServer:
 
         self.running = True
         _track_stats('session', 'start', session_name=self.session_name)
-        print(f"[Server] 已启动: {self.socket_path}")
+        logger.info(f"已启动: {self.socket_path} (Socket {(time.time()-t2)*1000:.0f}ms, 总计 {(time.time()-t0)*1000:.0f}ms)")
 
         # 启动 PTY 读取任务
         asyncio.create_task(self._read_pty())
@@ -664,8 +729,14 @@ class ProxyServer:
         try:
             with open(env_snapshot_path) as _f:
                 _extra_env = _json.load(_f)
+            logger.info(f"环境快照已加载 ({len(_extra_env)} 个变量)")
         except Exception:
-            pass
+            logger.warning("环境快照加载失败，使用当前进程环境")
+
+        # 提前计算命令（fork 后父子进程共享，方便父进程打印和子进程执行）
+        import shlex as _shlex
+        _cmd_parts = _shlex.split(self._get_effective_cmd())
+        _full_cmd = ' '.join(_cmd_parts + self.claude_args)
 
         try:
             pid, fd = pty.fork()
@@ -688,10 +759,25 @@ class ProxyServer:
             # 清除 tmux 标识变量（PTY 数据不经过 tmux，不应让 Claude CLI 误判终端环境）
             child_env.pop('TMUX', None)
             child_env.pop('TMUX_PANE', None)
-            import shlex as _shlex
-            _cmd_parts = _shlex.split(self._get_effective_cmd())
-            os.execvpe(_cmd_parts[0], _cmd_parts + self.claude_args, child_env)
-            os._exit(1)  # execvpe 失败时兜底退出
+            try:
+                os.execvpe(_cmd_parts[0], _cmd_parts + self.claude_args, child_env)
+            except Exception as _e:
+                msg = f"启动失败: 命令 '{_cmd_parts[0]}' 无法执行: {_e}"
+                os.write(1, (msg + "\n").encode())  # 写到 PTY
+                # fork 后不能安全使用 logging，直接追加写日志文件
+                try:
+                    import time as _t
+                    _ts = _t.strftime("%Y-%m-%d %H:%M:%S")
+                    _ms = int((_t.time() % 1) * 1000)
+                    _log_line = f"{_ts}.{_ms:03d} [Server] ERROR {msg}\n"
+                    _home = os.path.expanduser("~")
+                    _log_file = os.path.join(_home, ".remote-claude", "startup.log")
+                    with open(_log_file, "a", encoding="utf-8") as _f:
+                        _f.write(_log_line)
+                except Exception:
+                    pass
+                os._exit(127)  # 127 = command not found (shell convention)
+            os._exit(1)  # 理论上不可达
         else:
             # 父进程
             self.master_fd = fd
@@ -706,7 +792,8 @@ class ProxyServer:
             fcntl.fcntl(fd, fcntl.F_SETFL, flags | os.O_NONBLOCK)
 
             cli_label = self.cli_type.capitalize()
-            print(f"[Server] {cli_label} 已启动 (PID: {pid}, PTY: {self.PTY_COLS}×{self.PTY_ROWS})")
+            logger.info(f"启动命令: {_full_cmd}")
+            logger.info(f"{cli_label} 已启动 (PID: {pid}, PTY: {self.PTY_COLS}×{self.PTY_ROWS})")
 
     _COALESCE_MAX = 64 * 1024  # 64KB，防止单次广播过大
 
@@ -744,11 +831,19 @@ class ProxyServer:
                     break
             except Exception as e:
                 if self.running:
-                    print(f"[Server] 读取 PTY 错误: {e}")
+                    logger.error(f"读取 PTY 错误: {e}")
                 break
 
-        # Claude 退出
-        print("[Server] Claude 已退出")
+        # Claude 退出，获取 exit code 以便诊断
+        try:
+            _, status = os.waitpid(self.child_pid, os.WNOHANG)
+            if status != 0:
+                exit_code = os.waitstatus_to_exitcode(status)
+                logger.error(f"CLI 进程异常退出 (exit_code={exit_code})")
+            else:
+                logger.info("Claude 已退出")
+        except Exception:
+            logger.info("Claude 已退出")
         await self._shutdown()
 
     def _read_pty_sync(self) -> Optional[bytes]:
@@ -766,7 +861,7 @@ class ProxyServer:
         client = ClientConnection(client_id, reader, writer)
         self.clients[client_id] = client
 
-        print(f"[Server] 客户端连接: {client_id}")
+        logger.info(f"客户端连接: {client_id}")
         _track_stats('session', 'attach', session_name=self.session_name)
 
         # 发送历史输出
@@ -782,12 +877,12 @@ class ProxyServer:
                     break
                 await self._handle_message(client_id, msg)
         except Exception as e:
-            print(f"[Server] 客户端处理错误 ({client_id}): {e}")
+            logger.error(f"客户端处理错误 ({client_id}): {e}")
         finally:
             # 清理
             del self.clients[client_id]
             client.close()
-            print(f"[Server] 客户端断开: {client_id}")
+            logger.info(f"客户端断开: {client_id}")
 
     async def _handle_message(self, client_id: str, msg: Message):
         """处理客户端消息"""
@@ -804,7 +899,7 @@ class ProxyServer:
             _track_stats('terminal', 'input', session_name=self.session_name,
                          value=len(data))
         except Exception as e:
-            print(f"[Server] 写入 PTY 错误: {e}")
+            logger.error(f"写入 PTY 错误: {e}")
 
         # 广播输入给其他客户端（飞书侧可以感知终端用户的输入内容）
         for cid, client in list(self.clients.items()):
@@ -824,7 +919,7 @@ class ProxyServer:
             winsize = struct.pack('HHHH', msg.rows, msg.cols, 0, 0)
             fcntl.ioctl(self.master_fd, termios.TIOCSWINSZ, winsize)
         except Exception as e:
-            print(f"[Server] 调整终端大小错误: {e}")
+            logger.error(f"调整终端大小错误: {e}")
 
     async def _broadcast_output(self, data: bytes):
         """广播输出给所有客户端，同时喂给 OutputWatcher 生成快照"""
@@ -863,7 +958,7 @@ class ProxyServer:
         # 清理文件
         cleanup_session(self.session_name)
 
-        print("[Server] 已关闭")
+        logger.info("已关闭")
 
 
 def run_server(session_name: str, claude_args: list = None,
@@ -903,7 +998,22 @@ if __name__ == "__main__":
                         help="debug 日志输出完整诊断信息（indicator、repr 等）")
     args = parser.parse_args()
 
+    # 配置日志：写文件（供故障诊断）+ stdout（供 tmux attach 时查看）
+    from utils.session import USER_DATA_DIR
+    USER_DATA_DIR.mkdir(parents=True, exist_ok=True)
+    _log_path = USER_DATA_DIR / "startup.log"
+    logging.basicConfig(
+        level=logging.DEBUG,
+        format="%(asctime)s.%(msecs)03d [%(name)s] %(levelname)s %(message)s",
+        datefmt="%Y-%m-%d %H:%M:%S",
+        handlers=[
+            logging.FileHandler(_log_path, encoding="utf-8"),
+            logging.StreamHandler(sys.stdout),
+        ],
+    )
+
     claude_cmd = os.environ.get("CLAUDE_COMMAND", "claude")
+    logger.info(f"CLAUDE_COMMAND={claude_cmd!r}")
     run_server(args.session_name, args.claude_args, claude_cmd=claude_cmd,
                cli_type=args.cli_type,
                debug_screen=args.debug_screen, debug_verbose=args.debug_verbose)

package/utils/session.py

@@ -101,6 +101,8 @@ def tmux_create_session(session_name: str, command: str, detached: bool = True)
     args.extend(["-x", "200", "-y", "50"])  # 默认大小
     args.append(command)
 
+    import logging as _logging
+    _logging.getLogger('Start').info(f"tmux_cmd: {' '.join(args)}")
     result = subprocess.run(args, capture_output=True)
     if result.returncode == 0:
         # 启用鼠标支持，允许在 tmux 窗口内用鼠标滚轮查看历史输出