swytchcode-runtime 1.1.4__tar.gz → 1.1.5__tar.gz

{swytchcode_runtime-1.1.4/swytchcode_runtime.egg-info → swytchcode_runtime-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swytchcode-runtime
-Version: 1.1.4
+Version: 1.1.5
 Summary: Thin runtime wrapper around the Swytchcode CLI
 Author: Swytchcode
 License: MIT

{swytchcode_runtime-1.1.4 → swytchcode_runtime-1.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "swytchcode-runtime"
-version = "1.1.4"
+version = "1.1.5"
 description = "Thin runtime wrapper around the Swytchcode CLI"
 readme = "README.md"
 license = { text = "MIT" }

{swytchcode_runtime-1.1.4 → swytchcode_runtime-1.1.5}/swytchcode_runtime/cli.py

@@ -18,14 +18,14 @@ def run_cli(
     env: dict | None = None,
     timeout: float | None = 60,
 ) -> Any:
-    cmd = [_resolve_bin(), *args]
-    if "--json" not in args:
-        cmd.append("--json")
-
     run_env = os.environ.copy()
     if env:
         run_env.update(env)
 
+    cmd = [_resolve_bin(run_env), *args]
+    if "--json" not in args:
+        cmd.append("--json")
+
     try:
         r = subprocess.run(
             cmd,

{swytchcode_runtime-1.1.4 → swytchcode_runtime-1.1.5}/swytchcode_runtime/exec.py

@@ -10,7 +10,7 @@ from typing import Any
 from .errors import SwytchcodeError
 
 
-def _resolve_bin() -> str:
+def _resolve_bin(env: dict[str, str]) -> str:
     """
     Resolve the swytchcode binary path using the following order:
 
@@ -19,25 +19,26 @@ def _resolve_bin() -> str:
     3. Common install-path fallbacks for when PATH is not configured.
     """
     # 1. Explicit override
-    explicit = os.environ.get("SWYTCHCODE_BIN", "").strip()
+    explicit = env.get("SWYTCHCODE_BIN", "").strip()
     if explicit:
         return explicit
 
     # 2. PATH lookup
-    found = shutil.which("swytchcode")
+    found = shutil.which("swytchcode", path=env.get("PATH"))
     if found:
         return found
 
     # 3. Common install-path fallbacks
     if sys.platform == "win32":
-        local_app_data = os.environ.get("LOCALAPPDATA", "")
+        local_app_data = env.get("LOCALAPPDATA", "")
         candidates = [
             os.path.join(
                 local_app_data, "Programs", "swytchcode", "bin", "swytchcode.exe"
             ),
         ]
     else:
-        home = os.path.expanduser("~")
+        # Fallback to os.environ for HOME if not explicitly in env
+        home = env.get("HOME") or os.path.expanduser("~")
         candidates = [
             os.path.join(home, ".local", "bin", "swytchcode"),
             "/usr/local/bin/swytchcode",
@@ -112,18 +113,18 @@ def exec_(
     if not canonical_id:
         raise SwytchcodeError("canonical_id must be a non-empty string")
 
+    run_env = os.environ.copy()
+    if env:
+        run_env.update(env)
+
     flag = "--raw" if raw else "--json"
-    bin_path = _resolve_bin()
+    bin_path = _resolve_bin(run_env)
     cmd = [bin_path, "exec", canonical_id, flag]
     if dry_run:
         cmd.append("--dry-run")
     if allow_raw:
         cmd.append("--allow-raw")
 
-    run_env = os.environ.copy()
-    if env:
-        run_env.update(env)
-
     stdin_payload: bytes | None = None
     if input is not None:
         stdin_payload = json.dumps(input).encode("utf-8")

{swytchcode_runtime-1.1.4 → swytchcode_runtime-1.1.5/swytchcode_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swytchcode-runtime
-Version: 1.1.4
+Version: 1.1.5
 Summary: Thin runtime wrapper around the Swytchcode CLI
 Author: Swytchcode
 License: MIT