diff options
Diffstat (limited to 'packages/tui/internal/components')
| -rw-r--r-- | packages/tui/internal/components/chat/messages.go | 88 | ||||
| -rw-r--r-- | packages/tui/internal/components/commands/commands.go | 14 | ||||
| -rw-r--r-- | packages/tui/internal/components/dialog/help.go | 9 |
3 files changed, 4 insertions, 107 deletions
diff --git a/packages/tui/internal/components/chat/messages.go b/packages/tui/internal/components/chat/messages.go index ab9ef65ec..bfbae3938 100644 --- a/packages/tui/internal/components/chat/messages.go +++ b/packages/tui/internal/components/chat/messages.go @@ -10,7 +10,6 @@ import ( "github.com/charmbracelet/lipgloss/v2" "github.com/sst/opencode-sdk-go" "github.com/sst/opencode/internal/app" - "github.com/sst/opencode/internal/components/commands" "github.com/sst/opencode/internal/components/dialog" "github.com/sst/opencode/internal/layout" "github.com/sst/opencode/internal/styles" @@ -39,7 +38,6 @@ type messagesComponent struct { viewport viewport.Model spinner spinner.Model attachments viewport.Model - commands commands.CommandsComponent cache *MessageCache rendering bool showToolDetails bool @@ -49,7 +47,7 @@ type renderFinishedMsg struct{} type ToggleToolDetailsMsg struct{} func (m *messagesComponent) Init() tea.Cmd { - return tea.Batch(m.viewport.Init(), m.spinner.Tick, m.commands.Init()) + return tea.Batch(m.viewport.Init(), m.spinner.Tick) } func (m *messagesComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) { @@ -100,10 +98,6 @@ func (m *messagesComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) { m.spinner = spinner cmds = append(cmds, cmd) - updated, cmd := m.commands.Update(msg) - m.commands = updated.(commands.CommandsComponent) - cmds = append(cmds, cmd) - return m, tea.Batch(cmds...) } @@ -271,8 +265,8 @@ func (m *messagesComponent) renderView() { )) } - m.viewport.SetHeight(m.height - lipgloss.Height(m.header())) - m.viewport.SetContent("\n" + strings.Join(centered, "\n") + "\n") + m.viewport.SetHeight(m.height - lipgloss.Height(m.header()) + 1) + m.viewport.SetContent("\n" + strings.Join(centered, "\n")) } func (m *messagesComponent) header() string { @@ -309,9 +303,6 @@ func (m *messagesComponent) header() string { } func (m *messagesComponent) View() string { - if len(m.app.Messages) == 0 { - return m.home() - } t := theme.CurrentTheme() if m.rendering { return lipgloss.Place( @@ -334,70 +325,6 @@ func (m *messagesComponent) View() string { Render(header + "\n" + m.viewport.View()) } -func (m *messagesComponent) home() string { - t := theme.CurrentTheme() - baseStyle := styles.NewStyle().Background(t.Background()) - base := baseStyle.Render - muted := styles.NewStyle().Foreground(t.TextMuted()).Background(t.Background()).Render - - open := ` -█▀▀█ █▀▀█ █▀▀ █▀▀▄ -█░░█ █░░█ █▀▀ █░░█ -▀▀▀▀ █▀▀▀ ▀▀▀ ▀ ▀ ` - code := ` -█▀▀ █▀▀█ █▀▀▄ █▀▀ -█░░ █░░█ █░░█ █▀▀ -▀▀▀ ▀▀▀▀ ▀▀▀ ▀▀▀` - - logo := lipgloss.JoinHorizontal( - lipgloss.Top, - muted(open), - base(code), - ) - // cwd := app.Info.Path.Cwd - // config := app.Info.Path.Config - - versionStyle := styles.NewStyle(). - Foreground(t.TextMuted()). - Background(t.Background()). - Width(lipgloss.Width(logo)). - Align(lipgloss.Right) - version := versionStyle.Render(m.app.Version) - - logoAndVersion := strings.Join([]string{logo, version}, "\n") - logoAndVersion = lipgloss.PlaceHorizontal( - m.width, - lipgloss.Center, - logoAndVersion, - styles.WhitespaceStyle(t.Background()), - ) - m.commands.SetBackgroundColor(t.Background()) - commands := lipgloss.PlaceHorizontal( - m.width, - lipgloss.Center, - m.commands.View(), - styles.WhitespaceStyle(t.Background()), - ) - - lines := []string{} - lines = append(lines, logoAndVersion) - lines = append(lines, "") - lines = append(lines, "") - // lines = append(lines, base("cwd ")+muted(cwd)) - // lines = append(lines, base("config ")+muted(config)) - // lines = append(lines, "") - lines = append(lines, commands) - - return lipgloss.Place( - m.width, - m.height, - lipgloss.Center, - lipgloss.Center, - baseStyle.Render(strings.Join(lines, "\n")), - styles.WhitespaceStyle(t.Background()), - ) -} - func (m *messagesComponent) SetSize(width, height int) tea.Cmd { if m.width == width && m.height == height { return nil @@ -412,7 +339,6 @@ func (m *messagesComponent) SetSize(width, height int) tea.Cmd { m.viewport.SetHeight(height - lipgloss.Height(m.header())) m.attachments.SetWidth(width + 40) m.attachments.SetHeight(3) - m.commands.SetSize(width, height) m.renderView() return nil } @@ -476,19 +402,11 @@ func NewMessagesComponent(app *app.App) MessagesComponent { attachments := viewport.New() vp.KeyMap = viewport.KeyMap{} - t := theme.CurrentTheme() - commandsView := commands.New( - app, - commands.WithBackground(t.Background()), - commands.WithLimit(6), - ) - return &messagesComponent{ app: app, viewport: vp, spinner: s, attachments: attachments, - commands: commandsView, showToolDetails: true, cache: NewMessageCache(), tail: true, diff --git a/packages/tui/internal/components/commands/commands.go b/packages/tui/internal/components/commands/commands.go index 68f6503e0..dbd001497 100644 --- a/packages/tui/internal/components/commands/commands.go +++ b/packages/tui/internal/components/commands/commands.go @@ -14,7 +14,6 @@ import ( ) type CommandsComponent interface { - tea.Model tea.ViewModel SetSize(width, height int) tea.Cmd SetBackgroundColor(color compat.AdaptiveColor) @@ -43,19 +42,6 @@ func (c *commandsComponent) SetBackgroundColor(color compat.AdaptiveColor) { c.background = &color } -func (c *commandsComponent) Init() tea.Cmd { - return nil -} - -func (c *commandsComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) { - switch msg := msg.(type) { - case tea.WindowSizeMsg: - c.width = msg.Width - c.height = msg.Height - } - return c, nil -} - func (c *commandsComponent) View() string { t := theme.CurrentTheme() diff --git a/packages/tui/internal/components/dialog/help.go b/packages/tui/internal/components/dialog/help.go index 78cbd7042..4107384f8 100644 --- a/packages/tui/internal/components/dialog/help.go +++ b/packages/tui/internal/components/dialog/help.go @@ -20,10 +20,7 @@ type helpDialog struct { } func (h *helpDialog) Init() tea.Cmd { - return tea.Batch( - h.commandsComponent.Init(), - h.viewport.Init(), - ) + return h.viewport.Init() } func (h *helpDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) { @@ -38,10 +35,6 @@ func (h *helpDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) { h.commandsComponent.SetSize(msg.Width-4, msg.Height-6) } - // Update commands component first to get the latest content - _, cmdCmd := h.commandsComponent.Update(msg) - cmds = append(cmds, cmdCmd) - // Update viewport content h.viewport.SetContent(h.commandsComponent.View()) |
