enter shell mode only when the input is empty

Author: iscekic

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

@@ -10,7 +10,7 @@ import {
 	navigateShellHistoryDownAtom,
 	addToShellHistoryAtom,
 } from "../shell.js"
-import { textBufferStringAtom } from "../textBuffer.js"
+import { textBufferStringAtom, setTextAtom } from "../textBuffer.js"
 
 // Mock child_process to avoid actual command execution
 vi.mock("child_process", () => ({
@@ -56,12 +56,13 @@ describe("shell mode - comprehensive tests", () => {
 	})
 
 	describe("shell mode activation", () => {
-		it("should toggle shell mode on and off", () => {
+		it("should toggle shell mode on and off when input is empty", () => {
 			// Initial state
 			expect(store.get(shellModeActiveAtom)).toBe(false)
 			expect(store.get(inputModeAtom)).toBe("normal")
+			expect(store.get(textBufferStringAtom)).toBe("")
 
-			// Toggle on
+			// Toggle on (input is empty)
 			store.set(toggleShellModeAtom)
 			expect(store.get(shellModeActiveAtom)).toBe(true)
 			expect(store.get(inputModeAtom)).toBe("shell")
@@ -72,6 +73,36 @@ describe("shell mode - comprehensive tests", () => {
 			expect(store.get(inputModeAtom)).toBe("normal")
 		})
 
+		it("should NOT enter shell mode when input is not empty", () => {
+			// Set some text in the buffer
+			store.set(setTextAtom, "some text")
+			expect(store.get(textBufferStringAtom)).toBe("some text")
+
+			// Try to toggle on
+			store.set(toggleShellModeAtom)
+
+			// Should NOT activate shell mode
+			expect(store.get(shellModeActiveAtom)).toBe(false)
+			expect(store.get(inputModeAtom)).toBe("normal")
+
+			// Text should still be there
+			expect(store.get(textBufferStringAtom)).toBe("some text")
+		})
+
+		it("should exit shell mode even when text is present", () => {
+			// Enter shell mode (with empty input)
+			store.set(toggleShellModeAtom)
+			expect(store.get(shellModeActiveAtom)).toBe(true)
+
+			// Add some text
+			store.set(setTextAtom, "some command")
+
+			// Toggle off should work even with text
+			store.set(toggleShellModeAtom)
+			expect(store.get(shellModeActiveAtom)).toBe(false)
+			expect(store.get(inputModeAtom)).toBe("normal")
+		})
+
 		it("should reset history index when toggling on", () => {
 			// Set a non-default history index
 			store.set(shellHistoryIndexAtom, 5)
@@ -95,8 +126,8 @@ describe("shell mode - comprehensive tests", () => {
 			expect(store.get(shellHistoryIndexAtom)).toBe(-1)
 		})
 
-		it("should handle multiple rapid toggles", () => {
-			// Toggle multiple times
+		it("should handle multiple rapid toggles when input is empty", () => {
+			// Toggle multiple times (with empty input)
 			store.set(toggleShellModeAtom)
 			expect(store.get(shellModeActiveAtom)).toBe(true)
 
@@ -351,7 +382,7 @@ describe("shell mode - comprehensive tests", () => {
 	})
 
 	describe("Shift+1 key detection", () => {
-		it("should detect Shift+1 and toggle shell mode", async () => {
+		it("should detect Shift+1 and toggle shell mode when input is empty", async () => {
 			const shift1Key: Key = {
 				name: "shift-1",
 				sequence: "!",
@@ -361,6 +392,9 @@ describe("shell mode - comprehensive tests", () => {
 				paste: false,
 			}
 
+			// Ensure input is empty
+			expect(store.get(textBufferStringAtom)).toBe("")
+
 			// Press Shift+1
 			await store.set(keyboardHandlerAtom, shift1Key)
 
@@ -379,7 +413,7 @@ describe("shell mode - comprehensive tests", () => {
 				paste: false,
 			}
 
-			// Activate
+			// Activate (with empty input)
 			await store.set(keyboardHandlerAtom, shift1Key)
 			expect(store.get(shellModeActiveAtom)).toBe(true)
 
@@ -388,6 +422,28 @@ describe("shell mode - comprehensive tests", () => {
 			expect(store.get(shellModeActiveAtom)).toBe(false)
 			expect(store.get(inputModeAtom)).toBe("normal")
 		})
+
+		it("should NOT activate shell mode via Shift+1 when input has text", async () => {
+			const shift1Key: Key = {
+				name: "shift-1",
+				sequence: "!",
+				ctrl: false,
+				meta: false,
+				shift: true,
+				paste: false,
+			}
+
+			// Add text to input
+			store.set(setTextAtom, "some command")
+			expect(store.get(textBufferStringAtom)).toBe("some command")
+
+			// Try to activate with Shift+1
+			await store.set(keyboardHandlerAtom, shift1Key)
+
+			// Should NOT activate shell mode
+			expect(store.get(shellModeActiveAtom)).toBe(false)
+			expect(store.get(inputModeAtom)).toBe("normal")
+		})
 	})
 
 	describe("edge cases", () => {

cli/src/state/atoms/shell.ts

@@ -6,7 +6,7 @@ import { atom } from "jotai"
 import { addMessageAtom, inputModeAtom, type InputMode } from "./ui.js"
 import { exec } from "child_process"
 import { chatMessagesAtom } from "./extension.js"
-import { clearTextAtom, setTextAtom } from "./textBuffer.js"
+import { clearTextAtom, setTextAtom, textBufferIsEmptyAtom } from "./textBuffer.js"
 
 // ============================================================================
 // Shell Mode Atoms
@@ -29,19 +29,26 @@ export const shellHistoryIndexAtom = atom<number>(-1)
 
 /**
  * Action atom to toggle shell mode
+ * Only enters shell mode if input is empty, but always allows exiting
  */
 export const toggleShellModeAtom = atom(null, (get, set) => {
 	const isCurrentlyActive = get(shellModeActiveAtom)
-	set(shellModeActiveAtom, !isCurrentlyActive)
+	const isEmpty = get(textBufferIsEmptyAtom)
 
 	if (!isCurrentlyActive) {
-		// Entering shell mode
+		// Entering shell mode - only allow if input is empty
+		if (!isEmpty) {
+			// Don't enter shell mode if there's already text in the input
+			return
+		}
+		set(shellModeActiveAtom, true)
 		set(inputModeAtom, "shell" as InputMode)
 		set(shellHistoryIndexAtom, -1)
 		// Clear text buffer when entering shell mode
 		set(clearTextAtom)
 	} else {
-		// Exiting shell mode
+		// Exiting shell mode - always allow
+		set(shellModeActiveAtom, false)
 		set(inputModeAtom, "normal" as InputMode)
 		set(shellHistoryIndexAtom, -1)
 		// Clear text buffer when exiting shell mode
@@ -184,10 +191,10 @@ export const executeShellCommandAtom = atom(null, async (get, set, command: stri
 
 		const currentMessages = get(chatMessagesAtom)
 		set(chatMessagesAtom, [...currentMessages, chatMessage])
-	} catch (error: any) {
+	} catch (error: unknown) {
 		// Handle errors and display them in the message system
 
-		const errorOutput = `❌ Error: ${error.message}`
+		const errorOutput = `❌ Error: ${error instanceof Error ? error.message : error}`
 
 		// Display as error message for visibility
 		const errorMessage = {