lark-remote 0.5.19 → 0.5.21

package/dist/index.js

@@ -1,4 +1,4 @@
-import { loadConfig, getAgentConfig } from './config/index.js';
+import { loadConfig, getAgentConfig, PI_DEFAULTS, KIMI_DEFAULTS, } from './config/index.js';
 import { resolveAgentChoices } from './runner/index.js';
 import { ensureConfig } from './config/wizard.js';
 import { parseCliArgs, resolveConfigDir, setConfigDir, printHelp, printVersion, } from './config/dir.js';
@@ -29,6 +29,13 @@ import { buildSessionHistoryCard, pickResumeCardEvents } from './card/card-helpe
 import { newSessionButton, resumeCompactButton, agentDisplayName } from './card/card-shared.js';
 import path from 'node:path';
 import { setupMessageHandlers } from './message-handlers.js';
+/**
+ * 分钟 → 毫秒（turn idle timeout 等 config 字段共用）。
+ * 未配置（undefined/null）→ undefined = 不设该超时，与原三处内联三元逐字等价。
+ */
+function minutesToMs(minutes) {
+    return minutes != null ? minutes * 60_000 : undefined;
+}
 /** Send auto-resume card for a restored session */
 async function sendAutoResumeCard(connector, contact, cwd, session, state, compactSupported = false, stillRunning = false) {
     if (!contact.userId)
@@ -38,7 +45,7 @@ async function sendAutoResumeCard(connector, contact, cwd, session, state, compa
         return;
     // Limit history events to prevent card size exceeded error (11310).
     // 窗口按"最后 N 条"截，但强制保住最后一条用户消息与最后一条 assistant 正文，
-    // 否则工具往返会把它俩一起挤出卡（2026-10-19 恢复卡只剩 5 个 bash 面板）。
+    // 否则工具往返多时（如连续 bash 面板占满窗口）会把这两条挤出卡。
     const MAX_HISTORY_EVENTS = 5;
     const eventsToShow = pickResumeCardEvents(state.events, MAX_HISTORY_EVENTS);
     const hiddenCount = state.events.length - eventsToShow.length;
@@ -122,151 +129,28 @@ async function setupInstanceLockAndHandlers(instanceLock, logger, configDir) {
         }
     });
 }
-/** Initialize per-workspace runner factory + agent registry. */
-function initializeRunner(config, configDir, cliArgs) {
-    const agentRegistry = new AgentRegistry();
-    // 单点化：runner factory 取最新 config 的唯一入口（语义保持，
-    // container 未接线时回退启动快照）。
-    const latest = () => agentRegistry.getConfigContainer()?.current ?? config;
-    // One global DSH per machine/DSH_HOME. This resolver reuses a listening
-    // process or starts `dsh web` detached; it never owns the child's lifetime.
-    const dshDaemon = new DshDaemon({
-        host: () => getAgentConfig(latest(), 'dsh')?.host,
-        dshHome: () => getAgentConfig(latest(), 'dsh')?.dshHome,
-        dshCommand: () => getAgentConfig(latest(), 'dsh')?.dshCommand,
-        manageProcess: () => getAgentConfig(latest(), 'dsh')?.manageProcess ?? true,
-        startTimeoutMs: () => getAgentConfig(latest(), 'dsh')?.startTimeoutMs,
-    });
+/**
+ * 创建全部 session reader。runner 侧不 import session 层（否则 runner ↔ session
+ * 互相依赖），统一由组合根注入。
+ */
+function createSessionReaders(config, latest) {
     // claude 的会话读取器与其余 agent 一样由组合根注入：runner 侧不 import session
     // 层（否则 runner ↔ session 互相依赖），且 bridge 读 usage / router 列 session
     // 用的是同一个实例（缓存共用）。
-    const claudeSessionReader = new ClaudeSessionReader();
-    // Claude factory reads from configContainer (not closure) so runtime
-    // config changes (model, effort, stopGraceMs) take effect after
-    // bridge.setConfig() + clearRunners(). Same pattern as codex/pi/kimi.
-    agentRegistry.register('claude', (ws) => {
-        const claudeConfig = latest().claude;
-        return new ClaudeRunner({
-            model: claudeConfig.model,
-            effort: claudeConfig.effort,
-            stopGraceMs: claudeConfig.stopGraceMs,
-            settings: cliArgs.settings,
-            pidDir: configDir,
-            cwd: ws,
-            sessionReader: claudeSessionReader,
-            permissionMode: claudeConfig.permissionMode,
-            idleTtlMs: claudeConfig.idleTtlMinutes != null ? claudeConfig.idleTtlMinutes * 60_000 : undefined,
-        });
-    });
-    // Register Codex runner (app-server only). The registry factory reads latest
-    // config from container.current so runtime config changes (model, sandbox,
-    // approvalPolicy, reasoningEffort, etc.) take effect after bridge.setConfig()
-    // + clearRunners().
-    const codexSessionReader = new CodexSessionReader({ codexHome: process.env.CODEX_HOME });
-    agentRegistry.register('codex', (_ws) => {
-        const codexConfig = getAgentConfig(latest(), 'codex');
-        return new CodexAppServerRunner({
-            kind: 'codex',
-            model: codexConfig?.model,
-            modelProvider: codexConfig?.modelProvider,
-            reasoningEffort: codexConfig?.reasoningEffort,
-            sessionReader: codexSessionReader,
-            sandbox: codexConfig?.sandbox,
-            approvalPolicy: codexConfig?.approvalPolicy,
-            binary: codexConfig?.appServer?.binary,
-            requestTimeoutMs: codexConfig?.appServer?.requestTimeoutMs,
-            idleTtlMs: codexConfig?.appServer?.idleTtlMs,
-            turnTimeoutMs: codexConfig?.appServer?.turnIdleTimeoutMinutes != null
-                ? codexConfig.appServer.turnIdleTimeoutMinutes * 60_000
-                : undefined,
-        });
-    });
-    // Register OpencodeAcpRunner (pure ACP mode, `opencode acp` JSON-RPC over stdio)
-    // Register session reader (same instance as used by runner)
-    const sessionReaderRegistry = new SessionReaderRegistry();
-    sessionReaderRegistry.register('claude', claudeSessionReader);
-    sessionReaderRegistry.register('codex', codexSessionReader);
+    const claude = new ClaudeSessionReader();
+    const codex = new CodexSessionReader({ codexHome: process.env.CODEX_HOME });
     // Register OpencodeSessionReader (CLI version)
     // Using `opencode session list` and `session export` instead of HTTP API.
     // Share the configured binary with the ACP runner so `opencode2` (v2) can
     // be used without the reader silently falling back to a v1 `opencode`.
     // The reader is registered once; changing acp.binary at runtime requires a
     // lark-remote restart.
-    const opencodeSessionReader = new OpencodeSessionReader({
+    const opencode = new OpencodeSessionReader({
         binary: getAgentConfig(config, 'opencode')?.acp?.binary,
     });
-    agentRegistry.register('opencode', (_ws) => {
-        const ocConfig = getAgentConfig(latest(), 'opencode');
-        // Build model string with validation: provider/model format
-        let model;
-        if (ocConfig?.modelID) {
-            const provider = ocConfig.providerID ?? 'anthropic';
-            // Validate: if modelID contains '/', it's already in provider/model format
-            if (ocConfig.modelID.includes('/')) {
-                model = ocConfig.modelID;
-            }
-            else {
-                model = `${provider}/${ocConfig.modelID}`;
-            }
-        }
-        return new OpencodeAcpRunner({
-            kind: 'opencode',
-            model,
-            sessionReader: opencodeSessionReader,
-            mode: ocConfig?.mode ?? 'build',
-            binary: ocConfig?.acp?.binary,
-            requestTimeoutMs: ocConfig?.acp?.requestTimeoutMs,
-            idleTtlMs: ocConfig?.acp?.idleTtlMs,
-            turnIdleTimeoutMs: ocConfig?.acp?.turnIdleTimeoutMinutes != null
-                ? ocConfig.acp.turnIdleTimeoutMinutes * 60_000
-                : undefined,
-        });
-    });
-    sessionReaderRegistry.register('opencode', opencodeSessionReader);
-    // Register PiRpcRunner and PiSessionReader
-    // 2026-07-12: 修复 config.save 后 pi provider 不生效的问题
-    // 关键：factory 闭包必须能访问到最新的 config，而不是启动时的快照
-    // 用可变容器存储 config 引用，registry 持有容器引用，factory 从容器读取最新值
-    const configContainer = { current: config };
-    agentRegistry.setConfigContainer(configContainer);
-    const piSessionReader = new PiSessionReader();
-    agentRegistry.register('pi', (ws) => {
-        const piConf = getAgentConfig(latest(), 'pi');
-        return new PiRpcRunner({
-            provider: piConf?.provider ?? 'Volcano',
-            model: piConf?.model ?? 'glm-5.2',
-            thinking: piConf?.thinking ?? 'medium',
-            tools: (piConf?.tools ?? 'read,bash,edit,write,grep,find,ls')
-                .split(',')
-                .map((t) => t.trim())
-                .filter(Boolean),
-            cwd: ws,
-            sessionReader: piSessionReader,
-        });
-    });
-    sessionReaderRegistry.register('pi', piSessionReader);
-    // Register KimiAcpRunner (pure ACP mode) and KimiSessionReader
-    const kimiSessionReader = new KimiSessionReader();
-    agentRegistry.register('kimi', (_ws) => {
-        const kimiConf = getAgentConfig(latest(), 'kimi');
-        const acpConf = kimiConf?.acp;
-        return new KimiAcpRunner({
-            kind: 'kimi',
-            sessionReader: kimiSessionReader,
-            binary: acpConf?.binary ?? 'kimi',
-            requestTimeoutMs: acpConf?.requestTimeoutMs,
-            idleTtlMs: acpConf?.idleTtlMs,
-            turnIdleTimeoutMs: acpConf?.turnIdleTimeoutMinutes != null
-                ? acpConf.turnIdleTimeoutMinutes * 60_000
-                : undefined,
-            model: kimiConf?.model ?? 'kimi-code/k3',
-            thinkingEffort: kimiConf?.thinkingEffort,
-            permissionMode: kimiConf?.permissionMode ?? 'manual',
-        });
-    });
-    sessionReaderRegistry.register('kimi', kimiSessionReader);
-    // Register DshRunner (HTTP-only DSH Web Host agent) and DshSessionReader.
-    const dshSessionReader = new DshSessionReader({
+    const pi = new PiSessionReader();
+    const kimi = new KimiSessionReader();
+    const dsh = new DshSessionReader({
         // hostProvider 每次调用读最新 config：/config 修改 host 后 runner 重建为
         // 新 host，reader（/resume、用量、完成卡）也跟随新 host。
         hostProvider: () => getAgentConfig(latest(), 'dsh')?.host,
@@ -274,53 +158,217 @@ function initializeRunner(config, configDir, cliArgs) {
         tokenProvider: () => getAgentConfig(latest(), 'dsh')?.token,
         credentialsFileProvider: () => getAgentConfig(latest(), 'dsh')?.credentialsFile,
     });
+    return { claude, codex, opencode, pi, kimi, dsh };
+}
+// Claude factory reads from configContainer (not closure) so runtime
+// config changes (model, effort, stopGraceMs) take effect after
+// bridge.setConfig() + clearRunners(). Same pattern as codex/pi/kimi.
+function claudeRunnerOptions(deps, cwdOpt) {
+    const { cliArgs, configDir, latest, readers } = deps;
+    const claudeConfig = latest().claude;
+    return {
+        model: claudeConfig.model,
+        effort: claudeConfig.effort,
+        stopGraceMs: claudeConfig.stopGraceMs,
+        settings: cliArgs.settings,
+        pidDir: configDir,
+        cwd: cwdOpt.cwd,
+        sessionReader: readers.claude,
+        permissionMode: claudeConfig.permissionMode,
+        idleTtlMs: claudeConfig.idleTtlMinutes != null ? claudeConfig.idleTtlMinutes * 60_000 : undefined,
+    };
+}
+// Register Codex runner (app-server only). The registry factory reads latest
+// config from container.current so runtime config changes (model, sandbox,
+// approvalPolicy, reasoningEffort, etc.) take effect after bridge.setConfig()
+// + clearRunners().
+function codexRunnerOptions(deps) {
+    const codexConfig = getAgentConfig(deps.latest(), 'codex');
+    return {
+        kind: 'codex',
+        model: codexConfig?.model,
+        modelProvider: codexConfig?.modelProvider,
+        reasoningEffort: codexConfig?.reasoningEffort,
+        sessionReader: deps.readers.codex,
+        sandbox: codexConfig?.sandbox,
+        approvalPolicy: codexConfig?.approvalPolicy,
+        binary: codexConfig?.appServer?.binary,
+        requestTimeoutMs: codexConfig?.appServer?.requestTimeoutMs,
+        idleTtlMs: codexConfig?.appServer?.idleTtlMs,
+        turnTimeoutMs: minutesToMs(codexConfig?.appServer?.turnIdleTimeoutMinutes),
+    };
+}
+// Register OpencodeAcpRunner (pure ACP mode, `opencode acp` JSON-RPC over stdio)
+function opencodeRunnerOptions(deps) {
+    const ocConfig = getAgentConfig(deps.latest(), 'opencode');
+    // Build model string with validation: provider/model format
+    let model;
+    if (ocConfig?.modelID) {
+        const provider = ocConfig.providerID ?? 'anthropic';
+        // Validate: if modelID contains '/', it's already in provider/model format
+        if (ocConfig.modelID.includes('/')) {
+            model = ocConfig.modelID;
+        }
+        else {
+            model = `${provider}/${ocConfig.modelID}`;
+        }
+    }
+    return {
+        kind: 'opencode',
+        model,
+        sessionReader: deps.readers.opencode,
+        mode: ocConfig?.mode ?? 'build',
+        binary: ocConfig?.acp?.binary,
+        requestTimeoutMs: ocConfig?.acp?.requestTimeoutMs,
+        idleTtlMs: ocConfig?.acp?.idleTtlMs,
+        turnIdleTimeoutMs: minutesToMs(ocConfig?.acp?.turnIdleTimeoutMinutes),
+    };
+}
+// Register PiRpcRunner.
+// factory 闭包必须读最新 config 而不是启动时的快照，否则 /config 保存后
+// provider 等字段对 pi 不生效：config 引用放在可变容器里（见上文
+// setConfigContainer），factory 每次从容器取最新值。
+// PiSessionReader 的创建与注册见 registerSessionReaders。
+function piRunnerOptions(deps, cwdOpt) {
+    const piConf = getAgentConfig(deps.latest(), 'pi');
+    return {
+        provider: piConf?.provider ?? PI_DEFAULTS.provider,
+        model: piConf?.model ?? PI_DEFAULTS.model,
+        thinking: piConf?.thinking ?? PI_DEFAULTS.thinking,
+        tools: (piConf?.tools ?? PI_DEFAULTS.tools)
+            .split(',')
+            .map((t) => t.trim())
+            .filter(Boolean),
+        cwd: cwdOpt.cwd,
+        sessionReader: deps.readers.pi,
+    };
+}
+// Register KimiAcpRunner (pure ACP mode)
+function kimiRunnerOptions(deps) {
+    const kimiConf = getAgentConfig(deps.latest(), 'kimi');
+    const acpConf = kimiConf?.acp;
+    return {
+        kind: 'kimi',
+        sessionReader: deps.readers.kimi,
+        binary: acpConf?.binary ?? 'kimi',
+        requestTimeoutMs: acpConf?.requestTimeoutMs,
+        idleTtlMs: acpConf?.idleTtlMs,
+        turnIdleTimeoutMs: minutesToMs(acpConf?.turnIdleTimeoutMinutes),
+        model: kimiConf?.model ?? KIMI_DEFAULTS.model,
+        thinkingEffort: kimiConf?.thinkingEffort,
+        permissionMode: kimiConf?.permissionMode ?? 'manual',
+    };
+}
+// Warm the shared process in the background so the first message and
+// `/resume` do not pay the full startup delay. Failures surface from
+// DshRunner.run(), which awaits the same resolver.
+function warmDshDaemon(dshDaemon, failureLabel) {
+    void dshDaemon.ensure().catch((error) => {
+        getLogger().warn(`[dsh] ${failureLabel}: ${error.message}`);
+    });
+}
+// Register DshRunner (HTTP-only DSH Web Host agent).
+function dshRunnerOptions(deps) {
+    const dshConf = getAgentConfig(deps.latest(), 'dsh');
+    return {
+        kind: 'dsh',
+        sessionReader: deps.readers.dsh,
+        daemon: deps.dshDaemon,
+        host: dshConf?.host,
+        dshHome: dshConf?.dshHome,
+        token: dshConf?.token,
+        credentialsFile: dshConf?.credentialsFile,
+        agentPreset: dshConf?.agentPreset,
+        permissionPreset: dshConf?.permissionPreset,
+        provider: dshConf?.provider,
+        model: dshConf?.model,
+        reasoningEffort: dshConf?.reasoningEffort,
+        // Durable markers for turns that outlive this process; reconciled on the
+        // next startup (see reconcileInflightDshRuns).
+        inflightPath: dshInflightPath(deps.configDir),
+    };
+}
+function registerRunners(agentRegistry, deps) {
+    agentRegistry.register('claude', (ws) => {
+        return new ClaudeRunner(claudeRunnerOptions(deps, { cwd: ws }));
+    });
+    agentRegistry.register('codex', (_ws) => {
+        return new CodexAppServerRunner(codexRunnerOptions(deps));
+    });
+    agentRegistry.register('opencode', (_ws) => {
+        return new OpencodeAcpRunner(opencodeRunnerOptions(deps));
+    });
+    agentRegistry.register('pi', (ws) => {
+        return new PiRpcRunner(piRunnerOptions(deps, { cwd: ws }));
+    });
+    agentRegistry.register('kimi', (_ws) => {
+        return new KimiAcpRunner(kimiRunnerOptions(deps));
+    });
     agentRegistry.register('dsh', (_ws) => {
-        const dshConf = getAgentConfig(latest(), 'dsh');
-        // Warm the shared process in the background so the first message and
-        // `/resume` do not pay the full startup delay. Failures surface from
-        // DshRunner.run(), which awaits the same resolver.
-        void dshDaemon.ensure().catch((error) => {
-            getLogger().warn(`[dsh] background start failed: ${error.message}`);
-        });
-        return new DshRunner({
-            kind: 'dsh',
-            sessionReader: dshSessionReader,
-            daemon: dshDaemon,
-            host: dshConf?.host,
-            dshHome: dshConf?.dshHome,
-            token: dshConf?.token,
-            credentialsFile: dshConf?.credentialsFile,
-            agentPreset: dshConf?.agentPreset,
-            permissionPreset: dshConf?.permissionPreset,
-            provider: dshConf?.provider,
-            model: dshConf?.model,
-            reasoningEffort: dshConf?.reasoningEffort,
-            // Durable markers for turns that outlive this process; reconciled on the
-            // next startup (see reconcileInflightDshRuns).
-            inflightPath: dshInflightPath(configDir),
-        });
+        warmDshDaemon(deps.dshDaemon, 'background start failed');
+        return new DshRunner(dshRunnerOptions(deps));
     });
-    sessionReaderRegistry.register('dsh', dshSessionReader);
+}
+/** 按 agent 家族注册 session reader（与 runner factory 共享同一实例）。 */
+function registerSessionReaders(registry, readers) {
+    registry.register('claude', readers.claude);
+    registry.register('codex', readers.codex);
+    registry.register('opencode', readers.opencode);
+    registry.register('pi', readers.pi);
+    registry.register('kimi', readers.kimi);
+    registry.register('dsh', readers.dsh);
+}
+/** 探测 agent CLI 可用性（fire-and-forget，填充 /config 卡片缓存）。 */
+function probeAgentsInBackground() {
+    probeAllAgents().then(logAgentProbeResults).catch(logAgentProbeFailure);
+}
+function logAgentProbeResults(availability) {
+    const unavailable = [...availability.entries()].filter(([, ok]) => !ok).map(([kind]) => kind);
+    if (unavailable.length > 0) {
+        getLogger().warn(`[probe] agent CLI not found or not functional: ${unavailable.join(', ')}`);
+    }
+    else {
+        getLogger().info('[probe] all agent CLIs available');
+    }
+}
+function logAgentProbeFailure(err) {
+    getLogger().warn(`[probe] background probe failed: ${err.message}`);
+}
+/** runner factory 取最新 config 的唯一入口（container 未接线时回退启动快照）。 */
+function createConfigLatest(agentRegistry, config) {
+    return () => agentRegistry.getConfigContainer()?.current ?? config;
+}
+/** One global DSH per machine/DSH_HOME：provider 箭头在模块级函数内定义。 */
+function createDshDaemon(latest) {
+    return new DshDaemon({
+        host: () => getAgentConfig(latest(), 'dsh')?.host,
+        dshHome: () => getAgentConfig(latest(), 'dsh')?.dshHome,
+        dshCommand: () => getAgentConfig(latest(), 'dsh')?.dshCommand,
+        manageProcess: () => getAgentConfig(latest(), 'dsh')?.manageProcess ?? true,
+        startTimeoutMs: () => getAgentConfig(latest(), 'dsh')?.startTimeoutMs,
+    });
+}
+/** Initialize per-workspace runner factory + agent registry. */
+function initializeRunner(config, configDir, cliArgs) {
+    const agentRegistry = new AgentRegistry();
+    // 单点化：runner factory 取最新 config 的唯一入口（语义保持，
+    // container 未接线时回退启动快照）。
+    const latest = createConfigLatest(agentRegistry, config);
+    // 用可变容器存储 config 引用，registry 持有容器引用，factory 从容器读取最新值。
+    agentRegistry.setConfigContainer({ current: config });
+    // One global DSH per machine/DSH_HOME. This resolver reuses a listening
+    // process or starts `dsh web` detached; it never owns the child's lifetime.
+    const dshDaemon = createDshDaemon(latest);
+    const readers = createSessionReaders(config, latest);
+    registerRunners(agentRegistry, { configDir, cliArgs, latest, dshDaemon, readers });
+    const sessionReaderRegistry = new SessionReaderRegistry();
+    registerSessionReaders(sessionReaderRegistry, readers);
     if (config.defaultAgent === 'dsh') {
-        void dshDaemon.ensure().catch((error) => {
-            getLogger().warn(`[dsh] startup probe failed: ${error.message}`);
-        });
+        warmDshDaemon(dshDaemon, 'startup probe failed');
     }
     // Probe agent CLI availability (fire-and-forget, populates cache for /config card).
     // Don't block startup — log unavailable agents as warnings.
-    probeAllAgents()
-        .then((availability) => {
-        const unavailable = [...availability.entries()].filter(([, ok]) => !ok).map(([kind]) => kind);
-        if (unavailable.length > 0) {
-            getLogger().warn(`[probe] agent CLI not found or not functional: ${unavailable.join(', ')}`);
-        }
-        else {
-            getLogger().info('[probe] all agent CLIs available');
-        }
-    })
-        .catch((err) => {
-        getLogger().warn(`[probe] background probe failed: ${err.message}`);
-    });
+    probeAgentsInBackground();
     // Warm the codex model catalog in the background so the first Codex /config
     // card open reads a warm cache instead of blocking the event loop for up to
     // 8s (execFileSync cold path). Fire-and-forget; failure lands in negative
@@ -328,8 +376,14 @@ function initializeRunner(config, configDir, cliArgs) {
     warmCodexCatalogCache();
     return { agentRegistry, sessionReaderRegistry };
 }
-async function main() {
-    const cliArgs = parseCliArgs();
+/**
+ * CLI 早期退出分支：--help / --version / --update。
+ *
+ * 红线：三者都必须在 config 加载与单例锁之前完成——--help/--version 是纯信息
+ * 查询，另一实例在跑、或还没有 config 时也必须能应答；--update 不是守护类命令，
+ * 等锁只会误报 "already running"。返回 true 表示进程应停止。
+ */
+async function handleCliEarlyExit(cliArgs) {
     // --help/--version must bypass config loading and singleton lock — it's a pure
     // informational query that must work even when another instance is running
     // or no config exists yet.
@@ -367,6 +421,14 @@ async function main() {
             process.exit(1);
         }
     }
+    return false;
+}
+/**
+ * Bootstrap：configDir → config → logger → 单例锁 → 防休眠 → 启动配置日志。
+ * 顺序红线：waitForPreviousInstance 必须先于 instanceLock.acquire()（/restart
+ * 替补进程要等旧实例释放锁才能拿到单例锁）；PID 存活校验在 acquire 内完成。
+ */
+async function bootstrap(cliArgs) {
     const { config, configDir, logger, instanceLock } = await initializeCliAndConfig();
     // Restart handoff: if spawned as a /restart replacement, wait for the old
     // lark-remote to die (and release the instance lock) before acquiring it.
@@ -387,6 +449,11 @@ async function main() {
     if (cliArgs.settings) {
         logger.info(`claude.settings = ${cliArgs.settings}`);
     }
+    return { cliArgs, config, configDir, logger };
+}
+/** Wiring：装配 connector / stores / bridge / router / 消息处理器（不连接）。 */
+function wire(boot) {
+    const { cliArgs, config, configDir, logger } = boot;
     const { agentRegistry, sessionReaderRegistry } = initializeRunner(config, configDir, cliArgs);
     const connector = new FeishuConnector(config);
     const startupContactStore = new StartupContactStore(path.join(configDir, 'startup-contact.json'));
@@ -438,6 +505,143 @@ async function main() {
         config,
         cloneSession,
     });
+    return {
+        cliArgs,
+        config,
+        configDir,
+        logger,
+        connector,
+        startupContactStore,
+        binder,
+        sessionStore,
+        bridge,
+        sessionReaderRegistry,
+    };
+}
+/**
+ * Auto-restore: resume the persisted sessionId if available.
+ * 非关键启动优化：发送失败只告警（logger 已初始化），不允许经
+ * main().catch → process.exit(1) 拖垮整个桥接。
+ */
+async function restoreLastSession(app) {
+    const { config, logger, sessionStore, sessionReaderRegistry, bridge, connector, startupContactStore, } = app;
+    const restoredContact = startupContactStore.getContact();
+    if (!restoredContact?.userId)
+        return;
+    const restoredCwd = sessionStore.getCwd(restoredContact.userId);
+    if (!restoredCwd)
+        return;
+    const sessionIdToResume = sessionStore.getSessionId(restoredContact.userId, config.defaultAgent);
+    if (!sessionIdToResume)
+        return;
+    logger.info(`[startup] auto-resuming persisted session ${sessionIdToResume} in ${restoredCwd}`);
+    const startupReader = sessionReaderRegistry.get(config.defaultAgent);
+    sessionStore.setSessionIdAndCwd(restoredContact.userId, config.defaultAgent, sessionIdToResume, restoredCwd);
+    const content = startupReader.readSessionContent(sessionIdToResume, restoredCwd);
+    // 该会话可能仍有在途 turn（上一个实例退出/崩溃后留在常驻 host 里）。
+    // 不取消、不接管，但必须在卡上说明，否则用户会把它当"卡住了"。
+    //
+    // 只有 DSH reader 的 isSessionActive() 是服务端的 running 事实。其他
+    // reader 的同名方法只表示"最近一段时间有写入"，拿它当 turn 在跑会在
+    // 每次自动恢复时误报。
+    const stillRunning = config.defaultAgent === 'dsh'
+        ? (() => {
+            try {
+                return startupReader.isSessionActive(sessionIdToResume, restoredCwd);
+            }
+            catch (err) {
+                getLogger().warn(`[startup] isSessionActive failed: ${err.message}`);
+                return false;
+            }
+        })()
+        : false;
+    if (stillRunning) {
+        getLogger().warn(`[startup] session ${sessionIdToResume} still has a running turn; auto-resume card is a snapshot`);
+    }
+    // 完整透传 usage（含 inputTokens/outputTokens/totalTokens），
+    // 让 formatUsageStats 走真实值路径，与终态卡片//resume 卡片口径一致。
+    const usage = content.usage;
+    // Build auto-resume card and send to the user. Auto-resume is a
+    // non-critical startup nicety: a sendWithRetry failure here (e.g.
+    // transient feishu API error) must not crash the bridge via
+    // main().catch → process.exit(1). Logger is already initialized.
+    try {
+        await sendAutoResumeCard(connector, restoredContact, restoredCwd, { sessionId: sessionIdToResume, summary: '' }, {
+            events: content.events,
+            usage,
+            aiTitle: content.aiTitle,
+            recap: content.recap,
+            displayTitle: content.displayTitle,
+            agentKind: config.defaultAgent,
+        }, 
+        // Compact 能力探测与 bridge 侧一致（runner 有 runCompact 才渲染）。
+        bridge.hasRunCompact(restoredCwd, config.defaultAgent), stillRunning);
+    }
+    catch (err) {
+        getLogger().warn('[startup] sendAutoResumeCard failed:', err);
+    }
+}
+/**
+ * 启动时静默检查版本（由 checkUpdateOnStartup 控制，默认关闭）。
+ * 抽成模块级 async 函数（原为 main 内的 fire-and-forget IIFE）；失败只告警，
+ * 不允许经 main().catch → process.exit(1) 拖垮整个桥接。
+ */
+async function checkUpdateOnStartupNotify(app) {
+    try {
+        const cachePath = path.join(app.configDir, 'update-cache.json');
+        const { current, latest } = await checkLatestVersion({ cachePath });
+        const hint = formatUpdateHint(current, latest);
+        if (hint) {
+            const contact = app.startupContactStore.getContact();
+            const recipient = contact?.chatId ?? contact?.userId;
+            if (recipient) {
+                await app.connector.sendWithRetry(recipient, { text: hint });
+            }
+        }
+    }
+    catch (err) {
+        // Non-fatal: startup check failure must not crash the bridge
+        app.logger.warn(`[startup] update check failed: ${err.message}`);
+    }
+}
+/**
+ * 上次进程可能死在 DSH turn 中途：清掉残留的待执行 prompt，并对仍在跑的
+ * turn 提示 owner（不自动 cancel——它可能是 Web UI 的 turn）。清理不依赖是否
+ * 已绑定；没有收件人时只是不发提示。
+ */
+function reconcileDshInflightOnStartup(app) {
+    const dshConf = getAgentConfig(app.config, 'dsh');
+    if (!dshConf)
+        return;
+    const contact = app.startupContactStore.getContact();
+    const recipient = contact?.chatId ?? contact?.userId;
+    void reconcileInflightDshRuns({
+        store: new DshInflightStore(dshInflightPath(app.configDir)),
+        client: new DshClient(dshConf.host ?? 'http://127.0.0.1:3080', {
+            dshHome: dshConf.dshHome,
+            token: dshConf.token,
+            credentialsFile: dshConf.credentialsFile,
+            // Host may be down: bound the probe instead of waiting the default 60s.
+            requestTimeoutMs: 3_000,
+        }),
+        ...(recipient
+            ? {
+                notify: async (text) => {
+                    await app.connector.sendWithRetry(recipient, { text });
+                },
+            }
+            : {}),
+    }).catch((err) => {
+        app.logger.warn(`[startup] dsh inflight reconcile failed: ${err.message}`);
+    });
+}
+async function main() {
+    const cliArgs = parseCliArgs();
+    if (await handleCliEarlyExit(cliArgs))
+        return;
+    const boot = await bootstrap(cliArgs);
+    const app = wire(boot);
+    const { config, logger, connector, startupContactStore, binder } = app;
     try {
         await connector.connect();
     }
@@ -447,112 +651,14 @@ async function main() {
     }
     if (binder.isBound()) {
         // 仅已绑定时发送启动通知；未绑定时不打扰（PIN 引导已在控制台输出）
-        await sendStartupHello(connector, startupContactStore, { dev: cliArgs.dev });
+        await sendStartupHello(connector, startupContactStore, { dev: app.cliArgs.dev });
         // 启动时静默检查版本（由 checkUpdateOnStartup 控制，默认关闭）
         if (config.checkUpdateOnStartup) {
-            void (async () => {
-                try {
-                    const cachePath = path.join(configDir, 'update-cache.json');
-                    const { current, latest } = await checkLatestVersion({ cachePath });
-                    const hint = formatUpdateHint(current, latest);
-                    if (hint) {
-                        const contact = startupContactStore.getContact();
-                        const recipient = contact?.chatId ?? contact?.userId;
-                        if (recipient) {
-                            await connector.sendWithRetry(recipient, { text: hint });
-                        }
-                    }
-                }
-                catch (err) {
-                    // Non-fatal: startup check failure must not crash the bridge
-                    logger.warn(`[startup] update check failed: ${err.message}`);
-                }
-            })();
-        }
-    }
-    // 上次进程可能死在 DSH turn 中途：清掉残留的待执行 prompt，并对仍在跑的
-    // turn 提示 owner（不自动 cancel——它可能是 Web UI 的 turn）。清理不依赖是否
-    // 已绑定；没有收件人时只是不发提示。
-    const dshConf = getAgentConfig(config, 'dsh');
-    if (dshConf) {
-        const contact = startupContactStore.getContact();
-        const recipient = contact?.chatId ?? contact?.userId;
-        void reconcileInflightDshRuns({
-            store: new DshInflightStore(dshInflightPath(configDir)),
-            client: new DshClient(dshConf.host ?? 'http://127.0.0.1:3080', {
-                dshHome: dshConf.dshHome,
-                token: dshConf.token,
-                credentialsFile: dshConf.credentialsFile,
-                // Host may be down: bound the probe instead of waiting the default 60s.
-                requestTimeoutMs: 3_000,
-            }),
-            ...(recipient
-                ? {
-                    notify: async (text) => {
-                        await connector.sendWithRetry(recipient, { text });
-                    },
-                }
-                : {}),
-        }).catch((err) => {
-            logger.warn(`[startup] dsh inflight reconcile failed: ${err.message}`);
-        });
-    }
-    // Auto-restore: resume the persisted sessionId if available
-    const restoredContact = startupContactStore.getContact();
-    if (restoredContact?.userId) {
-        const restoredCwd = sessionStore.getCwd(restoredContact.userId);
-        if (restoredCwd) {
-            const sessionIdToResume = sessionStore.getSessionId(restoredContact.userId, config.defaultAgent);
-            if (sessionIdToResume) {
-                logger.info(`[startup] auto-resuming persisted session ${sessionIdToResume} in ${restoredCwd}`);
-                const startupReader = sessionReaderRegistry.get(config.defaultAgent);
-                sessionStore.setSessionIdAndCwd(restoredContact.userId, config.defaultAgent, sessionIdToResume, restoredCwd);
-                const content = startupReader.readSessionContent(sessionIdToResume, restoredCwd);
-                // 该会话可能仍有在途 turn（上一个实例退出/崩溃后留在常驻 host 里）。
-                // 不取消、不接管，但必须在卡上说明，否则用户会把它当"卡住了"。
-                //
-                // 只有 DSH reader 的 isSessionActive() 是服务端的 running 事实。其他
-                // reader 的同名方法只表示"最近一段时间有写入"，拿它当 turn 在跑会在
-                // 每次自动恢复时误报。
-                const stillRunning = config.defaultAgent === 'dsh'
-                    ? (() => {
-                        try {
-                            return startupReader.isSessionActive(sessionIdToResume, restoredCwd);
-                        }
-                        catch (err) {
-                            getLogger().warn(`[startup] isSessionActive failed: ${err.message}`);
-                            return false;
-                        }
-                    })()
-                    : false;
-                if (stillRunning) {
-                    getLogger().warn(`[startup] session ${sessionIdToResume} still has a running turn; auto-resume card is a snapshot`);
-                }
-                // 完整透传 usage（含 inputTokens/outputTokens/totalTokens），
-                // 让 formatUsageStats 走真实值路径，与终态卡片//resume 卡片口径一致。
-                const usage = content.usage;
-                // Build auto-resume card and send to the user. Auto-resume is a
-                // non-critical startup nicety: a sendWithRetry failure here (e.g.
-                // transient feishu API error) must not crash the bridge via
-                // main().catch → process.exit(1). Logger is already initialized.
-                try {
-                    await sendAutoResumeCard(connector, restoredContact, restoredCwd, { sessionId: sessionIdToResume, summary: '' }, {
-                        events: content.events,
-                        usage,
-                        aiTitle: content.aiTitle,
-                        recap: content.recap,
-                        displayTitle: content.displayTitle,
-                        agentKind: config.defaultAgent,
-                    }, 
-                    // Compact 能力探测与 bridge 侧一致（runner 有 runCompact 才渲染）。
-                    bridge.hasRunCompact(restoredCwd, config.defaultAgent), stillRunning);
-                }
-                catch (err) {
-                    getLogger().warn('[startup] sendAutoResumeCard failed:', err);
-                }
-            }
+            void checkUpdateOnStartupNotify(app);
         }
     }
+    reconcileDshInflightOnStartup(app);
+    await restoreLastSession(app);
     logger.info('lark-remote is running, press Ctrl+C to exit');
 }
 main().catch((err) => {