lark-remote 0.5.19 → 0.5.20

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,25 +129,45 @@ 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();
+    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 opencode = new OpencodeSessionReader({
+        binary: getAgentConfig(config, 'opencode')?.acp?.binary,
+    });
+    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,
+        dshHomeProvider: () => getAgentConfig(latest(), 'dsh')?.dshHome,
+        tokenProvider: () => getAgentConfig(latest(), 'dsh')?.token,
+        credentialsFileProvider: () => getAgentConfig(latest(), 'dsh')?.credentialsFile,
+    });
+    return { claude, codex, opencode, pi, kimi, dsh };
+}
+/**
+ * 按 agent 家族注册 runner factory。
+ *
+ * factory 一律从 configContainer 读最新 config（bridge.setConfig() +
+ * clearRunners() 后运行时改动生效）；`latest()` 未接线时回退启动快照。
+ */
+function registerRunners(agentRegistry, deps) {
+    const { configDir, cliArgs, latest, dshDaemon, readers } = deps;
     // 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.
@@ -153,7 +180,7 @@ function initializeRunner(config, configDir, cliArgs) {
             settings: cliArgs.settings,
             pidDir: configDir,
             cwd: ws,
-            sessionReader: claudeSessionReader,
+            sessionReader: readers.claude,
             permissionMode: claudeConfig.permissionMode,
             idleTtlMs: claudeConfig.idleTtlMinutes != null ? claudeConfig.idleTtlMinutes * 60_000 : undefined,
         });
@@ -162,7 +189,6 @@ function initializeRunner(config, configDir, cliArgs) {
     // 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({
@@ -170,31 +196,16 @@ function initializeRunner(config, configDir, cliArgs) {
             model: codexConfig?.model,
             modelProvider: codexConfig?.modelProvider,
             reasoningEffort: codexConfig?.reasoningEffort,
-            sessionReader: codexSessionReader,
+            sessionReader: readers.codex,
             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,
+            turnTimeoutMs: minutesToMs(codexConfig?.appServer?.turnIdleTimeoutMinutes),
         });
     });
     // 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);
-    // 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({
-        binary: getAgentConfig(config, 'opencode')?.acp?.binary,
-    });
     agentRegistry.register('opencode', (_ws) => {
         const ocConfig = getAgentConfig(latest(), 'opencode');
         // Build model string with validation: provider/model format
@@ -212,68 +223,50 @@ function initializeRunner(config, configDir, cliArgs) {
         return new OpencodeAcpRunner({
             kind: 'opencode',
             model,
-            sessionReader: opencodeSessionReader,
+            sessionReader: readers.opencode,
             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,
+            turnIdleTimeoutMs: minutesToMs(ocConfig?.acp?.turnIdleTimeoutMinutes),
         });
     });
-    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();
+    // Register PiRpcRunner.
+    // factory 闭包必须读最新 config 而不是启动时的快照，否则 /config 保存后
+    // provider 等字段对 pi 不生效：config 引用放在可变容器里（见上文
+    // setConfigContainer），factory 每次从容器取最新值。
+    // PiSessionReader 的创建与注册见 registerSessionReaders。
     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')
+            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: ws,
-            sessionReader: piSessionReader,
+            sessionReader: readers.pi,
         });
     });
-    sessionReaderRegistry.register('pi', piSessionReader);
-    // Register KimiAcpRunner (pure ACP mode) and KimiSessionReader
-    const kimiSessionReader = new KimiSessionReader();
+    // Register KimiAcpRunner (pure ACP mode)
     agentRegistry.register('kimi', (_ws) => {
         const kimiConf = getAgentConfig(latest(), 'kimi');
         const acpConf = kimiConf?.acp;
         return new KimiAcpRunner({
             kind: 'kimi',
-            sessionReader: kimiSessionReader,
+            sessionReader: readers.kimi,
             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',
+            turnIdleTimeoutMs: minutesToMs(acpConf?.turnIdleTimeoutMinutes),
+            model: kimiConf?.model ?? KIMI_DEFAULTS.model,
             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({
-        // hostProvider 每次调用读最新 config：/config 修改 host 后 runner 重建为
-        // 新 host，reader（/resume、用量、完成卡）也跟随新 host。
-        hostProvider: () => getAgentConfig(latest(), 'dsh')?.host,
-        dshHomeProvider: () => getAgentConfig(latest(), 'dsh')?.dshHome,
-        tokenProvider: () => getAgentConfig(latest(), 'dsh')?.token,
-        credentialsFileProvider: () => getAgentConfig(latest(), 'dsh')?.credentialsFile,
-    });
+    // Register DshRunner (HTTP-only DSH Web Host agent).
     agentRegistry.register('dsh', (_ws) => {
         const dshConf = getAgentConfig(latest(), 'dsh');
         // Warm the shared process in the background so the first message and
@@ -284,7 +277,7 @@ function initializeRunner(config, configDir, cliArgs) {
         });
         return new DshRunner({
             kind: 'dsh',
-            sessionReader: dshSessionReader,
+            sessionReader: readers.dsh,
             daemon: dshDaemon,
             host: dshConf?.host,
             dshHome: dshConf?.dshHome,
@@ -300,7 +293,37 @@ function initializeRunner(config, configDir, cliArgs) {
             inflightPath: dshInflightPath(configDir),
         });
     });
-    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);
+}
+/** 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;
+    // 用可变容器存储 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 = 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,
+    });
+    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}`);
@@ -328,8 +351,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 +396,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 +424,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 +480,89 @@ 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);
+    }
+}
+async function main() {
+    const cliArgs = parseCliArgs();
+    if (await handleCliEarlyExit(cliArgs))
+        return;
+    const boot = await bootstrap(cliArgs);
+    const app = wire(boot);
+    const { config, configDir, logger, connector, startupContactStore, binder } = app;
     try {
         await connector.connect();
     }
@@ -447,7 +572,7 @@ 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 () => {
@@ -497,62 +622,7 @@ async function main() {
             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);
-                }
-            }
-        }
-    }
+    await restoreLastSession(app);
     logger.info('lark-remote is running, press Ctrl+C to exit');
 }
 main().catch((err) => {

package/dist/logger/index.js

@@ -21,12 +21,12 @@ function todayStr(d) {
     return `${y}-${m}-${day}`;
 }
 function timestampStr(d) {
-    // local ISO 8601 with milliseconds and explicit offset, e.g.
-    // 2026-08-03T01:30:00.000+08:00. Previously this used toISOString() (UTC)
-    // while the daily directory boundary (todayStr) used local time — after
-    // local midnight in a +08:00 zone the new day's directory held lines
-    // timestamped with the previous UTC day. Local offset keeps the timestamp's
-    // calendar date consistent with the directory date across all timezones.
+    // Local ISO 8601 with milliseconds and explicit offset, e.g.
+    // 2026-08-03T01:30:00.000+08:00. Must match the daily directory boundary
+    // (todayStr), which is local time: a UTC timestamp would put lines written
+    // after local midnight into the previous UTC day's file. Local offset keeps
+    // the timestamp's calendar date consistent with the directory date across
+    // all timezones.
     const pad = (n) => String(n).padStart(2, '0');
     const y = d.getFullYear();
     const mo = pad(d.getMonth() + 1);

package/dist/message-handlers.d.ts

@@ -7,11 +7,6 @@ import type { SessionStore } from './session/index.js';
 import type { WorkspaceStore } from './workspace/index.js';
 import type { OwnerBinder } from './binder.js';
 import type { CloneSession } from './clone.js';
-/**
- * /stop 命令别名单源：普通消息的停止分支与 clone 活跃期拦截的排除条件
- * 共用同一判定，防止将来加别名时两处漂移。
- */
-export declare function isStopCommand(text: string): boolean;
 export interface MessageHandlerDeps {
     connector: FeishuConnector;
     router: CommandRouter;

package/dist/message-handlers.js

@@ -14,7 +14,7 @@ const SESSION_MUTATING_FLUSH_BUDGET_MS = 2_000;
  * /stop 命令别名单源：普通消息的停止分支与 clone 活跃期拦截的排除条件
  * 共用同一判定，防止将来加别名时两处漂移。
  */
-export function isStopCommand(text) {
+function isStopCommand(text) {
     const t = text.trim().toLowerCase();
     return t === '/stop' || t === '/t';
 }

package/dist/model-catalog.d.ts

@@ -6,9 +6,9 @@
  * 「地基层被 runner 反向 import」；挪到这里后三方共同引用同一份。
  *
  * 表内容来自 Claude CLI 的模型别名（alias 是 CLI 侧的稳定名字，model ID 会随
- * 版本变），新增一行只改这里。
+ * 版本变），新增一行只改 MODEL_ID_TO_ALIAS，反向表自动派生。
  */
 /** 模型 ID → alias 映射。 */
 export declare const MODEL_ID_TO_ALIAS: Record<string, string>;
-/** alias → model ID 反向映射。 */
+/** alias → model ID 反向映射（从正向表派生，新增别名只改上面一张表）。 */
 export declare const MODEL_ALIAS_TO_ID: Record<string, string>;

package/dist/model-catalog.js

@@ -6,7 +6,7 @@
  * 「地基层被 runner 反向 import」；挪到这里后三方共同引用同一份。
  *
  * 表内容来自 Claude CLI 的模型别名（alias 是 CLI 侧的稳定名字，model ID 会随
- * 版本变），新增一行只改这里。
+ * 版本变），新增一行只改 MODEL_ID_TO_ALIAS，反向表自动派生。
  */
 /** 模型 ID → alias 映射。 */
 export const MODEL_ID_TO_ALIAS = {
@@ -15,11 +15,6 @@ export const MODEL_ID_TO_ALIAS = {
     'claude-haiku-4-5-20250501': 'haiku',
     'claude-fable-5': 'fable',
 };
-/** alias → model ID 反向映射。 */
-export const MODEL_ALIAS_TO_ID = {
-    opus: 'claude-opus-4-8',
-    sonnet: 'claude-sonnet-4-6',
-    haiku: 'claude-haiku-4-5-20250501',
-    fable: 'claude-fable-5',
-};
+/** alias → model ID 反向映射（从正向表派生，新增别名只改上面一张表）。 */
+export const MODEL_ALIAS_TO_ID = Object.fromEntries(Object.entries(MODEL_ID_TO_ALIAS).map(([id, alias]) => [alias, id]));
 //# sourceMappingURL=model-catalog.js.map

package/dist/platform/identity.js

@@ -154,7 +154,7 @@ export function binaryName(token, platform = currentPlatform) {
     return caseInsensitive(platform) ? name.toLowerCase() : name;
 }
 /**
- * 命令行与期望二进制是否属于同一程序（review 2026-09-05 收紧 + 2026-09-20 分档）。
+ * 命令行与期望二进制是否属于同一程序。
  *
  * 1. 可执行位匹配：首 token 的 basename 相等——`/usr/local/bin/claude --verbose`
  *    匹配 claude；native 单文件 CLI（claude 的 `bin/claude.exe`）也走这条；

package/dist/platform/path.d.ts

@@ -21,7 +21,7 @@ export declare function samePath(a: string, b: string, opts?: PathOptions): bool
  * cwd → 会话项目目录名（Claude/pi 的 on-disk 编码，lossy N-to-N）。
  *
  * 只可用于**定位**目录，绝不可反解回 cwd——cwd 必须从 JSONL 内容读取
- * （回归 2026-06-21 /resume & /cd 路径错乱）。
+ * （否则 /resume & /cd 路径会错乱）。
  *
  * posix：`/` → `-`（`_` 同样归一，与 Claude Code 一致）。
  * win32：`\` 与 `/` **都是**分隔符、`:` 是非法文件名字符，三者都必须归一，

package/dist/platform/path.js

@@ -63,7 +63,7 @@ export function samePath(a, b, opts) {
  * cwd → 会话项目目录名（Claude/pi 的 on-disk 编码，lossy N-to-N）。
  *
  * 只可用于**定位**目录，绝不可反解回 cwd——cwd 必须从 JSONL 内容读取
- * （回归 2026-06-21 /resume & /cd 路径错乱）。
+ * （否则 /resume & /cd 路径会错乱）。
  *
  * posix：`/` → `-`（`_` 同样归一，与 Claude Code 一致）。
  * win32：`\` 与 `/` **都是**分隔符、`:` 是非法文件名字符，三者都必须归一，

package/dist/platform/sleep-blocker.js

@@ -6,7 +6,7 @@ import { getLogger } from '../logger/index.js';
  * **必须按无符号 32 位取值**：`0x80000001` = 2147483649 超出 Int32 正数上界
  * （2147483647），而 PowerShell 的数字字面量按 Int32 解析 —— 十六进制写法一旦
  * 进了脚本就会被解析成 **-2147483647**，传给 P/Invoke 声明的 `uint` 形参时抛
- * `MethodArgumentConversionInvalidCastArgument`（2026-09-22 真机复现）。
+ * `MethodArgumentConversionInvalidCastArgument`。
  */
 const ES_FLAGS_UINT32 = (0x80000000 | 0x00000001) >>> 0;
 /**

package/dist/platform/terminator-win32.js

@@ -42,8 +42,9 @@ export function createWin32Terminator(deps) {
                 stdio: 'ignore',
                 windowsHide: true,
             });
-            killer?.on?.('error', () => {
+            killer?.on?.('error', (err) => {
                 // taskkill 拉起失败不致命：调用方仍可走 killOrphan / 陈旧锁自愈
+                log?.(`win32 树杀失败：taskkill error 事件 ${err?.message ?? err}`);
             });
         }
         catch (error) {

package/dist/router/commands/resume.js

@@ -1,5 +1,5 @@
 import { isAgentKind } from '../../agent-kinds.js';
-import { agentDisplayName } from '../../card/card-shared.js';
+import { agentDisplayName, cardButton } from '../../card/card-shared.js';
 import { buildSessionHistoryCard, paginationBar } from '../../card/card-helpers.js';
 import { pageInfo } from '../paging.js';
 import { clampInt } from '../../common/clamp.js';
@@ -194,25 +194,7 @@ export function buildResumeCommand(args, ctx, offset, deps) {
                     tag: 'column',
                     width: 'auto',
                     elements: [
-                        {
-                            tag: 'button',
-                            text: {
-                                tag: 'plain_text',
-                                content: isCurrent ? '✓ 当前会话' : '恢复此会话',
-                            },
-                            type: isCurrent ? 'default' : 'primary',
-                            disabled: isCurrent,
-                            behaviors: [
-                                {
-                                    type: 'callback',
-                                    value: {
-                                        cmd: 'resume.use',
-                                        sessionId: session.sessionId,
-                                        agent: agentKind,
-                                    },
-                                },
-                            ],
-                        },
+                        cardButton(isCurrent ? '✓ 当前会话' : '恢复此会话', { cmd: 'resume.use', sessionId: session.sessionId, agent: agentKind }, { type: isCurrent ? 'default' : 'primary', disabled: isCurrent }),
                     ],
                 },
             ],