Skip to content

Agent Zero AI framework

shell echo fix, faster startup

frdeld0a0bf67b8bf
diff --git a/python/helpers/shell_ssh.py b/python/helpers/shell_ssh.py
index 160ccaa57..bdc5dfd51 100644
--- a/python/helpers/shell_ssh.py
+++ b/python/helpers/shell_ssh.py
@@ -44,6 +44,8 @@ class SSHInteractiveSession:
self.shell = self.client.invoke_shell(width=100, height=50)
# self.shell.send(f'PS1="{SSHInteractiveSession.ps1_label}"'.encode())
# return
+ self.shell.send("stty -echo\n".encode()) # disable shell echo
+
while True: # wait for end of initial output
full, part = await self.read_output()
if full and not part:
@@ -100,32 +102,32 @@ class SSHInteractiveSession:
# data = self.shell.recv(1024)
data = self.receive_bytes()
- # Trim own command from output
- if (
- self.last_command
- and len(self.last_command) > self.trimmed_command_length
- ):
- command_to_trim = self.last_command[self.trimmed_command_length :]
- data_to_trim = leftover + data
-
- trim_com, trim_out = calculate_valid_match_lengths(
- command_to_trim,
- data_to_trim,
- deviation_threshold=8,
- deviation_reset=2,
- ignore_patterns=[
- rb"\x1b\[\?\d{4}[a-zA-Z](?:> )?", # ANSI escape sequences
- rb"\r", # Carriage return
- rb">\s", # Greater-than symbol
- ],
- debug=False,
- )
-
- leftover = b""
- if trim_com > 0 and trim_out > 0:
- data = data_to_trim[trim_out:]
- leftover = data
- self.trimmed_command_length += trim_com
+ # # Trim own command from output
+ # if (
+ # self.last_command
+ # and len(self.last_command) > self.trimmed_command_length
+ # ):
+ # command_to_trim = self.last_command[self.trimmed_command_length :]
+ # data_to_trim = leftover + data
+
+ # trim_com, trim_out = calculate_valid_match_lengths(
+ # command_to_trim,
+ # data_to_trim,
+ # deviation_threshold=8,
+ # deviation_reset=2,
+ # ignore_patterns=[
+ # rb"\x1b\[\?\d{4}[a-zA-Z](?:> )?", # ANSI escape sequences
+ # rb"\r", # Carriage return
+ # rb">\s", # Greater-than symbol
+ # ],
+ # debug=False,
+ # )
+
+ # leftover = b""
+ # if trim_com > 0 and trim_out > 0:
+ # data = data_to_trim[trim_out:]
+ # leftover = data
+ # self.trimmed_command_length += trim_com
partial_output += data
self.full_output += data
@@ -196,11 +198,14 @@ class SSHInteractiveSession:
# remove null bytes
cleaned = cleaned.replace("\x00", "")
+ # remove ipython \r\r\n> sequences from the start
+ cleaned = re.sub(r'^[ \r]*(?:\r*\n>[ \r]*)*', '', cleaned)
+
# Replace '\r\n' with '\n'
cleaned = cleaned.replace("\r\n", "\n")
- # remove leading \r
- cleaned = cleaned.lstrip("\r")
+ # remove leading \r and spaces
+ cleaned = cleaned.lstrip("\r ")
# Split the string by newline characters to process each segment separately
lines = cleaned.split("\n")
diff --git a/run_ui.py b/run_ui.py
index 5acfb360b..7e6fa12e9 100644
--- a/run_ui.py
+++ b/run_ui.py
@@ -245,14 +245,15 @@ def run():
def init_a0():
# initialize contexts and MCP
init_chats = initialize.initialize_chats()
+ # only wait for init chats, otherwise they would seem to disappear for a while on restart
+ init_chats.result_sync()
+
initialize.initialize_mcp()
# start job loop
initialize.initialize_job_loop()
# preload
initialize.initialize_preload()
- # only wait for init chats, otherwise they would seem to dissapear for a while on restart
- init_chats.result_sync()
# run the internal server