clikernel 0.2.4__tar.gz → 0.2.5__tar.gz

{clikernel-0.2.4 → clikernel-0.2.5}/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 <!-- do not remove -->
 
+## 0.2.5
+
+### New Features
+
+- restart now re-runs startup.py and reinstalls inspectors on client-created kernels; attached kernels still restart bare ([#37](https://github.com/AnswerDotAI/clikernel/issues/37))
+
+
 ## 0.2.4
 
 ### New Features

{clikernel-0.2.4/clikernel.egg-info → clikernel-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clikernel
-Version: 0.2.4
+Version: 0.2.5
 Summary: Serve persistent Jupyter kernels to LLMs as concise text, over MCP or a plain stream protocol
 Author: clikernel contributors
 License: Apache-2.0

{clikernel-0.2.4 → clikernel-0.2.5}/clikernel/__init__.py

@@ -8,4 +8,4 @@ Modules:
 - `clikernel.skill`: Use the persistent `clikernel` MCP session as the default workspace for any task advanced through live Python execution -- stateful inspection, file-editing workflows, debugging, experiments, API probes, data transforms, or notebook-style work. Read this before writing, running, or debugging Python code in a session with `clikernel` connected.
 - `clikernel.stream`: Streaming JSON-lines worker protocol: nbformat-shaped output events, and a supervisor for select-based UIs."""
 
-__version__ = "0.2.4"
+__version__ = "0.2.5"

{clikernel-0.2.4 → clikernel-0.2.5}/clikernel/_modidx.py

@@ -16,6 +16,7 @@ d = { 'settings': { 'branch': 'main',
                                'clikernel.cli.serve_stream': ('cli.html#serve_stream', 'clikernel/cli.py')},
             'clikernel.core': { 'clikernel.core.Client': ('core.html#client', 'clikernel/core.py'),
                                 'clikernel.core.Client.__init__': ('core.html#client.__init__', 'clikernel/core.py'),
+                                'clikernel.core.Client._setup': ('core.html#client._setup', 'clikernel/core.py'),
                                 'clikernel.core.Client._use': ('core.html#client._use', 'clikernel/core.py'),
                                 'clikernel.core.Client.aclose': ('core.html#client.aclose', 'clikernel/core.py'),
                                 'clikernel.core.Client.connect': ('core.html#client.connect', 'clikernel/core.py'),

{clikernel-0.2.4 → clikernel-0.2.5}/clikernel/core.py

@@ -7,7 +7,7 @@ Docs: https://AnswerDotAI.github.io/clikernel/core.html.md"""
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_core.ipynb.
 
 # %% auto #0
-__all__ = ['DEFAULT_URL', 'MAXLEN', 'STATE_LOST', 'cfg_dir', 'gateways', 'resolve', 'Client']
+__all__ = ['DEFAULT_URL', 'MAXLEN', 'STATE_LOST', 'STATE_LOST_SETUP', 'cfg_dir', 'gateways', 'resolve', 'Client']
 
 # %% ../nbs/00_core.ipynb #2b3b7f4a
 import os, tomllib
@@ -92,10 +92,11 @@ def _inspector_setup(src):
 
 # %% ../nbs/00_core.ipynb #33b7bc28
 STATE_LOST = 'NOTE: the kernel restarted with a fresh interpreter: all session state is lost (imports, variables, monkeypatches). Redo any setup the task still needs.'
+STATE_LOST_SETUP = 'NOTE: the kernel restarted with a fresh interpreter: startup.py has been re-run (its imports are back), but all other session state is lost (variables, monkeypatches, other imports). Redo what the task still needs.'
 
 class Client:
     "One conversation's connection: a gateway manager, and the current kernel"
-    def __init__(self, cfgdir=None): self.cfgdir,self.mgr,self.kc,self.kid,self.auto = cfgdir,None,None,None,False
+    def __init__(self, cfgdir=None): self.cfgdir,self.mgr,self.kc,self.kid,self.auto,self.made = cfgdir,None,None,None,False,False
 
     async def _use(self, mgr, kid):
         "Point at `kid` on `mgr`, dropping any previous ws (never the kernel)"
@@ -106,6 +107,20 @@ class Client:
         await self.kc.wait_for_ready(timeout=30)
 
 # %% ../nbs/00_core.ipynb #94497e4a
+@patch
+async def _setup(self:Client):
+    "Deliver `startup.py` and `inspectors.py` to the current kernel, returning startup's output"
+    out = ''
+    d = Path(self.cfgdir) if self.cfgdir else cfg_dir()
+    if (p := d/'startup.py').exists(): out = await self.execute(_startup_src(p.read_text(), p))
+    if (p := d/'inspectors.py').exists():
+        res = await self.execute(_inspector_setup(p.read_text()))
+        if res:   # a load failure is fatal: refusing to run beats running uninspected
+            await self.mgr.shutdown_kernel(self.kid)
+            self.kc,self.kid,self.auto,self.made = None,None,False,False
+            raise RuntimeError(f'inspectors.py failed to load; kernel stopped:\n{res}')
+    return out
+
 @patch
 async def connect(self:Client, host='', kernel='', auto=False):
     "Connect to a gateway (create a kernel, or attach to `kernel` by id prefix); the pointer aims at it afterwards; `auto` marks a created kernel as client-scoped"
@@ -113,7 +128,7 @@ async def connect(self:Client, host='', kernel='', auto=False):
     if self.auto:   # scoped to this client: any new connect ends it, even one already dead
         try: await self.stop()
         except Exception as e:
-            self.kc,self.kid,self.auto = None,None,False
+            self.kc,self.kid,self.auto,self.made = None,None,False,False
             note = f'\nnote: stopping the auto kernel failed ({e})'
     url,tok,ver = resolve(host, self.cfgdir)
     mgr = JupyAsyncMultiKernelManager(url, token=tok, verify=ver)
@@ -122,19 +137,13 @@ async def connect(self:Client, host='', kernel='', auto=False):
         kid = first(k['id'] for k in ks if k['id'].startswith(kernel))
         if not kid: raise ValueError(f'no kernel matching {kernel!r} on {url}: {[k["id"][:8] for k in ks]}')
         await self._use(mgr, kid)
+        self.made = False
         return f'connected to existing kernel {kid} on {url}' + note
     kw = dict(cwd=os.getcwd(), env=dict(os.environ)) if not host else {}   # the default gateway is local by definition: kernels start where, and as, the conversation lives (cwd and environment - so kernel-side tools that key state to the conversation, like llmdojo's doc-state, resolve it correctly)
     kid = await mgr.start_kernel(**kw)
     await self._use(mgr, kid)
-    out = ''
-    d = Path(self.cfgdir) if self.cfgdir else cfg_dir()
-    if (p := d/'startup.py').exists(): out = await self.execute(_startup_src(p.read_text(), p))
-    if (p := d/'inspectors.py').exists():
-        res = await self.execute(_inspector_setup(p.read_text()))
-        if res:   # a load failure is fatal: refusing to start beats running uninspected
-            await self.mgr.shutdown_kernel(kid)
-            self.kc,self.kid = None,None
-            raise RuntimeError(f'inspectors.py failed to load; kernel stopped:\n{res}')
+    self.made = True
+    out = await self._setup()
     self.auto = auto
     return f'created kernel {kid} on {url}' + (f'\n{out}' if out.strip() else '') + note
 
@@ -175,16 +184,18 @@ async def stop(self:Client, kernel=''):
     await self.mgr.shutdown_kernel(kid)
     if kid == self.kid:
         await self.kc.aclose()
-        self.kc,self.kid,self.auto = None,None,False
+        self.kc,self.kid,self.auto,self.made = None,None,False,False
     return f'stopped kernel {kid}'
 
 @patch
 async def restart(self:Client):
-    "Restart the current kernel: same id, fresh interpreter"
+    "Restart the current kernel: same id, fresh interpreter; a kernel this client created gets `startup.py` and `inspectors.py` again"
     if not self.kc: return 'no kernel: call `connect` first'
     await self.mgr.restart_kernel(self.kid)
     await self.kc.wait_for_ready(timeout=30)
-    return STATE_LOST
+    if not self.made: return STATE_LOST
+    out = await self._setup()
+    return STATE_LOST_SETUP + (f'\n{out}' if out.strip() else '')
 
 @patch
 async def interrupt(self:Client):

{clikernel-0.2.4 → clikernel-0.2.5}/clikernel/mcp.py

@@ -67,7 +67,7 @@ def mk_server(c:Client):
         return await c.stop(kernel)
 
     async def restart()->str:
-        "Kill the current kernel's process and start a fresh one under the same id: `sys.modules` genuinely reset, all session state discarded. Use for a clean slate, after rebuilding a native extension, or after a reload left stale classes behind (symptoms: `isinstance` mysteriously failing, a class missing a method you know it has). Also works when `execute` is stuck. After restarting, redo any imports/setup the task still needs."
+        "Kill the current kernel's process and start a fresh one under the same id: `sys.modules` genuinely reset, all session state discarded. Use for a clean slate, after rebuilding a native extension, or after a reload left stale classes behind (symptoms: `isinstance` mysteriously failing, a class missing a method you know it has). Also works when `execute` is stuck. A kernel this conversation created gets startup.py re-run and inspectors reinstalled (the reply says so); an attached kernel restarts bare, as found."
         return await c.restart()
 
     async def interrupt()->str:

{clikernel-0.2.4 → clikernel-0.2.5}/clikernel/skill.py

@@ -14,7 +14,7 @@ The lifecycle has one implicit convenience and no implicit destruction beyond it
 - Returning to earlier work (the user asks to continue where a previous conversation left off, or to use their solveit kernel): `list_kernels` to see what's running, then `connect` with the kernel id (or unique prefix). Attach runs nothing -- the kernel's live state is the point.
 - End of work: an auto kernel stops itself with the conversation. `stop_kernel` an explicitly created kernel when it was for this task only; leave it running if the user wants to return to it, and tell the user its id so they can.
 
-`restart` gives the current kernel a genuinely fresh interpreter under the same id (redo imports after it); `interrupt` stops a too-long `execute` while keeping state. If a reply says the kernel died, `connect` again. If `connect` fails because the gateway is unreachable, the gateway server is not running -- report that to the user rather than working around it.
+`restart` gives the current kernel a genuinely fresh interpreter under the same id (a kernel this conversation created gets `startup.py` and inspectors again; redo any other setup); `interrupt` stops a too-long `execute` while keeping state. If a reply says the kernel died, `connect` again. If `connect` fails because the gateway is unreachable, the gateway server is not running -- report that to the user rather than working around it.
 
 Remote gateways (a rustygate or solveit instance elsewhere) are the same verbs with a `host`: a name from `~/.config/clikernel/gateways.toml` (`[gateways.<name>]` tables with `url`, `token` or `token_env`, and optional `verify = false` for self-signed TLS) or a URL. Tokens live in the config file, never in tool arguments.
 

{clikernel-0.2.4 → clikernel-0.2.5/clikernel.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clikernel
-Version: 0.2.4
+Version: 0.2.5
 Summary: Serve persistent Jupyter kernels to LLMs as concise text, over MCP or a plain stream protocol
 Author: clikernel contributors
 License: Apache-2.0