Polish welcome gate

Author: Patel230

cmd/chat_commands_session.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"context"
 	"fmt"
 	"math/rand"
 	"os"
@@ -55,28 +54,30 @@ func (m *chatModel) handleSessionCommand(cmd string, parts []string, text string
 		return m, tea.Quit
 
 	case "/clear":
+		if m.manualCompacting {
+			return m.cancelManualCompact("Compaction cancelled.")
+		}
 		// Cancel any running /loop goroutine.
 		if m.loopCancel != nil {
 			m.loopCancel()
 			m.loopCancel = nil
 		}
-		m.messages = nil
-		m.messages = append(m.messages, displayMsg{role: "system", content: "Conversation cleared."})
+		m.messages = []displayMsg{{role: "system", content: "Conversation cleared."}}
+		m.viewDirty = true
+		m.autoScroll = false
 		return m, nil
 
 	case "/compact":
-		before := m.session.MessageCount()
-		strat, tokBefore, tokAfter, err := m.session.CompactConversation(context.Background())
-		after := m.session.MessageCount()
-		msg := fmt.Sprintf("Compacted (%s): %d → %d messages, ~%dk → ~%dk tokens", strat, before, after, tokBefore/1000, tokAfter/1000)
-		if err != nil {
-			msg = fmt.Sprintf("Compacted with fallback: %d → %d messages", before, after)
+		if m.manualCompacting {
+			return m.cancelManualCompact("Compaction cancelled.")
 		}
-		m.messages = append(m.messages, displayMsg{role: "system", content: msg})
-		m.compacting = false
-		m.brailleSpinner.SetLabel(m.spinnerVerb)
-		m.invalidateConnStatus()
-		return m, nil
+		if m.waiting {
+			m.messages = append(m.messages, displayMsg{role: "system", content: "Wait for the current response to finish, then run /compact."})
+			m.viewDirty = true
+			m.updateViewportContent()
+			return m, nil
+		}
+		return m.startManualCompact()
 
 	case "/history":
 		entries, err := session.List()
@@ -105,7 +106,7 @@ func (m *chatModel) handleSessionCommand(cmd string, parts []string, text string
 				return m, nil
 			}
 			m.sessionID = s.ID
-			m.messages = nil
+			m.messages = []displayMsg{{role: "welcome", content: m.welcomeCache}}
 			var msgs []client.EyrieMessage
 			for _, sm := range s.Messages {
 				em := client.EyrieMessage{Role: sm.Role, Content: sm.Content}
@@ -123,6 +124,8 @@ func (m *chatModel) handleSessionCommand(cmd string, parts []string, text string
 			}
 			m.session.LoadMessages(msgs)
 			m.messages = append(m.messages, displayMsg{role: "system", content: fmt.Sprintf("Recovered: %s\nSession %s ready (%d msgs)", note, s.ID, len(s.Messages))})
+			m.viewDirty = true
+			m.autoScroll = false
 			return m, nil
 		}
 		// List candidates
@@ -151,7 +154,7 @@ func (m *chatModel) handleSessionCommand(cmd string, parts []string, text string
 			return m, nil
 		}
 		m.sessionID = saved.ID
-		m.messages = nil
+		m.messages = []displayMsg{{role: "welcome", content: m.welcomeCache}}
 		var msgs []client.EyrieMessage
 		for _, sm := range saved.Messages {
 			em := client.EyrieMessage{Role: sm.Role, Content: sm.Content}
@@ -169,6 +172,8 @@ func (m *chatModel) handleSessionCommand(cmd string, parts []string, text string
 		}
 		m.session.LoadMessages(msgs)
 		m.messages = append(m.messages, displayMsg{role: "system", content: fmt.Sprintf("Resumed session %s", saved.ID)})
+		m.viewDirty = true
+		m.autoScroll = false
 		return m, nil
 
 	case "/fork":

cmd/chat_layout.go

@@ -0,0 +1,85 @@
+package cmd
+
+import (
+	"strings"
+)
+
+const minChatViewportLines = 4
+
+// fixedWelcomeLineCount reserves room for the branded welcome pane above chat.
+func (m chatModel) fixedWelcomeLineCount() int {
+	if strings.TrimSpace(m.welcomeCache) == "" || m.onWelcomeGate() {
+		return 0
+	}
+	lines := strings.Split(strings.TrimRight(m.welcomeCache, "\n"), "\n")
+	count := len(lines)
+	if m.height <= 0 {
+		return count
+	}
+	max := m.height - m.chatBottomBarLines() - minChatViewportLines - 1
+	if max < 0 {
+		max = 0
+	}
+	if count > max {
+		count = max
+	}
+	return count
+}
+
+// renderFixedWelcomePane draws the welcome screen above the scrollable chat viewport.
+func (m chatModel) renderFixedWelcomePane(width int) string {
+	if m.fixedWelcomeLineCount() == 0 {
+		return ""
+	}
+	lines := strings.Split(strings.TrimRight(m.welcomeCache, "\n"), "\n")
+	max := m.fixedWelcomeLineCount()
+	if len(lines) > max {
+		lines = lines[:max]
+	}
+	return strings.Join(lines, "\n")
+}
+
+// withSyncedLayout returns m with viewport size reserved for welcome + bottom chrome.
+func (m chatModel) withSyncedLayout() chatModel {
+	if m.height <= 0 {
+		return m
+	}
+	bottomH := m.chatBottomBarLines()
+	welcomeH := m.fixedWelcomeLineCount()
+	vpH := m.height - bottomH - welcomeH
+	if welcomeH > 0 {
+		vpH--
+	}
+	if m.onWelcomeGate() {
+		vpH = minChatViewportLines
+	}
+	if vpH < minChatViewportLines {
+		vpH = minChatViewportLines
+	}
+	if m.viewport.Height != vpH {
+		m.viewport.Height = vpH
+	}
+	w := m.width
+	if w <= 0 {
+		w = 80
+	}
+	vpW := m.chatViewportWidth(w)
+	if m.viewport.Width != vpW {
+		m.viewport.Width = vpW
+	}
+	return m
+}
+
+// measureInputBoxLines returns rendered input box height (borders + content).
+func (m chatModel) measureInputBoxLines(footerW int) int {
+	view := m.input.View()
+	if m.useConfigInput {
+		view = m.configInput.View()
+	}
+	box := inputBorderStyle.Width(footerW).Render(view)
+	lines := strings.Split(strings.TrimRight(box, "\n"), "\n")
+	if len(lines) == 0 {
+		return 3
+	}
+	return len(lines)
+}