more-compute 0.3.3__py3-none-any.whl → 0.4.0__py3-none-any.whl

{more_compute-0.3.3.dist-info → more_compute-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: more-compute
-Version: 0.3.3
+Version: 0.4.0
 Summary: An interactive notebook environment for local and GPU computing
 Home-page: https://github.com/DannyMang/MORECOMPUTE
 Author: MoreCompute Team
@@ -44,16 +44,12 @@ Dynamic: requires-python
 [![Python 3.8+](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/downloads/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
-An interactive notebook environment, similar to Marimo and Google Colab, that runs locally. It works with standard `.ipynb` files, similar to Jupyter Lab but more awesome.
-
-
+An interactive Python notebook environment, similar to Marimo and Google Colab, that runs locally.
 
 
 https://github.com/user-attachments/assets/8c7ec716-dade-4de2-ad37-71d328129c97
 
 
-
-
 ## Installation
 
 **Prerequisites:** [Node.js](https://nodejs.org/) >= 20.10.0 required for web interface
@@ -83,40 +79,46 @@ pip install more-compute
 ## Usage
 
 ```bash
-more-compute notebook.ipynb  # Open existing notebook
-more-compute                 # Create and open new notebook
+more-compute notebook.py     # Open existing notebook
+more-compute new             # Create new notebook
 more-compute --debug         # Show logs
 ```
 
-Opens automatically at http://localhost:8000
+Opens automatically at http://localhost:3141
 
-## Troubleshooting
+### Converting Between Formats
 
-**Command not found:**
-```bash
-uv tool update-shell  # Fixes PATH automatically
-```
+MoreCompute uses `.py` notebooks with `# %%` cell markers, but you can convert to/from `.ipynb`:
 
-**Manual PATH fix (macOS/Linux):**
+**From .ipynb to .py:**
 ```bash
-echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc
-source ~/.bashrc
-```
+# Auto-detect output name (notebook.ipynb -> notebook.py)
+more-compute convert notebook.ipynb
 
-**Manual PATH fix (Windows):**
-```powershell
-$pythonScripts = python -c "import site; print(site.USER_BASE)"
-$userPath = [Environment]::GetEnvironmentVariable("Path", "User")
-[Environment]::SetEnvironmentVariable("Path", "$userPath;$pythonScripts\Scripts", "User")
-# Restart PowerShell
+# Or specify output
+more-compute convert notebook.ipynb -o my_notebook.py
+
+# Then open in MoreCompute
+more-compute my_notebook.py
 ```
 
-**Port in use:**
+The converter automatically extracts dependencies from `!pip install` commands and adds UV inline script metadata.
+
+**From .py to .ipynb:**
 ```bash
-export MORECOMPUTE_PORT=8080  # macOS/Linux
-$env:MORECOMPUTE_PORT = "8080"  # Windows
+# Auto-detect output name (notebook.py -> notebook.ipynb)
+more-compute convert notebook.py
+
+# Or specify output
+more-compute convert notebook.py -o colab_notebook.ipynb
 ```
 
+This makes your notebooks compatible with Google Colab, Jupyter, and other tools that require `.ipynb` format.
+
+## Troubleshooting
+
+will add things here as things progress...
+
 ## Development
 
 ```bash
@@ -125,7 +127,7 @@ cd MORECOMPUTE
 uv venv && source .venv/bin/activate
 uv pip install -e .
 cd frontend && npm install && cd ..
-python kernel_run.py notebook.ipynb
+more-compute notebook.py
 ```
 
 ## License

{more_compute-0.3.3.dist-info → more_compute-0.4.0.dist-info}/RECORD

@@ -1,11 +1,10 @@
-kernel_run.py,sha256=VlIQDKa2z9noDwAyRpUz49LCspjHntnlHugHIuP47dw,17936
-frontend/.DS_Store,sha256=uQeHnkKyuTF1AVax3NPqtN0uCH6XNXAxL9Nkb6Q9cGw,8196
+kernel_run.py,sha256=tY8n3U4-mB3PYwVWDEOe5x0v67iXMOWpIrWNFqcm7JE,21540
 frontend/.gitignore,sha256=IH4mX_SQH5rZ-W2M4IUw4E-fxgCBVHKmbQpEYJbWVM0,480
 frontend/README.md,sha256=YLVf9995r3JZD5UkII5GZCvDK9wXXNrUE0loHA4vlY8,1450
 frontend/__init__.py,sha256=L5SAOdfDfKqlgEVCvYQQRDZBTlCxutZKSpJp4018IG4,100
 frontend/eslint.config.mjs,sha256=LBCCw4SomtiVMmlTSpYRXfkRs6Xs04R1YFfoyorYyT8,879
 frontend/next-env.d.ts,sha256=ha5a7nXwEZZ88tJcvDQvYtaTFOnZJff0qjRW_Cz_zKY,262
-frontend/next.config.mjs,sha256=n0o6cIIVIoOtI6JlvAK-HUFd2lg1pQPfUwlFS4O6TK0,346
+frontend/next.config.mjs,sha256=hxSST3ls40dm0NL0F8J9yPkHXFQZNQ_JenO7qDxbYSQ,346
 frontend/next.config.ts,sha256=OL_rEfTIZxsB_B5R9JX2AxYXgC0Fc_XiDoRlOGEDEpk,368
 frontend/package-lock.json,sha256=pGL_J72WHNTz7iLx2MOwHwnDGfbKzN-r_qnnbzfGbEU,334369
 frontend/package.json,sha256=nUVMqlXGT5m431ArOzzs_geSfmq0AKfqUB40zIAeZ5s,1395
@@ -14,20 +13,20 @@ frontend/styling_README.md,sha256=jvoXKUzJv0rEIU40gz23Z6Xugy4To8P0N9szg_hKrqw,56
 frontend/tailwind.config.ts,sha256=eP9nVaAuyYo46vGQfCyWbo25_pr2hW830fs1Itcix9Q,620
 frontend/tsconfig.json,sha256=7SvBlRBYmuXAlAteRQTGwEE7ooWuNaPUrZ219dOo61E,598
 frontend/app/favicon.ico,sha256=K4rS0zRVqPc2_DqOv48L3qiEitTA20iigzvQ-c13WTI,25931
-frontend/app/globals.css,sha256=pjnnmkXxa0SoPYPtfBdqyHutSeUUqGvUsgSD4Zt7dcA,33884
-frontend/app/layout.tsx,sha256=VMkhvePu0hV0w-huEmTocTr7lZ6DF_7eidrhzCCMwzc,7604
+frontend/app/globals.css,sha256=uNJlOuKwesEGBHdZauR2-peTvBR9BH_-5J05enUTdUQ,34048
+frontend/app/layout.tsx,sha256=6xut2wC-CN1aPufPfjJqa2TlYKr8gD6F9KqUlINd0hg,9295
 frontend/app/page.tsx,sha256=p-DgDv8xDnwcRfDJY4rtfSQ2VdYwbnP3G-otWqDR1l0,256
-frontend/components/Notebook.tsx,sha256=JImlThoX4F363yShOqdYDjIIO3i1uqfCLRkDlzurinQ,21851
+frontend/components/Notebook.tsx,sha256=izTlXRI7-JR51f_uSwqV8kcMeuhiVPq_wR30h_8jhhI,22517
 frontend/components/cell/AddCellButton.tsx,sha256=ZC2Vck0JIRDxGYhYv3LPYAdKDo13U6008WG_-XoPlIM,1012
-frontend/components/cell/CellButton.tsx,sha256=j3lRStluVtRXjZOhi9isS3XKsRmM0WTn5SaFDM6GuYg,1386
-frontend/components/cell/MonacoCell.tsx,sha256=EqsajBZuQpoOWlNVG7OmmoIyY4pUfW5obiBwpniuQbw,23862
+frontend/components/cell/CellButton.tsx,sha256=7OaedFBBOygLD-AcaF_FyCFBSc9841jhTwC_mDe1JrY,1439
+frontend/components/cell/MonacoCell.tsx,sha256=x0cwutkb-mueaXf-FdXnK6hmUuq1nROD04uq7_aZ5xc,24743
 frontend/components/layout/ConnectionBanner.tsx,sha256=-m77wKCFpeRJ_AQwnM38jLwCY5vfpqE846xeXmT3p8A,870
 frontend/components/layout/Sidebar.tsx,sha256=kxgO2mXX11xI6rX478cUqqQ3xB40jlby21y27GTJSLU,1551
 frontend/components/modals/ConfirmModal.tsx,sha256=3WgXy_wmR8FHZPwzMevfZHFXa0blR4v_SbKG3d5McT4,3652
 frontend/components/modals/ErrorModal.tsx,sha256=kkGHQvgyMYlScKwni04-V_Dq6a0-lg0WodglLARR-uA,3536
 frontend/components/modals/SuccessModal.tsx,sha256=7NVg0MFPVvsBGDOHPVyZTNx4kmZLHgxdhZKKtTD9FTU,3385
 frontend/components/output/CellOutput.tsx,sha256=KLRzwEchvBoeoai8TbabKEwO4tHmog3EKeTJAXtmveI,3665
-frontend/components/output/ErrorDisplay.tsx,sha256=kYfip5zikcFIuN7WW47RVjoqwDujC1q_yMbgHrHl0E0,4996
+frontend/components/output/ErrorDisplay.tsx,sha256=va_jMO9mZnrjOWxVZ7nwL1_7-Ii9I5JVwEwAZR-jsNU,5535
 frontend/components/output/MarkdownRenderer.tsx,sha256=RtZ5yNRxDXIh_NkNsNiy30wMGIW7V1gfhsjecgMdc80,3341
 frontend/components/popups/ComputePopup.tsx,sha256=B7AwwjpJ9_nNI5qSN53jdR2tAulB5yl7spjMXjH4yDM,44021
 frontend/components/popups/FilterPopup.tsx,sha256=KRIzRvVxEF47ELWIAvrqv7BZQYmEo_zOX8Nbpz0zEik,14133
@@ -35,13 +34,13 @@ frontend/components/popups/FolderPopup.tsx,sha256=V2tDAbztvNIUyPWtFiwjeIoCmFGQyD
 frontend/components/popups/MetricsPopup.tsx,sha256=ublYbOQ-pSU_w48F10uFjDYctysEwmri9lrji5YHIC4,6034
 frontend/components/popups/PackagesPopup.tsx,sha256=2DnwNVN8kwC3ff1UN_7cl6qLwAFE9F9H8hYwl7M3jTM,4141
 frontend/components/popups/SettingsPopup.tsx,sha256=rGwYxjkADnyTtpP0MjVpFPBsGoT1eENN2z7nWjLuzFE,2773
-frontend/contexts/PodWebSocketContext.tsx,sha256=QyEg1Msyum7h3T6F3j6pn4Ds5sXFT_9WYu5_0YZ2IUI,8256
+frontend/contexts/PodWebSocketContext.tsx,sha256=YIC7tDHM4iGYhH_B75Eiye4uveVAzWoXzLqw83obGIs,8256
 frontend/lib/api.ts,sha256=L6Js3K7RcPCLfVVUz-bKX5hLAVFKCfUSHAKSHk2keAk,11026
 frontend/lib/monaco-themes.ts,sha256=jh_pZAmSMKjY_belbMbZX2WpFBN7baRxvJp9shUDYgk,5396
 frontend/lib/settings.ts,sha256=klHVyB2n-wTc8YrjKCIf2BEmrR-JLVHrRYIXkDxv9-A,6263
 frontend/lib/themes.json,sha256=mk6IGy6o_DCOerBH3QmfXozTHEiy-alsTLTTIaba7No,292018
 frontend/lib/websocket-native.ts,sha256=KcokVZAl08iWRAcBOfyt3uej352esOa_-YwLk7M5iSU,6046
-frontend/lib/websocket.ts,sha256=V2Y7sktt2dm1G-ZILggcqIWccsh-xoAG9dLHpNVqIqs,4500
+frontend/lib/websocket.ts,sha256=K9Pf71fbRTuwbJTToLq9r4vlbv_c3JOMxJlpDinDKMI,4500
 frontend/public/file.svg,sha256=K2eBLDJcGZoCU2zb7qDFk6cvcH0yO3LuPgjbqwZ1O9Q,391
 frontend/public/globe.svg,sha256=thS5vxg5JZV2YayFFJj-HYAp_UOmL7_thvniYkpX588,1035
 frontend/public/next.svg,sha256=VZld-tbstJRaHoVt3KA8XhaqW_E_0htN9qdK55NXvPw,1375
@@ -64,17 +63,17 @@ frontend/public/fonts/Fira.ttf,sha256=dbSM4W7Drd9n_EkfXq8P31KuxbjZ1wtuFiZ8aFebvT
 frontend/public/fonts/Tiempos.woff2,sha256=h83bJKvAK301wXCMIvK7ZG5j0H2K3tzAfgo0yk4z8OE,13604
 frontend/public/fonts/VeraMono.ttf,sha256=2kKB3H2xej385kpiztkodcWJU0AFXsi6JKORTrl7NJ0,49224
 frontend/types/notebook.ts,sha256=v23RaZe6H3lU5tq6sqnJDPxC2mu0NZFDCJfiN0mgvSs,1359
-more_compute-0.3.3.dist-info/licenses/LICENSE,sha256=0Ot-XIetYt06iay6IhtpJkruD-cLZtjyv7_aIEE-oSc,1073
+more_compute-0.4.0.dist-info/licenses/LICENSE,sha256=0Ot-XIetYt06iay6IhtpJkruD-cLZtjyv7_aIEE-oSc,1073
 morecompute/__init__.py,sha256=pcMVq8Q7qb42AOn7tqgoZJOi3epDDBnEriiv2WVKnXY,87
-morecompute/__version__.py,sha256=8KcCYTXH99C2-gCLuPILJvtT9YftRWJsartIx6TQ2ZY,22
+morecompute/__version__.py,sha256=42STGor_9nKYXumfeV5tiyD_M8VdcddX7CEexmibPBk,22
 morecompute/cli.py,sha256=kVvzvPBqF8xO6UuhU_-TBn99nKwJ405R2mAS6zU0KBc,734
-morecompute/notebook.py,sha256=KEcv0eOEh9N7bPVGoRuKJb47G9MmpQ5zz1B6Dm58w18,4651
+morecompute/notebook.py,sha256=RubIXps925vCFgHznkW0QvvW0I11p6IGDDOrhnZ4jYs,6824
 morecompute/process_worker.py,sha256=KsE3r-XpkYGuyO4w3t54VKkD51LfNHAZc3TYattMtrg,7185
-morecompute/server.py,sha256=8Bn0RzH6HB1meCr2BXwcjcFAUSFSEVK2KSkM31wX65Q,40246
+morecompute/server.py,sha256=mcJwIvT9QHfpKuAq5jP2SW5hPjFB_rySevgQvOHuud8,41689
 morecompute/execution/__init__.py,sha256=jPmBmq8BZWbUEY9XFSpqt5FkgX04uNS10WnUlr7Rnms,134
 morecompute/execution/__main__.py,sha256=pAWB_1bn99u8Gb-tVMSMI-NYvbYbDiwbn40L0a0djeA,202
-morecompute/execution/executor.py,sha256=C7exiQN5eeg_XJzfqbJThFvRiwBPdwNrJ6koCZnVwN8,20643
-morecompute/execution/worker.py,sha256=-_-KD89LVA1DmGa1fTqKekttTOGX_JMtUdO02-SV5DE,16388
+morecompute/execution/executor.py,sha256=UaHsMLfbj4-jKI61vt2EhHF9-9fe01EZZwiFQPsnUMg,25912
+morecompute/execution/worker.py,sha256=i1FbsIGGGqRllceerYnwR0p-M18U6Ez32aeOLhpBL9s,27529
 morecompute/models/__init__.py,sha256=VLJ5GWi2uTNiZBdvl-ipSbmA6EL8FZHZ5oq-rJmm9z0,640
 morecompute/models/api_models.py,sha256=-ydvi9SeTfdoY9oVPNQS4by-kQGSknx6BHhGD8E2tpo,4553
 morecompute/services/data_manager.py,sha256=c4GKucetMM-VPNbHyzce6bZRvFfmz8kTd5RppLjoLVc,14329
@@ -85,18 +84,20 @@ morecompute/services/prime_intellect.py,sha256=b705rHv3RPRsgWedRlHwoP_S-TxxZtMSy
 morecompute/static/styles.css,sha256=el_NtrUMbAUNSiMVBn1xlG70m3iPv7dyaIbWQMexhsY,19277
 morecompute/utils/__init__.py,sha256=VIxCL3S1pnjEs4cjKGZqZB68_P8FegdeMIqBjJhI5jQ,419
 morecompute/utils/cache_util.py,sha256=lVlXudHvtyvSo_kCSxORJrI85Jod8FrQLbI2f_JOIbA,661
-morecompute/utils/cell_magics.py,sha256=XUxy6lIsrx-9r0mWn0smI1gvT3-kv0rhN5km9cs3D48,27278
+morecompute/utils/cell_magics.py,sha256=YLxltTBprCA8jfgsjqf7Shnk4NCmGKIp3aV5_CYkKRM,29072
 morecompute/utils/config_util.py,sha256=I90om4Wf4BODc5Gy9u8Tu34AcqpkfkGAKQO6JE_NMzU,1940
 morecompute/utils/error_utils.py,sha256=e50WLFdD6ngIC30xAgrzdTYtD8tPOIFkKAAh_sPbK0I,11667
 morecompute/utils/line_magics.py,sha256=kTutYBPAWoURY_pk8HXQ38IP712M2rBBfUg3oN8VrP0,33740
+morecompute/utils/notebook_converter.py,sha256=aI9JdgPO8zpE0vYcBGlMEvQT2rLmZtjP_VD5bUn80bY,4229
 morecompute/utils/notebook_util.py,sha256=3hH94dtXvhizRVTU9a2b38m_51Y4igoXpkjAXUqpVBQ,1353
+morecompute/utils/py_percent_parser.py,sha256=_CVB7uP8Qu8X_yIGKv-k3Lhpw7saH67VofYvRDfGGw8,5087
 morecompute/utils/python_environment_util.py,sha256=l8WWWPwKbypknw8GwL22NXCji5i1FOy1vWG47J6og4g,7441
 morecompute/utils/shell_utils.py,sha256=fGFLhQLZU-lmMGALbbS-fKPkhQtmMhZ1FkgQ3TeoFhA,1917
-morecompute/utils/special_commands.py,sha256=IyF9MTINMNNo3P_f56Q6yS_P2HNjA9vohYVxEV7KYnc,17331
+morecompute/utils/special_commands.py,sha256=nf2nVea5SyFqpulNYrnRx7anU4-G-e5_kLJ0PLtEi3Q,22030
 morecompute/utils/system_environment_util.py,sha256=32mQRubo0i4X61o-825T7m-eUSidcEp07qkInP1sWZA,4774
 morecompute/utils/zmq_util.py,sha256=tx7-iS04UN69OFtBzkxcEnRhT7xtI9EzRnrZ_nsH_O0,1889
-more_compute-0.3.3.dist-info/METADATA,sha256=RO_WGr4vGpdG7gIvYqrMH6iBnc9dQiYSpnGYV-uhQYM,3718
-more_compute-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-more_compute-0.3.3.dist-info/entry_points.txt,sha256=xp7z9eRPNRM4oxkZZVlyXkhkSjN1AjoYI_B7qpDJ1bI,49
-more_compute-0.3.3.dist-info/top_level.txt,sha256=Tamm6ADzjwaQa1z27O7Izcyhyt9f0gVjMv1_tC810aI,32
-more_compute-0.3.3.dist-info/RECORD,,
+more_compute-0.4.0.dist-info/METADATA,sha256=RBEFHSXqQsBN5zbiANyf86r1cHoEEPFpzwNbIVKRTLA,3877
+more_compute-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+more_compute-0.4.0.dist-info/entry_points.txt,sha256=xp7z9eRPNRM4oxkZZVlyXkhkSjN1AjoYI_B7qpDJ1bI,49
+more_compute-0.4.0.dist-info/top_level.txt,sha256=Tamm6ADzjwaQa1z27O7Izcyhyt9f0gVjMv1_tC810aI,32
+more_compute-0.4.0.dist-info/RECORD,,

morecompute/__version__.py

@@ -1 +1 @@
-__version__ = "0.3.3"
+__version__ = "0.4.0"

morecompute/execution/executor.py

@@ -17,6 +17,7 @@ class NextZmqExecutor:
     error_utils: "ErrorUtils"
     cmd_addr: str
     pub_addr: str
+    ctrl_addr: str
     execution_count: int
     interrupt_timeout: float
     worker_pid: int | None
@@ -26,12 +27,14 @@ class NextZmqExecutor:
     ctx: object  # zmq.Context - untyped due to zmq type limitations
     req: object  # zmq.Socket - untyped due to zmq type limitations
     sub: object  # zmq.Socket - untyped due to zmq type limitations
+    ctrl: object  # zmq.Socket - control socket for interrupts
     is_remote: bool  # Flag to track if connected to remote worker
 
     def __init__(self, error_utils: "ErrorUtils", cmd_addr: str | None = None, pub_addr: str | None = None, interrupt_timeout: float = 0.5) -> None:
         self.error_utils = error_utils
         self.cmd_addr = cmd_addr or os.getenv('MC_ZMQ_CMD_ADDR', 'tcp://127.0.0.1:5555')
         self.pub_addr = pub_addr or os.getenv('MC_ZMQ_PUB_ADDR', 'tcp://127.0.0.1:5556')
+        self.ctrl_addr = os.getenv('MC_ZMQ_CTRL_ADDR', self.cmd_addr.replace('5555', '5557'))
         self.execution_count = 0
         self.interrupt_timeout = interrupt_timeout
         self.worker_pid = None
@@ -46,6 +49,9 @@ class NextZmqExecutor:
         self.sub = self.ctx.socket(zmq.SUB)  # type: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
         self.sub.connect(self.pub_addr)  # type: ignore[reportAttributeAccessIssue]
         self.sub.setsockopt_string(zmq.SUBSCRIBE, '')  # type: ignore[reportAttributeAccessIssue]
+        # Control socket for interrupts (DEALER to connect to worker's ROUTER)
+        self.ctrl = self.ctx.socket(zmq.DEALER)  # type: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
+        self.ctrl.connect(self.ctrl_addr)  # type: ignore[reportAttributeAccessIssue]
         self._ensure_worker()
 
     def _ensure_special_handler(self) -> None:
@@ -66,7 +72,9 @@ class NextZmqExecutor:
         try:
             tmp.connect(self.cmd_addr)  # type: ignore[reportAttributeAccessIssue]
             tmp.send_json({'type': 'ping'})  # type: ignore[reportAttributeAccessIssue]
-            _ = cast(dict[str, object], tmp.recv_json())  # type: ignore[reportAttributeAccessIssue]
+            resp = cast(dict[str, object], tmp.recv_json())  # type: ignore[reportAttributeAccessIssue]
+            # Store worker PID even if already running (for force-kill)
+            self.worker_pid = resp.get('pid')  # type: ignore[assignment]
         except Exception:
             #worker not responding, need to start it
             pass
@@ -80,6 +88,7 @@ class NextZmqExecutor:
         env = os.environ.copy()
         env.setdefault('MC_ZMQ_CMD_ADDR', self.cmd_addr)
         env.setdefault('MC_ZMQ_PUB_ADDR', self.pub_addr)
+        env.setdefault('MC_ZMQ_CTRL_ADDR', self.ctrl_addr)
         try:
             # Keep track of the worker process
             # Redirect stderr to see errors during development
@@ -148,8 +157,10 @@ class NextZmqExecutor:
                         normalized_source, result, start_time, execution_count, websocket, cell_index
                     )
                     result['execution_time'] = f"{(time.time()-start_time)*1000:.1f}ms"
+                    print(f"[EXECUTOR] Sending execution_complete for cell {cell_index}, status={result.get('status')}, has_error={result.get('error') is not None}", file=sys.stderr, flush=True)
                     if websocket:
                         await websocket.send_json({'type': 'execution_complete', 'data': {'cell_index': cell_index, 'result': result}})
+                        print(f"[EXECUTOR] Sent execution_complete successfully", file=sys.stderr, flush=True)
                     return result
                 # For remote execution OR mixed commands, fall through to send via ZMQ
 
@@ -163,10 +174,18 @@ class NextZmqExecutor:
         # Consume pub until we see complete for this cell
         start_time = time.time()
         max_wait = 300.0  # 5 minute timeout for really long operations
+        interrupted_time = None  # Track when interrupt was sent
         while True:
             # Check if this cell was interrupted
-            if self.interrupted_cell == cell_index:
-                print(f"[EXECUTE] Cell {cell_index} was interrupted, breaking out of execution loop", file=sys.stderr, flush=True)
+            if self.interrupted_cell == cell_index and interrupted_time is None:
+                print(f"[EXECUTE] Cell {cell_index} was interrupted, waiting for subprocess to be killed...", file=sys.stderr, flush=True)
+                interrupted_time = time.time()
+                # Don't break immediately - wait for execution_complete from worker
+                # Give worker 5 seconds to kill subprocess and send completion
+
+            # If interrupted and waited long enough, force break
+            if interrupted_time and (time.time() - interrupted_time > 5.0):
+                print(f"[EXECUTE] Cell {cell_index} interrupt timeout, breaking out", file=sys.stderr, flush=True)
                 self.interrupted_cell = None  # Clear the flag
                 result.update({
                     'status': 'error',
@@ -174,7 +193,7 @@ class NextZmqExecutor:
                         'output_type': 'error',
                         'ename': 'KeyboardInterrupt',
                         'evalue': 'Execution interrupted by user',
-                        'traceback': ['KeyboardInterrupt: Execution was stopped by user']
+                        'traceback': []  # No traceback needed for user-initiated interrupt
                     }
                 })
                 break
@@ -215,6 +234,10 @@ class NextZmqExecutor:
             elif t == 'execution_complete' and msg.get('cell_index') == cell_index:
                 result.update(msg.get('result') or {})
                 result.setdefault('execution_count', execution_count)
+                # Clear interrupted flag if this was interrupted
+                if self.interrupted_cell == cell_index:
+                    print(f"[EXECUTE] Cell {cell_index} completed after interrupt", file=sys.stderr, flush=True)
+                    self.interrupted_cell = None
                 break
 
         # Try to receive the reply from REQ socket (if worker is still alive)
@@ -248,7 +271,7 @@ class NextZmqExecutor:
         return result
 
     async def interrupt_kernel(self, cell_index: int | None = None) -> None:
-        """Interrupt the kernel with escalation to force-kill if needed"""
+        """Interrupt the kernel using the control socket"""
         import sys
         print(f"[INTERRUPT] Starting interrupt for cell {cell_index}", file=sys.stderr, flush=True)
 
@@ -261,32 +284,22 @@ class NextZmqExecutor:
         if isinstance(cell_index, int):
             payload['cell_index'] = cell_index
 
-        # Try graceful interrupt, but don't trust it for blocking I/O
+        # Send interrupt on control socket (non-blocking)
         try:
-            # Very short timeout since we'll force-kill anyway
-            self.req.setsockopt(zmq.SNDTIMEO, 100)  # type: ignore[reportAttributeAccessIssue]
-            self.req.setsockopt(zmq.RCVTIMEO, 100)  # type: ignore[reportAttributeAccessIssue]
-            self.req.send_json(payload)  # type: ignore[reportAttributeAccessIssue]
-            _ = cast(dict[str, object], self.req.recv_json())  # type: ignore[reportAttributeAccessIssue]
-            print(f"[INTERRUPT] Sent interrupt signal to worker", file=sys.stderr, flush=True)
+            self.ctrl.setsockopt(zmq.SNDTIMEO, 1000)  # type: ignore[reportAttributeAccessIssue]
+            self.ctrl.setsockopt(zmq.RCVTIMEO, 1000)  # type: ignore[reportAttributeAccessIssue]
+            self.ctrl.send_json(payload)  # type: ignore[reportAttributeAccessIssue]
+            _ = cast(dict[str, object], self.ctrl.recv_json())  # type: ignore[reportAttributeAccessIssue]
+            print(f"[INTERRUPT] Sent interrupt signal to worker via control socket", file=sys.stderr, flush=True)
         except Exception as e:
             print(f"[INTERRUPT] Could not send interrupt signal: {e}", file=sys.stderr, flush=True)
+            # If control socket fails, try force-kill immediately
+            print(f"[INTERRUPT] Force killing worker immediately...", file=sys.stderr, flush=True)
+            await self._force_kill_worker()
         finally:
             # Reset timeouts
-            self.req.setsockopt(zmq.SNDTIMEO, -1)  # type: ignore[reportAttributeAccessIssue]
-            self.req.setsockopt(zmq.RCVTIMEO, -1)  # type: ignore[reportAttributeAccessIssue]
-
-        # Wait briefly to see if worker responds, but DON'T read from pub socket
-        # (execute_cell is already reading from it - we'd steal messages!)
-        # Instead, just wait a moment and force-kill if needed
-        print(f"[INTERRUPT] Waiting {self.interrupt_timeout}s before force-kill...", file=sys.stderr, flush=True)
-        await asyncio.sleep(self.interrupt_timeout)
-
-        # For blocking I/O operations, interrupt rarely works - just force-kill
-        # The interrupted_cell flag will let execute_cell break out gracefully
-        print(f"[INTERRUPT] Force killing worker to ensure stop...", file=sys.stderr, flush=True)
-        await self._force_kill_worker()
-        print(f"[INTERRUPT] Force kill completed", file=sys.stderr, flush=True)
+            self.ctrl.setsockopt(zmq.SNDTIMEO, -1)  # type: ignore[reportAttributeAccessIssue]
+            self.ctrl.setsockopt(zmq.RCVTIMEO, -1)  # type: ignore[reportAttributeAccessIssue]
 
         # Interrupt special handler
         if self.special_handler:
@@ -325,13 +338,16 @@ class NextZmqExecutor:
         # CRITICAL: Reset socket state - close and recreate
         # The REQ socket may be waiting for a reply from the dead worker
         try:
-            print(f"[FORCE_KILL] Resetting REQ socket", file=sys.stderr, flush=True)
+            print(f"[FORCE_KILL] Resetting REQ and CTRL sockets", file=sys.stderr, flush=True)
             self.req.close(0)  # type: ignore[reportAttributeAccessIssue]
             self.req = self.ctx.socket(zmq.REQ)  # type: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
             self.req.connect(self.cmd_addr)  # type: ignore[reportAttributeAccessIssue]
-            print(f"[FORCE_KILL] REQ socket reset complete", file=sys.stderr, flush=True)
+            self.ctrl.close(0)  # type: ignore[reportAttributeAccessIssue]
+            self.ctrl = self.ctx.socket(zmq.DEALER)  # type: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
+            self.ctrl.connect(self.ctrl_addr)  # type: ignore[reportAttributeAccessIssue]
+            print(f"[FORCE_KILL] Socket reset complete", file=sys.stderr, flush=True)
         except Exception as e:
-            print(f"[FORCE_KILL] Error resetting socket: {e}", file=sys.stderr, flush=True)
+            print(f"[FORCE_KILL] Error resetting sockets: {e}", file=sys.stderr, flush=True)
 
         # Respawn worker
         try:
@@ -341,40 +357,86 @@ class NextZmqExecutor:
 
     def reset_kernel(self) -> None:
         """Reset the kernel by shutting down worker and restarting"""
-        # Try graceful shutdown first
+        import sys
+        print(f"[RESET] Starting kernel reset, worker_pid={self.worker_pid}, is_remote={self.is_remote}", file=sys.stderr, flush=True)
+
+        # If connected to remote GPU, DON'T kill the worker - just send shutdown message
+        if self.is_remote:
+            print(f"[RESET] Remote worker - sending shutdown message only", file=sys.stderr, flush=True)
+            try:
+                self.req.setsockopt(zmq.SNDTIMEO, 2000)  # type: ignore[reportAttributeAccessIssue]
+                self.req.setsockopt(zmq.RCVTIMEO, 2000)  # type: ignore[reportAttributeAccessIssue]
+                self.req.send_json({'type': 'shutdown'})  # type: ignore[reportAttributeAccessIssue]
+                _ = cast(dict[str, object], self.req.recv_json())  # type: ignore[reportAttributeAccessIssue]
+                print(f"[RESET] Remote worker acknowledged shutdown", file=sys.stderr, flush=True)
+            except Exception as e:
+                print(f"[RESET] Remote worker shutdown failed: {e}", file=sys.stderr, flush=True)
+            finally:
+                self.req.setsockopt(zmq.SNDTIMEO, -1)  # type: ignore[reportAttributeAccessIssue]
+                self.req.setsockopt(zmq.RCVTIMEO, -1)  # type: ignore[reportAttributeAccessIssue]
+
+            # Reset execution count but don't respawn worker
+            self.execution_count = 0
+            print(f"[RESET] Remote kernel reset complete", file=sys.stderr, flush=True)
+            return
+
+        # Local worker mode - try graceful shutdown first
         try:
             self.req.setsockopt(zmq.SNDTIMEO, 500)  # type: ignore[reportAttributeAccessIssue]
             self.req.setsockopt(zmq.RCVTIMEO, 500)  # type: ignore[reportAttributeAccessIssue]
             self.req.send_json({'type': 'shutdown'})  # type: ignore[reportAttributeAccessIssue]
             _ = cast(dict[str, object], self.req.recv_json())  # type: ignore[reportAttributeAccessIssue]
-        except Exception:
-            pass
+            print(f"[RESET] Sent graceful shutdown message", file=sys.stderr, flush=True)
+        except Exception as e:
+            print(f"[RESET] Graceful shutdown failed: {e}", file=sys.stderr, flush=True)
         finally:
             self.req.setsockopt(zmq.SNDTIMEO, -1)  # type: ignore[reportAttributeAccessIssue]
             self.req.setsockopt(zmq.RCVTIMEO, -1)  # type: ignore[reportAttributeAccessIssue]
 
-        # Force kill if needed
+        # Force kill local worker if needed
         if self.worker_pid:
             try:
+                print(f"[RESET] Sending SIGTERM to worker PID {self.worker_pid}", file=sys.stderr, flush=True)
                 os.kill(self.worker_pid, signal.SIGTERM)
-                time.sleep(0.2)
+                time.sleep(0.3)  # Give it time to shutdown gracefully
                 try:
+                    # Check if still alive
                     os.kill(self.worker_pid, 0)
+                    # Still alive, force kill
+                    print(f"[RESET] Worker still alive, sending SIGKILL", file=sys.stderr, flush=True)
                     os.kill(self.worker_pid, signal.SIGKILL)
+                    time.sleep(0.2)  # Wait for SIGKILL to complete
                 except ProcessLookupError:
-                    pass
-            except Exception:
-                pass
+                    print(f"[RESET] Worker process terminated", file=sys.stderr, flush=True)
+            except Exception as e:
+                print(f"[RESET] Error killing worker: {e}", file=sys.stderr, flush=True)
 
         if self.worker_proc:
             try:
                 self.worker_proc.terminate()
                 self.worker_proc.wait(timeout=1)
+                print(f"[RESET] Worker process terminated via Popen", file=sys.stderr, flush=True)
             except Exception:
                 try:
                     self.worker_proc.kill()
-                except Exception:
-                    pass
+                    print(f"[RESET] Worker process killed via Popen", file=sys.stderr, flush=True)
+                except Exception as e:
+                    print(f"[RESET] Error killing via Popen: {e}", file=sys.stderr, flush=True)
+
+        # Close sockets first, BEFORE recreating them
+        print(f"[RESET] Closing old sockets", file=sys.stderr, flush=True)
+        try:
+            self.req.close(0)  # type: ignore[reportAttributeAccessIssue]
+        except Exception:
+            pass
+        try:
+            self.ctrl.close(0)  # type: ignore[reportAttributeAccessIssue]
+        except Exception:
+            pass
+
+        # Wait for ZMQ to release the sockets (critical!)
+        time.sleep(0.5)
+        print(f"[RESET] Sockets closed, waited for cleanup", file=sys.stderr, flush=True)
 
         # Reset state
         self.execution_count = 0
@@ -383,11 +445,14 @@ class NextZmqExecutor:
 
         # Recreate sockets
         try:
-            self.req.close(0)  # type: ignore[reportAttributeAccessIssue]
+            print(f"[RESET] Creating new sockets", file=sys.stderr, flush=True)
             self.req = self.ctx.socket(zmq.REQ)  # type: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
             self.req.connect(self.cmd_addr)  # type: ignore[reportAttributeAccessIssue]
-        except Exception:
-            pass
+            self.ctrl = self.ctx.socket(zmq.DEALER)  # type: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
+            self.ctrl.connect(self.ctrl_addr)  # type: ignore[reportAttributeAccessIssue]
+            print(f"[RESET] New sockets created successfully", file=sys.stderr, flush=True)
+        except Exception as e:
+            print(f"[RESET] Error creating sockets: {e}", file=sys.stderr, flush=True)
 
         # Reset special handler
         if self.special_handler is not None:
@@ -395,6 +460,10 @@ class NextZmqExecutor:
 
         # Respawn worker
         try:
+            print(f"[RESET] Respawning new worker", file=sys.stderr, flush=True)
             self._ensure_worker()
-        except Exception:
-            pass
+            print(f"[RESET] Kernel reset complete, new worker_pid={self.worker_pid}", file=sys.stderr, flush=True)
+        except Exception as e:
+            print(f"[RESET] Error respawning worker: {e}", file=sys.stderr, flush=True)
+            import traceback
+            traceback.print_exc()