langbot-plugin 0.6.7__tar.gz → 0.6.9__tar.gz

{langbot_plugin-0.6.7 → langbot_plugin-0.6.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: langbot-plugin
-Version: 0.6.7
+Version: 0.6.9
 Summary: This package contains the SDK, CLI for building plugins for LangBot, plus the runtime for hosting LangBot plugins
 Project-URL: Homepage, https://langbot.app
 Project-URL: Repository, https://github.com/langbot-app/langbot-plugin-sdk

{langbot_plugin-0.6.7 → langbot_plugin-0.6.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "langbot-plugin"
-version = "0.6.7"
+version = "0.6.9"
 description = "This package contains the SDK, CLI for building plugins for LangBot, plus the runtime for hosting LangBot plugins"
 readme = "README.md"
 authors = [

{langbot_plugin-0.6.7 → langbot_plugin-0.6.9}/src/langbot_plugin/runtime/plugin/mgr.py

@@ -149,6 +149,9 @@ class SharedPluginWorkerRuntime:
         default_factory=dict
     )
     plugin_handler: runtime_plugin_handler_cls.PluginConnectionHandler | None = None
+    pending_plugin_handler: (
+        runtime_plugin_handler_cls.PluginConnectionHandler | None
+    ) = None
     controller: Controller | None = None
     launch_task: asyncio.Task[None] | None = None
     transport_registered_event: asyncio.Event = field(default_factory=asyncio.Event)
@@ -552,12 +555,23 @@ class PluginManager:
         *,
         plugin_author: str,
         plugin_name: str,
+        expected_shared_handler: runtime_plugin_handler_cls.PluginConnectionHandler
+        | None = None,
     ) -> _PendingPluginRegistration:
         key = self._find_pending_registration_key(capability)
         if key is None:
             raise ValueError(
                 "Plugin registration capability is invalid or already used"
             )
+        registration = self._pending_registrations[key]
+        if registration.shared_pool_digest is not None:
+            worker = self._shared_workers.get(registration.shared_pool_digest)
+            if (
+                expected_shared_handler is None
+                or worker is None
+                or worker.pending_plugin_handler is not expected_shared_handler
+            ):
+                raise ValueError("Shared plugin worker registration transport changed")
         registration = self._pending_registrations.pop(key)
         if (
             registration.plugin_author != plugin_author
@@ -1967,6 +1981,12 @@ class PluginManager:
             worker.controller = controller
 
             async def new_plugin_connection_callback(connection: Connection):
+                if (
+                    worker.pending_plugin_handler is not None
+                    or worker.plugin_handler is not None
+                ):
+                    await connection.close()
+                    return
                 shared_transfer_root = (
                     self.artifact_store.base_path
                     / "shared-transfers"
@@ -1991,13 +2011,7 @@ class PluginManager:
                         self.context.worker_policy.max_file_size_mb * 1024 * 1024
                     ),
                 )
-                if (
-                    worker.plugin_handler is not None
-                    and worker.plugin_handler is not plugin_handler
-                ):
-                    await connection.close()
-                    return
-                worker.plugin_handler = plugin_handler
+                worker.pending_plugin_handler = plugin_handler
                 self.plugin_handlers.append(plugin_handler)
                 try:
                     await plugin_handler.run()
@@ -2173,6 +2187,9 @@ class PluginManager:
         if handler in self.plugin_handlers:
             self.plugin_handlers.remove(handler)
         for worker in self._shared_workers.values():
+            if worker.pending_plugin_handler is handler:
+                worker.pending_plugin_handler = None
+                return
             if worker.plugin_handler is handler:
                 async with worker.lifecycle_lock:
                     if worker.plugin_handler is not handler:
@@ -2591,6 +2608,7 @@ class PluginManager:
                 registration_capability or "",
                 plugin_author=plugin_author,
                 plugin_name=plugin_name,
+                expected_shared_handler=handler,
             )
             # From this point forward, use only the identity captured before the
             # child process was launched, never values supplied by plugin code.
@@ -2617,6 +2635,11 @@ class PluginManager:
                         registration.shared_pool_digest,
                         worker.slots,
                     )
+                    if worker.pending_plugin_handler is not handler:
+                        raise ValueError(
+                            "Shared plugin worker registration transport changed"
+                        )
+                    worker.pending_plugin_handler = None
                     worker.plugin_handler = handler
                     for slot_runtime in tuple(worker.slots.values()):
                         if (

langbot_plugin-0.6.9/src/langbot_plugin/version.py

@@ -0,0 +1 @@
+__version__ = "0.6.9"

{langbot_plugin-0.6.7 → langbot_plugin-0.6.9}/tests/packaging/test_release_metadata.py

@@ -11,5 +11,5 @@ def test_stable_release_metadata_is_consistent() -> None:
         (root / "src/langbot_plugin/version.py").read_text(encoding="utf-8").strip()
     )
 
-    assert project["project"]["version"] == "0.6.7"
-    assert source_version == '__version__ = "0.6.7"'
+    assert project["project"]["version"] == "0.6.9"
+    assert source_version == '__version__ = "0.6.9"'

{langbot_plugin-0.6.7 → langbot_plugin-0.6.9}/tests/runtime/plugin/test_installation_manager.py

@@ -441,6 +441,7 @@ async def test_failed_sole_shared_slot_retries_with_registered_handler(
 
     context.control_handler = Control()
     handler = Handler()
+    worker.pending_plugin_handler = handler
     capability = manager._issue_registration_capability(
         plugin_author="tester",
         plugin_name="demo",
@@ -448,6 +449,15 @@ async def test_failed_sole_shared_slot_retries_with_registered_handler(
         binding=binding,
         shared_pool_digest=digest,
     )
+    alt_handler = Handler()
+    with pytest.raises(ValueError, match="registration transport changed"):
+        await manager.register_plugin(
+            alt_handler,
+            container.model_dump(),
+            registration_capability=capability,
+        )
+    assert manager.is_registration_capability_pending(capability)
+    assert worker.pending_plugin_handler is handler
     await manager.register_plugin(
         handler,
         container.model_dump(),
@@ -545,6 +555,7 @@ async def test_failed_shared_slot_retry_keeps_healthy_sibling_and_worker(
 
     context.control_handler = Control()
     handler = Handler()
+    worker.pending_plugin_handler = handler
     capability = manager._issue_registration_capability(
         plugin_author="tester",
         plugin_name="demo",
@@ -771,6 +782,7 @@ async def test_shared_worker_registration_attaches_all_slots_with_exact_settings
     context.control_handler = Control()
     handler = Handler()
     worker = manager.installation_runtimes[binding_a].shared_worker
+    worker.pending_plugin_handler = handler
     capability = manager._issue_registration_capability(
         plugin_author="tester",
         plugin_name="demo",
@@ -865,6 +877,7 @@ async def test_shared_registration_waits_for_validated_slot_before_running(
 
     context.control_handler = Control()
     handler = Handler()
+    worker.pending_plugin_handler = handler
     capability = manager._issue_registration_capability(
         plugin_author="tester",
         plugin_name="demo",
@@ -972,6 +985,7 @@ async def test_shared_registration_reports_mixed_slot_attach_results(
 
     context.control_handler = Control()
     handler = Handler()
+    worker.pending_plugin_handler = handler
     capability = manager._issue_registration_capability(
         plugin_author="tester",
         plugin_name="demo",
@@ -1063,6 +1077,7 @@ async def test_shared_slot_uninitialized_container_is_failed(tmp_path, monkeypat
 
     context.control_handler = Control()
     handler = Handler()
+    worker.pending_plugin_handler = handler
     capability = manager._issue_registration_capability(
         plugin_author="tester",
         plugin_name="demo",
@@ -2067,6 +2082,117 @@ async def test_installation_worker_ready_timeout_cancels_hung_process(
     assert cancelled.is_set()
 
 
+async def test_shared_connection_does_not_claim_registration_before_capability_validation(
+    tmp_path,
+    monkeypatch,
+):
+    _, manager = _manager(tmp_path)
+    package = _package()
+    digest = hashlib.sha256(package).hexdigest()
+    binding = _binding("installation-a", digest, workspace_uuid="workspace-a")
+    monkeypatch.setattr(
+        manager.worker_launcher,
+        "prepare_dependency_environment",
+        _prepare_environment,
+    )
+    monkeypatch.setattr(manager, "_schedule_shared_worker", lambda _worker: None)
+    await manager.apply_plugin_installation(
+        binding,
+        artifact_package=package,
+        execution_mode=PluginExecutionMode.SHARED_CERTIFIED,
+    )
+    worker = manager.installation_runtimes[binding].shared_worker
+    assert worker is not None
+
+    class FakeConnection:
+        async def close(self):
+            return None
+
+    class FakeHandler:
+        async def run(self):
+            await asyncio.Event().wait()
+
+    handler = FakeHandler()
+    callback_started = asyncio.Event()
+
+    class CapturingController:
+        process = None
+
+        async def run(self, callback):
+            task = asyncio.create_task(callback(FakeConnection()))
+            callback_started.set()
+            try:
+                await task
+            finally:
+                if not task.done():
+                    task.cancel()
+                    await asyncio.gather(task, return_exceptions=True)
+
+        async def close(self):
+            return None
+
+    monkeypatch.setattr(
+        manager.worker_launcher,
+        "create_shared_pool_controller",
+        lambda _spec: CapturingController(),
+    )
+    monkeypatch.setattr(
+        manager_module.runtime_plugin_handler_cls,
+        "PluginConnectionHandler",
+        lambda *args, **kwargs: handler,
+    )
+
+    launch = asyncio.create_task(manager._launch_shared_worker(worker))
+    await asyncio.wait_for(callback_started.wait(), timeout=1)
+    await asyncio.sleep(0)
+
+    assert worker.plugin_handler is None
+    assert worker.pending_plugin_handler is handler
+    assert handler in manager.plugin_handlers
+
+    launch.cancel()
+    await asyncio.gather(launch, return_exceptions=True)
+
+
+async def test_shared_registration_failure_does_not_clear_new_worker_handler(
+    tmp_path,
+    monkeypatch,
+):
+    _, manager = _manager(tmp_path)
+    package = _package()
+    digest = hashlib.sha256(package).hexdigest()
+    binding = _binding("installation-a", digest, workspace_uuid="workspace-a")
+    monkeypatch.setattr(
+        manager.worker_launcher,
+        "prepare_dependency_environment",
+        _prepare_environment,
+    )
+    monkeypatch.setattr(manager, "_schedule_shared_worker", lambda _worker: None)
+    await manager.apply_plugin_installation(
+        binding,
+        artifact_package=package,
+        execution_mode=PluginExecutionMode.SHARED_CERTIFIED,
+    )
+    worker = manager.installation_runtimes[binding].shared_worker
+    assert worker is not None
+
+    class OldHandler:
+        pass
+
+    class NewHandler:
+        pass
+
+    old_handler = OldHandler()
+    new_handler = NewHandler()
+    worker.plugin_handler = new_handler
+    manager.plugin_handlers.extend([old_handler, new_handler])
+
+    await manager.remove_plugin_handler(old_handler)
+
+    assert worker.plugin_handler is new_handler
+    assert new_handler in manager.plugin_handlers
+
+
 async def test_shared_worker_ready_timeout_cancels_hung_controller_and_records_failure(
     tmp_path,
     monkeypatch,

langbot_plugin-0.6.7/src/langbot_plugin/version.py

@@ -1 +0,0 @@
-__version__ = "0.6.7"