@deepseek-harness-tui/dsh-tui 0.8.6 → 0.8.8

package/lib/types/screens/Chat.js

@@ -47,7 +47,10 @@ import { HistorySearchDialog } from '../components/HistorySearchDialog.js';
 import { RewindPicker } from '../components/RewindPicker.js';
 import { BtwPanel } from '../components/BtwPanel.js';
 import { TipsPanel } from '../components/TipsPanel.js';
+import { SubagentDashboard } from '../components/SubagentDashboard.js';
+import { SubagentDetailScene } from '../components/SubagentDetailScene.js';
 import { setClipboard } from '../ink/termio/osc.js';
+import { TerminalWriteContext } from '../ink/useTerminalNotification.js';
 import instances from '../ink/instances.js';
 import { useAnimationFrame } from '../ink/hooks/use-animation-frame.js';
 import { TrajectoryScene } from './TrajectoryScene.js';
@@ -135,6 +138,7 @@ let fallbackApprovalStore;
 let fallbackDialogStore;
 let fallbackStatusStore;
 export function Chat({ channel, questionStore, approvalStore, extensionDialogs, extensionStatus, extensionShortcuts, onExit, onUpdate, fullscreen = false, trajectorySeen: trajectorySeenProp, }) {
+    const writeRaw = React.useContext(TerminalWriteContext);
     // Re-render whenever the channel mutates; rows/status are read fresh below.
     React.useSyncExternalStore(channel.subscribe, () => channel.version);
     // Re-render on language switches so the whole UI hot-swaps its strings.
@@ -230,8 +234,6 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
     const [thinkingVisible, setThinkingVisible] = React.useState(true);
     const [thinkingOpen, setThinkingOpen] = React.useState(false);
     const [thinkingFocus, setThinkingFocus] = React.useState(0);
-    /** Mid-conversation toggle waiting for Enter confirmation (CC semantics). */
-    const [thinkingConfirm, setThinkingConfirm] = React.useState(null);
     /** ctrl+r history search dialog (ported from CC's HistorySearchDialog). */
     const [historyOpen, setHistoryOpen] = React.useState(false);
     const [historyQuery, setHistoryQuery] = React.useState('');
@@ -265,6 +267,15 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
     };
     /** /tips usage-tips overlay: pure UI state, no session side effects. */
     const [tipsOpen, setTipsOpen] = React.useState(false);
+    /** Subagent dashboard (Ctrl+A): displays active/completed subagents. */
+    const [subagentDashboardOpen, setSubagentDashboardOpen] = React.useState(false);
+    /** Detail view for a specific subagent (opened from dashboard). */
+    const [subagentDetailId, setSubagentDetailId] = React.useState(null);
+    /**
+     * Hidden `/deepseek` easter egg: each invocation bumps this key so the
+     * logo header remounts and replays the whale spout + text shimmer.
+     */
+    const [logoNonce, setLogoNonce] = React.useState(0);
     React.useEffect(() => () => btwAbortRef.current?.abort(), []);
     /**
      * The trajectory scene (issue #80 evolution). Unlike every other overlay
@@ -1063,6 +1074,18 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                 });
                 return true;
             }
+            case 'deepseek': {
+                // Hidden easter egg: replay the logo header's whale spout + text
+                // shimmer. The command is intentionally not in the suggestion/help
+                // catalogs; PromptInput recognizes it through HIDDEN_COMMAND_NAMES.
+                setHelpOpen(false);
+                setLogoNonce(n => n + 1);
+                // Bring the logo back into view if the transcript has scrolled.
+                setTimeout(() => {
+                    handle?.scrollTo(0);
+                }, 0);
+                return true;
+            }
             case 'tips':
                 setHelpOpen(false);
                 setTipsOpen(true);
@@ -1353,12 +1376,35 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
         // the field draft editor belong to it alone.
         if (settingsOpen)
             return;
+        // Subagent dashboard or detail scene: it owns the keyboard while open.
+        if (subagentDashboardOpen || subagentDetailId !== null)
+            return;
         // A plugin scene (dsh-tui-scenes) or the trajectory scene owns the whole
         // screen while open: every key belongs to it. Unguarded, an Esc meant to
         // CLOSE the scene also reached the chat:cancel branch below whenever a
         // turn was in flight — closing the view and killing the turn in one key.
         if (sceneOpen || channel.pluginScene !== undefined)
             return;
+        // Mouse wheel scrolls the transcript even while a question/approval/
+        // dialog panel is open — those panels own arrow/Enter/Esc keys, but the
+        // transcript above them should still be scrollable in fullscreen mode.
+        // Help is different: its own ScrollBox owns wheel input, so Chat must
+        // yield before stopping propagation or both covered layers would move.
+        // Events only arrive with mouse tracking on; inline mode never sees
+        // them, so this is a no-op there.
+        if (key.wheelUp || key.wheelDown) {
+            if (helpOpen)
+                return;
+            handle?.scrollBy(key.wheelUp ? -3 : 3);
+            event.stopImmediatePropagation();
+            return;
+        }
+        // Help is modal over Chat. Chat's listener registers before PromptInput's,
+        // so yield every remaining key before any global/custom shortcut, search,
+        // selection, or working-turn cancellation branch can mutate hidden state.
+        // PromptInput then owns Esc, navigation, Tab guards, and ordinary typing.
+        if (helpOpen)
+            return;
         // The questionnaire / approval panel / managed plugin dialog owns the
         // keyboard while one is pending (the panel's own useInput handles
         // ↑/↓/Space/Tab/Enter/Esc; the prompt input is unmounted, so nothing
@@ -1370,16 +1416,6 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
         const plainReturn = returnCandidate && returnNow - lastModalEnterAtRef.current >= 80;
         if (plainReturn)
             lastModalEnterAtRef.current = returnNow;
-        // Mouse wheel scrolls the transcript — in fullscreen there is no
-        // terminal scrollback (alt-screen), so this is the only way back.
-        // Imperative scrollBy: no React re-render per notch (CC semantics).
-        // Events only arrive with mouse tracking on; inline mode never sees
-        // them, so this is a no-op there.
-        if (key.wheelUp || key.wheelDown) {
-            handle?.scrollBy(key.wheelUp ? -3 : 3);
-            event.stopImmediatePropagation();
-            return;
-        }
         // Esc clears a settled mouse selection first (CC precedence), ahead of
         // every other Esc meaning below (close pickers, interrupt the turn).
         // hasSelection() is an imperative read — no subscription needed.
@@ -1447,33 +1483,14 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
             return;
         }
         if (thinkingOpen) {
-            if (thinkingConfirm !== null) {
-                // Confirmation state: Enter applies, Esc backs out to the select.
-                if (plainReturn) {
-                    const enabled = thinkingConfirm;
-                    setThinkingVisible(enabled);
-                    setThinkingConfirm(null);
-                    setThinkingOpen(false);
-                    channel.notify(t('thinking-toggled', { state: enabled ? t('thinking-on') : t('thinking-off') }));
-                }
-                else if (key.escape) {
-                    setThinkingConfirm(null);
-                }
-            }
-            else if (key.upArrow || key.downArrow) {
+            if (key.upArrow || key.downArrow) {
                 setThinkingFocus(index => (index === 0 ? 1 : 0));
             }
             else if (plainReturn) {
-                const enabled = thinkingFocus === 0;
-                const midConversation = channel.rows.some(row => row.kind === 'assistant');
-                if (midConversation && enabled !== thinkingVisible) {
-                    setThinkingConfirm(enabled);
-                }
-                else {
-                    setThinkingVisible(enabled);
-                    setThinkingOpen(false);
-                    channel.notify(t('thinking-toggled', { state: enabled ? t('thinking-on') : t('thinking-off') }));
-                }
+                const visible = thinkingFocus === 0;
+                setThinkingVisible(visible);
+                setThinkingOpen(false);
+                channel.notify(t('thinking-toggled', { state: visible ? t('thinking-on') : t('thinking-off') }));
             }
             else if (key.escape) {
                 setThinkingOpen(false);
@@ -1850,6 +1867,11 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
             openScene();
             return;
         }
+        if (isMod(key) && input === 'a') {
+            // Ctrl+A opens the subagent dashboard.
+            setSubagentDashboardOpen(true);
+            return;
+        }
         if (isMod(key) && input === 'p' && loadedContextVisible) {
             // Ctrl+P toggles the startup loaded-context panel while it is on
             // screen (transcript still empty); once rows take over and the
@@ -1865,7 +1887,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
             setHistoryOpen(true);
             return;
         }
-        if (key.shift && key.upArrow && !selectionActive) {
+        if (key.shift && key.upArrow && !selectionActive && !helpOpen) {
             enterSelection();
         }
         else if (selectionActive) {
@@ -1883,7 +1905,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                 setSelectedId(null);
             }
         }
-        else if (key.escape && channel.working) {
+        else if (key.escape && channel.working && !helpOpen) {
             // CC's chat:cancel — esc interrupts a running turn (the prompt input
             // only sees esc when idle, where it has the double-tap-clear meaning).
             // With messages queued for delivery, interrupt-and-deliver them right
@@ -1899,8 +1921,11 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
             }
             event.stopImmediatePropagation();
         }
-        else if (isMod(key) && input === 'o') {
+        else if (isMod(key) && input === 'o' && !helpOpen) {
             // Leaving transcript mode (Ctrl+O) — search was already handled above.
+            // Help is modal: toggling this state behind the overlay is invisible,
+            // then the next `/` unexpectedly opens transcript search instead of
+            // slash-command completion after Help closes.
             setExpanded(previous => !previous);
             // The toggle rewrites every thinking row's layout at once. The
             // ordinary scroll-based diff pushes rows into terminal scrollback on
@@ -1913,7 +1938,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
             const ink = instances.get(process.stdout) ?? instances.values().next().value;
             ink?.reanchorViewport();
         }
-        else if (input === '/' && !key.ctrl && !key.meta && !key.super) {
+        else if (input === '/' && !key.ctrl && !key.meta && !key.super && !helpOpen) {
             // `/` in transcript mode (Ctrl+O expanded, CC's REPL semantics:
             // search is active on the transcript screen where `/` isn't a command).
             if (expanded) {
@@ -2011,6 +2036,31 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
         const screen = _jsx(Settings, { channel: channel, onClose: () => setSettingsOpen(false) });
         return fullscreen ? screen : _jsx(AlternateScreen, { children: screen });
     }
+    // Subagent detail scene: displays detailed view of a specific subagent.
+    // Like the browser and settings, it replaces the conversation entirely.
+    if (subagentDetailId !== null) {
+        const subagent = channel.subagents.find(s => s.agentId === subagentDetailId);
+        if (!subagent) {
+            // Agent not found, go back to dashboard
+            setSubagentDetailId(null);
+            setSubagentDashboardOpen(true);
+            return null;
+        }
+        const scene = (_jsx(SubagentDetailScene, { subagent: subagent, onInterrupt: (id) => channel.subagentControl.interrupt(id), onBack: () => {
+                setSubagentDetailId(null);
+                setSubagentDashboardOpen(true);
+            } }));
+        return fullscreen ? scene : _jsx(AlternateScreen, { children: scene });
+    }
+    // Subagent dashboard: displays all active and completed subagents.
+    // Like the browser and settings, it replaces the conversation entirely.
+    if (subagentDashboardOpen) {
+        const dashboard = (_jsx(SubagentDashboard, { subagents: [...channel.subagents], onSelect: (id) => {
+                setSubagentDashboardOpen(false);
+                setSubagentDetailId(id);
+            }, onClose: () => setSubagentDashboardOpen(false) }));
+        return fullscreen ? dashboard : _jsx(AlternateScreen, { children: dashboard });
+    }
     /** Prompt input is inert while a modal dialog owns the keyboard. */
     const promptSelectionActive = selectionActive || modelPickerOpen || skillsPickerOpen || workspacePickerOpen || workspaceFlow !== null || activityPickerOpen ||
         effortSliderOpen || presetPickerOpen || themePickerOpen || thinkingOpen || historyOpen || rewindOpen || searchOpen ||
@@ -2044,8 +2094,9 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                         seekRow(lastUser.id);
                     else
                         handle?.scrollToBottom();
-                } })), _jsxs(ScrollBox, { ref: setHandle, flexDirection: "column", flexGrow: 1, flexShrink: 1, stickyScroll: true, children: [_jsx(LogoHeader, { model: channel.model, effort: channel.reasoningEffort, cwd: channel.displayCwd }), loadedContextVisible && (_jsx(LoadedContextPanel, { context: channel.loadedContext, open: loadedContextOpen, onToggle: toggleLoadedContext })), _jsx(MessageList, { rows: channel.rows, failureHintRowId: failureHintRowId, failureHint: t('traj-hint-failure', { key: `${modLabel}t` }), expanded: expanded, expandedRows: expandedRows, selectedId: selectionActive ? selectedId : null, onToggleRow: toggleRowExpanded, model: channel.model, diffLayout: channel.diffLayout, thinkingFold: channel.thinkingFold, toolBackground: channel.toolBackground, showAll: showAllMessages, thinkingVisible: thinkingVisible, onToggleAll: () => { setShowAllMessages(previous => !previous); }, onLoadOlder: () => channel.loadOlder(), registerRowRef: registerRowRef, scrollHandle: handle, forceMountRowId: forceMountRowId, newSinceRowId: isSticky ? null : lastSeenRowIdRef.current, onUnseenCount: setUnseenCount })] }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [showPill && (_jsx(NewMessagesPill, { count: unseenCount, onClick: () => handle?.scrollToBottom() })), channel.working &&
+                } })), _jsxs(ScrollBox, { ref: setHandle, flexDirection: "column", flexGrow: 1, flexShrink: 1, stickyScroll: true, children: [_jsx(LogoHeader, { model: channel.model, effort: channel.reasoningEffort, cwd: channel.displayCwd, whale: channel.whale }, logoNonce), loadedContextVisible && (_jsx(LoadedContextPanel, { context: channel.loadedContext, open: loadedContextOpen, onToggle: toggleLoadedContext })), _jsx(MessageList, { rows: channel.rows, failureHintRowId: failureHintRowId, failureHint: t('traj-hint-failure', { key: `${modLabel}t` }), expanded: expanded, expandedRows: expandedRows, selectedId: selectionActive ? selectedId : null, onToggleRow: toggleRowExpanded, model: channel.model, diffLayout: channel.diffLayout, thinkingFold: channel.thinkingFold, toolBackground: channel.toolBackground, activityFrames: channel.activityFrames, showAll: showAllMessages, thinkingVisible: thinkingVisible, onToggleAll: () => { setShowAllMessages(previous => !previous); }, onLoadOlder: () => channel.loadOlder(), registerRowRef: registerRowRef, scrollHandle: handle, forceMountRowId: forceMountRowId, newSinceRowId: isSticky ? null : lastSeenRowIdRef.current, onUnseenCount: setUnseenCount })] }), _jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [showPill && (_jsx(NewMessagesPill, { count: unseenCount, onClick: () => handle?.scrollToBottom() })), channel.working &&
                         (channel.activityEnabled &&
+                            !channel.minimal &&
                             channel.workingActivity !== undefined &&
                             channel.workingActivity.line !== '' &&
                             channel.workingActivity.phase !== 'idle' ? (_jsx(Box, { marginTop: 1, children: _jsx(ActivityLine, { activity: channel.workingActivity, activityFrames: channel.activityFrames, warnPct: activityWarnPct, warnDanger: activityWarnPct !== undefined && activityWarnPct >= 95, 
@@ -2055,7 +2106,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                                 // inflating the reading next to a real upload number).
                                 suffix: `${lastUploadTokens > 0 ? ` · ↑ ${formatTokens(lastUploadTokens)}` : ''} · ↓ ${formatTokens(Math.round(channel.responseChars / 4))} tokens` }) })) : (_jsx(WorkingSpinner, { mode: channel.spinnerMode, hasActiveTools: channel.activeToolCount > 0, responseLengthRef: responseLengthRef, uploadTokensRef: uploadTokensRef, loadingStartTimeRef: loadingStartTimeRef, totalPausedMsRef: totalPausedMsRef, pauseStartTimeRef: pauseStartTimeRef, thinkingStatus: thinkingStatus }))), _jsx(GoalTodoPanel, { channel: channel }), statusEntries.length > 0 && (_jsx(Text, { dimColor: true, wrap: "truncate", children: statusEntries.map(entry => entry.text).join(' · ') })), approvalSnapshot !== null ? (_jsx(ApprovalPanel, { approval: approvalSnapshot, onDecide: outcome => approvals.decide(outcome) }, approvalSnapshot.key)) : dialogSnapshot !== null ? (_jsx(ExtensionDialog, { dialog: dialogSnapshot, onDecide: value => dialogs.decide(dialogSnapshot.key, value), onCancel: () => dialogs.cancel(dialogSnapshot.key) }, dialogSnapshot.key)) : tipsOpen ? (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(TipsPanel, { onClose: () => setTipsOpen(false) }) })) : btw !== null ? (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(BtwPanel, { question: btw.question, answer: btw.answer, error: btw.error, streaming: !btw.done, onClose: closeBtw, onCopy: () => {
                                 void setClipboard(btw.answer ?? '').then(raw => { if (raw)
-                                    process.stdout.write(raw); });
+                                    writeRaw?.(raw); });
                                 channel.notify(t('copied-chars', { n: (btw.answer ?? '').length }), { timeoutMs: 1500 });
                             } }) })) : questionSnapshot !== null ? (_jsx(AskUserQuestionPanel, { question: questionSnapshot.question, position: questionSnapshot.position, total: questionSnapshot.total, answered: questionSnapshot.answered, onAnswer: selection => questionStore.answerCurrent(selection), onCancel: () => questionStore.cancelCurrent() }, questionSnapshot.key)) : (_jsx(PromptInput, { channel: channel, helpOpen: helpOpen, onToggleHelp: () => { setHelpOpen(previous => !previous); }, onRunCommand: runCommand, selectionActive: promptSelectionActive, fillText: historyFill, onFillConsumed: () => { setHistoryFill(null); }, onRewindRequest: openRewind, controllerRef: promptControllerRef })), _jsx(StatusLine, { channel: channel, selectionActive: selectionActive, helpOpen: helpOpen, wake: wakeBand === undefined
                             ? undefined
@@ -2063,7 +2114,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                                 band: wakeBand,
                                 hint: trajectorySeen ? undefined : `${modLabel}t`,
                                 tick: Math.floor(wakeTime / 120),
-                            } }), dialogOverlayOpen && (_jsxs(OverlayAbove, { maxHeight: Math.max(terminalRows - 8, 8), children: [thinkingOpen && (_jsx(ThinkingToggle, { currentValue: thinkingVisible, focusIndex: thinkingFocus, confirmationPending: thinkingConfirm })), workspacePickerOpen && workspaceTargets.length > 0 && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(WorkspacePicker, { targets: workspaceTargets, focusIndex: workspaceIndex, currentCwd: channel.cwd }) })), workspaceFlow !== null && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(WorkspaceFlowPicker, { title: workspaceFlow.title, choices: workspaceFlow.choices, focusIndex: workspaceFlowIndex, busy: workspaceFlowBusy, input: workspaceFlowInput }) })), modelPickerOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: models.length === 0 ? (_jsx(ModelPickerLoading, {})) : (_jsx(ModelPicker, { models: models, focusIndex: modelIndex, currentModel: `${channel.provider}/${channel.model}` })) })), skillsPickerOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: skillsList === null ? (_jsx(SkillsPickerLoading, {})) : (_jsx(SkillsPicker, { skills: skillsList, focusIndex: skillsIndex })) })), activityPickerOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(ActivityPicker, { focusIndex: activityIndex, currentPreset: channel.activityFrames }) })), effortSliderOpen && effortOptions.length > 1 && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(EffortSlider, { options: effortOptions, focusIndex: effortIndex, currentId: channel.reasoningEffort }) })), presetPickerOpen && presetOptions.length > 0 && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(PresetPicker, { presets: presetOptions, focusIndex: presetIndex, currentPreset: channel.agentPreset }) })), themePickerOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(ThemePicker, { focusIndex: themeIndex, currentTheme: themeName }) })), historyOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(HistorySearchDialog, { query: historyQuery, cursorOffset: historyCursor, matches: historyMatches, focusIndex: historyFocus }) })), rewindOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(RewindPicker, { rows: rewindRows, focusIndex: rewindIndex, confirmRow: rewindConfirm, modes: rewindModes, modeIndex: rewindModeIndex, busy: rewindBusy }) })), searchOpen && _jsx(TranscriptSearchBar, { query: searchQuery, cursorOffset: searchCursor, count: searchCount, current: searchCurrent })] }))] })] }));
+                            } }), dialogOverlayOpen && (_jsxs(OverlayAbove, { maxHeight: Math.max(terminalRows - 8, 8), children: [thinkingOpen && (_jsx(ThinkingToggle, { currentValue: thinkingVisible, focusIndex: thinkingFocus })), workspacePickerOpen && workspaceTargets.length > 0 && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(WorkspacePicker, { targets: workspaceTargets, focusIndex: workspaceIndex, currentCwd: channel.cwd }) })), workspaceFlow !== null && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(WorkspaceFlowPicker, { title: workspaceFlow.title, choices: workspaceFlow.choices, focusIndex: workspaceFlowIndex, busy: workspaceFlowBusy, input: workspaceFlowInput }) })), modelPickerOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: models.length === 0 ? (_jsx(ModelPickerLoading, {})) : (_jsx(ModelPicker, { models: models, focusIndex: modelIndex, currentModel: `${channel.provider}/${channel.model}` })) })), skillsPickerOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: skillsList === null ? (_jsx(SkillsPickerLoading, {})) : (_jsx(SkillsPicker, { skills: skillsList, focusIndex: skillsIndex })) })), activityPickerOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(ActivityPicker, { focusIndex: activityIndex, currentPreset: channel.activityFrames }) })), effortSliderOpen && effortOptions.length > 1 && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(EffortSlider, { options: effortOptions, focusIndex: effortIndex, currentId: channel.reasoningEffort }) })), presetPickerOpen && presetOptions.length > 0 && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(PresetPicker, { presets: presetOptions, focusIndex: presetIndex, currentPreset: channel.agentPreset }) })), themePickerOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(ThemePicker, { focusIndex: themeIndex, currentTheme: themeName }) })), historyOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(HistorySearchDialog, { query: historyQuery, cursorOffset: historyCursor, matches: historyMatches, focusIndex: historyFocus }) })), rewindOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(RewindPicker, { rows: rewindRows, focusIndex: rewindIndex, confirmRow: rewindConfirm, modes: rewindModes, modeIndex: rewindModeIndex, busy: rewindBusy }) })), searchOpen && _jsx(TranscriptSearchBar, { query: searchQuery, cursorOffset: searchCursor, count: searchCount, current: searchCurrent })] }))] })] }));
 }
 /**
  * The pinned prompt header shown above the ScrollBox while the user has

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;AAOzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAGxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAQvD;;;;;;;GAOG;AACH,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,qBAsPA;AAED,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAKvF"}
+{"version":3,"file":"StatusLine.d.ts","sourceRoot":"","sources":["../../../src/screens/StatusLine.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAGxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAQvD;;;;;;;GAOG;AACH,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,qBA0PA;AAED,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAKvF"}

package/lib/types/screens/StatusLine.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text, useTerminalSize, useTheme } from '../ui.js';
 import { formatTokens } from '../cc/format.js';
 import { t } from '../i18n.js';
-import { formatContextUsage, normalizeStatusBar } from '../tuiDisplayPrefs.js';
+import { formatContextUsage, DEFAULT_STATUS_BAR, normalizeStatusBar } from '../tuiDisplayPrefs.js';
 import { Byline } from '../components/design-system/Byline.js';
 import { ActivityLine, contextPressurePct } from '../components/ActivityLine.js';
 import { modeDisplayName } from '../sessionModes.js';
@@ -19,7 +19,11 @@ import { renderContextBar, renderTpsGauge, renderTpsSparkline, speedColor, } fro
 export function StatusLine({ channel, selectionActive = false, helpOpen = false, wake, }) {
     const { columns } = useTerminalSize();
     const [themeName] = useTheme();
-    const statusBar = normalizeStatusBar(channel.statusBar);
+    const statusBar = channel.minimal
+        // Minimal mode overrides every field switch: model + cwd only, so the
+        // footer can never grow decorations regardless of saved preferences.
+        ? { ...DEFAULT_STATUS_BAR, compact: true, model: true, cwd: true }
+        : normalizeStatusBar(channel.statusBar);
     const usage = channel.lastUsage;
     const contextUsed = usage === undefined
         ? undefined

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

@@ -1 +1 @@
-{"version":3,"file":"TrajectoryScene.d.ts","sourceRoot":"","sources":["../../../src/screens/TrajectoryScene.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAczB,OAAO,EAML,KAAK,SAAS,EACf,MAAM,oCAAoC,CAAA;AAE3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AA+BxD,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,SAAS,CAAA;AAEnD,wBAAgB,eAAe,CAAC,EAC9B,OAAO,EACP,KAAK,EACL,OAAO,GACR,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB;;;;OAIG;IACH,KAAK,EAAE,SAAS,CAAA;IAChB,sDAAsD;IACtD,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB,GAAG,KAAK,CAAC,SAAS,CAuYlB"}
+{"version":3,"file":"TrajectoryScene.d.ts","sourceRoot":"","sources":["../../../src/screens/TrajectoryScene.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAczB,OAAO,EAML,KAAK,SAAS,EACf,MAAM,oCAAoC,CAAA;AAE3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AA+BxD,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,SAAS,CAAA;AAEnD,wBAAgB,eAAe,CAAC,EAC9B,OAAO,EACP,KAAK,EACL,OAAO,GACR,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB;;;;OAIG;IACH,KAAK,EAAE,SAAS,CAAA;IAChB,sDAAsD;IACtD,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB,GAAG,KAAK,CAAC,SAAS,CAyYlB"}

package/lib/types/screens/TrajectoryScene.js

@@ -227,12 +227,14 @@ export function TrajectoryScene({ channel, build, onClose, }) {
             return move(-ledgerRows);
         if (key.pageDown)
             return move(ledgerRows);
-        if (input === 'g') {
+        // Bare-letter jumps must not fire on Ctrl+G (the prompt's external-editor
+        // key) or other modified chords that share the letter.
+        if (input === 'g' && !key.ctrl && !key.meta && !key.super) {
             setCursor(0);
             setFollow(false);
             return;
         }
-        if (input === 'G') {
+        if (input === 'G' && !key.ctrl && !key.meta && !key.super) {
             setCursor(Math.max(0, filtered.length - 1));
             setFollow(true);
             return;

package/lib/types/theme.d.ts

@@ -104,6 +104,14 @@ export type Theme = {
     rainbow_blue_shimmer: string;
     rainbow_indigo_shimmer: string;
     rainbow_violet_shimmer: string;
+    subagentBullet: string;
+    subagentDescription: string;
+    subagentModel: string;
+    subagentElapsed: string;
+    subagentToolName: string;
+    subagentStatusRunning: string;
+    subagentStatusCompleted: string;
+    subagentStatusFailed: string;
 };
 /** The built-in theme names, in display order. */
 export declare const THEME_NAMES: readonly ["dark", "dark-ansi", "light"];

package/lib/types/theme.d.ts.map

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

package/lib/types/theme.js

@@ -95,16 +95,16 @@ const darkTheme = {
     toolDotWrite: rgb('#B3A0D4'), // soft violet — edit/write
     toolDotWeb: rgb('#7DA1DE'), // mist blue — web search/fetch
     toolDotTask: rgb('#D194AE'), // mist rose — subagent/jobs
-    syntaxKeyword: rgb('#82AAFF'), // vivid blue (theme anchor)
-    syntaxString: rgb('#E5C07B'), // gold - echoes the user-message gold accent
-    syntaxComment: rgb('#6B7280'), // neutral grey
-    syntaxNumber: rgb('#D19A66'), // warm orange
-    syntaxFunction: rgb('#56B6C2'), // vivid cyan
-    syntaxType: rgb('#C678DD'), // vivid violet
+    syntaxKeyword: rgb('#78A0D6'), // muted anchor blue
+    syntaxString: rgb('#79AD91'), // mist green, distinct without neon saturation
+    syntaxComment: rgb('#74808D'), // neutral blue-grey
+    syntaxNumber: rgb('#C89B70'), // softened warm amber
+    syntaxFunction: rgb('#6FAEB5'), // muted cyan
+    syntaxType: rgb('#A98FBF'), // softened violet
     syntaxVariable: rgb('#C9D1D9'), // near-text
     syntaxOperator: rgb('#93A1B0'), // blue grey
     syntaxPunctuation: rgb('#7A8694'), // dim blue grey
-    syntaxConstant: rgb('#E48A9B'), // soft rose
+    syntaxConstant: rgb('#C98291'), // softened rose
     red_FOR_SUBAGENTS_ONLY: rgb('#D4685E'),
     blue_FOR_SUBAGENTS_ONLY: rgb('#7496D6'),
     green_FOR_SUBAGENTS_ONLY: rgb('#66B285'),
@@ -143,6 +143,14 @@ const darkTheme = {
     rainbow_blue_shimmer: rgb('#AFBFE2'),
     rainbow_indigo_shimmer: rgb('#BFB4DE'),
     rainbow_violet_shimmer: rgb('#D1B4D1'),
+    subagentBullet: rgb('#D194AE'),
+    subagentDescription: rgb('#E8E6E0'),
+    subagentModel: rgb('#8D95A6'),
+    subagentElapsed: rgb('#8D95A6'),
+    subagentToolName: rgb('#7DA1DE'),
+    subagentStatusRunning: rgb('#7DA1DE'),
+    subagentStatusCompleted: rgb('#82B89D'),
+    subagentStatusFailed: rgb('#DA8A93'),
 };
 /**
  * Gentle Mist Blue light theme — the strict original card. Blue carries
@@ -191,16 +199,16 @@ const lightTheme = {
     toolDotWrite: rgb('#7A5CA8'),
     toolDotWeb: rgb('#4A63A8'),
     toolDotTask: rgb('#B04A5A'),
-    syntaxKeyword: rgb('#2557C7'),
-    syntaxString: rgb('#8A6A00'),
-    syntaxComment: rgb('#8A8F98'),
-    syntaxNumber: rgb('#B25E1E'),
-    syntaxFunction: rgb('#0F7A8A'),
-    syntaxType: rgb('#8A3FC7'),
+    syntaxKeyword: rgb('#3F68B5'), // clear primary blue without neon saturation
+    syntaxString: rgb('#3F805F'), // readable muted green
+    syntaxComment: rgb('#7D858F'), // neutral blue-grey
+    syntaxNumber: rgb('#A7652B'), // warm amber accent
+    syntaxFunction: rgb('#2E7E8A'), // muted cyan
+    syntaxType: rgb('#7E55A4'), // softened violet
     syntaxVariable: rgb('#343945'),
     syntaxOperator: rgb('#5B6672'),
     syntaxPunctuation: rgb('#9AA0A8'),
-    syntaxConstant: rgb('#C2186B'),
+    syntaxConstant: rgb('#A84472'), // muted rose accent
     red_FOR_SUBAGENTS_ONLY: rgb('#BE5A52'),
     blue_FOR_SUBAGENTS_ONLY: rgb('#3F6CC4'),
     green_FOR_SUBAGENTS_ONLY: rgb('#4E9675'),
@@ -239,6 +247,14 @@ const lightTheme = {
     rainbow_blue_shimmer: rgb('#A9BCE0'),
     rainbow_indigo_shimmer: rgb('#B7AFD8'),
     rainbow_violet_shimmer: rgb('#CFB0CC'),
+    subagentBullet: rgb('#C07A93'),
+    subagentDescription: rgb('#343945'),
+    subagentModel: rgb('#8991A0'),
+    subagentElapsed: rgb('#8991A0'),
+    subagentToolName: rgb('#3F6CC4'),
+    subagentStatusRunning: rgb('#3F6CC4'),
+    subagentStatusCompleted: rgb('#4E9675'),
+    subagentStatusFailed: rgb('#C65D6B'),
 };
 /**
  * Dark ANSI theme using only the 16 standard ANSI colors, for terminals
@@ -337,6 +353,14 @@ const darkAnsiTheme = {
     rainbow_blue_shimmer: 'ansi:cyanBright',
     rainbow_indigo_shimmer: 'ansi:blueBright',
     rainbow_violet_shimmer: 'ansi:magentaBright',
+    subagentBullet: 'ansi:magentaBright',
+    subagentDescription: 'ansi:whiteBright',
+    subagentModel: 'ansi:white',
+    subagentElapsed: 'ansi:white',
+    subagentToolName: 'ansi:cyanBright',
+    subagentStatusRunning: 'ansi:blueBright',
+    subagentStatusCompleted: 'ansi:greenBright',
+    subagentStatusFailed: 'ansi:redBright',
 };
 /**
  * Resolve a theme name to its concrete color palette.

package/lib/types/tips.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tips.d.ts","sourceRoot":"","sources":["../../src/tips.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,GAAG,UAAU,CAAA;AAEhF,MAAM,WAAW,GAAG;IAClB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,QAAQ,CAAA;IACf,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,MAAM,CAAA;CACX;AAED,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAMzE,CAAA;AAED,eAAO,MAAM,IAAI,EAAE,SAAS,GAAG,EAsiB9B,CAAA;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,GAAE,MAAM,MAAoB,GAAG,GAAG,CAErE;AAED,0CAA0C;AAC1C,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,GAAG,EAAE,CAElD"}
+{"version":3,"file":"tips.d.ts","sourceRoot":"","sources":["../../src/tips.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,GAAG,UAAU,CAAA;AAEhF,MAAM,WAAW,GAAG;IAClB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,QAAQ,CAAA;IACf,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,MAAM,CAAA;CACX;AAED,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAMzE,CAAA;AAED,eAAO,MAAM,IAAI,EAAE,SAAS,GAAG,EAwjB9B,CAAA;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,GAAE,MAAM,MAAoB,GAAG,GAAG,CAErE;AAED,0CAA0C;AAC1C,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,GAAG,EAAE,CAElD"}

package/lib/types/tips.js

@@ -60,10 +60,10 @@ export const TIPS = [
         en: 'In trajectory, / queries fields like tool:, err:, >10s, tok>1k',
     },
     {
-        id: 'keys-ctrl-x',
+        id: 'keys-ctrl-g',
         group: 'keys',
-        zh: 'Ctrl+X 用 $VISUAL 编辑器编辑当前输入',
-        en: 'Ctrl+X edits your input in the $VISUAL editor',
+        zh: 'Ctrl+G 用 $VISUAL/$EDITOR 编辑器编辑当前输入',
+        en: 'Ctrl+G edits your input in the $VISUAL/$EDITOR editor',
     },
     {
         id: 'keys-ctrl-enter',
@@ -98,8 +98,14 @@ export const TIPS = [
     {
         id: 'keys-home-end',
         group: 'keys',
-        zh: 'Home/End 与 Ctrl+A 快速到行首/行尾',
-        en: 'Home/End and Ctrl+A jump to line start/end',
+        zh: 'Home/End 到行首/行尾，Ctrl+E 到行尾',
+        en: 'Home/End jump to line start/end; Ctrl+E to line end',
+    },
+    {
+        id: 'keys-ctrl-a',
+        group: 'keys',
+        zh: 'Ctrl+A 子代理面板：Enter 看详情 · X 中断 · Esc 关',
+        en: 'Ctrl+A opens the subagent dashboard; Enter details, X interrupt, Esc close',
     },
     {
         id: 'keys-edit-keys',
@@ -364,8 +370,8 @@ export const TIPS = [
     {
         id: 'flow-at',
         group: 'workflow',
-        zh: '任意位置 @ 补全文件，@ink 也能命中 src/ink',
-        en: '@ completes files anywhere; @ink matches src/ink',
+        zh: '@ 补全支持模糊匹配；@src/ 直达该目录',
+        en: '@ completes files with fuzzy matching; @dir/ lists that directory',
     },
     {
         id: 'flow-question-type',
@@ -470,6 +476,12 @@ export const TIPS = [
         zh: '全屏模式鼠标拖选即复制；Esc 取消选区',
         en: 'Drag-select copies instantly in fullscreen; Esc cancels',
     },
+    {
+        id: 'disp-wheel-sel',
+        group: 'display',
+        zh: '有文本选区时，滚轮平移选区而非滚动列表',
+        en: 'With a text selection, the wheel translates the selection, not the list',
+    },
     {
         id: 'disp-whale',
         group: 'display',
@@ -519,6 +531,12 @@ export const TIPS = [
         zh: '提示版本错位时，按提示 npm install -g 对齐启动器',
         en: 'On version skew, follow the npm install -g hint to align the launcher',
     },
+    {
+        id: 'pit-drift',
+        group: 'pitfalls',
+        zh: 'logo ⚠ 提示 dsh 版本不符时，按提示 npm i -g @deepseek-ai/dsh 对齐',
+        en: 'When the logo warns about dsh versions, follow the npm i -g @deepseek-ai/dsh hint',
+    },
     {
         id: 'pit-mac',
         group: 'pitfalls',

package/lib/types/update.d.ts

@@ -88,6 +88,24 @@ export declare function tuiUpdatePluginArgs(profile: string, targetVersion?: str
  * token, so matching both keeps the retry from masking real failures.
  */
 export declare function isTransientUpdateFailure(stderr: string): boolean;
+/**
+ * Best-effort migrate the GLOBAL launcher to the delegating shim (0.8.7):
+ * after a successful profile update, copy this package's `bin/dsh-tui.js`
+ * and `package.json` over the global install so the launcher can never lag
+ * the profile again — the shim delegates all logic to the profile copy it
+ * just updated. Single-file-safe by contract: the new bin imports nothing
+ * from lib/ (see its header), so overwriting it inside an older global
+ * install cannot dangle a missing helper.
+ *
+ * Locating the global dir relies on argv[1] being the global `dsh-tui.js`
+ * (true when booted through the `dsh-tui` command). Source checkouts and
+ * direct `dsh --profile` boots resolve nothing — the migration is a silent
+ * no-op there. Write failures (permissions, locked files) are equally
+ * silent: the launcher-alignment warning remains the fallback diagnosis.
+ *
+ * @returns true when the global launcher files were replaced.
+ */
+export declare function migrateGlobalLauncher(): boolean;
 /**
  * Update the installed dsh-tui package and restart the same launcher while
  * preserving the active session. The TUI must already be unmounted before

package/lib/types/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/update.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAIlD,OAAO,EAAE,UAAU,EAAE,CAAA;AAQrB,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf;AAED,4DAA4D;AAC5D,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3E;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAA;AAEvB,MAAM,WAAW,eAAe;IAC9B,8EAA8E;IAC9E,UAAU,EAAE,MAAM,CAAA;IAClB;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,gFAAgF;AAChF,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,SAAS,CAiBxD;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,GAAE,SAAS,MAAM,EAAiB,GAAG,MAAM,GAAG,SAAS,CAahG;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAW5C;AAED,6EAA6E;AAC7E,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAIzE;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAG7D;AA4BD;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,eAAe,CAAC,CAcvE;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAG5E;AA6DD,gFAAgF;AAChF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAIrF;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,eAAe,CAAC,CAuE1B"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/update.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAIlD,OAAO,EAAE,UAAU,EAAE,CAAA;AAQrB,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf;AAED,4DAA4D;AAC5D,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3E;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAA;AAEvB,MAAM,WAAW,eAAe;IAC9B,8EAA8E;IAC9E,UAAU,EAAE,MAAM,CAAA;IAClB;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,gFAAgF;AAChF,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,SAAS,CAiBxD;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,GAAE,SAAS,MAAM,EAAiB,GAAG,MAAM,GAAG,SAAS,CAahG;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAW5C;AAED,6EAA6E;AAC7E,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAIzE;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAG7D;AA4BD;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,eAAe,CAAC,CAcvE;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAG5E;AA6DD,gFAAgF;AAChF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAIrF;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,CA2C/C;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,eAAe,CAAC,CA+E1B"}