usecli 0.1.66__tar.gz → 0.1.68__tar.gz

{usecli-0.1.66 → usecli-0.1.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usecli
-Version: 0.1.66
+Version: 0.1.68
 Summary: A powerful Python CLI framework for building beautiful, developer-friendly command-line tools.
 Author: Edward Boswell
 Author-email: Edward Boswell <thememium@gmail.com>

{usecli-0.1.66 → usecli-0.1.68}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usecli"
-version = "0.1.66"
+version = "0.1.68"
 description = "A powerful Python CLI framework for building beautiful, developer-friendly command-line tools."
 readme = "README.md"
 authors = [{ name = "Edward Boswell", email = "thememium@gmail.com" }]

{usecli-0.1.66 → usecli-0.1.68}/src/usecli/__init__.py

@@ -165,25 +165,29 @@ def _ensure_cli_initialized() -> None:
             )
 
         def invoke(self, ctx):
-            from click.exceptions import BadParameter, ClickException, Exit, UsageError
+            from click.exceptions import Exit
+
+            _TyperBadParameter = globals()["_TyperBadParameter"]
+            _TyperUsageError = globals()["_TyperUsageError"]
+            _TyperClickException = globals()["_TyperClickException"]
 
             try:
                 return super().invoke(ctx)
             except Exit:
                 sys.exit(0)
-            except BadParameter as e:
+            except _TyperBadParameter as e:
                 from usecli.cli.core.exceptions import UsecliBadParameter
 
                 styled_error = UsecliBadParameter(e.message, ctx=e.ctx, param=e.param)
                 styled_error.show()
                 sys.exit(styled_error.exit_code)
-            except UsageError as e:
+            except _TyperUsageError as e:
                 from usecli.cli.core.exceptions import UsecliUsageError
 
                 styled_error = UsecliUsageError(e.message, ctx=e.ctx)
                 styled_error.show()
                 sys.exit(styled_error.exit_code)
-            except ClickException as e:
+            except _TyperClickException as e:
                 if hasattr(e, "show"):
                     e.show()
                 sys.exit(e.exit_code if hasattr(e, "exit_code") else 1)
@@ -419,6 +423,12 @@ def main() -> None:
     _ensure_cli_initialized()
     _resolve_help()
 
+    # Use typer's exception classes if available (they're subclasses of click's)
+    # typer raises its own exceptions which may not match click's exactly
+    _TyperBadParameter = globals().get("_TyperBadParameter", BadParameter)
+    _TyperUsageError = globals().get("_TyperUsageError", UsageError)
+    _TyperClickException = globals().get("_TyperClickException", ClickException)
+
     from usecli.shared.config.manager import get_config
 
     config = get_config()
@@ -439,22 +449,28 @@ def main() -> None:
         _get_app()()
     except Exit:
         sys.exit(0)
-    except BadParameter as e:
+    except _TyperBadParameter as e:
         from usecli.cli.core.exceptions import UsecliBadParameter
 
         styled_error = UsecliBadParameter(e.message, ctx=e.ctx, param=e.param)
         styled_error.show()
         sys.exit(styled_error.exit_code)
-    except UsageError as e:
+    except _TyperUsageError as e:
         from usecli.cli.core.exceptions import UsecliUsageError
 
         styled_error = UsecliUsageError(e.message, ctx=e.ctx)
         styled_error.show()
         sys.exit(styled_error.exit_code)
-    except ClickException as e:
+    except _TyperClickException as e:
         if hasattr(e, "show"):
             e.show()
         sys.exit(e.exit_code if hasattr(e, "exit_code") else 1)
+    except Exception as e:
+        from usecli.cli.core.exceptions import UsecliUsageError
+
+        styled_error = UsecliUsageError(str(e))
+        styled_error.show()
+        sys.exit(1)
 
 
 if __name__ == "__main__":

{usecli-0.1.66 → usecli-0.1.68}/src/usecli/shared/config/manager.py

@@ -417,13 +417,6 @@ class ConfigManager:
                 break
             current = parent
 
-        # Early exit: skip expensive lookups when searching from high-level dirs.
-        # Global tools running from HOME or / won't find project configs.
-        resolved_start = str(start_dir.resolve())
-        if resolved_start in _get_high_level_dirs():
-            _config_search_cache[cache_key] = None
-            return None
-
         # Try fast lookups before expensive rglob (perf: global tools).
         console_match = cls._find_usecli_config_for_console_script()
         if console_match:
@@ -920,34 +913,60 @@ class ConfigManager:
         - The current project IS usecli (name matches)
         - usecli appears in pyproject.toml [project.dependencies]
         - usecli appears in pyproject.toml [dependency-groups]
+        - The running console script's distribution lists usecli as a dependency
+          (fallback for globally installed tools where pyproject.toml is not
+          discoverable from CWD)
         """
-        if not self.pyproject_path.exists():
-            return False
-
-        try:
-            with open(self.pyproject_path, "rb") as f:
-                data = _get_tomllib().load(f)
-        except (_get_tomllib().TOMLDecodeError, OSError):
-            return False
-
-        project_name = data.get("project", {}).get("name", "")
-        if isinstance(project_name, str) and project_name.strip().lower() == "usecli":
-            return True
-
-        for dep in data.get("project", {}).get("dependencies", []):
-            if isinstance(dep, str) and dep.strip().lower().startswith("usecli"):
-                return True
-
-        for group_deps in data.get("dependency-groups", {}).values():
-            if not isinstance(group_deps, list):
-                continue
-            for dep in group_deps:
-                dep_str = dep if isinstance(dep, str) else dep.get("dependency", "")
-                if isinstance(dep_str, str) and dep_str.strip().lower().startswith(
-                    "usecli"
+        if self.pyproject_path.exists():
+            try:
+                with open(self.pyproject_path, "rb") as f:
+                    data = _get_tomllib().load(f)
+            except (_get_tomllib().TOMLDecodeError, OSError):
+                data = None
+
+            if data is not None:
+                project_name = data.get("project", {}).get("name", "")
+                if (
+                    isinstance(project_name, str)
+                    and project_name.strip().lower() == "usecli"
                 ):
                     return True
 
+                for dep in data.get("project", {}).get("dependencies", []):
+                    if isinstance(dep, str) and dep.strip().lower().startswith(
+                        "usecli"
+                    ):
+                        return True
+
+                for group_deps in data.get("dependency-groups", {}).values():
+                    if not isinstance(group_deps, list):
+                        continue
+                    for dep in group_deps:
+                        dep_str = (
+                            dep if isinstance(dep, str) else dep.get("dependency", "")
+                        )
+                        if isinstance(
+                            dep_str, str
+                        ) and dep_str.strip().lower().startswith("usecli"):
+                            return True
+
+        # Fallback: check the installed distribution's metadata.
+        # This handles globally installed tools (uv tool install, pipx) where
+        # the project's pyproject.toml is not discoverable from CWD.
+        command_name = os.path.basename(sys.argv[0]) if sys.argv else None
+        if command_name:
+            dist = _find_distribution_for_console_script(command_name)
+            if dist is not None:
+                dist_name = dist.metadata.get("Name", "")
+                if dist_name.lower() == "usecli":
+                    return True
+                requires = dist.requires or []
+                for req in requires:
+                    if isinstance(req, str) and req.strip().lower().startswith(
+                        "usecli"
+                    ):
+                        return True
+
         return False
 
     def reload(self) -> None:
@@ -1047,12 +1066,6 @@ def find_project_root(start_dir: Path | None = None) -> Path | None:
 
     search_root = git_root or start_dir.resolve()
 
-    # Skip expensive recursive search when search root is a high-level directory.
-    # Global tools running from HOME or / will never find a project config this way.
-    if str(search_root) in _get_high_level_dirs():
-        _project_root_cache[cache_key] = git_root
-        return git_root
-
     # Try fast lookups before expensive rglob (perf: global tools).
     console_match = ConfigManager._find_usecli_config_for_console_script()
     if console_match:
@@ -1065,6 +1078,12 @@ def find_project_root(start_dir: Path | None = None) -> Path | None:
             _project_root_cache[cache_key] = package_match.parent
             return package_match.parent
 
+    # Skip expensive recursive search when search root is a high-level directory.
+    # Global tools running from HOME or / will never find a project config this way.
+    if str(search_root) in _get_high_level_dirs():
+        _project_root_cache[cache_key] = git_root
+        return git_root
+
     config_match = ConfigManager._find_usecli_config_in_tree(
         search_root,
         start_dir,