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

package/lib/types/commands.js

@@ -42,7 +42,9 @@ export const LOCAL_COMMANDS = [
     { name: 'config', description: 'Show the dsh-tui configuration source' },
     { name: 'reload', description: 'Reload preference files from disk and apply live' },
     { name: 'settings', description: 'View and edit plugin settings' },
+    { name: 'star', description: 'Star this project on GitHub (one-key via the gh CLI)' },
     { name: 'doctor', description: 'Run environment checks' },
+    { name: 'migrate', description: 'Import conversations from other coding agents (claude-code / codex / omp / zcode / grok-build)' },
     { name: 'init', description: 'Create AGENTS.md in the working directory' },
     { name: 'agents', description: 'Show subagents of this session' },
     { name: 'jobs', description: 'Show background jobs of this session' },

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

@@ -1,21 +1,29 @@
 import React from 'react';
 import type { BalanceResult } from '../deepseekBalance.js';
 import type { TokenUsage } from '../dsh-adapter/channel.js';
+import type { ChannelUi } from '../adapter/channel/ui-policy.js';
 /**
  * `/balance` 余额报告行：Divider + 一行安静摘要，hover 展开明细
  * （各币种赠送/充值拆分、本会话 token 与花费估算、失败原因），点击行
  * 重新查询，右上角 × 关闭 —— 与 AutoRecapRow 同一套视觉与交互语言。
  * 报告只活在内存里：不进 transcript、不进会话日志。
  */
-export declare function BalanceReportRow({ result, refreshing, tokens, model, onRefresh, onDismiss, }: {
+export declare function BalanceReportRow({ result, refreshing, tokens, model, provider, mainCost, subagentCost, onRefresh, onDismiss, }: {
     /** null 表示查询仍在途。 */
     result: BalanceResult | null;
     /** 查询在途（刷新时摘要不动，明细区显示加载行）。 */
     refreshing: boolean;
-    /** 会话累计 token（hover 明细里的花费估算输入）。 */
+    /** 会话累计 token（hover 明细里的花费估算输入；没有 mainCost 的旧快照
+     *  回退到这份总量 + 当前模型）。 */
     tokens: TokenUsage;
     /** 当前模型 id（花费估算的单价匹配）。 */
     model: string;
+    /** 当前 provider（主会话用量的官方判定）。 */
+    provider: string;
+    /** 主会话按模型分桶（费用估算输入；旧快照缺省时回退 tokens）。 */
+    mainCost?: ChannelUi['mainCost'];
+    /** 子代理按 (provider, model) 分桶（费用估算输入）。 */
+    subagentCost?: ChannelUi['subagentCost'];
     /** 点击报告行：重新查询余额。 */
     onRefresh: () => void;
     /** 点击 ×：关闭报告。 */

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

@@ -1 +1 @@
-{"version":3,"file":"BalanceReportRow.d.ts","sourceRoot":"","sources":["../../../src/components/BalanceReportRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAG3D;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,UAAU,EACV,MAAM,EACN,KAAK,EACL,SAAS,EACT,SAAS,GACV,EAAE;IACD,oBAAoB;IACpB,MAAM,EAAE,aAAa,GAAG,IAAI,CAAA;IAC5B,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAA;IACnB,oCAAoC;IACpC,MAAM,EAAE,UAAU,CAAA;IAClB,0BAA0B;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,oBAAoB;IACpB,SAAS,EAAE,MAAM,IAAI,CAAA;IACrB,iBAAiB;IACjB,SAAS,EAAE,MAAM,IAAI,CAAA;CACtB,GAAG,KAAK,CAAC,SAAS,CAyGlB"}
+{"version":3,"file":"BalanceReportRow.d.ts","sourceRoot":"","sources":["../../../src/components/BalanceReportRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAGhE;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,UAAU,EACV,MAAM,EACN,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,SAAS,GACV,EAAE;IACD,oBAAoB;IACpB,MAAM,EAAE,aAAa,GAAG,IAAI,CAAA;IAC5B,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAA;IACnB;2BACuB;IACvB,MAAM,EAAE,UAAU,CAAA;IAClB,0BAA0B;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAChB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC,CAAA;IAChC,yCAAyC;IACzC,YAAY,CAAC,EAAE,SAAS,CAAC,cAAc,CAAC,CAAA;IACxC,oBAAoB;IACpB,SAAS,EAAE,MAAM,IAAI,CAAA;IACrB,iBAAiB;IACjB,SAAS,EAAE,MAAM,IAAI,CAAA;CACtB,GAAG,KAAK,CAAC,SAAS,CAuHlB"}

package/lib/types/components/BalanceReportRow.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { Box, Text } from '../ui.js';
 import { Divider } from './design-system/Divider.js';
 import { t } from '../i18n.js';
-import { estimateSessionCostSplitCny, isPeakHour, priceForModel } from '../deepseekPricing.js';
+import { estimateSessionCostSnapshotCny, isPeakHour, priceForModel } from '../deepseekPricing.js';
 import { formatTokens } from '../terminal-utils/format.js';
 /**
  * `/balance` 余额报告行：Divider + 一行安静摘要，hover 展开明细
@@ -11,7 +11,7 @@ import { formatTokens } from '../terminal-utils/format.js';
  * 重新查询，右上角 × 关闭 —— 与 AutoRecapRow 同一套视觉与交互语言。
  * 报告只活在内存里：不进 transcript、不进会话日志。
  */
-export function BalanceReportRow({ result, refreshing, tokens, model, onRefresh, onDismiss, }) {
+export function BalanceReportRow({ result, refreshing, tokens, model, provider, mainCost, subagentCost, onRefresh, onDismiss, }) {
     const [hovered, setHovered] = React.useState(false);
     const summary = (() => {
         if (result === null)
@@ -30,7 +30,13 @@ export function BalanceReportRow({ result, refreshing, tokens, model, onRefresh,
                 : t('balance-summary-state-off'),
         });
     })();
-    const estimate = estimateSessionCostSplitCny(tokens, model);
+    const estimate = estimateSessionCostSnapshotCny({
+        provider,
+        main: mainCost,
+        subagents: subagentCost,
+        fallbackTokens: tokens,
+        fallbackModel: model,
+    });
     const detailLines = (() => {
         if (result === null)
             return [];
@@ -63,7 +69,7 @@ export function BalanceReportRow({ result, refreshing, tokens, model, onRefresh,
                 output: price.output[rateIndex].toFixed(1),
             }));
         }
-        if (estimate !== undefined) {
+        if (estimate !== undefined && estimate.total > 0) {
             lines.push(t('balance-hover-tokens', {
                 input: formatTokens(tokens.input),
                 output: formatTokens(tokens.output),
@@ -74,6 +80,14 @@ export function BalanceReportRow({ result, refreshing, tokens, model, onRefresh,
                 idleName: t('cost-idle-name'),
             }));
         }
+        // 拆解口径（DESIGN D6）：主会话 / 子代理各按自身模型分组计价；无法计价
+        // 的用量只报 token，让"估算偏低"变成可见事实而不是静默少算。
+        if (estimate !== undefined) {
+            lines.push(`${t('cost-split-main', { cost: estimate.main.toFixed(2) })} · ${t('cost-split-subagent', { cost: estimate.subagent.toFixed(2) })}`);
+            if (estimate.unpricedTokens > 0) {
+                lines.push(t('cost-unpriced', { tokens: formatTokens(estimate.unpricedTokens) }));
+            }
+        }
         return lines;
     })();
     return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Divider, {}), _jsxs(Box, { flexDirection: "column", marginTop: 1, marginLeft: 1, onClick: onRefresh, onMouseEnter: () => setHovered(true), onMouseLeave: () => setHovered(false), children: [_jsx(Text, { dimColor: !hovered, children: refreshing ? t('balance-summary-loading') : summary }), hovered && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [detailLines.map((line, index) => (_jsx(Text, { dimColor: true, wrap: "truncate", children: line }, index))), result !== null && (_jsxs(Box, { flexDirection: "row", marginTop: 1, children: [_jsxs(Text, { color: "success", children: [" [", result.ok ? t('balance-refresh') : t('balance-retry'), "]"] }), _jsx(Box, { onClick: (event) => {

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

@@ -0,0 +1,24 @@
+import React from 'react';
+import type { CompactionStatus } from '../adapter/ports/channel-view.js';
+/**
+ * The in-flight compaction row, in the same slot as the working spinner.
+ *
+ * A `/compact` runs for tens of seconds (measured on real sessions: median
+ * ~25s, p90 ~70s) and the old transient toast covered the first four of them,
+ * leaving the screen indistinguishable from idle. This row stays for the whole
+ * bracket, counts up, and shows the summarizer's own output as it streams
+ * (`compaction.outputChars`) — the one honest progress signal a compaction has,
+ * since the host exposes no proportional one.
+ *
+ * Its leading indicator follows the spinner slot: the `/activity` preset while
+ * the working-activity line owns that slot (a running turn shows the preset, so
+ * the compaction must not answer with a different glyph), the classic dot
+ * otherwise.
+ */
+export declare function CompactionStatusRow({ compaction, activityPreset, }: {
+    compaction: CompactionStatus;
+    /** `/activity` preset name to draw the indicator with; undefined keeps the
+     *  classic dot family. */
+    activityPreset?: string;
+}): React.ReactNode;
+//# sourceMappingURL=CompactionStatusRow.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"CompactionStatusRow.d.ts","sourceRoot":"","sources":["../../../src/components/CompactionStatusRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AASzB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AAmBxE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,UAAU,EACV,cAAc,GACf,EAAE;IACD,UAAU,EAAE,gBAAgB,CAAA;IAC5B;8BAC0B;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,GAAG,KAAK,CAAC,SAAS,CAkDlB"}

package/lib/types/components/CompactionStatusRow.js

@@ -0,0 +1,72 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
+import { Box, Text } from '../ui.js';
+import { useAnimationFrame } from '../ink/hooks/use-animation-frame.js';
+import { useTerminalSize } from '../ink/hooks/use-terminal-size.js';
+import { stringWidth } from '../ink/stringWidth.js';
+import { t } from '../i18n.js';
+import { formatDuration, formatTokens } from '../terminal-utils/format.js';
+import { SpinnerGlyph } from './Spinner/SpinnerGlyph.js';
+import { resolvePreset } from './activityFrames.js';
+/** Field separator, matching the working spinner's row. */
+const SEP = ' · ';
+/** Cells kept clear so a long row never wraps into the prompt below. */
+const RESERVE = 2;
+/** Cadence of the classic dot spinner, so that slot agrees with the turn's. */
+const FRAME_MS = 140;
+/** Tick granularity: fine enough for the fastest `/activity` preset (120ms). */
+const TICK_MS = 60;
+/** Columns the classic dot occupies (`SpinnerGlyph`'s fixed two-column slot). */
+const DOT_SLOT = 2;
+/**
+ * The in-flight compaction row, in the same slot as the working spinner.
+ *
+ * A `/compact` runs for tens of seconds (measured on real sessions: median
+ * ~25s, p90 ~70s) and the old transient toast covered the first four of them,
+ * leaving the screen indistinguishable from idle. This row stays for the whole
+ * bracket, counts up, and shows the summarizer's own output as it streams
+ * (`compaction.outputChars`) — the one honest progress signal a compaction has,
+ * since the host exposes no proportional one.
+ *
+ * Its leading indicator follows the spinner slot: the `/activity` preset while
+ * the working-activity line owns that slot (a running turn shows the preset, so
+ * the compaction must not answer with a different glyph), the classic dot
+ * otherwise.
+ */
+export function CompactionStatusRow({ compaction, activityPreset, }) {
+    const { columns } = useTerminalSize();
+    const [viewportRef, time] = useAnimationFrame(TICK_MS);
+    // `random` resolves per call, so the pick is memoized per preset name — the
+    // rule the activity line and the subagent rows already follow.
+    const indicator = React.useMemo(() => {
+        if (activityPreset === undefined)
+            return null;
+        const preset = resolvePreset(activityPreset);
+        // The widest frame, not the current one: the row must not reflow mid-pulse.
+        return { preset, width: Math.max(...preset.frames.map(frame => stringWidth(frame))) + 1 };
+    }, [activityPreset]);
+    const glyph = indicator === null
+        ? null
+        : indicator.preset.frames[Math.floor(time / indicator.preset.intervalMs) % indicator.preset.frames.length] ?? '·';
+    // Derived from wall-clock each frame (the row is only mounted while a
+    // compaction runs, so the tick stops with it).
+    const elapsed = formatDuration(Date.now() - compaction.startedAt);
+    const frame = Math.floor(time / FRAME_MS);
+    const label = t('compact-working');
+    const detail = compaction.phase === 'summary'
+        ? `↓ ${formatTokens(Math.round(compaction.outputChars / 4))} tokens`
+        : t('compact-phase-prefill');
+    const hint = compaction.cancellable ? t('compact-esc-cancel') : undefined;
+    // The hint is actionable and the phase is informative, so a narrow terminal
+    // drops the phase first and the hint only when even that does not fit.
+    const budget = Math.max(0, columns - RESERVE);
+    const base = (indicator === null ? DOT_SLOT : indicator.width) + stringWidth(label);
+    const elapsedWidth = stringWidth(SEP) + stringWidth(elapsed);
+    const hintWidth = hint === undefined ? 0 : stringWidth(SEP) + stringWidth(hint);
+    const detailWidth = stringWidth(SEP) + stringWidth(detail);
+    const showHint = hint !== undefined && base + elapsedWidth + hintWidth <= budget;
+    const showDetail = base + elapsedWidth + hintWidth + detailWidth <= budget;
+    return (_jsxs(Box, { ref: viewportRef, flexDirection: "row", flexWrap: "wrap", marginTop: 1, width: "100%", children: [glyph === null
+                ? _jsx(SpinnerGlyph, { frame: frame, messageColor: "accent" })
+                : _jsx(Text, { color: "activity", children: `${glyph} ` }), _jsx(Text, { color: "accent", children: label }), showDetail && _jsx(Text, { dimColor: true, children: `${SEP}${detail}` }), _jsx(Text, { dimColor: true, children: `${SEP}${elapsed}` }), showHint && _jsx(Text, { dimColor: true, children: `${SEP}${hint}` })] }));
+}

package/lib/types/components/GoalTodoPanel.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { Box, Text } from '../ui.js';
 import { t } from '../i18n.js';
-import { modLabel } from '../utils/modifiers.js';
+import { primaryComboString } from '../utils/keymap.js';
 /** Maximum todo rows shown before the overflow line. */
 const MAX_TODOS = 8;
 const PHASE_LABEL = {
@@ -127,5 +127,5 @@ export function GoalTodoPanel({ channel, collapsed = false, onToggle, }) {
     return (_jsxs(Box, { flexDirection: "column", paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: [goal !== undefined && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", width: "100%", height: 1, children: [_jsx(Text, { color: "suggestion", children: "\uD83C\uDFAF " }), _jsx(Box, { flexGrow: 1, flexShrink: 1, children: _jsx(Text, { bold: true, wrap: "truncate", children: goal.objective }) }), _jsx(Box, { flexShrink: 0, marginLeft: 1, children: _jsx(PhaseBadge, { phase: goal.phase, roundsStarted: goal.roundsStarted, maxGoalRounds: goal.maxGoalRounds, elapsed: elapsed }) })] }), goal.phase === 'blocked' && goal.blockedReason !== undefined && (_jsxs(Box, { flexDirection: "row", marginTop: 1, height: 1, children: [_jsx(Text, { dimColor: true, children: "\u2502 " }), _jsx(Text, { color: "error", wrap: "truncate", children: goal.blockedReason.message })] }))] })), showTodoSection && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", height: 1, onClick: onToggle, onMouseEnter: () => setHeaderHovered(true), onMouseLeave: () => setHeaderHovered(false), backgroundColor: headerHovered ? 'userMessageBackgroundHover' : undefined, children: [_jsxs(Text, { dimColor: true, children: [collapsed ? '▸' : '▾', " "] }), _jsxs(Text, { dimColor: true, children: ["\u2713 ", doneCount, "/", allTodos.length] }), collapsed && preview !== undefined && (_jsx(Box, { flexGrow: 1, flexShrink: 1, marginLeft: 1, children: preview.status === 'in_progress' ? (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: "suggestion", children: "\u25CF " }), preview.content] })) : (_jsxs(Text, { wrap: "truncate", dimColor: true, children: ["\u25CB ", preview.content] })) }))] }), !collapsed && (_jsxs(Box, { flexDirection: "column", children: [visible.map((todo, index) => {
                                 const last = index === visible.length - 1 && hidden === 0;
                                 return (_jsxs(Box, { flexDirection: "row", height: 1, children: [_jsx(BranchPrefix, { last: last }), _jsx(TodoGlyph, { status: todo.status }), _jsx(Text, { wrap: "truncate", dimColor: todo.status === 'completed', children: todo.content })] }, index));
-                            }), hidden > 0 && (_jsxs(Box, { flexDirection: "row", height: 1, children: [_jsx(BranchPrefix, { last: true }), _jsxs(Text, { dimColor: true, children: ["\u2026 ", hidden, " more"] })] })), _jsxs(Text, { dimColor: true, children: ["  ", t('goal-todo-fold-hint', { mod: modLabel })] })] }))] }))] }));
+                            }), hidden > 0 && (_jsxs(Box, { flexDirection: "row", height: 1, children: [_jsx(BranchPrefix, { last: true }), _jsxs(Text, { dimColor: true, children: ["\u2026 ", hidden, " more"] })] })), _jsxs(Text, { dimColor: true, children: ["  ", t('goal-todo-fold-hint', { key: primaryComboString('todoFold') })] })] }))] }))] }));
 }

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

@@ -8,8 +8,8 @@ import type { LocalCommand } from '../commands.js';
  * commands plus plugin-registered ones from the DSH registry (plan/goal/…).
  * Skill entries (user-invocable skills merged for `/` completion, issue
  * #86) are hidden — a skills directory can hold dozens of entries and the
- * menu is for chrome commands. Modifier labels follow the platform
- * convention: ⌘ on macOS, ctrl elsewhere.
+ * menu is for chrome commands. Modifier labels always read ctrl+ (see
+ * modLabel): Ctrl works in every terminal, ⌘ is only a macOS alias.
  */
 export declare function HelpMenu({ commands, viewportHeight, viewportWidth, scrollRef, onCommandPick, }: {
     commands: readonly LocalCommand[];

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

@@ -1 +1 @@
-{"version":3,"file":"HelpMenu.d.ts","sourceRoot":"","sources":["../../../src/components/HelpMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,UAAU,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAKlD;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,EACvB,QAAQ,EACR,cAAc,EACd,aAAa,EACb,SAAS,EACT,aAAa,GACd,EAAE;IACD,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAA;IACjC,mFAAmF;IACnF,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,yEAAyE;IACzE,SAAS,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IACtC;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CACvC,GAAG,KAAK,CAAC,SAAS,CAoHlB"}
+{"version":3,"file":"HelpMenu.d.ts","sourceRoot":"","sources":["../../../src/components/HelpMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,UAAU,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAMlD;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,EACvB,QAAQ,EACR,cAAc,EACd,aAAa,EACb,SAAS,EACT,aAAa,GACd,EAAE;IACD,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAA;IACjC,mFAAmF;IACnF,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,yEAAyE;IACzE,SAAS,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IACtC;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CACvC,GAAG,KAAK,CAAC,SAAS,CAoHlB"}

package/lib/types/components/HelpMenu.js

@@ -3,6 +3,7 @@ import React from 'react';
 import { Box, ScrollBox, Text } from '../ui.js';
 import { localizedDescription } from '../commands.js';
 import { t } from '../i18n.js';
+import { primaryComboString } from '../utils/keymap.js';
 import { modLabel } from '../utils/modifiers.js';
 /**
  * The `?` help menu with a three-column shortcut layout, trimmed to the keys
@@ -11,13 +12,13 @@ import { modLabel } from '../utils/modifiers.js';
  * commands plus plugin-registered ones from the DSH registry (plan/goal/…).
  * Skill entries (user-invocable skills merged for `/` completion, issue
  * #86) are hidden — a skills directory can hold dozens of entries and the
- * menu is for chrome commands. Modifier labels follow the platform
- * convention: ⌘ on macOS, ctrl elsewhere.
+ * menu is for chrome commands. Modifier labels always read ctrl+ (see
+ * modLabel): Ctrl works in every terminal, ⌘ is only a macOS alias.
  */
 export function HelpMenu({ commands, viewportHeight, viewportWidth, scrollRef, onCommandPick, }) {
     const chrome = commands.filter(command => !command.skill);
-    const primaryShortcuts = (_jsxs(Box, { flexDirection: "column", width: 26, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-for-commands') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-this-help') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-verbose-output', { mod: modLabel }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-open-trajectory', { mod: modLabel }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-search-history', { mod: modLabel }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-interrupt') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-exit') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-redraw', { mod: modLabel }) }) })] }));
-    const secondaryShortcuts = (_jsxs(Box, { flexDirection: "column", width: 24, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-clear-input') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-history-nav') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-move-cursor') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-word-jumps', { mod: modLabel }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-complete-command') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-cycle-mode') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-open-editor') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-fold-todos', { mod: modLabel }) }) })] }));
+    const primaryShortcuts = (_jsxs(Box, { flexDirection: "column", width: 26, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-for-commands') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-this-help') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-verbose-output', { key: primaryComboString('transcript') }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-open-trajectory', { key: primaryComboString('trajectory') }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-search-history', { key: primaryComboString('history') }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-interrupt') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-exit') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-redraw', { key: primaryComboString('redraw') }) }) })] }));
+    const secondaryShortcuts = (_jsxs(Box, { flexDirection: "column", width: 24, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-clear-input') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-history-nav') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-move-cursor') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-word-jumps', { mod: modLabel }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-complete-command') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-cycle-mode') }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-open-editor', { key: primaryComboString('editor') }) }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: t('help-fold-todos', { key: primaryComboString('todoFold') }) }) })] }));
     const commandRows = chrome.map(command => (_jsx(HelpCommandRow, { command: command, onPick: onCommandPick }, command.name)));
     const compactCommandRows = chrome.map(command => (_jsx(HelpCommandRow, { command: command, onPick: onCommandPick }, command.name)));
     const commandList = (_jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [_jsx(Text, { dimColor: true, children: t('help-commands-title') }), commandRows] }));

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

@@ -0,0 +1,22 @@
+import React from 'react';
+import type { Tokens } from 'marked';
+import type { CliHighlight } from '../terminal-utils/cliHighlight.js';
+/**
+ * A top-level paragraph whose inline formulas show as terminal images
+ * (`mathRendering: image`, Kitty or Sixel graphics, a measured cell size).
+ *
+ * It renders exactly like the plain <Text> paragraph until it can switch
+ * whole: the paragraph's width is measured, and every formula has settled
+ * (typeset into a one-row image, or failed). The switch then happens once,
+ * so formulas arriving one by one never shift the wrap points. Formulas that
+ * failed or would shrink below legibility on one row keep their Unicode
+ * form. Each row is laid out by `layoutInlineMedia` and drawn as text
+ * pieces with one-row <Image> slots between them.
+ */
+type Props = {
+    token: Tokens.Paragraph;
+    highlight: CliHighlight | null;
+};
+export declare function InlineMathParagraph({ token, highlight }: Props): React.ReactNode;
+export {};
+//# sourceMappingURL=InlineMathParagraph.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InlineMathParagraph.d.ts","sourceRoot":"","sources":["../../../src/components/InlineMathParagraph.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAA;AAQ3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAQrE;;;;;;;;;;;GAWG;AAEH,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC,SAAS,CAAA;IACvB,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;CAC/B,CAAA;AAOD,wBAAgB,mBAAmB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,SAAS,CAiGhF"}

package/lib/types/components/InlineMathParagraph.js

@@ -0,0 +1,178 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
+import { Box, Image, Text, useTerminalImageCellSize, useTerminalImageProtocol, useTerminalImages } from '../ui.js';
+import measureElement from '../ink/measure-element.js';
+import { useTerminalSize } from '../ink/hooks/use-terminal-size.js';
+import { INLINE_MEDIA_MAX, inlineMediaPlaceholder, layoutInlineMedia } from '../math/inline-layout.js';
+import { peekMathRaster, renderMathRaster } from '../math/renderer.js';
+import { getTheme } from '../theme.js';
+import { formatToken } from '../terminal-utils/markdown.js';
+import { isMathToken, renderInlineMath } from '../terminal-utils/math.js';
+import { useTerminalBackground, useTheme } from './design-system/ThemeProvider.js';
+import { themeInkHex } from './MathBlock.js';
+import { getMathImageBacking, subscribeMathImageBacking } from '../tuiDisplayPrefs.js';
+import { useMathPreviewOpener } from './mathPreview.js';
+const WIDTH_PROBE = ' '.repeat(1024);
+/** Distinct widths applied before measurement freezes (see Divider). */
+const MAX_APPLIED_MEASUREMENTS = 4;
+export function InlineMathParagraph({ token, highlight }) {
+    const plain = React.useMemo(() => formatToken(token, 0, null, null, highlight).trim(), [token, highlight]);
+    const formulas = React.useMemo(() => collectInlineMath(token).slice(0, INLINE_MEDIA_MAX), [token]);
+    const graphics = useTerminalImages(formulas.length > 0);
+    const protocol = useTerminalImageProtocol();
+    const cellSize = useTerminalImageCellSize();
+    const [themeName] = useTheme();
+    const color = themeInkHex(getTheme(themeName).text);
+    const previewMath = useMathPreviewOpener();
+    const backdrop = React.useSyncExternalStore(subscribeMathImageBacking, getMathImageBacking);
+    const composited = backdrop === 'terminal';
+    const terminalBackground = useTerminalBackground();
+    const width = useMeasuredWidth();
+    const requests = React.useMemo(() => {
+        if (!graphics || (protocol !== 'kitty' && protocol !== 'sixel') || cellSize === undefined || color === undefined)
+            return undefined;
+        if (width.value === undefined || formulas.length === 0)
+            return undefined;
+        return formulas.map(formula => ({
+            tex: formula.text, display: false, color, cellSize, maxColumns: width.value, maxRows: 1,
+        }));
+    }, [graphics, protocol, cellSize, color, width.value, formulas]);
+    const results = useSettledRasters(requests);
+    const layout = React.useMemo(() => {
+        if (results === undefined || width.value === undefined)
+            return undefined;
+        const media = [];
+        const slot = new Map();
+        formulas.forEach((formula, index) => {
+            const result = results[index];
+            // Failures and formulas that did not fit one row keep their Unicode.
+            if (!result.ok || result.raster.rows !== 1)
+                return;
+            slot.set(formula, inlineMediaPlaceholder(media.length, result.raster.columns));
+            media.push({ formula, raster: result.raster });
+        });
+        if (media.length === 0)
+            return undefined;
+        const formatted = formatToken(withPlaceholders(token, slot), 0, null, null, highlight).trim();
+        const rows = layoutInlineMedia(formatted, width.value, media.map(entry => entry.raster.columns));
+        return rows === undefined ? undefined : { rows, media };
+    }, [results, width.value, formulas, token, highlight]);
+    return (_jsxs(Box, { ref: width.ref, flexDirection: "column", children: [_jsx(Box, { height: 0, overflow: "hidden", children: _jsx(Text, { wrap: "truncate", children: WIDTH_PROBE }) }), layout === undefined
+                ? _jsx(Text, { children: plain })
+                : layout.rows.map((row, rowIndex) => (_jsx(Box, { flexDirection: "row", height: 1, softWrapContinuation: row.continuation ? layout.rows[rowIndex - 1]?.width : undefined, children: row.pieces.map((piece, pieceIndex) => {
+                        if (piece.kind === 'text') {
+                            return (_jsx(Box, { width: piece.width, flexShrink: 0, children: _jsx(Text, { wrap: "truncate", children: piece.text }) }, `t${pieceIndex}`));
+                        }
+                        const { formula, raster } = layout.media[piece.index];
+                        // Keyed by the formula slot, so an unchanged layout keeps the
+                        // same image node (placements follow node identity). The
+                        // transcript presentation is what lets Sixel paint the one-row
+                        // slot at all, and crops instead of dropping it at a viewport
+                        // edge — the same contract block formulas use.
+                        const formulaRequest = requests?.[piece.index];
+                        const painted = (_jsx(Image, { ...(composited ? {} : { transparent: true }), presentation: "transcript", source: raster.source, width: piece.columns, height: 1, alt: formula.text, copyText: formula.raw, children: _jsx(Text, { dimColor: true, wrap: "truncate", children: renderInlineMath(formula.text) ?? formula.raw }) }));
+                        const image = composited
+                            ? (_jsx(Box, { width: piece.columns, height: 1, flexShrink: 0, backgroundColor: terminalBackground, children: painted }))
+                            : painted;
+                        return previewMath === undefined || formulaRequest === undefined
+                            ? _jsx(React.Fragment, { children: image }, `m${piece.index}:${raster.key}`)
+                            : (_jsx(Box, { onClick: event => { event.stopImmediatePropagation(); previewMath({ tex: formula.text, request: formulaRequest, source: raster.source }); }, children: image }, `m${piece.index}:${raster.key}`));
+                    }) }, rowIndex)))] }));
+}
+/** Inline math tokens of a paragraph, in reading order. */
+function collectInlineMath(token) {
+    const found = [];
+    const walk = (tokens) => {
+        for (const child of tokens ?? []) {
+            if (isMathToken(child))
+                found.push(child);
+            else
+                walk(child.tokens);
+        }
+    };
+    walk(token.tokens);
+    return found;
+}
+/** A copy of `token` whose listed math tokens format as placeholder runs. */
+function withPlaceholders(token, slot) {
+    const children = token.tokens;
+    if (children === undefined)
+        return token;
+    return {
+        ...token,
+        tokens: children.map(child => {
+            const placeholder = isMathToken(child) ? slot.get(child) : undefined;
+            return placeholder !== undefined
+                ? { type: 'escape', raw: child.raw, text: placeholder }
+                : withPlaceholders(child, slot);
+        }),
+    };
+}
+/**
+ * Results for every request once all have settled; a cached set is used on
+ * the first render (a paragraph scrolled back into view switches at once).
+ */
+function useSettledRasters(requests) {
+    const key = requests === undefined ? undefined : requests.map(requestKey).join('\u0001');
+    const cached = React.useMemo(() => {
+        if (requests === undefined)
+            return undefined;
+        const peeked = requests.map(peekMathRaster);
+        return peeked.every(result => result !== undefined) ? peeked : undefined;
+        // `key` captures every field of every request.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [key]);
+    const [settled, setSettled] = React.useState();
+    React.useEffect(() => {
+        if (requests === undefined || cached !== undefined || key === undefined)
+            return;
+        let live = true;
+        void Promise.all(requests.map(renderMathRaster)).then(results => {
+            if (live)
+                setSettled({ key, results });
+        });
+        return () => { live = false; };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [key]);
+    if (cached !== undefined)
+        return cached;
+    return settled !== undefined && settled.key === key ? settled.results : undefined;
+}
+function requestKey(request) {
+    return [request.tex, request.color, request.cellSize.width, request.cellSize.height, request.maxColumns, request.maxRows].join('\u0000');
+}
+/**
+ * The laid-out width of the paragraph box. Its width comes from the parent,
+ * not from its content, but the guard from Divider still bounds how many
+ * distinct widths are applied per terminal width in case a layout ever
+ * feeds back.
+ */
+function useMeasuredWidth() {
+    const { columns } = useTerminalSize();
+    const ref = React.useRef(null);
+    const [value, setValue] = React.useState();
+    const negotiation = React.useRef({ columns, applied: [], frozen: false });
+    React.useLayoutEffect(() => {
+        const node = ref.current;
+        if (node === null)
+            return;
+        const state = negotiation.current;
+        if (state.columns !== columns) {
+            state.columns = columns;
+            state.applied = [];
+            state.frozen = false;
+        }
+        if (state.frozen)
+            return;
+        const measured = Math.floor(measureElement(node).width);
+        if (measured <= 0 || measured === value)
+            return;
+        if (state.applied.includes(measured) || state.applied.length >= MAX_APPLIED_MEASUREMENTS) {
+            state.frozen = true;
+            return;
+        }
+        state.applied.push(measured);
+        setValue(measured);
+    });
+    return { ref, value };
+}

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import { type Tip } from '../tips.js';
 import { type UpstreamDriftSummary } from '../dsh-adapter/contract.js';
+import { type SplashEgg } from './splashEggs.js';
 import { type WhaleIntroId } from './whaleFrames.js';
 /**
  * The header splash: one layout, two phases. The **opening** (~1.7–3.5s,
@@ -14,12 +15,23 @@ import { type WhaleIntroId } from './whaleFrames.js';
  *
  * Layout: the 13-row pixel whale beside a text column of matching height —
  * the `✦ dsh-TUI` wordmark with version, the `DEEPSEEK`/`HARNESS` tagline in
- * the 5-row block font (brand-blue → ice gradient), the model/effort and
+ * the 5-row block font (brand-blue → ice gradient, a blank row between the
+ * two words, both stretched to the same width — see `splashFonts.ts` for the
+ * eight faces and the per-face kerning), the model/effort and
  * cwd in plain text (no brand-color highlight), the startup tip, and below
  * the whale the welcome tagline, centered under the art, in ice
- * blue. Narrow terminals drop the whale and keep the text column.
+ * blue. Narrow terminals climb down the `resolveSplashLayout` ladder —
+ * whale + big text, then the big text alone, then the whale alone, then one
+ * plain title line. The face rotates by local date (`pickSplashFont`), so a
+ * given day always shows the same one.
+ *
+ * Two easter eggs sit on top of that layout without changing it (both live in
+ * `splashEggs.ts`): the holiday word pair swaps the two big-text words on its
+ * date (`MERRY` on 12/25, …), and a 1-in-20 roll replaces the welcome tagline
+ * with a clickable "star us on GitHub" line whose indent is recomputed from
+ * its own width.
  */
-export declare function LogoV2({ model, effort, cwd, skipIntro, intro, tip, whale, whaleIdle, working, drift, }: {
+export declare function LogoV2({ model, effort, cwd, skipIntro, intro, tip, fontId, whale, whaleIdle, whaleGirl, starred, starReveal, onStarClick, working, drift, egg, starChance, }: {
     model: string;
     effort?: string | undefined;
     cwd: string;
@@ -27,10 +39,36 @@ export declare function LogoV2({ model, effort, cwd, skipIntro, intro, tip, whal
     skipIntro?: boolean;
     /** Test seam: pin the intro animation instead of rolling one at startup. */
     intro?: WhaleIntroId;
+    /** Big-text face id (settings `dsh-tui.splashFont`); undefined → the
+     * date-rotated `pickSplashFont()`. */
+    fontId?: string | undefined;
     /** Test seam: pin the startup tip line (probes need a deterministic tip). */
     tip?: Tip;
+    /** Test seam: pin the holiday word pair instead of reading the local date
+     * (`null` forces the normal words; `undefined` — production — rolls by
+     * date). See `splashEggs.ts`. */
+    egg?: SplashEgg | null;
+    /** Test seam: pin the star tagline's chance (1 forces the egg, 0 suppresses
+     * it; production rolls `SPLASH_STAR_CHANCE` once per mount). */
+    starChance?: number;
     /** Show the pixel whale art (settings `dsh-tui.whale`); off → text-only header. */
     whale?: boolean;
+    /** Swap the header's pixel whale for the maid portrait (settings
+     * `dsh-tui.whaleGirl`; off by default). The portrait renders FIRST as a
+     * real raster through the terminal image protocols (Kitty/Sixel —
+     * `maidPortrait.tsx`), keeping the art's full fidelity; when the terminal
+     * cannot (inline mode, unsupported protocol, decode failure) the
+     * character-art maid (`WhaleGirl.tsx`, the author's placeholder to be
+     * replaced with better art) takes the slot. Both forms are static, so
+     * `whaleIdle` only animates the whale. */
+    whaleGirl?: boolean;
+    /** 本次会话已经 star 过：彩蛋标题换成「捡到一颗小星星啦」，不再重复求。 */
+    starred?: boolean;
+    /** 彩蛋渐显的测试缝：`instant` 时三行一次画全（静态渲染夹具用；真机不传）。 */
+    starReveal?: 'instant';
+    /** 求 star 标语那一行被点击时执行（一键 star，与 `/star` / `Alt+S` 同一个
+     * 动作）。不传则那一行不可点——只有它出现时才有这个交互。 */
+    onStarClick?: () => void;
     /** Welcome-phase idle whale behaviors — fin flutters, tail thumps,
      * sleep after inactivity (settings `dsh-tui.whaleIdle`; on by default —
      * an explicit `false` keeps the settled header timer-free). Click-hearts

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

@@ -1 +1 @@
-{"version":3,"file":"LogoV2.d.ts","sourceRoot":"","sources":["../../../src/components/LogoV2.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAiB,KAAK,GAAG,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,EAAoD,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAYxH,OAAO,EAA+E,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAsDjI;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,MAAM,CAAC,EACrB,KAAK,EACL,MAAM,EACN,GAAG,EACH,SAAiB,EACjB,KAAK,EACL,GAAG,EACH,KAAY,EACZ,SAAgB,EAChB,OAAe,EACf,KAAK,GACN,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,iFAAiF;IACjF,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,4EAA4E;IAC5E,KAAK,CAAC,EAAE,YAAY,CAAA;IACpB,6EAA6E;IAC7E,GAAG,CAAC,EAAE,GAAG,CAAA;IACT,mFAAmF;IACnF,KAAK,CAAC,EAAE,OAAO,CAAA;IACf;;;4CAGwC;IACxC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;mCAG+B;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;2EACuE;IACvE,KAAK,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAA;CACpC,GAAG,KAAK,CAAC,SAAS,CAqOlB"}
+{"version":3,"file":"LogoV2.d.ts","sourceRoot":"","sources":["../../../src/components/LogoV2.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAiB,KAAK,GAAG,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,EAAoD,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAWxH,OAAO,EAAiC,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAQ/E,OAAO,EAA+E,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAA;AA+CjI;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,MAAM,CAAC,EACrB,KAAK,EACL,MAAM,EACN,GAAG,EACH,SAAiB,EACjB,KAAK,EACL,GAAG,EACH,MAAM,EACN,KAAY,EACZ,SAAgB,EAChB,SAAiB,EACjB,OAAe,EACf,UAAU,EACV,WAAW,EACX,OAAe,EACf,KAAK,EACL,GAAG,EACH,UAAU,GACX,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,iFAAiF;IACjF,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,4EAA4E;IAC5E,KAAK,CAAC,EAAE,YAAY,CAAA;IACpB;0CACsC;IACtC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,6EAA6E;IAC7E,GAAG,CAAC,EAAE,GAAG,CAAA;IACT;;qCAEiC;IACjC,GAAG,CAAC,EAAE,SAAS,GAAG,IAAI,CAAA;IACtB;oEACgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,mFAAmF;IACnF,KAAK,CAAC,EAAE,OAAO,CAAA;IACf;;;;;;;8CAO0C;IAC1C,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,4CAA4C;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,gDAAgD;IAChD,UAAU,CAAC,EAAE,SAAS,CAAA;IACtB;sCACkC;IAClC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAA;IACxB;;;4CAGwC;IACxC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;mCAG+B;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;2EACuE;IACvE,KAAK,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAA;CACpC,GAAG,KAAK,CAAC,SAAS,CAgZlB"}