From 4cd8dafba93c4882542c194be31d990c04fae04c Mon Sep 17 00:00:00 2001
From: Brian Guarraci <briang@openai.com>
Date: Sun, 14 Sep 2025 06:10:09 -0700
Subject: [PATCH] Ensure exit test covers debug mode

---
 scripts/kgpy         | 30 +++++++++++++++++++++++++-----
 tests/test_sys_fn.py | 16 ++++++++++++++--
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/scripts/kgpy b/scripts/kgpy
index 5b661f1..f34ced9 100644
--- a/scripts/kgpy
+++ b/scripts/kgpy
@@ -204,7 +204,11 @@ def get_input():
 
 
 def run_in_loop(klong_loop, coro):
-    return asyncio.run_coroutine_threadsafe(coro, klong_loop).result()
+    fut = asyncio.run_coroutine_threadsafe(coro, klong_loop)
+    r = fut.result()
+    if isinstance(r, SystemExit):
+        raise r
+    return r
 
 
 class ConsoleInputHandler:
@@ -232,6 +236,9 @@ class ConsoleInputHandler:
                     break
                 except KeyboardInterrupt:
                     print(failure("\nkg: error: interrupted"))
+                except SystemExit as e:
+                    console_loop.stop()
+                    raise e
                 except Exception as e:
                     print(failure(f"Error: {e.args}"))
                     import traceback
@@ -241,7 +248,10 @@ class ConsoleInputHandler:
 
 
 async def run_in_klong(klong, s):
-    return klong(s)
+    try:
+        return klong(s)
+    except SystemExit as e:
+        return e
 
 
 def run_file(klong_loop, klong, fname, verbose=False):
@@ -344,6 +354,7 @@ if __name__ == "__main__":
     klong['.os.argv'] = extras if extras else []
 
     run_repl = False
+    exit_code = 0
 
     if args.server:
         r = klong(f".srv({args.server})")
@@ -362,7 +373,10 @@ if __name__ == "__main__":
     if args.filename:
         if args.verbose:
             print(f"Running: {args.filename}")
-        run_file(klong_loop, klong, args.filename, verbose=args.verbose)
+        try:
+            run_file(klong_loop, klong, args.filename, verbose=args.verbose)
+        except SystemExit as e:
+            exit_code = e.code
 
         def gather_io_tasks(io_loop):
             done_event = threading.Event()
@@ -394,10 +408,16 @@ if __name__ == "__main__":
         colorama.init(autoreset=True)
         show_repl_header(args.server)
         console_loop.create_task(ConsoleInputHandler.input_producer(console_loop,   klong_loop, klong, args.verbose))
-        console_loop.run_forever()
-        console_loop.close()
+        try:
+            console_loop.run_forever()
+        except SystemExit as e:
+            exit_code = e.code
+        finally:
+            console_loop.close()
 
     shutdown_event.trigger()
 
     cleanup_async_loop(io_loop, io_loop_thread, stop_event=io_stop_event, debug=args.debug, name="io_loop")
     cleanup_async_loop(klong_loop, klong_loop_thread, stop_event=klong_stop_event, debug=args.debug, name="klong_loop")
+
+    sys.exit(exit_code)
diff --git a/tests/test_sys_fn.py b/tests/test_sys_fn.py
index 0e99785..ed7ae97 100644
--- a/tests/test_sys_fn.py
+++ b/tests/test_sys_fn.py
@@ -1,4 +1,6 @@
 import os
+import sys
+import subprocess
 import tempfile
 import unittest
 
@@ -379,7 +381,17 @@ def test_sys_write_dict(self):
         self.assertEqual(r,{1:2})
 
     def test_eval_sys_exit(self):
-        pass
+        with tempfile.TemporaryDirectory() as td:
+            fname = os.path.join(td, "exit.kg")
+            with open(fname, "w") as f:
+                f.write(".x(0)")
+
+            root = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+            cmd = [sys.executable, os.path.join(root, "scripts", "kgpy"), "-d", fname]
+            env = os.environ.copy()
+            env["PYTHONPATH"] = root
+            result = subprocess.run(cmd, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, timeout=5)
+            self.assertEqual(result.returncode, 0, result.stdout + result.stderr)
 
     def test_simple_io(self):
         t = """
@@ -401,7 +413,7 @@ def test_simple_io(self):
     def test_simple_cat(self):
         t = """
         cat::{.mi{.p(x);.rl()}:~.rl()}
-        type::{.fc(.ic(x));cat()}
+        type::{[ic];ic::.ic(x);.fc(ic);cat();.cc(ic)}
         copy::{[of];.tc(of::.oc(y));type(x);.cc(of)}
         """
         klong = KlongInterpreter()