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

package/lib/types/components/questions/AskUserQuestionPanel.js

@@ -34,10 +34,14 @@ import { POINTER } from '../../terminal-utils/figures.js';
 import { PlanReviewPanel } from './PlanReviewPanel.js';
 import { QuestionMinimizedBar } from './QuestionMinimizedBar.js';
 import { isPlainReturnInput } from '../../utils/modifiers.js';
-import { actionMatches, effectiveComboDisplay } from '../../utils/keymap.js';
+import { actionMatches, comboDisplay, effectiveComboDisplay, primaryComboString } from '../../utils/keymap.js';
 import { flattenPasteInline } from '../../dsh-adapter/sanitize.js';
 import { readClipboard } from '../../utils/clipboard.js';
 import { listWindow } from '../listWindow.js';
+/** Unmodified arrows switch questions; Ctrl/Alt/Super/Shift stay caret motion. */
+function isPlainArrow(key) {
+    return key.ctrl !== true && key.meta !== true && key.super !== true && key.shift !== true;
+}
 const CHECKED = '◉';
 const UNCHECKED = '○';
 const PENCIL = '✎';
@@ -51,7 +55,7 @@ const PENCIL = '✎';
  * PlanReviewPanel (the two panels share the same input contract).
  */
 const ANSWER_PASTE_MAX_POINTS = 8000;
-export function AskUserQuestionPanel({ question, position, total, answered, initialDraft, onAnswer, onCancel, onBack, readClipboardOverride, collapsed = false, onExpand, onToggleFold, fullscreen = false, }) {
+export function AskUserQuestionPanel({ question, position, total, answered, initialDraft, onAnswer, onCancel, onEscape, onBack, onForward, readClipboardOverride, collapsed = false, onExpand, onToggleFold, fullscreen = false, }) {
     // Plan-mode's exit_plan_mode ask carries a presentation intent: render
     // the plan decision card instead of the generic questionnaire. The
     // branch precedes every hook so hook order stays stable per remount key.
@@ -79,6 +83,11 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
         : selectedIndices[0] ?? 0;
     const [focusIndex, setFocusIndex] = React.useState(initialFocus);
     const [checked, setChecked] = React.useState(() => new Set(multiSelect ? selectedIndices : []));
+    // Same stdin batch, same closure: Space / ↑ / ↓ must be visible to a
+    // following → before React commits. Refs are the draft source; state
+    // only repaints.
+    const focusRef = React.useRef(initialFocus);
+    const checkedRef = React.useRef(new Set(multiSelect ? selectedIndices : []));
     const [customText, setCustomText] = React.useState(initialCustom);
     const [customCursor, setCustomCursor] = React.useState(() => [...initialCustom].length);
     // Synchronous source of truth for the handlers (see the module header):
@@ -105,6 +114,28 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
     /** Single-select label captured by typing on a focused option — submitted
      *  together with the custom text when the input row itself is Entered. */
     const [attached, setAttached] = React.useState(() => initialCustom !== '' && !multiSelect ? (initialSelected[0] ?? null) : null);
+    const attachedRef = React.useRef(initialCustom !== '' && !multiSelect ? (initialSelected[0] ?? null) : null);
+    const placeFocus = (index) => {
+        focusRef.current = index;
+        setFocusIndex(index);
+    };
+    const placeChecked = (next) => {
+        checkedRef.current = next;
+        setChecked(next);
+    };
+    const toggleCheckedAt = (index) => {
+        const next = new Set(checkedRef.current);
+        if (next.has(index))
+            next.delete(index);
+        else
+            next.add(index);
+        placeChecked(next);
+    };
+    const placeAttached = (value) => {
+        attachedRef.current = value;
+        setAttached(value);
+    };
+    const onInputRow = () => !hideCustomInput && focusRef.current === options.length;
     const [error, setError] = React.useState(null);
     const inputFocused = !hideCustomInput && focusIndex === options.length;
     // Chat chrome + panel scaffolding consume twelve rows before the option
@@ -139,7 +170,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
     const moveFocus = (delta) => {
         if (rowCount <= 1)
             return;
-        setFocusIndex(index => (index + delta + rowCount) % rowCount);
+        placeFocus((focusRef.current + delta + rowCount) % rowCount);
         setError(null);
     };
     /** Append at the text tail (option-row typing has no visible cursor). */
@@ -156,7 +187,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
         points.splice(at - 1, 1);
         const next = points.join('');
         if (next === '')
-            setAttached(null);
+            placeAttached(null);
         applyText(next, at - 1);
     };
     /**
@@ -181,7 +212,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
         points.splice(at, 0, ...text);
         applyText(points.join(''), at + [...text].length);
         if (!atCaret && !multiSelect)
-            setAttached(options[focusIndex]?.label ?? null);
+            placeAttached(options[focusRef.current]?.label ?? null);
         return 'ok';
     };
     /** Inline error for an over-cap paste (shared by both transports). */
@@ -223,7 +254,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
             pasteBusyRef.current = false;
         });
     };
-    const checkedLabels = () => [...checked].sort((a, b) => a - b).map(index => options[index]?.label)
+    const checkedLabels = () => [...checkedRef.current].sort((a, b) => a - b).map(index => options[index]?.label)
         .filter((label) => label !== undefined);
     /** Enter on a real option: the option(s) plus whatever the input row holds. */
     const submitOptions = () => {
@@ -237,7 +268,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
             onAnswer({ selected, ...(text !== '' ? { custom: text } : {}) });
             return;
         }
-        const label = options[focusIndex]?.label;
+        const label = options[focusRef.current]?.label;
         if (label === undefined) {
             setError(t('question-select-or-answer'));
             return;
@@ -261,16 +292,16 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
             setError(t('question-type-answer-first'));
             return;
         }
-        onAnswer({ selected: attached !== null ? [attached] : [], custom: text });
+        onAnswer({ selected: attachedRef.current !== null ? [attachedRef.current] : [], custom: text });
     };
     /** Capture the visible answer state before navigating away. */
     const currentDraft = () => {
         const selected = multiSelect
             ? checkedLabels()
-            : inputFocused
-                ? (attached === null ? [] : [attached])
+            : onInputRow()
+                ? (attachedRef.current === null ? [] : [attachedRef.current])
                 : (() => {
-                    const label = options[focusIndex]?.label;
+                    const label = options[focusRef.current]?.label;
                     return label === undefined ? [] : [label];
                 })();
         return {
@@ -299,7 +330,9 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
             return;
         }
         if (key.escape) {
-            if (onBack !== undefined)
+            if (onEscape !== undefined)
+                onEscape(currentDraft());
+            else if (onBack !== undefined)
                 onBack(currentDraft());
             else
                 onCancel();
@@ -328,7 +361,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
                 pasteFromClipboard();
             return;
         }
-        if (inputFocused) {
+        if (onInputRow()) {
             if (key.upArrow) {
                 moveFocus(-1);
                 return;
@@ -352,17 +385,28 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
                     points.splice(at, 1);
                     const next = points.join('');
                     if (next === '')
-                        setAttached(null);
+                        placeAttached(null);
                     applyText(next, at);
                 }
                 return;
             }
             if (key.leftArrow) {
+                // Plain ← at the start of the answer switches questions; anywhere
+                // else (and modified arrows) stays a caret step.
+                if (isPlainArrow(key) && cursorRef.current === 0 && onBack !== undefined) {
+                    onBack(currentDraft());
+                    return;
+                }
                 applyText(textRef.current, Math.max(0, cursorRef.current - 1));
                 return;
             }
             if (key.rightArrow) {
-                applyText(textRef.current, Math.min([...textRef.current].length, cursorRef.current + 1));
+                const length = [...textRef.current].length;
+                if (isPlainArrow(key) && cursorRef.current >= length && onForward !== undefined) {
+                    onForward(currentDraft());
+                    return;
+                }
+                applyText(textRef.current, Math.min(length, cursorRef.current + 1));
                 return;
             }
             if (key.home) {
@@ -393,20 +437,23 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
             moveFocus(1);
             return;
         }
+        if (key.leftArrow && isPlainArrow(key)) {
+            if (onBack !== undefined)
+                onBack(currentDraft());
+            return;
+        }
+        if (key.rightArrow && isPlainArrow(key)) {
+            if (onForward !== undefined)
+                onForward(currentDraft());
+            return;
+        }
         if (key.tab && !hideCustomInput) {
-            setFocusIndex(options.length);
+            placeFocus(options.length);
             setError(null);
             return;
         }
         if (input === ' ' && multiSelect) {
-            setChecked(previous => {
-                const next = new Set(previous);
-                if (next.has(focusIndex))
-                    next.delete(focusIndex);
-                else
-                    next.add(focusIndex);
-                return next;
-            });
+            toggleCheckedAt(focusRef.current);
             return;
         }
         if (isPlainReturnInput(input, key)) {
@@ -424,7 +471,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
         if (!hideCustomInput && !key.ctrl && !key.meta && !key.super && input) {
             appendText(input);
             if (!multiSelect)
-                setAttached(options[focusIndex]?.label ?? null);
+                placeAttached(options[focusRef.current]?.label ?? null);
         }
     });
     const remaining = total - answered;
@@ -443,7 +490,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
     const focusInputRow = () => {
         if (hideCustomInput)
             return;
-        setFocusIndex(options.length);
+        placeFocus(options.length);
         setError(null);
     };
     /**
@@ -454,14 +501,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
      */
     const clickOption = (index) => {
         if (multiSelect) {
-            setChecked(previous => {
-                const next = new Set(previous);
-                if (next.has(index))
-                    next.delete(index);
-                else
-                    next.add(index);
-                return next;
-            });
+            toggleCheckedAt(index);
             return;
         }
         const label = options[index]?.label;
@@ -475,9 +515,9 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
     const [headerHovered, setHeaderHovered] = React.useState(false);
     /** Mouse submit row hover (multi-select: clicking submits the checked set). */
     const [submitHovered, setSubmitHovered] = React.useState(false);
-    const renderInputRow = () => (_jsxs(Box, { flexDirection: "row", marginTop: inputFocused ? 1 : 0, onClick: focusInputRow, onMouseEnter: () => setHoverIndex(options.length), onMouseLeave: () => setHoverIndex(current => (current === options.length ? -1 : current)), backgroundColor: hoverIndex === options.length && !inputFocused ? 'userMessageBackgroundHover' : undefined, children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: inputFocused ? 'accent' : undefined, bold: inputFocused, children: inputFocused ? POINTER : ' ' }) }), _jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: inputFocused ? 'accent' : 'suggestion', children: PENCIL }) }), _jsxs(Box, { flexDirection: "row", marginLeft: 1, children: [_jsx(Text, { bold: inputFocused, color: inputFocused ? 'accent' : 'suggestion', children: t('question-custom-tab') }), attached !== null && (_jsx(Text, { color: "suggestion", children: t('question-attached-label', { label: attached }) })), _jsx(Text, { dimColor: true, children: "\uFF1A" }), customText === '' && !inputFocused ? (_jsx(Text, { ref: caretRef, dimColor: true, children: t('question-direct-input') })) : (_jsxs(_Fragment, { children: [_jsx(Text, { wrap: "wrap", children: textPoints.slice(0, customCursor).join('') }), inputFocused
+    const renderInputRow = () => (_jsxs(Box, { flexDirection: "row", marginTop: inputFocused ? 1 : 0, onClick: focusInputRow, onMouseEnter: () => setHoverIndex(options.length), onMouseLeave: () => setHoverIndex(current => (current === options.length ? -1 : current)), backgroundColor: hoverIndex === options.length && !inputFocused ? 'userMessageBackgroundHover' : undefined, children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: inputFocused ? 'accent' : undefined, bold: inputFocused, children: inputFocused ? POINTER : ' ' }) }), _jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: inputFocused ? 'accent' : 'suggestion', children: PENCIL }) }), _jsxs(Box, { flexDirection: "row", marginLeft: 1, children: [_jsx(Text, { bold: inputFocused, color: inputFocused ? 'accent' : 'suggestion', children: t('question-custom-tab') }), attached !== null && (_jsx(Text, { color: "suggestion", children: t('question-attached-label', { label: attached }) })), _jsx(Text, { dimColor: true, children: "\uFF1A" }), customText === '' && !inputFocused ? (_jsxs(_Fragment, { children: [_jsx(Text, { ref: caretRef, children: ' ' }), _jsx(Text, { dimColor: true, children: t('question-direct-input') })] })) : (_jsxs(_Fragment, { children: [_jsx(Text, { wrap: "wrap", children: textPoints.slice(0, customCursor).join('') }), inputFocused
                                 ? _jsx(Text, { ref: caretRef, inverse: true, children: cursorChar })
-                                : _jsx(Text, { ref: caretRef, color: "suggestion", children: "\u258F" }), _jsx(Text, { wrap: "wrap", children: textPoints.slice(inputFocused ? customCursor + 1 : customCursor).join('') })] }))] })] }));
+                                : _jsx(Text, { ref: caretRef, children: "\u258F" }), _jsx(Text, { wrap: "wrap", children: textPoints.slice(inputFocused ? customCursor + 1 : customCursor).join('') })] }))] })] }));
     const renderOptions = () => (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [options.slice(optionWindow.start, optionWindow.end).map((option, index) => {
                 const absoluteIndex = optionWindow.start + index;
                 const focused = absoluteIndex === focusIndex;
@@ -498,10 +538,11 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
     const hintParts = inputFocused
         ? [
             t('question-hint-type'),
-            t('question-hint-paste'),
+            t('question-hint-paste', { key: comboDisplay(primaryComboString('paste')) }),
             t('question-hint-enter'),
             ...(options.length > 0 ? [t('question-hint-back')] : []),
             onBack === undefined ? t('question-hint-esc') : t('question-hint-previous'),
+            ...(onBack !== undefined || onForward !== undefined ? [t('question-hint-switch-input')] : []),
             ...(onBack === undefined ? [] : [t('question-hint-cancel')]),
             ...(multiSelect && checked.size > 0 ? [t('question-hint-selected', { n: checked.size })] : []),
             t('question-fold-hint', { combo: foldCombo }),
@@ -509,9 +550,10 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
         : [
             t('question-hint-select'),
             ...(multiSelect ? [t('question-hint-multi')] : []),
-            ...(hideCustomInput ? [] : [t('question-hint-paste'), t('question-hint-attach')]),
+            ...(hideCustomInput ? [] : [t('question-hint-paste', { key: comboDisplay(primaryComboString('paste')) }), t('question-hint-attach')]),
             t('question-hint-enter'),
             onBack === undefined ? t('question-hint-esc') : t('question-hint-previous'),
+            ...(onBack !== undefined || onForward !== undefined ? [t('question-hint-switch')] : []),
             ...(onBack === undefined ? [] : [t('question-hint-cancel')]),
             ...(multiSelect && checked.size > 0 ? [t('question-hint-selected', { n: checked.size })] : []),
             t('question-fold-hint', { combo: foldCombo }),

package/lib/types/components/questions/PlanReviewPanel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PlanReviewPanel.d.ts","sourceRoot":"","sources":["../../../../src/components/questions/PlanReviewPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAIvE,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAa5E,MAAM,MAAM,oBAAoB,GAAG;IACjC,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QAC3F,QAAQ,CAAC,MAAM,CAAC,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;YAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAA;KAC7E,CAAA;IACD,QAAQ,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACzD,iEAAiE;IACjE,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;IAC7B;;;OAGG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAA;CAC9D,CAAA;AAED,wBAAgB,eAAe,CAAC,EAC9B,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,qBAAqB,GACtB,EAAE,oBAAoB,GAAG,KAAK,CAAC,SAAS,CAmZxC"}
+{"version":3,"file":"PlanReviewPanel.d.ts","sourceRoot":"","sources":["../../../../src/components/questions/PlanReviewPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAIvE,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAa5E,MAAM,MAAM,oBAAoB,GAAG;IACjC,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QAC3F,QAAQ,CAAC,MAAM,CAAC,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;YAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAA;KAC7E,CAAA;IACD,QAAQ,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACzD,iEAAiE;IACjE,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;IAC7B;;;OAGG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAA;CAC9D,CAAA;AAED,wBAAgB,eAAe,CAAC,EAC9B,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,qBAAqB,GACtB,EAAE,oBAAoB,GAAG,KAAK,CAAC,SAAS,CA4ZxC"}

package/lib/types/components/questions/PlanReviewPanel.js

@@ -33,7 +33,7 @@ import { Divider } from '../design-system/Divider.js';
 import { Markdown } from '../Markdown.js';
 import { POINTER } from '../../terminal-utils/figures.js';
 import { isPlainReturnInput } from '../../utils/modifiers.js';
-import { actionMatches } from '../../utils/keymap.js';
+import { actionMatches, comboDisplay, primaryComboString } from '../../utils/keymap.js';
 import { flattenPasteInline } from '../../dsh-adapter/sanitize.js';
 import { readClipboard } from '../../utils/clipboard.js';
 const PENCIL = '✎';
@@ -345,7 +345,7 @@ export function PlanReviewPanel({ question, onAnswer, onCancel, readClipboardOve
                         const focused = index === focusIndex;
                         const isApprove = option.label === approveLabel;
                         return (_jsxs(Box, { flexDirection: "row", marginTop: focused ? 1 : 0, onClick: () => clickOption(index), onMouseEnter: () => setHoverIndex(index), onMouseLeave: () => setHoverIndex(current => (current === index ? -1 : current)), backgroundColor: hoverIndex === index && !focused ? 'userMessageBackgroundHover' : undefined, children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: focused ? 'accent' : undefined, bold: focused, children: focused ? POINTER : ' ' }) }), _jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [_jsxs(Text, { bold: focused, color: focused || isApprove ? 'accent' : undefined, wrap: "wrap", children: [index + 1, ". ", option.label] }), option.description !== undefined && (_jsx(Text, { dimColor: true, wrap: "wrap", children: option.description }))] })] }, option.label));
-                    }), _jsxs(Box, { flexDirection: "row", marginTop: inputFocused ? 1 : 0, onClick: focusFeedbackRow, onMouseEnter: () => setHoverIndex(options.length), onMouseLeave: () => setHoverIndex(current => (current === options.length ? -1 : current)), backgroundColor: hoverIndex === options.length && !inputFocused ? 'userMessageBackgroundHover' : undefined, children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: inputFocused ? 'accent' : undefined, bold: inputFocused, children: inputFocused ? POINTER : ' ' }) }), _jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: inputFocused ? 'accent' : 'suggestion', children: PENCIL }) }), _jsx(Box, { flexDirection: "row", marginLeft: 1, children: feedback === '' && !inputFocused ? (_jsx(Text, { ref: caretRef, dimColor: true, children: t('plan-review-feedback-placeholder') })) : (_jsxs(_Fragment, { children: [_jsx(Text, { wrap: "wrap", children: feedbackPoints.slice(0, cursor).join('') }), inputFocused
+                    }), _jsxs(Box, { flexDirection: "row", marginTop: inputFocused ? 1 : 0, onClick: focusFeedbackRow, onMouseEnter: () => setHoverIndex(options.length), onMouseLeave: () => setHoverIndex(current => (current === options.length ? -1 : current)), backgroundColor: hoverIndex === options.length && !inputFocused ? 'userMessageBackgroundHover' : undefined, children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: inputFocused ? 'accent' : undefined, bold: inputFocused, children: inputFocused ? POINTER : ' ' }) }), _jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: inputFocused ? 'accent' : 'suggestion', children: PENCIL }) }), _jsx(Box, { flexDirection: "row", marginLeft: 1, children: feedback === '' && !inputFocused ? (_jsxs(_Fragment, { children: [_jsx(Text, { ref: caretRef, children: ' ' }), _jsx(Text, { dimColor: true, children: t('plan-review-feedback-placeholder') })] })) : (_jsxs(_Fragment, { children: [_jsx(Text, { wrap: "wrap", children: feedbackPoints.slice(0, cursor).join('') }), inputFocused
                                             ? _jsx(Text, { ref: caretRef, inverse: true, children: cursorChar })
-                                            : _jsx(Text, { ref: caretRef, color: "suggestion", children: "\u258F" }), _jsx(Text, { wrap: "wrap", children: feedbackPoints.slice(inputFocused ? cursor + 1 : cursor).join('') })] })) })] })] }), error !== null && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "error", children: error }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('plan-review-hint') }) })] }));
+                                            : _jsx(Text, { ref: caretRef, children: "\u258F" }), _jsx(Text, { wrap: "wrap", children: feedbackPoints.slice(inputFocused ? cursor + 1 : cursor).join('') })] })) })] })] }), error !== null && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "error", children: error }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('plan-review-hint', { paste: comboDisplay(primaryComboString('paste')) }) }) })] }));
 }

package/lib/types/components/sessions/ForeignSessionRow.d.ts

@@ -0,0 +1,34 @@
+import React from 'react';
+import type { ClickEvent } from '../../ink/events/click-event.js';
+import type { ForeignSessionRow as ForeignSessionSummary } from '../../adapter/ports/channel-session.js';
+/**
+ * One conversation of another agent in a source tab: its title, and a facts
+ * line with when it last moved and where it ran.
+ *
+ * It looks like a DSH session row on purpose — the same two lines, the same
+ * `❯`, green selection and blue hover (see SessionListRow) — so the tabs read
+ * as one screen. It is its own component rather than a shared core so the DSH
+ * row stays untouched; the handful of lines below are the whole overlap.
+ *
+ * Deliberately NO import status. Selecting a row imports it on the spot (or
+ * opens the copy an earlier selection made), so "imported or not" is a detail
+ * of the selection, not a fact the user has to read before choosing; showing it
+ * would also invite a sync the feature does not do.
+ *
+ * The working directory rides on the facts line here, unlike the DSH row: the
+ * rail groups by directory, but a search spans every group of the source and
+ * "which project was this" is the question a foreign title answers worst.
+ */
+export declare function ForeignSessionRow({ session, width, focused, home, now, onClick, }: {
+    session: ForeignSessionSummary;
+    /** Columns available to the row. */
+    width: number;
+    focused: boolean;
+    /** Home directory, for collapsing the path to `~`. */
+    home: string;
+    /** Epoch ms used for every relative time in this render pass. */
+    now: number;
+    /** Mouse click: import and open (same path as Enter). */
+    onClick?(event: ClickEvent): void;
+}): React.ReactNode;
+//# sourceMappingURL=ForeignSessionRow.d.ts.map

package/lib/types/components/sessions/ForeignSessionRow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ForeignSessionRow.d.ts","sourceRoot":"","sources":["../../../../src/components/sessions/ForeignSessionRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAEvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAGjE,OAAO,KAAK,EAAE,iBAAiB,IAAI,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AAExG;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,OAAO,EACP,KAAK,EACL,OAAO,EACP,IAAI,EACJ,GAAG,EACH,OAAO,GACR,EAAE;IACD,OAAO,EAAE,qBAAqB,CAAA;IAC9B,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,OAAO,CAAA;IAChB,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAA;IACZ,iEAAiE;IACjE,GAAG,EAAE,MAAM,CAAA;IACX,yDAAyD;IACzD,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;CAClC,GAAG,KAAK,CAAC,SAAS,CAmClB"}

package/lib/types/components/sessions/ForeignSessionRow.js

@@ -0,0 +1,43 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState } from 'react';
+import { Box, Text } from '../../ui.js';
+import { useTooltip } from '../Tooltip.js';
+import { formatAbsolute, formatProject, formatWhen, truncateWidth } from '../../sessions/format.js';
+/**
+ * One conversation of another agent in a source tab: its title, and a facts
+ * line with when it last moved and where it ran.
+ *
+ * It looks like a DSH session row on purpose — the same two lines, the same
+ * `❯`, green selection and blue hover (see SessionListRow) — so the tabs read
+ * as one screen. It is its own component rather than a shared core so the DSH
+ * row stays untouched; the handful of lines below are the whole overlap.
+ *
+ * Deliberately NO import status. Selecting a row imports it on the spot (or
+ * opens the copy an earlier selection made), so "imported or not" is a detail
+ * of the selection, not a fact the user has to read before choosing; showing it
+ * would also invite a sync the feature does not do.
+ *
+ * The working directory rides on the facts line here, unlike the DSH row: the
+ * rail groups by directory, but a search spans every group of the source and
+ * "which project was this" is the question a foreign title answers worst.
+ */
+export function ForeignSessionRow({ session, width, focused, home, now, onClick, }) {
+    const [hovered, setHovered] = useState(false);
+    // Two cells for the focus marker.
+    const body = Math.max(8, width - 2);
+    const shownTitle = truncateWidth(session.title, Math.max(4, body - 2));
+    const titleTooltip = useTooltip(() => {
+        const parts = [];
+        if (shownTitle !== session.title)
+            parts.push(session.title);
+        parts.push(formatAbsolute(session.updatedAt));
+        if (session.cwd !== '')
+            parts.push(session.cwd);
+        return parts.join('\n');
+    });
+    const facts = [formatWhen(session.updatedAt, now), formatProject(session.cwd, home)];
+    return (_jsxs(Box, { flexDirection: "column", flexShrink: 0, onClick: onClick, onMouseEnter: onClick === undefined ? undefined : () => setHovered(true), onMouseLeave: onClick === undefined ? undefined : () => setHovered(false), 
+        // Hover is the blue prompt and never marks the focused row; selection is
+        // the green foreground below, as on the DSH row.
+        backgroundColor: hovered && !focused ? 'userMessageBackgroundHover' : undefined, children: [_jsxs(Box, { children: [_jsx(Text, { color: focused ? 'success' : 'subtle', children: focused ? '❯ ' : '  ' }), _jsx(Box, { ...titleTooltip, children: _jsx(Text, { color: focused ? 'success' : undefined, bold: focused, children: shownTitle }) })] }), _jsx(Text, { color: focused ? 'success' : undefined, dimColor: !focused, children: `  ${truncateWidth(facts.join(' · '), body)}` })] }));
+}

package/lib/types/components/sessions/SourceTabs.d.ts

@@ -0,0 +1,52 @@
+import React from 'react';
+import type { ClickEvent } from '../../ink/events/click-event.js';
+/** One tab of the session screen's source strip. */
+export interface SourceTab {
+    readonly id: string;
+    readonly label: string;
+}
+/** Which tabs the strip draws and which fold into the `+N` cell. */
+export interface SourceTabsLayout {
+    readonly shown: readonly SourceTab[];
+    readonly hidden: readonly SourceTab[];
+}
+/**
+ * Display width of a strip: its cells, the `│` after the leading DSH tab when
+ * anything follows it, and the `+N` cell when tabs are folded.
+ * @param shown - Tabs drawn in full; the first is the DSH tab when present.
+ * @param hidden - How many tabs fold into `+N`.
+ * @param leadId - Id of the tab the separator follows.
+ * @returns Terminal cells the strip occupies.
+ */
+export declare function sourceTabsWidth(shown: readonly SourceTab[], hidden: number, leadId: string): number;
+/**
+ * Fit the strip into `budget` cells.
+ *
+ * Tabs fold from the END (the strip is sorted by recency, so the oldest source
+ * goes first) into one `+N` cell. The active tab never folds — a strip that
+ * hid the tab you are on could not tell you where you are — and the leading
+ * tab is the last to go after it.
+ * @param tabs - Every tab, leading tab first.
+ * @param active - Id of the active tab.
+ * @param budget - Cells available to the strip.
+ * @returns The tabs to draw and the tabs behind `+N`.
+ */
+export declare function layoutSourceTabs(tabs: readonly SourceTab[], active: string, budget: number): SourceTabsLayout;
+/**
+ * The source strip in the session screen's header: `DSH │ Claude Code  Codex`.
+ *
+ * The active tab is a reverse block in the remember colour; the others are dim
+ * until the pointer is over them. Every click stops propagation, because the
+ * screen's root closes open menus on click and a tab click is not a click on
+ * the background.
+ */
+export declare function SourceTabs({ layout, active, leadId, onSelect, onOverflow, }: {
+    layout: SourceTabsLayout;
+    active: string;
+    /** Id of the tab the `│` separator follows. */
+    leadId: string;
+    onSelect(id: string): void;
+    /** Click on `+N`: open the list of folded tabs at the pointer. */
+    onOverflow(event: ClickEvent): void;
+}): React.ReactNode;
+//# sourceMappingURL=SourceTabs.d.ts.map

package/lib/types/components/sessions/SourceTabs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SourceTabs.d.ts","sourceRoot":"","sources":["../../../../src/components/sessions/SourceTabs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAEvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAGjE,oDAAoD;AACpD,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB;AAED,oEAAoE;AACpE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAA;IACpC,QAAQ,CAAC,MAAM,EAAE,SAAS,SAAS,EAAE,CAAA;CACtC;AAKD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAKnG;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAW7G;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,EACzB,MAAM,EACN,MAAM,EACN,MAAM,EACN,QAAQ,EACR,UAAU,GACX,EAAE;IACD,MAAM,EAAE,gBAAgB,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,kEAAkE;IAClE,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;CACpC,GAAG,KAAK,CAAC,SAAS,CA8BlB"}

package/lib/types/components/sessions/SourceTabs.js

@@ -0,0 +1,70 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React, { useState } from 'react';
+import { Box, Text } from '../../ui.js';
+import { stringWidth } from '../../ink/stringWidth.js';
+/** A tab cell is its label with one column of padding on each side. */
+const cellWidth = (label) => stringWidth(label) + 2;
+/**
+ * Display width of a strip: its cells, the `│` after the leading DSH tab when
+ * anything follows it, and the `+N` cell when tabs are folded.
+ * @param shown - Tabs drawn in full; the first is the DSH tab when present.
+ * @param hidden - How many tabs fold into `+N`.
+ * @param leadId - Id of the tab the separator follows.
+ * @returns Terminal cells the strip occupies.
+ */
+export function sourceTabsWidth(shown, hidden, leadId) {
+    let width = shown.reduce((sum, tab) => sum + cellWidth(tab.label), 0);
+    if (hidden > 0)
+        width += cellWidth(`+${hidden}`);
+    if (shown[0]?.id === leadId && (shown.length > 1 || hidden > 0))
+        width += 1;
+    return width;
+}
+/**
+ * Fit the strip into `budget` cells.
+ *
+ * Tabs fold from the END (the strip is sorted by recency, so the oldest source
+ * goes first) into one `+N` cell. The active tab never folds — a strip that
+ * hid the tab you are on could not tell you where you are — and the leading
+ * tab is the last to go after it.
+ * @param tabs - Every tab, leading tab first.
+ * @param active - Id of the active tab.
+ * @param budget - Cells available to the strip.
+ * @returns The tabs to draw and the tabs behind `+N`.
+ */
+export function layoutSourceTabs(tabs, active, budget) {
+    const leadId = tabs[0]?.id ?? '';
+    for (let keep = tabs.length; keep >= 0; keep--) {
+        const shown = tabs.filter((tab, index) => index < keep || tab.id === active);
+        const hidden = tabs.filter(tab => !shown.includes(tab));
+        if (sourceTabsWidth(shown, hidden.length, leadId) <= budget)
+            return { shown, hidden };
+    }
+    // Not even the active tab and `+N` fit: draw them anyway and let the header
+    // clip, since a missing active tab is worse than a clipped one.
+    const shown = tabs.filter(tab => tab.id === active);
+    return { shown, hidden: tabs.filter(tab => tab.id !== active) };
+}
+/**
+ * The source strip in the session screen's header: `DSH │ Claude Code  Codex`.
+ *
+ * The active tab is a reverse block in the remember colour; the others are dim
+ * until the pointer is over them. Every click stops propagation, because the
+ * screen's root closes open menus on click and a tab click is not a click on
+ * the background.
+ */
+export function SourceTabs({ layout, active, leadId, onSelect, onOverflow, }) {
+    return (_jsxs(Box, { flexShrink: 0, height: 1, overflow: "hidden", children: [layout.shown.map((tab, index) => (_jsxs(React.Fragment, { children: [_jsx(SourceTabCell, { label: tab.label, active: tab.id === active, onClick: (event) => {
+                            event.stopImmediatePropagation();
+                            onSelect(tab.id);
+                        } }), index === 0 && tab.id === leadId && (layout.shown.length > 1 || layout.hidden.length > 0) && (_jsx(Text, { dimColor: true, children: '│' }))] }, tab.id))), layout.hidden.length > 0 && (_jsx(SourceTabCell, { label: `+${layout.hidden.length}`, active: false, onClick: (event) => {
+                    event.stopImmediatePropagation();
+                    onOverflow(event);
+                } }))] }));
+}
+function SourceTabCell({ label, active, onClick, }) {
+    const [hovered, setHovered] = useState(false);
+    return (_jsx(Box, { flexShrink: 0, onClick: onClick, onMouseEnter: () => setHovered(true), onMouseLeave: () => setHovered(false), children: active
+            ? _jsx(Text, { color: "remember", bold: true, inverse: true, children: ` ${label} ` })
+            : _jsx(Text, { dimColor: !hovered, children: ` ${label} ` }) }));
+}

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

@@ -0,0 +1,56 @@
+/**
+ * 开屏的两个彩蛋——都只改**文字**，字体轮换、鲸鱼动画、窄终端阶梯一律照旧：
+ *
+ * ① 节日换词：本地日期命中整天窗口时，把下排词换成 `HAPPINESS` / `MERRY` /
+ *    `NEW YEAR`（上排仍是 `DEEPSEEK`）。字距由 `withTagline` 按新词重解，
+ *    所以换词不会把两行搞成不等宽。
+ * ② 小概率求 star：每次 mount 掷一次（默认 1/20），命中就把底部欢迎语换成
+ *    一句带仓库链接的话。链接走 `createHyperlink`，不支持 OSC 8 的终端自动
+ *    退化成纯文本 URL；命中概率与终端能力都是可注入的测试缝。
+ */
+import type { UsageStats } from '../usageStats.js';
+/** 一个节日彩蛋：当天要用的上下两排词。 */
+export interface SplashEgg {
+    /** 稳定 id（回归按 id 命中）。 */
+    readonly id: string;
+    /** 上排词。 */
+    readonly top: string;
+    /** 下排词。 */
+    readonly bottom: string;
+}
+/**
+ * 当天是不是彩蛋日。
+ * @param now - 注入的当前时间（测试缝；生产用 `new Date()`）。
+ * @returns 命中的彩蛋（含当天要用的词对）；没命中返回 `null`（照常画 `HARNESS`）。
+ */
+export declare function pickSplashEgg(now?: Date): SplashEgg | null;
+/** 求 star 标语指向的仓库。 */
+export declare const SPLASH_STAR_URL = "https://github.com/ccch1mneyyy/dsh-TUI";
+/** 求 star 彩蛋的三行结构（标题 / 数字 / 求星）。 */
+export interface SplashStarLine {
+    /** 标题行：替换平时的欢迎语（本次会话 star 过后换成"捡到星星"版）。 */
+    readonly title: string;
+    /** 数字行：本机实测累计值。 */
+    readonly stats: string;
+    /**
+     * 求星行（`Star` 上是 OSC 8 链接），已拼好；**终端不支持超链接时为
+     * `null`**——那行会退化成裸 URL，长 30+ 列会把整块撑破，宁可不显示。
+     */
+    readonly ask: string | null;
+    /** 整块里**最宽一行**的可见宽度：居中缩进必须按它算。 */
+    readonly width: number;
+}
+/**
+ * 组装求 star 彩蛋。文案走 i18n 字典（中英齐全），`{{hours}}`/`{{launches}}`
+ * 换成本机**实测**的累计值，`{{key}}` 换成生效中的快捷键显示。
+ * @param options - `usage` 是本机累计用量；`supportsHyperlinks` 是终端能力的测试缝；
+ *   `keyHint` 是快捷键显示（如 `Alt+S`）；`caught` 表示本次会话已经 star 过。
+ * @returns 三行文案与最宽行可见宽度。
+ */
+export declare function splashStarLine(options: {
+    usage: UsageStats;
+    supportsHyperlinks?: boolean;
+    keyHint?: string;
+    caught?: boolean;
+}): SplashStarLine;
+//# sourceMappingURL=splashEggs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"splashEggs.d.ts","sourceRoot":"","sources":["../../../src/components/splashEggs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,yBAAyB;AACzB,MAAM,WAAW,SAAS;IACxB,wBAAwB;IACxB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,WAAW;IACX,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,WAAW;IACX,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB;AAsBD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,GAAE,IAAiB,GAAG,SAAS,GAAG,IAAI,CAItE;AAED,sBAAsB;AACtB,eAAO,MAAM,eAAe,2CAA2C,CAAA;AAKvE,oCAAoC;AACpC,MAAM,WAAW,cAAc;IAC7B,2CAA2C;IAC3C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,mBAAmB;IACnB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB;;;OAGG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,kCAAkC;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB;AAKD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE;IACtC,KAAK,EAAE,UAAU,CAAA;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,GAAG,cAAc,CAsBjB"}