aljaz/opencode
1
0
Fork 0
mirror of https://github.com/aljazceru/opencode.git synced 2026-01-07 18:04:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix the memory bug

Browse Source
This commit is contained in:
Kujtim Hoxha
2025-04-21 13:33:51 +02:00
parent 1da298e755
commit e7bb99baab
6 changed files with 128 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/tui/components/chat/list.go
View File

@@ -370,6 +370,7 @@ func (m *messagesCmp) SetSize(width, height int) tea.Cmd {
delete(m.cachedContent, msg.ID)
}
m.uiMessages = make([]uiMessage, 0)
m.renderView()
return nil
}

15
internal/tui/components/core/status.go
View File

@@ -18,6 +18,11 @@ import (
"github.com/kujtimiihoxha/opencode/internal/tui/util"
)
type StatusCmp interface {
tea.Model
SetHelpMsg(string)
}
type statusCmp struct {
info util.InfoMsg
width int
@@ -146,7 +151,7 @@ func (m *statusCmp) projectDiagnostics() string {
break
}
}
// If any server is initializing, show that status
if initializing {
return lipgloss.NewStyle().
@@ -154,7 +159,7 @@ func (m *statusCmp) projectDiagnostics() string {
Foreground(styles.Peach).
Render(fmt.Sprintf("%s Initializing LSP...", styles.SpinnerIcon))
}
errorDiagnostics := []protocol.Diagnostic{}
warnDiagnostics := []protocol.Diagnostic{}
hintDiagnostics := []protocol.Diagnostic{}
@@ -235,7 +240,11 @@ func (m statusCmp) model() string {
return styles.Padded.Background(styles.Grey).Foreground(styles.Text).Render(model.Name)
}
func NewStatusCmp(lspClients map[string]*lsp.Client) tea.Model {
func (m statusCmp) SetHelpMsg(s string) {
helpWidget = styles.Padded.Background(styles.Forground).Foreground(styles.BackgroundDarker).Bold(true).Render(s)
}
func NewStatusCmp(lspClients map[string]*lsp.Client) StatusCmp {
return &statusCmp{
messageTTL: 10 * time.Second,
lspClients: lspClients,

63
internal/tui/tui.go
View File

@@ -39,12 +39,18 @@ var keys = keyMap{
key.WithKeys("ctrl+_"),
key.WithHelp("ctrl+?", "toggle help"),
),
SwitchSession: key.NewBinding(
key.WithKeys("ctrl+a"),
key.WithHelp("ctrl+a", "switch session"),
),
}
var helpEsc = key.NewBinding(
key.WithKeys("?"),
key.WithHelp("?", "toggle help"),
)
var returnKey = key.NewBinding(
key.WithKeys("esc"),
key.WithHelp("esc", "close"),
@@ -61,7 +67,7 @@ type appModel struct {
previousPage page.PageID
pages map[page.PageID]tea.Model
loadedPages map[page.PageID]bool
status tea.Model
status core.StatusCmp
app *app.App
showPermissions bool
@@ -75,6 +81,8 @@ type appModel struct {
showSessionDialog bool
sessionDialog dialog.SessionDialog
editingMode bool
}
func (a appModel) Init() tea.Cmd {
@@ -101,7 +109,8 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
msg.Height -= 1 // Make space for the status bar
a.width, a.height = msg.Width, msg.Height
a.status, _ = a.status.Update(msg)
s, _ := a.status.Update(msg)
a.status = s.(core.StatusCmp)
a.pages[a.currentPage], cmd = a.pages[a.currentPage].Update(msg)
cmds = append(cmds, cmd)
@@ -118,45 +127,56 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
cmds = append(cmds, sessionCmd)
return a, tea.Batch(cmds...)
case chat.EditorFocusMsg:
a.editingMode = bool(msg)
// Status
case util.InfoMsg:
a.status, cmd = a.status.Update(msg)
s, cmd := a.status.Update(msg)
a.status = s.(core.StatusCmp)
cmds = append(cmds, cmd)
return a, tea.Batch(cmds...)
case pubsub.Event[logging.LogMessage]:
if msg.Payload.Persist {
switch msg.Payload.Level {
case "error":
a.status, cmd = a.status.Update(util.InfoMsg{
s, cmd := a.status.Update(util.InfoMsg{
Type: util.InfoTypeError,
Msg: msg.Payload.Message,
TTL: msg.Payload.PersistTime,
})
a.status = s.(core.StatusCmp)
cmds = append(cmds, cmd)
case "info":
a.status, cmd = a.status.Update(util.InfoMsg{
s, cmd := a.status.Update(util.InfoMsg{
Type: util.InfoTypeInfo,
Msg: msg.Payload.Message,
TTL: msg.Payload.PersistTime,
})
a.status = s.(core.StatusCmp)
cmds = append(cmds, cmd)
case "warn":
a.status, cmd = a.status.Update(util.InfoMsg{
s, cmd := a.status.Update(util.InfoMsg{
Type: util.InfoTypeWarn,
Msg: msg.Payload.Message,
TTL: msg.Payload.PersistTime,
})
a.status = s.(core.StatusCmp)
cmds = append(cmds, cmd)
default:
a.status, cmd = a.status.Update(util.InfoMsg{
s, cmd := a.status.Update(util.InfoMsg{
Type: util.InfoTypeInfo,
Msg: msg.Payload.Message,
TTL: msg.Payload.PersistTime,
})
a.status = s.(core.StatusCmp)
cmds = append(cmds, cmd)
}
cmds = append(cmds, cmd)
}
case util.ClearStatusMsg:
a.status, _ = a.status.Update(msg)
s, _ := a.status.Update(msg)
a.status = s.(core.StatusCmp)
// Permission
case pubsub.Event[permission.PermissionRequest]:
@@ -243,7 +263,16 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
a.showHelp = !a.showHelp
return a, nil
case key.Matches(msg, helpEsc):
if !a.editingMode {
if a.showQuit {
return a, nil
}
a.showHelp = !a.showHelp
return a, nil
}
}
}
if a.showQuit {
@@ -275,7 +304,8 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
}
a.status, _ = a.status.Update(msg)
s, _ := a.status.Update(msg)
a.status = s.(core.StatusCmp)
a.pages[a.currentPage], cmd = a.pages[a.currentPage].Update(msg)
cmds = append(cmds, cmd)
return a, tea.Batch(cmds...)
@@ -326,6 +356,12 @@ func (a appModel) View() string {
)
}
if a.editingMode {
a.status.SetHelpMsg("ctrl+? help")
} else {
a.status.SetHelpMsg("? help")
}
if a.showHelp {
bindings := layout.KeyMapToSlice(keys)
if p, ok := a.pages[a.currentPage].(layout.Bindings); ok {
@@ -337,7 +373,9 @@ func (a appModel) View() string {
if a.currentPage == page.LogsPage {
bindings = append(bindings, logsKeyReturnKey)
}
if !a.editingMode {
bindings = append(bindings, helpEsc)
}
a.help.SetBindings(bindings)
overlay := a.help.View()
@@ -398,6 +436,7 @@ func New(app *app.App) tea.Model {
sessionDialog: dialog.NewSessionDialogCmp(),
permissions: dialog.NewPermissionDialogCmp(),
app: app,
editingMode: true,
pages: map[page.PageID]tea.Model{
page.ChatPage: page.NewChatPage(app),
page.LogsPage: page.NewLogsPage(),