@mindfoldhq/trellis 0.1.9 → 0.2.1

package/dist/templates/trellis/scripts/common/git-context.sh

@@ -21,14 +21,14 @@ source "$COMMON_DIR/developer.sh"
 output_json() {
   local repo_root=$(get_repo_root)
   local developer=$(get_developer "$repo_root")
-  local features_dir=$(get_features_dir "$repo_root")
-  local progress_file=$(get_active_progress_file "$repo_root")
-  local progress_lines=0
-  local progress_relative=""
+  local tasks_dir=$(get_tasks_dir "$repo_root")
+  local journal_file=$(get_active_journal_file "$repo_root")
+  local journal_lines=0
+  local journal_relative=""
 
-  if [[ -n "$progress_file" ]]; then
-    progress_lines=$(count_lines "$progress_file")
-    progress_relative="$DIR_WORKFLOW/$DIR_PROGRESS/$developer/$(basename "$progress_file")"
+  if [[ -n "$journal_file" ]]; then
+    journal_lines=$(count_lines "$journal_file")
+    journal_relative="$DIR_WORKFLOW/$DIR_WORKSPACE/$developer/$(basename "$journal_file")"
   fi
 
   local branch=$(git branch --show-current 2>/dev/null || echo "unknown")
@@ -52,28 +52,28 @@ output_json() {
   done < <(git log --oneline -5 2>/dev/null || echo "")
   commits_json+="]"
 
-  # Build features JSON
-  local features_json="["
+  # Build tasks JSON
+  local tasks_json="["
   first=true
-  if [[ -d "$features_dir" ]]; then
-    for f in "$features_dir"/*.json; do
-      if [[ -f "$f" ]]; then
-        local filename=$(basename "$f")
-        local name=$(echo "$filename" | sed 's/^[0-9]*-//' | sed 's/\.json$//')
-        local status="unknown"
-        if command -v jq &> /dev/null; then
-          status=$(jq -r '.status // "unknown"' "$f")
-        fi
-        if [[ "$first" == "true" ]]; then
-          first=false
-        else
-          features_json+=","
+  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 dir_name=$(basename "$d")
+          local name=$(jq -r '.name // .id // "unknown"' "$task_json" 2>/dev/null)
+          local status=$(jq -r '.status // "unknown"' "$task_json" 2>/dev/null)
+          if [[ "$first" == "true" ]]; then
+            first=false
+          else
+            tasks_json+=","
+          fi
+          tasks_json+="{\"dir\":\"$dir_name\",\"name\":\"$name\",\"status\":\"$status\"}"
         fi
-        features_json+="{\"file\":\"$filename\",\"name\":\"$name\",\"status\":\"$status\"}"
       fi
     done
   fi
-  features_json+="]"
+  tasks_json+="]"
 
   cat << EOF
 {
@@ -84,14 +84,14 @@ output_json() {
     "uncommittedChanges": $git_status,
     "recentCommits": $commits_json
   },
-  "features": {
-    "active": $features_json,
-    "directory": "$DIR_WORKFLOW/$DIR_PROGRESS/$developer/$DIR_FEATURES"
+  "tasks": {
+    "active": $tasks_json,
+    "directory": "$DIR_WORKFLOW/$DIR_TASKS"
   },
-  "traces": {
-    "file": "$progress_relative",
-    "lines": $progress_lines,
-    "nearLimit": $([ "$progress_lines" -gt 1800 ] && echo "true" || echo "false")
+  "journal": {
+    "file": "$journal_relative",
+    "lines": $journal_lines,
+    "nearLimit": $([ "$journal_lines" -gt 1800 ] && echo "true" || echo "false")
   }
 }
 EOF
@@ -135,131 +135,106 @@ output_text() {
   git log --oneline -5 2>/dev/null || echo "(no commits)"
   echo ""
 
-  echo "## CURRENT FEATURE"
-  local current_feature=$(get_current_feature "$repo_root")
-  if [[ -n "$current_feature" ]]; then
-    local current_feature_dir="$repo_root/$current_feature"
-    local feature_json="$current_feature_dir/feature.json"
-    echo "Path: $current_feature"
+  echo "## CURRENT TASK"
+  local current_task=$(get_current_task "$repo_root")
+  if [[ -n "$current_task" ]]; then
+    local current_task_dir="$repo_root/$current_task"
+    local task_json="$current_task_dir/$FILE_TASK_JSON"
+    echo "Path: $current_task"
 
-    if [[ -f "$feature_json" ]]; then
+    if [[ -f "$task_json" ]]; then
       if command -v jq &> /dev/null; then
-        local f_name=$(jq -r '.name // .id // "unknown"' "$feature_json")
-        local f_status=$(jq -r '.status // "unknown"' "$feature_json")
-        local f_created=$(jq -r '.createdAt // "unknown"' "$feature_json")
-        local f_desc=$(jq -r '.description // ""' "$feature_json")
-        echo "Name: $f_name"
-        echo "Status: $f_status"
-        echo "Created: $f_created"
-        if [[ -n "$f_desc" ]]; then
-          echo "Description: $f_desc"
+        local t_name=$(jq -r '.name // .id // "unknown"' "$task_json")
+        local t_status=$(jq -r '.status // "unknown"' "$task_json")
+        local t_created=$(jq -r '.createdAt // "unknown"' "$task_json")
+        local t_desc=$(jq -r '.description // ""' "$task_json")
+        echo "Name: $t_name"
+        echo "Status: $t_status"
+        echo "Created: $t_created"
+        if [[ -n "$t_desc" ]]; then
+          echo "Description: $t_desc"
         fi
       fi
     fi
 
     # Check for prd.md
-    if [[ -f "$current_feature_dir/prd.md" ]]; then
+    if [[ -f "$current_task_dir/prd.md" ]]; then
       echo ""
-      echo "[!] This feature has prd.md - read it for task details"
+      echo "[!] This task has prd.md - read it for task details"
     fi
   else
     echo "(none)"
   fi
   echo ""
 
-  echo "## ACTIVE FEATURES"
-  local features_dir=$(get_features_dir "$repo_root")
-  local feature_count=0
-  if [[ -d "$features_dir" ]]; then
-    for d in "$features_dir"/*/; do
+  echo "## ACTIVE TASKS"
+  local tasks_dir=$(get_tasks_dir "$repo_root")
+  local task_count=0
+  if [[ -d "$tasks_dir" ]]; then
+    for d in "$tasks_dir"/*/; do
       if [[ -d "$d" ]] && [[ "$(basename "$d")" != "archive" ]]; then
         local dir_name=$(basename "$d")
-        local f_json="$d/feature.json"
+        local t_json="$d/$FILE_TASK_JSON"
         local status="unknown"
-        if [[ -f "$f_json" ]] && command -v jq &> /dev/null; then
-          status=$(jq -r '.status // "unknown"' "$f_json")
-        fi
-        echo "- $dir_name/ ($status)"
-        ((feature_count++))
-      fi
-    done
-  fi
-  if [[ $feature_count -eq 0 ]]; then
-    echo "(no active features)"
-  fi
-  echo "Total: $feature_count active feature(s)"
-  echo ""
-
-  echo "## BACKLOG (Assigned to me)"
-  local backlog_dir=$(get_backlog_dir "$repo_root")
-  local backlog_count=0
-  if [[ -d "$backlog_dir" ]]; then
-    for f in "$backlog_dir"/*.json; do
-      if [[ -f "$f" ]]; then
-        local assignee=$(jq -r '.assigned_to' "$f" 2>/dev/null)
-        local status=$(jq -r '.status // "in_progress"' "$f" 2>/dev/null)
-        # Only show items assigned to current developer and not done
-        if [[ "$assignee" == "$developer" ]] && [[ "$status" != "done" ]]; then
-          local id=$(jq -r '.id' "$f" 2>/dev/null)
-          local title=$(jq -r '.title' "$f" 2>/dev/null)
-          local priority=$(jq -r '.priority // "P2"' "$f" 2>/dev/null)
-          # Extract date from id (YYMMDD-slug)
-          local date_part=$(echo "$id" | grep -oE '^[0-9]{6}' | sed 's/\(..\)\(..\)\(..\)/20\1-\2-\3/')
-          echo "- [$priority] $title ($date_part)"
-          ((backlog_count++))
+        local assignee="-"
+        if [[ -f "$t_json" ]] && command -v jq &> /dev/null; then
+          status=$(jq -r '.status // "unknown"' "$t_json")
+          assignee=$(jq -r '.assignee // "-"' "$t_json")
         fi
+        echo "- $dir_name/ ($status) @$assignee"
+        ((task_count++))
       fi
     done
   fi
-  if [[ $backlog_count -eq 0 ]]; then
-    echo "(no backlog items assigned to you)"
+  if [[ $task_count -eq 0 ]]; then
+    echo "(no active tasks)"
   fi
+  echo "Total: $task_count active task(s)"
   echo ""
 
-  echo "## CREATED BY ME (Assigned to others)"
-  local created_count=0
-  if [[ -d "$backlog_dir" ]]; then
-    for f in "$backlog_dir"/*.json; do
-      if [[ -f "$f" ]]; then
-        local creator=$(jq -r '.created_by' "$f" 2>/dev/null)
-        local assignee=$(jq -r '.assigned_to' "$f" 2>/dev/null)
-        local status=$(jq -r '.status // "in_progress"' "$f" 2>/dev/null)
-        # Only show items created by me but assigned to others, and not done
-        if [[ "$creator" == "$developer" ]] && [[ "$assignee" != "$developer" ]] && [[ "$status" != "done" ]]; then
-          local id=$(jq -r '.id' "$f" 2>/dev/null)
-          local title=$(jq -r '.title' "$f" 2>/dev/null)
-          local priority=$(jq -r '.priority // "P2"' "$f" 2>/dev/null)
-          local date_part=$(echo "$id" | grep -oE '^[0-9]{6}' | sed 's/\(..\)\(..\)\(..\)/20\1-\2-\3/')
-          echo "- [$priority] $title @$assignee ($date_part)"
-          ((created_count++))
+  echo "## MY TASKS (Assigned to me)"
+  local my_task_count=0
+  if [[ -d "$tasks_dir" ]]; then
+    for d in "$tasks_dir"/*/; do
+      if [[ -d "$d" ]] && [[ "$(basename "$d")" != "archive" ]]; then
+        local t_json="$d/$FILE_TASK_JSON"
+        if [[ -f "$t_json" ]] && command -v jq &> /dev/null; then
+          local assignee=$(jq -r '.assignee // ""' "$t_json")
+          local status=$(jq -r '.status // "planning"' "$t_json")
+          if [[ "$assignee" == "$developer" ]] && [[ "$status" != "done" ]]; then
+            local title=$(jq -r '.title // .name // "unknown"' "$t_json")
+            local priority=$(jq -r '.priority // "P2"' "$t_json")
+            echo "- [$priority] $title ($status)"
+            ((my_task_count++))
+          fi
         fi
       fi
     done
   fi
-  if [[ $created_count -eq 0 ]]; then
-    echo "(none)"
+  if [[ $my_task_count -eq 0 ]]; then
+    echo "(no tasks assigned to you)"
   fi
   echo ""
 
-  echo "## TRACES FILE"
-  local traces_file=$(get_active_progress_file "$repo_root")
-  if [[ -n "$traces_file" ]]; then
-    local lines=$(count_lines "$traces_file")
-    local relative="$DIR_WORKFLOW/$DIR_PROGRESS/$developer/$(basename "$traces_file")"
+  echo "## JOURNAL FILE"
+  local journal_file=$(get_active_journal_file "$repo_root")
+  if [[ -n "$journal_file" ]]; then
+    local lines=$(count_lines "$journal_file")
+    local relative="$DIR_WORKFLOW/$DIR_WORKSPACE/$developer/$(basename "$journal_file")"
     echo "Active file: $relative"
     echo "Line count: $lines / 2000"
     if [[ "$lines" -gt 1800 ]]; then
       echo "[!] WARNING: Approaching 2000 line limit!"
     fi
   else
-    echo "No traces file found"
+    echo "No journal file found"
   fi
   echo ""
 
   echo "## PATHS"
-  echo "Traces dir: $DIR_WORKFLOW/$DIR_PROGRESS/$developer/"
-  echo "Features dir: $DIR_WORKFLOW/$DIR_PROGRESS/$developer/$DIR_FEATURES/"
-  echo "Index file: $DIR_WORKFLOW/$DIR_PROGRESS/$developer/index.md"
+  echo "Workspace: $DIR_WORKFLOW/$DIR_WORKSPACE/$developer/"
+  echo "Tasks: $DIR_WORKFLOW/$DIR_TASKS/"
+  echo "Spec: $DIR_WORKFLOW/$DIR_SPEC/"
   echo ""
 
   echo "========================================"

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

@@ -7,9 +7,9 @@
 # Provides:
 #   get_repo_root          - Get repository root directory
 #   get_developer          - Get developer name
-#   get_features_dir       - Get features directory
-#   get_progress_dir       - Get traces directory
-#   get_active_progress_file - Get current traces file
+#   get_workspace_dir      - Get developer workspace directory
+#   get_tasks_dir          - Get tasks directory
+#   get_active_journal_file - Get current journal file
 
 # =============================================================================
 # Path Constants (change here to rename directories)
@@ -17,17 +17,17 @@
 
 # Directory names
 DIR_WORKFLOW=".trellis"
-DIR_PROGRESS="agent-traces"
-DIR_FEATURES="features"
+DIR_WORKSPACE="workspace"
+DIR_TASKS="tasks"
 DIR_ARCHIVE="archive"
-DIR_STRUCTURE="structure"
+DIR_SPEC="spec"
 DIR_SCRIPTS="scripts"
-DIR_BACKLOG="backlog"
 
 # File names
 FILE_DEVELOPER=".developer"
-FILE_CURRENT_FEATURE=".current-feature"
-FILE_FEATURE_JSON="feature.json"
+FILE_CURRENT_TASK=".current-task"
+FILE_TASK_JSON="task.json"
+FILE_JOURNAL_PREFIX="journal-"
 
 # =============================================================================
 # Repository Root
@@ -69,49 +69,45 @@ check_developer() {
 }
 
 # =============================================================================
-# Features Directory
+# Tasks Directory
 # =============================================================================
 
-get_features_dir() {
+get_tasks_dir() {
   local repo_root="${1:-$(get_repo_root)}"
-  local developer=$(get_developer "$repo_root")
-
-  if [[ -n "$developer" ]]; then
-    echo "$repo_root/$DIR_WORKFLOW/$DIR_PROGRESS/$developer/$DIR_FEATURES"
-  fi
+  echo "$repo_root/$DIR_WORKFLOW/$DIR_TASKS"
 }
 
 # =============================================================================
-# Progress Directory
+# Workspace Directory
 # =============================================================================
 
-get_progress_dir() {
+get_workspace_dir() {
   local repo_root="${1:-$(get_repo_root)}"
   local developer=$(get_developer "$repo_root")
 
   if [[ -n "$developer" ]]; then
-    echo "$repo_root/$DIR_WORKFLOW/$DIR_PROGRESS/$developer"
+    echo "$repo_root/$DIR_WORKFLOW/$DIR_WORKSPACE/$developer"
   fi
 }
 
 # =============================================================================
-# Progress File
+# Journal File
 # =============================================================================
 
-get_active_progress_file() {
+get_active_journal_file() {
   local repo_root="${1:-$(get_repo_root)}"
-  local progress_dir=$(get_progress_dir "$repo_root")
+  local workspace_dir=$(get_workspace_dir "$repo_root")
 
-  if [[ -z "$progress_dir" ]] || [[ ! -d "$progress_dir" ]]; then
+  if [[ -z "$workspace_dir" ]] || [[ ! -d "$workspace_dir" ]]; then
     echo ""
     return
   fi
 
   local latest=""
   local highest=0
-  for f in "$progress_dir"/traces-*.md; do
+  for f in "$workspace_dir"/${FILE_JOURNAL_PREFIX}*.md; do
     if [[ -f "$f" ]]; then
-      local num=$(basename "$f" | sed 's/traces-//' | sed 's/\.md//')
+      local num=$(basename "$f" | sed "s/${FILE_JOURNAL_PREFIX}//" | sed 's/\.md//')
       if [[ "$num" =~ ^[0-9]+$ ]] && [[ "$num" -gt "$highest" ]]; then
         highest=$num
         latest="$f"
@@ -134,85 +130,79 @@ count_lines() {
 }
 
 # =============================================================================
-# Current Feature Management
+# Current Task Management
 # =============================================================================
 
-# Get .current-feature file path
-_get_current_feature_file() {
+# Get .current-task file path
+_get_current_task_file() {
   local repo_root="${1:-$(get_repo_root)}"
-  echo "$repo_root/$DIR_WORKFLOW/$FILE_CURRENT_FEATURE"
+  echo "$repo_root/$DIR_WORKFLOW/$FILE_CURRENT_TASK"
 }
 
-# Get current feature directory path (relative to repo_root)
-get_current_feature() {
+# Get current task directory path (relative to repo_root)
+get_current_task() {
   local repo_root="${1:-$(get_repo_root)}"
-  local current_file=$(_get_current_feature_file "$repo_root")
+  local current_file=$(_get_current_task_file "$repo_root")
 
   if [[ -f "$current_file" ]]; then
     cat "$current_file" 2>/dev/null
   fi
 }
 
-# Get current feature directory absolute path
-get_current_feature_abs() {
+# Get current task directory absolute path
+get_current_task_abs() {
   local repo_root="${1:-$(get_repo_root)}"
-  local relative=$(get_current_feature "$repo_root")
+  local relative=$(get_current_task "$repo_root")
 
   if [[ -n "$relative" ]]; then
     echo "$repo_root/$relative"
   fi
 }
 
-# Set current feature
-# Args: $1 - feature directory path (relative to repo_root)
-set_current_feature() {
-  local feature_path="$1"
+# Set current task
+# Args: $1 - task directory path (relative to repo_root)
+set_current_task() {
+  local task_path="$1"
   local repo_root="${2:-$(get_repo_root)}"
-  local current_file=$(_get_current_feature_file "$repo_root")
+  local current_file=$(_get_current_task_file "$repo_root")
 
-  if [[ -z "$feature_path" ]]; then
-    echo "Error: feature path is required" >&2
+  if [[ -z "$task_path" ]]; then
+    echo "Error: task path is required" >&2
     return 1
   fi
 
-  # Verify feature directory exists
-  local full_path="$repo_root/$feature_path"
+  # Verify task directory exists
+  local full_path="$repo_root/$task_path"
   if [[ ! -d "$full_path" ]]; then
-    echo "Error: feature directory not found: $feature_path" >&2
+    echo "Error: task directory not found: $task_path" >&2
     return 1
   fi
 
-  echo "$feature_path" > "$current_file"
+  echo "$task_path" > "$current_file"
 }
 
-# Clear current feature
-clear_current_feature() {
+# Clear current task
+clear_current_task() {
   local repo_root="${1:-$(get_repo_root)}"
-  local current_file=$(_get_current_feature_file "$repo_root")
+  local current_file=$(_get_current_task_file "$repo_root")
 
   if [[ -f "$current_file" ]]; then
     rm -f "$current_file"
   fi
 }
 
-# Check if has current feature
-has_current_feature() {
-  local current=$(get_current_feature "$1")
+# Check if has current task
+has_current_task() {
+  local current=$(get_current_task "$1")
   [[ -n "$current" ]]
 }
 
 # =============================================================================
-# Backlog Directory
+# Task ID Generation
 # =============================================================================
 
-# Get backlog directory path
-get_backlog_dir() {
-  local repo_root="${1:-$(get_repo_root)}"
-  echo "$repo_root/$DIR_WORKFLOW/$DIR_BACKLOG"
-}
-
-# Generate backlog issue ID based on date
-# Returns: YYMMDD (e.g., "250119")
-generate_backlog_id() {
-  date +%y%m%d
+# Generate task ID based on date (MM-DD format)
+# Returns: MM-DD (e.g., "01-21")
+generate_task_date_prefix() {
+  date +%m-%d
 }