@deepseek-harness-tui/dsh-tui 0.7.1 → 0.7.2

package/lib/types/screens/Chat.js

@@ -5,6 +5,8 @@ import { AlternateScreen, Box, Text, useInput, ScrollBox, useTheme, useTerminalS
 import { POINTER } from '../cc/figures.js';
 import { isMod, isPlainReturnInput, modLabel } from '../utils/modifiers.js';
 import { formatTokens } from '../cc/format.js';
+import { homeDir } from '../utils/paths.js';
+import { sessionCwdMatches } from '../dsh-adapter/channel.js';
 import { runProviderWizard } from '../dsh-adapter/providerWizard.js';
 import { ApprovalStore } from '../dsh-adapter/approvals.js';
 import { AskUserQuestionPanel } from '../components/questions/AskUserQuestionPanel.js';
@@ -24,7 +26,7 @@ import { StatusLine } from './StatusLine.js';
 import { WorkingSpinner, useThinkingStatus } from '../components/WorkingSpinner.js';
 import { ActivityLine, contextPressurePct } from '../components/ActivityLine.js';
 import { ModelPicker } from '../components/ModelPicker.js';
-import { ResumePicker } from '../components/ResumePicker.js';
+import { SessionBrowser } from './SessionBrowser.js';
 import { WorkspacePicker } from '../components/WorkspacePicker.js';
 import { WorkspaceFlowPicker } from '../components/WorkspaceFlowPicker.js';
 import { ActivityPicker } from '../components/ActivityPicker.js';
@@ -150,12 +152,9 @@ export function Chat({ channel, questionStore, approvalStore, onExit, onUpdate,
     const [modelPickerOpen, setModelPickerOpen] = React.useState(false);
     const [models, setModels] = React.useState([]);
     const [modelIndex, setModelIndex] = React.useState(0);
-    const [resumePickerOpen, setResumePickerOpen] = React.useState(false);
-    const [resumeSessions, setResumeSessions] = React.useState([]);
-    const [resumeIndex, setResumeIndex] = React.useState(0);
-    /** `/resume` session management (issue #112): plain selection, a delete
-     *  confirmation (ctrl+d), or the inline rename input (ctrl+r). */
-    const [resumeMode, setResumeMode] = React.useState('list');
+    /** `/resume` opens the session browser, a screen rather than a panel. It
+     *  owns its own selection, filters and keyboard — Chat only opens it. */
+    const [browserOpen, setBrowserOpen] = React.useState(false);
     const [workspacePickerOpen, setWorkspacePickerOpen] = React.useState(false);
     const [workspaceTargets, setWorkspaceTargets] = React.useState([]);
     const [workspaceIndex, setWorkspaceIndex] = React.useState(0);
@@ -165,7 +164,6 @@ export function Chat({ channel, questionStore, approvalStore, onExit, onUpdate,
     const [workspaceFlowInput, setWorkspaceFlowInput] = React.useState(null);
     const workspaceFlowRequestRef = React.useRef(0);
     const workspaceFlowAbortRef = React.useRef(null);
-    const [resumeRenameText, setResumeRenameText] = React.useState('');
     /** `/activity` indicator picker (pi extension's interactive select). */
     const [activityPickerOpen, setActivityPickerOpen] = React.useState(false);
     const [activityIndex, setActivityIndex] = React.useState(0);
@@ -663,22 +661,10 @@ export function Chat({ channel, questionStore, approvalStore, onExit, onUpdate,
             }
             case 'resume': {
                 setHelpOpen(false);
-                void (async () => {
-                    const sessions = await channel.listSessions();
-                    // The current session cannot be resumed into itself (agents.resume
-                    // rejects a live session), so it is excluded from the picker —
-                    // otherwise the fresh empty session of this launch always tops the
-                    // list as an unopenable row.
-                    const pickable = sessions.filter(session => session.id !== channel.agentId);
-                    setResumeSessions(pickable);
-                    if (pickable.length === 0) {
-                        channel.notify(t('resume-none-in-cwd'));
-                        return;
-                    }
-                    setResumeMode('list');
-                    setResumePickerOpen(true);
-                    setResumeIndex(0);
-                })();
+                // The browser opens immediately and loads its own list. Waiting for
+                // the listing here would make `/resume` feel slower the more history
+                // a project has, which is exactly backwards.
+                setBrowserOpen(true);
                 return true;
             }
             case 'workspace': {
@@ -1182,6 +1168,11 @@ export function Chat({ channel, questionStore, approvalStore, onExit, onUpdate,
         // not block the event from reaching the panel.
         if (btw !== null)
             return;
+        // Same for the session browser: it renders instead of the conversation,
+        // so every key belongs to it — including the plain letters that drive its
+        // search box, which Chat would otherwise route into the prompt.
+        if (browserOpen)
+            return;
         // The questionnaire / approval panel owns the keyboard while one is
         // pending (the panel's own useInput handles ↑/↓/Space/Tab/Enter/Esc;
         // the prompt input is unmounted, so nothing else should see these keys).
@@ -1407,123 +1398,6 @@ export function Chat({ channel, questionStore, approvalStore, onExit, onUpdate,
             }
             return;
         }
-        if (resumePickerOpen) {
-            const resumeSession = resumeSessions[resumeIndex];
-            // Session management modes (issue #112): the list keys stay untouched
-            // until ctrl+d/ctrl+r switch into a sub-mode, each with Enter/Esc.
-            if (resumeMode === 'confirm-delete') {
-                if (plainReturn) {
-                    setResumeMode('list');
-                    // oxlint-disable-next-line typescript/no-unnecessary-condition -- runtime guard: out-of-range index on an empty list
-                    if (resumeSession) {
-                        const target = resumeSession;
-                        void (async () => {
-                            const ok = await channel.deleteSession(target.id);
-                            if (!ok) {
-                                channel.notify(t('resume-delete-failed', { name: target.title || target.id }), { color: 'error' });
-                                return;
-                            }
-                            channel.notify(t('resume-deleted', { name: target.title || target.id }));
-                            // Refresh right away so the row disappears in place; closing
-                            // the picker when nothing resumable remains.
-                            const sessions = await channel.listSessions();
-                            const pickable = sessions.filter(session => session.id !== channel.agentId);
-                            setResumeSessions(pickable);
-                            if (pickable.length === 0) {
-                                setResumePickerOpen(false);
-                            }
-                            else {
-                                setResumeIndex(index => Math.min(index, pickable.length - 1));
-                            }
-                        })();
-                    }
-                }
-                else if (key.escape) {
-                    setResumeMode('list');
-                }
-                return;
-            }
-            if (resumeMode === 'rename') {
-                if (plainReturn) {
-                    setResumeMode('list');
-                    const title = resumeRenameText.trim();
-                    // oxlint-disable-next-line typescript/no-unnecessary-condition -- runtime guard: out-of-range index on an empty list
-                    if (resumeSession && title.length > 0) {
-                        const target = resumeSession;
-                        void (async () => {
-                            const ok = await channel.renameSessionTo(target.id, title);
-                            if (!ok) {
-                                channel.notify(t('resume-rename-failed', { name: target.title || target.id }), { color: 'error' });
-                                return;
-                            }
-                            channel.notify(t('rename-done', { title }));
-                            // Re-list so the row reflects the persisted state, but patch
-                            // the renamed row's title explicitly: listSessions resolves
-                            // persisted titles only within the MRU top SESSION_TITLE_DEPTH
-                            // window, and a freshly renamed row must never snap back to
-                            // the basename fallback in between.
-                            const sessions = await channel.listSessions();
-                            const next = sessions
-                                .filter(session => session.id !== channel.agentId)
-                                .map(session => (session.id === target.id ? { ...session, title } : session));
-                            setResumeSessions(next);
-                            // Re-anchor focus on the renamed row: renameSessionTo touches
-                            // MRU, so the re-listed order shifts — a kept index would
-                            // silently point at a DIFFERENT session, and a following
-                            // Enter/ctrl+d would act on the wrong one (review leftover).
-                            const anchored = next.findIndex(session => session.id === target.id);
-                            if (anchored >= 0)
-                                setResumeIndex(anchored);
-                        })();
-                    }
-                }
-                else if (key.escape) {
-                    setResumeMode('list');
-                }
-                else if (key.backspace) {
-                    setResumeRenameText(text => text.slice(0, -1));
-                }
-                else if (!key.ctrl && !key.meta && !key.super && input) {
-                    // Single-line title: pasted newlines collapse to spaces.
-                    setResumeRenameText(text => text + input.replace(/[\r\n]+/g, ' '));
-                }
-                return;
-            }
-            if (key.upArrow) {
-                setResumeIndex(index => (index <= 0 ? resumeSessions.length - 1 : index - 1));
-            }
-            else if (key.downArrow) {
-                setResumeIndex(index => (index >= resumeSessions.length - 1 ? 0 : index + 1));
-            }
-            else if (plainReturn) {
-                // oxlint-disable-next-line typescript/no-unnecessary-condition -- runtime guard: out-of-range index on an empty list
-                if (resumeSession) {
-                    // Enter switches the live agent to the persisted session right
-                    // away (the history replays into the transcript); the resume.txt
-                    // launcher marker is refreshed by resumeTo so `--resume` on the
-                    // next launch opens the same session.
-                    setResumePickerOpen(false);
-                    void channel.resumeTo(resumeSession.id).then((ok) => {
-                        if (ok)
-                            channel.notify(t('resume-resumed'));
-                    });
-                }
-                else {
-                    setResumePickerOpen(false);
-                }
-            }
-            else if (key.escape) {
-                setResumePickerOpen(false);
-            }
-            else if (isMod(key) && input === 'd' && resumeSession) {
-                setResumeMode('confirm-delete');
-            }
-            else if (isMod(key) && input === 'r' && resumeSession) {
-                setResumeRenameText(resumeSession.title || '');
-                setResumeMode('rename');
-            }
-            return;
-        }
         if (modelPickerOpen) {
             if (key.upArrow) {
                 setModelIndex(index => (index <= 0 ? models.length - 1 : index - 1));
@@ -1815,8 +1689,18 @@ export function Chat({ channel, questionStore, approvalStore, onExit, onUpdate,
     // Working-activity line (spinner slot): context-pressure prefix shares the
     // StatusLine thresholds (amber ≥ 80, red ≥ 95).
     const activityWarnPct = contextPressurePct(channel.lastUsage, channel.contextWindow);
+    // The browser is a screen, not an overlay: it REPLACES the conversation
+    // rather than floating above it. Rendering it as an early return (after
+    // every hook above has run) is what makes that literal — there is no
+    // transcript underneath to be repainted, scrolled, or bled through.
+    if (browserOpen) {
+        const browser = (_jsx(SessionBrowser, { channel: channel, home: homeDir(), sameProject: sessionCwdMatches, onClose: () => setBrowserOpen(false) }));
+        // Inline hosts enter the alternate screen for the duration; full-screen
+        // hosts are already in it and must not nest a second one.
+        return fullscreen ? browser : _jsx(AlternateScreen, { children: browser });
+    }
     /** Prompt input is inert while a modal dialog owns the keyboard. */
-    const promptSelectionActive = selectionActive || modelPickerOpen || resumePickerOpen || workspacePickerOpen || workspaceFlow !== null || activityPickerOpen ||
+    const promptSelectionActive = selectionActive || modelPickerOpen || workspacePickerOpen || workspaceFlow !== null || activityPickerOpen ||
         effortSliderOpen || presetPickerOpen || themePickerOpen || thinkingOpen || historyOpen || rewindOpen || searchOpen ||
         btw !== null;
     // The trajectory scene replaces the conversation for as long as it is open.
@@ -1837,7 +1721,7 @@ export function Chat({ channel, questionStore, approvalStore, onExit, onUpdate,
     // 常驻、只移除其普通子节点，blit 解毒不触发，被覆盖的转录行会在
     // blit-skip 后留空（Esc 关 picker 一片空白的根因）。
     const dialogOverlayOpen = thinkingOpen || (workspacePickerOpen && workspaceTargets.length > 0) || workspaceFlow !== null ||
-        (resumePickerOpen && resumeSessions.length > 0) || modelPickerOpen ||
+        modelPickerOpen ||
         activityPickerOpen || (effortSliderOpen && effortOptions.length > 1) ||
         (presetPickerOpen && presetOptions.length > 0) || themePickerOpen || historyOpen ||
         rewindOpen || searchOpen;
@@ -1862,7 +1746,7 @@ export function Chat({ channel, questionStore, approvalStore, onExit, onUpdate,
                                 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 }) })), resumePickerOpen && resumeSessions.length > 0 && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(ResumePicker, { sessions: resumeSessions, focusIndex: resumeIndex, currentSessionId: channel.agentId, mode: resumeMode, renameText: resumeRenameText }) })), modelPickerOpen && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: models.length === 0 ? (_jsx(ModelPickerLoading, {})) : (_jsx(ModelPicker, { models: models, focusIndex: modelIndex, currentModel: `${channel.provider}/${channel.model}` })) })), 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 }) })), 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, 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}` })) })), 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 }) })), 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/SessionBrowser.d.ts

@@ -0,0 +1,37 @@
+import React from 'react';
+import type { Channel } from '../dsh-adapter/channel.js';
+/**
+ * The session browser — `/resume` as a screen of its own.
+ *
+ * The old picker was a panel of eight titles and a timestamp, and the reason
+ * it could not be more than that was never layout: the data behind it was five
+ * fields wide. With every session now arriving classified, sized, dated and
+ * attributed, the surface that shows them can do the job a person actually
+ * came for — find one conversation among many.
+ *
+ * What that means concretely:
+ *
+ * - Search is always live. There is no mode to enter; typing filters, because
+ *   the list is the search results.
+ * - Delegated sub-agent runs are folded away by default and revealed under
+ *   their parents on demand. They are not noise to be deleted — they are the
+ *   model's own work, and it is worth being able to open one — but they are
+ *   not what "resume a conversation" means, and there are five of them for
+ *   every conversation.
+ * - Sessions that hold no conversation are never listed, only counted, with
+ *   one action to clear them.
+ * - The preview shows the end of a session, so "is this the one I was in the
+ *   middle of" is answerable without resuming it.
+ *
+ * Every one of those reads bounded data, so the screen behaves the same on a
+ * fifty-session history as on a five-session one.
+ */
+export declare function SessionBrowser({ channel, home, sameProject, onClose, }: {
+    channel: Channel;
+    /** Home directory, for collapsing project paths to `~`. */
+    home: string;
+    /** Whether a stored cwd belongs to the same project as the live session. */
+    sameProject: (a: string, b: string) => boolean;
+    onClose: () => void;
+}): React.ReactNode;
+//# sourceMappingURL=SessionBrowser.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SessionBrowser.d.ts","sourceRoot":"","sources":["../../../src/screens/SessionBrowser.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAsBzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAoDxD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,cAAc,CAAC,EAC7B,OAAO,EACP,IAAI,EACJ,WAAW,EACX,OAAO,GACR,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAA;IACZ,4EAA4E;IAC5E,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,CAAA;IAC9C,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB,GAAG,KAAK,CAAC,SAAS,CAydlB"}