interactive: blank line above slash popup and dialog block

Slash command popup and dialogs (login / model / sessions / jump /
btw / changelog / etc.) used to sit flush against the chat or
welcome content above. Add one blank row before the suggest popup
when it is non-empty and one above the dialog block when a dialog
is showing.

Cursor-row math gains a dialogLead offset so popup-side cursor
branches (btwDialog, login dialog, sessionDialog) land in the
right cell now that the dialog starts one row lower.

commit: a07e43dfd7226f49d575c7cd1e5092fb83431b10
author: patriceckhart · 5mo ago · 2026-04-28 17:19 UTC
parent: 0cc0036
signature: unsigned
refs: tag: v0.1.41

1 file · +26 -11

M internal/agent/modes/interactive.go +26 -11


@@ -794,6 +794,11 @@ func (i *Interactive) redraw() {
794	794		} else if len(dialog) == 0 && i.fileSuggest.Active(currentInput) {
795	795		suggest = i.fileSuggest.Render(currentInput, i.cfg.Theme, cols)
796	796		}
	797	+	if len(suggest) > 0 {
	798	+	// One blank row above the popup so it doesn't sit flush
	799	+	// against the chat / welcome content above.
	800	+	suggest = append([]string{""}, suggest...)
	801	+	}
797	802
798	803		// Busy prefix shown at the far left of the status bar. The
799	804		// spinner glyph and its funny-line message share the `zot`

@@ -845,13 +850,16 @@ func (i *Interactive) redraw() {
845	850		}
846	851		}
847	852
848		-	// Bottom-sticky sections (always visible, never scroll). One
849		-	// blank row above statusLines so the spinner / model / cwd
850		-	// block doesn't sit flush against the chat content above it,
851		-	// one blank between status bar and editor for input breathing
852		-	// room, and one trailing blank at the very bottom so the
853		-	// editor isn't flush against the terminal edge.
854		-	bottom := make([]string, 0, len(dialog)+len(suggest)+len(queue)+len(edLines)+4)
	853	+	// Bottom-sticky sections (always visible, never scroll). Each
	854	+	// non-empty subsection (dialog, suggest popup, sliding-in queue)
	855	+	// is preceded by one blank row so it has air above the chat
	856	+	// content. The status block and editor get their own dedicated
	857	+	// blanks so spacing stays consistent whether or not a dialog or
	858	+	// popup is showing.
	859	+	bottom := make([]string, 0, len(dialog)+len(suggest)+len(queue)+len(edLines)+8)
	860	+	if len(dialog) > 0 {
	861	+	bottom = append(bottom, "")
	862	+	}
855	863		bottom = append(bottom, dialog...)
856	864		bottom = append(bottom, suggest...)
857	865		bottom = append(bottom, queue...)

@@ -972,28 +980,35 @@ func (i *Interactive) redraw() {
972	980		// the blinking cursor shows where the user is actually typing.
973	981		// Dialogs without a cursor (model picker, /help, /login, etc.)
974	982		// return -1 and the main editor keeps the cursor.
	983	+	// dialogLead is 1 when the bottom region prepends a blank above
	984	+	// the dialog block (whenever a dialog is showing) so popup-side
	985	+	// cursor positions still land in the right cell.
	986	+	dialogLead := 0
	987	+	if len(dialog) > 0 {
	988	+	dialogLead = 1
	989	+	}
975	990		// +2 accounts for the blank row above statusLines (so the
976	991		// status block has air above it) and the blank row between
977	992		// statusLines and edLines (input breathing room). Without
978	993		// these the rendered cursor would land on a blank instead of
979	994		// inside the editor row.
980		-	cursorRow := len(visibleChat) + len(dialog) + len(suggest) + len(queue) + 1 + len(statusLines) + 1 + curR
	995	+	cursorRow := len(visibleChat) + dialogLead + len(dialog) + len(suggest) + len(queue) + 1 + len(statusLines) + 1 + curR
981	996		cursorCol := curC
982	997		if i.btwDialog.Active() {
983	998		if r, c := i.btwDialog.CursorPos(cols); r >= 0 {
984		-	cursorRow = len(visibleChat) + r
	999	+	cursorRow = len(visibleChat) + dialogLead + r
985	1000		cursorCol = c
986	1001		}
987	1002		}
988	1003		if i.dialog.Active() {
989	1004		if r, c := i.dialog.CursorPos(cols); r >= 0 {
990		-	cursorRow = len(visibleChat) + r
	1005	+	cursorRow = len(visibleChat) + dialogLead + r
991	1006		cursorCol = c
992	1007		}
993	1008		}
994	1009		if i.sessionDialog.Active() {
995	1010		if r, c := i.sessionDialog.CursorPos(); r >= 0 {
996		-	cursorRow = len(visibleChat) + r
	1011	+	cursorRow = len(visibleChat) + dialogLead + r
997	1012		cursorCol = c
998	1013		}
999	1014		}

 	} else if len(dialog) == 0 && i.fileSuggest.Active(currentInput) {
 		suggest = i.fileSuggest.Render(currentInput, i.cfg.Theme, cols)
 	}
+	if len(suggest) > 0 {
+		// One blank row above the popup so it doesn't sit flush
+		// against the chat / welcome content above.
+		suggest = append([]string{""}, suggest...)
+	}
 	// Busy prefix shown at the far left of the status bar. The
 	// spinner glyph and its funny-line message share the `zot`
 		}
 	}
-	// Bottom-sticky sections (always visible, never scroll). One
+	// Bottom-sticky sections (always visible, never scroll). Each
-	// blank row above statusLines so the spinner / model / cwd
+	// non-empty subsection (dialog, suggest popup, sliding-in queue)
-	// block doesn't sit flush against the chat content above it,
+	// is preceded by one blank row so it has air above the chat
-	// one blank between status bar and editor for input breathing
+	// content. The status block and editor get their own dedicated
-	// room, and one trailing blank at the very bottom so the
+	// blanks so spacing stays consistent whether or not a dialog or
-	// editor isn't flush against the terminal edge.
+	// popup is showing.
-	bottom := make([]string, 0, len(dialog)+len(suggest)+len(queue)+len(edLines)+4)
+	bottom := make([]string, 0, len(dialog)+len(suggest)+len(queue)+len(edLines)+8)
+	if len(dialog) > 0 {
+		bottom = append(bottom, "")
+	}
 	bottom = append(bottom, dialog...)
 	bottom = append(bottom, suggest...)
 	bottom = append(bottom, queue...)
 	// the blinking cursor shows where the user is actually typing.
 	// Dialogs without a cursor (model picker, /help, /login, etc.)
 	// return -1 and the main editor keeps the cursor.
+	// dialogLead is 1 when the bottom region prepends a blank above
+	// the dialog block (whenever a dialog is showing) so popup-side
+	// cursor positions still land in the right cell.
+	dialogLead := 0
+	if len(dialog) > 0 {
+		dialogLead = 1
+	}
 	// +2 accounts for the blank row above statusLines (so the
 	// status block has air above it) and the blank row between
 	// statusLines and edLines (input breathing room). Without
 	// these the rendered cursor would land on a blank instead of
 	// inside the editor row.
-	cursorRow := len(visibleChat) + len(dialog) + len(suggest) + len(queue) + 1 + len(statusLines) + 1 + curR
+	cursorRow := len(visibleChat) + dialogLead + len(dialog) + len(suggest) + len(queue) + 1 + len(statusLines) + 1 + curR
 	cursorCol := curC
 	if i.btwDialog.Active() {
 		if r, c := i.btwDialog.CursorPos(cols); r >= 0 {
-			cursorRow = len(visibleChat) + r
+			cursorRow = len(visibleChat) + dialogLead + r
 			cursorCol = c
 		}
 	}
 	if i.dialog.Active() {
 		if r, c := i.dialog.CursorPos(cols); r >= 0 {
-			cursorRow = len(visibleChat) + r
+			cursorRow = len(visibleChat) + dialogLead + r
 			cursorCol = c
 		}
 	}
 	if i.sessionDialog.Active() {
 		if r, c := i.sessionDialog.CursorPos(); r >= 0 {
-			cursorRow = len(visibleChat) + r
+			cursorRow = len(visibleChat) + dialogLead + r
 			cursorCol = c
 		}
 	}