@pellux/goodvibes-tui 0.19.94 → 0.19.96

package/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to GoodVibes TUI.
 
 ---
 
+## [0.19.96] — 2026-05-11
+
+### Changes
+- 77abb7be fix: navigate multiline prompt history
+
+## [0.19.95] — 2026-05-11
+
+### Changes
+- e04ad422 fix: preserve first typed key after recovery prompt
+
 ## [0.19.94] — 2026-05-11
 
 ### Changes

package/README.md

@@ -2,7 +2,7 @@
 
 [![CI](https://github.com/mgd34msu/goodvibes-tui/actions/workflows/ci.yml/badge.svg)](https://github.com/mgd34msu/goodvibes-tui/actions/workflows/ci.yml)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Version](https://img.shields.io/badge/version-0.19.94-blue.svg)](https://github.com/mgd34msu/goodvibes-tui)
+[![Version](https://img.shields.io/badge/version-0.19.96-blue.svg)](https://github.com/mgd34msu/goodvibes-tui)
 
 A terminal-native AI coding, operations, automation, knowledge, and integration console with a typed runtime, omnichannel surfaces, structured memory/knowledge, and a raw ANSI renderer.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pellux/goodvibes-tui",
-  "version": "0.19.94",
+  "version": "0.19.96",
   "description": "Terminal-native GoodVibes product for coding, operations, automation, knowledge, channels, and daemon-backed control-plane workflows.",
   "type": "module",
   "main": "src/main.ts",

package/src/input/feed-context-factory.ts

@@ -56,6 +56,7 @@ import type { PanelMouseLayout } from './handler-feed-routes.ts';
 export interface FeedContextMutableInit {
   prompt: string;
   cursorPos: number;
+  inputScrollTop: number;
   commandMode: boolean;
   panelFocused: boolean;
   indicatorFocused: boolean;
@@ -230,6 +231,7 @@ export function syncFeedContextMutableFields(
 ): void {
   ctx.prompt = fields.prompt;
   ctx.cursorPos = fields.cursorPos;
+  ctx.inputScrollTop = fields.inputScrollTop;
   ctx.commandMode = fields.commandMode;
   ctx.panelFocused = fields.panelFocused;
   ctx.indicatorFocused = fields.indicatorFocused;

package/src/input/handler-feed-routes.ts

@@ -6,6 +6,11 @@ import type { CommandRegistry, CommandContext } from './command-registry.ts';
 import type { AutocompleteEngine } from './autocomplete.ts';
 import type { SelectionManager } from './selection.ts';
 import type { WrappedPromptInfo } from './handler-prompt-buffer.ts';
+import {
+  ensureInputCursorVisible as computeInputScrollTop,
+  getWrappedPromptInfo as computeWrappedPromptInfo,
+  moveCursorVertical as computeCursorVerticalMove,
+} from './handler-prompt-buffer.ts';
 import { cleanupMarkerRegistry, expandPrompt, findMarkerAtPos, registerPaste } from './handler-content-actions.ts';
 import type { PanelManager } from '../panels/panel-manager.ts';
 import type { KeybindingsManager } from './keybindings.ts';
@@ -243,8 +248,10 @@ export function handlePromptTextToken(state: TextRouteState, token: InputToken):
 export type KeyRouteState = {
   prompt: string;
   cursorPos: number;
+  inputScrollTop: number;
   commandMode: boolean;
   contentWidth: number;
+  maxInputRows: number;
   inputHistory: InputHistory | null;
   indicatorFocused: boolean;
   conversationManager: ConversationManager | null;
@@ -271,6 +278,7 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
   handled: boolean;
   prompt: string;
   cursorPos: number;
+  inputScrollTop: number;
   commandMode: boolean;
   indicatorFocused: boolean;
 } {
@@ -279,6 +287,7 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
       handled: false,
       prompt: state.prompt,
       cursorPos: state.cursorPos,
+      inputScrollTop: state.inputScrollTop,
       commandMode: state.commandMode,
       indicatorFocused: state.indicatorFocused,
     };
@@ -286,8 +295,12 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
 
   let prompt = state.prompt;
   let cursorPos = state.cursorPos;
+  let inputScrollTop = state.inputScrollTop;
   let commandMode = state.commandMode;
   let indicatorFocused = state.indicatorFocused;
+  const ensureLocalInputCursorVisible = () => {
+    inputScrollTop = computeInputScrollTop(prompt, cursorPos, inputScrollTop, state.contentWidth, state.maxInputRows);
+  };
   const runQuitShortcut = (commandName: 'quit' | 'wq') => {
     if (state.commandContext?.executeCommand) {
       void state.commandContext.executeCommand(commandName, []).catch((error) => {
@@ -304,15 +317,15 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
     if (!state.handlePathCompletion()) {
       state.handleBlockToggle();
     }
-    return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+    return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
   if (token.logicalName === 'enter') {
     if (token.shift) {
       prompt = prompt.slice(0, cursorPos) + '\n' + prompt.slice(cursorPos);
       cursorPos++;
-      state.ensureInputCursorVisible();
-      return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+      ensureLocalInputCursorVisible();
+      return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
     }
 
     const text = prompt.trim();
@@ -323,7 +336,7 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
         state.modalOpened('blockActions');
         state.blockActionsMenu.open(nearest);
         state.requestRender();
-        return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+        return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
       }
     }
     if (text === ':q' || text === ':wq') {
@@ -331,7 +344,7 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
       cursorPos = 0;
       runQuitShortcut(text === ':wq' ? 'wq' : 'quit');
       state.requestRender();
-      return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+      return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
     }
     if (text) {
       const expanded = state.expandPrompt(text);
@@ -354,7 +367,7 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
         state.commandContext?.submitInput?.(textOnly, expanded);
       }
     }
-    return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+    return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
   if (token.logicalName === 'backspace') {
@@ -376,9 +389,9 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
         prompt = prompt.slice(0, cursorPos - 1) + prompt.slice(cursorPos);
         cursorPos--;
       }
-      state.ensureInputCursorVisible(state.contentWidth);
+      ensureLocalInputCursorVisible();
     }
-    return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+    return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
   if (token.logicalName === 'delete') {
@@ -392,52 +405,58 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
       } else {
         prompt = prompt.slice(0, cursorPos) + prompt.slice(cursorPos + 1);
       }
-      state.ensureInputCursorVisible(state.contentWidth);
+      ensureLocalInputCursorVisible();
     }
     state.requestRender();
-    return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+    return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
   if (token.logicalName === 'left') {
     if (cursorPos > 0) {
       const marker = state.findMarkerAtPos(cursorPos);
       cursorPos = marker ? marker.start : cursorPos - 1;
-      state.ensureInputCursorVisible(state.contentWidth);
+      ensureLocalInputCursorVisible();
     }
     state.requestRender();
-    return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+    return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
   if (token.logicalName === 'right') {
     if (cursorPos < prompt.length) {
       const marker = state.findMarkerAtPos(cursorPos + 1);
       cursorPos = marker ? marker.end : cursorPos + 1;
-      state.ensureInputCursorVisible(state.contentWidth);
+      ensureLocalInputCursorVisible();
     }
     state.requestRender();
-    return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+    return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
   if (token.logicalName === 'home') {
     cursorPos = 0;
-    return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+    ensureLocalInputCursorVisible();
+    return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
   if (token.logicalName === 'end') {
     cursorPos = prompt.length;
-    return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+    ensureLocalInputCursorVisible();
+    return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
   if (token.logicalName === 'up') {
-    if (!state.moveCursorVertical(-1)) {
-      const info = state.getWrappedPromptInfo(state.contentWidth);
+    const move = computeCursorVerticalMove(prompt, cursorPos, inputScrollTop, state.contentWidth, state.maxInputRows, -1);
+    if (move.moved) {
+      cursorPos = move.cursorPos;
+      inputScrollTop = move.inputScrollTop;
+    } else {
+      const info = computeWrappedPromptInfo(prompt, cursorPos, inputScrollTop, state.contentWidth, state.maxInputRows);
       if (info.cursorWrappedLine === 0) {
         if (state.inputHistory) {
           const recalled = state.inputHistory.up(prompt);
           if (recalled !== null) {
             prompt = recalled;
             cursorPos = recalled.length;
-            state.ensureInputCursorVisible();
+            ensureLocalInputCursorVisible();
           } else {
             state.scroll(-3);
           }
@@ -446,22 +465,23 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
         }
       }
     }
-    return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+    return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
   if (token.logicalName === 'down') {
-    if (!state.moveCursorVertical(1)) {
-      const info = state.getWrappedPromptInfo(state.contentWidth);
-      if (info.wrappedLines.length <= 1) {
-        if (state.inputHistory?.isBrowsing) {
-          const recalled = state.inputHistory.down();
-          if (recalled !== null) {
-            prompt = recalled;
-            cursorPos = recalled.length;
-            state.ensureInputCursorVisible();
-          } else {
-            indicatorFocused = true;
-          }
+    const move = computeCursorVerticalMove(prompt, cursorPos, inputScrollTop, state.contentWidth, state.maxInputRows, 1);
+    if (move.moved) {
+      cursorPos = move.cursorPos;
+      inputScrollTop = move.inputScrollTop;
+    } else {
+      const info = computeWrappedPromptInfo(prompt, cursorPos, inputScrollTop, state.contentWidth, state.maxInputRows);
+      const atBottom = info.cursorWrappedLine >= info.wrappedLines.length - 1;
+      if (atBottom && state.inputHistory?.isBrowsing) {
+        const recalled = state.inputHistory.down();
+        if (recalled !== null) {
+          prompt = recalled;
+          cursorPos = recalled.length;
+          ensureLocalInputCursorVisible();
         } else {
           indicatorFocused = true;
         }
@@ -469,17 +489,17 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
         indicatorFocused = true;
       }
     }
-    return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+    return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
   if (token.logicalName === 'f2') {
     indicatorFocused = false;
     state.modalOpened('process');
     state.processModal.open();
-    return { handled: true, prompt, cursorPos, commandMode, indicatorFocused };
+    return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 
-  return { handled: false, prompt, cursorPos, commandMode, indicatorFocused };
+  return { handled: false, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
 }
 
 export type MouseRouteState = {

package/src/input/handler-feed.ts

@@ -85,6 +85,7 @@ import type { ModelPickerTarget } from './model-picker.ts';
 export interface InputFeedContext {
   prompt: string;
   cursorPos: number;
+  inputScrollTop: number;
   commandMode: boolean;
   panelFocused: boolean;
   indicatorFocused: boolean;
@@ -365,8 +366,10 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       const keyRoute = handlePromptKeyToken({
         prompt: context.prompt,
         cursorPos: context.cursorPos,
+        inputScrollTop: context.inputScrollTop,
         commandMode: context.commandMode,
         contentWidth: context.contentWidth,
+        maxInputRows: 8,
         inputHistory: context.inputHistory,
         indicatorFocused: context.indicatorFocused,
         conversationManager: context.conversationManager,
@@ -391,6 +394,7 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       if (keyRoute.handled) {
         context.prompt = keyRoute.prompt;
         context.cursorPos = keyRoute.cursorPos;
+        context.inputScrollTop = keyRoute.inputScrollTop;
         context.commandMode = keyRoute.commandMode;
         context.indicatorFocused = keyRoute.indicatorFocused;
         continue;

package/src/input/handler.ts

@@ -258,7 +258,7 @@ export class InputHandler {
   public initFeedContext(): void {
     this.feedContext = buildInitialFeedContext(
       {
-        prompt: this.prompt, cursorPos: this.cursorPos, commandMode: this.commandMode,
+        prompt: this.prompt, cursorPos: this.cursorPos, inputScrollTop: this.inputScrollTop, commandMode: this.commandMode,
         panelFocused: this.panelFocused, indicatorFocused: this.indicatorFocused,
         helpOverlayActive: this.helpOverlayActive, helpScrollOffset: this.helpScrollOffset,
         shortcutsOverlayActive: this.shortcutsOverlayActive, shortcutsScrollOffset: this.shortcutsScrollOffset,
@@ -338,7 +338,7 @@ export class InputHandler {
   /** Sync mutable handler fields back into feedContext after in-feed mutations. */
   public syncFeedContextMutableFields(): void {
     const h = this;
-    syncFeedContextMutableFields({ prompt: h.prompt, cursorPos: h.cursorPos, commandMode: h.commandMode,
+    syncFeedContextMutableFields({ prompt: h.prompt, cursorPos: h.cursorPos, inputScrollTop: h.inputScrollTop, commandMode: h.commandMode,
       panelFocused: h.panelFocused, indicatorFocused: h.indicatorFocused, helpOverlayActive: h.helpOverlayActive,
       helpScrollOffset: h.helpScrollOffset, shortcutsOverlayActive: h.shortcutsOverlayActive,
       shortcutsScrollOffset: h.shortcutsScrollOffset, selectionCallback: h.selectionCallback,
@@ -445,6 +445,7 @@ export class InputHandler {
       // Sync mutable scalars from handler into the reused context.
       context.prompt = this.prompt;
       context.cursorPos = this.cursorPos;
+      context.inputScrollTop = this.inputScrollTop;
       context.commandMode = this.commandMode;
       context.panelFocused = this.panelFocused;
       context.indicatorFocused = this.indicatorFocused;
@@ -473,6 +474,7 @@ export class InputHandler {
       feedInputTokens(context, this.tokenizer.feed(data));
       this.prompt = context.prompt;
       this.cursorPos = context.cursorPos;
+      this.inputScrollTop = context.inputScrollTop;
       this.commandMode = context.commandMode;
       this.panelFocused = context.panelFocused;
       this.indicatorFocused = context.indicatorFocused;

package/src/input/input-history.ts

@@ -175,7 +175,6 @@ export class InputHistory {
    * Navigate up (older entry).
    * On first call, saves currentInput as draft.
    * Returns the entry to display, or null if at boundary.
-   * Only single-line entries are returned (multiline stored but skipped).
    */
   up(currentInput: string): string | null {
     if (this.entries.length === 0) return null;
@@ -185,15 +184,10 @@ export class InputHistory {
       this.draft = currentInput;
     }
 
-    // Try to advance to an older single-line entry
-    let next = this.position + 1;
-    while (next < this.entries.length) {
-      const entry = this.entries[next]!;
-      if (!this.getDisplayText(entry).includes('\n')) {
-        this.position = next;
-        return this.getRecallText(this.entries[this.position]!);
-      }
-      next++;
+    const next = this.position + 1;
+    if (next < this.entries.length) {
+      this.position = next;
+      return this.getRecallText(this.entries[this.position]!);
     }
 
     // At oldest boundary
@@ -208,15 +202,10 @@ export class InputHistory {
   down(): string | null {
     if (this.position === -1) return null;
 
-    // Try to find a newer single-line entry
-    let prev = this.position - 1;
-    while (prev >= 0) {
-      const entry = this.entries[prev]!;
-      if (!this.getDisplayText(entry).includes('\n')) {
-        this.position = prev;
-        return this.getRecallText(this.entries[this.position]!);
-      }
-      prev--;
+    const prev = this.position - 1;
+    if (prev >= 0) {
+      this.position = prev;
+      return this.getRecallText(this.entries[this.position]!);
     }
 
     // Back to draft

package/src/main.ts

@@ -766,7 +766,7 @@ async function main() {
   // --- Crash recovery check ---
   const recoveryInfo = checkRecoveryFile({ workingDirectory: workingDir, homeDirectory });
   if (recoveryInfo) {
-    systemMessageRouter.high(`[Recovery] Found unsaved session from ${new Date(recoveryInfo.timestamp).toLocaleString()}. Title: "${recoveryInfo.title}". Press R to restore, any other key to discard.`);
+    systemMessageRouter.high(`[Recovery] Found unsaved session from ${new Date(recoveryInfo.timestamp).toLocaleString()}. Title: "${recoveryInfo.title}". Press Ctrl+R to restore, Esc to discard, or start typing to ignore it.`);
     for (const line of formatReturnContextForDisplay(recoveryInfo.returnContext)) {
       systemMessageRouter.low(`[Recovery] ${line}`);
     }

package/src/shell/blocking-input.ts

@@ -68,8 +68,7 @@ export function handleBlockingShellInput(
   }
 
   if (recoveryPending) {
-    const key = data.toLowerCase();
-    if (key === 'r') {
+    if (data === '\x12') {
       const recovery = loadRecoveryConversation();
       if (recovery) {
         conversation.fromJSON({ messages: recovery.messages as Parameters<typeof conversation.fromJSON>[0]['messages'] });
@@ -77,12 +76,22 @@ export function handleBlockingShellInput(
       } else {
         systemMessageRouter.high('[Recovery] Failed to restore saved data.');
       }
-    } else {
+      deleteRecoveryFile();
+      render();
+      return { handled: true, pendingPermission: null, recoveryPending: false };
+    }
+
+    if (data === '\x1b' || data === '\x03') {
       systemMessageRouter.high('[Recovery] Discarded recovery data.');
+      deleteRecoveryFile();
+      render();
+      return { handled: true, pendingPermission: null, recoveryPending: false };
     }
+
+    systemMessageRouter.high('[Recovery] Ignored saved session; starting a new prompt.');
     deleteRecoveryFile();
     render();
-    return { handled: true, pendingPermission: null, recoveryPending: false };
+    return { handled: false, pendingPermission: null, recoveryPending: false };
   }
 
   return { handled: false, pendingPermission, recoveryPending };

package/src/version.ts

@@ -6,7 +6,7 @@ import { join } from 'node:path';
 // The prebuild script updates the fallback value before compilation.
 // Uses import.meta.dir (Bun) to locate package.json relative to this file,
 // which is correct regardless of the process working directory.
-let _version = '0.19.94';
+let _version = '0.19.96';
 try {
   const pkg = JSON.parse(readFileSync(join(import.meta.dir, '..', 'package.json'), 'utf-8'));
   _version = pkg.version ?? _version;