@mindfoldhq/trellis 0.1.0 → 0.1.2

package/dist/{templates/scripts/add-session.sh.txt → .trellis/scripts/add-session.sh}

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Add a new session to progress file and update index.md
+# Add a new session to traces file and update index.md
 #
 # Usage:
 #   ./.trellis/scripts/add-session.sh --title "Title" --commit "hash" --summary "Summary"
@@ -30,9 +30,9 @@ get_latest_progress_info() {
   local latest_file=""
   local latest_num=0
 
-  for f in "$DEV_DIR"/progress-*.md; do
+  for f in "$DEV_DIR"/traces-*.md; do
     if [[ -f "$f" ]]; then
-      local num=$(basename "$f" | sed 's/progress-\([0-9]*\)\.md/\1/')
+      local num=$(basename "$f" | sed 's/traces-\([0-9]*\)\.md/\1/')
       if [[ "$num" -gt "$latest_num" ]]; then
         latest_num=$num
         latest_file="$f"
@@ -57,9 +57,9 @@ count_progress_files() {
   local result=""
   local progress_info=$(get_latest_progress_info)
   local active_num=$(echo "$progress_info" | cut -d: -f2)
-  local active_file="progress-$active_num.md"
+  local active_file="traces-$active_num.md"
 
-  for f in $(ls -v "$DEV_DIR"/progress-*.md 2>/dev/null | sort -t- -k2 -n -r); do
+  for f in $(ls -v "$DEV_DIR"/traces-*.md 2>/dev/null | sort -t- -k2 -n -r); do
     if [[ -f "$f" ]]; then
       local filename=$(basename "$f")
       local lines=$(wc -l < "$f" | tr -d ' ')
@@ -76,15 +76,15 @@ count_progress_files() {
   echo "$result" | sed '/^$/d'
 }
 
-create_new_progress_file() {
+create_new_traces_file() {
   local num=$1
   local prev_num=$((num - 1))
-  local new_file="$DEV_DIR/progress-$num.md"
+  local new_file="$DEV_DIR/traces-$num.md"
 
   cat > "$new_file" << EOF
-# Agent Progress - $DEVELOPER (Part $num)
+# Agent Traces - $DEVELOPER (Part $num)
 
-> Continuation from \`progress-$prev_num.md\` (archived at ~$MAX_LINES lines)
+> Continuation from \`traces-$prev_num.md\` (archived at ~$MAX_LINES lines)
 > Started: $TODAY
 
 ---
@@ -317,7 +317,7 @@ add_session() {
   echo "Title: $title" >&2
   echo "Commit: $commit" >&2
   echo "" >&2
-  echo "Current progress file: progress-$current_num.md" >&2
+  echo "Current traces file: traces-$current_num.md" >&2
   echo "Current lines: $current_lines" >&2
   echo "New content lines: $content_lines" >&2
   echo "Total after append: $((current_lines + content_lines))" >&2
@@ -328,8 +328,8 @@ add_session() {
 
   if [[ $((current_lines + content_lines)) -gt $MAX_LINES ]]; then
     target_num=$((current_num + 1))
-    echo "[!] Exceeds $MAX_LINES lines, creating progress-$target_num.md" >&2
-    target_file=$(create_new_progress_file "$target_num")
+    echo "[!] Exceeds $MAX_LINES lines, creating traces-$target_num.md" >&2
+    target_file=$(create_new_traces_file "$target_num")
     echo "Created: $target_file" >&2
   fi
 
@@ -339,7 +339,7 @@ add_session() {
   echo "" >&2
 
   # Update index.md directly
-  local active_file="progress-$target_num.md"
+  local active_file="traces-$target_num.md"
   update_index "$title" "$commit" "$new_session" "$active_file"
 
   echo "" >&2
@@ -355,7 +355,7 @@ add_session() {
 show_help() {
   echo "Usage: $0 --title \"Title\" [options]"
   echo ""
-  echo "Add a new session to progress file and update index.md automatically."
+  echo "Add a new session to traces file and update index.md automatically."
   echo ""
   echo "Options:"
   echo "  --title TEXT       Session title (required)"

package/dist/{templates/scripts/common/developer.sh.txt → .trellis/scripts/common/developer.sh}

@@ -40,34 +40,34 @@ EOF
   mkdir -p "$progress_dir/$DIR_FEATURES"
   mkdir -p "$progress_dir/$DIR_FEATURES/$DIR_ARCHIVE"
 
-  # Create initial progress file
-  local progress_file="$progress_dir/progress-1.md"
-  if [[ ! -f "$progress_file" ]]; then
-    cat > "$progress_file" << PROGRESS_EOF
-# Agent Progress - $name (Part 1)
+  # Create initial traces file
+  local traces_file="$progress_dir/traces-1.md"
+  if [[ ! -f "$traces_file" ]]; then
+    cat > "$traces_file" << TRACES_EOF
+# Agent Traces - $name (Part 1)
 
-> AI development session progress tracking
+> AI development session traces
 > Started: $(date +%Y-%m-%d)
 
 ---
 
-PROGRESS_EOF
+TRACES_EOF
   fi
 
   # Create index.md with markers for auto-update
   local index_file="$progress_dir/index.md"
   if [[ ! -f "$index_file" ]]; then
     cat > "$index_file" << INDEX_EOF
-# Agent Progress Index - $name
+# Agent Traces Index - $name
 
-> Progress tracking for AI development sessions.
+> Traces tracking for AI development sessions.
 
 ---
 
 ## Current Status
 
 <!-- @@@auto:current-status -->
-- **Active File**: \`progress-1.md\`
+- **Active File**: \`traces-1.md\`
 - **Total Sessions**: 0
 - **Last Active**: -
 <!-- @@@/auto:current-status -->
@@ -79,7 +79,7 @@ PROGRESS_EOF
 <!-- @@@auto:active-documents -->
 | File | Lines | Status |
 |------|-------|--------|
-| \`progress-1.md\` | ~0 | Active |
+| \`traces-1.md\` | ~0 | Active |
 <!-- @@@/auto:active-documents -->
 
 ---
@@ -95,8 +95,8 @@ PROGRESS_EOF
 
 ## Notes
 
-- Sessions are appended to progress files
-- New progress file created when current exceeds 2000 lines
+- Sessions are appended to traces files
+- New traces file created when current exceeds 2000 lines
 - Use \`add-session.sh\` to record sessions
 INDEX_EOF
   fi

package/dist/{templates/scripts/common/git-context.sh.txt → .trellis/scripts/common/git-context.sh}

@@ -88,7 +88,7 @@ output_json() {
     "active": $features_json,
     "directory": "$DIR_WORKFLOW/$DIR_PROGRESS/$developer/$DIR_FEATURES"
   },
-  "progress": {
+  "traces": {
     "file": "$progress_relative",
     "lines": $progress_lines,
     "nearLimit": $([ "$progress_lines" -gt 1800 ] && echo "true" || echo "false")
@@ -190,23 +190,23 @@ output_text() {
   echo "Total: $feature_count active feature(s)"
   echo ""
 
-  echo "## PROGRESS FILE"
-  local progress_file=$(get_active_progress_file "$repo_root")
-  if [[ -n "$progress_file" ]]; then
-    local lines=$(count_lines "$progress_file")
-    local relative="$DIR_WORKFLOW/$DIR_PROGRESS/$developer/$(basename "$progress_file")"
+  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 "Active file: $relative"
     echo "Line count: $lines / 2000"
     if [[ "$lines" -gt 1800 ]]; then
       echo "[!] WARNING: Approaching 2000 line limit!"
     fi
   else
-    echo "No progress file found"
+    echo "No traces file found"
   fi
   echo ""
 
   echo "## PATHS"
-  echo "Progress dir: $DIR_WORKFLOW/$DIR_PROGRESS/$developer/"
+  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 ""

package/dist/{templates/scripts/common/paths.sh.txt → .trellis/scripts/common/paths.sh}

@@ -8,8 +8,8 @@
 #   get_repo_root          - Get repository root directory
 #   get_developer          - Get developer name
 #   get_features_dir       - Get features directory
-#   get_progress_dir       - Get progress directory
-#   get_active_progress_file - Get current progress file
+#   get_progress_dir       - Get traces directory
+#   get_active_progress_file - Get current traces file
 
 # =============================================================================
 # Path Constants (change here to rename directories)
@@ -108,9 +108,9 @@ get_active_progress_file() {
 
   local latest=""
   local highest=0
-  for f in "$progress_dir"/progress-*.md; do
+  for f in "$progress_dir"/traces-*.md; do
     if [[ -f "$f" ]]; then
-      local num=$(basename "$f" | sed 's/progress-//' | sed 's/\.md//')
+      local num=$(basename "$f" | sed 's/traces-//' | sed 's/\.md//')
       if [[ "$num" =~ ^[0-9]+$ ]] && [[ "$num" -gt "$highest" ]]; then
         highest=$num
         latest="$f"

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

@@ -0,0 +1,150 @@
+#!/bin/bash
+# =============================================================================
+# Phase Management Utilities
+# =============================================================================
+# Centralized phase tracking for multi-agent pipeline
+#
+# 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 number
+get_current_phase() {
+  local feature_json="$1"
+  if [ ! -f "$feature_json" ]; then
+    echo "0"
+    return
+  fi
+  jq -r '.current_phase // 0' "$feature_json"
+}
+
+# Get total number of phases
+get_total_phases() {
+  local feature_json="$1"
+  if [ ! -f "$feature_json" ]; then
+    echo "0"
+    return
+  fi
+  jq -r '.next_action | length // 0' "$feature_json"
+}
+
+# Get action name for a specific phase
+get_phase_action() {
+  local feature_json="$1"
+  local phase="$2"
+  if [ ! -f "$feature_json" ]; then
+    echo "unknown"
+    return
+  fi
+  jq -r --argjson phase "$phase" '.next_action[] | select(.phase == $phase) | .action // "unknown"' "$feature_json"
+}
+
+# Get formatted phase info: "N/M (action)"
+get_phase_info() {
+  local feature_json="$1"
+  if [ ! -f "$feature_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")
+
+  if [ "$current_phase" = "0" ] || [ "$current_phase" = "null" ]; then
+    echo "0/${total_phases} (pending)"
+  else
+    echo "${current_phase}/${total_phases} (${action_name})"
+  fi
+}
+
+# Set current phase to a specific value
+set_phase() {
+  local feature_json="$1"
+  local phase="$2"
+
+  if [ ! -f "$feature_json" ]; then
+    echo "Error: feature.json not found: $feature_json" >&2
+    return 1
+  fi
+
+  jq --argjson phase "$phase" '.current_phase = $phase' "$feature_json" > "${feature_json}.tmp"
+  mv "${feature_json}.tmp" "$feature_json"
+}
+
+# Advance to next phase
+advance_phase() {
+  local feature_json="$1"
+
+  if [ ! -f "$feature_json" ]; then
+    echo "Error: feature.json not found: $feature_json" >&2
+    return 1
+  fi
+
+  local current=$(get_current_phase "$feature_json")
+  local total=$(get_total_phases "$feature_json")
+  local next=$((current + 1))
+
+  if [ "$next" -gt "$total" ]; then
+    echo "Warning: Already at final phase" >&2
+    return 0
+  fi
+
+  set_phase "$feature_json" "$next"
+}
+
+# Get phase number for a specific action name
+get_phase_for_action() {
+  local feature_json="$1"
+  local action="$2"
+
+  if [ ! -f "$feature_json" ]; then
+    echo "0"
+    return
+  fi
+
+  jq -r --arg action "$action" '.next_action[] | select(.action == $action) | .phase // 0' "$feature_json"
+}
+
+# Map subagent type to action name
+# Used by hooks to determine which action a subagent corresponds to
+map_subagent_to_action() {
+  local subagent_type="$1"
+
+  case "$subagent_type" in
+    implement) echo "implement" ;;
+    check) echo "check" ;;
+    debug) echo "debug" ;;
+    research) echo "research" ;;
+    # finish uses check agent but is a different action
+    *) echo "$subagent_type" ;;
+  esac
+}
+
+# Check if a phase is completed (current_phase > phase)
+is_phase_completed() {
+  local feature_json="$1"
+  local phase="$2"
+
+  local current=$(get_current_phase "$feature_json")
+  [ "$current" -gt "$phase" ]
+}
+
+# Check if we're at a specific action
+is_current_action() {
+  local feature_json="$1"
+  local action="$2"
+
+  local current=$(get_current_phase "$feature_json")
+  local action_phase=$(get_phase_for_action "$feature_json" "$action")
+
+  [ "$current" = "$action_phase" ]
+}

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

@@ -0,0 +1,138 @@
+#!/bin/bash
+# Worktree utilities for Multi-Agent Pipeline
+#
+# Usage: source this file in multi-agent scripts
+#   source "$(dirname "$0")/../common/worktree.sh"
+#
+# Provides:
+#   get_worktree_config         - Get worktree.yaml path
+#   get_worktree_base_dir       - Get worktree storage directory
+#   get_worktree_copy_files     - Get files to copy list
+#   get_worktree_post_create_hooks - Get post-create hooks
+#   get_worktree_pre_merge_hooks   - Get pre-merge hooks
+#   get_agents_dir              - Get agents registry directory
+#
+# Requires: paths.sh (for get_repo_root)
+
+# Ensure paths.sh is loaded
+if ! type get_repo_root &>/dev/null; then
+  SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+  source "$SCRIPT_DIR/paths.sh"
+fi
+
+# =============================================================================
+# Worktree Configuration
+# =============================================================================
+
+# Worktree config file relative path (relative to repo root)
+WORKTREE_CONFIG_PATH="$DIR_WORKFLOW/worktree.yaml"
+
+# Get worktree.yaml config file path
+# Args: $1 - repo_root (optional)
+# Returns: absolute path to config file
+get_worktree_config() {
+  local repo_root="${1:-$(get_repo_root)}"
+  echo "$repo_root/$WORKTREE_CONFIG_PATH"
+}
+
+# Read simple value from worktree.yaml
+# Args: $1 - key, $2 - config_file (optional)
+# Returns: value
+_yaml_get_value() {
+  local key="$1"
+  local config="${2:-$(get_worktree_config)}"
+  grep "^${key}:" "$config" 2>/dev/null | sed "s/^${key}:[[:space:]]*//" | tr -d '"' | tr -d "'"
+}
+
+# Read list from worktree.yaml
+# Args: $1 - section, $2 - config_file (optional)
+# Returns: list items (one per line)
+_yaml_get_list() {
+  local section="$1"
+  local config="${2:-$(get_worktree_config)}"
+  local in_section=0
+
+  while IFS= read -r line; do
+    if [[ "$line" =~ ^${section}: ]]; then
+      in_section=1
+      continue
+    fi
+
+    if [ $in_section -eq 1 ]; then
+      # Exit when encountering new top-level key
+      if [[ "$line" =~ ^[a-z_]+: ]] && [[ ! "$line" =~ ^[[:space:]] ]]; then
+        break
+      fi
+      # Read list item
+      if [[ "$line" =~ ^[[:space:]]*-[[:space:]](.+)$ ]]; then
+        echo "${BASH_REMATCH[1]}" | tr -d '"' | tr -d "'"
+      fi
+    fi
+  done < "$config"
+}
+
+# Get worktree base directory
+# Args: $1 - repo_root (optional)
+# Returns: absolute path to worktree base directory
+get_worktree_base_dir() {
+  local repo_root="${1:-$(get_repo_root)}"
+  local config=$(get_worktree_config "$repo_root")
+  local worktree_dir=$(_yaml_get_value "worktree_dir" "$config")
+
+  # Default value
+  if [ -z "$worktree_dir" ]; then
+    worktree_dir="../worktrees"
+  fi
+
+  # Handle relative path
+  if [[ "$worktree_dir" == ../* ]] || [[ "$worktree_dir" == ./* ]]; then
+    # Relative to repo_root
+    echo "$repo_root/$worktree_dir"
+  else
+    # Absolute path
+    echo "$worktree_dir"
+  fi
+}
+
+# Get files to copy list
+# Args: $1 - repo_root (optional)
+# Returns: file list (one per line)
+get_worktree_copy_files() {
+  local repo_root="${1:-$(get_repo_root)}"
+  local config=$(get_worktree_config "$repo_root")
+  _yaml_get_list "copy" "$config"
+}
+
+# Get post_create hooks
+# Args: $1 - repo_root (optional)
+# Returns: command list (one per line)
+get_worktree_post_create_hooks() {
+  local repo_root="${1:-$(get_repo_root)}"
+  local config=$(get_worktree_config "$repo_root")
+  _yaml_get_list "post_create" "$config"
+}
+
+# Get pre_merge hooks
+# Args: $1 - repo_root (optional)
+# Returns: command list (one per line)
+get_worktree_pre_merge_hooks() {
+  local repo_root="${1:-$(get_repo_root)}"
+  local config=$(get_worktree_config "$repo_root")
+  _yaml_get_list "pre_merge" "$config"
+}
+
+# =============================================================================
+# Agents Registry
+# =============================================================================
+
+# Get agents directory for current developer
+# Args: $1 - repo_root (optional)
+# Returns: absolute path to agents directory
+get_agents_dir() {
+  local repo_root="${1:-$(get_repo_root)}"
+  local progress_dir=$(get_progress_dir "$repo_root")
+
+  if [[ -n "$progress_dir" ]]; then
+    echo "$progress_dir/.agents"
+  fi
+}