@mindfoldhq/trellis 0.3.10-beta.0 → 0.3.10

package/dist/templates/trellis/scripts/common/phase.py

@@ -19,39 +19,25 @@ Provides:
 
 from __future__ import annotations
 
+import json
 from pathlib import Path
 
-from .io import read_json, write_json
 
-
-# =============================================================================
-# Internal Helpers (operate on pre-loaded data dict)
-# =============================================================================
-
-def _total_phases(data: dict) -> int:
-    """Get total phases from pre-loaded data."""
-    next_action = data.get("next_action", [])
-    return len(next_action) if isinstance(next_action, list) else 0
+def _read_json_file(path: Path) -> dict | None:
+    """Read and parse a JSON file."""
+    try:
+        return json.loads(path.read_text(encoding="utf-8"))
+    except (FileNotFoundError, json.JSONDecodeError, OSError):
+        return None
 
 
-def _phase_action(data: dict, phase: int) -> str:
-    """Get action name for a phase from pre-loaded data."""
-    next_action = data.get("next_action", [])
-    if isinstance(next_action, list):
-        for item in next_action:
-            if isinstance(item, dict) and item.get("phase") == phase:
-                return item.get("action", "unknown")
-    return "unknown"
-
-
-def _phase_for_action(data: dict, action: str) -> int:
-    """Get phase number for an action name from pre-loaded data."""
-    next_action = data.get("next_action", [])
-    if isinstance(next_action, list):
-        for item in next_action:
-            if isinstance(item, dict) and item.get("action") == action:
-                return item.get("phase", 0)
-    return 0
+def _write_json_file(path: Path, data: dict) -> bool:
+    """Write dict to JSON file."""
+    try:
+        path.write_text(json.dumps(data, indent=2, ensure_ascii=False), encoding="utf-8")
+        return True
+    except (OSError, IOError):
+        return False
 
 
 # =============================================================================
@@ -67,7 +53,7 @@ def get_current_phase(task_json: Path) -> int:
     Returns:
         Current phase number, or 0 if not found.
     """
-    data = read_json(task_json)
+    data = _read_json_file(task_json)
     if not data:
         return 0
     return data.get("current_phase", 0) or 0
@@ -82,10 +68,14 @@ def get_total_phases(task_json: Path) -> int:
     Returns:
         Total phase count, or 0 if not found.
     """
-    data = read_json(task_json)
+    data = _read_json_file(task_json)
     if not data:
         return 0
-    return _total_phases(data)
+
+    next_action = data.get("next_action", [])
+    if isinstance(next_action, list):
+        return len(next_action)
+    return 0
 
 
 def get_phase_action(task_json: Path, phase: int) -> str:
@@ -98,10 +88,16 @@ def get_phase_action(task_json: Path, phase: int) -> str:
     Returns:
         Action name, or "unknown" if not found.
     """
-    data = read_json(task_json)
+    data = _read_json_file(task_json)
     if not data:
         return "unknown"
-    return _phase_action(data, phase)
+
+    next_action = data.get("next_action", [])
+    if isinstance(next_action, list):
+        for item in next_action:
+            if isinstance(item, dict) and item.get("phase") == phase:
+                return item.get("action", "unknown")
+    return "unknown"
 
 
 def get_phase_info(task_json: Path) -> str:
@@ -113,18 +109,18 @@ def get_phase_info(task_json: Path) -> str:
     Returns:
         Formatted string like "1/4 (implement)".
     """
-    data = read_json(task_json)
+    data = _read_json_file(task_json)
     if not data:
         return "N/A"
 
     current_phase = data.get("current_phase", 0) or 0
-    total = _total_phases(data)
-    action_name = _phase_action(data, current_phase)
+    total_phases = get_total_phases(task_json)
+    action_name = get_phase_action(task_json, current_phase)
 
     if current_phase == 0 or current_phase is None:
-        return f"0/{total} (pending)"
+        return f"0/{total_phases} (pending)"
     else:
-        return f"{current_phase}/{total} ({action_name})"
+        return f"{current_phase}/{total_phases} ({action_name})"
 
 
 def set_phase(task_json: Path, phase: int) -> bool:
@@ -137,12 +133,12 @@ def set_phase(task_json: Path, phase: int) -> bool:
     Returns:
         True on success, False on error.
     """
-    data = read_json(task_json)
+    data = _read_json_file(task_json)
     if not data:
         return False
 
     data["current_phase"] = phase
-    return write_json(task_json, data)
+    return _write_json_file(task_json, data)
 
 
 def advance_phase(task_json: Path) -> bool:
@@ -154,19 +150,19 @@ def advance_phase(task_json: Path) -> bool:
     Returns:
         True on success, False on error or at final phase.
     """
-    data = read_json(task_json)
+    data = _read_json_file(task_json)
     if not data:
         return False
 
     current = data.get("current_phase", 0) or 0
-    total = _total_phases(data)
+    total = get_total_phases(task_json)
     next_phase = current + 1
 
     if next_phase > total:
         return False  # Already at final phase
 
     data["current_phase"] = next_phase
-    return write_json(task_json, data)
+    return _write_json_file(task_json, data)
 
 
 def get_phase_for_action(task_json: Path, action: str) -> int:
@@ -179,10 +175,16 @@ def get_phase_for_action(task_json: Path, action: str) -> int:
     Returns:
         Phase number, or 0 if not found.
     """
-    data = read_json(task_json)
+    data = _read_json_file(task_json)
     if not data:
         return 0
-    return _phase_for_action(data, action)
+
+    next_action = data.get("next_action", [])
+    if isinstance(next_action, list):
+        for item in next_action:
+            if isinstance(item, dict) and item.get("action") == action:
+                return item.get("phase", 0)
+    return 0
 
 
 def map_subagent_to_action(subagent_type: str) -> str:
@@ -229,11 +231,8 @@ def is_current_action(task_json: Path, action: str) -> bool:
     Returns:
         True if current phase matches the action.
     """
-    data = read_json(task_json)
-    if not data:
-        return False
-    current = data.get("current_phase", 0) or 0
-    action_phase = _phase_for_action(data, action)
+    current = get_current_phase(task_json)
+    action_phase = get_phase_for_action(task_json, action)
     return current == action_phase
 
 

package/dist/templates/trellis/scripts/common/registry.py

@@ -16,35 +16,29 @@ Provides:
 
 from __future__ import annotations
 
+import json
 from datetime import datetime
 from pathlib import Path
 
-from .io import read_json, write_json
 from .paths import get_repo_root
 from .worktree import get_agents_dir
 
 
-# =============================================================================
-# Internal Helpers
-# =============================================================================
-
-def _load_registry(
-    repo_root: Path | None = None,
-) -> tuple[Path | None, dict | None]:
-    """Load registry file and data in one step.
-
-    Returns:
-        (registry_file_path, data_dict) — either may be None.
-    """
-    if repo_root is None:
-        repo_root = get_repo_root()
+def _read_json_file(path: Path) -> dict | None:
+    """Read and parse a JSON file."""
+    try:
+        return json.loads(path.read_text(encoding="utf-8"))
+    except (FileNotFoundError, json.JSONDecodeError, OSError):
+        return None
 
-    registry_file = registry_get_file(repo_root)
-    if not registry_file or not registry_file.is_file():
-        return registry_file, None
 
-    data = read_json(registry_file)
-    return registry_file, data
+def _write_json_file(path: Path, data: dict) -> bool:
+    """Write dict to JSON file."""
+    try:
+        path.write_text(json.dumps(data, indent=2, ensure_ascii=False), encoding="utf-8")
+        return True
+    except (OSError, IOError):
+        return False
 
 
 # =============================================================================
@@ -91,7 +85,7 @@ def _ensure_registry(repo_root: Path | None = None) -> Path | None:
         agents_dir.mkdir(parents=True, exist_ok=True)
 
         if not registry_file.exists():
-            write_json(registry_file, {"agents": []})
+            _write_json_file(registry_file, {"agents": []})
 
         return registry_file
     except (OSError, IOError):
@@ -115,7 +109,14 @@ def registry_get_agent_by_id(
     Returns:
         Agent dict, or None if not found.
     """
-    _, data = _load_registry(repo_root)
+    if repo_root is None:
+        repo_root = get_repo_root()
+
+    registry_file = registry_get_file(repo_root)
+    if not registry_file or not registry_file.is_file():
+        return None
+
+    data = _read_json_file(registry_file)
     if not data:
         return None
 
@@ -139,7 +140,14 @@ def registry_get_agent_by_worktree(
     Returns:
         Agent dict, or None if not found.
     """
-    _, data = _load_registry(repo_root)
+    if repo_root is None:
+        repo_root = get_repo_root()
+
+    registry_file = registry_get_file(repo_root)
+    if not registry_file or not registry_file.is_file():
+        return None
+
+    data = _read_json_file(registry_file)
     if not data:
         return None
 
@@ -163,7 +171,14 @@ def registry_search_agent(
     Returns:
         First matching agent dict, or None if not found.
     """
-    _, data = _load_registry(repo_root)
+    if repo_root is None:
+        repo_root = get_repo_root()
+
+    registry_file = registry_get_file(repo_root)
+    if not registry_file or not registry_file.is_file():
+        return None
+
+    data = _read_json_file(registry_file)
     if not data:
         return None
 
@@ -192,14 +207,9 @@ def registry_get_task_dir(
     Returns:
         Task directory path, or None if not found.
     """
-    _, data = _load_registry(repo_root)
-    if not data:
-        return None
-
-    for agent in data.get("agents", []):
-        if agent.get("worktree_path") == worktree_path:
-            return agent.get("task_dir")
-
+    agent = registry_get_agent_by_worktree(worktree_path, repo_root)
+    if agent:
+        return agent.get("task_dir")
     return None
 
 
@@ -217,14 +227,21 @@ def registry_remove_by_id(agent_id: str, repo_root: Path | None = None) -> bool:
     Returns:
         True on success.
     """
-    registry_file, data = _load_registry(repo_root)
-    if not registry_file or not data:
+    if repo_root is None:
+        repo_root = get_repo_root()
+
+    registry_file = registry_get_file(repo_root)
+    if not registry_file or not registry_file.is_file():
         return True  # Nothing to remove
 
+    data = _read_json_file(registry_file)
+    if not data:
+        return True
+
     agents = data.get("agents", [])
     data["agents"] = [a for a in agents if a.get("id") != agent_id]
 
-    return write_json(registry_file, data)
+    return _write_json_file(registry_file, data)
 
 
 def registry_remove_by_worktree(
@@ -240,14 +257,21 @@ def registry_remove_by_worktree(
     Returns:
         True on success.
     """
-    registry_file, data = _load_registry(repo_root)
-    if not registry_file or not data:
+    if repo_root is None:
+        repo_root = get_repo_root()
+
+    registry_file = registry_get_file(repo_root)
+    if not registry_file or not registry_file.is_file():
         return True  # Nothing to remove
 
+    data = _read_json_file(registry_file)
+    if not data:
+        return True
+
     agents = data.get("agents", [])
     data["agents"] = [a for a in agents if a.get("worktree_path") != worktree_path]
 
-    return write_json(registry_file, data)
+    return _write_json_file(registry_file, data)
 
 
 def registry_add_agent(
@@ -278,7 +302,7 @@ def registry_add_agent(
     if not registry_file:
         return False
 
-    data = read_json(registry_file)
+    data = _read_json_file(registry_file)
     if not data:
         data = {"agents": []}
 
@@ -300,7 +324,7 @@ def registry_add_agent(
     agents.append(new_agent)
     data["agents"] = agents
 
-    return write_json(registry_file, data)
+    return _write_json_file(registry_file, data)
 
 
 def registry_list_agents(repo_root: Path | None = None) -> list[dict]:
@@ -312,7 +336,14 @@ def registry_list_agents(repo_root: Path | None = None) -> list[dict]:
     Returns:
         List of agent dicts.
     """
-    _, data = _load_registry(repo_root)
+    if repo_root is None:
+        repo_root = get_repo_root()
+
+    registry_file = registry_get_file(repo_root)
+    if not registry_file or not registry_file.is_file():
+        return []
+
+    data = _read_json_file(registry_file)
     if not data:
         return []
 

package/dist/templates/trellis/scripts/common/task_queue.py

@@ -12,32 +12,23 @@ Provides:
 
 from __future__ import annotations
 
+import json
 from pathlib import Path
 
 from .paths import (
+    FILE_TASK_JSON,
     get_repo_root,
     get_developer,
     get_tasks_dir,
 )
-from .tasks import iter_active_tasks
 
 
-# =============================================================================
-# Internal helper
-# =============================================================================
-
-def _task_to_dict(t) -> dict:
-    """Convert TaskInfo to the dict format callers expect."""
-    return {
-        "priority": t.priority,
-        "id": t.raw.get("id", ""),
-        "title": t.title,
-        "status": t.status,
-        "assignee": t.assignee or "-",
-        "dir": t.dir_name,
-        "children": list(t.children),
-        "parent": t.parent,
-    }
+def _read_json_file(path: Path) -> dict | None:
+    """Read and parse a JSON file."""
+    try:
+        return json.loads(path.read_text(encoding="utf-8"))
+    except (FileNotFoundError, json.JSONDecodeError, OSError):
+        return None
 
 
 # =============================================================================
@@ -63,10 +54,41 @@ def list_tasks_by_status(
     tasks_dir = get_tasks_dir(repo_root)
     results = []
 
-    for t in iter_active_tasks(tasks_dir):
-        if filter_status and t.status != filter_status:
+    if not tasks_dir.is_dir():
+        return results
+
+    for d in tasks_dir.iterdir():
+        if not d.is_dir() or d.name == "archive":
+            continue
+
+        task_json = d / FILE_TASK_JSON
+        if not task_json.is_file():
+            continue
+
+        data = _read_json_file(task_json)
+        if not data:
             continue
-        results.append(_task_to_dict(t))
+
+        task_id = data.get("id", "")
+        title = data.get("title") or data.get("name", "")
+        priority = data.get("priority", "P2")
+        status = data.get("status", "planning")
+        assignee = data.get("assignee", "-")
+
+        # Apply filter
+        if filter_status and status != filter_status:
+            continue
+
+        results.append({
+            "priority": priority,
+            "id": task_id,
+            "title": title,
+            "status": status,
+            "assignee": assignee,
+            "dir": d.name,
+            "children": data.get("children", []),
+            "parent": data.get("parent"),
+        })
 
     return results
 
@@ -104,12 +126,46 @@ def list_tasks_by_assignee(
     tasks_dir = get_tasks_dir(repo_root)
     results = []
 
-    for t in iter_active_tasks(tasks_dir):
-        if (t.assignee or "-") != assignee:
+    if not tasks_dir.is_dir():
+        return results
+
+    for d in tasks_dir.iterdir():
+        if not d.is_dir() or d.name == "archive":
+            continue
+
+        task_json = d / FILE_TASK_JSON
+        if not task_json.is_file():
             continue
-        if filter_status and t.status != filter_status:
+
+        data = _read_json_file(task_json)
+        if not data:
+            continue
+
+        task_assignee = data.get("assignee", "-")
+
+        # Apply assignee filter
+        if task_assignee != assignee:
             continue
-        results.append(_task_to_dict(t))
+
+        task_id = data.get("id", "")
+        title = data.get("title") or data.get("name", "")
+        priority = data.get("priority", "P2")
+        status = data.get("status", "planning")
+
+        # Apply status filter
+        if filter_status and status != filter_status:
+            continue
+
+        results.append({
+            "priority": priority,
+            "id": task_id,
+            "title": title,
+            "status": status,
+            "assignee": task_assignee,
+            "dir": d.name,
+            "children": data.get("children", []),
+            "parent": data.get("parent"),
+        })
 
     return results
 
@@ -155,9 +211,24 @@ def get_task_stats(repo_root: Path | None = None) -> dict[str, int]:
     tasks_dir = get_tasks_dir(repo_root)
     stats = {"P0": 0, "P1": 0, "P2": 0, "P3": 0, "Total": 0}
 
-    for t in iter_active_tasks(tasks_dir):
-        if t.priority in stats:
-            stats[t.priority] += 1
+    if not tasks_dir.is_dir():
+        return stats
+
+    for d in tasks_dir.iterdir():
+        if not d.is_dir() or d.name == "archive":
+            continue
+
+        task_json = d / FILE_TASK_JSON
+        if not task_json.is_file():
+            continue
+
+        data = _read_json_file(task_json)
+        if not data:
+            continue
+
+        priority = data.get("priority", "P2")
+        if priority in stats:
+            stats[priority] += 1
         stats["Total"] += 1
 
     return stats

package/dist/templates/trellis/scripts/common/task_utils.py

@@ -3,11 +3,9 @@
 Task utility functions.
 
 Provides:
-    is_safe_task_path   - Validate task path is safe to operate on
-    find_task_by_name   - Find task directory by name
-    resolve_task_dir    - Resolve task directory from name, relative, or absolute path
-    archive_task_dir    - Archive task to monthly directory
-    run_task_hooks      - Run lifecycle hooks for task events
+    is_safe_task_path  - Validate task path is safe to operate on
+    find_task_by_name  - Find task directory by name
+    archive_task_dir   - Archive task to monthly directory
 """
 
 from __future__ import annotations
@@ -17,7 +15,7 @@ import sys
 from datetime import datetime
 from pathlib import Path
 
-from .paths import get_repo_root, get_tasks_dir
+from .paths import get_repo_root
 
 
 # =============================================================================
@@ -165,101 +163,13 @@ def archive_task_complete(
     return {}
 
 
-# =============================================================================
-# Task Directory Resolution
-# =============================================================================
-
-def resolve_task_dir(target_dir: str, repo_root: Path) -> Path:
-    """Resolve task directory to absolute path.
-
-    Supports:
-    - Absolute path: /path/to/task
-    - Relative path: .trellis/tasks/01-31-my-task
-    - Task name: my-task (uses find_task_by_name for lookup)
-
-    Args:
-        target_dir: Task directory specification.
-        repo_root: Repository root path.
-
-    Returns:
-        Resolved absolute path.
-    """
-    if not target_dir:
-        return Path()
-
-    # Absolute path
-    if target_dir.startswith("/"):
-        return Path(target_dir)
-
-    # Relative path (contains path separator or starts with .trellis)
-    if "/" in target_dir or target_dir.startswith(".trellis"):
-        return repo_root / target_dir
-
-    # Task name - try to find in tasks directory
-    tasks_dir = get_tasks_dir(repo_root)
-    found = find_task_by_name(target_dir, tasks_dir)
-    if found:
-        return found
-
-    # Fallback to treating as relative path
-    return repo_root / target_dir
-
-
-# =============================================================================
-# Lifecycle Hooks
-# =============================================================================
-
-def run_task_hooks(event: str, task_json_path: Path, repo_root: Path) -> None:
-    """Run lifecycle hooks for a task event.
-
-    Args:
-        event: Event name (e.g. "after_create").
-        task_json_path: Absolute path to the task's task.json.
-        repo_root: Repository root for cwd and config lookup.
-    """
-    import os
-    import subprocess
-
-    from .config import get_hooks
-    from .log import Colors, colored
-
-    commands = get_hooks(event, repo_root)
-    if not commands:
-        return
-
-    env = {**os.environ, "TASK_JSON_PATH": str(task_json_path)}
-
-    for cmd in commands:
-        try:
-            result = subprocess.run(
-                cmd,
-                shell=True,
-                cwd=repo_root,
-                env=env,
-                capture_output=True,
-                text=True,
-                encoding="utf-8",
-                errors="replace",
-            )
-            if result.returncode != 0:
-                print(
-                    colored(f"[WARN] Hook failed ({event}): {cmd}", Colors.YELLOW),
-                    file=sys.stderr,
-                )
-                if result.stderr.strip():
-                    print(f"  {result.stderr.strip()}", file=sys.stderr)
-        except Exception as e:
-            print(
-                colored(f"[WARN] Hook error ({event}): {cmd} — {e}", Colors.YELLOW),
-                file=sys.stderr,
-            )
-
-
 # =============================================================================
 # Main Entry (for testing)
 # =============================================================================
 
 if __name__ == "__main__":
+    from .paths import get_tasks_dir
+
     repo = get_repo_root()
     tasks = get_tasks_dir(repo)