f664df6 · crush · git.iko.soy

git.iko.soy/crush

on main help sign in

Merge pull request #219 from charmbracelet/crush-thinking

f664df6Kujtim Hoxha1 year ago

internal/tui/components/chat/messages/messages.go+3

compare with main

unifiedsplit

@@ -252,6 +252,7 @@ func (m *messageCmp) renderThinkingContent() string {

252 m.thinkingViewport.SetWidth(m.textWidth())

253 m.thinkingViewport.SetContent(fullContent)

254 m.thinkingViewport.GotoBottom()

255+ finishReason := m.message.FinishPart()

255 var footer string

256 var footer string

256 if reasoningContent.StartedAt > 0 {

257 if reasoningContent.StartedAt > 0 {

257 duration := m.message.ThinkingDuration()

258 duration := m.message.ThinkingDuration()

@@ -263,6 +264,8 @@ func (m *messageCmp) renderThinkingContent() string {

263 NoIcon: true,

264 NoIcon: true,

264 }

265 }

265 footer = t.S().Base.PaddingLeft(1).Render(core.Status(opts, m.textWidth()-1))

266 footer = t.S().Base.PaddingLeft(1).Render(core.Status(opts, m.textWidth()-1))

267+ } else if finishReason != nil && finishReason.Reason == message.FinishReasonCanceled {

268+ footer = t.S().Base.PaddingLeft(1).Render(m.toMarkdown("*Canceled*"))

266 } else {

269 } else {

267 footer = m.anim.View()

270 footer = m.anim.View()

268 }

271 }

internal/tui/components/chat/sidebar/sidebar.go+28−1

@@ -12,6 +12,7 @@ import (

12 "github.com/charmbracelet/crush/internal/config"

13 "github.com/charmbracelet/crush/internal/diff"

14 "github.com/charmbracelet/crush/internal/fsext"

15+ "github.com/charmbracelet/crush/internal/fur/provider"

15 "github.com/charmbracelet/crush/internal/history"

16 "github.com/charmbracelet/crush/internal/history"

16 "github.com/charmbracelet/crush/internal/lsp"

17 "github.com/charmbracelet/crush/internal/lsp"

17 "github.com/charmbracelet/crush/internal/lsp/protocol"

18 "github.com/charmbracelet/crush/internal/lsp/protocol"

@@ -26,6 +27,8 @@ import (

26 "github.com/charmbracelet/crush/internal/version"

27 "github.com/charmbracelet/crush/internal/version"

27 "github.com/charmbracelet/lipgloss/v2"

28 "github.com/charmbracelet/lipgloss/v2"

28 "github.com/charmbracelet/x/ansi"

29 "github.com/charmbracelet/x/ansi"

30+ "golang.org/x/text/cases"

31+ "golang.org/x/text/language"

29)

32)

31type FileHistory struct {

34type FileHistory struct {

@@ -880,8 +883,13 @@ func formatTokensAndCost(tokens, contextWindow int64, cost float64) string {

880}

883}

881

884

882func (s *sidebarCmp) currentModelBlock() string {

885func (s *sidebarCmp) currentModelBlock() string {

883− agentCfg := config.Get().Agents["coder"]

886+ cfg := config.Get()

887+ agentCfg := cfg.Agents["coder"]

888+

889+ selectedModel := cfg.Models[agentCfg.Model]

890+

884 model := config.Get().GetModelByType(agentCfg.Model)

891 model := config.Get().GetModelByType(agentCfg.Model)

892+ modelProvider := config.Get().GetProviderForModel(agentCfg.Model)

885

893

886 t := styles.CurrentTheme()

894 t := styles.CurrentTheme()

887

895

@@ -891,6 +899,25 @@ func (s *sidebarCmp) currentModelBlock() string {

891 parts := []string{

899 parts := []string{

892 modelInfo,

900 modelInfo,

893 }

901 }

902+ if model.CanReason {

903+ reasoningInfoStyle := t.S().Subtle.PaddingLeft(2)

904+ switch modelProvider.Type {

905+ case provider.TypeOpenAI:

906+ reasoningEffort := model.DefaultReasoningEffort

907+ if selectedModel.ReasoningEffort != "" {

908+ reasoningEffort = selectedModel.ReasoningEffort

909+ }

910+ formatter := cases.Title(language.English, cases.NoLower)

911+ parts = append(parts, reasoningInfoStyle.Render(formatter.String(fmt.Sprintf("Reasoning %s", reasoningEffort))))

912+ case provider.TypeAnthropic:

913+ formatter := cases.Title(language.English, cases.NoLower)

914+ if selectedModel.Think {

915+ parts = append(parts, reasoningInfoStyle.Render(formatter.String("Thinking on")))

916+ } else {

917+ parts = append(parts, reasoningInfoStyle.Render(formatter.String("Thinking off")))

918+ }

919+ }

920+ }

894 if s.session.ID != "" {

921 if s.session.ID != "" {

895 parts = append(

922 parts = append(

896 parts,

923 parts,