nonoka-cli 0.2.13__tar.gz → 0.2.14__tar.gz

{nonoka_cli-0.2.13 → nonoka_cli-0.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonoka-cli
-Version: 0.2.13
+Version: 0.2.14
 Summary: OpenCode backend for the Nonoka Agent framework
 License: MIT
 License-File: LICENSE
@@ -43,7 +43,7 @@ tool execution and human-in-the-loop (HITL) approval using its native tools.
 The easiest way to get nonoka + OpenCode is the one-line installer:
 
 ```bash
-curl -fsSL https://nonoka.dev/install.sh | bash
+curl -fsSL https://raw.githubusercontent.com/fyerfyer/Nonoka-cli/main/install.sh | bash
 ```
 
 The installer will:
@@ -89,8 +89,9 @@ The legacy `nonoka-cli` executable remains available for compatibility.
 `nonoka-cli` automatically loads `~/.config/nonoka/.env` and `./.env` on startup,
 so you don't need to `export` every time if you save the key in `.env`.
 
-> To use `uv` instead of `pip`, or to run non-interactively, pass flags:
-> `curl -fsSL https://nonoka.dev/install.sh | bash -s -- --uv --yes`.
+> The installer uses `uv` by default when it is available and falls back to
+> the isolated environment's pip. Pass `--pip` to explicitly select pip, or
+> `--yes` to run non-interactively.
 
 For a non-interactive custom location, use flags (environment variables with
 the same names are also supported):
@@ -163,7 +164,7 @@ Example output:
 
 ```
 nonoka-cli doctor
-✓ nonoka-cli 0.2.13
+✓ nonoka-cli 0.2.14
 ✓ Python 3.11
 ✓ opencode 1.18.2
 ✓ provider nonoka-opencode-provider@0.2.17

{nonoka_cli-0.2.13 → nonoka_cli-0.2.14}/README.md

@@ -14,7 +14,7 @@ tool execution and human-in-the-loop (HITL) approval using its native tools.
 The easiest way to get nonoka + OpenCode is the one-line installer:
 
 ```bash
-curl -fsSL https://nonoka.dev/install.sh | bash
+curl -fsSL https://raw.githubusercontent.com/fyerfyer/Nonoka-cli/main/install.sh | bash
 ```
 
 The installer will:
@@ -60,8 +60,9 @@ The legacy `nonoka-cli` executable remains available for compatibility.
 `nonoka-cli` automatically loads `~/.config/nonoka/.env` and `./.env` on startup,
 so you don't need to `export` every time if you save the key in `.env`.
 
-> To use `uv` instead of `pip`, or to run non-interactively, pass flags:
-> `curl -fsSL https://nonoka.dev/install.sh | bash -s -- --uv --yes`.
+> The installer uses `uv` by default when it is available and falls back to
+> the isolated environment's pip. Pass `--pip` to explicitly select pip, or
+> `--yes` to run non-interactively.
 
 For a non-interactive custom location, use flags (environment variables with
 the same names are also supported):
@@ -134,7 +135,7 @@ Example output:
 
 ```
 nonoka-cli doctor
-✓ nonoka-cli 0.2.13
+✓ nonoka-cli 0.2.14
 ✓ Python 3.11
 ✓ opencode 1.18.2
 ✓ provider nonoka-opencode-provider@0.2.17

{nonoka_cli-0.2.13 → nonoka_cli-0.2.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nonoka-cli"
-version = "0.2.13"
+version = "0.2.14"
 description = "OpenCode backend for the Nonoka Agent framework"
 readme = "README.md"
 license = { text = "MIT" }

{nonoka_cli-0.2.13 → nonoka_cli-0.2.14}/src/nonoka_cli/__init__.py

@@ -2,4 +2,4 @@
 
 from __future__ import annotations
 
-__version__ = "0.2.13"
+__version__ = "0.2.14"

{nonoka_cli-0.2.13 → nonoka_cli-0.2.14}/tests/unit/test_install_script.py

@@ -20,7 +20,18 @@ def _fake_environment(tmp_path: Path) -> tuple[dict[str, str], Path]:
   fake_bin = tmp_path / "bin"
   fake_bin.mkdir()
   log = tmp_path / "calls.log"
-  _command(fake_bin / "python3", "printf '3.13\\n'\n")
+  _command(
+    fake_bin / "python3",
+    'if [ "${1:-}" = "-c" ]; then\n'
+    '  printf "3.13\\n"\n'
+    'elif [ "${1:-}" = "-m" ] && [ "${2:-}" = "venv" ]; then\n'
+    '  mkdir -p "$3/bin"\n'
+    '  cp "$0" "$3/bin/python"\n'
+    '  cp "$(dirname "$0")/nonoka" "$3/bin/nonoka"\n'
+    'elif [ "${1:-}" = "-m" ] && [ "${2:-}" = "pip" ]; then\n'
+    '  printf "python-pip:%s\\n" "${*:3}" >> "$NONOKA_TEST_LOG"\n'
+    'fi\n',
+  )
   _command(
     fake_bin / "uv",
     'printf "uv:%s\\n" "$*" >> "$NONOKA_TEST_LOG"\n'
@@ -87,7 +98,7 @@ def test_install_dir_flags_expand_home_and_drive_all_commands(tmp_path: Path) ->
   home = Path(env["HOME"])
   calls = log.read_text()
   assert f"uv:venv {home}/chosen-install/.venv --python python3" in calls
-  assert "uv:pip install --upgrade nonoka-cli" in calls
+  assert f"uv:pip install --python {home}/chosen-install/.venv/bin/python --upgrade nonoka-cli" in calls
   assert f"nonoka:config init --yes --config {home}/chosen-config/config.yaml" in calls
   assert f"nonoka:init --config {home}/chosen-config/config.yaml" in calls
   assert f"npm prefix: {home}/chosen-npm" in result.stdout
@@ -112,6 +123,49 @@ def test_environment_variables_select_noninteractive_layout(tmp_path: Path) -> N
   assert f"npm prefix: {tmp_path}/env-npm" in result.stdout
 
 
+def test_uv_is_the_default_and_targets_the_created_environment(tmp_path: Path) -> None:
+  env, log = _fake_environment(tmp_path)
+  install_dir = tmp_path / "default-uv"
+
+  result = _run(
+    tmp_path,
+    "--yes",
+    "--no-opencode",
+    "--install-dir",
+    str(install_dir),
+    env=env,
+  )
+
+  assert result.returncode == 0, result.stderr
+  calls = log.read_text()
+  assert f"uv:venv {install_dir}/.venv --python python3" in calls
+  assert (
+    f"uv:pip install --python {install_dir}/.venv/bin/python --upgrade nonoka-cli"
+    in calls
+  )
+  assert "python-pip:" not in calls
+
+
+def test_pip_mode_is_pinned_to_the_created_environment(tmp_path: Path) -> None:
+  env, log = _fake_environment(tmp_path)
+  install_dir = tmp_path / "explicit-pip"
+
+  result = _run(
+    tmp_path,
+    "--yes",
+    "--pip",
+    "--no-opencode",
+    "--install-dir",
+    str(install_dir),
+    env=env,
+  )
+
+  assert result.returncode == 0, result.stderr
+  calls = log.read_text()
+  assert "python-pip:install --upgrade nonoka-cli" in calls
+  assert f"uv:venv {install_dir}/.venv --python python3" not in calls
+
+
 def test_interactive_prompts_explain_each_directory(tmp_path: Path) -> None:
   env, log = _fake_environment(tmp_path)
   selected_install = tmp_path / "interactive-install"