@mindfoldhq/trellis 0.1.9 → 0.2.1

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

@@ -7,57 +7,57 @@
 # 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 "$task_json"          # Returns current phase number
+#   get_total_phases "$task_json"           # Returns total phase count
+#   get_phase_action "$task_json" "$phase"  # Returns action name for phase
+#   get_phase_info "$task_json"             # Returns "N/M (action)" format
+#   set_phase "$task_json" "$phase"         # Sets current_phase
+#   advance_phase "$task_json"              # Advances to next phase
+#   get_phase_for_action "$task_json" "$action"  # Returns phase number for action
 # =============================================================================
 
 # Get current phase number
 get_current_phase() {
-  local feature_json="$1"
-  if [ ! -f "$feature_json" ]; then
+  local task_json="$1"
+  if [ ! -f "$task_json" ]; then
     echo "0"
     return
   fi
-  jq -r '.current_phase // 0' "$feature_json"
+  jq -r '.current_phase // 0' "$task_json"
 }
 
 # Get total number of phases
 get_total_phases() {
-  local feature_json="$1"
-  if [ ! -f "$feature_json" ]; then
+  local task_json="$1"
+  if [ ! -f "$task_json" ]; then
     echo "0"
     return
   fi
-  jq -r '.next_action | length // 0' "$feature_json"
+  jq -r '.next_action | length // 0' "$task_json"
 }
 
 # Get action name for a specific phase
 get_phase_action() {
-  local feature_json="$1"
+  local task_json="$1"
   local phase="$2"
-  if [ ! -f "$feature_json" ]; then
+  if [ ! -f "$task_json" ]; then
     echo "unknown"
     return
   fi
-  jq -r --argjson phase "$phase" '.next_action[] | select(.phase == $phase) | .action // "unknown"' "$feature_json"
+  jq -r --argjson phase "$phase" '.next_action[] | select(.phase == $phase) | .action // "unknown"' "$task_json"
 }
 
 # Get formatted phase info: "N/M (action)"
 get_phase_info() {
-  local feature_json="$1"
-  if [ ! -f "$feature_json" ]; then
+  local task_json="$1"
+  if [ ! -f "$task_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")
+  local current_phase=$(get_current_phase "$task_json")
+  local total_phases=$(get_total_phases "$task_json")
+  local action_name=$(get_phase_action "$task_json" "$current_phase")
 
   if [ "$current_phase" = "0" ] || [ "$current_phase" = "null" ]; then
     echo "0/${total_phases} (pending)"
@@ -68,29 +68,29 @@ get_phase_info() {
 
 # Set current phase to a specific value
 set_phase() {
-  local feature_json="$1"
+  local task_json="$1"
   local phase="$2"
 
-  if [ ! -f "$feature_json" ]; then
-    echo "Error: feature.json not found: $feature_json" >&2
+  if [ ! -f "$task_json" ]; then
+    echo "Error: task.json not found: $task_json" >&2
     return 1
   fi
 
-  jq --argjson phase "$phase" '.current_phase = $phase' "$feature_json" > "${feature_json}.tmp"
-  mv "${feature_json}.tmp" "$feature_json"
+  jq --argjson phase "$phase" '.current_phase = $phase' "$task_json" > "${task_json}.tmp"
+  mv "${task_json}.tmp" "$task_json"
 }
 
 # Advance to next phase
 advance_phase() {
-  local feature_json="$1"
+  local task_json="$1"
 
-  if [ ! -f "$feature_json" ]; then
-    echo "Error: feature.json not found: $feature_json" >&2
+  if [ ! -f "$task_json" ]; then
+    echo "Error: task.json not found: $task_json" >&2
     return 1
   fi
 
-  local current=$(get_current_phase "$feature_json")
-  local total=$(get_total_phases "$feature_json")
+  local current=$(get_current_phase "$task_json")
+  local total=$(get_total_phases "$task_json")
   local next=$((current + 1))
 
   if [ "$next" -gt "$total" ]; then
@@ -98,20 +98,20 @@ advance_phase() {
     return 0
   fi
 
-  set_phase "$feature_json" "$next"
+  set_phase "$task_json" "$next"
 }
 
 # Get phase number for a specific action name
 get_phase_for_action() {
-  local feature_json="$1"
+  local task_json="$1"
   local action="$2"
 
-  if [ ! -f "$feature_json" ]; then
+  if [ ! -f "$task_json" ]; then
     echo "0"
     return
   fi
 
-  jq -r --arg action "$action" '.next_action[] | select(.action == $action) | .phase // 0' "$feature_json"
+  jq -r --arg action "$action" '.next_action[] | select(.action == $action) | .phase // 0' "$task_json"
 }
 
 # Map subagent type to action name
@@ -131,20 +131,20 @@ map_subagent_to_action() {
 
 # Check if a phase is completed (current_phase > phase)
 is_phase_completed() {
-  local feature_json="$1"
+  local task_json="$1"
   local phase="$2"
 
-  local current=$(get_current_phase "$feature_json")
+  local current=$(get_current_phase "$task_json")
   [ "$current" -gt "$phase" ]
 }
 
 # Check if we're at a specific action
 is_current_action() {
-  local feature_json="$1"
+  local task_json="$1"
   local action="$2"
 
-  local current=$(get_current_phase "$feature_json")
-  local action_phase=$(get_phase_for_action "$feature_json" "$action")
+  local current=$(get_current_phase "$task_json")
+  local action_phase=$(get_phase_for_action "$task_json" "$action")
 
   [ "$current" = "$action_phase" ]
 }

package/dist/templates/trellis/scripts/common/registry.sh

@@ -8,7 +8,7 @@
 #   registry_get_file        - Get registry file path
 #   registry_get_agent_by_id - Find agent by ID
 #   registry_get_agent_by_worktree - Find agent by worktree path
-#   registry_get_feature_dir - Get feature dir for a worktree
+#   registry_get_task_dir - Get feature dir for a worktree
 #   registry_remove_by_id    - Remove agent by ID
 #   registry_remove_by_worktree - Remove agent by worktree path
 #   registry_add_agent       - Add agent to registry
@@ -99,7 +99,7 @@ registry_get_agent_by_worktree() {
   return 1
 }
 
-# Search agent by ID or feature_dir containing search term
+# Search agent by ID or task_dir containing search term
 # Args: search_term, [repo_root]
 # Returns: first matching agent JSON object (compact), or empty if not found
 registry_search_agent() {
@@ -112,7 +112,7 @@ registry_search_agent() {
   fi
 
   local agent=$(jq -c --arg search "$search" \
-    '[.agents[] | select(.id == $search or (.feature_dir | contains($search)))] | first' \
+    '[.agents[] | select(.id == $search or (.task_dir | contains($search)))] | first' \
     "$registry_file" 2>/dev/null)
 
   if [[ -n "$agent" ]] && [[ "$agent" != "null" ]]; then
@@ -125,8 +125,8 @@ registry_search_agent() {
 
 # Get feature directory for a worktree
 # Args: worktree_path, [repo_root]
-# Returns: feature_dir value, or empty if not found
-registry_get_feature_dir() {
+# Returns: task_dir value, or empty if not found
+registry_get_task_dir() {
   local worktree_path="$1"
   local repo_root="${2:-$(get_repo_root)}"
   local registry_file=$(registry_get_file "$repo_root")
@@ -135,12 +135,12 @@ registry_get_feature_dir() {
     return 1
   fi
 
-  local feature_dir=$(jq -r --arg path "$worktree_path" \
-    '.agents[] | select(.worktree_path == $path) | .feature_dir' \
+  local task_dir=$(jq -r --arg path "$worktree_path" \
+    '.agents[] | select(.worktree_path == $path) | .task_dir' \
     "$registry_file" 2>/dev/null)
 
-  if [[ -n "$feature_dir" ]] && [[ "$feature_dir" != "null" ]]; then
-    echo "$feature_dir"
+  if [[ -n "$task_dir" ]] && [[ "$task_dir" != "null" ]]; then
+    echo "$task_dir"
     return 0
   fi
 
@@ -192,13 +192,13 @@ registry_remove_by_worktree() {
 }
 
 # Add agent to registry (replaces if same ID exists)
-# Args: agent_id, worktree_path, pid, feature_dir, [repo_root]
+# Args: agent_id, worktree_path, pid, task_dir, [repo_root]
 # Returns: 0 on success
 registry_add_agent() {
   local agent_id="$1"
   local worktree_path="$2"
   local pid="$3"
-  local feature_dir="$4"
+  local task_dir="$4"
   local repo_root="${5:-$(get_repo_root)}"
 
   _ensure_registry "$repo_root"
@@ -217,13 +217,13 @@ registry_add_agent() {
     --arg worktree "$worktree_path" \
     --arg pid "$pid" \
     --arg started_at "$started_at" \
-    --arg feature_dir "$feature_dir" \
+    --arg task_dir "$task_dir" \
     '{
       id: $id,
       worktree_path: $worktree,
       pid: ($pid | tonumber),
       started_at: $started_at,
-      feature_dir: $feature_dir
+      task_dir: $task_dir
     }')
 
   # Add to registry

package/dist/templates/trellis/scripts/common/task-queue.sh

@@ -0,0 +1,142 @@
+#!/bin/bash
+# Task queue utility functions
+#
+# Usage: source this file in other scripts
+#   source "$(dirname "$0")/common/task-queue.sh"
+#
+# Provides:
+#   list_pending_tasks     - List tasks with pending status
+#   get_task_stats         - Get P0/P1/P2/P3 counts
+
+# Ensure paths.sh is loaded
+if ! type get_repo_root &>/dev/null; then
+  echo "Error: paths.sh must be sourced before task-queue.sh" >&2
+  exit 1
+fi
+
+# =============================================================================
+# Public Functions
+# =============================================================================
+
+# List tasks by status
+# Args: [filter_status]
+# Output: formatted list to stdout
+list_tasks_by_status() {
+  local filter_status="${1:-}"
+  local repo_root="${2:-$(get_repo_root)}"
+
+  local tasks_dir=$(get_tasks_dir "$repo_root")
+
+  if [[ ! -d "$tasks_dir" ]]; then
+    return 0
+  fi
+
+  for d in "$tasks_dir"/*/; do
+    if [[ -d "$d" ]] && [[ "$(basename "$d")" != "archive" ]]; then
+      local task_json="$d/$FILE_TASK_JSON"
+      if [[ -f "$task_json" ]]; then
+        local id=$(jq -r '.id' "$task_json")
+        local title=$(jq -r '.title // .name' "$task_json")
+        local priority=$(jq -r '.priority // "P2"' "$task_json")
+        local status=$(jq -r '.status // "planning"' "$task_json")
+        local assignee=$(jq -r '.assignee // "-"' "$task_json")
+
+        # Apply filter
+        if [[ -n "$filter_status" ]] && [[ "$status" != "$filter_status" ]]; then
+          continue
+        fi
+
+        echo "$priority|$id|$title|$status|$assignee"
+      fi
+    fi
+  done
+}
+
+# List pending tasks
+list_pending_tasks() {
+  list_tasks_by_status "planning" "$@"
+}
+
+# List tasks assigned to a specific developer
+# Args: developer_name, [filter_status], [repo_root]
+# Output: formatted list to stdout
+list_tasks_by_assignee() {
+  local assignee="$1"
+  local filter_status="${2:-}"
+  local repo_root="${3:-$(get_repo_root)}"
+
+  local tasks_dir=$(get_tasks_dir "$repo_root")
+
+  if [[ ! -d "$tasks_dir" ]]; then
+    return 0
+  fi
+
+  for d in "$tasks_dir"/*/; do
+    if [[ -d "$d" ]] && [[ "$(basename "$d")" != "archive" ]]; then
+      local task_json="$d/$FILE_TASK_JSON"
+      if [[ -f "$task_json" ]]; then
+        local id=$(jq -r '.id' "$task_json")
+        local title=$(jq -r '.title // .name' "$task_json")
+        local priority=$(jq -r '.priority // "P2"' "$task_json")
+        local status=$(jq -r '.status // "planning"' "$task_json")
+        local task_assignee=$(jq -r '.assignee // "-"' "$task_json")
+
+        # Apply assignee filter
+        if [[ "$task_assignee" != "$assignee" ]]; then
+          continue
+        fi
+
+        # Apply status filter
+        if [[ -n "$filter_status" ]] && [[ "$status" != "$filter_status" ]]; then
+          continue
+        fi
+
+        echo "$priority|$id|$title|$status|$task_assignee"
+      fi
+    fi
+  done
+}
+
+# List my tasks (current developer)
+# Args: [filter_status], [repo_root]
+list_my_tasks() {
+  local filter_status="${1:-}"
+  local repo_root="${2:-$(get_repo_root)}"
+  local developer=$(get_developer "$repo_root")
+
+  if [[ -z "$developer" ]]; then
+    echo "Error: Developer not set" >&2
+    return 1
+  fi
+
+  list_tasks_by_assignee "$developer" "$filter_status" "$repo_root"
+}
+
+# Get task statistics
+# Output: "P0:N P1:N P2:N P3:N Total:N"
+get_task_stats() {
+  local repo_root="${1:-$(get_repo_root)}"
+  local tasks_dir=$(get_tasks_dir "$repo_root")
+
+  local p0=0 p1=0 p2=0 p3=0 total=0
+
+  if [[ -d "$tasks_dir" ]]; then
+    for d in "$tasks_dir"/*/; do
+      if [[ -d "$d" ]] && [[ "$(basename "$d")" != "archive" ]]; then
+        local task_json="$d/$FILE_TASK_JSON"
+        if [[ -f "$task_json" ]]; then
+          local priority=$(jq -r '.priority // "P2"' "$task_json" 2>/dev/null)
+          case "$priority" in
+            P0) ((p0++)) ;;
+            P1) ((p1++)) ;;
+            P2) ((p2++)) ;;
+            P3) ((p3++)) ;;
+          esac
+          ((total++))
+        fi
+      fi
+    done
+  fi
+
+  echo "P0:$p0 P1:$p1 P2:$p2 P3:$p3 Total:$total"
+}

package/dist/templates/trellis/scripts/common/task-utils.sh

@@ -0,0 +1,151 @@
+#!/bin/bash
+# Task utility functions
+#
+# Usage: source this file in other scripts
+#   source "$(dirname "$0")/common/task-utils.sh"
+#
+# Provides:
+#   is_safe_task_path      - Validate task path is safe to operate on
+#   find_task_by_name      - Find task directory by name
+#   archive_task_dir       - Archive task to monthly directory
+
+# Ensure dependencies are loaded
+if ! type get_repo_root &>/dev/null; then
+  echo "Error: paths.sh must be sourced before task-utils.sh" >&2
+  exit 1
+fi
+
+# =============================================================================
+# Path Safety
+# =============================================================================
+
+# Check if a relative task path is safe to operate on
+# Args: task_path (relative), repo_root
+# Returns: 0 if safe, 1 if dangerous
+# Outputs: error message to stderr if unsafe
+is_safe_task_path() {
+  local task_path="$1"
+  local repo_root="${2:-$(get_repo_root)}"
+
+  # Check empty or null
+  if [[ -z "$task_path" ]] || [[ "$task_path" = "null" ]]; then
+    echo "Error: empty or null task path" >&2
+    return 1
+  fi
+
+  # Reject absolute paths
+  if [[ "$task_path" = /* ]]; then
+    echo "Error: absolute path not allowed: $task_path" >&2
+    return 1
+  fi
+
+  # Reject ".", "..", paths starting with "./" or "../", or containing ".."
+  if [[ "$task_path" = "." ]] || [[ "$task_path" = ".." ]] || \
+     [[ "$task_path" = "./" ]] || [[ "$task_path" == ./* ]] || \
+     [[ "$task_path" == *".."* ]]; then
+    echo "Error: path traversal not allowed: $task_path" >&2
+    return 1
+  fi
+
+  # Final check: ensure resolved path is not the repo root
+  local abs_path="${repo_root}/${task_path}"
+  if [[ -e "$abs_path" ]]; then
+    local resolved=$(realpath "$abs_path" 2>/dev/null)
+    local root_resolved=$(realpath "$repo_root" 2>/dev/null)
+    if [[ "$resolved" = "$root_resolved" ]]; then
+      echo "Error: path resolves to repo root: $task_path" >&2
+      return 1
+    fi
+  fi
+
+  return 0
+}
+
+# =============================================================================
+# Task Lookup
+# =============================================================================
+
+# Find task directory by name (exact or suffix match)
+# Args: task_name, tasks_dir
+# Returns: absolute path to task directory, or empty if not found
+find_task_by_name() {
+  local task_name="$1"
+  local tasks_dir="$2"
+
+  if [[ -z "$task_name" ]] || [[ -z "$tasks_dir" ]]; then
+    return 1
+  fi
+
+  # Try exact match first
+  local task_dir=$(find "$tasks_dir" -maxdepth 1 -type d -name "${task_name}" 2>/dev/null | head -1)
+
+  # Try suffix match (e.g., "my-task" matches "01-21-my-task")
+  if [[ -z "$task_dir" ]]; then
+    task_dir=$(find "$tasks_dir" -maxdepth 1 -type d -name "*-${task_name}" 2>/dev/null | head -1)
+  fi
+
+  if [[ -n "$task_dir" ]] && [[ -d "$task_dir" ]]; then
+    echo "$task_dir"
+    return 0
+  fi
+
+  return 1
+}
+
+# =============================================================================
+# Archive Operations
+# =============================================================================
+
+# Archive a task directory to archive/{YYYY-MM}/
+# Args: task_dir_abs, [repo_root]
+# Returns: 0 on success, 1 on error
+# Outputs: archive destination path
+archive_task_dir() {
+  local task_dir_abs="$1"
+  local repo_root="${2:-$(get_repo_root)}"
+
+  if [[ ! -d "$task_dir_abs" ]]; then
+    echo "Error: task directory not found: $task_dir_abs" >&2
+    return 1
+  fi
+
+  # Get tasks directory (parent of the task)
+  local tasks_dir=$(dirname "$task_dir_abs")
+  local archive_dir="$tasks_dir/archive"
+  local year_month=$(date +%Y-%m)
+  local month_dir="$archive_dir/$year_month"
+
+  # Create archive directory
+  mkdir -p "$month_dir"
+
+  # Move task to archive
+  local task_name=$(basename "$task_dir_abs")
+  mv "$task_dir_abs" "$month_dir/"
+
+  # Output the destination
+  echo "$month_dir/$task_name"
+  return 0
+}
+
+# Complete archive workflow: archive directory
+# Args: task_dir_abs, [repo_root]
+# Returns: 0 on success
+# Outputs: lines with status info
+archive_task_complete() {
+  local task_dir_abs="$1"
+  local repo_root="${2:-$(get_repo_root)}"
+
+  if [[ ! -d "$task_dir_abs" ]]; then
+    echo "Error: task directory not found: $task_dir_abs" >&2
+    return 1
+  fi
+
+  # Archive the directory
+  local archive_dest
+  if archive_dest=$(archive_task_dir "$task_dir_abs" "$repo_root"); then
+    echo "archived_to:$archive_dest"
+    return 0
+  fi
+
+  return 1
+}

package/dist/templates/trellis/scripts/common/worktree.sh

@@ -120,9 +120,9 @@ get_worktree_post_create_hooks() {
 # Returns: absolute path to agents directory
 get_agents_dir() {
   local repo_root="${1:-$(get_repo_root)}"
-  local progress_dir=$(get_progress_dir "$repo_root")
+  local workspace_dir=$(get_workspace_dir "$repo_root")
 
-  if [[ -n "$progress_dir" ]]; then
-    echo "$progress_dir/.agents"
+  if [[ -n "$workspace_dir" ]]; then
+    echo "$workspace_dir/.agents"
   fi
 }