Fix login dialog cursor alignment

2 files · +30 -1

M packages/agent/modes/login_dialog.go +5 -1


@@ -490,7 +490,11 @@ func (d *loginDialog) CursorPos(width int) (row, col int) {
490	490		wrapW = 20
491	491		}
492	492		urlLines := len(tui.WrapANSILine(d.url, wrapW))
493		-	baseOffset := 1 /frameHeader/ + 1 /hint/ + urlLines + 1 /blank/ + 1 /prompt/
	493	+	// interactive.redraw wraps dialog output with padDialogFrame, which
	494	+	// injects a blank row after the frame header. Count that row here so
	495	+	// the real terminal cursor lands on the editor input instead of the
	496	+	// prompt above it.
	497	+	baseOffset := 1 /frameHeader/ + 1 /padDialogFrame blank/ + 1 /hint/ + urlLines + 1 /blank/ + 1 /prompt/
494	498		return baseOffset + eRow, eCol
495	499		}
496	500

 		wrapW = 20
 	}
 	urlLines := len(tui.WrapANSILine(d.url, wrapW))
-	baseOffset := 1 /*frameHeader*/ + 1 /*hint*/ + urlLines + 1 /*blank*/ + 1 /*prompt*/
+	// interactive.redraw wraps dialog output with padDialogFrame, which
+	// injects a blank row after the frame header. Count that row here so
+	// the real terminal cursor lands on the editor input instead of the
+	// prompt above it.
+	baseOffset := 1 /*frameHeader*/ + 1 /*padDialogFrame blank*/ + 1 /*hint*/ + urlLines + 1 /*blank*/ + 1 /*prompt*/
 	return baseOffset + eRow, eCol
 }

A packages/agent/modes/login_dialog_test.go +25 -0

@@ -0,0 +1,25 @@
	1	+	package modes
	2	+
	3	+	import (
	4	+	"strings"
	5	+	"testing"
	6	+
	7	+	"github.com/patriceckhart/zot/packages/tui"
	8	+	)
	9	+
	10	+	func TestLoginDialogCursorPosMatchesPaddedInputRow(t *testing.T) {
	11	+	d := newLoginDialog()
	12	+	d.Open(t.TempDir())
	13	+	d.method = "oauth"
	14	+	d.provider = "anthropic"
	15	+	d.ShowWaiting("https://example.com/oauth/authorize?code_challenge=abc&state=xyz")
	16	+
	17	+	lines := padDialogFrame(d.Render(tui.Theme{}, 80))
	18	+	row, _ := d.CursorPos(80)
	19	+	if row < 0 \|\| row >= len(lines) {
	20	+	t.Fatalf("CursorPos row = %d outside rendered lines %d", row, len(lines))
	21	+	}
	22	+	if got := stripANSIBytes(lines[row]); !strings.Contains(got, "▌") {
	23	+	t.Fatalf("CursorPos row %d = %q; want editor input row", row, got)
	24	+	}
	25	+	}

@@ -0,0 +1,25 @@
	1	+	package modes
	2	+
	3	+	import (
	4	+	"strings"
	5	+	"testing"
	6	+
	7	+	"github.com/patriceckhart/zot/packages/tui"
	8	+	)
	9	+
	10	+	func TestLoginDialogCursorPosMatchesPaddedInputRow(t *testing.T) {
	11	+	d := newLoginDialog()
	12	+	d.Open(t.TempDir())
	13	+	d.method = "oauth"
	14	+	d.provider = "anthropic"
	15	+	d.ShowWaiting("https://example.com/oauth/authorize?code_challenge=abc&state=xyz")
	16	+
	17	+	lines := padDialogFrame(d.Render(tui.Theme{}, 80))
	18	+	row, _ := d.CursorPos(80)
	19	+	if row < 0 \|\| row >= len(lines) {
	20	+	t.Fatalf("CursorPos row = %d outside rendered lines %d", row, len(lines))
	21	+	}
	22	+	if got := stripANSIBytes(lines[row]); !strings.Contains(got, "▌") {
	23	+	t.Fatalf("CursorPos row %d = %q; want editor input row", row, got)
	24	+	}
	25	+	}