@deepseek-harness-tui/dsh-tui 0.14.1 → 0.16.0

package/lib/types/screens/SessionSupervisor.js

@@ -11,6 +11,7 @@ import { SessionListRow } from '../components/sessions/SessionListRow.js';
 import { SpinnerGlyph } from '../components/Spinner/SpinnerGlyph.js';
 import { ApprovalPanel } from '../components/approvals/ApprovalPanel.js';
 import { useTerminalFocus } from '../ink/hooks/use-terminal-focus.js';
+import { useDeclaredCursor, useNativeCursor } from '../ink/hooks/use-declared-cursor.js';
 import { useAnimationFrame } from '../ink/hooks/use-animation-frame.js';
 import { isPlainReturn, isMod } from '../utils/modifiers.js';
 import { truncateWidth } from '../sessions/format.js';
@@ -65,6 +66,25 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
     const [tab, setTab] = useState(DSH_TAB);
     /** The `+N` dropdown of folded tabs, anchored where it was clicked. */
     const [tabMenu, setTabMenu] = useState(undefined);
+    // Like ModelPicker, the native caret follows the region last touched.
+    // The live filter keeps the rail/list's existing navigation and Enter target.
+    const [filterFocused, setFilterFocused] = useState(false);
+    const cursorActive = approval === null && menu === undefined && tabMenu === undefined
+        && rename === undefined && confirmRemove === undefined && sessionRename === undefined && confirmDelete === undefined;
+    const searchCursor = filterFocused || (!railVisible && activePane === 'rail');
+    const nativeCursor = useNativeCursor();
+    const newSessionCursorRef = useDeclaredCursor({
+        line: 0, column: 0, active: tab === DSH_TAB && cursorActive && !searchCursor && cardFocused,
+        visible: nativeCursor, hideOnIdle: true,
+    });
+    const focusRail = () => {
+        setFilterFocused(false);
+        activateRail();
+    };
+    const focusList = () => {
+        setFilterFocused(false);
+        activateList();
+    };
     const tabMenuRef = useRef(tabMenu);
     tabMenuRef.current = tabMenu;
     /** The session-rename draft as the keyboard sees it (see the input handler). */
@@ -102,6 +122,7 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
         closeMenu();
         closeTabMenu();
         setQuery('');
+        setFilterFocused(false);
         setNotice(undefined);
         setTab(id);
     }, [closeMenu, closeTabMenu, setQuery, setNotice]);
@@ -238,6 +259,7 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
                 return;
             }
             if (queryRef.current.length > 0) {
+                setFilterFocused(true);
                 setQuery('');
                 return;
             }
@@ -251,6 +273,9 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
             cycleTab(key.shift ? -1 : 1);
             return;
         }
+        if (key.leftArrow || key.rightArrow || key.upArrow || key.downArrow || key.wheelUp || key.wheelDown || key.pageUp || key.pageDown) {
+            setFilterFocused(false);
+        }
         if (tab !== DSH_TAB) {
             foreignKey(input, key);
             return;
@@ -286,12 +311,10 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
                 moveRail(key.pageDown ? 1 : -1);
             return;
         }
-        // The filter is a LIVE query, not a mode you enter: this screen has no
-        // second cursor for a text seat, and the rail/list already own the arrows
-        // (a seat would have to relearn them). So printable input goes straight to
-        // the query — without this branch the box rendered, focused, and could never
-        // be typed into.
+        // Typing moves the native caret into the live filter; arrows and Enter
+        // still belong to the rail/list, so filtering adds no separate input mode.
         if (key.backspace || key.delete) {
+            setFilterFocused(true);
             setQuery(text => text.slice(0, -1));
             return;
         }
@@ -361,8 +384,10 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
         // unknown key cannot type an invisible glyph into the query.
         if (!isMod(key) && !key.meta && !key.super && input && !key.return) {
             const typed = input.replace(/\p{Cc}/gu, '');
-            if (typed.length > 0)
+            if (typed.length > 0) {
+                setFilterFocused(true);
                 setQuery(text => text + typed);
+            }
         }
     });
     // Working rows animate their glyph. The shared clock only runs while at
@@ -394,6 +419,7 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
             return;
         }
         if (key.backspace || key.delete) {
+            setFilterFocused(true);
             setQuery(text => text.slice(0, -1));
             return;
         }
@@ -413,8 +439,10 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
         }
         if (!key.meta && !key.super && input && !key.return) {
             const typed = input.replace(/\p{Cc}/gu, '');
-            if (typed.length > 0)
+            if (typed.length > 0) {
+                setFilterFocused(true);
                 setQuery(text => text + typed);
+            }
         }
     }
     // Header: title, subtitle, and the source strip on the right. Width runs
@@ -465,14 +493,16 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
                                 const next = { col: event.col, row: event.row, item: 0 };
                                 tabMenuRef.current = next;
                                 setTabMenu(next);
-                            } }) }))] }), _jsx(Divider, { bleed: true }), tab !== DSH_TAB && (_jsx(ForeignSessionPanes, { model: foreign, sourceLabel: activeSource?.label ?? tab, home: home, now: now, query: query, notice: notice, railVisible: railVisible, railWidth: railWidth, railEntryCapacity: railEntryCapacity, sessionWidth: sessionWidth, rows: rows, isTerminalFocused: isTerminalFocused })), tab === DSH_TAB && (_jsxs(Box, { flexDirection: "row", flexGrow: 1, flexShrink: 1, overflow: "hidden", children: [railVisible && (_jsxs("ink-box", { style: { flexDirection: 'column', width: railWidth, height: '100%', flexShrink: 0, overflow: 'hidden' }, onClick: activateRail, onMouseEnter: activateRail, onWheel: (event) => {
+                            } }) }))] }), _jsx(Divider, { bleed: true }), tab !== DSH_TAB && (_jsx(ForeignSessionPanes, { model: foreign, sourceLabel: activeSource?.label ?? tab, home: home, now: now, query: query, notice: notice, railVisible: railVisible, railWidth: railWidth, railEntryCapacity: railEntryCapacity, sessionWidth: sessionWidth, rows: rows, isTerminalFocused: isTerminalFocused, filterFocused: filterFocused, cursorActive: cursorActive, onFilterFocus: setFilterFocused })), tab === DSH_TAB && (_jsxs(Box, { flexDirection: "row", flexGrow: 1, flexShrink: 1, overflow: "hidden", children: [railVisible && (_jsxs("ink-box", { style: { flexDirection: 'column', width: railWidth, height: '100%', flexShrink: 0, overflow: 'hidden' }, onClick: focusRail, onMouseEnter: focusRail, onWheel: (event) => {
+                            setFilterFocused(false);
                             moveRail(event.deltaY >= 0 ? 1 : -1);
                         }, children: [_jsx(Box, { height: 1, flexShrink: 0, overflow: "hidden", paddingX: 1, children: _jsx(Text, { dimColor: true, children: truncateWidth(railEntries.length === entries.length
                                         ? t('home-section-workspaces', { n: entries.length })
                                         : t('supervisor-workspace-groups', { registered: entries.length, history: railEntries.length - entries.length }), railWidth - 2) }) }), !loading && railEntries.length === 0 && (_jsx(Box, { paddingX: 1, children: _jsx(Text, { dimColor: true, italic: true, wrap: "truncate-end", children: truncateWidth(t('home-no-workspaces'), railWidth - 2) }) })), visibleRailRows.map((entry) => {
                                 const absolute = railEntries.indexOf(entry);
-                                return (_jsx(HomeWorkspaceRow, { title: entry.title, path: entry.path, home: home, sessionCount: countOf(entry), historyOnly: entry.from === 'unregistered', present: entry.present, selected: selected !== undefined && selected.id === entry.id, focused: activePane === 'rail' && railFocus === absolute, width: railWidth, onSelect: (event) => {
+                                return (_jsx(HomeWorkspaceRow, { title: entry.title, path: entry.path, home: home, sessionCount: countOf(entry), historyOnly: entry.from === 'unregistered', present: entry.present, selected: selected !== undefined && selected.id === entry.id, focused: activePane === 'rail' && railFocus === absolute, declareCursor: cursorActive && !searchCursor, width: railWidth, onSelect: (event) => {
                                         event.stopImmediatePropagation();
+                                        setFilterFocused(false);
                                         railRef.current = absolute;
                                         setRailFocus(absolute);
                                         selectEntry(entry);
@@ -484,20 +514,31 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
                                         menuRef.current = next;
                                         setMenu(next);
                                     } }, entry.id));
-                            }), _jsx(Box, { flexGrow: 1 }), _jsx(Box, { flexShrink: 0, paddingX: 1, children: _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: railHint }) }) })] })), railVisible && (_jsx(Box, { width: 1, flexShrink: 0, flexDirection: "column", children: _jsx(Text, { dimColor: true, children: '│' }) })), _jsxs(Box, { flexDirection: "column", width: sessionWidth, height: "100%", flexShrink: 0, overflow: "hidden", onClick: activateList, onMouseEnter: activateList, children: [_jsx(Box, { height: 1, flexShrink: 0, overflow: "hidden", children: _jsxs(Box, { flexShrink: 1, overflow: "hidden", children: [_jsx(Text, { color: "remember", bold: true, children: truncateWidth(` ${t('home-sessions-title', { name: selected?.title ?? t('supervisor-title') })}`, Math.max(4, sessionWidth - 3)) }), _jsx(Text, { dimColor: true, children: `  ${truncateWidth(t('supervisor-counts', { working: workingCount, live: liveCount, total: visibleSessions.length }) + (refreshing ? ` · ${t('home-sessions-refreshing')}` : ''), Math.max(4, sessionWidth - 3))}` })] }) }), _jsx(Box, { height: 1, flexShrink: 0, paddingX: 1, children: _jsx(SearchBox, { query: query, isFocused: activePane === 'list', isTerminalFocused: isTerminalFocused, placeholder: truncateWidth(t('supervisor-filter-placeholder'), Math.max(8, sessionWidth - 6)), prefix: "/", borderless: true, width: Math.max(8, sessionWidth - 2) }) }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, onClick: (event) => {
+                            }), _jsx(Box, { flexGrow: 1 }), _jsx(Box, { flexShrink: 0, paddingX: 1, children: _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: railHint }) }) })] })), railVisible && (_jsx(Box, { width: 1, flexShrink: 0, flexDirection: "column", children: _jsx(Text, { dimColor: true, children: '│' }) })), _jsxs(Box, { flexDirection: "column", width: sessionWidth, height: "100%", flexShrink: 0, overflow: "hidden", onClick: focusList, onMouseEnter: focusList, children: [_jsx(Box, { height: 1, flexShrink: 0, overflow: "hidden", children: _jsxs(Box, { flexShrink: 1, overflow: "hidden", children: [_jsx(Text, { color: "remember", bold: true, children: truncateWidth(` ${t('home-sessions-title', { name: selected?.title ?? t('supervisor-title') })}`, Math.max(4, sessionWidth - 3)) }), _jsx(Text, { dimColor: true, children: `  ${truncateWidth(t('supervisor-counts', { working: workingCount, live: liveCount, total: visibleSessions.length }) + (refreshing ? ` · ${t('home-sessions-refreshing')}` : ''), Math.max(4, sessionWidth - 3))}` })] }) }), _jsx(Box, { height: 1, flexShrink: 0, paddingX: 1, onClick: event => {
+                                    event.stopImmediatePropagation();
+                                    activateList();
+                                    setFilterFocused(true);
+                                }, onMouseEnter: event => {
+                                    event.stopImmediatePropagation();
+                                    if (activePane !== 'list')
+                                        activateList();
+                                    setFilterFocused(true);
+                                }, children: _jsx(SearchBox, { query: query, isFocused: activePane === 'list' || searchCursor, declareCursor: cursorActive && searchCursor, isTerminalFocused: isTerminalFocused, placeholder: truncateWidth(t('supervisor-filter-placeholder'), Math.max(8, sessionWidth - 6)), prefix: "/", borderless: true, width: Math.max(8, sessionWidth - 2) }) }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, onMouseEnter: () => setFilterFocused(false), onClick: (event) => {
                                     event.stopImmediatePropagation();
                                     if (selected !== undefined)
                                         newSessionIn(selected);
-                                }, children: [_jsxs(Box, { height: 1, flexShrink: 0, overflow: "hidden", children: [_jsx(Text, { color: cardFocused ? 'success' : 'subtle', children: cardFocused ? '❯ ' : '  ' }), _jsx(Text, { color: cardFocused ? 'success' : undefined, bold: cardFocused, children: t('supervisor-new-session') })] }), _jsx(Box, { height: 1, flexShrink: 0, overflow: "hidden", children: _jsx(Text, { dimColor: true, children: `  ${truncateWidth(t('supervisor-new-session-hint', { name: selected?.title ?? t('supervisor-title') }), Math.max(8, sessionWidth - 3))}` }) })] }), _jsxs("ink-box", { style: { flexDirection: 'column', flexGrow: 1, flexShrink: 1, overflow: 'hidden' }, onWheel: (event) => {
+                                }, children: [_jsxs(Box, { ref: newSessionCursorRef, height: 1, flexShrink: 0, overflow: "hidden", children: [_jsx(Text, { color: cardFocused ? 'success' : 'subtle', children: cardFocused ? '❯ ' : '  ' }), _jsx(Text, { color: cardFocused ? 'success' : undefined, bold: cardFocused, children: t('supervisor-new-session') })] }), _jsx(Box, { height: 1, flexShrink: 0, overflow: "hidden", children: _jsx(Text, { dimColor: true, children: `  ${truncateWidth(t('supervisor-new-session-hint', { name: selected?.title ?? t('supervisor-title') }), Math.max(8, sessionWidth - 3))}` }) })] }), _jsxs("ink-box", { style: { flexDirection: 'column', flexGrow: 1, flexShrink: 1, overflow: 'hidden' }, onMouseEnter: () => setFilterFocused(false), onWheel: (event) => {
+                                    setFilterFocused(false);
                                     moveSession(event.deltaY >= 0 ? 1 : -1);
                                 }, children: [loading && _jsx(Text, { dimColor: true, italic: true, children: ` ${truncateWidth(t('home-sessions-loading'), sessionWidth - 2)}` }), !loading && visibleSessions.length === 0 && (_jsx(Text, { dimColor: true, italic: true, children: ` ${truncateWidth(filtered ? t('supervisor-no-matches') : t('home-no-sessions'), sessionWidth - 2)}` })), visibleSessionRows.map((session, index) => {
                                         const state = liveStateOf(session.id);
                                         const holder = holderOf(session.id);
-                                        return (_jsx(SessionListRow, { session: session, width: sessionWidth, depth: 0, focused: activePane === 'list' && sessionTop + index + 1 === sessionIndex, pinned: pins.has(session.id), now: now, liveStatus: state?.live === true ? state.status : undefined, current: state?.current === true, occupiedPid: holder, spinner: { frame: spinnerFrame, time: spinnerTime }, onClick: (event) => {
+                                        return (_jsx(SessionListRow, { session: session, width: sessionWidth, depth: 0, focused: activePane === 'list' && sessionTop + index + 1 === sessionIndex, declareCursor: cursorActive && !searchCursor, pinned: pins.has(session.id), now: now, liveStatus: state?.live === true ? state.status : undefined, current: state?.current === true, occupiedPid: holder, spinner: { frame: spinnerFrame, time: spinnerTime }, onClick: (event) => {
                                                 event.stopImmediatePropagation();
                                                 setFocusSessionId(session.id);
                                                 openSession(session);
                                             }, onTogglePin: () => {
+                                                setFilterFocused(false);
                                                 setFocusSessionId(session.id);
                                                 persistPin(session.id, !pins.has(session.id));
                                             }, onContextMenu: (event) => {

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

@@ -1 +1 @@
-{"version":3,"file":"Settings.d.ts","sourceRoot":"","sources":["../../../src/screens/Settings.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAczB,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAgZ3E;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,QAAQ,CAAC,EACvB,OAAO,EACP,OAAO,GACR,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB,GAAG,KAAK,CAAC,SAAS,CA0uBlB"}
+{"version":3,"file":"Settings.d.ts","sourceRoot":"","sources":["../../../src/screens/Settings.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAczB,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAgZ3E;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,QAAQ,CAAC,EACvB,OAAO,EACP,OAAO,GACR,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB,GAAG,KAAK,CAAC,SAAS,CA+uBlB"}

package/lib/types/screens/Settings.js

@@ -234,6 +234,7 @@ export function Settings({ channel, onClose, }) {
     formsRef.current = forms;
     const refresh = () => {
         setNamespaces(host?.listNamespaces() ?? []);
+        setSections(channel.settingsSections());
     };
     // Secret fields report only configured/unconfigured; resolve each ref once
     // per section-list change (and after every save, which may have set one).
@@ -574,6 +575,12 @@ export function Settings({ channel, onClose, }) {
         const badges = [];
         if (view === undefined)
             badges.push({ text: t('settings-section-unavailable'), color: 'warning' });
+        // A fault in the document itself: the broken-file badge names the backup
+        // the first save made, so the original settings stay findable.
+        if (view?.warning?.id === 'unreadable')
+            badges.push({ text: t('settings-badge-unreadable'), color: 'warning' });
+        if (view?.warning?.id === 'recovered')
+            badges.push({ text: t('settings-badge-recovered', { backup: view.warning.backup }), color: 'warning' });
         if (view?.applies === 'restart')
             badges.push({ text: t('settings-badge-restart'), color: 'warning' });
         if (shell?.dirty === true)

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

@@ -1 +1 @@
-{"version":3,"file":"StatusLine.d.ts","sourceRoot":"","sources":["../../../src/screens/StatusLine.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,EAAoC,KAAK,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AASxG,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAC3E,kEAAkE;AAClE;wEACwE;AACxE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAKvG;AAuBD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AA4HvD,wBAAgB,UAAU,CAAC,EACzB,OAAO,EACP,eAAuB,EACvB,QAAgB,EAChB,WAAW,EACX,WAAW,EACX,YAAY,EACZ,IAAI,EACJ,QAAQ,EAAE,iBAAiB,GAC5B,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;;;;;;;;+EAU2E;IAC3E,WAAW,CAAC,EAAE;QACZ,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;QACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;QACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAA;KAC5B,CAAA;IACD;;;;0EAIsE;IACtE,WAAW,CAAC,EAAE;QACZ,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAA;KAC5B,CAAA;IACD;;uEAEmE;IACnE,YAAY,CAAC,EAAE;QACb,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAA;KAC5B,CAAA;IACD;kFAC8E;IAC9E,QAAQ,CAAC,EAAE,iBAAiB,CAAA;IAC5B;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE;QACL,IAAI,EAAE,QAAQ,CAAA;QACd,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,IAAI,EAAE,MAAM,CAAA;QACZ,8DAA8D;QAC9D,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;QACnB,2DAA2D;QAC3D,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,CAAA;CACF,qBAifA;AAED,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,gEAAgE;IAChE,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAgSD,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAKvF;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EACL;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GACzD,SAAS,GACZ,MAAM,GAAG,SAAS,CAIpB"}
+{"version":3,"file":"StatusLine.d.ts","sourceRoot":"","sources":["../../../src/screens/StatusLine.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,EAAoC,KAAK,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AASxG,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAC3E,kEAAkE;AAClE;wEACwE;AACxE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAKvG;AAyBD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AA4HvD,wBAAgB,UAAU,CAAC,EACzB,OAAO,EACP,eAAuB,EACvB,QAAgB,EAChB,WAAW,EACX,WAAW,EACX,YAAY,EACZ,IAAI,EACJ,QAAQ,EAAE,iBAAiB,GAC5B,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;;;;;;;;+EAU2E;IAC3E,WAAW,CAAC,EAAE;QACZ,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;QACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;QACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAA;KAC5B,CAAA;IACD;;;;0EAIsE;IACtE,WAAW,CAAC,EAAE;QACZ,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAA;KAC5B,CAAA;IACD;;uEAEmE;IACnE,YAAY,CAAC,EAAE;QACb,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAA;KAC5B,CAAA;IACD;kFAC8E;IAC9E,QAAQ,CAAC,EAAE,iBAAiB,CAAA;IAC5B;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE;QACL,IAAI,EAAE,QAAQ,CAAA;QACd,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,IAAI,EAAE,MAAM,CAAA;QACZ,8DAA8D;QAC9D,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;QACnB,2DAA2D;QAC3D,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,CAAA;CACF,qBA2fA;AAED,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,gEAAgE;IAChE,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AA2SD,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAKvF;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EACL;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GACzD,SAAS,GACZ,MAAM,GAAG,SAAS,CAIpB"}

package/lib/types/screens/StatusLine.js

@@ -32,7 +32,7 @@ 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 { USED_SEGMENTS, channelContextOccupancy, contextBarBreakdown, contextBarSegmentColors, renderMiniContextBar, renderTpsGauge, renderTpsSparkline, speedColor, tpsStats, } from './StatusMetrics.js';
+import { USED_SEGMENTS, channelContextOccupancy, attributeBarTokens, barSegments, 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
@@ -251,7 +251,16 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
             id: 'jobs',
             node: (_jsxs(Text, { color: "toolDotTask", children: ['● ', liveJobs.length] })),
         };
+    // The placeholder's backend is still opening: say so up front, so the
+    // frame drawn before DSH's synchronous load is not a silent one.
+    const startingPart = channel.ready === false && channel.startupFailure === undefined
+        ? {
+            key: 'starting',
+            node: _jsx(Text, { color: "warning", children: t('status-starting', { backend: channel.backendCapabilities?.backendLabel ?? 'DSH' }) }),
+        }
+        : undefined;
     const leftFields = [
+        ...(startingPart !== undefined ? [startingPart] : []),
         ...(statusBar.model
             ? [{ key: 'model', id: 'model', ...(modelPicker === undefined ? {} : { onClick: modelPicker.onOpen }), node: _jsx(Text, { color: "inactiveShimmer", children: channel.modelDisplay ?? channel.model }) }]
             : []),
@@ -378,8 +387,8 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
     // (the v0.8.0 paddingX 2→1 tightening left the old `columns - 4` stale).
     const barWidth = columns - 2;
     // 空段的深色兜底：deepseek 档冷灰、claude 档暖墨（品牌档见 branding.ts）。
-    // 明暗问色板而不是比主题名：浅色主题不一定叫 `light`（用户/插件色板也可以是
-    // 浅色），只有真彩/ANSI 的深色默认档才需要显式的 free 段色。
+    // 明暗问色板而不是比主题名：浅色主题不一定叫 `light`（pink-day、用户/插件
+    // 色板也可以是浅色），只有真彩/ANSI 的深色默认档才需要显式的 free 段色。
     const barColors = isLightThemeActive(themeName)
         ? undefined
         : getActiveBrand() === 'claude'
@@ -415,7 +424,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: 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] }) }));
+    return (_jsx(Box, { paddingX: 1, width: columns, flexShrink: 0, children: _jsxs(Box, { flexDirection: "column", width: "100%", children: [barVisible ? (_jsx(ContextBarView, { segments: channel.contextSegments, breakdown: channel.contextBreakdown, 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
@@ -446,8 +455,10 @@ function buildHoverDetail(hover, channel, occupancy, usage, columns, barColors,
         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, { used: usedColors, freeFill: barColors?.freeFill });
+        // every entry leads with a chip of the very color it names, and the numbers
+        // are the shares the fills above were drawn from — attributed to the
+        // occupancy, so five entries plus `free` make up the window.
+        const { entries, separator } = contextBarBreakdown(attributeBarTokens(barSegments(channel.contextSegments, channel.contextBreakdown), contextUsed), 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))) }));
@@ -460,7 +471,13 @@ function buildHoverDetail(hover, channel, occupancy, usage, columns, barColors,
             // The hover payoff for the ctx ask: percent + counts + free, then the
             // segment breakdown as the truncate-able tail (no bar — the row's
             // in-place morph and the segment bar above already carry the gauge).
-            const segments = USED_SEGMENTS.map(segment => `${segment.labels[1] ?? segment.key} ${formatTokens(channel.contextSegments[segment.key])}`).join(' · ');
+            // Match the bar's attributed shares, including its measured-used
+            // fallback when no content category can be attributed.
+            const sizes = attributeBarTokens(barSegments(channel.contextSegments, channel.contextBreakdown), contextUsed);
+            const hasComposition = USED_SEGMENTS.some(segment => sizes[segment.key] > 0);
+            const segments = hasComposition
+                ? USED_SEGMENTS.map(segment => `${segment.labels[1] ?? segment.key} ${formatTokens(sizes[segment.key])}`).join(' · ')
+                : `${t('context-bar-used')} ${formatTokens(contextUsed)}`;
             return (_jsxs(Text, { wrap: "truncate", children: [((contextUsed / window) * 100).toFixed(1), "% \u00B7", ' ', formatTokens(contextUsed), "/", formatTokens(window), " \u00B7 ", dim('free '), formatTokens(free), ' · ', segments] }));
         }
         case 'mode': {

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

@@ -9,7 +9,7 @@
  */
 import type { Color } from '../ink/styles.js';
 import type { Theme } from '../theme.js';
-import type { ContextOccupancy } from '../adapter/ports/channel-view.js';
+import type { ContextBreakdown, ContextOccupancy } from '../adapter/ports/channel-view.js';
 /**
  * The occupancy reading a screen renders.
  *
@@ -118,6 +118,51 @@ export declare function contextBarReadout(usedTokens: number, contextWindow: num
  * JSX bar (ContextBarView) so both render identical readouts.
  */
 export declare function rightAlignBarText(options: readonly string[], width: number): string;
+/**
+ * The five fills' weights, in bar order — the composition the bar is drawn
+ * from: the meter's `contextBreakdown` joined with the estimates that stay
+ * useful for the part it does not break down.
+ *
+ * DSH's meter prices the composition it can see (`contextBreakdown`: the system
+ * prompt, the newest request ENVELOPE's tool schemas, and every other visible
+ * surface node, injected context included). This app's own `segments` estimates
+ * are what remains useful for the part the meter does not break down: the
+ * message side, where only the transcript distinguishes a human prompt from
+ * assistant text, reasoning and tool results. The join is therefore:
+ *
+ *  - `system` ← the meter's `systemTokens`;
+ *  - `tools` ← the meter's `toolsTokens` (the tool SCHEMAS, which no transcript
+ *    estimate can see) plus this app's tool-RESULT estimate;
+ *  - `prompt`/`assistant`/`thinking` ← the meter's `messageTokens` shared in the
+ *    proportions the estimates report.
+ *
+ * One weight set feeds every reader of the composition: the bar's own column
+ * split (`contextBarColumns`, which the hoverable twin calls too) and the hover
+ * legend (`contextBarBreakdown`), so the numbers under the pointer describe the
+ * fills above them.
+ *
+ * Without a meter value this is the estimates alone — the pre-existing
+ * behavior — and the bar spans whatever the occupancy says regardless, since
+ * the weights only divide a span the occupancy already fixed.
+ * @param segments - Used tokens per content type (this app's estimates).
+ * @param breakdown - The meter's composition, when the harness publishes one.
+ * @returns One weight per used fill, in bar order.
+ */
+export declare function barSegments(segments: ContextSegments, breakdown: ContextBreakdown | undefined): ContextSegments;
+/**
+ * Attribute the composition's weights to the one authoritative token total:
+ * largest remainders, integers that sum EXACTLY to it, so the hover legend's
+ * numbers add up to the reading beside them instead of reporting a second,
+ * unrelated total.
+ *
+ * All-zero weights — no composition known at all — attribute nothing: the bar
+ * paints its measured span as one `unclassified` block, so the legend names
+ * that block as measured `used` rather than inventing five equal slices.
+ * @param weights - The composition's weights, one per used fill.
+ * @param total - Tokens to attribute (the occupancy numerator).
+ * @returns Integer weights summing to `total` (all zero for a non-positive total).
+ */
+export declare function attributeBarTokens(weights: ContextSegments, total: number): ContextSegments;
 /** One entry of the context bar's hover breakdown: the fill color, the name
  *  to put next to a swatch of it, and the token count already folded into
  *  `label` (`system 1.2k`). */

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

@@ -1 +1 @@
-{"version":3,"file":"StatusMetrics.d.ts","sourceRoot":"","sources":["../../../src/screens/StatusMetrics.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AAMxE;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAC/C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAA;IACxD,QAAQ,CAAC,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAA;IACzF,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;CAC3C,GAAG,gBAAgB,GAAG,SAAS,CAK/B;AAED;;;;;;;;;;;uCAWuC;AACvC,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;EAMhB,CAAA;AA0CV;;kCAEkC;AAClC,wBAAgB,gBAAgB,CAAC,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAAG,KAAK,CAQ9E;AAED;;;;;yCAKyC;AACzC,wBAAgB,uBAAuB,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,SAAS,KAAK,EAAE,CAEvE;AAED,kFAAkF;AAClF,wBAAgB,mBAAmB,CAAC,MAAM,CAAC,EAAE,SAAS,KAAK,EAAE,GAAG,KAAK,CAGpE;AAED,mGAAmG;AACnG,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAA;AAEnF;;sDAEsD;AACtD,eAAO,MAAM,iBAAiB,YAAY,CAAA;AAC1C,eAAO,MAAM,iBAAiB,YAAY,CAAA;AAiB1C;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAOlD;AAQD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAIhF;AAID;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,SAAS,MAAM,EAAE,CAGnB;AAID;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,KAAK,EAAE,MAAM,GACZ,MAAM,CAYR;AAsBD;;+BAE+B;AAC/B,MAAM,MAAM,wBAAwB,GAAG;IACrC,qCAAqC;IACrC,GAAG,EAAE,MAAM,CAAA;IACX,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAA;IACb;uDACmD;IACnD,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,6EAA6E;AAC7E,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,OAAO,EAAE,SAAS,wBAAwB,EAAE,CAAA;IACrD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAC3B,CAAA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,SAAS,KAAK,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,KAAK,CAAA;CAAE,GACrD,mBAAmB,CAoErB;AA6BD,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAkBrF;AAED,mFAAmF;AACnF,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,eAAe,EACzB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,GACZ;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAYxD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,eAAe,EACzB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC9C,MAAM,CAqBR;AAID;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAG/D;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,KAAK,SAAK,GACT,MAAM,CAaR;AAYD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAG5D;AAYD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAYhE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,SAAS;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,EAAE,GAAG,MAAM,CAqB9E;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG;IACxF,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;CACZ,CAUA"}
+{"version":3,"file":"StatusMetrics.d.ts","sourceRoot":"","sources":["../../../src/screens/StatusMetrics.ts"],"names":[],"mappings":"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"}

package/lib/types/screens/StatusMetrics.js

@@ -205,6 +205,78 @@ function renderFreeSegment(options, width, fill, style) {
         return '';
     return background(fill, style(rightAlignBarText(options, width)));
 }
+/**
+ * The five fills' weights, in bar order — the composition the bar is drawn
+ * from: the meter's `contextBreakdown` joined with the estimates that stay
+ * useful for the part it does not break down.
+ *
+ * DSH's meter prices the composition it can see (`contextBreakdown`: the system
+ * prompt, the newest request ENVELOPE's tool schemas, and every other visible
+ * surface node, injected context included). This app's own `segments` estimates
+ * are what remains useful for the part the meter does not break down: the
+ * message side, where only the transcript distinguishes a human prompt from
+ * assistant text, reasoning and tool results. The join is therefore:
+ *
+ *  - `system` ← the meter's `systemTokens`;
+ *  - `tools` ← the meter's `toolsTokens` (the tool SCHEMAS, which no transcript
+ *    estimate can see) plus this app's tool-RESULT estimate;
+ *  - `prompt`/`assistant`/`thinking` ← the meter's `messageTokens` shared in the
+ *    proportions the estimates report.
+ *
+ * One weight set feeds every reader of the composition: the bar's own column
+ * split (`contextBarColumns`, which the hoverable twin calls too) and the hover
+ * legend (`contextBarBreakdown`), so the numbers under the pointer describe the
+ * fills above them.
+ *
+ * Without a meter value this is the estimates alone — the pre-existing
+ * behavior — and the bar spans whatever the occupancy says regardless, since
+ * the weights only divide a span the occupancy already fixed.
+ * @param segments - Used tokens per content type (this app's estimates).
+ * @param breakdown - The meter's composition, when the harness publishes one.
+ * @returns One weight per used fill, in bar order.
+ */
+export function barSegments(segments, breakdown) {
+    if (breakdown === undefined)
+        return segments;
+    const promptEst = Math.max(0, segments.prompt ?? 0);
+    const assistantEst = Math.max(0, segments.assistant ?? 0);
+    const thinkingEst = Math.max(0, segments.thinking ?? 0);
+    const toolsEst = Math.max(0, segments.tools ?? 0);
+    const estimatedMessages = promptEst + assistantEst + thinkingEst + toolsEst;
+    // No estimates to share it in (a partial channel literal, or the frame before
+    // a replay folds): the message side stays unattributed rather than invented.
+    const scale = estimatedMessages > 0
+        ? Math.max(0, breakdown.messageTokens) / estimatedMessages
+        : 0;
+    return {
+        system: Math.max(0, breakdown.systemTokens),
+        prompt: promptEst * scale,
+        assistant: assistantEst * scale,
+        thinking: thinkingEst * scale,
+        tools: Math.max(0, breakdown.toolsTokens) + toolsEst * scale,
+    };
+}
+/**
+ * Attribute the composition's weights to the one authoritative token total:
+ * largest remainders, integers that sum EXACTLY to it, so the hover legend's
+ * numbers add up to the reading beside them instead of reporting a second,
+ * unrelated total.
+ *
+ * All-zero weights — no composition known at all — attribute nothing: the bar
+ * paints its measured span as one `unclassified` block, so the legend names
+ * that block as measured `used` rather than inventing five equal slices.
+ * @param weights - The composition's weights, one per used fill.
+ * @param total - Tokens to attribute (the occupancy numerator).
+ * @returns Integer weights summing to `total` (all zero for a non-positive total).
+ */
+export function attributeBarTokens(weights, total) {
+    const budget = Math.max(0, Math.round(total));
+    const values = USED_SEGMENTS.map(segment => Math.max(0, weights[segment.key] ?? 0));
+    const attributed = values.reduce((sum, value) => sum + value, 0) <= 0
+        ? values.map(() => 0)
+        : allocateProportionally(values, budget);
+    return Object.fromEntries(USED_SEGMENTS.map((segment, index) => [segment.key, attributed[index] ?? 0]));
+}
 /**
  * The context bar's hover breakdown — the legend the bar no longer carries
  * itself. Local content estimates come first, measured free space last. When

package/lib/types/screens/chat/useKernelPicker.d.ts

@@ -1,11 +1,14 @@
 import React from 'react';
 import type { ChannelUi } from '../../adapter/ports/channel-ui.js';
-import { type KernelStatus } from '../../components/kernelCatalog.js';
-import { type KernelBackendId } from '../../kernelPrefs.js';
+import { type KernelEntry, type KernelOption, type KernelStatus } from '../../components/kernelCatalog.js';
+import type { KernelBackendId } from '../../kernelPrefs.js';
 import type { ChatOverlayAction } from '../chatOverlay.js';
-export declare function useKernelPicker({ channel, kernelVersion, launchpadShown, onProbeKernels, onSwitchBackend, canInstallSdk, dispatchOverlay }: {
+export declare function useKernelPicker({ channel, kernelVersion, kernelEntries, launchpadShown, onProbeKernels, onSwitchBackend, canInstallSdk, dispatchOverlay }: {
     channel: ChannelUi;
     kernelVersion: string | undefined;
+    /** The host's registry projection, in picker order (P0: the UI renders the
+     *  entry list it is handed and never imports the registry). */
+    kernelEntries: readonly KernelEntry[];
     launchpadShown: boolean;
     onProbeKernels: (() => Promise<Record<string, KernelStatus>>) | undefined;
     onSwitchBackend: ((id: KernelBackendId) => void) | undefined;
@@ -15,9 +18,10 @@ export declare function useKernelPicker({ channel, kernelVersion, launchpadShown
     dispatchOverlay: React.Dispatch<ChatOverlayAction>;
 }): {
     currentId: string;
-    options: readonly import("../../components/kernelCatalog.js").KernelOption[];
+    options: readonly KernelOption[];
     open: (index?: number) => void;
     pick: (index: number) => void;
+    pickById: (id: string) => Promise<void>;
     reprobe: () => void;
 };
 //# sourceMappingURL=useKernelPicker.d.ts.map

package/lib/types/screens/chat/useKernelPicker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useKernelPicker.d.ts","sourceRoot":"","sources":["../../../../src/screens/chat/useKernelPicker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAA;AAClE,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAGzF,OAAO,EAAc,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,wBAAgB,eAAe,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE;IAC3I,OAAO,EAAE,SAAS,CAAA;IAClB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,cAAc,EAAE,OAAO,CAAA;IACvB,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;IACzE,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,eAAe,KAAK,IAAI,CAAC,GAAG,SAAS,CAAA;IAC5D;2EACuE;IACvE,aAAa,EAAE,OAAO,CAAA;IACtB,eAAe,EAAE,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA;CACnD;;;mBA4ByC,MAAM,KAAG,IAAI;kBAIhC,MAAM,KAAG,IAAI;mBAlBI,IAAI;EAiD3C"}
+{"version":3,"file":"useKernelPicker.d.ts","sourceRoot":"","sources":["../../../../src/screens/chat/useKernelPicker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAA;AAClE,OAAO,EAAsB,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAG9H,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,wBAAgB,eAAe,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE;IAC1J,OAAO,EAAE,SAAS,CAAA;IAClB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC;mEAC+D;IAC/D,aAAa,EAAE,SAAS,WAAW,EAAE,CAAA;IACrC,cAAc,EAAE,OAAO,CAAA;IACvB,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;IACzE,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,eAAe,KAAK,IAAI,CAAC,GAAG,SAAS,CAAA;IAC5D;2EACuE;IACvE,aAAa,EAAE,OAAO,CAAA;IACtB,eAAe,EAAE,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA;CACnD;;;mBAkCyC,MAAM,KAAG,IAAI;kBA8ChC,MAAM,KAAG,IAAI;mBAIN,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;mBAjEZ,IAAI;EAoF3C"}

package/lib/types/screens/chat/useKernelPicker.js

@@ -2,50 +2,66 @@ import React from 'react';
 import { buildKernelCatalog } from '../../components/kernelCatalog.js';
 import { WORKING_GATE_NOTICES } from '../../commands.js';
 import { t } from '../../i18n.js';
-import { KERNEL_IDS } from '../../kernelPrefs.js';
-export function useKernelPicker({ channel, kernelVersion, launchpadShown, onProbeKernels, onSwitchBackend, canInstallSdk, dispatchOverlay }) {
+export function useKernelPicker({ channel, kernelVersion, kernelEntries, launchpadShown, onProbeKernels, onSwitchBackend, canInstallSdk, dispatchOverlay }) {
     const currentId = channel.backendCapabilities?.backendId ?? 'dsh';
     const [probe, setProbe] = React.useState(undefined);
-    const probeStarted = React.useRef(false);
+    const probeRequest = React.useRef(undefined);
+    const pendingPick = React.useRef(0);
+    React.useEffect(() => () => { pendingPick.current += 1; }, []);
     const requestProbe = React.useCallback(() => {
-        if (probeStarted.current || onProbeKernels === undefined)
-            return;
-        probeStarted.current = true;
-        void onProbeKernels().then(setProbe).catch(() => {
-            setProbe(Object.fromEntries(KERNEL_IDS.map(id => [id, { installed: false }])));
+        if (probeRequest.current !== undefined || onProbeKernels === undefined)
+            return probeRequest.current;
+        probeRequest.current = onProbeKernels().catch(() => {
+            // A failed probe leaves every optional backend "not installed" rather than
+            // "checking" forever; dsh needs no status (it is always available).
+            return Object.fromEntries(kernelEntries.map(entry => [entry.id, { installed: false }]));
         });
-    }, [onProbeKernels]);
+        void probeRequest.current.then(setProbe);
+        return probeRequest.current;
+    }, [onProbeKernels, kernelEntries]);
     /** Force a fresh probe (the once-guard stays for the automatic paths): the
      *  SDK install wizard calls this after a successful install so the dim
      *  row lights up without a process restart. */
     const reprobe = React.useCallback(() => {
-        probeStarted.current = false;
-        requestProbe();
+        probeRequest.current = undefined;
+        void requestProbe();
     }, [requestProbe]);
     const options = React.useMemo(() => buildKernelCatalog({
         current: currentId,
+        entries: kernelEntries,
         ...(kernelVersion === undefined ? {} : { dshVersion: kernelVersion }),
         ...(probe === undefined ? {} : { statuses: probe }),
         canInstallSdk,
-    }), [currentId, kernelVersion, probe, canInstallSdk]);
+    }), [currentId, kernelEntries, kernelVersion, probe, canInstallSdk]);
     React.useEffect(() => {
         if (launchpadShown)
-            requestProbe();
+            void requestProbe();
     }, [launchpadShown, requestProbe]);
     const currentIndex = Math.max(0, options.findIndex(option => option.current));
     const open = React.useCallback((index) => {
-        requestProbe();
+        pendingPick.current += 1;
+        void requestProbe();
         dispatchOverlay({ type: 'open', overlay: { kind: 'kernel', index: index ?? currentIndex } });
     }, [currentIndex, requestProbe, dispatchOverlay]);
-    const pick = (index) => {
-        const option = options[index];
-        if (option === undefined)
+    const pickOption = (option, wasWorking = channel.working) => {
+        if (option === undefined) {
+            channel.notify(t('kernel-switch-unavailable'), { color: 'warning' });
             return;
+        }
         if (!option.selectable) {
             if (option.installable === true) {
                 // The installable row opens the wizard instead of a dead-end toast;
-                // the wizard owns its own keys (Enter/Esc) from here on.
-                dispatchOverlay({ type: 'open', overlay: { kind: 'sdk-install' } });
+                // the wizard owns its own keys (Enter/Esc) from here on. It carries the
+                // row's id: the surface the wizard acts on is looked up per backend at
+                // open time, not assumed (Stage B / §6 item 12).
+                dispatchOverlay({
+                    type: 'open',
+                    overlay: {
+                        kind: 'sdk-install',
+                        backendId: option.id,
+                        ...(option.hint === undefined ? {} : { foundCli: option.hint }),
+                    },
+                });
                 return;
             }
             // Detection's own guidance (how to install or upgrade) beats the bare reason.
@@ -61,12 +77,36 @@ export function useKernelPicker({ channel, kernelVersion, launchpadShown, onProb
             channel.notify(t('kernel-switch-unavailable'), { color: 'warning' });
             return;
         }
-        if (channel.working) {
+        if (wasWorking || channel.working) {
             channel.notify(t(WORKING_GATE_NOTICES.kernel), { color: 'warning' });
             return;
         }
         dispatchOverlay({ type: 'close' });
         onSwitchBackend(option.id);
     };
-    return { currentId, options, open, pick, reprobe };
+    const pick = (index) => {
+        pendingPick.current += 1;
+        if (options[index] !== undefined)
+            pickOption(options[index]);
+    };
+    const pickById = async (id) => {
+        const generation = ++pendingPick.current;
+        const wasWorking = channel.working;
+        let option = options.find(option => option.id === id);
+        if (option?.reasonKey === 'kernel-probing') {
+            const statuses = await requestProbe();
+            // A newer pick, opening the picker, or unmounting cancels a waiting shortcut.
+            if (generation !== pendingPick.current)
+                return;
+            option = buildKernelCatalog({
+                current: channel.backendCapabilities?.backendId ?? 'dsh',
+                entries: kernelEntries,
+                dshVersion: kernelVersion,
+                statuses,
+                canInstallSdk,
+            }).find(option => option.id === id);
+        }
+        pickOption(option, wasWorking);
+    };
+    return { currentId, options, open, pick, pickById, reprobe };
 }