claude-fsd 1.5.25 → 1.5.27

package/README.md

@@ -69,10 +69,6 @@ claude-fsd create-plan        # Generate development plan from requirements
 claude-fsd --working-dir=project1 dev
 claude-fsd --working-dir=backend interview
 
-# Fast mode (skips slow o3-pro planning)
-claude-fsd create-plan --fast
-claude-fsd --working-dir=project1 --fast create-plan
-
 # claudefsd also works the same way
 claudefsd                     # Same as claude-fsd
 ```
@@ -87,7 +83,7 @@ Runs the development agent fleet. This command:
 - Updates the plan to track progress
 - Repeats until all tasks are done
 
-Every 4th cycle, it activates "megathinking mode" using the Opus model for architectural planning.
+Every 4th cycle, it activates "megathinking mode" using ultrathink for deep architectural planning.
 
 #### claudefsd-interview
 Interactive expert Q&A session that:
@@ -101,8 +97,7 @@ Generates a comprehensive development plan based on:
 - Your project brief (BRIEF.md)
 - Interview answers (QUESTIONS.md) or requirements (REQUIREMENTS.md)
 - Creates PLAN.md with prioritized tasks and CLAUDE-NOTES.md with architectural analysis
-- Uses Opus model for standard planning, o3-pro for deep strategic analysis (when codex available)
-- Use `--fast` flag to skip o3-pro step for quicker results
+- Uses Claude Sonnet with ultrathink for deep strategic planning
 
 ## How it Works
 
@@ -142,12 +137,13 @@ This isn't sci-fi level "sleep through the entire project" automation - it's mor
 - Unix-like environment (macOS, Linux)
 - [Claude CLI](https://docs.anthropic.com/en/docs/claude-code) (`claude` command)
 
-### Optional (but recommended)
-- [Codex](https://github.com/Codex-ai/codex) - For enhanced code review capabilities
-- OpenAI API key - For Codex features (set `OPENAI_API_KEY` environment variable)
-
 ## Project Structure
 
+**Flexible Structure:** Files can be placed in either `docs/` (default) or root directory `.`
+- System automatically detects file locations
+- Use `docs/` for larger projects to keep files organized
+- Use root `.` for smaller projects for simplicity
+
 Default structure (using 'docs' as working directory):
 ```
 your-project/
@@ -163,6 +159,16 @@ your-project/
 └── [your code files]
 ```
 
+Simple structure (files in root):
+```
+your-project/
+├── BRIEF.md
+├── PLAN.md
+├── CLAUDE-NOTES.md
+├── logs/
+└── [your code files]
+```
+
 With custom working directory:
 ```
 your-project/
@@ -188,21 +194,18 @@ your-project/
 
 ## Model Selection Strategy
 
-The system intelligently selects AI models based on task complexity:
+The system uses Claude Sonnet throughout with strategic ultrathinking for complex work:
 
-- **o3-pro Model**: Used for the most complex strategic work (requires codex CLI)
-  - Deep architectural planning (create-plan, unless --fast used)
-  - Takes 5-15 minutes but provides exceptional strategic reasoning
-  
-- **Opus Model**: Used for complex architectural work
-  - Requirements gathering (interview)
-  - Standard architecture planning (create-plan with --fast or when codex unavailable)
+- **Sonnet + Ultrathink**: Used for complex architectural work requiring deep thinking
+  - Requirements consolidation (interview)
+  - Deep strategic planning (create-plan)
   - Megathinking mode (every 4th dev iteration)
-  
-- **Sonnet Model**: Used for regular development
+
+- **Sonnet (Standard)**: Used for regular development
   - Standard development tasks
   - Code implementation and reviews
   - Most development iterations
+  - Question generation in interview
 
 
 ## License

package/bin/claudefsd

@@ -10,7 +10,6 @@ NC='\033[0m' # No Color
 
 # Parse command line parameters
 WORKING_DIR="docs"
-FAST_MODE=""
 for arg in "$@"; do
     case $arg in
         --working-dir=*)
@@ -18,10 +17,6 @@ for arg in "$@"; do
             # Remove this argument from the list
             shift
             ;;
-        --fast)
-            FAST_MODE="--fast"
-            shift
-            ;;
     esac
 done
 export CLAUDEFSD_WORKING_DIR="$WORKING_DIR"
@@ -47,11 +42,18 @@ get_default_choice() {
     source "$(dirname "$0")/claudefsd-find-brief"
     if ! find_brief_file >/dev/null 2>&1; then
         echo "0"
-    elif [ ! -f "$WORKING_DIR/REQUIREMENTS.md" ] && [ ! -f "$WORKING_DIR/QUESTIONS.md" ]; then
+    fi
+
+    # Use flexible file detection
+    local requirements_file=$(find_project_file "REQUIREMENTS.md" 2>/dev/null || echo "")
+    local questions_file=$(find_project_file "QUESTIONS.md" 2>/dev/null || echo "")
+    local plan_file=$(find_project_file "PLAN.md" 2>/dev/null || echo "")
+
+    if [ -z "$requirements_file" ] && [ -z "$questions_file" ]; then
         echo "1"  # Interactive interview
-    elif [ -f "$WORKING_DIR/REQUIREMENTS.md" ] && [ ! -f "$WORKING_DIR/PLAN.md" ]; then
+    elif [ -n "$requirements_file" ] && [ -z "$plan_file" ]; then
         echo "2"  # Create plan from requirements
-    elif [ -f "$WORKING_DIR/QUESTIONS.md" ] && [ ! -f "$WORKING_DIR/PLAN.md" ]; then
+    elif [ -n "$questions_file" ] && [ -z "$plan_file" ]; then
         echo "2"  # Create plan from questions
     else
         echo "3"  # Development mode
@@ -88,10 +90,14 @@ show_menu() {
         echo "  1) Interview - Gather requirements through expert Q&A"
     fi
     
-    # Show create plan option based on what exists
-    if [ -f "$WORKING_DIR/REQUIREMENTS.md" ]; then
+    # Show create plan option based on what exists (use flexible detection)
+    source "$(dirname "$0")/claudefsd-find-brief"
+    local requirements_file=$(find_project_file "REQUIREMENTS.md" 2>/dev/null || echo "")
+    local questions_file=$(find_project_file "QUESTIONS.md" 2>/dev/null || echo "")
+
+    if [ -n "$requirements_file" ]; then
         echo "  2) Create plan - Generate development plan from requirements"
-    elif [ -f "$WORKING_DIR/QUESTIONS.md" ]; then
+    elif [ -n "$questions_file" ]; then
         echo "  2) Create plan - Generate plan from answered questions"
     else
         echo "  2) [Requires interview first]"
@@ -118,9 +124,14 @@ show_menu() {
         echo "  📝 Interview session: $session_status ($total_questions questions)"
     fi
     
-    [ -f "$WORKING_DIR/REQUIREMENTS.md" ] && echo "  ✓ $WORKING_DIR/REQUIREMENTS.md exists" || echo "  ✗ $WORKING_DIR/REQUIREMENTS.md missing"
-    [ -f "$WORKING_DIR/QUESTIONS.md" ] && echo "  ✓ $WORKING_DIR/QUESTIONS.md exists" || echo "  ✗ $WORKING_DIR/QUESTIONS.md missing"
-    [ -f "$WORKING_DIR/PLAN.md" ] && echo "  ✓ $WORKING_DIR/PLAN.md exists" || echo "  ✗ $WORKING_DIR/PLAN.md missing"
+    # Show status with flexible file detection
+    local requirements_file=$(find_project_file "REQUIREMENTS.md" 2>/dev/null || echo "")
+    local questions_file=$(find_project_file "QUESTIONS.md" 2>/dev/null || echo "")
+    local plan_file=$(find_project_file "PLAN.md" 2>/dev/null || echo "")
+
+    [ -n "$requirements_file" ] && echo "  ✓ $requirements_file exists" || echo "  ✗ REQUIREMENTS.md missing"
+    [ -n "$questions_file" ] && echo "  ✓ $questions_file exists" || echo "  ✗ QUESTIONS.md missing"
+    [ -n "$plan_file" ] && echo "  ✓ $plan_file exists" || echo "  ✗ PLAN.md missing"
     echo
 }
 
@@ -267,11 +278,15 @@ if [ $# -eq 0 ]; then
             exec "$(dirname "$0")/claudefsd-interview" --working-dir="$WORKING_DIR"
             ;;
         2)
-            # Create plan - check what source to use
-            if [ -f "$WORKING_DIR/REQUIREMENTS.md" ] || [ -f "$WORKING_DIR/QUESTIONS.md" ]; then
+            # Create plan - check what source to use (flexible detection)
+            source "$(dirname "$0")/claudefsd-find-brief"
+            requirements_file=$(find_project_file "REQUIREMENTS.md" 2>/dev/null || echo "")
+            questions_file=$(find_project_file "QUESTIONS.md" 2>/dev/null || echo "")
+
+            if [ -n "$requirements_file" ] || [ -n "$questions_file" ]; then
                 echo -e "${GREEN}Creating plan from project inputs...${NC}"
                 echo
-                exec "$(dirname "$0")/claudefsd-create-plan" --working-dir="$WORKING_DIR" $FAST_MODE
+                exec "$(dirname "$0")/claudefsd-create-plan" --working-dir="$WORKING_DIR"
             else
                 echo -e "${RED}No requirements or questions found. Please run the interview first.${NC}"
                 exit 1

package/bin/claudefsd-analyze-brief

@@ -16,7 +16,7 @@ exec "$(dirname "$0")/claudefsd-analyze-brief-personas" "$@"
 
 mkdir -p logs
 
-# Use a temporary directory for tmp files, as codex is sandboxed to this directory
+# Use a temporary directory for tmp files
 mkdir -p tmp
 export TMPDIR=tmp/
 
@@ -48,7 +48,7 @@ Read all of these documents if they exist:
 - docs/WEBTESTS.md -- the project web tests
 - README.md -- the project README
 
-Your job, as a megathinker business analyst, is to analyze the project brief and generate clarifying questions.
+Your job, as an ultrathinker business analyst, is to analyze the project brief and generate clarifying questions.
 
 1. Read through the BRIEF.md and any existing documents to understand the project.
 2. Generate 10-15 relevant questions to clarify ambiguous aspects of the brief.
@@ -67,18 +67,9 @@ DO NOT answer the questions yourself - just generate them for the user to answer
 "
 
 # run BA's
-echo "Running claude with opus model..."
+echo "Running claude with opus model with ultrathink..."
 claude --model opus --dangerously-skip-permissions -p "$prompt1" | tee >(cat > $LOGFILE-ba1)
 
-# Only run codex if available
-if command -v codex >/dev/null 2>&1; then
-    echo "Running codex o3 (results won't display)..."
-    codex -m o3 --full-auto -q "$prompt1" > $LOGFILE-ba2
-else
-    echo "Warning: codex not found, skipping enhanced analysis"
-    echo "Codex not available, skipping o3 analysis" > $LOGFILE-ba2
-fi
-
 echo -e "\033[32m==================================================================\033[0m"
 echo -e "\033[32m== ANALYSIS COMPLETE\033[0m"
 echo -e "\033[32m==================================================================\033[0m"

package/bin/claudefsd-analyze-brief-personas

@@ -83,7 +83,7 @@ Include only personas that are truly relevant to this project.
 "
 
 echo "Determining relevant expert personas..."
-PERSONAS=$(claude --model sonnet -p "$coordinator_prompt" 2>/dev/null | tail -1)
+PERSONAS=$(claude --model opus -p "$coordinator_prompt" 2>/dev/null | tail -1)
 
 # Clean up and validate personas
 PERSONAS=$(echo "$PERSONAS" | tr -d ' \n\r')
@@ -172,7 +172,7 @@ Output ONLY the questions, one per line, no numbering or bullets.
 "
     
     # Generate questions
-    QUESTIONS=$(claude --model sonnet -p "$batch_prompt" 2>/dev/null)
+    QUESTIONS=$(claude --model opus -p "$batch_prompt" 2>/dev/null)
     
     # Add section header
     echo "" >> "$WORKING_DIR/QUESTIONS.md"

package/bin/claudefsd-check-dependencies

@@ -13,26 +13,13 @@ command_exists() {
 
 # Function to check dependencies
 check_dependencies() {
-    local check_codex=${1:-true}  # Check codex by default
     local missing_deps=()
-    local warnings=()
-    
-    # Check for claude
+
+    # Check for claude (only required dependency)
     if ! command_exists claude; then
         missing_deps+=("claude")
     fi
-    
-    # Check for codex (optional but recommended)
-    if [ "$check_codex" = true ] && ! command_exists codex; then
-        warnings+=("codex is not installed. Some review features will be unavailable.")
-    fi
-    
-    # Check for OPENAI_API_KEY (optional for codex)
-    if [ "$check_codex" = true ] && [ -z "${OPENAI_API_KEY:-}" ]; then
-        warnings+=("OPENAI_API_KEY is not set. Codex features will be limited.")
-        warnings+=("Set it with: export OPENAI_API_KEY='your-key-here'")
-    fi
-    
+
     # Show critical errors
     if [ ${#missing_deps[@]} -ne 0 ]; then
         echo -e "${RED}❌ Missing required dependencies:${NC}"
@@ -45,15 +32,6 @@ check_dependencies() {
         echo
         exit 1
     fi
-    
-    # Show warnings
-    if [ ${#warnings[@]} -ne 0 ]; then
-        echo -e "${YELLOW}⚠️  Optional dependencies:${NC}"
-        for warning in "${warnings[@]}"; do
-            echo -e "  - $warning"
-        done
-        echo
-    fi
 }
 
 # If sourced directly, run the check

package/bin/claudefsd-create-plan

@@ -4,17 +4,12 @@ set -e
 
 # Parse command line parameters
 WORKING_DIR="docs"
-FAST_MODE=false
 for arg in "$@"; do
     case $arg in
         --working-dir=*)
             WORKING_DIR="${arg#*=}"
             shift
             ;;
-        --fast)
-            FAST_MODE=true
-            shift
-            ;;
     esac
 done
 export CLAUDEFSD_WORKING_DIR="$WORKING_DIR"
@@ -24,7 +19,7 @@ $(dirname "$0")/claudefsd-check-dependencies
 
 mkdir -p logs
 
-# Use a temporary directory for tmp files, as codex is sandboxed to this directory
+# Use a temporary directory for tmp files
 mkdir -p tmp
 export TMPDIR=tmp/
 
@@ -36,8 +31,12 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-if [ ! -f "$WORKING_DIR/QUESTIONS.md" ] && [ ! -f "$WORKING_DIR/REQUIREMENTS.md" ]; then
-    echo "No $WORKING_DIR/QUESTIONS.md or $WORKING_DIR/REQUIREMENTS.md found."
+# Check for required input files using flexible detection
+questions_file=$(find_project_file "QUESTIONS.md" 2>/dev/null || echo "")
+requirements_file=$(find_project_file "REQUIREMENTS.md" 2>/dev/null || echo "")
+
+if [ -z "$questions_file" ] && [ -z "$requirements_file" ]; then
+    echo "No QUESTIONS.md or REQUIREMENTS.md found in $WORKING_DIR/ or root directory."
     echo "Please run either:"
     echo "  - 'claudefsd analyze-brief' to generate questions, or"
     echo "  - 'claudefsd interview' to conduct an interactive interview"
@@ -50,22 +49,48 @@ echo -e "\033[32m===============================================================
 echo -e "\033[32m== CREATING PLAN FROM PROJECT INPUTS\033[0m"
 echo -e "\033[32m==================================================================\033[0m"
 
+# Build list of files to read (using flexible paths)
+plan_file=$(find_project_file "PLAN.md" 2>/dev/null || echo "")
+notes_file=$(find_project_file "CLAUDE-NOTES.md" 2>/dev/null || echo "")
+ideas_file=$(find_project_file "IDEAS.md" 2>/dev/null || echo "")
+webtests_file=$(find_project_file "WEBTESTS.md" 2>/dev/null || echo "")
+readme_file=$(find_project_file "README.md" 2>/dev/null || echo "")
+
+# Build file list for prompt
+file_list="- $BRIEF_FILE -- the project brief"
+[ -n "$questions_file" ] && file_list="$file_list
+- $questions_file -- the project questions (with answers) from analyze-brief or interview"
+[ -n "$requirements_file" ] && file_list="$file_list
+- $requirements_file -- consolidated requirements from interview process"
+[ -n "$notes_file" ] && file_list="$file_list
+- $notes_file -- AI's working notes and understanding"
+[ -n "$plan_file" ] && file_list="$file_list
+- $plan_file -- the project plan"
+[ -n "$ideas_file" ] && file_list="$file_list
+- $ideas_file -- the backlog of future ideas"
+[ -n "$webtests_file" ] && file_list="$file_list
+- $webtests_file -- the project web tests"
+[ -n "$readme_file" ] && file_list="$file_list
+- $readme_file -- the project README"
+
+# Determine output paths (prefer working dir if it exists, otherwise root)
+if [ -d "$WORKING_DIR" ] && [ "$WORKING_DIR" != "." ]; then
+    output_notes="$WORKING_DIR/CLAUDE-NOTES.md"
+    output_plan="$WORKING_DIR/PLAN.md"
+else
+    output_notes="CLAUDE-NOTES.md"
+    output_plan="PLAN.md"
+fi
+
     prompt2="
 Read and analyze these project files if they exist:
-- $BRIEF_FILE -- the project brief
-- $WORKING_DIR/QUESTIONS.md -- the project questions (with answers) from analyze-brief or interview
-- $WORKING_DIR/REQUIREMENTS.md -- consolidated requirements from interview process
-- $WORKING_DIR/CLAUDE-NOTES.md -- AI's working notes and understanding
-- $WORKING_DIR/PLAN.md -- the project plan
-- $WORKING_DIR/IDEAS.md -- the backlog of future ideas
-- $WORKING_DIR/WEBTESTS.md -- the project web tests
-- $WORKING_DIR/README.md -- the project README (if exists in working directory)
+$file_list
 
 Your job, as a megathinking architect and project manager, is to create the project plan and working notes.
 
-1. Read through the BRIEF.md and any available requirements/questions ($WORKING_DIR/QUESTIONS.md and/or $WORKING_DIR/REQUIREMENTS.md).
-2. Update or create $WORKING_DIR/CLAUDE-NOTES.md with your interpretation and understanding of the project.
-3. Update or create $WORKING_DIR/PLAN.md with a detailed implementation plan based on all available inputs.
+1. Read through the BRIEF.md and any available requirements/questions.
+2. Update or create $output_notes with your interpretation and understanding of the project.
+3. Update or create $output_plan with a detailed implementation plan based on all available inputs.
 
 The CLAUDE-NOTES.md should contain:
 - Your understanding of the project goals and requirements
@@ -76,7 +101,7 @@ The CLAUDE-NOTES.md should contain:
 The PLAN.md should contain:
 - Master plan limited to 100 lines maximum
 - High-level sections with [ ] checkboxes for completion tracking
-- For complex projects, reference detailed sub-plans in separate files ($WORKING_DIR/plan-section1.md, $WORKING_DIR/plan-section2.md, etc.)
+- For complex projects, reference detailed sub-plans in separate files (plan-section1.md, plan-section2.md, etc.)
 - Include proportional infrastructure setup (basic linting + pre-commit hooks)
 - Group related tasks into logical phases
 - If the plan would exceed 100 lines, create a master plan with section references and detailed sub-plans
@@ -92,87 +117,30 @@ INFRASTRUCTURE PROPORTIONALITY RULES:
 - Choose infrastructure complexity appropriate to solution size
 "
 
-# run BA's
-echo "Running claude with opus model..."
-claude --model opus --dangerously-skip-permissions -p "$prompt2" | tee >(cat > $LOGFILE-ba3)
+# Add ultrathink instruction to the beginning
+ultrathink_instruction="<ultrathink>
+You are entering deep strategic planning mode. Before responding, engage in extended reasoning to:
+- Analyze the full scope and implications of the project
+- Consider architectural tradeoffs and long-term consequences
+- Identify edge cases, failure modes, and technical risks
+- Think through the optimal approach from multiple angles
+Take your time to think deeply about the best solution before generating your plan.
+</ultrathink>
 
-# Only run codex if available and not in fast mode
-if command -v codex >/dev/null 2>&1 && [ "$FAST_MODE" = false ]; then
-    echo ""
-    echo -e "\033[33m==================================================================\033[0m"
-    echo -e "\033[33m== RUNNING O3-PRO FOR DEEP STRATEGIC PLANNING\033[0m"
-    echo -e "\033[33m==================================================================\033[0m"
-    echo "⏳ This will take several minutes as o3-pro deeply analyzes the project..."
-    echo "   o3-pro excels at strategic thinking and will create a comprehensive plan."
-    echo ""
-    
-    # Prepare comprehensive context for o3-pro with file references
-    file_list=""
-    [ -f "$BRIEF_FILE" ] && file_list="$file_list\n- $BRIEF_FILE (project brief)"
-    [ -f "$WORKING_DIR/QUESTIONS.md" ] && file_list="$file_list\n- $WORKING_DIR/QUESTIONS.md (interview questions & answers)"
-    [ -f "$WORKING_DIR/REQUIREMENTS.md" ] && file_list="$file_list\n- $WORKING_DIR/REQUIREMENTS.md (consolidated requirements)"
-    [ -f "$WORKING_DIR/INTERVIEW-SESSION.json" ] && file_list="$file_list\n- $WORKING_DIR/INTERVIEW-SESSION.json (interview metadata)"
-    [ -f "$WORKING_DIR/CLAUDE-NOTES.md" ] && file_list="$file_list\n- $WORKING_DIR/CLAUDE-NOTES.md (existing technical notes)"
-    [ -f "$WORKING_DIR/IDEAS.md" ] && file_list="$file_list\n- $WORKING_DIR/IDEAS.md (ideas backlog)"
-    [ -f "$WORKING_DIR/README.md" ] && file_list="$file_list\n- $WORKING_DIR/README.md (project readme)"
-    
-    o3_prompt="You are an elite software architect and strategic planner using o3-pro's advanced reasoning capabilities.
-
-READ AND ANALYZE THESE PROJECT FILES:$file_list
-
-TASK:
-Using your deep strategic reasoning, create a comprehensive project architecture and implementation plan.
-
-1. ARCHITECTURAL ANALYSIS ($WORKING_DIR/CLAUDE-NOTES.md):
-   - System architecture and key design decisions
-   - Technology stack justification
-   - Critical technical challenges and mitigation strategies
-   - Integration points and dependencies
-   - Performance and scalability considerations
-   - Security architecture
-   - Long-term maintainability strategy
-
-2. IMPLEMENTATION PLAN ($WORKING_DIR/PLAN.md):
-   - Master plan limited to 100 lines maximum with high-level sections
-   - For complex projects, create detailed sub-plans in separate files ($WORKING_DIR/plan-section1.md, etc.)
-   - Phased development approach with clear milestones
-   - Task breakdown with dependencies (detailed in sub-plans if needed)
-   - Risk assessment for each phase
-   - Testing strategy integrated into each phase
-   - Infrastructure needs (proportional to project size)
-   - Performance benchmarks and acceptance criteria
-
-Remember:
-- Think strategically about the entire system lifecycle
-- Consider edge cases and failure modes
-- Plan for iterative development and feedback loops
-- Keep infrastructure proportional to project complexity
-- Prioritize robustness and maintainability
-
-Take your time to think deeply about the optimal approach."
-
-    echo "Running codex o3-pro (this may take 3-5 minutes)..."
-    codex -m o3-pro --full-auto -q "$o3_prompt" | tee $LOGFILE-ba4
-    echo ""
-    echo "✅ o3-pro strategic planning complete!"
-else
-    echo ""
-    if [ "$FAST_MODE" = true ]; then
-        echo -e "\033[33m⚡ Fast mode enabled - skipping o3-pro strategic analysis for quicker results.\033[0m"
-        echo "Use 'claudefsd-create-plan' without --fast for deep o3-pro planning."
-        echo "Fast mode: skipping o3-pro strategic analysis" > $LOGFILE-ba4
-    else
-        echo -e "\033[33mNote: Install 'codex' CLI to enable o3-pro strategic planning for enhanced results.\033[0m"
-        echo "Proceeding with standard planning using Claude Opus..."
-        echo "Codex not available, skipping o3-pro strategic analysis" > $LOGFILE-ba4
-    fi
-fi
+"
+
+# Prepend ultrathink to the prompt
+prompt2="$ultrathink_instruction$prompt2"
+
+# Run planning with opus + ultrathink
+echo "Running claude with opus model (ultrathink mode)..."
+claude --model opus --dangerously-skip-permissions -p "$prompt2" | tee >(cat > $LOGFILE-ba3)
 
 echo -e "\033[32m==================================================================\033[0m"
 echo -e "\033[32m== PLAN CREATION COMPLETE\033[0m"
 echo -e "\033[32m==================================================================\033[0m"
-echo "Plan created in $WORKING_DIR/PLAN.md"
-echo "Working notes saved in $WORKING_DIR/CLAUDE-NOTES.md"
+echo "Plan created in $output_plan"
+echo "Working notes saved in $output_notes"
 echo "You can now run 'claudefsd dev' to start the development process."
 
 

package/bin/claudefsd-dev

@@ -46,17 +46,18 @@ SCRIPT_DIR="$(dirname "$SCRIPT_PATH")"
 
 # Function to check for required files
 check_requirements() {
-    # Load find_brief_file function
+    # Load file finding functions
     source "$SCRIPT_DIR/claudefsd-find-brief"
     brief_file=$(find_brief_file 2>/dev/null || echo "")
-    
+
     if [ -z "$brief_file" ]; then
         echo "No BRIEF.md file found in $WORKING_DIR/ or root directory. Please create one first."
         exit 1
     fi
-    
-    if [ ! -f "$WORKING_DIR/PLAN.md" ]; then
-        echo "No $WORKING_DIR/PLAN.md file found. Please run 'claudefsd create-plan' first."
+
+    plan_file=$(find_project_file "PLAN.md" 2>/dev/null || echo "")
+    if [ -z "$plan_file" ]; then
+        echo "No PLAN.md file found in $WORKING_DIR/ or root directory. Please run 'claudefsd create-plan' first."
         exit 1
     fi
 }
@@ -94,11 +95,23 @@ while true; do
     if [ $((LOOP_COUNTER % 4)) -eq 0 ]; then
         echo -e "\033[33m**** MEGATHINKING MODE ACTIVATED ****\033[0m"
         echo -e "\033[33mThis is your 4th development cycle. Taking a step back for architectural planning.\033[0m"
-        MEGATHINKING_MODE="**** MEGATHINKING MODE ACTIVATED ****\nThis is your 4th development cycle. Before proceeding with the next task, please take a step back and use megathinking mode to architecturally plan the next phase of development. Consider the overall structure of the codebase, potential refactoring opportunities, design patterns, technical debt, and how the current work connects to broader project goals.\n\n"
+        MEGATHINKING_MODE="<ultrathink>
+**** MEGATHINKING MODE ACTIVATED ****
+This is your 4th development cycle. Before proceeding with the next task, engage in deep extended reasoning to:
+- Take a step back and architecturally plan the next phase of development
+- Consider the overall structure of the codebase
+- Identify potential refactoring opportunities
+- Evaluate design patterns and technical debt
+- Think about how the current work connects to broader project goals
+- Analyze edge cases and potential failure modes
+Take your time to think deeply about the optimal approach before proceeding.
+</ultrathink>
+
+"
         CLAUDE_MODEL="opus"
     else
         MEGATHINKING_MODE=""
-        CLAUDE_MODEL="sonnet"
+        CLAUDE_MODEL="opus"
     fi
 
     # Build the development prompt combining intelligent task selection with parallel execution
@@ -107,37 +120,43 @@ You are an elite AI developer working in an automated development environment. Y
 
 **PROJECT FILES TO READ AND ANALYZE:**"
 
-    # Build file list more safely
+    # Build file list using flexible file detection
     source "$SCRIPT_DIR/claudefsd-find-brief"
+
     brief_file=$(find_brief_file 2>/dev/null || echo "")
     if [ -n "$brief_file" ]; then
         DEVELOPMENT_PROMPT="$DEVELOPMENT_PROMPT
 - $brief_file (project brief)"
     fi
-    
-    if [ -f "$WORKING_DIR/PLAN.md" ]; then
+
+    plan_file=$(find_project_file "PLAN.md" 2>/dev/null || echo "")
+    if [ -n "$plan_file" ]; then
         DEVELOPMENT_PROMPT="$DEVELOPMENT_PROMPT
-- $WORKING_DIR/PLAN.md (development plan with tasks)"
+- $plan_file (development plan with tasks)"
     fi
-    
-    if [ -f "$WORKING_DIR/REQUIREMENTS.md" ]; then
+
+    requirements_file=$(find_project_file "REQUIREMENTS.md" 2>/dev/null || echo "")
+    if [ -n "$requirements_file" ]; then
         DEVELOPMENT_PROMPT="$DEVELOPMENT_PROMPT
-- $WORKING_DIR/REQUIREMENTS.md (project requirements)"
+- $requirements_file (project requirements)"
     fi
-    
-    if [ -f "$WORKING_DIR/QUESTIONS.md" ]; then
+
+    questions_file=$(find_project_file "QUESTIONS.md" 2>/dev/null || echo "")
+    if [ -n "$questions_file" ]; then
         DEVELOPMENT_PROMPT="$DEVELOPMENT_PROMPT
-- $WORKING_DIR/QUESTIONS.md (interview Q&A)"
+- $questions_file (interview Q&A)"
     fi
-    
-    if [ -f "$WORKING_DIR/CLAUDE-NOTES.md" ]; then
+
+    notes_file=$(find_project_file "CLAUDE-NOTES.md" 2>/dev/null || echo "")
+    if [ -n "$notes_file" ]; then
         DEVELOPMENT_PROMPT="$DEVELOPMENT_PROMPT
-- $WORKING_DIR/CLAUDE-NOTES.md (technical notes)"
+- $notes_file (technical notes)"
     fi
-    
-    if [ -f "$WORKING_DIR/README.md" ]; then
+
+    readme_file=$(find_project_file "README.md" 2>/dev/null || echo "")
+    if [ -n "$readme_file" ]; then
         DEVELOPMENT_PROMPT="$DEVELOPMENT_PROMPT
-- $WORKING_DIR/README.md (project readme)"
+- $readme_file (project readme)"
     fi
     
     if [ -f "CLAUDE.md" ]; then
@@ -167,7 +186,7 @@ You are an elite AI developer working in an automated development environment. Y
 **YOUR MISSION:**
 
 **PHASE 1: TASK SELECTION**
-1. Read $WORKING_DIR/PLAN.md and work through tasks in order
+1. Read $plan_file and work through tasks in order
 2. If a phase references a sub-plan file, read that file as well
 3. Complete tasks in the order they appear - don't skip ahead
 4. Identify if tasks can be done in parallel
@@ -177,7 +196,7 @@ Choose the optimal approach:
 
 **Option A: Single Focus Task** (for sequential dependencies or complex architectural work)
 - Implement the next task in order using appropriate tools (Edit, Write, Bash, etc.)
-- Update $WORKING_DIR/PLAN.md to mark task as complete with [x]
+- Update $plan_file to mark task as complete with [x]
 
 **Option B: Parallel Task Execution** (for independent tasks)
 - Identify 2-4 related but independent tasks that can be done simultaneously
@@ -187,13 +206,13 @@ Choose the optimal approach:
 
 **PHASE 3: COMPLETION CHECK**
 After completing work:
-1. Update $WORKING_DIR/PLAN.md to reflect completed tasks
+1. Update $plan_file to reflect completed tasks
 2. Run any linters or tests specified in the project
 3. Report on what was accomplished and what remains
 
 **EXECUTION GUIDELINES:**
 - **BUILD BULLETPROOF**: Create robust solutions that handle edge cases
-- **STAY FOCUSED**: Only implement what's specified in $WORKING_DIR/PLAN.md
+- **STAY FOCUSED**: Only implement what's specified in $plan_file
 - **QUALITY FIRST**: Proper error handling, testing, and documentation
 - **ARCHITECTURAL THINKING**: Consider long-term maintainability
 
@@ -208,10 +227,10 @@ When using parallel Task agents, ensure each one:
 **OUTPUT FORMAT:**
 1. **<task_analysis>**: List identified open tasks and selected approach
 2. **<execution>**: Details of your ACTUAL implementation work (code written, files edited, commands run)
-3. **<plan_updates>**: How you updated $WORKING_DIR/PLAN.md to reflect progress
+3. **<plan_updates>**: How you updated $plan_file to reflect progress
 4. **<completion_check>**: Status of remaining work
 
-IMPORTANT: You must ACTUALLY IMPLEMENT tasks, not just describe what should be done. Use Edit, Write, Bash, and Task tools to complete real work. Begin by analyzing $WORKING_DIR/PLAN.md and then IMPLEMENT the next task in order."
+IMPORTANT: You must ACTUALLY IMPLEMENT tasks, not just describe what should be done. Use Edit, Write, Bash, and Task tools to complete real work. Begin by analyzing $plan_file and then IMPLEMENT the next task in order."
 
     # Save the prompt to the log file first
     echo "=== DEVELOPMENT PROMPT ===" > $LOGFILE
@@ -231,7 +250,7 @@ IMPORTANT: You must ACTUALLY IMPLEMENT tasks, not just describe what should be d
     echo -e "\033[32m== REVIEWING/VERIFYING WORK\033[0m"
     echo -e "\033[32m==================================================================\033[0m"
 
-    # Define the verifier prompt
+    # Define the verifier prompt (reuse plan_file from earlier)
     VERIFIER_PROMPT="You are an expert code reviewer tasked with verifying a developer's work.
 
 **DEVELOPER'S OUTPUT:**
@@ -242,13 +261,13 @@ $DEVELOPER_OUTPUT
 2. Verify the work was actually completed by checking files
 3. Look for any cheating patterns (disabled tests, silent fallbacks, etc.)
 4. Create a git commit (see guidelines below)
-5. Check if ALL tasks in $WORKING_DIR/PLAN.md are now complete
+5. Check if ALL tasks in $plan_file are now complete
 
 **VERIFICATION CHECKLIST:**
 - Did the developer actually implement code (not just analyze)?
 - Are all changes working correctly?
 - Do tests pass (if applicable)?
-- Is the task properly marked as complete in $WORKING_DIR/PLAN.md?
+- Is the task properly marked as complete in $plan_file?
 
 **GIT COMMIT GUIDELINES:**
 - If the code looks good: Definitely commit with a clear message

package/bin/claudefsd-find-brief

@@ -5,7 +5,7 @@
 find_brief_file() {
     # Use environment variable if set, otherwise default to "docs"
     local working_dir="${CLAUDEFSD_WORKING_DIR:-docs}"
-    
+
     if [ -f "$working_dir/BRIEF.md" ]; then
         echo "$working_dir/BRIEF.md"
     elif [ -f "BRIEF.md" ]; then
@@ -15,6 +15,22 @@ find_brief_file() {
     fi
 }
 
+# Generic function to find any file in working dir or root
+# Usage: find_project_file "PLAN.md"
+# Returns: path to file (prefers $WORKING_DIR/file, falls back to ./file)
+find_project_file() {
+    local filename="$1"
+    local working_dir="${CLAUDEFSD_WORKING_DIR:-docs}"
+
+    if [ -f "$working_dir/$filename" ]; then
+        echo "$working_dir/$filename"
+    elif [ -f "$filename" ]; then
+        echo "$filename"
+    else
+        return 1
+    fi
+}
+
 # If called directly, just output the path
 if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
     find_brief_file

package/bin/claudefsd-interview

@@ -193,7 +193,7 @@ prepare_next_question_bg() {
     coordinator_prompt="${coordinator_prompt//\{qa_summary_by_domain\}/$qa_summary}"
     
     # Get coordinator decision
-    local next_persona=$(claude --model sonnet -p "$coordinator_prompt" 2>/dev/null | tail -1)
+    local next_persona=$(claude --model opus -p "$coordinator_prompt" 2>/dev/null | tail -1)
     
     # Validate and clean decision - remove spaces, newlines, and markdown formatting
     next_persona=$(echo "$next_persona" | tr -d ' \n\r' | sed 's/[*_`]//g')
@@ -312,7 +312,7 @@ ${prompt_template}"
             prompt_template="${prompt_template//\{security_qa_history\}/$persona_qa}"
             
             # Get question from Claude
-            local question=$(claude --model sonnet -p "$prompt_template" 2>/dev/null | tail -1)
+            local question=$(claude --model opus -p "$prompt_template" 2>/dev/null | tail -1)
             echo "$question" > "$QUESTION_CACHE"
             
             # Question is ready in cache, no output needed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-fsd",
-  "version": "1.5.25",
+  "version": "1.5.27",
   "description": "Claude Full Self Drive tools for autonomous AI-powered development",
   "bin": {
     "claude-fsd": "bin/claude-fsd",

package/bin/claudefsd-dev 2

@@ -1,69 +0,0 @@
-#!/bin/bash
-#
-# Main development dispatcher - now uses unified development mode by default
-# Usage: claudefsd-dev [direct|iterative|legacy-direct|legacy-iterative]
-# 
-# Modes:
-# (default): Unified mode combining best of both approaches
-# direct: Legacy single-context parallel execution (deprecated)
-# iterative: Legacy multi-iteration loop development (deprecated)
-# legacy-direct: Force legacy direct execution mode
-# legacy-iterative: Force legacy iterative loop mode
-#
-# Examples:
-#   claudefsd-dev                    # Use unified development mode (recommended)
-#   claudefsd-dev legacy-direct      # Force legacy direct execution mode
-#   claudefsd-dev legacy-iterative   # Force legacy iterative loop mode
-
-set -e
-
-# Parse command line arguments
-DEV_MODE="$1"
-
-# Default to unified mode
-if [ -z "$DEV_MODE" ]; then
-    DEV_MODE="unified"
-fi
-
-echo "Development mode: $DEV_MODE"
-
-# Route to appropriate development script
-case "$DEV_MODE" in
-    unified)
-        echo "Launching unified development mode (recommended)..."
-        exec "$(dirname "$0")/claudefsd-dev-unified"
-        ;;
-    direct)
-        echo "WARNING: Legacy direct mode is deprecated. Consider using unified mode."
-        echo "Launching legacy direct execution mode..."
-        exec "$(dirname "$0")/claudefsd-dev-direct"
-        ;;
-    iterative)
-        echo "WARNING: Legacy iterative mode is deprecated. Consider using unified mode."
-        echo "Launching legacy iterative development mode..."
-        exec "$(dirname "$0")/claudefsd-dev-iterative"
-        ;;
-    legacy-direct)
-        echo "Launching legacy direct execution mode..."
-        exec "$(dirname "$0")/claudefsd-dev-direct"
-        ;;
-    legacy-iterative)
-        echo "Launching legacy iterative development mode..."
-        exec "$(dirname "$0")/claudefsd-dev-iterative"
-        ;;
-    small)
-        # Legacy support - map to unified (was direct)
-        echo "Legacy 'small' mode - redirecting to unified development..."
-        exec "$(dirname "$0")/claudefsd-dev-unified"
-        ;;
-    large)
-        # Legacy support - map to unified (was iterative)
-        echo "Legacy 'large' mode - redirecting to unified development..."
-        exec "$(dirname "$0")/claudefsd-dev-unified"
-        ;;
-    *)
-        echo "Unknown development mode: $DEV_MODE"
-        echo "Valid modes: unified (default), direct, iterative, legacy-direct, legacy-iterative"
-        exit 1
-        ;;
-esac