Merge branch 'main' into ui

Ayman Bagabas created 2 weeks ago

Change summary

internal/db/sessions.sql.go                      | 2 +-
internal/db/sql/sessions.sql                     | 2 +-
internal/tui/components/dialogs/models/keys.go   | 4 ++--
internal/tui/components/dialogs/models/models.go | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)

Detailed changes

internal/db/sessions.sql.go

@@ -110,7 +110,7 @@ const listSessions = `-- name: ListSessions :many
 SELECT id, parent_session_id, title, message_count, prompt_tokens, completion_tokens, cost, updated_at, created_at, summary_message_id
 FROM sessions
 WHERE parent_session_id is NULL
-ORDER BY created_at DESC
+ORDER BY updated_at DESC
 `
 
 func (q *Queries) ListSessions(ctx context.Context) ([]Session, error) {

internal/db/sql/sessions.sql

@@ -32,7 +32,7 @@ WHERE id = ? LIMIT 1;
 SELECT *
 FROM sessions
 WHERE parent_session_id is NULL
-ORDER BY created_at DESC;
+ORDER BY updated_at DESC;
 
 -- name: UpdateSession :one
 UPDATE sessions

internal/tui/components/dialogs/models/keys.go

@@ -15,7 +15,7 @@ type KeyMap struct {
 	isAPIKeyHelp  bool
 	isAPIKeyValid bool
 
-	isClaudeAuthChoiseHelp    bool
+	isClaudeAuthChoiceHelp    bool
 	isClaudeOAuthHelp         bool
 	isClaudeOAuthURLState     bool
 	isClaudeOAuthHelpComplete bool
@@ -74,7 +74,7 @@ func (k KeyMap) FullHelp() [][]key.Binding {
 
 // ShortHelp implements help.KeyMap.
 func (k KeyMap) ShortHelp() []key.Binding {
-	if k.isClaudeAuthChoiseHelp {
+	if k.isClaudeAuthChoiceHelp {
 		return []key.Binding{
 			key.NewBinding(
 				key.WithKeys("left", "right", "h", "l"),

internal/tui/components/dialogs/models/models.go

@@ -164,7 +164,7 @@ func (m *modelDialogCmp) Update(msg tea.Msg) (util.Model, tea.Cmd) {
 			}
 
 			askForApiKey := func() {
-				m.keyMap.isClaudeAuthChoiseHelp = false
+				m.keyMap.isClaudeAuthChoiceHelp = false
 				m.keyMap.isClaudeOAuthHelp = false
 				m.keyMap.isAPIKeyHelp = true
 				m.showClaudeAuthMethodChooser = false
@@ -183,7 +183,7 @@ func (m *modelDialogCmp) Update(msg tea.Msg) (util.Model, tea.Cmd) {
 					m.selectedModelType = modelType
 					m.showClaudeAuthMethodChooser = false
 					m.showClaudeOAuth2 = true
-					m.keyMap.isClaudeAuthChoiseHelp = false
+					m.keyMap.isClaudeAuthChoiceHelp = false
 					m.keyMap.isClaudeOAuthHelp = true
 				}
 				return m, nil
@@ -252,7 +252,7 @@ func (m *modelDialogCmp) Update(msg tea.Msg) (util.Model, tea.Cmd) {
 			} else {
 				if selectedItem.Provider.ID == catwalk.InferenceProviderAnthropic {
 					m.showClaudeAuthMethodChooser = true
-					m.keyMap.isClaudeAuthChoiseHelp = true
+					m.keyMap.isClaudeAuthChoiceHelp = true
 					return m, nil
 				}
 				askForApiKey()
@@ -278,7 +278,7 @@ func (m *modelDialogCmp) Update(msg tea.Msg) (util.Model, tea.Cmd) {
 			if m.showClaudeAuthMethodChooser {
 				m.claudeAuthMethodChooser.SetDefaults()
 				m.showClaudeAuthMethodChooser = false
-				m.keyMap.isClaudeAuthChoiseHelp = false
+				m.keyMap.isClaudeAuthChoiceHelp = false
 				m.keyMap.isClaudeOAuthHelp = false
 				return m, nil
 			}