ouroboros-ai 0.40.2.dev22__tar.gz → 0.40.2.dev23__tar.gz

{ouroboros_ai-0.40.2.dev22 → ouroboros_ai-0.40.2.dev23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ouroboros-ai
-Version: 0.40.2.dev22
+Version: 0.40.2.dev23
 Summary: Specification-first workflow engine for AI coding agents. Works with Claude Code and Codex CLI.
 Author-email: Q00 <jqyu.lee@gmail.com>
 License-File: LICENSE

{ouroboros_ai-0.40.2.dev22 → ouroboros_ai-0.40.2.dev23}/scripts/install.sh

@@ -488,21 +488,44 @@ else
   fi
 fi
 
-# Ensure ouroboros binary is in PATH (uv tool install may add to ~/.local/bin)
-if ! command -v ouroboros &>/dev/null; then
-  for p in "$HOME/.local/bin" "$HOME/.cargo/bin" "$HOME/bin"; do
-    if [ -x "$p/ouroboros" ]; then
-      export PATH="$p:$PATH"
-      break
+# Ensure setup runs the freshly-installed uv tool binary rather than a stale
+# command already on PATH. uv can install into UV_TOOL_BIN_DIR or its configured
+# tool bin directory without updating the current shell's PATH, so remember the
+# fresh executable and invoke that exact path below. For pipx/pip installs,
+# preserve the existing PATH command unless no ouroboros command is visible.
+OUROBOROS_BIN=""
+_prepend_path_if_ouroboros() {
+  local candidate="$1"
+  if [ -n "$candidate" ] && [ -x "$candidate/ouroboros" ]; then
+    export PATH="$candidate:$PATH"
+    if [ -z "$OUROBOROS_BIN" ]; then
+      OUROBOROS_BIN="$candidate/ouroboros"
     fi
+    return 0
+  fi
+  return 1
+}
+
+if [ "$INSTALL_METHOD" = "uv" ]; then
+  _prepend_path_if_ouroboros "${UV_TOOL_BIN_DIR:-}" || true
+  if command -v uv &>/dev/null; then
+    UV_TOOL_BIN="$(uv tool dir --bin 2>/dev/null || true)"
+    _prepend_path_if_ouroboros "$UV_TOOL_BIN" || true
+  fi
+fi
+
+if [ -z "$OUROBOROS_BIN" ] && ! command -v ouroboros &>/dev/null; then
+  for p in "$HOME/.local/bin" "$HOME/.cargo/bin" "$HOME/bin"; do
+    _prepend_path_if_ouroboros "$p" || true
   done
 fi
 
 # 4. Setup (ouroboros CLI configures runtime-specific integration)
 _step "4/4  Wiring local integrations" "Creates config and runtime-specific files when a backend was selected."
-if [ -n "$RUNTIME" ] && command -v ouroboros &>/dev/null; then
-  _info "Running: ouroboros setup --runtime $RUNTIME --non-interactive"
-  ouroboros setup --runtime "$RUNTIME" --non-interactive || true
+if [ -n "$RUNTIME" ] && { [ -n "$OUROBOROS_BIN" ] || command -v ouroboros &>/dev/null; }; then
+  OUROBOROS_SETUP_CMD="${OUROBOROS_BIN:-ouroboros}"
+  _info "Running: $OUROBOROS_SETUP_CMD setup --runtime $RUNTIME --non-interactive"
+  "$OUROBOROS_SETUP_CMD" setup --runtime "$RUNTIME" --non-interactive || true
 elif [ -n "$RUNTIME" ]; then
   _warn "ouroboros command is not on PATH yet; run setup after your shell sees the installed binary."
 else

{ouroboros_ai-0.40.2.dev22 → ouroboros_ai-0.40.2.dev23}/src/ouroboros/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.40.2.dev22'
-__version_tuple__ = version_tuple = (0, 40, 2, 'dev22')
+__version__ = version = '0.40.2.dev23'
+__version_tuple__ = version_tuple = (0, 40, 2, 'dev23')
 
 __commit_id__ = commit_id = None

{ouroboros_ai-0.40.2.dev22 → ouroboros_ai-0.40.2.dev23}/tests/unit/scripts/test_install_runtime_selection.py

@@ -18,25 +18,41 @@ def _write_executable(path: Path, content: str) -> None:
 def _run_installer(
     tmp_path: Path,
     *,
+    include_uv: bool = True,
     local_repo: bool = True,
     env: dict[str, str] | None = None,
     fake_commands: dict[str, str] | None = None,
 ) -> subprocess.CompletedProcess[str]:
     bin_dir = tmp_path / "bin"
     bin_dir.mkdir()
+    tool_bin_dir = tmp_path / "uv-tool-bin"
+    tool_bin_dir.mkdir()
     calls = tmp_path / "calls.log"
 
-    _write_executable(
-        bin_dir / "uv",
-        f"""#!/bin/sh
+    if include_uv:
+        _write_executable(
+            bin_dir / "uv",
+            f"""#!/bin/sh
 if [ "$1" = "--version" ]; then
   echo "uv 0.0.0-test"
   exit 0
 fi
+if [ "$1" = "tool" ] && [ "$2" = "dir" ] && [ "$3" = "--bin" ]; then
+  echo "{tool_bin_dir!s}"
+  exit 0
+fi
+if [ "$1" = "tool" ] && [ "$2" = "install" ]; then
+  cat > "{tool_bin_dir!s}/ouroboros" <<'SH'
+#!/bin/sh
+printf 'ouroboros %s\\n' "$*" >> "{calls!s}"
+exit 0
+SH
+  chmod 755 "{tool_bin_dir!s}/ouroboros"
+fi
 printf 'uv %s\\n' "$*" >> {calls!s}
 exit 0
 """,
-    )
+        )
     _write_executable(
         bin_dir / "ouroboros",
         f"""#!/bin/sh
@@ -136,6 +152,74 @@ def test_explicit_pi_installs_base_and_runs_pi_setup(tmp_path: Path) -> None:
     ]
 
 
+def test_uv_install_setup_prefers_fresh_tool_bin_over_stale_path_command(tmp_path: Path) -> None:
+    result = _run_installer(
+        tmp_path,
+        env={"OUROBOROS_INSTALL_RUNTIME": "pi"},
+        fake_commands={
+            "pi": "#!/bin/sh\nexit 0\n",
+            "ouroboros": f"#!/bin/sh\nprintf 'stale-ouroboros %s\\n' \"$*\" >> {tmp_path / 'calls.log'}\nexit 0\n",
+        },
+    )
+
+    assert result.returncode == 0, result.stderr
+    calls = (tmp_path / "calls.log").read_text(encoding="utf-8").splitlines()
+    assert "ouroboros setup --runtime pi --non-interactive" in calls
+    assert not any(call.startswith("stale-ouroboros setup") for call in calls)
+
+
+def test_uv_install_setup_prefers_fresh_tool_bin_over_stale_home_local_bin(
+    tmp_path: Path,
+) -> None:
+    home_local_bin = tmp_path / "home" / ".local" / "bin"
+    home_local_bin.mkdir(parents=True)
+    _write_executable(
+        home_local_bin / "ouroboros",
+        f"#!/bin/sh\nprintf 'stale-local-ouroboros %s\\n' \"$*\" >> {tmp_path / 'calls.log'}\nexit 0\n",
+    )
+
+    result = _run_installer(
+        tmp_path,
+        env={"OUROBOROS_INSTALL_RUNTIME": "pi"},
+        fake_commands={"pi": "#!/bin/sh\nexit 0\n"},
+    )
+
+    assert result.returncode == 0, result.stderr
+    calls = (tmp_path / "calls.log").read_text(encoding="utf-8").splitlines()
+    assert "ouroboros setup --runtime pi --non-interactive" in calls
+    assert not any(call.startswith("stale-local-ouroboros setup") for call in calls)
+
+
+def test_pipx_install_setup_prefers_existing_path_command_over_stale_home_local_bin(
+    tmp_path: Path,
+) -> None:
+    home_local_bin = tmp_path / "home" / ".local" / "bin"
+    home_local_bin.mkdir(parents=True)
+    _write_executable(
+        home_local_bin / "ouroboros",
+        f"#!/bin/sh\nprintf 'stale-home-ouroboros %s\\n' \"$*\" >> {tmp_path / 'calls.log'}\nexit 0\n",
+    )
+
+    python = '#!/bin/sh\nif [ "$1" = "-c" ]; then echo 3.12; exit 0; fi\necho \'Python 3.12.0\'\n'
+    result = _run_installer(
+        tmp_path,
+        include_uv=False,
+        env={"OUROBOROS_INSTALL_RUNTIME": "pi"},
+        fake_commands={
+            "pipx": '#!/bin/sh\nif [ "$1" = "--version" ]; then echo \'pipx 0.0.0-test\'; exit 0; fi\nprintf \'pipx %s\\n\' "$*" >> __CALLS__\nexit 0\n'.replace(
+                "__CALLS__", str(tmp_path / "calls.log")
+            ),
+            "python3.12": python,
+            "pi": "#!/bin/sh\nexit 0\n",
+        },
+    )
+
+    assert result.returncode == 0, result.stderr
+    calls = (tmp_path / "calls.log").read_text(encoding="utf-8").splitlines()
+    assert "ouroboros setup --runtime pi --non-interactive" in calls
+    assert not any(call.startswith("stale-home-ouroboros setup") for call in calls)
+
+
 def test_detects_pi_as_single_runtime_and_runs_pi_setup(tmp_path: Path) -> None:
     result = _run_installer(
         tmp_path,