@jahanxu/trellis 0.4.1

package/dist/templates/trellis/scripts-shell-archive/multi-agent/cleanup.sh

@@ -0,0 +1,396 @@
+#!/bin/bash
+# =============================================================================
+# Multi-Agent Pipeline: Cleanup Worktree
+# =============================================================================
+# Usage:
+#   ./cleanup.sh <branch-name>      Remove specific worktree
+#   ./cleanup.sh --list             List all worktrees
+#   ./cleanup.sh --merged           Remove merged worktrees
+#   ./cleanup.sh --all              Remove all worktrees (with confirmation)
+#
+# Options:
+#   -y, --yes                       Skip confirmation prompts
+#   --keep-branch                   Don't delete the git branch
+#
+# This script:
+# 1. Archives task directory to archive/{YYYY-MM}/
+# 2. Removes agent from registry
+# 3. Removes git worktree
+# 4. Optionally deletes git branch
+# =============================================================================
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/../common/paths.sh"
+source "$SCRIPT_DIR/../common/worktree.sh"
+source "$SCRIPT_DIR/../common/developer.sh"
+source "$SCRIPT_DIR/../common/task-queue.sh"
+source "$SCRIPT_DIR/../common/task-utils.sh"
+source "$SCRIPT_DIR/../common/registry.sh"
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+
+log_info() { echo -e "${BLUE}[INFO]${NC} $1"; }
+log_success() { echo -e "${GREEN}[SUCCESS]${NC} $1"; }
+log_warn() { echo -e "${YELLOW}[WARN]${NC} $1"; }
+log_error() { echo -e "${RED}[ERROR]${NC} $1"; }
+
+PROJECT_ROOT=$(get_repo_root)
+SKIP_CONFIRM=false
+KEEP_BRANCH=false
+
+# =============================================================================
+# Parse Arguments
+# =============================================================================
+POSITIONAL_ARGS=()
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -y|--yes)
+      SKIP_CONFIRM=true
+      shift
+      ;;
+    --keep-branch)
+      KEEP_BRANCH=true
+      shift
+      ;;
+    --list|--merged|--all)
+      ACTION="${1#--}"
+      shift
+      ;;
+    -*)
+      log_error "Unknown option: $1"
+      exit 1
+      ;;
+    *)
+      POSITIONAL_ARGS+=("$1")
+      shift
+      ;;
+  esac
+done
+
+# =============================================================================
+# List Worktrees
+# =============================================================================
+cmd_list() {
+  echo -e "${BLUE}=== Git Worktrees ===${NC}"
+  echo ""
+
+  cd "$PROJECT_ROOT"
+  git worktree list
+
+  echo ""
+
+  # Show registry info
+  local registry_file=$(registry_get_file "$PROJECT_ROOT")
+
+  if [ -f "$registry_file" ]; then
+    echo -e "${BLUE}=== Registered Agents ===${NC}"
+    echo ""
+    jq -r '.agents[] | "  \(.id): PID=\(.pid) [\(.worktree_path)]"' "$registry_file" 2>/dev/null || echo "  (none)"
+    echo ""
+  fi
+}
+
+# =============================================================================
+# Archive Task (using common function)
+# =============================================================================
+archive_task() {
+  local worktree_path="$1"
+
+  # Find task directory from registry
+  local task_dir=$(registry_get_task_dir "$worktree_path" "$PROJECT_ROOT")
+
+  # Validate task path is safe
+  if ! is_safe_task_path "$task_dir" "$PROJECT_ROOT" 2>/dev/null; then
+    return 0
+  fi
+
+  local task_dir_abs="${PROJECT_ROOT}/${task_dir}"
+  if [ ! -d "$task_dir_abs" ]; then
+    return 0
+  fi
+
+  # Use common archive function
+  local result=$(archive_task_complete "$task_dir_abs" "$PROJECT_ROOT")
+
+  # Parse result and log
+  echo "$result" | while IFS= read -r line; do
+    case "$line" in
+      task_completed:*)
+        log_info "Completed task: ${line#task_completed:}"
+        ;;
+      archived_to:*)
+        local dest="${line#archived_to:}"
+        local task_name=$(basename "$dest")
+        local month_dir=$(dirname "$dest")
+        log_success "Archived task: $task_name -> $(basename "$month_dir")/"
+        ;;
+    esac
+  done
+}
+
+# =============================================================================
+# Cleanup from Registry Only (no worktree)
+# =============================================================================
+cleanup_registry_only() {
+  local search="$1"
+
+  # Find agent using registry function
+  local agent_info=$(registry_search_agent "$search" "$PROJECT_ROOT")
+
+  if [ -z "$agent_info" ]; then
+    log_error "No agent found in registry matching: $search"
+    exit 1
+  fi
+
+  local agent_id=$(echo "$agent_info" | jq -r '.id')
+  local task_dir=$(echo "$agent_info" | jq -r '.task_dir')
+
+  echo ""
+  echo -e "${BLUE}=== Cleanup Agent (no worktree) ===${NC}"
+  echo "  Agent ID:  $agent_id"
+  echo "  Task Dir:  $task_dir"
+  echo ""
+
+  # Confirmation
+  if [ "$SKIP_CONFIRM" != "true" ]; then
+    if [ -t 0 ]; then
+      read -p "Archive task and remove from registry? [y/N] " -n 1 -r
+      echo
+      if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        log_info "Aborted"
+        exit 0
+      fi
+    else
+      log_error "Non-interactive mode detected. Use -y to skip confirmation."
+      exit 1
+    fi
+  fi
+
+  # 1. Archive task directory if exists
+  # Validate task path is safe
+  if ! is_safe_task_path "$task_dir" "$PROJECT_ROOT" 2>/dev/null; then
+    log_warn "Invalid task_dir in registry, skipping archive"
+  else
+    local task_dir_abs="${PROJECT_ROOT}/${task_dir}"
+    if [ -d "$task_dir_abs" ]; then
+    local result=$(archive_task_complete "$task_dir_abs" "$PROJECT_ROOT")
+
+    echo "$result" | while IFS= read -r line; do
+      case "$line" in
+        task_completed:*)
+          log_info "Completed task: ${line#task_completed:}"
+          ;;
+        archived_to:*)
+          local dest="${line#archived_to:}"
+          local task_name=$(basename "$dest")
+          log_success "Archived task: $task_name -> archive/$(basename "$(dirname "$dest")")/"
+          ;;
+      esac
+    done
+    fi
+  fi
+
+  # 2. Remove from registry
+  registry_remove_by_id "$agent_id" "$PROJECT_ROOT"
+  log_success "Removed from registry: $agent_id"
+
+  log_success "Cleanup complete"
+}
+
+# =============================================================================
+# Cleanup Single Worktree
+# =============================================================================
+cleanup_worktree() {
+  local branch="$1"
+
+  cd "$PROJECT_ROOT"
+
+  # Find worktree path for branch
+  # porcelain format: worktree line comes BEFORE branch line, so use -B2
+  local worktree_info=$(git worktree list --porcelain | grep -B2 "branch refs/heads/$branch" | head -3)
+  local worktree_path=$(echo "$worktree_info" | grep "^worktree " | cut -d' ' -f2-)
+
+  if [ -z "$worktree_path" ]; then
+    # No worktree found, try to cleanup from registry only
+    log_warn "No worktree found for: $branch"
+    log_info "Trying to cleanup from registry..."
+    cleanup_registry_only "$branch"
+    return
+  fi
+
+  echo ""
+  echo -e "${BLUE}=== Cleanup Worktree ===${NC}"
+  echo "  Branch:   $branch"
+  echo "  Worktree: $worktree_path"
+  echo ""
+
+  # Confirmation
+  if [ "$SKIP_CONFIRM" != "true" ]; then
+    # Check if running interactively
+    if [ -t 0 ]; then
+      read -p "Remove this worktree? [y/N] " -n 1 -r
+      echo
+      if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        log_info "Aborted"
+        exit 0
+      fi
+    else
+      log_error "Non-interactive mode detected. Use -y to skip confirmation."
+      exit 1
+    fi
+  fi
+
+  # 1. Archive task
+  archive_task "$worktree_path"
+
+  # 2. Remove from registry
+  registry_remove_by_worktree "$worktree_path" "$PROJECT_ROOT"
+  log_info "Removed from registry"
+
+  # 3. Remove worktree
+  log_info "Removing worktree..."
+  git worktree remove "$worktree_path" --force 2>/dev/null || rm -rf "$worktree_path"
+  log_success "Worktree removed"
+
+  # 4. Delete branch (optional)
+  if [ "$KEEP_BRANCH" != "true" ]; then
+    log_info "Deleting branch..."
+    git branch -D "$branch" 2>/dev/null || log_warn "Could not delete branch (may be checked out elsewhere)"
+  fi
+
+  log_success "Cleanup complete for: $branch"
+}
+
+# =============================================================================
+# Cleanup Merged Worktrees
+# =============================================================================
+cmd_merged() {
+  cd "$PROJECT_ROOT"
+
+  local main_branch=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@' || echo "main")
+
+  echo -e "${BLUE}=== Finding Merged Worktrees ===${NC}"
+  echo ""
+
+  local merged_branches=$(git branch --merged "$main_branch" | grep -v "^\*" | grep -v "$main_branch" | tr -d ' ')
+
+  if [ -z "$merged_branches" ]; then
+    log_info "No merged branches found"
+    exit 0
+  fi
+
+  local worktree_branches=""
+  while IFS= read -r branch; do
+    if git worktree list | grep -q "\[$branch\]"; then
+      worktree_branches="$worktree_branches $branch"
+      echo "  - $branch"
+    fi
+  done <<< "$merged_branches"
+
+  if [ -z "$worktree_branches" ]; then
+    log_info "No merged worktrees found"
+    exit 0
+  fi
+
+  echo ""
+
+  if [ "$SKIP_CONFIRM" != "true" ]; then
+    if [ -t 0 ]; then
+      read -p "Remove these merged worktrees? [y/N] " -n 1 -r
+      echo
+      if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        log_info "Aborted"
+        exit 0
+      fi
+    else
+      log_error "Non-interactive mode detected. Use -y to skip confirmation."
+      exit 1
+    fi
+  fi
+
+  for branch in $worktree_branches; do
+    cleanup_worktree "$branch"
+  done
+}
+
+# =============================================================================
+# Cleanup All Worktrees
+# =============================================================================
+cmd_all() {
+  cd "$PROJECT_ROOT"
+
+  echo -e "${BLUE}=== All Worktrees ===${NC}"
+  echo ""
+
+  local worktrees=$(git worktree list --porcelain | grep "^worktree " | grep -v "$PROJECT_ROOT$" | cut -d' ' -f2-)
+
+  if [ -z "$worktrees" ]; then
+    log_info "No worktrees to remove"
+    exit 0
+  fi
+
+  while IFS= read -r wt; do
+    echo "  - $wt"
+  done <<< "$worktrees"
+
+  echo ""
+
+  if [ "$SKIP_CONFIRM" != "true" ]; then
+    if [ -t 0 ]; then
+      echo -e "${RED}WARNING: This will remove ALL worktrees!${NC}"
+      read -p "Are you sure? [y/N] " -n 1 -r
+      echo
+      if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        log_info "Aborted"
+        exit 0
+      fi
+    else
+      log_error "Non-interactive mode detected. Use -y to skip confirmation."
+      exit 1
+    fi
+  fi
+
+  while IFS= read -r wt; do
+    local branch=$(git worktree list | grep "$wt" | awk '{print $NF}' | tr -d '[]')
+    if [ -n "$branch" ]; then
+      cleanup_worktree "$branch"
+    fi
+  done <<< "$worktrees"
+}
+
+# =============================================================================
+# Main
+# =============================================================================
+case "${ACTION:-}" in
+  list)
+    cmd_list
+    ;;
+  merged)
+    cmd_merged
+    ;;
+  all)
+    cmd_all
+    ;;
+  *)
+    if [ ${#POSITIONAL_ARGS[@]} -eq 0 ]; then
+      echo "Usage:"
+      echo "  $0 <branch-name>      Remove specific worktree"
+      echo "  $0 --list             List all worktrees"
+      echo "  $0 --merged           Remove merged worktrees"
+      echo "  $0 --all              Remove all worktrees"
+      echo ""
+      echo "Options:"
+      echo "  -y, --yes             Skip confirmation"
+      echo "  --keep-branch         Don't delete git branch"
+      exit 1
+    fi
+    cleanup_worktree "${POSITIONAL_ARGS[0]}"
+    ;;
+esac

package/dist/templates/trellis/scripts-shell-archive/multi-agent/create-pr.sh

@@ -0,0 +1,241 @@
+#!/bin/bash
+# =============================================================================
+# Multi-Agent Pipeline: Create PR
+# =============================================================================
+# Usage:
+#   ./create-pr.sh [task-dir] [--dry-run]
+#
+# This script:
+# 1. Stages and commits all changes (excluding workspace/)
+# 2. Pushes to origin
+# 3. Creates a Draft PR using `gh pr create`
+# 4. Updates task.json with status="completed", pr_url, and current_phase
+#
+# Note: This is the only action that performs git commit, as it's the final
+# step after all implementation and checks are complete.
+# =============================================================================
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/../common/paths.sh"
+source "$SCRIPT_DIR/../common/phase.sh"
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+
+REPO_ROOT=$(get_repo_root)
+
+# =============================================================================
+# Parse Arguments
+# =============================================================================
+TARGET_DIR=""
+DRY_RUN=false
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --dry-run)
+      DRY_RUN=true
+      shift
+      ;;
+    -h|--help)
+      echo "Usage: $0 [task-dir] [--dry-run]"
+      echo ""
+      echo "Options:"
+      echo "  --dry-run    Show what would be done without making changes"
+      echo "  -h, --help   Show this help message"
+      exit 0
+      ;;
+    *)
+      if [[ -z "$TARGET_DIR" ]]; then
+        TARGET_DIR="$1"
+      fi
+      shift
+      ;;
+  esac
+done
+
+# =============================================================================
+# Get Task Directory
+# =============================================================================
+if [[ -z "$TARGET_DIR" ]]; then
+  # Try to get from .current-task
+  CURRENT_TASK_FILE="$REPO_ROOT/.trellis/.current-task"
+  if [[ -f "$CURRENT_TASK_FILE" ]]; then
+    TARGET_DIR=$(cat "$CURRENT_TASK_FILE")
+  fi
+
+  if [[ -z "$TARGET_DIR" ]]; then
+    echo -e "${RED}Error: No task directory specified and no current task set${NC}"
+    echo "Usage: $0 [task-dir] [--dry-run]"
+    exit 1
+  fi
+fi
+
+# Support relative paths
+if [[ ! "$TARGET_DIR" = /* ]]; then
+  TARGET_DIR="$REPO_ROOT/$TARGET_DIR"
+fi
+
+TASK_JSON="$TARGET_DIR/task.json"
+if [[ ! -f "$TASK_JSON" ]]; then
+  echo -e "${RED}Error: task.json not found at $TARGET_DIR${NC}"
+  exit 1
+fi
+
+# =============================================================================
+# Main
+# =============================================================================
+echo -e "${BLUE}=== Create PR ===${NC}"
+if [[ "$DRY_RUN" == "true" ]]; then
+  echo -e "${YELLOW}[DRY-RUN MODE] No actual changes will be made${NC}"
+fi
+echo ""
+
+# Read task config
+TASK_NAME=$(jq -r '.name' "$TASK_JSON")
+BASE_BRANCH=$(jq -r '.base_branch // "main"' "$TASK_JSON")
+SCOPE=$(jq -r '.scope // "core"' "$TASK_JSON")
+DEV_TYPE=$(jq -r '.dev_type // "feature"' "$TASK_JSON")
+
+# Map dev_type to commit prefix
+case "$DEV_TYPE" in
+  feature|frontend|backend|fullstack) COMMIT_PREFIX="feat" ;;
+  bugfix|fix) COMMIT_PREFIX="fix" ;;
+  refactor) COMMIT_PREFIX="refactor" ;;
+  docs) COMMIT_PREFIX="docs" ;;
+  test) COMMIT_PREFIX="test" ;;
+  *) COMMIT_PREFIX="feat" ;;
+esac
+
+echo -e "Task: ${TASK_NAME}"
+echo -e "Base branch: ${BASE_BRANCH}"
+echo -e "Scope: ${SCOPE}"
+echo -e "Commit prefix: ${COMMIT_PREFIX}"
+echo ""
+
+# Get current branch
+CURRENT_BRANCH=$(git branch --show-current)
+echo -e "Current branch: ${CURRENT_BRANCH}"
+
+# Check for changes
+echo -e "${YELLOW}Checking for changes...${NC}"
+
+# Stage changes (even in dry-run to detect what would be committed)
+git add -A
+
+# Exclude workspace and temp files
+git reset ".trellis/workspace/" 2>/dev/null || true
+git reset .agent-log .agent-runner.sh 2>/dev/null || true
+
+# Check if there are staged changes
+if git diff --cached --quiet 2>/dev/null; then
+  echo -e "${YELLOW}No staged changes to commit${NC}"
+
+  # Check for unpushed commits
+  UNPUSHED=$(git log "origin/${CURRENT_BRANCH}..HEAD" --oneline 2>/dev/null | wc -l | tr -d ' ' || echo "0")
+  if [[ "$UNPUSHED" -eq 0 ]] 2>/dev/null; then
+    # In dry-run, also reset the staging
+    if [[ "$DRY_RUN" == "true" ]]; then
+      git reset HEAD >/dev/null 2>&1 || true
+    fi
+    echo -e "${RED}No changes to create PR${NC}"
+    exit 1
+  fi
+  echo -e "Found ${UNPUSHED} unpushed commit(s)"
+else
+  # Commit changes
+  echo -e "${YELLOW}Committing changes...${NC}"
+  COMMIT_MSG="${COMMIT_PREFIX}(${SCOPE}): ${TASK_NAME}"
+
+  if [[ "$DRY_RUN" == "true" ]]; then
+    echo -e "[DRY-RUN] Would commit with message: ${COMMIT_MSG}"
+    echo -e "[DRY-RUN] Staged files:"
+    git diff --cached --name-only | sed 's/^/  - /'
+  else
+    git commit -m "$COMMIT_MSG"
+    echo -e "${GREEN}Committed: ${COMMIT_MSG}${NC}"
+  fi
+fi
+
+# Push to remote
+echo -e "${YELLOW}Pushing to remote...${NC}"
+if [[ "$DRY_RUN" == "true" ]]; then
+  echo -e "[DRY-RUN] Would push to: origin/${CURRENT_BRANCH}"
+else
+  git push -u origin "$CURRENT_BRANCH"
+  echo -e "${GREEN}Pushed to origin/${CURRENT_BRANCH}${NC}"
+fi
+
+# Create PR
+echo -e "${YELLOW}Creating PR...${NC}"
+PR_TITLE="${COMMIT_PREFIX}(${SCOPE}): ${TASK_NAME}"
+PR_URL=""
+
+if [[ "$DRY_RUN" == "true" ]]; then
+  echo -e "[DRY-RUN] Would create PR:"
+  echo -e "  Title: ${PR_TITLE}"
+  echo -e "  Base:  ${BASE_BRANCH}"
+  echo -e "  Head:  ${CURRENT_BRANCH}"
+  if [[ -f "$TARGET_DIR/prd.md" ]]; then
+    echo -e "  Body:  (from prd.md)"
+  fi
+  PR_URL="https://github.com/example/repo/pull/DRY-RUN"
+else
+  # Check if PR already exists
+  EXISTING_PR=$(gh pr list --head "$CURRENT_BRANCH" --base "$BASE_BRANCH" --json url --jq '.[0].url' 2>/dev/null || echo "")
+
+  if [[ -n "$EXISTING_PR" ]]; then
+    echo -e "${YELLOW}PR already exists: ${EXISTING_PR}${NC}"
+    PR_URL="$EXISTING_PR"
+  else
+    # Read PRD as PR body
+    PR_BODY=""
+    if [[ -f "$TARGET_DIR/prd.md" ]]; then
+      PR_BODY=$(cat "$TARGET_DIR/prd.md")
+    fi
+
+    # Create PR
+    PR_URL=$(gh pr create \
+      --draft \
+      --base "$BASE_BRANCH" \
+      --title "$PR_TITLE" \
+      --body "$PR_BODY" \
+      2>&1)
+
+    echo -e "${GREEN}PR created: ${PR_URL}${NC}"
+  fi
+fi
+
+# Update task.json
+echo -e "${YELLOW}Updating task status...${NC}"
+if [[ "$DRY_RUN" == "true" ]]; then
+  echo -e "[DRY-RUN] Would update task.json:"
+  echo -e "  status: completed"
+  echo -e "  pr_url: ${PR_URL}"
+  echo -e "  current_phase: (set to create-pr phase)"
+else
+  # Get the phase number for create-pr action using common/phase.sh
+  CREATE_PR_PHASE=$(get_phase_for_action "$TASK_JSON" "create-pr")
+  if [[ -z "$CREATE_PR_PHASE" ]] || [[ "$CREATE_PR_PHASE" == "0" ]]; then
+    CREATE_PR_PHASE=4  # Default fallback
+  fi
+
+  jq --arg url "$PR_URL" --argjson phase "$CREATE_PR_PHASE" \
+    '.status = "completed" | .pr_url = $url | .current_phase = $phase' "$TASK_JSON" > "${TASK_JSON}.tmp"
+  mv "${TASK_JSON}.tmp" "$TASK_JSON"
+  echo -e "${GREEN}Task status updated to 'completed', phase ${CREATE_PR_PHASE}${NC}"
+fi
+
+# In dry-run, reset the staging area
+if [[ "$DRY_RUN" == "true" ]]; then
+  git reset HEAD >/dev/null 2>&1 || true
+fi
+
+echo ""
+echo -e "${GREEN}=== PR Created Successfully ===${NC}"
+echo -e "PR URL: ${PR_URL}"