@mindfoldhq/trellis 0.3.10-beta.0 → 0.3.10

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

@@ -21,6 +21,7 @@ Configuration: .trellis/worktree.yaml
 
 from __future__ import annotations
 
+import json
 import os
 import shutil
 import subprocess
@@ -28,12 +29,11 @@ import sys
 import uuid
 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.cli_adapter import get_cli_adapter
-from common.git import run_git
-from common.io import read_json, write_json
-from common.log import Colors, log_info, log_success, log_warn, log_error
+from common.cli_adapter import CLIAdapter, get_cli_adapter
+from common.git_context import _run_git_command
 from common.paths import (
     DIR_WORKFLOW,
     FILE_CURRENT_TASK,
@@ -44,12 +44,6 @@ from common.registry import (
     registry_add_agent,
     registry_get_file,
 )
-from common.config import (
-    get_default_package,
-    get_packages,
-    get_submodule_packages,
-    validate_package,
-)
 from common.worktree import (
     get_worktree_base_dir,
     get_worktree_config,
@@ -57,121 +51,64 @@ from common.worktree import (
     get_worktree_post_create_hooks,
 )
 
-# Colors, log_info, log_success, log_warn, log_error, read_json, write_json
-# are now imported from common.log and common.io above.
-
-
 # =============================================================================
-# Constants
+# Colors
 # =============================================================================
 
-DEFAULT_PLATFORM = "claude"
+
+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}")
 
 
 # =============================================================================
-# Submodule Init
+# Helper Functions
 # =============================================================================
 
 
-def _init_submodules_for_task(
-    task_data: dict, worktree_path: str, project_root: Path
-) -> None:
-    """Initialize submodules in worktree based on task's target package.
+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
 
-    Resolves the target package from task_data.package -> default_package -> None.
-    Only initializes submodule-type packages. Idempotent: skips already-initialized
-    submodules to avoid detaching HEAD on in-progress work.
-    """
-    # Skip if not a monorepo (no packages configured)
-    if get_packages(project_root) is None:
-        return
 
-    # Resolve package: task.package -> default_package -> None
-    task_package = task_data.get("package")
-    package = None
+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
 
-    if task_package and isinstance(task_package, str):
-        if validate_package(task_package, project_root):
-            package = task_package
-        else:
-            log_warn(
-                f"package '{task_package}' not found in config.yaml, "
-                "skipping submodule init"
-            )
-            return
-    else:
-        # Fallback to default_package
-        default_pkg = get_default_package(project_root)
-        if default_pkg:
-            if validate_package(default_pkg, project_root):
-                package = default_pkg
-            else:
-                log_warn(
-                    f"package '{default_pkg}' not found in config.yaml, "
-                    "skipping submodule init"
-                )
-                return
-
-    if not package:
-        log_warn("no package specified, skipping submodule init")
-        return
-
-    # Check if this package is a submodule
-    submodule_packages = get_submodule_packages(project_root)
-    if package not in submodule_packages:
-        log_info(f"Package '{package}' is not a submodule, skipping submodule init")
-        return
-
-    submodule_path = submodule_packages[package]
-    log_info(f"Checking submodule status for '{package}' ({submodule_path})...")
-
-    # Run git submodule status in worktree directory
-    ret, status_out, status_err = run_git(
-        ["submodule", "status", submodule_path], cwd=Path(worktree_path)
-    )
 
-    if ret != 0:
-        log_warn(
-            f"git submodule status failed for '{submodule_path}': {status_err.strip()}, "
-            "skipping submodule init"
-        )
-        return
-
-    # Parse the prefix character from submodule status output
-    # Format: "<prefix><sha1> <path> (<describe>)"
-    # Prefix: '-' (uninitialized), ' ' (normal), '+' (commit mismatch), 'U' (conflict)
-    status_line = status_out.rstrip("\n\r")
-    if not status_line:
-        log_warn(f"Empty submodule status for '{submodule_path}', skipping")
-        return
-
-    prefix = status_line[0]
-
-    if prefix == "-":
-        # Uninitialized: run git submodule update --init
-        log_info(f"Initializing submodule '{submodule_path}'...")
-        ret, _, err = run_git(
-            ["submodule", "update", "--init", submodule_path],
-            cwd=Path(worktree_path),
-        )
-        if ret != 0:
-            log_warn(f"Failed to initialize submodule '{submodule_path}': {err.strip()}")
-        else:
-            log_success(f"Submodule '{submodule_path}' initialized")
-    elif prefix == " ":
-        log_info(f"Submodule '{submodule_path}' already initialized, skipping")
-    elif prefix == "+":
-        log_warn(
-            f"submodule {submodule_path} has local changes, skipping update"
-        )
-    elif prefix == "U":
-        log_warn(
-            f"submodule {submodule_path} has conflicts, skipping"
-        )
-    else:
-        log_warn(
-            f"Unknown submodule status prefix '{prefix}' for '{submodule_path}', skipping"
-        )
+# =============================================================================
+# Constants
+# =============================================================================
+
+DEFAULT_PLATFORM = "claude"
 
 
 # =============================================================================
@@ -236,7 +173,7 @@ def main() -> int:
     print(f"{Colors.BLUE}=== Multi-Agent Pipeline: Start ==={Colors.NC}")
     log_info(f"Task: {task_dir_abs}")
 
-    task_data = read_json(task_json_path)
+    task_data = _read_json_file(task_json_path)
     if not task_data:
         log_error("Failed to read task.json")
         return 1
@@ -285,7 +222,7 @@ def main() -> int:
         log_info("Step 1: Creating worktree...")
 
         # Record current branch as base_branch (PR target)
-        _, base_branch_out, _ = run_git(
+        _, base_branch_out, _ = _run_git_command(
             ["branch", "--show-current"], cwd=project_root
         )
         base_branch = base_branch_out.strip()
@@ -302,18 +239,18 @@ def main() -> int:
         worktree_path_obj.parent.mkdir(parents=True, exist_ok=True)
 
         # Create branch if not exists
-        ret, _, _ = run_git(
+        ret, _, _ = _run_git_command(
             ["show-ref", "--verify", "--quiet", f"refs/heads/{branch}"],
             cwd=project_root,
         )
         if ret == 0:
             log_info("Branch exists, checking out...")
-            ret, _, err = run_git(
+            ret, _, err = _run_git_command(
                 ["worktree", "add", worktree_path, branch], cwd=project_root
             )
         else:
             log_info(f"Creating new branch: {branch}")
-            ret, _, err = run_git(
+            ret, _, err = _run_git_command(
                 ["worktree", "add", "-b", branch, worktree_path], cwd=project_root
             )
 
@@ -326,7 +263,7 @@ def main() -> int:
         # Update task.json with worktree_path and base_branch
         task_data["worktree_path"] = worktree_path
         task_data["base_branch"] = base_branch
-        write_json(task_json_path, task_data)
+        _write_json_file(task_json_path, task_data)
 
         # ----- Copy environment files -----
         log_info("Copying environment files...")
@@ -357,9 +294,6 @@ def main() -> int:
         shutil.copytree(str(task_dir_abs), str(task_target_dir))
         log_success("Task directory copied to worktree")
 
-        # ----- Initialize submodules (before hooks, so hooks can use submodule content) -----
-        _init_submodules_for_task(task_data, worktree_path, project_root)
-
         # ----- Run post_create hooks -----
         log_info("Running post_create hooks...")
         post_create = get_worktree_post_create_hooks(project_root)
@@ -381,9 +315,6 @@ def main() -> int:
     else:
         log_info(f"Step 1: Using existing worktree: {worktree_path}")
 
-        # ----- Initialize submodules (idempotent, for reused worktrees) -----
-        _init_submodules_for_task(task_data, worktree_path, project_root)
-
     # =============================================================================
     # Step 2: Set .current-task in Worktree
     # =============================================================================
@@ -403,7 +334,7 @@ def main() -> int:
 
     # Update task status
     task_data["status"] = "in_progress"
-    write_json(task_json_path, task_data)
+    _write_json_file(task_json_path, task_data)
 
     log_file = Path(worktree_path) / ".agent-log"
     session_id_file = Path(worktree_path) / ".session-id"