agentixx 0.2.2__tar.gz → 0.2.3__tar.gz

{agentixx-0.2.2 → agentixx-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentixx
-Version: 0.2.2
+Version: 0.2.3
 Summary: Sandboxed rollouts you call like typed Python (import as `agentix`)
 Project-URL: Homepage, https://github.com/Agentiix/Agentix
 Author: Agentiix

{agentixx-0.2.2 → agentixx-0.2.3}/agentix/__init__.py

@@ -24,7 +24,7 @@ from agentix.runtime.client import RemoteCallError, RuntimeClient
 from agentix.runtime.client._sio_facade import AsyncClientNamespace
 from agentix.sio import Namespace, RemoteSioError, register_namespace
 
-__version__ = "0.2.2"
+__version__ = "0.2.3"
 
 __all__ = [
     "AsyncClientNamespace",

{agentixx-0.2.2 → agentixx-0.2.3}/agentix/cli/build.py

@@ -87,13 +87,23 @@ def _stage_builder(dest: Path) -> None:
         (dest / fname).write_bytes(src.read_bytes())
 
 
-def _discover_plugin_nix(stage_plugin_dir: Path) -> list[str]:
-    """Find every `agentix.<short>/default.nix` shipped by installed wheels.
-
-    Returns the list of nix-relative paths (one per plugin) ready to drop
-    into the generated wrapper flake. Each plugin's default.nix is copied
-    into `stage_plugin_dir/<short>.nix` so the flake context is self-
-    contained — Nix won't follow absolute paths outside the flake root.
+def _discover_plugin_nix(stage_plugin_dir: Path, project_src: Path) -> list[str]:
+    """Find every `default.nix` that contributes system binaries to the bundle.
+
+    Two sources, in order:
+
+    1. Plugin wheels installed under the `agentix` namespace
+       (`agentix.<short>/default.nix`). These ship via `pip install
+       agentix-<plugin>` and are how runtime extensions add their CLI
+       deps (e.g. `agentix-runtime-basic` adds `bash`).
+    2. The **user project root**'s own `default.nix`, if present —
+       lets a project pull in extra binaries (`claude`, `ffmpeg`, ...)
+       without packaging a fake plugin.
+
+    Each discovered file is copied into `stage_plugin_dir/<name>.nix`
+    so the flake context is self-contained; Nix won't follow absolute
+    paths outside the flake root. Returns the list of nix-relative
+    paths ready to drop into the generated wrapper flake.
     """
     stage_plugin_dir.mkdir(parents=True)
     nix_paths: list[str] = []
@@ -101,18 +111,27 @@ def _discover_plugin_nix(stage_plugin_dir: Path) -> list[str]:
     try:
         agentix_root = resources.files("agentix")
     except (ModuleNotFoundError, FileNotFoundError):
-        return nix_paths
+        agentix_root = None
+
+    if agentix_root is not None:
+        for entry in agentix_root.iterdir():
+            if not entry.is_dir():
+                continue
+            nix_file = entry / "default.nix"
+            if not nix_file.is_file():
+                continue
+            short = entry.name
+            target = stage_plugin_dir / f"{short}.nix"
+            target.write_bytes(nix_file.read_bytes())
+            nix_paths.append(f"./plugins/{short}.nix")
+
+    # Project root default.nix, when present.
+    project_nix = project_src / "default.nix"
+    if project_nix.is_file():
+        target = stage_plugin_dir / "project.nix"
+        target.write_bytes(project_nix.read_bytes())
+        nix_paths.append("./plugins/project.nix")
 
-    for entry in agentix_root.iterdir():
-        if not entry.is_dir():
-            continue
-        nix_file = entry / "default.nix"
-        if not nix_file.is_file():
-            continue
-        short = entry.name
-        target = stage_plugin_dir / f"{short}.nix"
-        target.write_bytes(nix_file.read_bytes())
-        nix_paths.append(f"./plugins/{short}.nix")
     return nix_paths
 
 
@@ -274,7 +293,7 @@ def main(argv: Sequence[str] | None = None) -> int:
     def _stage(stage: Path) -> None:
         _stage_builder(stage / "_builder")
         _stage_project(src, stage / "project")
-        plugin_paths = _discover_plugin_nix(stage / "plugins")
+        plugin_paths = _discover_plugin_nix(stage / "plugins", src)
         wrapper = _render_wrapper(
             name=name,
             tag=tag,

{agentixx-0.2.2 → agentixx-0.2.3}/agentix/nix/wrapper.nix.tmpl

@@ -6,7 +6,13 @@
   outputs = { self, agentix }:
     let
       system = "@SYSTEM@";
-      pkgs = agentix.inputs.nixpkgs.legacyPackages.${system};
+      # Re-import nixpkgs with `config.allowUnfree = true` so plugin
+      # `default.nix` files can pull unfree binaries (e.g. claude CLI).
+      # Plugins that don't need unfree packages are unaffected.
+      pkgs = import agentix.inputs.nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+      };
     in {
       packages.${system}.bundle = agentix.lib.mkBundle {
         inherit pkgs;

{agentixx-0.2.2 → agentixx-0.2.3}/agentix/runtime/server/worker/client.py

@@ -26,6 +26,11 @@ logger = logging.getLogger("agentix.runtime.server.worker.client")
 
 _WORKER_START_TIMEOUT = 15.0
 _DEFAULT_WORKER_PATH = "/usr/local/bin:/usr/bin:/bin"
+# Plugin `default.nix` derivations are symlink-joined into this path
+# inside the bundle image (see `agentix/nix/builder.nix`). Worker code
+# (`subprocess.run("claude", ...)`, `c.remote(cc.run, ...)`, ...) must
+# be able to find those binaries by bare name.
+_RUNTIME_BIN_PATH = "/nix/runtime/bin"
 _STRIPPED_ENV = {
     "LD_LIBRARY_PATH",
     "LD_PRELOAD",
@@ -43,7 +48,17 @@ def _clean_worker_env(runtime_bin_dir: Path | None) -> dict[str, str]:
         for key, value in os.environ.items()
         if key not in _STRIPPED_ENV and not any(key.startswith(prefix) for prefix in _STRIPPED_ENV_PREFIXES)
     }
-    env["PATH"] = f"{runtime_bin_dir}:{_DEFAULT_WORKER_PATH}" if runtime_bin_dir is not None else _DEFAULT_WORKER_PATH
+    # Build PATH from: the venv's bin (`runtime_bin_dir`), the bundle's
+    # symlink-join (`/nix/runtime/bin`), then a minimal system fallback.
+    # Inside the bundle image the first two are siblings and both must
+    # be searchable; outside the bundle, only the first one exists.
+    parts: list[str] = []
+    if runtime_bin_dir is not None:
+        parts.append(str(runtime_bin_dir))
+    if _RUNTIME_BIN_PATH not in parts:
+        parts.append(_RUNTIME_BIN_PATH)
+    parts.append(_DEFAULT_WORKER_PATH)
+    env["PATH"] = ":".join(parts)
     return env
 
 

{agentixx-0.2.2 → agentixx-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentixx"
-version = "0.2.2"
+version = "0.2.3"
 description = "Sandboxed rollouts you call like typed Python (import as `agentix`)"
 readme = "README.md"
 requires-python = ">=3.11"