@agi-fans/dsh-tui 0.1.0 → 0.2.0

package/lib/provider-local.js

@@ -4,7 +4,7 @@
  * Owns the tty: raw-mode key input (editing, history, slash/tab
  * autocomplete, /settings overlay, /copy picker, Ctrl-R history search, PgUp/PgDn
  * and mouse-wheel transcript scroll, click-to-caret, Ctrl-O tool
- * expand, bracketed paste, double Ctrl-C exit, Ctrl-D quit),
+ * expand, bracketed paste, double-Escape conversation rewind, double Ctrl-C exit, Ctrl-D quit),
  * SIGWINCH reflow, and the differential renderer. In non-tty mode
  * (pipes, CI) it degrades to line-based input with plain append-only
  * printing of settled blocks.
@@ -22,12 +22,11 @@ import { buildCopyTargets, extractCopyTarget, parseCopyKind } from "./copy-targe
 import { applyHistorySearchEvent, createHistorySearch, hitTestHistorySearch, } from "./history-search.js";
 import { InputEditor, lineEnd, lineStart } from "./editor.js";
 import { applySettingsEvent, createSettings, hitTestSettings, selectSetting, tuiSettingItems, } from "./settings-list.js";
-import { applyEvent, blockLines, initialTranscript, renderView, TRANSCRIPT_FAST_SCROLL, TRANSCRIPT_WHEEL_SCROLL, } from "./event-views.js";
+import { applyEvent, blockLines, initialTranscript, replayEvents, renderView, TRANSCRIPT_FAST_SCROLL, TRANSCRIPT_WHEEL_SCROLL, } from "./event-views.js";
 import { flushPending, MOUSE_TRACKING_OFF, MOUSE_TRACKING_ON, parseKeys } from "./keys.js";
 import { LineRenderer } from "./renderer.js";
 import { hitTestEditor } from "./box.js";
 import { createTheme, detectTrueColor, parseThemeName } from "./theme.js";
-import { formatWorkspaceText } from "./pwd.js";
 import { TUI_SETTINGS_NAMESPACE, TuiSettingsSchema } from "./tui-settings.js";
 import { defaultStatusBarConfig, resolveStatusBarConfig } from "./status-config.js";
 import { HistoryStore } from "./history-store.js";
@@ -37,10 +36,12 @@ import { settingsNamespace } from '@deepseek-ai/dsh-settings';
 import { movePromptSelection, filteredPromptOptions, selectedPromptAnswer, selectedFilteredPromptAnswer, togglePromptSelection, } from "./prompt-selector.js";
 import { resolveProjectContext } from "./project-context.js";
 import { pickWelcomeTips } from "./welcome-tips.js";
+import { formatHotkeysText, hotkeyCount } from "./hotkeys.js";
 import { imageMarker, imagePathCandidates, probeImageDimensions, readImageFile, readImageFromClipboard, readMacClipboardFiles, } from "./image-paste.js";
 const APP_NAME = 'omdsh';
 const APP_VERSION = '0.1.0';
 const DOUBLE_CTRL_C_MS = 500;
+const DOUBLE_ESCAPE_MS = 500;
 function shortenPath(cwd) {
     const home = homedir();
     if (cwd === home)
@@ -73,11 +74,17 @@ export class LocalTui {
     #settings = null;
     #copySelector = null;
     #pending = null;
-    #queue = [];
+    #queuedSubmissions = [];
+    /** Newer queue entries temporarily detached while Up browses backward. */
+    #queueEditNewer = null;
+    #queueEditPending = false;
     #quitRequested = false;
     #resumeHintRequested = false;
     #lastSigintTime = 0;
+    #lastEscapeTime = 0;
     #interrupts = new Set();
+    #queueEdits = new Set();
+    #rewinds = new Set();
     #disposed = false;
     #pendingKeys = '';
     #escapeTimer = null;
@@ -202,6 +209,8 @@ export class LocalTui {
         }
     }
     setStatus(status) {
+        if (this.#state.status === 'compacting')
+            return;
         this.#state = { ...this.#state, status };
         this.#syncTick();
         if (this.#tty)
@@ -226,8 +235,14 @@ export class LocalTui {
         if (this.#tty)
             this.#render();
     }
-    notice(text, level = 'info') {
-        this.#state = { ...this.#state, blocks: [...this.#state.blocks, { kind: 'notice', level, text }] };
+    notice(text, options = {}) {
+        const block = {
+            kind: 'notice',
+            level: options.level ?? 'info',
+            text,
+            ...(options.framed === true ? { framed: true } : {}),
+        };
+        this.#state = { ...this.#state, blocks: [...this.#state.blocks, block] };
         if (this.#tty)
             this.#render();
         else
@@ -276,10 +291,8 @@ export class LocalTui {
         });
     }
     replaceSession(events, presentations) {
-        let state = initialTranscript();
-        for (const event of events)
-            state = applyEvent(state, event, presentations?.get(event.seq));
-        this.#state = { ...state, status: 'idle' };
+        const state = replayEvents(events, presentations);
+        this.#state = { ...state, status: 'idle', compactCommandId: undefined };
         this.#plainPrinted = 0;
         this.#followTail();
         if (this.#tty)
@@ -331,9 +344,11 @@ export class LocalTui {
             return this.#readlinePlain();
         // Lines submitted while a turn was still running were queued instead of
         // dropped; serve the oldest before waiting for fresh input.
-        const queued = this.#queue.shift();
-        if (queued !== undefined)
+        const queued = this.#queuedSubmissions.shift();
+        if (queued !== undefined) {
+            this.#render();
             return Promise.resolve(queued);
+        }
         return new Promise((resolve) => {
             this.#pending = { resolve };
         });
@@ -357,10 +372,49 @@ export class LocalTui {
         if (this.#tty)
             this.#render();
     }
+    resolveQueueEdit(submission) {
+        if (!this.#queueEditPending)
+            return;
+        this.#queueEditPending = false;
+        if (submission === null) {
+            if (this.#editor.text === '' && this.#images.length === 0 && this.#queueEditNewer?.length === 0) {
+                this.#queueEditNewer = null;
+            }
+            return;
+        }
+        if (this.#queueEditNewer === null)
+            this.#queueEditNewer = [];
+        if (this.#editor.text !== '' || this.#images.length > 0) {
+            this.#queueEditNewer.unshift(this.#currentSubmission());
+        }
+        this.#replaceInput(submission);
+    }
+    #currentSubmission() {
+        return {
+            text: this.#editor.text,
+            images: this.#images.map(image => ({ ...image })),
+        };
+    }
+    #replaceInput(submission) {
+        this.#images = submission.images.map(image => ({ ...image }));
+        this.#editor.setText(submission.text);
+        this.#historyIndex = 0;
+        this.#refreshAutocomplete();
+        if (this.#tty)
+            this.#render();
+    }
     onInterrupt(listener) {
         this.#interrupts.add(listener);
         return () => { this.#interrupts.delete(listener); };
     }
+    onQueueEdit(listener) {
+        this.#queueEdits.add(listener);
+        return () => { this.#queueEdits.delete(listener); };
+    }
+    onRewind(listener) {
+        this.#rewinds.add(listener);
+        return () => { this.#rewinds.delete(listener); };
+    }
     dispose() {
         if (this.#disposed)
             return;
@@ -465,7 +519,7 @@ export class LocalTui {
             this.#term.output.write(out);
     }
     #busy() {
-        if (this.#state.status === 'running')
+        if (this.#state.status !== 'idle')
             return true;
         return this.#state.blocks.some((block) => block.kind === 'tool' && block.status === 'running');
     }
@@ -500,6 +554,9 @@ export class LocalTui {
                 input: this.#editor.text,
                 inputCursor: this.#editor.cursor,
                 inputImages: this.#images.length,
+                queuedSubmissions: this.#queueEditNewer === null
+                    ? this.#queuedSubmissions
+                    : [...this.#queuedSubmissions, ...this.#queueEditNewer],
                 colors: this.#colors,
                 pwd: this.#pwd,
                 ...(this.#branch !== undefined ? { branch: this.#branch } : {}),
@@ -600,7 +657,7 @@ export class LocalTui {
     #startAsyncPaste(operation) {
         this.#pasteInFlight += 1;
         void operation.catch((error) => {
-            this.notice('Paste failed: ' + (error instanceof Error ? error.message : String(error)), 'error');
+            this.notice('Paste failed: ' + (error instanceof Error ? error.message : String(error)), { level: 'error' });
         }).finally(() => {
             this.#pasteInFlight = Math.max(0, this.#pasteInFlight - 1);
             if (this.#pasteInFlight !== 0 || this.#deferredPasteEvents.length === 0)
@@ -755,6 +812,22 @@ export class LocalTui {
         this.#editor.setText(text, Math.min(this.#editor.cursor, text.length));
     }
     #dispatch(event) {
+        if (this.#state.status === 'compacting') {
+            if (event.type === 'mouse' && event.wheel !== null) {
+                this.#scrollBy(event.wheel < 0 ? -TRANSCRIPT_WHEEL_SCROLL : TRANSCRIPT_WHEEL_SCROLL, true);
+                return;
+            }
+            if (event.type === 'key' && event.id === 'pageUp') {
+                this.#scrollBy(-this.#pageSize());
+                return;
+            }
+            if (event.type === 'key' && event.id === 'pageDown') {
+                this.#scrollBy(this.#pageSize());
+                return;
+            }
+            if (event.type !== 'key' || event.id !== 'ctrl+c')
+                return;
+        }
         // Clipboard image inspection is asynchronous. Preserve the exact key
         // order so a fast Ctrl+V, Enter submits the finished image draft rather
         // than an empty prompt.
@@ -783,9 +856,12 @@ export class LocalTui {
             return;
         }
         if (event.type === 'mouse') {
+            this.#lastEscapeTime = 0;
             this.#handleMouse(event);
             return;
         }
+        if (event.type !== 'key' || event.id !== 'escape')
+            this.#lastEscapeTime = 0;
         if (this.#handlePrompt(event))
             return;
         if (event.type === 'key') {
@@ -824,7 +900,7 @@ export class LocalTui {
                 return;
             }
             this.#lastSigintTime = now;
-            if (this.#state.status === 'running') {
+            if (this.#state.status !== 'idle') {
                 for (const listener of this.#interrupts)
                     listener();
             }
@@ -857,8 +933,29 @@ export class LocalTui {
             this.#applySearch(event);
             return;
         }
-        if (this.#handleAutocomplete(event))
+        if (this.#handleAutocomplete(event)) {
+            if (event.type === 'key' && event.id === 'escape')
+                this.#lastEscapeTime = 0;
             return;
+        }
+        if (event.type === 'key' && event.id === 'escape') {
+            if (this.#state.status !== 'idle' || this.#pending === null
+                || this.#editor.text !== '' || this.#images.length > 0) {
+                this.#lastEscapeTime = 0;
+            }
+            else {
+                const now = Date.now();
+                if (now - this.#lastEscapeTime < DOUBLE_ESCAPE_MS) {
+                    this.#lastEscapeTime = 0;
+                    for (const listener of this.#rewinds)
+                        listener();
+                }
+                else {
+                    this.#lastEscapeTime = now;
+                }
+                return;
+            }
+        }
         if (event.type === 'key' && (event.id === 'backspace' || event.id === 'delete')
             && this.#removeImageAtCursor(event.id))
             return;
@@ -1422,6 +1519,8 @@ export class LocalTui {
             return;
         }
         if (command.kind === 'historyPrev') {
+            if (this.#restoreLatestQueuedSubmission())
+                return;
             this.#historyPrev();
             return;
         }
@@ -1439,6 +1538,8 @@ export class LocalTui {
         if (command.kind === 'clear') {
             this.#editor.clear();
             this.#images = [];
+            this.#queueEditNewer = null;
+            this.#queueEditPending = false;
             this.#historyIndex = 0;
             this.#ac = null;
             this.#search = null;
@@ -1476,6 +1577,41 @@ export class LocalTui {
         this.#refreshAutocomplete();
         this.#render();
     }
+    #restoreLatestQueuedSubmission() {
+        if (this.#queueEditPending)
+            return true;
+        if (this.#queueEditNewer !== null) {
+            const previous = this.#queuedSubmissions.pop();
+            if (previous !== undefined) {
+                this.#queueEditNewer.unshift(this.#currentSubmission());
+                this.#replaceInput(previous);
+                return true;
+            }
+            const hasDurableFollowup = this.#state.nextTurnInbox.some(message => message.source.kind === 'user');
+            if (!hasDurableFollowup || this.#queueEdits.size === 0)
+                return true;
+            this.#queueEditPending = true;
+            for (const listener of this.#queueEdits)
+                listener();
+            return true;
+        }
+        if (this.#editor.text !== '' || this.#images.length > 0 || this.#historyIndex !== 0)
+            return false;
+        const submission = this.#queuedSubmissions.pop();
+        if (submission !== undefined) {
+            this.#queueEditNewer = [];
+            this.#replaceInput(submission);
+            return true;
+        }
+        const hasDurableFollowup = this.#state.nextTurnInbox.some(message => message.source.kind === 'user');
+        if (!hasDurableFollowup || this.#queueEdits.size === 0)
+            return false;
+        this.#queueEditNewer = [];
+        this.#queueEditPending = true;
+        for (const listener of this.#queueEdits)
+            listener();
+        return true;
+    }
     #historyNext() {
         if (this.#images.length > 0)
             return;
@@ -1506,6 +1642,7 @@ export class LocalTui {
         }
         const images = this.#images.map(image => ({ ...image }));
         const submittedText = images.length > 0 ? text.trim() : text;
+        const queueEditNewer = this.#queueEditNewer;
         const historyText = images.reduce((value, image, index) => value.replaceAll(imageMarker(index, image), ''), submittedText)
             .replace(/[ \t]{2,}/gu, ' ')
             .trim();
@@ -1515,6 +1652,8 @@ export class LocalTui {
         }
         this.#historyIndex = 0;
         this.#draft = '';
+        this.#queueEditNewer = null;
+        this.#queueEditPending = false;
         this.#editor.setText('');
         this.#images = [];
         this.#ac = null;
@@ -1524,18 +1663,26 @@ export class LocalTui {
         this.#followTail();
         const slash = images.length === 0 ? parseSlashInput(submittedText) : null;
         if (slash !== null) {
+            if (queueEditNewer !== null)
+                this.#queuedSubmissions.push(...queueEditNewer);
             this.#runSlash(slash.name, slash.args);
             return;
         }
-        this.#render();
         const pending = this.#pending;
         if (pending !== null) {
             this.#pending = null;
             pending.resolve({ text: submittedText, images });
+            if (queueEditNewer !== null)
+                this.#queuedSubmissions.push(...queueEditNewer);
         }
-        else if (submittedText !== '' || images.length > 0) {
-            this.#queue.push({ text: submittedText, images });
+        else if (submittedText !== '' || images.length > 0 || queueEditNewer !== null) {
+            if (submittedText !== '' || images.length > 0) {
+                this.#queuedSubmissions.push({ text: submittedText, images });
+            }
+            if (queueEditNewer !== null)
+                this.#queuedSubmissions.push(...queueEditNewer);
         }
+        this.#render();
     }
     #runSlash(name, args = '') {
         if (name === '') {
@@ -1563,11 +1710,6 @@ export class LocalTui {
             this.#runSettings(args);
             return;
         }
-        if (command.name === 'hotkeys') {
-            this.#hotkeyCatalog();
-            this.#render();
-            return;
-        }
         if (command.name === 'copy') {
             void this.#runCopy(args);
             return;
@@ -1577,17 +1719,7 @@ export class LocalTui {
             this.#render();
             return;
         }
-        if (command.name === 'pwd') {
-            this.#notice(formatWorkspaceText({
-                cwd: process.cwd(),
-                model: this.#model,
-                ...(this.#branch !== undefined ? { branch: this.#branch } : {}),
-            }));
-            this.#render();
-            return;
-        }
         if (!BUILTIN_SLASH_COMMANDS.some((entry) => entry.name === command.name)) {
-            this.#render();
             const raw = '/' + name + (args === '' ? '' : ' ' + args);
             const pending = this.#pending;
             if (pending !== null) {
@@ -1595,13 +1727,24 @@ export class LocalTui {
                 pending.resolve({ text: raw, images: [] });
             }
             else {
-                this.#queue.push({ text: raw, images: [] });
+                this.#queuedSubmissions.push({ text: raw, images: [] });
             }
+            this.#render();
             return;
         }
         this.#state = {
             ...this.#state,
-            blocks: [...this.#state.blocks, { kind: 'commandOutput', command: 'help', text: formatHelpText(this.#commands()) }],
+            blocks: [...this.#state.blocks, {
+                    kind: 'commandOutput',
+                    command: 'help',
+                    text: [
+                        formatHelpText(this.#commands()),
+                        '',
+                        `**Keyboard Shortcuts · ${hotkeyCount(this.#keybindings)} bindings**`,
+                        '',
+                        formatHotkeysText(this.#keybindings),
+                    ].join('\n'),
+                }],
         };
         this.#focusLatestBlock();
         this.#render();
@@ -1678,13 +1821,6 @@ export class LocalTui {
         };
         this.#focusLatestBlock();
     }
-    #hotkeyCatalog() {
-        this.#state = {
-            ...this.#state,
-            blocks: [...this.#state.blocks, { kind: 'hotkeyCatalog', bindings: this.#keybindings }],
-        };
-        this.#focusLatestBlock();
-    }
     #focusLatestBlock() {
         this.#follow = false;
         this.#focusBlock = Math.max(0, this.#state.blocks.length - 1);
@@ -1716,7 +1852,7 @@ export class LocalTui {
             this.#reconcileImageDrafts();
         }
         catch (error) {
-            this.notice(error instanceof Error ? error.message : String(error), 'error');
+            this.notice(error instanceof Error ? error.message : String(error), { level: 'error' });
         }
         finally {
             this.#term.input.setRawMode?.(true);