Feat: working tab completion in shell mode

config.example.toml

@@ -43,6 +43,7 @@ STT_SR = 16000  # Sample rate for audio recording
 DBPATH = "gflt.db"
 FilePickerDir = "." # Directory where file picker should start
 FilePickerExts = "png,jpg,jpeg,gif,webp" # Comma-separated list of allowed file extensions for file picker
+CodingDir = "." # Default directory for coding assistant file operations (relative paths resolved against this)
 EnableMouse = false # Enable mouse support in the UI
 # character specific context
 CharSpecificContextEnabled = true

config/config.go

@@ -31,6 +31,7 @@ type Config struct {
 	DBPATH                        string `toml:"DBPATH"`
 	FilePickerDir                 string `toml:"FilePickerDir"`
 	FilePickerExts                string `toml:"FilePickerExts"`
+	CodingDir                     string `toml:"CodingDir"`
 	ImagePreview                  bool   `toml:"ImagePreview"`
 	EnableMouse                   bool   `toml:"EnableMouse"`
 	// embeddings

docs/config.md

@@ -145,6 +145,9 @@ This document explains how to set up and configure the application using the `co
 #### FilePickerExts (`"png,jpg,jpeg,gif,webp"`)
 - Comma-separated list of allowed file extensions for the file picker.
 
+#### CodingDir (`"."`)
+- Default directory for coding assistant file operations. Relative paths in file tools (file_read, file_write, etc.) are resolved against this directory. Use absolute paths (starting with `/`) to bypass this.
+
 #### EnableMouse (`false`)
 - Enable or disable mouse support in the UI. When set to `true`, allows clicking buttons and interacting with UI elements using the mouse, but prevents the terminal from handling mouse events normally (such as selecting and copying text). When set to `false`, enables default terminal behavior allowing you to select and copy text, but disables mouse interaction with UI elements.
 

helpfuncs.go

@@ -7,12 +7,15 @@ import (
 	"image"
 	"net/url"
 	"os"
+	"os/exec"
 	"path"
 	"slices"
 	"strings"
 	"unicode"
 
 	"math/rand/v2"
+
+	"github.com/rivo/tview"
 )
 
 func isASCII(s string) bool {
@@ -374,3 +377,352 @@ func deepseekModelValidator() error {
 	}
 	return nil
 }
+
+// == shellmode ==
+
+func toggleShellMode() {
+	shellMode = !shellMode
+	if shellMode {
+		// Update input placeholder to indicate shell mode
+		textArea.SetPlaceholder("SHELL MODE: Enter command and press <Esc> to execute")
+	} else {
+		// Reset to normal mode
+		textArea.SetPlaceholder("input is multiline; press <Enter> to start the next line;\npress <Esc> to send the message. Alt+1 to exit shell mode")
+	}
+	updateStatusLine()
+}
+
+func updateFlexLayout() {
+	if fullscreenMode {
+		// flex already contains only focused widget; do nothing
+		return
+	}
+	flex.Clear()
+	flex.AddItem(textView, 0, 40, false)
+	flex.AddItem(textArea, 0, 10, false)
+	if positionVisible {
+		flex.AddItem(statusLineWidget, 0, 2, false)
+	}
+	// Keep focus on currently focused widget
+	focused := app.GetFocus()
+	if focused == textView {
+		app.SetFocus(textView)
+	} else {
+		app.SetFocus(textArea)
+	}
+}
+
+func executeCommandAndDisplay(cmdText string) {
+	// Parse the command (split by spaces, but handle quoted arguments)
+	cmdParts := parseCommand(cmdText)
+	if len(cmdParts) == 0 {
+		fmt.Fprintf(textView, "\n[red]Error: No command provided[-:-:-]\n")
+		if scrollToEndEnabled {
+			textView.ScrollToEnd()
+		}
+		colorText()
+		return
+	}
+	command := cmdParts[0]
+	args := []string{}
+	if len(cmdParts) > 1 {
+		args = cmdParts[1:]
+	}
+	// Create the command execution
+	cmd := exec.Command(command, args...)
+	// Execute the command and get output
+	output, err := cmd.CombinedOutput()
+	// Add the command being executed to the chat
+	fmt.Fprintf(textView, "\n[yellow]$ %s[-:-:-]\n", cmdText)
+	var outputContent string
+	if err != nil {
+		// Include both output and error
+		errorMsg := "Error: " + err.Error()
+		fmt.Fprintf(textView, "[red]%s[-:-:-]\n", errorMsg)
+		if len(output) > 0 {
+			outputStr := string(output)
+			fmt.Fprintf(textView, "[red]%s[-:-:-]\n", outputStr)
+			outputContent = errorMsg + "\n" + outputStr
+		} else {
+			outputContent = errorMsg
+		}
+	} else {
+		// Only output if successful
+		if len(output) > 0 {
+			outputStr := string(output)
+			fmt.Fprintf(textView, "[green]%s[-:-:-]\n", outputStr)
+			outputContent = outputStr
+		} else {
+			successMsg := "Command executed successfully (no output)"
+			fmt.Fprintf(textView, "[green]%s[-:-:-]\n", successMsg)
+			outputContent = successMsg
+		}
+	}
+	// Combine command and output in a single message for chat history
+	combinedContent := "$ " + cmdText + "\n\n" + outputContent
+	combinedMsg := models.RoleMsg{
+		Role:    cfg.ToolRole,
+		Content: combinedContent,
+	}
+	chatBody.Messages = append(chatBody.Messages, combinedMsg)
+	// Scroll to end and update colors
+	if scrollToEndEnabled {
+		textView.ScrollToEnd()
+	}
+	colorText()
+}
+
+// parseCommand splits command string handling quotes properly
+func parseCommand(cmd string) []string {
+	var args []string
+	var current string
+	var inQuotes bool
+	var quoteChar rune
+	for _, r := range cmd {
+		switch r {
+		case '"', '\'':
+			if inQuotes {
+				if r == quoteChar {
+					inQuotes = false
+				} else {
+					current += string(r)
+				}
+			} else {
+				inQuotes = true
+				quoteChar = r
+			}
+		case ' ', '\t':
+			if inQuotes {
+				current += string(r)
+			} else if current != "" {
+				args = append(args, current)
+				current = ""
+			}
+		default:
+			current += string(r)
+		}
+	}
+	if current != "" {
+		args = append(args, current)
+	}
+	return args
+}
+
+// == search ==
+
+// Global variables for search state
+var searchResults []int
+var searchResultLengths []int // To store the length of each match in the formatted string
+var searchIndex int
+var searchText string
+var originalTextForSearch string
+
+// performSearch searches for the given term in the textView content and highlights matches
+func performSearch(term string) {
+	searchText = term
+	if searchText == "" {
+		searchResults = nil
+		searchResultLengths = nil
+		originalTextForSearch = ""
+		// Re-render text without highlights
+		textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
+		colorText()
+		return
+	}
+	// Get formatted text and search directly in it to avoid mapping issues
+	formattedText := textView.GetText(true)
+	originalTextForSearch = formattedText
+	searchTermLower := strings.ToLower(searchText)
+	formattedTextLower := strings.ToLower(formattedText)
+	// Find all occurrences of the search term in the formatted text directly
+	formattedSearchResults := []int{}
+	searchStart := 0
+	for {
+		pos := strings.Index(formattedTextLower[searchStart:], searchTermLower)
+		if pos == -1 {
+			break
+		}
+		absolutePos := searchStart + pos
+		formattedSearchResults = append(formattedSearchResults, absolutePos)
+		searchStart = absolutePos + len(searchText)
+	}
+	if len(formattedSearchResults) == 0 {
+		// No matches found
+		searchResults = nil
+		searchResultLengths = nil
+		notification := "Pattern not found: " + term
+		if err := notifyUser("search", notification); err != nil {
+			logger.Error("failed to send notification", "error", err)
+		}
+		return
+	}
+	// Store the formatted text positions and lengths for accurate highlighting
+	searchResults = formattedSearchResults
+	// Create lengths array - all matches have the same length as the search term
+	searchResultLengths = make([]int, len(formattedSearchResults))
+	for i := range searchResultLengths {
+		searchResultLengths[i] = len(searchText)
+	}
+	searchIndex = 0
+	highlightCurrentMatch()
+}
+
+// highlightCurrentMatch highlights the current search match and scrolls to it
+func highlightCurrentMatch() {
+	if len(searchResults) == 0 || searchIndex >= len(searchResults) {
+		return
+	}
+	// Get the stored formatted text
+	formattedText := originalTextForSearch
+	// For tview to properly support highlighting and scrolling, we need to work with its region system
+	// Instead of just applying highlights, we need to add region tags to the text
+	highlightedText := addRegionTags(formattedText, searchResults, searchResultLengths, searchIndex, searchText)
+	// Update the text view with the text that includes region tags
+	textView.SetText(highlightedText)
+	// Highlight the current region and scroll to it
+	// Need to identify which position in the results array corresponds to the current match
+	// The region ID will be search_<position>_<index>
+	currentRegion := fmt.Sprintf("search_%d_%d", searchResults[searchIndex], searchIndex)
+	textView.Highlight(currentRegion).ScrollToHighlight()
+	// Send notification about which match we're at
+	notification := fmt.Sprintf("Match %d of %d", searchIndex+1, len(searchResults))
+	if err := notifyUser("search", notification); err != nil {
+		logger.Error("failed to send notification", "error", err)
+	}
+}
+
+// showSearchBar shows the search input field as an overlay
+func showSearchBar() {
+	// Create a temporary flex to combine search and main content
+	updatedFlex := tview.NewFlex().SetDirection(tview.FlexRow).
+		AddItem(searchField, 3, 0, true). // Search field at top
+		AddItem(flex, 0, 1, false)        // Main flex layout below
+	// Add the search overlay as a page
+	pages.AddPage(searchPageName, updatedFlex, true, true)
+	app.SetFocus(searchField)
+}
+
+// hideSearchBar hides the search input field
+func hideSearchBar() {
+	pages.RemovePage(searchPageName)
+	// Return focus to the text view
+	app.SetFocus(textView)
+	// Clear the search field
+	searchField.SetText("")
+}
+
+// Global variables for index overlay functionality
+var indexPageName = "indexOverlay"
+
+// showIndexBar shows the index input field as an overlay at the top
+func showIndexBar() {
+	// Create a temporary flex to combine index input and main content
+	updatedFlex := tview.NewFlex().SetDirection(tview.FlexRow).
+		AddItem(indexPickWindow, 3, 0, true). // Index field at top
+		AddItem(flex, 0, 1, false)            // Main flex layout below
+
+	// Add the index overlay as a page
+	pages.AddPage(indexPageName, updatedFlex, true, true)
+	app.SetFocus(indexPickWindow)
+}
+
+// hideIndexBar hides the index input field
+func hideIndexBar() {
+	pages.RemovePage(indexPageName)
+	// Return focus to the text view
+	app.SetFocus(textView)
+	// Clear the index field
+	indexPickWindow.SetText("")
+}
+
+// addRegionTags adds region tags to search matches in the text for tview highlighting
+func addRegionTags(text string, positions []int, lengths []int, currentIdx int, searchTerm string) string {
+	if len(positions) == 0 {
+		return text
+	}
+	var result strings.Builder
+	lastEnd := 0
+	for i, pos := range positions {
+		endPos := pos + lengths[i]
+		// Add text before this match
+		if pos > lastEnd {
+			result.WriteString(text[lastEnd:pos])
+		}
+		// The matched text, which may contain its own formatting tags
+		actualText := text[pos:endPos]
+		// Add region tag and highlighting for this match
+		// Use a unique region id that includes the match index to avoid conflicts
+		regionId := fmt.Sprintf("search_%d_%d", pos, i) // position + index to ensure uniqueness
+		var highlightStart, highlightEnd string
+		if i == currentIdx {
+			// Current match - use different highlighting
+			highlightStart = fmt.Sprintf(`["%s"][yellow:blue:b]`, regionId) // Current match with region and special highlight
+			highlightEnd = `[-:-:-][""]`                                    // Reset formatting and close region
+		} else {
+			// Other matches - use regular highlighting
+			highlightStart = fmt.Sprintf(`["%s"][gold:red:u]`, regionId) // Other matches with region and highlight
+			highlightEnd = `[-:-:-][""]`                                 // Reset formatting and close region
+		}
+		result.WriteString(highlightStart)
+		result.WriteString(actualText)
+		result.WriteString(highlightEnd)
+		lastEnd = endPos
+	}
+	// Add the rest of the text after the last processed match
+	if lastEnd < len(text) {
+		result.WriteString(text[lastEnd:])
+	}
+	return result.String()
+}
+
+// searchNext finds the next occurrence of the search term
+func searchNext() {
+	if len(searchResults) == 0 {
+		if err := notifyUser("search", "No search results to navigate"); err != nil {
+			logger.Error("failed to send notification", "error", err)
+		}
+		return
+	}
+	searchIndex = (searchIndex + 1) % len(searchResults)
+	highlightCurrentMatch()
+}
+
+// searchPrev finds the previous occurrence of the search term
+func searchPrev() {
+	if len(searchResults) == 0 {
+		if err := notifyUser("search", "No search results to navigate"); err != nil {
+			logger.Error("failed to send notification", "error", err)
+		}
+		return
+	}
+	if searchIndex == 0 {
+		searchIndex = len(searchResults) - 1
+	} else {
+		searchIndex--
+	}
+	highlightCurrentMatch()
+}
+
+// == tab completion ==
+
+func scanFiles(dir, filter string) []string {
+	var files []string
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		return files
+	}
+	for _, entry := range entries {
+		name := entry.Name()
+		if strings.HasPrefix(name, ".") {
+			continue
+		}
+		if filter == "" || strings.HasPrefix(strings.ToLower(name), strings.ToLower(filter)) {
+			if entry.IsDir() {
+				files = append(files, name+"/")
+			} else {
+				files = append(files, name)
+			}
+		}
+	}
+	return files
+}

popups.go

@@ -70,6 +70,10 @@ func showModelSelectionPopup() {
 			pages.RemovePage("modelSelectionPopup")
 			return nil
 		}
+		if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
+			pages.RemovePage("modelSelectionPopup")
+			return nil
+		}
 		return event
 	})
 	modal := func(p tview.Primitive, width, height int) tview.Primitive {
@@ -163,6 +167,10 @@ func showAPILinkSelectionPopup() {
 			pages.RemovePage("apiLinkSelectionPopup")
 			return nil
 		}
+		if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
+			pages.RemovePage("apiLinkSelectionPopup")
+			return nil
+		}
 		return event
 	})
 	modal := func(p tview.Primitive, width, height int) tview.Primitive {
@@ -229,6 +237,10 @@ func showUserRoleSelectionPopup() {
 			pages.RemovePage("userRoleSelectionPopup")
 			return nil
 		}
+		if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
+			pages.RemovePage("userRoleSelectionPopup")
+			return nil
+		}
 		return event
 	})
 	modal := func(p tview.Primitive, width, height int) tview.Primitive {
@@ -297,6 +309,10 @@ func showBotRoleSelectionPopup() {
 			pages.RemovePage("botRoleSelectionPopup")
 			return nil
 		}
+		if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
+			pages.RemovePage("botRoleSelectionPopup")
+			return nil
+		}
 		return event
 	})
 	modal := func(p tview.Primitive, width, height int) tview.Primitive {
@@ -312,3 +328,62 @@ func showBotRoleSelectionPopup() {
 	pages.AddPage("botRoleSelectionPopup", modal(roleListWidget, 80, 20), true, true)
 	app.SetFocus(roleListWidget)
 }
+
+func showFileCompletionPopup(filter string) {
+	baseDir := cfg.CodingDir
+	if baseDir == "" {
+		baseDir = "."
+	}
+	complMatches := scanFiles(baseDir, filter)
+	if len(complMatches) == 0 {
+		return
+	}
+	// If only one match, auto-complete without showing popup
+	if len(complMatches) == 1 {
+		currentText := textArea.GetText()
+		atIdx := strings.LastIndex(currentText, "@")
+		if atIdx >= 0 {
+			before := currentText[:atIdx]
+			textArea.SetText(before+complMatches[0], true)
+		}
+		return
+	}
+	widget := tview.NewList().ShowSecondaryText(false).
+		SetSelectedBackgroundColor(tcell.ColorGray)
+	widget.SetTitle("file completion").SetBorder(true)
+	for _, m := range complMatches {
+		widget.AddItem(m, "", 0, nil)
+	}
+	widget.SetSelectedFunc(func(index int, mainText string, secondaryText string, shortcut rune) {
+		currentText := textArea.GetText()
+		atIdx := strings.LastIndex(currentText, "@")
+		if atIdx >= 0 {
+			before := currentText[:atIdx]
+			textArea.SetText(before+mainText, true)
+		}
+		pages.RemovePage("fileCompletionPopup")
+	})
+	widget.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
+		if event.Key() == tcell.KeyEscape {
+			pages.RemovePage("fileCompletionPopup")
+			return nil
+		}
+		if event.Key() == tcell.KeyRune && event.Rune() == 'x' {
+			pages.RemovePage("fileCompletionPopup")
+			return nil
+		}
+		return event
+	})
+	modal := func(p tview.Primitive, width, height int) tview.Primitive {
+		return tview.NewFlex().
+			AddItem(nil, 0, 1, false).
+			AddItem(tview.NewFlex().SetDirection(tview.FlexRow).
+				AddItem(nil, 0, 1, false).
+				AddItem(p, height, 1, true).
+				AddItem(nil, 0, 1, false), width, 1, true).
+			AddItem(nil, 0, 1, false)
+	}
+	// Add modal page and make it visible
+	pages.AddPage("fileCompletionPopup", modal(widget, 80, 20), true, true)
+	app.SetFocus(widget)
+}

tables.go

@@ -820,7 +820,7 @@ func makeFilePicker() *tview.Flex {
 	}
 	// Create UI elements
 	listView := tview.NewList()
-	listView.SetBorder(true).SetTitle("Files & Directories").SetTitleAlign(tview.AlignLeft)
+	listView.SetBorder(true).SetTitle("Files & Directories [c: set CodingDir]").SetTitleAlign(tview.AlignLeft)
 	// Status view for selected file information
 	statusView := tview.NewTextView()
 	statusView.SetBorder(true).SetTitle("Selected File").SetTitleAlign(tview.AlignLeft)
@@ -1032,6 +1032,37 @@ func makeFilePicker() *tview.Flex {
 				refreshList(currentDisplayDir, "")
 				return nil
 			}
+			if event.Rune() == 'c' {
+				// Set CodingDir to current directory
+				itemIndex := listView.GetCurrentItem()
+				if itemIndex >= 0 && itemIndex < listView.GetItemCount() {
+					itemText, _ := listView.GetItemText(itemIndex)
+					// Get the actual directory path
+					var targetDir string
+					if strings.HasPrefix(itemText, "Exit") || strings.HasPrefix(itemText, "Select this directory") {
+						targetDir = currentDisplayDir
+					} else {
+						actualItemName := itemText
+						if bracketPos := strings.Index(itemText, " ["); bracketPos != -1 {
+							actualItemName = itemText[:bracketPos]
+						}
+						if strings.HasPrefix(actualItemName, "../") {
+							targetDir = path.Dir(currentDisplayDir)
+						} else if strings.HasSuffix(actualItemName, "/") {
+							dirName := strings.TrimSuffix(actualItemName, "/")
+							targetDir = path.Join(currentDisplayDir, dirName)
+						} else {
+							targetDir = currentDisplayDir
+						}
+					}
+					cfg.CodingDir = targetDir
+					if err := notifyUser("CodingDir", "Set to: "+targetDir); err != nil {
+						logger.Error("failed to notify user", "error", err)
+					}
+					pages.RemovePage(filePickerPage)
+					return nil
+				}
+			}
 		case tcell.KeyEnter:
 			// Get the currently highlighted item in the list
 			itemIndex := listView.GetCurrentItem()

tools.go

@@ -9,6 +9,7 @@ import (
 	"io"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
@@ -377,6 +378,8 @@ func fileCreate(args map[string]string) []byte {
 		return []byte(msg)
 	}
 
+	path = resolvePath(path)
+
 	content, ok := args["content"]
 	if !ok {
 		content = ""
@@ -400,6 +403,8 @@ func fileRead(args map[string]string) []byte {
 		return []byte(msg)
 	}
 
+	path = resolvePath(path)
+
 	content, err := readStringFromFile(path)
 	if err != nil {
 		msg := "failed to read file; error: " + err.Error()
@@ -428,6 +433,7 @@ func fileWrite(args map[string]string) []byte {
 		logger.Error(msg)
 		return []byte(msg)
 	}
+	path = resolvePath(path)
 	content, ok := args["content"]
 	if !ok {
 		content = ""
@@ -448,6 +454,7 @@ func fileWriteAppend(args map[string]string) []byte {
 		logger.Error(msg)
 		return []byte(msg)
 	}
+	path = resolvePath(path)
 	content, ok := args["content"]
 	if !ok {
 		content = ""
@@ -469,6 +476,8 @@ func fileDelete(args map[string]string) []byte {
 		return []byte(msg)
 	}
 
+	path = resolvePath(path)
+
 	if err := removeFile(path); err != nil {
 		msg := "failed to delete file; error: " + err.Error()
 		logger.Error(msg)
@@ -486,6 +495,7 @@ func fileMove(args map[string]string) []byte {
 		logger.Error(msg)
 		return []byte(msg)
 	}
+	src = resolvePath(src)
 
 	dst, ok := args["dst"]
 	if !ok || dst == "" {
@@ -493,6 +503,7 @@ func fileMove(args map[string]string) []byte {
 		logger.Error(msg)
 		return []byte(msg)
 	}
+	dst = resolvePath(dst)
 
 	if err := moveFile(src, dst); err != nil {
 		msg := "failed to move file; error: " + err.Error()
@@ -511,6 +522,7 @@ func fileCopy(args map[string]string) []byte {
 		logger.Error(msg)
 		return []byte(msg)
 	}
+	src = resolvePath(src)
 
 	dst, ok := args["dst"]
 	if !ok || dst == "" {
@@ -518,6 +530,7 @@ func fileCopy(args map[string]string) []byte {
 		logger.Error(msg)
 		return []byte(msg)
 	}
+	dst = resolvePath(dst)
 
 	if err := copyFile(src, dst); err != nil {
 		msg := "failed to copy file; error: " + err.Error()
@@ -535,6 +548,8 @@ func fileList(args map[string]string) []byte {
 		path = "." // default to current directory
 	}
 
+	path = resolvePath(path)
+
 	files, err := listDirectory(path)
 	if err != nil {
 		msg := "failed to list directory; error: " + err.Error()
@@ -558,6 +573,13 @@ func fileList(args map[string]string) []byte {
 
 // Helper functions for file operations
 
+func resolvePath(p string) string {
+	if filepath.IsAbs(p) {
+		return p
+	}
+	return filepath.Join(cfg.CodingDir, p)
+}
+
 func readStringFromFile(filename string) (string, error) {
 	data, err := os.ReadFile(filename)
 	if err != nil {

tui.go

@@ -7,7 +7,6 @@ import (
 	_ "image/jpeg"
 	_ "image/png"
 	"os"
-	"os/exec"
 	"path"
 	"strconv"
 	"strings"
@@ -50,7 +49,6 @@ var (
 	imgPage        = "imgPage"
 	filePickerPage = "filePicker"
 	exportDir      = "chat_exports"
-
 	// For overlay search functionality
 	searchField    *tview.InputField
 	searchPageName = "searchOverlay"
@@ -109,6 +107,13 @@ var (
 === tables (chat history, agent pick, file pick, properties) ===
 [yellow]x[white]: to exit the table page
 
+=== filepicker ===
+[yellow]c[white]: (in file picker) set current dir as CodingDir
+[yellow]x[white]: to exit
+
+=== shell mode ===
+[yellow]@match->Tab[white]: file completion (type @ in input to get file suggestions)
+
 === status line ===
 %s
 
@@ -170,328 +175,6 @@ Press <Enter> or 'x' to return
 	}
 )
 
-func toggleShellMode() {
-	shellMode = !shellMode
-	if shellMode {
-		// Update input placeholder to indicate shell mode
-		textArea.SetPlaceholder("SHELL MODE: Enter command and press <Esc> to execute")
-	} else {
-		// Reset to normal mode
-		textArea.SetPlaceholder("input is multiline; press <Enter> to start the next line;\npress <Esc> to send the message. Alt+1 to exit shell mode")
-	}
-	updateStatusLine()
-}
-
-func updateFlexLayout() {
-	if fullscreenMode {
-		// flex already contains only focused widget; do nothing
-		return
-	}
-	flex.Clear()
-	flex.AddItem(textView, 0, 40, false)
-	flex.AddItem(textArea, 0, 10, false)
-	if positionVisible {
-		flex.AddItem(statusLineWidget, 0, 2, false)
-	}
-	// Keep focus on currently focused widget
-	focused := app.GetFocus()
-	if focused == textView {
-		app.SetFocus(textView)
-	} else {
-		app.SetFocus(textArea)
-	}
-}
-
-func executeCommandAndDisplay(cmdText string) {
-	// Parse the command (split by spaces, but handle quoted arguments)
-	cmdParts := parseCommand(cmdText)
-	if len(cmdParts) == 0 {
-		fmt.Fprintf(textView, "\n[red]Error: No command provided[-:-:-]\n")
-		if scrollToEndEnabled {
-			textView.ScrollToEnd()
-		}
-		colorText()
-		return
-	}
-	command := cmdParts[0]
-	args := []string{}
-	if len(cmdParts) > 1 {
-		args = cmdParts[1:]
-	}
-	// Create the command execution
-	cmd := exec.Command(command, args...)
-	// Execute the command and get output
-	output, err := cmd.CombinedOutput()
-	// Add the command being executed to the chat
-	fmt.Fprintf(textView, "\n[yellow]$ %s[-:-:-]\n", cmdText)
-	var outputContent string
-	if err != nil {
-		// Include both output and error
-		errorMsg := "Error: " + err.Error()
-		fmt.Fprintf(textView, "[red]%s[-:-:-]\n", errorMsg)
-		if len(output) > 0 {
-			outputStr := string(output)
-			fmt.Fprintf(textView, "[red]%s[-:-:-]\n", outputStr)
-			outputContent = errorMsg + "\n" + outputStr
-		} else {
-			outputContent = errorMsg
-		}
-	} else {
-		// Only output if successful
-		if len(output) > 0 {
-			outputStr := string(output)
-			fmt.Fprintf(textView, "[green]%s[-:-:-]\n", outputStr)
-			outputContent = outputStr
-		} else {
-			successMsg := "Command executed successfully (no output)"
-			fmt.Fprintf(textView, "[green]%s[-:-:-]\n", successMsg)
-			outputContent = successMsg
-		}
-	}
-	// Combine command and output in a single message for chat history
-	combinedContent := "$ " + cmdText + "\n\n" + outputContent
-	combinedMsg := models.RoleMsg{
-		Role:    cfg.ToolRole,
-		Content: combinedContent,
-	}
-	chatBody.Messages = append(chatBody.Messages, combinedMsg)
-	// Scroll to end and update colors
-	if scrollToEndEnabled {
-		textView.ScrollToEnd()
-	}
-	colorText()
-}
-
-// parseCommand splits command string handling quotes properly
-func parseCommand(cmd string) []string {
-	var args []string
-	var current string
-	var inQuotes bool
-	var quoteChar rune
-	for _, r := range cmd {
-		switch r {
-		case '"', '\'':
-			if inQuotes {
-				if r == quoteChar {
-					inQuotes = false
-				} else {
-					current += string(r)
-				}
-			} else {
-				inQuotes = true
-				quoteChar = r
-			}
-		case ' ', '\t':
-			if inQuotes {
-				current += string(r)
-			} else if current != "" {
-				args = append(args, current)
-				current = ""
-			}
-		default:
-			current += string(r)
-		}
-	}
-	if current != "" {
-		args = append(args, current)
-	}
-	return args
-}
-
-// Global variables for search state
-var searchResults []int
-var searchResultLengths []int // To store the length of each match in the formatted string
-var searchIndex int
-var searchText string
-var originalTextForSearch string
-
-// performSearch searches for the given term in the textView content and highlights matches
-func performSearch(term string) {
-	searchText = term
-	if searchText == "" {
-		searchResults = nil
-		searchResultLengths = nil
-		originalTextForSearch = ""
-		// Re-render text without highlights
-		textView.SetText(chatToText(chatBody.Messages, cfg.ShowSys))
-		colorText()
-		return
-	}
-	// Get formatted text and search directly in it to avoid mapping issues
-	formattedText := textView.GetText(true)
-	originalTextForSearch = formattedText
-	searchTermLower := strings.ToLower(searchText)
-	formattedTextLower := strings.ToLower(formattedText)
-	// Find all occurrences of the search term in the formatted text directly
-	formattedSearchResults := []int{}
-	searchStart := 0
-	for {
-		pos := strings.Index(formattedTextLower[searchStart:], searchTermLower)
-		if pos == -1 {
-			break
-		}
-		absolutePos := searchStart + pos
-		formattedSearchResults = append(formattedSearchResults, absolutePos)
-		searchStart = absolutePos + len(searchText)
-	}
-	if len(formattedSearchResults) == 0 {
-		// No matches found
-		searchResults = nil
-		searchResultLengths = nil
-		notification := "Pattern not found: " + term
-		if err := notifyUser("search", notification); err != nil {
-			logger.Error("failed to send notification", "error", err)
-		}
-		return
-	}
-	// Store the formatted text positions and lengths for accurate highlighting
-	searchResults = formattedSearchResults
-	// Create lengths array - all matches have the same length as the search term
-	searchResultLengths = make([]int, len(formattedSearchResults))
-	for i := range searchResultLengths {
-		searchResultLengths[i] = len(searchText)
-	}
-	searchIndex = 0
-	highlightCurrentMatch()
-}
-
-// highlightCurrentMatch highlights the current search match and scrolls to it
-func highlightCurrentMatch() {
-	if len(searchResults) == 0 || searchIndex >= len(searchResults) {
-		return
-	}
-	// Get the stored formatted text
-	formattedText := originalTextForSearch
-	// For tview to properly support highlighting and scrolling, we need to work with its region system
-	// Instead of just applying highlights, we need to add region tags to the text
-	highlightedText := addRegionTags(formattedText, searchResults, searchResultLengths, searchIndex, searchText)
-	// Update the text view with the text that includes region tags
-	textView.SetText(highlightedText)
-	// Highlight the current region and scroll to it
-	// Need to identify which position in the results array corresponds to the current match
-	// The region ID will be search_<position>_<index>
-	currentRegion := fmt.Sprintf("search_%d_%d", searchResults[searchIndex], searchIndex)
-	textView.Highlight(currentRegion).ScrollToHighlight()
-	// Send notification about which match we're at
-	notification := fmt.Sprintf("Match %d of %d", searchIndex+1, len(searchResults))
-	if err := notifyUser("search", notification); err != nil {
-		logger.Error("failed to send notification", "error", err)
-	}
-}
-
-// showSearchBar shows the search input field as an overlay
-func showSearchBar() {
-	// Create a temporary flex to combine search and main content
-	updatedFlex := tview.NewFlex().SetDirection(tview.FlexRow).
-		AddItem(searchField, 3, 0, true). // Search field at top
-		AddItem(flex, 0, 1, false)        // Main flex layout below
-
-	// Add the search overlay as a page
-	pages.AddPage(searchPageName, updatedFlex, true, true)
-	app.SetFocus(searchField)
-}
-
-// hideSearchBar hides the search input field
-func hideSearchBar() {
-	pages.RemovePage(searchPageName)
-	// Return focus to the text view
-	app.SetFocus(textView)
-	// Clear the search field
-	searchField.SetText("")
-}
-
-// Global variables for index overlay functionality
-var indexPageName = "indexOverlay"
-
-// showIndexBar shows the index input field as an overlay at the top
-func showIndexBar() {
-	// Create a temporary flex to combine index input and main content
-	updatedFlex := tview.NewFlex().SetDirection(tview.FlexRow).
-		AddItem(indexPickWindow, 3, 0, true). // Index field at top
-		AddItem(flex, 0, 1, false)            // Main flex layout below
-
-	// Add the index overlay as a page
-	pages.AddPage(indexPageName, updatedFlex, true, true)
-	app.SetFocus(indexPickWindow)
-}
-
-// hideIndexBar hides the index input field
-func hideIndexBar() {
-	pages.RemovePage(indexPageName)
-	// Return focus to the text view
-	app.SetFocus(textView)
-	// Clear the index field
-	indexPickWindow.SetText("")
-}
-
-// addRegionTags adds region tags to search matches in the text for tview highlighting
-func addRegionTags(text string, positions []int, lengths []int, currentIdx int, searchTerm string) string {
-	if len(positions) == 0 {
-		return text
-	}
-	var result strings.Builder
-	lastEnd := 0
-	for i, pos := range positions {
-		endPos := pos + lengths[i]
-		// Add text before this match
-		if pos > lastEnd {
-			result.WriteString(text[lastEnd:pos])
-		}
-		// The matched text, which may contain its own formatting tags
-		actualText := text[pos:endPos]
-		// Add region tag and highlighting for this match
-		// Use a unique region id that includes the match index to avoid conflicts
-		regionId := fmt.Sprintf("search_%d_%d", pos, i) // position + index to ensure uniqueness
-		var highlightStart, highlightEnd string
-		if i == currentIdx {
-			// Current match - use different highlighting
-			highlightStart = fmt.Sprintf(`["%s"][yellow:blue:b]`, regionId) // Current match with region and special highlight
-			highlightEnd = `[-:-:-][""]`                                    // Reset formatting and close region
-		} else {
-			// Other matches - use regular highlighting
-			highlightStart = fmt.Sprintf(`["%s"][gold:red:u]`, regionId) // Other matches with region and highlight
-			highlightEnd = `[-:-:-][""]`                                 // Reset formatting and close region
-		}
-		result.WriteString(highlightStart)
-		result.WriteString(actualText)
-		result.WriteString(highlightEnd)
-		lastEnd = endPos
-	}
-	// Add the rest of the text after the last processed match
-	if lastEnd < len(text) {
-		result.WriteString(text[lastEnd:])
-	}
-	return result.String()
-}
-
-// searchNext finds the next occurrence of the search term
-func searchNext() {
-	if len(searchResults) == 0 {
-		if err := notifyUser("search", "No search results to navigate"); err != nil {
-			logger.Error("failed to send notification", "error", err)
-		}
-		return
-	}
-	searchIndex = (searchIndex + 1) % len(searchResults)
-	highlightCurrentMatch()
-}
-
-// searchPrev finds the previous occurrence of the search term
-func searchPrev() {
-	if len(searchResults) == 0 {
-		if err := notifyUser("search", "No search results to navigate"); err != nil {
-			logger.Error("failed to send notification", "error", err)
-		}
-		return
-	}
-	if searchIndex == 0 {
-		searchIndex = len(searchResults) - 1
-	} else {
-		searchIndex--
-	}
-	highlightCurrentMatch()
-}
-
 func init() {
 	tview.Styles = colorschemes["default"]
 	app = tview.NewApplication()
@@ -499,6 +182,37 @@ func init() {
 	textArea = tview.NewTextArea().
 		SetPlaceholder("input is multiline; press <Enter> to start the next line;\npress <Esc> to send the message.")
 	textArea.SetBorder(true).SetTitle("input")
+	// Add input capture for @ completion
+	textArea.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
+		if !shellMode {
+			return event
+		}
+		// Handle Tab key for file completion
+		if event.Key() == tcell.KeyTab {
+			currentText := textArea.GetText()
+			row, col, _, _ := textArea.GetCursor()
+			// Calculate absolute position from row/col
+			lines := strings.Split(currentText, "\n")
+			cursorPos := 0
+			for i := 0; i < row && i < len(lines); i++ {
+				cursorPos += len(lines[i]) + 1 // +1 for newline
+			}
+			cursorPos += col
+			// Look backwards from cursor to find @
+			if cursorPos > 0 {
+				// Find the last @ before cursor
+				textBeforeCursor := currentText[:cursorPos]
+				atIndex := strings.LastIndex(textBeforeCursor, "@")
+				if atIndex >= 0 {
+					// Extract the partial match text after @
+					filter := textBeforeCursor[atIndex+1:]
+					showFileCompletionPopup(filter)
+					return nil // Consume the Tab event
+				}
+			}
+		}
+		return event
+	})
 	textView = tview.NewTextView().
 		SetDynamicColors(true).
 		SetRegions(true).
@@ -612,7 +326,6 @@ func init() {
 			// colorText()
 			// updateStatusLine()
 		})
-
 	roleEditWindow = tview.NewInputField().
 		SetLabel("Enter new role: ").
 		SetPlaceholder("e.g., user, assistant, system, tool").
@@ -1306,7 +1019,6 @@ func init() {
 			app.SetFocus(focusSwitcher[currentF])
 			return nil
 		}
-
 		if isASCII(string(event.Rune())) && !botRespMode {
 			return event
 		}