lark-remote 0.5.7 → 0.5.9

package/dist/bridge/queue-manager.js

@@ -1,4 +1,5 @@
 import { getLogger } from '../logger/index.js';
+import { cardWithHeader } from '../card/card-shared.js';
 import { displayName } from '../platform/path.js';
 /**
  * Per-workspace cap on the number of tasks WAITING to execute.
@@ -171,25 +172,19 @@ export class QueueManager {
             // a rejected task never executes, so it must not occupy a slot.
             if (currentQueueLength >= MAX_WAITING_QUEUE) {
                 getLogger().warn(`[queue-manager] queue full cwd=${cwd} depth=${currentQueueLength} rejecting task messageId=${taskMeta.messageId}`);
-                void this.sendCard(taskMeta.chatId, {
-                    schema: '2.0',
-                    config: { wide_screen_mode: true },
-                    header: {
-                        template: 'red',
-                        title: { tag: 'plain_text', content: '🚫 队列已满' },
-                    },
-                    body: {
-                        elements: [
-                            {
-                                tag: 'div',
-                                text: {
-                                    tag: 'lark_md',
-                                    content: `当前工作目录已有 ${MAX_WAITING_QUEUE} 条消息排队等待，为防止积压已拒收本条消息。请等待队列消化后重发，或用 \`/stop\` 清空当前任务。`,
-                                },
+                void this.sendCard(taskMeta.chatId, cardWithHeader({
+                    template: 'red',
+                    title: '🚫 队列已满',
+                    elements: [
+                        {
+                            tag: 'div',
+                            text: {
+                                tag: 'lark_md',
+                                content: `当前工作目录已有 ${MAX_WAITING_QUEUE} 条消息排队等待，为防止积压已拒收本条消息。请等待队列消化后重发，或用 \`/stop\` 清空当前任务。`,
                             },
-                        ],
-                    },
-                }, { replyTo: taskMeta.feishuReplyTo ?? taskMeta.messageId }).catch((err) => {
+                        },
+                    ],
+                }), { replyTo: taskMeta.feishuReplyTo ?? taskMeta.messageId }).catch((err) => {
                     getLogger().error('[queue-manager] failed to send queue-full rejection card:', err);
                 });
                 return;
@@ -559,27 +554,21 @@ export class QueueManager {
                 return;
             }
             const previewForCard = liveTask?.messagePreview ?? messagePreview;
-            const card = {
-                schema: '2.0',
-                config: { wide_screen_mode: true },
-                header: {
-                    template: 'green',
-                    title: { tag: 'plain_text', content: '▶️ 已开始执行' },
-                },
-                body: {
-                    elements: [
-                        {
-                            tag: 'div',
-                            text: { tag: 'lark_md', content: `**当前 Workspace:** \`${workspaceName}\`` },
-                        },
-                        { tag: 'hr' },
-                        { tag: 'div', text: { tag: 'lark_md', content: `📝 \`${previewForCard}\`` } },
-                        { tag: 'hr' },
-                        ...this.buildQueueActionButtons(cwd, messageId, true),
-                    ],
-                },
-            };
-            await this.updateCard(cardMessageId, card);
+            const card = cardWithHeader({
+                template: 'green',
+                title: '▶️ 已开始执行',
+                elements: [
+                    {
+                        tag: 'div',
+                        text: { tag: 'lark_md', content: `**当前 Workspace:** \`${workspaceName}\`` },
+                    },
+                    { tag: 'hr' },
+                    { tag: 'div', text: { tag: 'lark_md', content: `📝 \`${previewForCard}\`` } },
+                    { tag: 'hr' },
+                    ...this.buildQueueActionButtons(cwd, messageId, true),
+                ],
+            });
+            await this.updateCardWithRetry(cardMessageId, card);
             getLogger().debug(`[queue-manager] queue card updated to executing messageId=${messageId}`);
         }
         catch (err) {
@@ -608,9 +597,9 @@ export class QueueManager {
             taskList.splice(index, 1);
         }
         this.indexRemove(cwd, messageId);
-        // Note: queueCardMessages mapping is NOT deleted here.
-        // The caller (handleQueueCancel) will call updateQueueCardToCancelled
-        // which will clean up the mapping after updating the card.
+        // queueCardMessages mapping 仍不在这里删：卡片更新由 Bridge.removeFromQueue
+        // 统一触发（单一收口），updateQueueCardToCancelled 成功/失败后都会清掉映射。
+        // 直接调 QueueManager.removeFromQueue 的测试/内部用途不会自动更新卡片。
         getLogger().info(`[queue-manager] removed from queue cwd=${cwd} messageId=${messageId}`);
         return true;
     }
@@ -622,28 +611,22 @@ export class QueueManager {
             return;
         }
         const workspaceName = displayName(cwd);
-        const card = {
-            schema: '2.0',
-            config: { wide_screen_mode: true },
-            header: {
-                template: 'gray',
-                title: { tag: 'plain_text', content: '❌ 已撤销' },
-            },
-            body: {
-                elements: [
-                    {
-                        tag: 'div',
-                        text: { tag: 'lark_md', content: `**当前 Workspace:** \`${workspaceName}\`` },
-                    },
-                    { tag: 'hr' },
-                    { tag: 'div', text: { tag: 'lark_md', content: `📝 该消息已从队列中撤销` } },
-                    { tag: 'hr' },
-                    ...this.buildQueueActionButtons(cwd, messageId, true),
-                ],
-            },
-        };
+        const card = cardWithHeader({
+            template: 'gray',
+            title: '❌ 已撤销',
+            elements: [
+                {
+                    tag: 'div',
+                    text: { tag: 'lark_md', content: `**当前 Workspace:** \`${workspaceName}\`` },
+                },
+                { tag: 'hr' },
+                { tag: 'div', text: { tag: 'lark_md', content: `📝 该消息已从队列中撤销` } },
+                { tag: 'hr' },
+                ...this.buildQueueActionButtons(cwd, messageId, true),
+            ],
+        });
         try {
-            await this.updateCard(cardMessageId, card);
+            await this.updateCardWithRetry(cardMessageId, card);
             getLogger().debug(`[queue-manager] queue card updated to cancelled, messageId=${messageId}`);
         }
         catch (err) {
@@ -653,6 +636,21 @@ export class QueueManager {
             this.queueCardMessages.delete(messageId);
         }
     }
+    /**
+     * 卡片 PATCH 带一次重试：一次网络抖动不该让排队卡永久停在旧状态——映射
+     * 会在本次调用结束时被清理，之后没有任何自动修正机会。
+     * 第二次仍失败则向上抛，由调用方 catch 记日志（行为与改前一致）。
+     */
+    async updateCardWithRetry(messageId, card) {
+        try {
+            await this.updateCard(messageId, card);
+            return;
+        }
+        catch (err) {
+            getLogger().warn(`[queue-manager] queue card update failed, retrying once messageId=${messageId}: ${err.message}`);
+        }
+        await this.updateCard(messageId, card);
+    }
     /** Get task metadata from queue. */
     getQueuedTask(cwd, messageId) {
         // O(1) index lookup instead of array `find`.

package/dist/card/approval-render.js

@@ -5,7 +5,8 @@
  * Uses CardKit 2.0 (no tag:"action" container — 200861 rule).
  */
 import { collapsibleMarkdownPanel } from './collapsible.js';
-import { truncateUtf8, truncateMarkdownTables } from './text-truncate.js';
+import { truncateMarkdownTables } from './text-truncate.js';
+import { truncateUtf8 } from '../common/truncate.js';
 import { cardButton } from './card-shared.js';
 /** Unique nonce for card button callbacks (SDK dedup + router validation). */
 function mkNonce() {

package/dist/card/bash-card-session.d.ts

@@ -38,7 +38,6 @@ export declare class BashCardSession extends CardSession<BashState, BashRenderOp
     protected get logPrefix(): string;
     protected get errorPrefix(): string;
     protected renderCard(state: BashState, options: BashRenderOptions): object;
-    protected hasOwnBudgetProtection(): boolean;
     protected isFlushableState(): boolean;
     /** Patch the card with updated bash state (e.g. new stdout/stderr). */
     update(patch: Partial<BashState>): Promise<void>;

package/dist/card/bash-card-session.js

@@ -53,14 +53,6 @@ export class BashCardSession extends CardSession {
     renderCard(state, options) {
         return renderBashCard(state, options);
     }
-    hasOwnBudgetProtection() {
-        // renderBashCard 自带 stringify 级 degraded/extreme fallback 预算保护
-        // （与 renderRunCard 对称），保证返回卡 ≤28KB 且保留 command/exitCode。
-        // enforceCardBudget 是会话事件面板专用的静态裁剪层，对 bash 卡的普通
-        // markdownDiv output 是 misfit（超限时极端降级丢 command/exitCode），bash
-        // 卡应跳过它，靠自身 renderer 保护。
-        return true;
-    }
     isFlushableState() {
         // finish() 已把 state 转终态后，in-flight/延迟 flush 不再用旧 state patch。
         return this.state.terminal === 'running';

package/dist/card/bash-renderer.js

@@ -1,6 +1,7 @@
 import { terminalToColor, terminalToLabel, stopButton } from './card-shared.js';
 import { markdownDiv } from './collapsible.js';
-import { truncateUtf8, CARD_BUDGET_BYTES } from './text-truncate.js';
+import { CARD_BUDGET_BYTES } from './text-truncate.js';
+import { truncateUtf8 } from '../common/truncate.js';
 /**
  * 飞书卡片大小限制（安全阈值，与 run-renderer 一致）。
  * 从共享的 text-truncate.ts 导入，避免三处各自定义后数值漂移。

package/dist/card/card-budget.js

@@ -1,4 +1,6 @@
-import { truncateUtf8, dropOldestMarkdownTables, countMarkdownTables, FEISHU_MAX_TABLES, CARD_BUDGET_BYTES, } from './text-truncate.js';
+import { dropOldestMarkdownTables, countMarkdownTables, FEISHU_MAX_TABLES, CARD_BUDGET_BYTES, } from './text-truncate.js';
+import { truncateUtf8 } from '../common/truncate.js';
+import { cardWithHeader } from './card-shared.js';
 /**
  * 静态卡片体积保护
  *
@@ -257,25 +259,19 @@ function enforceByteBudget(truncated, opts = {}, bytesBefore) {
         return done(true);
     }
     // ========== 阶段5：最终兜底（原 extreme_fallback） ==========
-    const minimalCard = {
-        schema: '2.0',
-        config: { wide_screen_mode: true },
-        header: {
-            template: 'orange',
-            title: { tag: 'plain_text', content: '⚠️ 内容已截断' },
-        },
-        body: {
-            elements: [
-                {
-                    tag: 'div',
-                    text: {
-                        tag: 'lark_md',
-                        content: '会话内容过大，已自动截断。\n\n请使用 `/active` 查看完整列表。',
-                    },
+    const minimalCard = cardWithHeader({
+        template: 'orange',
+        title: '⚠️ 内容已截断',
+        elements: [
+            {
+                tag: 'div',
+                text: {
+                    tag: 'lark_md',
+                    content: '会话内容过大，已自动截断。\n\n请使用 `/active` 查看完整列表。',
                 },
-            ],
-        },
-    };
+            },
+        ],
+    });
     return {
         card: minimalCard,
         wasTruncated: true,

package/dist/card/card-session.d.ts

@@ -107,19 +107,9 @@ export declare abstract class CardSession<S, RO = unknown> {
     start(): Promise<void>;
     settle(): Promise<StreamSettleResult>;
     /**
-     * Whether renderCard() already enforces a size budget (so updateCard can
-     * skip enforceCardBudget). Subclasses whose renderer has its own
-     * stringify-level budget protection (e.g. RunCardSession via degraded/
-     * extreme fallback) should override this to return true.
-     */
-    protected hasOwnBudgetProtection(): boolean;
-    /**
-     * Render the current card and apply stringify-level budget enforcement unless
-     * the subclass renderer has its own budget protection. Centralizes the budget
-     * decision so start()/updateCard()/settle() stay symmetric — previously only
-     * updateCard() guarded, while start() producer and settle() fallback sent bare
-     * renderCard output (risking >28KB for BashCardSession, which has no own
-     * stringify-level safety net).
+     * 渲染当前卡片。所有生产子类的 renderer 都自带 stringify 级预算保护
+     * （run/bash 的 degraded/extreme 路径）；发送前 Bridge 还会再走一次
+     * enforceCardBudget，因此这里不再重复裁剪。
      */
     protected safeRenderCard(): object;
     /**

package/dist/card/card-session.js

@@ -1,5 +1,4 @@
 import { getLogger } from '../logger/index.js';
-import { enforceCardBudget } from './card-budget.js';
 /**
  * Base class for single-card streaming sessions (RunCardSession, BashCardSession).
  * Provides the shared lifecycle: start → (push/update) → finish → settle.
@@ -216,25 +215,12 @@ export class CardSession {
         }
     }
     /**
-     * Whether renderCard() already enforces a size budget (so updateCard can
-     * skip enforceCardBudget). Subclasses whose renderer has its own
-     * stringify-level budget protection (e.g. RunCardSession via degraded/
-     * extreme fallback) should override this to return true.
-     */
-    hasOwnBudgetProtection() {
-        return false;
-    }
-    /**
-     * Render the current card and apply stringify-level budget enforcement unless
-     * the subclass renderer has its own budget protection. Centralizes the budget
-     * decision so start()/updateCard()/settle() stay symmetric — previously only
-     * updateCard() guarded, while start() producer and settle() fallback sent bare
-     * renderCard output (risking >28KB for BashCardSession, which has no own
-     * stringify-level safety net).
+     * 渲染当前卡片。所有生产子类的 renderer 都自带 stringify 级预算保护
+     * （run/bash 的 degraded/extreme 路径）；发送前 Bridge 还会再走一次
+     * enforceCardBudget，因此这里不再重复裁剪。
      */
     safeRenderCard() {
-        const card = this.renderCard(this.state, this.renderOptions);
-        return this.hasOwnBudgetProtection() ? card : enforceCardBudget(card).card;
+        return this.renderCard(this.state, this.renderOptions);
     }
     /**
      * Push an update to the card. Tries controller.update first, falls back to

package/dist/card/card-shared.d.ts

@@ -9,6 +9,15 @@ import { type AgentKind } from '../runner/index.js';
 export declare function agentDisplayName(kind: string): string;
 export declare function terminalToLabel(terminal: string): string;
 export declare function terminalToColor(terminal: string): string;
+/**
+ * CardKit 2.0 静态卡骨架：schema/config/header + 给定 body elements。
+ * 队列状态卡、预算兜底卡等"只有 header 文案 + 少量 div"的卡共用。
+ */
+export declare function cardWithHeader(opts: {
+    template: string;
+    title: string;
+    elements: object[];
+}): object;
 /**
  * Create a CardKit 2.0 button with a callback behavior. Shared constructor
  * for every callback button in the card module (stop/new-session/compact/
@@ -21,6 +30,8 @@ export declare function cardButton(text: string, value: Record<string, unknown>,
     size?: 'small' | 'medium' | 'large';
     /** Fixed width, e.g. '100px' (keeps option-row buttons left-aligned). */
     width?: string;
+    /** 置灰（当前项 / 不可执行），仍保留回调 payload。 */
+    disabled?: boolean;
 }): object;
 /**
  * Create a CardKit 2.0 stop button with behaviors callback.

package/dist/card/card-shared.js

@@ -1,4 +1,5 @@
 import { AgentRegistry } from '../runner/index.js';
+import { AGENT_DISPLAY_NAMES } from '../runner/types.js';
 /**
  * Display name for an agent kind in the run card header.
  *
@@ -11,19 +12,8 @@ export function agentDisplayName(kind) {
     if (globalReg) {
         return globalReg.getDisplayName(kind);
     }
-    // Fallback: hardcoded default mapping for unit tests that exercise
-    // render helpers without booting the full AgentRegistry.
-    if (kind === 'claude')
-        return 'Claude';
-    if (kind === 'codex')
-        return 'Codex';
-    if (kind === 'opencode')
-        return 'Opencode';
-    if (kind === 'pi')
-        return 'Pi';
-    if (kind === 'kimi')
-        return 'Kimi';
-    return kind;
+    // Fallback for render helpers that run without the global registry.
+    return AGENT_DISPLAY_NAMES[kind] ?? kind;
 }
 const TERMINAL_LABELS = {
     done: '已完成',
@@ -32,6 +22,8 @@ const TERMINAL_LABELS = {
     idle_timeout: '已超时',
     running: '运行中',
     finalizing: '完成中',
+    // 本轮结束、goal 仍 active：任务没结束，标签不能说"完成"。
+    goal_continuing: '目标继续',
 };
 export function terminalToLabel(terminal) {
     return TERMINAL_LABELS[terminal] ?? '运行中';
@@ -47,10 +39,27 @@ export function terminalToColor(terminal) {
         return 'orange';
     if (terminal === 'finalizing')
         return 'orange';
+    if (terminal === 'goal_continuing')
+        return 'orange';
     if (terminal === 'running')
         return 'blue';
     return 'red';
 }
+/**
+ * CardKit 2.0 静态卡骨架：schema/config/header + 给定 body elements。
+ * 队列状态卡、预算兜底卡等"只有 header 文案 + 少量 div"的卡共用。
+ */
+export function cardWithHeader(opts) {
+    return {
+        schema: '2.0',
+        config: { wide_screen_mode: true },
+        header: {
+            template: opts.template,
+            title: { tag: 'plain_text', content: opts.title },
+        },
+        body: { elements: opts.elements },
+    };
+}
 /**
  * Create a CardKit 2.0 button with a callback behavior. Shared constructor
  * for every callback button in the card module (stop/new-session/compact/
@@ -65,6 +74,7 @@ export function cardButton(text, value, opts = {}) {
         ...(opts.type ? { type: opts.type } : {}),
         ...(opts.size ? { size: opts.size } : {}),
         ...(opts.width ? { width: opts.width } : {}),
+        ...(opts.disabled !== undefined ? { disabled: opts.disabled } : {}),
         behaviors: [{ type: 'callback', value }],
     };
 }

package/dist/card/run-card-session.d.ts

@@ -18,7 +18,6 @@ export declare class RunCardSession extends CardSession<RunState, RunCardRenderO
     protected get logPrefix(): string;
     protected get errorPrefix(): string;
     protected renderCard(state: RunState, options: RunCardRenderOptions): object;
-    protected hasOwnBudgetProtection(): boolean;
     protected isFlushableState(): boolean;
     push(event: AgentEvent): Promise<void>;
     finish(terminal: Exclude<RunTerminal, 'running' | 'finalizing'>, meta?: FinishMeta): Promise<void>;

package/dist/card/run-card-session.js

@@ -22,12 +22,6 @@ export class RunCardSession extends CardSession {
     renderCard(state, options) {
         return renderRunCard(state, options);
     }
-    hasOwnBudgetProtection() {
-        // renderRunCard has 3-tier degraded/extreme fallback budget protection
-        // that guarantees the returned card is <= 28KB, so the base-class
-        // enforceCardBudget stringify pass is redundant for run cards.
-        return true;
-    }
     isFlushableState() {
         // finish() 已转终态（done/error/interrupted/idle_timeout）时不再 patch；
         // 'finalizing' 是非终态，in-flight/延迟 flush 仍可渲染累积事件。

package/dist/card/run-renderer.d.ts

@@ -1,13 +1,4 @@
-import type { RunState, ToolEntry } from './run-state.js';
-/**
- * 带「详情」按钮的工具行数上限（从最新往回数）。
- *
- * 按钮行是节点大户：`column_set` + 2 个 `column` + 标题 div/text + button/text/
- * behaviors/value ≈ 10 个 JSON 节点；纯标题行只有 2 个。24 行全带按钮 ≈ 240 节点，
- * 直接撞飞书的元素总数上限（实测 203 通过 / 204 失败，见 card-budget.ts）。
- * 最近 8 行保留按钮（用户最可能展开的就是刚跑完的），更早的行退化成一行标题。
- */
-export declare const MAX_TOOL_ROWS_WITH_BUTTON = 8;
+import { type RunState, type ToolEntry } from './run-state.js';
 export interface RunCardRenderOptions {
     /**
      * Agent kind for the run card header title (e.g. "Claude · 思考中").
@@ -21,6 +12,13 @@ export interface RunCardRenderOptions {
      * 无 turn_started → operationKind undefined）同样能拿到按钮。
      */
     compactSupported?: boolean;
+    /**
+     * 卡片没有 `state.sessionId` 时，是否仍有可压缩的会话（bridge 在开跑前从
+     * sessionStore 探到的会话）。`false` 表示「本轮没有 init，之前也没有任何
+     * 会话」——此时 Compact 按钮点了必然反查不到记录，不渲染。缺省（undefined）
+     * 保持原有「按钮可见」语义，供渲染层独立调用方使用。
+     */
+    sessionFallbackAvailable?: boolean;
 }
 type BlockGroup = {
     kind: 'thinking';
@@ -60,6 +58,9 @@ type GroupContentPrepared = Map<BlockGroup, string>;
  * 状态标签（运行中/已完成…）不再重复：header 已经写了（`🔧 dsh · 调用工具`
  * / `✅ dsh · 已完成`），终态 summary 还有一次。
  *
+ * 终态也保留状态行：耗时定格，DSH 的步数/上下文投影展示最后一次快照
+ * （2026-10-21 用户要求）。summary 的最终 usage 与状态行并存。
+ *
  * 导出供窄屏守卫测试断言分段宽度（与 `estimateCardBytes` 同一惯例）。
  */
 export declare function statusLine(state: RunState): string;