sbxloop-worker 0.4.0__tar.gz → 0.4.2__tar.gz

{sbxloop_worker-0.4.0 → sbxloop_worker-0.4.2}/.gitignore

@@ -221,3 +221,7 @@ __marimo__/
 .sbxloop/
 .sdxloop/
 packages/sbxloop/src/sbxloop/_vendor/
+
+# written at build time by hatch-vcs
+packages/sbxloop/src/sbxloop/_version.py
+packages/sbxloop-worker/src/sbxloop_worker/_version.py

{sbxloop_worker-0.4.0 → sbxloop_worker-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sbxloop-worker
-Version: 0.4.0
+Version: 0.4.2
 Summary: In-sandbox worker runtime for sbxloop (protocol models, agent backends, job runner)
 Project-URL: Homepage, https://github.com/brettbergin/sbxloop
 Project-URL: Repository, https://github.com/brettbergin/sbxloop

{sbxloop_worker-0.4.0 → sbxloop_worker-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sbxloop-worker"
-version = "0.4.0"
+dynamic = ["version"]  # derived from git tags by hatch-vcs (see [tool.hatch.version])
 description = "In-sandbox worker runtime for sbxloop (protocol models, agent backends, job runner)"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -25,8 +25,20 @@ Homepage = "https://github.com/brettbergin/sbxloop"
 Repository = "https://github.com/brettbergin/sbxloop"
 
 [build-system]
-requires = ["hatchling>=1.27"]
+requires = ["hatchling>=1.27", "hatch-vcs"]
 build-backend = "hatchling.build"
 
+# Both workspace packages version from the same repo-root git tag, keeping the
+# lockstep invariant by construction. `fallback_root` lets a wheel built from
+# an extracted sdist (no git) pick the version up from the sdist's PKG-INFO.
+[tool.hatch.version]
+source = "vcs"
+raw-options = { root = "../..", fallback_root = ".", local_scheme = "no-local-version", fallback_version = "0.0.0" }
+
+# Write the resolved version into the package so `sbxloop_worker.__version__`
+# reports it at runtime (inside the sandbox, where dist metadata may be absent).
+[tool.hatch.build.hooks.vcs]
+version-file = "src/sbxloop_worker/_version.py"
+
 [tool.hatch.build.targets.wheel]
 packages = ["src/sbxloop_worker"]

sbxloop_worker-0.4.2/src/sbxloop_worker/__init__.py

@@ -0,0 +1,19 @@
+"""sbxloop-worker — the in-sandbox runtime for sbxloop.
+
+Runs inside a Docker Sandbox microVM. Hosts the shared host/worker protocol
+models, the agent backends (GitHub Copilot SDK), and the job runner invoked
+via ``python -m sbxloop_worker``.
+"""
+
+try:
+    # written at build time by hatch-vcs (see pyproject [tool.hatch.build.hooks.vcs])
+    from sbxloop_worker._version import __version__
+except ImportError:  # pragma: no cover - raw source tree that was never built
+    try:
+        from importlib.metadata import version as _pkg_version
+
+        __version__ = _pkg_version("sbxloop-worker")
+    except Exception:
+        __version__ = "0.0.0"
+
+__all__ = ["__version__"]

sbxloop_worker-0.4.2/src/sbxloop_worker/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '0.4.2'
+__version_tuple__ = version_tuple = (0, 4, 2)
+
+__commit_id__ = commit_id = None

{sbxloop_worker-0.4.0 → sbxloop_worker-0.4.2}/src/sbxloop_worker/backends/copilot.py

@@ -69,7 +69,7 @@ def _tool_args(arguments: Any) -> str | None:
     if arguments is None:
         return None
     if isinstance(arguments, dict):
-        for key in ("command", "cmd", "input", "query", "path"):
+        for key in ("command", "cmd", "input", "query", "pattern", "path"):
             value = arguments.get(key)
             if isinstance(value, str) and value.strip():
                 return value[:TOOL_ARGS_CLIP]
@@ -106,6 +106,20 @@ def _tool_output(data: Any) -> str | None:
     return content[-TOOL_OUTPUT_CLIP:]
 
 
+def _tool_error(data: Any) -> str | None:
+    """The failure reason from a ToolExecutionComplete, when present.
+
+    On failed executions the SDK leaves ``result`` unset (it is documented
+    as "tool execution result on success") and reports the reason in
+    ``error.message`` instead, so this is the only failure text available.
+    """
+    error = getattr(data, "error", None)
+    message = getattr(error, "message", None)
+    if not isinstance(message, str) or not message.strip():
+        return None
+    return message[-TOOL_OUTPUT_CLIP:]
+
+
 class CopilotBackend:
     name = "copilot"
 
@@ -129,9 +143,9 @@ class CopilotBackend:
 
         usage = Usage()
         final_text: list[str] = []
-        # tool_call_id -> tool name, so completion events can name the tool
-        # (the SDK's Complete event carries only the call id).
-        tool_names: dict[str, str] = {}
+        # tool_call_id -> (tool name, displayed args), so completion events
+        # can say what ran (the SDK's Complete event carries only the call id).
+        tool_calls: dict[str, tuple[str | None, str | None]] = {}
 
         def on_event(event: Any) -> None:
             nonlocal usage
@@ -150,23 +164,27 @@ class CopilotBackend:
             elif type_name.startswith("ToolExecutionStart"):
                 tool = getattr(data, "tool_name", None) or getattr(data, "toolName", None)
                 call_id = getattr(data, "tool_call_id", None) or getattr(data, "toolCallId", None)
-                if tool and call_id:
-                    tool_names[str(call_id)] = str(tool)
+                args = _tool_args(getattr(data, "arguments", None))
+                if call_id:
+                    tool_calls[str(call_id)] = (str(tool) if tool else None, args)
                 emit(
                     EventTypes.AGENT_TOOL_START,
                     tool=tool,
                     tool_call_id=call_id,
-                    args=_tool_args(getattr(data, "arguments", None)),
+                    args=args,
                 )
             elif type_name.startswith("ToolExecutionComplete"):
                 call_id = getattr(data, "tool_call_id", None) or getattr(data, "toolCallId", None)
+                tool, args = tool_calls.get(str(call_id), (None, None))
                 emit(
                     EventTypes.AGENT_TOOL_END,
                     tool_call_id=call_id,
-                    tool=tool_names.get(str(call_id)),
+                    tool=tool,
+                    args=args,
                     success=getattr(data, "success", None),
                     exit_code=_tool_exit_code(data),
                     output=_tool_output(data),
+                    error=_tool_error(data),
                 )
             elif type_name == "AssistantUsageData":
                 sample = Usage(

{sbxloop_worker-0.4.0 → sbxloop_worker-0.4.2}/tests/test_runner_unit.py

@@ -109,6 +109,36 @@ class TestBackendRegistry:
             backend.run_session(agent_job(), lambda *a, **k: None)  # type: ignore[arg-type,return-value]
 
 
+class TestCopilotEventHelpers:
+    """Pure helpers from the copilot backend (importable without the SDK)."""
+
+    def test_tool_args_prefers_glob_pattern(self) -> None:
+        from sbxloop_worker.backends.copilot import _tool_args
+
+        assert _tool_args({"pattern": "**/*.py"}) == "**/*.py"
+
+    def test_tool_error_reads_failure_message(self) -> None:
+        from types import SimpleNamespace
+
+        from sbxloop_worker.backends.copilot import _tool_error
+
+        # A failed ToolExecutionComplete: result is None, error carries the
+        # reason (the SDK documents `result` as success-only).
+        data = SimpleNamespace(
+            success=False,
+            result=None,
+            error=SimpleNamespace(message="permission denied", code=None),
+        )
+        assert _tool_error(data) == "permission denied"
+
+    def test_tool_error_none_when_absent(self) -> None:
+        from types import SimpleNamespace
+
+        from sbxloop_worker.backends.copilot import _tool_error
+
+        assert _tool_error(SimpleNamespace(success=True, result=None, error=None)) is None
+
+
 class TestEchoScriptEdgeCases:
     def test_script_entry_must_be_object(
         self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch

sbxloop_worker-0.4.0/src/sbxloop_worker/__init__.py

@@ -1,10 +0,0 @@
-"""sbxloop-worker — the in-sandbox runtime for sbxloop.
-
-Runs inside a Docker Sandbox microVM. Hosts the shared host/worker protocol
-models, the agent backends (GitHub Copilot SDK), and the job runner invoked
-via ``python -m sbxloop_worker``.
-"""
-
-__version__ = "0.4.0"
-
-__all__ = ["__version__"]