lark-remote 0.1.6 → 0.1.8

package/dist/connector/index.js

@@ -1,9 +1,15 @@
 import { createLarkChannel, } from '@larksuite/channel';
 import { getLogger } from '../logger/index.js';
 import { MAX_FILE_UPLOAD_SIZE } from './file-limits.js';
+import { DEFAULT_INBOUND_MEDIA_MAX_SIZE_MB } from '../config/index.js';
+import { sleep } from '../common/sleep.js';
 import axios from 'axios';
 import fs from 'node:fs';
+import { silentlyUnlink } from '../common/fs.js';
 import https from 'node:https';
+import os from 'node:os';
+import path from 'node:path';
+import { randomUUID } from 'node:crypto';
 import FormData from 'form-data';
 /**
  * Dedicated https.Agent with keepAlive disabled for sendFile's three axios
@@ -36,6 +42,20 @@ const noKeepAliveAgent = new https.Agent({ keepAlive: false });
  * 详见 design.md §9.8。原地更新逻辑新增按钮时参考该节去重风险分类。
  */
 export const DEDUP_TTL_MS = 300;
+/** 单资源下载超时（毫秒）：SDK 无内置超时，挂起会导致提示丢失 + 残留临时文件。 */
+const RESOURCE_DOWNLOAD_TIMEOUT_MS = 5 * 60 * 1000;
+function withTimeout(promise, ms, label) {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => reject(new Error(`${label} timed out after ${ms}ms`)), ms);
+        promise.then((value) => {
+            clearTimeout(timer);
+            resolve(value);
+        }, (err) => {
+            clearTimeout(timer);
+            reject(err);
+        });
+    });
+}
 /**
  * 判断 send 失败是否值得重试一次（§9.5 限流重试口径，§P1-3 修正）。
  *
@@ -75,9 +95,11 @@ function tryGetPatchService(channel) {
     return c?.im?.v1?.message;
 }
 export class FeishuConnector {
+    /** 飞书 channel 实例（public：测试直接访问/注入 mock，替代 as unknown as）。 */
     channel;
     onMessage;
     onCardAction;
+    onInboundMediaDetected;
     isConnected = false;
     appId;
     appSecret;
@@ -125,6 +147,15 @@ export class FeishuConnector {
         this.channel.on('message', (msg) => {
             if (msg.chatType !== 'p2p')
                 return;
+            // 入站图片/文件：不转发文本内容（图片消息的 content 只是占位文案），
+            // 而是下载资源后交给 bridge 落盘（runner 零改动）。
+            if ((msg.rawContentType === 'image' || msg.rawContentType === 'file') &&
+                msg.resources.length > 0) {
+                // 只上报"媒体到达"，不在此下载：owner/配置闸门在 index.ts 里先执行，
+                // 通过后才调用 downloadInboundMedia（避免未认证大文件下载打爆内存）。
+                void this.handleInboundMediaDetected(msg);
+                return;
+            }
             this.onMessage?.({
                 userId: msg.senderId,
                 messageId: msg.messageId,
@@ -158,6 +189,81 @@ export class FeishuConnector {
     setCardActionHandler(handler) {
         this.onCardAction = handler;
     }
+    setInboundMediaDetectedHandler(handler) {
+        this.onInboundMediaDetected = handler;
+    }
+    /**
+     * 上报媒体消息到达（轻量，不含下载内容）。上层认证/配置闸门通过后
+     * 再调 downloadInboundMedia。
+     */
+    async handleInboundMediaDetected(msg) {
+        if (!this.onInboundMediaDetected) {
+            getLogger().warn('[feishu] inbound media received but no detected handler registered');
+            return;
+        }
+        try {
+            await this.onInboundMediaDetected({
+                userId: msg.senderId,
+                chatId: msg.chatId,
+                messageId: msg.messageId,
+                replyToMessageId: msg.replyToMessageId,
+                resources: msg.resources.map((r) => ({
+                    type: r.type === 'image' ? 'image' : 'file',
+                    fileKey: r.fileKey,
+                    fileName: r.fileName,
+                })),
+            });
+        }
+        catch (err) {
+            getLogger().error('[feishu] inbound media detected handler failed:', err.message);
+        }
+    }
+    /**
+     * 下载消息里的全部资源（流式写临时文件，避免大文件全量进堆内存）。
+     * 逐资源 try/catch：单个失败不影响其他资源；超限项不进入 media（不落盘）。
+     * 下载失败/超限都随 failures 交给 bridge 提示用户（对齐"发送文件失败"文案风格）。
+     * 调用方必须已通过 owner/配置闸门（index.ts）；maxFileSizeMb 由调用方从
+     * 当前配置传入（避免 connector 持有过期的 config 快照）。
+     */
+    async downloadInboundMedia(msg, opts) {
+        const maxBytes = (opts?.maxFileSizeMb ?? DEFAULT_INBOUND_MEDIA_MAX_SIZE_MB) * 1024 * 1024;
+        const timeoutMs = opts?.downloadTimeoutMs ?? RESOURCE_DOWNLOAD_TIMEOUT_MS;
+        const media = [];
+        const failures = [];
+        for (const res of msg.resources) {
+            const tmpPath = path.join(os.tmpdir(), `lark-remote-inbound-${randomUUID()}`);
+            try {
+                const { contentType, bytesWritten } = await withTimeout(this.channel.downloadResourceToFile(msg.messageId, res.fileKey, res.type, tmpPath), timeoutMs, `downloadResource fileKey=${res.fileKey}`);
+                if (bytesWritten > maxBytes) {
+                    silentlyUnlink(tmpPath);
+                    failures.push({
+                        fileName: res.fileName,
+                        reason: `超过 ${maxBytes / (1024 * 1024)}MB 大小限制`,
+                    });
+                    continue;
+                }
+                media.push({
+                    type: res.type,
+                    fileName: res.fileName,
+                    mimeType: contentType,
+                    tempPath: tmpPath,
+                });
+            }
+            catch (err) {
+                silentlyUnlink(tmpPath);
+                getLogger().warn(`[feishu] downloadResource failed fileKey=${res.fileKey} type=${res.type}:`, err.message);
+                failures.push({ fileName: res.fileName, reason: `下载失败: ${err.message}` });
+            }
+        }
+        return {
+            userId: msg.userId,
+            chatId: msg.chatId,
+            messageId: msg.messageId,
+            replyToMessageId: msg.replyToMessageId,
+            media,
+            failures,
+        };
+    }
     async connect() {
         try {
             await this.channel.connect();
@@ -200,7 +306,7 @@ export class FeishuConnector {
         catch (err) {
             if (shouldRetrySendError(err)) {
                 getLogger().warn('[feishu] rate limited, retrying in 200ms...');
-                await new Promise((r) => setTimeout(r, 200));
+                await sleep(200);
                 try {
                     const result = await this.channel.send(chatId, input, { replyTo: opts?.replyTo });
                     return result.messageId;

package/dist/index.js

@@ -1,15 +1,16 @@
-import { loadConfig, getAgentConfig, DEFAULT_STOP_GRACE_MS, } from './config/index.js';
+import { loadConfig, getAgentConfig } 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';
 import { FeishuConnector } from './connector/index.js';
-import { ClaudeRunner, createCodexRunner, OpencodeExecRunner, PiRunner, KimiRunner, } from './runner/index.js';
+import { ClaudeRunner, CodexAppServerRunner, OpencodeAcpRunner, PiRpcRunner, KimiAcpRunner, DshRunner, } from './runner/index.js';
 import { AgentRegistry } from './runner/registry.js';
 import { probeAllAgents } from './runner/probe.js';
 import { SessionReaderRegistry, SessionStore } from './session/index.js';
-import { ClaudeSessionReader, CodexSessionReader, OpencodeSessionReader, PiSessionReader, KimiSessionReader, } from './session/index.js';
-import { CommandRouter, isImmediateAction, formatUsageStats, } from './router/index.js';
+import { ClaudeSessionReader, CodexSessionReader, OpencodeSessionReader, PiSessionReader, KimiSessionReader, DshSessionReader, } from './session/index.js';
+import { CommandRouter, isImmediateAction } from './router/index.js';
 import { dispatchOrderExecForQueue } from './router/order-exec-dispatch.js';
+import { buildCardActionFullValue } from './router/card-action-payload.js';
 import { Bridge } from './bridge/index.js';
 import { initLogger, getLogger } from './logger/index.js';
 import { StartupContactStore, sendStartupHello } from './startup-contact.js';
@@ -19,11 +20,11 @@ import { spawnReplacementBridge, waitForPreviousInstance } from './restart.js';
 import { checkLatestVersion, isNewer, runInstallLatest, formatUpdateHint } from './update/index.js';
 import { classifyRejection } from './error-classification.js';
 import { WorkspaceStore } from './workspace/index.js';
-import { markdownDiv } from './card/collapsible.js';
-import { sessionEventPanel } from './router/card-helpers.js';
+import { buildSessionHistoryCard } from './router/card-helpers.js';
 import { newSessionButton, resumeCompactButton, agentDisplayName } from './card/card-shared.js';
 import path from 'node:path';
 import fs from 'node:fs';
+import { silentlyUnlink } from './common/fs.js';
 /** Send auto-resume card for a restored session */
 async function sendAutoResumeCard(connector, contact, cwd, session, state, compactSupported = false) {
     if (!contact.userId)
@@ -31,68 +32,32 @@ async function sendAutoResumeCard(connector, contact, cwd, session, state, compa
     const recipient = contact.chatId ?? contact.userId;
     if (!recipient)
         return;
-    // Build header with displayTitle (aiTitle or last user message) and recap
-    let header = `📂 \`${cwd}\`\n已恢复最近会话: **${session.sessionId}**`;
-    const sections = [];
-    if (state.displayTitle) {
-        const label = state.aiTitle ? 'AI 标题' : '最近输入';
-        sections.push(`🏷️ **${label}**\n${state.displayTitle}`);
-    }
-    if (state.recap) {
-        const recapPreview = state.recap.length > 200 ? state.recap.slice(0, 197) + '...' : state.recap;
-        sections.push(`📝 **Recap**\n${recapPreview}`);
-    }
-    if (sections.length > 0) {
-        header += '\n\n' + sections.join('\n\n──\n\n');
-    }
-    const elements = [markdownDiv(header), { tag: 'hr' }];
     // Limit history events to prevent card size exceeded error (11310)
     const MAX_HISTORY_EVENTS = 5;
     const eventsToShow = state.events.slice(-MAX_HISTORY_EVENTS);
     const hiddenCount = state.events.length - MAX_HISTORY_EVENTS;
-    // Add indicator if events were hidden
-    if (hiddenCount > 0) {
-        elements.push(markdownDiv(`📜 还有 ${hiddenCount} 个更早的事件未显示`));
-    }
-    // Fold session history into collapsible panels: the last 2 events stay expanded
+    // Action buttons: Compact (runCompact-capable runner) + new session.
     const agentKind = state.agentKind ?? 'claude';
-    eventsToShow.forEach((ev, i) => {
-        elements.push(sessionEventPanel(ev, i, eventsToShow.length, 2, agentKind));
-    });
-    // Add usage/stats at the end
-    if (state.usage) {
-        const usageStr = formatUsageStats(state.usage);
-        elements.push(markdownDiv(usageStr));
-    }
-    // Add action buttons - use column_set+column (div+elements not supported in 2.0)
     const actionButtons = [];
-    // Compact 按钮：仅 codex app-server 模式（runner 有 runCompact）且未在跑。
-    // 启动自动恢复时不会存在该会话的 activeRun，直接渲染。
     if (compactSupported) {
         actionButtons.push(resumeCompactButton(session.sessionId, state.agentKind ?? 'codex'));
     }
     actionButtons.push(newSessionButton());
-    elements.push({
-        tag: 'column_set',
-        columns: actionButtons.map((btn) => ({
-            tag: 'column',
-            width: 'auto',
-            elements: [btn],
-        })),
+    const card = buildSessionHistoryCard({
+        sessionId: session.sessionId,
+        cwd,
+        displayTitle: state.displayTitle,
+        aiTitle: state.aiTitle,
+        recap: state.recap,
+        events: eventsToShow,
+        usage: state.usage,
+    }, {
+        agentKind,
+        headerText: `📂 \`${cwd}\`\n已恢复最近会话: **${session.sessionId}**`,
+        title: `🔁 自动恢复会话 · ${agentDisplayName(agentKind)}`,
+        hiddenCount,
+        actions: actionButtons,
     });
-    const card = {
-        schema: '2.0',
-        config: {
-            wide_screen_mode: true,
-        },
-        header: {
-            title: {
-                tag: 'plain_text',
-                content: `🔁 自动恢复会话 · ${agentDisplayName(agentKind)}`,
-            },
-        },
-        body: { elements },
-    };
     await connector.sendWithRetry(recipient, { card });
 }
 /** Initialize CLI args, config, and logger. Returns { config, configDir, logger, instanceLock }. */
@@ -165,37 +130,36 @@ function initializeRunner(config, configDir, cliArgs) {
             settings: cliArgs.settings,
             pidDir: configDir,
             workspace: ws,
+            permissionMode: claudeConfig.permissionMode,
+            idleTtlMs: claudeConfig.idleTtlMinutes != null ? claudeConfig.idleTtlMinutes * 60_000 : undefined,
         });
     });
-    // Register Codex runner. Factory reads latest config from container.current
-    // so runtime config changes (serviceMode, model, sandbox, approvalPolicy,
-    // reasoningEffort, etc.) take effect after bridge.setConfig() + clearRunners().
-    // serviceMode=app-server → CodexAppServerRunner (persistent connection with
-    // approval + sandbox); otherwise CodexExecRunner (codex exec --json).
+    // 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) => {
+    agentRegistry.register('codex', (_ws) => {
         const container = agentRegistry.getConfigContainer();
         const latestConfig = container?.current ?? config;
         const codexConfig = getAgentConfig(latestConfig, 'codex');
-        return createCodexRunner({
+        return new CodexAppServerRunner({
+            kind: 'codex',
             model: codexConfig?.model,
             modelProvider: codexConfig?.modelProvider,
             reasoningEffort: codexConfig?.reasoningEffort,
-            stopGraceMs: codexConfig?.stopGraceMs ?? latestConfig.claude?.stopGraceMs ?? DEFAULT_STOP_GRACE_MS,
-            pidDir: configDir,
-            workspace: ws,
             sessionReader: codexSessionReader,
-            serviceMode: codexConfig?.serviceMode,
             sandbox: codexConfig?.sandbox,
             approvalPolicy: codexConfig?.approvalPolicy,
-            appServerBinary: codexConfig?.appServer?.binary,
-            appServerRequestTimeoutMs: codexConfig?.appServer?.requestTimeoutMs,
-            appServerIdleTtlMs: codexConfig?.appServer?.idleTtlMs,
-            appServerTurnIdleTimeoutMinutes: codexConfig?.appServer?.turnIdleTimeoutMinutes,
+            binary: codexConfig?.appServer?.binary,
+            requestTimeoutMs: codexConfig?.appServer?.requestTimeoutMs,
+            idleTtlMs: codexConfig?.appServer?.idleTtlMs,
+            turnTimeoutMs: codexConfig?.appServer?.turnIdleTimeoutMinutes != null
+                ? codexConfig.appServer.turnIdleTimeoutMinutes * 60_000
+                : undefined,
         });
     });
-    // Register OpencodeExecRunner (run mode)
-    // Using `opencode run --format json --auto` instead of HTTP+SSE server mode
+    // 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', new ClaudeSessionReader());
@@ -203,7 +167,7 @@ function initializeRunner(config, configDir, cliArgs) {
     // Register OpencodeSessionReader (CLI version)
     // Using `opencode session list` and `opencode export` instead of HTTP API
     const opencodeSessionReader = new OpencodeSessionReader();
-    agentRegistry.register('opencode', (ws) => {
+    agentRegistry.register('opencode', (_ws) => {
         // Get latest config from container (set below for pi)
         const container = agentRegistry.getConfigContainer();
         const latestConfig = container?.current ?? config;
@@ -220,17 +184,15 @@ function initializeRunner(config, configDir, cliArgs) {
                 model = `${provider}/${ocConfig.modelID}`;
             }
         }
-        return new OpencodeExecRunner({
+        return new OpencodeAcpRunner({
+            kind: 'opencode',
             model,
-            // P1-15: read stopGraceMs from latestConfig (not startup closure)
-            stopGraceMs: latestConfig.claude?.stopGraceMs ?? DEFAULT_STOP_GRACE_MS,
-            pidDir: configDir,
-            workspace: ws,
             sessionReader: opencodeSessionReader,
+            mode: ocConfig?.mode ?? 'build',
         });
     });
     sessionReaderRegistry.register('opencode', opencodeSessionReader);
-    // Register PiRunner and PiSessionReader
+    // Register PiRpcRunner and PiSessionReader
     // 2026-07-12: 修复 config.save 后 pi provider 不生效的问题
     // 关键：factory 闭包必须能访问到最新的 config，而不是启动时的快照
     // 用可变容器存储 config 引用，registry 持有容器引用，factory 从容器读取最新值
@@ -242,7 +204,7 @@ function initializeRunner(config, configDir, cliArgs) {
         const container = agentRegistry.getConfigContainer();
         const latestConfig = container?.current ?? config;
         const piConf = getAgentConfig(latestConfig, 'pi');
-        return new PiRunner({
+        return new PiRpcRunner({
             provider: piConf?.provider ?? 'Volcano',
             model: piConf?.model ?? 'glm-5.2',
             thinking: piConf?.thinking ?? 'medium',
@@ -250,36 +212,60 @@ function initializeRunner(config, configDir, cliArgs) {
                 .split(',')
                 .map((t) => t.trim())
                 .filter(Boolean),
-            pidDir: configDir,
             workspace: ws,
             sessionReader: piSessionReader,
         });
     });
     sessionReaderRegistry.register('pi', piSessionReader);
-    // Register KimiRunner and KimiSessionReader
+    // Register KimiAcpRunner (pure ACP mode) and KimiSessionReader
     const kimiSessionReader = new KimiSessionReader();
-    agentRegistry.register('kimi', (ws) => {
+    agentRegistry.register('kimi', (_ws) => {
         // 每次 factory 调用时从 registry 获取最新 config
         const container = agentRegistry.getConfigContainer();
         const latestConfig = container?.current ?? config;
         const kimiConf = getAgentConfig(latestConfig, 'kimi');
-        return new KimiRunner({
-            model: kimiConf?.model ?? 'kimi-code/k3',
-            thinkingEffort: kimiConf?.thinkingEffort ?? 'max',
-            // P1-15: read stopGraceMs from latestConfig (not startup closure)
-            stopGraceMs: latestConfig.claude?.stopGraceMs ?? DEFAULT_STOP_GRACE_MS,
-            pidDir: configDir,
-            workspace: ws,
+        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',
+            permissionMode: kimiConf?.permissionMode ?? 'manual',
         });
     });
     sessionReaderRegistry.register('kimi', kimiSessionReader);
+    // Register DshRunner (HTTP-only DSH Web Host agent) and DshSessionReader.
+    const dshSessionReader = new DshSessionReader({
+        host: getAgentConfig(config, 'dsh')?.host,
+    });
+    agentRegistry.register('dsh', (_ws) => {
+        // Read latest config from container so /config host changes take effect
+        // after bridge.setConfig() + clearRunners().
+        const container = agentRegistry.getConfigContainer();
+        const latestConfig = container?.current ?? config;
+        const dshConf = getAgentConfig(latestConfig, 'dsh');
+        return new DshRunner({
+            kind: 'dsh',
+            sessionReader: dshSessionReader,
+            host: dshConf?.host,
+            agentPreset: dshConf?.agentPreset,
+            model: dshConf?.model,
+            reasoningEffort: dshConf?.reasoningEffort,
+        });
+    });
+    sessionReaderRegistry.register('dsh', dshSessionReader);
     // 2026-07-17: 注册所有 agent 的显示名，实现单点真相
     agentRegistry.registerDisplayName('claude', 'Claude');
     agentRegistry.registerDisplayName('codex', 'Codex');
     agentRegistry.registerDisplayName('opencode', 'Opencode');
     agentRegistry.registerDisplayName('pi', 'Pi');
     agentRegistry.registerDisplayName('kimi', 'Kimi');
+    agentRegistry.registerDisplayName('dsh', 'DSH');
     // 设置全局 registry，供 agentDisplayName 等全局函数使用
     AgentRegistry.setGlobalInstance(agentRegistry);
     // Probe agent CLI availability (fire-and-forget, populates cache for /config card).
@@ -301,6 +287,48 @@ function initializeRunner(config, configDir, cliArgs) {
 }
 /** Setup message and card action handlers. */
 function setupMessageHandlers(connector, router, bridge, sessionStore, workspaceStore, binder, logger, config) {
+    // 入站媒体（图片/文件）：先认证后下载（P1 review 修复）。
+    // connector 只上报"媒体到达"，这里先过 owner + enabled 闸门，通过后才
+    // 下载——未认证/关闭配置时不会发生任何网络下载或内存/磁盘占用。
+    connector.setInboundMediaDetectedHandler((msg) => {
+        if (!binder.isOwner(msg.userId)) {
+            logger.warn(`[media] rejected inbound media from non-owner ${msg.userId}`);
+            return;
+        }
+        // 读 router.config（活引用）：/config 保存后 setConfigValues 返回新对象，
+        // 启动时捕获的 config 参数会过期（P2 review 修复）。
+        if (!router.config.inboundMedia.enabled) {
+            // 不静默（P3 review）：关闭时给 owner 明确反馈，避免发图后无任何反应。
+            // 不下载、不落盘，只回一条说明。
+            void bridge
+                .sendResult({
+                text: '⚠️ 入站媒体保存已关闭（inboundMedia.enabled: false），未保存文件。' +
+                    '如需自动保存图片/文件，请开启后重试',
+            }, {
+                userId: msg.userId,
+                chatId: msg.chatId,
+                messageId: msg.messageId,
+            })
+                .catch((err) => logger.error('[media] disabled feedback send failed:', err));
+            return;
+        }
+        void (async () => {
+            const payload = await connector.downloadInboundMedia(msg, {
+                maxFileSizeMb: router.config.inboundMedia.maxFileSizeMb,
+            });
+            try {
+                await bridge.onInboundMedia(payload);
+            }
+            catch (err) {
+                // handle() 的正常路径会清理临时文件；这里兜底 handle 进入 mkdir
+                // try 之前意外抛错的情况，避免 os.tmpdir 残留。
+                for (const item of payload.media) {
+                    silentlyUnlink(item.tempPath);
+                }
+                throw err;
+            }
+        })().catch((err) => logger.error('[media] inbound media download/save failed:', err));
+    });
     connector.setMessageHandler((msg) => {
         // 绑定/授权闸门：仅 owner 放行；非 owner 静默丢弃；未绑定时要求 PIN 认领
         const decision = binder.classify(msg.userId, msg.content, msg.chatId);
@@ -358,9 +386,16 @@ function setupMessageHandlers(connector, router, bridge, sessionStore, workspace
         }
         // decision.kind === 'owner'：正常处理（不再每条覆盖 startup-contact）
         logger.info(`message from ${msg.userId}: ${msg.content.slice(0, 100)}`);
+        // 文本到达先冲刷待合批的媒体保存提示（先图后文字时文字到达
+        // 先冲刷批次，避免合批提示被后续消息淹没/丢图）。
+        bridge.flushMediaNotifications(msg.userId, msg.chatId);
         // Add Typing reaction to indicate "still alive"
         void connector.addReaction(msg.messageId, 'Typing');
-        const trimmedLower = msg.content.trim().toLowerCase();
+        // 别名展开：命令分发前对消息做一次 $name 展开（不递归）。
+        // `!` / `/` 开头的消息不会进入展开路径（$PATH、$HOME 等 shell 变量不受影响），
+        // 未知 $xxx 原样透传；展开结果若以 `/` 开头会自然落入命令路径。
+        const content = router.expandAliasMessage(msg.content);
+        const trimmedLower = content.trim().toLowerCase();
         if (trimmedLower === '/stop' || trimmedLower === '/t') {
             void (async () => {
                 const stopped = await bridge.interruptCurrentRun({
@@ -377,9 +412,9 @@ function setupMessageHandlers(connector, router, bridge, sessionStore, workspace
             })().catch((err) => logger.error('[control] /stop failed:', err));
             return;
         }
-        if (msg.content.trim().startsWith('/')) {
+        if (content.trim().startsWith('/')) {
             void router
-                .handle(msg.content, {
+                .handle(content, {
                 userId: msg.userId,
                 chatId: msg.chatId,
                 messageId: msg.messageId,
@@ -392,9 +427,9 @@ function setupMessageHandlers(connector, router, bridge, sessionStore, workspace
         // in the same workspace (design.md §9.6: the queue exists to prevent
         // concurrent claude runs, not to serialize bash). router.handle dispatches
         // `!` to bridge.executeBash, which tracks the run independently.
-        if (msg.content.trim().startsWith('!')) {
+        if (content.trim().startsWith('!')) {
             void router
-                .handle(msg.content, {
+                .handle(content, {
                 userId: msg.userId,
                 chatId: msg.chatId,
                 messageId: msg.messageId,
@@ -418,7 +453,7 @@ function setupMessageHandlers(connector, router, bridge, sessionStore, workspace
         // 捕获点 Bridge.currentBinding。
         const binding = bridge.currentBinding(msg.userId);
         bridge.enqueue(workspace, async () => {
-            await router.handle(msg.content, {
+            await router.handle(content, {
                 userId: msg.userId,
                 chatId: msg.chatId,
                 messageId: msg.messageId,
@@ -433,7 +468,7 @@ function setupMessageHandlers(connector, router, bridge, sessionStore, workspace
                 userId: msg.userId,
                 chatId: msg.chatId,
                 messageId: msg.messageId,
-                messagePreview: msg.content.slice(0, 3000),
+                messagePreview: content.slice(0, 3000),
                 // D3/Step4: binding 随 taskMeta 存进 QueuedTask，供替换闭包
                 // （queue.edit/queue.immediate）复用，不重新快照。
                 binding,
@@ -480,27 +515,24 @@ function setupMessageHandlers(connector, router, bridge, sessionStore, workspace
         }
         const isImmediate = isImmediateAction(actionValue.cmd);
         const workspace = sessionStore.getCwd(userId) ?? '';
-        // Build full value object — spread all fields from actionValue,
-        // then override option/formValue/inputValue from action for CardKit 2.0 compatibility.
-        // 2026-07-04: inputValue 来自 CardKit 2.0 input 组件自带提交图标触发 callback
-        const fullValue = {
-            ...actionValue,
-            option: action.action.option,
-            formValue: action.action.formValue,
-            // CardKit 2.0 input ✓ 提交图标：输入值走 raw.action.input_value（SDK normalizer
-            // 丢弃 action.action.input_value，需 connector includeRawEvent: true）。
-            inputValue: action.raw?.action?.input_value ??
-                action.action.input_value,
-        };
-        // queue.input / config.save / approval.respond / approval.toggle 返回
-        // CardActionResponse toast 给点击用户即时反馈。必须直接返回值 --
-        // enqueueImmediate / enqueueConfigAction 是 fire-and-forget，会吞掉返回值。
+        // Build full value object — spread all fields from actionValue, then merge
+        // component out-of-band fields (option/formValue/inputValue/options) where
+        // present. See card-action-payload.ts for the component-type contract.
+        const fullValue = buildCardActionFullValue(actionValue, action);
+        // queue.input / config.save / approval.respond / approval.toggle /
+        // approval.answer 系列返回 CardActionResponse toast 给点击用户即时反馈。
+        // 必须直接返回值 -- enqueueImmediate / enqueueConfigAction 是
+        // fire-and-forget，会吞掉返回值（2026-08-17 review：answer 家族曾漏在
+        // 直返列表外，过期/重复 nonce/非法选项等错误 toast 被静默吞掉）。
         // 审批响应尤其不能落串行队列：run 任务占用队列头直到 turn 结束，审批响应
         // 排在后面会形成死锁（run 不结束不执行、run 结束 coordinator 已删响应空转）。
         if (actionValue.cmd === 'queue.input' ||
             actionValue.cmd === 'config.save' ||
             actionValue.cmd === 'approval.respond' ||
-            actionValue.cmd === 'approval.toggle') {
+            actionValue.cmd === 'approval.toggle' ||
+            actionValue.cmd === 'approval.answer' ||
+            actionValue.cmd === 'approval.answerSubmit' ||
+            actionValue.cmd === 'approval.answerCustom') {
             return router.handleCardAction(fullValue, { userId, chatId, messageId });
         }
         // order.exec → equivalent queued message (Plan A): resolve the order text
@@ -618,6 +650,7 @@ async function main() {
         configPath: path.join(configDir, 'config.yaml'),
         workspacePath: path.join(configDir, 'workspace.json'),
         ordersPath: path.join(configDir, 'orders.json'),
+        aliasesPath: path.join(configDir, 'aliases.json'),
         restartSpawner: () => spawnReplacementBridge(path.join(configDir, 'logs')),
         sessionReaderRegistry,
         devMode: cliArgs.dev,
@@ -683,9 +716,8 @@ async function main() {
                         displayTitle: content.displayTitle,
                         agentKind: config.defaultAgent,
                     }, 
-                    // Compact 仅 codex app-server 模式有实现（runner.runCompact）。
-                    config.defaultAgent === 'codex' &&
-                        getAgentConfig(config, 'codex')?.serviceMode === 'app-server');
+                    // Compact 能力探测与 bridge 侧一致（runner 有 runCompact 才渲染）。
+                    bridge.hasRunCompact(restoredCwd, config.defaultAgent));
                 }
                 catch (err) {
                     getLogger().warn('[startup] sendAutoResumeCard failed:', err);

package/dist/instance-lock.js

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { execFileSync } from 'node:child_process';
+import { silentlyUnlink } from './common/fs.js';
 export class InstanceAlreadyRunningError extends Error {
     pid;
     lockPath;
@@ -68,10 +69,7 @@ export class InstanceLock {
                     throw new InstanceAlreadyRunningError(pid, this.lockPath);
                 }
                 // Stale lock: remove and retry once
-                try {
-                    fs.unlinkSync(this.lockPath);
-                }
-                catch { }
+                silentlyUnlink(this.lockPath);
                 try {
                     const fd = fs.openSync(this.lockPath, 'wx');
                     fs.writeSync(fd, this.lockContents(process.pid));
@@ -99,10 +97,7 @@ export class InstanceLock {
     release() {
         const { pid } = this.readPidAndComm();
         if (pid === process.pid) {
-            try {
-                fs.unlinkSync(this.lockPath);
-            }
-            catch { }
+            silentlyUnlink(this.lockPath);
         }
     }
     registerExitHandlers() {
@@ -142,10 +137,7 @@ export class InstanceLock {
         if (Number.isInteger(pid) && pid > 0 && comm)
             return { pid, comm };
         // Malformed or missing comm — treat as corrupt, unlink and return undefined
-        try {
-            fs.unlinkSync(this.lockPath);
-        }
-        catch { }
+        silentlyUnlink(this.lockPath);
         return { pid: undefined, comm: undefined };
     }
 }

package/dist/order/alias-resolve.d.ts

@@ -0,0 +1,13 @@
+import type { AliasEntry } from './alias-store.js';
+/**
+ * 一次别名展开。
+ *
+ * - 仅匹配消息开头的 `$name`（`^$name`），`$name` 后接空格或行尾，全词精确匹配；
+ * - 名称必须 `[A-Za-z_][A-Za-z0-9_]*`（数字开头的 `$500` 永不匹配）；
+ * - 未知别名返回 undefined（原样透传给 agent，不报错）；
+ * - 单次不递归：展开结果不再二次展开，防死循环；
+ * - `!` / `/` 开头消息天然不匹配（正则要求 `$` 开头），bash 的 `$PATH` 不受影响。
+ *
+ * @returns 展开后的完整消息；无匹配时返回 undefined。
+ */
+export declare function resolveAlias(message: string, aliases: readonly AliasEntry[]): string | undefined;