lark-remote 0.1.13 → 0.2.0

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

@@ -7,9 +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';
 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: '出错',
@@ -53,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
@@ -82,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>`).
@@ -98,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[];

package/dist/card/run-renderer.js

@@ -95,6 +95,58 @@ function renderTextBlock(content, timestamp, finalized = false) {
         }),
     ];
 }
+/** 运行期通知作为普通消息渲染：与内容流同级的一行斜体提示。 */
+function renderNoticeRow(notice) {
+    const icon = notice.level === 'info' ? 'ℹ️' : '⚠️';
+    return markdownDiv(`_${icon} ${notice.text}_`);
+}
+/** 内容组用于时间线插值的锚点时刻（与面板标题展示的时间戳一致）。 */
+function groupTimeMs(group) {
+    if (group.kind === 'tool') {
+        const ts = group.tool.completedAt ?? group.tool.startedAt;
+        return ts ? Date.parse(ts) : undefined;
+    }
+    return group.timestamp ? Date.parse(group.timestamp) : undefined;
+}
+/**
+ * 把 notices 作为普通消息并入内容时间线：按到达时间插到对应内容组之间。
+ * 内容组自身的相对顺序不被改动（仍由 run-state 的块数组决定），时间戳只决定
+ * notice 的落点；无时间戳的 notice 无法定位，兜底置于内容流末尾。
+ */
+function mergeNoticesIntoContent(groups, notices) {
+    if (!notices || notices.length === 0)
+        return groups;
+    const timed = [];
+    const untimed = [];
+    for (const notice of notices) {
+        if (notice.timestamp)
+            timed.push(notice);
+        else
+            untimed.push(notice);
+    }
+    const items = [];
+    let cursor = 0;
+    for (const notice of timed) {
+        const t = Date.parse(notice.timestamp);
+        if (!Number.isNaN(t)) {
+            while (cursor < groups.length &&
+                groupTimeMs(groups[cursor]) !== undefined &&
+                groupTimeMs(groups[cursor]) <= t) {
+                items.push(groups[cursor]);
+                cursor++;
+            }
+        }
+        items.push({ kind: 'notice', notice });
+    }
+    while (cursor < groups.length) {
+        items.push(groups[cursor]);
+        cursor++;
+    }
+    for (const notice of untimed) {
+        items.push({ kind: 'notice', notice });
+    }
+    return items;
+}
 /**
  * 单次截断：把每个超限块（thinking/plan/text）的最终渲染内容算出来，供
  * estimateCardBytes 与 buildChronologicalContent 共用。此前影子测量与正式渲染
@@ -180,9 +232,9 @@ function groupBlocks(blocks) {
  * - Running tool: expanded (user can watch live)
  * - Completed tool: collapsed (click to inspect)
  */
-function renderTool(tool, finalized, showResult) {
+function renderTool(tool, finalized) {
     const border = tool.status === 'error' ? 'red' : 'grey';
-    const body = showResult ? toolBodyMd(tool) : toolBodyMd({ ...tool, output: undefined });
+    const body = toolBodyMd(tool);
     return collapsibleMarkdownPanel({
         title: toolTitle(tool),
         expanded: !finalized && tool.status === 'running',
@@ -208,8 +260,8 @@ const EXTREME_TIER = {
     toolKeep: EXTREME_TOOL_KEEP,
     textBytes: DEGRADED_TEXT_BYTES,
 };
-/** Bottom action row: stop (if running) + compact (if applicable) + new session (always). */
-function actionRow(state, options) {
+/** Bottom action buttons: stop (if running) + compact (if applicable) + new session (always). */
+function actionButtonList(state, options) {
     const actionButtons = [];
     // finalizing 也显示停止按钮（进程未退出，用户可 /stop）
     const showStop = state.terminal === 'running' || state.terminal === 'finalizing';
@@ -221,6 +273,11 @@ function actionRow(state, options) {
         actionButtons.push(compactButton(state.runId));
     }
     actionButtons.push(newSessionButton());
+    return actionButtons;
+}
+/** Bottom action row: spacer + column_set of actionButtonList (估算与渲染共用，W2.2）。 */
+function actionRow(state, options) {
+    const actionButtons = actionButtonList(state, options);
     if (actionButtons.length === 0)
         return [];
     return [
@@ -235,7 +292,9 @@ function actionRow(state, options) {
         },
     ];
 }
-/** 审批区位于 body 最底部（底部操作行之后）：待审批时决策按钮不遮挡内容流。 */
+/** 审批区位于 body 最底部（底部操作行之后）：待审批时决策按钮不遮挡内容流。
+ *  例外：skeleton 兜底路径中 approvalArea 在 actionRow 之前（信息保真 C4.3），
+ *  保证极端降级时审批入口与 stop/new-session 按钮同时可见。 */
 function approvalArea(state) {
     const elements = [];
     for (const slot of state.approvals ?? []) {
@@ -247,6 +306,12 @@ function approvalArea(state) {
     }
     return elements;
 }
+/** 底部操作行之前的内容区提示：被 MAX_BLOCKS 截掉的早期块计数（信息保真 C4.1）。 */
+function omittedBlocksHint(state) {
+    return state.omittedBlocks !== undefined && state.omittedBlocks > 0
+        ? [markdownDiv(`_💡 已省略 ${state.omittedBlocks} 个早期步骤_`)]
+        : [];
+}
 /** Assemble the card shell (schema/config/header) around body elements. */
 function assembleRunCard(state, options, elements) {
     return {
@@ -267,6 +332,7 @@ function assembleRunCard(state, options, elements) {
 function buildFallbackElements(state, options, tier) {
     const elements = [];
     elements.push(statusRow(state));
+    elements.push(...omittedBlocksHint(state));
     // 单遍分桶：thinking / tool（保持原相对顺序）
     const { thinking: allThinkingBlocks, tool: allToolBlocks } = bucketThinkingAndTool(state.blocks);
     if (allThinkingBlocks.length > tier.thinkingKeep) {
@@ -298,11 +364,26 @@ function buildFallbackElements(state, options, tier) {
         }
         return true; // keep all non-thinking, non-tool blocks
     });
-    // Render thinking/text/tool in chronological order using groupBlocks
-    for (const group of groupBlocks(filteredBlocks)) {
+    // 信息保真 C4.2：plan/file_change 块在降级路径不渲染内容（正常路径已可见，
+    // 降级预算紧张），但必须计数留痕，禁止静默丢弃。
+    // 计数在渲染前完成，提示与 thinking/tool 省略提示一并置于卡片顶部——不能等
+    // 内容循环结束再追加，否则提示会落在最后一条输出之后，打乱「输出收尾」观感。
+    const groupsToRender = groupBlocks(filteredBlocks);
+    const omittedPlanOrFileChange = groupsToRender.filter((g) => g.kind === 'plan' || g.kind === 'file_change').length;
+    if (omittedPlanOrFileChange > 0) {
+        elements.push(markdownDiv(`_💡 另外 ${omittedPlanOrFileChange} 个计划/文件变更已省略_`));
+    }
+    // notices 作为普通消息按时间插入内容流（与正常路径同语义）；降级只裁剪
+    // 内容块，不裁剪运行期通知。
+    const contentItems = mergeNoticesIntoContent(groupsToRender, state.notices);
+    // Render thinking/text/tool/notice in chronological order
+    for (const item of contentItems) {
+        if (item.kind === 'notice') {
+            elements.push(renderNoticeRow(item.notice));
+            continue;
+        }
+        const group = item;
         if (group.kind === 'thinking') {
-            if (options.showThinking === false)
-                continue;
             const ts = formatTimestamp(group.timestamp);
             const title = '💭 **思考完成**';
             const content = truncateUtf8(group.content, tier.thinkingBytes);
@@ -322,15 +403,13 @@ function buildFallbackElements(state, options, tier) {
         }
         else if (group.kind === 'tool') {
             // Show tool individually (each tool is independent now)
-            if (options.showToolUse === false)
-                continue;
-            elements.push(renderTool(group.tool, true, options.showToolResult !== false)); // finalized=true
+            elements.push(renderTool(group.tool, true)); // finalized=true
         }
     }
     if (elements.length === 0 && tier === EXTREME_TIER) {
         elements.push(markdownDiv('_暂无输出_'));
     }
-    elements.push(...buildSummaryContent(state));
+    elements.push(...buildSummaryContent(state, { includeNotices: false }));
     elements.push(...actionRow(state, options));
     elements.push(...approvalArea(state));
     return elements;
@@ -388,6 +467,9 @@ function buildSkeletonElements(state, options) {
     elements.push(markdownDiv('_⚠️ 输出过大且含大量转义字符，已省略全部内容以避免超限；完整内容请查日志_'));
     // Summary (token stats etc.) — static, bounded size
     elements.push(...buildSummaryContent(state));
+    // 信息保真 C4.3：skeleton 也渲染审批区——极端兜底不丢审批入口
+    //（待审批被静默吞掉 = 用户永远看不到审批请求）。
+    elements.push(...approvalArea(state));
     // Bottom action row: stop (if running/finalizing) + compact (if applicable) + new session (always).
     // Degraded paths must keep the action buttons reachable (design constraint).
     elements.push(...actionRow(state, options));
@@ -431,85 +513,67 @@ function bucketThinkingAndTool(blocks) {
  * 走正常路径，renderRunCard 仍会 stringify 确认 ≤28KB；若估算低估，仍 fallback
  * 到 degraded（安全网不丢）。
  */
+/**
+ * W2.2 镜像对单源：thinking/plan/file_change 三个 collapsible 面板组的
+ * { title, expanded, border, content } 描述，估算（measurePanelBytes）与渲染
+ * （collapsibleMarkdownPanel）共用——此前同一套标题/opIcon/内容模板写两遍。
+ * text（renderTextBlock）与 tool（renderTool）形态特殊，由调用方各自处理；
+ * 返回 null 表示该组不是 collapsible 面板。
+ */
+function describePanelGroup(group, prepared) {
+    if (group.kind === 'tool')
+        return null;
+    const ts = formatTimestamp(group.timestamp);
+    const suffix = ts ? ` (${ts})` : '';
+    if (group.kind === 'thinking') {
+        const title = (group.active ? '💭 **思考中**' : '💭 **思考完成**') + suffix;
+        return { title, expanded: group.active, border: 'grey', content: prepared.get(group) ?? '' };
+    }
+    if (group.kind === 'plan') {
+        const title = (group.active ? '📋 **执行计划**' : '📋 **计划完成**') + suffix;
+        return { title, expanded: group.active, border: 'blue', content: prepared.get(group) ?? '' };
+    }
+    if (group.kind === 'file_change') {
+        const opIcon = group.operation === 'create'
+            ? '🆕'
+            : group.operation === 'edit'
+                ? '✏️'
+                : group.operation === 'delete'
+                    ? '🗑️'
+                    : '📖';
+        const title = `${opIcon} **文件改动**${suffix}`;
+        const content = group.diff
+            ? `**${group.path}**\n\n\`\`\`\n${group.diff}\n\`\`\``
+            : `**${group.path}** (${group.operation})`;
+        return { title, expanded: false, border: 'grey', content };
+    }
+    return null;
+}
 /** 导出供测试断言估算精度（估算 ≈ 实际渲染字节，见 tests/anchor/run-card/run-card.test.ts）。 */
 export function estimateCardBytes(state, options = {}, shared) {
     const finalized = state.terminal !== 'running';
-    const showResult = options.showToolResult !== false;
-    const showThinking = options.showThinking !== false;
-    const showToolUse = options.showToolUse !== false;
     // P1-2：renderRunCard 传入共享 groups/prepared 时直接复用（截断只做一次）；
     // 独立调用（测试/预算探针）时自建，行为与原先一致。
     const groups = shared?.groups ?? groupBlocks(state.blocks);
     const prepared = shared?.prepared ?? prepareGroupContent(groups);
-    // 卡片外壳 + 状态行 + summary（小对象实测，动态文案精确）
-    let total = measureJson({
-        schema: '2.0',
-        config: { wide_screen_mode: true, update_multi: true },
-        header: {
-            template: headerTemplate2(state),
-            title: { content: headerTitle2(state, options), tag: 'plain_text' },
-        },
-        body: { elements: [] },
-    }) +
+    // 卡片外壳直接实测 assembleRunCard 空元素产物（schema/config/header/body 结构
+    // 与正式渲染完全一致，W2.2）；status/summary/操作行同样实测渲染结构。
+    // 注：审批区（approvalArea）不参与估算——待审批通常在途且体积小，超预算由
+    // renderRunCard 的 stringify 兜底捕获。
+    let total = measureJson(assembleRunCard(state, options, [])) +
         measureJson(statusRow(state)) +
-        measureJson(buildSummaryContent(state));
-    // 底部操作行：spacer + 操作按钮（与 renderRunCard normal 分支一致）
-    const actionButtons = [];
-    if (state.terminal === 'running' || state.terminal === 'finalizing') {
-        actionButtons.push(stopButton(state.runId));
-    }
-    if (shouldShowCompactButton(state, options)) {
-        actionButtons.push(compactButton(state.runId));
-    }
-    actionButtons.push(newSessionButton());
-    total += measureJson([
-        { tag: 'div', text: { content: '‎', tag: 'lark_md' } },
-        {
-            tag: 'column_set',
-            columns: actionButtons.map((btn) => ({
-                tag: 'column',
-                width: 'auto',
-                elements: [btn],
-            })),
-        },
-    ]);
-    // 块内容：与 buildChronologicalContent 同源（groupBlocks 合并语义一致）
+        measureJson(buildSummaryContent(state, { includeNotices: false })) +
+        measureJson(actionRow(state, options));
+    // 块内容：与 buildChronologicalContent 同源（describePanelGroup 单源，W2.2）
     let renderedAny = false;
     for (const group of groups) {
-        if (group.kind === 'thinking') {
-            if (!showThinking)
-                continue;
+        if (group.kind === 'tool') {
             renderedAny = true;
-            const ts = formatTimestamp(group.timestamp);
-            const title = group.active ? '💭 **思考中**' : '💭 **思考完成**';
-            const header = ts ? `${title} (${ts})` : title;
-            total += measurePanelBytes(header, group.active, 'grey', prepared.get(group) ?? '');
-        }
-        else if (group.kind === 'plan') {
-            renderedAny = true;
-            const ts = formatTimestamp(group.timestamp);
-            const title = group.active ? '📋 **执行计划**' : '📋 **计划完成**';
-            const header = ts ? `${title} (${ts})` : title;
-            total += measurePanelBytes(header, group.active, 'blue', prepared.get(group) ?? '');
-        }
-        else if (group.kind === 'file_change') {
-            renderedAny = true;
-            const ts = formatTimestamp(group.timestamp);
-            const opIcon = group.operation === 'create'
-                ? '🆕'
-                : group.operation === 'edit'
-                    ? '✏️'
-                    : group.operation === 'delete'
-                        ? '🗑️'
-                        : '📖';
-            const title = `${opIcon} **文件改动**`;
-            const content = group.diff
-                ? `**${group.path}**\n\n\`\`\`\n${group.diff}\n\`\`\``
-                : `**${group.path}** (${group.operation})`;
-            const header = ts ? `${title} (${ts})` : title;
-            total += measurePanelBytes(header, false, 'grey', content);
+            // tool 直接实测真实渲染元素（复用 renderTool，output ≤1200 字符，物化廉价）
+            total += measureJson(renderTool(group.tool, finalized));
+            continue;
         }
-        else if (group.kind === 'text') {
+        if (group.kind === 'text') {
             const content = prepared.get(group) ?? '';
             if (!content.trim())
                 continue;
@@ -517,14 +581,19 @@ export function estimateCardBytes(state, options = {}, shared) {
             const ts = formatTimestamp(group.timestamp);
             const header = `💬 **输出**${ts ? ` (${ts})` : ''}`;
             total += measurePanelBytes(header, true, 'grey', content);
+            continue;
         }
-        else if (group.kind === 'tool') {
-            if (!showToolUse)
-                continue;
-            renderedAny = true;
-            // tool 直接实测真实渲染元素（复用 renderTool，output ≤1200 字符，物化廉价）
-            total += measureJson(renderTool(group.tool, finalized, showResult));
-        }
+        const spec = describePanelGroup(group, prepared);
+        if (!spec)
+            continue;
+        renderedAny = true;
+        total += measurePanelBytes(spec.title, spec.expanded, spec.border, spec.content);
+    }
+    // notices 在正常路径作为普通消息内联渲染（与 buildChronologicalContent 同源，
+    // renderNoticeRow 单源）；行体积与位置无关，直接按条累加。
+    for (const notice of state.notices ?? []) {
+        renderedAny = true;
+        total += measureJson(renderNoticeRow(notice));
     }
     if (!renderedAny) {
         total += measureJson(markdownDiv('_暂无输出_'));
@@ -560,8 +629,9 @@ export function renderRunCard(state, options = {}) {
     if (estimate < DEGRADED_THRESHOLD) {
         const elements = [
             statusRow(state),
-            ...buildChronologicalContent(state, options, prepared, groups),
-            ...buildSummaryContent(state),
+            ...omittedBlocksHint(state),
+            ...buildChronologicalContent(state, prepared, groups),
+            ...buildSummaryContent(state, { includeNotices: false }),
             ...actionRow(state, options),
             ...approvalArea(state),
         ];
@@ -599,77 +669,41 @@ export function renderRunCard(state, options = {}) {
     return truncatedSkeleton;
 }
 /** Build content in chronological order using groupBlocks to interleave thinking/text/tools. */
-function buildChronologicalContent(state, options, prepared, groups) {
+function buildChronologicalContent(state, prepared, groups) {
     const elements = [];
     // finalized = 非 running（含 finalizing：主结果已出，thinking 折叠）
     const finalized = state.terminal !== 'running';
-    const showResult = options.showToolResult !== false;
     // P1-2：renderRunCard 传入同一 groups 数组时直接复用（prepared 的键是组对象
     // 引用，重建数组会让 prepared.get 永远 miss，退化为二次截断）。
-    for (const group of groups ?? groupBlocks(state.blocks)) {
-        if (group.kind === 'thinking') {
-            if (options.showThinking === false)
-                continue;
-            const ts = formatTimestamp(group.timestamp);
-            const title = group.active ? '💭 **思考中**' : '💭 **思考完成**';
-            const content = prepared?.get(group) ?? truncateUtf8(group.content, REASONING_BYTES);
-            const header = ts ? `${title} (${ts})` : title;
-            elements.push(collapsibleMarkdownPanel({
-                title: header,
-                expanded: group.active,
-                border: 'grey',
-                content,
-                textSize: 'notation',
-            }));
-        }
-        else if (group.kind === 'plan') {
-            // Plan blocks: render as collapsible panel (default collapsed)
-            const ts = formatTimestamp(group.timestamp);
-            const title = group.active ? '📋 **执行计划**' : '📋 **计划完成**';
-            const content = prepared?.get(group) ?? truncateUtf8(group.content, REASONING_BYTES * 2);
-            const header = ts ? `${title} (${ts})` : title;
-            elements.push(collapsibleMarkdownPanel({
-                title: header,
-                expanded: group.active, // expand while active, collapse when done
-                border: 'blue',
-                content,
-                textSize: 'notation',
-            }));
+    // W2.2：面板组描述经 describePanelGroup 与估算共享同一份模板。
+    // notices 作为普通消息按到达时间插入内容流（有内容时不再沉到 summary）。
+    const contentItems = mergeNoticesIntoContent(groups, state.notices);
+    for (const item of contentItems) {
+        if (item.kind === 'notice') {
+            elements.push(renderNoticeRow(item.notice));
+            continue;
         }
-        else if (group.kind === 'file_change') {
-            // File change blocks: render as collapsible panel (default collapsed)
-            const ts = formatTimestamp(group.timestamp);
-            const opIcon = group.operation === 'create'
-                ? '🆕'
-                : group.operation === 'edit'
-                    ? '✏️'
-                    : group.operation === 'delete'
-                        ? '🗑️'
-                        : '📖';
-            const title = `${opIcon} **文件改动**`;
-            const content = group.diff
-                ? `**${group.path}**\n\n\`\`\`\n${group.diff}\n\`\`\``
-                : `**${group.path}** (${group.operation})`;
-            const header = ts ? `${title} (${ts})` : title;
-            elements.push(collapsibleMarkdownPanel({
-                title: header,
-                expanded: false,
-                border: 'grey',
-                content,
-                textSize: 'notation',
-            }));
+        const group = item;
+        if (group.kind === 'tool') {
+            elements.push(renderTool(group.tool, finalized));
+            continue;
         }
-        else if (group.kind === 'text') {
-            const content = prepared?.get(group) ?? truncateUtf8(group.content, TEXT_BYTES, true, '…（已截断）\n');
+        if (group.kind === 'text') {
+            const content = prepared.get(group) ?? '';
             const ts = formatTimestamp(group.timestamp);
-            const els = renderTextBlock(content, ts, finalized);
-            elements.push(...els);
-        }
-        else if (group.kind === 'tool') {
-            if (options.showToolUse === false)
-                continue;
-            elements.push(renderTool(group.tool, finalized, showResult));
+            elements.push(...renderTextBlock(content, ts, finalized));
+            continue;
         }
+        const spec = describePanelGroup(group, prepared);
+        if (!spec)
+            continue;
+        elements.push(collapsibleMarkdownPanel({
+            title: spec.title,
+            expanded: spec.expanded,
+            border: spec.border,
+            content: spec.content,
+            textSize: 'notation',
+        }));
     }
     if (elements.length === 0) {
         elements.push(markdownDiv('_暂无输出_'));
@@ -677,8 +711,16 @@ function buildChronologicalContent(state, options, prepared, groups) {
     return elements;
 }
 /** Build summary tab content */
-function buildSummaryContent(state) {
+function buildSummaryContent(state, options = {}) {
     const elements = [];
+    // 运行期通知默认仍走 summary（skeleton 兜底：内容区整体缺失时唯一可见位置）。
+    // 正常/degraded/extreme 路径传入 includeNotices:false——通知已作为普通消息
+    // 按时间线内联渲染（renderNoticeRow），避免同一通知渲染两遍。
+    if (options.includeNotices !== false) {
+        for (const notice of state.notices ?? []) {
+            elements.push(renderNoticeRow(notice));
+        }
+    }
     // running 时不显示统计（仍在生成）；finalizing 显示等待提示
     if (state.terminal === 'running') {
         return elements;
@@ -710,7 +752,15 @@ function buildSummaryContent(state) {
     else {
         const result = state.resultSubtype ?? 'success';
         const hasContent = state.blocks.length > 0;
-        const empty = !hasContent ? '\n\n（未返回内容）' : '';
+        // 压缩（operationKind='compaction'）不会返回 agent 正文——引擎只压缩上下文
+        // 窗口，空内容属正常，不能沿用普通 run 的「（未返回内容）」异常信号
+        // （2026-09 用户反馈）。所有会压缩的 agent（codex/claude/kimi/opencode/pi）
+        // 都经 streamCodexCompact 走这条共享渲染路径，一处覆盖全部。
+        const empty = hasContent
+            ? ''
+            : state.operationKind === 'compaction'
+                ? '\n\n🗜 Compact 完成'
+                : '\n\n（未返回内容）';
         const usageStatsStr = formatUsageStats({
             contextLength: state.contextLength,
             contextLimit: state.contextLimit,
@@ -726,6 +776,9 @@ function buildSummaryContent(state) {
             cumulativeOutputTokens: state.cumulativeOutputTokens,
             cumulativeCacheReadTokens: state.cumulativeCacheReadTokens,
             cumulativeCacheCreationTokens: state.cumulativeCacheCreationTokens,
+            model: state.model,
+            costUsd: state.costUsd,
+            reasoningTokens: state.reasoningTokens,
         }, { showResult: true, result });
         elements.push(markdownDiv(usageStatsStr + empty));
     }