agent-toolkit-cli 1.0.4__tar.gz → 1.0.6__tar.gz

{agent_toolkit_cli-1.0.4 → agent_toolkit_cli-1.0.6}/CHANGELOG.md

@@ -35,6 +35,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   before falling back to walking up the filesystem (which breaks in uvx cache)
 - Added `agent-toolkit-cli` as script alias so `uvx agent-toolkit-cli` works
 
+## [1.0.5] — 2026-08-04
+
+### Fixed
+- loop runner: resolve toolkit root from package data dir before CWD fallback,
+  preventing it from picking up the user's ai-workspace loops when run via uvx/pip
+
+## [1.0.6] — 2026-08-04
+
+### Fixed
+- **CRITICAL**: Local `toolkit_root()` in cli/install.py, doctor.py, mcp.py, skills.py,
+  plugin.py was defined *after* the import from `_paths.py`, shadowing it — so the
+  correct resolution logic was never called in wheel/uvx installs
+- Removed module-level `TOOLKIT_DIR: Path = toolkit_root()` (evaluated at import time,
+  crashed before any function ran) — replaced with lazy `toolkit_root()` per call site
+
 ## [Unreleased]
 
 ### Added

{agent_toolkit_cli-1.0.4 → agent_toolkit_cli-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-toolkit-cli
-Version: 1.0.4
+Version: 1.0.6
 Summary: Composable AI agent toolkit — loops, skills, profiles, and MCP for Claude Code, Cursor, OpenCode, Windsurf, and more
 Project-URL: Homepage, https://github.com/ulises-jeremias/agent-toolkit
 Project-URL: Repository, https://github.com/ulises-jeremias/agent-toolkit.git

{agent_toolkit_cli-1.0.4 → agent_toolkit_cli-1.0.6}/src/agent_toolkit/__init__.py

@@ -1,4 +1,4 @@
 """agent-toolkit: Composable AI agent capabilities for all major AI coding tools."""
 
-__version__ = "1.0.4"
+__version__ = "1.0.6"
 __author__ = "ulises-jeremias"

{agent_toolkit_cli-1.0.4 → agent_toolkit_cli-1.0.6}/src/agent_toolkit/cli/doctor.py

@@ -56,17 +56,7 @@ class CheckResult:
         }
 
 
-# ---------------------------------------------------------------------------
-# Toolkit directory resolution
-# ---------------------------------------------------------------------------
 
-def toolkit_root() -> Path | None:
-    candidate = Path(__file__).resolve()
-    for _ in range(10):
-        candidate = candidate.parent
-        if (candidate / "profiles").is_dir():
-            return candidate
-    return None
 
 
 # ---------------------------------------------------------------------------

{agent_toolkit_cli-1.0.4 → agent_toolkit_cli-1.0.6}/src/agent_toolkit/cli/install.py

@@ -19,24 +19,9 @@ from pathlib import Path
 from agent_toolkit._paths import toolkit_root
 
 
-# ---------------------------------------------------------------------------
-# Toolkit directory resolution
-# ---------------------------------------------------------------------------
 
-def toolkit_root() -> Path:
-    """Walk up from this file until we find the directory containing profiles/."""
-    candidate = Path(__file__).resolve()
-    for _ in range(10):
-        candidate = candidate.parent
-        if (candidate / "profiles").is_dir():
-            return candidate
-    raise FileNotFoundError(
-        "Cannot locate toolkit root (directory containing profiles/). "
-        "Make sure agent-toolkit is installed from its source tree."
-    )
 
 
-TOOLKIT_DIR: Path = toolkit_root()
 
 # ---------------------------------------------------------------------------
 # Helpers
@@ -181,7 +166,7 @@ def _windsurf_config_dir() -> Path:
 def _install_claude_code(*, dry_run: bool, force: bool) -> bool:
     print()
     _info("Installing: Claude Code")
-    src = TOOLKIT_DIR / "profiles" / "claude-code"
+    src = toolkit_root() / "profiles" / "claude-code"
 
     if not src.is_dir():
         _warn(f"Profile directory not found: {src}")
@@ -202,7 +187,7 @@ def _install_claude_code(*, dry_run: bool, force: bool) -> bool:
 def _install_cursor(*, dry_run: bool, force: bool) -> bool:
     print()
     _info("Installing: Cursor")
-    src = TOOLKIT_DIR / "profiles" / "cursor" / "rules"
+    src = toolkit_root() / "profiles" / "cursor" / "rules"
 
     if not src.is_dir():
         _warn(f"Cursor rules directory not found: {src}")
@@ -215,7 +200,7 @@ def _install_cursor(*, dry_run: bool, force: bool) -> bool:
 def _install_opencode(*, dry_run: bool, force: bool) -> bool:
     print()
     _info("Installing: OpenCode")
-    src = TOOLKIT_DIR / "profiles" / "opencode"
+    src = toolkit_root() / "profiles" / "opencode"
 
     if not src.is_dir():
         _warn(f"OpenCode profile directory not found: {src}")
@@ -236,7 +221,7 @@ def _install_copilot(*, dry_run: bool, force: bool) -> bool:
     _info("Installing: GitHub Copilot")
     _info("Copilot instructions are per-project and committed to the repository.")
 
-    src = TOOLKIT_DIR / "profiles" / "copilot" / "copilot-instructions.md"
+    src = toolkit_root() / "profiles" / "copilot" / "copilot-instructions.md"
     if not src.is_file():
         _warn(f"Copilot instructions not found: {src}")
         return False
@@ -272,7 +257,7 @@ def _install_copilot(*, dry_run: bool, force: bool) -> bool:
 def _install_windsurf(*, dry_run: bool, force: bool) -> bool:
     print()
     _info("Installing: Windsurf")
-    src = TOOLKIT_DIR / "profiles" / "windsurf"
+    src = toolkit_root() / "profiles" / "windsurf"
 
     if not src.is_dir():
         _warn(f"Windsurf profile directory not found: {src}")
@@ -292,7 +277,7 @@ def _install_windsurf(*, dry_run: bool, force: bool) -> bool:
 def _install_pi(*, dry_run: bool, force: bool) -> bool:
     print()
     _info("Installing: Pi Coding Agent")
-    src = TOOLKIT_DIR / "profiles" / "pi" / "skills"
+    src = toolkit_root() / "profiles" / "pi" / "skills"
 
     if not src.is_dir():
         _warn(f"Pi skills directory not found: {src}")
@@ -359,7 +344,7 @@ def cmd_install(args: list[str]) -> int:
 
     print()
     print("agent-toolkit installer")
-    print(f"Toolkit: {TOOLKIT_DIR}")
+    print(f"Toolkit: {toolkit_root()}")
 
     if dry_run:
         print()

{agent_toolkit_cli-1.0.4 → agent_toolkit_cli-1.0.6}/src/agent_toolkit/cli/mcp.py

@@ -28,13 +28,7 @@ from agent_toolkit._paths import toolkit_root
 # Toolkit directory & config paths
 # ---------------------------------------------------------------------------
 
-def toolkit_root() -> Path | None:
-    candidate = Path(__file__).resolve()
-    for _ in range(10):
-        candidate = candidate.parent
-        if (candidate / "profiles").is_dir():
-            return candidate
-    return None
+
 
 
 def _mcp_config_path() -> Path:

{agent_toolkit_cli-1.0.4 → agent_toolkit_cli-1.0.6}/src/agent_toolkit/cli/plugin.py

@@ -20,17 +20,7 @@ from pathlib import Path
 from agent_toolkit._paths import toolkit_root
 
 
-# ---------------------------------------------------------------------------
-# Toolkit directory resolution
-# ---------------------------------------------------------------------------
 
-def toolkit_root() -> Path | None:
-    candidate = Path(__file__).resolve()
-    for _ in range(10):
-        candidate = candidate.parent
-        if (candidate / "profiles").is_dir():
-            return candidate
-    return None
 
 
 # ---------------------------------------------------------------------------

{agent_toolkit_cli-1.0.4 → agent_toolkit_cli-1.0.6}/src/agent_toolkit/cli/skills.py

@@ -25,17 +25,7 @@ from pathlib import Path
 from agent_toolkit._paths import toolkit_root
 
 
-# ---------------------------------------------------------------------------
-# Toolkit directory resolution
-# ---------------------------------------------------------------------------
 
-def toolkit_root() -> Path | None:
-    candidate = Path(__file__).resolve()
-    for _ in range(10):
-        candidate = candidate.parent
-        if (candidate / "profiles").is_dir():
-            return candidate
-    return None
 
 
 # ---------------------------------------------------------------------------

{agent_toolkit_cli-1.0.4 → agent_toolkit_cli-1.0.6}/src/agent_toolkit/loop/runner.py

@@ -56,22 +56,32 @@ signal.signal(signal.SIGTERM, _handle_sig)
 
 # ── paths ─────────────────────────────────────────────────────────────────────
 
-# WORKSPACE_ROOT: prefer env var (for users running from their own workspace),
-# then fall back to the repo root where agent-toolkit is installed/cloned.
-# When installed as a package via pip, data files live alongside the source.
-def _find_repo_root() -> Path:
-    """Walk up from this file to find the repo root (where loops/ lives)."""
+# WORKSPACE_ROOT resolution (in priority order):
+# 1. AGENT_TOOLKIT_ROOT env var — explicit user override / ai-workspace session
+# 2. AI_WORKSPACE env var — compatibility with ai-workspace sessions
+# 3. Package data dir (pip/uvx/brew installs) — agent_toolkit/data/ in wheel
+# 4. Walk up from this file — editable/source installs
+# 5. CWD fallback
+def _find_toolkit_root() -> Path:
+    """Locate the directory that contains loops/, profiles/, skills/, etc."""
+    # Try package data directory first (pip/uvx wheel installs)
+    try:
+        pkg_data = Path(__file__).resolve().parent.parent / "data"
+        if pkg_data.is_dir() and (pkg_data / "loops").is_dir():
+            return pkg_data
+    except Exception:
+        pass
+    # Walk up from this file (editable/source installs)
     here = Path(__file__).resolve().parent
     for candidate in [here.parent.parent.parent, here.parent.parent, here.parent]:
         if (candidate / "loops").is_dir():
             return candidate
-    # Fallback to CWD
     return Path.cwd()
 
 WORKSPACE_ROOT = Path(
     os.environ.get("AGENT_TOOLKIT_ROOT", "")
     or os.environ.get("AI_WORKSPACE", "")
-    or _find_repo_root()
+    or _find_toolkit_root()
 )
 LOOPS_DIR = WORKSPACE_ROOT / "loops"
 TEMPLATES_DIR = WORKSPACE_ROOT / "loops"  # templates are the loops/ dir itself