@mindfoldhq/trellis 0.3.10-beta.0 → 0.3.10

package/dist/templates/trellis/scripts/create_bootstrap.py

@@ -36,7 +36,6 @@ from common.paths import (
     get_tasks_dir,
     set_current_task,
 )
-from common.config import get_spec_base, resolve_package
 
 
 # =============================================================================
@@ -71,36 +70,36 @@ Fill in the guideline files based on your **existing codebase**.
 """
 
 
-def write_prd_backend_section(spec_base: str) -> str:
+def write_prd_backend_section() -> str:
     """Write PRD backend section."""
-    return f"""
+    return """
 
 ### Backend Guidelines
 
 | File | What to Document |
 |------|------------------|
-| `.trellis/{spec_base}/backend/directory-structure.md` | Where different file types go (routes, services, utils) |
-| `.trellis/{spec_base}/backend/database-guidelines.md` | ORM, migrations, query patterns, naming conventions |
-| `.trellis/{spec_base}/backend/error-handling.md` | How errors are caught, logged, and returned |
-| `.trellis/{spec_base}/backend/logging-guidelines.md` | Log levels, format, what to log |
-| `.trellis/{spec_base}/backend/quality-guidelines.md` | Code review standards, testing requirements |
+| `.trellis/spec/backend/directory-structure.md` | Where different file types go (routes, services, utils) |
+| `.trellis/spec/backend/database-guidelines.md` | ORM, migrations, query patterns, naming conventions |
+| `.trellis/spec/backend/error-handling.md` | How errors are caught, logged, and returned |
+| `.trellis/spec/backend/logging-guidelines.md` | Log levels, format, what to log |
+| `.trellis/spec/backend/quality-guidelines.md` | Code review standards, testing requirements |
 """
 
 
-def write_prd_frontend_section(spec_base: str) -> str:
+def write_prd_frontend_section() -> str:
     """Write PRD frontend section."""
-    return f"""
+    return """
 
 ### Frontend Guidelines
 
 | File | What to Document |
 |------|------------------|
-| `.trellis/{spec_base}/frontend/directory-structure.md` | Component/page/hook organization |
-| `.trellis/{spec_base}/frontend/component-guidelines.md` | Component patterns, props conventions |
-| `.trellis/{spec_base}/frontend/hook-guidelines.md` | Custom hook naming, patterns |
-| `.trellis/{spec_base}/frontend/state-management.md` | State library, patterns, what goes where |
-| `.trellis/{spec_base}/frontend/type-safety.md` | TypeScript conventions, type organization |
-| `.trellis/{spec_base}/frontend/quality-guidelines.md` | Linting, testing, accessibility |
+| `.trellis/spec/frontend/directory-structure.md` | Component/page/hook organization |
+| `.trellis/spec/frontend/component-guidelines.md` | Component patterns, props conventions |
+| `.trellis/spec/frontend/hook-guidelines.md` | Custom hook naming, patterns |
+| `.trellis/spec/frontend/state-management.md` | State library, patterns, what goes where |
+| `.trellis/spec/frontend/type-safety.md` | TypeScript conventions, type organization |
+| `.trellis/spec/frontend/quality-guidelines.md` | Linting, testing, accessibility |
 """
 
 
@@ -169,17 +168,17 @@ After completing this task:
 """
 
 
-def write_prd(task_dir: Path, project_type: str, spec_base: str) -> None:
+def write_prd(task_dir: Path, project_type: str) -> None:
     """Write prd.md file."""
     content = write_prd_header()
 
     if project_type == "frontend":
-        content += write_prd_frontend_section(spec_base)
+        content += write_prd_frontend_section()
     elif project_type == "backend":
-        content += write_prd_backend_section(spec_base)
+        content += write_prd_backend_section()
     else:  # fullstack
-        content += write_prd_backend_section(spec_base)
-        content += write_prd_frontend_section(spec_base)
+        content += write_prd_backend_section()
+        content += write_prd_frontend_section()
 
     content += write_prd_footer()
 
@@ -191,7 +190,7 @@ def write_prd(task_dir: Path, project_type: str, spec_base: str) -> None:
 # Task JSON
 # =============================================================================
 
-def write_task_json(task_dir: Path, developer: str, project_type: str, spec_base: str) -> None:
+def write_task_json(task_dir: Path, developer: str, project_type: str) -> None:
     """Write task.json file."""
     today = datetime.now().strftime("%Y-%m-%d")
 
@@ -201,20 +200,20 @@ def write_task_json(task_dir: Path, developer: str, project_type: str, spec_base
             {"name": "Fill frontend guidelines", "status": "pending"},
             {"name": "Add code examples", "status": "pending"},
         ]
-        related_files = [f".trellis/{spec_base}/frontend/"]
+        related_files = [".trellis/spec/frontend/"]
     elif project_type == "backend":
         subtasks = [
             {"name": "Fill backend guidelines", "status": "pending"},
             {"name": "Add code examples", "status": "pending"},
         ]
-        related_files = [f".trellis/{spec_base}/backend/"]
+        related_files = [".trellis/spec/backend/"]
     else:  # fullstack
         subtasks = [
             {"name": "Fill backend guidelines", "status": "pending"},
             {"name": "Fill frontend guidelines", "status": "pending"},
             {"name": "Add code examples", "status": "pending"},
         ]
-        related_files = [f".trellis/{spec_base}/backend/", f".trellis/{spec_base}/frontend/"]
+        related_files = [".trellis/spec/backend/", ".trellis/spec/frontend/"]
 
     task_data = {
         "id": TASK_NAME,
@@ -265,10 +264,6 @@ def main() -> int:
         print(f"Run: python3 ./{DIR_WORKFLOW}/{DIR_SCRIPTS}/init_developer.py <your-name>")
         return 1
 
-    # Resolve spec base path (monorepo: spec/<package>, single-repo: spec)
-    package = resolve_package(repo_root=repo_root)
-    spec_base = get_spec_base(package, repo_root)
-
     tasks_dir = get_tasks_dir(repo_root)
     task_dir = tasks_dir / TASK_NAME
     relative_path = f"{DIR_WORKFLOW}/{DIR_TASKS}/{TASK_NAME}"
@@ -282,8 +277,8 @@ def main() -> int:
     task_dir.mkdir(parents=True, exist_ok=True)
 
     # Write files
-    write_task_json(task_dir, developer, project_type, spec_base)
-    write_prd(task_dir, project_type, spec_base)
+    write_task_json(task_dir, developer, project_type)
+    write_prd(task_dir, project_type)
 
     # Set as current task
     set_current_task(relative_path, repo_root)

package/dist/templates/trellis/scripts/multi_agent/cleanup.py

@@ -22,17 +22,16 @@ This script:
 from __future__ import annotations
 
 import argparse
-import json
 import shutil
 import subprocess
 import sys
 from pathlib import Path
 
-import _bootstrap  # noqa: F401 — adds parent scripts/ dir to sys.path
+# Add parent directory to path for imports
+sys.path.insert(0, str(Path(__file__).parent.parent))
 
-from common.git import run_git
-from common.log import Colors, log_info, log_success, log_warn, log_error
-from common.paths import FILE_TASK_JSON, get_repo_root
+from common.git_context import _run_git_command
+from common.paths import get_repo_root
 from common.registry import (
     registry_get_file,
     registry_get_task_dir,
@@ -45,8 +44,38 @@ from common.task_utils import (
     is_safe_task_path,
 )
 
-# Colors, log_info, log_success, log_warn, log_error
-# are now imported from common.log above.
+# =============================================================================
+# Colors
+# =============================================================================
+
+
+class Colors:
+    RED = "\033[0;31m"
+    GREEN = "\033[0;32m"
+    YELLOW = "\033[1;33m"
+    BLUE = "\033[0;34m"
+    NC = "\033[0m"
+
+
+def log_info(msg: str) -> None:
+    print(f"{Colors.BLUE}[INFO]{Colors.NC} {msg}")
+
+
+def log_success(msg: str) -> None:
+    print(f"{Colors.GREEN}[SUCCESS]{Colors.NC} {msg}")
+
+
+def log_warn(msg: str) -> None:
+    print(f"{Colors.YELLOW}[WARN]{Colors.NC} {msg}")
+
+
+def log_error(msg: str) -> None:
+    print(f"{Colors.RED}[ERROR]{Colors.NC} {msg}")
+
+
+# =============================================================================
+# Helper Functions
+# =============================================================================
 
 
 def confirm(prompt: str, skip_confirm: bool) -> bool:
@@ -62,26 +91,6 @@ def confirm(prompt: str, skip_confirm: bool) -> bool:
     return response.lower() in ("y", "yes")
 
 
-def _warn_submodule_prs(task_dir_abs: Path) -> None:
-    """Print reminders for any open submodule PRs found in task.json."""
-    task_json = task_dir_abs / FILE_TASK_JSON
-    if not task_json.is_file():
-        return
-
-    try:
-        task_data = json.loads(task_json.read_text(encoding="utf-8"))
-    except (json.JSONDecodeError, OSError):
-        return
-
-    submodule_prs = task_data.get("submodule_prs")
-    if not isinstance(submodule_prs, dict) or not submodule_prs:
-        return
-
-    for name, url in submodule_prs.items():
-        log_warn(f"Submodule PR still open: {name} -> {url}")
-    log_info("Remember to close/merge submodule PRs before cleanup")
-
-
 # =============================================================================
 # Commands
 # =============================================================================
@@ -101,6 +110,8 @@ def cmd_list(repo_root: Path) -> int:
         print(f"{Colors.BLUE}=== Registered Agents ==={Colors.NC}")
         print()
 
+        import json
+
         data = json.loads(registry_file.read_text(encoding="utf-8"))
         agents = data.get("agents", [])
 
@@ -154,11 +165,10 @@ def cleanup_registry_only(search: str, repo_root: Path, skip_confirm: bool) -> i
         log_info("Aborted")
         return 0
 
-    # Check for submodule PRs and archive task directory
+    # Archive task directory if exists
     if task_dir and is_safe_task_path(task_dir, repo_root):
         task_dir_abs = repo_root / task_dir
         if task_dir_abs.is_dir():
-            _warn_submodule_prs(task_dir_abs)
             result = archive_task_complete(task_dir_abs, repo_root)
             if "archived_to" in result:
                 dest = Path(result["archived_to"])
@@ -181,7 +191,7 @@ def cleanup_worktree(
 ) -> int:
     """Cleanup single worktree."""
     # Find worktree path for branch
-    _, worktree_list, _ = run_git(
+    _, worktree_list, _ = _run_git_command(
         ["worktree", "list", "--porcelain"], cwd=repo_root
     )
 
@@ -213,12 +223,7 @@ def cleanup_worktree(
         log_info("Aborted")
         return 0
 
-    # 1. Archive task (and check for submodule PRs)
-    task_dir = registry_get_task_dir(worktree_path, repo_root)
-    if task_dir and is_safe_task_path(task_dir, repo_root):
-        task_dir_abs_for_warn = repo_root / task_dir
-        if task_dir_abs_for_warn.is_dir():
-            _warn_submodule_prs(task_dir_abs_for_warn)
+    # 1. Archive task
     archive_task(worktree_path, repo_root)
 
     # 2. Remove from registry
@@ -227,7 +232,7 @@ def cleanup_worktree(
 
     # 3. Remove worktree
     log_info("Removing worktree...")
-    ret, _, _ = run_git(
+    ret, _, _ = _run_git_command(
         ["worktree", "remove", worktree_path, "--force"], cwd=repo_root
     )
     if ret != 0:
@@ -242,7 +247,7 @@ def cleanup_worktree(
     # 4. Delete branch (optional)
     if not keep_branch:
         log_info("Deleting branch...")
-        ret, _, _ = run_git(["branch", "-D", branch], cwd=repo_root)
+        ret, _, _ = _run_git_command(["branch", "-D", branch], cwd=repo_root)
         if ret != 0:
             log_warn("Could not delete branch (may be checked out elsewhere)")
 
@@ -253,7 +258,7 @@ def cleanup_worktree(
 def cmd_merged(repo_root: Path, skip_confirm: bool, keep_branch: bool) -> int:
     """Cleanup merged worktrees."""
     # Get main branch
-    _, head_out, _ = run_git(
+    _, head_out, _ = _run_git_command(
         ["symbolic-ref", "refs/remotes/origin/HEAD"], cwd=repo_root
     )
     main_branch = head_out.strip().replace("refs/remotes/origin/", "") or "main"
@@ -262,7 +267,7 @@ def cmd_merged(repo_root: Path, skip_confirm: bool, keep_branch: bool) -> int:
     print()
 
     # Get merged branches
-    _, merged_out, _ = run_git(
+    _, merged_out, _ = _run_git_command(
         ["branch", "--merged", main_branch], cwd=repo_root
     )
     merged_branches = []
@@ -276,7 +281,7 @@ def cmd_merged(repo_root: Path, skip_confirm: bool, keep_branch: bool) -> int:
         return 0
 
     # Get worktree list
-    _, worktree_list, _ = run_git(["worktree", "list"], cwd=repo_root)
+    _, worktree_list, _ = _run_git_command(["worktree", "list"], cwd=repo_root)
 
     worktree_branches = []
     for branch in merged_branches:
@@ -305,7 +310,7 @@ def cmd_all(repo_root: Path, skip_confirm: bool, keep_branch: bool) -> int:
     print()
 
     # Get worktree list
-    _, worktree_list, _ = run_git(
+    _, worktree_list, _ = _run_git_command(
         ["worktree", "list", "--porcelain"], cwd=repo_root
     )
 
@@ -335,7 +340,7 @@ def cmd_all(repo_root: Path, skip_confirm: bool, keep_branch: bool) -> int:
     # Get branch for each worktree
     for wt in worktrees:
         # Find branch name from worktree list
-        _, wt_list, _ = run_git(["worktree", "list"], cwd=repo_root)
+        _, wt_list, _ = _run_git_command(["worktree", "list"], cwd=repo_root)
         for line in wt_list.splitlines():
             if wt in line:
                 # Extract branch from [branch] format