@agentunion/kite 1.0.7 → 1.2.0

package/main.py

@@ -2,14 +2,16 @@
 Kite development entry point.
 Loads .env, sets KITE_* defaults, parses --debug, starts Launcher.
 """
-import atexit
 import builtins
+import json
 import os
+import re
 import secrets
 import sys
 import threading
 import time
-from datetime import datetime
+import traceback
+from datetime import datetime, timezone
 
 # ── Timestamped print with delta + color ──
 # Covers the entire Launcher process. Child processes (registry, event_hub) are
@@ -17,23 +19,35 @@ from datetime import datetime
 # → print(), so timestamps & deltas are added at the relay point automatically.
 
 _builtin_print = builtins.print
+_start_ts = time.monotonic()
 _last_ts = time.monotonic()
+_first_line = True
+_module_last_ts: dict[str, float] = {}  # module_name -> last print timestamp
 
-# ANSI escape codes
-_DIM   = "\033[90m"   # gray  — fast, normal
-_GREEN = "\033[32m"   # green — noticeable but expected (subprocess launch, network wait)
-_RED   = "\033[91m"   # red   — abnormally slow, likely a problem
-_RESET = "\033[0m"
+# Regex to extract [module_name] prefix from print text
+_MODULE_PREFIX_RE = re.compile(r"^\[([a-z_]+)\]")
 
-# ── Log file handles ──
-# Initialized lazily after KITE_MODULE_DATA is resolved (see _init_log_files)
+# ANSI escape codes
+_DIM    = "\033[90m"        # gray
+_GREEN  = "\033[32m"        # green
+_RED    = "\033[91m"        # red
+_ORANGE = "\033[38;5;208m"  # orange — first line highlight
+_RESET  = "\033[0m"
+
+# ── Log file paths ──
+# Initialized lazily after KITE_MODULE_DATA is resolved (see _init_log_files).
+# We store paths (not handles) and open/write/close on each log line to avoid
+# holding file handles for the entire process lifetime.
 _log_lock = threading.Lock()
-_log_latest = None    # file handle: latest.log (cleared each startup)
-_log_daily = None     # file handle: {YYYY-MM}/{YYYY-MM-DD}.log (append)
-_log_daily_date = ""  # current date string to detect day rollover
+_log_latest_path = None   # path to latest.log
+_log_daily_path = None    # path to {YYYY-MM}/{YYYY-MM-DD}.log
+_log_daily_date = ""      # current date string to detect day rollover
+_log_dir = None           # base log directory
+
+# Crash log paths
+_crash_log_path = None    # path to crashes.jsonl (current run)
 
 # Strip ANSI escape sequences for plain-text log files
-import re
 _ANSI_RE = re.compile(r"\033\[[0-9;]*m")
 
 def _strip_ansi(s: str) -> str:
@@ -41,123 +55,238 @@ def _strip_ansi(s: str) -> str:
 
 
 def _init_log_files():
-    """Initialize log file handles. Called after KITE_MODULE_DATA is set."""
-    global _log_latest, _log_daily, _log_daily_date
+    """Initialize log file paths. Called after KITE_MODULE_DATA is set."""
+    global _log_latest_path, _log_dir, _crash_log_path
     module_data = os.environ.get("KITE_MODULE_DATA")
     if not module_data:
         return
-    log_dir = os.path.join(module_data, "log")
-    os.makedirs(log_dir, exist_ok=True)
+    _log_dir = os.path.join(module_data, "log")
+    os.makedirs(_log_dir, exist_ok=True)
+
+    suffix = os.environ.get("KITE_INSTANCE_SUFFIX", "")
 
-    # latest.log — truncate on each startup
+    # latest.log — truncate on each startup (write empty to clear)
+    _log_latest_path = os.path.join(_log_dir, f"latest{suffix}.log")
     try:
-        _log_latest = open(os.path.join(log_dir, "latest.log"), "w", encoding="utf-8")
+        with open(_log_latest_path, "w", encoding="utf-8") as f:
+            pass  # truncate
     except Exception as e:
-        _builtin_print(f"[launcher] 警告: 无法打开 latest.log: {e}")
+        _builtin_print(f"[launcher] 警告: 无法初始化 {os.path.basename(_log_latest_path)}: {e}")
+        _log_latest_path = None
 
-    # daily log — append
-    _open_daily_log(log_dir)
+    # crashes.jsonl — truncate on each startup
+    _crash_log_path = os.path.join(_log_dir, f"crashes{suffix}.jsonl")
+    try:
+        with open(_crash_log_path, "w", encoding="utf-8") as f:
+            pass  # truncate
+    except Exception:
+        _crash_log_path = None
+
+    # daily log — ensure directory exists
+    _resolve_daily_log_path()
 
 
-def _open_daily_log(log_dir: str = None):
-    """Open (or rotate) the daily log file based on current date."""
-    global _log_daily, _log_daily_date
+def _resolve_daily_log_path():
+    """Resolve the daily log file path based on current date."""
+    global _log_daily_path, _log_daily_date
+    if not _log_dir:
+        return
     today = datetime.now().strftime("%Y-%m-%d")
-    if today == _log_daily_date and _log_daily:
+    if today == _log_daily_date and _log_daily_path:
         return
-    if _log_daily:
-        try:
-            _log_daily.close()
-        except Exception:
-            pass
-    if not log_dir:
-        module_data = os.environ.get("KITE_MODULE_DATA")
-        if not module_data:
-            return
-        log_dir = os.path.join(module_data, "log")
-    month_dir = os.path.join(log_dir, today[:7])  # YYYY-MM
+    month_dir = os.path.join(_log_dir, today[:7])  # YYYY-MM
     os.makedirs(month_dir, exist_ok=True)
-    try:
-        _log_daily = open(os.path.join(month_dir, f"{today}.log"), "a", encoding="utf-8")
-        _log_daily_date = today
-    except Exception as e:
-        _builtin_print(f"[launcher] 警告: 无法打开每日日志: {e}")
+    _log_daily_path = os.path.join(month_dir, f"{today}.log")
+    _log_daily_date = today
 
 
 def _write_log(plain_line: str):
-    """Write a plain-text line to both latest.log and daily log."""
-    global _log_daily
+    """Write a plain-text line to both latest.log and daily log (open-write-close)."""
     with _log_lock:
-        if _log_latest:
+        if _log_latest_path:
             try:
-                _log_latest.write(plain_line)
-                _log_latest.flush()
+                with open(_log_latest_path, "a", encoding="utf-8") as f:
+                    f.write(plain_line)
             except Exception:
                 pass
         # Check daily rotation
-        today = datetime.now().strftime("%Y-%m-%d")
-        if today != _log_daily_date:
-            _open_daily_log()
-        if _log_daily:
+        _resolve_daily_log_path()
+        if _log_daily_path:
             try:
-                _log_daily.write(plain_line)
-                _log_daily.flush()
+                with open(_log_daily_path, "a", encoding="utf-8") as f:
+                    f.write(plain_line)
             except Exception:
                 pass
 
 
-def _close_log_files():
-    """Flush and close log files on exit."""
-    global _log_latest, _log_daily
-    for f in (_log_latest, _log_daily):
-        if f:
-            try:
-                f.flush()
-                f.close()
-            except Exception:
-                pass
-    _log_latest = None
-    _log_daily = None
+def _write_crash(exc_type, exc_value, exc_tb,
+                 thread_name=None, severity="critical", handled=False):
+    """Write crash record to crashes.jsonl + daily archive."""
+    record = {
+        "timestamp": datetime.now(timezone.utc).isoformat(),
+        "module": "launcher",
+        "thread": thread_name or threading.current_thread().name,
+        "exception_type": exc_type.__name__ if exc_type else "Unknown",
+        "exception_message": str(exc_value),
+        "traceback": "".join(traceback.format_exception(exc_type, exc_value, exc_tb)),
+        "severity": severity,
+        "handled": handled,
+        "process_id": os.getpid(),
+        "platform": sys.platform,
+        "runtime_version": f"Python {sys.version.split()[0]}",
+    }
+
+    if exc_tb:
+        tb_entries = traceback.extract_tb(exc_tb)
+        if tb_entries:
+            last = tb_entries[-1]
+            record["context"] = {
+                "function": last.name,
+                "file": os.path.basename(last.filename),
+                "line": last.lineno,
+            }
+
+    line = json.dumps(record, ensure_ascii=False) + "\n"
+
+    # 1. Write to crashes.jsonl (current run)
+    if _crash_log_path:
+        try:
+            with open(_crash_log_path, "a", encoding="utf-8") as f:
+                f.write(line)
+        except Exception:
+            pass
+
+    # 2. Write to daily archive
+    if _log_dir:
+        try:
+            today = datetime.now().strftime("%Y-%m-%d")
+            archive_dir = os.path.join(_log_dir, "crashes", today[:7])
+            os.makedirs(archive_dir, exist_ok=True)
+            archive_path = os.path.join(archive_dir, f"{today}.jsonl")
+            with open(archive_path, "a", encoding="utf-8") as f:
+                f.write(line)
+        except Exception:
+            pass
+
+
+def _print_crash_summary(exc_type, exc_tb, thread_name=None):
+    """Print crash summary to console (red highlight)."""
+    if exc_tb:
+        tb_entries = traceback.extract_tb(exc_tb)
+        if tb_entries:
+            last = tb_entries[-1]
+            location = f"{os.path.basename(last.filename)}:{last.lineno}"
+        else:
+            location = "unknown"
+    else:
+        location = "unknown"
+
+    prefix = "[launcher]"
+    if thread_name:
+        print(f"{prefix} {_RED}线程 {thread_name} 崩溃: "
+              f"{exc_type.__name__} in {location}{_RESET}")
+    else:
+        print(f"{prefix} {_RED}崩溃: {exc_type.__name__} in {location}{_RESET}")
+    if _crash_log_path:
+        print(f"{prefix} 崩溃日志: {_crash_log_path}")
+
+
+def _setup_exception_hooks():
+    """Set up global exception hooks for launcher process."""
+    _orig_excepthook = sys.excepthook
+
+    def _excepthook(exc_type, exc_value, exc_tb):
+        _write_crash(exc_type, exc_value, exc_tb, severity="critical", handled=False)
+        _print_crash_summary(exc_type, exc_tb)
+        _orig_excepthook(exc_type, exc_value, exc_tb)
+
+    sys.excepthook = _excepthook
+
+    if hasattr(threading, "excepthook"):
+        def _thread_excepthook(args):
+            _write_crash(args.exc_type, args.exc_value, args.exc_traceback,
+                        thread_name=args.thread.name if args.thread else "unknown",
+                        severity="error", handled=False)
+            _print_crash_summary(args.exc_type, args.exc_traceback,
+                                thread_name=args.thread.name if args.thread else None)
+
+        threading.excepthook = _thread_excepthook
 
-atexit.register(_close_log_files)
 
 
 def _tprint(*args, **kwargs):
-    global _last_ts
+    global _last_ts, _first_line
     now = time.monotonic()
-    delta = now - _last_ts
-    _last_ts = now
+    elapsed = now - _start_ts
 
     # Timestamp
     ts = datetime.now().strftime("%H:%M:%S.%f")[:-3]
 
+    # Format elapsed string (time since startup)
+    if elapsed < 1:
+        elapsed_str = f"{elapsed * 1000:.0f}ms"
+    elif elapsed < 100:
+        elapsed_str = f"{elapsed:.1f}s"
+    else:
+        elapsed_str = f"{elapsed:.0f}s"
+
+    # Extract module prefix from text for per-module delta tracking
+    text_for_module = " ".join(str(a) for a in args) if args else ""
+    plain_text = _ANSI_RE.sub("", text_for_module).strip()
+    m = _MODULE_PREFIX_RE.match(plain_text)
+    module_name = m.group(1) if m else None
+
+    if module_name:
+        # Per-module delta: interval since this module's last print
+        if module_name in _module_last_ts:
+            delta = now - _module_last_ts[module_name]
+        else:
+            delta = None  # first line for this module — no delta
+        _module_last_ts[module_name] = now
+    else:
+        # Fallback: global last-line delta
+        delta = now - _last_ts
+    _last_ts = now
+
     # Format delta string
-    if delta < 1:
+    if delta is None:
+        delta_str = ""
+        delta_color = _DIM
+    elif delta < 1:
         delta_str = f"+{delta * 1000:.0f}ms"
     elif delta < 100:
         delta_str = f"+{delta:.1f}s"
     else:
         delta_str = f"+{delta:.0f}s"
 
-    # Color: gray < 1s, green 1–5s, red > 5s
-    if delta >= 5:
-        color = _RED
-    elif delta >= 1:
-        color = _GREEN
+    # Color for delta: gray < 1s, green 1–5s, red > 5s
+    if delta is not None:
+        if delta >= 5:
+            delta_color = _RED
+        elif delta >= 1:
+            delta_color = _GREEN
+        else:
+            delta_color = _DIM
+
+    # First line: entire line in orange
+    if _first_line:
+        _first_line = False
+        prefix = f"{_ORANGE}[{elapsed_str:>6}] {ts} {delta_str:>8} "
+        _builtin_print(prefix, end="")
+        _builtin_print(*args, end="", **{k: v for k, v in kwargs.items() if k != "end"})
+        _builtin_print(_RESET, end=kwargs.get("end", "\n"))
     else:
-        color = _DIM
-
-    prefix = f"{ts} {color}{delta_str:>8}{_RESET} "
-    _builtin_print(prefix, end="")
-    _builtin_print(*args, **kwargs)
+        prefix = f"[{elapsed_str:>6}] {ts} {delta_color}{delta_str:>8}{_RESET} "
+        _builtin_print(prefix, end="")
+        _builtin_print(*args, **kwargs)
 
     # Write to log files (plain text, no ANSI)
-    if _log_latest or _log_daily:
+    if _log_latest_path or _log_daily_path:
         sep = kwargs.get("sep", " ")
         end = kwargs.get("end", "\n")
         text = sep.join(str(a) for a in args)
-        plain_prefix = f"{ts} {delta_str:>8} "
-        _write_log(plain_prefix + text + end)
+        plain_prefix = f"[{elapsed_str:>6}] {ts} {delta_str:>8} "
+        _write_log(plain_prefix + _strip_ansi(text) + end)
 
 builtins.print = _tprint
 
@@ -197,20 +326,31 @@ if "--debug" in sys.argv:
 # Ensure project root is on sys.path
 sys.path.insert(0, os.environ["KITE_PROJECT"])
 
+_builtin_print("[launcher] 正在加载模块...")
 from core.launcher.entry import Launcher
 
 
 def main():
+    # Reset timing baseline to exclude import overhead
+    global _start_ts, _last_ts
+    _start_ts = time.monotonic()
+    _last_ts = time.monotonic()
+
     token = secrets.token_hex(32)
-    print(f"[main] KITE_TOKEN 已生成 ({len(token)} 字符)")
-    env = os.environ.get("KITE_ENV", "development")
-    debug = os.environ.get("KITE_DEBUG") == "1"
-    print(f"[main] 环境={env}, 调试={debug}, 项目={os.environ['KITE_PROJECT']}")
     launcher = Launcher(kite_token=token)
-    # KITE_MODULE_DATA is now set — initialize log files
+    # KITE_MODULE_DATA is now set by constructor — initialize log files
     _init_log_files()
-    print(f"[main] 日志文件已初始化: {os.environ.get('KITE_MODULE_DATA', '')}/log/")
-    launcher.run()
+    _setup_exception_hooks()
+    # First lines in both console AND log file
+    print("[launcher] Kite 启动中...")
+    log_dir = os.path.join(os.environ.get("KITE_MODULE_DATA", ""), "log")
+    print(f"[launcher] 日志: {log_dir}")
+    try:
+        launcher.run()
+    except Exception as e:
+        _write_crash(type(e), e, e.__traceback__, severity="critical", handled=True)
+        _print_crash_summary(type(e), e.__traceback__)
+        sys.exit(1)
 
 
 if __name__ == "__main__":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentunion/kite",
-  "version": "1.0.7",
+  "version": "1.2.0",
   "description": "Kite framework launcher — start Kite from anywhere",
   "bin": {
     "kite": "./cli.js"