diff --git a/Cargo.lock b/Cargo.lock
index fc5da8e685d67..e67fdfbf0dd0b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4875,12 +4875,14 @@ dependencies = [
  "fs2",
  "junction",
  "path-slash",
+ "rustix",
  "schemars",
  "serde",
  "tempfile",
  "tokio",
  "tracing",
  "urlencoding",
+ "winsafe 0.0.22",
 ]
 
 [[package]]
@@ -5066,7 +5068,6 @@ dependencies = [
  "reqwest",
  "reqwest-middleware",
  "rmp-serde",
- "rustix",
  "same-file",
  "schemars",
  "serde",
@@ -5091,7 +5092,6 @@ dependencies = [
  "windows-registry",
  "windows-result 0.2.0",
  "windows-sys 0.59.0",
- "winsafe 0.0.22",
 ]
 
 [[package]]
diff --git a/crates/uv-fs/Cargo.toml b/crates/uv-fs/Cargo.toml
index c7aa1cb1a20f3..88f53659bfa00 100644
--- a/crates/uv-fs/Cargo.toml
+++ b/crates/uv-fs/Cargo.toml
@@ -29,6 +29,12 @@ tempfile = { workspace = true }
 tracing = { workspace = true }
 urlencoding = { workspace = true }
 
+[target.'cfg(target_os = "windows")'.dependencies]
+winsafe = { workspace = true }
+
+[target.'cfg(any(unix, target_os = "wasi", target_os = "redox"))'.dependencies]
+rustix = { workspace = true }
+
 [target.'cfg(windows)'.dependencies]
 junction = { workspace = true }
 
diff --git a/crates/uv-fs/src/lib.rs b/crates/uv-fs/src/lib.rs
index 5c69e5a962b3f..658b6127ff1dc 100644
--- a/crates/uv-fs/src/lib.rs
+++ b/crates/uv-fs/src/lib.rs
@@ -12,6 +12,7 @@ pub use crate::path::*;
 
 pub mod cachedir;
 mod path;
+pub mod which;
 
 /// Reads data from the path and requires that it be valid UTF-8 or UTF-16.
 ///
diff --git a/crates/uv-python/src/which.rs b/crates/uv-fs/src/which.rs
similarity index 100%
rename from crates/uv-python/src/which.rs
rename to crates/uv-fs/src/which.rs
diff --git a/crates/uv-python/Cargo.toml b/crates/uv-python/Cargo.toml
index 9bd7363ecc199..87d714fc76db4 100644
--- a/crates/uv-python/Cargo.toml
+++ b/crates/uv-python/Cargo.toml
@@ -53,12 +53,8 @@ tracing = { workspace = true }
 url = { workspace = true }
 which = { workspace = true }
 
-[target.'cfg(any(unix, target_os = "wasi", target_os = "redox"))'.dependencies]
-rustix = { workspace = true }
-
 [target.'cfg(target_os = "windows")'.dependencies]
 windows-sys = { workspace = true }
-winsafe = { workspace = true }
 windows-registry = { workspace = true }
 windows-result = { workspace = true }
 
diff --git a/crates/uv-python/src/discovery.rs b/crates/uv-python/src/discovery.rs
index a0ff76405ccdc..68938eeeda8bb 100644
--- a/crates/uv-python/src/discovery.rs
+++ b/crates/uv-python/src/discovery.rs
@@ -11,6 +11,7 @@ use which::{which, which_all};
 
 use pep440_rs::{Prerelease, Version, VersionSpecifier, VersionSpecifiers};
 use uv_cache::Cache;
+use uv_fs::which::is_executable;
 use uv_fs::Simplified;
 use uv_warnings::warn_user_once;
 
@@ -27,7 +28,6 @@ use crate::virtualenv::{
     conda_prefix_from_env, virtualenv_from_env, virtualenv_from_working_dir,
     virtualenv_python_executable,
 };
-use crate::which::is_executable;
 use crate::{Interpreter, PythonVersion};
 
 /// A request to find a Python installation.
diff --git a/crates/uv-python/src/lib.rs b/crates/uv-python/src/lib.rs
index b13ba983c809d..0d64bc6ce37b5 100644
--- a/crates/uv-python/src/lib.rs
+++ b/crates/uv-python/src/lib.rs
@@ -37,7 +37,6 @@ mod python_version;
 mod target;
 mod version_files;
 mod virtualenv;
-pub mod which;
 
 #[cfg(not(test))]
 pub(crate) fn current_dir() -> Result<std::path::PathBuf, std::io::Error> {
diff --git a/crates/uv/src/commands/project/run.rs b/crates/uv/src/commands/project/run.rs
index b0e4c269b684b..5747ac8fc06a5 100644
--- a/crates/uv/src/commands/project/run.rs
+++ b/crates/uv/src/commands/project/run.rs
@@ -18,10 +18,11 @@ use uv_configuration::{
     Concurrency, DevMode, EditableMode, ExtrasSpecification, InstallOptions, SourceStrategy,
 };
 use uv_distribution::LoweredRequirement;
+use uv_fs::which::is_executable;
 use uv_fs::{PythonExt, Simplified};
 use uv_installer::{SatisfiesResult, SitePackages};
 use uv_normalize::PackageName;
-use uv_python::which::is_executable;
+
 use uv_python::{
     EnvironmentPreference, Interpreter, PythonDownloads, PythonEnvironment, PythonInstallation,
     PythonPreference, PythonRequest, PythonVersionFile, VersionRequest,
@@ -723,10 +724,11 @@ pub(crate) async fn run(
     if let RunCommand::Empty = command {
         writeln!(
             printer.stdout(),
-            "Provide a command or script to invoke with `uv run <command>` or `uv run script.py`.\n"
+            "Provide a command or script to invoke with `uv run <command>` or `uv run <script>.py`.\n"
         )?;
 
-        let mut scripts = interpreter
+        #[allow(clippy::map_identity)]
+        let mut commands = interpreter
             .scripts()
             .read_dir()
             .ok()
@@ -735,7 +737,10 @@ pub(crate) async fn run(
             .filter_map(|entry| match entry {
                 Ok(entry) => Some(entry),
                 Err(err) => {
-                    debug!("Failed to read entry: {}", err);
+                    // If we can't read the entry, skip it.
+                    // However, let the user know that we failed to read it.
+                    // This could be a symptom of a more serious problem.
+                    warn!("Failed to read entry: {}", err);
                     None
                 }
             })
@@ -746,25 +751,38 @@ pub(crate) async fn run(
             })
             .map(|entry| entry.path())
             .filter(|path| is_executable(path))
+            .map(|path| {
+                if cfg!(windows) {
+                    // remove the extensions
+                    path.with_extension("")
+                } else {
+                    path
+                }
+            })
             .map(|path| {
                 path.file_name()
                     .unwrap_or_default()
                     .to_string_lossy()
                     .to_string()
             })
+            .filter(|command| {
+                !command.starts_with("activate") || !command.starts_with("deactivate")
+            })
             .collect_vec();
-        scripts.sort();
+        commands.sort();
 
-        if !scripts.is_empty() {
-            writeln!(printer.stdout(), "The following scripts are available:\n")?;
-            writeln!(printer.stdout(), "{}", scripts.join("\n"))?;
+        if !commands.is_empty() {
+            writeln!(printer.stdout(), "The following commands are available:")?;
+            for command in commands {
+                writeln!(printer.stdout(), "- {command}")?;
+            }
         }
         writeln!(
             printer.stdout(),
             "\nSee `uv run --help` for more information."
         )?;
 
-        return Ok(ExitStatus::Success);
+        return Ok(ExitStatus::Failure);
     };
 
     debug!("Running `{command}`");
diff --git a/crates/uv/tests/run.rs b/crates/uv/tests/run.rs
index f30c536cfe4d0..04cc9c159a4d5 100644
--- a/crates/uv/tests/run.rs
+++ b/crates/uv/tests/run.rs
@@ -220,16 +220,15 @@ fn run_no_args() -> Result<()> {
     // Run without specifying any argunments.
     #[cfg(not(windows))]
     uv_snapshot!(context.filters(), context.run(), @r###"
-    success: true
-    exit_code: 0
+    success: false
+    exit_code: 1
     ----- stdout -----
-    Provide a command or script to invoke with `uv run <command>` or `uv run script.py`.
-
-    The following scripts are available:
+    Provide a command or script to invoke with `uv run <command>` or `uv run <script>.py`.
 
-    python
-    python3
-    python3.12
+    The following commands are available:
+    - python
+    - python3
+    - python3.12
 
     See `uv run --help` for more information.
 
@@ -245,20 +244,12 @@ fn run_no_args() -> Result<()> {
     success: true
     exit_code: 0
     ----- stdout -----
-    Provide a command or script to invoke with `uv run <command>` or `uv run script.py`.
-
-    The following scripts are available:
+    Provide a command or script to invoke with `uv run <command>` or `uv run <script>.py`.
 
-    activate.bat
-    activate.csh
-    activate.fish
-    activate.nu
-    activate.ps1
-    activate_this.py
-    deactivate.bat
-    pydoc.bat
-    python.exe
-    pythonw.exe
+    The following commands are available:
+    - pydoc
+    - python
+    - pythonw
 
     See `uv run --help` for more information.