@agi-fans/dsh-tui 0.1.1 → 0.2.0

package/lib/hotkeys.js

@@ -1,9 +1,8 @@
 /**
- * Keyboard-shortcut catalog painted by `/hotkeys`.
+ * Keyboard-shortcut catalog embedded in `/help`.
  * @module @agi-fans/dsh-tui
  */
 import { DEFAULT_KEYBINDINGS } from "./keybindings-config.js";
-import { renderMarkdown } from "./markdown.js";
 function displayKey(key) {
     return key.split('+').map((part) => {
         const normalized = part.toLowerCase();
@@ -71,6 +70,7 @@ function sections(bindings) {
         {
             title: 'Session',
             rows: [
+                { keys: 'Esc twice', action: 'Rewind to an earlier conversation turn' },
                 { keys: 'Ctrl+C twice', action: 'Interrupt or clear, then exit' },
                 { keys: 'Ctrl+Z', action: 'Suspend to the background' },
                 { keys: 'Alt+L', action: 'Reset the terminal display' },
@@ -80,7 +80,7 @@ function sections(bindings) {
                 { keys: '@ / ./ / ~/', action: 'Complete file paths' },
                 { keys: 'Tab', action: 'Accept command or path completion' },
                 { keys: '/copy', action: 'Open the copy picker' },
-                { keys: '/hotkeys', action: 'Show this catalog' },
+                { keys: '/help', action: 'Show commands and keyboard shortcuts' },
             ],
         },
     ];
@@ -92,7 +92,7 @@ function tableCell(value) {
 export function hotkeyCount(bindings = DEFAULT_KEYBINDINGS) {
     return sections(bindings).reduce((total, section) => total + section.rows.length, 0);
 }
-/** Markdown tables used by the `/hotkeys` transcript panel. */
+/** Markdown tables embedded in the `/help` transcript panel. */
 export function formatHotkeysText(bindings = DEFAULT_KEYBINDINGS) {
     return sections(bindings).flatMap((section, index) => [
         ...(index === 0 ? [] : ['']),
@@ -102,14 +102,4 @@ export function formatHotkeysText(bindings = DEFAULT_KEYBINDINGS) {
         ...section.rows.map(row => `| \`${tableCell(row.keys)}\` | ${tableCell(row.action)} |`),
     ]).join('\n');
 }
-/** OMP-style command heading followed by grouped native Markdown tables. */
-export function renderHotkeysPanel(bindings, theme, width) {
-    const inset = width > 2 ? 1 : 0;
-    const contentWidth = Math.max(1, width - inset * 2);
-    const prefix = ' '.repeat(inset);
-    const title = theme.bold(theme.fg('accent', 'Keyboard Shortcuts'))
-        + theme.fg('muted', ` · ${hotkeyCount(bindings)} bindings`);
-    const body = renderMarkdown(formatHotkeysText(bindings), theme, contentWidth);
-    return [prefix + title, '', ...body.map(line => prefix + line)];
-}
 //# sourceMappingURL=hotkeys.js.map

package/lib/hotkeys.js.map

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

package/lib/provider-local.d.ts

@@ -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.
@@ -102,7 +102,10 @@ export declare class LocalTui implements TuiService {
     /** Compatibility helper for provider-level text editing tests and embedders. */
     readline(): Promise<string | null>;
     restoreInput(submission: TuiSubmission): void;
+    resolveQueueEdit(submission: TuiSubmission | null): void;
     onInterrupt(listener: () => void): () => void;
+    onQueueEdit(listener: () => void): () => void;
+    onRewind(listener: () => void): () => void;
     dispose(): void;
     /** Re-render the current frame (resize reflow). */
     refresh(): void;

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)
@@ -282,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)
@@ -337,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 };
         });
@@ -363,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;
@@ -471,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');
     }
@@ -506,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 } : {}),
@@ -761,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.
@@ -789,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') {
@@ -830,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();
             }
@@ -863,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;
@@ -1428,6 +1519,8 @@ export class LocalTui {
             return;
         }
         if (command.kind === 'historyPrev') {
+            if (this.#restoreLatestQueuedSubmission())
+                return;
             this.#historyPrev();
             return;
         }
@@ -1445,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;
@@ -1482,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;
@@ -1512,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();
@@ -1521,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;
@@ -1530,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 === '') {
@@ -1569,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;
@@ -1583,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) {
@@ -1601,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();
@@ -1684,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);