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

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

@@ -3,6 +3,7 @@ import { SpinnerGlyph } from '../components/Spinner/SpinnerGlyph.js';
 import type { ApprovalSnapshot } from '../dsh-adapter/approvals.js';
 import type { TuiWorkspaceTarget } from '../workspaces.js';
 import type { ChannelUi as Channel } from '../adapter/channel/ui-policy.js';
+import type { ResumeResult } from '../adapter/ports/channel-view.js';
 import { SupervisorLiveState, sessionMatchesQuery } from './sessionSupervisor/model.js';
 export { sessionMatchesQuery };
 /**
@@ -40,7 +41,7 @@ export declare function SessionSupervisor({ channel, home, onClose, onOpenSessio
     /** Leave the screen and show the conversation. */
     onClose(): void;
     /** Mount a persisted session (the channel's unified resume path). */
-    onOpenSession(sessionId: string): Promise<boolean>;
+    onOpenSession(sessionId: string): Promise<ResumeResult>;
     /** Start a fresh session in the workspace at `path`. */
     onNewSession(target: TuiWorkspaceTarget): Promise<boolean>;
     /** Stop a background session of this terminal; false when it is not ours. */

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

@@ -1 +1 @@
-{"version":3,"file":"SessionSupervisor.d.ts","sourceRoot":"","sources":["../../../src/screens/SessionSupervisor.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiD,MAAM,OAAO,CAAA;AAarE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AAEpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AASnE,OAAO,KAAK,EAAqB,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAC7E,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAE3E,OAAO,EAAkN,mBAAmB,EAAsD,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAC3V,OAAO,EAAE,mBAAmB,EAAE,CAAA;AAE9B;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,OAAO,EACP,IAAI,EACJ,OAAO,EACP,aAAa,EACb,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,mDAAmD;IACnD,IAAI,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,OAAO,IAAI,IAAI,CAAA;IACf,qEAAqE;IACrE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAClD,wDAAwD;IACxD,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC1D,6EAA6E;IAC7E,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAClD;;;;OAIG;IACH,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAA;IACjC,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU,GAAG,IAAI,CAAA;IACrD;;;;OAIG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAAA;CAChE,GAAG,KAAK,CAAC,SAAS,CA8hBlB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAOzF;AAED,+EAA+E;AAC/E,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"SessionSupervisor.d.ts","sourceRoot":"","sources":["../../../src/screens/SessionSupervisor.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiD,MAAM,OAAO,CAAA;AAarE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AAEpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AASnE,OAAO,KAAK,EAAqB,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAC7E,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAC3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAMpE,OAAO,EAAkN,mBAAmB,EAAsD,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAC3V,OAAO,EAAE,mBAAmB,EAAE,CAAA;AAE9B;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,OAAO,EACP,IAAI,EACJ,OAAO,EACP,aAAa,EACb,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,mDAAmD;IACnD,IAAI,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,OAAO,IAAI,IAAI,CAAA;IACf,qEAAqE;IACrE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IACvD,wDAAwD;IACxD,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC1D,6EAA6E;IAC7E,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAClD;;;;OAIG;IACH,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAA;IACjC,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU,GAAG,IAAI,CAAA;IACrD;;;;OAIG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAAA;CAChE,GAAG,KAAK,CAAC,SAAS,CA2tBlB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAOzF;AAED,+EAA+E;AAC/E,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/lib/types/screens/SessionSupervisor.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React from 'react';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { Box, Text, useInput, useTerminalSize } from '../ui.js';
 import { t } from '../i18n.js';
 import { Divider } from '../components/design-system/Divider.js';
@@ -15,6 +15,10 @@ import { useAnimationFrame } from '../ink/hooks/use-animation-frame.js';
 import { isPlainReturn, isMod } from '../utils/modifiers.js';
 import { truncateWidth } from '../sessions/format.js';
 import { useSessionSupervisor } from './sessionSupervisor/useSessionSupervisor.js';
+import { DSH_TAB, useForeignSessions } from './sessionSupervisor/useForeignSessions.js';
+import { ForeignSessionPanes } from './sessionSupervisor/ForeignSessionPanes.js';
+import { SourceTabs, layoutSourceTabs, sourceTabsWidth } from '../components/sessions/SourceTabs.js';
+import { stringWidth } from '../ink/stringWidth.js';
 import { SESSION_ROW_LINES, MENU_ACTIONS, MENU_WIDTH, MENU_HEIGHT, MENU_LABEL_KEYS, samePath, sessionMatchesQuery } from './sessionSupervisor/model.js';
 export { sessionMatchesQuery };
 /**
@@ -49,7 +53,54 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
     const { columns, rows } = useTerminalSize();
     const inset = React.useContext(PageInsetContext);
     const isTerminalFocused = useTerminalFocus();
-    const { entries, sessions, loading, notice, setNotice, query, setQuery, holderOf, listedSessions, railEntries, countOf, railFocus, setRailFocus, setFocusSessionId, activePane, pins, menu, setMenu, rename, setRename, confirmRemove, setConfirmRemove, railRef, menuRef, queryRef, now, reload, selected, visibleSessions, sessionIndex, cardFocused, sessionAt, activateList, activateRail, railWidth, railVisible, sessionWidth, railEntryCapacity, sessionListHeight, persistPin, selectEntry, openSession, newSessionIn, renameEntry, removeEntry, stopSession, closeMenu, activateMenu, moveRail, moveSession, focusedSession, } = useSessionSupervisor({ channel, home, onOpenSession, onNewSession, onStopSession, liveStateOf, columns, rows });
+    const { entries, sessions, loading, refreshing, notice, setNotice, query, setQuery, holderOf, listedSessions, railEntries, countOf, railFocus, setRailFocus, setFocusSessionId, activePane, pins, menu, setMenu, rename, setRename, confirmRemove, setConfirmRemove, railRef, menuRef, queryRef, now, reload, selected, visibleSessions, sessionIndex, cardFocused, sessionAt, activateList, activateRail, railWidth, railVisible, sessionWidth, railEntryCapacity, sessionListHeight, noticeRows, persistPin, selectEntry, openSession, newSessionIn, renameEntry, removeEntry, stopSession, closeMenu, activateMenu, moveRail, moveSession, focusedSession, } = useSessionSupervisor({ channel, home, onOpenSession, onNewSession, onStopSession, liveStateOf, columns, rows });
+    /**
+     * The source tab: this screen's own sessions ({@link DSH_TAB}) or another
+     * coding agent's, by agent id. Every open starts on DSH — the screen is
+     * where you manage your sessions first, and a foreign tab is a place you
+     * visit.
+     */
+    const [tab, setTab] = useState(DSH_TAB);
+    /** The `+N` dropdown of folded tabs, anchored where it was clicked. */
+    const [tabMenu, setTabMenu] = useState(undefined);
+    const tabMenuRef = useRef(tabMenu);
+    tabMenuRef.current = tabMenu;
+    const foreign = useForeignSessions({ channel, tab, registry: entries, query, setNotice, onOpenSession });
+    /**
+     * Only sources with data get a tab, after DSH, in a fixed order: ranking
+     * them by recency would mean stat-ing every conversation of every source
+     * each time this screen opens.
+     */
+    const tabs = useMemo(() => {
+        if (foreign.sources.length === 0)
+            return [];
+        return [{ id: DSH_TAB, label: 'DSH' }, ...foreign.sources.map(source => ({ id: source.agentId, label: source.label }))];
+    }, [foreign.sources]);
+    const activeSource = foreign.sources.find(source => source.agentId === tab);
+    // A source that vanished on refresh takes its tab with it; land on DSH
+    // rather than on a tab the strip no longer draws.
+    React.useEffect(() => {
+        if (tab !== DSH_TAB && activeSource === undefined)
+            setTab(DSH_TAB);
+    }, [tab, activeSource]);
+    const closeTabMenu = useCallback(() => {
+        tabMenuRef.current = undefined;
+        setTabMenu(undefined);
+    }, []);
+    /** Switch source. The query and notice belong to the tab they were made on. */
+    const switchTab = useCallback((id) => {
+        closeMenu();
+        closeTabMenu();
+        setQuery('');
+        setNotice(undefined);
+        setTab(id);
+    }, [closeMenu, closeTabMenu, setQuery, setNotice]);
+    const cycleTab = useCallback((by) => {
+        if (tabs.length < 2)
+            return;
+        const index = Math.max(0, tabs.findIndex(candidate => candidate.id === tab));
+        switchTab(tabs[(index + by + tabs.length) % tabs.length].id);
+    }, [tabs, tab, switchTab]);
     useInput((input, key) => {
         // Modal layers own the keyboard, in the same order they render.
         if (rename !== undefined) {
@@ -109,6 +160,26 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
             }
             return;
         }
+        if (tabMenuRef.current !== undefined) {
+            const current = tabMenuRef.current;
+            const count = Math.max(1, tabLayout.hidden.length);
+            if (key.upArrow || key.downArrow) {
+                const next = { ...current, item: (current.item + (key.upArrow ? count - 1 : 1)) % count };
+                tabMenuRef.current = next;
+                setTabMenu(next);
+            }
+            else if (isPlainReturn(key)) {
+                const target = tabLayout.hidden[current.item];
+                if (target !== undefined)
+                    switchTab(target.id);
+                else
+                    closeTabMenu();
+            }
+            else {
+                closeTabMenu();
+            }
+            return;
+        }
         if (key.escape) {
             if (notice !== undefined) {
                 setNotice(undefined);
@@ -122,17 +193,14 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
             return;
         }
         if (key.tab) {
-            // Shift+Tab keeps the keyboard route to the focused workspace's action
-            // menu. Plain Tab does nothing here: panes are chosen with ←/→ now, and
-            // Tab is the composer's business.
-            if (key.shift && activePane === 'rail') {
-                const entry = railEntries[railRef.current];
-                if (entry !== undefined) {
-                    const next = { path: entry.path, ...keyboardMenuAnchor, item: 0 };
-                    menuRef.current = next;
-                    setMenu(next);
-                }
-            }
+            // Tab / Shift+Tab walk the source tabs. Shift+Tab used to open the
+            // focused workspace's menu, which Enter on the rail already does, so
+            // the route was given up to the tabs.
+            cycleTab(key.shift ? -1 : 1);
+            return;
+        }
+        if (tab !== DSH_TAB) {
+            foreignKey(input, key);
             return;
         }
         // ←/→ choose the column. There is exactly one `❯` on screen because exactly
@@ -235,6 +303,67 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
     const workingCount = listedSessions.filter(session => liveStateOf(session.id)?.status === 'working').length;
     const [, spinnerTime] = useAnimationFrame(workingCount > 0 ? 120 : null);
     const spinnerFrame = Math.floor(spinnerTime / 120);
+    /**
+     * Keys on a source tab: the same pane model as DSH (←/→ pick the column,
+     * ↑/↓ move, typing filters), with what a foreign source cannot do left out —
+     * no workspace menu, no new session, no stop — and Ctrl+L rescanning the
+     * source instead of re-listing.
+     */
+    function foreignKey(input, key) {
+        if (key.leftArrow) {
+            foreign.activateRail();
+            return;
+        }
+        if (key.rightArrow) {
+            foreign.activateList();
+            return;
+        }
+        const by = key.upArrow || key.wheelUp || key.pageUp ? -1 : key.downArrow || key.wheelDown || key.pageDown ? 1 : 0;
+        if (by !== 0) {
+            if (foreign.pane === 'rail')
+                foreign.moveRail(by);
+            else
+                foreign.moveList(by);
+            return;
+        }
+        if (key.backspace || key.delete) {
+            setQuery(text => text.slice(0, -1));
+            return;
+        }
+        if (isMod(key) && input === 'l') {
+            foreign.rescan();
+            return;
+        }
+        if (isMod(key))
+            return;
+        if (isPlainReturn(key)) {
+            // The rail has no menu here, so Enter on it steps into the list.
+            if (foreign.pane === 'rail')
+                foreign.activateList();
+            else if (foreign.focusedRow !== undefined)
+                foreign.openRow(foreign.focusedRow);
+            return;
+        }
+        if (!key.meta && !key.super && input && !key.return) {
+            const typed = input.replace(/\p{Cc}/gu, '');
+            if (typed.length > 0)
+                setQuery(text => text + typed);
+        }
+    }
+    // Header: title, subtitle, and the source strip on the right. Width runs
+    // out in a fixed order — the subtitle goes first, then trailing tabs fold
+    // into `+N`; the active tab never folds.
+    const titleText = ` ▣ ${t('supervisor-title')}`;
+    const subtitleText = `  ${t('supervisor-subtitle')}`;
+    /** One column between title and strip, one after the strip. */
+    const HEADER_GAPS = 2;
+    const fullStrip = tabs.length === 0 ? 0 : sourceTabsWidth(tabs, 0, DSH_TAB);
+    const showSubtitle = tabs.length === 0
+        || stringWidth(titleText) + stringWidth(subtitleText) + HEADER_GAPS + fullStrip <= columns;
+    const tabBudget = columns - stringWidth(titleText) - (showSubtitle ? stringWidth(subtitleText) : 0) - HEADER_GAPS;
+    const tabLayout = layoutSourceTabs(tabs, tab, tabBudget);
+    const tabMenuWidth = Math.max(12, ...tabLayout.hidden.map(hidden => stringWidth(hidden.label) + 6));
+    const withTabHint = (text) => (tabs.length === 0 ? text : `${text} · ${t('supervisor-hint-tabs')}`);
     const railHint = rename !== undefined
         ? t('home-hint-rename')
         : confirmRemove !== undefined
@@ -242,8 +371,8 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
             : menu !== undefined
                 ? t('home-hint-menu')
                 : activePane === 'rail'
-                    ? t('home-hint-list')
-                    : t('supervisor-hint-list');
+                    ? withTabHint(t('home-hint-list'))
+                    : withTabHint(t('supervisor-hint-list'));
     const railWindowTopIndex = railWindowTop(railFocus, railEntries.length, railEntryCapacity);
     const visibleRailRows = railEntries.slice(railWindowTopIndex, railWindowTopIndex + railEntryCapacity);
     /** Content-local anchor for a keyboard-opened menu (screen coords minus inset). */
@@ -263,7 +392,12 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
         sessionTop = Math.max(0, sessionIndex - 1);
     const visibleSessionRows = visibleSessions.slice(sessionTop, sessionTop + sessionCapacity);
     const liveCount = listedSessions.filter(session => liveStateOf(session.id)?.live === true).length;
-    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, onClick: menu !== undefined ? closeMenu : undefined, children: [_jsxs(Box, { height: 1, flexShrink: 0, overflow: "hidden", children: [_jsx(Text, { color: "remember", bold: true, children: ` ▣ ${t('supervisor-title')}` }), _jsx(Text, { dimColor: true, children: `  ${t('supervisor-subtitle')}` })] }), _jsx(Divider, { bleed: true }), _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) => {
+    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, onClick: menu !== undefined ? closeMenu : tabMenu !== undefined ? closeTabMenu : undefined, children: [_jsxs(Box, { height: 1, flexShrink: 0, overflow: "hidden", children: [_jsxs(Box, { flexGrow: 1, flexShrink: 1, overflow: "hidden", children: [_jsx(Text, { color: "remember", bold: true, children: titleText }), showSubtitle && _jsx(Text, { dimColor: true, children: subtitleText })] }), tabs.length > 0 && (_jsx(Box, { flexShrink: 0, marginRight: 1, children: _jsx(SourceTabs, { layout: tabLayout, active: tab, leadId: DSH_TAB, onSelect: switchTab, onOverflow: (event) => {
+                                closeMenu();
+                                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) => {
                             moveRail(event.deltaY >= 0 ? 1 : -1);
                         }, children: [_jsx(Box, { height: 1, flexShrink: 0, overflow: "hidden", paddingX: 1, children: _jsx(Text, { dimColor: true, children: truncateWidth(t('home-section-workspaces', { n: railEntries.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);
@@ -280,7 +414,7 @@ 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 }), 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: 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) => {
                                     event.stopImmediatePropagation();
                                     if (selected !== undefined)
                                         newSessionIn(selected);
@@ -305,7 +439,7 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
                                                 menuRef.current = next;
                                                 setMenu(next);
                                             } }, session.id));
-                                    })] }), _jsx(Box, { flexShrink: 0, height: 1, overflow: "hidden", children: _jsx(Text, { color: notice?.tone === 'error' ? 'error' : 'success', children: notice === undefined ? ' ' : ` ${truncateWidth(notice.text, Math.max(0, sessionWidth - 3))}` }) }), _jsx(Box, { flexShrink: 0, children: _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: filtered ? t('supervisor-hint-filter') : t('supervisor-hint-list') }) }) })] })] }), rename !== undefined && (_jsx(Box, { height: 1, flexShrink: 0, children: _jsx(SearchBox, { query: rename.draft, isFocused: true, isTerminalFocused: isTerminalFocused, placeholder: t('home-rename-placeholder'), prefix: "\u270E", borderless: true, width: "100%" }) })), confirmRemove !== undefined && (_jsx(Box, { flexShrink: 0, paddingX: 1, onClick: () => {
+                                    })] }), _jsx(Box, { flexShrink: 0, flexDirection: "column", height: noticeRows.length, overflow: "hidden", children: noticeRows.map((line, index) => (_jsx(Text, { color: notice?.tone === 'error' ? 'error' : 'success', children: ` ${line}` }, index))) }), _jsx(Box, { flexShrink: 0, children: _jsx(Text, { dimColor: true, italic: true, children: _jsx(HintLine, { text: filtered ? t('supervisor-hint-filter') : withTabHint(t('supervisor-hint-list')) }) }) })] })] })), rename !== undefined && (_jsx(Box, { height: 1, flexShrink: 0, children: _jsx(SearchBox, { query: rename.draft, isFocused: true, isTerminalFocused: isTerminalFocused, placeholder: t('home-rename-placeholder'), prefix: "\u270E", borderless: true, width: "100%" }) })), confirmRemove !== undefined && (_jsx(Box, { flexShrink: 0, paddingX: 1, onClick: () => {
                     const path = confirmRemove;
                     setConfirmRemove(undefined);
                     removeEntry(path);
@@ -314,7 +448,10 @@ export function SessionSupervisor({ channel, home, onClose, onOpenSession, onNew
                         const entry = railEntries.find(candidate => samePath(candidate.path, menu.path));
                         if (entry !== undefined)
                             activateMenu(entry, index);
-                    }, children: _jsx(Text, { color: action === 'remove' ? 'error' : undefined, children: ` ${index === menu.item ? '❯' : ' '} ${t(MENU_LABEL_KEYS[action])}` }) }, action))) })), approval !== null && (_jsx(Box, { flexShrink: 0, flexDirection: "column", position: "absolute", bottom: 1, left: 0, width: columns, children: _jsx(ApprovalPanel, { approval: approval, background: approval.agentId !== channel.agentId, onDecide: onApprove }) }))] }));
+                    }, children: _jsx(Text, { color: action === 'remove' ? 'error' : undefined, children: ` ${index === menu.item ? '❯' : ' '} ${t(MENU_LABEL_KEYS[action])}` }) }, action))) })), tabMenu !== undefined && tabLayout.hidden.length > 0 && (_jsx(Box, { position: "absolute", left: Math.max(0, Math.min(tabMenu.col - inset.x - tabMenuWidth + 2, Math.max(0, columns - tabMenuWidth))), top: Math.max(0, Math.min(tabMenu.row - inset.y + 1, Math.max(0, rows - tabLayout.hidden.length - 2))), width: tabMenuWidth, height: tabLayout.hidden.length + 2, flexDirection: "column", flexShrink: 0, borderStyle: "round", borderColor: "permission", backgroundColor: "toolCardBackground", children: tabLayout.hidden.map((hidden, index) => (_jsx(Box, { height: 1, flexShrink: 0, backgroundColor: index === tabMenu.item ? 'userMessageBackgroundHover' : undefined, onMouseEnter: () => setTabMenu(current => (current === undefined ? current : { ...current, item: index })), onClick: (event) => {
+                        event.stopImmediatePropagation();
+                        switchTab(hidden.id);
+                    }, children: _jsx(Text, { children: truncateWidth(` ${index === tabMenu.item ? '❯' : ' '} ${hidden.label}`, tabMenuWidth - 2) }) }, hidden.id))) })), approval !== null && (_jsx(Box, { flexShrink: 0, flexDirection: "column", position: "absolute", bottom: 1, left: 0, width: columns, children: _jsx(ApprovalPanel, { approval: approval, background: approval.agentId !== channel.agentId, onDecide: onApprove }) }))] }));
 }
 /**
  * Scroll anchor for the rail: the first entry index to show.

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;AAuP3E;;;;;;;;;;;;;;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,CAojBlB"}
+{"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;AAkS3E;;;;;;;;;;;;;;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,CAikBlB"}

package/lib/types/screens/Settings.js

@@ -9,6 +9,25 @@ import { stringWidth } from '../ink/stringWidth.js';
 import { POINTER, TICK, MULTIPLICATION_X } from '../terminal-utils/figures.js';
 import { getLang, t } from '../i18n.js';
 import { SettingsForm } from '../dsh-adapter/settingsEditor.js';
+function rootRowsFor(section) {
+    const rows = section.fields
+        .filter(field => field.group === undefined)
+        .map(field => ({ kind: 'field', field }));
+    for (const group of section.groups ?? []) {
+        if (group.mode === 'inline') {
+            const fields = section.fields.filter(field => field.group === group.id);
+            if (fields.length === 0)
+                continue;
+            rows.push({ kind: 'header', group });
+            for (const field of fields)
+                rows.push({ kind: 'field', field });
+        }
+        else {
+            rows.push({ kind: 'page', group });
+        }
+    }
+    return rows;
+}
 /** Pick the provider-owned translation for the active language. */
 function pick(text, descriptions) {
     return descriptions?.[getLang()] ?? text;
@@ -41,6 +60,15 @@ function FieldRow({ label, kind, value, selectLabel, focused, editing, invalid,
 function GroupRow({ title, focused, onClick, onMouseEnter, }) {
     return (_jsxs(Box, { flexDirection: "row", height: 1, flexShrink: 0, overflow: "hidden", onClick: onClick, onMouseEnter: onMouseEnter, children: [_jsx(Text, { color: focused ? 'suggestion' : undefined, children: focused ? padTo(POINTER, 2) : '  ' }), _jsx(Text, { bold: focused, children: title }), _jsx(Box, { flexGrow: 1 }), _jsx(Text, { color: focused ? 'suggestion' : 'subtle', children: '›' })] }));
 }
+/**
+ * A non-focusable topic header on the root page — the inline twin of
+ * GroupRow: it names the run of fields below it instead of hiding them
+ * on a subpage. One line, dim, indented to the label column so the rows
+ * below keep their pointer gutter and value chips aligned.
+ */
+function GroupHeaderRow({ title }) {
+    return (_jsx(Box, { flexDirection: "row", height: 1, flexShrink: 0, overflow: "hidden", children: _jsxs(Text, { dimColor: true, children: ['  ', title] }) }));
+}
 /** 区块卡片的边框色（沿用输入框的 panel 边框 token）。 */
 const CARD_BORDER = 'promptBorder';
 /**
@@ -175,12 +203,13 @@ export function Settings({ channel, onClose, }) {
         ? activeSection.fields
             .filter(field => field.group === activeGroupSpec.id)
             .map(field => ({ kind: 'field', ns: activeSection.ns, field }))
-        : sections.flatMap(section => [
-            ...section.fields
-                .filter(field => field.group === undefined)
-                .map(field => ({ kind: 'field', ns: section.ns, field })),
-            ...(section.groups ?? []).map(group => ({ kind: 'group', ns: section.ns, group })),
-        ]);
+        : sections.flatMap(section => rootRowsFor(section).flatMap((row) => {
+            if (row.kind === 'field')
+                return [{ kind: 'field', ns: section.ns, field: row.field }];
+            if (row.kind === 'page')
+                return [{ kind: 'group', ns: section.ns, group: row.group }];
+            return [];
+        }));
     const effFocus = Math.min(focusIndex, Math.max(0, focusable.length - 1));
     const focused = focusable.length === 0 ? undefined : focusable[effFocus];
     /**
@@ -465,11 +494,20 @@ export function Settings({ channel, onClose, }) {
                 lines: 1,
                 node: (_jsx(CardTop, { title: pick(section.title, section.descriptions), subtitle: section.ns, badges: sectionBadges(section), columns: columns })),
             });
-            for (const field of section.fields) {
-                if (field.group === undefined)
-                    addField(section, field);
-            }
-            for (const group of section.groups ?? []) {
+            for (const row of rootRowsFor(section)) {
+                if (row.kind === 'header') {
+                    entries.push({
+                        key: `header:${section.ns}:${row.group.id}`,
+                        lines: 1,
+                        node: (_jsx(CardRow, { children: _jsx(GroupHeaderRow, { title: pick(row.group.title, row.group.descriptions) }) })),
+                    });
+                    continue;
+                }
+                if (row.kind === 'field') {
+                    addField(section, row.field);
+                    continue;
+                }
+                const group = row.group;
                 const isFocused = focused?.kind === 'group' && focused.ns === section.ns && focused.group === group;
                 const index = focusCursor;
                 focusCursor += 1;

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

@@ -1,10 +1,14 @@
 import React from 'react';
+import { type ActivityLineValue } from '../components/ActivityLine.js';
 import type { ChannelUi as Channel } from '../adapter/channel/ui-policy.js';
 import type { WaveBand } from '../dsh-adapter/types.js';
-export declare function StatusLine({ channel, selectionActive, helpOpen, wake, }: {
+export declare function StatusLine({ channel, selectionActive, helpOpen, wake, activity: projectedActivity, }: {
     channel: Channel;
     selectionActive?: boolean;
     helpOpen?: boolean;
+    /** Activity value published by the working-activity plugin for this session.
+     *  Preferred over the channel's own copy when the composition provides it. */
+    activity?: ActivityLineValue;
     /**
      * The session projected onto the status line's few columns, plus the
      * animation tick and the self-retiring key hint.

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;AAczB,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAkB3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAqHvD,wBAAgB,UAAU,CAAC,EACzB,OAAO,EACP,eAAuB,EACvB,QAAgB,EAChB,IAAI,GACL,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CACvD,qBA8ZA;AAED,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AA4KD,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;AAOzB,OAAO,EAAoC,KAAK,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAOxG,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAqB3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAqHvD,wBAAgB,UAAU,CAAC,EACzB,OAAO,EACP,eAAuB,EACvB,QAAgB,EAChB,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;kFAC8E;IAC9E,QAAQ,CAAC,EAAE,iBAAiB,CAAA;IAC5B;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CACvD,qBA+aA;AAED,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AA0LD,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

@@ -4,13 +4,16 @@ import { Box, Text, useTerminalSize, useTheme } from '../ui.js';
 import { formatTokens } from '../terminal-utils/format.js';
 import { t } from '../i18n.js';
 import { formatContextUsage, DEFAULT_STATUS_BAR, normalizeStatusBar } from '../tuiDisplayPrefs.js';
-import { estimateSessionCostCny, estimateSessionCostSplitCny, isDeepSeekOfficialProvider, isPeakHour } from '../deepseekPricing.js';
+import { estimateSessionCostSnapshotCny, isDeepSeekOfficialProvider, isPeakHour } from '../deepseekPricing.js';
 import { ActivityLine, contextPressurePct } from '../components/ActivityLine.js';
 import { GoalStatusChip } from '../components/GoalTodoPanel.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 兼容）。 */
+const NO_MAIN_COST = {};
+const NO_SUBAGENT_COST = [];
 import { modeDisplayName } from '../sessionModes.js';
 import { MiniWake } from '../components/trajectory/MiniWake.js';
 import { ContextBarView } from '../components/ContextBarView.js';
@@ -69,7 +72,7 @@ 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))) }));
 }
-export function StatusLine({ channel, selectionActive = false, helpOpen = false, wake, }) {
+export function StatusLine({ channel, selectionActive = false, helpOpen = false, wake, activity: projectedActivity, }) {
     const { columns } = useTerminalSize();
     const [themeName] = useTheme();
     const [hover, setHover] = React.useState(null);
@@ -212,20 +215,32 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
                     node: (_jsxs(Text, { color: "inactiveShimmer", children: [formatTokens(channel.tokens.input), "\u2192", formatTokens(channel.tokens.output)] })),
                 }]
             : []),
-        // Estimated session spend (≈¥): only for official DeepSeek providers
-        // whose model has a known price, and only once the estimate is non-zero
-        // (a fresh session showing ¥0.00 is noise). The trailing 峰/谷 marker
-        // shows the current billing window. Hover shows the breakdown.
+        // Estimated session spend (≈¥): only for official DeepSeek providers.
+        // Visible once there is a priced amount or at least one unpriced token (a
+        // fresh, fully priced zero session keeps hiding ¥0.00 as noise; unpriced
+        // usage still needs the 未计价 marker). The estimate merges the main
+        // session (by model) with the subagents' own durable usage, so delegating
+        // 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)
             ? (() => {
-                const estimate = estimateSessionCostCny(channel.tokens, channel.model);
-                return estimate === undefined || estimate <= 0
-                    ? []
-                    : [{
+                const estimate = estimateSessionCostSnapshotCny({
+                    provider: channel.provider,
+                    main: channel.mainCost ?? NO_MAIN_COST,
+                    subagents: channel.subagentCost ?? NO_SUBAGENT_COST,
+                    fallbackTokens: channel.tokens,
+                    fallbackModel: channel.model,
+                });
+                return estimate !== undefined && (estimate.total > 0 || estimate.unpricedTokens > 0)
+                    ? [{
                             key: 'cost',
                             id: 'cost',
-                            node: (_jsxs(Text, { color: "inactiveShimmer", children: [t('status-cost-label'), "\u00A5", estimate.toFixed(2), " ", t(isPeakHour() ? 'cost-now-peak' : 'cost-now-idle')] })),
-                        }];
+                            node: (_jsxs(Text, { color: "inactiveShimmer", children: [t('status-cost-label'), estimate.total > 0
+                                        ? _jsxs(_Fragment, { children: ["\u00A5", estimate.total.toFixed(2), " ", t(isPeakHour() ? 'cost-now-peak' : 'cost-now-idle')] })
+                                        : _jsxs(_Fragment, { children: [" ", t('cost-unpriced', { tokens: formatTokens(estimate.unpricedTokens) })] })] })),
+                        }]
+                    : [];
             })()
             : []),
     ];
@@ -291,14 +306,18 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
             : statusBar.shortcutHint && !helpOpen
                 ? t('statusline-hint-shortcuts')
                 : '';
-    const activity = channel.workingActivity;
+    const activity = projectedActivity;
     const showActivity = statusBar.activity &&
         !channel.working &&
         activity !== undefined &&
         activity.line !== '' &&
         activity.phase !== 'idle';
     const showTrajectory = statusBar.trajectory && wake !== undefined;
-    const barWidth = columns - 4;
+    // The root Box below paints paddingX={1} inside width={columns}, so the
+    // content area is `columns - 2` cells wide — size the bar from the same
+    // 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'
         ? undefined
         : { freeFill: '#2E3440', freeText: '#8D95A6' };
@@ -384,11 +403,22 @@ function buildHoverDetail(hover, channel, usage, contextUsed, columns, barColors
             return (_jsxs(Text, { wrap: "truncate", children: [dim('in '), input.toLocaleString(), " \u00B7 ", dim('out '), output.toLocaleString(), " \u00B7", ' ', dim('total '), (input + output).toLocaleString()] }));
         }
         case 'cost': {
-            const split = estimateSessionCostSplitCny(channel.tokens, channel.model);
-            if (split === undefined)
+            const estimate = estimateSessionCostSnapshotCny({
+                provider: channel.provider,
+                main: channel.mainCost ?? NO_MAIN_COST,
+                subagents: channel.subagentCost ?? NO_SUBAGENT_COST,
+                fallbackTokens: channel.tokens,
+                fallbackModel: channel.model,
+            });
+            // Same visibility contract as the field: a priced amount or unpriced
+            // tokens (with the 未计价 row) both warrant the breakdown; the old
+            // total>0 gate hid the only explanation for an all-unpriced session.
+            if (estimate === undefined || (estimate.total <= 0 && estimate.unpricedTokens <= 0))
                 return null;
             const { input, output, cacheRead } = channel.tokens;
-            return (_jsxs(Text, { wrap: "truncate", children: [dim('≈¥'), split.total.toFixed(2), " \u00B7 ", dim('peak '), "\u00A5", split.peak.toFixed(2), ' · ', dim('idle '), "\u00A5", split.idle.toFixed(2), " \u00B7 ", dim('in '), formatTokens(input), ' · ', dim('out '), formatTokens(output), " \u00B7 ", dim('cache '), formatTokens(cacheRead), ' · ', t('status-cost-note')] }));
+            return (_jsxs(Text, { wrap: "truncate", children: [dim('≈¥'), estimate.total.toFixed(2), " \u00B7 ", dim('peak '), "\u00A5", estimate.peak.toFixed(2), ' · ', dim('idle '), "\u00A5", estimate.idle.toFixed(2), " \u00B7 ", dim('in '), formatTokens(input), ' · ', dim('out '), formatTokens(output), " \u00B7 ", dim('cache '), formatTokens(cacheRead), ' · ', t('cost-split-main', { cost: estimate.main.toFixed(2) }), ' · ', t('cost-split-subagent', { cost: estimate.subagent.toFixed(2) }), estimate.unpricedTokens > 0
+                        ? _jsxs(_Fragment, { children: [' · ', t('cost-unpriced', { tokens: formatTokens(estimate.unpricedTokens) })] })
+                        : null, ' · ', t('status-cost-note')] }));
         }
         case 'goal': {
             const goal = channel.goal;

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

@@ -66,6 +66,11 @@ export type ChatOverlay = {
 } | {
     kind: 'skills';
     index: number;
+} | {
+    kind: 'migrate';
+    index: number;
+} | {
+    kind: 'migrate-confirm';
 } | {
     kind: 'activity';
     index: number;

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

@@ -1 +1 @@
-{"version":3,"file":"chatOverlay.d.ts","sourceRoot":"","sources":["../../../src/screens/chatOverlay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAClF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AACvE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAA;AAEjE,mEAAmE;AACnE,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,yBAAyB,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,CAAA;AAE1F,8EAA8E;AAC9E,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC3C;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACzC;IACE,IAAI,EAAE,gBAAgB,CAAA;IACtB,IAAI,EAAE,oBAAoB,CAAA;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAAA;CACjC,GACD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,wBAAwB,CAAA;CAAE,GACzE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjE;IACE,IAAI,EAAE,QAAQ,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;IACvB,KAAK,EAAE,SAAS,aAAa,EAAE,GAAG,IAAI,CAAA;IACtC,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,OAAO,CAAA;CACd,GAID;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE;AAClB;;;;;;GAMG;GACD;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE;AACvE;;;;;;;GAOG;GACD;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,eAAe,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAC9D,OAAO,CAAC,EAAE,SAAS;QAAE,KAAK,EAAE,eAAe,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAEvF,eAAO,MAAM,UAAU,EAAE,WAA8B,CAAA;AAEvD,MAAM,MAAM,iBAAiB;AAC3B,mEAAmE;AACjE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE;AACxC,gFAAgF;GAC9E;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE;AACnB,8EAA8E;GAC5E;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;CAAE;AACvC;oEACoE;GAClE;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE;AACjD;;;;;;GAMG;GACD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,SAAS,WAAW,CAAC,MAAM,CAAC,EAAE,CAAA;CAAE;AACjF;;;;;GAKG;GACD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE;AAChD;;;oDAGoD;GAClD;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,YAAY,GAAG,gBAAgB,GAAG,QAAQ,GAAG,cAAc,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE;AACzI,wEAAwE;GACtE;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE;AAC3E,4EAA4E;GAC1E;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE;AACtC,2EAA2E;GACzE;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAAA;CAAE;AAC1D,0DAA0D;GACxD;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE;AAC5D,sEAAsE;GACpE;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE;AACxC;;wEAEwE;GACtE;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,SAAS,aAAa,EAAE,GAAG,IAAI,CAAA;CAAE;AACvF,0EAA0E;GACxE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAA;AAE3B;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAI7E;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,iBAAiB,GAAG,WAAW,CAoF7F;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE;IACL,oBAAoB,EAAE,MAAM,CAAA;IAC5B,iBAAiB,EAAE,MAAM,CAAA;IACzB,iBAAiB,EAAE,MAAM,CAAA;CAC1B,GACA,OAAO,CAmBT"}
+{"version":3,"file":"chatOverlay.d.ts","sourceRoot":"","sources":["../../../src/screens/chatOverlay.ts"],"names":[],"mappings":"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"}

package/lib/types/screens/chatOverlay.js

@@ -50,6 +50,7 @@ export function chatOverlayReducer(state, action) {
                 || state.kind === 'workspace-flow'
                 || state.kind === 'model'
                 || state.kind === 'skills'
+                || state.kind === 'migrate'
                 || state.kind === 'activity'
                 || state.kind === 'color'
                 || state.kind === 'effort'

package/lib/types/screens/sessionSupervisor/ForeignSessionPanes.d.ts

@@ -0,0 +1,47 @@
+import React from 'react';
+import type { ForeignSessionsModel } from './useForeignSessions.js';
+/**
+ * Chrome the right pane of a source tab spends outside its rows: the screen
+ * header and divider, the pane banner, the filter, the notice and the hints.
+ * Two rows fewer than the DSH pane, which also carries the new-session card.
+ */
+export declare const FOREIGN_PANE_CHROME_ROWS = 6;
+/**
+ * First visible row of a scroll window that keeps `focus` on screen, the same
+ * anchoring the DSH list uses.
+ * @param focus - Cursor index.
+ * @param total - Rows in the list.
+ * @param capacity - Rows the window shows.
+ * @returns Index of the first row to draw.
+ */
+export declare function windowTop(focus: number, total: number, capacity: number): number;
+/**
+ * The two panes of a source tab: the source's directories on the left, the
+ * conversations of the selected one on the right.
+ *
+ * Presentational only; every value and action comes from
+ * {@link ForeignSessionsModel}. The shape follows the DSH panes on purpose so
+ * the tabs read as one screen, with what a foreign source cannot do removed:
+ * no workspace menu (the rail is derived, not a ledger), no new-session card,
+ * no live state and no pins.
+ */
+export declare function ForeignSessionPanes({ model, sourceLabel, home, now, query, notice, railVisible, railWidth, railEntryCapacity, sessionWidth, rows, isTerminalFocused, }: {
+    model: ForeignSessionsModel;
+    /** The active source's display name. */
+    sourceLabel: string;
+    home: string;
+    now: number;
+    query: string;
+    notice: {
+        text: string;
+        tone: 'info' | 'error';
+    } | undefined;
+    railVisible: boolean;
+    railWidth: number;
+    railEntryCapacity: number;
+    sessionWidth: number;
+    /** Terminal rows of the whole screen. */
+    rows: number;
+    isTerminalFocused: boolean;
+}): React.ReactNode;
+//# sourceMappingURL=ForeignSessionPanes.d.ts.map