@deepseek-harness-tui/dsh-tui 0.11.1 → 0.11.2

package/lib/types/components/splashLayout.js

@@ -0,0 +1,40 @@
+import { bigTextWidth } from './bigfont.js';
+/**
+ * 开屏头部的窄终端降级阶梯——越窄越先放弃「并排」这件事：
+ *
+ *   ① 像素鲸鱼 + `DEEPSEEK`/`HARNESS` 大字 —— 两者都放得下
+ *   ② 只留大字 logo                        —— 先撤鲸鱼：大字被截断会毁掉品牌字形，
+ *                                            鲸鱼被撤只是少一个装饰
+ *   ③ 只留像素鲸鱼                          —— 大字放不下，鲸鱼顶上撑住开屏
+ *   ④ 一行纯文字                            —— 两者都放不下
+ *
+ * 列数一律按**内容区**算：`PageMargin` 已经把 `TerminalSizeContext` 收窄成
+ * 内容宽（`PageMargin.tsx`），所以这里不再减页边距。
+ */
+/**
+ * 鲸鱼 art 的固定盒宽：甩尾帧比标准姿势向右多出 4 列，钉死宽度才不让文字列
+ * 跟着左右跳。
+ */
+export const WHALE_BOX_WIDTH = 40;
+/** 鲸鱼与文字列之间的间隔列数（头部那行 `Box` 的 `gap`）。 */
+export const COLUMN_GAP = 2;
+/**
+ * 解析开屏头部的阶梯档位。
+ * @param columns - 内容区列数（不是终端总宽）。
+ * @param options - `whale` 对应 `dsh-tui.whale` 设置；`font` 是当天那款字体
+ * （字身宽度不同，阈值也就不同）。
+ * @returns 该宽度下要渲染的部件。
+ */
+export function resolveSplashLayout(columns, options) {
+    const { font } = options;
+    // 阈值按**画出来**的列数算：每行末尾还会画出一格字距，而 `bigTextWidth` 只算到
+    // 最后一个字形。按 ink 宽判「放得下」，会在恰好卡阈值时让 Ink 走 `truncate-end`
+    // ——最后一个字形被换成 `…`（可达边界：基准款 55 列即复现）。末尾那一格是空白，
+    // 少画一格不可惜，字形被吃掉才可惜。
+    const titleWidth = bigTextWidth(font, font.tagline.top, font.tagline.topKerning) + font.tagline.topKerning;
+    const fitsTitle = columns >= titleWidth;
+    const showWhale = options.whale &&
+        columns >= WHALE_BOX_WIDTH &&
+        (columns >= titleWidth + COLUMN_GAP + WHALE_BOX_WIDTH || !fitsTitle);
+    return { showWhale, showBigTitle: fitsTitle, showPlainTitle: !fitsTitle && !showWhale };
+}

package/lib/types/components/whaleGirlSprite.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 女仆娘精灵表（30 列 × 30 精灵格，半块渲染 → 15 个文本行）。
+ *
+ * 来源：本项目作者设计的像素画 `等面积像素格 鲸鱼娘.png`（464×464，透明底），
+ * 由 `.local/convert-maid.mjs` 生成：去白底 → 众数降采样 → 眼睛对称化 + 嘴巴/脖子微调。
+ * **原创作品、非第三方素材，无需 THIRD_PARTY_LICENSES 条目。**
+ *
+ * 契约：每行 30 格；`null` = 透明；每格是 [r, g, b]。渲染见 `whaleGirl.ts`。
+ * 改了源图就重跑那份脚本，不要手改这个文件。
+ */
+/** 精灵格数（列）。 */
+export declare const WHALE_GIRL_COLS = 30;
+/** 精灵行数（半块渲染后是 `WHALE_GIRL_ROWS / 2` 个文本行）。 */
+export declare const WHALE_GIRL_SPRITE_ROWS = 30;
+/** 精灵表：[行][列] = null（透明）或 [r, g, b]。 */
+export declare const WHALE_GIRL_SPRITE: readonly (readonly (readonly [number, number, number] | null)[])[];
+//# sourceMappingURL=whaleGirlSprite.d.ts.map

package/lib/types/components/whaleGirlSprite.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"whaleGirlSprite.d.ts","sourceRoot":"","sources":["../../../src/components/whaleGirlSprite.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,eAAe;AACf,eAAO,MAAM,eAAe,KAAK,CAAA;AACjC,+CAA+C;AAC/C,eAAO,MAAM,sBAAsB,KAAK,CAAA;AAExC,wCAAwC;AACxC,eAAO,MAAM,iBAAiB,EAAE,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,EA+B/F,CAAA"}

package/lib/types/components/whaleGirlSprite.js

@@ -0,0 +1,47 @@
+/**
+ * 女仆娘精灵表（30 列 × 30 精灵格，半块渲染 → 15 个文本行）。
+ *
+ * 来源：本项目作者设计的像素画 `等面积像素格 鲸鱼娘.png`（464×464，透明底），
+ * 由 `.local/convert-maid.mjs` 生成：去白底 → 众数降采样 → 眼睛对称化 + 嘴巴/脖子微调。
+ * **原创作品、非第三方素材，无需 THIRD_PARTY_LICENSES 条目。**
+ *
+ * 契约：每行 30 格；`null` = 透明；每格是 [r, g, b]。渲染见 `whaleGirl.ts`。
+ * 改了源图就重跑那份脚本，不要手改这个文件。
+ */
+/** 精灵格数（列）。 */
+export const WHALE_GIRL_COLS = 30;
+/** 精灵行数（半块渲染后是 `WHALE_GIRL_ROWS / 2` 个文本行）。 */
+export const WHALE_GIRL_SPRITE_ROWS = 30;
+/** 精灵表：[行][列] = null（透明）或 [r, g, b]。 */
+export const WHALE_GIRL_SPRITE = [
+    [null, null, null, null, null, null, null, null, null, null, [43, 56, 120], [80, 98, 170], [82, 100, 171], null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, null, null, [36, 46, 105], [83, 100, 171], null, [49, 63, 134], [25, 32, 84], null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, null, null, [33, 42, 100], null, [18, 21, 71], [20, 24, 75], [18, 21, 72], [253, 253, 253], [18, 21, 72], [19, 23, 74], null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, null, null, null, [16, 19, 67], [253, 252, 253], [254, 254, 254], [254, 254, 254], [254, 254, 254], [189, 185, 212], [253, 253, 253], [254, 253, 254], [16, 19, 69], null, null, null, null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, null, null, [16, 19, 67], [188, 184, 211], [254, 254, 254], [254, 254, 254], [253, 253, 254], [254, 254, 254], [189, 184, 211], [254, 254, 254], [254, 254, 254], [251, 250, 252], [19, 22, 71], null, null, null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, null, [16, 19, 67], [250, 250, 252], [254, 254, 254], [254, 254, 254], [72, 92, 173], [45, 61, 131], [45, 61, 131], [47, 61, 131], [253, 253, 254], [254, 254, 254], [254, 254, 254], [20, 23, 72], null, null, null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, null, [16, 19, 67], [252, 252, 253], [46, 60, 129], [46, 61, 129], [73, 93, 174], [73, 93, 175], [73, 93, 175], [72, 93, 173], [45, 61, 132], [46, 62, 133], [254, 254, 254], [187, 183, 211], [17, 21, 70], null, null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, null, [16, 19, 67], [47, 62, 131], [73, 93, 173], [74, 94, 174], [74, 94, 174], [74, 94, 175], [75, 95, 175], [74, 94, 175], [73, 94, 175], [73, 94, 175], [46, 62, 132], [252, 251, 253], [252, 252, 252], [17, 20, 70], null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, [17, 20, 70], [42, 56, 123], [73, 93, 172], [73, 93, 172], [44, 57, 124], [74, 94, 174], [74, 94, 174], [97, 124, 191], [97, 124, 191], [75, 95, 175], [74, 95, 175], [15, 20, 68], [96, 126, 191], [26, 32, 86], [56, 79, 169], null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, [17, 20, 70], [72, 90, 168], [73, 91, 170], [73, 92, 170], [45, 57, 122], [73, 92, 171], [74, 93, 173], [73, 92, 172], [45, 60, 128], [75, 94, 174], [74, 94, 175], [16, 21, 70], [16, 20, 68], [247, 192, 126], [56, 78, 168], [14, 20, 68], null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, [17, 20, 69], [72, 90, 168], [73, 91, 169], [44, 57, 123], [59, 71, 139], [74, 92, 169], [75, 93, 171], [73, 92, 172], [46, 60, 128], [74, 94, 174], [74, 94, 174], [15, 20, 68], [250, 250, 250], [247, 191, 125], [33, 47, 114], null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, [17, 20, 69], [72, 90, 168], [73, 91, 169], [43, 57, 123], [248, 181, 153], [73, 91, 168], [73, 92, 171], [73, 92, 172], [250, 191, 164], [45, 60, 130], [74, 93, 173], [73, 94, 176], [18, 23, 73], [27, 34, 87], [15, 19, 68], null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, [17, 20, 69], [72, 89, 166], [72, 89, 166], [73, 91, 169], [245, 178, 151], [254, 233, 220], [73, 90, 166], [73, 91, 170], [251, 191, 166], [254, 233, 220], [250, 192, 167], [73, 93, 172], [72, 93, 175], [16, 20, 70], [71, 92, 174], [16, 20, 69], [16, 20, 69], null, null, null, null, null, null, null],
+    [null, null, null, null, null, [17, 20, 70], [40, 50, 107], [72, 89, 166], [72, 89, 167], [72, 89, 167], [20, 22, 69], [17, 20, 65], [247, 229, 217], [73, 90, 167], [252, 234, 222], [16, 18, 65], [15, 19, 65], [14, 18, 66], [73, 94, 175], [73, 93, 175], [40, 54, 122], [41, 53, 117], [46, 61, 133], [16, 19, 70], null, null, null, null, null, null],
+    [null, null, null, [22, 24, 73], [23, 27, 78], [41, 51, 108], [41, 51, 108], [72, 89, 166], [72, 88, 167], [15, 17, 64], [251, 251, 252], [31, 46, 102], [18, 21, 66], [74, 91, 169], [19, 22, 70], [251, 251, 252], [55, 78, 139], [15, 20, 68], [73, 93, 176], [73, 94, 176], [40, 55, 123], [162, 158, 194], [46, 60, 130], [46, 60, 129], [17, 21, 72], null, null, null, null, null],
+    [null, null, null, null, null, [17, 20, 69], [165, 160, 195], [163, 158, 195], [40, 55, 124], [73, 94, 176], [72, 93, 176], [51, 88, 146], [48, 86, 146], [254, 254, 254], [254, 233, 220], [254, 254, 254], [48, 86, 146], [51, 88, 146], [72, 93, 176], [73, 94, 176], [40, 55, 124], [163, 158, 195], [165, 160, 195], [17, 20, 69], null, null, null, null, null, null],
+    [null, null, null, null, null, null, [164, 159, 195], [43, 58, 127], [71, 92, 173], [44, 60, 132], [73, 94, 176], [99, 157, 204], [100, 159, 206], [254, 254, 254], [254, 232, 220], [254, 254, 254], [100, 159, 206], [99, 157, 204], [73, 94, 176], [44, 60, 132], [71, 92, 173], [43, 58, 127], [164, 159, 195], null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, [16, 20, 69], [41, 57, 126], [72, 92, 174], [44, 60, 132], [72, 93, 174], [251, 183, 155], [253, 232, 220], [254, 232, 219], [254, 233, 220], [254, 232, 219], [253, 232, 220], [251, 183, 155], [72, 93, 174], [44, 60, 132], [72, 92, 174], [41, 57, 126], [16, 20, 69], null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, [46, 62, 132], [69, 88, 169], [44, 60, 130], [44, 59, 129], [41, 57, 128], [254, 233, 220], [254, 232, 219], [254, 233, 219], [254, 233, 220], [43, 59, 130], [72, 93, 175], [39, 52, 118], [46, 61, 134], [71, 91, 173], [71, 92, 173], [37, 50, 118], null, null, null, null, [22, 28, 82], null, null],
+    [null, null, null, null, null, null, [19, 22, 71], [18, 21, 69], [71, 90, 169], [44, 59, 131], [37, 49, 113], [42, 58, 128], [41, 56, 127], [247, 173, 143], [246, 170, 140], [42, 58, 127], [42, 58, 128], [72, 92, 173], [40, 52, 119], [39, 52, 118], [44, 60, 133], [72, 92, 174], [71, 92, 173], [20, 23, 72], null, null, [17, 20, 70], [43, 58, 129], null, null],
+    [null, null, null, null, null, [16, 19, 68], [253, 233, 220], [253, 233, 220], [70, 90, 170], [44, 59, 130], [38, 50, 115], [251, 251, 253], [252, 252, 253], [246, 170, 140], [254, 254, 254], [254, 253, 254], [72, 93, 174], [72, 93, 173], [40, 52, 120], [39, 52, 119], [44, 60, 133], [71, 92, 174], [71, 92, 173], [18, 21, 71], [17, 20, 70], null, [23, 29, 84], [44, 59, 130], null, null],
+    [null, null, null, null, null, [15, 17, 66], [253, 233, 220], [254, 233, 220], [17, 21, 71], [43, 58, 129], [251, 251, 253], [254, 254, 254], [17, 20, 70], [200, 194, 217], [17, 20, 68], [18, 21, 70], [71, 91, 171], [251, 251, 253], [20, 24, 75], [38, 51, 119], [45, 61, 134], [71, 92, 174], [71, 92, 173], [18, 21, 71], [43, 60, 131], [17, 21, 72], [44, 60, 131], [43, 59, 129], null, null],
+    [null, null, null, null, null, [179, 174, 204], [249, 190, 166], [254, 233, 219], [17, 21, 72], [19, 22, 74], [179, 174, 207], [253, 253, 254], [22, 27, 79], [245, 192, 129], [34, 43, 99], [17, 20, 70], [73, 94, 174], [190, 185, 212], [190, 185, 213], [19, 22, 75], [44, 60, 133], [71, 91, 173], [70, 91, 172], null, [43, 59, 131], [44, 60, 132], [44, 60, 131], null, null, null],
+    [null, null, null, null, [21, 24, 72], [162, 158, 197], [253, 253, 254], [253, 253, 253], [45, 56, 122], [15, 19, 68], [254, 253, 254], [134, 134, 184], [36, 46, 107], [253, 253, 253], [17, 20, 70], [43, 55, 122], [252, 252, 253], [254, 254, 254], [47, 59, 123], [43, 55, 120], [16, 20, 70], [71, 91, 173], [41, 58, 131], null, null, [40, 58, 132], [17, 21, 71], null, null, null],
+    [null, null, null, null, [15, 18, 66], [32, 42, 98], [34, 43, 100], [146, 145, 190], [43, 55, 119], [15, 19, 69], [134, 134, 183], [253, 252, 253], [14, 17, 64], [254, 254, 254], [253, 253, 253], [16, 19, 66], [253, 253, 253], [253, 253, 254], [44, 56, 121], [45, 57, 122], [45, 58, 124], [15, 20, 69], [70, 90, 171], [18, 23, 71], [42, 61, 134], [41, 59, 132], [17, 21, 72], null, null, null],
+    [null, null, null, null, null, [16, 20, 68], [34, 43, 99], [40, 52, 114], [33, 43, 101], [34, 44, 102], [15, 19, 67], [253, 253, 254], [253, 252, 253], [254, 254, 254], [185, 179, 210], [252, 252, 253], [254, 254, 254], [16, 20, 67], [251, 233, 222], [254, 233, 221], [44, 56, 121], [15, 19, 67], [70, 90, 171], [41, 59, 133], [41, 59, 132], [41, 59, 132], [16, 20, 71], null, null, null],
+    [null, null, null, null, null, [14, 18, 67], [40, 52, 116], [33, 43, 100], [34, 44, 102], [34, 44, 102], [15, 19, 67], [194, 189, 215], [193, 189, 214], [245, 191, 127], [18, 21, 71], [194, 190, 215], [193, 189, 215], [15, 18, 66], [254, 233, 221], [254, 233, 221], [251, 193, 168], [15, 18, 66], [33, 45, 109], [42, 60, 133], [42, 60, 133], [18, 22, 74], null, null, null, null],
+    [null, null, null, null, null, null, [22, 26, 76], [35, 44, 102], [36, 46, 105], [18, 22, 71], [19, 22, 69], [192, 188, 213], [194, 189, 214], [245, 192, 130], [18, 21, 71], [200, 196, 219], [195, 190, 216], [19, 22, 70], [254, 236, 226], [254, 234, 221], [251, 194, 168], [20, 23, 70], [34, 46, 109], [42, 57, 127], [23, 28, 81], null, null, null, null, null],
+    [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+];

package/lib/types/deepseekPricing.d.ts

@@ -80,4 +80,78 @@ export declare function estimateSessionCostSplitCny(tokens: CostTokenBuckets, mo
  * 估算本会话花费（人民币，元）——estimateSessionCostSplitCny 的总价捷径。
  */
 export declare function estimateSessionCostCny(tokens: CostTokenBuckets, model: string): number | undefined;
+/** 一笔增量 usage（durable assistant/message.usage 的计价字段）。 */
+export type CostUsageDelta = Partial<CostTokenTotals>;
+/** 空的峰谷分桶（新模型 / 新会话累计起点）。 */
+export declare function emptyCostBuckets(): CostTokenBuckets;
+/** 深拷贝分桶，供快照镜像（调用方拿到后修改不得影响累计源）。 */
+export declare function cloneCostBuckets(buckets: CostTokenBuckets): CostTokenBuckets;
+/**
+ * 把一笔 usage 按计价时段累加进分桶（in-place）。durable 事件按发生时刻
+ * 落桶，峰/谷单价不同；cacheRead/cacheWrite 作为分项保留（cacheRead 计价
+ * 时按命中价，见 costSplit）。
+ */
+export declare function addUsageToCostBuckets(buckets: CostTokenBuckets, usage: CostUsageDelta, peak: boolean): void;
+/** 一笔待计价用量：provider 决定官方与否，model 查价目，buckets 为峰谷分桶。 */
+export interface CostBucketEntry {
+    readonly provider: string;
+    readonly model: string;
+    readonly buckets: CostTokenBuckets;
+    /** 展示分侧（主会话 / 子代理）；缺省按主会话处理（兼容旧调用）。 */
+    readonly scope?: 'main' | 'subagent';
+}
+/** 多模型桶计价选项。 */
+export interface EstimateCostOptions {
+    /** 默认 true：非官方 provider 一律不估价（只计入 unpriced）。false 时
+     *  非官方 provider 也按 model 价目估算（调用方自担口径）。 */
+    readonly officialOnly?: boolean;
+}
+/** 多模型桶计价结果：金额按展示分侧拆解，未计价 token 单独上报。 */
+export interface SessionCostEstimate {
+    /** 已计价总额（元）＝ main + subagent。 */
+    readonly total: number;
+    /** 主会话部分（元）。 */
+    readonly main: number;
+    /** 子代理部分（元）。 */
+    readonly subagent: number;
+    /** 高峰时段部分（元）。 */
+    readonly peak: number;
+    /** 空闲时段部分（元）。 */
+    readonly idle: number;
+    /** 未能计价的用量 token（非官方 provider / 价目未收录）：只展示，不计金额。 */
+    readonly unpricedTokens: number;
+}
+/**
+ * 多模型桶计价纯函数：逐条目查价求和，金额按 scope 拆成主会话/子代理，
+ * 非官方 provider 或未收录模型计入 unpriced（只上报 token，不给金额）。
+ * 所有条目都是零 token 时返回 undefined（调用方不显示金额）。
+ * 空 provider 表示旧快照/测试桩（生产契约里 provider 恒有）——不武断视为
+ * 非官方，按 model 价目估算，避免既有展示静默少算。
+ */
+export declare function estimateCostFromBucketsCny(entries: readonly CostBucketEntry[], options?: EstimateCostOptions): SessionCostEstimate | undefined;
+/** 费用估算输入：主会话按模型桶 + 子代理按 (provider, model) 桶。 */
+export interface SessionCostInput {
+    /** 主会话当前 provider（主会话条目的官方判定；空串 = 旧快照）。 */
+    readonly provider: string;
+    /** 主会话按模型分桶（ChannelState.mainCost）。 */
+    readonly main?: Readonly<Record<string, CostTokenBuckets>> | undefined;
+    /** 子代理按 (provider, model) 分桶（ChannelState.subagentCost）。 */
+    readonly subagents?: readonly {
+        readonly provider: string;
+        readonly model: string;
+        readonly buckets: CostTokenBuckets;
+    }[] | undefined;
+    /** main 缺失/为空时的回退 token（旧快照/测试桩没有 mainCost 时用
+     *  channel.tokens + 当前模型，保持既有展示不消失）。 */
+    readonly fallbackTokens?: CostTokenBuckets | undefined;
+    readonly fallbackModel?: string | undefined;
+}
+/**
+ * 汇总一次费用估算的输入条目：主会话按模型分桶优先；没有分桶的旧快照
+ * 回退到 `channel.tokens` + 当前模型（不叠加，避免双计）；子代理条目
+ * 追加在后。纯函数，不修改入参。
+ */
+export declare function collectSessionCostEntries(input: SessionCostInput): CostBucketEntry[];
+/** collectSessionCostEntries + estimateCostFromBucketsCny 的展示侧捷径。 */
+export declare function estimateSessionCostSnapshotCny(input: SessionCostInput, options?: EstimateCostOptions): SessionCostEstimate | undefined;
 //# sourceMappingURL=deepseekPricing.d.ts.map

package/lib/types/deepseekPricing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deepseekPricing.d.ts","sourceRoot":"","sources":["../../src/deepseekPricing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,uCAAuC;AACvC,MAAM,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAErD,kCAAkC;AAClC,MAAM,WAAW,kBAAkB;IACjC,yBAAyB;IACzB,SAAS,EAAE,aAAa,CAAA;IACxB,gBAAgB;IAChB,QAAQ,EAAE,aAAa,CAAA;IACvB,UAAU;IACV,MAAM,EAAE,aAAa,CAAA;CACtB;AAED;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAsB9E,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,EAAE,SAAS,MAAM,EAIxD,CAAA;AAED,gDAAgD;AAChD,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,GAAE,IAAiB,GAAG,OAAO,CAM3D;AAED,wCAAwC;AACxC,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAU3E;AAED,6CAA6C;AAC7C,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,eAAe,CAAA;IACrB,IAAI,EAAE,eAAe,CAAA;CACtB;AAiCD;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,gBAAgB,EACxB,KAAK,EAAE,MAAM,GACZ;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAc3D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,gBAAgB,EACxB,KAAK,EAAE,MAAM,GACZ,MAAM,GAAG,SAAS,CAEpB"}
+{"version":3,"file":"deepseekPricing.d.ts","sourceRoot":"","sources":["../../src/deepseekPricing.ts"],"names":[],"mappings":"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"}

package/lib/types/deepseekPricing.js

@@ -25,20 +25,18 @@ export const DEEPSEEK_MODEL_PRICES = {
         inputHit: [0.02, 0.04],
         output: [4.0, 8.0],
     },
+    // issue #857：官方已按 Flash 价计费 V4.1-Flash 的正式 id 与 vision 实验 id；
+    // V4-Pro 已下线，不再保留价目行（未收录 → priceForModel 返回 undefined，
+    // 界面只展示 token、不给金额）。
     'deepseek-v4-flash': {
-        inputMiss: [1.5, 3.0],
-        inputHit: [0.05, 0.10],
-        output: [4.5, 9.0],
-    },
-    'deepseek-v4-pro': {
-        inputMiss: [4.5, 9.0],
-        inputHit: [0.15, 0.30],
-        output: [13.5, 27.0],
+        inputMiss: [1.0, 2.0],
+        inputHit: [0.02, 0.04],
+        output: [4.0, 8.0],
     },
     'deepseek-v4-flash-vision-exp': {
-        inputMiss: [1.5, 3.0],
-        inputHit: [0.05, 0.10],
-        output: [4.5, 9.0],
+        inputMiss: [1.0, 2.0],
+        inputHit: [0.02, 0.04],
+        output: [4.0, 8.0],
     },
 };
 /**
@@ -138,3 +136,104 @@ export function estimateSessionCostSplitCny(tokens, model) {
 export function estimateSessionCostCny(tokens, model) {
     return estimateSessionCostSplitCny(tokens, model)?.total;
 }
+/** 空的峰谷分桶（新模型 / 新会话累计起点）。 */
+export function emptyCostBuckets() {
+    return {
+        peak: { ...EMPTY_TOTALS },
+        idle: { ...EMPTY_TOTALS },
+    };
+}
+/** 深拷贝分桶，供快照镜像（调用方拿到后修改不得影响累计源）。 */
+export function cloneCostBuckets(buckets) {
+    return {
+        peak: { ...(buckets.peak ?? EMPTY_TOTALS) },
+        idle: { ...(buckets.idle ?? EMPTY_TOTALS) },
+    };
+}
+/**
+ * 把一笔 usage 按计价时段累加进分桶（in-place）。durable 事件按发生时刻
+ * 落桶，峰/谷单价不同；cacheRead/cacheWrite 作为分项保留（cacheRead 计价
+ * 时按命中价，见 costSplit）。
+ */
+export function addUsageToCostBuckets(buckets, usage, peak) {
+    const bucket = peak ? buckets.peak : buckets.idle;
+    bucket.input += usage.input ?? 0;
+    bucket.output += usage.output ?? 0;
+    bucket.cacheRead += usage.cacheRead ?? 0;
+    bucket.cacheWrite += usage.cacheWrite ?? 0;
+}
+/** 分桶里的计价 token 总数（input 含 cacheRead，与既有显示口径一致）。 */
+function bucketTokenTotal(buckets) {
+    const peak = buckets.peak ?? EMPTY_TOTALS;
+    const idle = buckets.idle ?? EMPTY_TOTALS;
+    return peak.input + peak.output + idle.input + idle.output;
+}
+/**
+ * 多模型桶计价纯函数：逐条目查价求和，金额按 scope 拆成主会话/子代理，
+ * 非官方 provider 或未收录模型计入 unpriced（只上报 token，不给金额）。
+ * 所有条目都是零 token 时返回 undefined（调用方不显示金额）。
+ * 空 provider 表示旧快照/测试桩（生产契约里 provider 恒有）——不武断视为
+ * 非官方，按 model 价目估算，避免既有展示静默少算。
+ */
+export function estimateCostFromBucketsCny(entries, options = {}) {
+    const officialOnly = options.officialOnly !== false;
+    let total = 0;
+    let main = 0;
+    let subagent = 0;
+    let peak = 0;
+    let idle = 0;
+    let unpricedTokens = 0;
+    let tokenCount = 0;
+    for (const entry of entries) {
+        const tokens = bucketTokenTotal(entry.buckets);
+        tokenCount += tokens;
+        const priceable = !officialOnly
+            || entry.provider === ''
+            || isDeepSeekOfficialProvider(entry.provider);
+        const price = priceable ? priceForModel(entry.model) : undefined;
+        if (price === undefined) {
+            unpricedTokens += tokens;
+            continue;
+        }
+        const split = costSplit(entry.buckets, price);
+        const amount = (split.peak + split.idle) / 1_000_000;
+        total += amount;
+        peak += split.peak / 1_000_000;
+        idle += split.idle / 1_000_000;
+        if (entry.scope === 'subagent')
+            subagent += amount;
+        else
+            main += amount;
+    }
+    if (tokenCount <= 0)
+        return undefined;
+    return { total, main, subagent, peak, idle, unpricedTokens };
+}
+/**
+ * 汇总一次费用估算的输入条目：主会话按模型分桶优先；没有分桶的旧快照
+ * 回退到 `channel.tokens` + 当前模型（不叠加，避免双计）；子代理条目
+ * 追加在后。纯函数，不修改入参。
+ */
+export function collectSessionCostEntries(input) {
+    const entries = [];
+    const main = input.main ?? {};
+    const mainModels = Object.keys(main);
+    if (mainModels.length > 0) {
+        for (const model of mainModels) {
+            const buckets = main[model];
+            if (buckets !== undefined)
+                entries.push({ provider: input.provider, model, buckets, scope: 'main' });
+        }
+    }
+    else if (input.fallbackTokens !== undefined && input.fallbackModel !== undefined && input.fallbackModel !== '') {
+        entries.push({ provider: input.provider, model: input.fallbackModel, buckets: input.fallbackTokens, scope: 'main' });
+    }
+    for (const subagent of input.subagents ?? []) {
+        entries.push({ provider: subagent.provider, model: subagent.model, buckets: subagent.buckets, scope: 'subagent' });
+    }
+    return entries;
+}
+/** collectSessionCostEntries + estimateCostFromBucketsCny 的展示侧捷径。 */
+export function estimateSessionCostSnapshotCny(input, options = {}) {
+    return estimateCostFromBucketsCny(collectSessionCostEntries(input), options);
+}

package/lib/types/dsh-adapter/channel/action-readiness.d.ts

@@ -4,7 +4,7 @@ import type { ChannelState } from './types.js';
  * specialist has been constructed.  Construction-time callers fail closed
  * rather than receiving a plausible no-op while the Channel is incomplete.
  */
-export type ChannelActionDelegates = Pick<ChannelState, 'commandCompletions' | 'loadOlder' | 'rewindTo' | 'rewindToNode' | 'forkSession' | 'resumeTo' | 'newSession' | 'listWorkspaces' | 'listWorkspaceRegistry' | 'removeWorkspace' | 'renameWorkspaceAt' | 'resolveWorkspace' | 'switchWorkspace' | 'renameWorkspace' | 'workspaceCommands' | 'runWorkspaceCommand' | 'switchModel' | 'listEfforts' | 'setEffort' | 'setDefaultEffort' | 'cycleMode' | 'runPermissionPreset' | 'clear' | 'setActivityFrames' | 'listPresets' | 'switchPreset' | 'listModels' | 'listProviders' | 'invalidateModelCompletion' | 'listSkills' | 'describeCredential' | 'balanceInfo' | 'sideQuestion' | 'listFileCandidates' | 'listFiles' | 'listSessions' | 'previewSession' | 'bindApprovalStore' | 'agentViewRows' | 'subscribeAgentView' | 'dispatchBackgroundAgent' | 'stopBackgroundAgent' | 'attachToAgent' | 'peekAgentSession' | 'replyToAgent' | 'backgroundCurrent' | 'setResumeTarget' | 'renameSession' | 'setSessionColor' | 'recapRecent' | 'deleteSession' | 'renameSessionTo' | 'compact' | 'runExternalCommand' | 'runExternalCommandOutcome' | 'pushLocal' | 'mcpStatus' | 'exportSession' | 'initWorkspace' | 'doctorInfo' | 'pluginsInfo' | 'listSubagents'> & {
+export type ChannelActionDelegates = Pick<ChannelState, 'commandCompletions' | 'loadOlder' | 'rewindTo' | 'rewindToNode' | 'forkSession' | 'resumeTo' | 'newSession' | 'listWorkspaces' | 'listWorkspaceRegistry' | 'removeWorkspace' | 'renameWorkspaceAt' | 'resolveWorkspace' | 'switchWorkspace' | 'renameWorkspace' | 'workspaceCommands' | 'runWorkspaceCommand' | 'switchModel' | 'listEfforts' | 'setEffort' | 'setDefaultEffort' | 'cycleMode' | 'runPermissionPreset' | 'clear' | 'setActivityFrames' | 'listPresets' | 'switchPreset' | 'listModels' | 'listProviders' | 'invalidateModelCompletion' | 'listSkills' | 'describeCredential' | 'balanceInfo' | 'sideQuestion' | 'listFileCandidates' | 'listFiles' | 'cachedSessions' | 'listSessions' | 'previewSession' | 'listForeignSources' | 'listForeignSessions' | 'importForeignSession' | 'bindApprovalStore' | 'agentViewRows' | 'subscribeAgentView' | 'dispatchBackgroundAgent' | 'stopBackgroundAgent' | 'attachToAgent' | 'peekAgentSession' | 'replyToAgent' | 'backgroundCurrent' | 'setResumeTarget' | 'renameSession' | 'setSessionColor' | 'recapRecent' | 'deleteSession' | 'renameSessionTo' | 'compact' | 'cancelCompact' | 'runExternalCommand' | 'runExternalCommandOutcome' | 'pushLocal' | 'mcpStatus' | 'exportSession' | 'initWorkspace' | 'doctorInfo' | 'pluginsInfo' | 'listSubagents'> & {
     runLocalCommand(command: string, includeInContext: boolean): Promise<void>;
 };
 type ChannelActionMethodName = Exclude<keyof ChannelActionDelegates, 'runLocalCommand'>;

package/lib/types/dsh-adapter/channel/action-readiness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-readiness.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/action-readiness.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,YAAY,EAClD,oBAAoB,GACpB,WAAW,GACX,UAAU,GACV,cAAc,GACd,aAAa,GACb,UAAU,GACV,YAAY,GACZ,gBAAgB,GAChB,uBAAuB,GACvB,iBAAiB,GACjB,mBAAmB,GACnB,kBAAkB,GAClB,iBAAiB,GACjB,iBAAiB,GACjB,mBAAmB,GACnB,qBAAqB,GACrB,aAAa,GACb,aAAa,GACb,WAAW,GACX,kBAAkB,GAClB,WAAW,GACX,qBAAqB,GACrB,OAAO,GACP,mBAAmB,GACnB,aAAa,GACb,cAAc,GACd,YAAY,GACZ,eAAe,GACf,2BAA2B,GAC3B,YAAY,GACZ,oBAAoB,GACpB,aAAa,GACb,cAAc,GACd,oBAAoB,GACpB,WAAW,GACX,cAAc,GACd,gBAAgB,GAChB,mBAAmB,GACnB,eAAe,GACf,oBAAoB,GACpB,yBAAyB,GACzB,qBAAqB,GACrB,eAAe,GACf,kBAAkB,GAClB,cAAc,GACd,mBAAmB,GACnB,iBAAiB,GACjB,eAAe,GACf,iBAAiB,GACjB,aAAa,GACb,eAAe,GACf,iBAAiB,GACjB,SAAS,GACT,oBAAoB,GACpB,2BAA2B,GAC3B,WAAW,GACX,WAAW,GACX,eAAe,GACf,eAAe,GACf,YAAY,GACZ,aAAa,GACb,eAAe,CAClB,GAAG;IACF,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3E,CAAA;AAED,KAAK,uBAAuB,GAAG,OAAO,CAAC,MAAM,sBAAsB,EAAE,iBAAiB,CAAC,CAAA;AACvF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAA;AAE9E;4EAC4E;AAC5E,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,MAAM,sBAAsB,GAC5C,oBAAoB,CAoEtB;AAED,wBAAgB,4BAA4B;kBAG1B,sBAAsB,GAAG,IAAI;uBAIxB,sBAAsB;EAK5C"}
+{"version":3,"file":"action-readiness.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/action-readiness.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,YAAY,EAClD,oBAAoB,GACpB,WAAW,GACX,UAAU,GACV,cAAc,GACd,aAAa,GACb,UAAU,GACV,YAAY,GACZ,gBAAgB,GAChB,uBAAuB,GACvB,iBAAiB,GACjB,mBAAmB,GACnB,kBAAkB,GAClB,iBAAiB,GACjB,iBAAiB,GACjB,mBAAmB,GACnB,qBAAqB,GACrB,aAAa,GACb,aAAa,GACb,WAAW,GACX,kBAAkB,GAClB,WAAW,GACX,qBAAqB,GACrB,OAAO,GACP,mBAAmB,GACnB,aAAa,GACb,cAAc,GACd,YAAY,GACZ,eAAe,GACf,2BAA2B,GAC3B,YAAY,GACZ,oBAAoB,GACpB,aAAa,GACb,cAAc,GACd,oBAAoB,GACpB,WAAW,GACX,gBAAgB,GAChB,cAAc,GACd,gBAAgB,GAChB,oBAAoB,GACpB,qBAAqB,GACrB,sBAAsB,GACtB,mBAAmB,GACnB,eAAe,GACf,oBAAoB,GACpB,yBAAyB,GACzB,qBAAqB,GACrB,eAAe,GACf,kBAAkB,GAClB,cAAc,GACd,mBAAmB,GACnB,iBAAiB,GACjB,eAAe,GACf,iBAAiB,GACjB,aAAa,GACb,eAAe,GACf,iBAAiB,GACjB,SAAS,GACT,eAAe,GACf,oBAAoB,GACpB,2BAA2B,GAC3B,WAAW,GACX,WAAW,GACX,eAAe,GACf,eAAe,GACf,YAAY,GACZ,aAAa,GACb,eAAe,CAClB,GAAG;IACF,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3E,CAAA;AAED,KAAK,uBAAuB,GAAG,OAAO,CAAC,MAAM,sBAAsB,EAAE,iBAAiB,CAAC,CAAA;AACvF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAA;AAE9E;4EAC4E;AAC5E,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,MAAM,sBAAsB,GAC5C,oBAAoB,CAyEtB;AAED,wBAAgB,4BAA4B;kBAG1B,sBAAsB,GAAG,IAAI;uBAIxB,sBAAsB;EAK5C"}

package/lib/types/dsh-adapter/channel/action-readiness.js

@@ -40,8 +40,12 @@ export function createChannelActionMethods(getReadyActions) {
         sideQuestion: (question, options) => getReadyActions().sideQuestion(question, options),
         listFileCandidates: (query, options) => getReadyActions().listFileCandidates(query, options),
         listFiles: () => getReadyActions().listFiles(),
-        listSessions: () => getReadyActions().listSessions(),
+        cachedSessions: () => getReadyActions().cachedSessions(),
+        listSessions: (onEnriched, onPartial) => getReadyActions().listSessions(onEnriched, onPartial),
         previewSession: sessionId => getReadyActions().previewSession(sessionId),
+        listForeignSources: () => getReadyActions().listForeignSources(),
+        listForeignSessions: (agentId, onRow) => getReadyActions().listForeignSessions(agentId, onRow),
+        importForeignSession: (agentId, key) => getReadyActions().importForeignSession(agentId, key),
         bindApprovalStore: store => getReadyActions().bindApprovalStore(store),
         agentViewRows: () => getReadyActions().agentViewRows(),
         subscribeAgentView: listener => getReadyActions().subscribeAgentView(listener),
@@ -58,6 +62,7 @@ export function createChannelActionMethods(getReadyActions) {
         deleteSession: sessionId => getReadyActions().deleteSession(sessionId),
         renameSessionTo: (sessionId, title) => getReadyActions().renameSessionTo(sessionId, title),
         compact: () => getReadyActions().compact(),
+        cancelCompact: () => getReadyActions().cancelCompact(),
         runExternalCommand: (name, rawInput) => getReadyActions().runExternalCommand(name, rawInput),
         runExternalCommandOutcome: (name, rawInput, images) => getReadyActions().runExternalCommandOutcome(name, rawInput, images),
         pushLocal: (title, lines) => getReadyActions().pushLocal(title, lines),

package/lib/types/dsh-adapter/channel/background-action.d.ts

@@ -22,6 +22,7 @@ export declare function createBackgroundCurrentAction(ctx: Context, state: Pick<
     };
     resetProjector(): void;
     resetSubagents(): void;
+    parkSubagents(agent: AgentHandle['agent']): void;
     resetJobs(): void;
     refreshEffortLevels(): void;
     bindAgent(): void;

package/lib/types/dsh-adapter/channel/background-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"background-action.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/background-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,wBAAwB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAYlD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEhE,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAEtD;iFACiF;AACjF,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,IAAI,CAAC,YAAY,EACtB,KAAK,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,eAAe,GAAG,eAAe,GAC9E,cAAc,GAAG,iBAAiB,GAAG,MAAM,GAAG,QAAQ,CAAC,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,EACxG,OAAO,EAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAC9H,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC,CAAA;IACjF,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;IAC3C,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,cAAc,IAAI,IAAI,CAAA;IACtB,cAAc,IAAI,IAAI,CAAA;IACtB,SAAS,IAAI,IAAI,CAAA;IACjB,mBAAmB,IAAI,IAAI,CAAA;IAC3B,SAAS,IAAI,IAAI,CAAA;IACjB,eAAe,IAAI,IAAI,CAAA;IACvB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,iBAAiB,IAAI,IAAI,CAAA;IACzB,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7F,4EAA4E;IAC5E,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAA;IAC5F,eAAe,IAAI,IAAI,CAAA;CACxB,GACA,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAyFjC"}
+{"version":3,"file":"background-action.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/background-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,wBAAwB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAYlD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEhE,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAEtD;iFACiF;AACjF,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,IAAI,CAAC,YAAY,EACtB,KAAK,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,eAAe,GAAG,eAAe,GAC9E,cAAc,GAAG,iBAAiB,GAAG,MAAM,GAAG,QAAQ,CAAC,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,EACxG,OAAO,EAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAC9H,IAAI,EAAE;IACJ,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC,CAAA;IACjF,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;IAC3C,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,cAAc,IAAI,IAAI,CAAA;IACtB,cAAc,IAAI,IAAI,CAAA;IACtB,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;IAChD,SAAS,IAAI,IAAI,CAAA;IACjB,mBAAmB,IAAI,IAAI,CAAA;IAC3B,SAAS,IAAI,IAAI,CAAA;IACjB,eAAe,IAAI,IAAI,CAAA;IACvB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,iBAAiB,IAAI,IAAI,CAAA;IACzB,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7F,4EAA4E;IAC5E,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAA;IAC5F,eAAe,IAAI,IAAI,CAAA;CACxB,GACA,MAAM,OAAO,CAAC,gBAAgB,CAAC,CA0FjC"}

package/lib/types/dsh-adapter/channel/background-action.js

@@ -62,6 +62,7 @@ export function createBackgroundCurrentAction(ctx, state, options, deps) {
             try {
                 const result = deps.binding.adopt(handle, adoption, (previous, disposePrevious) => {
                     const previousSessionId = String(previous.agent.session.id);
+                    deps.parkSubagents(previous.agent);
                     if (previous.handle !== undefined) {
                         deps.backgroundHandles.set(previousSessionId, previous.handle);
                         disposePrevious('park');

package/lib/types/dsh-adapter/channel/binding-events.d.ts

@@ -1,4 +1,4 @@
-import type { AssistantStreamFrame, ModelSelectionRef } from '@deepseek-ai/dsh-agent';
+import type { Agent, AssistantStreamFrame, ModelSelectionRef } from '@deepseek-ai/dsh-agent';
 import type { Context } from '@deepseek-ai/cordis';
 import type { InputConvergence } from './input-actions.js';
 import type { ChannelBinding } from './binding.js';
@@ -6,11 +6,10 @@ import type { ChannelOwner } from './owner.js';
 import { type createChannelProjection } from './projection.js';
 import type { ChannelState } from './types.js';
 /**
- * The binding event router is the sole subscriber for a foreground Agent.
- * It captures the binding generation at every listener entry; teardown is
- * incremental and retained callbacks check that captured Agent/session pair
- * before touching state. Transcript presentation remains exclusively owned by
- * ChannelProjection.
+ * Foreground transcript listeners capture a binding generation. Child event
+ * listeners instead span the Channel owner, keeping parked reducers current
+ * across rebinds. Both paths own registrations incrementally and fence retained
+ * callbacks; only ChannelProjection presents the foreground transcript.
  */
 export declare function createBindingEvents(ctx: Context, deps: {
     owner: ChannelOwner;
@@ -36,19 +35,19 @@ export declare function createBindingEvents(ctx: Context, deps: {
     subagents: {
         onSessionEvent(session: unknown, event: unknown): boolean;
         onStreamFrame?(agent: unknown, frame: AssistantStreamFrame): boolean;
-        onParentEvent?(event: unknown): void;
         onStart(info: {
             id: string;
             runId?: string;
             provider: string;
             local?: boolean;
-        }): void;
+        }, parent: object | null): void;
         onEnd(info: {
             id: string;
             runId?: string;
             stopReason: string;
             lastAssistantMessage?: unknown[];
-        }): void;
+        }, parent: object | null): void;
+        forget?(agent: Agent): void;
     };
     agentView: {
         schedule(): void;

package/lib/types/dsh-adapter/channel/binding-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"binding-events.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/binding-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AACrF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE;IACtD,KAAK,EAAE,YAAY,CAAA;IACnB,OAAO,EAAE,cAAc,CAAA;IACvB,KAAK,EAAE,YAAY,CAAA;IACnB;;;;iDAI6C;IAC7C,YAAY,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;IACrC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,SAAS,EAAE,iBAAiB,CAAA;IAC5B,YAAY,EAAE;QAAE,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;QAAC,SAAS,EAAE,iBAAiB,CAAA;KAAE,CAAA;IACrF,WAAW,EAAE;QAAE,WAAW,IAAI,IAAI,CAAC;QAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;KAAE,CAAA;IAC5F,SAAS,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA;IACrD,SAAS,EAAE;QAAE,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC;QAAC,aAAa,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC;QAAC,aAAa,CAAC,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;QAAC,OAAO,CAAC,IAAI,EAAE;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,OAAO,CAAA;SAAE,GAAG,IAAI,CAAC;QAAC,KAAK,CAAC,IAAI,EAAE;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAC;YAAC,oBAAoB,CAAC,EAAE,OAAO,EAAE,CAAA;SAAE,GAAG,IAAI,CAAA;KAAE,CAAA;IACrX,SAAS,EAAE;QAAE,QAAQ,IAAI,IAAI,CAAA;KAAE,CAAA;IAC/B,eAAe,CAAC,EAAE;QAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;KAAE,CAAA;IACrE;;;sCAGkC;IAClC,gBAAgB,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAC3C;gBAYkB,IAAI;EAiItB"}
+{"version":3,"file":"binding-events.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/binding-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE;IACtD,KAAK,EAAE,YAAY,CAAA;IACnB,OAAO,EAAE,cAAc,CAAA;IACvB,KAAK,EAAE,YAAY,CAAA;IACnB;;;;iDAI6C;IAC7C,YAAY,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;IACrC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,SAAS,EAAE,iBAAiB,CAAA;IAC5B,YAAY,EAAE;QAAE,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;QAAC,SAAS,EAAE,iBAAiB,CAAA;KAAE,CAAA;IACrF,WAAW,EAAE;QAAE,WAAW,IAAI,IAAI,CAAC;QAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;KAAE,CAAA;IAC5F,SAAS,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA;IACrD,SAAS,EAAE;QACT,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAA;QACzD,aAAa,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAA;QACpE,OAAO,CAAC,IAAI,EAAE;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,OAAO,CAAA;SAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAA;QAC7G,KAAK,CAAC,IAAI,EAAE;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAC;YAAC,oBAAoB,CAAC,EAAE,OAAO,EAAE,CAAA;SAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAA;QAC9H,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;KAC5B,CAAA;IACD,SAAS,EAAE;QAAE,QAAQ,IAAI,IAAI,CAAA;KAAE,CAAA;IAC/B,eAAe,CAAC,EAAE;QAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;KAAE,CAAA;IACrE;;;sCAGkC;IAClC,gBAAgB,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAC3C;gBAqCkB,IAAI;EAiJtB"}

package/lib/types/dsh-adapter/channel/binding-events.js

@@ -1,11 +1,43 @@
+import { carrierKeyOf } from '@deepseek-ai/dsh-scope';
+import { isTokenDelta, tokenDeltaChars } from './usage.js';
 /**
- * The binding event router is the sole subscriber for a foreground Agent.
- * It captures the binding generation at every listener entry; teardown is
- * incremental and retained callbacks check that captured Agent/session pair
- * before touching state. Transcript presentation remains exclusively owned by
- * ChannelProjection.
+ * Foreground transcript listeners capture a binding generation. Child event
+ * listeners instead span the Channel owner, keeping parked reducers current
+ * across rebinds. Both paths own registrations incrementally and fence retained
+ * callbacks; only ChannelProjection presents the foreground transcript.
  */
 export function createBindingEvents(ctx, deps) {
+    let subagentsInstalled = false;
+    const installSubagents = () => {
+        if (subagentsInstalled)
+            return;
+        subagentsInstalled = true;
+        // Child reducers span foreground bindings. One owner subscription keeps
+        // parked stores current; only the active reducer publishes view changes.
+        deps.owner.own(ctx.on('session/event', (session, event) => {
+            if (deps.owner.current())
+                deps.subagents.onSessionEvent(session, event);
+        }));
+        deps.owner.own(ctx.on('agent/assistant-stream', ({ agent, frame }) => {
+            if (deps.owner.current())
+                deps.subagents.onStreamFrame?.(agent, frame);
+        }));
+        // Cordis binds the dispatch receiver as `this`. The upstream carrier
+        // names the direct delegating parent, even for external children absent
+        // from agents.get(); its ancestor-inclusive filter cannot identify it.
+        deps.owner.own(ctx.on('subagent/start', (function (info) {
+            if (deps.owner.current())
+                deps.subagents.onStart(info, carrierKeyOf(this) ?? null);
+        })));
+        deps.owner.own(ctx.on('subagent/end', (function (info) {
+            if (deps.owner.current())
+                deps.subagents.onEnd(info, carrierKeyOf(this) ?? null);
+        })));
+        deps.owner.own(ctx.on('agent/disposed', ({ agent }) => {
+            if (deps.owner.current())
+                deps.subagents.forget?.(agent);
+        }));
+    };
     const reconcileRetiredProjection = (status) => {
         if (!deps.state.working)
             return;
@@ -20,6 +52,7 @@ export function createBindingEvents(ctx, deps) {
     const bind = () => {
         try {
             deps.state.agentBindingGeneration = deps.binding.bind();
+            installSubagents();
             deps.inputConvergence.cancelInFlight = false;
             deps.inputConvergence.interruptSeq += 1;
             deps.seedActivity?.(deps.binding.agent.session);
@@ -118,15 +151,9 @@ export function createBindingEvents(ctx, deps) {
                 if (!current())
                     return;
                 const isMainSession = subject === session;
-                if (!isMainSession && deps.subagents.onSessionEvent(subject, event))
-                    return;
                 if (!isMainSession)
                     return;
                 deps.messageObserver?.publish(subject, event);
-                // Parent-log discovery events (`subagent/catalog`, workflow member
-                // edges) reach the dashboard through the same firehose; they are not
-                // transcript rows and render below remains untouched by them.
-                deps.subagents.onParentEvent?.(event);
                 deps.modeActions.onSessionEvent(subject, event);
                 deps.projector.renderEvent(event);
                 if (event.type === 'assistant/chunk')
@@ -142,24 +169,45 @@ export function createBindingEvents(ctx, deps) {
             on('agent/assistant-stream', ({ agent: subject, frame }) => {
                 if (!current())
                     return;
-                if (subject !== capture.agent) {
-                    deps.subagents.onStreamFrame?.(subject, frame);
+                if (subject !== capture.agent)
                     return;
-                }
                 deps.projector.renderStreamFrame(frame);
                 if (frame.type === 'chunk')
                     deps.state.emitStream();
                 else if (frame.type === 'end')
                     deps.state.emit();
             });
-            on('subagent/start', (info) => {
-                if (current())
-                    deps.subagents.onStart(info);
-            });
-            on('subagent/end', (info) => {
-                if (current())
-                    deps.subagents.onEnd(info);
+            /**
+             * Live compaction progress. The summarizer is one `ctx.llm.stream()`
+             * call, so its chunks are the only work signal a compaction has between
+             * `compaction/start` and `compaction/end` (dsh-llm tags the call
+             * `purpose: 'compaction'`, and a manual one runs while the session is
+             * idle, so it cannot be confused with the foreground turn's stream).
+             * Everything else passes through untouched: the original iterable is
+             * returned for any other purpose or session.
+             */
+            const disposeCompactionStream = ctx.on('llm/stream', (options, next) => {
+                const stream = next();
+                if (options.purpose !== 'compaction')
+                    return stream;
+                if (options.sessionId === undefined || String(options.sessionId) !== String(session.id))
+                    return stream;
+                return (async function* compactionStream() {
+                    for await (const chunk of stream) {
+                        const compaction = deps.state.compaction;
+                        if (compaction !== undefined && isTokenDelta(chunk)) {
+                            deps.state.compaction = {
+                                ...compaction,
+                                phase: 'summary',
+                                outputChars: compaction.outputChars + tokenDeltaChars(chunk),
+                            };
+                            deps.state.emitStream();
+                        }
+                        yield chunk;
+                    }
+                })();
             });
+            register(disposeCompactionStream);
         }
         catch (error) {
             deps.owner.dispose();