Revert "fix(cli): Abort functionality, autocomplete, and fixed memory prompts…" (#248)

This reverts commit 681e184.

Author: hwchase17

libs/deepagents-cli/deepagents_cli/agent.py

@@ -199,6 +199,14 @@ def format_edit_file_description(tool_call: dict) -> str:
             f"Snippet delta: {delta:+} characters"
         )
 
+    def format_web_search_description(tool_call: dict) -> str:
+        """Format web_search tool call for approval prompt."""
+        args = tool_call.get("args", {})
+        query = args.get("query", "unknown")
+        max_results = args.get("max_results", 5)
+
+        return f"Query: {query}\nMax results: {max_results}\n\n⚠️  This will use Tavily API credits"
+
     def format_task_description(tool_call: dict) -> str:
         """Format task (subagent) tool call for approval prompt."""
         args = tool_call.get("args", {})
@@ -240,6 +248,11 @@ def format_task_description(tool_call: dict) -> str:
         "description": lambda tool_call, state, runtime: format_edit_file_description(tool_call),
     }
 
+    web_search_interrupt_config: InterruptOnConfig = {
+        "allowed_decisions": ["approve", "reject"],
+        "description": lambda tool_call, state, runtime: format_web_search_description(tool_call),
+    }
+
     task_interrupt_config: InterruptOnConfig = {
         "allowed_decisions": ["approve", "reject"],
         "description": lambda tool_call, state, runtime: format_task_description(tool_call),
@@ -255,9 +268,8 @@ def format_task_description(tool_call: dict) -> str:
             "shell": shell_interrupt_config,
             "write_file": write_file_interrupt_config,
             "edit_file": edit_file_interrupt_config,
+            "web_search": web_search_interrupt_config,
             "task": task_interrupt_config,
-            # Note: web_search is NOT here - it's a read-only tool like http_request
-            # and should execute automatically without requiring approval
         },
     ).with_config(config)
 

libs/deepagents-cli/deepagents_cli/commands.py

@@ -1,7 +1,5 @@
 """Command handlers for slash commands and bash execution."""
 
-import os
-import signal
 import subprocess
 from pathlib import Path
 
@@ -59,92 +57,33 @@ def execute_bash_command(command: str) -> bool:
     if not cmd:
         return True
 
-    process = None
-    interrupted = False
-    original_handler = None
-
-    def sigint_handler(signum, frame):
-        """Custom SIGINT handler - kills subprocess immediately and sets flag."""
-        nonlocal interrupted, process
-        interrupted = True
-
-        # Kill subprocess immediately when Ctrl+C is pressed
-        if process and process.poll() is None:
-            try:
-                if hasattr(os, "killpg"):
-                    os.killpg(os.getpgid(process.pid), signal.SIGINT)
-                else:
-                    process.send_signal(signal.SIGINT)
-            except (ProcessLookupError, OSError):
-                pass
-
     try:
-        # Install our signal handler (temporarily overrides asyncio's handler)
-        original_handler = signal.signal(signal.SIGINT, sigint_handler)
-
         console.print()
         console.print(f"[dim]$ {cmd}[/dim]")
 
-        # Create subprocess in new session (process group) to isolate from parent's signals
-        process = subprocess.Popen(
-            cmd,
-            shell=True,
-            text=True,
-            stdin=subprocess.DEVNULL,  # Close stdin to prevent interactive commands from hanging
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            start_new_session=True,  # Isolate subprocess in its own process group
-            cwd=Path.cwd(),
+        # Execute the command
+        result = subprocess.run(
+            cmd, check=False, shell=True, capture_output=True, text=True, timeout=30, cwd=Path.cwd()
         )
 
-        try:
-            # Wait for command to complete with timeout
-            stdout, stderr = process.communicate(timeout=30)
-
-            # Display output
-            if stdout:
-                console.print(stdout, style=COLORS["dim"], markup=False)
-            if stderr:
-                console.print(stderr, style="red", markup=False)
-
-            # Check if interrupted via our flag
-            if interrupted:
-                console.print("\n[yellow]Command interrupted by user[/yellow]\n")
-            elif process.returncode != 0:
-                # Exit code 130 = 128 + SIGINT (2) - command was interrupted
-                # Exit code -2 also indicates interrupt in some shells
-                if process.returncode == 130 or process.returncode == -2:
-                    console.print("[yellow]Command interrupted[/yellow]")
-                else:
-                    console.print(f"[dim]Exit code: {process.returncode}[/dim]")
-
-        except subprocess.TimeoutExpired:
-            # Timeout - kill the process group
-            if hasattr(os, "killpg"):
-                try:
-                    os.killpg(os.getpgid(process.pid), signal.SIGKILL)
-                except (ProcessLookupError, OSError):
-                    pass
-            else:
-                process.kill()
-
-            # Clean up zombie process
-            try:
-                process.wait(timeout=1)
-            except subprocess.TimeoutExpired:
-                pass
-
-            console.print("[red]Command timed out after 30 seconds[/red]")
+        # Display output
+        if result.stdout:
+            console.print(result.stdout, style=COLORS["dim"], markup=False)
+        if result.stderr:
+            console.print(result.stderr, style="red", markup=False)
+
+        # Show return code if non-zero
+        if result.returncode != 0:
+            console.print(f"[dim]Exit code: {result.returncode}[/dim]")
 
         console.print()
         return True
 
+    except subprocess.TimeoutExpired:
+        console.print("[red]Command timed out after 30 seconds[/red]")
+        console.print()
+        return True
     except Exception as e:
         console.print(f"[red]Error executing command: {e}[/red]")
         console.print()
         return True
-
-    finally:
-        # CRITICAL: Always restore original signal handler so asyncio can handle Ctrl+C at prompt
-        if original_handler is not None:
-            signal.signal(signal.SIGINT, original_handler)

libs/deepagents-cli/deepagents_cli/config.py

@@ -48,6 +48,7 @@
 # Common bash commands for autocomplete
 COMMON_BASH_COMMANDS = {
     "ls": "List directory contents",
+    "ls -la": "List all files with details",
     "cd": "Change directory",
     "pwd": "Print working directory",
     "cat": "Display file contents",

libs/deepagents-cli/deepagents_cli/default_agent_prompt.md

@@ -3,12 +3,16 @@ You are an AI assistant that helps users with various tasks including coding, re
 # Core Role
 Your core role and behavior may be updated based on user feedback and instructions. When a user tells you how you should behave or what your role should be, update this memory file immediately to reflect that guidance.
 
-## Memory System
-You have access to persistent memory in `/memories/`.
+## Memory-First Protocol
+You have access to a persistent memory system. ALWAYS follow this protocol:
 
-**When answering questions:**
-- If asked "what do you know about X?" or similar questions about specific topics → Check `/memories/` for relevant knowledge
-- If you recall working on or saving information about the current topic → Read those memory files
+**At session start:**
+- Check `ls /memories/` to see what knowledge you have stored
+- If your role description references specific topics, check /memories/ for relevant guides
+
+**Before answering questions:**
+- If asked "what do you know about X?" or "how do I do Y?" → Check `ls /memories/` FIRST
+- If relevant memory files exist → Read them and base your answer on saved knowledge
 - Prefer saved knowledge over general knowledge when available
 
 **When learning new information:**