@mindfoldhq/trellis 0.1.1 → 0.1.3

package/dist/.trellis/scripts/common/phase.sh

@@ -0,0 +1,150 @@
+#!/bin/bash
+# =============================================================================
+# Phase Management Utilities
+# =============================================================================
+# Centralized phase tracking for multi-agent pipeline
+#
+# Usage:
+#   source common/phase.sh
+#
+#   get_current_phase "$feature_json"          # Returns current phase number
+#   get_total_phases "$feature_json"           # Returns total phase count
+#   get_phase_action "$feature_json" "$phase"  # Returns action name for phase
+#   get_phase_info "$feature_json"             # Returns "N/M (action)" format
+#   set_phase "$feature_json" "$phase"         # Sets current_phase
+#   advance_phase "$feature_json"              # Advances to next phase
+#   get_phase_for_action "$feature_json" "$action"  # Returns phase number for action
+# =============================================================================
+
+# Get current phase number
+get_current_phase() {
+  local feature_json="$1"
+  if [ ! -f "$feature_json" ]; then
+    echo "0"
+    return
+  fi
+  jq -r '.current_phase // 0' "$feature_json"
+}
+
+# Get total number of phases
+get_total_phases() {
+  local feature_json="$1"
+  if [ ! -f "$feature_json" ]; then
+    echo "0"
+    return
+  fi
+  jq -r '.next_action | length // 0' "$feature_json"
+}
+
+# Get action name for a specific phase
+get_phase_action() {
+  local feature_json="$1"
+  local phase="$2"
+  if [ ! -f "$feature_json" ]; then
+    echo "unknown"
+    return
+  fi
+  jq -r --argjson phase "$phase" '.next_action[] | select(.phase == $phase) | .action // "unknown"' "$feature_json"
+}
+
+# Get formatted phase info: "N/M (action)"
+get_phase_info() {
+  local feature_json="$1"
+  if [ ! -f "$feature_json" ]; then
+    echo "N/A"
+    return
+  fi
+
+  local current_phase=$(get_current_phase "$feature_json")
+  local total_phases=$(get_total_phases "$feature_json")
+  local action_name=$(get_phase_action "$feature_json" "$current_phase")
+
+  if [ "$current_phase" = "0" ] || [ "$current_phase" = "null" ]; then
+    echo "0/${total_phases} (pending)"
+  else
+    echo "${current_phase}/${total_phases} (${action_name})"
+  fi
+}
+
+# Set current phase to a specific value
+set_phase() {
+  local feature_json="$1"
+  local phase="$2"
+
+  if [ ! -f "$feature_json" ]; then
+    echo "Error: feature.json not found: $feature_json" >&2
+    return 1
+  fi
+
+  jq --argjson phase "$phase" '.current_phase = $phase' "$feature_json" > "${feature_json}.tmp"
+  mv "${feature_json}.tmp" "$feature_json"
+}
+
+# Advance to next phase
+advance_phase() {
+  local feature_json="$1"
+
+  if [ ! -f "$feature_json" ]; then
+    echo "Error: feature.json not found: $feature_json" >&2
+    return 1
+  fi
+
+  local current=$(get_current_phase "$feature_json")
+  local total=$(get_total_phases "$feature_json")
+  local next=$((current + 1))
+
+  if [ "$next" -gt "$total" ]; then
+    echo "Warning: Already at final phase" >&2
+    return 0
+  fi
+
+  set_phase "$feature_json" "$next"
+}
+
+# Get phase number for a specific action name
+get_phase_for_action() {
+  local feature_json="$1"
+  local action="$2"
+
+  if [ ! -f "$feature_json" ]; then
+    echo "0"
+    return
+  fi
+
+  jq -r --arg action "$action" '.next_action[] | select(.action == $action) | .phase // 0' "$feature_json"
+}
+
+# Map subagent type to action name
+# Used by hooks to determine which action a subagent corresponds to
+map_subagent_to_action() {
+  local subagent_type="$1"
+
+  case "$subagent_type" in
+    implement) echo "implement" ;;
+    check) echo "check" ;;
+    debug) echo "debug" ;;
+    research) echo "research" ;;
+    # finish uses check agent but is a different action
+    *) echo "$subagent_type" ;;
+  esac
+}
+
+# Check if a phase is completed (current_phase > phase)
+is_phase_completed() {
+  local feature_json="$1"
+  local phase="$2"
+
+  local current=$(get_current_phase "$feature_json")
+  [ "$current" -gt "$phase" ]
+}
+
+# Check if we're at a specific action
+is_current_action() {
+  local feature_json="$1"
+  local action="$2"
+
+  local current=$(get_current_phase "$feature_json")
+  local action_phase=$(get_phase_for_action "$feature_json" "$action")
+
+  [ "$current" = "$action_phase" ]
+}

package/dist/{templates/scripts/feature.sh.txt → .trellis/scripts/feature.sh}

@@ -880,10 +880,14 @@ cmd_create_pr() {
     echo -e "[DRY-RUN] Would update feature.json:"
     echo -e "  status: review"
     echo -e "  pr_url: ${pr_url}"
+    echo -e "  current_phase: (set to create-pr phase)"
   else
-    jq --arg url "$pr_url" '.status = "review" | .pr_url = $url' "$feature_json" > "${feature_json}.tmp"
+    # Find the phase number for create-pr action
+    local create_pr_phase=$(jq -r '.next_action[] | select(.action == "create-pr") | .phase // 4' "$feature_json")
+    jq --arg url "$pr_url" --argjson phase "$create_pr_phase" \
+      '.status = "review" | .pr_url = $url | .current_phase = $phase' "$feature_json" > "${feature_json}.tmp"
     mv "${feature_json}.tmp" "$feature_json"
-    echo -e "${GREEN}Feature status updated to 'review'${NC}"
+    echo -e "${GREEN}Feature status updated to 'review', phase ${create_pr_phase}${NC}"
   fi
 
   # In dry-run, reset the staging area
@@ -970,8 +974,9 @@ case "${1:-}" in
     cmd_set_scope "$2" "$3"
     ;;
   create-pr)
+    # Delegate to multi-agent/create-pr.sh
     shift
-    cmd_create_pr "$@"
+    "$SCRIPT_DIR/multi-agent/create-pr.sh" "$@"
     ;;
   archive)
     cmd_archive "$2"

package/dist/{templates/scripts/multi-agent/cleanup.sh.txt → .trellis/scripts/multi-agent/cleanup.sh}

@@ -155,6 +155,76 @@ remove_from_registry() {
   log_info "Removed from registry"
 }
 
+# =============================================================================
+# Cleanup from Registry Only (no worktree)
+# =============================================================================
+cleanup_registry_only() {
+  local search="$1"
+
+  AGENTS_DIR=$(get_agents_dir)
+  REGISTRY_FILE="${AGENTS_DIR}/registry.json"
+
+  if [ ! -f "$REGISTRY_FILE" ]; then
+    log_error "No registry found"
+    exit 1
+  fi
+
+  # Find agent by id or feature_dir containing search term
+  local agent_info=$(jq -r --arg search "$search" '.agents[] | select(.id == $search or (.feature_dir | contains($search)))' "$REGISTRY_FILE" 2>/dev/null | head -1)
+
+  if [ -z "$agent_info" ] || [ "$agent_info" = "null" ]; then
+    log_error "No agent found in registry matching: $search"
+    exit 1
+  fi
+
+  local agent_id=$(echo "$agent_info" | jq -r '.id')
+  local feature_dir=$(echo "$agent_info" | jq -r '.feature_dir')
+  local worktree_path=$(echo "$agent_info" | jq -r '.worktree_path')
+
+  echo ""
+  echo -e "${BLUE}=== Cleanup Agent (no worktree) ===${NC}"
+  echo "  Agent ID:    $agent_id"
+  echo "  Feature Dir: $feature_dir"
+  echo ""
+
+  # Confirmation
+  if [ "$SKIP_CONFIRM" != "true" ]; then
+    if [ -t 0 ]; then
+      read -p "Archive feature 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 feature directory if exists
+  FEATURE_DIR_ABS="${PROJECT_ROOT}/${feature_dir}"
+  if [ -d "$FEATURE_DIR_ABS" ]; then
+    local features_dir=$(get_features_dir)
+    local archive_dir="$features_dir/archive"
+    local year_month=$(date +%Y-%m)
+    local month_dir="$archive_dir/$year_month"
+
+    mkdir -p "$month_dir"
+
+    local feature_name=$(basename "$feature_dir")
+    mv "$FEATURE_DIR_ABS" "$month_dir/"
+    log_success "Archived feature: $feature_name -> archive/$year_month/"
+  fi
+
+  # 2. Remove from registry
+  local updated=$(jq --arg id "$agent_id" '.agents = [.agents[] | select(.id != $id)]' "$REGISTRY_FILE")
+  echo "$updated" | jq '.' > "$REGISTRY_FILE"
+  log_success "Removed from registry: $agent_id"
+
+  log_success "Cleanup complete"
+}
+
 # =============================================================================
 # Cleanup Single Worktree
 # =============================================================================
@@ -169,8 +239,11 @@ cleanup_worktree() {
   local worktree_path=$(echo "$worktree_info" | grep "^worktree " | cut -d' ' -f2-)
 
   if [ -z "$worktree_path" ]; then
-    log_error "No worktree found for branch: $branch"
-    exit 1
+    # 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 ""
@@ -181,11 +254,17 @@ cleanup_worktree() {
 
   # Confirmation
   if [ "$SKIP_CONFIRM" != "true" ]; then
-    read -p "Remove this worktree? [y/N] " -n 1 -r
-    echo
-    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-      log_info "Aborted"
-      exit 0
+    # 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
 
@@ -243,11 +322,16 @@ cmd_merged() {
   echo ""
 
   if [ "$SKIP_CONFIRM" != "true" ]; then
-    read -p "Remove these merged worktrees? [y/N] " -n 1 -r
-    echo
-    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-      log_info "Aborted"
-      exit 0
+    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
 
@@ -279,12 +363,17 @@ cmd_all() {
   echo ""
 
   if [ "$SKIP_CONFIRM" != "true" ]; 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
+    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
 

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

@@ -0,0 +1,241 @@
+#!/bin/bash
+# =============================================================================
+# Multi-Agent Pipeline: Create PR
+# =============================================================================
+# Usage:
+#   ./create-pr.sh [feature-dir] [--dry-run]
+#
+# This script:
+# 1. Stages and commits all changes (excluding agent-traces)
+# 2. Pushes to origin
+# 3. Creates a Draft PR using `gh pr create`
+# 4. Updates feature.json with status="review", 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 [feature-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 Feature Directory
+# =============================================================================
+if [[ -z "$TARGET_DIR" ]]; then
+  # Try to get from .current-feature
+  CURRENT_FEATURE_FILE="$REPO_ROOT/.trellis/.current-feature"
+  if [[ -f "$CURRENT_FEATURE_FILE" ]]; then
+    TARGET_DIR=$(cat "$CURRENT_FEATURE_FILE")
+  fi
+
+  if [[ -z "$TARGET_DIR" ]]; then
+    echo -e "${RED}Error: No feature directory specified and no current feature set${NC}"
+    echo "Usage: $0 [feature-dir] [--dry-run]"
+    exit 1
+  fi
+fi
+
+# Support relative paths
+if [[ ! "$TARGET_DIR" = /* ]]; then
+  TARGET_DIR="$REPO_ROOT/$TARGET_DIR"
+fi
+
+FEATURE_JSON="$TARGET_DIR/feature.json"
+if [[ ! -f "$FEATURE_JSON" ]]; then
+  echo -e "${RED}Error: feature.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 feature config
+FEATURE_NAME=$(jq -r '.name' "$FEATURE_JSON")
+BASE_BRANCH=$(jq -r '.base_branch // "main"' "$FEATURE_JSON")
+SCOPE=$(jq -r '.scope // "core"' "$FEATURE_JSON")
+DEV_TYPE=$(jq -r '.dev_type // "feature"' "$FEATURE_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 "Feature: ${FEATURE_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 agent traces and temp files
+git reset ".trellis/agent-traces/" 2>/dev/null || true
+git reset .agent-log .agent-prompt .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}): ${FEATURE_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}): ${FEATURE_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 feature.json
+echo -e "${YELLOW}Updating feature status...${NC}"
+if [[ "$DRY_RUN" == "true" ]]; then
+  echo -e "[DRY-RUN] Would update feature.json:"
+  echo -e "  status: review"
+  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 "$FEATURE_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 = "review" | .pr_url = $url | .current_phase = $phase' "$FEATURE_JSON" > "${FEATURE_JSON}.tmp"
+  mv "${FEATURE_JSON}.tmp" "$FEATURE_JSON"
+  echo -e "${GREEN}Feature status updated to 'review', 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}"