notebook-intelligence 5.2.0__tar.gz → 5.2.1__tar.gz

{notebook_intelligence-5.2.0 → notebook_intelligence-5.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: notebook_intelligence
-Version: 5.2.0
+Version: 5.2.1
 Summary: AI coding assistant for JupyterLab
 Project-URL: Homepage, https://github.com/plmbr/notebook-intelligence
 Project-URL: Bug Tracker, https://github.com/plmbr/notebook-intelligence/issues

{notebook_intelligence-5.2.0 → notebook_intelligence-5.2.1}/notebook_intelligence/_version.py

@@ -1,4 +1,4 @@
 # This file is auto-generated by Hatchling. As such, do not:
 #   - modify
 #   - track in version control e.g. be sure to add to .gitignore
-__version__ = VERSION = '5.2.0'
+__version__ = VERSION = '5.2.1'

{notebook_intelligence-5.2.0 → notebook_intelligence-5.2.1}/notebook_intelligence/api.py

@@ -2,6 +2,7 @@
 
 import asyncio
 import json
+import time
 from typing import Any, Callable, Dict, Union, Optional
 from dataclasses import asdict, dataclass
 from enum import Enum
@@ -309,6 +310,24 @@ class ChatResponse:
         self._user_input_signal: SignalImpl = SignalImpl()
         self._run_ui_command_response_signal: SignalImpl = SignalImpl()
         self.participant_id = ''
+        # Cumulative wall-clock seconds spent blocked on a user reply (tool
+        # approval, plan confirm, AskUserQuestion), plus the start of any wait
+        # currently in progress. Consumers subtract this from a response
+        # timeout so a slow human approval isn't mistaken for an unresponsive
+        # agent, which previously timed out the turn and wedged the next one
+        # (issue #381).
+        self._user_input_wait_total = 0.0
+        self._user_input_wait_started = None
+
+    @property
+    def user_input_wait_seconds(self) -> float:
+        """Total time this response has spent awaiting user input, including
+        any wait still in progress."""
+        total = self._user_input_wait_total
+        started = self._user_input_wait_started
+        if started is not None:
+            total += time.time() - started
+        return total
 
     @property
     def message_id(self) -> str:
@@ -335,12 +354,19 @@ class ChatResponse:
                 resp["data"] = data['data']
 
         response.user_input_signal.connect(_on_user_input)
+        response._user_input_wait_started = time.time()
 
-        while True:
-            if resp["data"] is not None:
-                response.user_input_signal.disconnect(_on_user_input)
-                return resp["data"]
-            await asyncio.sleep(0.1)
+        try:
+            while True:
+                if resp["data"] is not None:
+                    return resp["data"]
+                await asyncio.sleep(0.1)
+        finally:
+            response.user_input_signal.disconnect(_on_user_input)
+            started = response._user_input_wait_started
+            if started is not None:
+                response._user_input_wait_total += time.time() - started
+                response._user_input_wait_started = None
 
     async def run_ui_command(self, command: str, args: dict = {}) -> None:
         raise NotImplementedError

{notebook_intelligence-5.2.0 → notebook_intelligence-5.2.1}/notebook_intelligence/claude.py

@@ -1175,6 +1175,12 @@ class ClaudeCodeClient():
 
         start_time = time.time()
         last_heartbeat = start_time
+        # Time the agent spends blocked on a tool approval (or any user input)
+        # must not count toward the response timeout: a slow human reply isn't
+        # an unresponsive agent. Without this, a long approval wait timed out
+        # the turn and left the worker mid-request, wedging later prompts
+        # (issue #381).
+        response_obj = event_args.get("response") if event_args else None
 
         try:
             while True:
@@ -1227,7 +1233,10 @@ class ClaudeCodeClient():
                         "success": False,
                         "error": "Claude agent is not running",
                     }
-                if time.time() - start_time > CLAUDE_AGENT_CLIENT_RESPONSE_TIMEOUT:
+                elapsed = time.time() - start_time
+                if response_obj is not None:
+                    elapsed -= response_obj.user_input_wait_seconds
+                if elapsed > CLAUDE_AGENT_CLIENT_RESPONSE_TIMEOUT:
                     return {
                         "data": None,
                         "success": False,

{notebook_intelligence-5.2.0 → notebook_intelligence-5.2.1}/notebook_intelligence/extension.py

@@ -2632,11 +2632,21 @@ class WebsocketCopilotHandler(WebSocketMixin, websocket.WebSocketHandler, Jupyte
             handlers.cancel_token.cancel_request()
  
     def on_close(self):
-        # Drop any handler entries whose worker threads outlive the
-        # websocket connection. The thread wrapper would clean these up
-        # on its own once the coro returns, but a long-running request
-        # left in-flight at disconnect would otherwise pin its emitter
-        # and cancel token for the lifetime of the worker.
+        # Cancel any requests still in flight at disconnect, then drop their
+        # handlers. Clearing alone isn't enough: a turn parked on a tool
+        # approval no longer self-resolves via the response timeout (the
+        # approval wait is excluded from it, #381), so without an explicit
+        # cancel its worker thread and the Claude subprocess would spin until
+        # the server restarts. Cancelling makes the poll loop tear the
+        # subprocess down and return.
+        # Snapshot first: a worker thread finishing its request pops its own
+        # entry (see _run_request_thread), which would otherwise raise
+        # "dictionary changed size during iteration" here on the IOLoop thread.
+        for handlers in list(self._messageCallbackHandlers.values()):
+            try:
+                handlers.cancel_token.cancel_request()
+            except Exception as e:
+                log.warning(f"Error cancelling in-flight request on close: {e}")
         self._messageCallbackHandlers.clear()
 
     async def handle_inline_completions(prefix, suffix, language, filename, response_emitter, cancel_token):

{notebook_intelligence-5.2.0 → notebook_intelligence-5.2.1}/notebook_intelligence/labextension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plmbr/notebook-intelligence",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "description": "AI coding assistant for JupyterLab",
   "keywords": [
     "AI",
@@ -152,7 +152,7 @@
       }
     },
     "_build": {
-      "load": "static/remoteEntry.542e0ded69d4368a8e30.js",
+      "load": "static/remoteEntry.66f4a7743a2091e5cae6.js",
       "extension": "./extension",
       "style": "./style"
     }

{notebook_intelligence-5.2.0 → notebook_intelligence-5.2.1}/notebook_intelligence/labextension/schemas/@plmbr/notebook-intelligence/package.json.orig

@@ -1,6 +1,6 @@
 {
     "name": "@plmbr/notebook-intelligence",
-    "version": "5.2.0",
+    "version": "5.2.1",
     "description": "AI coding assistant for JupyterLab",
     "keywords": [
         "AI",