remote-claude 0.2.11 → 0.2.13

package/server/server.py

@@ -42,6 +42,15 @@ from utils.session import (
 
 logger = logging.getLogger('Server')
 
+# Server 日志级别配置
+_SERVER_LOG_LEVEL = os.getenv("SERVER_LOG_LEVEL", "INFO").upper()
+SERVER_LOG_LEVEL_MAP = {
+    "DEBUG": logging.DEBUG,
+    "INFO": logging.INFO,
+    "WARNING": logging.WARNING,
+    "ERROR": logging.ERROR,
+}.get(_SERVER_LOG_LEVEL, logging.INFO)  # 默认 INFO
+
 # 加载用户 .env 配置（支持 CLAUDE_COMMAND 等）
 try:
     from dotenv import load_dotenv
@@ -126,11 +135,11 @@ class OutputWatcher:
         # 持久化解析器（跨帧保留 dot_row_cache）；由调用方注入（可插拔架构）
         import logging as _logging
         _logging.getLogger('ComponentParser').setLevel(_logging.DEBUG)
-        _blink_handler = _logging.FileHandler(
-            f"/tmp/remote-claude/{safe_name}_blink.log"
-        )
-        _blink_handler.setFormatter(_logging.Formatter('%(asctime)s %(message)s', '%H:%M:%S'))
-        _logging.getLogger('ComponentParser').addHandler(_blink_handler)
+        # 创建专用 logger 替换直接文件写入
+        self._blink_logger = _logging.getLogger(f'OutputWatcher.{self._session_name}.blink')
+        self._blink_logger.setLevel(_logging.DEBUG)
+        self._flush_logger = _logging.getLogger(f'OutputWatcher.{self._session_name}.flush')
+        self._flush_logger.setLevel(_logging.DEBUG)
         if parser is None:
             from parsers import ClaudeParser
             parser = ClaudeParser()
@@ -258,11 +267,7 @@ class OutputWatcher:
                             pass
                     break
             if last_ob_blink:
-                _blink_log = open(f"/tmp/remote-claude/{self._session_name}_blink.log", "a")
-                _blink_log.write(
-                    f"[{time.strftime('%H:%M:%S')}] raw-blink  last_ob={last_ob_content!r}\n"
-                )
-                _blink_log.close()
+                self._blink_logger.debug(f"raw-blink  last_ob={last_ob_content!r}")
 
             self._frame_window.append(_FrameObs(
                 ts=now,
@@ -308,23 +313,19 @@ class OutputWatcher:
                     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"
+                        self._blink_logger.debug(
+                            f"char-change row={last_ob_start_row}"
+                            f"  chars={chars}  fgs={fgs}  bolds={bolds}"
                         )
-                        _blink_log.close()
 
             if window_block_active:
                 for b in reversed(visible_blocks):
                     if isinstance(b, OutputBlock):
-                        _blink_log = open(f"/tmp/remote-claude/{self._session_name}_blink.log", "a")
-                        _blink_log.write(
-                            f"[{time.strftime('%H:%M:%S')}] win-smooth last_ob={b.content[:40]!r}"
+                        self._blink_logger.debug(
+                            f"win-smooth last_ob={b.content[:40]!r}"
                             f"  window_frames={len(window_list)}"
-                            f"  blink_frames={sum(1 for o in window_list if o.block_blink)}\n"
+                            f"  blink_frames={sum(1 for o in window_list if o.block_blink)}"
                         )
-                        _blink_log.close()
                         b.is_streaming = True
                         break
 
@@ -373,13 +374,12 @@ class OutputWatcher:
                 self._on_snapshot(window)
             t4 = time.time()
 
-            with open(f"/tmp/remote-claude/{_safe_filename(self._session_name)}_flush.log", "a") as _f:
-                _f.write(
-                    f"[flush] screen_log={1000*(t1-t0):.1f}ms  parse={1000*(t2-t1):.1f}ms  "
-                    f"msg_log={1000*(t3-t2):.1f}ms  snapshot={1000*(t4-t3):.1f}ms  "
-                    f"total={1000*(t4-t0):.1f}ms  rows={self._rows}\n"
-                    f"  └─ {self._parser.last_parse_timing}\n"
-                )
+            self._flush_logger.debug(
+                f"[flush] screen_log={1000*(t1-t0):.1f}ms  parse={1000*(t2-t1):.1f}ms  "
+                f"msg_log={1000*(t3-t2):.1f}ms  snapshot={1000*(t4-t3):.1f}ms  "
+                f"total={1000*(t4-t0):.1f}ms  rows={self._rows}\n"
+                f"  └─ {self._parser.last_parse_timing}"
+            )
 
         except Exception as e:
             print(f"[OutputWatcher] flush 失败: {e}")
@@ -727,6 +727,14 @@ class ProxyServer:
                not hasattr(handler, '_debug_handler'):
                 root_logger.removeHandler(handler)
 
+        # 重定向 sys.stderr 到 ~/.remote-claude/server.error.log
+        # 注意：这不会影响外层的 2>> startup.log，但 Python 的 stderr 输出会走这里
+        # 适用于：print(..., file=sys.stderr)、logging 的 StreamHandler 等
+        # 不适用于：C 扩展模块直接写文件描述符 2、解释器崩溃等底层错误
+        error_log_path = os.path.expanduser('~/.remote-claude/server.error.log')
+        sys.stderr = open(error_log_path, 'w', encoding='utf-8')
+        logger.info(f"已重定向 stderr 到 {error_log_path}")
+
         # 添加运行阶段日志文件
         safe_name = _safe_filename(self.session_name)
         runtime_handler = logging.FileHandler(
@@ -740,6 +748,21 @@ class ProxyServer:
         runtime_handler._runtime_handler = True  # 标记，方便后续清理
         root_logger.addHandler(runtime_handler)
 
+        # DEBUG 级别时额外记录调试日志到独立文件
+        if SERVER_LOG_LEVEL_MAP == logging.DEBUG:
+            debug_handler = logging.FileHandler(
+                f"{SOCKET_DIR}/{safe_name}_debug.log",
+                encoding="utf-8"
+            )
+            debug_handler.setLevel(logging.DEBUG)
+            debug_handler.setFormatter(logging.Formatter(
+                "%(asctime)s.%(msecs)03d [%(name)s] %(levelname)s %(message)s",
+                datefmt="%Y-%m-%d %H:%M:%S"
+            ))
+            debug_handler._debug_handler = True  # 标记，方便后续清理
+            root_logger.addHandler(debug_handler)
+            logger.info(f"已启用 DEBUG 日志: {safe_name}_debug.log")
+
         logger.info(f"日志已切换到运行阶段: {safe_name}_server.log")
 
     def _get_effective_cmd(self) -> str:

package/utils/session.py

@@ -99,7 +99,15 @@ def tmux_create_session(session_name: str, command: str, detached: bool = True)
     if detached:
         args.append("-d")
     args.extend(["-x", "200", "-y", "50"])  # 默认大小
-    args.append(command)
+
+    # 将 stderr 重定向到 startup.log，捕获 Python 启动错误（如 ModuleNotFoundError）
+    # startup.log 位于 ~/.remote-claude/startup.log
+    startup_log = USER_DATA_DIR / "startup.log"
+    startup_log.parent.mkdir(parents=True, exist_ok=True)
+    # 直接在命令末尾添加重定向，使用 str(startup_log) 确保路径正确展开
+    command_with_stderr = f"{command} 2>> {startup_log}"
+
+    args.append(command_with_stderr)
 
     import logging as _logging
     _logging.getLogger('Start').info(f"tmux_cmd: {' '.join(args)}")