lark-remote 0.5.7 → 0.5.9

package/dist/router/index.js

@@ -6,7 +6,7 @@ import { getConfigDir, getConfigValue, setConfigValue, setConfigValues, mapAgent
 import { syncAgentChoices } from '../runner/index.js';
 import { resolveDshCredentialsFile } from '../runner/dsh/auth.js';
 import { WorkspaceStore } from '../workspace/index.js';
-import { OrderStore } from '../order/index.js';
+import { OrderStore, ORDER_NOT_FOUND_TEXT } from '../order/index.js';
 import { resolveAlias } from '../order/alias-resolve.js';
 import { diffConfig, setNestedValue } from './config-diff.js';
 import { AGENT_KINDS } from '../runner/types.js';
@@ -16,7 +16,7 @@ import { clampInt } from '../common/clamp.js';
 import { activeRunUsage } from './usage-format.js';
 import { markdownDiv, buildSessionHistoryCard, paginationBar, searchBar, parseJumpOffset, SEARCH_INPUT_NAME, PAGE_JUMP_INVALID_HINT, } from './card-helpers.js';
 import { MAX_FILE_UPLOAD_SIZE } from '../connector/file-limits.js';
-import { newSessionButton, resumeCompactButton, agentDisplayName } from '../card/card-shared.js';
+import { cardButton, newSessionButton, resumeCompactButton, agentDisplayName, } from '../card/card-shared.js';
 import { displayName } from '../platform/path.js';
 import { atomicWrite } from '../persistence/atomic-write.js';
 import { checkLatestVersion as defaultCheckLatestVersion, compareVersions as defaultCompareVersions, runInstallLatest as defaultRunInstallLatest, } from '../update/index.js';
@@ -133,6 +133,18 @@ const RESUME_CONTENT_PREFETCH = 5;
  * `New Session`、空串），都不是真实输入，不得渲染成行标题。
  */
 const RESUME_SUMMARY_PLACEHOLDERS = new Set(['', '(no user message)', '(无摘要)', 'New Session']);
+/** 列表卡「最近输入 / 最后输出」单行预览的长度上限（中文按字符，手机约两行）。 */
+const RESUME_PREVIEW_MAX = 60;
+/**
+ * 列表卡单行预览：压平空白、去掉反引号，再按字符截断。
+ *
+ * 为什么去反引号：agent 的输出里 `code` 很常见，截断点落在一对反引号中间时
+ * 后半张卡片的 markdown 会被当成代码块渲染（lark_md 不闭合就不回退）。
+ */
+function sessionPreviewLine(text, max) {
+    const flat = text.replace(/`/g, '').replace(/\s+/g, ' ').trim();
+    return flat.length > max ? `${flat.slice(0, max - 1)}…` : flat;
+}
 /**
  * Card-action commands that must run with enqueue({ immediate: true }).
  * These bypass the serial queue and execute immediately.
@@ -771,9 +783,8 @@ export class CommandRouter {
         const { cwd, messageId } = payload;
         const removed = this.bridge.removeFromQueue(cwd, messageId);
         if (removed) {
-            // Update the queue card in-place to "cancelled" state
-            await this.bridge.updateQueueCardToCancelled(cwd, messageId);
-            // Send a brief confirmation (user can see the card has been updated)
+            // 队列卡的「已撤销」更新由 removeFromQueue 统一触发（单一收口）；
+            // 这里只负责给点击者一个即时反馈。
             await this.bridge.sendResult({ text: '✅ 已从队列中撤销' }, ctx);
         }
         else {
@@ -854,7 +865,6 @@ export class CommandRouter {
         const tasks = this.bridge.getQueuedTasks(cwd);
         const targetIdx = tasks.findIndex((t) => t.messageId === messageId);
         let removedCount = 0;
-        const removedIds = [];
         // Phase 1: remove synchronously. The queue chain advances on any await
         // (card PATCH round trips included), so every task before the target must
         // be removed before yielding to the event loop — otherwise a task the user
@@ -862,20 +872,15 @@ export class CommandRouter {
         // in flight.
         for (let i = 0; i < targetIdx; i++) {
             const task = tasks[i];
+            // 撤销卡片由 removeFromQueue 统一触发（fire-and-forget），保持本循环
+            // 同步推进的既有不变式。
             if (this.bridge.removeFromQueue(cwd, task.messageId)) {
                 removedCount++;
-                removedIds.push(task.messageId);
             }
         }
         if (targetIdx < 0) {
             getLogger().debug(`[router] queue.immediate: target no longer queued (began/cancelled), not clearing tasks behind it`);
         }
-        // Phase 2: update cancelled cards after all removals. All tasks before the
-        // target are already gone, so any chain advance can only reach the target
-        // itself — the card updates may safely run in the background.
-        for (const removedId of removedIds) {
-            void this.bridge.updateQueueCardToCancelled(cwd, removedId);
-        }
         // 4. DO NOT remove the target task - keep it in queue to execute immediately
         // The queue will naturally execute it after the current task (which we just stopped)
         // 4.4. Refresh the replacement with the latest edited content (idempotent:
@@ -1504,7 +1509,7 @@ export class CommandRouter {
             return { toast: { type: 'error', content: CARD_PAYLOAD_MISSING } };
         }
         if (!this.orderStore.has(orderId)) {
-            return { toast: { type: 'error', content: '指令不存在或已被删除' } };
+            return { toast: { type: 'error', content: ORDER_NOT_FOUND_TEXT } };
         }
         // Delete the order
         this.orderStore.remove(orderId);
@@ -1542,7 +1547,7 @@ export class CommandRouter {
         this.orderStore.reload();
         const order = this.orderStore.get().find((o) => o.id === orderId);
         if (!order) {
-            return { toast: { type: 'error', content: '指令不存在或已被删除' } };
+            return { toast: { type: 'error', content: ORDER_NOT_FOUND_TEXT } };
         }
         // 列表卡显示的是截断版（≤100 字符 + ...），编辑卡预览保持一致
         const displayText = order.text.length > 100 ? order.text.slice(0, 97) + '...' : order.text;
@@ -1614,7 +1619,7 @@ export class CommandRouter {
      */
     async handleOrderAliasInput(value, ctx) {
         const name = value.inputValue ?? value.formValue?.['aliasName'];
-        return this.mutateOrderAndRefreshCard(value, ctx, { missingToast: '指令不存在或已被删除' }, (order) => {
+        return this.mutateOrderAndRefreshCard(value, ctx, { missingToast: ORDER_NOT_FOUND_TEXT }, (order) => {
             const trimmed = name?.trim() ?? '';
             // 变更前快照旧别名：setAlias 会原地变异 order 对象（delete entry.alias），
             // 删除后 order.alias 已为 undefined，直接用会让成功文案显示 `$undefined`。
@@ -1676,7 +1681,7 @@ export class CommandRouter {
      */
     async handleOrderTextInput(value, ctx) {
         const raw = value.inputValue ?? value.formValue?.['text'];
-        return this.mutateOrderAndRefreshCard(value, ctx, { missingToast: '指令不存在或已被删除' }, (order) => {
+        return this.mutateOrderAndRefreshCard(value, ctx, { missingToast: ORDER_NOT_FOUND_TEXT }, (order) => {
             let updated;
             try {
                 updated = this.orderStore.updateText(order.id, raw ?? '');
@@ -1686,7 +1691,7 @@ export class CommandRouter {
             }
             if (!updated) {
                 // reload + find 后 updateText 不应返回 undefined；防御性兜底（如并发删除）。
-                return { ok: false, error: '指令不存在或已被删除' };
+                return { ok: false, error: ORDER_NOT_FOUND_TEXT };
             }
             const preview = updated.text.length > 50 ? updated.text.slice(0, 50) + '...' : updated.text;
             return { ok: true, toast: `✅ 已更新指令: ${preview}` };
@@ -2322,13 +2327,7 @@ export class CommandRouter {
                         width: 'weighted',
                         weight: 2,
                         elements: [
-                            {
-                                tag: 'button',
-                                text: { tag: 'plain_text', content: c.label },
-                                type: 'default',
-                                size: 'small',
-                                behaviors: [{ type: 'callback', value: { cmd: `help.${c.cmd}` } }],
-                            },
+                            cardButton(c.label, { cmd: `help.${c.cmd}` }, { type: 'default', size: 'small' }),
                         ],
                     },
                     {
@@ -2485,6 +2484,11 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
                     '请在 DSH Web UI 检查；需要终止时再发一次 /stop。',
             };
         }
+        // 多个 workspace 并行时 /stop 会停掉全部；把这件事说出来，避免用户以为
+        // 只停了当前那个（旧实现只停一条且无提示）。
+        const count = interrupt.stoppedCount ?? 1;
+        if (count > 1)
+            return { text: `✅ 已停止 ${count} 个运行中的任务` };
         return null;
     }
     async cmdExit() {
@@ -2622,6 +2626,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
             activeRun.terminal !== 'error' &&
             activeRun.terminal !== 'interrupted' &&
             activeRun.terminal !== 'idle_timeout' &&
+            activeRun.terminal !== 'goal_continuing' &&
             activeRun.sessionId === sessionId;
         const activeUsage = activeRunUsage(activeRun);
         return {
@@ -2804,17 +2809,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
     buildResumeActionButtons(opts) {
         const actions = [];
         if (opts.isActive) {
-            actions.push({
-                tag: 'button',
-                text: { tag: 'plain_text', content: '⏹ 终止' },
-                type: 'danger',
-                behaviors: [
-                    {
-                        type: 'callback',
-                        value: { cmd: 'stop', runId: opts.activeRunRunId, cwd: opts.cwd },
-                    },
-                ],
-            });
+            actions.push(cardButton('⏹ 终止', { cmd: 'stop', runId: opts.activeRunRunId, cwd: opts.cwd }, { type: 'danger' }));
         }
         if (opts.compact && !opts.isActive) {
             actions.push(resumeCompactButton(opts.compact.sessionId, opts.compact.agentKind));
@@ -2930,88 +2925,32 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
             // Build header with parent button
             const headerElements = [];
             if (hasParent) {
-                headerElements.push({
-                    tag: 'button',
-                    text: { tag: 'plain_text', content: '上级' },
-                    type: 'default',
-                    size: 'small',
-                    behaviors: [
-                        { type: 'callback', value: { cmd: 'ls.browse', path: parentDir, root: browseRoot } },
-                    ],
-                });
+                headerElements.push(cardButton('上级', { cmd: 'ls.browse', path: parentDir, root: browseRoot }, { type: 'default', size: 'small' }));
             }
             // Show "返回" button when browsing away from the /ls root (回到 /ls 指定的目录)
             if (canReturn) {
-                headerElements.push({
-                    tag: 'button',
-                    text: { tag: 'plain_text', content: '返回' },
-                    type: 'default',
-                    size: 'small',
-                    behaviors: [
-                        { type: 'callback', value: { cmd: 'ls.browse', path: browseRoot, root: browseRoot } },
-                    ],
-                });
+                headerElements.push(cardButton('返回', { cmd: 'ls.browse', path: browseRoot, root: browseRoot }, { type: 'default', size: 'small' }));
             }
-            headerElements.push({
-                tag: 'button',
-                text: { tag: 'plain_text', content: '刷新' },
-                type: 'default',
-                size: 'small',
-                behaviors: [
-                    {
-                        type: 'callback',
-                        value: {
-                            cmd: 'ls.refresh',
-                            path: targetDir,
-                            offset: safeOffset,
-                            root: browseRoot,
-                            ...(filter ? { q: filter } : {}),
-                        },
-                    },
-                ],
-            });
+            headerElements.push(cardButton('刷新', {
+                cmd: 'ls.refresh',
+                path: targetDir,
+                offset: safeOffset,
+                root: browseRoot,
+                ...(filter ? { q: filter } : {}),
+            }, { type: 'default', size: 'small' }));
             // Show "切换" button when viewing a subdirectory (to switch cwd to this directory)
             if (isSubdir) {
-                headerElements.push({
-                    tag: 'button',
-                    text: { tag: 'plain_text', content: '切换' },
-                    type: 'primary',
-                    size: 'small',
-                    // 切换只改 cwd，**不重置浏览起点**：root 一路带到切换后的卡片，
-                    // 否则「返回」会退化成「回到刚切换到的目录」（用户反馈的缺陷）。
-                    behaviors: [
-                        { type: 'callback', value: { cmd: 'ls.switch', path: targetDir, root: browseRoot } },
-                    ],
-                });
+                headerElements.push(
+                // 切换只改 cwd，**不重置浏览起点**：root 一路带到切换后的卡片，
+                // 否则「返回」会退化成「回到刚切换到的目录」（用户反馈的缺陷）。
+                cardButton('切换', { cmd: 'ls.switch', path: targetDir, root: browseRoot }, { type: 'primary', size: 'small' }));
             }
             // Helper to create directory button - use targetDir
-            const dirButton = (name) => ({
-                tag: 'button',
-                text: { tag: 'plain_text', content: `📁 ${name}` },
-                type: 'default',
-                behaviors: [
-                    {
-                        type: 'callback',
-                        value: {
-                            cmd: 'ls.browse',
-                            path: path.join(targetDir, name),
-                            root: browseRoot,
-                        },
-                    },
-                ],
-            });
+            const dirButton = (name) => cardButton(`📁 ${name}`, { cmd: 'ls.browse', path: path.join(targetDir, name), root: browseRoot }, { type: 'default' });
             // Helper to create file button with size - use targetDir
             const fileButton = (name, size) => {
                 const sizeStr = size !== undefined ? ` (${formatBytes(size)})` : '';
-                return {
-                    tag: 'button',
-                    text: { tag: 'plain_text', content: `📄 ${name}${sizeStr}` },
-                    type: 'default',
-                    size: 'small',
-                    behaviors: [
-                        { type: 'callback', value: { cmd: 'ls.file', path: path.join(targetDir, name) } },
-                    ],
-                };
+                return cardButton(`📄 ${name}${sizeStr}`, { cmd: 'ls.file', path: path.join(targetDir, name) }, { type: 'default', size: 'small' });
             };
             // Build each section's elements (no tabs - use section headers)
             // Note: div+elements is not supported in CardKit 2.0, use column_set instead
@@ -3176,25 +3115,12 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
         const mtimeText = stat ? stat.mtime.toLocaleString('zh-CN', { hour12: false }) : '未知';
         const parentDir = path.dirname(filePath);
         const buttons = [
-            {
-                tag: 'button',
-                text: { tag: 'plain_text', content: '📎 下载' },
-                type: 'primary',
-                size: 'small',
-                behaviors: [{ type: 'callback', value: { cmd: 'ls.file', path: filePath } }],
-            },
+            cardButton('📎 下载', { cmd: 'ls.file', path: filePath }, { type: 'primary', size: 'small' }),
         ];
         if (parentDir !== filePath) {
-            buttons.push({
-                tag: 'button',
-                text: { tag: 'plain_text', content: '上级' },
-                type: 'default',
-                size: 'small',
-                // 浏览起点 = 文件所在目录：进入后「返回」回到这里，不回 工作目录
-                behaviors: [
-                    { type: 'callback', value: { cmd: 'ls.browse', path: parentDir, root: parentDir } },
-                ],
-            });
+            buttons.push(
+            // 浏览起点 = 文件所在目录：进入后「返回」回到这里，不回 工作目录
+            cardButton('上级', { cmd: 'ls.browse', path: parentDir, root: parentDir }, { type: 'default', size: 'small' }));
         }
         return {
             card: {
@@ -3373,18 +3299,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
                                 tag: 'column',
                                 width: 'auto',
                                 elements: [
-                                    {
-                                        tag: 'button',
-                                        text: { tag: 'plain_text', content: `切换为 ${switchLabel}` },
-                                        type: 'default',
-                                        size: 'small',
-                                        behaviors: [
-                                            {
-                                                type: 'callback',
-                                                value: { cmd: 'ws.sort', ...(filter ? { q: filter } : {}) },
-                                            },
-                                        ],
-                                    },
+                                    cardButton(`切换为 ${switchLabel}`, { cmd: 'ws.sort', ...(filter ? { q: filter } : {}) }, { type: 'default', size: 'small' }),
                                 ],
                             },
                         ],
@@ -3403,46 +3318,24 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
                                     tag: 'column',
                                     width: 'auto',
                                     elements: [
-                                        {
-                                            tag: 'button',
-                                            text: { tag: 'plain_text', content: '切换' },
-                                            type: 'primary',
-                                            size: 'small',
-                                            behaviors: [
-                                                {
-                                                    type: 'callback',
-                                                    value: {
-                                                        cmd: 'ws.use',
-                                                        name: entry.name,
-                                                        offset: safeOffset,
-                                                        ...(filter ? { q: filter } : {}),
-                                                    },
-                                                },
-                                            ],
-                                        },
+                                        cardButton('切换', {
+                                            cmd: 'ws.use',
+                                            name: entry.name,
+                                            offset: safeOffset,
+                                            ...(filter ? { q: filter } : {}),
+                                        }, { type: 'primary', size: 'small' }),
                                     ],
                                 },
                                 {
                                     tag: 'column',
                                     width: 'auto',
                                     elements: [
-                                        {
-                                            tag: 'button',
-                                            text: { tag: 'plain_text', content: '删除' },
-                                            type: 'danger',
-                                            size: 'small',
-                                            behaviors: [
-                                                {
-                                                    type: 'callback',
-                                                    value: {
-                                                        cmd: 'ws.remove',
-                                                        name: entry.name,
-                                                        offset: safeOffset,
-                                                        ...(filter ? { q: filter } : {}),
-                                                    },
-                                                },
-                                            ],
-                                        },
+                                        cardButton('删除', {
+                                            cmd: 'ws.remove',
+                                            name: entry.name,
+                                            offset: safeOffset,
+                                            ...(filter ? { q: filter } : {}),
+                                        }, { type: 'danger', size: 'small' }),
                                     ],
                                 },
                             ],
@@ -3477,17 +3370,6 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
             }
         }
     }
-    /**
-     * degraded card when a session's export is non-empty but unparseable
-     * (truncated by opencode's pipe cap on huge sessions, or otherwise corrupt).
-     * The session exists, so reuse listSessions metadata (title) instead of the
-     * misleading "未找到". Reuses the same card-builder helpers (markdownDiv) as
-     * the normal resume card; enforceCardBudget still applies at send time.
-     */
-    /**
-     * /resume 核心实现（public：handleResumePage / handle / resume.use 共用，
-     * 也是测试的直接 seam，避免测试用 @ts-expect-error 摸私有方法）。
-     */
     /**
      * DSH /resume preset 一致性校验：返回 mismatch 详情，或 undefined（一致/不可判定）。
      *
@@ -3654,6 +3536,13 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
         const sessionMeta = new Map();
         const prefetchCount = Math.min(RESUME_CONTENT_PREFETCH, allSessions.length);
         for (const s of allSessions.slice(0, prefetchCount)) {
+            // 行上已经带了服务端投影预览（DSH：title + turnOutline 末条）→ 跳过预取。
+            // DSH 的 readSessionContent 每行走 3 次 unary：`session/list`（cwd 守卫）、
+            // `session/projections`（取 throughSeq）、再 `session/page`（maxMessages=10000，
+            // 拉整段历史）。按前 5 行预取等于 15 次同步 HTTP，而这些信息一次
+            // `session/list` 就已经给全了。
+            if (s.title || s.lastUserMessage || s.lastAssistantMessage)
+                continue;
             // 优先走轻量摘要（只取标题/用量，不构造 events）——codex 实现了
             // readSessionSummary，避免对前 N 条各做一次全量 JSONL 解析来构造
             // 立即被丢弃的 events 数组。其他 agent 无此方法时回退全量读取再取字段。
@@ -3697,26 +3586,33 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
             const buttonText = isCurrent ? '✓ 当前会话' : '恢复此会话';
             const meta = sessionMeta.get(s.sessionId);
             // Title priority:
-            // 1. Prefetched displayTitle (aiTitle or last user message) keeps its
+            // 1. 行级 title（服务端投影，DSH）→ 「标题」。
+            // 2. Prefetched displayTitle (aiTitle or last user message) keeps its
             //    original label (AI 标题 / 最近输入).
-            // 2. Otherwise the lightweight summary renders under the neutral
+            // 3. Otherwise the lightweight summary renders under the neutral
             //    "会话摘要" label — summary is the first user message, not the
             //    last input, so "最近输入" would be semantically wrong.
-            // 3. Placeholder summaries (no user message) render no title section
+            // 4. Placeholder summaries (no user message) render no title section
             //    at all — never leak '(无摘要)'/'(no user message)'/'New Session'.
             const summaryIsPlaceholder = RESUME_SUMMARY_PLACEHOLDERS.has(s.summary.trim());
             const prefetchedTitle = meta?.displayTitle;
+            // 行级 title 也过占位符过滤：DSH 对空会话可能给 "New Session"，旧路径
+            // 的 summary 会被挡掉，新路径如果不过滤就会把它当真实标题渲染。
+            const rowTitleRaw = s.title?.trim() ?? '';
+            const rowTitle = rowTitleRaw && !RESUME_SUMMARY_PLACEHOLDERS.has(rowTitleRaw) ? rowTitleRaw : undefined;
             // aiTitle 不能单独作为"预取标题"键：若 displayTitle 缺失（理论上 opencode
             // info.title 非空但 export 无 user text），标题兜底是 summary，label 必须
             // 是中性"会话摘要"而不是"最近输入"（Review 边缘分支）。
-            const titleText = prefetchedTitle ?? (summaryIsPlaceholder ? '' : s.summary);
+            const titleText = prefetchedTitle ?? rowTitle ?? (summaryIsPlaceholder ? '' : s.summary);
             const titleLabel = prefetchedTitle
                 ? meta?.aiTitle
                     ? 'AI 标题'
                     : '最近输入'
-                : summaryIsPlaceholder
-                    ? ''
-                    : '会话摘要';
+                : rowTitle
+                    ? '标题'
+                    : summaryIsPlaceholder
+                        ? ''
+                        : '会话摘要';
             const sections = [];
             if (titleText) {
                 sections.push(`🏷️ **${titleLabel}**\n${titleText.slice(0, 80)}${titleText.length > 80 ? '...' : ''}`);
@@ -3724,6 +3620,14 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
             if (meta?.recap) {
                 sections.push(`📝 **Recap**\n${meta.recap.slice(0, 60)}${meta.recap.length > 60 ? '...' : ''}`);
             }
+            // 行级预览（DSH 服务端投影）：最后一句我说了什么 / 最后一句它答了什么。
+            // 只对提供了字段的 reader 渲染，其他 agent 的卡片一个字都不变。
+            if (s.lastUserMessage) {
+                sections.push(`✏️ **最近输入**\n${sessionPreviewLine(s.lastUserMessage, RESUME_PREVIEW_MAX)}`);
+            }
+            if (s.lastAssistantMessage) {
+                sections.push(`📤 **最后输出**\n${sessionPreviewLine(s.lastAssistantMessage, RESUME_PREVIEW_MAX)}`);
+            }
             const infoStr = sections.length > 0 ? '\n' + sections.join('\n──\n') : '';
             elements.push({ tag: 'hr' });
             // Both current and non-current sessions get a button for visual consistency
@@ -3741,18 +3645,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
                         tag: 'column',
                         width: 'auto',
                         elements: [
-                            {
-                                tag: 'button',
-                                text: { tag: 'plain_text', content: buttonText },
-                                type: isCurrent ? 'default' : 'primary',
-                                disabled: isCurrent,
-                                behaviors: [
-                                    {
-                                        type: 'callback',
-                                        value: { cmd: 'resume.use', sessionId: s.sessionId, agent: agentKind },
-                                    },
-                                ],
-                            },
+                            cardButton(buttonText, { cmd: 'resume.use', sessionId: s.sessionId, agent: agentKind }, { type: isCurrent ? 'default' : 'primary', disabled: isCurrent }),
                         ],
                     },
                 ],
@@ -3830,14 +3723,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
                         content: `> session: ${run.sessionId.slice(0, 12)}...  \n> 状态: ${statusLabel}`,
                     },
                 });
-                // Stop button - CardKit 2.0 with behaviors callback
-                elements.push({
-                    tag: 'button',
-                    text: { tag: 'plain_text', content: '⏹ 停止' },
-                    type: 'danger',
-                    size: 'small',
-                    behaviors: [{ type: 'callback', value: { cmd: 'stop', runId: run.runId, cwd: run.cwd } }],
-                });
+                elements.push(cardButton('⏹ 停止', { cmd: 'stop', runId: run.runId, cwd: run.cwd }, { type: 'danger', size: 'small' }));
                 elements.push({ tag: 'hr' });
             }
             remaining -= end - start;
@@ -3862,14 +3748,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
                     tag: 'div',
                     text: { tag: 'lark_md', content: `> 目录: ${run.cwd}  \n> 状态: ${statusLabel}` },
                 });
-                // Stop button - CardKit 2.0 with behaviors callback
-                elements.push({
-                    tag: 'button',
-                    text: { tag: 'plain_text', content: '⏹ 停止' },
-                    type: 'danger',
-                    size: 'small',
-                    behaviors: [{ type: 'callback', value: { cmd: 'stop', runId: run.runId, cwd: run.cwd } }],
-                });
+                elements.push(cardButton('⏹ 停止', { cmd: 'stop', runId: run.runId, cwd: run.cwd }, { type: 'danger', size: 'small' }));
                 elements.push({ tag: 'hr' });
             }
         }
@@ -3976,55 +3855,29 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
         // 使用 agent config builder 获取该 agent 的配置字段
         const defaultAgent = displayConfig.defaultAgent ?? 'claude';
         const configBuilder = getConfigBuilder(defaultAgent);
-        // Build defaultAgent selector with availability annotations.
-        // Direct inline construction (not via ConfigField) so that text (display label)
-        // and value (agentKind for config storage) can differ — uninstalled agents get
-        // a "⚠️ (未安装)" suffix in the label while the value stays clean.
-        // 固定展示顺序（Codex → Claude → OpenCode → Pi → Kimi），
+        // defaultAgent 选择器作为普通 select 字段交给共享渲染（SelectOption 支持
+        // text/value 分离：未安装 agent 的 label 带「⚠️ (未安装)」，value 保持干净）。
+        // 固定展示顺序（Codex → Claude → OpenCode → Pi → Kimi → DSH），
         // 明确未安装的 agent 排到后面（getCachedAvailability === false）。
         const allAgents = sortAgentsForDisplay(listRegisteredAgents(), getCachedAvailability);
         const agentOptions = allAgents.map((kind) => {
             const available = getCachedAvailability(kind);
             const label = available === false ? `${agentDisplayName(kind)} ⚠️ (未安装)` : agentDisplayName(kind);
-            return { text: { tag: 'plain_text', content: label }, value: kind };
+            return { text: label, value: kind };
         });
         const selectedAgent = displayConfig.defaultAgent ?? 'claude';
-        const agentSelector = {
-            tag: 'column_set',
-            flex_mode: 'none',
-            columns: [
-                {
-                    tag: 'column',
-                    width: 'weighted',
-                    weight: 2,
-                    vertical_align: 'center',
-                    elements: [{ tag: 'div', text: { tag: 'lark_md', content: '默认 Agent' } }],
-                },
-                {
-                    tag: 'column',
-                    width: 'weighted',
-                    weight: 3,
-                    vertical_align: 'center',
-                    elements: [
-                        {
-                            tag: 'select_static',
-                            placeholder: { tag: 'plain_text', content: '请选择' },
-                            options: agentOptions,
-                            initial_option: selectedAgent,
-                            behaviors: [{ type: 'callback', value: { cmd: 'config.set', key: 'defaultAgent' } }],
-                        },
-                    ],
-                },
-            ],
+        const agentSelectorField = {
+            key: 'defaultAgent',
+            label: '默认 Agent',
+            type: 'select',
+            options: agentOptions,
+            currentValue: selectedAgent,
         };
-        // Agent config fields — no longer include defaultAgent as a ConfigField
-        // (it's rendered inline above with text/value separation).
-        const agentConfigFieldsNoSelector = configBuilder.buildFields(displayConfig);
         const tabs = [
             {
                 id: 'agent',
                 label: `🤖 ${agentDisplayName(defaultAgent)}`,
-                fields: agentConfigFieldsNoSelector,
+                fields: [agentSelectorField, ...configBuilder.buildFields(displayConfig)],
             },
             {
                 id: 'idle',
@@ -4044,28 +3897,8 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
                 ],
             },
         ];
-        // 使用共享渲染模块构建卡片
-        const card = buildConfigCardFromTabs(tabs, displayConfig);
-        // Inject the agent selector as the first element in the agent tab section,
-        // right after the "**🤖 ..." header, so text/value can differ for uninstalled agents.
-        // NOTE: findIndex relies on the agent tab header starting with "**🤖" — if the
-        // tab label format changes, this fallback will fire and the selector moves to top.
-        const body = card.body;
-        if (body && Array.isArray(body.elements)) {
-            const headerIdx = body.elements.findIndex((el) => typeof el === 'object' &&
-                el !== null &&
-                el.tag === 'div' &&
-                el.text?.tag === 'lark_md' &&
-                (el.text?.content ?? '').startsWith('**🤖'));
-            if (headerIdx >= 0) {
-                body.elements.splice(headerIdx + 1, 0, agentSelector);
-            }
-            else {
-                getLogger().warn('[buildConfigCard] agent tab header not found, falling back to unshift');
-                body.elements.unshift(agentSelector);
-            }
-        }
-        return { card };
+        // 使用共享渲染模块构建卡片（Agent 选择器作为普通 select 字段参与渲染）
+        return { card: buildConfigCardFromTabs(tabs, displayConfig) };
     }
     /** /order 实现（public：测试直接调用，替代 as unknown as）。 */
     cmdOrder(args, _ctx, offset = 0) {
@@ -4096,49 +3929,16 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
                     // 右侧「删除指令」按钮。两列均 weighted 1:1，跨行对齐。
                     const leftColumn = order.alias
                         ? [
-                            {
-                                tag: 'button',
-                                text: { tag: 'plain_text', content: `$${order.alias}` },
-                                type: 'default',
-                                size: 'small',
-                                behaviors: [
-                                    {
-                                        type: 'callback',
-                                        value: { cmd: 'order.aliasEdit', orderId: order.id, offset: safeOffset },
-                                    },
-                                ],
-                            },
-                            {
-                                tag: 'button',
-                                text: { tag: 'plain_text', content: '✕' },
-                                type: 'default',
-                                size: 'small',
-                                behaviors: [
-                                    {
-                                        type: 'callback',
-                                        value: {
-                                            cmd: 'order.aliasRemove',
-                                            orderId: order.id,
-                                            aliasName: order.alias,
-                                            offset: safeOffset,
-                                        },
-                                    },
-                                ],
-                            },
+                            cardButton(`$${order.alias}`, { cmd: 'order.aliasEdit', orderId: order.id, offset: safeOffset }, { type: 'default', size: 'small' }),
+                            cardButton('✕', {
+                                cmd: 'order.aliasRemove',
+                                orderId: order.id,
+                                aliasName: order.alias,
+                                offset: safeOffset,
+                            }, { type: 'default', size: 'small' }),
                         ]
                         : [
-                            {
-                                tag: 'button',
-                                text: { tag: 'plain_text', content: '＋别名' },
-                                type: 'default',
-                                size: 'small',
-                                behaviors: [
-                                    {
-                                        type: 'callback',
-                                        value: { cmd: 'order.aliasEdit', orderId: order.id, offset: safeOffset },
-                                    },
-                                ],
-                            },
+                            cardButton('＋别名', { cmd: 'order.aliasEdit', orderId: order.id, offset: safeOffset }, { type: 'default', size: 'small' }),
                         ];
                     elements.push({
                         tag: 'column_set',
@@ -4162,18 +3962,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
                                                 tag: 'column',
                                                 width: 'auto',
                                                 elements: [
-                                                    {
-                                                        tag: 'button',
-                                                        text: { tag: 'plain_text', content: '▶ 执行' },
-                                                        type: 'primary',
-                                                        size: 'small',
-                                                        behaviors: [
-                                                            {
-                                                                type: 'callback',
-                                                                value: { cmd: 'order.exec', orderId: order.id },
-                                                            },
-                                                        ],
-                                                    },
+                                                    cardButton('▶ 执行', { cmd: 'order.exec', orderId: order.id }, { type: 'primary', size: 'small' }),
                                                 ],
                                             },
                                             {
@@ -4183,44 +3972,14 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
                                                 tag: 'column',
                                                 width: 'auto',
                                                 elements: [
-                                                    {
-                                                        tag: 'button',
-                                                        text: { tag: 'plain_text', content: '编辑' },
-                                                        type: 'default',
-                                                        size: 'small',
-                                                        behaviors: [
-                                                            {
-                                                                type: 'callback',
-                                                                value: {
-                                                                    cmd: 'order.textEdit',
-                                                                    orderId: order.id,
-                                                                    offset: safeOffset,
-                                                                },
-                                                            },
-                                                        ],
-                                                    },
+                                                    cardButton('编辑', { cmd: 'order.textEdit', orderId: order.id, offset: safeOffset }, { type: 'default', size: 'small' }),
                                                 ],
                                             },
                                             {
                                                 tag: 'column',
                                                 width: 'auto',
                                                 elements: [
-                                                    {
-                                                        tag: 'button',
-                                                        text: { tag: 'plain_text', content: '删除' },
-                                                        type: 'danger',
-                                                        size: 'small',
-                                                        behaviors: [
-                                                            {
-                                                                type: 'callback',
-                                                                value: {
-                                                                    cmd: 'order.delete',
-                                                                    orderId: order.id,
-                                                                    offset: safeOffset,
-                                                                },
-                                                            },
-                                                        ],
-                                                    },
+                                                    cardButton('删除', { cmd: 'order.delete', orderId: order.id, offset: safeOffset }, { type: 'danger', size: 'small' }),
                                                 ],
                                             },
                                         ],