replace entire input with suggestion

Author: iscekic

cli/src/state/atoms/__tests__/keyboard.test.ts

@@ -354,11 +354,63 @@ describe("keypress atoms", () => {
 			}
 			store.set(keyboardHandlerAtom, tabKey)
 
-			// Should append only 'de' to complete '/mode'
+			// Should complete to '/mode'
 			const text = store.get(textBufferStringAtom)
 			expect(text).toBe("/mode")
 		})
 
+		it("should complete command even when user types wrong letters", () => {
+			// Type '/modl' - typo, but 'model' should still be suggested
+			const chars = ["/", "m", "o", "d", "l"]
+			for (const char of chars) {
+				const key: Key = {
+					name: char,
+					sequence: char,
+					ctrl: false,
+					meta: false,
+					shift: false,
+					paste: false,
+				}
+				store.set(keyboardHandlerAtom, key)
+			}
+
+			// Autocomplete should now be visible
+			expect(store.get(showAutocompleteAtom)).toBe(true)
+
+			// Set up autocomplete suggestions
+			const mockCommand: Command = {
+				name: "model",
+				description: "Manage models",
+				aliases: [],
+				usage: "/model <subcommand>",
+				examples: ["/model info"],
+				category: "settings",
+				handler: vi.fn(),
+			}
+			const mockSuggestion: CommandSuggestion = {
+				command: mockCommand,
+				matchScore: 70,
+				highlightedName: "model",
+			}
+			store.set(suggestionsAtom, [mockSuggestion])
+			store.set(selectedIndexAtom, 0)
+
+			// Press Tab
+			const tabKey: Key = {
+				name: "tab",
+				sequence: "\t",
+				ctrl: false,
+				meta: false,
+				shift: false,
+				paste: false,
+			}
+			store.set(keyboardHandlerAtom, tabKey)
+
+			// Should replace '/modl' with '/model' (not '/modlmodel')
+			const text = store.get(textBufferStringAtom)
+			expect(text).toBe("/model")
+		})
+
 		it("should complete argument by replacing partial text", () => {
 			// Type '/mode tes' - this will automatically trigger autocomplete
 			const input = "/mode tes"

cli/src/state/atoms/keyboard.ts

@@ -307,38 +307,6 @@ export const submitInputAtom = atom(null, (get, set, text: string | Buffer) => {
 // Keyboard Handler System
 // ============================================================================
 
-/**
- * Helper function to get the completion text (only the missing part to append)
- */
-function getCompletionText(currentInput: string, suggestion: CommandSuggestion | ArgumentSuggestion): string {
-	if ("command" in suggestion) {
-		// CommandSuggestion - complete the command name
-		const commandName = suggestion.command.name
-		const currentText = currentInput.startsWith("/") ? currentInput.slice(1) : currentInput
-
-		// If the command name starts with what user typed, return only the missing part
-		if (commandName.toLowerCase().startsWith(currentText.toLowerCase())) {
-			return commandName.slice(currentText.length)
-		}
-
-		// Otherwise return the full command (shouldn't happen in normal flow)
-		return commandName
-	} else {
-		// ArgumentSuggestion - complete the last argument
-		const parts = currentInput.split(" ")
-		const lastPart = parts[parts.length - 1] || ""
-		const suggestionValue = suggestion.value
-
-		// If suggestion starts with what user typed, return only the missing part
-		if (suggestionValue.toLowerCase().startsWith(lastPart.toLowerCase())) {
-			return suggestionValue.slice(lastPart.length)
-		}
-
-		// Otherwise return the full value
-		return suggestionValue
-	}
-}
-
 /**
  * Helper function to format autocomplete suggestions for display/submission
  */
@@ -487,17 +455,10 @@ function handleAutocompleteKeys(get: any, set: any, key: Key): void {
 				const suggestion = allSuggestions[selectedIndex]
 				const currentText = get(textBufferStringAtom)
 
-				// For argument suggestions, replace the entire input with formatted suggestion
-				// For command suggestions, append the completion text
-				if ("command" in suggestion) {
-					// CommandSuggestion - append only the missing part
-					const completionText = getCompletionText(currentText, suggestion)
-					set(insertTextAtom, completionText)
-				} else {
-					// ArgumentSuggestion - replace entire input to avoid duplication
-					const newText = formatSuggestion(suggestion, currentText)
-					set(setTextAtom, newText)
-				}
+				// Always replace the entire input with formatted suggestion
+				// This handles both commands and arguments correctly
+				const newText = formatSuggestion(suggestion, currentText)
+				set(setTextAtom, newText)
 			}
 			return