@mindfoldhq/trellis 0.1.8 → 0.2.1

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

@@ -1,25 +1,25 @@
 #!/bin/bash
-# Feature Management Script for Multi-Agent Pipeline
+# Task Management Script for Multi-Agent Pipeline
 #
 # Usage:
-#   ./.trellis/scripts/feature.sh create "<title>" [--slug <name>] [--assignee <dev>] [--priority P0|P1|P2|P3]
-#   ./.trellis/scripts/feature.sh init-context <dir> <type>   # Initialize jsonl files
-#   ./.trellis/scripts/feature.sh add-context <dir> <file> <path> [reason] # Add jsonl entry
-#   ./.trellis/scripts/feature.sh validate <dir>              # Validate jsonl files
-#   ./.trellis/scripts/feature.sh list-context <dir>          # List jsonl entries
-#   ./.trellis/scripts/feature.sh start <dir>                 # Set as current feature
-#   ./.trellis/scripts/feature.sh finish                      # Clear current feature
-#   ./.trellis/scripts/feature.sh set-branch <dir> <branch>   # Set git branch
-#   ./.trellis/scripts/feature.sh set-scope <dir> <scope>     # Set scope for PR title
-#   ./.trellis/scripts/feature.sh create-pr [dir] [--dry-run] # Create PR from feature
-#   ./.trellis/scripts/feature.sh archive <feature-name>      # Archive completed feature
-#   ./.trellis/scripts/feature.sh list                        # List active features
-#   ./.trellis/scripts/feature.sh list-archive [month]        # List archived features
+#   ./.trellis/scripts/task.sh create "<title>" [--slug <name>] [--assignee <dev>] [--priority P0|P1|P2|P3]
+#   ./.trellis/scripts/task.sh init-context <dir> <type>   # Initialize jsonl files
+#   ./.trellis/scripts/task.sh add-context <dir> <file> <path> [reason] # Add jsonl entry
+#   ./.trellis/scripts/task.sh validate <dir>              # Validate jsonl files
+#   ./.trellis/scripts/task.sh list-context <dir>          # List jsonl entries
+#   ./.trellis/scripts/task.sh start <dir>                 # Set as current task
+#   ./.trellis/scripts/task.sh finish                      # Clear current task
+#   ./.trellis/scripts/task.sh set-branch <dir> <branch>   # Set git branch
+#   ./.trellis/scripts/task.sh set-scope <dir> <scope>     # Set scope for PR title
+#   ./.trellis/scripts/task.sh create-pr [dir] [--dry-run] # Create PR from task
+#   ./.trellis/scripts/task.sh archive <task-name>         # Archive completed task
+#   ./.trellis/scripts/task.sh list                        # List active tasks
+#   ./.trellis/scripts/task.sh list-archive [month]        # List archived tasks
 #
-# Feature Directory Structure:
-#   features/
-#     ├── 13-my-feature/
-#     │   ├── feature.json      # Metadata
+# Task Directory Structure:
+#   tasks/
+#     ├── 01-21-my-task/
+#     │   ├── task.json         # Metadata
 #     │   ├── prd.md            # Requirements
 #     │   ├── info.md           # Technical design (optional)
 #     │   ├── implement.jsonl   # Implement agent context
@@ -27,15 +27,15 @@
 #     │   └── debug.jsonl       # Debug agent context
 #     └── archive/
 #         └── 2026-01/
-#             └── 13-old-feature/
+#             └── 01-21-old-task/
 
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/common/paths.sh"
 source "$SCRIPT_DIR/common/developer.sh"
-source "$SCRIPT_DIR/common/backlog.sh"
-source "$SCRIPT_DIR/common/feature-utils.sh"
+source "$SCRIPT_DIR/common/task-queue.sh"
+source "$SCRIPT_DIR/common/task-utils.sh"
 
 # Colors
 RED='\033[0;31m'
@@ -47,6 +47,16 @@ NC='\033[0m'
 
 REPO_ROOT=$(get_repo_root)
 
+# =============================================================================
+# Helper Functions
+# =============================================================================
+
+# Convert title to slug (only works with ASCII)
+_slugify() {
+  local result=$(echo "$1" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/--*/-/g' | sed 's/^-//' | sed 's/-$//')
+  echo "$result"
+}
+
 # =============================================================================
 # jsonl Default Content Generators
 # =============================================================================
@@ -54,22 +64,22 @@ REPO_ROOT=$(get_repo_root)
 get_implement_base() {
   cat << EOF
 {"file": "$DIR_WORKFLOW/workflow.md", "reason": "Project workflow and conventions"}
-{"file": "$DIR_WORKFLOW/$DIR_STRUCTURE/shared/index.md", "reason": "Shared coding standards"}
+{"file": "$DIR_WORKFLOW/$DIR_SPEC/shared/index.md", "reason": "Shared coding standards"}
 EOF
 }
 
 get_implement_backend() {
   cat << EOF
-{"file": "$DIR_WORKFLOW/$DIR_STRUCTURE/backend/index.md", "reason": "Backend development guide"}
-{"file": "$DIR_WORKFLOW/$DIR_STRUCTURE/backend/api-module.md", "reason": "API module conventions"}
-{"file": "$DIR_WORKFLOW/$DIR_STRUCTURE/backend/quality.md", "reason": "Code quality requirements"}
+{"file": "$DIR_WORKFLOW/$DIR_SPEC/backend/index.md", "reason": "Backend development guide"}
+{"file": "$DIR_WORKFLOW/$DIR_SPEC/backend/api-module.md", "reason": "API module conventions"}
+{"file": "$DIR_WORKFLOW/$DIR_SPEC/backend/quality.md", "reason": "Code quality requirements"}
 EOF
 }
 
 get_implement_frontend() {
   cat << EOF
-{"file": "$DIR_WORKFLOW/$DIR_STRUCTURE/frontend/index.md", "reason": "Frontend development guide"}
-{"file": "$DIR_WORKFLOW/$DIR_STRUCTURE/frontend/components.md", "reason": "Component conventions"}
+{"file": "$DIR_WORKFLOW/$DIR_SPEC/frontend/index.md", "reason": "Frontend development guide"}
+{"file": "$DIR_WORKFLOW/$DIR_SPEC/frontend/components.md", "reason": "Component conventions"}
 EOF
 }
 
@@ -78,7 +88,7 @@ get_check_context() {
 
   cat << EOF
 {"file": ".claude/commands/finish-work.md", "reason": "Finish work checklist"}
-{"file": "$DIR_WORKFLOW/$DIR_STRUCTURE/shared/index.md", "reason": "Shared coding standards"}
+{"file": "$DIR_WORKFLOW/$DIR_SPEC/shared/index.md", "reason": "Shared coding standards"}
 EOF
 
   if [[ "$dev_type" == "backend" ]] || [[ "$dev_type" == "fullstack" ]]; then
@@ -92,7 +102,7 @@ EOF
 get_debug_context() {
   local dev_type="$1"
 
-  echo "{\"file\": \"$DIR_WORKFLOW/$DIR_STRUCTURE/shared/index.md\", \"reason\": \"Shared coding standards\"}"
+  echo "{\"file\": \"$DIR_WORKFLOW/$DIR_SPEC/shared/index.md\", \"reason\": \"Shared coding standards\"}"
 
   if [[ "$dev_type" == "backend" ]] || [[ "$dev_type" == "fullstack" ]]; then
     echo '{"file": ".claude/commands/check-backend.md", "reason": "Backend check spec"}'
@@ -103,16 +113,16 @@ get_debug_context() {
 }
 
 # =============================================================================
-# Feature Operations
+# Task Operations
 # =============================================================================
 
-ensure_features_dir() {
-  local features_dir=$(get_features_dir)
-  local archive_dir="$features_dir/archive"
+ensure_tasks_dir() {
+  local tasks_dir=$(get_tasks_dir)
+  local archive_dir="$tasks_dir/archive"
 
-  if [[ ! -d "$features_dir" ]]; then
-    mkdir -p "$features_dir"
-    echo -e "${GREEN}Created features directory: $features_dir${NC}" >&2
+  if [[ ! -d "$tasks_dir" ]]; then
+    mkdir -p "$tasks_dir"
+    echo -e "${GREEN}Created tasks directory: $tasks_dir${NC}" >&2
   fi
 
   if [[ ! -d "$archive_dir" ]]; then
@@ -179,7 +189,7 @@ cmd_create() {
     fi
   fi
 
-  ensure_features_dir
+  ensure_tasks_dir
 
   # Get current developer as creator
   local creator=$(get_developer "$REPO_ROOT")
@@ -187,48 +197,44 @@ cmd_create() {
     creator="$assignee"
   fi
 
-  # Create backlog issue (returns ID like "260119-my-feature")
-  local backlog_id=$(create_backlog_issue "$title" "$assignee" "$priority" "$slug" "$description" "$creator" "$REPO_ROOT")
-  if [[ -z "$backlog_id" ]]; then
-    echo -e "${RED}Error: Failed to create backlog issue${NC}" >&2
-    exit 1
+  # Generate slug if not provided
+  if [[ -z "$slug" ]]; then
+    slug=$(_slugify "$title")
   fi
 
-  echo -e "${GREEN}Created backlog issue: ${backlog_id}.json${NC}" >&2
-
-  # Extract slug from backlog_id (remove date prefix)
-  local feature_slug=$(echo "$backlog_id" | sed 's/^[0-9]*-//')
-
-  # Create feature directory
-  local features_dir="$REPO_ROOT/$DIR_WORKFLOW/$DIR_PROGRESS/$assignee/$DIR_FEATURES"
-  if [[ ! -d "$features_dir" ]]; then
-    mkdir -p "$features_dir"
+  # Validate slug
+  if [[ -z "$slug" ]]; then
+    echo -e "${RED}Error: could not generate slug from title${NC}" >&2
+    exit 1
   fi
 
-  local day=$(date +%d)
-  local dir_name="${day}-${feature_slug}"
-  local feature_dir="$features_dir/$dir_name"
-  local feature_json="$feature_dir/feature.json"
+  # Create task directory with MM-DD-slug format
+  local tasks_dir=$(get_tasks_dir)
+  local date_prefix=$(generate_task_date_prefix)
+  local dir_name="${date_prefix}-${slug}"
+  local task_dir="$tasks_dir/$dir_name"
+  local task_json="$task_dir/$FILE_TASK_JSON"
 
-  if [[ -d "$feature_dir" ]]; then
-    echo -e "${YELLOW}Warning: Feature directory already exists: $dir_name${NC}" >&2
+  if [[ -d "$task_dir" ]]; then
+    echo -e "${YELLOW}Warning: Task directory already exists: $dir_name${NC}" >&2
   else
-    mkdir -p "$feature_dir"
+    mkdir -p "$task_dir"
   fi
 
   local today=$(date +%Y-%m-%d)
-  local backlog_ref_json="\"${backlog_id}.json\""
 
-  cat > "$feature_json" << EOF
+  cat > "$task_json" << EOF
 {
-  "id": "$feature_slug",
-  "name": "$feature_slug",
+  "id": "$slug",
+  "name": "$slug",
+  "title": "$title",
   "description": "$description",
   "status": "planning",
   "dev_type": null,
   "scope": null,
   "priority": "$priority",
-  "developer": "$assignee",
+  "creator": "$creator",
+  "assignee": "$assignee",
   "createdAt": "$today",
   "completedAt": null,
   "branch": null,
@@ -243,15 +249,13 @@ cmd_create() {
   ],
   "commit": null,
   "pr_url": null,
-  "backlog_ref": $backlog_ref_json,
   "subtasks": [],
   "relatedFiles": [],
   "notes": ""
 }
 EOF
 
-  echo -e "${GREEN}Created feature: $dir_name${NC}" >&2
-  echo -e "${CYAN}Linked to backlog: $backlog_id${NC}" >&2
+  echo -e "${GREEN}Created task: $dir_name${NC}" >&2
   echo -e "" >&2
   echo -e "${BLUE}Next steps:${NC}" >&2
   echo -e "  1. Create prd.md with requirements" >&2
@@ -260,7 +264,7 @@ EOF
   echo "" >&2
 
   # Output relative path for script chaining
-  echo "$DIR_WORKFLOW/$DIR_PROGRESS/$assignee/$DIR_FEATURES/$dir_name"
+  echo "$DIR_WORKFLOW/$DIR_TASKS/$dir_name"
 }
 
 # =============================================================================
@@ -273,7 +277,7 @@ cmd_init_context() {
 
   if [[ -z "$target_dir" ]] || [[ -z "$dev_type" ]]; then
     echo -e "${RED}Error: Missing arguments${NC}"
-    echo "Usage: $0 init-context <feature-dir> <dev_type>"
+    echo "Usage: $0 init-context <task-dir> <dev_type>"
     echo "  dev_type: backend | frontend | fullstack | test | docs"
     exit 1
   fi
@@ -341,7 +345,7 @@ cmd_add_context() {
 
   if [[ -z "$target_dir" ]] || [[ -z "$jsonl_name" ]] || [[ -z "$path" ]]; then
     echo -e "${RED}Error: Missing arguments${NC}"
-    echo "Usage: $0 add-context <feature-dir> <jsonl-file> <path> [reason]"
+    echo "Usage: $0 add-context <task-dir> <jsonl-file> <path> [reason]"
     echo "  jsonl-file: implement | check | debug (or full filename)"
     exit 1
   fi
@@ -445,7 +449,7 @@ cmd_validate() {
   local target_dir="$1"
 
   if [[ -z "$target_dir" ]]; then
-    echo -e "${RED}Error: feature directory required${NC}"
+    echo -e "${RED}Error: task directory required${NC}"
     exit 1
   fi
 
@@ -480,7 +484,7 @@ cmd_list_context() {
   local target_dir="$1"
 
   if [[ -z "$target_dir" ]]; then
-    echo -e "${RED}Error: feature directory required${NC}"
+    echo -e "${RED}Error: task directory required${NC}"
     exit 1
   fi
 
@@ -523,40 +527,40 @@ cmd_list_context() {
 # =============================================================================
 
 cmd_start() {
-  local feature_dir="$1"
+  local task_dir="$1"
 
-  if [[ -z "$feature_dir" ]]; then
-    echo -e "${RED}Error: feature directory required${NC}"
+  if [[ -z "$task_dir" ]]; then
+    echo -e "${RED}Error: task directory required${NC}"
     exit 1
   fi
 
   # Convert to relative path
-  if [[ "$feature_dir" = /* ]]; then
-    feature_dir="${feature_dir#$REPO_ROOT/}"
+  if [[ "$task_dir" = /* ]]; then
+    task_dir="${task_dir#$REPO_ROOT/}"
   fi
 
   # Verify directory exists
-  if [[ ! -d "$REPO_ROOT/$feature_dir" ]]; then
-    echo -e "${RED}Error: Feature directory not found: $feature_dir${NC}"
+  if [[ ! -d "$REPO_ROOT/$task_dir" ]]; then
+    echo -e "${RED}Error: Task directory not found: $task_dir${NC}"
     exit 1
   fi
 
-  set_current_feature "$feature_dir"
-  echo -e "${GREEN}✓ Current feature set to: $feature_dir${NC}"
+  set_current_task "$task_dir"
+  echo -e "${GREEN}✓ Current task set to: $task_dir${NC}"
   echo ""
-  echo -e "${BLUE}The hook will now inject context from this feature's jsonl files.${NC}"
+  echo -e "${BLUE}The hook will now inject context from this task's jsonl files.${NC}"
 }
 
 cmd_finish() {
-  local current=$(get_current_feature)
+  local current=$(get_current_task)
 
   if [[ -z "$current" ]]; then
-    echo -e "${YELLOW}No current feature set${NC}"
+    echo -e "${YELLOW}No current task set${NC}"
     exit 0
   fi
 
-  clear_current_feature
-  echo -e "${GREEN}✓ Cleared current feature (was: $current)${NC}"
+  clear_current_task
+  echo -e "${GREEN}✓ Cleared current task (was: $current)${NC}"
 }
 
 # =============================================================================
@@ -564,54 +568,49 @@ cmd_finish() {
 # =============================================================================
 
 cmd_archive() {
-  local feature_name="$1"
+  local task_name="$1"
 
-  if [[ -z "$feature_name" ]]; then
-    echo -e "${RED}Error: Feature name is required${NC}" >&2
-    echo "Usage: $0 archive <feature-name>" >&2
+  if [[ -z "$task_name" ]]; then
+    echo -e "${RED}Error: Task name is required${NC}" >&2
+    echo "Usage: $0 archive <task-name>" >&2
     exit 1
   fi
 
-  ensure_developer
-
-  local features_dir=$(get_features_dir)
+  local tasks_dir=$(get_tasks_dir)
 
-  # Find feature directory using common function
-  local feature_dir=$(find_feature_by_name "$feature_name" "$features_dir")
+  # Find task directory using common function
+  local task_dir=$(find_task_by_name "$task_name" "$tasks_dir")
 
-  if [[ -z "$feature_dir" ]] || [[ ! -d "$feature_dir" ]]; then
-    echo -e "${RED}Error: Feature not found: $feature_name${NC}" >&2
-    echo "Active features:" >&2
+  if [[ -z "$task_dir" ]] || [[ ! -d "$task_dir" ]]; then
+    echo -e "${RED}Error: Task not found: $task_name${NC}" >&2
+    echo "Active tasks:" >&2
     cmd_list >&2
     exit 1
   fi
 
-  local dir_name=$(basename "$feature_dir")
-  local feature_json="$feature_dir/feature.json"
+  local dir_name=$(basename "$task_dir")
+  local task_json="$task_dir/$FILE_TASK_JSON"
 
   # Update status before archiving
   local today=$(date +%Y-%m-%d)
-  if [[ -f "$feature_json" ]] && command -v jq &> /dev/null; then
+  if [[ -f "$task_json" ]] && command -v jq &> /dev/null; then
     local temp_file=$(mktemp)
-    jq --arg date "$today" '.status = "completed" | .completedAt = $date' "$feature_json" > "$temp_file"
-    mv "$temp_file" "$feature_json"
+    jq --arg date "$today" '.status = "completed" | .completedAt = $date' "$task_json" > "$temp_file"
+    mv "$temp_file" "$task_json"
   fi
 
-  # Clear if current feature
-  local current=$(get_current_feature)
+  # Clear if current task
+  local current=$(get_current_task)
   if [[ "$current" == *"$dir_name"* ]]; then
-    clear_current_feature
+    clear_current_task
   fi
 
-  # Use common archive function (handles backlog completion + directory move)
-  local result=$(archive_feature_complete "$feature_dir" "$REPO_ROOT")
+  # Use common archive function
+  local result=$(archive_task_complete "$task_dir" "$REPO_ROOT")
   local archive_dest=""
 
   echo "$result" | while IFS= read -r line; do
     case "$line" in
-      backlog_completed:*)
-        echo -e "${CYAN}Completed linked backlog: ${line#backlog_completed:}${NC}" >&2
-        ;;
       archived_to:*)
         archive_dest="${line#archived_to:}"
         local year_month=$(basename "$(dirname "$archive_dest")")
@@ -622,7 +621,7 @@ cmd_archive() {
 
   # Return the archive path
   local year_month=$(date +%Y-%m)
-  echo "$DIR_WORKFLOW/$DIR_PROGRESS/$(get_developer)/$DIR_FEATURES/$DIR_ARCHIVE/$year_month/$dir_name"
+  echo "$DIR_WORKFLOW/$DIR_TASKS/$DIR_ARCHIVE/$year_month/$dir_name"
 }
 
 # =============================================================================
@@ -630,44 +629,90 @@ cmd_archive() {
 # =============================================================================
 
 cmd_list() {
-  ensure_developer
+  local filter_mine=false
+  local filter_status=""
 
-  local features_dir=$(get_features_dir)
-  local developer=$(get_developer)
-  local current_feature=$(get_current_feature)
+  # Parse arguments
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      --mine|-m)
+        filter_mine=true
+        shift
+        ;;
+      --status|-s)
+        filter_status="$2"
+        shift 2
+        ;;
+      *)
+        shift
+        ;;
+    esac
+  done
 
-  echo -e "${BLUE}Active features for $developer:${NC}"
+  local tasks_dir=$(get_tasks_dir)
+  local current_task=$(get_current_task)
+  local developer=$(get_developer "$REPO_ROOT")
+
+  if [[ "$filter_mine" == "true" ]]; then
+    if [[ -z "$developer" ]]; then
+      echo -e "${RED}Error: No developer set. Run init-developer.sh first${NC}" >&2
+      exit 1
+    fi
+    echo -e "${BLUE}My tasks (assignee: $developer):${NC}"
+  else
+    echo -e "${BLUE}All active tasks:${NC}"
+  fi
   echo ""
 
   local count=0
 
-  for d in "$features_dir"/*/; do
+  for d in "$tasks_dir"/*/; do
     if [[ -d "$d" ]] && [[ "$(basename "$d")" != "archive" ]]; then
       local dir_name=$(basename "$d")
-      local feature_json="$d/feature.json"
+      local task_json="$d/$FILE_TASK_JSON"
       local status="unknown"
-      local relative_path="$DIR_WORKFLOW/$DIR_PROGRESS/$developer/$DIR_FEATURES/$dir_name"
+      local assignee="-"
+      local relative_path="$DIR_WORKFLOW/$DIR_TASKS/$dir_name"
+
+      if [[ -f "$task_json" ]] && command -v jq &> /dev/null; then
+        status=$(jq -r '.status // "unknown"' "$task_json")
+        assignee=$(jq -r '.assignee // "-"' "$task_json")
+      fi
 
-      if [[ -f "$feature_json" ]] && command -v jq &> /dev/null; then
-        status=$(jq -r '.status // "unknown"' "$feature_json")
+      # Apply --mine filter
+      if [[ "$filter_mine" == "true" ]] && [[ "$assignee" != "$developer" ]]; then
+        continue
+      fi
+
+      # Apply --status filter
+      if [[ -n "$filter_status" ]] && [[ "$status" != "$filter_status" ]]; then
+        continue
       fi
 
       local marker=""
-      if [[ "$relative_path" == "$current_feature" ]]; then
+      if [[ "$relative_path" == "$current_task" ]]; then
         marker=" ${GREEN}<- current${NC}"
       fi
 
-      echo -e "  - $dir_name/ ($status)$marker"
+      if [[ "$filter_mine" == "true" ]]; then
+        echo -e "  - $dir_name/ ($status)$marker"
+      else
+        echo -e "  - $dir_name/ ($status) [${CYAN}$assignee${NC}]$marker"
+      fi
       ((count++))
     fi
   done
 
   if [[ $count -eq 0 ]]; then
-    echo "  (no active features)"
+    if [[ "$filter_mine" == "true" ]]; then
+      echo "  (no tasks assigned to you)"
+    else
+      echo "  (no active tasks)"
+    fi
   fi
 
   echo ""
-  echo "Total: $count active feature(s)"
+  echo "Total: $count task(s)"
 }
 
 # =============================================================================
@@ -677,13 +722,10 @@ cmd_list() {
 cmd_list_archive() {
   local month="$1"
 
-  ensure_developer
-
-  local features_dir=$(get_features_dir)
-  local archive_dir="$features_dir/archive"
-  local developer=$(get_developer)
+  local tasks_dir=$(get_tasks_dir)
+  local archive_dir="$tasks_dir/archive"
 
-  echo -e "${BLUE}Archived features for $developer:${NC}"
+  echo -e "${BLUE}Archived tasks:${NC}"
   echo ""
 
   if [[ -n "$month" ]]; then
@@ -703,7 +745,7 @@ cmd_list_archive() {
       if [[ -d "$month_dir" ]]; then
         local month_name=$(basename "$month_dir")
         local count=$(find "$month_dir" -maxdepth 1 -type d ! -name "$(basename "$month_dir")" | wc -l | tr -d ' ')
-        echo "[$month_name] - $count feature(s)"
+        echo "[$month_name] - $count task(s)"
       fi
     done
   fi
@@ -719,8 +761,8 @@ cmd_set_branch() {
 
   if [[ -z "$target_dir" ]] || [[ -z "$branch" ]]; then
     echo -e "${RED}Error: Missing arguments${NC}"
-    echo "Usage: $0 set-branch <feature-dir> <branch-name>"
-    echo "Example: $0 set-branch <dir> feature/my-feature"
+    echo "Usage: $0 set-branch <task-dir> <branch-name>"
+    echo "Example: $0 set-branch <dir> feature/my-task"
     exit 1
   fi
 
@@ -729,15 +771,15 @@ cmd_set_branch() {
     target_dir="$REPO_ROOT/$target_dir"
   fi
 
-  local feature_json="$target_dir/feature.json"
-  if [[ ! -f "$feature_json" ]]; then
-    echo -e "${RED}Error: feature.json not found at $target_dir${NC}"
+  local task_json="$target_dir/$FILE_TASK_JSON"
+  if [[ ! -f "$task_json" ]]; then
+    echo -e "${RED}Error: task.json not found at $target_dir${NC}"
     exit 1
   fi
 
   # Update branch field
-  jq --arg branch "$branch" '.branch = $branch' "$feature_json" > "${feature_json}.tmp"
-  mv "${feature_json}.tmp" "$feature_json"
+  jq --arg branch "$branch" '.branch = $branch' "$task_json" > "${task_json}.tmp"
+  mv "${task_json}.tmp" "$task_json"
 
   echo -e "${GREEN}✓ Branch set to: $branch${NC}"
   echo ""
@@ -755,7 +797,7 @@ cmd_set_scope() {
 
   if [[ -z "$target_dir" ]] || [[ -z "$scope" ]]; then
     echo -e "${RED}Error: Missing arguments${NC}"
-    echo "Usage: $0 set-scope <feature-dir> <scope>"
+    echo "Usage: $0 set-scope <task-dir> <scope>"
     echo "Example: $0 set-scope <dir> api"
     exit 1
   fi
@@ -765,15 +807,15 @@ cmd_set_scope() {
     target_dir="$REPO_ROOT/$target_dir"
   fi
 
-  local feature_json="$target_dir/feature.json"
-  if [[ ! -f "$feature_json" ]]; then
-    echo -e "${RED}Error: feature.json not found at $target_dir${NC}"
+  local task_json="$target_dir/$FILE_TASK_JSON"
+  if [[ ! -f "$task_json" ]]; then
+    echo -e "${RED}Error: task.json not found at $target_dir${NC}"
     exit 1
   fi
 
   # Update scope field
-  jq --arg scope "$scope" '.scope = $scope' "$feature_json" > "${feature_json}.tmp"
-  mv "${feature_json}.tmp" "$feature_json"
+  jq --arg scope "$scope" '.scope = $scope' "$task_json" > "${task_json}.tmp"
+  mv "${task_json}.tmp" "$task_json"
 
   echo -e "${GREEN}✓ Scope set to: $scope${NC}"
 }
@@ -802,12 +844,12 @@ cmd_create_pr() {
     esac
   done
 
-  # Get feature directory
+  # Get task directory
   if [[ -z "$target_dir" ]]; then
-    target_dir=$(get_current_feature)
+    target_dir=$(get_current_task)
     if [[ -z "$target_dir" ]]; then
-      echo -e "${RED}Error: No feature directory specified and no current feature set${NC}"
-      echo "Usage: $0 create-pr [feature-dir] [--dry-run]"
+      echo -e "${RED}Error: No task directory specified and no current task set${NC}"
+      echo "Usage: $0 create-pr [task-dir] [--dry-run]"
       exit 1
     fi
   fi
@@ -817,9 +859,9 @@ cmd_create_pr() {
     target_dir="$REPO_ROOT/$target_dir"
   fi
 
-  local feature_json="$target_dir/feature.json"
-  if [[ ! -f "$feature_json" ]]; then
-    echo -e "${RED}Error: feature.json not found at $target_dir${NC}"
+  local task_json="$target_dir/$FILE_TASK_JSON"
+  if [[ ! -f "$task_json" ]]; then
+    echo -e "${RED}Error: task.json not found at $target_dir${NC}"
     exit 1
   fi
 
@@ -829,11 +871,11 @@ cmd_create_pr() {
   fi
   echo ""
 
-  # Read feature config
-  local feature_name=$(jq -r '.name' "$feature_json")
-  local base_branch=$(jq -r '.base_branch // "main"' "$feature_json")
-  local scope=$(jq -r '.scope // "core"' "$feature_json")
-  local dev_type=$(jq -r '.dev_type // "feature"' "$feature_json")
+  # Read task config
+  local task_name=$(jq -r '.name' "$task_json")
+  local base_branch=$(jq -r '.base_branch // "main"' "$task_json")
+  local scope=$(jq -r '.scope // "core"' "$task_json")
+  local dev_type=$(jq -r '.dev_type // "feature"' "$task_json")
 
   # Map dev_type to commit prefix
   local commit_prefix
@@ -846,7 +888,7 @@ cmd_create_pr() {
     *) commit_prefix="feat" ;;
   esac
 
-  echo -e "Feature: ${feature_name}"
+  echo -e "Task: ${task_name}"
   echo -e "Base branch: ${base_branch}"
   echo -e "Scope: ${scope}"
   echo -e "Commit prefix: ${commit_prefix}"
@@ -861,9 +903,9 @@ cmd_create_pr() {
 
   # Stage changes (even in dry-run to detect what would be committed)
   git add -A
-  # Exclude agent traces and temp files
-  git reset "$DIR_WORKFLOW/$DIR_PROGRESS/" 2>/dev/null || true
-  git reset .agent-log .agent-prompt .agent-runner.sh 2>/dev/null || true
+  # Exclude workspace and temp files
+  git reset "$DIR_WORKFLOW/$DIR_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
@@ -883,7 +925,7 @@ cmd_create_pr() {
   else
     # Commit changes
     echo -e "${YELLOW}Committing changes...${NC}"
-    local commit_msg="${commit_prefix}(${scope}): ${feature_name}"
+    local commit_msg="${commit_prefix}(${scope}): ${task_name}"
 
     if [[ "$dry_run" == "true" ]]; then
       echo -e "[DRY-RUN] Would commit with message: ${commit_msg}"
@@ -906,7 +948,7 @@ cmd_create_pr() {
 
   # Create PR
   echo -e "${YELLOW}Creating PR...${NC}"
-  local pr_title="${commit_prefix}(${scope}): ${feature_name}"
+  local pr_title="${commit_prefix}(${scope}): ${task_name}"
   local pr_url=""
 
   if [[ "$dry_run" == "true" ]]; then
@@ -944,20 +986,20 @@ cmd_create_pr() {
     fi
   fi
 
-  # Update feature.json
-  echo -e "${YELLOW}Updating feature status...${NC}"
+  # Update task.json
+  echo -e "${YELLOW}Updating task status...${NC}"
   if [[ "$dry_run" == "true" ]]; then
-    echo -e "[DRY-RUN] Would update feature.json:"
+    echo -e "[DRY-RUN] Would update task.json:"
     echo -e "  status: review"
     echo -e "  pr_url: ${pr_url}"
     echo -e "  current_phase: (set to create-pr phase)"
   else
     # Find the phase number for create-pr action
-    local create_pr_phase=$(jq -r '.next_action[] | select(.action == "create-pr") | .phase // 4' "$feature_json")
+    local create_pr_phase=$(jq -r '.next_action[] | select(.action == "create-pr") | .phase // 4' "$task_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', phase ${create_pr_phase}${NC}"
+      '.status = "review" | .pr_url = $url | .current_phase = $phase' "$task_json" > "${task_json}.tmp"
+    mv "${task_json}.tmp" "$task_json"
+    echo -e "${GREEN}Task status updated to 'review', phase ${create_pr_phase}${NC}"
   fi
 
   # In dry-run, reset the staging area
@@ -978,36 +1020,43 @@ cmd_create_pr() {
 
 show_usage() {
   cat << EOF
-Feature Management Script for Multi-Agent Pipeline
+Task Management Script for Multi-Agent Pipeline
 
 Usage:
-  $0 create <feature-name>              Create new feature directory
+  $0 create <title>                     Create new task directory
   $0 init-context <dir> <dev_type>      Initialize jsonl files
   $0 add-context <dir> <jsonl> <path> [reason]  Add entry to jsonl
   $0 validate <dir>                     Validate jsonl files
   $0 list-context <dir>                 List jsonl entries
-  $0 start <dir>                        Set as current feature
-  $0 finish                             Clear current feature
+  $0 start <dir>                        Set as current task
+  $0 finish                             Clear current task
   $0 set-branch <dir> <branch>          Set git branch for multi-agent
   $0 set-scope <dir> <scope>            Set scope for PR title
-  $0 create-pr [dir] [--dry-run]        Create PR from feature
-  $0 archive <feature-name>             Archive completed feature
-  $0 list                               List active features
-  $0 list-archive [YYYY-MM]             List archived features
+  $0 create-pr [dir] [--dry-run]        Create PR from task
+  $0 archive <task-name>                Archive completed task
+  $0 list [--mine] [--status <status>]  List tasks
+  $0 list-archive [YYYY-MM]             List archived tasks
 
 Arguments:
   dev_type: backend | frontend | fullstack | test | docs
 
+List options:
+  --mine, -m           Show only tasks assigned to current developer
+  --status, -s <s>     Filter by status (planning, in_progress, review, completed)
+
 Examples:
-  $0 create add-login-feature
-  $0 init-context .trellis/agent-traces/john/features/13-add-login-feature backend
-  $0 add-context <dir> implement .trellis/structure/backend/auth.md "Auth guidelines"
-  $0 set-branch <dir> feature/add-login-feature
-  $0 start .trellis/agent-traces/john/features/13-add-login-feature
-  $0 create-pr                          # Uses current feature
+  $0 create "Add login feature" --slug add-login
+  $0 init-context .trellis/tasks/01-21-add-login backend
+  $0 add-context <dir> implement .trellis/spec/backend/auth.md "Auth guidelines"
+  $0 set-branch <dir> feature/add-login
+  $0 start .trellis/tasks/01-21-add-login
+  $0 create-pr                          # Uses current task
   $0 create-pr <dir> --dry-run          # Preview without changes
   $0 finish
-  $0 archive add-login-feature
+  $0 archive add-login
+  $0 list                               # List all active tasks
+  $0 list --mine                        # List my tasks only
+  $0 list --mine --status in_progress   # List my in-progress tasks
 EOF
 }
 
@@ -1053,7 +1102,8 @@ case "${1:-}" in
     cmd_archive "$2"
     ;;
   list)
-    cmd_list
+    shift
+    cmd_list "$@"
     ;;
   list-archive)
     cmd_list_archive "$2"