mirror of
https://github.com/OpenHands/OpenHands.git
synced 2025-12-26 13:52:43 +08:00
6ecaca5b3c
- Replace complex ProcessSignalHandler with SimpleSignalHandler - Direct signal handling in main process instead of queue communication - Simple Ctrl+C counting with immediate force kill on second press - Reset functionality to clear count when starting new operations - Replace ProcessBasedConversationRunner with SimpleProcessRunner - Minimal multiprocessing - only process_message runs in subprocess - Direct method calls for status, settings, and other operations - No unnecessary queue communication - Update agent_chat.py to use simplified components - Reset Ctrl+C count when starting new message processing - Direct method calls for commands that don't need process isolation - Cleaner error handling and resource cleanup - Update simple_main.py imports Fixes issues where second Ctrl+C wouldn't register properly due to complex queue-based communication and race conditions. Co-authored-by: openhands <openhands@all-hands.dev>
239 lines
8.7 KiB
Python
239 lines
8.7 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Agent chat functionality for OpenHands CLI.
|
|
Provides a conversation interface with an AI agent using OpenHands patterns.
|
|
"""
|
|
|
|
import sys
|
|
from datetime import datetime
|
|
import uuid
|
|
|
|
from openhands.sdk import (
|
|
Message,
|
|
TextContent,
|
|
)
|
|
from openhands.sdk.conversation.state import AgentExecutionStatus
|
|
from prompt_toolkit import print_formatted_text
|
|
from prompt_toolkit.formatted_text import HTML
|
|
|
|
from openhands_cli.runner import ConversationRunner
|
|
from openhands_cli.simple_process_runner import SimpleProcessRunner
|
|
from openhands_cli.simple_signal_handler import SimpleSignalHandler
|
|
from openhands_cli.setup import (
|
|
MissingAgentSpec,
|
|
setup_conversation,
|
|
verify_agent_exists_or_setup_agent
|
|
)
|
|
from openhands_cli.tui.settings.mcp_screen import MCPScreen
|
|
from openhands_cli.tui.settings.settings_screen import SettingsScreen
|
|
from openhands_cli.tui.status import display_status
|
|
from openhands_cli.tui.tui import (
|
|
display_help,
|
|
display_welcome,
|
|
)
|
|
from openhands_cli.user_actions import UserConfirmation, exit_session_confirmation
|
|
from openhands_cli.user_actions.utils import get_session_prompter
|
|
|
|
|
|
def _restore_tty() -> None:
|
|
"""
|
|
Ensure terminal modes are reset in case prompt_toolkit cleanup didn't run.
|
|
- Turn off application cursor keys (DECCKM): ESC[?1l
|
|
- Turn off bracketed paste: ESC[?2004l
|
|
"""
|
|
try:
|
|
sys.stdout.write('\x1b[?1l\x1b[?2004l')
|
|
sys.stdout.flush()
|
|
except Exception:
|
|
pass
|
|
|
|
|
|
def _print_exit_hint(conversation_id: str) -> None:
|
|
"""Print a resume hint with the current conversation ID."""
|
|
print_formatted_text(
|
|
HTML(f'<grey>Conversation ID:</grey> <yellow>{conversation_id}</yellow>')
|
|
)
|
|
print_formatted_text(
|
|
HTML(
|
|
f'<grey>Hint:</grey> run <gold>openhands --resume {conversation_id}</gold> '
|
|
'to resume this conversation.'
|
|
)
|
|
)
|
|
|
|
|
|
|
|
def run_cli_entry(resume_conversation_id: str | None = None) -> None:
|
|
"""Run the agent chat session using the agent SDK.
|
|
|
|
|
|
Raises:
|
|
AgentSetupError: If agent setup fails
|
|
KeyboardInterrupt: If user interrupts the session
|
|
EOFError: If EOF is encountered
|
|
"""
|
|
|
|
conversation_id = uuid.uuid4()
|
|
if resume_conversation_id:
|
|
try:
|
|
conversation_id = uuid.UUID(resume_conversation_id)
|
|
except ValueError as e:
|
|
print_formatted_text(
|
|
HTML(
|
|
f"<yellow>Warning: '{resume_conversation_id}' is not a valid UUID.</yellow>"
|
|
)
|
|
)
|
|
return
|
|
|
|
try:
|
|
initialized_agent = verify_agent_exists_or_setup_agent()
|
|
except MissingAgentSpec:
|
|
print_formatted_text(HTML('\n<yellow>Setup is required to use OpenHands CLI.</yellow>'))
|
|
print_formatted_text(HTML('\n<yellow>Goodbye! 👋</yellow>'))
|
|
return
|
|
|
|
|
|
display_welcome(conversation_id, bool(resume_conversation_id))
|
|
|
|
# Track session start time for uptime calculation
|
|
session_start_time = datetime.now()
|
|
|
|
# Create simple signal handler and session
|
|
signal_handler = SimpleSignalHandler()
|
|
signal_handler.install()
|
|
session = get_session_prompter()
|
|
|
|
# Create simple process runner
|
|
process_runner = SimpleProcessRunner(str(conversation_id), setup_conversation)
|
|
|
|
try:
|
|
# Main chat loop
|
|
while True:
|
|
try:
|
|
# Get user input
|
|
user_input = session.prompt(
|
|
HTML('<gold>> </gold>'),
|
|
multiline=False,
|
|
)
|
|
|
|
if not user_input.strip():
|
|
continue
|
|
|
|
# Handle commands
|
|
command = user_input.strip().lower()
|
|
|
|
message = Message(
|
|
role='user',
|
|
content=[TextContent(text=user_input)],
|
|
)
|
|
|
|
if command == '/exit':
|
|
exit_confirmation = exit_session_confirmation()
|
|
if exit_confirmation == UserConfirmation.ACCEPT:
|
|
print_formatted_text(HTML('\n<yellow>Goodbye! 👋</yellow>'))
|
|
_print_exit_hint(conversation_id)
|
|
break
|
|
|
|
elif command == '/settings':
|
|
# For process-based runner, we can't directly access the conversation
|
|
# TODO: Implement settings access through process communication if needed
|
|
settings_screen = SettingsScreen(None)
|
|
settings_screen.display_settings()
|
|
continue
|
|
|
|
elif command == '/mcp':
|
|
mcp_screen = MCPScreen()
|
|
mcp_screen.display_mcp_info(initialized_agent)
|
|
continue
|
|
|
|
elif command == '/clear':
|
|
display_welcome(conversation_id)
|
|
continue
|
|
|
|
elif command == '/new':
|
|
try:
|
|
# Clean up existing process runner
|
|
if process_runner:
|
|
process_runner.cleanup()
|
|
|
|
# Create fresh conversation with new process runner
|
|
conversation_id = uuid.uuid4()
|
|
process_runner = SimpleProcessRunner(str(conversation_id), setup_conversation)
|
|
display_welcome(conversation_id, resume=False)
|
|
print_formatted_text(
|
|
HTML('<green>✓ Started fresh conversation</green>')
|
|
)
|
|
continue
|
|
except Exception as e:
|
|
print_formatted_text(
|
|
HTML(f'<red>Error starting fresh conversation: {e}</red>')
|
|
)
|
|
continue
|
|
|
|
elif command == '/help':
|
|
display_help()
|
|
continue
|
|
|
|
elif command == '/status':
|
|
status = process_runner.get_status()
|
|
print_formatted_text(HTML(f'<yellow>Conversation ID:</yellow> {status["conversation_id"]}'))
|
|
print_formatted_text(HTML(f'<yellow>Agent State:</yellow> {status.get("agent_state", "Unknown")}'))
|
|
print_formatted_text(HTML(f'<yellow>Process Running:</yellow> {status["is_running"]}'))
|
|
continue
|
|
|
|
elif command == '/confirm':
|
|
result = process_runner.toggle_confirmation_mode()
|
|
mode_text = "Enabled" if result else "Disabled"
|
|
print_formatted_text(HTML(f'<yellow>Confirmation mode: {mode_text}</yellow>'))
|
|
continue
|
|
|
|
elif command == '/resume':
|
|
try:
|
|
process_runner.resume()
|
|
print_formatted_text(HTML('<green>Agent resumed</green>'))
|
|
except Exception as e:
|
|
print_formatted_text(HTML(f'<red>Failed to resume: {e}</red>'))
|
|
continue
|
|
|
|
# Reset Ctrl+C count when starting new message processing
|
|
signal_handler.reset_count()
|
|
|
|
# Process the message
|
|
try:
|
|
# Set the current process for signal handling
|
|
signal_handler.set_process(process_runner.current_process)
|
|
|
|
result = process_runner.process_message(user_input)
|
|
print() # Add spacing for successful processing
|
|
|
|
except Exception as e:
|
|
print_formatted_text(HTML(f'<red>Failed to process message: {e}</red>'))
|
|
finally:
|
|
# Clear the process reference
|
|
signal_handler.set_process(None)
|
|
|
|
except KeyboardInterrupt:
|
|
# KeyboardInterrupt should be handled by the signal handler now
|
|
# This is a fallback in case the signal handler doesn't catch it
|
|
exit_confirmation = exit_session_confirmation()
|
|
if exit_confirmation == UserConfirmation.ACCEPT:
|
|
print_formatted_text(HTML('\n<yellow>Goodbye! 👋</yellow>'))
|
|
_print_exit_hint(conversation_id)
|
|
break
|
|
except Exception as e:
|
|
print_formatted_text(HTML(f'<red>Error in chat loop: {e}</red>'))
|
|
continue
|
|
|
|
except KeyboardInterrupt:
|
|
# Final fallback for KeyboardInterrupt
|
|
print_formatted_text(HTML('\n<yellow>Goodbye! 👋</yellow>'))
|
|
_print_exit_hint(conversation_id)
|
|
|
|
finally:
|
|
# Clean up resources
|
|
if process_runner:
|
|
process_runner.cleanup()
|
|
signal_handler.uninstall()
|
|
|
|
# Clean up terminal state
|
|
_restore_tty()
|