@agentunion/kite 1.6.3 → 1.6.5

package/cli.js

@@ -55,6 +55,8 @@ const args = process.argv.slice(2);
 const pythonArgs = [];
 let cwdOverride = null;
 let useVersion = version;
+let isDaemon = false;
+let isStop = false;
 
 for (let i = 0; i < args.length; i++) {
   if (args[i] === '--cwd' && args[i + 1]) {
@@ -62,6 +64,8 @@ for (let i = 0; i < args.length; i++) {
   } else if (args[i] === '--use' && args[i + 1]) {
     useVersion = args[++i];
   } else {
+    if (args[i] === '--daemon' || args[i] === '-d') isDaemon = true;
+    if (args[i] === '--stop') isStop = true;
     pythonArgs.push(args[i]);
   }
 }
@@ -252,71 +256,121 @@ if (!fs.existsSync(python)) {
 
 console.log(`[kite] Python:   ${python}`);
 
-const child = spawn(
-  python,
-  [path.join(versionDir, 'main.py'), ...pythonArgs],
-  { cwd: versionDir, env, stdio: 'inherit' }
-);
+// --stop: 同步执行，等待结果后退出
+if (isStop) {
+  const child = spawn(
+    python,
+    [path.join(versionDir, 'main.py'), ...pythonArgs],
+    { cwd: versionDir, env, stdio: 'inherit' }
+  );
+  child.on('error', err => {
+    console.error(`[kite] 执行失败: ${err.message}`);
+    process.exit(1);
+  });
+  child.on('exit', code => process.exit(code ?? 0));
+
+// --daemon / -d: 后台启动，Node 立即退出
+} else if (isDaemon) {
+  // 日志输出到实例目录
+  const basename = path.basename(kiteCwd);
+  const instanceDir = path.join(kiteHome, 'workspace', basename || 'default');
+  const logDir = path.join(instanceDir, 'launcher', 'log');
+  fs.mkdirSync(logDir, { recursive: true });
+  const daemonLog = path.join(logDir, 'daemon.log');
+  const logFd = fs.openSync(daemonLog, 'w');
+
+  const spawnOpts = {
+    cwd: versionDir,
+    env,
+    stdio: ['ignore', logFd, logFd],
+    detached: true,
+  };
+
+  // Windows: 额外设置无窗口标志
+  if (process.platform === 'win32') {
+    spawnOpts.windowsHide = true;
+  }
+
+  // 透传给 Python 时去掉 --daemon / -d，由 Node 层处理脱离
+  const childArgs = pythonArgs.filter(a => a !== '--daemon' && a !== '-d');
+  const child = spawn(
+    python,
+    [path.join(versionDir, 'main.py'), ...childArgs],
+    spawnOpts
+  );
 
-child.on('error', err => {
-  console.error(`[kite] 启动 Python 失败: ${err.message}`);
-  console.error(`[kite] 请确认 Python 3.8+ 已安装`);
-  console.error(`[kite] 或运行: npm install 重新准备环境`);
+  child.unref();
+  console.log(`[kite] 后台启动成功 (PID: ${child.pid})`);
+  console.log(`[kite] 日志: ${daemonLog}`);
+  console.log(`[kite] 停止: kite --stop`);
+  fs.closeSync(logFd);
+  process.exit(0);
 
-  // 标记环境失败
-  markEnvFailed('python_launch_failed');
-  process.exit(1);
-});
-
-child.on('exit', (code, signal) => {
-  // 如果是异常退出，检查是否是环境问题
-  if (code !== 0 && code !== null) {
-    console.error(`[kite] Python 进程异常退出，退出码: ${code}`);
-
-    // 读取 Kernel 日志，检查是否是依赖问题
-    // KITE_INSTANCE_DIR 由 Launcher 设置，格式为 ~/.kite/workspace/Kite
-    const workspaceDir = path.join(kiteHome, 'workspace');
-    const instanceDir = path.join(workspaceDir, 'Kite');
-    const kernelLog = path.join(instanceDir, 'kernel', 'log', 'latest.log');
-
-    let isDependencyIssue = false;
-
-    if (fs.existsSync(kernelLog)) {
-      try {
-        const log = fs.readFileSync(kernelLog, 'utf-8');
-
-        // 检测依赖相关错误
-        const depErrors = [
-          'ImportError',
-          'ModuleNotFoundError',
-          'not installed',
-          'cannot parse module.md',
-          'No module named',
-          'Failed to import'
-        ];
-
-        for (const errorPattern of depErrors) {
-          if (log.includes(errorPattern)) {
-            isDependencyIssue = true;
-            console.error(`[kite] 检测到依赖问题: ${errorPattern}`);
-            break;
+// 正常前台启动
+} else {
+  const child = spawn(
+    python,
+    [path.join(versionDir, 'main.py'), ...pythonArgs],
+    { cwd: versionDir, env, stdio: 'inherit' }
+  );
+
+  child.on('error', err => {
+    console.error(`[kite] 启动 Python 失败: ${err.message}`);
+    console.error(`[kite] 请确认 Python 3.8+ 已安装`);
+    console.error(`[kite] 或运行: npm install 重新准备环境`);
+
+    // 标记环境失败
+    markEnvFailed('python_launch_failed');
+    process.exit(1);
+  });
+
+  child.on('exit', (code, signal) => {
+    // 如果是异常退出，检查是否是环境问题
+    if (code !== 0 && code !== null) {
+      console.error(`[kite] Python 进程异常退出，退出码: ${code}`);
+
+      // 读取 Kernel 日志，检查是否是依赖问题
+      const workspaceDir = path.join(kiteHome, 'workspace');
+      const instanceDir = path.join(workspaceDir, 'Kite');
+      const kernelLog = path.join(instanceDir, 'kernel', 'log', 'latest.log');
+
+      let isDependencyIssue = false;
+
+      if (fs.existsSync(kernelLog)) {
+        try {
+          const log = fs.readFileSync(kernelLog, 'utf-8');
+
+          const depErrors = [
+            'ImportError',
+            'ModuleNotFoundError',
+            'not installed',
+            'cannot parse module.md',
+            'No module named',
+            'Failed to import'
+          ];
+
+          for (const errorPattern of depErrors) {
+            if (log.includes(errorPattern)) {
+              isDependencyIssue = true;
+              console.error(`[kite] 检测到依赖问题: ${errorPattern}`);
+              break;
+            }
           }
+        } catch (e) {
+          // 读取日志失败，忽略
         }
-      } catch (e) {
-        // 读取日志失败，忽略
       }
-    }
 
-    // 如果检测到依赖问题，或者是常见的环境错误码
-    if (isDependencyIssue || code === 1 || code === 127) {
-      console.error(`[kite] 下次启动将重新检查环境`);
-      markEnvFailed(isDependencyIssue ? 'dependency_import_error' : 'python_runtime_error');
+      if (isDependencyIssue || code === 1 || code === 127) {
+        console.error(`[kite] 下次启动将重新检查环境`);
+        markEnvFailed(isDependencyIssue ? 'dependency_import_error' : 'python_runtime_error');
+      }
     }
-  }
 
-  process.exit(code ?? 0);
-});
+    process.exit(code ?? 0);
+  });
 
-for (const sig of ['SIGINT', 'SIGTERM']) {
-  process.on(sig, () => child.kill(sig));
+  for (const sig of ['SIGINT', 'SIGTERM']) {
+    process.on(sig, () => child.kill(sig));
+  }
 }

package/launcher/entry.py

@@ -356,12 +356,59 @@ class Launcher:
         threading.Thread(target=_force, daemon=True).start()
 
     def _setup_unix_signals(self):
-        """Register SIGTERM/SIGINT handlers on Linux/macOS."""
+        """Register SIGTERM/SIGINT handlers + 'q' key listener on Linux/macOS."""
         def _handler(signum, frame):
             self._request_shutdown(f"收到信号 {signum}，正在关闭...")
         signal.signal(signal.SIGTERM, _handler)
         signal.signal(signal.SIGINT, _handler)
 
+        # 'q' key listener: 使用 termios 将 stdin 设为 raw 模式
+        def _listen_unix():
+            try:
+                import tty
+                import termios
+                import select
+            except ImportError:
+                return  # 无 tty 支持（如 daemon 模式），跳过
+
+            fd = sys.stdin.fileno()
+            try:
+                old_settings = termios.tcgetattr(fd)
+            except termios.error:
+                return  # stdin 不是终端（如重定向、daemon），跳过
+
+            try:
+                tty.setcbreak(fd)  # cbreak 模式：单字符读取，但保留 Ctrl+C 信号
+                while not self._thread_shutdown.is_set():
+                    # select 超时 0.2s，避免忙等
+                    rlist, _, _ = select.select([sys.stdin], [], [], 0.2)
+                    if rlist:
+                        ch = sys.stdin.read(1)
+                        if ch == '\x1b':  # ESC
+                            print("[launcher] ESC 强制退出")
+                            try:
+                                if self._ws and self._loop:
+                                    import concurrent.futures
+                                    fut = asyncio.run_coroutine_threadsafe(
+                                        self._publish_event("module.exiting", {
+                                            "module_id": "launcher",
+                                            "reason": "ESC exit",
+                                            "action": "none",
+                                        }),
+                                        self._loop,
+                                    )
+                                    fut.result(timeout=1)
+                            except Exception:
+                                pass
+                            os._exit(0)
+                        elif ch in ('q', 'Q'):
+                            self._request_shutdown("收到退出请求，正在关闭...")
+                            return
+            finally:
+                termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
+
+        threading.Thread(target=_listen_unix, daemon=True).start()
+
     def _setup_windows_exit(self):
         """SetConsoleCtrlHandler for Ctrl+C + daemon thread for 'q' key.
 

package/package.json

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