@caoruhua/open-claude-remote 0.1.6 → 0.2.3

package/dist/backend/src/daemon/daemon-entry.js

@@ -0,0 +1,37 @@
+"use strict";
+/**
+ * Daemon 子进程入口点
+ *
+ * 由 daemon-launcher.ts 通过 fork() 启动。
+ * 以 daemonMode 运行 startServer（不创建 firstSession，不接管 stdin/stdout）。
+ * 启动成功后通过 IPC 通知父进程，然后断开 IPC。
+ */
+// Daemon 不需要 CLI 模式的 logger 配置
+delete process.env.CLI_MODE;
+// 标记为无终端模式
+process.env.NO_TERMINAL = 'true';
+void (async () => {
+    try {
+        // 从环境变量读取 CLI overrides
+        const overridesJson = process.env.DAEMON_OVERRIDES;
+        const overrides = overridesJson ? JSON.parse(overridesJson) : {};
+        // 强制 daemon 模式
+        overrides.daemonMode = true;
+        const { startServer } = await import('../index.js');
+        await startServer(overrides);
+        // 服务启动成功，通知父进程
+        if (process.send) {
+            process.send({ type: 'ready', pid: process.pid });
+            // 断开 IPC 通道，让父进程可以独立退出
+            process.disconnect();
+        }
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        if (process.send) {
+            process.send({ type: 'error', message });
+        }
+        process.exit(1);
+    }
+})();
+//# sourceMappingURL=daemon-entry.js.map

package/dist/backend/src/daemon/daemon-entry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"daemon-entry.js","sourceRoot":"","sources":["../../../../backend/src/daemon/daemon-entry.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;AAEH,+BAA+B;AAC/B,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AAC5B,WAAW;AACX,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;AAEjC,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,IAAI,CAAC;QACH,wBAAwB;QACxB,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;QACnD,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEjE,eAAe;QACf,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;QAE5B,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;QACpD,MAAM,WAAW,CAAC,SAAS,CAAC,CAAC;QAE7B,eAAe;QACf,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YAClD,uBAAuB;YACvB,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,EAAE,CAAC"}

package/dist/backend/src/daemon/daemon-launcher.d.ts

@@ -0,0 +1,13 @@
+import type { CliOverrides } from '../config.js';
+export interface DaemonLaunchResult {
+    pid: number;
+}
+/**
+ * Fork 一个 daemon 子进程并等待其就绪
+ *
+ * @param overrides CLI 覆盖参数（传给 daemon 的 startServer）
+ * @returns daemon 进程的 PID
+ * @throws 启动超时或 daemon 报错
+ */
+export declare function launchDaemon(overrides?: Omit<CliOverrides, 'daemonMode'>): Promise<DaemonLaunchResult>;
+//# sourceMappingURL=daemon-launcher.d.ts.map

package/dist/backend/src/daemon/daemon-launcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"daemon-launcher.d.ts","sourceRoot":"","sources":["../../../../backend/src/daemon/daemon-launcher.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAOjD,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,SAAS,GAAE,IAAI,CAAC,YAAY,EAAE,YAAY,CAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAgDhH"}

package/dist/backend/src/daemon/daemon-launcher.js

@@ -0,0 +1,62 @@
+/**
+ * Daemon 启动器
+ *
+ * 使用 fork() 启动 daemon-entry.ts 作为独立子进程。
+ * 等待 IPC "ready" 消息确认启动成功，然后 unref 子进程让 CLI 可以独立退出。
+ */
+import { fork } from 'node:child_process';
+import { resolve, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+const __dirname = dirname(fileURLToPath(import.meta.url));
+/** daemon 启动超时（毫秒） */
+const DAEMON_READY_TIMEOUT_MS = 15_000;
+/**
+ * Fork 一个 daemon 子进程并等待其就绪
+ *
+ * @param overrides CLI 覆盖参数（传给 daemon 的 startServer）
+ * @returns daemon 进程的 PID
+ * @throws 启动超时或 daemon 报错
+ */
+export async function launchDaemon(overrides = {}) {
+    const entryPath = resolve(__dirname, 'daemon-entry.js');
+    // 判断是否运行在 tsx/ts-node 下（开发模式），使用 .ts 后缀
+    const isDevMode = process.execArgv.some(arg => arg.includes('tsx') || arg.includes('ts-node') || arg.includes('loader'));
+    const actualEntry = isDevMode
+        ? resolve(__dirname, 'daemon-entry.ts')
+        : entryPath;
+    const child = fork(actualEntry, [], {
+        detached: true,
+        stdio: ['ignore', 'ignore', 'ignore', 'ipc'],
+        env: {
+            ...process.env,
+            DAEMON_OVERRIDES: JSON.stringify(overrides),
+            CLI_MODE: undefined, // daemon 不是 CLI 模式
+        },
+    });
+    return new Promise((promiseResolve, reject) => {
+        const timeout = setTimeout(() => {
+            child.kill();
+            reject(new Error(`Daemon failed to start within ${DAEMON_READY_TIMEOUT_MS / 1000}s`));
+        }, DAEMON_READY_TIMEOUT_MS);
+        child.on('message', (msg) => {
+            clearTimeout(timeout);
+            if (msg.type === 'ready') {
+                // Daemon 启动成功，解除引用让 CLI 可以退出
+                child.unref();
+                promiseResolve({ pid: msg.pid });
+            }
+            else if (msg.type === 'error') {
+                reject(new Error(`Daemon startup failed: ${msg.message}`));
+            }
+        });
+        child.on('error', (err) => {
+            clearTimeout(timeout);
+            reject(new Error(`Failed to fork daemon: ${err.message}`));
+        });
+        child.on('exit', (code) => {
+            clearTimeout(timeout);
+            reject(new Error(`Daemon exited unexpectedly with code ${code}`));
+        });
+    });
+}
+//# sourceMappingURL=daemon-launcher.js.map

package/dist/backend/src/daemon/daemon-launcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"daemon-launcher.js","sourceRoot":"","sources":["../../../../backend/src/daemon/daemon-launcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,sBAAsB;AACtB,MAAM,uBAAuB,GAAG,MAAM,CAAC;AAMvC;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,YAA8C,EAAE;IACjF,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAExD,wCAAwC;IACxC,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CACrC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAChF,CAAC;IACF,MAAM,WAAW,GAAG,SAAS;QAC3B,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC;QACvC,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,EAAE,EAAE;QAClC,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC;QAC5C,GAAG,EAAE;YACH,GAAG,OAAO,CAAC,GAAG;YACd,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;YAC3C,QAAQ,EAAE,SAAS,EAAE,mBAAmB;SACzC;KACF,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAqB,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE;QAChE,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,KAAK,CAAC,IAAI,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,KAAK,CAAC,iCAAiC,uBAAuB,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;QACxF,CAAC,EAAE,uBAAuB,CAAC,CAAC;QAE5B,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAQ,EAAE,EAAE;YAC/B,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACzB,6BAA6B;gBAC7B,KAAK,CAAC,KAAK,EAAE,CAAC;gBACd,cAAc,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;YACnC,CAAC;iBAAM,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAChC,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACxB,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACxB,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,MAAM,CAAC,IAAI,KAAK,CAAC,wCAAwC,IAAI,EAAE,CAAC,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/backend/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../backend/src/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAmI,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAoBjL,wBAAsB,WAAW,CAAC,YAAY,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+YhF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../backend/src/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuC,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAgBrF,wBAAsB,WAAW,CAAC,YAAY,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmQhF"}

package/dist/backend/src/index.js

@@ -1,70 +1,47 @@
 import { createServer } from 'node:http';
 import { resolve, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { existsSync, readdirSync, unlinkSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { randomUUID } from 'node:crypto';
+import { existsSync } from 'node:fs';
 import express from 'express';
 import cors from 'cors';
-import { CLAUDE_REMOTE_DIR, SETTINGS_DIR } from '../../shared/index.js';
-import { loadConfig, createSessionCookieName, createClaudeSettings, extractSettingsFromArgs, saveClaudeSettings, ensureDefaultUserConfig } from './config.js';
+import { loadConfig, ensureDefaultUserConfig } from './config.js';
+import { PortInUseError } from './cli-utils.js';
 import { AuthModule } from './auth/auth-middleware.js';
-import { PtyManager } from './pty/pty-manager.js';
 import { WsServer } from './ws/ws-server.js';
-import { HookReceiver } from './hooks/hook-receiver.js';
-import { SessionController } from './session/session-controller.js';
+import { InstanceManager } from './instance/instance-manager.js';
 import { TerminalRelay } from './terminal/terminal-relay.js';
 import { createApiRouter } from './api/router.js';
+import { setDaemonStartTime } from './api/health-routes.js';
 import { PushService } from './push/push-service.js';
 import { createNotificationManager } from './notification/notification-manager.js';
 import { createNotificationServiceFactory } from './notification/notification-service-factory.js';
 import { logger, setInstanceContext } from './logger/logger.js';
 import { getOrCreateSharedToken } from './registry/shared-token.js';
-import { findAvailablePort } from './registry/port-finder.js';
-import { InstanceRegistryManager } from './registry/instance-registry.js';
-import { InstanceSpawner } from './registry/instance-spawner.js';
 import { IpMonitor } from './utils/ip-monitor.js';
-import { generateQRCodeLines } from './utils/qrcode-banner.js';
-import { getCurrentVersion } from './update.js';
+import { printBanner } from './utils/banner.js';
 export async function startServer(cliOverrides = {}) {
-    // 1. Load configuration
+    // 1. Load configuration (global + workdir merged)
     const config = loadConfig(cliOverrides);
-    const projectRoot = resolve(dirname(fileURLToPath(import.meta.url)), '../..');
     // 1.5. Ensure default shortcuts/commands in user config
     await ensureDefaultUserConfig();
     // 2. Shared config directory and token
-    const sharedConfigDir = resolve(homedir(), CLAUDE_REMOTE_DIR);
-    const { token, source: tokenSource } = getOrCreateSharedToken(sharedConfigDir, config.token ?? undefined);
-    // 3. Instance ID and registry
-    const instanceId = randomUUID();
-    const registry = new InstanceRegistryManager(sharedConfigDir);
-    // 4. Find available port (auto-increment if preferred port is occupied)
-    const actualPort = await findAvailablePort(config.port, config.host);
-    // Update config to reflect the actual port (cookie name must match actual port
-    // to prevent cross-instance cookie collision when port auto-increments)
-    if (actualPort !== config.port) {
-        config.sessionCookieName = createSessionCookieName(actualPort);
-        config.port = actualPort;
-        logger.info({
-            actualPort,
-            sessionCookieName: config.sessionCookieName,
-        }, 'Config updated for actual port');
-    }
-    // 设置日志实例上下文，后续所有日志自动包含 instancePort 字段
-    setInstanceContext(actualPort);
+    const homeConfigDir = resolve(process.env.HOME ?? process.env.USERPROFILE ?? '', '.claude-remote');
+    const { token, source: tokenSource } = getOrCreateSharedToken(homeConfigDir, config.token ?? undefined);
+    // 3. Fixed port (8866)
+    const port = config.port; // DEFAULT_PORT
+    // 设置日志实例上下文
+    setInstanceContext(port);
     // 5. Create Express app
     const app = express();
     app.use(express.json());
     app.use(cors({
         origin: (origin, callback) => {
-            // Allow same-origin requests (origin is undefined) and requests from LAN
             if (!origin) {
                 callback(null, true);
                 return;
             }
             try {
                 const url = new URL(origin);
-                // 允许同一 host 的任意端口（多实例跨端口访问）
                 const allowedHosts = [config.displayIp, 'localhost', '127.0.0.1'];
                 if (allowedHosts.includes(url.hostname)) {
                     callback(null, true);
@@ -80,49 +57,45 @@ export async function startServer(cliOverrides = {}) {
     }));
     // 6. Create HTTP server
     const httpServer = createServer(app);
-    // 7. Setup auth module
+    // 7. Setup auth module (fixed cookie name: session_id)
     const authModule = new AuthModule({
         token,
         sessionTtlMs: config.sessionTtlMs,
         rateLimitPerMinute: config.authRateLimit,
         cookieName: config.sessionCookieName,
     });
-    // 8. Setup Hook receiver
-    const hookReceiver = new HookReceiver();
-    // 9. Setup Push service
-    const pushService = new PushService(sharedConfigDir);
-    // 9.1. Create NotificationManager for dynamic enabled status checking
+    // 8. Setup Push service
+    const pushService = new PushService(homeConfigDir);
+    // 8.1. Create NotificationManager for dynamic enabled status checking
     const notificationManager = createNotificationManager();
-    // 9.2. Create NotificationServiceFactory for lazy-loading notification services
+    // 8.2. Create NotificationServiceFactory for lazy-loading notification services
     const notificationServiceFactory = createNotificationServiceFactory();
-    // 10. Session controller reference (set after PTY spawn)
-    let sessionController = null;
-    // 10.5. Create Instance Spawner (for creating new instances via API)
-    const instanceSpawner = new InstanceSpawner();
-    // 11. Create WebSocket server (needed for API routes)
+    // 9. InstanceManager (replaces SessionController)
+    const instanceManager = new InstanceManager();
+    instanceManager.setSharedServices({
+        pushService,
+        notificationManager,
+        notificationServiceFactory,
+        displayIp: config.displayIp,
+    });
+    // 10. Create WebSocket server (with InstanceManager routing)
     const wsServer = new WsServer(httpServer, authModule);
-    // 12. Mount REST API (with instance routes)
+    wsServer.setInstanceManager(instanceManager);
+    // 11. Mount REST API
     app.use('/api', createApiRouter({
         authModule,
-        hookReceiver,
-        getController: () => sessionController,
+        instanceManager,
         pushService,
-        listInstances: () => registry.list(),
-        currentInstanceId: instanceId,
-        instanceSpawner,
         notificationManager,
         notificationServiceFactory,
-        wsServer,
+        onShutdown: () => shutdown(0),
     }));
-    // 13. Serve frontend static files (if built)
+    // 12. Serve frontend static files (if built)
     const __dirname = dirname(fileURLToPath(import.meta.url));
-    // 开发模式 (tsx backend/src/index.ts): __dirname = backend/src/ → ../../frontend-dist
-    // 生产构建 (node dist/backend/src/index.js): __dirname = dist/backend/src/ → ../../../frontend-dist
     const isDistBuild = __dirname.includes('/dist/');
     const frontendDist = resolve(__dirname, isDistBuild ? '../../../frontend-dist' : '../../frontend-dist');
     if (existsSync(frontendDist)) {
         app.use(express.static(frontendDist));
-        // SPA fallback — skip /api and /ws paths to avoid hijacking backend routes
         app.get('*', (req, res, next) => {
             if (req.path.startsWith('/api') || req.path.startsWith('/ws')) {
                 return next();
@@ -134,139 +107,86 @@ export async function startServer(cliOverrides = {}) {
     else {
         logger.warn('Frontend dist not found, skipping static file serving');
     }
-    // 14. Spawn PTY with Claude Code CLI
-    const ptyManager = new PtyManager();
-    // 15. Terminal Relay (条件启动，headless 模式跳过)
-    const noTerminal = process.env.NO_TERMINAL === 'true';
-    const relay = (!noTerminal && process.stdin.isTTY) ? new TerminalRelay(ptyManager) : undefined;
-    // 16. Create Session Controller (with relay for dynamic master switch)
-    sessionController = new SessionController(ptyManager, wsServer, hookReceiver, config.maxBufferLines, relay);
-    sessionController.setPushService(pushService);
-    sessionController.setNotificationManager(notificationManager);
-    sessionController.setNotificationServiceFactory(notificationServiceFactory);
-    // 设置实例 URL（初始化）
-    const instanceUrl = `http://${config.displayIp}:${actualPort}`;
-    sessionController.setInstanceUrl(instanceUrl);
-    // 17. Spawn Claude Code with instance-specific hook settings
-    // 检查用户是否传了 --settings 参数，如果有则合并 hooks
-    const extracted = extractSettingsFromArgs(config.claudeArgs);
-    let finalArgs;
-    // 生成最终的 settings 对象
-    const finalSettings = createClaudeSettings(actualPort, extracted?.settingsValue);
-    // 保存到文件并通过文件路径传递给 Claude
-    const settingsPath = saveClaudeSettings(finalSettings, actualPort, sharedConfigDir);
-    if (extracted) {
-        finalArgs = [...extracted.otherArgs, '--settings', settingsPath];
-        logger.info({ port: actualPort, originalSettingsPath: extracted.settingsPath, savedSettingsPath: settingsPath }, 'Merged user settings with hooks');
-    }
-    else {
-        finalArgs = [...config.claudeArgs, '--settings', settingsPath];
-        logger.info({ port: actualPort, savedSettingsPath: settingsPath }, 'Generated Claude settings with instance-specific hook URL');
-    }
-    ptyManager.on('error', (err) => {
-        logger.error({ err }, 'PTY process error');
-        process.stderr.write(`\n[ERROR] Failed to start Claude CLI: ${err.message}\n`);
-        registry.unregister(instanceId);
-        process.exit(1);
-    });
-    ptyManager.spawn({
-        command: config.claudeCommand,
-        args: finalArgs,
-        cwd: config.claudeCwd,
-    });
-    // Start relay after spawn (if not headless)
-    if (relay) {
-        relay.start();
-    }
-    sessionController.setStatus('running');
-    // 18. Register instance in shared registry
-    registry.register({
-        instanceId,
-        name: config.instanceName,
-        host: config.displayIp,
-        port: actualPort,
-        pid: process.pid,
-        cwd: config.claudeCwd,
-        startedAt: new Date().toISOString(),
-        headless: noTerminal,
-        claudeArgs: config.claudeArgs.length > 0 ? config.claudeArgs : undefined,
-    });
-    // 18.5. Clean up stale settings files for dead instances
-    try {
-        const settingsDir = resolve(sharedConfigDir, SETTINGS_DIR);
-        if (existsSync(settingsDir)) {
-            const alivePorts = new Set((await registry.list()).map(i => i.port));
-            for (const file of readdirSync(settingsDir)) {
-                const match = file.match(/^(\d+)\.json$/);
-                if (match) {
-                    const port = parseInt(match[1], 10);
-                    if (!alivePorts.has(port)) {
-                        try {
-                            unlinkSync(resolve(settingsDir, file));
-                            logger.info({ file, port }, 'Cleaned up stale settings file');
-                        }
-                        catch {
-                            // 静默处理：清理失败不影响启动
-                        }
-                    }
-                }
-            }
+    // 13. Create first instance (skip in daemon mode — instances created via API)
+    const daemonMode = cliOverrides.daemonMode === true;
+    let firstSession;
+    let relay;
+    let ptyDataHandler;
+    if (!daemonMode) {
+        const noTerminal = process.env.NO_TERMINAL === 'true';
+        firstSession = instanceManager.createInstance({
+            cwd: config.claudeCwd,
+            name: config.instanceName,
+            claudeCommand: config.claudeCommand,
+            claudeArgs: config.claudeArgs,
+            headless: noTerminal,
+        });
+        // 14. Terminal Relay (条件启动，headless 模式跳过)
+        //     PTY output → stdout: InstanceSession 只广播给 WS 客户端，CLI 需要额外管道
+        const isTTY = !noTerminal && process.stdin.isTTY;
+        if (isTTY) {
+            ptyDataHandler = (data) => {
+                process.stdout.write(data);
+            };
+            firstSession.ptyManager.on('data', ptyDataHandler);
+        }
+        relay = isTTY ? new TerminalRelay(firstSession.ptyManager) : undefined;
+        if (relay) {
+            relay.start();
         }
     }
-    catch (err) {
-        logger.debug({ err }, 'Settings cleanup skipped');
-    }
-    // 18.6. Start IP monitor
+    // 15. IP monitor
     const ipMonitor = new IpMonitor((newIp, oldIp) => {
-        const newUrl = `http://${newIp}:${actualPort}`;
-        logger.info({ oldIp, newIp, newUrl }, 'IP change detected');
-        // Update config
+        logger.info({ oldIp, newIp }, 'IP change detected');
         config.displayIp = newIp;
-        // Update registry
-        registry.updateHost(instanceId, newIp);
-        // Update instance URL in session controller
-        sessionController?.setInstanceUrl(newUrl);
-        // Broadcast to all connected clients
-        wsServer.broadcast({
-            type: 'ip_changed',
-            oldIp,
-            newIp,
-            newUrl,
-        });
-    }, 30000, 2); // 30s interval, 2 consecutive detections required
+        instanceManager.updateDisplayIp(newIp);
+    }, 30000, 2);
     ipMonitor.start(config.displayIp);
-    // 19. Unified graceful shutdown
+    // 16. Unified graceful shutdown
     let shuttingDown = false;
     const shutdown = (exitCode = 0) => {
         if (shuttingDown)
             return;
         shuttingDown = true;
         logger.info({ exitCode }, 'Shutting down...');
-        // Unregister from shared registry
-        registry.unregister(instanceId);
         if (relay) {
             relay.stop();
         }
         ipMonitor.stop();
-        // Pause stdin to remove it as an active event loop handle
         if (!process.stdin.isTTY) {
             process.stdin.pause();
         }
-        ptyManager.destroy();
+        instanceManager.destroyAll();
         wsServer.destroy();
         authModule.destroy();
         httpServer.close(() => {
             process.exit(exitCode);
         });
-        // Force exit if httpServer.close hangs (ref'd to guarantee it fires)
         setTimeout(() => process.exit(exitCode), 2000);
     };
-    // Handle PTY exit → graceful shutdown
-    ptyManager.on('exit', (exitCode) => {
-        logger.info({ exitCode }, 'Claude Code exited');
-        // Give time for WS messages to flush, then shutdown
-        setTimeout(() => shutdown(exitCode), 500);
-    });
+    // Handle first instance PTY exit (only in non-daemon mode)
+    if (firstSession) {
+        const session = firstSession;
+        session.on('exit', (exitCode) => {
+            logger.info({ exitCode, instanceId: session.instanceId }, 'First instance PTY exited');
+            // 打印提示后 CLI 退出，daemon 后台运行
+            // 注意：先打印提示再停止 relay，确保输出可见
+            process.stderr.write(`\nInstance "${session.name}" exited with code ${exitCode}.\n`);
+            process.stderr.write('Daemon is still running. Use "claude-remote stop" to shut down.\n\n');
+            // 清理 PTY 输出监听器（避免事件循环句柄残留）
+            if (ptyDataHandler) {
+                session.ptyManager.removeListener('data', ptyDataHandler);
+            }
+            // 停止 terminal relay（恢复终端状态）
+            if (relay) {
+                relay.stop();
+            }
+            // CLI 退出，daemon 继续后台运行
+            // 注意：不调用 shutdown()，只移除 CLI 相关的事件监听并退出进程
+            process.exitCode = exitCode;
+            process.exit(exitCode);
+        });
+    }
     process.on('SIGINT', () => {
         logger.info('SIGINT received');
         shutdown(0);
@@ -275,23 +195,16 @@ export async function startServer(cliOverrides = {}) {
         logger.info('SIGTERM received');
         shutdown(0);
     });
-    // When running via pnpm dev (stdin is a pipe, not TTY), detect parent process exit
-    // via stdin close event — this fires when concurrently/pnpm terminates
-    // Also handle Ctrl+C which may come through stdin in pipe mode
-    if (!process.stdin.isTTY) {
+    // When running via pnpm dev (stdin is a pipe, not TTY) — skip in daemon mode
+    if (!daemonMode && !process.stdin.isTTY) {
         process.stdin.resume();
-        // Kitty keyboard protocol CSI u variants for Ctrl+C:
-        // Match press/repeat (event type 1 or 2) but not release (3)
         const CTRL_C = '\x03';
         const KITTY_CTRL_C_RE = /\x1b\[99;5(?::(?:[12]))?(?:;\d+)*u/;
-        // Use 'readable' event for immediate reads without waiting for newline
-        // In pipe mode, 'data' event is line-buffered and waits for Enter
         process.stdin.on('readable', () => {
             let chunk;
             while ((chunk = process.stdin.read()) !== null) {
                 const str = chunk.toString();
                 logger.info({ hex: chunk.toString('hex'), len: chunk.length, str: str.replace(/\x1b/g, 'ESC') }, 'stdin data received in non-TTY mode');
-                // Single Ctrl+C (classic ETX or Kitty protocol) → shutdown immediately
                 if (str === CTRL_C || KITTY_CTRL_C_RE.test(str)) {
                     logger.info('Ctrl+C detected in pipe mode, initiating shutdown');
                     shutdown(0);
@@ -303,86 +216,37 @@ export async function startServer(cliOverrides = {}) {
             shutdown(0);
         });
     }
-    // 20. Handle port collision (TOCTOU between findAvailablePort and listen)
-    httpServer.on('error', (err) => {
-        if (err.code === 'EADDRINUSE') {
-            logger.error({ port: actualPort, host: config.host }, 'Port is already in use (TOCTOU race). Another process claimed it between port check and listen.');
-            process.exit(1);
-        }
-        logger.error({ err }, 'HTTP server error');
-        process.exit(1);
-    });
-    // 21. Start listening
-    httpServer.listen(actualPort, config.host, () => {
-        const url = `http://${config.displayIp}:${actualPort}`;
-        const qrUrl = `${url}?token=${token}`;
-        const qrLines = generateQRCodeLines(qrUrl);
-        // Version (with fallback)
-        let version = '';
-        try {
-            version = getCurrentVersion();
-        }
-        catch { /* ignore */ }
-        // Left column: instance info + commands
-        const leftLines = [];
-        leftLines.push(`Instance:  ${config.instanceName}`);
-        leftLines.push(`URL:       ${url}`);
-        leftLines.push(`PID:       ${process.pid}`);
-        leftLines.push(`Logs:      ${config.logDir}`);
-        leftLines.push('');
-        leftLines.push('Commands:');
-        leftLines.push(`  attach:  claude-remote attach ${actualPort}`);
-        leftLines.push('  update:  claude-remote update');
-        // Right column: QR lines + blank + centered label
-        const qrLabel = 'Scan QR to connect';
-        const rightLines = [...qrLines, ''];
-        const targetHeight = Math.max(leftLines.length, rightLines.length + 1);
-        while (rightLines.length < targetHeight - 1) {
-            rightLines.push('');
-        }
-        rightLines.push(qrLabel);
-        // Width calculations
-        const qrWidth = Math.max(qrLines[0]?.length || 0, qrLabel.length);
-        const leftWidth = Math.max(...leftLines.map(l => l.length), 35);
-        const totalWidth = leftWidth + qrWidth + 6;
-        // Border components
-        const topBorder = '╔' + '═'.repeat(totalWidth - 2) + '╗';
-        const title = version ? `Claude Code Remote v${version}` : 'Claude Code Remote';
-        const titleLine = '║' + title.padStart(Math.floor((totalWidth - 2 + title.length) / 2)).padEnd(totalWidth - 2) + '║';
-        const sepLine = '╠' + '═'.repeat(leftWidth + 1) + '╤' + '═'.repeat(qrWidth + 2) + '╣';
-        const midSep = '╠' + '═'.repeat(leftWidth + 1) + '╧' + '═'.repeat(qrWidth + 2) + '╣';
-        const tokenLine = '║ ' + `Token: ${token}`.padEnd(totalWidth - 4) + ' ║';
-        const bottomBorder = '╚' + '═'.repeat(totalWidth - 2) + '╝';
-        // Render three-section banner
-        process.stderr.write('\n');
-        process.stderr.write(topBorder + '\n');
-        process.stderr.write(titleLine + '\n');
-        process.stderr.write(sepLine + '\n');
-        const maxLines = Math.max(leftLines.length, rightLines.length);
-        for (let i = 0; i < maxLines; i++) {
-            const left = (leftLines[i] || '').padEnd(leftWidth);
-            let right;
-            if (i < qrLines.length && rightLines[i]) {
-                right = ` ${rightLines[i]} `.padEnd(qrWidth + 2);
-            }
-            else if (rightLines[i]) {
-                const centered = rightLines[i].padStart(Math.floor((qrWidth + rightLines[i].length) / 2)).padEnd(qrWidth);
-                right = ` ${centered} `;
+    // 17. Start listening (awaitable: resolves on success, rejects on error)
+    await new Promise((resolve, reject) => {
+        httpServer.on('error', (err) => {
+            if (err.code === 'EADDRINUSE') {
+                logger.warn({ port, host: config.host }, 'Port is already in use, will attempt fallback');
+                reject(new PortInUseError(port));
+                return;
             }
-            else {
-                right = ' '.repeat(qrWidth + 2);
+            logger.error({ err }, 'HTTP server error');
+            reject(err);
+        });
+        httpServer.listen(port, config.host, () => {
+            // Record daemon start time
+            setDaemonStartTime(new Date().toISOString());
+            const url = `http://${config.displayIp}:${port}`;
+            if (!daemonMode) {
+                // CLI 直接启动模式（pnpm dev 等）：打印 banner
+                printBanner({
+                    url,
+                    token,
+                    instanceName: config.instanceName,
+                    logDir: config.logDir,
+                    pid: process.pid,
+                });
             }
-            process.stderr.write(`║ ${left}│${right}║\n`);
-        }
-        process.stderr.write(midSep + '\n');
-        process.stderr.write(tokenLine + '\n');
-        process.stderr.write(bottomBorder + '\n');
-        process.stderr.write('\n');
-        logger.info({ url, host: config.host, port: actualPort, instanceName: config.instanceName, tokenSource }, 'Server started');
+            logger.info({ url, host: config.host, port, instanceName: config.instanceName, tokenSource, daemonMode }, 'Server started');
+            resolve();
+        });
     });
 }
 // Auto-start when run directly (non-CLI mode)
-// CLI mode: cli.ts imports startServer() directly
 if (process.argv[1] && fileURLToPath(import.meta.url) === process.argv[1]) {
     startServer().catch((err) => {
         logger.error({ err }, 'Failed to start');