lark-remote 0.1.12 → 0.2.0

package/dist/card/approval-render.js

@@ -6,6 +6,7 @@
  */
 import { collapsibleMarkdownPanel } from './collapsible.js';
 import { truncateUtf8, truncateMarkdownTables } from './text-truncate.js';
+import { cardButton } from './card-shared.js';
 /** Unique nonce for card button callbacks (SDK dedup + router validation). */
 function mkNonce() {
     return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
@@ -100,23 +101,13 @@ function renderDecisionButtons(approval, expired, runId) {
     // 决策按钮逐个作为 body 直接元素返回（CardKit body 纵向堆叠 = 上下排列）。
     // 不能用 column_set width:auto 横排：手机窄屏下多个按钮挤在一行，按钮文字
     // 被截断成省略号，用户无法辨认审批动作。
-    return offered.map((d) => ({
-        tag: 'button',
-        text: { tag: 'plain_text', content: BUTTONS[d].label },
-        type: BUTTONS[d].type,
-        behaviors: [
-            {
-                type: 'callback',
-                value: {
-                    cmd: 'approval.respond',
-                    decision: d,
-                    requestId: approval.requestId,
-                    runId,
-                    nonce: mkNonce(),
-                },
-            },
-        ],
-    }));
+    return offered.map((d) => cardButton(BUTTONS[d].label, {
+        cmd: 'approval.respond',
+        decision: d,
+        requestId: approval.requestId,
+        runId,
+        nonce: mkNonce(),
+    }, { type: BUTTONS[d].type }));
 }
 // =============================================================================
 // Tool Approval (non-command tools, e.g. ExitPlanMode)
@@ -350,28 +341,14 @@ function renderPermissionsApproval(approval, expired, runId) {
                 tag: 'div',
                 text: { tag: 'lark_md', content: `${icon} ${item.label}` },
             });
-            elements.push({
-                tag: 'button',
-                text: {
-                    tag: 'plain_text',
-                    content: item.selected ? '取消授予' : '授予',
-                },
-                type: item.selected ? 'default' : 'primary',
-                size: 'small',
-                behaviors: [
-                    {
-                        type: 'callback',
-                        value: {
-                            cmd: 'approval.toggle',
-                            requestId: approval.requestId,
-                            permId: item.id,
-                            selected: !item.selected,
-                            runId,
-                            nonce: mkNonce(),
-                        },
-                    },
-                ],
-            });
+            elements.push(cardButton(item.selected ? '取消授予' : '授予', {
+                cmd: 'approval.toggle',
+                requestId: approval.requestId,
+                permId: item.id,
+                selected: !item.selected,
+                runId,
+                nonce: mkNonce(),
+            }, { type: item.selected ? 'default' : 'primary', size: 'small' }));
         }
     }
     // Action buttons
@@ -473,46 +450,26 @@ function renderQuestionApproval(approval, expired, runId) {
         }
         // 多选问题：有勾选才给提交按钮（单选在协调器内即时提交）。
         if (q.multiSelect && selected.length > 0) {
-            elements.push({
-                tag: 'button',
-                text: { tag: 'plain_text', content: `✅ 提交答案（已选 ${selected.length} 项）` },
-                type: 'primary',
-                behaviors: [
-                    {
-                        type: 'callback',
-                        value: {
-                            cmd: 'approval.answerSubmit',
-                            requestId: approval.requestId,
-                            questionIndex: i,
-                            runId,
-                            nonce: mkNonce(),
-                        },
-                    },
-                ],
-            });
+            elements.push(cardButton(`✅ 提交答案（已选 ${selected.length} 项）`, {
+                cmd: 'approval.answerSubmit',
+                requestId: approval.requestId,
+                questionIndex: i,
+                runId,
+                nonce: mkNonce(),
+            }, { type: 'primary' }));
         }
     }
     // 提问卡底部统一「跳过回答」：走现有 approval.respond + decision=decline
     // （coordinator 对 question 允许 decline 作为安全兜底），runner 按协议映射
     // 跳过语义（Claude deny / Codex 空 answers / Kimi action decline / Pi cancelled）。
     if (!expired) {
-        elements.push({
-            tag: 'button',
-            text: { tag: 'plain_text', content: '⏭️ 跳过回答' },
-            type: 'default',
-            behaviors: [
-                {
-                    type: 'callback',
-                    value: {
-                        cmd: 'approval.respond',
-                        decision: 'decline',
-                        requestId: approval.requestId,
-                        runId,
-                        nonce: mkNonce(),
-                    },
-                },
-            ],
-        });
+        elements.push(cardButton('⏭️ 跳过回答', {
+            cmd: 'approval.respond',
+            decision: 'decline',
+            requestId: approval.requestId,
+            runId,
+            nonce: mkNonce(),
+        }, { type: 'default' }));
     }
     return elements;
 }
@@ -530,27 +487,15 @@ function renderOptionRow(requestId, questionIndex, option, isSelected, icon, run
                 width: 'auto',
                 vertical_align: 'center',
                 elements: [
-                    {
-                        tag: 'button',
-                        text: { tag: 'plain_text', content: isSelected ? '取消选择' : '选择' },
-                        type: isSelected ? 'default' : 'primary',
-                        size: 'small',
-                        // 固定宽度让所有选项行的按钮左对齐（描述长短不影响按钮列）。
-                        width: '100px',
-                        behaviors: [
-                            {
-                                type: 'callback',
-                                value: {
-                                    cmd: 'approval.answer',
-                                    requestId,
-                                    questionIndex,
-                                    option: option.label,
-                                    runId,
-                                    nonce: mkNonce(),
-                                },
-                            },
-                        ],
-                    },
+                    // 固定宽度让所有选项行的按钮左对齐（描述长短不影响按钮列）。
+                    cardButton(isSelected ? '取消选择' : '选择', {
+                        cmd: 'approval.answer',
+                        requestId,
+                        questionIndex,
+                        option: option.label,
+                        runId,
+                        nonce: mkNonce(),
+                    }, { type: isSelected ? 'default' : 'primary', size: 'small', width: '100px' }),
                 ],
             },
             {

package/dist/card/bash-renderer.js

@@ -78,16 +78,17 @@ function assembleCard(state, elements) {
     };
 }
 /**
- * Build elements for the normal path: full output/stderr (each ≤ OUTPUT_MAX_BYTES).
+ * Build output/stderr elements shared by normal & degraded paths (W2.3 单源）：
+ * 除截断预算（OUTPUT_MAX_BYTES / DEGRADED_OUTPUT_BYTES）外逐行同构。
  */
-function buildNormalElements(state) {
+function buildOutputElements(state, maxBytes) {
     const { terminal, runId, output, stderr } = state;
     const elements = [buildStatusRow(state)];
     const truncatedOutput = output
-        ? truncateUtf8(output, OUTPUT_MAX_BYTES, true, '…（输出已截断，共 ' + output.length + ' 字符）')
+        ? truncateUtf8(output, maxBytes, true, '…（输出已截断，共 ' + output.length + ' 字符）')
         : '';
     const truncatedStderr = stderr
-        ? truncateUtf8(stderr, OUTPUT_MAX_BYTES, true, '…（诊断输出已截断，共 ' + stderr.length + ' 字符）')
+        ? truncateUtf8(stderr, maxBytes, true, '…（诊断输出已截断，共 ' + stderr.length + ' 字符）')
         : '';
     if (truncatedOutput)
         elements.push(markdownDiv(`\`\`\`\n${truncatedOutput}\n\`\`\``));
@@ -99,28 +100,18 @@ function buildNormalElements(state) {
     elements.push(...buildExitFooter(state));
     return elements;
 }
+/**
+ * Build elements for the normal path: full output/stderr (each ≤ OUTPUT_MAX_BYTES).
+ */
+function buildNormalElements(state) {
+    return buildOutputElements(state, OUTPUT_MAX_BYTES);
+}
 /**
  * Build elements for the degraded path: output/stderr truncated to a smaller
  * budget. Preserves command (status row) and exitCode (footer).
  */
 function buildDegradedElements(state) {
-    const { terminal, runId, output, stderr } = state;
-    const elements = [buildStatusRow(state)];
-    const truncatedOutput = output
-        ? truncateUtf8(output, DEGRADED_OUTPUT_BYTES, true, '…（输出已截断，共 ' + output.length + ' 字符）')
-        : '';
-    const truncatedStderr = stderr
-        ? truncateUtf8(stderr, DEGRADED_OUTPUT_BYTES, true, '…（诊断输出已截断，共 ' + stderr.length + ' 字符）')
-        : '';
-    if (truncatedOutput)
-        elements.push(markdownDiv(`\`\`\`\n${truncatedOutput}\n\`\`\``));
-    if (truncatedStderr)
-        elements.push(markdownDiv(`📋 诊断输出:\n\`\`\`\n${truncatedStderr}\n\`\`\``));
-    if (terminal === 'running') {
-        elements.push({ tag: 'div', text: { content: '‎', tag: 'lark_md' } }, stopButton(runId));
-    }
-    elements.push(...buildExitFooter(state));
-    return elements;
+    return buildOutputElements(state, DEGRADED_OUTPUT_BYTES);
 }
 /**
  * Build elements for the extreme fallback: no output/stderr body, only

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

@@ -7,12 +7,21 @@ import { type AgentKind } from '../runner/index.js';
  * wire up the registry (notably unit tests of pure render helpers).
  */
 export declare function agentDisplayName(kind: string): string;
-export { truncate } from '../common/truncate.js';
-interface TerminalLabelOptions {
-    prefix?: string;
-}
-export declare function terminalToLabel(terminal: string, options?: TerminalLabelOptions): string;
+export declare function terminalToLabel(terminal: string): string;
 export declare function terminalToColor(terminal: string): string;
+/**
+ * Create a CardKit 2.0 button with a callback behavior. Shared constructor
+ * for every callback button in the card module (stop/new-session/compact/
+ * approval decisions/question options/…) — previously each render site
+ * hand-rolled the `{tag, text, type, behaviors}` object and they had drifted
+ * (plain_text tag sometimes present, sometimes omitted).
+ */
+export declare function cardButton(text: string, value: Record<string, unknown>, opts?: {
+    type?: 'primary' | 'default' | 'danger';
+    size?: 'small' | 'medium' | 'large';
+    /** Fixed width, e.g. '100px' (keeps option-row buttons left-aligned). */
+    width?: string;
+}): object;
 /**
  * Create a CardKit 2.0 stop button with behaviors callback.
  */

package/dist/card/card-shared.js

@@ -25,7 +25,6 @@ export function agentDisplayName(kind) {
         return 'Kimi';
     return kind;
 }
-export { truncate } from '../common/truncate.js';
 const TERMINAL_LABELS = {
     done: '已完成',
     error: '出错',
@@ -34,10 +33,8 @@ const TERMINAL_LABELS = {
     running: '运行中',
     finalizing: '完成中',
 };
-export function terminalToLabel(terminal, options) {
-    const label = TERMINAL_LABELS[terminal] ?? '运行中';
-    const prefix = options?.prefix ?? '';
-    return prefix + label;
+export function terminalToLabel(terminal) {
+    return TERMINAL_LABELS[terminal] ?? '运行中';
 }
 export function terminalToColor(terminal) {
     if (terminal === 'done')
@@ -55,27 +52,34 @@ export function terminalToColor(terminal) {
     return 'red';
 }
 /**
- * Create a CardKit 2.0 stop button with behaviors callback.
+ * Create a CardKit 2.0 button with a callback behavior. Shared constructor
+ * for every callback button in the card module (stop/new-session/compact/
+ * approval decisions/question options/…) — previously each render site
+ * hand-rolled the `{tag, text, type, behaviors}` object and they had drifted
+ * (plain_text tag sometimes present, sometimes omitted).
  */
-export function stopButton(runId) {
+export function cardButton(text, value, opts = {}) {
     return {
         tag: 'button',
-        text: { content: '⏹ 停止' },
-        type: 'danger',
-        behaviors: [{ type: 'callback', value: { cmd: 'stop', runId } }],
+        text: { tag: 'plain_text', content: text },
+        ...(opts.type ? { type: opts.type } : {}),
+        ...(opts.size ? { size: opts.size } : {}),
+        ...(opts.width ? { width: opts.width } : {}),
+        behaviors: [{ type: 'callback', value }],
     };
 }
+/**
+ * Create a CardKit 2.0 stop button with behaviors callback.
+ */
+export function stopButton(runId) {
+    return cardButton('⏹ 停止', { cmd: 'stop', runId }, { type: 'danger' });
+}
 /**
  * Create a CardKit 2.0 "new session" button with behaviors callback.
  * Standardized: ✨ 新会话 + primary type
  */
 export function newSessionButton() {
-    return {
-        tag: 'button',
-        text: { content: '✨ 新会话' },
-        type: 'primary',
-        behaviors: [{ type: 'callback', value: { cmd: 'new-session' } }],
-    };
+    return cardButton('✨ 新会话', { cmd: 'new-session' }, { type: 'primary' });
 }
 /**
  * Create a CardKit 2.0 Compact button for any runCompact-capable runner
@@ -84,12 +88,7 @@ export function newSessionButton() {
  * runId 解析 agentKind，claude 走 stream-json 内建 /compact）。
  */
 export function compactButton(runId) {
-    return {
-        tag: 'button',
-        text: { content: '🗜 Compact' },
-        type: 'primary',
-        behaviors: [{ type: 'callback', value: { cmd: 'codex.compact', runId } }],
-    };
+    return cardButton('🗜 Compact', { cmd: 'codex.compact', runId }, { type: 'primary' });
 }
 /**
  * Create a CardKit 2.0 Compact button for resume cards (auto-resume / `/resume <id>`).
@@ -100,19 +99,9 @@ export function compactButton(runId) {
  * non-default agent.
  */
 export function resumeCompactButton(sessionId, agent) {
-    return {
-        tag: 'button',
-        text: { content: '🗜 Compact' },
-        type: 'primary',
-        behaviors: [{ type: 'callback', value: { cmd: 'resume.compact', sessionId, agent } }],
-    };
+    return cardButton('🗜 Compact', { cmd: 'resume.compact', sessionId, agent }, { type: 'primary' });
 }
 export function resumeUseButton(sessionId, agent) {
-    return {
-        tag: 'button',
-        text: { tag: 'plain_text', content: '🔁 切换到此会话' },
-        type: 'primary',
-        behaviors: [{ type: 'callback', value: { cmd: 'resume.use', sessionId, agent } }],
-    };
+    return cardButton('🔁 切换到此会话', { cmd: 'resume.use', sessionId, agent }, { type: 'primary' });
 }
 //# sourceMappingURL=card-shared.js.map

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

@@ -1,8 +1,5 @@
 import type { RunState, ToolEntry } from './run-state.js';
 export interface RunCardRenderOptions {
-    showThinking?: boolean;
-    showToolUse?: boolean;
-    showToolResult?: boolean;
     /**
      * Agent kind for the run card header title (e.g. "Claude · 思考中").
      * Defaults to 'claude' when not provided; the bridge passes `config.defaultAgent`.
@@ -42,25 +39,6 @@ type BlockGroup = {
 };
 /** 每个块的截断后内容（thinking/plan/text），测量与渲染共用（P1-2 建议项）。 */
 type GroupContentPrepared = Map<BlockGroup, string>;
-/**
- * 影子测量：精确复刻 normal 路径（buildChronologicalContent + renderRunCard 的
- * 骨架）产物 stringify 后的字节数，避免"先建完整卡再丢弃"的浪费。
- *
- * 第一性原理：估算应当测量"将要渲染的内容"，而非近似它。
- * - 骨架（schema/config/header/statusRow/summary/buttons/spacer）用小对象实测
- *   （measureJson），不依赖固定常数。
- * - 块内容经与渲染完全相同的变换后精确测量：truncateUtf8 截断 →
- *   markdownDiv 的 escapeMarkdown（反斜杠 2×）→ JSON.stringify。因此 CJK
- *   （3 字节/字符无转义）与 ASCII 高转义（\n/" 膨胀）双向精确，无需转义因子。
- * - tool 块直接 measureJson(renderTool(...))——与渲染共用同一函数，无复制。
- * - 块结构基于 groupBlocks（与渲染一致，连续 text 合并），保证合并语义一致。
- *
- * 唯一系统性低估：elements 数组元素间逗号/括号 ~n+1 字节（忽略，4KB 裕度内）。
- *
- * 注意：估算只是优化路径选择，不替代最终 stringify 兜底。即使估算说"低于阈值"
- * 走正常路径，renderRunCard 仍会 stringify 确认 ≤28KB；若估算低估，仍 fallback
- * 到 degraded（安全网不丢）。
- */
 /** 导出供测试断言估算精度（估算 ≈ 实际渲染字节，见 tests/anchor/run-card/run-card.test.ts）。 */
 export declare function estimateCardBytes(state: RunState, options?: RunCardRenderOptions, shared?: {
     groups?: BlockGroup[];