@agentunion/kite 1.0.6 → 1.2.0

package/core/launcher/entry.py

@@ -4,8 +4,16 @@ Launcher — the core of Kite. Manages module lifecycle, exposes API, monitors p
 Thread model:
 - Main thread: asyncio event loop (process management + monitor loop)
 - API thread: independent thread running uvicorn + FastAPI
-- stdout threads: one daemon thread per child process
+- stdout threads: one daemon thread per child process (ProcessManager)
 - (Windows) keyboard listener thread: polls for 'q' key
+
+4-Phase startup:
+  Phase 1: Registry + Event Hub (parallel start) → Registry stdout port → stdin broadcast port to Event Hub
+           → API → register self + tokens → stdin launcher_ws_token to Event Hub
+           → stdout ws_endpoint → WS connect → module.ready
+  Phase 2: (reserved — Event Hub ready handled in Phase 1)
+  Phase 3: Registry delayed ready (Event Hub → Registry → Event Hub WS → module.ready)
+  Phase 4: start remaining enabled modules in topo order
 """
 
 import asyncio
@@ -22,25 +30,43 @@ import httpx
 import uvicorn
 import websockets
 from fastapi import FastAPI, HTTPException
-from fastapi.responses import JSONResponse
 
-from .module_scanner import ModuleScanner, ModuleInfo, _parse_frontmatter
+from .module_scanner import ModuleScanner, ModuleInfo, LaunchConfig, _parse_frontmatter
 from .process_manager import ProcessManager
-from core.data_dir import get_launcher_data_dir
 
 IS_WINDOWS = sys.platform == "win32"
 
+# Shutdown timeout constants (seconds)
+SHUTDOWN_TIMEOUT_NON_GRACEFUL = 5  # Non-graceful modules or no ack response
+SHUTDOWN_TIMEOUT_PARTIAL = 3       # Graceful module ack'd but no ready
+SHUTDOWN_TIMEOUT_READY = 1         # Graceful module sent ready (cleanup done)
+SHUTDOWN_TIMEOUT_BULK = 3          # Bulk stop_all() safety net
+
+# Core module names that are started in Phase 1-2 (not Phase 4)
+CORE_MODULE_NAMES = {"registry", "event_hub"}
+
+WATCHDOG_MODULE_NAME = "watchdog"
+
 
 class Launcher:
     """Kite system entry point. Starts Registry, manages modules, exposes API."""
 
     def __init__(self, kite_token: str):
         self.kite_token = kite_token
-        self.project_root = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
         self.instance_id = str(os.getpid())
-        self.process_manager = ProcessManager(self.project_root, kite_token, self.instance_id)
+        os.environ["KITE_INSTANCE"] = self.instance_id
+
+        # Resolve instance workspace (must happen before ProcessManager init)
+        self._resolve_instance_dir()
+        os.environ["KITE_MODULE_DATA"] = os.path.join(
+            os.environ["KITE_INSTANCE_DIR"], "launcher",
+        )
+
+        self.process_manager = ProcessManager(
+            kite_token, self.instance_id,
+            on_kite_message=self._on_kite_message,
+        )
         self.module_scanner = ModuleScanner(
-            self.project_root,
             discovery=self._load_discovery(),
         )
 
@@ -49,36 +75,158 @@ class Launcher:
         self.modules: dict[str, ModuleInfo] = {}
         self._shutdown_event = asyncio.Event()
         self._thread_shutdown = threading.Event()
+        self._shutdown_complete = threading.Event()  # Set when normal shutdown finishes
         self._api_server: uvicorn.Server | None = None
         self._api_ready = threading.Event()
-        self._fail_counts: dict[str, int] = {}  # module_name -> consecutive failure count
         self._module_tokens: dict[str, str] = {}  # module_name -> per-module token
 
         # Three-layer state model: desired_state per module
-        # Initialized from config_state: enabled→running, manual→stopped, disabled→stopped
         self._desired_states: dict[str, str] = {}  # module_name -> "running" | "stopped"
 
         # Event Hub WebSocket client
         self._event_hub_ws_url: str = ""
+        self._launcher_ws_token: str = ""
         self._ws: object | None = None
         self._ws_task: asyncio.Task | None = None
         self._loop: asyncio.AbstractEventLoop | None = None
 
         # Event waiters: {event_key: (asyncio.Event, data_dict)}
-        # event_key format: "event_type:module_id"
         self._event_waiters: dict[str, tuple[asyncio.Event, dict]] = {}
 
-        self._lifecycle_log = os.path.join(
-            get_launcher_data_dir(), "lifecycle.jsonl",
-        )
+        # Module ready times: module_name -> seconds from start to ready
+        self._ready_times: dict[str, float] = {}
+
+        # Shared HTTP client for Registry communication (lazy-init, reuses TCP connections)
+        self._http: httpx.AsyncClient | None = None
+
+        # Module exit reasons: module_name -> reason string (for modules that sent module.exiting)
+        self._exit_reasons: dict[str, str] = {}
+
+        # Graceful shutdown capability: module_name -> True if module declared support
+        # Registry and Event Hub default to True (they start before Watchdog can observe)
+        self._graceful_modules: dict[str, bool] = {"registry": True, "event_hub": True}
+
+        # System-wide shutdown flag: prevents Watchdog restart during shutdown
+        self._system_shutting_down = False
+
+        # Kite stdout message waiters: {waiter_key: (threading.Event, data_dict)}
+        # Used by ProcessManager stdout callback (cross-thread)
+        self._msg_waiters: dict[str, tuple[threading.Event, dict]] = {}
+
+        suffix = self.process_manager.instance_suffix
+        state_dir = os.path.join(os.environ["KITE_INSTANCE_DIR"], "launcher", "state")
+        os.makedirs(state_dir, exist_ok=True)
+        self._lifecycle_log = os.path.join(state_dir, f"lifecycle{suffix}.jsonl")
+        # Clear lifecycle log on startup (like latest.log)
+        try:
+            with open(self._lifecycle_log, "w", encoding="utf-8") as f:
+                pass
+        except Exception:
+            pass
+        os.environ["KITE_INSTANCE_SUFFIX"] = suffix
         self._app = self._create_api_app()
 
+    @staticmethod
+    def _fmt_elapsed(seconds: float) -> str:
+        """Format elapsed seconds: <1s → 'NNNms', >=1s → 'N.Ns', >=10s → 'NNs'."""
+        if seconds < 1:
+            return f"{seconds * 1000:.0f}ms"
+        if seconds < 10:
+            return f"{seconds:.1f}s"
+        return f"{seconds:.0f}s"
+
+    # ── Instance workspace resolution ──
+
+    @staticmethod
+    def _resolve_instance_dir():
+        """Resolve KITE_INSTANCE_DIR from KITE_WORKSPACE + KITE_CWD.
+        Algorithm: take CWD basename, find matching dir in workspace via .cwd file,
+        or create new one. Sets KITE_INSTANCE_DIR env var.
+        """
+        if os.environ.get("KITE_INSTANCE_DIR"):
+            return  # already set (e.g. by tests or parent)
+
+        cwd = os.environ.get("KITE_CWD", os.getcwd())
+        workspace = os.environ.get("KITE_WORKSPACE", "")
+        if not workspace:
+            home = os.environ.get("HOME") or os.environ.get("USERPROFILE") or os.path.expanduser("~")
+            workspace = os.path.join(home, ".kite", "workspace")
+            os.environ["KITE_WORKSPACE"] = workspace
+
+        basename = os.path.basename(cwd.rstrip(os.sep)) or "default"
+        suffix = 0
+
+        while True:
+            name = basename if suffix == 0 else f"{basename}~{suffix}"
+            candidate = os.path.join(workspace, name)
+            cwd_file = os.path.join(candidate, ".cwd")
+
+            if not os.path.exists(candidate):
+                # Empty slot — create new workspace
+                os.makedirs(candidate, exist_ok=True)
+                with open(cwd_file, "w", encoding="utf-8") as f:
+                    f.write(cwd)
+                os.environ["KITE_INSTANCE_DIR"] = candidate
+                return
+
+            if os.path.isfile(cwd_file):
+                try:
+                    with open(cwd_file, "r", encoding="utf-8") as f:
+                        if f.read().strip() == cwd:
+                            os.environ["KITE_INSTANCE_DIR"] = candidate
+                            return
+                except Exception:
+                    pass
+
+            suffix += 1
+
+    # ── Kite stdout message callback ──
+
+    def _on_kite_message(self, module_name: str, msg: dict):
+        """Called by ProcessManager stdout reader thread when a kite message is detected.
+        Thread-safe: only touches _msg_waiters (dict + threading.Event).
+        """
+        kite_type = msg.get("kite", "")
+        key = f"{module_name}:{kite_type}"
+        waiter = self._msg_waiters.get(key)
+        if waiter:
+            waiter[1].update(msg)
+            waiter[0].set()
+
+    async def _wait_kite_message(self, module_name: str, kite_type: str,
+                                  timeout: float) -> dict | None:
+        """Wait for a kite stdout message from a module. Returns msg dict or None on timeout.
+        Checks shutdown flag every 0.5s so Ctrl+C is responsive even during Phase 1-2 waits.
+        """
+        key = f"{module_name}:{kite_type}"
+        evt = threading.Event()
+        data = {}
+        self._msg_waiters[key] = (evt, data)
+        shutdown = self._thread_shutdown
+        try:
+            def _wait():
+                deadline = time.monotonic() + timeout
+                while time.monotonic() < deadline:
+                    if evt.wait(timeout=0.5):
+                        return True
+                    if shutdown.is_set():
+                        return False
+                return False
+            got = await asyncio.get_running_loop().run_in_executor(None, _wait)
+            return data if got else None
+        finally:
+            self._msg_waiters.pop(key, None)
+
     # ── Public entry ──
 
     def run(self):
         """Synchronous entry point. Sets up signals, runs the async main loop."""
-        print("[launcher] Kite starting...")
-        print(f"[launcher] Project root: {self.project_root}")
+        print("[launcher] ── 环境 ──")
+        for key in sorted(k for k in os.environ if k.startswith("KITE_")):
+            print(f"[launcher]   {key} = {os.environ[key]}")
+        print(f"[launcher]   PID = {os.getpid()}")
+        print(f"[launcher]   PYTHON = {sys.executable}")
+        print(f"[launcher]   PLATFORM = {sys.platform}")
 
         if IS_WINDOWS:
             self._setup_windows_exit()
@@ -89,116 +237,505 @@ class Launcher:
             asyncio.run(self._async_main())
         except KeyboardInterrupt:
             pass
+        except RuntimeError as e:
+            print(f"[launcher] 启动失败: {e}")
         finally:
             self._final_cleanup()
 
+    def _request_shutdown(self, reason: str = ""):
+        """Request graceful shutdown. Thread-safe — can be called from signal handler or any thread."""
+        if self._thread_shutdown.is_set():
+            return  # already shutting down
+        print(f"[launcher] {reason or '收到关闭请求'}")
+        self._thread_shutdown.set()
+        # Wake up asyncio event loop immediately (so _monitor_loop / wait_for exits)
+        loop = self._loop
+        if loop and not loop.is_closed():
+            try:
+                loop.call_soon_threadsafe(self._shutdown_event.set)
+            except RuntimeError:
+                pass
+        # Safety net: force exit after 10s only if normal shutdown hasn't completed
+        def _force():
+            if self._shutdown_complete.wait(timeout=10):
+                return  # Normal shutdown completed — no need to force
+            try:
+                pm = self.process_manager
+                still = [n for n in pm._processes if pm.is_running(n)]
+            except Exception:
+                still = []
+            if still:
+                print(f"[launcher] 关闭超时，以下模块仍在运行: {', '.join(still)}，强制退出")
+            else:
+                print("[launcher] 关闭超时，强制退出")
+            os._exit(1)
+        threading.Thread(target=_force, daemon=True).start()
+
     def _setup_unix_signals(self):
         """Register SIGTERM/SIGINT handlers on Linux/macOS."""
         def _handler(signum, frame):
-            print(f"\n[launcher] Received signal {signum}, shutting down...")
-            self._thread_shutdown.set()
+            self._request_shutdown(f"收到信号 {signum}，正在关闭...")
         signal.signal(signal.SIGTERM, _handler)
         signal.signal(signal.SIGINT, _handler)
 
     def _setup_windows_exit(self):
-        """Start a daemon thread that listens for 'q' or Ctrl+C on Windows."""
+        """SetConsoleCtrlHandler for Ctrl+C + daemon thread for 'q' key.
+
+        Why not signal.signal(SIGINT)?
+        Python's signal delivery requires the main thread to be executing bytecode.
+        When the main thread is blocked in C code (asyncio ProactorEventLoop →
+        GetQueuedCompletionStatus), SIGINT is never delivered.
+        SetConsoleCtrlHandler runs its callback in a separate OS thread, so it
+        always works regardless of what the main thread is doing.
+        """
+        import ctypes
+
+        @ctypes.WINFUNCTYPE(ctypes.c_int, ctypes.c_uint)
+        def _ctrl_handler(ctrl_type):
+            if ctrl_type in (0, 1):  # CTRL_C_EVENT, CTRL_BREAK_EVENT
+                self._request_shutdown("收到 Ctrl+C，正在关闭...")
+                return 1  # handled — prevent default (which kills the process)
+            return 0
+
+        # prevent GC of the C callback
+        self._ctrl_handler_ref = _ctrl_handler
+        ctypes.windll.kernel32.SetConsoleCtrlHandler(_ctrl_handler, 1)
+
+        # 'q' key: handle via msvcrt polling
         def _listen():
             import msvcrt
             while not self._thread_shutdown.is_set():
                 if msvcrt.kbhit():
                     ch = msvcrt.getch()
-                    if ch in (b'q', b'Q', b'\x03'):  # q or Ctrl+C
-                        print("\n[launcher] Exit requested, shutting down...")
-                        self._thread_shutdown.set()
+                    if ch in (b'q', b'Q'):
+                        self._request_shutdown("收到退出请求，正在关闭...")
                         return
                 time.sleep(0.1)
-        t = threading.Thread(target=_listen, daemon=True)
-        t.start()
+        threading.Thread(target=_listen, daemon=True).start()
 
-    # ── Async main ──
+    # ── Async main (4-Phase startup) ──
 
     async def _async_main(self):
-        """Full startup sequence, then monitor loop."""
+        """Full 4-phase startup sequence, then monitor loop."""
         self._loop = asyncio.get_running_loop()
+        t_start = time.monotonic()
+        self._start_unix = time.time()
+        phase_times = {}
+        G = "\033[32m"
+        R = "\033[0m"
+
+        # Validate core modules exist (mechanism 12)
+        self._validate_core_modules()
+
+        # Cleanup leftovers from previous instances (current instance dir)
+        local_cleaned = self.process_manager.cleanup_leftovers()
+
+        # Cross-directory leftover cleanup (background, non-blocking)
+        # run_in_executor returns a Future (not coroutine), so use ensure_future
+        self._global_cleanup_task = asyncio.ensure_future(
+            asyncio.get_running_loop().run_in_executor(
+                None, self.process_manager.cleanup_global_leftovers
+            )
+        )
 
-        # Step 1: cleanup leftovers
-        self.process_manager.cleanup_leftovers()
+        try:
+            # Phase 1+2: Registry + Event Hub parallel bootstrap
+            t0 = time.monotonic()
+            await self._phase1_parallel_bootstrap()
+            elapsed_p1 = time.monotonic() - t0
+            phase_times["Phase 1+2: Registry + Event Hub (并行)"] = elapsed_p1
+            print(f"{G}[launcher] ✓ Phase 1+2 完成: Registry + Event Hub 已就绪 ({elapsed_p1:.2f}s){R}")
+            if self._shutdown_event.is_set(): return
+
+            # Phase 3: Wait for Registry delayed ready
+            t0 = time.monotonic()
+            await self._phase3_registry_ready()
+            elapsed = time.monotonic() - t0
+            phase_times["Phase 3: Registry 事件总线"] = elapsed
+            print(f"{G}[launcher] ✓ Phase 3 完成: Registry 已连接事件总线 ({elapsed:.2f}s){R}")
+            if self._shutdown_event.is_set(): return
+
+            # Initialize desired_state from config_state (needed before Phase 3.5)
+            for name, info in self.modules.items():
+                if info.state == "enabled":
+                    self._desired_states[name] = "running"
+                else:  # manual, disabled
+                    self._desired_states[name] = "stopped"
+            # Core modules are already running
+            for cn in CORE_MODULE_NAMES:
+                self._desired_states[cn] = "running"
+
+            # Phase 3.5: Watchdog ready
+            # If started in parallel (Phase 1), just wait for module.ready
+            # Otherwise start it now (fallback)
+            watchdog_info = self.modules.get(WATCHDOG_MODULE_NAME)
+            if watchdog_info and self._desired_states.get(WATCHDOG_MODULE_NAME) == "running":
+                t0 = time.monotonic()
+                if getattr(self, '_watchdog_parallel', False):
+                    print(f"[launcher] Phase 3.5: Watchdog 已并行启动，等待就绪...")
+                    ready = await self._wait_event("module.ready", "watchdog", timeout=15)
+                    elapsed = time.monotonic() - t0
+                    if ready and not ready.get("_exited"):
+                        self._graceful_modules["watchdog"] = bool(ready.get("graceful_shutdown"))
+                        self._ready_times["watchdog"] = elapsed
+                        print(f"[launcher] Watchdog 已就绪")
+                        self._log_lifecycle("started", "watchdog")
+                        await self._publish_event("module.started", {"module_id": "watchdog"})
+                        self.process_manager.close_stdio("watchdog")
+                    else:
+                        print(f"[launcher] 警告: Watchdog 在 15s 内未就绪")
+                else:
+                    print(f"[launcher] Phase 3.5: 启动 Watchdog...")
+                    await self._start_one_module(watchdog_info)
+                    elapsed = time.monotonic() - t0
+                print(f"{G}[launcher] ✓ Phase 3.5 完成: Watchdog ({elapsed:.2f}s){R}")
+                if self._shutdown_event.is_set(): return
+
+            # Phase 4: Start remaining enabled modules
+            t0 = time.monotonic()
+            await self._phase4_start_modules()
+            elapsed = time.monotonic() - t0
+            phase_times["Phase 4: Extensions"] = elapsed
+            print(f"{G}[launcher] ✓ Phase 4 完成: 扩展模块已启动 ({elapsed:.2f}s){R}")
+            if self._shutdown_event.is_set(): return
+
+            # Post-startup
+            self.process_manager.persist_records()
+            self._heartbeat_task = asyncio.create_task(self._heartbeat_loop())
 
-        # Step 2: start Registry
-        await self._start_registry()
+            # Wait for global leftover cleanup to finish (non-blocking with timeout)
+            global_cleaned = {}
+            if hasattr(self, '_global_cleanup_task'):
+                try:
+                    global_cleaned = await asyncio.wait_for(self._global_cleanup_task, timeout=5) or {}
+                except asyncio.TimeoutError:
+                    print("[launcher] 警告: 全局遗留清理超时 (5s)，跳过")
+                except Exception as e:
+                    print(f"[launcher] 警告: 全局遗留清理出错: {e}")
+            # Merge local + global cleanup stats
+            cleaned_stats: dict[str, int] = {}
+            for d in (local_cleaned, global_cleaned):
+                for k, v in d.items():
+                    cleaned_stats[k] = cleaned_stats.get(k, 0) + v
+
+            # Global instance scan (via executor to avoid blocking)
+            global_instances = await asyncio.get_running_loop().run_in_executor(
+                None, self.process_manager.get_global_instances
+            )
+
+            # ── Startup report ──
+            total_time = time.monotonic() - t_start
+            await self._print_startup_report(total_time, phase_times,
+                                             global_instances=global_instances,
+                                             cleaned_stats=cleaned_stats)
+            # Notify all modules that system startup is complete
+            await self._publish_event("system.ready", {
+                "startup_time": round(total_time, 2),
+            })
 
-        # Step 3: start Launcher API in a separate thread
-        self._start_api_thread()
+            print("[launcher] 进入监控循环 (按 Ctrl+C 或 'q' 退出)")
+            await self._monitor_loop()
+        finally:
+            try:
+                await self._graceful_shutdown_all()
+            except Exception as e:
+                print(f"[launcher] 优雅关闭出错: {e}")
 
-        # Step 4: register Launcher to Registry
-        await self._register_self()
+    # ── Phase 1+2: Parallel bootstrap (Registry + Event Hub) ──
 
-        # Step 5: scan modules
-        self.modules = self.module_scanner.scan()
-        for name, info in self.modules.items():
-            self._log_lifecycle("scanned", name, state=info.state, module_dir=info.module_dir)
-        print(f"[launcher] Found {len(self.modules)} module(s): {', '.join(self.modules.keys()) or '(none)'}")
+    async def _phase1_parallel_bootstrap(self):
+        """Start Registry + Event Hub processes in parallel to overlap cold-start time.
 
-        # Step 5.5: initialize desired_state from config_state
-        for name, info in self.modules.items():
-            if info.state == "enabled":
-                self._desired_states[name] = "running"
-            else:  # manual, disabled
-                self._desired_states[name] = "stopped"
+        Flow:
+        1. Start Registry + Event Hub processes simultaneously
+        2. Wait for Registry to report port via stdout
+        3. Set KITE_REGISTRY_PORT env (for Phase 3.5/4 modules) + start API
+        4. Scan modules + register self & tokens (parallel)
+        5. Send launcher_ws_token + registry_port to Event Hub via stdin
+        6. Wait for Event Hub ws_endpoint → WS connect → module.ready
+        """
+        t_registry = time.monotonic()
 
-        # Step 6: generate per-module tokens and register to Registry
-        await self._register_module_tokens()
+        # ── Step 1: Start both processes ──
+        registry_dir = os.path.join(os.environ["KITE_PROJECT"], "core", "registry")
+        registry_info = ModuleInfo(
+            name="registry",
+            display_name="Registry",
+            type="infrastructure",
+            state="enabled",
+            runtime="python",
+            entry="entry.py",
+            module_dir=registry_dir,
+        )
+        boot_info_registry = {"token": self.kite_token}
+        self._log_lifecycle("starting", "registry")
+        ok = self.process_manager.start_module(registry_info, boot_info=boot_info_registry)
+        if not ok:
+            self._log_lifecycle("start_failed", "registry")
+            raise RuntimeError("启动 Registry 失败")
+
+        # Start Event Hub in parallel (before Registry port is known)
+        eh_dir = os.path.join(os.environ["KITE_PROJECT"], "core", "event_hub")
+        eh_info = ModuleInfo(
+            name="event_hub",
+            display_name="Event Hub",
+            type="infrastructure",
+            state="enabled",
+            runtime="python",
+            entry="entry.py",
+            module_dir=eh_dir,
+        )
+        # Generate Event Hub token early (will register to Registry once it's up)
+        eh_token = secrets.token_hex(32)
+        self._module_tokens["event_hub"] = eh_token
+        boot_info_eh = {"token": eh_token}
+        self._log_lifecycle("starting", "event_hub")
+        ok = self.process_manager.start_module(eh_info, boot_info=boot_info_eh)
+        if not ok:
+            self._log_lifecycle("start_failed", "event_hub")
+            raise RuntimeError("启动 Event Hub 失败")
+
+        # Start Watchdog in parallel (before Registry port is known)
+        # Watchdog will block on stdin waiting for registry_port
+        watchdog_dir = os.path.join(os.environ["KITE_PROJECT"], "extensions", "services", "watchdog")
+        watchdog_md = os.path.join(watchdog_dir, "module.md")
+        self._watchdog_parallel = False  # track whether watchdog was started in parallel
+        if os.path.isfile(watchdog_md):
+            wd_token = secrets.token_hex(32)
+            self._module_tokens["watchdog"] = wd_token
+            # Parse watchdog module.md for ModuleInfo
+            try:
+                with open(watchdog_md, "r", encoding="utf-8") as f:
+                    wd_fm = _parse_frontmatter(f.read())
+                wd_info = ModuleInfo(
+                    name="watchdog",
+                    display_name=wd_fm.get("display_name", "Watchdog"),
+                    type=wd_fm.get("type", "service"),
+                    state="enabled",
+                    runtime=wd_fm.get("runtime", "python"),
+                    entry=wd_fm.get("entry", "entry.py"),
+                    module_dir=watchdog_dir,
+                )
+                boot_info_wd = {"token": wd_token}
+                self._log_lifecycle("starting", "watchdog")
+                ok = self.process_manager.start_module(wd_info, boot_info=boot_info_wd)
+                if ok:
+                    self._watchdog_parallel = True
+                else:
+                    self._log_lifecycle("start_failed", "watchdog")
+                    print("[launcher] 警告: Watchdog 并行启动失败，将在 Phase 3.5 重试")
+            except Exception as e:
+                print(f"[launcher] 警告: Watchdog module.md 解析失败: {e}")
 
-        # Step 7: start enabled modules
-        await self._start_enabled_modules()
+        parallel_modules = "Registry + Event Hub" + (" + Watchdog" if self._watchdog_parallel else "")
+        print(f"[launcher] {parallel_modules} 进程已同时启动，等待 Registry 端口...")
 
-        # Step 8: persist records
+        # Persist immediately after starting core processes
         self.process_manager.persist_records()
 
-        # Step 9: connect to Event Hub (best-effort, non-blocking)
-        await self._connect_event_hub()
+        # ── Step 2: Wait for Registry port ──
+        msg = await self._wait_kite_message("registry", "port", timeout=6)
+        if not msg or not msg.get("port"):
+            raise RuntimeError("致命错误: Registry 在 6s 内未报告端口")
+        self.registry_port = int(msg["port"])
+        self._ready_times["registry"] = time.monotonic() - t_registry
+        _wait_s = time.monotonic() - t_registry
+        print(f"[launcher] Registry 端口: {self.registry_port} (等待 {self._fmt_elapsed(_wait_s)})")
+
+        # ── Step 3: Set env + start API + immediately unblock Event Hub ──
+        os.environ["KITE_REGISTRY_PORT"] = str(self.registry_port)
+        self._start_api_thread()
 
-        # Step 10: start heartbeat to Registry
-        self._heartbeat_task = asyncio.create_task(self._heartbeat_loop())
+        # Send launcher_ws_token + registry_port to Event Hub ASAP (unblock it)
+        self._launcher_ws_token = secrets.token_hex(32)
+        self.process_manager.write_stdin("event_hub", {
+            "kite": "launcher_ws_token",
+            "launcher_ws_token": self._launcher_ws_token,
+        })
+        self.process_manager.write_stdin("event_hub", {
+            "kite": "registry_port",
+            "registry_port": self.registry_port,
+        })
 
-        # Step 11: monitor loop
-        print("[launcher] Entering monitor loop (press Ctrl+C or 'q' to exit)")
-        await self._monitor_loop()
+        # Send registry_port to Watchdog via stdin (if started in parallel)
+        # Watchdog will retry querying launcher.api_endpoint until it's available
+        if self.process_manager.is_running("watchdog"):
+            self.process_manager.write_stdin("watchdog", {
+                "kite": "registry_port",
+                "registry_port": self.registry_port,
+            })
 
-        # Graceful shutdown all modules before event loop closes
-        await self._graceful_shutdown_all()
+        # ── Step 4: Scan + register tokens ‖ wait for Event Hub ws_endpoint (parallel) ──
+        # Pre-register ws_endpoint waiter BEFORE gather to avoid race condition:
+        # module_scanner.scan() is synchronous and blocks the event loop,
+        # so the _wait_event_hub_endpoint coroutine wouldn't register its waiter in time.
+        ws_waiter_key = "event_hub:ws_endpoint"
+        ws_evt = threading.Event()
+        ws_data: dict = {}
+        self._msg_waiters[ws_waiter_key] = (ws_evt, ws_data)
+
+        async def _scan_and_register_tokens():
+            t_scan = time.monotonic()
+            self.modules = self.module_scanner.scan()
+            for name, info in self.modules.items():
+                self._log_lifecycle("scanned", name, state=info.state, module_dir=info.module_dir)
+            _scan_s = time.monotonic() - t_scan
+            print(f"[launcher] 发现 {len(self.modules)} 个模块: {', '.join(self.modules.keys()) or '(无)'} (扫描 {self._fmt_elapsed(_scan_s)})")
+            t_reg = time.monotonic()
+            await self._register_module_tokens()
+            _reg_s = time.monotonic() - t_reg
+            print(f"[launcher] 令牌注册完成 ({self._fmt_elapsed(_reg_s)})")
+
+        async def _wait_event_hub_endpoint():
+            t_wait_eh = time.monotonic()
+            print("[launcher] 等待 Event Hub ws_endpoint...")
+            shutdown = self._thread_shutdown
+            def _wait():
+                deadline = time.monotonic() + 10
+                while time.monotonic() < deadline:
+                    if ws_evt.wait(timeout=0.5):
+                        return True
+                    if shutdown.is_set():
+                        return False
+                return False
+            got = await asyncio.get_running_loop().run_in_executor(None, _wait)
+            self._msg_waiters.pop(ws_waiter_key, None)
+            if not got or not ws_data.get("ws_endpoint"):
+                raise RuntimeError("致命错误: Event Hub 在 10s 内未报告 ws_endpoint")
+            self._event_hub_ws_url = ws_data["ws_endpoint"]
+            _eh_s = time.monotonic() - t_wait_eh
+            print(f"[launcher] Event Hub 已发现: {self._event_hub_ws_url} (等待 {self._fmt_elapsed(_eh_s)})")
+
+        # Run all three in parallel: register_self + scan_tokens + wait_event_hub
+        await asyncio.gather(
+            self._register_self(),
+            _scan_and_register_tokens(),
+            _wait_event_hub_endpoint(),
+        )
+        if self._shutdown_event.is_set():
+            return
+
+        # ── Step 5: WS connect → module.ready ──
+        t_eh = time.monotonic()
+        self._ws_task = asyncio.create_task(self._ws_loop())
+
+        # Wait for Event Hub module.ready (sent when Launcher connects)
+        ready = await self._wait_event("module.ready", "event_hub", timeout=15)
+        if ready:
+            self._graceful_modules["event_hub"] = bool(ready.get("graceful_shutdown"))
+            print("[launcher] Event Hub 已就绪")
+        else:
+            print("[launcher] 警告: Event Hub 在 15s 内未发送 module.ready")
 
-    # ── Event Hub connection ──
+        self._ready_times["event_hub"] = time.monotonic() - t_eh
+        self._log_lifecycle("started", "event_hub")
+        await self._publish_event("module.started", {"module_id": "event_hub"})
+        self.process_manager.close_stdio("event_hub")
 
-    async def _connect_event_hub(self):
-        """Discover Event Hub WS endpoint (with retry) and start background client."""
-        url = f"http://127.0.0.1:{self.registry_port}"
+        # Store eh_info in modules dict if not already present (from scan)
+        if "event_hub" not in self.modules:
+            self.modules["event_hub"] = eh_info
+
+    def _get_http(self) -> httpx.AsyncClient:
+        """Get shared HTTP client (lazy-init, reuses TCP connections to Registry)."""
+        if self._http is None or self._http.is_closed:
+            self._http = httpx.AsyncClient(timeout=5)
+        return self._http
+
+    async def _close_http(self):
+        """Close shared HTTP client."""
+        if self._http and not self._http.is_closed:
+            await self._http.aclose()
+            self._http = None
+
+    async def _register_self(self):
+        """Register Launcher itself to Registry."""
+        url = f"http://127.0.0.1:{self.registry_port}/modules"
         headers = {"Authorization": f"Bearer {self.kite_token}"}
+        payload = {
+            "action": "register",
+            "module_id": "launcher",
+            "module_type": "infrastructure",
+            "name": "Launcher",
+            "api_endpoint": f"http://127.0.0.1:{self.api_port}",
+            "health_endpoint": "/launcher/modules",
+            "events_publish": {
+                "module.started": {},
+                "module.stopped": {},
+                "module.state_changed": {},
+            },
+            "events_subscribe": [">"],
+        }
+        try:
+            client = self._get_http()
+            resp = await client.post(url, json=payload, headers=headers)
+            if resp.status_code == 200:
+                print("[launcher] 已注册到 Registry")
+            else:
+                print(f"[launcher] 警告: Registry 注册返回 {resp.status_code}")
+        except Exception as e:
+            print(f"[launcher] 警告: 注册到 Registry 失败: {e}")
 
-        # Event Hub needs time to start and register itself to Registry
-        print("[launcher] Waiting for Event Hub to register...")
-        deadline = time.time() + 15
-        while time.time() < deadline:
-            try:
-                async with httpx.AsyncClient() as client:
-                    resp = await client.get(
-                        f"{url}/get/event_hub.metadata.ws_endpoint",
-                        headers=headers, timeout=3,
-                    )
-                    if resp.status_code == 200:
-                        self._event_hub_ws_url = resp.json()
-                        if self._event_hub_ws_url:
-                            break
-            except Exception:
-                pass
-            await asyncio.sleep(1)
+    # ── (Phase 2 merged into _phase1_parallel_bootstrap) ──
 
-        if not self._event_hub_ws_url:
-            print("[launcher] WARNING: Could not discover Event Hub WS, events disabled")
+    # ── Phase 3: Registry delayed ready ──
+
+    async def _phase3_registry_ready(self):
+        """Wait for Registry module.ready (triggered after Event Hub registers to Registry
+        and Registry connects to Event Hub WS)."""
+        print("[launcher] 等待 Registry 连接 Event Hub...")
+        ready = await self._wait_event("module.ready", "registry", timeout=12)
+        if ready:
+            self._graceful_modules["registry"] = bool(ready.get("graceful_shutdown"))
+            print("[launcher] Registry 事件总线连接完成")
+        else:
+            print("[launcher] 警告: Registry 在 12s 内未连接事件总线 (降级运行)")
+
+        self._log_lifecycle("started", "registry")
+        await self._publish_event("module.started", {"module_id": "registry"})
+        self.process_manager.close_stdio("registry")
+
+    # ── Phase 4: Start remaining modules ──
+
+    async def _phase4_start_modules(self):
+        """Start enabled modules (excluding core) in dependency order."""
+        to_start = [m for m in self.modules.values()
+                     if self._desired_states.get(m.name) == "running"
+                     and m.name not in CORE_MODULE_NAMES
+                     and m.name != WATCHDOG_MODULE_NAME]
+        if not to_start:
+            print("[launcher] 没有额外模块需要启动")
             return
 
-        print(f"[launcher] Event Hub discovered: {self._event_hub_ws_url}")
-        self._ws_task = asyncio.create_task(self._ws_loop())
+        # Auto-start manual modules if depended upon
+        needed = set(m.name for m in to_start)
+        for m in list(to_start):
+            for dep in m.depends_on:
+                if dep not in needed and dep not in CORE_MODULE_NAMES:
+                    dep_info = self.modules.get(dep)
+                    if dep_info and dep_info.state != "disabled":
+                        needed.add(dep)
+                        to_start.append(dep_info)
+                        self._desired_states[dep] = "running"
+                        print(f"[launcher] 自动启动 '{dep}' (被依赖)")
+                    elif dep_info and dep_info.state == "disabled":
+                        print(f"[launcher] 错误: '{m.name}' 依赖已禁用的模块 '{dep}'")
+
+        try:
+            layers = self._topo_layers(to_start)
+        except RuntimeError as e:
+            print(f"[launcher] 错误: {e}")
+            return
+
+        total = sum(len(layer) for layer in layers)
+        print(f"[launcher] 正在启动 {total} 个模块...")
+        for layer in layers:
+            if len(layer) == 1:
+                await self._start_one_module(layer[0])
+            else:
+                await asyncio.gather(*(self._start_one_module(info) for info in layer))
+
+    # ── Event Hub WebSocket connection ──
 
     async def _ws_loop(self):
         """Connect to Event Hub, reconnect on failure."""
@@ -208,16 +745,19 @@ class Launcher:
             except asyncio.CancelledError:
                 return
             except Exception as e:
-                print(f"[launcher] Event Hub connection error: {e}")
+                if not self._system_shutting_down:
+                    print(f"[launcher] Event Hub 连接错误: {e}")
             self._ws = None
             await asyncio.sleep(5)
 
     async def _ws_connect(self):
-        """Single WebSocket session: connect, subscribe to all events, display them."""
-        ws_url = f"{self._event_hub_ws_url}?token={self.kite_token}"
-        async with websockets.connect(ws_url) as ws:
+        """Single WebSocket session with launcher_ws_token auth."""
+        ws_url = f"{self._event_hub_ws_url}?token={self._launcher_ws_token}&id=launcher"
+        t_ws_connect = time.monotonic()
+        async with websockets.connect(ws_url, open_timeout=3, ping_interval=None, ping_timeout=None, close_timeout=10) as ws:
             self._ws = ws
-            print("[launcher] Connected to Event Hub")
+            _ws_s = time.monotonic() - t_ws_connect
+            print(f"[launcher] 已连接到 Event Hub ({self._fmt_elapsed(_ws_s)})")
 
             # Subscribe to all events
             await ws.send(json.dumps({
@@ -231,52 +771,89 @@ class Launcher:
                     msg = json.loads(raw)
                 except (json.JSONDecodeError, TypeError):
                     continue
-                msg_type = msg.get("type", "")
-                if msg_type == "event":
-                    source = msg.get("source", "unknown")
-                    event = msg.get("event", "")
-                    data = msg.get("data", {})
-                    # Trigger event waiters
-                    module_id = data.get("module_id", "")
-                    waiter_key = f"{event}:{module_id}"
-                    waiter = self._event_waiters.get(waiter_key)
-                    if waiter:
-                        waiter[1].update(data)
-                        waiter[0].set()
-                    ts = msg.get("timestamp", "")
-                    latency_str = ""
-                    if ts:
-                        try:
-                            from datetime import datetime, timezone
-                            sent = datetime.fromisoformat(ts)
-                            delay_ms = (datetime.now(timezone.utc) - sent).total_seconds() * 1000
-                            latency_str = f" ({delay_ms:.1f}ms)"
-                            local_ts = sent.astimezone().strftime("%H:%M:%S")
-                        except Exception:
-                            local_ts = ts[11:19] if len(ts) >= 19 else ts
-                        print(f"[{source}] {local_ts} {event}{latency_str}: {json.dumps(data, ensure_ascii=False)}")
-                    else:
-                        print(f"[{source}] {event}: {json.dumps(data, ensure_ascii=False)}")
-                elif msg_type == "error":
-                    print(f"[launcher] Event Hub error: {msg.get('message')}")
+                try:
+                    msg_type = msg.get("type", "")
+                    if msg_type == "event":
+                        source = msg.get("source", "unknown")
+                        event = msg.get("event", "")
+                        data = msg.get("data") if isinstance(msg.get("data"), dict) else {}
+                        # Trigger event waiters
+                        module_id = data.get("module_id", "")
+                        waiter_key = f"{event}:{module_id}"
+                        waiter = self._event_waiters.get(waiter_key)
+                        if waiter:
+                            waiter[1].update(data)
+                            waiter[0].set()
+                        # module.exiting also wakes module.ready waiter
+                        # (module won't send ready — no point waiting)
+                        if event == "module.exiting" and module_id:
+                            ready_key = f"module.ready:{module_id}"
+                            ready_waiter = self._event_waiters.get(ready_key)
+                            if ready_waiter:
+                                ready_waiter[1].update(data)
+                                ready_waiter[1]["_exited"] = True
+                                ready_waiter[0].set()
+                        # module.crash → print red crash summary (real-time notification)
+                        if event == "module.crash" and module_id:
+                            RED = "\033[91m"
+                            RESET = "\033[0m"
+                            exc_type = data.get("exception_type", "Unknown")
+                            preview = data.get("traceback_preview", "")
+                            severity = data.get("severity", "error")
+                            print(f"[launcher] {RED}模块 '{module_id}' 崩溃: "
+                                  f"{exc_type} — {preview}{RESET}")
+                            _suffix = os.environ.get("KITE_INSTANCE_SUFFIX", "")
+                            crash_log = os.path.join(
+                                os.environ.get("KITE_INSTANCE_DIR", ""),
+                                module_id, "log", f"crashes{_suffix}.jsonl"
+                            )
+                            print(f"[launcher] 崩溃日志: {crash_log}")
+                        ts = msg.get("timestamp", "")
+                        # Only log system events (module.*, watchdog.*) to avoid flooding
+                        # from benchmark/test traffic
+                        if not (event.startswith("module.") or event.startswith("watchdog.")):
+                            continue
+                        latency_str = ""
+                        if ts:
+                            try:
+                                from datetime import datetime, timezone
+                                sent = datetime.fromisoformat(ts)
+                                delay_ms = (datetime.now(timezone.utc) - sent).total_seconds() * 1000
+                                latency_str = f" ({delay_ms:.1f}ms)"
+                                local_ts = sent.astimezone().strftime("%H:%M:%S")
+                            except Exception:
+                                local_ts = ts[11:19] if len(ts) >= 19 else ts
+                            print(f"[{source}] {local_ts} {event}{latency_str}: {json.dumps(data, ensure_ascii=False)}")
+                        else:
+                            print(f"[{source}] {event}: {json.dumps(data, ensure_ascii=False)}")
+                    elif msg_type == "error":
+                        print(f"[launcher] Event Hub 错误: {msg.get('message')}")
+                except Exception as e:
+                    print(f"[launcher] 事件处理异常（已忽略）: {e}")
 
     async def _publish_event(self, event_type: str, data: dict):
-        """Publish an event to Event Hub via WebSocket."""
+        """Publish an event to Event Hub via WebSocket. Uses create_task to avoid
+        deadlock with _ws_connect recv loop (websockets 15.x send can block when
+        incoming frames are pending and recv is held by async-for)."""
         if not self._ws:
             return
         from datetime import datetime, timezone
-        msg = {
+        msg = json.dumps({
             "type": "event",
             "event_id": str(uuid.uuid4()),
             "event": event_type,
             "source": "launcher",
             "timestamp": datetime.now(timezone.utc).isoformat(),
             "data": data,
-        }
-        try:
-            await self._ws.send(json.dumps(msg))
-        except Exception as e:
-            print(f"[launcher] Failed to publish event: {e}")
+        })
+
+        async def _send():
+            try:
+                await self._ws.send(msg)
+            except Exception as e:
+                print(f"[launcher] 发布事件失败: {e}")
+
+        asyncio.create_task(_send())
 
     def _publish_event_threadsafe(self, event_type: str, data: dict):
         """Publish event from non-async context (API thread). Fire-and-forget."""
@@ -301,57 +878,127 @@ class Launcher:
             self._event_waiters.pop(key, None)
 
     async def _graceful_stop(self, name: str, reason: str = "stop_requested", timeout: float = 10):
-        """Graceful shutdown: send event → wait ack → wait ready → kill."""
+        """Graceful shutdown: check capability → send event → wait ack → wait ready → kill.
+        Modules that did not declare graceful_shutdown in module.ready are terminated directly.
+        """
         self._log_lifecycle("stopping", name, reason=reason)
-        # Step 1: send module.shutdown event
+
+        if not self._graceful_modules.get(name):
+            self.process_manager.stop_module(name, timeout=SHUTDOWN_TIMEOUT_NON_GRACEFUL)
+            self._log_lifecycle("stopped", name, reason=reason)
+            await self._publish_event("module.stopped", {
+                "module_id": name,
+                "graceful_shutdown": False,
+            })
+            return
+
         await self._publish_event("module.shutdown", {
             "module_id": name, "reason": reason, "timeout": timeout,
         })
 
-        # Step 2: wait for ack (3s)
         ack = await self._wait_event("module.shutdown.ack", name, timeout=3)
         if not ack:
-            # No ack — fallback to direct terminate
-            self.process_manager.stop_module(name, timeout=5)
-            await self._publish_event("module.stopped", {"module_id": name})
+            self.process_manager.stop_module(name, timeout=SHUTDOWN_TIMEOUT_NON_GRACEFUL)
+            await self._publish_event("module.stopped", {
+                "module_id": name,
+                "graceful_shutdown": self._graceful_modules.get(name, False),
+            })
             return
 
-        # Step 3: wait for ready
         estimated = min(ack.get("estimated_cleanup", timeout), timeout)
         ready = await self._wait_event("module.shutdown.ready", name, timeout=estimated)
         if ready:
-            # Module is ready to die — kill immediately
-            self.process_manager.stop_module(name, timeout=1)
+            self.process_manager.stop_module(name, timeout=SHUTDOWN_TIMEOUT_READY)
         else:
-            # Timeout — force stop
-            self.process_manager.stop_module(name, timeout=3)
+            self.process_manager.stop_module(name, timeout=SHUTDOWN_TIMEOUT_PARTIAL)
 
         self._log_lifecycle("stopped", name, reason=reason)
-        await self._publish_event("module.stopped", {"module_id": name})
+        await self._publish_event("module.stopped", {
+            "module_id": name,
+            "graceful_shutdown": self._graceful_modules.get(name, False),
+        })
 
     async def _graceful_shutdown_all(self):
-        """Broadcast module.shutdown to all running modules, then force-kill survivors."""
+        """Shut down all modules. Order:
+        1. Send shutdown to graceful modules (excl. Event Hub) — let them start cleanup
+        2. Terminate non-graceful modules (fast, runs during graceful cleanup)
+        3. Wait for graceful modules to exit (process monitoring)
+        4. Shut down Event Hub last (keeps event routing alive throughout)
+        """
+        self._system_shutting_down = True
         running = [n for n in self.modules if self.process_manager.is_running(n)]
+        # Also check core modules
+        for cn in CORE_MODULE_NAMES:
+            if self.process_manager.is_running(cn) and cn not in running:
+                running.append(cn)
         if not running:
+            print("[launcher] 没有运行中的模块需要关闭")
             return
-        print(f"[launcher] Graceful shutdown: {', '.join(running)}")
-        # Broadcast shutdown event
-        for name in running:
+
+        graceful = [n for n in running if self._graceful_modules.get(n)]
+        non_graceful = [n for n in running if not self._graceful_modules.get(n)]
+
+        # Defer Event Hub — it must stay alive to route shutdown events
+        hub_deferred = "event_hub" in graceful
+        graceful_batch = [n for n in graceful if n != "event_hub"] if hub_deferred else graceful
+
+        print(f"[launcher] 正在关闭 {len(running)} 个模块: {', '.join(running)}")
+
+        # Phase 1: Notify graceful modules first (they start cleanup immediately)
+        for name in graceful_batch:
             self._log_lifecycle("stopping", name, reason="system_shutdown")
             await self._publish_event("module.shutdown", {
-                "module_id": name, "reason": "system_shutdown", "timeout": 10,
+                "module_id": name, "reason": "system_shutdown", "timeout": 5,
             })
-        # Wait up to 10s total, then force-kill
-        deadline = time.time() + 10
-        while time.time() < deadline:
-            still_running = [n for n in running if self.process_manager.is_running(n)]
-            if not still_running:
-                break
-            await asyncio.sleep(0.5)
-        self.process_manager.stop_all(timeout=3)
-        for name in running:
+
+        # Phase 2: While graceful modules are cleaning up, terminate non-graceful ones
+        if non_graceful:
+            print(f"[launcher] 直接终止 {len(non_graceful)} 个不支持优雅退出的模块: {', '.join(non_graceful)}")
+        for name in non_graceful:
+            self._log_lifecycle("stopping", name, reason="system_shutdown")
+            self.process_manager.stop_module(name, timeout=SHUTDOWN_TIMEOUT_PARTIAL)
             self._log_lifecycle("stopped", name, reason="system_shutdown")
 
+        # Phase 3: Wait for graceful modules to exit (process monitoring)
+        if graceful_batch:
+            deadline = time.time() + 5
+            while time.time() < deadline:
+                still_running = [n for n in graceful_batch if self.process_manager.is_running(n)]
+                if not still_running:
+                    print("[launcher] 所有优雅退出模块已自行退出")
+                    break
+                remaining = max(0, deadline - time.time())
+                print(f"[launcher] 等待 {len(still_running)} 个模块退出 ({remaining:.0f}s): {', '.join(still_running)}")
+                await asyncio.sleep(1)
+            # Force kill survivors
+            for name in graceful_batch:
+                if self.process_manager.is_running(name):
+                    self.process_manager.stop_module(name, timeout=SHUTDOWN_TIMEOUT_PARTIAL)
+                    self._log_lifecycle("stopped", name, reason="system_shutdown")
+
+        # Phase 4: All other modules exited — now shut down Event Hub
+        if hub_deferred and self.process_manager.is_running("event_hub"):
+            self._log_lifecycle("stopping", "event_hub", reason="system_shutdown")
+            await self._publish_event("module.shutdown", {
+                "module_id": "event_hub", "reason": "system_shutdown", "timeout": 5,
+            })
+            deadline = time.time() + 5
+            while time.time() < deadline:
+                if not self.process_manager.is_running("event_hub"):
+                    print("[launcher] Event Hub 已退出")
+                    break
+                await asyncio.sleep(0.5)
+            if self.process_manager.is_running("event_hub"):
+                self.process_manager.stop_module("event_hub", timeout=SHUTDOWN_TIMEOUT_PARTIAL)
+            self._log_lifecycle("stopped", "event_hub", reason="system_shutdown")
+
+        # Final safety net
+        try:
+            self.process_manager.stop_all(timeout=SHUTDOWN_TIMEOUT_BULK)
+        except Exception as e:
+            print(f"[launcher] stop_all 出错: {e}")
+        await self._close_http()
+
     # ── Heartbeat to Registry ──
 
     async def _heartbeat_loop(self):
@@ -359,110 +1006,15 @@ class Launcher:
         while not self._thread_shutdown.is_set():
             await asyncio.sleep(30)
             try:
-                async with httpx.AsyncClient() as client:
-                    await client.post(
-                        f"http://127.0.0.1:{self.registry_port}/modules",
-                        json={"action": "heartbeat", "module_id": "launcher"},
-                        headers={"Authorization": f"Bearer {self.kite_token}"},
-                        timeout=5,
-                    )
+                client = self._get_http()
+                await client.post(
+                    f"http://127.0.0.1:{self.registry_port}/modules",
+                    json={"action": "heartbeat", "module_id": "launcher"},
+                    headers={"Authorization": f"Bearer {self.kite_token}"},
+                )
             except Exception:
                 pass
 
-    # ── Registry startup ──
-
-    async def _start_registry(self):
-        """Start Registry as a subprocess, wait for it to write port.txt and /health to respond."""
-        registry_dir = os.path.join(self.project_root, "core", "registry")
-        if not os.path.isdir(registry_dir):
-            raise RuntimeError(f"Registry module not found at {registry_dir}")
-
-        # Use centralized data directory
-        from core.data_dir import get_registry_data_dir
-        registry_data_dir = get_registry_data_dir()
-
-        # Clean our instance's port file before starting
-        port_file = os.path.join(registry_data_dir, f"port_{self.instance_id}.txt")
-        if os.path.isfile(port_file):
-            os.remove(port_file)
-
-        registry_info = ModuleInfo(
-            name="registry",
-            display_name="Registry",
-            type="infrastructure",
-            state="enabled",
-            runtime="python",
-            entry="entry.py",
-            module_dir=registry_dir,
-        )
-
-        # Pass launcher_token + bind config via stdin
-        boot_info = {"token": self.kite_token, "registry_port": 0, "bind": "127.0.0.1", "instance_id": self.instance_id}
-        ok = self.process_manager.start_module(registry_info, boot_info=boot_info)
-        if not ok:
-            raise RuntimeError("Failed to start Registry")
-
-        # Wait for Registry to write port.txt
-        print("[launcher] Waiting for Registry to report its port...")
-        deadline = time.time() + 10
-        while time.time() < deadline:
-            if os.path.isfile(port_file):
-                try:
-                    with open(port_file, "r") as f:
-                        self.registry_port = int(f.read().strip())
-                    break
-                except (ValueError, OSError):
-                    pass
-            await asyncio.sleep(0.2)
-        else:
-            raise RuntimeError("Registry failed to write port.txt within 10s")
-
-        # Poll /health until ready
-        url = f"http://127.0.0.1:{self.registry_port}/health"
-        print(f"[launcher] Registry on port {self.registry_port}, waiting for health check...")
-
-        deadline = time.time() + 10
-        async with httpx.AsyncClient() as client:
-            while time.time() < deadline:
-                try:
-                    resp = await client.get(url, timeout=1)
-                    if resp.status_code == 200:
-                        print("[launcher] Registry is ready")
-                        return
-                except Exception:
-                    pass
-                await asyncio.sleep(0.2)
-
-        raise RuntimeError("Registry failed to become ready within 10s")
-
-    async def _register_self(self):
-        """Register Launcher itself to Registry using new API."""
-        url = f"http://127.0.0.1:{self.registry_port}/modules"
-        headers = {"Authorization": f"Bearer {self.kite_token}"}
-        payload = {
-            "action": "register",
-            "module_id": "launcher",
-            "module_type": "infrastructure",
-            "name": "Launcher",
-            "api_endpoint": f"http://127.0.0.1:{self.api_port}",
-            "health_endpoint": "/launcher/modules",
-            "events_publish": {
-                "module.started": {},
-                "module.stopped": {},
-                "module.state_changed": {},
-            },
-            "events_subscribe": [">"],
-        }
-        try:
-            async with httpx.AsyncClient() as client:
-                resp = await client.post(url, json=payload, headers=headers, timeout=5)
-                if resp.status_code == 200:
-                    print("[launcher] Registered self to Registry")
-                else:
-                    print(f"[launcher] WARNING: Registry registration returned {resp.status_code}")
-        except Exception as e:
-            print(f"[launcher] WARNING: failed to register to Registry: {e}")
-
     # ── Module startup ──
 
     def _topo_sort(self, modules: list[ModuleInfo]) -> list[ModuleInfo]:
@@ -491,86 +1043,133 @@ class Launcher:
             visit(m.name)
         return order
 
+    def _topo_layers(self, modules: list[ModuleInfo]) -> list[list[ModuleInfo]]:
+        """Topological sort into layers. Modules in the same layer have no
+        inter-dependencies and can be started in parallel."""
+        name_map = {m.name: m for m in modules}
+        all_names = set(name_map.keys())
+
+        # Compute depth (longest path from root) for each module
+        depth: dict[str, int] = {}
+        in_stack: set[str] = set()
+
+        def get_depth(name: str) -> int:
+            if name in depth:
+                return depth[name]
+            if name in in_stack:
+                raise RuntimeError(f"Circular dependency detected involving '{name}'")
+            in_stack.add(name)
+            info = name_map.get(name)
+            d = 0
+            if info:
+                for dep in info.depends_on:
+                    if dep in all_names:
+                        d = max(d, get_depth(dep) + 1)
+            in_stack.remove(name)
+            depth[name] = d
+            return d
+
+        for name in all_names:
+            get_depth(name)
+
+        # Group by depth
+        max_depth = max(depth.values()) if depth else 0
+        layers: list[list[ModuleInfo]] = [[] for _ in range(max_depth + 1)]
+        for name, d in depth.items():
+            layers[d].append(name_map[name])
+        return layers
+
     async def _start_one_module(self, info: ModuleInfo):
-        """Start a single module: publish starting event, start process, wait for ready."""
+        """Start a single module: publish starting → start process → wait ready → started → close stdio."""
         self._log_lifecycle("starting", info.name)
         await self._publish_event("module.starting", {"module_id": info.name})
 
         token = self._module_tokens.get(info.name, "")
-        boot_info = {
-            "token": token,
-            "registry_port": self.registry_port,
-            "preferred_port": info.preferred_port,
-            "advertise_ip": "127.0.0.1",
-        }
+        boot_info = {"token": token}
+        t0 = time.monotonic()
         ok = self.process_manager.start_module(info, boot_info=boot_info)
         if not ok:
             self._log_lifecycle("start_failed", info.name)
             return
 
-        # Wait for module.ready (configurable timeout, degrade on timeout)
+        # Persist immediately after starting to ensure PID is recorded
+        # (in case launcher crashes before Phase 4 completes)
+        self.process_manager.persist_records()
+
+        # Wait for module.ready or module.exiting (whichever comes first)
         timeout = info.launch.timeout
         ready = await self._wait_event("module.ready", info.name, timeout=timeout)
-        if ready:
-            print(f"[launcher] Module '{info.name}' is ready")
+        elapsed = time.monotonic() - t0
+        if ready and ready.get("_exited"):
+            # Module sent module.exiting before ready — it chose to quit
+            reason = ready.get("reason", "unknown")
+            self._exit_reasons[info.name] = reason
+            print(f"[launcher] 模块 '{info.name}' 主动退出: {reason} ({elapsed:.2f}s)")
+        elif ready:
+            self._graceful_modules[info.name] = bool(ready.get("graceful_shutdown"))
+            self._ready_times[info.name] = elapsed
+            print(f"[launcher] 模块 '{info.name}' 已就绪 ({elapsed:.2f}s)")
         else:
-            print(f"[launcher] WARNING: '{info.name}' did not send module.ready within {timeout}s")
+            print(f"[launcher] 警告: '{info.name}' 在 {timeout}s 内未发送 module.ready")
 
         rec = self.process_manager.get_record(info.name)
         self._log_lifecycle("started", info.name, pid=rec.pid if rec else None)
         await self._publish_event("module.started", {"module_id": info.name})
-
-    async def _start_enabled_modules(self):
-        """Start modules in dependency order, auto-starting manual deps if needed."""
-        to_start = [m for m in self.modules.values()
-                     if self._desired_states.get(m.name) == "running"]
-        if not to_start:
-            print("[launcher] No modules to start")
-            return
-
-        # Auto-start manual modules if depended upon
-        needed = set(m.name for m in to_start)
-        for m in to_start:
-            for dep in m.depends_on:
-                if dep not in needed:
-                    dep_info = self.modules.get(dep)
-                    if dep_info and dep_info.state != "disabled":
-                        needed.add(dep)
-                        to_start.append(dep_info)
-                        self._desired_states[dep] = "running"
-                        print(f"[launcher] Auto-starting '{dep}' (dependency)")
-                    elif dep_info and dep_info.state == "disabled":
-                        print(f"[launcher] ERROR: '{m.name}' depends on disabled module '{dep}'")
-
-        try:
-            sorted_modules = self._topo_sort(to_start)
-        except RuntimeError as e:
-            print(f"[launcher] ERROR: {e}")
-            return
-
-        print(f"[launcher] Starting {len(sorted_modules)} module(s)...")
-        for info in sorted_modules:
-            await self._start_one_module(info)
+        self.process_manager.close_stdio(info.name)
 
     async def _register_module_tokens(self):
         """Generate per-module tokens and register the mapping to Registry."""
+        # Include all scanned modules + core modules
         for name in self.modules:
-            self._module_tokens[name] = secrets.token_hex(32)
+            if name not in self._module_tokens:
+                self._module_tokens[name] = secrets.token_hex(32)
+        # Ensure registry has a token
+        if "registry" not in self._module_tokens:
+            self._module_tokens["registry"] = secrets.token_hex(32)
 
         if not self._module_tokens:
             return
 
+        await self._register_tokens_to_registry(self._module_tokens)
+
+    async def _register_tokens_to_registry(self, tokens: dict):
+        """Register token mapping to Registry via POST /tokens."""
         url = f"http://127.0.0.1:{self.registry_port}/tokens"
         headers = {"Authorization": f"Bearer {self.kite_token}"}
         try:
-            async with httpx.AsyncClient() as client:
-                resp = await client.post(url, json=self._module_tokens, headers=headers, timeout=5)
-                if resp.status_code == 200:
-                    print(f"[launcher] Registered {len(self._module_tokens)} module token(s)")
-                else:
-                    print(f"[launcher] WARNING: token registration returned {resp.status_code}")
+            client = self._get_http()
+            resp = await client.post(url, json=tokens, headers=headers)
+            if resp.status_code == 200:
+                print(f"[launcher] 已注册 {len(tokens)} 个模块令牌")
+            else:
+                print(f"[launcher] 警告: 令牌注册返回 {resp.status_code}")
         except Exception as e:
-            print(f"[launcher] WARNING: failed to register module tokens: {e}")
+            print(f"[launcher] 警告: 注册模块令牌失败: {e}")
+
+    # ── Validation ──
+
+    def _validate_core_modules(self):
+        """Validate core modules exist (mechanism 12)."""
+        project_root = os.environ["KITE_PROJECT"]
+        for name in ("registry", "event_hub"):
+            mod_dir = os.path.join(project_root, "core", name)
+            md_path = os.path.join(mod_dir, "module.md")
+            if not os.path.isdir(mod_dir):
+                print(f"[launcher] 致命: 核心模块 '{name}' 目录未找到: {mod_dir}")
+                sys.exit(1)
+            if not os.path.isfile(md_path):
+                print(f"[launcher] 致命: 核心模块 '{name}' 缺少 module.md: {md_path}")
+                sys.exit(1)
+            # Try to parse frontmatter
+            try:
+                with open(md_path, "r", encoding="utf-8") as f:
+                    fm = _parse_frontmatter(f.read())
+                if not fm:
+                    print(f"[launcher] 致命: 核心模块 '{name}' module.md 没有有效的 frontmatter")
+                    sys.exit(1)
+            except Exception as e:
+                print(f"[launcher] 致命: 核心模块 '{name}' module.md 解析错误: {e}")
+                sys.exit(1)
 
     # ── API thread ──
 
@@ -591,70 +1190,119 @@ class Launcher:
         t = threading.Thread(target=_run, daemon=True)
         t.start()
 
-        # Wait for API server to actually be ready before proceeding
         deadline = time.time() + 5
         while time.time() < deadline:
             if self._api_server.started:
                 break
             time.sleep(0.05)
         else:
-            print("[launcher] WARNING: API server may not be fully ready")
+            print("[launcher] 警告: API 服务器可能尚未完全就绪")
 
-        print(f"[launcher] API server started on port {self.api_port}")
+        print(f"[launcher] API 服务器已启动，端口 {self.api_port}")
+
+    # ── Module crash summary ──
+
+    def _print_module_crash_summary(self, name: str):
+        """Read module's crashes.jsonl last record and print red summary to console.
+        Complement to module.crash event — reliable even if event was never sent."""
+        RED = "\033[91m"
+        RESET = "\033[0m"
+        _suffix = os.environ.get("KITE_INSTANCE_SUFFIX", "")
+        crash_log = os.path.join(
+            os.environ.get("KITE_INSTANCE_DIR", ""), name, "log", f"crashes{_suffix}.jsonl"
+        )
+        if not os.path.isfile(crash_log):
+            return
+        try:
+            with open(crash_log, "rb") as f:
+                f.seek(0, 2)
+                size = f.tell()
+                if size == 0:
+                    return
+                f.seek(max(0, size - 4096))
+                lines = f.read().decode("utf-8").strip().split("\n")
+                last = json.loads(lines[-1])
+                exc_type = last.get("exception_type", "Unknown")
+                ctx = last.get("context", {})
+                file_name = ctx.get("file", "unknown")
+                line_no = ctx.get("line", "?")
+                print(f"[launcher] {RED}崩溃: "
+                      f"{exc_type} in {file_name}:{line_no}{RESET}")
+                print(f"[launcher] 崩溃日志: {crash_log}")
+        except Exception:
+            pass
 
     # ── Monitor loop ──
 
     async def _monitor_loop(self):
-        """Check child processes every second. Handle crashes."""
-        MAX_FAIL = 3
-        MAX_FAILED_MODULES = 3
-
-        while not self._thread_shutdown.is_set():
+        """Check child processes every second. Handle crashes.
+        Uses _shutdown_event (asyncio.Event) so Ctrl+C wakes us immediately.
+
+        Responsibility split:
+        - Core module crash → full restart (Launcher handles)
+        - Watchdog crash → Launcher restarts directly (up to 3 times)
+        - Other module exit → publish module.stopped event only; Watchdog decides restart
+        """
+        WATCHDOG_MAX_FAIL = 3
+        watchdog_fail_count = 0
+
+        while not self._shutdown_event.is_set():
             exited = self.process_manager.check_exited()
 
             for name, rc in exited:
-                print(f"[launcher] Module '{name}' exited with code {rc}")
+                print(f"[launcher] 模块 '{name}' 退出，返回码 {rc}")
+                if rc != 0:
+                    self._print_module_crash_summary(name)
                 self._log_lifecycle("exited", name, exit_code=rc)
                 await self._publish_event("module.stopped", {
                     "module_id": name, "exit_code": rc,
+                    "graceful_shutdown": self._graceful_modules.get(name, False),
                 })
                 info = self.modules.get(name)
 
-                # Core module crash → full restart
-                if info and info.is_core(self.project_root):
-                    print(f"[launcher] CRITICAL: core module '{name}' crashed, restarting all...")
+                # 1) Core module crash → full restart
+                if name in CORE_MODULE_NAMES or (info and info.is_core()):
+                    print(f"[launcher] 严重: 核心模块 '{name}' 崩溃，正在全部重启...")
                     self._log_lifecycle("core_crash", name, exit_code=rc)
                     await self._full_restart()
                     return
 
-                # Non-core: attempt restart if desired_state is "running"
-                self._fail_counts[name] = self._fail_counts.get(name, 0) + 1
-                count = self._fail_counts[name]
-
-                if count < MAX_FAIL and self._desired_states.get(name) == "running" and info:
-                    print(f"[launcher] Restarting '{name}' (attempt {count}/{MAX_FAIL})...")
-                    await self._start_one_module(info)
-                elif count >= MAX_FAIL:
-                    self._desired_states[name] = "stopped"
-                    self._log_lifecycle("failed", name, reason=f"exceeded {MAX_FAIL} retries")
-                    print(f"[launcher] Module '{name}' failed {MAX_FAIL} times, giving up")
+                # 2) Watchdog crash → Launcher restarts directly
+                if name == WATCHDOG_MODULE_NAME:
+                    if self._system_shutting_down:
+                        print(f"[launcher] Watchdog 退出（系统关闭中），跳过重启")
+                        continue
+                    watchdog_fail_count += 1
+                    if watchdog_fail_count <= WATCHDOG_MAX_FAIL and info:
+                        print(f"[launcher] Watchdog 崩溃，正在重启 (第 {watchdog_fail_count}/{WATCHDOG_MAX_FAIL} 次)...")
+                        await self._start_one_module(info)
+                    else:
+                        self._desired_states[name] = "stopped"
+                        self._log_lifecycle("failed", name, reason=f"exceeded {WATCHDOG_MAX_FAIL} retries")
+                        print(f"[launcher] Watchdog 失败 {WATCHDOG_MAX_FAIL} 次，已放弃")
+                    continue
 
-            # Too many failed modules → exit
-            failed_count = sum(1 for c in self._fail_counts.values() if c >= MAX_FAIL)
-            if failed_count >= MAX_FAILED_MODULES:
-                print(f"[launcher] {failed_count} modules permanently failed, Launcher exiting")
-                return
+                # 3) Other modules → event already published above; Watchdog decides restart
+                #    (no restart logic here — Watchdog handles it via module.stopped event)
 
             if exited:
                 self.process_manager.persist_records()
 
-            await asyncio.sleep(1)
+            # Wait 1s but wake immediately on shutdown signal
+            try:
+                await asyncio.wait_for(self._shutdown_event.wait(), timeout=1)
+                return  # shutdown requested
+            except asyncio.TimeoutError:
+                pass
 
     async def _full_restart(self):
-        """Stop all modules, then re-run the startup sequence."""
-        print("[launcher] Full restart: stopping all modules...")
+        """Stop all modules, regenerate tokens, re-run Phase 1-4 (mechanism 10)."""
+        print("[launcher] 全量重启: 正在停止所有模块...")
+
+        # Persist records before shutdown so cleanup_leftovers can find survivors
+        self.process_manager.persist_records()
 
-        # Disconnect Event Hub
+        # Disconnect Event Hub WS
         if self._ws_task:
             self._ws_task.cancel()
             self._ws_task = None
@@ -662,79 +1310,303 @@ class Launcher:
             self._heartbeat_task.cancel()
             self._heartbeat_task = None
         self._ws = None
+        self._event_hub_ws_url = ""
+        self._launcher_ws_token = ""
 
         await self._graceful_shutdown_all()
-        self._fail_counts.clear()
+
+        # Cleanup any leftover processes that survived graceful shutdown.
+        # Note: _graceful_shutdown_all() clears _processes/_records dicts, but
+        # cleanup_leftovers() reads from processes.json (persisted above), so it can
+        # still find and kill survivors.
+        self.process_manager.cleanup_leftovers()
 
         self._module_tokens.clear()
 
-        print("[launcher] Full restart: re-running startup sequence...")
+        # Regenerate kite_token
+        self.kite_token = secrets.token_hex(32)
+        self.process_manager.kite_token = self.kite_token
+
+        print("[launcher] 全量重启: 重新执行 Phase 1-4...")
         try:
-            await self._start_registry()
-            await self._register_self()
-            self.modules = self.module_scanner.scan()
-            for n, info in self.modules.items():
-                self._log_lifecycle("scanned", n, state=info.state, module_dir=info.module_dir)
-            await self._register_module_tokens()
-            await self._start_enabled_modules()
+            await self._phase1_parallel_bootstrap()
+            await self._phase3_registry_ready()
+            await self._phase4_start_modules()
             self.process_manager.persist_records()
-            await self._connect_event_hub()
-            print("[launcher] Full restart complete, resuming monitor loop")
+            self._heartbeat_task = asyncio.create_task(self._heartbeat_loop())
+            print("[launcher] 全量重启完成，恢复监控循环")
             await self._monitor_loop()
         except Exception as e:
-            print(f"[launcher] Full restart failed: {e}")
+            print(f"[launcher] 全量重启失败: {e}")
 
     # ── Shutdown ──
 
     def _final_cleanup(self):
         """Called on exit — stop all processes, stop API, clear records."""
-        print("[launcher] Shutting down...")
+        try:
+            print("[launcher] 正在执行最终清理...")
+
+            if self._ws_task:
+                self._ws_task.cancel()
+            if hasattr(self, '_heartbeat_task') and self._heartbeat_task:
+                self._heartbeat_task.cancel()
+
+            # Note: _graceful_shutdown_all() already called stop_all() in _async_main finally block.
+            # This is just a safety check — should normally find nothing.
+            remaining = [n for n in self.process_manager._processes
+                         if self.process_manager.is_running(n)]
+            if remaining:
+                print(f"[launcher] 警告: 仍有残留进程 (不应出现): {', '.join(remaining)}")
+                self.process_manager.stop_all(timeout=SHUTDOWN_TIMEOUT_BULK)
+            else:
+                print("[launcher] 无残留进程")
 
-        if self._ws_task:
-            self._ws_task.cancel()
-        if hasattr(self, '_heartbeat_task') and self._heartbeat_task:
-            self._heartbeat_task.cancel()
+            if self._api_server:
+                self._api_server.should_exit = True
 
-        self.process_manager.stop_all(timeout=10)
+            # Clear instance runtime files
+            try:
+                os.remove(self.process_manager.records_path)
+            except OSError:
+                pass
+        except Exception as e:
+            print(f"[launcher] 最终清理出错: {e}")
+        finally:
+            # Signal the safety-net thread that normal shutdown has completed
+            self._shutdown_complete.set()
+            print("[launcher] 再见。")
+
+            if IS_WINDOWS:
+                os._exit(0)
+
+    # ── Startup report ──
+
+    async def _print_startup_report(self, total_time: float, phase_times: dict[str, float], *,
+                                     global_instances=None, cleaned_stats: dict[str, int] | None = None):
+        """Print a green startup summary with module list and timing."""
+        G = "\033[32m"  # green
+        Y = "\033[33m"  # yellow
+        R = "\033[0m"   # reset
+        B = "\033[1;32m"  # bold green
+
+        running = []
+        exited = []
+        stopped = []
+        for name, info in self.modules.items():
+            rec = self.process_manager.get_record(name)
+            is_running = self.process_manager.is_running(name)
+            if is_running and rec:
+                running.append((name, info, rec))
+            elif self._desired_states.get(name) == "running" and not is_running:
+                # Was started but already exited (e.g. module.exiting)
+                exited.append((name, info))
+            else:
+                stopped.append((name, info))
+
+        # Calculate kernel startup time (Phase 1+2+3)
+        kernel_time = 0
+        for phase_name in ["Phase 1+2: Registry + Event Hub (并行)", "Phase 3: Registry 事件总线"]:
+            if phase_name in phase_times:
+                kernel_time += phase_times[phase_name]
+
+        lines = [
+            "",
+            f"{B}{'=' * 60}",
+            f"  Kite 内核启动完成   耗时 {kernel_time:.2f}s",
+            f"  Kite 全部模块启动完成   总耗时 {total_time:.2f}s",
+            f"{'=' * 60}{R}",
+        ]
+
+        # Phase breakdown
+        lines.append(f"{G}  阶段耗时:{R}")
+
+        # Kernel modules section
+        lines.append(f"{G}    内核模块:{R}")
+        for phase_name in ["Phase 1+2: Registry + Event Hub (并行)", "Phase 3: Registry 事件总线"]:
+            if phase_name in phase_times:
+                elapsed = phase_times[phase_name]
+                lines.append(f"{G}      {phase_name:<26s} {elapsed:>6.2f}s{R}")
+
+        # Extension modules section
+        lines.append(f"{G}    扩展模块:{R}")
+        if "Phase 4: Extensions" in phase_times:
+            elapsed = phase_times["Phase 4: Extensions"]
+            lines.append(f"{G}      {'Phase 4: Extensions':<26s} {elapsed:>6.2f}s{R}")
+
+        # Sort running modules by ready time
+        running_sorted = sorted(running, key=lambda x: self._ready_times.get(x[0], float('inf')))
+
+        # Running modules with ready time and elapsed from Kite start
+        DIM = "\033[90m"
+        lines.append(f"{G}  运行中 ({len(running)}):{R}")
+
+        # CJK-aware display width helpers
+        def _dw(s):
+            """Display width: CJK chars count as 2, others as 1."""
+            w = 0
+            for c in str(s):
+                w += 2 if '\u4e00' <= c <= '\u9fff' or '\u3000' <= c <= '\u303f' or '\uff00' <= c <= '\uffef' else 1
+            return w
+
+        def _rpad(s, width):
+            """Left-align s in a field of given display width."""
+            return str(s) + ' ' * max(0, width - _dw(s))
+
+        def _lpad(s, width):
+            """Right-align s in a field of given display width."""
+            return ' ' * max(0, width - _dw(s)) + str(s)
+
+        # Column definitions: (header, align, min_width)
+        headers = ['模块', 'PID', '启动耗时', '进程启动时长', '类型']
+        aligns = ['left', 'right', 'right', 'right', 'left']  # alignment per column
+
+        # Build data rows first to calculate column widths
+        rows = []
+        for name, info, rec in running_sorted:
+            label = info.display_name or name
+            ready_t = self._ready_times.get(name)
+            time_str = f"{ready_t:.2f}s" if ready_t is not None else "—"
+            if ready_t is not None and hasattr(self, '_start_unix'):
+                elapsed_from_start = (rec.started_at + ready_t) - self._start_unix
+                es_str = f"{elapsed_from_start:.2f}s"
+            else:
+                es_str = "—"
+            rows.append([label, str(rec.pid), time_str, es_str, f"[{info.type}]"])
+
+        # Calculate column widths: max of header and all data display widths
+        col_widths = [_dw(h) for h in headers]
+        for row in rows:
+            for i, cell in enumerate(row):
+                col_widths[i] = max(col_widths[i], _dw(cell))
+
+        # Render header
+        hdr_parts = []
+        for i, h in enumerate(headers):
+            if aligns[i] == 'left':
+                hdr_parts.append(_rpad(h, col_widths[i]))
+            else:
+                hdr_parts.append(_lpad(h, col_widths[i]))
+        lines.append(f"{DIM}      {'  '.join(hdr_parts)}{R}")
+
+        # Render data rows
+        for row in rows:
+            parts = []
+            for i, cell in enumerate(row):
+                if aligns[i] == 'left':
+                    parts.append(_rpad(cell, col_widths[i]))
+                else:
+                    parts.append(_lpad(cell, col_widths[i]))
+            lines.append(f"{G}    ✓ {'  '.join(parts)}{R}")
+
+        # Exited modules (started but already quit)
+        if exited:
+            lines.append(f"{Y}  已退出 ({len(exited)}):{R}")
+            for name, info in exited:
+                label = info.display_name or name
+                reason = self._exit_reasons.get(name, "")
+                reason_str = f": {reason}" if reason else ""
+                lines.append(f"{Y}    ↗ {label:<20s} (主动退出{reason_str}){R}")
+
+        # Stopped modules
+        if stopped:
+            lines.append(f"{G}  未启动 ({len(stopped)}):{R}")
+            for name, info in stopped:
+                label = info.display_name or name
+                lines.append(f"{G}    - {label:<20s} ({info.state}){R}")
+
+        lines.append(f"{G}  Launcher API: http://127.0.0.1:{self.api_port}   实例: {self.instance_id}{R}")
+
+        # Query Registry for web module's access URL
+        web_url = await self._get_web_url()
+        if web_url:
+            lines.append(f"{B}  Web 管理后台: {web_url}{R}")
+
+        # Instance info
+        instances = self.process_manager.get_alive_instances()
+        inst_num = self.process_manager.instance_num
+        suffix_display = self.process_manager.instance_suffix or "(无)"
+        inst_dir = os.environ.get("KITE_INSTANCE_DIR", "")
+        cwd = os.environ.get("KITE_CWD", "")
+        debug_flag = " [DEBUG]" if os.environ.get("KITE_DEBUG") == "1" else ""
+        lines.append(f"{G}  当前实例: #{inst_num}  后缀: {suffix_display}  PID: {os.getpid()}{debug_flag}{R}")
+        lines.append(f"{G}  实例目录: {inst_dir}{R}")
+        lines.append(f"{G}  工作目录: {cwd}{R}")
+        if len(instances) > 1:
+            lines.append(f"{G}  所有实例:{R}")
+            for i in instances:
+                s = "" if i["num"] == 1 else f"~{i['num']}"
+                debug_tag = " [DEBUG]" if i.get("debug", False) else ""
+                current_tag = " (当前)" if i["is_self"] else ""
+                lines.append(f"{G}    #{i['num']}  PID {i['launcher_pid']}  "
+                             f"模块数 {i['module_count']}  (processes{s}.json){debug_tag}{current_tag}{R}")
+
+        # Cross-directory instances from other projects
+        if global_instances:
+            my_inst_basename = os.path.basename(os.environ.get("KITE_INSTANCE_DIR", ""))
+            other_instances = [i for i in global_instances
+                               if not i["is_self"] and i["instance_dir"] != my_inst_basename]
+            if other_instances:
+                lines.append(f"{G}  其他项目实例:{R}")
+                for i in other_instances:
+                    debug_tag = " [DEBUG]" if i.get("debug", False) else ""
+                    cwd_display = f"  {i['cwd']}" if i["cwd"] else ""
+                    lines.append(
+                        f"{G}    {i['instance_dir']:<20s}  "
+                        f"#{i['num']}  PID {i['launcher_pid']}  "
+                        f"模块数 {i['module_count']}"
+                        f"{cwd_display}{debug_tag}{R}"
+                    )
 
-        if self._api_server:
-            self._api_server.should_exit = True
+        if cleaned_stats:
+            total = sum(cleaned_stats.values())
+            if len(cleaned_stats) == 1:
+                inst, count = next(iter(cleaned_stats.items()))
+                lines.append(f"{Y}  已清理残留进程: {inst} ({count} 个){R}")
+            else:
+                lines.append(f"{Y}  已清理残留进程 (共 {total} 个):{R}")
+                for inst, count in cleaned_stats.items():
+                    lines.append(f"{Y}    {inst}: {count} 个{R}")
 
-        # Clear instance runtime files
-        self.process_manager._write_records_file([])
-        try:
-            os.remove(self.process_manager.records_path)
-        except OSError:
-            pass
-        from core.data_dir import get_registry_data_dir
-        port_file = os.path.join(get_registry_data_dir(), f"port_{self.instance_id}.txt")
+        lines.append(f"{B}{'=' * 60}{R}")
+        lines.append("")
+
+        print("\n".join(lines))
+
+    async def _get_web_url(self) -> str:
+        """Query Registry for the web module's api_endpoint. Returns URL or empty string."""
         try:
-            os.remove(port_file)
-        except OSError:
+            client = self._get_http()
+            resp = await client.get(
+                f"http://127.0.0.1:{self.registry_port}/get/web.api_endpoint",
+                headers={"Authorization": f"Bearer {self.kite_token}"},
+                timeout=3,
+            )
+            if resp.status_code == 200:
+                val = resp.json()
+                if val and isinstance(val, str):
+                    # Show localhost instead of 127.0.0.1 for friendliness
+                    return val.replace("://127.0.0.1:", "://localhost:")
+        except Exception:
             pass
-        print("[launcher] Goodbye.")
-
-        if IS_WINDOWS:
-            os._exit(0)
+        return ""
 
     # ── Utilities ──
 
     def _load_discovery(self) -> dict | None:
         """Read discovery config from launcher's own module.md."""
-        md_path = os.path.join(self.project_root, "core", "launcher", "module.md")
+        md_path = os.path.join(os.environ["KITE_PROJECT"], "core", "launcher", "module.md")
         try:
             with open(md_path, "r", encoding="utf-8") as f:
                 fm = _parse_frontmatter(f.read())
             discovery = fm.get("discovery")
             if isinstance(discovery, dict) and discovery:
-                print(f"[launcher] Discovery sources: {', '.join(discovery.keys())}")
                 return discovery
         except Exception as e:
-            print(f"[launcher] WARNING: failed to read discovery config: {e}")
+            print(f"[launcher] 警告: 读取发现配置失败: {e}")
         return None
 
     def _log_lifecycle(self, event: str, module: str, **extra):
-        """Append one JSONL line to core/launcher/data/lifecycle.jsonl."""
+        """Append one JSONL line to lifecycle.jsonl."""
         from datetime import datetime, timezone
         record = {"ts": datetime.now(timezone.utc).isoformat(), "event": event, "module": module}
         record.update(extra)
@@ -757,12 +1629,29 @@ class Launcher:
 
     def _create_api_app(self) -> FastAPI:
         """Create the FastAPI app with Launcher management routes."""
+        from fastapi import Request, HTTPException
         app = FastAPI(title="Kite Launcher", docs_url=None, redoc_url=None)
-        launcher = self  # closure reference
+        launcher = self
+
+        def _require_auth(request: Request):
+            """Verify Bearer token and IP whitelist. Raise 401/403 on failure."""
+            # IP whitelist: only allow 127.0.0.1
+            client_host = request.client.host if request.client else None
+            if client_host not in ("127.0.0.1", "::1", "localhost"):
+                raise HTTPException(status_code=403, detail="Access denied: only localhost allowed")
+
+            # Bearer token verification
+            auth = request.headers.get("Authorization", "")
+            if not auth.startswith("Bearer "):
+                raise HTTPException(status_code=401, detail="Missing or invalid Authorization header")
+            token = auth[7:].strip()
+            if token != launcher.kite_token:
+                raise HTTPException(status_code=401, detail="Invalid token")
 
         @app.get("/launcher/modules")
-        async def list_modules():
-            """List all modules and their current status (three-layer state model)."""
+        async def list_modules(request: Request):
+            """List all modules and their current status."""
+            _require_auth(request)
             result = []
             for name, info in launcher.modules.items():
                 running = launcher.process_manager.is_running(name)
@@ -780,39 +1669,32 @@ class Launcher:
             return result
 
         @app.post("/launcher/modules/{name}/start")
-        async def start_module(name: str):
-            """Start a module by name. Generates token and passes boot_info via stdin."""
+        async def start_module(name: str, request: Request):
+            """Start a module by name."""
+            _require_auth(request)
             info = launcher.modules.get(name)
             if not info:
                 raise HTTPException(404, f"Module '{name}' not found")
             if info.state == "disabled":
                 raise HTTPException(403, f"Module '{name}' is disabled")
 
-            # Generate token if not already present
             if name not in launcher._module_tokens:
                 launcher._module_tokens[name] = secrets.token_hex(32)
-                # Register the new token to Registry
                 try:
-                    async with httpx.AsyncClient() as client:
-                        await client.post(
-                            f"http://127.0.0.1:{launcher.registry_port}/tokens",
-                            json={name: launcher._module_tokens[name]},
-                            headers={"Authorization": f"Bearer {launcher.kite_token}"},
-                            timeout=5,
-                        )
+                    client = launcher._get_http()
+                    await client.post(
+                        f"http://127.0.0.1:{launcher.registry_port}/tokens",
+                        json={name: launcher._module_tokens[name]},
+                        headers={"Authorization": f"Bearer {launcher.kite_token}"},
+                    )
                 except Exception as e:
-                    print(f"[launcher] WARNING: failed to register token for {name}: {e}")
+                    print(f"[launcher] 警告: 注册 {name} 的令牌失败: {e}")
 
             token = launcher._module_tokens[name]
-            boot_info = {
-                "token": token,
-                "registry_port": launcher.registry_port,
-                "preferred_port": info.preferred_port,
-            }
+            boot_info = {"token": token}
             ok = launcher.process_manager.start_module(info, boot_info=boot_info)
             if ok:
                 launcher._desired_states[name] = "running"
-                launcher._fail_counts.pop(name, None)
                 launcher.process_manager.persist_records()
                 rec = launcher.process_manager.get_record(name)
                 launcher._log_lifecycle("started", name, pid=rec.pid if rec else None, via="api")
@@ -822,8 +1704,9 @@ class Launcher:
             raise HTTPException(500, f"Failed to start '{name}'")
 
         @app.post("/launcher/modules/{name}/stop")
-        async def stop_module(name: str, body: dict = None):
-            """Stop a module with graceful shutdown. Accepts optional reason."""
+        async def stop_module(name: str, request: Request, body: dict = None):
+            """Stop a module with graceful shutdown."""
+            _require_auth(request)
             info = launcher.modules.get(name)
             if not info:
                 raise HTTPException(404, f"Module '{name}' not found")
@@ -834,8 +1717,9 @@ class Launcher:
             return {"status": "stopped", "name": name}
 
         @app.post("/launcher/modules/{name}/restart")
-        async def restart_module(name: str, body: dict = None):
+        async def restart_module(name: str, request: Request, body: dict = None):
             """Restart a module (stop + start)."""
+            _require_auth(request)
             info = launcher.modules.get(name)
             if not info:
                 raise HTTPException(404, f"Module '{name}' not found")
@@ -843,28 +1727,21 @@ class Launcher:
                 raise HTTPException(403, f"Module '{name}' is disabled")
             reason = (body or {}).get("reason", "restart")
             await launcher._graceful_stop(name, reason)
-            # Re-generate token
             launcher._module_tokens[name] = secrets.token_hex(32)
             try:
-                async with httpx.AsyncClient() as client:
-                    await client.post(
-                        f"http://127.0.0.1:{launcher.registry_port}/tokens",
-                        json={name: launcher._module_tokens[name]},
-                        headers={"Authorization": f"Bearer {launcher.kite_token}"},
-                        timeout=5,
-                    )
+                client = launcher._get_http()
+                await client.post(
+                    f"http://127.0.0.1:{launcher.registry_port}/tokens",
+                    json={name: launcher._module_tokens[name]},
+                    headers={"Authorization": f"Bearer {launcher.kite_token}"},
+                )
             except Exception:
                 pass
             token = launcher._module_tokens[name]
-            boot_info = {
-                "token": token,
-                "registry_port": launcher.registry_port,
-                "preferred_port": info.preferred_port,
-            }
+            boot_info = {"token": token}
             ok = launcher.process_manager.start_module(info, boot_info=boot_info)
             if ok:
                 launcher._desired_states[name] = "running"
-                launcher._fail_counts.pop(name, None)
                 launcher.process_manager.persist_records()
                 rec = launcher.process_manager.get_record(name)
                 launcher._log_lifecycle("started", name, pid=rec.pid if rec else None, via="restart_api")
@@ -874,8 +1751,9 @@ class Launcher:
             raise HTTPException(500, f"Failed to restart '{name}'")
 
         @app.post("/launcher/rescan")
-        async def rescan_modules():
+        async def rescan_modules(request: Request):
             """Rescan module directories for new/removed modules."""
+            _require_auth(request)
             old_names = set(launcher.modules.keys())
             launcher.modules = launcher.module_scanner.scan()
             new_names = set(launcher.modules.keys())
@@ -884,31 +1762,37 @@ class Launcher:
             for name in added:
                 info = launcher.modules[name]
                 launcher._log_lifecycle("scanned", name, state=info.state, module_dir=info.module_dir)
-            # Initialize desired_state for new modules
             for name in added:
                 info = launcher.modules[name]
                 launcher._desired_states[name] = "running" if info.state == "enabled" else "stopped"
-            # Register tokens for new modules
             if added:
                 new_tokens = {}
                 for name in added:
                     launcher._module_tokens[name] = secrets.token_hex(32)
                     new_tokens[name] = launcher._module_tokens[name]
                 try:
-                    async with httpx.AsyncClient() as client:
-                        await client.post(
-                            f"http://127.0.0.1:{launcher.registry_port}/tokens",
-                            json=new_tokens,
-                            headers={"Authorization": f"Bearer {launcher.kite_token}"},
-                            timeout=5,
-                        )
+                    client = launcher._get_http()
+                    await client.post(
+                        f"http://127.0.0.1:{launcher.registry_port}/tokens",
+                        json=new_tokens,
+                        headers={"Authorization": f"Bearer {launcher.kite_token}"},
+                    )
                 except Exception:
                     pass
             return {"added": added, "removed": removed, "total": len(launcher.modules)}
 
+        @app.post("/launcher/shutdown")
+        async def shutdown_launcher(request: Request, body: dict = None):
+            """Shutdown the entire Kite system (equivalent to Ctrl+C)."""
+            _require_auth(request)
+            reason = (body or {}).get("reason", "api_request")
+            launcher._request_shutdown(f"API shutdown request: {reason}")
+            return {"status": "shutting_down", "reason": reason}
+
         @app.put("/launcher/modules/{name}/state")
-        async def update_state(name: str, body: dict):
+        async def update_state(name: str, request: Request, body: dict):
             """Update module state (enabled/manual/disabled). Writes to module.md."""
+            _require_auth(request)
             info = launcher.modules.get(name)
             if not info:
                 raise HTTPException(404, f"Module '{name}' not found")
@@ -917,14 +1801,12 @@ class Launcher:
             if new_state not in ("enabled", "manual", "disabled"):
                 raise HTTPException(400, "state must be enabled, manual, or disabled")
 
-            # Core modules cannot be disabled
-            if info.is_core(launcher.project_root) and new_state == "disabled":
+            if info.is_core() and new_state == "disabled":
                 raise HTTPException(403, "Core modules cannot be disabled")
 
             old_state = info.state
             info.state = new_state
 
-            # Update desired_state to match new config_state
             if new_state == "enabled":
                 launcher._desired_states[name] = "running"
             else:
@@ -956,7 +1838,6 @@ def _update_module_md_state(module_dir: str, new_state: str):
         with open(md_path, "r", encoding="utf-8") as f:
             content = f.read()
 
-        # Replace state: xxx in frontmatter
         updated = re.sub(
             r'^(state:\s*)(\S+)',
             rf'\g<1>{new_state}',
@@ -968,4 +1849,4 @@ def _update_module_md_state(module_dir: str, new_state: str):
         with open(md_path, "w", encoding="utf-8") as f:
             f.write(updated)
     except Exception as e:
-        print(f"[launcher] WARNING: failed to update module.md state: {e}")
+        print(f"[launcher] 警告: 更新 module.md 状态失败: {e}")