@mindfoldhq/trellis 0.2.5 → 0.2.6

package/dist/templates/trellis/gitignore.txt

@@ -11,6 +11,7 @@
 .agents/
 .agent-log
 .agent-runner.sh
+.session-id
 
 # Task directory runtime files
 .plan-log

package/dist/templates/trellis/scripts/add-session.sh

@@ -28,7 +28,7 @@ INDEX_FILE="$DEV_DIR/index.md"
 
 get_latest_journal_info() {
   local latest_file=""
-  local latest_num=0
+  local latest_num=-1  # Start at -1 so journal-0.md can be detected (0 > -1)
 
   for f in "$DEV_DIR"/${FILE_JOURNAL_PREFIX}*.md; do
     if [[ -f "$f" ]]; then

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

@@ -244,19 +244,25 @@ cd "$WORKTREE_PATH"
 
 LOG_FILE="${WORKTREE_PATH}/.agent-log"
 RUNNER_SCRIPT="${WORKTREE_PATH}/.agent-runner.sh"
+SESSION_ID_FILE="${WORKTREE_PATH}/.session-id"
 
 touch "$LOG_FILE"
 
+# Generate session ID for resume support
+SESSION_ID=$(uuidgen | tr '[:upper:]' '[:lower:]')
+echo "$SESSION_ID" > "$SESSION_ID_FILE"
+log_info "Session ID: ${SESSION_ID}"
+
 # Create runner script (uses --agent flag to load dispatch agent directly)
-cat > "$RUNNER_SCRIPT" << 'RUNNER_EOF'
+cat > "$RUNNER_SCRIPT" << RUNNER_EOF
 #!/bin/bash
-cd "$(dirname "$0")"
-export https_proxy="${AGENT_HTTPS_PROXY:-}"
-export http_proxy="${AGENT_HTTP_PROXY:-}"
-export all_proxy="${AGENT_ALL_PROXY:-}"
+cd "\$(dirname "\$0")"
+export https_proxy="\${AGENT_HTTPS_PROXY:-}"
+export http_proxy="\${AGENT_HTTP_PROXY:-}"
+export all_proxy="\${AGENT_ALL_PROXY:-}"
 export CLAUDE_NON_INTERACTIVE=1
 
-claude -p --agent dispatch --dangerously-skip-permissions --output-format stream-json --verbose "Start the pipeline"
+claude -p --agent dispatch --session-id "${SESSION_ID}" --dangerously-skip-permissions --output-format stream-json --verbose "Start the pipeline"
 RUNNER_EOF
 chmod +x "$RUNNER_SCRIPT"
 
@@ -293,6 +299,7 @@ echo -e "${GREEN}=== Agent Started ===${NC}"
 echo ""
 echo "  ID:        $TASK_ID"
 echo "  PID:       $AGENT_PID"
+echo "  Session:   $SESSION_ID"
 echo "  Worktree:  $WORKTREE_PATH"
 echo "  Task:      $TASK_DIR_RELATIVE"
 echo "  Log:       $LOG_FILE"
@@ -300,3 +307,4 @@ echo "  Registry:  $(registry_get_file "$PROJECT_ROOT")"
 echo ""
 echo -e "${YELLOW}To monitor:${NC} tail -f $LOG_FILE"
 echo -e "${YELLOW}To stop:${NC}    kill $AGENT_PID"
+echo -e "${YELLOW}To resume:${NC}  cd $WORKTREE_PATH && claude --resume $SESSION_ID"

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

@@ -4,6 +4,7 @@
 # =============================================================================
 # Usage:
 #   ./status.sh                     Show summary of all tasks (default)
+#   ./status.sh -a <assignee>       Filter tasks by assignee
 #   ./status.sh --list              List all worktrees and agents
 #   ./status.sh --detail <task>     Detailed task status
 #   ./status.sh --watch <task>      Watch agent log in real-time
@@ -36,9 +37,14 @@ PROJECT_ROOT=$(get_repo_root)
 # =============================================================================
 ACTION="summary"
 TARGET=""
+FILTER_ASSIGNEE=""
 
 while [[ $# -gt 0 ]]; do
   case $1 in
+    -a|--assignee)
+      FILTER_ASSIGNEE="$2"
+      shift 2
+      ;;
     --list)
       ACTION="list"
       shift
@@ -186,6 +192,7 @@ Multi-Agent Pipeline: Status Monitor
 
 Usage:
   $0                         Show summary of all tasks
+  $0 -a <assignee>           Filter tasks by assignee
   $0 --list                  List all worktrees and agents
   $0 --detail <task>         Detailed task status
   $0 --progress <task>       Quick progress view with recent activity
@@ -194,6 +201,7 @@ Usage:
   $0 --registry              Show agent registry
 
 Examples:
+  $0 -a taosu
   $0 --detail my-task
   $0 --progress my-task
   $0 --watch 01-16-worktree-support
@@ -308,14 +316,20 @@ cmd_summary() {
   fi
 
   # Task queue stats
-  local task_stats=$(get_task_queue_stats "$PROJECT_ROOT")
+  local task_stats=$(get_task_stats "$PROJECT_ROOT")
 
   echo -e "${BLUE}=== Multi-Agent Status ===${NC}"
   echo -e "  Agents:  ${GREEN}${running_count}${NC} running / ${total_agents} registered"
   echo -e "  Tasks:   ${task_stats}"
   echo ""
 
-  # Check if any agents are running and show detailed view
+  # Use temp files for grouping (compatible with old bash)
+  local tmp_dir=$(mktemp -d)
+  local running_file="$tmp_dir/running"
+  local stopped_file="$tmp_dir/stopped"
+  local tasks_file="$tmp_dir/tasks"
+  touch "$running_file" "$stopped_file" "$tasks_file"
+
   local has_running_agent=false
 
   for d in "$tasks_dir"/*/; do
@@ -325,9 +339,18 @@ cmd_summary() {
     local name=$(basename "$d")
     local task_json="$d/task.json"
     local status="unknown"
+    local assignee="unassigned"
+    local priority="P2"
 
     if [ -f "$task_json" ]; then
       status=$(jq -r '.status // "unknown"' "$task_json")
+      assignee=$(jq -r '.assignee // "unassigned"' "$task_json")
+      priority=$(jq -r '.priority // "P2"' "$task_json")
+    fi
+
+    # Filter by assignee if specified
+    if [ -n "$FILTER_ASSIGNEE" ] && [ "$assignee" != "$FILTER_ASSIGNEE" ]; then
+      continue
     fi
 
     # Check agent status
@@ -352,9 +375,16 @@ cmd_summary() {
 
     local color=$(status_color "$status")
 
+    # Color priority
+    local priority_color="${NC}"
+    case "$priority" in
+      P0) priority_color="${RED}" ;;
+      P1) priority_color="${YELLOW}" ;;
+      P2) priority_color="${BLUE}" ;;
+    esac
+
     if [ "$is_agent_running" = true ]; then
-      # Detailed view for running agents
-      # Read task.json from worktree (has live phase info)
+      # Running agent
       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"
@@ -364,54 +394,119 @@ cmd_summary() {
       local elapsed=$(calc_elapsed "$started")
       local modified=$(count_modified_files "$worktree")
       local branch=$(jq -r '.branch // "N/A"' "$phase_source" 2>/dev/null)
-      local developer=$(jq -r '.developer // "?"' "$phase_source" 2>/dev/null)
-      local priority=$(jq -r '.priority // "?"' "$phase_source" 2>/dev/null)
-
-      # Color priority
-      local priority_color="${NC}"
-      case "$priority" in
-        P0) priority_color="${RED}" ;;
-        P1) priority_color="${YELLOW}" ;;
-        P2) priority_color="${BLUE}" ;;
-      esac
-
-      # Get recent activity from log
       local log_file="$worktree/.agent-log"
       local last_tool=$(get_last_tool "$log_file")
 
-      echo -e "${GREEN}▶${NC} ${CYAN}${name}${NC} ${GREEN}[running]${NC} ${priority_color}[${priority}]${NC} @${developer}"
-      echo -e "  Phase:    ${phase_info}"
-      echo -e "  Elapsed:  ${elapsed}"
-      echo -e "  Branch:   ${DIM}${branch}${NC}"
-      echo -e "  Modified: ${modified} file(s)"
-      if [ -n "$last_tool" ]; then
-        echo -e "  Activity: ${YELLOW}${last_tool}${NC}"
-      fi
-      echo -e "  PID:      ${DIM}${pid}${NC}"
-      echo ""
+      {
+        echo -e "${GREEN}▶${NC} ${CYAN}${name}${NC} ${GREEN}[running]${NC} ${priority_color}[${priority}]${NC} @${assignee}"
+        echo -e "  Phase:    ${phase_info}"
+        echo -e "  Elapsed:  ${elapsed}"
+        echo -e "  Branch:   ${DIM}${branch}${NC}"
+        echo -e "  Modified: ${modified} file(s)"
+        [ -n "$last_tool" ] && echo -e "  Activity: ${YELLOW}${last_tool}${NC}"
+        echo -e "  PID:      ${DIM}${pid}${NC}"
+        echo ""
+      } >> "$running_file"
+
     elif [ -n "$agent_info" ] && [ "$agent_info" != "null" ]; then
-      # Stopped agent
-      echo -e "${RED}○${NC} ${name} ${RED}[stopped]${NC}"
-      echo -e "  ${DIM}PID ${pid} is no longer running${NC}"
-      echo ""
-    else
-      # No agent, just show status with developer and priority
-      local developer=$(jq -r '.developer // "?"' "$task_json" 2>/dev/null)
-      local priority=$(jq -r '.priority // "?"' "$task_json" 2>/dev/null)
+      # Stopped agent - check if completed or interrupted
+      local task_dir_rel=$(echo "$agent_info" | jq -r '.task_dir')
+      local worktree_task_json="$worktree/$task_dir_rel/task.json"
+      local worktree_status="unknown"
+      if [ -f "$worktree_task_json" ]; then
+        worktree_status=$(jq -r '.status // "unknown"' "$worktree_task_json")
+      fi
+
+      if [ "$worktree_status" = "completed" ]; then
+        # Agent completed successfully
+        {
+          echo -e "${GREEN}✓${NC} ${name} ${GREEN}[completed]${NC}"
+          echo ""
+        } >> "$stopped_file"
+      else
+        # Agent was interrupted/blocked
+        {
+          local session_id_file="${worktree}/.session-id"
+          local log_file="$worktree/.agent-log"
+          local last_msg=$(get_last_message "$log_file" 150)
+
+          if [ -f "$session_id_file" ]; then
+            local session_id=$(cat "$session_id_file")
+            echo -e "${RED}○${NC} ${name} ${RED}[stopped]${NC}"
+            if [ -n "$last_msg" ]; then
+              echo -e "${DIM}\"${last_msg}\"${NC}"
+            fi
+            echo -e "${YELLOW}cd ${worktree} && claude --resume ${session_id}${NC}"
+          else
+            echo -e "${RED}○${NC} ${name} ${RED}[stopped]${NC} ${DIM}(no session-id)${NC}"
+          fi
+          echo ""
+        } >> "$stopped_file"
+      fi
 
-      # Color priority
-      local priority_color="${NC}"
+    else
+      # Normal task - store with assignee + priority_order + status_order + date for sorting
+      # Priority order: P0=0, P1=1, P2=2, P3=3 (lower = higher priority)
+      local priority_order="2"
       case "$priority" in
-        P0) priority_color="${RED}" ;;
-        P1) priority_color="${YELLOW}" ;;
-        P2) priority_color="${BLUE}" ;;
+        P0) priority_order="0" ;;
+        P1) priority_order="1" ;;
+        P2) priority_order="2" ;;
+        P3) priority_order="3" ;;
       esac
-
-      echo -e "  ${color}●${NC} ${name} (${status}) ${priority_color}[${priority}]${NC} @${developer}"
+      # Status order: in_progress=0, planning=1, completed=2 (lower = show first)
+      local status_order="1"
+      case "$status" in
+        in_progress) status_order="0" ;;
+        planning) status_order="1" ;;
+        completed) status_order="2" ;;
+      esac
+      # Extract date from name (MM-DD) for sorting, use reverse for desc
+      # Name format: MM-DD-xxx, extract MM-DD part and invert for desc sort
+      local date_part=$(echo "$name" | grep -oE '^[0-9]{2}-[0-9]{2}' || echo "00-00")
+      echo -e "${assignee}\t${priority_order}\t${status_order}\t${date_part}\t${color}●${NC} ${name} (${status}) ${priority_color}[${priority}]${NC}" >> "$tasks_file"
     fi
   done
 
+  # Output running agents first
+  if [ -s "$running_file" ]; then
+    echo -e "${CYAN}Running Agents:${NC}"
+    cat "$running_file"
+  fi
+
+  # Output stopped agents
+  if [ -s "$stopped_file" ]; then
+    echo -e "${RED}Stopped Agents:${NC}"
+    cat "$stopped_file"
+  fi
+
+  # Separator between agents and tasks
+  if [ -s "$running_file" ] || [ -s "$stopped_file" ]; then
+    if [ -s "$tasks_file" ]; then
+      echo -e "${DIM}───────────────────────────────────────${NC}"
+      echo ""
+    fi
+  fi
+
+  # Output tasks grouped by assignee, sorted by priority > status > date(desc)
+  if [ -s "$tasks_file" ]; then
+    local current_assignee=""
+    # Sort: assignee(asc), priority(asc), status(asc), date(desc/reverse)
+    sort -t$'\t' -k1,1 -k2,2n -k3,3n -k4,4r "$tasks_file" | while IFS=$'\t' read -r assignee priority_order status_order date_part task_line; do
+      if [ "$assignee" != "$current_assignee" ]; then
+        [ -n "$current_assignee" ] && echo ""
+        echo -e "${CYAN}@${assignee}:${NC}"
+        current_assignee="$assignee"
+      fi
+      echo -e "  $task_line"
+    done
+  fi
+
+  # Cleanup
+  rm -rf "$tmp_dir"
+
   if [ "$has_running_agent" = true ]; then
+    echo ""
     echo -e "${DIM}─────────────────────────────────────${NC}"
     echo -e "${DIM}Use --progress <name> for quick activity view${NC}"
     echo -e "${DIM}Use --detail <name> for more info${NC}"
@@ -535,10 +630,18 @@ cmd_detail() {
   local task_dir=$(echo "$agent" | jq -r '.task_dir')
   local started=$(echo "$agent" | jq -r '.started_at')
 
+  # Check for session-id
+  local session_id=""
+  local session_id_file="${worktree}/.session-id"
+  if [ -f "$session_id_file" ]; then
+    session_id=$(cat "$session_id_file")
+  fi
+
   echo -e "${BLUE}=== Agent Detail: $id ===${NC}"
   echo ""
   echo "  ID:        $id"
   echo "  PID:       $pid"
+  echo "  Session:   ${session_id:-N/A}"
   echo "  Worktree:  $worktree"
   echo "  Task Dir:  $task_dir"
   echo "  Started:   $started"
@@ -549,6 +652,10 @@ cmd_detail() {
     echo -e "  Status:    ${GREEN}Running${NC}"
   else
     echo -e "  Status:    ${RED}Stopped${NC}"
+    if [ -n "$session_id" ]; then
+      echo ""
+      echo -e "  ${YELLOW}Resume:${NC} cd ${worktree} && claude --resume ${session_id}"
+    fi
   fi
 
   # Task info

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindfoldhq/trellis",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "AI capabilities grow like ivy — Trellis provides the structure to guide them along a disciplined path",
   "type": "module",
   "main": "./dist/index.js",