remote-claude 0.2.10 → 0.2.12

package/server/server.py

@@ -698,6 +698,9 @@ class ProxyServer:
         # 启动 PTY 读取任务
         asyncio.create_task(self._read_pty())
 
+        # 切换到运行阶段日志
+        self._switch_to_runtime_logging()
+
         # 等待服务器关闭
         async with self.server:
             await self.server.serve_forever()
@@ -713,6 +716,32 @@ class ProxyServer:
             return CodexParser()
         return ClaudeParser()
 
+    def _switch_to_runtime_logging(self):
+        """从启动日志切换到运行阶段日志"""
+        root_logger = logging.getLogger()
+
+        # 移除启动日志 handler（保留 stdout handler）
+        for handler in root_logger.handlers[:]:
+            if isinstance(handler, logging.FileHandler) and \
+               not hasattr(handler, '_runtime_handler') and \
+               not hasattr(handler, '_debug_handler'):
+                root_logger.removeHandler(handler)
+
+        # 添加运行阶段日志文件
+        safe_name = _safe_filename(self.session_name)
+        runtime_handler = logging.FileHandler(
+            f"{SOCKET_DIR}/{safe_name}_server.log",
+            encoding="utf-8"
+        )
+        runtime_handler.setFormatter(logging.Formatter(
+            "%(asctime)s.%(msecs)03d [%(name)s] %(levelname)s %(message)s",
+            datefmt="%Y-%m-%d %H:%M:%S"
+        ))
+        runtime_handler._runtime_handler = True  # 标记，方便后续清理
+        root_logger.addHandler(runtime_handler)
+
+        logger.info(f"日志已切换到运行阶段: {safe_name}_server.log")
+
     def _get_effective_cmd(self) -> str:
         """根据 cli_type 返回实际执行的命令（codex 时使用 'codex'，否则用 claude_cmd）"""
         if self.cli_type == "codex":
@@ -998,20 +1027,27 @@ if __name__ == "__main__":
                         help="debug 日志输出完整诊断信息（indicator、repr 等）")
     args = parser.parse_args()
 
-    # 配置日志：写文件（供故障诊断）+ stdout（供 tmux attach 时查看）
-    from utils.session import USER_DATA_DIR
+    # 配置日志：启动阶段输出到 stdout + startup.log
+    from utils.session import USER_DATA_DIR, _safe_filename
     USER_DATA_DIR.mkdir(parents=True, exist_ok=True)
-    _log_path = USER_DATA_DIR / "startup.log"
+
+    # 先配置基本输出（stdout）
     logging.basicConfig(
-        level=logging.DEBUG,
+        level=logging.INFO,
         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),
-        ],
+        handlers=[logging.StreamHandler(sys.stdout)],
     )
 
+    # 添加启动日志 handler
+    startup_handler = logging.FileHandler(USER_DATA_DIR / "startup.log", encoding="utf-8")
+    startup_handler.setFormatter(logging.Formatter(
+        "%(asctime)s.%(msecs)03d [%(name)s] %(levelname)s %(message)s",
+        datefmt="%Y-%m-%d %H:%M:%S"
+    ))
+    startup_handler._startup_handler = True  # 标记为启动日志 handler
+    logging.getLogger().addHandler(startup_handler)
+
     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,

package/server/shared_state.py

@@ -93,6 +93,7 @@ class SharedStateWriter:
     """写端：Server 进程持有，生命周期与 ProxyServer 相同"""
 
     def __init__(self, session_name: str):
+        self._session_name = session_name
         self._path = get_mq_path(session_name)
         self._path.parent.mkdir(parents=True, exist_ok=True)
 
@@ -139,7 +140,7 @@ class SharedStateWriter:
                 "input_area_text": window.input_area_text,
                 "timestamp": window.timestamp,
                 "layout_mode": window.layout_mode,
-                "cli_type": getattr(window, "cli_type", "claude"),
+                "cli_type": getattr(window, "cli_type", "unknown"),
             }
             data = json.dumps(snapshot, ensure_ascii=False).encode('utf-8')
 
@@ -177,7 +178,7 @@ class SharedStateReader:
     反映跨进程写入更新的问题。每次 read() 打开文件读取后关闭，保证读到最新数据。
     """
 
-    _EMPTY = {"blocks": [], "status_line": None, "bottom_bar": None, "option_block": None}
+    _EMPTY = {"blocks": [], "status_line": None, "bottom_bar": None, "option_block": None, "cli_type": "claude"}
 
     def __init__(self, session_name: str):
         self._path = get_mq_path(session_name)

package/utils/__init__.py

@@ -0,0 +1,3 @@
+"""
+Remote Claude 工具模块
+"""

package/utils/session.py

@@ -223,10 +223,30 @@ def list_active_sessions() -> List[dict]:
                 import datetime
                 try:
                     mtime = pid_file.stat().st_mtime
-                    start_time = datetime.datetime.fromtimestamp(mtime).strftime("%H:%M")
+                    start_time = datetime.datetime.fromtimestamp(mtime).strftime("%m-%d %H:%M")
                 except OSError:
                     mtime = 0
                     start_time = "?"
+
+                # 读取 .mq 文件获取 cli_type（避免循环导入，在函数内导入）
+                try:
+                    import sys
+                    from pathlib import Path
+                    import logging
+                    project_root = str(Path(__file__).parent.parent)
+                    if project_root not in sys.path:
+                        sys.path.insert(0, project_root)
+                    from server.shared_state import SharedStateReader
+                    reader = SharedStateReader(session_name)
+                    snapshot = reader.read()
+                    cli_type = snapshot.get("cli_type", "claude")
+                except Exception as e:
+                    # 添加详细日志记录，便于诊断问题
+                    import logging
+                    logger = logging.getLogger('Session')
+                    logger.warning(f"读取共享内存 cli_type 失败: session={session_name}, error={e}")
+                    cli_type = "claude"  # 读取失败时使用默认值
+
                 sessions.append({
                     "name": session_name,
                     "socket": str(sock_file),
@@ -234,7 +254,8 @@ def list_active_sessions() -> List[dict]:
                     "cwd": cwd or "",
                     "start_time": start_time,
                     "mtime": mtime,
-                    "tmux": tmux_session_exists(session_name)
+                    "tmux": tmux_session_exists(session_name),
+                    "cli_type": cli_type
                 })
             except (ProcessLookupError, ValueError, OSError):
                 # 进程不存在或文件被并发清理，清理残留文件