diff --git a/python/tools/code_execution_tool.py b/python/tools/code_execution_tool.py
index a37056057b..fa4f9dad70 100644
--- a/python/tools/code_execution_tool.py
+++ b/python/tools/code_execution_tool.py
@@ -3,7 +3,7 @@
 import shlex
 import time
 from python.helpers.tool import Tool, Response
-from python.helpers import files, rfc_exchange, projects, runtime
+from python.helpers import files, rfc_exchange, projects, runtime, settings
 from python.helpers.print_style import PrintStyle
 from python.helpers.shell_local import LocalInteractiveSession
 from python.helpers.shell_ssh import SSHInteractiveSession
@@ -468,7 +468,13 @@ def fix_full_output(self, output: str):
         output = re.sub(r"(?<!\\)\\x[0-9A-Fa-f]{2}", "", output)
         # Strip every line of output before truncation
         # output = "\n".join(line.strip() for line in output.splitlines())
-        output = truncate_text_agent(agent=self.agent, output=output, threshold=1000000) # ~1MB, larger outputs should be dumped to file, not read from terminal
+
+        # Dynamic threshold to prevent ContextWindowExceededError (#833)
+        set = settings.get_settings()
+        max_tokens = set["chat_model_ctx_length"] * set["chat_model_ctx_history"] * 0.125
+        threshold = max(50000, int(max_tokens * 3))
+
+        output = truncate_text_agent(agent=self.agent, output=output, threshold=threshold)
         return output
 
     def get_cwd(self):