From 486f88cd218dadf8582a69cae370053b664f444b Mon Sep 17 00:00:00 2001 From: luijait Date: Sat, 24 May 2025 07:37:44 +0000 Subject: [PATCH] Little fix in session outputs --- src/cai/tools/common.py | 41 ------------------- .../reconnaissance/generic_linux_command.py | 4 +- 2 files changed, 2 insertions(+), 43 deletions(-) diff --git a/src/cai/tools/common.py b/src/cai/tools/common.py index 85923a9f..3d5eaa51 100644 --- a/src/cai/tools/common.py +++ b/src/cai/tools/common.py @@ -377,47 +377,6 @@ def get_session_output(session_id, clear=True, stdout=True): session = ACTIVE_SESSIONS[session_id] output = session.get_output(clear) - # If stdout is enabled, display using cli_print_tool_output with counter - if stdout: - # Generate unique counter for this session output command - counter_key = f"session_output_{session_id}" - if counter_key not in SESSION_OUTPUT_COUNTER: - SESSION_OUTPUT_COUNTER[counter_key] = 0 - SESSION_OUTPUT_COUNTER[counter_key] += 1 - - # Create args for display - session_args = { - "command": "session", - "args": f"output {session_id}", - "session_id": session_id, - "call_counter": SESSION_OUTPUT_COUNTER[counter_key] # This ensures uniqueness - } - - # Determine environment info for display - env_type = "Local" - if session.container_id: - env_type = f"Container({session.container_id[:12]})" - elif session.ctf: - env_type = "CTF" - - # Create execution info - execution_info = { - "status": "completed", - "environment": env_type, - "host": session.workspace_dir, - "session_id": session_id - } - - # Display the session output using cli_print_tool_output - from cai.util import cli_print_tool_output - cli_print_tool_output( - tool_name="generic_linux_command", - args=session_args, - output=output, - execution_info=execution_info, - streaming=False - ) - return output diff --git a/src/cai/tools/reconnaissance/generic_linux_command.py b/src/cai/tools/reconnaissance/generic_linux_command.py index b1ab271f..f6beaede 100644 --- a/src/cai/tools/reconnaissance/generic_linux_command.py +++ b/src/cai/tools/reconnaissance/generic_linux_command.py @@ -65,8 +65,8 @@ def generic_linux_command(command: str = "", session_id = args.split(" ")[1] # Call get_session_output with stdout=True to display via cli_print_tool_output # The function will handle the display and return a simple confirmation message - get_session_output(session_id, clear=False, stdout=True) - return f"Session {session_id} output displayed above" + output = get_session_output(session_id, clear=False, stdout=True) + return output if args.startswith("kill "): session_id = args.split(" ")[1]