From b437d0f620e289182a9067b05804f79b1174c1cc Mon Sep 17 00:00:00 2001
From: Kujtim Hoxha <kujtimii.h@gmail.com>
Date: Tue, 17 Jun 2025 21:39:49 +0200
Subject: [PATCH] chore: small fixes

---
 internal/tui/components/chat/sidebar/sidebar.go |  5 ++++-
 internal/tui/tui.go                             | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/internal/tui/components/chat/sidebar/sidebar.go b/internal/tui/components/chat/sidebar/sidebar.go
index 7f408c440d6db6ab7d5444e86243516c4dad1d94..308e981214940ab8c409898dac8db2a42530b0e9 100644
--- a/internal/tui/components/chat/sidebar/sidebar.go
+++ b/internal/tui/components/chat/sidebar/sidebar.go
@@ -291,7 +291,10 @@ func (m *sidebarCmp) filesBlock() string {
 		}
 
 		extraContent := strings.Join(statusParts, " ")
-		filePath := fsext.DirTrim(fsext.PrettyPath(file.FilePath), 2)
+		cwd := config.WorkingDirectory() + string(os.PathSeparator)
+		filePath := file.FilePath
+		filePath = strings.TrimPrefix(filePath, cwd)
+		filePath = fsext.DirTrim(fsext.PrettyPath(filePath), 2)
 		filePath = ansi.Truncate(filePath, maxWidth-lipgloss.Width(extraContent)-2, "…")
 		fileList = append(fileList,
 			core.Status(
diff --git a/internal/tui/tui.go b/internal/tui/tui.go
index 50e221a1520c446169fce544b494285f03a1e778..e7f2f99da3e7bbf726ac78d654d6501018ba1351 100644
--- a/internal/tui/tui.go
+++ b/internal/tui/tui.go
@@ -2,6 +2,7 @@ package tui
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/charmbracelet/bubbles/v2/key"
 	tea "github.com/charmbracelet/bubbletea/v2"
@@ -175,6 +176,15 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			Model: compact.NewCompactDialogCmp(a.app.CoderAgent, msg.SessionID, true),
 		})
 
+	// Model Switch
+	case models.ModelSelectedMsg:
+		model, err := a.app.CoderAgent.Update(config.AgentCoder, msg.Model.ID)
+		if err != nil {
+			return a, util.ReportError(err)
+		}
+
+		return a, util.ReportInfo(fmt.Sprintf("Model changed to %s", model.Name))
+
 	// File Picker
 	case chat.OpenFilePickerMsg:
 		if a.dialog.ActiveDialogID() == filepicker.FilePickerID {