@mindfoldhq/trellis 0.2.13 → 0.2.15

package/dist/migrations/manifests/{0.3.0.json → 0.2.14.json}

@@ -1,6 +1,6 @@
 {
-  "version": "0.3.0",
-  "description": "Command path namespace migration for brand recognition",
+  "version": "0.2.14",
+  "description": "Command namespace migration + fix incorrect task directory paths in agent docs",
   "migrations": [
     {
       "type": "rename",
@@ -171,5 +171,5 @@
       "description": "Rename Cursor parallel command with trellis- prefix"
     }
   ],
-  "notes": "Claude Code uses subdirectory namespacing (.claude/commands/trellis/), Cursor uses filename prefix (.cursor/commands/trellis-*) since Cursor doesn't support nested command directories"
+  "notes": "This release includes: (1) Command namespace migration - Claude Code uses subdirectory (.claude/commands/trellis/), Cursor uses filename prefix (.cursor/commands/trellis-*); (2) Bug fix for incorrect task directory paths in agent docs - these files will be updated via normal template sync"
 }

package/dist/migrations/manifests/0.2.15.json

@@ -0,0 +1,33 @@
+{
+  "version": "0.2.15",
+  "description": "Fix task directory paths, base_branch auto-detection, and migration bug",
+  "migrations": [],
+  "changelog": [
+    {
+      "type": "fix",
+      "scope": "agents",
+      "description": "Correct task directory path in dispatch.md and plan.md (was .trellis/workspace/{dev}/tasks/, now .trellis/tasks/)"
+    },
+    {
+      "type": "fix",
+      "scope": "scripts",
+      "description": "Remove hardcoded 'taosu' in status.sh help example"
+    },
+    {
+      "type": "fix",
+      "scope": "task",
+      "description": "Auto-record current branch as base_branch when creating task, so PR targets correct branch"
+    },
+    {
+      "type": "fix",
+      "scope": "update",
+      "description": "Remove unsupported 'update' migration type that caused 'path argument undefined' error"
+    },
+    {
+      "type": "feat",
+      "scope": "task",
+      "description": "Add set-base-branch command to manually override PR target branch"
+    }
+  ],
+  "notes": "Key fix: When user creates a task on branch A, base_branch is now automatically set to A. Worktree creates feature branch based on A, and PR will target A."
+}

package/dist/templates/claude/agents/dispatch.md

@@ -13,7 +13,7 @@ You are the Dispatch Agent in the Multi-Agent Pipeline (pure dispatcher).
 
 Current Task is specified by `.trellis/.current-task` file, content is the relative path to task directory.
 
-Task directory path format: `.trellis/workspace/{developer}/tasks/{MM}-{DD}-{name}/`
+Task directory path format: `.trellis/tasks/{MM}-{DD}-{name}/`
 
 This directory contains all context files for the current task:
 
@@ -41,7 +41,7 @@ Read `.trellis/.current-task` to get current task directory path:
 
 ```bash
 TASK_DIR=$(cat .trellis/.current-task)
-# e.g.: .trellis/workspace/taosu/tasks/12-my-feature
+# e.g.: .trellis/tasks/02-03-my-feature
 ```
 
 ### Step 2: Read Task Configuration

package/dist/templates/claude/agents/plan.md

@@ -335,7 +335,7 @@ Input:
 Result: ACCEPTED - Clear, specific, has defined behavior
 
 Output:
-  .trellis/workspace/xxx/tasks/17-add-rate-limiting/
+  .trellis/tasks/02-03-add-rate-limiting/
   ├── task.json      # branch: feature/add-rate-limiting, scope: api
   ├── prd.md            # Detailed requirements with acceptance criteria
   ├── implement.jsonl   # Backend specs + existing middleware patterns

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

@@ -98,6 +98,7 @@ BRANCH=$(jq -r '.branch' "$TASK_JSON")
 TASK_NAME=$(jq -r '.name' "$TASK_JSON")
 TASK_STATUS=$(jq -r '.status' "$TASK_JSON")
 WORKTREE_PATH=$(jq -r '.worktree_path // empty' "$TASK_JSON")
+CONFIGURED_BASE_BRANCH=$(jq -r '.base_branch // empty' "$TASK_JSON")
 
 # Check if task was rejected
 if [ "$TASK_STATUS" = "rejected" ]; then
@@ -135,9 +136,15 @@ log_info "Name: ${TASK_NAME}"
 if [ -z "$WORKTREE_PATH" ] || [ ! -d "$WORKTREE_PATH" ]; then
   log_info "Step 1: Creating worktree..."
 
-  # Record current branch as base_branch (PR target)
-  BASE_BRANCH=$(git -C "$PROJECT_ROOT" branch --show-current)
-  log_info "Base branch (PR target): ${BASE_BRANCH}"
+  # Determine base_branch (PR target)
+  # Priority: 1) task.json configured value, 2) current branch
+  if [ -n "$CONFIGURED_BASE_BRANCH" ]; then
+    BASE_BRANCH="$CONFIGURED_BASE_BRANCH"
+    log_info "Base branch (from task.json): ${BASE_BRANCH}"
+  else
+    BASE_BRANCH=$(git -C "$PROJECT_ROOT" branch --show-current)
+    log_info "Base branch (current branch): ${BASE_BRANCH}"
+  fi
 
   # Calculate worktree path
   WORKTREE_BASE=$(get_worktree_base_dir "$PROJECT_ROOT")

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

@@ -201,7 +201,7 @@ Usage:
   $0 --registry              Show agent registry
 
 Examples:
-  $0 -a taosu
+  $0 -a john
   $0 --detail my-task
   $0 --progress my-task
   $0 --watch 01-16-worktree-support

package/dist/templates/trellis/scripts/task.sh

@@ -47,6 +47,21 @@ NC='\033[0m'
 
 REPO_ROOT=$(get_repo_root)
 
+# Platform (claude | cursor), can be overridden via --platform flag
+PLATFORM="claude"
+
+# Get command file path based on platform
+# Claude: .claude/commands/trellis/<name>.md
+# Cursor: .cursor/commands/trellis-<name>.md
+get_command_path() {
+  local name="$1"
+  if [[ "$PLATFORM" == "cursor" ]]; then
+    echo ".cursor/commands/trellis-${name}.md"
+  else
+    echo ".claude/commands/trellis/${name}.md"
+  fi
+}
+
 # =============================================================================
 # Helper Functions
 # =============================================================================
@@ -85,30 +100,35 @@ EOF
 
 get_check_context() {
   local dev_type="$1"
+  local finish_work=$(get_command_path "finish-work")
+  local check_backend=$(get_command_path "check-backend")
+  local check_frontend=$(get_command_path "check-frontend")
 
   cat << EOF
-{"file": ".claude/commands/trellis/finish-work.md", "reason": "Finish work checklist"}
+{"file": "${finish_work}", "reason": "Finish work checklist"}
 {"file": "$DIR_WORKFLOW/$DIR_SPEC/shared/index.md", "reason": "Shared coding standards"}
 EOF
 
   if [[ "$dev_type" == "backend" ]] || [[ "$dev_type" == "fullstack" ]]; then
-    echo '{"file": ".claude/commands/trellis/check-backend.md", "reason": "Backend check spec"}'
+    echo "{\"file\": \"${check_backend}\", \"reason\": \"Backend check spec\"}"
   fi
   if [[ "$dev_type" == "frontend" ]] || [[ "$dev_type" == "fullstack" ]]; then
-    echo '{"file": ".claude/commands/trellis/check-frontend.md", "reason": "Frontend check spec"}'
+    echo "{\"file\": \"${check_frontend}\", \"reason\": \"Frontend check spec\"}"
   fi
 }
 
 get_debug_context() {
   local dev_type="$1"
+  local check_backend=$(get_command_path "check-backend")
+  local check_frontend=$(get_command_path "check-frontend")
 
   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/trellis/check-backend.md", "reason": "Backend check spec"}'
+    echo "{\"file\": \"${check_backend}\", \"reason\": \"Backend check spec\"}"
   fi
   if [[ "$dev_type" == "frontend" ]] || [[ "$dev_type" == "fullstack" ]]; then
-    echo '{"file": ".claude/commands/trellis/check-frontend.md", "reason": "Frontend check spec"}'
+    echo "{\"file\": \"${check_frontend}\", \"reason\": \"Frontend check spec\"}"
   fi
 }
 
@@ -222,6 +242,8 @@ cmd_create() {
   fi
 
   local today=$(date +%Y-%m-%d)
+  # Record current branch as base_branch (PR target)
+  local current_branch=$(git branch --show-current 2>/dev/null || echo "main")
 
   cat > "$task_json" << EOF
 {
@@ -238,7 +260,7 @@ cmd_create() {
   "createdAt": "$today",
   "completedAt": null,
   "branch": null,
-  "base_branch": null,
+  "base_branch": "$current_branch",
   "worktree_path": null,
   "current_phase": 0,
   "next_action": [
@@ -272,13 +294,36 @@ EOF
 # =============================================================================
 
 cmd_init_context() {
-  local target_dir="$1"
-  local dev_type="$2"
+  local target_dir=""
+  local dev_type=""
+
+  # Parse arguments
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      --platform)
+        PLATFORM="$2"
+        shift 2
+        ;;
+      -*)
+        echo -e "${RED}Error: Unknown option $1${NC}"
+        exit 1
+        ;;
+      *)
+        if [[ -z "$target_dir" ]]; then
+          target_dir="$1"
+        elif [[ -z "$dev_type" ]]; then
+          dev_type="$1"
+        fi
+        shift
+        ;;
+    esac
+  done
 
   if [[ -z "$target_dir" ]] || [[ -z "$dev_type" ]]; then
     echo -e "${RED}Error: Missing arguments${NC}"
-    echo "Usage: $0 init-context <task-dir> <dev_type>"
+    echo "Usage: $0 init-context <task-dir> <dev_type> [--platform claude|cursor]"
     echo "  dev_type: backend | frontend | fullstack | test | docs"
+    echo "  --platform: claude (default) | cursor"
     exit 1
   fi
 
@@ -787,6 +832,42 @@ cmd_set_branch() {
   echo "  ./.trellis/scripts/multi-agent/start.sh $1"
 }
 
+# =============================================================================
+# Command: set-base-branch
+# =============================================================================
+
+cmd_set_base_branch() {
+  local target_dir="$1"
+  local base_branch="$2"
+
+  if [[ -z "$target_dir" ]] || [[ -z "$base_branch" ]]; then
+    echo -e "${RED}Error: Missing arguments${NC}"
+    echo "Usage: $0 set-base-branch <task-dir> <base-branch>"
+    echo "Example: $0 set-base-branch <dir> develop"
+    echo ""
+    echo "This sets the target branch for PR (the branch your feature will merge into)."
+    exit 1
+  fi
+
+  # Support relative paths
+  if [[ ! "$target_dir" = /* ]]; then
+    target_dir="$REPO_ROOT/$target_dir"
+  fi
+
+  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 base_branch field
+  jq --arg base "$base_branch" '.base_branch = $base' "$task_json" > "${task_json}.tmp"
+  mv "${task_json}.tmp" "$task_json"
+
+  echo -e "${GREEN}✓ Base branch set to: $base_branch${NC}"
+  echo -e "  PR will target: $base_branch"
+}
+
 # =============================================================================
 # Command: set-scope
 # =============================================================================
@@ -1024,7 +1105,7 @@ Task Management Script for Multi-Agent Pipeline
 
 Usage:
   $0 create <title>                     Create new task directory
-  $0 init-context <dir> <dev_type>      Initialize jsonl files
+  $0 init-context <dir> <type> [--platform claude|cursor]  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
@@ -1047,6 +1128,7 @@ List options:
 Examples:
   $0 create "Add login feature" --slug add-login
   $0 init-context .trellis/tasks/01-21-add-login backend
+  $0 init-context .trellis/tasks/01-21-add-login frontend --platform cursor
   $0 add-context <dir> implement .trellis/spec/backend/auth.md "Auth guidelines"
   $0 set-branch <dir> task/add-login
   $0 start .trellis/tasks/01-21-add-login
@@ -1070,7 +1152,8 @@ case "${1:-}" in
     cmd_create "$@"
     ;;
   init-context)
-    cmd_init_context "$2" "$3"
+    shift
+    cmd_init_context "$@"
     ;;
   add-context)
     cmd_add_context "$2" "$3" "$4" "$5"
@@ -1090,6 +1173,9 @@ case "${1:-}" in
   set-branch)
     cmd_set_branch "$2" "$3"
     ;;
+  set-base-branch)
+    cmd_set_base_branch "$2" "$3"
+    ;;
   set-scope)
     cmd_set_scope "$2" "$3"
     ;;

package/package.json

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