@mindfoldhq/trellis 0.1.0 → 0.1.1

package/dist/templates/scripts/multi-agent/cleanup.sh.txt

@@ -0,0 +1,327 @@
+#!/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 feature 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"
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+CYAN='\033[0;36m'
+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
+  AGENTS_DIR=$(get_agents_dir)
+  REGISTRY_FILE="${AGENTS_DIR}/registry.json"
+
+  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 Feature
+# =============================================================================
+archive_feature() {
+  local worktree_path="$1"
+
+  # Find feature directory from registry
+  AGENTS_DIR=$(get_agents_dir)
+  REGISTRY_FILE="${AGENTS_DIR}/registry.json"
+
+  if [ ! -f "$REGISTRY_FILE" ]; then
+    return 0
+  fi
+
+  FEATURE_DIR=$(jq -r --arg path "$worktree_path" '.agents[] | select(.worktree_path == $path) | .feature_dir' "$REGISTRY_FILE" 2>/dev/null)
+
+  if [ -z "$FEATURE_DIR" ] || [ "$FEATURE_DIR" = "null" ]; then
+    return 0
+  fi
+
+  FEATURE_DIR_ABS="${PROJECT_ROOT}/${FEATURE_DIR}"
+  if [ ! -d "$FEATURE_DIR_ABS" ]; then
+    return 0
+  fi
+
+  # Archive to archive/{YYYY-MM}/
+  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/"
+}
+
+# =============================================================================
+# Remove from Registry
+# =============================================================================
+remove_from_registry() {
+  local worktree_path="$1"
+
+  AGENTS_DIR=$(get_agents_dir)
+  REGISTRY_FILE="${AGENTS_DIR}/registry.json"
+
+  if [ ! -f "$REGISTRY_FILE" ]; then
+    return 0
+  fi
+
+  # Remove by worktree path
+  local updated=$(jq --arg path "$worktree_path" '.agents = [.agents[] | select(.worktree_path != $path)]' "$REGISTRY_FILE")
+  echo "$updated" | jq '.' > "$REGISTRY_FILE"
+
+  log_info "Removed from registry"
+}
+
+# =============================================================================
+# 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
+    log_error "No worktree found for branch: $branch"
+    exit 1
+  fi
+
+  echo ""
+  echo -e "${BLUE}=== Cleanup Worktree ===${NC}"
+  echo "  Branch:   $branch"
+  echo "  Worktree: $worktree_path"
+  echo ""
+
+  # 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
+    fi
+  fi
+
+  # 1. Archive feature
+  archive_feature "$worktree_path"
+
+  # 2. Remove from registry
+  remove_from_registry "$worktree_path"
+
+  # 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
+    read -p "Remove these merged worktrees? [y/N] " -n 1 -r
+    echo
+    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+      log_info "Aborted"
+      exit 0
+    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
+    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
+  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/scripts/multi-agent/start.sh.txt

@@ -0,0 +1,323 @@
+#!/bin/bash
+# =============================================================================
+# Multi-Agent Pipeline: Start Worktree Agent
+# =============================================================================
+# Usage: ./start.sh <feature-dir>
+# Example: ./start.sh .trellis/agent-traces/taosu/features/16-my-feature
+#
+# This script:
+# 1. Creates worktree (if not exists) with dependency install
+# 2. Copies environment files (from worktree.yaml config)
+# 3. Sets .current-feature in worktree
+# 4. Starts claude agent in background
+# 5. Registers agent to registry.json
+#
+# Prerequisites:
+#   - feature.json must exist with 'branch' field
+#   - .claude/agents/dispatch.md must exist
+#
+# Configuration: .trellis/worktree.yaml
+# =============================================================================
+
+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"
+
+# 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"; }
+
+# =============================================================================
+# Constants
+# =============================================================================
+PROJECT_ROOT=$(get_repo_root)
+DISPATCH_MD_PATH=".claude/agents/dispatch.md"
+
+# =============================================================================
+# Parse Arguments
+# =============================================================================
+FEATURE_DIR=$1
+if [ -z "$FEATURE_DIR" ]; then
+  log_error "Feature directory required"
+  echo "Usage: $0 <feature-dir>"
+  echo "Example: $0 .trellis/agent-traces/taosu/features/16-my-feature"
+  exit 1
+fi
+
+# Normalize paths
+if [[ "$FEATURE_DIR" = /* ]]; then
+  FEATURE_DIR_RELATIVE="${FEATURE_DIR#$PROJECT_ROOT/}"
+  FEATURE_DIR_ABS="$FEATURE_DIR"
+else
+  FEATURE_DIR_RELATIVE="$FEATURE_DIR"
+  FEATURE_DIR_ABS="${PROJECT_ROOT}/${FEATURE_DIR}"
+fi
+
+FEATURE_JSON="${FEATURE_DIR_ABS}/feature.json"
+
+# =============================================================================
+# Validation
+# =============================================================================
+if [ ! -f "$FEATURE_JSON" ]; then
+  log_error "feature.json not found at ${FEATURE_JSON}"
+  exit 1
+fi
+
+DISPATCH_MD="${PROJECT_ROOT}/${DISPATCH_MD_PATH}"
+if [ ! -f "$DISPATCH_MD" ]; then
+  log_error "dispatch.md not found at ${DISPATCH_MD}"
+  exit 1
+fi
+
+CONFIG_FILE=$(get_worktree_config "$PROJECT_ROOT")
+if [ ! -f "$CONFIG_FILE" ]; then
+  log_error "worktree.yaml not found at ${CONFIG_FILE}"
+  exit 1
+fi
+
+# =============================================================================
+# Read Feature Config
+# =============================================================================
+echo ""
+echo -e "${BLUE}=== Multi-Agent Pipeline: Start ===${NC}"
+log_info "Feature: ${FEATURE_DIR_ABS}"
+
+BRANCH=$(jq -r '.branch' "$FEATURE_JSON")
+FEATURE_NAME=$(jq -r '.name' "$FEATURE_JSON")
+WORKTREE_PATH=$(jq -r '.worktree_path // empty' "$FEATURE_JSON")
+
+if [ -z "$BRANCH" ] || [ "$BRANCH" = "null" ]; then
+  log_error "branch field not set in feature.json"
+  log_info "Please set branch field first, e.g.:"
+  log_info "  jq '.branch = \"feature/my-feature\"' feature.json > tmp && mv tmp feature.json"
+  exit 1
+fi
+
+log_info "Branch: ${BRANCH}"
+log_info "Name: ${FEATURE_NAME}"
+
+# =============================================================================
+# Step 1: Create Worktree (if not exists)
+# =============================================================================
+if [ -z "$WORKTREE_PATH" ] || [ ! -d "$WORKTREE_PATH" ]; then
+  log_info "Step 1: Creating worktree..."
+
+  # Record current branch as base_branch (PR target)
+  BASE_BRANCH=$(git -C "$PROJECT_ROOT" branch --show-current)
+  log_info "Base branch (PR target): ${BASE_BRANCH}"
+
+  # Calculate worktree path
+  WORKTREE_BASE=$(get_worktree_base_dir "$PROJECT_ROOT")
+  mkdir -p "$WORKTREE_BASE"
+  WORKTREE_BASE="$(cd "$WORKTREE_BASE" && pwd)"
+  WORKTREE_PATH="${WORKTREE_BASE}/${BRANCH}"
+
+  # Create parent directory
+  mkdir -p "$(dirname "$WORKTREE_PATH")"
+  cd "$PROJECT_ROOT"
+
+  # Create branch if not exists
+  if git show-ref --verify --quiet "refs/heads/${BRANCH}"; then
+    log_info "Branch exists, checking out..."
+    git worktree add "$WORKTREE_PATH" "$BRANCH"
+  else
+    log_info "Creating new branch: $BRANCH"
+    git worktree add -b "$BRANCH" "$WORKTREE_PATH"
+  fi
+
+  log_success "Worktree created: ${WORKTREE_PATH}"
+
+  # Update feature.json with worktree_path and base_branch
+  jq --arg path "$WORKTREE_PATH" --arg base "$BASE_BRANCH" \
+    '.worktree_path = $path | .base_branch = $base' "$FEATURE_JSON" > "${FEATURE_JSON}.tmp"
+  mv "${FEATURE_JSON}.tmp" "$FEATURE_JSON"
+
+  # ----- Copy environment files -----
+  log_info "Copying environment files..."
+  cd "$WORKTREE_PATH"
+
+  COPY_LIST=$(get_worktree_copy_files "$PROJECT_ROOT")
+  COPY_COUNT=0
+
+  while IFS= read -r item; do
+    [ -z "$item" ] && continue
+
+    SOURCE="${PROJECT_ROOT}/${item}"
+    TARGET="${WORKTREE_PATH}/${item}"
+
+    if [ -f "$SOURCE" ]; then
+      mkdir -p "$(dirname "$TARGET")"
+      cp "$SOURCE" "$TARGET"
+      ((COPY_COUNT++))
+    fi
+  done <<< "$COPY_LIST"
+
+  if [ $COPY_COUNT -gt 0 ]; then
+    log_success "Copied $COPY_COUNT file(s)"
+  fi
+
+  # ----- Copy feature directory (may not be committed yet) -----
+  log_info "Copying feature directory..."
+  FEATURE_TARGET_DIR="${WORKTREE_PATH}/${FEATURE_DIR_RELATIVE}"
+  mkdir -p "$(dirname "$FEATURE_TARGET_DIR")"
+  cp -r "$FEATURE_DIR_ABS" "$(dirname "$FEATURE_TARGET_DIR")/"
+  log_success "Feature directory copied to worktree"
+
+  # ----- Run post_create hooks -----
+  log_info "Running post_create hooks..."
+
+  POST_CREATE=$(get_worktree_post_create_hooks "$PROJECT_ROOT")
+  HOOK_COUNT=0
+
+  while IFS= read -r cmd; do
+    [ -z "$cmd" ] && continue
+
+    log_info "  Running: $cmd"
+    if eval "$cmd"; then
+      ((HOOK_COUNT++))
+    else
+      log_error "Hook failed: $cmd"
+      exit 1
+    fi
+  done <<< "$POST_CREATE"
+
+  if [ $HOOK_COUNT -gt 0 ]; then
+    log_success "Ran $HOOK_COUNT hook(s)"
+  fi
+
+else
+  log_info "Step 1: Using existing worktree: ${WORKTREE_PATH}"
+fi
+
+# =============================================================================
+# Step 2: Set .current-feature in Worktree
+# =============================================================================
+log_info "Step 2: Setting current feature in worktree..."
+
+mkdir -p "${WORKTREE_PATH}/$DIR_WORKFLOW"
+echo "$FEATURE_DIR_RELATIVE" > "${WORKTREE_PATH}/$DIR_WORKFLOW/$FILE_CURRENT_FEATURE"
+log_success "Current feature set: ${FEATURE_DIR_RELATIVE}"
+
+# =============================================================================
+# Step 3: Prepare and Start Claude Agent
+# =============================================================================
+log_info "Step 3: Starting Claude agent..."
+
+# Extract dispatch.md content (skip frontmatter)
+DISPATCH_PROMPT=$(awk '
+  BEGIN { in_frontmatter = 0; started = 0 }
+  /^---$/ {
+    if (!started) { in_frontmatter = 1; started = 1; next }
+    else if (in_frontmatter) { in_frontmatter = 0; next }
+  }
+  !in_frontmatter { print }
+' "$DISPATCH_MD")
+
+# Update feature status
+jq '.status = "in_progress"' "$FEATURE_JSON" > "${FEATURE_JSON}.tmp"
+mv "${FEATURE_JSON}.tmp" "$FEATURE_JSON"
+
+cd "$WORKTREE_PATH"
+
+LOG_FILE="${WORKTREE_PATH}/.agent-log"
+PROMPT_FILE="${WORKTREE_PATH}/.agent-prompt"
+RUNNER_SCRIPT="${WORKTREE_PATH}/.agent-runner.sh"
+
+touch "$LOG_FILE"
+echo "$DISPATCH_PROMPT" > "$PROMPT_FILE"
+
+# Create runner script
+cat > "$RUNNER_SCRIPT" << 'RUNNER_EOF'
+#!/bin/bash
+cd "$(dirname "$0")"
+export https_proxy="${AGENT_HTTPS_PROXY:-}"
+export http_proxy="${AGENT_HTTP_PROXY:-}"
+export all_proxy="${AGENT_ALL_PROXY:-}"
+
+claude -p --dangerously-skip-permissions --output-format stream-json --verbose < .agent-prompt
+RUNNER_EOF
+chmod +x "$RUNNER_SCRIPT"
+
+# Start agent in background
+AGENT_HTTPS_PROXY="${https_proxy:-}" \
+AGENT_HTTP_PROXY="${http_proxy:-}" \
+AGENT_ALL_PROXY="${all_proxy:-}" \
+nohup "$RUNNER_SCRIPT" > "$LOG_FILE" 2>&1 &
+AGENT_PID=$!
+
+log_success "Agent started with PID: ${AGENT_PID}"
+
+# =============================================================================
+# Step 4: Register to Registry (in main repo, not worktree)
+# =============================================================================
+log_info "Step 4: Registering agent to registry..."
+
+DEVELOPER=$(get_developer "$PROJECT_ROOT")
+AGENTS_DIR=$(get_agents_dir "$PROJECT_ROOT")
+mkdir -p "$AGENTS_DIR"
+
+REGISTRY_FILE="${AGENTS_DIR}/registry.json"
+
+# Generate agent ID
+FEATURE_ID=$(jq -r '.id // empty' "$FEATURE_JSON")
+if [ -z "$FEATURE_ID" ]; then
+  FEATURE_ID=$(echo "$BRANCH" | sed 's/\//-/g')
+fi
+
+# Read or create registry
+if [ -f "$REGISTRY_FILE" ]; then
+  REGISTRY=$(cat "$REGISTRY_FILE")
+else
+  REGISTRY='{"agents":[]}'
+fi
+
+# Remove old record with same ID
+REGISTRY=$(echo "$REGISTRY" | jq --arg id "$FEATURE_ID" '.agents = [.agents[] | select(.id != $id)]')
+
+# Add new agent record
+STARTED_AT=$(date -Iseconds)
+NEW_AGENT=$(jq -n \
+  --arg id "$FEATURE_ID" \
+  --arg worktree "$WORKTREE_PATH" \
+  --arg pid "$AGENT_PID" \
+  --arg started_at "$STARTED_AT" \
+  --arg feature_dir "$FEATURE_DIR_RELATIVE" \
+  '{
+    id: $id,
+    worktree_path: $worktree,
+    pid: ($pid | tonumber),
+    started_at: $started_at,
+    feature_dir: $feature_dir
+  }')
+
+REGISTRY=$(echo "$REGISTRY" | jq --argjson agent "$NEW_AGENT" '.agents += [$agent]')
+echo "$REGISTRY" | jq '.' > "$REGISTRY_FILE"
+
+log_success "Agent registered: ${FEATURE_ID}"
+
+# =============================================================================
+# Summary
+# =============================================================================
+echo ""
+echo -e "${GREEN}=== Agent Started ===${NC}"
+echo ""
+echo "  ID:        $FEATURE_ID"
+echo "  PID:       $AGENT_PID"
+echo "  Worktree:  $WORKTREE_PATH"
+echo "  Feature:   $FEATURE_DIR_RELATIVE"
+echo "  Log:       $LOG_FILE"
+echo "  Registry:  $REGISTRY_FILE"
+echo ""
+echo -e "${YELLOW}To monitor:${NC} tail -f $LOG_FILE"
+echo -e "${YELLOW}To stop:${NC}    kill $AGENT_PID"