@mindfoldhq/trellis 0.1.9 → 0.2.1

package/dist/templates/trellis/scripts/multi-agent/start.sh

@@ -2,18 +2,18 @@
 # =============================================================================
 # Multi-Agent Pipeline: Start Worktree Agent
 # =============================================================================
-# Usage: ./start.sh <feature-dir>
-# Example: ./start.sh .trellis/agent-traces/taosu/features/16-my-feature
+# Usage: ./start.sh <task-dir>
+# Example: ./start.sh .trellis/tasks/01-21-my-task
 #
 # 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
+# 3. Sets .current-task in worktree
 # 4. Starts claude agent in background
 # 5. Registers agent to registry.json
 #
 # Prerequisites:
-#   - feature.json must exist with 'branch' field
+#   - task.json must exist with 'branch' field
 #   - .claude/agents/dispatch.md must exist
 #
 # Configuration: .trellis/worktree.yaml
@@ -48,30 +48,30 @@ 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"
+TASK_DIR=$1
+if [ -z "$TASK_DIR" ]; then
+  log_error "Task directory required"
+  echo "Usage: $0 <task-dir>"
+  echo "Example: $0 .trellis/tasks/01-21-my-task"
   exit 1
 fi
 
 # Normalize paths
-if [[ "$FEATURE_DIR" = /* ]]; then
-  FEATURE_DIR_RELATIVE="${FEATURE_DIR#$PROJECT_ROOT/}"
-  FEATURE_DIR_ABS="$FEATURE_DIR"
+if [[ "$TASK_DIR" = /* ]]; then
+  TASK_DIR_RELATIVE="${TASK_DIR#$PROJECT_ROOT/}"
+  TASK_DIR_ABS="$TASK_DIR"
 else
-  FEATURE_DIR_RELATIVE="$FEATURE_DIR"
-  FEATURE_DIR_ABS="${PROJECT_ROOT}/${FEATURE_DIR}"
+  TASK_DIR_RELATIVE="$TASK_DIR"
+  TASK_DIR_ABS="${PROJECT_ROOT}/${TASK_DIR}"
 fi
 
-FEATURE_JSON="${FEATURE_DIR_ABS}/feature.json"
+TASK_JSON="${TASK_DIR_ABS}/$FILE_TASK_JSON"
 
 # =============================================================================
 # Validation
 # =============================================================================
-if [ ! -f "$FEATURE_JSON" ]; then
-  log_error "feature.json not found at ${FEATURE_JSON}"
+if [ ! -f "$TASK_JSON" ]; then
+  log_error "task.json not found at ${TASK_JSON}"
   exit 1
 fi
 
@@ -88,24 +88,24 @@ if [ ! -f "$CONFIG_FILE" ]; then
 fi
 
 # =============================================================================
-# Read Feature Config
+# Read Task Config
 # =============================================================================
 echo ""
 echo -e "${BLUE}=== Multi-Agent Pipeline: Start ===${NC}"
-log_info "Feature: ${FEATURE_DIR_ABS}"
+log_info "Task: ${TASK_DIR_ABS}"
 
-BRANCH=$(jq -r '.branch' "$FEATURE_JSON")
-FEATURE_NAME=$(jq -r '.name' "$FEATURE_JSON")
-FEATURE_STATUS=$(jq -r '.status' "$FEATURE_JSON")
-WORKTREE_PATH=$(jq -r '.worktree_path // empty' "$FEATURE_JSON")
+BRANCH=$(jq -r '.branch' "$TASK_JSON")
+TASK_NAME=$(jq -r '.name' "$TASK_JSON")
+TASK_STATUS=$(jq -r '.status' "$TASK_JSON")
+WORKTREE_PATH=$(jq -r '.worktree_path // empty' "$TASK_JSON")
 
-# Check if feature was rejected
-if [ "$FEATURE_STATUS" = "rejected" ]; then
-  log_error "Feature was rejected by Plan Agent"
-  if [ -f "${FEATURE_DIR_ABS}/REJECTED.md" ]; then
+# Check if task was rejected
+if [ "$TASK_STATUS" = "rejected" ]; then
+  log_error "Task was rejected by Plan Agent"
+  if [ -f "${TASK_DIR_ABS}/REJECTED.md" ]; then
     echo ""
     echo -e "${YELLOW}Rejection reason:${NC}"
-    cat "${FEATURE_DIR_ABS}/REJECTED.md"
+    cat "${TASK_DIR_ABS}/REJECTED.md"
   fi
   echo ""
   log_info "To retry, delete this directory and run plan.sh again with revised requirements"
@@ -113,21 +113,21 @@ if [ "$FEATURE_STATUS" = "rejected" ]; then
 fi
 
 # Check if prd.md exists (plan completed successfully)
-if [ ! -f "${FEATURE_DIR_ABS}/prd.md" ]; then
+if [ ! -f "${TASK_DIR_ABS}/prd.md" ]; then
   log_error "prd.md not found - Plan Agent may not have completed"
-  log_info "Check plan log: ${FEATURE_DIR_ABS}/.plan-log"
+  log_info "Check plan log: ${TASK_DIR_ABS}/.plan-log"
   exit 1
 fi
 
 if [ -z "$BRANCH" ] || [ "$BRANCH" = "null" ]; then
-  log_error "branch field not set in feature.json"
+  log_error "branch field not set in task.json"
   log_info "Please set branch field first, e.g.:"
-  log_info "  jq '.branch = \"feature/my-feature\"' feature.json > tmp && mv tmp feature.json"
+  log_info "  jq '.branch = \"task/my-task\"' task.json > tmp && mv tmp task.json"
   exit 1
 fi
 
 log_info "Branch: ${BRANCH}"
-log_info "Name: ${FEATURE_NAME}"
+log_info "Name: ${TASK_NAME}"
 
 # =============================================================================
 # Step 1: Create Worktree (if not exists)
@@ -160,10 +160,10 @@ if [ -z "$WORKTREE_PATH" ] || [ ! -d "$WORKTREE_PATH" ]; then
 
   log_success "Worktree created: ${WORKTREE_PATH}"
 
-  # Update feature.json with worktree_path and base_branch
+  # Update task.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"
+    '.worktree_path = $path | .base_branch = $base' "$TASK_JSON" > "${TASK_JSON}.tmp"
+  mv "${TASK_JSON}.tmp" "$TASK_JSON"
 
   # ----- Copy environment files -----
   log_info "Copying environment files..."
@@ -189,12 +189,12 @@ if [ -z "$WORKTREE_PATH" ] || [ ! -d "$WORKTREE_PATH" ]; 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"
+  # ----- Copy task directory (may not be committed yet) -----
+  log_info "Copying task directory..."
+  TASK_TARGET_DIR="${WORKTREE_PATH}/${TASK_DIR_RELATIVE}"
+  mkdir -p "$(dirname "$TASK_TARGET_DIR")"
+  cp -r "$TASK_DIR_ABS" "$(dirname "$TASK_TARGET_DIR")/"
+  log_success "Task directory copied to worktree"
 
   # ----- Run post_create hooks -----
   log_info "Running post_create hooks..."
@@ -223,22 +223,22 @@ else
 fi
 
 # =============================================================================
-# Step 2: Set .current-feature in Worktree
+# Step 2: Set .current-task in Worktree
 # =============================================================================
-log_info "Step 2: Setting current feature in worktree..."
+log_info "Step 2: Setting current task 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}"
+echo "$TASK_DIR_RELATIVE" > "${WORKTREE_PATH}/$DIR_WORKFLOW/$FILE_CURRENT_TASK"
+log_success "Current task set: ${TASK_DIR_RELATIVE}"
 
 # =============================================================================
 # Step 3: Prepare and Start Claude Agent
 # =============================================================================
 log_info "Step 3: Starting Claude agent..."
 
-# Update feature status
-jq '.status = "in_progress"' "$FEATURE_JSON" > "${FEATURE_JSON}.tmp"
-mv "${FEATURE_JSON}.tmp" "$FEATURE_JSON"
+# Update task status
+jq '.status = "in_progress"' "$TASK_JSON" > "${TASK_JSON}.tmp"
+mv "${TASK_JSON}.tmp" "$TASK_JSON"
 
 cd "$WORKTREE_PATH"
 
@@ -275,15 +275,15 @@ log_success "Agent started with PID: ${AGENT_PID}"
 log_info "Step 4: Registering agent to registry..."
 
 # Generate agent ID
-FEATURE_ID=$(jq -r '.id // empty' "$FEATURE_JSON")
-if [ -z "$FEATURE_ID" ]; then
-  FEATURE_ID=$(echo "$BRANCH" | sed 's/\//-/g')
+TASK_ID=$(jq -r '.id // empty' "$TASK_JSON")
+if [ -z "$TASK_ID" ]; then
+  TASK_ID=$(echo "$BRANCH" | sed 's/\//-/g')
 fi
 
 # Use common registry function
-registry_add_agent "$FEATURE_ID" "$WORKTREE_PATH" "$AGENT_PID" "$FEATURE_DIR_RELATIVE" "$PROJECT_ROOT"
+registry_add_agent "$TASK_ID" "$WORKTREE_PATH" "$AGENT_PID" "$TASK_DIR_RELATIVE" "$PROJECT_ROOT"
 
-log_success "Agent registered: ${FEATURE_ID}"
+log_success "Agent registered: ${TASK_ID}"
 
 # =============================================================================
 # Summary
@@ -291,10 +291,10 @@ log_success "Agent registered: ${FEATURE_ID}"
 echo ""
 echo -e "${GREEN}=== Agent Started ===${NC}"
 echo ""
-echo "  ID:        $FEATURE_ID"
+echo "  ID:        $TASK_ID"
 echo "  PID:       $AGENT_PID"
 echo "  Worktree:  $WORKTREE_PATH"
-echo "  Feature:   $FEATURE_DIR_RELATIVE"
+echo "  Task:      $TASK_DIR_RELATIVE"
 echo "  Log:       $LOG_FILE"
 echo "  Registry:  $(registry_get_file "$PROJECT_ROOT")"
 echo ""

package/dist/templates/trellis/scripts/multi-agent/status.sh

@@ -3,11 +3,11 @@
 # Multi-Agent Pipeline: Status Monitor
 # =============================================================================
 # Usage:
-#   ./status.sh                     Show summary of all features (default)
+#   ./status.sh                     Show summary of all tasks (default)
 #   ./status.sh --list              List all worktrees and agents
-#   ./status.sh --detail <feature>  Detailed feature status
-#   ./status.sh --watch <feature>   Watch agent log in real-time
-#   ./status.sh --log <feature>     Show recent log entries
+#   ./status.sh --detail <task>     Detailed task status
+#   ./status.sh --watch <task>      Watch agent log in real-time
+#   ./status.sh --log <task>        Show recent log entries
 #   ./status.sh --registry          Show agent registry
 # =============================================================================
 
@@ -18,7 +18,7 @@ source "$SCRIPT_DIR/../common/paths.sh"
 source "$SCRIPT_DIR/../common/worktree.sh"
 source "$SCRIPT_DIR/../common/developer.sh"
 source "$SCRIPT_DIR/../common/phase.sh"
-source "$SCRIPT_DIR/../common/backlog.sh"
+source "$SCRIPT_DIR/../common/task-queue.sh"
 
 # Colors
 RED='\033[0;31m'
@@ -99,7 +99,7 @@ status_color() {
   esac
 }
 
-# Find agent by feature name or ID
+# Find agent by task name or ID
 find_agent() {
   local search="$1"
   AGENTS_DIR=$(get_agents_dir)
@@ -112,9 +112,9 @@ find_agent() {
   # Try exact ID match first (use -c for compact single-line JSON output)
   local agent=$(jq -c --arg id "$search" '.agents[] | select(.id == $id)' "$REGISTRY_FILE" 2>/dev/null)
 
-  # Try partial match on feature_dir (use -c for compact single-line JSON output)
+  # Try partial match on task_dir (use -c for compact single-line JSON output)
   if [ -z "$agent" ] || [ "$agent" = "null" ]; then
-    agent=$(jq -c --arg search "$search" '[.agents[] | select(.feature_dir | contains($search))] | first' "$REGISTRY_FILE" 2>/dev/null)
+    agent=$(jq -c --arg search "$search" '[.agents[] | select(.task_dir | contains($search))] | first' "$REGISTRY_FILE" 2>/dev/null)
   fi
 
   echo "$agent"
@@ -185,18 +185,18 @@ cmd_help() {
 Multi-Agent Pipeline: Status Monitor
 
 Usage:
-  $0                         Show summary of all features
+  $0                         Show summary of all tasks
   $0 --list                  List all worktrees and agents
-  $0 --detail <feature>      Detailed feature status
-  $0 --progress <feature>    Quick progress view with recent activity
-  $0 --watch <feature>       Watch agent log in real-time
-  $0 --log <feature>         Show recent log entries
+  $0 --detail <task>         Detailed task status
+  $0 --progress <task>       Quick progress view with recent activity
+  $0 --watch <task>          Watch agent log in real-time
+  $0 --log <task>            Show recent log entries
   $0 --registry              Show agent registry
 
 Examples:
-  $0 --detail my-feature
-  $0 --progress my-feature
-  $0 --watch 16-worktree-support
+  $0 --detail my-task
+  $0 --progress my-task
+  $0 --watch 01-16-worktree-support
   $0 --log worktree-support
 EOF
 }
@@ -288,9 +288,9 @@ count_modified_files() {
 cmd_summary() {
   ensure_developer
 
-  local features_dir=$(get_features_dir)
-  if [ ! -d "$features_dir" ]; then
-    echo "No features directory found"
+  local tasks_dir=$(get_tasks_dir)
+  if [ ! -d "$tasks_dir" ]; then
+    echo "No tasks directory found"
     exit 0
   fi
 
@@ -307,27 +307,27 @@ cmd_summary() {
     done < <(jq -r '.agents[].pid' "$REGISTRY_FILE" 2>/dev/null)
   fi
 
-  # Backlog stats
-  local backlog_stats=$(get_backlog_stats "$PROJECT_ROOT")
+  # Task queue stats
+  local task_stats=$(get_task_queue_stats "$PROJECT_ROOT")
 
   echo -e "${BLUE}=== Multi-Agent Status ===${NC}"
   echo -e "  Agents:  ${GREEN}${running_count}${NC} running / ${total_agents} registered"
-  echo -e "  Backlog: ${backlog_stats}"
+  echo -e "  Tasks:   ${task_stats}"
   echo ""
 
   # Check if any agents are running and show detailed view
   local has_running_agent=false
 
-  for d in "$features_dir"/*/; do
+  for d in "$tasks_dir"/*/; do
     [ ! -d "$d" ] && continue
     [[ "$(basename "$d")" == "archive" ]] && continue
 
     local name=$(basename "$d")
-    local feature_json="$d/feature.json"
+    local task_json="$d/task.json"
     local status="unknown"
 
-    if [ -f "$feature_json" ]; then
-      status=$(jq -r '.status // "unknown"' "$feature_json")
+    if [ -f "$task_json" ]; then
+      status=$(jq -r '.status // "unknown"' "$task_json")
     fi
 
     # Check agent status
@@ -338,7 +338,7 @@ cmd_summary() {
     local is_agent_running=false
 
     if [ -f "$REGISTRY_FILE" ]; then
-      agent_info=$(jq -c --arg name "$name" '[.agents[] | select(.feature_dir | contains($name))] | first' "$REGISTRY_FILE" 2>/dev/null)
+      agent_info=$(jq -c --arg name "$name" '[.agents[] | select(.task_dir | contains($name))] | first' "$REGISTRY_FILE" 2>/dev/null)
       if [ -n "$agent_info" ] && [ "$agent_info" != "null" ]; then
         pid=$(echo "$agent_info" | jq -r '.pid')
         worktree=$(echo "$agent_info" | jq -r '.worktree_path')
@@ -354,11 +354,11 @@ cmd_summary() {
 
     if [ "$is_agent_running" = true ]; then
       # Detailed view for running agents
-      # Read feature.json from worktree (has live phase info)
-      local feature_dir_rel=$(echo "$agent_info" | jq -r '.feature_dir')
-      local worktree_feature_json="$worktree/$feature_dir_rel/feature.json"
-      local phase_source="$feature_json"
-      [ -f "$worktree_feature_json" ] && phase_source="$worktree_feature_json"
+      # Read task.json from worktree (has live phase info)
+      local task_dir_rel=$(echo "$agent_info" | jq -r '.task_dir')
+      local worktree_task_json="$worktree/$task_dir_rel/task.json"
+      local phase_source="$task_json"
+      [ -f "$worktree_task_json" ] && phase_source="$worktree_task_json"
 
       local phase_info=$(get_phase_info "$phase_source")
       local elapsed=$(calc_elapsed "$started")
@@ -396,8 +396,8 @@ cmd_summary() {
       echo ""
     else
       # No agent, just show status with developer and priority
-      local developer=$(jq -r '.developer // "?"' "$feature_json" 2>/dev/null)
-      local priority=$(jq -r '.priority // "?"' "$feature_json" 2>/dev/null)
+      local developer=$(jq -r '.developer // "?"' "$task_json" 2>/dev/null)
+      local priority=$(jq -r '.priority // "?"' "$task_json" 2>/dev/null)
 
       # Color priority
       local priority_color="${NC}"
@@ -421,7 +421,7 @@ cmd_summary() {
 
 cmd_progress() {
   if [ -z "$TARGET" ]; then
-    echo "Usage: $0 --progress <feature>"
+    echo "Usage: $0 --progress <task>"
     exit 1
   fi
 
@@ -434,7 +434,7 @@ cmd_progress() {
   local id=$(echo "$agent" | jq -r '.id')
   local pid=$(echo "$agent" | jq -r '.pid')
   local worktree=$(echo "$agent" | jq -r '.worktree_path')
-  local feature_dir=$(echo "$agent" | jq -r '.feature_dir')
+  local task_dir=$(echo "$agent" | jq -r '.task_dir')
   local started=$(echo "$agent" | jq -r '.started_at')
   local log_file="$worktree/.agent-log"
 
@@ -443,13 +443,13 @@ cmd_progress() {
     exit 1
   fi
 
-  # Get phase info from worktree's feature.json
-  local worktree_feature_json="$worktree/$feature_dir/feature.json"
+  # Get phase info from worktree's task.json
+  local worktree_task_json="$worktree/$task_dir/task.json"
   local phase_info="N/A"
   local current_phase=0
-  if [ -f "$worktree_feature_json" ]; then
-    phase_info=$(get_phase_info "$worktree_feature_json")
-    current_phase=$(jq -r '.current_phase // 0' "$worktree_feature_json")
+  if [ -f "$worktree_task_json" ]; then
+    phase_info=$(get_phase_info "$worktree_task_json")
+    current_phase=$(jq -r '.current_phase // 0' "$worktree_task_json")
   fi
 
   local elapsed=$(calc_elapsed "$started")
@@ -519,7 +519,7 @@ cmd_progress() {
 
 cmd_detail() {
   if [ -z "$TARGET" ]; then
-    echo "Usage: $0 --detail <feature>"
+    echo "Usage: $0 --detail <task>"
     exit 1
   fi
 
@@ -532,34 +532,34 @@ cmd_detail() {
   local id=$(echo "$agent" | jq -r '.id')
   local pid=$(echo "$agent" | jq -r '.pid')
   local worktree=$(echo "$agent" | jq -r '.worktree_path')
-  local feature_dir=$(echo "$agent" | jq -r '.feature_dir')
+  local task_dir=$(echo "$agent" | jq -r '.task_dir')
   local started=$(echo "$agent" | jq -r '.started_at')
 
   echo -e "${BLUE}=== Agent Detail: $id ===${NC}"
   echo ""
-  echo "  ID:          $id"
-  echo "  PID:         $pid"
-  echo "  Worktree:    $worktree"
-  echo "  Feature Dir: $feature_dir"
-  echo "  Started:     $started"
+  echo "  ID:        $id"
+  echo "  PID:       $pid"
+  echo "  Worktree:  $worktree"
+  echo "  Task Dir:  $task_dir"
+  echo "  Started:   $started"
   echo ""
 
   # Status
   if is_running "$pid"; then
-    echo -e "  Status:      ${GREEN}Running${NC}"
+    echo -e "  Status:    ${GREEN}Running${NC}"
   else
-    echo -e "  Status:      ${RED}Stopped${NC}"
+    echo -e "  Status:    ${RED}Stopped${NC}"
   fi
 
-  # Feature info
-  local feature_json="$PROJECT_ROOT/$feature_dir/feature.json"
-  if [ -f "$feature_json" ]; then
+  # Task info
+  local task_json="$PROJECT_ROOT/$task_dir/task.json"
+  if [ -f "$task_json" ]; then
     echo ""
-    echo -e "${BLUE}=== Feature Info ===${NC}"
+    echo -e "${BLUE}=== Task Info ===${NC}"
     echo ""
-    local status=$(jq -r '.status // "unknown"' "$feature_json")
-    local branch=$(jq -r '.branch // "N/A"' "$feature_json")
-    local base=$(jq -r '.base_branch // "N/A"' "$feature_json")
+    local status=$(jq -r '.status // "unknown"' "$task_json")
+    local branch=$(jq -r '.branch // "N/A"' "$task_json")
+    local base=$(jq -r '.base_branch // "N/A"' "$task_json")
     echo "  Status:      $status"
     echo "  Branch:      $branch"
     echo "  Base Branch: $base"
@@ -588,7 +588,7 @@ cmd_detail() {
 
 cmd_watch() {
   if [ -z "$TARGET" ]; then
-    echo "Usage: $0 --watch <feature>"
+    echo "Usage: $0 --watch <task>"
     exit 1
   fi
 
@@ -615,7 +615,7 @@ cmd_watch() {
 
 cmd_log() {
   if [ -z "$TARGET" ]; then
-    echo "Usage: $0 --log <feature>"
+    echo "Usage: $0 --log <task>"
     exit 1
   fi