From 13acdb7df92105485b10b707cca7218e455d5aa3 Mon Sep 17 00:00:00 2001
From: piyush0049 <piyushjoshi81204@gmail.com>
Date: Thu, 23 Jul 2026 13:53:52 +0530
Subject: [PATCH] fix(tui): resolve cross-platform root detection and fallback
 paths in pickers

---
 pkg/tui/dialog/file_picker.go        | 2 +-
 pkg/tui/dialog/working_dir_picker.go | 4 ++--
 pkg/tui/tui.go                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/tui/dialog/file_picker.go b/pkg/tui/dialog/file_picker.go
index 20db586c53..4c02e4db09 100644
--- a/pkg/tui/dialog/file_picker.go
+++ b/pkg/tui/dialog/file_picker.go
@@ -144,7 +144,7 @@ func (d *filePickerDialog) loadDirectory() {
 	d.scrollview.SetScrollOffset(0)
 	d.err = nil
 
-	if d.currentDir != "/" {
+	if filepath.Dir(d.currentDir) != d.currentDir {
 		d.entries = append(d.entries, fileEntry{
 			name:  "..",
 			path:  filepath.Dir(d.currentDir),
diff --git a/pkg/tui/dialog/working_dir_picker.go b/pkg/tui/dialog/working_dir_picker.go
index f2f1ba4bff..30af95d41e 100644
--- a/pkg/tui/dialog/working_dir_picker.go
+++ b/pkg/tui/dialog/working_dir_picker.go
@@ -168,7 +168,7 @@ func NewWorkingDirPickerDialog(ctx context.Context, recentDirs, favoriteDirs []s
 		var err error
 		cwd, err = os.Getwd()
 		if err != nil {
-			cwd = "/"
+			cwd = "."
 		}
 	}
 
@@ -258,7 +258,7 @@ func (d *workingDirPickerDialog) loadBrowseDirectory() {
 		kind: entryUseThisDir,
 	})
 
-	if d.currentDir != "/" {
+	if filepath.Dir(d.currentDir) != d.currentDir {
 		d.browseEntries = append(d.browseEntries, dirEntry{
 			name: "..",
 			path: filepath.Dir(d.currentDir),
diff --git a/pkg/tui/tui.go b/pkg/tui/tui.go
index 5dff84ce8d..278afd5aab 100644
--- a/pkg/tui/tui.go
+++ b/pkg/tui/tui.go
@@ -1999,7 +1999,7 @@ func (m *appModel) handleCloseTab(sessionID string) (tea.Model, tea.Cmd) {
 			workingDir, _ = os.Getwd()
 		}
 		if workingDir == "" {
-			workingDir = "/"
+			workingDir = "."
 		}
 		return m.handleSpawnSession(workingDir)
 	}