@deepseek-harness-tui/dsh-tui 0.12.0 → 0.14.0

package/lib/types/screens/StatusLine.js

@@ -5,22 +5,34 @@ import { formatTokens } from '../terminal-utils/format.js';
 import { t } from '../i18n.js';
 import { formatContextUsage, DEFAULT_STATUS_BAR, normalizeStatusBar } from '../tuiDisplayPrefs.js';
 import { estimateSessionCostSnapshotCny, isDeepSeekOfficialProvider, isPeakHour } from '../deepseekPricing.js';
+import { getActiveBrand } from '../branding.js';
 import { ActivityLine, contextPressurePct } from '../components/ActivityLine.js';
+import { formatClock } from '../trajectory/format.js';
 import { GoalStatusChip } from '../components/GoalTodoPanel.js';
+import { formatGoalBudget } from '../channel/goal-command.js';
 import { formatJobDuration } from '../dsh-adapter/jobs.js';
 /** Stable fallback for stubbed channels: verify/repro harnesses render the
  *  real Chat with partial channel literals that predate the jobs field. */
 const NO_BACKGROUND_JOBS = [];
 /** 同上：partial channel 字面量可能早于 mainCost/subagentCost 字段（R4 兼容）。 */
+/** A reported session cost: `$0.0123` for USD (sub-dollar keeps 4 places,
+ *  a session often costs cents), `12.34 EUR` for any other currency. */
+export function formatCostReport(report) {
+    const digits = report.amount < 1 ? 4 : 2;
+    return report.currency === 'USD'
+        ? `$${report.amount.toFixed(digits)}`
+        : `${report.amount.toFixed(digits)} ${report.currency}`;
+}
 const NO_MAIN_COST = {};
 const NO_SUBAGENT_COST = [];
 import { modeDisplayName } from '../sessionModes.js';
 import { MiniWake } from '../components/trajectory/MiniWake.js';
+import { getTheme, isLightThemeActive } from '../theme.js';
 import { ContextBarView } from '../components/ContextBarView.js';
 import { TooltipTarget } from '../components/Tooltip.js';
 import { formatProject } from '../sessions/format.js';
 import { homeDir } from '../utils/paths.js';
-import { FREE_SEGMENT_FILL, USED_SEGMENTS, contextBarBreakdown, renderMiniContextBar, renderTpsGauge, renderTpsSparkline, speedColor, tpsStats, } from './StatusMetrics.js';
+import { USED_SEGMENTS, channelContextOccupancy, contextBarBreakdown, contextBarSegmentColors, renderMiniContextBar, renderTpsGauge, renderTpsSparkline, speedColor, tpsStats, } from './StatusMetrics.js';
 /**
  * The footer under the prompt input: the segmented context progress bar on
  * its own first line, the
@@ -70,9 +82,9 @@ const MINIMAL_UI_STATUS_BAR = Object.freeze({
  */
 function FieldLine({ parts, hoverProps, }) {
     const visible = parts.filter(part => part.node !== null && part.node !== undefined && part.node !== false);
-    return (_jsx(_Fragment, { children: visible.map((part, index) => (_jsxs(React.Fragment, { children: [index > 0 ? _jsx(Text, { dimColor: true, children: " \u00B7 " }) : null, _jsx(Box, { flexShrink: 1, ...(part.id === undefined ? {} : hoverProps(part.id)), children: part.tooltip === undefined || part.tooltip === '' ? (_jsx(Text, { wrap: "truncate", children: part.node })) : (_jsx(TooltipTarget, { content: part.tooltip, children: _jsx(Text, { wrap: "truncate", children: part.node }) })) })] }, part.key))) }));
+    return (_jsx(_Fragment, { children: visible.map((part, index) => (_jsxs(React.Fragment, { children: [index > 0 ? _jsx(Text, { dimColor: true, children: " \u00B7 " }) : null, _jsx(Box, { flexShrink: 1, ...(part.id === undefined ? {} : hoverProps(part.id)), ...(part.onClick === undefined ? {} : { onClick: part.onClick }), children: part.tooltip === undefined || part.tooltip === '' ? (_jsx(Text, { wrap: "truncate", children: part.node })) : (_jsx(TooltipTarget, { content: part.tooltip, children: _jsx(Text, { wrap: "truncate", children: part.node }) })) })] }, part.key))) }));
 }
-export function StatusLine({ channel, selectionActive = false, helpOpen = false, wake, activity: projectedActivity, }) {
+export function StatusLine({ channel, selectionActive = false, helpOpen = false, backendMode, modelPicker, effortPicker, wake, activity: projectedActivity, }) {
     const { columns } = useTerminalSize();
     const [themeName] = useTheme();
     const [hover, setHover] = React.useState(null);
@@ -93,27 +105,61 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
         ? formatProject(channel.displayCwd, homeDir())
         : channel.displayCwd;
     const usage = channel.lastUsage;
-    const contextUsed = usage === undefined
-        ? undefined
-        : usage.input + usage.cacheRead + usage.cacheWrite;
+    // ONE occupancy reading behind every ctx surface in this footer (the field,
+    // its hover gauge, the segmented bar, the working line's pressure prefix):
+    // DSH's own `contextPressure` projection when the composition mounts the
+    // token meter, else the last request's billed sample. `usage` above stays the
+    // source for the cache/cost fields — "what the last request cost" and "how
+    // full the window is now" are different questions.
+    const occupancy = channelContextOccupancy(channel);
+    const contextUsed = occupancy?.usedTokens;
+    const contextWindow = occupancy?.contextWindow;
     const contextParts = [];
     if (statusBar.thinking && channel.reasoningEffort !== undefined) {
         contextParts.push({
             key: 'effort',
+            // The hover id rides only with the click target: the segment's whole
+            // detail line IS the affordance (level + /effort), so promising it
+            // without the picker behind it would be a lie.
+            ...(effortPicker === undefined ? {} : { id: 'effort', onClick: effortPicker.onOpen }),
             node: _jsx(Text, { color: "inactiveShimmer", children: channel.reasoningEffort }),
         });
     }
     const modeNeedsExplicitMarker = channel.mode.plan === true
         || channel.mode.sandbox === 'danger-full-access'
         || channel.mode.approval === 'never';
-    if (statusBar.mode && (channel.modeIndex > 0 || modeNeedsExplicitMarker)) {
+    const modeMarked = channel.modeIndex > 0 || modeNeedsExplicitMarker;
+    // Backend-native permission modes are a SAFETY readout (bypassPermissions
+    // = every confirmation switched off), so the segment outranks the
+    // `statusBar.mode` field switch: it shows whenever the backend reports a
+    // mode, even at the default `mode: false`. The one thing it cannot outrank
+    // is the minimal UI (`minimalUi === true` pins the footer to model + cwd —
+    // the user's explicit choice must not be displaced). With no backend mode
+    // (DSH) the rule stays byte-identical to before: `statusBar.mode` AND
+    // modeMarked.
+    if (backendMode === undefined
+        ? statusBar.mode && modeMarked
+        : channel.minimalUi !== true) {
+        // Backend modes carry their own colour rule — the two destructive ids
+        // warn, plan keeps its own colour, everything else (the unmarked base
+        // mode included) renders muted; the DSH atoms never leak in. Without a
+        // backend mode the DSH rule stands: warning colour for anything that
+        // needs an explicit marker, plan keeps its own.
+        const modeColour = backendMode === undefined
+            ? channel.mode.plan === true
+                ? 'planMode'
+                : modeMarked ? 'warning' : 'inactiveShimmer'
+            : backendMode.id === 'bypassPermissions' || backendMode.id === 'dontAsk'
+                ? 'warning'
+                : backendMode.id === 'plan' ? 'planMode' : 'inactiveShimmer';
         contextParts.push({
             key: 'mode',
-            node: (_jsx(Text, { color: channel.mode.plan === true ? 'planMode' : 'warning', children: modeDisplayName(channel.mode) })),
+            ...(backendMode === undefined ? {} : { id: 'mode', onClick: backendMode.onOpen }),
+            node: (_jsx(Text, { color: modeColour, children: backendMode === undefined ? modeDisplayName(channel.mode) : backendMode.name })),
         });
     }
     const formattedContext = statusBar.contextUsage
-        ? formatContextUsage(contextUsed, channel.contextWindow, statusBar.compact)
+        ? formatContextUsage(contextUsed, contextWindow, statusBar.compact)
         : undefined;
     // The ctx field's two faces: the idle readout, and the hover state — an
     // in-place pressure bar (the user-liked "text becomes a bar" morph).
@@ -146,8 +192,8 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
             ctxParts !== undefined &&
             ctxHoverBarWidth > 0 &&
             contextUsed !== undefined &&
-            channel.contextWindow !== undefined
-            ? (_jsxs(Text, { color: "inactiveShimmer", children: [_jsx(Text, { dimColor: true, children: "ctx " }), renderMiniContextBar(contextUsed, channel.contextWindow, ctxHoverBarWidth), ' ', ctxParts.percent] }))
+            contextWindow !== undefined
+            ? (_jsxs(Text, { color: "inactiveShimmer", children: [_jsx(Text, { dimColor: true, children: "ctx " }), renderMiniContextBar(contextUsed, contextWindow, ctxHoverBarWidth), ' ', ctxParts.percent] }))
             : (_jsxs(Text, { color: "inactiveShimmer", children: [_jsx(Text, { dimColor: true, children: "ctx " }), formattedContext] }));
     if (statusBar.cache) {
         const cacheRate = formatCacheHitRate(usage);
@@ -187,6 +233,10 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
         }
     }
     const selectionBadge = formatSelectionBadge(channel.selection);
+    // The short id names the backend's own session, the id `--resume`
+    // takes. A DSH session's id is its agent id; stub channels
+    // without a session ref fall back to the agent id.
+    const sessionShortId = channel.sessionRef?.sessionId ?? channel.agentId;
     // Background-job chip (ctx.jobs; /jobs): live count of running/stopping
     // jobs, shown only while non-zero — a silent zero is not information.
     // Not preference-gated: it is transient situational state like the goal
@@ -203,7 +253,7 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
         };
     const leftFields = [
         ...(statusBar.model
-            ? [{ key: 'model', id: 'model', node: _jsx(Text, { color: "inactiveShimmer", children: channel.model }) }]
+            ? [{ key: 'model', id: 'model', ...(modelPicker === undefined ? {} : { onClick: modelPicker.onOpen }), node: _jsx(Text, { color: "inactiveShimmer", children: channel.modelDisplay ?? channel.model }) }]
             : []),
         ...(tpsPart !== undefined ? [tpsPart] : []),
         ...(jobsPart !== undefined ? [jobsPart] : []),
@@ -223,7 +273,16 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
         // work no longer silently undercounts. The trailing 峰/谷 marker shows
         // the current billing window; the total>0 shape is unchanged. Hover shows
         // the breakdown.
-        ...(statusBar.cost && isDeepSeekOfficialProvider(channel.provider)
+        // A backend that reports its own session cost (Claude `total_cost_usd`)
+        // wins over the local DeepSeek estimate: the reported figure is the bill.
+        ...(statusBar.cost && channel.costReport !== undefined
+            ? [{
+                    key: 'cost',
+                    id: 'cost',
+                    node: (_jsxs(Text, { color: "inactiveShimmer", children: [channel.costReport.source === 'estimate' ? t('status-cost-label') : '', formatCostReport(channel.costReport)] })),
+                }]
+            : []),
+        ...(statusBar.cost && channel.costReport === undefined && isDeepSeekOfficialProvider(channel.provider)
             ? (() => {
                 const estimate = estimateSessionCostSnapshotCny({
                     provider: channel.provider,
@@ -291,11 +350,11 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
         // Short id last: a provenance tag trails the content it identifies, and
         // the 8-char form is what the session log filename starts with, so a
         // truncated rendering still names the right log for --resume.
-        ...(statusBar.sessionId && channel.agentId
+        ...(statusBar.sessionId && sessionShortId
             ? [{
                     key: 'sessionId',
                     id: 'sessionId',
-                    node: _jsx(Text, { dimColor: true, children: `#${channel.agentId.slice(0, 8)}` }),
+                    node: _jsx(Text, { dimColor: true, children: `#${sessionShortId.slice(0, 8)}` }),
                 }]
             : []),
     ];
@@ -318,17 +377,22 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
     // arithmetic or its right edge falls 2 columns short of the status row's
     // (the v0.8.0 paddingX 2→1 tightening left the old `columns - 4` stale).
     const barWidth = columns - 2;
-    const barColors = themeName === 'light'
+    // 空段的深色兜底：deepseek 档冷灰、claude 档暖墨（品牌档见 branding.ts）。
+    // 明暗问色板而不是比主题名：浅色主题不一定叫 `light`（用户/插件色板也可以是
+    // 浅色），只有真彩/ANSI 的深色默认档才需要显式的 free 段色。
+    const barColors = isLightThemeActive(themeName)
         ? undefined
-        : { freeFill: '#2E3440', freeText: '#8D95A6' };
+        : getActiveBrand() === 'claude'
+            ? { freeFill: '#24221F', freeText: '#B8B2A8' }
+            : { freeFill: '#2E3440', freeText: '#8D95A6' };
     const barVisible = statusBar.contextBar &&
         channel.contextBarEnabled &&
         barWidth >= 14 &&
-        usage !== undefined &&
-        channel.contextWindow !== undefined;
+        contextUsed !== undefined &&
+        contextWindow !== undefined;
     // The supplemental-row readout for the hovered field: replaces the idle
     // hint (never the activity line) while the pointer dwells on a field.
-    const detail = buildHoverDetail(hover, channel, usage, contextUsed, columns, barColors);
+    const detail = buildHoverDetail(hover, channel, occupancy, usage, columns, barColors, backendMode, modelPicker, contextBarSegmentColors(getTheme(themeName)));
     const trailer = detail !== null
         ? detail
         : hint !== ''
@@ -351,7 +415,7 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
         showActivity ||
         showTrajectory ||
         hint !== '';
-    return (_jsx(Box, { paddingX: 1, width: columns, flexShrink: 0, children: _jsxs(Box, { flexDirection: "column", width: "100%", children: [barVisible ? (_jsx(ContextBarView, { segments: channel.contextSegments, usedTokens: contextUsed ?? 0, contextWindow: channel.contextWindow ?? 0, width: barWidth, colors: barColors, onHover: hovered => setHover(current => hovered ? 'bar' : current === 'bar' ? null : current) })) : null, hasStatusFields ? statusBar.compact ? (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, flexDirection: "row", overflow: "hidden", children: _jsx(FieldLine, { parts: compactFields, hoverProps: hoverProps }) }), ctxNode !== undefined ? (_jsx(Box, { flexShrink: 0, ...hoverProps('ctx'), children: _jsx(Text, { wrap: "truncate", children: ctxNode }) })) : null] })) : (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, flexDirection: "row", overflow: "hidden", children: _jsx(FieldLine, { parts: fullLeftFields, hoverProps: hoverProps }) }), _jsx(Box, { justifyContent: "flex-end", flexShrink: 2, flexDirection: "row", overflow: "hidden", children: _jsx(FieldLine, { parts: rightFields, hoverProps: hoverProps }) })] })) : null, showSupplementalRow ? _jsxs(Box, { height: 1, overflow: "hidden", flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsxs(Box, { flexDirection: "row", flexGrow: 1, justifyContent: showActivity && trailer !== null ? 'space-between' : 'flex-start', gap: 2, children: [showActivity && activity !== undefined ? (_jsx(ActivityLine, { activity: activity, activityFrames: channel.activityFrames, warnPct: contextPressurePct(usage, channel.contextWindow), warnDanger: (contextPressurePct(usage, channel.contextWindow) ?? 0) >= 95 })) : trailer, showActivity ? trailer : null] }), showTrajectory && wake !== undefined ? (_jsx(MiniWake, { band: wake.band, hint: wake.hint, tick: wake.tick, onOpen: wake.onOpen, hoverHint: wake.hoverHint })) : null] }) : null] }) }));
+    return (_jsx(Box, { paddingX: 1, width: columns, flexShrink: 0, children: _jsxs(Box, { flexDirection: "column", width: "100%", children: [barVisible ? (_jsx(ContextBarView, { segments: channel.contextSegments, usedTokens: contextUsed ?? 0, contextWindow: contextWindow ?? 0, width: barWidth, colors: barColors, onHover: hovered => setHover(current => hovered ? 'bar' : current === 'bar' ? null : current) })) : null, hasStatusFields ? statusBar.compact ? (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, flexDirection: "row", overflow: "hidden", children: _jsx(FieldLine, { parts: compactFields, hoverProps: hoverProps }) }), ctxNode !== undefined ? (_jsx(Box, { flexShrink: 0, ...hoverProps('ctx'), children: _jsx(Text, { wrap: "truncate", children: ctxNode }) })) : null] })) : (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, flexDirection: "row", overflow: "hidden", children: _jsx(FieldLine, { parts: fullLeftFields, hoverProps: hoverProps }) }), _jsx(Box, { justifyContent: "flex-end", flexShrink: 2, flexDirection: "row", overflow: "hidden", children: _jsx(FieldLine, { parts: rightFields, hoverProps: hoverProps }) })] })) : null, showSupplementalRow ? _jsxs(Box, { height: 1, overflow: "hidden", flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsxs(Box, { flexDirection: "row", flexGrow: 1, justifyContent: showActivity && trailer !== null ? 'space-between' : 'flex-start', gap: 2, children: [showActivity && activity !== undefined ? (_jsx(ActivityLine, { activity: activity, activityFrames: channel.activityFrames, warnPct: contextPressurePct(occupancy), warnDanger: (contextPressurePct(occupancy) ?? 0) >= 95 })) : trailer, showActivity ? trailer : null] }), showTrajectory && wake !== undefined ? (_jsx(MiniWake, { band: wake.band, hint: wake.hint, tick: wake.tick, onOpen: wake.onOpen, hoverHint: wake.hoverHint })) : null] }) : null] }) }));
 }
 /**
  * The supplemental-row readout for a hovered footer field. Technical label
@@ -360,17 +424,30 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
  * hovered (or the hover outlived its data, which the field gating makes
  * near-impossible).
  */
-function buildHoverDetail(hover, channel, usage, contextUsed, columns, barColors) {
+/** `5h 68% · 7d 87%` for the subscription windows a backend reported. */
+function formatRateLimit(rateLimit) {
+    const windows = rateLimit?.windows ?? [];
+    if (windows.length === 0)
+        return undefined;
+    const label = (name) => name === 'five_hour'
+        ? t('status-rate-limit-five-hour')
+        : name === 'seven_day' ? t('status-rate-limit-seven-day') : name;
+    return windows.map(window => `${label(window.name)} ${Math.round(window.utilization * 100)}%`).join(' · ');
+}
+function buildHoverDetail(hover, channel, occupancy, usage, columns, barColors, backendMode, modelPicker, usedColors) {
     if (hover === null)
         return null;
-    const window = channel.contextWindow;
+    const contextUsed = occupancy?.usedTokens;
+    // The hover surfaces report the SAME occupancy the field/bar above show; the
+    // 'model' chip below stays a pure route-capacity readout.
+    const window = occupancy?.contextWindow;
     const dim = (label) => _jsx(Text, { dimColor: true, children: label });
     if (hover === 'bar') {
         if (window === undefined || window <= 0 || contextUsed === undefined)
             return null;
         // The bar's text-free design pays off here: this line is its legend, so
         // every entry leads with a chip of the very color it names.
-        const { entries, separator } = contextBarBreakdown(channel.contextSegments, contextUsed, window, columns, barColors?.freeFill ?? FREE_SEGMENT_FILL);
+        const { entries, separator } = contextBarBreakdown(channel.contextSegments, contextUsed, window, columns, { used: usedColors, freeFill: barColors?.freeFill });
         if (entries.length === 0)
             return null;
         return (_jsx(Text, { wrap: "truncate", children: entries.map((entry, index) => (_jsxs(React.Fragment, { children: [index > 0 ? dim(separator) : null, _jsx(Text, { backgroundColor: entry.color, children: " " }), entry.label] }, entry.key))) }));
@@ -386,11 +463,33 @@ function buildHoverDetail(hover, channel, usage, contextUsed, columns, barColors
             const segments = USED_SEGMENTS.map(segment => `${segment.labels[1] ?? segment.key} ${formatTokens(channel.contextSegments[segment.key])}`).join(' · ');
             return (_jsxs(Text, { wrap: "truncate", children: [((contextUsed / window) * 100).toFixed(1), "% \u00B7", ' ', formatTokens(contextUsed), "/", formatTokens(window), " \u00B7 ", dim('free '), formatTokens(free), ' · ', segments] }));
         }
+        case 'mode': {
+            // Only the mode segment carries the hover id (its click target); the
+            // detail names the field and the affordance at the moment of asking.
+            // A backend-owned mode names itself (the DSH spec would only ever show
+            // the DSH cycle's own label here).
+            return (_jsxs(Text, { wrap: "truncate", children: [dim('mode '), backendMode?.name ?? modeDisplayName(channel.mode), " \u00B7 ", t('status-detail-mode')] }));
+        }
+        case 'effort': {
+            // The think-level segment's whole detail line IS the affordance (the
+            // hover id rides with the click target — see the field above), so the
+            // case is unreachable without the picker behind it.
+            return (_jsxs(Text, { wrap: "truncate", children: [dim('effort '), channel.reasoningEffort, " \u00B7 ", t('status-detail-effort')] }));
+        }
         case 'cache': {
             const rate = formatCacheHitRate(usage);
             if (usage === undefined || rate === undefined)
                 return null;
-            return (_jsxs(Text, { wrap: "truncate", children: [dim('cache '), rate, " \u00B7 ", dim('read '), formatTokens(usage.cacheRead), " \u00B7", ' ', dim('write '), formatTokens(usage.cacheWrite), " \u00B7 ", dim('input '), formatTokens(usage.input)] }));
+            // The cache split is optional on the wire (`cacheReadTokens?` /
+            // `cacheWriteTokens?`), and a route that never writes the prompt cache
+            // reports a zero or omits the field — every DeepSeek route does one or
+            // the other. A zero component says nothing the rate does not, and
+            // rendering the absence as `0` asserts a number no provider sent.
+            return (_jsxs(Text, { wrap: "truncate", children: [dim('cache '), rate, usage.cacheRead > 0
+                        ? _jsxs(_Fragment, { children: [' · ', dim('read '), formatTokens(usage.cacheRead)] })
+                        : null, usage.cacheWrite > 0
+                        ? _jsxs(_Fragment, { children: [' · ', dim('write '), formatTokens(usage.cacheWrite)] })
+                        : null, ' · ', dim('input '), formatTokens(usage.input)] }));
         }
         case 'tps': {
             if (channel.tps === undefined)
@@ -399,10 +498,31 @@ function buildHoverDetail(hover, channel, usage, contextUsed, columns, barColors
             return (_jsxs(Text, { wrap: "truncate", children: [dim('tps '), Math.round(channel.tps), " \u00B7 ", dim('avg60 '), stats.avg.toFixed(1), " \u00B7", ' ', dim('mean '), stats.mean.toFixed(1), " \u00B7 ", dim('p95 '), stats.p95.toFixed(1)] }));
         }
         case 'tokens': {
-            const { input, output } = channel.tokens;
-            return (_jsxs(Text, { wrap: "truncate", children: [dim('in '), input.toLocaleString(), " \u00B7 ", dim('out '), output.toLocaleString(), " \u00B7", ' ', dim('total '), (input + output).toLocaleString()] }));
+            const { input, output, cacheRead, cacheWrite } = channel.tokens;
+            // The hover answers "what moved" in one place — session
+            // totals with the cache split (uncached in/out stay separate from
+            // cache movement; zeros render nothing rather than a fabricated 0),
+            // the window the totals sit in, WHEN the last request was sampled,
+            // and the last COMPLETED turn's mini summary (kept after the turn
+            // ends — per-turn and cumulative never blend into one number).
+            const last = channel.turnUsage;
+            return (_jsxs(Text, { wrap: "truncate", children: [dim('in '), formatTokens(input), " \u00B7 ", dim('out '), formatTokens(output), cacheRead > 0 ? _jsxs(_Fragment, { children: [' · ', dim('cache read '), formatTokens(cacheRead)] }) : null, cacheWrite > 0 ? _jsxs(_Fragment, { children: [' · ', dim('cache write '), formatTokens(cacheWrite)] }) : null, ' · ', dim('total '), formatTokens(input + output + cacheRead + cacheWrite), window !== undefined && window > 0 ? _jsxs(_Fragment, { children: [' · ', dim('ctx '), formatTokens(window)] }) : null, usage !== undefined
+                        ? _jsxs(_Fragment, { children: [' · ', t('usage-sampled-at', { time: formatClock(usage.at) })] })
+                        : null, last !== undefined
+                        ? _jsxs(_Fragment, { children: [' · ', t('usage-last-turn'), " \u2191", formatTokens(last.input), " \u2193", formatTokens(last.output), last.cacheKnown && last.cacheRead + last.cacheWrite > 0
+                                    ? _jsxs(_Fragment, { children: [" ", t('usage-cache-segment', { parts: `${formatTokens(last.cacheRead)}/${formatTokens(last.cacheWrite)}` })] })
+                                    : null, last.retries > 0 ? _jsxs(_Fragment, { children: [" \u00B7 ", t('usage-retry-segment', { n: last.retries })] }) : null] })
+                        : null] }));
         }
         case 'cost': {
+            const report = channel.costReport;
+            if (report !== undefined) {
+                const { input, output, cacheRead } = channel.tokens;
+                // Subscription windows the backend reported ride along: the bill and
+                // the plan's remaining room answer the same "what did this cost" glance.
+                const usage = formatRateLimit(channel.rateLimit);
+                return (_jsxs(Text, { wrap: "truncate", children: [formatCostReport(report), " \u00B7 ", dim('in '), formatTokens(input), ' · ', dim('out '), formatTokens(output), " \u00B7 ", dim('cache '), formatTokens(cacheRead), ' · ', t(report.source === 'backend' ? 'cost-source-backend' : 'status-cost-note'), usage === undefined ? null : _jsxs(_Fragment, { children: [' · ', t('status-rate-limit', { usage })] })] }));
+            }
             const estimate = estimateSessionCostSnapshotCny({
                 provider: channel.provider,
                 main: channel.mainCost ?? NO_MAIN_COST,
@@ -424,7 +544,9 @@ function buildHoverDetail(hover, channel, usage, contextUsed, columns, barColors
             const goal = channel.goal;
             if (goal === undefined)
                 return null;
-            return (_jsxs(Text, { wrap: "truncate", children: [dim('goal '), goal.phase, " \u00B7 ", dim('r'), goal.roundsStarted, "/", goal.maxGoalRounds, " \u00B7", ' ', goal.objective] }));
+            // A budgeted goal (a backend that measures tokens/time) reads its
+            // spend instead of the rounds.
+            return goal.budget === undefined ? (_jsxs(Text, { wrap: "truncate", children: [dim('goal '), goal.phase, " \u00B7 ", dim('r'), goal.roundsStarted, "/", goal.maxGoalRounds, " \u00B7", ' ', goal.objective] })) : (_jsxs(Text, { wrap: "truncate", children: [dim('goal '), goal.phase, " \u00B7 ", formatGoalBudget(goal.budget), " \u00B7", ' ', goal.objective] }));
         }
         case 'jobs': {
             const live = (channel.backgroundJobs ?? NO_BACKGROUND_JOBS).filter(job => job.status === 'running' || job.status === 'stopping');
@@ -435,8 +557,16 @@ function buildHoverDetail(hover, channel, usage, contextUsed, columns, barColors
             return (_jsxs(Text, { wrap: "truncate", children: [dim('jobs '), shown.map(job => `${job.id} ${job.label} (${formatJobDuration(job)})`).join(' · '), rest > 0 ? ` · +${rest}` : ''] }));
         }
         case 'model': {
-            return (_jsxs(Text, { wrap: "truncate", children: [dim('model '), channel.model, " \u00B7 ", dim('provider '), channel.provider, channel.contextWindow !== undefined
+            // When a display name masks the raw id (modelDisplay maps a
+            // friendly/alias name), the hover shows BOTH — the requested alias the
+            // user picked and the raw id the route runs. Identical strings render
+            // once; nothing is invented when no mapping is known.
+            return (_jsxs(Text, { wrap: "truncate", children: [dim('model '), channel.modelDisplay ?? channel.model, channel.modelDisplay !== undefined && channel.modelDisplay !== channel.model
+                        ? _jsxs(_Fragment, { children: [' (', channel.model, ')'] })
+                        : null, ' · ', dim('provider '), channel.provider, channel.contextWindow !== undefined
                         ? _jsxs(_Fragment, { children: [" \u00B7 ", dim('ctx '), formatTokens(channel.contextWindow)] })
+                        : null, modelPicker !== undefined
+                        ? _jsxs(_Fragment, { children: [" \u00B7 ", t('status-detail-model')] })
                         : null] }));
         }
         case 'git': {
@@ -445,7 +575,7 @@ function buildHoverDetail(hover, channel, usage, contextUsed, columns, barColors
             return (_jsxs(Text, { wrap: "truncate", children: [dim('git '), channel.gitBranch] }));
         }
         case 'sessionId':
-            return (_jsxs(Text, { wrap: "truncate", children: [dim('# '), channel.agentId, " \u00B7 ", t('status-detail-session-id')] }));
+            return (_jsxs(Text, { wrap: "truncate", children: [dim('# '), channel.sessionRef?.sessionId ?? channel.agentId, " \u00B7 ", t('status-detail-session-id')] }));
         case 'cwd':
             return (_jsxs(Text, { wrap: "truncate", children: [dim('cwd '), channel.displayCwd] }));
         case 'title':

package/lib/types/screens/StatusMetrics.d.ts

@@ -8,8 +8,33 @@
  *    yellow ≥ 20, red below.
  */
 import type { Color } from '../ink/styles.js';
-/** Context bar segments — DeepSeek blue family (dark-theme friendly: deep
- *  navy → brand blue, neutral grey free segment).
+import type { Theme } from '../theme.js';
+import type { ContextOccupancy } from '../adapter/ports/channel-view.js';
+/**
+ * The occupancy reading a screen renders.
+ *
+ * The channel publishes `contextOccupancy` (see
+ * `dsh-adapter/context-occupancy.ts`); this resolves the same reading for ports
+ * that do not carry the member — the partial channel literals the verify/repro
+ * harnesses hand the real screens, and third-party scenes built against an
+ * older port. The channel itself always publishes it, so a production render
+ * has exactly one source, and a member that IS present is never second-guessed.
+ * @param channel - The channel surface (or a partial one).
+ * @returns Occupancy for the footer/bar/warning, or `undefined` when unknown.
+ */
+export declare function channelContextOccupancy(channel: {
+    readonly contextOccupancy?: ContextOccupancy | undefined;
+    readonly lastUsage?: {
+        input: number;
+        cacheRead: number;
+        cacheWrite: number;
+    } | undefined;
+    readonly contextWindow: number | undefined;
+}): ContextOccupancy | undefined;
+/** Context bar segments, in bar order — the theme key that fills each one,
+ *  its label pair, and the fill a palette without that key falls back to (the
+ *  pre-theme DeepSeek blue family, dark-theme friendly: deep navy → brand
+ *  blue, neutral grey free segment).
  *
  *  The bar draws NO text inside a used segment: the fill color is the whole
  *  signal (community feedback — the old `s`/`p`/`t` letters read as noise on
@@ -20,26 +45,47 @@ import type { Color } from '../ink/styles.js';
  *  this module's ANSI path renders. */
 export declare const USED_SEGMENTS: readonly [{
     readonly key: "system";
-    readonly color: "#22305F";
+    readonly themeKey: "contextBarSystem";
+    readonly fallback: "#22305F";
     readonly labels: readonly ["system", "sys"];
 }, {
     readonly key: "prompt";
-    readonly color: "#2B3D78";
+    readonly themeKey: "contextBarPrompt";
+    readonly fallback: "#2B3D78";
     readonly labels: readonly ["prompt", "pr"];
 }, {
     readonly key: "assistant";
-    readonly color: "#344A92";
+    readonly themeKey: "contextBarAssistant";
+    readonly fallback: "#344A92";
     readonly labels: readonly ["assistant", "ast"];
 }, {
     readonly key: "thinking";
-    readonly color: "#4D6BFE";
+    readonly themeKey: "contextBarThinking";
+    readonly fallback: "#4D6BFE";
     readonly labels: readonly ["thinking", "th"];
 }, {
     readonly key: "tools";
-    readonly color: "#5A7CFF";
+    readonly themeKey: "contextBarTools";
+    readonly fallback: "#5A7CFF";
     readonly labels: readonly ["tools", "tl"];
 }];
-/** Used tokens per context content type (system, prompt, assistant, thinking, tools). */
+/** 渲染期取一个已用分段的填充色（品牌档渲染时读取，见 `branding.ts`）：品牌在
+ *  档时品牌表优先——那是「切后端整屏换色」的语义，与当前主题声明了什么无关；
+ *  其余情形原样返回入参（主题声明的键或固定 ramp）。 */
+export declare function usedSegmentColor(segment: {
+    key: string;
+    color: Color;
+}): Color;
+/** The five used-segment fills a palette declares, in bar order. A palette
+ *  predating the keys (community themes) keeps the fixed ramp above, so both
+ *  the JSX bar and its hover legend stay renderable without the theme.
+ *
+ *  纯粹的调色板投影：只回答「这个调色板声明了什么」。品牌覆盖在渲染点叠加
+ *  （`usedSegmentColor`），两套机制因此不会互相顶掉。 */
+export declare function contextBarSegmentColors(theme?: Theme): readonly Color[];
+/** A single used block when the backend reports occupancy without composition. */
+export declare function contextBarUsedColor(colors?: readonly Color[]): Color;
+/** Local token estimates per context content type (system, prompt, assistant, thinking, tools). */
 export type ContextSegments = Record<(typeof USED_SEGMENTS)[number]['key'], number>;
 /** Free-segment colors: light grey fill, dark grey readout. Exported so the
  *  JSX bar (ContextBarView) and the hover chip paint the same free color the
@@ -91,35 +137,47 @@ export type ContextBarBreakdown = {
 };
 /**
  * The context bar's hover breakdown — the legend the bar no longer carries
- * itself. One entry per segment the bar actually paints (a zero-token content
- * type gets no columns, so it gets no entry either), in bar order, free last.
+ * itself. Local content estimates come first, measured free space last. When
+ * composition is unavailable, one measured used entry replaces the estimates.
  *
  * `columns` picks the label form: readable names with a ` · ` separator while
  * the line fits, then the short forms, then a bare space separator (the color
  * chip already separates the entries). The caller renders each entry as
  * `chip + space + label`, which is what the fit test measures.
  *
- * @param segments - Used tokens per content type.
+ * @param segments - Local token estimates per content type.
  * @param usedTokens - Total used tokens; the remainder is the free entry.
  * @param contextWindow - The context window size in tokens.
  * @param columns - Terminal width; the footer's own padding is subtracted here.
- * @param freeFill - The free segment's fill color (callers pass a theme override).
+ * @param colors - The bar's fills: `used` (bar order, from the palette) and the
+ *   free segment's fill. Absent fields fall back to the fixed ramp / grey.
  * @returns The breakdown entries and the separator to join them with.
  */
-export declare function contextBarBreakdown(segments: ContextSegments, usedTokens: number, contextWindow: number, columns: number, freeFill?: Color): ContextBarBreakdown;
-/** Give every visible used segment at least one column before sharing the
- *  rest. Exported for ContextBarView (hoverable JSX twin of the bar). */
+export declare function contextBarBreakdown(segments: ContextSegments, usedTokens: number, contextWindow: number, columns: number, colors?: {
+    used?: readonly Color[];
+    freeFill?: Color;
+}): ContextBarBreakdown;
+/** Share a fixed used-column budget, keeping small segments visible when it fits. */
 export declare function allocateBarColumns(values: readonly number[], width: number): number[];
+/** Occupancy fixes the used/free boundary; estimates only divide the used part. */
+export declare function contextBarColumns(segments: ContextSegments, usedTokens: number, contextWindow: number, width: number): {
+    used: number[];
+    unclassified: number;
+    free: number;
+};
 /**
  * The segmented context bar: used segments by content type, then the
  * remainder as a light free segment whose right edge carries the usage
  * readout (`13k/64k 19.5%`). No other text — the bar is read by color, and
  * the pointer supplies the names and numbers (contextBarBreakdown). The
  * readout tints amber / red as the context fills (contextPressureStep).
- * @param segments - Used tokens per content type.
- * @param usedTokens - Total used tokens, driving the usage readout.
+ * @param segments - Local token estimates per content type.
+ * @param usedTokens - Measured occupancy, driving both fill length and readout.
  * @param contextWindow - The context window size in tokens.
  * @param width - Total bar width in terminal columns.
+ * @param colors - The free segment's fill/text override; absent fields keep
+ *   the fixed defaults. The used fills stay on the fixed ramp unless a brand
+ *   overrides them (see usedSegmentColor).
  * @returns The ANSI-styled segmented bar, or '' when `width` or `contextWindow` is non-positive.
  */
 export declare function renderContextBar(segments: ContextSegments, usedTokens: number, contextWindow: number, width: number, colors?: {

package/lib/types/screens/StatusMetrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StatusMetrics.d.ts","sourceRoot":"","sources":["../../../src/screens/StatusMetrics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StatusMetrics.d.ts","sourceRoot":"","sources":["../../../src/screens/StatusMetrics.ts"],"names":[],"mappings":"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"}