tui: align status-bar spacing and indent assistant body

status bar:
  every horizontal gap is now exactly 2 spaces, applied uniformly
  via a single pad constant. before:
    1 leading | 6 between model+stats | 4 between stats+cwd
  after:
    2 leading | 2 between model+stats | 2 between stats+cwd
  produces e.g. "  (openai) gpt-5.4  $0.000 (sub) 0.0%/400k  ~/Sites/zot"
  matching the editor's left inset so the bar lines up vertically
  with the conversation column.

assistant body:
  user-role messages render their text with a 4-space indent under
  the "you" header. assistant text was rendering flush left, so the
  conversation column visibly broke at every assistant turn. now
  both renderMessage's RoleAssistant branch and Build's streaming
  path:
    - reduce the wrap width by the indent (4 cells)
    - prefix every produced line with the indent
  applies to plain text, markdown-rendered code fences / lists /
  blockquotes, and tool-call summary lines (>>= name args). tool
  result blocks were already indented and stay unchanged.

commit: c4251d88fd0697179e2b17d36b76d02352a459f8
author: patriceckhart · 6mo ago · 2026-04-19 11:10 UTC
parent: 36e0efe
signature: unsigned
refs: tag: v0.0.18

1 file · +44 -20

M internal/tui/view.go +44 -20


@@ -152,11 +152,18 @@ func (v *View) BuildWithAnchors(width int) ([]string, []MessageAnchor) {
152	152		// Stream the partial assistant text through the same markdown
153	153		// renderer used for finalised messages so code fences, diffs,
154	154		// lists, and inline styles look the same while streaming and
155		-	// don't suddenly reflow when the turn ends.
156		-	md := RenderMarkdown(v.Streaming, v.Theme, width)
	155	+	// don't suddenly reflow when the turn ends. Indent matches the
	156	+	// finalised assistant body in renderMessage so the column
	157	+	// stays consistent across the stream/finalise transition.
	158	+	const indent = " "
	159	+	inner := width - len(indent)
	160	+	if inner < 1 {
	161	+	inner = width
	162	+	}
	163	+	md := RenderMarkdown(v.Streaming, v.Theme, inner)
157	164		for _, l := range strings.Split(md, "\n") {
158		-	for _, w := range wrapLine(l, width, "") {
159		-	out = append(out, w)
	165	+	for _, w := range wrapLine(l, inner, "") {
	166	+	out = append(out, indent+w)
160	167		}
161	168		}
162	169		out = append(out, "")

@@ -306,28 +313,37 @@ func (v *View) renderMessage(m provider.Message, width int) []string {
306	313		switch b := c.(type) {
307	314		case provider.TextBlock:
308	315		for _, l := range strings.Split(b.Text, "\n") {
309		-	for _, w := range wrapLine(l, width-2, " ") {
310		-	lines = append(lines, " "+v.Theme.FG256(v.Theme.Muted, w))
	316	+	for _, w := range wrapLine(l, width-2, " ") {
	317	+	lines = append(lines, " "+v.Theme.FG256(v.Theme.Muted, w))
311	318		}
312	319		}
313	320		case provider.ImageBlock:
314		-	lines = append(lines, " "+v.Theme.FG256(v.Theme.Muted, fmt.Sprintf("[image %s, %d bytes]", b.MimeType, len(b.Data))))
	321	+	lines = append(lines, " "+v.Theme.FG256(v.Theme.Muted, fmt.Sprintf("[image %s, %d bytes]", b.MimeType, len(b.Data))))
315	322		}
316	323		}
317	324		case provider.RoleAssistant:
318	325		header := v.Theme.FG256(v.Theme.Assistant, "▍ zot")
319	326		lines = append(lines, header)
	327	+	// Indent assistant body the same 4 cells the user body uses,
	328	+	// so the conversation column lines up vertically. The width
	329	+	// passed into the markdown renderer / wrap is reduced by the
	330	+	// indent so long lines wrap inside the indented column.
	331	+	const indent = " "
	332	+	inner := width - len(indent)
	333	+	if inner < 1 {
	334	+	inner = width
	335	+	}
320	336		for _, c := range m.Content {
321	337		switch b := c.(type) {
322	338		case provider.TextBlock:
323		-	md := RenderMarkdown(b.Text, v.Theme, width)
	339	+	md := RenderMarkdown(b.Text, v.Theme, inner)
324	340		for _, l := range strings.Split(md, "\n") {
325		-	for _, w := range wrapLine(l, width, "") {
326		-	lines = append(lines, w)
	341	+	for _, w := range wrapLine(l, inner, "") {
	342	+	lines = append(lines, indent+w)
327	343		}
328	344		}
329	345		case provider.ToolCallBlock:
330		-	lines = append(lines, v.Theme.FG256(v.Theme.Tool, "▸ "+b.Name+" "+shortArgs(b.Arguments)))
	346	+	lines = append(lines, indent+v.Theme.FG256(v.Theme.Tool, "▸ "+b.Name+" "+shortArgs(b.Arguments)))
331	347		}
332	348		}
333	349		case provider.RoleTool:

@@ -855,18 +871,27 @@ func StatusBar(p StatusBarParams) []string {
855	871		stats = append(stats, th.FG256(ctxColor, ctx))
856	872		}
857	873
858		-	left := fmt.Sprintf(" (%s) %s ", p.Provider, p.Model)
859		-	middle := " " + strings.Join(stats, " ") + " "
	874	+	// Layout uses exactly 2 spaces of horizontal padding everywhere:
	875	+	// 2 spaces (openai) gpt-5.4 $0.000 (sub) 0.0%/400k ~/Sites/zot
	876	+	// matches the editor prompt's left inset so the bar lines up
	877	+	// vertically with the conversation column.
	878	+	const pad = " " // 2 spaces
	879	+
	880	+	left := fmt.Sprintf("(%s) %s", p.Provider, p.Model)
	881	+	middle := strings.Join(stats, " ")
860	882
861	883		var leftBuilder strings.Builder
862	884		if p.BusyPrefix != "" {
863		-	leftBuilder.WriteString(th.FG256(th.Accent, " "+p.BusyPrefix+" "))
864		-	leftBuilder.WriteString(" ")
	885	+	leftBuilder.WriteString(th.FG256(th.Accent, pad+p.BusyPrefix))
	886	+	leftBuilder.WriteString(pad)
865	887		}
	888	+	leftBuilder.WriteString(pad)
866	889		leftBuilder.WriteString(th.FG256(th.Muted, left))
867		-	leftBuilder.WriteString(" ")
868		-	// `middle` already has colorized context segments; wrap the rest in muted.
869		-	leftBuilder.WriteString(th.FG256(th.Muted, middle))
	890	+	if middle != "" {
	891	+	leftBuilder.WriteString(pad)
	892	+	// `middle` already has colorized context segments; wrap the rest in muted.
	893	+	leftBuilder.WriteString(th.FG256(th.Muted, middle))
	894	+	}
870	895
871	896		cwd := shortenHome(p.CWD)
872	897		if p.Locked && cwd != "" {

@@ -879,8 +904,7 @@ func StatusBar(p StatusBarParams) []string {
879	904		}
880	905
881	906		cwdRendered := th.FG256(th.Muted, cwd)
882		-	const gap = " " // exactly three spaces between stats and cwd
883		-	combined := primary + gap + cwdRendered
	907	+	combined := primary + pad + cwdRendered
884	908
885	909		// Wrap to a second line when the combined width would overflow.
886	910		if p.Cols > 0 && visibleWidth(combined) > p.Cols {

 		// Stream the partial assistant text through the same markdown
 		// renderer used for finalised messages so code fences, diffs,
 		// lists, and inline styles look the same while streaming and
-		// don't suddenly reflow when the turn ends.
+		// don't suddenly reflow when the turn ends. Indent matches the
-		md := RenderMarkdown(v.Streaming, v.Theme, width)
+		// finalised assistant body in renderMessage so the column
+		// stays consistent across the stream/finalise transition.
+		const indent = "    "
+		inner := width - len(indent)
+		if inner < 1 {
+			inner = width
+		}
+		md := RenderMarkdown(v.Streaming, v.Theme, inner)
 		for _, l := range strings.Split(md, "\n") {
-			for _, w := range wrapLine(l, width, "") {
+			for _, w := range wrapLine(l, inner, "") {
-				out = append(out, w)
+				out = append(out, indent+w)
 			}
 		}
 		out = append(out, "")
 			switch b := c.(type) {
 			case provider.TextBlock:
 				for _, l := range strings.Split(b.Text, "\n") {
-					for _, w := range wrapLine(l, width-2, "  ") {
+					for _, w := range wrapLine(l, width-2, "    ") {
-						lines = append(lines, "  "+v.Theme.FG256(v.Theme.Muted, w))
+						lines = append(lines, "    "+v.Theme.FG256(v.Theme.Muted, w))
 					}
 				}
 			case provider.ImageBlock:
-				lines = append(lines, "  "+v.Theme.FG256(v.Theme.Muted, fmt.Sprintf("[image %s, %d bytes]", b.MimeType, len(b.Data))))
+				lines = append(lines, "    "+v.Theme.FG256(v.Theme.Muted, fmt.Sprintf("[image %s, %d bytes]", b.MimeType, len(b.Data))))
 			}
 		}
 	case provider.RoleAssistant:
 		header := v.Theme.FG256(v.Theme.Assistant, "▍ zot")
 		lines = append(lines, header)
+		// Indent assistant body the same 4 cells the user body uses,
+		// so the conversation column lines up vertically. The width
+		// passed into the markdown renderer / wrap is reduced by the
+		// indent so long lines wrap inside the indented column.
+		const indent = "    "
+		inner := width - len(indent)
+		if inner < 1 {
+			inner = width
+		}
 		for _, c := range m.Content {
 			switch b := c.(type) {
 			case provider.TextBlock:
-				md := RenderMarkdown(b.Text, v.Theme, width)
+				md := RenderMarkdown(b.Text, v.Theme, inner)
 				for _, l := range strings.Split(md, "\n") {
-					for _, w := range wrapLine(l, width, "") {
+					for _, w := range wrapLine(l, inner, "") {
-						lines = append(lines, w)
+						lines = append(lines, indent+w)
 					}
 				}
 			case provider.ToolCallBlock:
-				lines = append(lines, v.Theme.FG256(v.Theme.Tool, "▸ "+b.Name+" "+shortArgs(b.Arguments)))
+				lines = append(lines, indent+v.Theme.FG256(v.Theme.Tool, "▸ "+b.Name+" "+shortArgs(b.Arguments)))
 			}
 		}
 	case provider.RoleTool:
 		stats = append(stats, th.FG256(ctxColor, ctx))
 	}
-	left := fmt.Sprintf(" (%s) %s ", p.Provider, p.Model)
+	// Layout uses exactly 2 spaces of horizontal padding everywhere:
-	middle := " " + strings.Join(stats, " ") + " "
+	//   2 spaces  (openai) gpt-5.4  $0.000 (sub) 0.0%/400k  ~/Sites/zot
+	// matches the editor prompt's left inset so the bar lines up
+	// vertically with the conversation column.
+	const pad = "  " // 2 spaces
+	left := fmt.Sprintf("(%s) %s", p.Provider, p.Model)
+	middle := strings.Join(stats, " ")
 	var leftBuilder strings.Builder
 	if p.BusyPrefix != "" {
-		leftBuilder.WriteString(th.FG256(th.Accent, " "+p.BusyPrefix+" "))
+		leftBuilder.WriteString(th.FG256(th.Accent, pad+p.BusyPrefix))
-		leftBuilder.WriteString("  ")
+		leftBuilder.WriteString(pad)
 	}
+	leftBuilder.WriteString(pad)
 	leftBuilder.WriteString(th.FG256(th.Muted, left))
-	leftBuilder.WriteString("  ")
+	if middle != "" {
-	// `middle` already has colorized context segments; wrap the rest in muted.
+		leftBuilder.WriteString(pad)
-	leftBuilder.WriteString(th.FG256(th.Muted, middle))
+		// `middle` already has colorized context segments; wrap the rest in muted.
+		leftBuilder.WriteString(th.FG256(th.Muted, middle))
+	}
 	cwd := shortenHome(p.CWD)
 	if p.Locked && cwd != "" {
 	}
 	cwdRendered := th.FG256(th.Muted, cwd)
-	const gap = "   " // exactly three spaces between stats and cwd
+	combined := primary + pad + cwdRendered
-	combined := primary + gap + cwdRendered
 	// Wrap to a second line when the combined width would overflow.
 	if p.Cols > 0 && visibleWidth(combined) > p.Cols {