chore: fix format

chore: update package-lock.json
Merge remote-tracking branch 'origin/main' into update.from.main.branch
2025-06-14 21:11:15 +03:00 · 2025-06-14 21:08:31 +03:00 · 2025-06-14 21:07:12 +03:00 · 2025-06-14 15:12:26 +00:00 · 2025-06-14 11:10:27 -04:00 · 2025-06-14 11:04:26 -04:00
177 changed files with 8293 additions and 16740 deletions
--- a/.changeset/bright-llamas-enter.md
+++ b/.changeset/bright-llamas-enter.md
@@ -1,12 +0,0 @@
---
-"task-master-ai": patch
---
-
-Fix expand command preserving tagged task structure and preventing data corruption
-
- Enhance E2E tests with comprehensive tag-aware expand testing to verify tag corruption fix
- Add new test section for feature-expand tag creation and testing during expand operations
- Verify tag preservation during expand, force expand, and expand --all operations
- Test that master tag remains intact while feature-expand tag receives subtasks correctly
- Fix file path references to use correct .taskmaster/config.json and .taskmaster/tasks/tasks.json locations
- All tag corruption verification tests pass successfully, confirming the expand command tag corruption bug fix works as expected
--- a/.changeset/bright-windows-sing.md
+++ b/.changeset/bright-windows-sing.md
@@ -0,0 +1,77 @@
+---
+"task-master-ai": minor
+---
+
+Add comprehensive AI-powered research command with intelligent context gathering and interactive follow-ups.
+
+The new `research` command provides AI-powered research capabilities that automatically gather relevant project context to answer your questions. The command intelligently selects context from multiple sources and supports interactive follow-up questions in CLI mode.
+
+**Key Features:**
+
+- **Intelligent Task Discovery**: Automatically finds relevant tasks and subtasks using fuzzy search based on your query keywords, supplementing any explicitly provided task IDs
+- **Multi-Source Context**: Gathers context from tasks, files, project structure, and custom text to provide comprehensive answers
+- **Interactive Follow-ups**: CLI users can ask follow-up questions that build on the conversation history while allowing fresh context discovery for each question
+- **Flexible Detail Levels**: Choose from low (concise), medium (balanced), or high (comprehensive) response detail levels
+- **Token Transparency**: Displays detailed token breakdown showing context size, sources, and estimated costs
+- **Enhanced Display**: Syntax-highlighted code blocks and structured output with clear visual separation
+
+**Usage Examples:**
+
+```bash
+# Basic research with auto-discovered context
+task-master research "How should I implement user authentication?"
+
+# Research with specific task context
+task-master research "What's the best approach for this?" --id=15,23.2
+
+# Research with file context and project tree
+task-master research "How does the current auth system work?" --files=src/auth.js,config/auth.json --tree
+
+# Research with custom context and low detail
+task-master research "Quick implementation steps?" --context="Using JWT tokens" --detail=low
+```
+
+**Context Sources:**
+
+- **Tasks**: Automatically discovers relevant tasks/subtasks via fuzzy search, plus any explicitly specified via `--id`
+- **Files**: Include specific files via `--files` for code-aware responses
+- **Project Tree**: Add `--tree` to include project structure overview
+- **Custom Context**: Provide additional context via `--context` for domain-specific information
+
+**Interactive Features (CLI only):**
+
+- Follow-up questions that maintain conversation history
+- Fresh fuzzy search for each follow-up to discover newly relevant tasks
+- Cumulative context building across the conversation
+- Clean visual separation between exchanges
+- **Save to Tasks**: Save entire research conversations (including follow-ups) directly to task or subtask details with timestamps
+- **Clean Menu Interface**: Streamlined inquirer-based menu for follow-up actions without redundant UI elements
+
+**Save Functionality:**
+
+The research command now supports saving complete conversation threads to tasks or subtasks:
+
+- Save research results and follow-up conversations to any task (e.g., "15") or subtask (e.g., "15.2")
+- Automatic timestamping and formatting of conversation history
+- Validation of task/subtask existence before saving
+- Appends to existing task details without overwriting content
+- Supports both CLI interactive mode and MCP programmatic access via `--save-to` flag
+
+**Enhanced CLI Options:**
+
+```bash
+# Auto-save research results to a task
+task-master research "Implementation approach?" --save-to=15
+
+# Combine auto-save with context gathering
+task-master research "How to optimize this?" --id=23 --save-to=23.1
+```
+
+**MCP Integration:**
+
+- `saveTo` parameter for automatic saving to specified task/subtask ID
+- Structured response format with telemetry data
+- Silent operation mode for programmatic usage
+- Full feature parity with CLI except interactive follow-ups
+
+The research command integrates with the existing AI service layer and supports all configured AI providers. Both CLI and MCP interfaces provide comprehensive research capabilities with intelligent context gathering and flexible output options.
--- a/.changeset/chatty-rats-talk.md
+++ b/.changeset/chatty-rats-talk.md
@@ -0,0 +1,5 @@
+---
+"task-master-ai": patch
+---
+
+Fix Cursor deeplink installation by providing copy-paste instructions for GitHub compatibility
--- a/.changeset/cold-pears-poke.md
+++ b/.changeset/cold-pears-poke.md
@@ -0,0 +1,13 @@
+---
+'task-master-ai': patch
+---
+
+Fix critical bugs in task move functionality:
+
+- **Fixed moving tasks to become subtasks of empty parents**: When moving a task to become a subtask of a parent that had no existing subtasks (e.g., task 89 → task 98.1), the operation would fail with validation errors.
+
+- **Fixed moving subtasks between parents**: Subtasks can now be properly moved between different parent tasks, including to parents that previously had no subtasks.
+
+- **Improved comma-separated batch moves**: Multiple tasks can now be moved simultaneously using comma-separated IDs (e.g., "88,90" → "92,93") with proper error handling and atomic operations.
+
+These fixes enables proper task hierarchy reorganization for corner cases that were previously broken.
--- a/.changeset/fluffy-waves-allow.md
+++ b/.changeset/fluffy-waves-allow.md
@@ -0,0 +1,5 @@
+---
+"task-master-ai": patch
+---
+
+Adds ability to automatically create/switch tags to match the current git branch. The configuration to enable the git workflow and then use the auto switching is in config.json."
--- a/.changeset/free-pants-rescue.md
+++ b/.changeset/free-pants-rescue.md
@@ -0,0 +1,18 @@
+---
+"task-master-ai": minor
+---
+
+Enhance update-task with --append flag for timestamped task updates
+
+Adds the `--append` flag to `update-task` command, enabling it to behave like `update-subtask` with timestamped information appending. This provides more flexible task updating options:
+
+**CLI Enhancement:**
+- `task-master update-task --id=5 --prompt="New info"` - Full task update (existing behavior)
+- `task-master update-task --id=5 --append --prompt="Progress update"` - Append timestamped info to task details
+
+**Full MCP Integration:**
+- MCP tool `update_task` now supports `append` parameter
+- Seamless integration with Cursor and other MCP clients
+- Consistent behavior between CLI and MCP interfaces
+
+Instead of requiring separate subtask creation for progress tracking, you can now append timestamped information directly to parent tasks while preserving the option for comprehensive task updates.
--- a/.changeset/huge-moose-prove.md
+++ b/.changeset/huge-moose-prove.md
@@ -1,8 +0,0 @@
---
-"task-master-ai": minor
---
-
-Can now configure baseURL of provider with `<PROVIDER>_BASE_URL`
-
- For example:
-  - `OPENAI_BASE_URL`
--- a/.changeset/icy-dryers-hunt.md
+++ b/.changeset/icy-dryers-hunt.md
@@ -1,5 +0,0 @@
---
-"task-master-ai": patch
---
-
-Call rules interactive setup during init
--- a/.changeset/large-wolves-strive.md
+++ b/.changeset/large-wolves-strive.md
@@ -2,4 +2,4 @@
 "task-master-ai": patch
 ---

-Store tasks in Git by default
+Update o3 model price
--- a/.changeset/late-dryers-relax.md
+++ b/.changeset/late-dryers-relax.md
@@ -0,0 +1,11 @@
+---
+"task-master-ai": minor
+---
+
+Add --tag flag support to core commands for multi-context task management. Commands like parse-prd, analyze-complexity, and others now support targeting specific task lists, enabling rapid prototyping and parallel development workflows.
+
+Key features:
+- parse-prd --tag=feature-name: Parse PRDs into separate task contexts on the fly
+- analyze-complexity --tag=branch: Generate tag-specific complexity reports  
+- All task operations can target specific contexts while preserving other lists
+- Non-existent tags are created automatically for seamless workflow
--- a/.changeset/lemon-deer-hide.md
+++ b/.changeset/lemon-deer-hide.md
@@ -1,17 +0,0 @@
---
-'task-master-ai': minor
---
-
-Added comprehensive rule profile management:
-
-**New Profile Support**: Added comprehensive IDE profile support with eight specialized profiles: Claude Code, Cline, Codex, Cursor, Roo, Trae, VS Code, and Windsurf. Each profile is optimized for its respective IDE with appropriate mappings and configuration.
-**Initialization**: You can now specify which rule profiles to include at project initialization using `--rules <profiles>` or `-r <profiles>` (e.g., `task-master init -r cursor,roo`). Only the selected profiles and configuration are included.
-**Add/Remove Commands**: `task-master rules add <profiles>` and `task-master rules remove <profiles>` let you manage specific rule profiles and MCP config after initialization, supporting multiple profiles at once.
-**Interactive Setup**: `task-master rules setup` launches an interactive prompt to select which rule profiles to add to your project. This does **not** re-initialize your project or affect shell aliases; it only manages rules.
-**Selective Removal**: Rules removal intelligently preserves existing non-Task Master rules and files and only removes Task Master-specific rules. Profile directories are only removed when completely empty and all conditions are met (no existing rules, no other files/folders, MCP config completely removed).
-**Safety Features**: Confirmation messages clearly explain that only Task Master-specific rules and MCP configurations will be removed, while preserving existing custom rules and other files.
-**Robust Validation**: Includes comprehensive checks for array types in MCP config processing and error handling throughout the rules management system.
-
-This enables more flexible, rule-specific project setups with intelligent cleanup that preserves user customizations while safely managing Task Master components.
-
- Resolves #338
--- a/.changeset/modern-cats-pick.md
+++ b/.changeset/modern-cats-pick.md
@@ -1,5 +0,0 @@
---
-"task-master-ai": patch
---
-
-Improves Amazon Bedrock support
--- a/.changeset/nasty-berries-tan.md
+++ b/.changeset/nasty-berries-tan.md
@@ -1,5 +0,0 @@
---
-"task-master-ai": patch
---
-
-Fix issues with task creation/update where subtasks are being created like id: <parent_task>.<subtask> instead if just id: <subtask>
--- a/.changeset/nasty-chefs-add.md
+++ b/.changeset/nasty-chefs-add.md
@@ -0,0 +1,8 @@
+---
+"task-master-ai": patch
+---
+
+Fixes issue with expand CLI command "Complexity report not found"
+
+- Closes #735
+- Closes #728
--- a/.changeset/petite-friends-arrive.md
+++ b/.changeset/petite-friends-arrive.md
@@ -1,10 +0,0 @@
---
-"task-master-ai": minor
---
-
-Make task-master more compatible with the "o" family models of OpenAI
-
-Now works well with:
- o3
- o3-mini
- etc.
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -2,22 +2,30 @@
  "mode": "exit",
  "tag": "rc",
  "initialVersions": {
-    "task-master-ai": "0.17.1"
+    "task-master-ai": "0.16.2"
  },
  "changesets": [
-    "bright-llamas-enter",
-    "huge-moose-prove",
-    "icy-dryers-hunt",
-    "lemon-deer-hide",
-    "modern-cats-pick",
-    "nasty-berries-tan",
-    "shy-groups-fly",
-    "sour-lions-check",
-    "spicy-teams-travel",
-    "stale-cameras-sin",
-    "swift-squids-sip",
-    "tiny-dogs-change",
-    "vast-plants-exist",
-    "wet-berries-dress"
+    "bright-windows-sing",
+    "chatty-rats-talk",
+    "cold-pears-poke",
+    "curly-dragons-design",
+    "eleven-news-check",
+    "fluffy-waves-allow",
+    "four-cups-enter",
+    "free-pants-rescue",
+    "large-wolves-strive",
+    "late-dryers-relax",
+    "nasty-chefs-add",
+    "pink-houses-lay",
+    "polite-areas-shave",
+    "quick-flies-sniff",
+    "six-cups-see",
+    "slick-webs-lead",
+    "slow-lies-make",
+    "stale-bats-sin",
+    "tiny-ads-decide",
+    "two-lies-start",
+    "vast-shrimps-happen",
+    "yellow-olives-admire"
  ]
-}
+}
--- a/.changeset/quick-flies-sniff.md
+++ b/.changeset/quick-flies-sniff.md
@@ -0,0 +1,5 @@
+---
+"task-master-ai": patch
+---
+
+Fix issue with generate command which was creating tasks in the legacy tasks location.
--- a/.changeset/shy-groups-fly.md
+++ b/.changeset/shy-groups-fly.md
@@ -1,5 +0,0 @@
---
-"task-master-ai": minor
---
-
-Add better support for python projects by adding `pyproject.toml` as a projectRoot marker
--- a/.changeset/six-cups-see.md
+++ b/.changeset/six-cups-see.md
@@ -0,0 +1,136 @@
+---
+"task-master-ai": minor
+---
+
+Introduces Tagged Lists: AI Multi-Context Task Management System
+
+This major release introduces Tagged Lists, a comprehensive system that transforms Task Master into a multi-context task management powerhouse. You can now organize tasks into completely isolated contexts, enabling parallel (agentic) development workflows, team collaboration, and project experimentation without conflicts.
+
+**🏷️ Tagged Task Lists Architecture:**
+
+The new tagged system fundamentally changes how tasks are organized:
+- **Legacy Format**: `{ "tasks": [...] }` 
+- **New Tagged Format**: `{ "master": { "tasks": [...], "metadata": {...} }, "feature-xyz": { "tasks": [...], "metadata": {...} } }`
+- **Automatic Migration**: Existing projects seamlessly migrate to tagged format with zero user intervention
+- **State Management**: New `.taskmaster/state.json` tracks current tag, last switched time, and migration status
+- **Configuration Integration**: Enhanced `.taskmaster/config.json` with tag-specific settings and defaults
+
+**🚀 Complete Tag Management Suite:**
+
+**Core Tag Commands:**
+- `task-master tags [--show-metadata]` - List all tags with task counts, completion stats, and metadata
+- `task-master add-tag <name> [options]` - Create new tag contexts with optional task copying
+- `task-master delete-tag <name> [--yes]` - Delete tags with double confirmation protection
+- `task-master use-tag <name>` - Switch contexts and immediately see next available task
+- `task-master rename-tag <old> <new>` - Rename tags with automatic current tag reference updates
+- `task-master copy-tag <source> <target> [options]` - Duplicate tag contexts for experimentation
+
+**🤖 Full MCP Integration for Tag Management:**
+
+Task Master's multi-context capabilities are now fully exposed through the MCP server, enabling powerful agentic workflows:
+- **`list_tags`**: List all available tag contexts.
+- **`add_tag`**: Programmatically create new tags.
+- **`delete_tag`**: Remove tag contexts.
+- **`use_tag`**: Switch the agent's active task context.
+- **`rename_tag`**: Rename existing tags.
+- **`copy_tag`**: Duplicate entire task contexts for experimentation.
+
+**Tag Creation Options:**
+- `--copy-from-current` - Copy tasks from currently active tag
+- `--copy-from=<tag>` - Copy tasks from specific tag
+- `--from-branch` - Creates a new tag usin active git branch name (for `add-tag` only)
+- `--description="<text>"` - Add custom tag descriptions
+- Empty tag creation for fresh contexts
+
+**🎯 Universal --tag Flag Support:**
+
+Every task operation now supports tag-specific execution:
+- `task-master list --tag=feature-branch` - View tasks in specific context
+- `task-master add-task --tag=experiment --prompt="..."` - Create tasks in specific tag
+- `task-master parse-prd document.txt --tag=v2-redesign` - Parse PRDs into dedicated contexts
+- `task-master analyze-complexity --tag=performance-work` - Generate tag-specific reports
+- `task-master set-status --tag=hotfix --id=5 --status=done` - Update tasks in specific contexts
+- `task-master expand --tag=research --id=3` - Break down tasks within tag contexts
+
+**📊 Enhanced Workflow Features:**
+
+**Smart Context Switching:**
+- `use-tag` command shows immediate next task after switching
+- Automatic tag creation when targeting non-existent tags
+- Current tag persistence across terminal sessions
+- Branch-tag mapping for future Git integration
+
+**Intelligent File Management:**
+- Tag-specific complexity reports: `task-complexity-report_tagname.json`
+- Master tag uses default filenames: `task-complexity-report.json`
+- Automatic file isolation prevents cross-tag contamination
+
+**Advanced Confirmation Logic:**
+- Commands only prompt when target tag has existing tasks
+- Empty tags allow immediate operations without confirmation
+- Smart append vs overwrite detection
+
+**🔄 Seamless Migration & Compatibility:**
+
+**Zero-Disruption Migration:**
+- Existing `tasks.json` files automatically migrate on first command
+- Master tag receives proper metadata (creation date, description)
+- Migration notice shown once with helpful explanation
+- All existing commands work identically to before
+
+**State Management:**
+- `.taskmaster/state.json` tracks current tag and migration status
+- Automatic state creation and maintenance
+- Branch-tag mapping foundation for Git integration
+- Migration notice tracking to avoid repeated notifications
+- Grounds for future context additions
+
+**Backward Compatibility:**
+- All existing workflows continue unchanged
+- Legacy commands work exactly as before
+- Gradual adoption - users can ignore tags entirely if desired
+- No breaking changes to existing tasks or file formats
+
+**💡 Real-World Use Cases:**
+
+**Team Collaboration:**
+- `task-master add-tag alice --copy-from-current` - Create teammate-specific contexts
+- `task-master add-tag bob --copy-from=master` - Onboard new team members
+- `task-master use-tag alice` - Switch to teammate's work context
+
+**Feature Development:**
+- `task-master parse-prd feature-spec.txt --tag=user-auth` - Dedicated feature planning
+- `task-master add-tag experiment --copy-from=user-auth` - Safe experimentation
+- `task-master analyze-complexity --tag=user-auth` - Feature-specific analysis
+
+**Release Management:**
+- `task-master add-tag v2.0 --description="Next major release"` - Version-specific planning
+- `task-master copy-tag master v2.1` - Release branch preparation
+- `task-master use-tag hotfix` - Emergency fix context
+
+**Project Phases:**
+- `task-master add-tag research --description="Discovery phase"` - Research tasks
+- `task-master add-tag implementation --copy-from=research` - Development phase
+- `task-master add-tag testing --copy-from=implementation` - QA phase
+
+**🛠️ Technical Implementation:**
+
+**Data Structure:**
+- Tagged format with complete isolation between contexts
+- Rich metadata per tag (creation date, description, update tracking)
+- Automatic metadata enhancement for existing tags
+- Clean separation of tag data and internal state
+
+**Performance Optimizations:**
+- Dynamic task counting without stored counters
+- Efficient tag resolution and caching
+- Minimal file I/O with smart data loading
+- Responsive table layouts adapting to terminal width
+
+**Error Handling:**
+- Comprehensive validation for tag names (alphanumeric, hyphens, underscores)
+- Reserved name protection (master, main, default)
+- Graceful handling of missing tags and corrupted data
+- Detailed error messages with suggested corrections
+
+This release establishes the foundation for advanced multi-context workflows while maintaining the simplicity and power that makes Task Master effective for individual developers.
--- a/.changeset/slick-webs-lead.md
+++ b/.changeset/slick-webs-lead.md
@@ -0,0 +1,24 @@
+---
+"task-master-ai": minor
+---
+
+Research Save-to-File Feature & Critical MCP Tag Corruption Fix
+
+**🔬 New Research Save-to-File Functionality:**
+
+Added comprehensive save-to-file capability to the research command, enabling users to preserve research sessions for future reference and documentation.
+
+**CLI Integration:**
+- New `--save-file` flag for `task-master research` command
+- Consistent with existing `--save` and `--save-to` flags for intuitive usage
+- Interactive "Save to file" option in follow-up questions menu
+
+**MCP Integration:**
+- New `saveToFile` boolean parameter for the `research` MCP tool
+- Enables programmatic research saving for AI agents and integrated tools
+
+**File Management:**
+- Automatically creates `.taskmaster/docs/research/` directory structure
+- Generates timestamped, slugified filenames (e.g., `2025-01-13_what-is-typescript.md`)
+- Comprehensive Markdown format with metadata headers including query, timestamp, and context sources
+- Clean conversation history formatting without duplicate information
--- a/.changeset/slow-lies-make.md
+++ b/.changeset/slow-lies-make.md
@@ -0,0 +1,5 @@
+---
+"task-master-ai": minor
+---
+
+No longer automatically creates individual task files as they are not used by the applicatoin. You can still generate them anytime using the `generate` command.
--- a/.changeset/spicy-teams-travel.md
+++ b/.changeset/spicy-teams-travel.md
@@ -1,11 +0,0 @@
---
-"task-master-ai": patch
---
-
-Improve provider validation system with clean constants structure
-
- **Fixed "Invalid provider hint" errors**: Resolved validation failures for Azure, Vertex, and Bedrock providers
- **Improved search UX**: Integrated search for better model discovery with real-time filtering
- **Better organization**: Moved custom provider options to bottom of model selection with clear section separators
-
-This change ensures all custom providers (Azure, Vertex, Bedrock, OpenRouter, Ollama) work correctly in `task-master models --setup`
--- a/.changeset/stale-bats-sin.md
+++ b/.changeset/stale-bats-sin.md
@@ -0,0 +1,19 @@
+---
+'task-master-ai': minor
+---
+
+Enhanced get-task/show command to support comma-separated task IDs for efficient batch operations
+
+**New Features:**
+- **Multiple Task Retrieval**: Pass comma-separated IDs to get/show multiple tasks at once (e.g., `task-master show 1,3,5` or MCP `get_task` with `id: "1,3,5"`)
+- **Smart Display Logic**: Single ID shows detailed view, multiple IDs show compact summary table with interactive options
+- **Batch Action Menu**: Interactive menu for multiple tasks with copy-paste ready commands for common operations (mark as done/in-progress, expand all, view dependencies, etc.)
+- **MCP Array Response**: MCP tool returns structured array of task objects for efficient AI agent context gathering
+
+**Benefits:**
+- **Faster Context Gathering**: AI agents can collect multiple tasks/subtasks in one call instead of iterating
+- **Improved Workflow**: Interactive batch operations reduce repetitive command execution
+- **Better UX**: Responsive layout adapts to terminal width, maintains consistency with existing UI patterns
+- **API Efficiency**: RESTful array responses in MCP format enable more sophisticated integrations
+
+This enhancement maintains full backward compatibility while significantly improving efficiency for both human users and AI agents working with multiple tasks.
--- a/.changeset/stale-cameras-sin.md
+++ b/.changeset/stale-cameras-sin.md
@@ -1,5 +0,0 @@
---
-"task-master-ai": patch
---
-
-Fix weird `task-master init` bug when using in certain environments
--- a/.changeset/swift-squids-sip.md
+++ b/.changeset/swift-squids-sip.md
@@ -1,5 +0,0 @@
---
-"task-master-ai": patch
---
-
-Rename Roo Code Boomerang role to Orchestrator
--- a/.changeset/tiny-ads-decide.md
+++ b/.changeset/tiny-ads-decide.md
@@ -0,0 +1,7 @@
+---
+"task-master-ai": minor
+---
+
+Adds support for filtering tasks by multiple statuses at once using comma-separated statuses.
+
+Example: `cancelled,deferred`
--- a/.changeset/tiny-dogs-change.md
+++ b/.changeset/tiny-dogs-change.md
@@ -1,5 +0,0 @@
---
-"task-master-ai": patch
---
-
-Improve mcp keys check in cursor
--- a/.changeset/two-lies-start.md
+++ b/.changeset/two-lies-start.md
@@ -0,0 +1,5 @@
+---
+"task-master-ai": patch
+---
+
+Improves dependency management when moving tasks by updating subtask dependencies that reference sibling subtasks by their old parent-based ID
--- a/.changeset/vast-plants-exist.md
+++ b/.changeset/vast-plants-exist.md
@@ -1,22 +0,0 @@
---
-"task-master-ai": minor
---
-
- **Git Worktree Detection:**
-  - Now properly skips Git initialization when inside existing Git worktree
-  - Prevents accidental nested repository creation
- **Flag System Overhaul:**
-  - `--git`/`--no-git` controls repository initialization
-  - `--aliases`/`--no-aliases` consistently manages shell alias creation
-  - `--git-tasks`/`--no-git-tasks` controls whether task files are stored in Git
-  - `--dry-run` accurately previews all initialization behaviors
- **GitTasks Functionality:**
-  - New `--git-tasks` flag includes task files in Git (comments them out in .gitignore)
-  - New `--no-git-tasks` flag excludes task files from Git (default behavior)
-  - Supports both CLI and MCP interfaces with proper parameter passing
-
-**Implementation Details:**
- Added explicit Git worktree detection before initialization
- Refactored flag processing to ensure consistent behavior
-
- Fixes #734
--- a/.changeset/wet-berries-dress.md
+++ b/.changeset/wet-berries-dress.md
@@ -1,22 +0,0 @@
---
-"task-master-ai": minor
---
-
-Add Claude Code provider support
-
-Introduces a new provider that enables using Claude models (Opus and Sonnet) through the Claude Code CLI without requiring an API key. 
-
-Key features:
- New claude-code provider with support for opus and sonnet models
- No API key required - uses local Claude Code CLI installation
- Optional dependency - won't affect users who don't need Claude Code
- Lazy loading ensures the provider only loads when requested
- Full integration with existing Task Master commands and workflows
- Comprehensive test coverage for reliability
- New --claude-code flag for the models command
-
-Users can now configure Claude Code models with:
-  task-master models --set-main sonnet --claude-code
-  task-master models --set-research opus --claude-code
-
-The @anthropic-ai/claude-code package is optional and won't be installed unless explicitly needed.
--- a/.changeset/yellow-olives-admire.md
+++ b/.changeset/yellow-olives-admire.md
@@ -0,0 +1,5 @@
+---
+"task-master-ai": minor
+---
+
+Adds tag to CLI output so you know which tag you are performing operations on. Already supported in the MCP response.
--- a/.cursor/rules/dev_workflow.mdc
+++ b/.cursor/rules/dev_workflow.mdc
@@ -1,200 +1,19 @@
 ---
-description: Guide for using Taskmaster to manage task-driven development workflows
+description: Guide for using Task Master to manage task-driven development workflows
 globs: **/*
 alwaysApply: true
 ---
+# Task Master Development Workflow

-# Taskmaster Development Workflow
-
-This guide outlines the standard process for using Taskmaster to manage software development projects. It is written as a set of instructions for you, the AI agent.
-
- **Your Default Stance**: For most projects, the user can work directly within the `master` task context. Your initial actions should operate on this default context unless a clear pattern for multi-context work emerges.
- **Your Goal**: Your role is to elevate the user's workflow by intelligently introducing advanced features like **Tagged Task Lists** when you detect the appropriate context. Do not force tags on the user; suggest them as a helpful solution to a specific need.
-
-## The Basic Loop
-The fundamental development cycle you will facilitate is:
-1.  **`list`**: Show the user what needs to be done.
-2.  **`next`**: Help the user decide what to work on.
-3.  **`show <id>`**: Provide details for a specific task.
-4.  **`expand <id>`**: Break down a complex task into smaller, manageable subtasks.
-5.  **Implement**: The user writes the code and tests.
-6.  **`update-subtask`**: Log progress and findings on behalf of the user.
-7.  **`set-status`**: Mark tasks and subtasks as `done` as work is completed.
-8.  **Repeat**.
-
-All your standard command executions should operate on the user's current task context, which defaults to `master`.
-
---
-
-## Standard Development Workflow Process
-
-### Simple Workflow (Default Starting Point)
-
-For new projects or when users are getting started, operate within the `master` tag context:
-
-   Start new projects by running `initialize_project` tool / `task-master init` or `parse_prd` / `task-master parse-prd --input='<prd-file.txt>'` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to generate initial tasks.json with tagged structure
-   Configure rule sets during initialization with `--rules` flag (e.g., `task-master init --rules cursor,windsurf`) or manage them later with `task-master rules add/remove` commands  
-   Begin coding sessions with `get_tasks` / `task-master list` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to see current tasks, status, and IDs
-   Determine the next task to work on using `next_task` / `task-master next` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc))
-   Analyze task complexity with `analyze_project_complexity` / `task-master analyze-complexity --research` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) before breaking down tasks
-   Review complexity report using `complexity_report` / `task-master complexity-report` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc))
-   Select tasks based on dependencies (all marked 'done'), priority level, and ID order
-   View specific task details using `get_task` / `task-master show <id>` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to understand implementation requirements
-   Break down complex tasks using `expand_task` / `task-master expand --id=<id> --force --research` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) with appropriate flags like `--force` (to replace existing subtasks) and `--research`
-   Implement code following task details, dependencies, and project standards
-   Mark completed tasks with `set_task_status` / `task-master set-status --id=<id> --status=done` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc))
-   Update dependent tasks when implementation differs from original plan using `update` / `task-master update --from=<id> --prompt="..."` or `update_task` / `task-master update-task --id=<id> --prompt="..."` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc))
-
---
-
-## Leveling Up: Agent-Led Multi-Context Workflows
-
-While the basic workflow is powerful, your primary opportunity to add value is by identifying when to introduce **Tagged Task Lists**. These patterns are your tools for creating a more organized and efficient development environment for the user, especially if you detect agentic or parallel development happening across the same session.
-
-**Critical Principle**: Most users should never see a difference in their experience. Only introduce advanced workflows when you detect clear indicators that the project has evolved beyond simple task management.
-
-### When to Introduce Tags: Your Decision Patterns
-
-Here are the patterns to look for. When you detect one, you should propose the corresponding workflow to the user.
-
-#### Pattern 1: Simple Git Feature Branching
-This is the most common and direct use case for tags.
-
- **Trigger**: The user creates a new git branch (e.g., `git checkout -b feature/user-auth`).
- **Your Action**: Propose creating a new tag that mirrors the branch name to isolate the feature's tasks from `master`.
- **Your Suggested Prompt**: *"I see you've created a new branch named 'feature/user-auth'. To keep all related tasks neatly organized and separate from your main list, I can create a corresponding task tag for you. This helps prevent merge conflicts in your `tasks.json` file later. Shall I create the 'feature-user-auth' tag?"*
- **Tool to Use**: `task-master add-tag --from-branch`
-
-#### Pattern 2: Team Collaboration
- **Trigger**: The user mentions working with teammates (e.g., "My teammate Alice is handling the database schema," or "I need to review Bob's work on the API.").
- **Your Action**: Suggest creating a separate tag for the user's work to prevent conflicts with shared master context.
- **Your Suggested Prompt**: *"Since you're working with Alice, I can create a separate task context for your work to avoid conflicts. This way, Alice can continue working with the master list while you have your own isolated context. When you're ready to merge your work, we can coordinate the tasks back to master. Shall I create a tag for your current work?"*
- **Tool to Use**: `task-master add-tag my-work --copy-from-current --description="My tasks while collaborating with Alice"`
-
-#### Pattern 3: Experiments or Risky Refactors
- **Trigger**: The user wants to try something that might not be kept (e.g., "I want to experiment with switching our state management library," or "Let's refactor the old API module, but I want to keep the current tasks as a reference.").
- **Your Action**: Propose creating a sandboxed tag for the experimental work.
- **Your Suggested Prompt**: *"This sounds like a great experiment. To keep these new tasks separate from our main plan, I can create a temporary 'experiment-zustand' tag for this work. If we decide not to proceed, we can simply delete the tag without affecting the main task list. Sound good?"*
- **Tool to Use**: `task-master add-tag experiment-zustand --description="Exploring Zustand migration"`
-
-#### Pattern 4: Large Feature Initiatives (PRD-Driven)
-This is a more structured approach for significant new features or epics.
-
- **Trigger**: The user describes a large, multi-step feature that would benefit from a formal plan.
- **Your Action**: Propose a comprehensive, PRD-driven workflow.
- **Your Suggested Prompt**: *"This sounds like a significant new feature. To manage this effectively, I suggest we create a dedicated task context for it. Here's the plan: I'll create a new tag called 'feature-xyz', then we can draft a Product Requirements Document (PRD) together to scope the work. Once the PRD is ready, I'll automatically generate all the necessary tasks within that new tag. How does that sound?"*
- **Your Implementation Flow**:
-    1.  **Create an empty tag**: `task-master add-tag feature-xyz --description "Tasks for the new XYZ feature"`. You can also start by creating a git branch if applicable, and then create the tag from that branch.
-    2.  **Collaborate & Create PRD**: Work with the user to create a detailed PRD file (e.g., `.taskmaster/docs/feature-xyz-prd.txt`).
-    3.  **Parse PRD into the new tag**: `task-master parse-prd .taskmaster/docs/feature-xyz-prd.txt --tag feature-xyz`
-    4.  **Prepare the new task list**: Follow up by suggesting `analyze-complexity` and `expand-all` for the newly created tasks within the `feature-xyz` tag.
-
-#### Pattern 5: Version-Based Development
-Tailor your approach based on the project maturity indicated by tag names.
-
- **Prototype/MVP Tags** (`prototype`, `mvp`, `poc`, `v0.x`):
-  - **Your Approach**: Focus on speed and functionality over perfection
-  - **Task Generation**: Create tasks that emphasize "get it working" over "get it perfect"
-  - **Complexity Level**: Lower complexity, fewer subtasks, more direct implementation paths
-  - **Research Prompts**: Include context like "This is a prototype - prioritize speed and basic functionality over optimization"
-  - **Example Prompt Addition**: *"Since this is for the MVP, I'll focus on tasks that get core functionality working quickly rather than over-engineering."*
-
- **Production/Mature Tags** (`v1.0+`, `production`, `stable`):
-  - **Your Approach**: Emphasize robustness, testing, and maintainability
-  - **Task Generation**: Include comprehensive error handling, testing, documentation, and optimization
-  - **Complexity Level**: Higher complexity, more detailed subtasks, thorough implementation paths
-  - **Research Prompts**: Include context like "This is for production - prioritize reliability, performance, and maintainability"
-  - **Example Prompt Addition**: *"Since this is for production, I'll ensure tasks include proper error handling, testing, and documentation."*
-
-### Advanced Workflow (Tag-Based & PRD-Driven)
-
-**When to Transition**: Recognize when the project has evolved (or has initiated a project which existing code) beyond simple task management. Look for these indicators:
- User mentions teammates or collaboration needs
- Project has grown to 15+ tasks with mixed priorities
- User creates feature branches or mentions major initiatives
- User initializes Taskmaster on an existing, complex codebase
- User describes large features that would benefit from dedicated planning
-
-**Your Role in Transition**: Guide the user to a more sophisticated workflow that leverages tags for organization and PRDs for comprehensive planning.
-
-#### Master List Strategy (High-Value Focus)
-Once you transition to tag-based workflows, the `master` tag should ideally contain only:
- **High-level deliverables** that provide significant business value
- **Major milestones** and epic-level features
- **Critical infrastructure** work that affects the entire project
- **Release-blocking** items
-
-**What NOT to put in master**:
- Detailed implementation subtasks (these go in feature-specific tags' parent tasks)
- Refactoring work (create dedicated tags like `refactor-auth`)
- Experimental features (use `experiment-*` tags)
- Team member-specific tasks (use person-specific tags)
-
-#### PRD-Driven Feature Development
-
-**For New Major Features**:
-1. **Identify the Initiative**: When user describes a significant feature
-2. **Create Dedicated Tag**: `add_tag feature-[name] --description="[Feature description]"`
-3. **Collaborative PRD Creation**: Work with user to create comprehensive PRD in `.taskmaster/docs/feature-[name]-prd.txt`
-4. **Parse & Prepare**: 
-   - `parse_prd .taskmaster/docs/feature-[name]-prd.txt --tag=feature-[name]`
-   - `analyze_project_complexity --tag=feature-[name] --research`
-   - `expand_all --tag=feature-[name] --research`
-5. **Add Master Reference**: Create a high-level task in `master` that references the feature tag
-
-**For Existing Codebase Analysis**:
-When users initialize Taskmaster on existing projects:
-1. **Codebase Discovery**: Use your native tools for producing deep context about the code base. You may use `research` tool with `--tree` and `--files` to collect up to date information using the existing architecture as context.
-2. **Collaborative Assessment**: Work with user to identify improvement areas, technical debt, or new features
-3. **Strategic PRD Creation**: Co-author PRDs that include:
-   - Current state analysis (based on your codebase research)
-   - Proposed improvements or new features
-   - Implementation strategy considering existing code
-4. **Tag-Based Organization**: Parse PRDs into appropriate tags (`refactor-api`, `feature-dashboard`, `tech-debt`, etc.)
-5. **Master List Curation**: Keep only the most valuable initiatives in master
-
-The parse-prd's `--append` flag enables the user to parse multple PRDs within tags or across tags. PRDs should be focused and the number of tasks they are parsed into should be strategically chosen relative to the PRD's complexity and level of detail.
-
-### Workflow Transition Examples
-
-**Example 1: Simple → Team-Based**
-```
-User: "Alice is going to help with the API work"
-Your Response: "Great! To avoid conflicts, I'll create a separate task context for your work. Alice can continue with the master list while you work in your own context. When you're ready to merge, we can coordinate the tasks back together."
-Action: add_tag my-api-work --copy-from-current --description="My API tasks while collaborating with Alice"
-```
-
-**Example 2: Simple → PRD-Driven**
-```
-User: "I want to add a complete user dashboard with analytics, user management, and reporting"
-Your Response: "This sounds like a major feature that would benefit from detailed planning. Let me create a dedicated context for this work and we can draft a PRD together to ensure we capture all requirements."
-Actions: 
-1. add_tag feature-dashboard --description="User dashboard with analytics and management"
-2. Collaborate on PRD creation
-3. parse_prd dashboard-prd.txt --tag=feature-dashboard
-4. Add high-level "User Dashboard" task to master
-```
-
-**Example 3: Existing Project → Strategic Planning**
-```
-User: "I just initialized Taskmaster on my existing React app. It's getting messy and I want to improve it."
-Your Response: "Let me research your codebase to understand the current architecture, then we can create a strategic plan for improvements."
-Actions:
-1. research "Current React app architecture and improvement opportunities" --tree --files=src/
-2. Collaborate on improvement PRD based on findings
-3. Create tags for different improvement areas (refactor-components, improve-state-management, etc.)
-4. Keep only major improvement initiatives in master
-```
-
---
+This guide outlines the typical process for using Task Master to manage software development projects.

 ## Primary Interaction: MCP Server vs. CLI

-Taskmaster offers two primary ways to interact:
+Task Master offers two primary ways to interact:

 1.  **MCP Server (Recommended for Integrated Tools)**:
    - For AI agents and integrated development environments (like Cursor), interacting via the **MCP server is the preferred method**.
-    - The MCP server exposes Taskmaster functionality through a set of tools (e.g., `get_tasks`, `add_subtask`).
+    - The MCP server exposes Task Master functionality through a set of tools (e.g., `get_tasks`, `add_subtask`).
    - This method offers better performance, structured data exchange, and richer error handling compared to CLI parsing.
    - Refer to [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc) for details on the MCP architecture and available tools.
    - A comprehensive list and description of MCP tools and their corresponding CLI commands can be found in [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc).
@@ -209,15 +28,62 @@ Taskmaster offers two primary ways to interact:
    - Refer to [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc) for a detailed command reference.
    - **Tagged Task Lists**: CLI fully supports the new tagged system with seamless migration.

-## How the Tag System Works (For Your Reference)
+## Tagged Task Lists System

- **Data Structure**: Tasks are organized into separate contexts (tags) like "master", "feature-branch", or "v2.0".
- **Silent Migration**: Existing projects automatically migrate to use a "master" tag with zero disruption.
- **Context Isolation**: Tasks in different tags are completely separate. Changes in one tag do not affect any other tag.
- **Manual Control**: The user is always in control. There is no automatic switching. You facilitate switching by using `use-tag <name>`.
- **Full CLI & MCP Support**: All tag management commands are available through both the CLI and MCP tools for you to use. Refer to [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc) for a full command list.
+Task Master now supports **tagged task lists** for multi-context task management:

---
+- **Data Structure**: Tasks are organized into separate contexts (tags) like "master", "feature-branch", or "v2.0"
+- **Seamless Migration**: Existing projects automatically migrate to use a "master" tag with zero disruption
+- **Backward Compatibility**: All existing commands continue to work exactly as before
+- **Context Isolation**: Tasks in different tags are completely separate and isolated
+- **Silent Migration**: The first time you run any Task Master command, your existing tasks.json will be automatically migrated to the new tagged format
+- **Migration Notice**: You'll see a friendly FYI notice after migration explaining the new system
+
+**Migration Example**:
+```json
+// Before (legacy format)
+{
+  "tasks": [
+    { "id": 1, "title": "Setup API", ... }
+  ]
+}
+
+// After (tagged format - automatic)
+{
+  "master": {
+    "tasks": [
+      { "id": 1, "title": "Setup API", ... }
+    ]
+  }
+}
+```
+
+**Tag Management**: CLI commands for tag management (`add-tag`, `use-tag`, `list-tags`, `delete-tag`, `rename-tag`, `copy-tag`) are now available with manual git integration via `--from-branch` option.
+
+## Standard Development Workflow Process
+
+-   Start new projects by running `initialize_project` tool / `task-master init` or `parse_prd` / `task-master parse-prd --input='<prd-file.txt>'` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to generate initial tasks.json with tagged structure
+-   Begin coding sessions with `get_tasks` / `task-master list` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to see current tasks, status, and IDs
+-   Determine the next task to work on using `next_task` / `task-master next` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
+-   Analyze task complexity with `analyze_project_complexity` / `task-master analyze-complexity --research` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) before breaking down tasks
+-   Review complexity report using `complexity_report` / `task-master complexity-report` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
+-   Select tasks based on dependencies (all marked 'done'), priority level, and ID order
+-   Clarify tasks by checking task files in tasks/ directory or asking for user input
+-   View specific task details using `get_task` / `task-master show <id>` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to understand implementation requirements
+-   Break down complex tasks using `expand_task` / `task-master expand --id=<id> --force --research` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) with appropriate flags like `--force` (to replace existing subtasks) and `--research`.
+-   Clear existing subtasks if needed using `clear_subtasks` / `task-master clear-subtasks --id=<id>` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) before regenerating
+-   Implement code following task details, dependencies, and project standards
+-   Verify tasks according to test strategies before marking as complete (See [`tests.mdc`](mdc:.cursor/rules/tests.mdc))
+-   Mark completed tasks with `set_task_status` / `task-master set-status --id=<id> --status=done` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc))
+-   Update dependent tasks when implementation differs from original plan using `update` / `task-master update --from=<id> --prompt="..."` or `update_task` / `task-master update-task --id=<id> --prompt="..."` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc))
+-   Add new tasks discovered during implementation using `add_task` / `task-master add-task --prompt="..." --research` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
+-   Add new subtasks as needed using `add_subtask` / `task-master add-subtask --parent=<id> --title="..."` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
+-   Append notes or details to subtasks using `update_subtask` / `task-master update-subtask --id=<subtaskId> --prompt='Add implementation notes here...\nMore details...'` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
+-   Generate task files with `generate` / `task-master generate` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) after updating tasks.json
+-   Maintain valid dependency structure with `add_dependency`/`remove_dependency` tools or `task-master add-dependency`/`remove-dependency` commands, `validate_dependencies` / `task-master validate-dependencies`, and `fix_dependencies` / `task-master fix-dependencies` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) when needed
+-   Respect dependency chains and task priorities when selecting work
+-   Report progress regularly using `get_tasks` / `task-master list`
+-   Reorganize tasks as needed using `move_task` / `task-master move --from=<id> --to=<id>` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to change task hierarchy or ordering

 ## Task Complexity Analysis

@@ -295,17 +161,6 @@ Taskmaster configuration is managed through two main mechanisms:
 **If AI commands FAIL in MCP** verify that the API key for the selected provider is present in the `env` section of `.cursor/mcp.json`.
 **If AI commands FAIL in CLI** verify that the API key for the selected provider is present in the `.env` file in the root of the project.

-## Rules Management
-
-Taskmaster supports multiple AI coding assistant rule sets that can be configured during project initialization or managed afterward:
-
- **Available Profiles**: Claude Code, Cline, Codex, Cursor, Roo Code, Trae, Windsurf (claude, cline, codex, cursor, roo, trae, windsurf)
- **During Initialization**: Use `task-master init --rules cursor,windsurf` to specify which rule sets to include
- **After Initialization**: Use `task-master rules add <profiles>` or `task-master rules remove <profiles>` to manage rule sets
- **Interactive Setup**: Use `task-master rules setup` to launch an interactive prompt for selecting rule profiles
- **Default Behavior**: If no `--rules` flag is specified during initialization, all available rule profiles are included
- **Rule Structure**: Each profile creates its own directory (e.g., `.cursor/rules`, `.roo/rules`) with appropriate configuration files
-
 ## Determining the Next Task

 - Run `next_task` / `task-master next` to show the next task to work on.
--- a/.cursor/rules/taskmaster.mdc
+++ b/.cursor/rules/taskmaster.mdc
@@ -26,7 +26,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
    *   `--name <name>`: `Set the name for your project in Taskmaster's configuration.`
    *   `--description <text>`: `Provide a brief description for your project.`
    *   `--version <version>`: `Set the initial version for your project, e.g., '0.1.0'.`
-    *   `--no-git`: `Skip initializing a Git repository entirely.`
    *   `-y, --yes`: `Initialize Taskmaster quickly using default settings without interactive prompts.`
 *   **Usage:** Run this once at the beginning of a new project.
 *   **MCP Variant Description:** `Set up the basic Taskmaster file structure and configuration in the current directory for a new project by running the 'task-master init' command.`
@@ -37,7 +36,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
    *   `authorName`: `Author name.` (CLI: `--author <author>`)
    *   `skipInstall`: `Skip installing dependencies. Default is false.` (CLI: `--skip-install`)
    *   `addAliases`: `Add shell aliases tm and taskmaster. Default is false.` (CLI: `--aliases`)
-    *   `noGit`: `Skip initializing a Git repository entirely. Default is false.` (CLI: `--no-git`)
    *   `yes`: `Skip prompts and use defaults/provided arguments. Default is false.` (CLI: `-y, --yes`)
 *   **Usage:** Run this once at the beginning of a new project, typically via an integrated tool like Cursor. Operates on the current working directory of the MCP server. 
 *   **Important:** Once complete, you *MUST* parse a prd in order to generate tasks. There will be no tasks files until then. The next step after initializing should be to create a PRD using the example PRD in .taskmaster/templates/example_prd.txt. 
@@ -79,7 +77,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
    *   `--set-fallback <model_id>`: `Set the fallback model.`
    *   `--ollama`: `Specify that the provided model ID is for Ollama (use with --set-*).`
    *   `--openrouter`: `Specify that the provided model ID is for OpenRouter (use with --set-*). Validates against OpenRouter API.`
-    *   `--bedrock`: `Specify that the provided model ID is for AWS Bedrock (use with --set-*).`
    *   `--setup`: `Run interactive setup to configure models, including custom Ollama/OpenRouter IDs.`
 *   **Usage (MCP):** Call without set flags to get current config. Use `setMain`, `setResearch`, or `setFallback` with a valid model ID to update the configuration. Use `listAvailableModels: true` to get a list of unassigned models. To set a custom model, provide the model ID and set `ollama: true` or `openrouter: true`.
 *   **Usage (CLI):** Run without flags to view current configuration and available models. Use set flags to update specific roles. Use `--setup` for guided configuration, including custom models. To set a custom model via flags, use `--set-<role>=<model_id>` along with either `--ollama` or `--openrouter`.
@@ -111,7 +108,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **Description:** `Ask Taskmaster to show the next available task you can work on, based on status and completed dependencies.`
 *   **Key Parameters/Options:**
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-    *   `tag`: `Specify which tag context to use. Defaults to the current active tag.` (CLI: `--tag <name>`)
 *   **Usage:** Identify what to work on next according to the plan.

 ### 5. Get Task Details (`get_task`)
@@ -140,7 +136,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
    *   `dependencies`: `Specify the IDs of any Taskmaster tasks that must be completed before this new one can start, e.g., '12,14'.` (CLI: `-d, --dependencies <ids>`)
    *   `priority`: `Set the priority for the new task: 'high', 'medium', or 'low'. Default is 'medium'.` (CLI: `--priority <priority>`)
    *   `research`: `Enable Taskmaster to use the research role for potentially more informed task creation.` (CLI: `-r, --research`)
-    *   `tag`: `Specify which tag context to add the task to. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
 *   **Usage:** Quickly add newly identified tasks during development.
 *   **Important:** This MCP tool makes AI calls and can take up to a minute to complete. Please inform users to hang tight while the operation is in progress.
@@ -159,7 +154,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
    *   `dependencies`: `Specify IDs of other tasks or subtasks, e.g., '15' or '16.1', that must be done before this new subtask.` (CLI: `--dependencies <ids>`)
    *   `status`: `Set the initial status for the new subtask. Default is 'pending'.` (CLI: `-s, --status <status>`)
    *   `skipGenerate`: `Prevent Taskmaster from automatically regenerating markdown task files after adding the subtask.` (CLI: `--skip-generate`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
 *   **Usage:** Break down tasks manually or reorganize existing tasks.

@@ -172,7 +166,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
    *   `from`: `Required. The ID of the first task Taskmaster should update. All tasks with this ID or higher that are not 'done' will be considered.` (CLI: `--from <id>`)
    *   `prompt`: `Required. Explain the change or new context for Taskmaster to apply to the tasks, e.g., "We are now using React Query instead of Redux Toolkit for data fetching".` (CLI: `-p, --prompt <text>`)
    *   `research`: `Enable Taskmaster to use the research role for more informed updates. Requires appropriate API key.` (CLI: `-r, --research`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
 *   **Usage:** Handle significant implementation changes or pivots that affect multiple future tasks. Example CLI: `task-master update --from='18' --prompt='Switching to React Query.\nNeed to refactor data fetching...'`
 *   **Important:** This MCP tool makes AI calls and can take up to a minute to complete. Please inform users to hang tight while the operation is in progress.
@@ -198,13 +191,12 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **CLI Command:** `task-master update-subtask [options]`
 *   **Description:** `Append timestamped notes or details to a specific Taskmaster subtask without overwriting existing content. Intended for iterative implementation logging.`
 *   **Key Parameters/Options:**
-    *   `id`: `Required. The ID of the Taskmaster subtask, e.g., '5.2', to update with new information.` (CLI: `-i, --id <id>`)
-    *   `prompt`: `Required. The information, findings, or progress notes to append to the subtask's details with a timestamp.` (CLI: `-p, --prompt <text>`)
-    *   `research`: `Enable Taskmaster to use the research role for more informed updates. Requires appropriate API key.` (CLI: `-r, --research`)
-    *   `tag`: `Specify which tag context the subtask belongs to. Defaults to the current active tag.` (CLI: `--tag <name>`)
+    *   `id`: `Required. The ID of the Taskmaster task, e.g., '5', or subtask, e.g., '5.2', to permanently remove.` (CLI: `-i, --id <id>`)
+    *   `yes`: `Skip the confirmation prompt and immediately delete the task.` (CLI: `-y, --yes`)
+    *   `tag`: `Specify which tag context to remove the task from. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Log implementation progress, findings, and discoveries during subtask development. Each update is timestamped and appended to preserve the implementation journey.
-*   **Important:** This MCP tool makes AI calls and can take up to a minute to complete. Please inform users to hang tight while the operation is in progress.
+*   **Usage:** Permanently delete tasks or subtasks that are no longer needed in the project.
+*   **Notes:** Use with caution as this operation cannot be undone. Consider using 'blocked', 'cancelled', or 'deferred' status instead if you just want to exclude a task from active planning but keep it for reference. The command automatically cleans up dependency references in other tasks.

 ### 11. Set Task Status (`set_task_status`)

@@ -214,7 +206,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **Key Parameters/Options:**
    *   `id`: `Required. The ID(s) of the Taskmaster task(s) or subtask(s), e.g., '15', '15.2', or '16,17.1', to update.` (CLI: `-i, --id <id>`)
    *   `status`: `Required. The new status to set, e.g., 'done', 'pending', 'in-progress', 'review', 'cancelled'.` (CLI: `-s, --status <status>`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
 *   **Usage:** Mark progress as tasks move through the development cycle.

@@ -226,7 +217,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **Key Parameters/Options:**
    *   `id`: `Required. The ID of the Taskmaster task, e.g., '5', or subtask, e.g., '5.2', to permanently remove.` (CLI: `-i, --id <id>`)
    *   `yes`: `Skip the confirmation prompt and immediately delete the task.` (CLI: `-y, --yes`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
 *   **Usage:** Permanently delete tasks or subtasks that are no longer needed in the project.
 *   **Notes:** Use with caution as this operation cannot be undone. Consider using 'blocked', 'cancelled', or 'deferred' status instead if you just want to exclude a task from active planning but keep it for reference. The command automatically cleans up dependency references in other tasks.
@@ -274,7 +264,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **Key Parameters/Options:**
    *   `id`: `The ID(s) of the Taskmaster parent task(s) whose subtasks you want to remove, e.g., '15' or '16,18'. Required unless using `all`.) (CLI: `-i, --id <ids>`)
    *   `all`: `Tell Taskmaster to remove subtasks from all parent tasks.` (CLI: `--all`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
 *   **Usage:** Used before regenerating subtasks with `expand_task` if the previous breakdown needs replacement.

@@ -287,7 +276,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
    *   `id`: `Required. The ID(s) of the Taskmaster subtask(s) to remove, e.g., '15.2' or '16.1,16.3'.` (CLI: `-i, --id <id>`)
    *   `convert`: `If used, Taskmaster will turn the subtask into a regular top-level task instead of deleting it.` (CLI: `-c, --convert`)
    *   `skipGenerate`: `Prevent Taskmaster from automatically regenerating markdown task files after removing the subtask.` (CLI: `--skip-generate`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
 *   **Usage:** Delete unnecessary subtasks or promote a subtask to a top-level task.

@@ -299,7 +287,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **Key Parameters/Options:**
    *   `from`: `Required. ID of the task/subtask to move (e.g., "5" or "5.2"). Can be comma-separated for multiple tasks.` (CLI: `--from <id>`)
    *   `to`: `Required. ID of the destination (e.g., "7" or "7.3"). Must match the number of source IDs if comma-separated.` (CLI: `--to <id>`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
 *   **Usage:** Reorganize tasks by moving them within the hierarchy. Supports various scenarios like:
    *   Moving a task to become a subtask
@@ -329,7 +316,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **Key Parameters/Options:**
    *   `id`: `Required. The ID of the Taskmaster task that will depend on another.` (CLI: `-i, --id <id>`)
    *   `dependsOn`: `Required. The ID of the Taskmaster task that must be completed first, the prerequisite.` (CLI: `-d, --depends-on <id>`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <path>`)
 *   **Usage:** Establish the correct order of execution between tasks.

@@ -341,7 +327,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **Key Parameters/Options:**
    *   `id`: `Required. The ID of the Taskmaster task you want to remove a prerequisite from.` (CLI: `-i, --id <id>`)
    *   `dependsOn`: `Required. The ID of the Taskmaster task that should no longer be a prerequisite.` (CLI: `-d, --depends-on <id>`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
 *   **Usage:** Update task relationships when the order of execution changes.

@@ -351,7 +336,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **CLI Command:** `task-master validate-dependencies [options]`
 *   **Description:** `Check your Taskmaster tasks for dependency issues (like circular references or links to non-existent tasks) without making changes.`
 *   **Key Parameters/Options:**
-    *   `tag`: `Specify which tag context to validate. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
 *   **Usage:** Audit the integrity of your task dependencies.

@@ -389,7 +373,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **CLI Command:** `task-master complexity-report [options]`
 *   **Description:** `Display the task complexity analysis report in a readable format.`
 *   **Key Parameters/Options:**
-    *   `tag`: `Specify which tag context to show the report for. Defaults to the current active tag.` (CLI: `--tag <name>`)
    *   `file`: `Path to the complexity report (default: '.taskmaster/reports/task-complexity-report.json').` (CLI: `-f, --file <file>`)
 *   **Usage:** Review and understand the complexity analysis results after running analyze-complexity.

@@ -461,7 +444,6 @@ This new suite of commands allows you to manage different task contexts (tags).
 *   **CLI Command:** `task-master tags [options]`
 *   **Description:** `List all available tags with task counts, completion status, and other metadata.`
 *   **Key Parameters/Options:**
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
    *   `--show-metadata`: `Include detailed metadata in the output (e.g., creation date, description).` (CLI: `--show-metadata`)

 ### 27. Add Tag (`add_tag`)
@@ -475,7 +457,6 @@ This new suite of commands allows you to manage different task contexts (tags).
    *   `--copy-from-current`: `Copy tasks from the currently active tag to the new tag.` (CLI: `--copy-from-current`)
    *   `--copy-from <tag>`: `Copy tasks from a specific source tag to the new tag.` (CLI: `--copy-from <tag>`)
    *   `--description <text>`: `Provide an optional description for the new tag.` (CLI: `-d, --description <text>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)

 ### 28. Delete Tag (`delete_tag`)

@@ -485,7 +466,6 @@ This new suite of commands allows you to manage different task contexts (tags).
 *   **Key Parameters/Options:**
    *   `tagName`: `Name of the tag to delete.` (CLI: `<tagName>` positional)
    *   `--yes`: `Skip the confirmation prompt.` (CLI: `-y, --yes`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)

 ### 29. Use Tag (`use_tag`)

@@ -494,7 +474,6 @@ This new suite of commands allows you to manage different task contexts (tags).
 *   **Description:** `Switch your active task context to a different tag.`
 *   **Key Parameters/Options:**
    *   `tagName`: `Name of the tag to switch to.` (CLI: `<tagName>` positional)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)

 ### 30. Rename Tag (`rename_tag`)

@@ -504,7 +483,6 @@ This new suite of commands allows you to manage different task contexts (tags).
 *   **Key Parameters/Options:**
    *   `oldName`: `The current name of the tag.` (CLI: `<oldName>` positional)
    *   `newName`: `The new name for the tag.` (CLI: `<newName>` positional)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)

 ### 31. Copy Tag (`copy_tag`)

@@ -556,4 +534,4 @@ Environment variables are used **only** for sensitive API keys related to AI pro

 ---

-For details on how these commands fit into the development process, see the [Development Workflow Guide](mdc:.cursor/rules/dev_workflow.mdc).
+For details on how these commands fit into the development process, see the [Development Workflow Guide](mdc:.cursor/rules/dev_workflow.mdc).
--- a/.gitignore
+++ b/.gitignore
@@ -77,13 +77,3 @@ dev-debug.log

 # NPMRC
 .npmrc
-
-# Added by Task Master AI
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
--- a/.taskmaster/config.json
+++ b/.taskmaster/config.json
@@ -1,14 +1,14 @@
 {
 	"models": {
 		"main": {
-			"provider": "vertex",
-			"modelId": "gemini-1.5-pro-002",
+			"provider": "anthropic",
+			"modelId": "claude-sonnet-4-20250514",
 			"maxTokens": 50000,
 			"temperature": 0.2
 		},
 		"research": {
 			"provider": "perplexity",
-			"modelId": "sonar",
+			"modelId": "sonar-pro",
 			"maxTokens": 8700,
 			"temperature": 0.1
 		},
@@ -20,6 +20,7 @@
 		}
 	},
 	"global": {
+		"userId": "1234567890",
 		"logLevel": "info",
 		"debug": false,
 		"defaultSubtasks": 5,
@@ -27,7 +28,6 @@
 		"projectName": "Taskmaster",
 		"ollamaBaseURL": "http://localhost:11434/api",
 		"bedrockBaseURL": "https://bedrock.us-east-1.amazonaws.com",
-		"userId": "1234567890",
 		"azureBaseURL": "https://your-endpoint.azure.com/",
 		"defaultTag": "master"
 	}
--- a/.taskmaster/docs/research/2025-06-13_what-is-typescript.md
+++ b/.taskmaster/docs/research/2025-06-13_what-is-typescript.md
@@ -0,0 +1,42 @@
+---
+title: Research Session
+query: "What is TypeScript?"
+date: 6/13/2025
+time: 3:07:41 PM
+timestamp: 2025-06-13T19:07:41.313Z
+exchanges: 2
+---
+
+# Research Session
+
+**Query:** What is TypeScript?  
+**Date:** 6/13/2025 3:07:41 PM  
+**Exchanges:** 2
+
+---
+
+## Initial Query
+
+**Question:** What is TypeScript?
+
+**Response:**
+
+TypeScript is a strongly typed, object-oriented programming language that builds on JavaScript by adding static typing and type annotations. It is a syntactic superset of JavaScript, meaning all JavaScript code is valid TypeScript, but TypeScript adds extra syntax to specify types, enabling compile-time type checking and better tooling support. This helps catch errors early before running the code and improves code quality, especially in large-scale applications. TypeScript code is transpiled to plain JavaScript, which can run anywhere JavaScript runs, such as browsers, Node.js, or Deno. It is developed and maintained by Microsoft as open-source software under the Apache 2.0 license[1][2][3][4][5].
+
+---
+
+## Follow-up 1
+
+**Question:** And why is the sky blue?
+
+**Response:**
+
+- The sky appears blue because sunlight interacts with Earth's atmosphere, and the shorter wavelengths of light (blue and violet) are scattered in all directions by air molecules—a process called Rayleigh scattering[1][2][3][5].
+- Blue light is scattered more than red light because it has a shorter wavelength, making the sky look blue to our eyes during the day[2][3][5].
+- If Earth's atmosphere didn't scatter sunlight, the sky would appear dark, as it does on the Moon, which lacks an atmosphere[5].
+
+
+---
+
+*Generated by Task Master Research Command*  
+*Timestamp: 2025-06-13T19:07:41.313Z*
--- a/.taskmaster/docs/research/2025-06-14_how-can-i-improve-the-scope-up-and-scope-down-comm.md
+++ b/.taskmaster/docs/research/2025-06-14_how-can-i-improve-the-scope-up-and-scope-down-comm.md
@@ -1,128 +0,0 @@
---
-title: Research Session
-query: "how can i improve the scope-up and scope-down command"
-date: 6/14/2025
-time: 4:35:03 PM
-timestamp: 2025-06-14T20:35:03.231Z
-exchanges: 2
---
-
-# Research Session
-
-## Initial Query
-
-**Question:** how can i improve the scope-up and scope-down command
-
-**Response:**
-
-## Improving the `scope-up` and `scope-down` Commands
-
-**Clarify Command Purpose and User Experience**
-
- Ensure the commands have clear, intuitive behavior. For example, `scope-up` should consistently broaden the context or task view, while `scope-down` should reliably narrow it.
- Provide immediate, user-friendly feedback after each command, indicating what changed (e.g., "Now viewing parent task and all subtasks" or "Focused on subtask: X").
- Document the commands with examples in your `docs/command-reference.md` and `docs/examples.md` to help users understand their effects and use cases.
-
-**Enhance Context Awareness**
-
- Make the commands context-sensitive: if the user is already at the top or bottom of the scope hierarchy, return a helpful message instead of failing silently.
- Allow optional arguments to specify the exact level or target (e.g., `scope-up 2` to move up two levels, or `scope-down <subtask-id>` to jump directly to a subtask).
-
-**Robust Error Handling and Validation**
-
- Implement checks to prevent invalid operations, such as attempting to scope up from the root or scope down when no subtasks exist.
- Provide clear error messages and suggestions for next steps, improving user trust and reducing confusion[1][5].
-
-**Integrate with Task and Tag Systems**
-
- Ensure `scope-up` and `scope-down` interact smoothly with your tagging and task hierarchy features. For example, scoping up from a subtask should show the parent task and its context, while scoping down should allow selection from available subtasks or related tags.
- Consider supporting batch operations, such as scoping down into all subtasks and displaying them in a summarized view.
-
-**Improve Performance and Synchronization**
-
- Optimize the underlying logic to minimize delays, especially in large task trees. Use asynchronous operations where possible to keep the UI responsive.
- If the commands trigger data loading or context switching, ensure synchronization so that subsequent commands operate on the correct, updated context[2][4].
-
-**Testing and Stakeholder Feedback**
-
- Add or expand unit and integration tests for these commands (see `tests/unit/commands.test.js` and `integration/cli/commands.test.js`) to cover edge cases and ensure reliability.
- Gather feedback from users and stakeholders to identify pain points and desired enhancements, then iterate on the command design and implementation[1][5].
-
-**Example Improvements Table**
-
-| Area                | Current Issue                | Suggested Improvement                        |
-|---------------------|-----------------------------|----------------------------------------------|
-| User Feedback       | Minimal or unclear output    | Add explicit, contextual messages            |
-| Error Handling      | Silent failures              | Informative errors and recovery suggestions  |
-| Flexibility         | Only single-level movement   | Support multi-level and targeted navigation  |
-| Integration         | Limited context awareness    | Sync with tags, parent/child relationships   |
-| Performance         | Slow on large hierarchies    | Optimize data access and UI updates          |
-
-By focusing on these areas, you can make `scope-up` and `scope-down` more robust, user-friendly, and aligned with best practices in scope management and command design[1][5].
-
---
-
-## Follow-up 1
-
-**Question:** how might i do this relative to the tag system?
-
-**Response:**
-
-## Integrating Scope-Up and Scope-Down with the Tag System
-
-**Conceptual Mapping**
-
- In your project, *scope-up* and *scope-down* commands currently operate on the task hierarchy, broadening or narrowing the context by moving between parent and child tasks.
- The tag system provides a parallel, orthogonal way to group and filter tasks—tags can represent categories, priorities, or any custom grouping, independent of strict parent/child relationships.
-
-**How to Make Scope Commands Tag-Aware**
-
- **Scoping by Tag**: Allow users to "scope-down" into a tag, viewing only tasks associated with that tag. Conversely, "scope-up" could move from a specific tag context back to the broader task list or to a parent tag grouping if you support tag hierarchies.
- **Tag-Scoped Views**: When a tag is active as the current scope, all navigation and operations (listing, editing, etc.) are limited to tasks with that tag. This is similar to how some systems let you set the "Tag Scope" to filter navigation and search to only tagged items[1][5].
- **Combining Hierarchy and Tags**: Enable compound scoping, such as "all subtasks of Task X that also have Tag Y." This can be implemented by intersecting the results of hierarchical and tag-based queries.
-
-**Implementation Strategies**
-
- **Scope Stack or Context Object**: Maintain a stack or context object that tracks both the current task scope and any active tag filters. Each scope change (up/down or tag in/out) updates this context.
- **Commands**:
-  - `scope-down --tag <tag>`: Narrows the view to tasks with the specified tag.
-  - `scope-up --tag`: Removes the tag filter, broadening the view.
-  - `scope-down <subtask-id> --tag <tag>`: Narrows to a specific subtask *and* applies a tag filter.
- **Tag Hierarchies (Optional)**: If your tag system supports parent/child tags or tag groups, allow "scope-up" to move from a specific tag to its parent tag or group, and "scope-down" to move into a child tag[4][5].
-
-**Example User Flows**
-
- *Scoping Down by Tag*:  
-  User runs `scope-down --tag urgent` → Only tasks tagged "urgent" are shown.
- *Combining Task and Tag*:  
-  User runs `scope-down <task-id> --tag frontend` → Only subtasks of `<task-id>` that are tagged "frontend" are shown.
- *Scoping Up from Tag*:  
-  User runs `scope-up --tag` → Removes the tag filter, returning to the previous broader context.
-
-**Technical Considerations**
-
- **Efficient Filtering**: Use indexed queries or in-memory filtering to efficiently combine tag and hierarchy filters, especially for large task sets.
- **Feedback and UI**: Always display the current scope context (e.g., "Viewing tasks tagged 'urgent' under 'Feature X'") so users understand what they're seeing.
- **Extensibility**: Design the scope system so new types of scopes (e.g., by status, assignee) can be added in the future, not just tags and hierarchy.
-
-**Relevant Precedents**
-
- Tag-based file systems and management tools often implement "scopes" as dynamic groups defined by tag criteria, allowing users to build up complex views by combining tags and other filters[5].
- Some systems allow scoping into tag management itself, where you can create, edit, or view tags and their associated objects, which could be mirrored in your CLI or UI[4].
-
-**Summary Table**
-
-| Command Example                  | Resulting Scope                                  |
-|----------------------------------|--------------------------------------------------|
-| `scope-down --tag bug`           | All tasks tagged "bug"                           |
-| `scope-down <task-id> --tag api` | Subtasks of `<task-id>` tagged "api"             |
-| `scope-up --tag`                 | Removes tag filter, returns to previous scope    |
-| `scope-down --tag frontend`      | All tasks tagged "frontend"                      |
-
-By integrating tag-based scoping, you make your scope commands more flexible and powerful, supporting both hierarchical and ad-hoc organizational strategies[1][5].
-
-
---
-
-*Generated by Task Master Research Command*  
-*Timestamp: 2025-06-14T20:35:03.231Z*
--- a/.taskmaster/docs/research/2025-06-14_should-i-be-using-any-specific-libraries-for-this.md
+++ b/.taskmaster/docs/research/2025-06-14_should-i-be-using-any-specific-libraries-for-this.md
@@ -1,158 +0,0 @@
---
-title: Research Session
-query: "should i be using any specific libraries for this?"
-date: 6/14/2025
-time: 5:20:00 PM
-timestamp: 2025-06-14T21:20:00.561Z
-exchanges: 2
---
-
-# Research Session
-
-## Initial Query
-
-**Question:** should i be using any specific libraries for this?
-
-**Response:**
-
-HELL YEAH PARTNER
-
-For implementing a GitHub Issue export feature with bidirectional linking in your project, you absolutely should use a dedicated library for interacting with the GitHub API. This will save you a ton of time, reduce boilerplate, and help you avoid common pitfalls with authentication, pagination, and error handling.
-
-## Recommended Library: PyGithub
-
- **PyGithub** is the most widely used and well-documented Python library for accessing the GitHub REST API v3. It allows you to manage repositories, issues, user profiles, and more, all with a clean, object-oriented interface[1][2][3][5].
- It supports all the operations you’ll need for your export feature, including creating issues, updating them, and managing references for bidirectional linking.
-
-### Key Features
-
- **Authentication**: Easily authenticate with a personal access token.
- **Issue Management**: Create, update, and link issues programmatically.
- **Repository Access**: Fetch and manipulate repository data.
- **User/Org Support**: Works for both user and organization repos.
- **Pagination & Rate Limiting**: Handles these for you.
-
-### Example Usage
-
-```python
-from github import Github, Auth
-
-# Authenticate with a personal access token
-auth = Auth.Token("your_github_token")
-g = Github(auth=auth)
-
-# Get the repo
-repo = g.get_repo("owner/repo_name")
-
-# Create a new issue
-issue = repo.create_issue(
-    title="Exported from Task Master",
-    body="This issue was created by Task Master. [Task ID: 123]"
-)
-
-# Add a comment or update the issue to include a backlink
-issue.create_comment("Linked to Task Master task #123")
-```
-[3][5]
-
-## Why Not Use Raw Requests?
-
- While you *can* use the `requests` library to call the GitHub API directly[4], PyGithub abstracts away authentication, error handling, and pagination, making your code much cleaner and less error-prone[2][5].
-
-## Integration Tips
-
- Store your GitHub token securely (e.g., in environment variables).
- Use PyGithub’s objects to fetch, create, and update issues.
- For bidirectional linking, store the GitHub issue URL in your task data and the Task Master task ID in the GitHub issue body or as a label/comment.
- PyGithub is actively maintained and widely used, so you’ll find plenty of support and documentation.
-
-## Installation
-
-```bash
-pip install PyGithub
-```
-[3]
-
-## Summary Table
-
-| Library   | Language | API Coverage | Ease of Use | Maintained | Docs/Support |
-|-----------|----------|--------------|-------------|------------|--------------|
-| PyGithub  | Python   | Full         | High        | Yes        | Excellent    |
-| requests  | Python   | Full (manual)| Medium      | Yes        | Good         |
-
-**Use PyGithub for all GitHub API interactions in your export/import features.** It’s the standard for Python projects and will make your implementation faster, safer, and more maintainable[1][2][3][5].
-
---
-
-## Follow-up 1
-
-**Question:** we don't want to use py github because we have a node project
-
-**Response:**
-
-HELL YEAH PARTNER
-
-For a Node.js project, you should use a Node-native library to interact with the GitHub API instead of PyGithub, which is Python-only. The industry standard for Node.js is **Octokit**, the official GitHub SDK for JavaScript/TypeScript[1][2].
-
-## Why Use Octokit?
-
- **Official & Complete**: Octokit is maintained by GitHub and covers all REST and GraphQL API endpoints, including issues, repositories, users, and more[1][2].
- **Universal**: Works in Node.js, browsers, and Deno environments[2].
- **Typed & Tested**: Comes with TypeScript declarations and 100% test coverage[2].
- **Authentication**: Supports personal access tokens, GitHub Apps, OAuth, and more.
- **Pagination & Error Handling**: Handles pagination and common error scenarios out of the box.
- **Extendable**: Supports plugins and custom hooks for advanced use cases[2].
-
-## How to Use Octokit for GitHub Issue Export
-
-Install Octokit in your Node.js project:
-
-```bash
-npm install @octokit/rest
-```
-
-Basic usage for creating and linking issues:
-
-```js
-const { Octokit } = require("@octokit/rest");
-
-// Authenticate with a personal access token
-const octokit = new Octokit({ auth: process.env.GITHUB_TOKEN });
-
-// Create a new issue
-const { data: issue } = await octokit.issues.create({
-  owner: "owner",
-  repo: "repo_name",
-  title: "Exported from Task Master",
-  body: "This issue was created by Task Master. [Task ID: 123]"
-});
-
-// Add a comment for bidirectional linking
-await octokit.issues.createComment({
-  owner: "owner",
-  repo: "repo_name",
-  issue_number: issue.number,
-  body: "Linked to Task Master task #123"
-});
-```
-
-## Alternatives
-
- **node-github**: An older library, less maintained than Octokit, but still functional for basic API access[5].
- **Raw HTTP Requests**: You can use `node-fetch` or `axios` to call the GitHub API directly, but you’ll need to handle authentication, pagination, and error handling yourself[3]. Octokit abstracts all of this for you.
-
-## Summary Table
-
-| Library         | Language | API Coverage | Maintained | TypeScript | Docs/Support |
-|-----------------|----------|--------------|------------|------------|--------------|
-| Octokit         | Node.js  | Full         | Yes        | Yes        | Excellent    |
-| node-github     | Node.js  | Full         | No         | No         | Limited      |
-| Raw HTTP        | Node.js  | Full (manual)| N/A        | N/A        | N/A          |
-
-**Recommendation:** Use Octokit for all GitHub API interactions in your Node.js project. It’s the official, most robust, and best-supported option for your use case[1][2].
-
-
---
-
-*Generated by Task Master Research Command*  
-*Timestamp: 2025-06-14T21:20:00.561Z*
--- a/.taskmaster/docs/research/2025-06-14_test-save-functionality.md
+++ b/.taskmaster/docs/research/2025-06-14_test-save-functionality.md
@@ -1,76 +0,0 @@
---
-title: Research Session
-query: "test save functionality"
-date: 6/14/2025
-time: 5:50:23 PM
-timestamp: 2025-06-14T21:50:23.797Z
-exchanges: 1
---
-
-# Research Session
-
-## Initial Query
-
-**Question:** test save functionality
-
-**Response:**
-
-## Testing Save Functionality in a Task Management System
-
-**Core Steps for Testing Save Functionality**
-
- Create or update a task in the system using the CLI or UI.
- Trigger the save operation (e.g., by issuing a command or clicking a save button).
- Verify that the data is correctly written to the persistent storage (e.g., `tasks.json`).
- Reload or re-query the data to ensure the saved changes persist and are accurately reflected.
- Validate that all required fields and relationships (such as dependencies and subtasks) are preserved and correctly structured.
-
-**Key Test Scenarios**
-
- **Basic Save:** Add a new task and confirm it appears in `tasks.json` with all fields populated.
- **Update Save:** Modify an existing task (e.g., change status, description, or priority) and verify the changes are saved.
- **Subtask and Dependency Preservation:** Update a parent task and ensure that completed subtasks and dependency links remain intact, especially after using commands like `updateTask`.
- **Batch Operations:** Perform bulk updates or additions and confirm all affected tasks are saved correctly, with no data loss or corruption.
- **Validation:** Attempt to save invalid data and ensure the system rejects it or provides meaningful error messages, confirming validation logic is enforced.
-
-**Recommended Practices**
-
- Use automated tests to simulate save operations for various scenarios, including edge cases (e.g., circular dependencies, missing required fields).
- After each save, reload the data and compare it to the expected state to ensure integrity.
- Log all save operations and errors for traceability and debugging.
- Regularly back up the `tasks.json` file to prevent data loss during testing and development.
-
-**Relevant Features from Industry Standards**
-
- Task management systems typically provide robust save and update mechanisms, ensuring that all task attributes (including dependencies, subtasks, and comments) are consistently maintained[1][2][5].
- Validation and error handling are critical to prevent corrupt or incomplete saves, especially when handling complex relationships or batch operations[1][5].
- User feedback (such as success messages or error alerts) is important for confirming save actions and guiding users in case of issues[1][2].
-
-**Example Test Case**
-
-1. Create a task with subtasks and dependencies.
-2. Mark some subtasks as complete.
-3. Use the `updateTask` command to modify the parent task.
-4. Save and reload the data.
-5. Assert that:
-   - The parent task reflects the updates.
-   - Completed subtasks remain marked as complete.
-   - Dependencies are unchanged and valid.
-
-**Summary Table: Save Functionality Test Aspects**
-
-| Aspect                | What to Test                                      | Expected Outcome                        |
-|-----------------------|---------------------------------------------------|-----------------------------------------|
-| Basic Save            | Add/update task, save, reload                     | Data persists and matches expectations  |
-| Subtask Preservation  | Update parent, check subtask status               | Completed subtasks remain complete      |
-| Dependency Handling   | Save with dependencies, reload                    | Dependencies are intact and valid       |
-| Batch Operations      | Bulk save/update, reload                          | All changes persist, no data loss       |
-| Validation            | Save invalid data                                 | Error is raised, data not corrupted     |
-
-These steps and scenarios ensure that the save functionality is robust, reliable, and meets the requirements of a modern task management system[1][2][5].
-
-
---
-
-*Generated by Task Master Research Command*  
-*Timestamp: 2025-06-14T21:50:23.797Z*
--- a/.taskmaster/docs/research/2025-06-14_test-the-fix-for-duplicate-saves-final-test.md
+++ b/.taskmaster/docs/research/2025-06-14_test-the-fix-for-duplicate-saves-final-test.md
@@ -1,81 +0,0 @@
---
-title: Research Session
-query: "test the fix for duplicate saves - final test"
-date: 6/14/2025
-time: 6:10:00 PM
-timestamp: 2025-06-14T22:10:00.394Z
-exchanges: 1
---
-
-# Research Session
-
-## Initial Query
-
-**Question:** test the fix for duplicate saves - final test
-
-**Response:**
-
-## Steps to Test the Fix for Duplicate Saves
-
-**1. Prepare a Clean Test Environment**
- Ensure the tasks.json file and any related data stores are in a known, clean state with no pre-existing duplicate entries.
- Back up the current tasks.json in case rollback is needed.
-
-**2. Define Test Scenarios**
- Attempt to save a new task with unique data.
- Attempt to save a task with the same ID or unique identifier as an existing task (simulate a duplicate).
- Attempt to save a task with the same title or content but a different ID (to test if the fix is based on ID or content).
- Simultaneously trigger multiple save operations (if the system supports concurrency) to test race conditions.
-
-**3. Execute Manual and Automated Tests**
- Use the application's UI or API to create and save tasks as per the scenarios above.
- For each save operation, check the tasks.json file or the data store to verify:
-  - No duplicate entries are created.
-  - Existing tasks are not overwritten unless intended (e.g., for updates).
-  - The system returns appropriate error messages or warnings when a duplicate save is attempted.
-
-**4. Validate System Behavior**
- Confirm that after all test operations, each task in tasks.json is unique according to the defined criteria (ID, title, or other unique fields).
- If the system is designed to merge duplicates, verify that merging occurs as expected.
- If the system is designed to reject duplicates, ensure that the rejection is clear and no duplicate is present.
-
-**5. Test Edge Cases**
- Attempt to save tasks with minor variations (e.g., whitespace differences, case sensitivity) to ensure the duplicate detection logic is robust.
- Test with large numbers of tasks to ensure performance and correctness at scale.
-
-**6. Review Logs and Error Handling**
- Check application logs for any errors or warnings related to duplicate saves.
- Ensure that error handling is user-friendly and provides actionable feedback.
-
-**7. Regression Testing**
- Run the full suite of task operations (create, update, delete) to ensure the fix for duplicate saves does not introduce new issues elsewhere in the system.
-
-## Additional Best Practices
-
- Communicate test results with the team to confirm the fix is effective and to prevent future regressions[1][2][5].
- Consider implementing automated duplicate detection as part of the save operation to prevent future issues[2][3].
- Document the test cases and results for future reference and audits.
-
-## Example Test Case Table
-
-| Test Scenario                        | Expected Result                | Actual Result | Pass/Fail |
-|--------------------------------------|-------------------------------|---------------|-----------|
-| Save unique task                     | Task saved                    |               |           |
-| Save duplicate task (same ID)        | Duplicate rejected/merged     |               |           |
-| Save duplicate task (same title)     | Duplicate rejected/merged     |               |           |
-| Simultaneous saves (race condition)  | Only one unique task present  |               |           |
-| Save with minor variations           | No false positives/negatives  |               |           |
-
-Fill in the "Actual Result" and "Pass/Fail" columns during testing.
-
-## Action Items
-
- Complete all test scenarios above.
- Document any issues found and retest after fixes.
- Confirm with stakeholders before closing the issue.
-
-
---
-
-*Generated by Task Master Research Command*  
-*Timestamp: 2025-06-14T22:10:00.394Z*
--- a/.taskmaster/docs/task-template-importing-prd.txt
+++ b/.taskmaster/docs/task-template-importing-prd.txt
@@ -1,471 +0,0 @@
-# Task Template Importing System - Product Requirements Document
-
-<context>
-# Overview  
-The Task Template Importing system enables seamless integration of external task templates into the Task Master CLI through automatic file discovery. This system allows users to drop task template files into the tasks directory and immediately access them as new tag contexts without manual import commands or configuration. The solution addresses the need for multi-project task management, team collaboration through shared templates, and clean separation between permanent tasks and temporary project contexts.
-
-# Core Features  
-## Silent Task Template Discovery
- **What it does**: Automatically scans for `tasks_*.json` files in the tasks directory during tag operations
- **Why it's important**: Eliminates friction in adding new task contexts and enables zero-configuration workflow
- **How it works**: File pattern matching extracts tag names from filenames and validates against internal tag keys
-
-## External Tag Resolution System
- **What it does**: Provides fallback mechanism to external files when tags are not found in main tasks.json
- **Why it's important**: Maintains clean separation between core tasks and project-specific templates
- **How it works**: Tag resolution logic checks external files as secondary source while preserving main file precedence
-
-## Read-Only External Tag Access
- **What it does**: Allows viewing and switching to external tags while preventing modifications
- **Why it's important**: Protects template integrity and prevents accidental changes to shared templates
- **How it works**: All task modifications route to main tasks.json regardless of current tag context
-
-## Tag Precedence Management
- **What it does**: Ensures main tasks.json tags override external files with same tag names
- **Why it's important**: Prevents conflicts and maintains data integrity
- **How it works**: Priority system where main file tags take precedence over external file tags
-
-# User Experience  
-## User Personas
- **Solo Developer**: Manages multiple projects with different task contexts
- **Team Lead**: Shares standardized task templates across team members
- **Project Manager**: Organizes tasks by project phases or feature branches
-
-## Key User Flows
-### Template Addition Flow
-1. User receives or creates a `tasks_projectname.json` file
-2. User drops file into `.taskmaster/tasks/` directory
-3. Tag becomes immediately available via `task-master use-tag projectname`
-4. User can list, view, and switch to external tag without configuration
-
-### Template Usage Flow
-1. User runs `task-master tags` to see available tags including external ones
-2. External tags display with `(imported)` indicator
-3. User switches to external tag with `task-master use-tag projectname`
-4. User can view tasks but modifications are routed to main tasks.json
-
-## UI/UX Considerations
- External tags clearly marked with `(imported)` suffix in listings
- Visual indicators distinguish between main and external tags
- Error messages guide users when external files are malformed
- Read-only warnings when attempting to modify external tag contexts
-</context>
-
-<PRD>
-# Technical Architecture  
-## System Components
-1. **External File Discovery Engine**
-   - File pattern scanner for `tasks_*.json` files
-   - Tag name extraction from filenames using regex
-   - Dynamic tag registry combining main and external sources
-   - Error handling for malformed external files
-
-2. **Enhanced Tag Resolution System**
-   - Fallback mechanism to external files when tags not found in main tasks.json
-   - Precedence management ensuring main file tags override external files
-   - Read-only access enforcement for external tags
-   - Tag metadata preservation during discovery operations
-
-3. **Silent Discovery Integration**
-   - Automatic scanning during tag-related operations
-   - Seamless integration with existing tag management functions
-   - Zero-configuration workflow requiring no manual import commands
-   - Dynamic tag availability without restart requirements
-
-## Data Models
-
-### External Task File Structure
-```json
-{
-  "meta": {
-    "projectName": "External Project Name",
-    "version": "1.0.0",
-    "templateSource": "external",
-    "createdAt": "ISO-8601 timestamp"
-  },
-  "tags": {
-    "projectname": {
-      "meta": {
-        "name": "Project Name",
-        "description": "Project description",
-        "createdAt": "ISO-8601 timestamp"
-      },
-      "tasks": [
-        // Array of task objects
-      ]
-    },
-    "master": {
-      // This section is ignored to prevent conflicts
-    }
-  }
-}
-```
-
-### Enhanced Tag Registry Model
-```json
-{
-  "mainTags": [
-    {
-      "name": "master",
-      "source": "main",
-      "taskCount": 150,
-      "isActive": true
-    }
-  ],
-  "externalTags": [
-    {
-      "name": "projectname",
-      "source": "external",
-      "filename": "tasks_projectname.json",
-      "taskCount": 25,
-      "isReadOnly": true
-    }
-  ]
-}
-```
-
-## APIs and Integrations
-1. **File System Discovery API**
-   - Directory scanning with pattern matching
-   - JSON file validation and parsing
-   - Error handling for corrupted or malformed files
-   - File modification time tracking for cache invalidation
-
-2. **Enhanced Tag Management API**
-   - `scanForExternalTaskFiles(projectRoot)` - Discover external template files
-   - `getExternalTagsFromFiles(projectRoot)` - Extract tag names from external files
-   - `readExternalTagData(projectRoot, tagName)` - Read specific external tag data
-   - `getAvailableTags(projectRoot)` - Combined main and external tag listing
-
-3. **Tag Resolution Enhancement**
-   - Modified `readJSON()` with external file fallback
-   - Enhanced `tags()` function with external tag display
-   - Updated `useTag()` function supporting external tag switching
-   - Read-only enforcement for external tag operations
-
-## Infrastructure Requirements
-1. **File System Access**
-   - Read permissions for tasks directory
-   - JSON parsing capabilities
-   - Pattern matching and regex support
-   - Error handling for file system operations
-
-2. **Backward Compatibility**
-   - Existing tag operations continue unchanged
-   - Main tasks.json structure preserved
-   - No breaking changes to current workflows
-   - Graceful degradation when external files unavailable
-
-# Development Roadmap  
-## Phase 1: Core External File Discovery (Foundation)
-1. **External File Scanner Implementation**
-   - Create `scanForExternalTaskFiles()` function in utils.js
-   - Implement file pattern matching for `tasks_*.json` files
-   - Add error handling for file system access issues
-   - Test with various filename patterns and edge cases
-
-2. **Tag Name Extraction System**
-   - Implement `getExternalTagsFromFiles()` function
-   - Create regex pattern for extracting tag names from filenames
-   - Add validation to ensure tag names match internal tag key format
-   - Handle special characters and invalid filename patterns
-
-3. **External Tag Data Reader**
-   - Create `readExternalTagData()` function
-   - Implement JSON parsing with error handling
-   - Add validation for required tag structure
-   - Ignore 'master' key in external files to prevent conflicts
-
-## Phase 2: Tag Resolution Enhancement (Core Integration)
-1. **Enhanced Tag Registry**
-   - Implement `getAvailableTags()` function combining main and external sources
-   - Create tag metadata structure including source information
-   - Add deduplication logic prioritizing main tags over external
-   - Implement caching mechanism for performance optimization
-
-2. **Modified readJSON Function**
-   - Add external file fallback when tag not found in main tasks.json
-   - Maintain precedence rule: main tasks.json overrides external files
-   - Preserve existing error handling and validation patterns
-   - Ensure read-only access for external tags
-
-3. **Tag Listing Enhancement**
-   - Update `tags()` function to display external tags with `(imported)` indicator
-   - Show external tag metadata and task counts
-   - Maintain current tag highlighting and sorting functionality
-   - Add visual distinction between main and external tags
-
-## Phase 3: User Interface Integration (User Experience)
-1. **Tag Switching Enhancement**
-   - Update `useTag()` function to support external tag switching
-   - Add read-only warnings when switching to external tags
-   - Update state.json with external tag context information
-   - Maintain current tag switching behavior for main tags
-
-2. **Error Handling and User Feedback**
-   - Implement comprehensive error messages for malformed external files
-   - Add user guidance for proper external file structure
-   - Create warnings for read-only operations on external tags
-   - Ensure graceful degradation when external files are corrupted
-
-3. **Documentation and Help Integration**
-   - Update command help text to include external tag information
-   - Add examples of external file structure and usage
-   - Create troubleshooting guide for common external file issues
-   - Document file naming conventions and best practices
-
-## Phase 4: Advanced Features and Optimization (Enhancement)
-1. **Performance Optimization**
-   - Implement file modification time caching
-   - Add lazy loading for external tag data
-   - Optimize file scanning for directories with many files
-   - Create efficient tag resolution caching mechanism
-
-2. **Advanced External File Features**
-   - Support for nested external file directories
-   - Batch external file validation and reporting
-   - External file metadata display and management
-   - Integration with version control ignore patterns
-
-3. **Team Collaboration Features**
-   - Shared external file validation
-   - External file conflict detection and resolution
-   - Team template sharing guidelines and documentation
-   - Integration with git workflows for template management
-
-# Logical Dependency Chain
-## Foundation Layer (Must Be Built First)
-1. **External File Scanner** 
-   - Core requirement for all other functionality
-   - Provides the discovery mechanism for external template files
-   - Must handle file system access and pattern matching reliably
-
-2. **Tag Name Extraction**
-   - Depends on file scanner functionality
-   - Required for identifying available external tags
-   - Must validate tag names against internal format requirements
-
-3. **External Tag Data Reader**
-   - Depends on tag name extraction
-   - Provides access to external tag content
-   - Must handle JSON parsing and validation safely
-
-## Integration Layer (Builds on Foundation)
-4. **Enhanced Tag Registry**
-   - Depends on all foundation components
-   - Combines main and external tag sources
-   - Required for unified tag management across the system
-
-5. **Modified readJSON Function**
-   - Depends on enhanced tag registry
-   - Provides fallback mechanism for tag resolution
-   - Critical for maintaining backward compatibility
-
-6. **Tag Listing Enhancement**
-   - Depends on enhanced tag registry
-   - Provides user visibility into external tags
-   - Required for user discovery of available templates
-
-## User Experience Layer (Completes the Feature)
-7. **Tag Switching Enhancement**
-   - Depends on modified readJSON and tag listing
-   - Enables user interaction with external tags
-   - Must enforce read-only access properly
-
-8. **Error Handling and User Feedback**
-   - Can be developed in parallel with other UX components
-   - Enhances reliability and user experience
-   - Should be integrated throughout development process
-
-9. **Documentation and Help Integration**
-   - Should be developed alongside implementation
-   - Required for user adoption and proper usage
-   - Can be completed in parallel with advanced features
-
-## Optimization Layer (Performance and Advanced Features)
-10. **Performance Optimization**
-    - Can be developed after core functionality is stable
-    - Improves user experience with large numbers of external files
-    - Not blocking for initial release
-
-11. **Advanced External File Features**
-    - Can be developed independently after core features
-    - Enhances power user workflows
-    - Optional for initial release
-
-12. **Team Collaboration Features**
-    - Depends on stable core functionality
-    - Enhances team workflows and template sharing
-    - Can be prioritized based on user feedback
-
-# Risks and Mitigations  
-## Technical Challenges
-
-### File System Performance
-**Risk**: Scanning for external files on every tag operation could impact performance with large directories.
-**Mitigation**: 
- Implement file modification time caching to avoid unnecessary rescans
- Use lazy loading for external tag data - only read when accessed
- Add configurable limits on number of external files to scan
- Optimize file pattern matching with efficient regex patterns
-
-### External File Corruption
-**Risk**: Malformed or corrupted external JSON files could break tag operations.
-**Mitigation**:
- Implement robust JSON parsing with comprehensive error handling
- Add file validation before attempting to parse external files
- Gracefully skip corrupted files and continue with valid ones
- Provide clear error messages guiding users to fix malformed files
-
-### Tag Name Conflicts
-**Risk**: External files might contain tag names that conflict with main tasks.json tags.
-**Mitigation**:
- Implement strict precedence rule: main tasks.json always overrides external files
- Add warnings when external tags are ignored due to conflicts
- Document naming conventions to avoid common conflicts
- Provide validation tools to check for potential conflicts
-
-## MVP Definition
-
-### Core Feature Scope
-**Risk**: Including too many advanced features could delay the core functionality.
-**Mitigation**:
- Define MVP as basic external file discovery + tag switching
- Focus on the silent discovery mechanism as the primary value proposition
- Defer advanced features like nested directories and batch operations
- Ensure each phase delivers complete, usable functionality
-
-### User Experience Complexity
-**Risk**: The read-only nature of external tags might confuse users.
-**Mitigation**:
- Provide clear visual indicators for external tags in all interfaces
- Add explicit warnings when users attempt to modify external tag contexts
- Document the read-only behavior and its rationale clearly
- Consider future enhancement for external tag modification workflows
-
-### Backward Compatibility
-**Risk**: Changes to tag resolution logic might break existing workflows.
-**Mitigation**:
- Maintain existing tag operations unchanged for main tasks.json
- Add external file support as enhancement, not replacement
- Test thoroughly with existing task structures and workflows
- Provide migration path if any breaking changes are necessary
-
-## Resource Constraints
-
-### Development Complexity
-**Risk**: Integration with existing tag management system could be complex.
-**Mitigation**:
- Phase implementation to minimize risk of breaking existing functionality
- Create comprehensive test suite covering both main and external tag scenarios
- Use feature flags to enable/disable external file support during development
- Implement thorough error handling to prevent system failures
-
-### File System Dependencies
-**Risk**: Different operating systems might handle file operations differently.
-**Mitigation**:
- Use Node.js built-in file system APIs for cross-platform compatibility
- Test on multiple operating systems (Windows, macOS, Linux)
- Handle file path separators and naming conventions properly
- Add fallback mechanisms for file system access issues
-
-### User Adoption
-**Risk**: Users might not understand or adopt the external file template system.
-**Mitigation**:
- Create clear documentation with practical examples
- Provide sample external template files for common use cases
- Integrate help and guidance directly into the CLI interface
- Gather user feedback early and iterate on the user experience
-
-# Appendix  
-## External File Naming Convention
-
-### Filename Pattern
- **Format**: `tasks_[tagname].json`
- **Examples**: `tasks_feature-auth.json`, `tasks_v2-migration.json`, `tasks_project-alpha.json`
- **Validation**: Tag name must match internal tag key format (alphanumeric, hyphens, underscores)
-
-### File Structure Requirements
-```json
-{
-  "meta": {
-    "projectName": "Required: Human-readable project name",
-    "version": "Optional: Template version",
-    "templateSource": "Optional: Source identifier",
-    "createdAt": "Optional: ISO-8601 timestamp"
-  },
-  "tags": {
-    "[tagname]": {
-      "meta": {
-        "name": "Required: Tag display name",
-        "description": "Optional: Tag description",
-        "createdAt": "Optional: ISO-8601 timestamp"
-      },
-      "tasks": [
-        // Required: Array of task objects following standard task structure
-      ]
-    }
-  }
-}
-```
-
-## Implementation Functions Specification
-
-### Core Discovery Functions
-```javascript
-// Scan tasks directory for external template files
-function scanForExternalTaskFiles(projectRoot) {
-  // Returns: Array of external file paths
-}
-
-// Extract tag names from external filenames
-function getExternalTagsFromFiles(projectRoot) {
-  // Returns: Array of external tag names
-}
-
-// Read specific external tag data
-function readExternalTagData(projectRoot, tagName) {
-  // Returns: Tag data object or null if not found
-}
-
-// Get combined main and external tags
-function getAvailableTags(projectRoot) {
-  // Returns: Combined tag registry with metadata
-}
-```
-
-### Integration Points
-```javascript
-// Enhanced readJSON with external fallback
-function readJSON(projectRoot, tag = null) {
-  // Modified to check external files when tag not found in main
-}
-
-// Enhanced tags listing with external indicators
-function tags(projectRoot, options = {}) {
-  // Modified to display external tags with (imported) suffix
-}
-
-// Enhanced tag switching with external support
-function useTag(projectRoot, tagName) {
-  // Modified to support switching to external tags (read-only)
-}
-```
-
-## Error Handling Specifications
-
-### File System Errors
- **ENOENT**: External file not found - gracefully skip and continue
- **EACCES**: Permission denied - warn user and continue with available files
- **EISDIR**: Directory instead of file - skip and continue scanning
-
-### JSON Parsing Errors
- **SyntaxError**: Malformed JSON - skip file and log warning with filename
- **Missing required fields**: Skip file and provide specific error message
- **Invalid tag structure**: Skip file and guide user to correct format
-
-### Tag Conflict Resolution
- **Duplicate tag names**: Main tasks.json takes precedence, log warning
- **Invalid tag names**: Skip external file and provide naming guidance
- **Master key in external**: Ignore master key, process other tags normally
-</PRD> 
--- a/.taskmaster/state.json
+++ b/.taskmaster/state.json
@@ -1,9 +1,8 @@
 {
 	"currentTag": "master",
-	"lastSwitched": "2025-06-14T20:37:15.456Z",
+	"lastSwitched": "2025-06-14T00:46:38.351Z",
 	"branchTagMapping": {
-		"v017-adds": "v017-adds",
-		"next": "next"
+		"v017-adds": "v017-adds"
 	},
 	"migrationNoticeShown": true
 }
--- a/.taskmaster/tasks/task_001_test-tag.txt
+++ b/.taskmaster/tasks/task_001_test-tag.txt
@@ -1,23 +0,0 @@
-# Task ID: 1
-# Title: Implement TTS Flag for Taskmaster Commands
-# Status: pending
-# Dependencies: 16 (Not found)
-# Priority: medium
-# Description: Add text-to-speech functionality to taskmaster commands with configurable voice options and audio output settings.
-# Details:
-Implement TTS functionality including:
- Add --tts flag to all relevant taskmaster commands (list, show, generate, etc.)
- Integrate with system TTS engines (Windows SAPI, macOS say command, Linux espeak/festival)
- Create TTS configuration options in the configuration management system
- Add voice selection options (male/female, different languages if available)
- Implement audio output settings (volume, speed, pitch)
- Add TTS-specific error handling for cases where TTS is unavailable
- Create fallback behavior when TTS fails (silent failure or text output)
- Support for reading task titles, descriptions, and status updates aloud
- Add option to read entire task lists or individual task details
- Implement TTS for command confirmations and error messages
- Create TTS output formatting to make spoken text more natural (removing markdown, formatting numbers/dates appropriately)
- Add configuration option to enable/disable TTS globally
-
-# Test Strategy:
-Test TTS functionality across different operating systems (Windows, macOS, Linux). Verify that the --tts flag works with all major commands. Test voice configuration options and ensure audio output settings are properly applied. Test error handling when TTS services are unavailable. Verify that text formatting for speech is natural and understandable. Test with various task content types including special characters, code snippets, and long descriptions. Ensure TTS can be disabled and enabled through configuration.
--- a/.taskmaster/tasks/task_095.txt
+++ b/.taskmaster/tasks/task_095.txt
@@ -0,0 +1,149 @@
+# Task ID: 95
+# Title: Implement .taskmaster Directory Structure
+# Status: done
+# Dependencies: 1, 3, 4, 17
+# Priority: high
+# Description: Consolidate all Task Master-managed files in user projects into a clean, centralized .taskmaster/ directory structure to improve organization and keep user project directories clean, based on GitHub issue #275.
+# Details:
+This task involves restructuring how Task Master organizes files within user projects to improve maintainability and keep project directories clean:
+
+1. Create a new `.taskmaster/` directory structure in user projects:
+   - Move task files from `tasks/` to `.taskmaster/tasks/`
+   - Move PRD files from `scripts/` to `.taskmaster/docs/`
+   - Move analysis reports to `.taskmaster/reports/`
+   - Move configuration from `.taskmasterconfig` to `.taskmaster/config.json`
+   - Create `.taskmaster/templates/` for user templates
+
+2. Update all Task Master code that creates/reads user files:
+   - Modify task file generation to use `.taskmaster/tasks/`
+   - Update PRD file handling to use `.taskmaster/docs/`
+   - Adjust report generation to save to `.taskmaster/reports/`
+   - Update configuration loading to look for `.taskmaster/config.json`
+   - Modify any path resolution logic in Task Master's codebase
+
+3. Ensure backward compatibility during migration:
+   - Implement path fallback logic that checks both old and new locations
+   - Add deprecation warnings when old paths are detected
+   - Create a migration command to help users transition to the new structure
+   - Preserve existing user data during migration
+
+4. Update the project initialization process:
+   - Modify the init command to create the new `.taskmaster/` directory structure
+   - Update default file creation to use new paths
+
+5. Benefits of the new structure:
+   - Keeps user project directories clean and organized
+   - Clearly separates Task Master files from user project files
+   - Makes it easier to add Task Master to .gitignore if desired
+   - Provides logical grouping of different file types
+
+6. Test thoroughly to ensure all functionality works with the new structure:
+   - Verify all Task Master commands work with the new paths
+   - Ensure backward compatibility functions correctly
+   - Test migration process preserves all user data
+
+7. Update documentation:
+   - Update README.md to reflect the new user file structure
+   - Add migration guide for existing users
+   - Document the benefits of the cleaner organization
+
+# Test Strategy:
+1. Unit Testing:
+   - Create unit tests for path resolution that verify both new and old paths work
+   - Test configuration loading with both `.taskmasterconfig` and `.taskmaster/config.json`
+   - Verify the migration command correctly moves files and preserves content
+   - Test file creation in all new subdirectories
+
+2. Integration Testing:
+   - Run all existing integration tests with the new directory structure
+   - Verify that all Task Master commands function correctly with new paths
+   - Test backward compatibility by running commands with old file structure
+
+3. Migration Testing:
+   - Test the migration process on sample projects with existing tasks and files
+   - Verify all tasks, PRDs, reports, and configurations are correctly moved
+   - Ensure no data loss occurs during migration
+   - Test migration with partial existing structures (e.g., only tasks/ exists)
+
+4. User Workflow Testing:
+   - Test complete workflows: init → create tasks → generate reports → update PRDs
+   - Verify all generated files go to correct locations in `.taskmaster/`
+   - Test that user project directories remain clean
+
+5. Manual Testing:
+   - Perform end-to-end testing with the new structure
+   - Create, update, and delete tasks using the new structure
+   - Generate reports and verify they're saved to `.taskmaster/reports/`
+
+6. Documentation Verification:
+   - Review all documentation to ensure it accurately reflects the new user file structure
+   - Verify the migration guide provides clear instructions
+
+7. Regression Testing:
+   - Run the full test suite to ensure no regressions were introduced
+   - Verify existing user projects continue to work during transition period
+
+# Subtasks:
+## 1. Create .taskmaster directory structure [done]
+### Dependencies: None
+### Description: Create the new .taskmaster directory and move existing files to their new locations
+### Details:
+Create a new .taskmaster/ directory in the project root. Move the tasks/ directory to .taskmaster/tasks/. Move the scripts/ directory to .taskmaster/scripts/. Move the .taskmasterconfig file to .taskmaster/config.json. Ensure proper file permissions are maintained during the move.
+<info added on 2025-05-29T15:03:56.912Z>
+Create the new .taskmaster/ directory structure in user projects with subdirectories for tasks/, docs/, reports/, and templates/. Move the existing .taskmasterconfig file to .taskmaster/config.json. Since this project is also a Task Master user, move this project's current user files (tasks.json, PRD files, etc.) to the new .taskmaster/ structure to test the implementation. This subtask focuses on user project directory structure, not Task Master source code relocation.
+</info added on 2025-05-29T15:03:56.912Z>
+
+## 2. Update Task Master code for new user file paths [done]
+### Dependencies: 95.1
+### Description: Modify all Task Master code that creates or reads user project files to use the new .taskmaster structure
+### Details:
+Update Task Master's file handling code to use the new paths: tasks in .taskmaster/tasks/, PRD files in .taskmaster/docs/, reports in .taskmaster/reports/, and config in .taskmaster/config.json. Modify path resolution logic throughout the Task Master codebase to reference the new user file locations.
+
+## 3. Update task file generation system [done]
+### Dependencies: 95.1
+### Description: Modify the task file generation system to use the new directory structure
+### Details:
+Update the task file generation system to create and read task files from .taskmaster/tasks/ instead of tasks/. Ensure all template paths are updated. Modify any path resolution logic specific to task file handling.
+
+## 4. Implement backward compatibility logic [done]
+### Dependencies: 95.2, 95.3
+### Description: Add fallback mechanisms to support both old and new file locations during transition
+### Details:
+Implement path fallback logic that checks both old and new locations when files aren't found. Add deprecation warnings when old paths are used, informing users about the new structure. Ensure error messages are clear about the transition.
+
+## 5. Create migration command for users [done]
+### Dependencies: 95.1, 95.4
+### Description: Develop a Task Master command to help users transition their existing projects to the new structure
+### Details:
+Create a 'taskmaster migrate' command that automatically moves user files from old locations to the new .taskmaster structure. Move tasks/ to .taskmaster/tasks/, scripts/prd.txt to .taskmaster/docs/, reports to .taskmaster/reports/, and .taskmasterconfig to .taskmaster/config.json. Include backup functionality and validation to ensure migration completed successfully.
+
+## 6. Update project initialization process [done]
+### Dependencies: 95.1
+### Description: Modify the init command to create the new directory structure for new projects
+### Details:
+Update the init command to create the .taskmaster directory and its subdirectories (tasks/, docs/, reports/, templates/). Modify default file creation to use the new paths. Ensure new projects are created with the correct structure from the start.
+
+## 7. Update PRD and report file handling [done]
+### Dependencies: 95.2, 95.6
+### Description: Modify PRD file creation and report generation to use the new directory structure
+### Details:
+Update PRD file handling to create and read files from .taskmaster/docs/ instead of scripts/. Modify report generation (like task-complexity-report.json) to save to .taskmaster/reports/. Ensure all file operations use the new paths consistently.
+
+## 8. Update documentation and create migration guide [done]
+### Dependencies: 95.5, 95.6, 95.7
+### Description: Update all documentation to reflect the new directory structure and provide migration guidance
+### Details:
+Update README.md and other documentation to reflect the new .taskmaster structure for user projects. Create a comprehensive migration guide explaining the benefits of the new structure and how to migrate existing projects. Include examples of the new directory layout and explain how it keeps user project directories clean.
+
+## 9. Add templates directory support [done]
+### Dependencies: 95.2, 95.6
+### Description: Implement support for user templates in the .taskmaster/templates/ directory
+### Details:
+Create functionality to support user-defined templates in .taskmaster/templates/. Allow users to store custom task templates, PRD templates, or other reusable files. Update Task Master commands to recognize and use templates from this directory when available.
+
+## 10. Verify clean user project directories [done]
+### Dependencies: 95.8, 95.9
+### Description: Ensure the new structure keeps user project root directories clean and organized
+### Details:
+Validate that after implementing the new structure, user project root directories only contain their actual project files plus the single .taskmaster/ directory. Verify that no Task Master files are created outside of .taskmaster/. Test that users can easily add .taskmaster/ to .gitignore if they choose to exclude Task Master files from version control.
+
--- a/.taskmaster/tasks/task_096.txt
+++ b/.taskmaster/tasks/task_096.txt
@@ -0,0 +1,37 @@
+# Task ID: 96
+# Title: Create Export Command for On-Demand Task File and PDF Generation
+# Status: pending
+# Dependencies: 2, 4, 95
+# Priority: medium
+# Description: Develop an 'export' CLI command that generates task files and comprehensive PDF exports on-demand, replacing automatic file generation and providing users with flexible export options.
+# Details:
+Implement a new 'export' command in the CLI that supports two primary modes: (1) generating individual task files on-demand (superseding the current automatic generation system), and (2) producing a comprehensive PDF export. The PDF should include: a first page with the output of 'tm list --with-subtasks', followed by individual pages for each task (using 'tm show <task_id>') and each subtask (using 'tm show <subtask_id>'). Integrate PDF generation using a robust library (e.g., pdfkit, Puppeteer, or jsPDF) to ensure high-quality output and proper pagination. Refactor or disable any existing automatic file generation logic to avoid performance overhead. Ensure the command supports flexible output paths and options for exporting only files, only PDF, or both. Update documentation and help output to reflect the new export capabilities. Consider concurrency and error handling for large projects. Ensure the export process is efficient and does not block the main CLI thread unnecessarily.
+
+# Test Strategy:
+1. Run the 'export' command with various options and verify that task files are generated only on-demand, not automatically. 2. Generate a PDF export and confirm that the first page contains the correct 'tm list --with-subtasks' output, and that each subsequent page accurately reflects the output of 'tm show <task_id>' and 'tm show <subtask_id>' for all tasks and subtasks. 3. Test exporting in projects with large numbers of tasks and subtasks to ensure performance and correctness. 4. Attempt exports with invalid paths or missing data to verify robust error handling. 5. Confirm that no automatic file generation occurs during normal task operations. 6. Review CLI help output and documentation for accuracy regarding the new export functionality.
+
+# Subtasks:
+## 1. Remove Automatic Task File Generation from Task Operations [pending]
+### Dependencies: None
+### Description: Eliminate all calls to generateTaskFiles() from task operations such as add-task, remove-task, set-status, and similar commands to prevent unnecessary performance overhead.
+### Details:
+Audit the codebase for any automatic invocations of generateTaskFiles() and remove or refactor them to ensure task files are not generated automatically during task operations.
+
+## 2. Implement Export Command Infrastructure with On-Demand Task File Generation [pending]
+### Dependencies: 96.1
+### Description: Develop the CLI 'export' command infrastructure, enabling users to generate task files on-demand by invoking the preserved generateTaskFiles function only when requested.
+### Details:
+Create the export command with options for output paths and modes (files, PDF, or both). Ensure generateTaskFiles is only called within this command and not elsewhere.
+
+## 3. Implement Comprehensive PDF Export Functionality [pending]
+### Dependencies: 96.2
+### Description: Add PDF export capability to the export command, generating a structured PDF with a first page listing all tasks and subtasks, followed by individual pages for each task and subtask, using a robust PDF library.
+### Details:
+Integrate a PDF generation library (e.g., pdfkit, Puppeteer, or jsPDF). Ensure the PDF includes the output of 'tm list --with-subtasks' on the first page, and uses 'tm show <task_id>' and 'tm show <subtask_id>' for subsequent pages. Handle pagination, concurrency, and error handling for large projects.
+
+## 4. Update Documentation, Tests, and CLI Help for Export Workflow [pending]
+### Dependencies: 96.2, 96.3
+### Description: Revise all relevant documentation, automated tests, and CLI help output to reflect the new export-based workflow and available options.
+### Details:
+Update user guides, README files, and CLI help text. Add or modify tests to cover the new export command and its options. Ensure all documentation accurately describes the new workflow and usage.
+
--- a/.taskmaster/tasks/tasks.json
+++ b/.taskmaster/tasks/tasks.json
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,114 +1,10 @@
 # task-master-ai

-## 0.18.0-rc.0
+## 0.17.0-rc.1

 ### Minor Changes

- [#830](https://github.com/eyaltoledano/claude-task-master/pull/830) [`e9d1bc2`](https://github.com/eyaltoledano/claude-task-master/commit/e9d1bc2385521c08374a85eba7899e878a51066c) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Can now configure baseURL of provider with `<PROVIDER>_BASE_URL`
-
-  - For example:
-    - `OPENAI_BASE_URL`
-
- [#460](https://github.com/eyaltoledano/claude-task-master/pull/460) [`a09a2d0`](https://github.com/eyaltoledano/claude-task-master/commit/a09a2d0967a10276623e3f3ead3ed577c15ce62f) Thanks [@joedanz](https://github.com/joedanz)! - Added comprehensive rule profile management:
-
-  **New Profile Support**: Added comprehensive IDE profile support with eight specialized profiles: Claude Code, Cline, Codex, Cursor, Roo, Trae, VS Code, and Windsurf. Each profile is optimized for its respective IDE with appropriate mappings and configuration.
-  **Initialization**: You can now specify which rule profiles to include at project initialization using `--rules <profiles>` or `-r <profiles>` (e.g., `task-master init -r cursor,roo`). Only the selected profiles and configuration are included.
-  **Add/Remove Commands**: `task-master rules add <profiles>` and `task-master rules remove <profiles>` let you manage specific rule profiles and MCP config after initialization, supporting multiple profiles at once.
-  **Interactive Setup**: `task-master rules setup` launches an interactive prompt to select which rule profiles to add to your project. This does **not** re-initialize your project or affect shell aliases; it only manages rules.
-  **Selective Removal**: Rules removal intelligently preserves existing non-Task Master rules and files and only removes Task Master-specific rules. Profile directories are only removed when completely empty and all conditions are met (no existing rules, no other files/folders, MCP config completely removed).
-  **Safety Features**: Confirmation messages clearly explain that only Task Master-specific rules and MCP configurations will be removed, while preserving existing custom rules and other files.
-  **Robust Validation**: Includes comprehensive checks for array types in MCP config processing and error handling throughout the rules management system.
-
-  This enables more flexible, rule-specific project setups with intelligent cleanup that preserves user customizations while safely managing Task Master components.
-
-  - Resolves #338
-
- [#804](https://github.com/eyaltoledano/claude-task-master/pull/804) [`1b8c320`](https://github.com/eyaltoledano/claude-task-master/commit/1b8c320c570473082f1eb4bf9628bff66e799092) Thanks [@ejones40](https://github.com/ejones40)! - Add better support for python projects by adding `pyproject.toml` as a projectRoot marker
-
- [#743](https://github.com/eyaltoledano/claude-task-master/pull/743) [`a2a3229`](https://github.com/eyaltoledano/claude-task-master/commit/a2a3229fd01e24a5838f11a3938a77250101e184) Thanks [@joedanz](https://github.com/joedanz)! - - **Git Worktree Detection:**
-
-  - Now properly skips Git initialization when inside existing Git worktree
-  - Prevents accidental nested repository creation
-  - **Flag System Overhaul:**
-    - `--git`/`--no-git` controls repository initialization
-    - `--aliases`/`--no-aliases` consistently manages shell alias creation
-    - `--git-tasks`/`--no-git-tasks` controls whether task files are stored in Git
-    - `--dry-run` accurately previews all initialization behaviors
-  - **GitTasks Functionality:**
-    - New `--git-tasks` flag includes task files in Git (comments them out in .gitignore)
-    - New `--no-git-tasks` flag excludes task files from Git (default behavior)
-    - Supports both CLI and MCP interfaces with proper parameter passing
-
-  **Implementation Details:**
-
-  - Added explicit Git worktree detection before initialization
-  - Refactored flag processing to ensure consistent behavior
-  - Fixes #734
-
- [#829](https://github.com/eyaltoledano/claude-task-master/pull/829) [`4b0c9d9`](https://github.com/eyaltoledano/claude-task-master/commit/4b0c9d9af62d00359fca3f43283cf33223d410bc) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Add Claude Code provider support
-
-  Introduces a new provider that enables using Claude models (Opus and Sonnet) through the Claude Code CLI without requiring an API key.
-
-  Key features:
-
-  - New claude-code provider with support for opus and sonnet models
-  - No API key required - uses local Claude Code CLI installation
-  - Optional dependency - won't affect users who don't need Claude Code
-  - Lazy loading ensures the provider only loads when requested
-  - Full integration with existing Task Master commands and workflows
-  - Comprehensive test coverage for reliability
-  - New --claude-code flag for the models command
-
-  Users can now configure Claude Code models with:
-  task-master models --set-main sonnet --claude-code
-  task-master models --set-research opus --claude-code
-
-  The @anthropic-ai/claude-code package is optional and won't be installed unless explicitly needed.
-
-### Patch Changes
-
- [#827](https://github.com/eyaltoledano/claude-task-master/pull/827) [`5da5b59`](https://github.com/eyaltoledano/claude-task-master/commit/5da5b59bdeeb634dcb3adc7a9bc0fc37e004fa0c) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix expand command preserving tagged task structure and preventing data corruption
-
-  - Enhance E2E tests with comprehensive tag-aware expand testing to verify tag corruption fix
-  - Add new test section for feature-expand tag creation and testing during expand operations
-  - Verify tag preservation during expand, force expand, and expand --all operations
-  - Test that master tag remains intact while feature-expand tag receives subtasks correctly
-  - Fix file path references to use correct .taskmaster/config.json and .taskmaster/tasks/tasks.json locations
-  - All tag corruption verification tests pass successfully, confirming the expand command tag corruption bug fix works as expected
-
- [#833](https://github.com/eyaltoledano/claude-task-master/pull/833) [`cf2c066`](https://github.com/eyaltoledano/claude-task-master/commit/cf2c06697a0b5b952fb6ca4b3c923e9892604d08) Thanks [@joedanz](https://github.com/joedanz)! - Call rules interactive setup during init
-
- [#826](https://github.com/eyaltoledano/claude-task-master/pull/826) [`7811227`](https://github.com/eyaltoledano/claude-task-master/commit/78112277b3caa4539e6e29805341a944799fb0e7) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Improves Amazon Bedrock support
-
- [#834](https://github.com/eyaltoledano/claude-task-master/pull/834) [`6483537`](https://github.com/eyaltoledano/claude-task-master/commit/648353794eb60d11ffceda87370a321ad310fbd7) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix issues with task creation/update where subtasks are being created like id: <parent_task>.<subtask> instead if just id: <subtask>
-
- [#835](https://github.com/eyaltoledano/claude-task-master/pull/835) [`727f1ec`](https://github.com/eyaltoledano/claude-task-master/commit/727f1ec4ebcbdd82547784c4c113b666af7e122e) Thanks [@joedanz](https://github.com/joedanz)! - Store tasks in Git by default
-
- [#822](https://github.com/eyaltoledano/claude-task-master/pull/822) [`1bd6d4f`](https://github.com/eyaltoledano/claude-task-master/commit/1bd6d4f2468070690e152e6e63e15a57bc550d90) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Improve provider validation system with clean constants structure
-
-  - **Fixed "Invalid provider hint" errors**: Resolved validation failures for Azure, Vertex, and Bedrock providers
-  - **Improved search UX**: Integrated search for better model discovery with real-time filtering
-  - **Better organization**: Moved custom provider options to bottom of model selection with clear section separators
-
-  This change ensures all custom providers (Azure, Vertex, Bedrock, OpenRouter, Ollama) work correctly in `task-master models --setup`
-
- [#633](https://github.com/eyaltoledano/claude-task-master/pull/633) [`3a2325a`](https://github.com/eyaltoledano/claude-task-master/commit/3a2325a963fed82377ab52546eedcbfebf507a7e) Thanks [@nmarley](https://github.com/nmarley)! - Fix weird `task-master init` bug when using in certain environments
-
- [#831](https://github.com/eyaltoledano/claude-task-master/pull/831) [`b592dff`](https://github.com/eyaltoledano/claude-task-master/commit/b592dff8bc5c5d7966843fceaa0adf4570934336) Thanks [@joedanz](https://github.com/joedanz)! - Rename Roo Code Boomerang role to Orchestrator
-
- [#830](https://github.com/eyaltoledano/claude-task-master/pull/830) [`e9d1bc2`](https://github.com/eyaltoledano/claude-task-master/commit/e9d1bc2385521c08374a85eba7899e878a51066c) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Improve mcp keys check in cursor
-
-## 0.17.1
-
-### Patch Changes
-
- [#789](https://github.com/eyaltoledano/claude-task-master/pull/789) [`8cde6c2`](https://github.com/eyaltoledano/claude-task-master/commit/8cde6c27087f401d085fe267091ae75334309d96) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix contextGatherer bug when adding a task `Cannot read properties of undefined (reading 'forEach')`
-
-## 0.17.0
-
-### Minor Changes
-
- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Add comprehensive AI-powered research command with intelligent context gathering and interactive follow-ups.
+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Add comprehensive AI-powered research command with intelligent context gathering and interactive follow-ups.

  The new `research` command provides AI-powered research capabilities that automatically gather relevant project context to answer your questions. The command intelligently selects context from multiple sources and supports interactive follow-up questions in CLI mode.

@@ -182,7 +78,7 @@

  The research command integrates with the existing AI service layer and supports all configured AI providers. Both CLI and MCP interfaces provide comprehensive research capabilities with intelligent context gathering and flexible output options.

- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Enhance update-task with --append flag for timestamped task updates
+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Enhance update-task with --append flag for timestamped task updates

  Adds the `--append` flag to `update-task` command, enabling it to behave like `update-subtask` with timestamped information appending. This provides more flexible task updating options:

@@ -199,7 +95,7 @@

  Instead of requiring separate subtask creation for progress tracking, you can now append timestamped information directly to parent tasks while preserving the option for comprehensive task updates.

- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Add --tag flag support to core commands for multi-context task management. Commands like parse-prd, analyze-complexity, and others now support targeting specific task lists, enabling rapid prototyping and parallel development workflows.
+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Add --tag flag support to core commands for multi-context task management. Commands like parse-prd, analyze-complexity, and others now support targeting specific task lists, enabling rapid prototyping and parallel development workflows.

  Key features:

@@ -208,21 +104,19 @@
  - All task operations can target specific contexts while preserving other lists
  - Non-existent tags are created automatically for seamless workflow

- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Introduces Tagged Lists: AI Multi-Context Task Management System
+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Introduces Tagged Lists: AI Multi-Context Task Management System

-  This major feature release introduces Tagged Lists, a comprehensive system that transforms Taskmaster into a multi-context task management powerhouse. You can now organize tasks into completely isolated contexts, enabling parallel (agentic) development workflows, team collaboration, and project experimentation without conflicts.
+  This major release introduces Tagged Lists, a comprehensive system that transforms Task Master into a multi-context task management powerhouse. You can now organize tasks into completely isolated contexts, enabling parallel (agentic) development workflows, team collaboration, and project experimentation without conflicts.

  **🏷️ Tagged Task Lists Architecture:**

-  The new tagged system fundamentally improves how tasks are organized:
+  The new tagged system fundamentally changes how tasks are organized:

  - **Legacy Format**: `{ "tasks": [...] }`
  - **New Tagged Format**: `{ "master": { "tasks": [...], "metadata": {...} }, "feature-xyz": { "tasks": [...], "metadata": {...} } }`
-  - **Automatic Migration**: Existing projects will seamlessly migrate to tagged format with zero user intervention
-  - **State Management**: New `.taskmaster/state.json` tracks current tag, last switched time, migration status and more.
-  - **Configuration Integration**: Enhanced `.taskmaster/config.json` with tag-specific settings and defaults.
-
-  By default, your existing task list will be migrated to the `master` tag.
+  - **Automatic Migration**: Existing projects seamlessly migrate to tagged format with zero user intervention
+  - **State Management**: New `.taskmaster/state.json` tracks current tag, last switched time, and migration status
+  - **Configuration Integration**: Enhanced `.taskmaster/config.json` with tag-specific settings and defaults

  **🚀 Complete Tag Management Suite:**

@@ -230,7 +124,7 @@

  - `task-master tags [--show-metadata]` - List all tags with task counts, completion stats, and metadata
  - `task-master add-tag <name> [options]` - Create new tag contexts with optional task copying
-  - `task-master delete-tag <name> [--yes]` - Delete tags (and attached tasks) with double confirmation protection
+  - `task-master delete-tag <name> [--yes]` - Delete tags with double confirmation protection
  - `task-master use-tag <name>` - Switch contexts and immediately see next available task
  - `task-master rename-tag <old> <new>` - Rename tags with automatic current tag reference updates
  - `task-master copy-tag <source> <target> [options]` - Duplicate tag contexts for experimentation
@@ -250,7 +144,7 @@

  - `--copy-from-current` - Copy tasks from currently active tag
  - `--copy-from=<tag>` - Copy tasks from specific tag
-  - `--from-branch` - Creates a new tag using the active git branch name (for `add-tag` only)
+  - `--from-branch` - Creates a new tag usin active git branch name (for `add-tag` only)
  - `--description="<text>"` - Add custom tag descriptions
  - Empty tag creation for fresh contexts

@@ -265,8 +159,6 @@
  - `task-master set-status --tag=hotfix --id=5 --status=done` - Update tasks in specific contexts
  - `task-master expand --tag=research --id=3` - Break down tasks within tag contexts

-  This way you or your agent can store out of context tasks into the appropriate tags for later, allowing you to maintain a groomed and scoped master list. Focus on value, not chores.
-
  **📊 Enhanced Workflow Features:**

  **Smart Context Switching:**
@@ -363,7 +255,7 @@

  This release establishes the foundation for advanced multi-context workflows while maintaining the simplicity and power that makes Task Master effective for individual developers.

- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Research Save-to-File Feature & Critical MCP Tag Corruption Fix
+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Research Save-to-File Feature & Critical MCP Tag Corruption Fix

  **🔬 New Research Save-to-File Functionality:**

@@ -387,9 +279,9 @@
  - Comprehensive Markdown format with metadata headers including query, timestamp, and context sources
  - Clean conversation history formatting without duplicate information

- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - No longer automatically creates individual task files as they are not used by the applicatoin. You can still generate them anytime using the `generate` command.
+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - No longer automatically creates individual task files as they are not used by the applicatoin. You can still generate them anytime using the `generate` command.

- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Enhanced get-task/show command to support comma-separated task IDs for efficient batch operations
+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Enhanced get-task/show command to support comma-separated task IDs for efficient batch operations

  **New Features:**

@@ -407,17 +299,17 @@

  This enhancement maintains full backward compatibility while significantly improving efficiency for both human users and AI agents working with multiple tasks.

- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Adds support for filtering tasks by multiple statuses at once using comma-separated statuses.
+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Adds support for filtering tasks by multiple statuses at once using comma-separated statuses.

  Example: `cancelled,deferred`

- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Adds tag to CLI and MCP outputs/responses so you know which tag you are performing operations on.
+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Adds tag to CLI output so you know which tag you are performing operations on. Already supported in the MCP response.

 ### Patch Changes

- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`5ec1f61`](https://github.com/eyaltoledano/claude-task-master/commit/5ec1f61c13f468648b7fdc8fa112e95aec25f76d) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Fix Cursor deeplink installation by providing copy-paste instructions for GitHub compatibility
+- [#723](https://github.com/eyaltoledano/claude-task-master/pull/723) [`40a5238`](https://github.com/eyaltoledano/claude-task-master/commit/40a52385baf43a5ed97ce29bc5c4fb3fea766b70) Thanks [@joedanz](https://github.com/joedanz)! - Fix Cursor deeplink installation by providing copy-paste instructions for GitHub compatibility

- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Fix critical bugs in task move functionality:
+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix critical bugs in task move functionality:

  - **Fixed moving tasks to become subtasks of empty parents**: When moving a task to become a subtask of a parent that had no existing subtasks (e.g., task 89 → task 98.1), the operation would fail with validation errors.
  - **Fixed moving subtasks between parents**: Subtasks can now be properly moved between different parent tasks, including to parents that previously had no subtasks.
@@ -425,30 +317,12 @@

  These fixes enables proper task hierarchy reorganization for corner cases that were previously broken.

- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`d76bea4`](https://github.com/eyaltoledano/claude-task-master/commit/d76bea49b381c523183f39e33c2a4269371576ed) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Update o3 model price
-
- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`0849c0c`](https://github.com/eyaltoledano/claude-task-master/commit/0849c0c2cedb16ac44ba5cc2d109625a9b4efd67) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Fixes issue with expand CLI command "Complexity report not found"
-
-  - Closes #735
-  - Closes #728
-
- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Fix issue with generate command which was creating tasks in the legacy tasks location.
-
-      - No longer creates individual task files automatically. You can still use `generate` if you need to create our update your task files.
-
- [#779](https://github.com/eyaltoledano/claude-task-master/pull/779) [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Improves dependency management when moving tasks by updating subtask dependencies that reference sibling subtasks by their old parent-based ID
-
- Updated dependencies [[`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f), [`5ec1f61`](https://github.com/eyaltoledano/claude-task-master/commit/5ec1f61c13f468648b7fdc8fa112e95aec25f76d), [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f), [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f), [`d76bea4`](https://github.com/eyaltoledano/claude-task-master/commit/d76bea49b381c523183f39e33c2a4269371576ed), [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f), [`0849c0c`](https://github.com/eyaltoledano/claude-task-master/commit/0849c0c2cedb16ac44ba5cc2d109625a9b4efd67), [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f), [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f), [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f), [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f), [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f), [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f), [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f), [`c0b3f43`](https://github.com/eyaltoledano/claude-task-master/commit/c0b3f432a60891550b00acb113dc877bd432995f)]:
-  - task-master-ai@0.17.0
-
-## 0.16.2
-
-### Patch Changes
-
 - [#695](https://github.com/eyaltoledano/claude-task-master/pull/695) [`1ece6f1`](https://github.com/eyaltoledano/claude-task-master/commit/1ece6f19048df6ae2a0b25cbfb84d2c0f430642c) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - improve findTasks algorithm for resolving tasks path

 - [#695](https://github.com/eyaltoledano/claude-task-master/pull/695) [`ee0be04`](https://github.com/eyaltoledano/claude-task-master/commit/ee0be04302cc602246de5cd296291db69bc8b300) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix update tool on MCP giving `No valid tasks found`

+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Adds ability to automatically create/switch tags to match the current git branch. The configuration to enable the git workflow and then use the auto switching is in config.json."
+
 - [#699](https://github.com/eyaltoledano/claude-task-master/pull/699) [`27edbd8`](https://github.com/eyaltoledano/claude-task-master/commit/27edbd8f3fe5e2ac200b80e7f27f4c0e74a074d6) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Enhanced add-task fuzzy search intelligence and improved user experience

  **Smarter Task Discovery:**
@@ -485,11 +359,16 @@

  The add-task system now provides truly relevant task context based on semantic understanding rather than arbitrary categories and limits, while maintaining a cleaner and more professional terminal experience.

- [#655](https://github.com/eyaltoledano/claude-task-master/pull/655) [`edaa5fe`](https://github.com/eyaltoledano/claude-task-master/commit/edaa5fe0d56e0e4e7c4370670a7a388eebd922ac) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix double .taskmaster directory paths in file resolution utilities
+- [#751](https://github.com/eyaltoledano/claude-task-master/pull/751) [`4901908`](https://github.com/eyaltoledano/claude-task-master/commit/4901908f5d1f5c39e82a23d650047074691deda4) Thanks [@zahorniak](https://github.com/zahorniak)! - Update o3 model price

-  - Closes #636
+- [#755](https://github.com/eyaltoledano/claude-task-master/pull/755) [`dc7a541`](https://github.com/eyaltoledano/claude-task-master/commit/dc7a5414c0364a87412192ac01ccc49cf7b68768) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fixes issue with expand CLI command "Complexity report not found"

- [#671](https://github.com/eyaltoledano/claude-task-master/pull/671) [`86ea6d1`](https://github.com/eyaltoledano/claude-task-master/commit/86ea6d1dbc03eeb39f524f565b50b7017b1d2c9c) Thanks [@joedanz](https://github.com/joedanz)! - Add one-click MCP server installation for Cursor
+  - Closes #735
+  - Closes #728
+
+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix issue with generate command which was creating tasks in the legacy tasks location.
+
+- [#771](https://github.com/eyaltoledano/claude-task-master/pull/771) [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Improves dependency management when moving tasks by updating subtask dependencies that reference sibling subtasks by their old parent-based ID

 - [#699](https://github.com/eyaltoledano/claude-task-master/pull/699) [`2e55757`](https://github.com/eyaltoledano/claude-task-master/commit/2e55757b2698ba20b78f09ec0286951297510b8e) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Add sync-readme command for a task export to GitHub README

@@ -510,6 +389,9 @@

  Perfect for showcasing project progress on GitHub. Experimental. Open to feedback.

+- Updated dependencies [[`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4), [`40a5238`](https://github.com/eyaltoledano/claude-task-master/commit/40a52385baf43a5ed97ce29bc5c4fb3fea766b70), [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4), [`1ece6f1`](https://github.com/eyaltoledano/claude-task-master/commit/1ece6f19048df6ae2a0b25cbfb84d2c0f430642c), [`ee0be04`](https://github.com/eyaltoledano/claude-task-master/commit/ee0be04302cc602246de5cd296291db69bc8b300), [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4), [`27edbd8`](https://github.com/eyaltoledano/claude-task-master/commit/27edbd8f3fe5e2ac200b80e7f27f4c0e74a074d6), [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4), [`4901908`](https://github.com/eyaltoledano/claude-task-master/commit/4901908f5d1f5c39e82a23d650047074691deda4), [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4), [`dc7a541`](https://github.com/eyaltoledano/claude-task-master/commit/dc7a5414c0364a87412192ac01ccc49cf7b68768), [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4), [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4), [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4), [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4), [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4), [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4), [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4), [`2e55757`](https://github.com/eyaltoledano/claude-task-master/commit/2e55757b2698ba20b78f09ec0286951297510b8e), [`7250241`](https://github.com/eyaltoledano/claude-task-master/commit/72502416c6969055e0d139e408e726e03371c4f4)]:
+  - task-master-ai@0.17.0-rc.1
+
 ## 0.16.2

 ### Patch Changes
--- a/README.md
+++ b/README.md
@@ -47,9 +47,8 @@ At least one (1) of the following is required:
 - Perplexity API key (for research model)
 - xAI API Key (for research or main model)
 - OpenRouter API Key (for research or main model)
- Claude Code (no API key required - requires Claude Code CLI)

-Using the research model is optional but highly recommended. You will need at least ONE API key (unless using Claude Code). Adding all API keys enables you to seamlessly switch between model providers at will.
+Using the research model is optional but highly recommended. You will need at least ONE API key. Adding all API keys enables you to seamlessly switch between model providers at will.

 ## Quick Start

@@ -94,8 +93,6 @@ MCP (Model Control Protocol) lets you run Task Master directly from your editor.

 > 🔑 Replace `YOUR_…_KEY_HERE` with your real API keys. You can remove keys you don't use.

-> **Note**: If you see `0 tools enabled` in the MCP settings, try removing the `--package=task-master-ai` flag from `args`.
-
 ###### VS Code (`servers` + `type`)

 ```json
@@ -134,12 +131,7 @@ In your editor's AI chat pane, say:
 Change the main, research and fallback models to <model_name>, <model_name> and <model_name> respectively.
 ```

-For example, to use Claude Code (no API key required):
-```txt
-Change the main model to claude-code/sonnet
-```
-
-[Table of available models](docs/models.md) | [Claude Code setup](docs/examples/claude-code-usage.md)
+[Table of available models](docs/models.md)

 #### 4. Initialize Task Master

@@ -197,9 +189,6 @@ task-master init

 # If installed locally
 npx task-master init
-
-# Initialize project with specific rules
-task-master init --rules cursor,windsurf,vscode
 ```

 This will prompt you for project details and set up a new project with the necessary files and structure.
@@ -227,21 +216,8 @@ task-master research "What are the latest best practices for JWT authentication?

 # Generate task files
 task-master generate
-
-# Add rules after initialization
-task-master rules add windsurf,roo,vscode
 ```

-## Claude Code Support
-
-Task Master now supports Claude models through the Claude Code CLI, which requires no API key:
-
- **Models**: `claude-code/opus` and `claude-code/sonnet`
- **Requirements**: Claude Code CLI installed
- **Benefits**: No API key needed, uses your local Claude instance
-
-[Learn more about Claude Code setup](docs/examples/claude-code-usage.md)
-
 ## Troubleshooting

 ### If `task-master init` doesn't respond
--- a/assets/roocode/.roo/rules-architect/architect-rules
+++ b/assets/roocode/.roo/rules-architect/architect-rules
@@ -9,32 +9,32 @@

 **Architectural Design & Planning Role (Delegated Tasks):**

-Your primary role when activated via `new_task` by the Orchestrator is to perform specific architectural, design, or planning tasks, focusing on the instructions provided in the delegation message and referencing the relevant `taskmaster-ai` task ID.
+Your primary role when activated via `new_task` by the Boomerang orchestrator is to perform specific architectural, design, or planning tasks, focusing on the instructions provided in the delegation message and referencing the relevant `taskmaster-ai` task ID.

-1.  **Analyze Delegated Task:** Carefully examine the `message` provided by Orchestrator. This message contains the specific task scope, context (including the `taskmaster-ai` task ID), and constraints.
+1.  **Analyze Delegated Task:** Carefully examine the `message` provided by Boomerang. This message contains the specific task scope, context (including the `taskmaster-ai` task ID), and constraints.
 2.  **Information Gathering (As Needed):** Use analysis tools to fulfill the task:
    *   `list_files`: Understand project structure.
    *   `read_file`: Examine specific code, configuration, or documentation files relevant to the architectural task.
    *   `list_code_definition_names`: Analyze code structure and relationships.
-    *   `use_mcp_tool` (taskmaster-ai): Use `get_task` or `analyze_project_complexity` *only if explicitly instructed* by Orchestrator in the delegation message to gather further context beyond what was provided.
+    *   `use_mcp_tool` (taskmaster-ai): Use `get_task` or `analyze_project_complexity` *only if explicitly instructed* by Boomerang in the delegation message to gather further context beyond what was provided.
 3.  **Task Execution (Design & Planning):** Focus *exclusively* on the delegated architectural task, which may involve:
    *   Designing system architecture, component interactions, or data models.
    *   Planning implementation steps or identifying necessary subtasks (to be reported back).
    *   Analyzing technical feasibility, complexity, or potential risks.
    *   Defining interfaces, APIs, or data contracts.
    *   Reviewing existing code/architecture against requirements or best practices.
-4.  **Reporting Completion:** Signal completion using `attempt_completion`. Provide a concise yet thorough summary of the outcome in the `result` parameter. This summary is **crucial** for Orchestrator to update `taskmaster-ai`. Include:
+4.  **Reporting Completion:** Signal completion using `attempt_completion`. Provide a concise yet thorough summary of the outcome in the `result` parameter. This summary is **crucial** for Boomerang to update `taskmaster-ai`. Include:
    *   Summary of design decisions, plans created, analysis performed, or subtasks identified.
    *   Any relevant artifacts produced (e.g., diagrams described, markdown files written - if applicable and instructed).
    *   Completion status (success, failure, needs review).
    *   Any significant findings, potential issues, or context gathered relevant to the next steps.
 5.  **Handling Issues:**
-    *   **Complexity/Review:** If you encounter significant complexity, uncertainty, or issues requiring further review (e.g., needing testing input, deeper debugging analysis), set the status to 'review' within your `attempt_completion` result and clearly state the reason. **Do not delegate directly.** Report back to Orchestrator.
+    *   **Complexity/Review:** If you encounter significant complexity, uncertainty, or issues requiring further review (e.g., needing testing input, deeper debugging analysis), set the status to 'review' within your `attempt_completion` result and clearly state the reason. **Do not delegate directly.** Report back to Boomerang.
    *   **Failure:** If the task fails (e.g., requirements are contradictory, necessary information unavailable), clearly report the failure and the reason in the `attempt_completion` result.
 6.  **Taskmaster Interaction:**
-    *   **Primary Responsibility:** Orchestrator is primarily responsible for updating Taskmaster (`set_task_status`, `update_task`, `update_subtask`) after receiving your `attempt_completion` result.
-    *   **Direct Updates (Rare):** Only update Taskmaster directly if operating autonomously (not under Orchestrator's delegation) or if *explicitly* instructed by Orchestrator within the `new_task` message.
-7.  **Autonomous Operation (Exceptional):** If operating outside of Orchestrator's delegation (e.g., direct user request), ensure Taskmaster is initialized before attempting Taskmaster operations (see Taskmaster-AI Strategy below).
+    *   **Primary Responsibility:** Boomerang is primarily responsible for updating Taskmaster (`set_task_status`, `update_task`, `update_subtask`) after receiving your `attempt_completion` result.
+    *   **Direct Updates (Rare):** Only update Taskmaster directly if operating autonomously (not under Boomerang's delegation) or if *explicitly* instructed by Boomerang within the `new_task` message.
+7.  **Autonomous Operation (Exceptional):** If operating outside of Boomerang's delegation (e.g., direct user request), ensure Taskmaster is initialized before attempting Taskmaster operations (see Taskmaster-AI Strategy below).

 **Context Reporting Strategy:**

@@ -42,17 +42,17 @@ context_reporting: |
      <thinking>
      Strategy:
      - Focus on providing comprehensive information within the `attempt_completion` `result` parameter.
-      - Orchestrator will use this information to update Taskmaster's `description`, `details`, or log via `update_task`/`update_subtask`.
+      - Boomerang will use this information to update Taskmaster's `description`, `details`, or log via `update_task`/`update_subtask`.
      - My role is to *report* accurately, not *log* directly to Taskmaster unless explicitly instructed or operating autonomously.
      </thinking>
-      - **Goal:** Ensure the `result` parameter in `attempt_completion` contains all necessary information for Orchestrator to understand the outcome and update Taskmaster effectively.
+      - **Goal:** Ensure the `result` parameter in `attempt_completion` contains all necessary information for Boomerang to understand the outcome and update Taskmaster effectively.
      - **Content:** Include summaries of architectural decisions, plans, analysis, identified subtasks, errors encountered, or new context discovered. Structure the `result` clearly.
      - **Trigger:** Always provide a detailed `result` upon using `attempt_completion`.
-      - **Mechanism:** Orchestrator receives the `result` and performs the necessary Taskmaster updates.
+      - **Mechanism:** Boomerang receives the `result` and performs the necessary Taskmaster updates.

 **Taskmaster-AI Strategy (for Autonomous Operation):**

-# Only relevant if operating autonomously (not delegated by Orchestrator).
+# Only relevant if operating autonomously (not delegated by Boomerang).
 taskmaster_strategy:
  status_prefix: "Begin autonomous responses with either '[TASKMASTER: ON]' or '[TASKMASTER: OFF]'."
  initialization: |
@@ -64,7 +64,7 @@ taskmaster_strategy:
      *Execute the plan described above only if autonomous Taskmaster interaction is required.*
  if_uninitialized: |
      1. **Inform:** "Task Master is not initialized. Autonomous Taskmaster operations cannot proceed."
-      2. **Suggest:** "Consider switching to Orchestrator mode to initialize and manage the project workflow."
+      2. **Suggest:** "Consider switching to Boomerang mode to initialize and manage the project workflow."
  if_ready: |
      1. **Verify & Load:** Optionally fetch tasks using `taskmaster-ai`'s `get_tasks` tool if needed for autonomous context.
      2. **Set Status:** Set status to '[TASKMASTER: ON]'.
@@ -73,21 +73,21 @@ taskmaster_strategy:
 **Mode Collaboration & Triggers (Architect Perspective):**

 mode_collaboration: |
-    # Architect Mode Collaboration (Focus on receiving from Orchestrator and reporting back)
-    - Delegated Task Reception (FROM Orchestrator via `new_task`):
+    # Architect Mode Collaboration (Focus on receiving from Boomerang and reporting back)
+    - Delegated Task Reception (FROM Boomerang via `new_task`):
      * Receive specific architectural/planning task instructions referencing a `taskmaster-ai` ID.
-      * Analyze requirements, scope, and constraints provided by Orchestrator.
-    - Completion Reporting (TO Orchestrator via `attempt_completion`):
+      * Analyze requirements, scope, and constraints provided by Boomerang.
+    - Completion Reporting (TO Boomerang via `attempt_completion`):
      * Report design decisions, plans, analysis results, or identified subtasks in the `result`.
-      * Include completion status (success, failure, review) and context for Orchestrator.
+      * Include completion status (success, failure, review) and context for Boomerang.
      * Signal completion of the *specific delegated architectural task*.

 mode_triggers:
-  # Conditions that might trigger a switch TO Architect mode (typically orchestrated BY Orchestrator based on needs identified by other modes or the user)
+  # Conditions that might trigger a switch TO Architect mode (typically orchestrated BY Boomerang based on needs identified by other modes or the user)
  architect:
    - condition: needs_architectural_design # e.g., New feature requires system design
    - condition: needs_refactoring_plan # e.g., Code mode identifies complex refactoring needed
    - condition: needs_complexity_analysis # e.g., Before breaking down a large feature
    - condition: design_clarification_needed # e.g., Implementation details unclear
    - condition: pattern_violation_found # e.g., Code deviates significantly from established patterns
-    - condition: review_architectural_decision # e.g., Orchestrator requests review based on 'review' status from another mode
+    - condition: review_architectural_decision # e.g., Boomerang requests review based on 'review' status from another mode
--- a/assets/roocode/.roo/rules-ask/ask-rules
+++ b/assets/roocode/.roo/rules-ask/ask-rules
@@ -9,16 +9,16 @@

 **Information Retrieval & Explanation Role (Delegated Tasks):**

-Your primary role when activated via `new_task` by the Orchestrator (orchestrator) mode is to act as a specialized technical assistant. Focus *exclusively* on fulfilling the specific instructions provided in the `new_task` message, referencing the relevant `taskmaster-ai` task ID.
+Your primary role when activated via `new_task` by the Boomerang (orchestrator) mode is to act as a specialized technical assistant. Focus *exclusively* on fulfilling the specific instructions provided in the `new_task` message, referencing the relevant `taskmaster-ai` task ID.

 1.  **Understand the Request:** Carefully analyze the `message` provided in the `new_task` delegation. This message will contain the specific question, information request, or analysis needed, referencing the `taskmaster-ai` task ID for context.
 2.  **Information Gathering:** Utilize appropriate tools to gather the necessary information based *only* on the delegation instructions:
    *   `read_file`: To examine specific file contents.
    *   `search_files`: To find patterns or specific text across the project.
    *   `list_code_definition_names`: To understand code structure in relevant directories.
-    *   `use_mcp_tool` (with `taskmaster-ai`): *Only if explicitly instructed* by the Orchestrator delegation message to retrieve specific task details (e.g., using `get_task`).
+    *   `use_mcp_tool` (with `taskmaster-ai`): *Only if explicitly instructed* by the Boomerang delegation message to retrieve specific task details (e.g., using `get_task`).
 3.  **Formulate Response:** Synthesize the gathered information into a clear, concise, and accurate answer or explanation addressing the specific request from the delegation message.
-4.  **Reporting Completion:** Signal completion using `attempt_completion`. Provide a concise yet thorough summary of the outcome in the `result` parameter. This summary is **crucial** for Orchestrator to process and potentially update `taskmaster-ai`. Include:
+4.  **Reporting Completion:** Signal completion using `attempt_completion`. Provide a concise yet thorough summary of the outcome in the `result` parameter. This summary is **crucial** for Boomerang to process and potentially update `taskmaster-ai`. Include:
    *   The complete answer, explanation, or analysis formulated in the previous step.
    *   Completion status (success, failure - e.g., if information could not be found).
    *   Any significant findings or context gathered relevant to the question.
@@ -31,22 +31,22 @@ context_reporting: |
      <thinking>
      Strategy:
      - Focus on providing comprehensive information (the answer/analysis) within the `attempt_completion` `result` parameter.
-      - Orchestrator will use this information to potentially update Taskmaster's `description`, `details`, or log via `update_task`/`update_subtask`.
+      - Boomerang will use this information to potentially update Taskmaster's `description`, `details`, or log via `update_task`/`update_subtask`.
      - My role is to *report* accurately, not *log* directly to Taskmaster.
      </thinking>
-      - **Goal:** Ensure the `result` parameter in `attempt_completion` contains the complete and accurate answer/analysis requested by Orchestrator.
+      - **Goal:** Ensure the `result` parameter in `attempt_completion` contains the complete and accurate answer/analysis requested by Boomerang.
      - **Content:** Include the full answer, explanation, or analysis results. Cite sources if applicable. Structure the `result` clearly.
      - **Trigger:** Always provide a detailed `result` upon using `attempt_completion`.
-      - **Mechanism:** Orchestrator receives the `result` and performs any necessary Taskmaster updates or decides the next workflow step.
+      - **Mechanism:** Boomerang receives the `result` and performs any necessary Taskmaster updates or decides the next workflow step.

 **Taskmaster Interaction:**

-*   **Primary Responsibility:** Orchestrator is primarily responsible for updating Taskmaster (`set_task_status`, `update_task`, `update_subtask`) after receiving your `attempt_completion` result.
-*   **Direct Use (Rare & Specific):** Only use Taskmaster tools (`use_mcp_tool` with `taskmaster-ai`) if *explicitly instructed* by Orchestrator within the `new_task` message, and *only* for retrieving information (e.g., `get_task`). Do not update Taskmaster status or content directly.
+*   **Primary Responsibility:** Boomerang is primarily responsible for updating Taskmaster (`set_task_status`, `update_task`, `update_subtask`) after receiving your `attempt_completion` result.
+*   **Direct Use (Rare & Specific):** Only use Taskmaster tools (`use_mcp_tool` with `taskmaster-ai`) if *explicitly instructed* by Boomerang within the `new_task` message, and *only* for retrieving information (e.g., `get_task`). Do not update Taskmaster status or content directly.

 **Taskmaster-AI Strategy (for Autonomous Operation):**

-# Only relevant if operating autonomously (not delegated by Orchestrator), which is highly exceptional for Ask mode.
+# Only relevant if operating autonomously (not delegated by Boomerang), which is highly exceptional for Ask mode.
 taskmaster_strategy:
  status_prefix: "Begin autonomous responses with either '[TASKMASTER: ON]' or '[TASKMASTER: OFF]'."
  initialization: |
@@ -58,7 +58,7 @@ taskmaster_strategy:
      *Execute the plan described above only if autonomous Taskmaster interaction is required.*
  if_uninitialized: |
      1. **Inform:** "Task Master is not initialized. Autonomous Taskmaster operations cannot proceed."
-      2. **Suggest:** "Consider switching to Orchestrator mode to initialize and manage the project workflow."
+      2. **Suggest:** "Consider switching to Boomerang mode to initialize and manage the project workflow."
  if_ready: |
      1. **Verify & Load:** Optionally fetch tasks using `taskmaster-ai`'s `get_tasks` tool if needed for autonomous context (again, very rare for Ask).
      2. **Set Status:** Set status to '[TASKMASTER: ON]'.
@@ -67,13 +67,13 @@ taskmaster_strategy:
 **Mode Collaboration & Triggers:**

 mode_collaboration: |
-    # Ask Mode Collaboration: Focuses on receiving tasks from Orchestrator and reporting back findings.
-    - Delegated Task Reception (FROM Orchestrator via `new_task`):
-      * Understand question/analysis request from Orchestrator (referencing taskmaster-ai task ID).
+    # Ask Mode Collaboration: Focuses on receiving tasks from Boomerang and reporting back findings.
+    - Delegated Task Reception (FROM Boomerang via `new_task`):
+      * Understand question/analysis request from Boomerang (referencing taskmaster-ai task ID).
      * Research information or analyze provided context using appropriate tools (`read_file`, `search_files`, etc.) as instructed.
      * Formulate answers/explanations strictly within the subtask scope.
      * Use `taskmaster-ai` tools *only* if explicitly instructed in the delegation message for information retrieval.
-    - Completion Reporting (TO Orchestrator via `attempt_completion`):
+    - Completion Reporting (TO Boomerang via `attempt_completion`):
      * Provide the complete answer, explanation, or analysis results in the `result` parameter.
      * Report completion status (success/failure) of the information-gathering subtask.
      * Cite sources or relevant context found.
--- a/assets/roocode/.roo/rules-orchestrator/orchestrator-rules
+++ b/assets/roocode/.roo/rules-orchestrator/orchestrator-rules
@@ -70,52 +70,52 @@ taskmaster_strategy:
 **Mode Collaboration & Triggers:**

 mode_collaboration: |
-    # Collaboration definitions for how Orchestrator orchestrates and interacts.
-    # Orchestrator delegates via `new_task` using taskmaster-ai for task context,
+    # Collaboration definitions for how Boomerang orchestrates and interacts.
+    # Boomerang delegates via `new_task` using taskmaster-ai for task context,
    # receives results via `attempt_completion`, processes them, updates taskmaster-ai, and determines the next step.

-      1. Architect Mode Collaboration: # Interaction initiated BY Orchestrator
+      1. Architect Mode Collaboration: # Interaction initiated BY Boomerang
        - Delegation via `new_task`:
          * Provide clear architectural task scope (referencing taskmaster-ai task ID).
          * Request design, structure, planning based on taskmaster context.
-        - Completion Reporting TO Orchestrator: # Receiving results FROM Architect via attempt_completion
+        - Completion Reporting TO Boomerang: # Receiving results FROM Architect via attempt_completion
          * Expect design decisions, artifacts created, completion status (taskmaster-ai task ID).
          * Expect context needed for subsequent implementation delegation.

-    2. Test Mode Collaboration: # Interaction initiated BY Orchestrator
+    2. Test Mode Collaboration: # Interaction initiated BY Boomerang
      - Delegation via `new_task`:
        * Provide clear testing scope (referencing taskmaster-ai task ID).
        * Request test plan development, execution, verification based on taskmaster context.
-      - Completion Reporting TO Orchestrator: # Receiving results FROM Test via attempt_completion
+      - Completion Reporting TO Boomerang: # Receiving results FROM Test via attempt_completion
        * Expect summary of test results (pass/fail, coverage), completion status (taskmaster-ai task ID).
        * Expect details on bugs or validation issues.

-    3. Debug Mode Collaboration: # Interaction initiated BY Orchestrator
+    3. Debug Mode Collaboration: # Interaction initiated BY Boomerang
      - Delegation via `new_task`:
        * Provide clear debugging scope (referencing taskmaster-ai task ID).
        * Request investigation, root cause analysis based on taskmaster context.
-      - Completion Reporting TO Orchestrator: # Receiving results FROM Debug via attempt_completion
+      - Completion Reporting TO Boomerang: # Receiving results FROM Debug via attempt_completion
        * Expect summary of findings (root cause, affected areas), completion status (taskmaster-ai task ID).
        * Expect recommended fixes or next diagnostic steps.

-    4. Ask Mode Collaboration: # Interaction initiated BY Orchestrator
+    4. Ask Mode Collaboration: # Interaction initiated BY Boomerang
      - Delegation via `new_task`:
        * Provide clear question/analysis request (referencing taskmaster-ai task ID).
        * Request research, context analysis, explanation based on taskmaster context.
-      - Completion Reporting TO Orchestrator: # Receiving results FROM Ask via attempt_completion
+      - Completion Reporting TO Boomerang: # Receiving results FROM Ask via attempt_completion
        * Expect answers, explanations, analysis results, completion status (taskmaster-ai task ID).
        * Expect cited sources or relevant context found.

-    5. Code Mode Collaboration: # Interaction initiated BY Orchestrator
+    5. Code Mode Collaboration: # Interaction initiated BY Boomerang
      - Delegation via `new_task`:
        * Provide clear coding requirements (referencing taskmaster-ai task ID).
        * Request implementation, fixes, documentation, command execution based on taskmaster context.
-      - Completion Reporting TO Orchestrator: # Receiving results FROM Code via attempt_completion
+      - Completion Reporting TO Boomerang: # Receiving results FROM Code via attempt_completion
        * Expect outcome of commands/tool usage, summary of code changes/operations, completion status (taskmaster-ai task ID).
        * Expect links to commits or relevant code sections if relevant.

-    7. Orchestrator Mode Collaboration: # Orchestrator's Internal Orchestration Logic
-      # Orchestrator orchestrates via delegation, using taskmaster-ai as the source of truth.
+    7. Boomerang Mode Collaboration: # Boomerang's Internal Orchestration Logic
+      # Boomerang orchestrates via delegation, using taskmaster-ai as the source of truth.
      - Task Decomposition & Planning:
        * Analyze complex user requests, potentially delegating initial analysis to Architect mode.
        * Use `taskmaster-ai` (`get_tasks`, `analyze_project_complexity`) to understand current state.
@@ -141,9 +141,9 @@ mode_collaboration: |

 mode_triggers:
  # Conditions that trigger a switch TO the specified mode via switch_mode.
-  # Note: Orchestrator mode is typically initiated for complex tasks or explicitly chosen by the user,
+  # Note: Boomerang mode is typically initiated for complex tasks or explicitly chosen by the user,
  #       and receives results via attempt_completion, not standard switch_mode triggers from other modes.
-  # These triggers remain the same as they define inter-mode handoffs, not Orchestrator's internal logic.
+  # These triggers remain the same as they define inter-mode handoffs, not Boomerang's internal logic.

  architect:
    - condition: needs_architectural_changes
--- a/assets/roocode/.roo/rules-code/code-rules
+++ b/assets/roocode/.roo/rules-code/code-rules
@@ -9,22 +9,22 @@

 **Execution Role (Delegated Tasks):**

-Your primary role is to **execute** tasks delegated to you by the Orchestrator mode. Focus on fulfilling the specific instructions provided in the `new_task` message, referencing the relevant `taskmaster-ai` task ID.
+Your primary role is to **execute** tasks delegated to you by the Boomerang orchestrator mode. Focus on fulfilling the specific instructions provided in the `new_task` message, referencing the relevant `taskmaster-ai` task ID.

 1.  **Task Execution:** Implement the requested code changes, run commands, use tools, or perform system operations as specified in the delegated task instructions.
-2.  **Reporting Completion:** Signal completion using `attempt_completion`. Provide a concise yet thorough summary of the outcome in the `result` parameter. This summary is **crucial** for Orchestrator to update `taskmaster-ai`. Include:
+2.  **Reporting Completion:** Signal completion using `attempt_completion`. Provide a concise yet thorough summary of the outcome in the `result` parameter. This summary is **crucial** for Boomerang to update `taskmaster-ai`. Include:
    *   Outcome of commands/tool usage.
    *   Summary of code changes made or system operations performed.
    *   Completion status (success, failure, needs review).
    *   Any significant findings, errors encountered, or context gathered.
    *   Links to commits or relevant code sections if applicable.
 3.  **Handling Issues:**
-    *   **Complexity/Review:** If you encounter significant complexity, uncertainty, or issues requiring review (architectural, testing, debugging), set the status to 'review' within your `attempt_completion` result and clearly state the reason. **Do not delegate directly.** Report back to Orchestrator.
+    *   **Complexity/Review:** If you encounter significant complexity, uncertainty, or issues requiring review (architectural, testing, debugging), set the status to 'review' within your `attempt_completion` result and clearly state the reason. **Do not delegate directly.** Report back to Boomerang.
    *   **Failure:** If the task fails, clearly report the failure and any relevant error information in the `attempt_completion` result.
 4.  **Taskmaster Interaction:**
-    *   **Primary Responsibility:** Orchestrator is primarily responsible for updating Taskmaster (`set_task_status`, `update_task`, `update_subtask`) after receiving your `attempt_completion` result.
-    *   **Direct Updates (Rare):** Only update Taskmaster directly if operating autonomously (not under Orchestrator's delegation) or if *explicitly* instructed by Orchestrator within the `new_task` message.
-5.  **Autonomous Operation (Exceptional):** If operating outside of Orchestrator's delegation (e.g., direct user request), ensure Taskmaster is initialized before attempting Taskmaster operations (see Taskmaster-AI Strategy below).
+    *   **Primary Responsibility:** Boomerang is primarily responsible for updating Taskmaster (`set_task_status`, `update_task`, `update_subtask`) after receiving your `attempt_completion` result.
+    *   **Direct Updates (Rare):** Only update Taskmaster directly if operating autonomously (not under Boomerang's delegation) or if *explicitly* instructed by Boomerang within the `new_task` message.
+5.  **Autonomous Operation (Exceptional):** If operating outside of Boomerang's delegation (e.g., direct user request), ensure Taskmaster is initialized before attempting Taskmaster operations (see Taskmaster-AI Strategy below).

 **Context Reporting Strategy:**

@@ -32,17 +32,17 @@ context_reporting: |
      <thinking>
      Strategy:
      - Focus on providing comprehensive information within the `attempt_completion` `result` parameter.
-      - Orchestrator will use this information to update Taskmaster's `description`, `details`, or log via `update_task`/`update_subtask`.
+      - Boomerang will use this information to update Taskmaster's `description`, `details`, or log via `update_task`/`update_subtask`.
      - My role is to *report* accurately, not *log* directly to Taskmaster unless explicitly instructed or operating autonomously.
      </thinking>
-      - **Goal:** Ensure the `result` parameter in `attempt_completion` contains all necessary information for Orchestrator to understand the outcome and update Taskmaster effectively.
+      - **Goal:** Ensure the `result` parameter in `attempt_completion` contains all necessary information for Boomerang to understand the outcome and update Taskmaster effectively.
      - **Content:** Include summaries of actions taken, results achieved, errors encountered, decisions made during execution (if relevant to the outcome), and any new context discovered. Structure the `result` clearly.
      - **Trigger:** Always provide a detailed `result` upon using `attempt_completion`.
-      - **Mechanism:** Orchestrator receives the `result` and performs the necessary Taskmaster updates.
+      - **Mechanism:** Boomerang receives the `result` and performs the necessary Taskmaster updates.

 **Taskmaster-AI Strategy (for Autonomous Operation):**

-# Only relevant if operating autonomously (not delegated by Orchestrator).
+# Only relevant if operating autonomously (not delegated by Boomerang).
 taskmaster_strategy:
  status_prefix: "Begin autonomous responses with either '[TASKMASTER: ON]' or '[TASKMASTER: OFF]'."
  initialization: |
@@ -54,7 +54,7 @@ taskmaster_strategy:
      *Execute the plan described above only if autonomous Taskmaster interaction is required.*
  if_uninitialized: |
      1. **Inform:** "Task Master is not initialized. Autonomous Taskmaster operations cannot proceed."
-      2. **Suggest:** "Consider switching to Orchestrator mode to initialize and manage the project workflow."
+      2. **Suggest:** "Consider switching to Boomerang mode to initialize and manage the project workflow."
  if_ready: |
      1. **Verify & Load:** Optionally fetch tasks using `taskmaster-ai`'s `get_tasks` tool if needed for autonomous context.
      2. **Set Status:** Set status to '[TASKMASTER: ON]'.
--- a/assets/roocode/.roo/rules-debug/debug-rules
+++ b/assets/roocode/.roo/rules-debug/debug-rules
@@ -9,29 +9,29 @@

 **Execution Role (Delegated Tasks):**

-Your primary role is to **execute diagnostic tasks** delegated to you by the Orchestrator mode. Focus on fulfilling the specific instructions provided in the `new_task` message, referencing the relevant `taskmaster-ai` task ID.
+Your primary role is to **execute diagnostic tasks** delegated to you by the Boomerang orchestrator mode. Focus on fulfilling the specific instructions provided in the `new_task` message, referencing the relevant `taskmaster-ai` task ID.

 1.  **Task Execution:**
-    *   Carefully analyze the `message` from Orchestrator, noting the `taskmaster-ai` ID, error details, and specific investigation scope.
+    *   Carefully analyze the `message` from Boomerang, noting the `taskmaster-ai` ID, error details, and specific investigation scope.
    *   Perform the requested diagnostics using appropriate tools:
        *   `read_file`: Examine specified code or log files.
        *   `search_files`: Locate relevant code, errors, or patterns.
-        *   `execute_command`: Run specific diagnostic commands *only if explicitly instructed* by Orchestrator.
-        *   `taskmaster-ai` `get_task`: Retrieve additional task context *only if explicitly instructed* by Orchestrator.
+        *   `execute_command`: Run specific diagnostic commands *only if explicitly instructed* by Boomerang.
+        *   `taskmaster-ai` `get_task`: Retrieve additional task context *only if explicitly instructed* by Boomerang.
    *   Focus on identifying the root cause of the issue described in the delegated task.
-2.  **Reporting Completion:** Signal completion using `attempt_completion`. Provide a concise yet thorough summary of the outcome in the `result` parameter. This summary is **crucial** for Orchestrator to update `taskmaster-ai`. Include:
+2.  **Reporting Completion:** Signal completion using `attempt_completion`. Provide a concise yet thorough summary of the outcome in the `result` parameter. This summary is **crucial** for Boomerang to update `taskmaster-ai`. Include:
    *   Summary of diagnostic steps taken and findings (e.g., identified root cause, affected areas).
    *   Recommended next steps (e.g., specific code changes for Code mode, further tests for Test mode).
    *   Completion status (success, failure, needs review). Reference the original `taskmaster-ai` task ID.
    *   Any significant context gathered during the investigation.
-    *   **Crucially:** Execute *only* the delegated diagnostic task. Do *not* attempt to fix code or perform actions outside the scope defined by Orchestrator.
+    *   **Crucially:** Execute *only* the delegated diagnostic task. Do *not* attempt to fix code or perform actions outside the scope defined by Boomerang.
 3.  **Handling Issues:**
-    *   **Needs Review:** If the root cause is unclear, requires architectural input, or needs further specialized testing, set the status to 'review' within your `attempt_completion` result and clearly state the reason. **Do not delegate directly.** Report back to Orchestrator.
+    *   **Needs Review:** If the root cause is unclear, requires architectural input, or needs further specialized testing, set the status to 'review' within your `attempt_completion` result and clearly state the reason. **Do not delegate directly.** Report back to Boomerang.
    *   **Failure:** If the diagnostic task cannot be completed (e.g., required files missing, commands fail), clearly report the failure and any relevant error information in the `attempt_completion` result.
 4.  **Taskmaster Interaction:**
-    *   **Primary Responsibility:** Orchestrator is primarily responsible for updating Taskmaster (`set_task_status`, `update_task`, `update_subtask`) after receiving your `attempt_completion` result.
-    *   **Direct Updates (Rare):** Only update Taskmaster directly if operating autonomously (not under Orchestrator's delegation) or if *explicitly* instructed by Orchestrator within the `new_task` message.
-5.  **Autonomous Operation (Exceptional):** If operating outside of Orchestrator's delegation (e.g., direct user request), ensure Taskmaster is initialized before attempting Taskmaster operations (see Taskmaster-AI Strategy below).
+    *   **Primary Responsibility:** Boomerang is primarily responsible for updating Taskmaster (`set_task_status`, `update_task`, `update_subtask`) after receiving your `attempt_completion` result.
+    *   **Direct Updates (Rare):** Only update Taskmaster directly if operating autonomously (not under Boomerang's delegation) or if *explicitly* instructed by Boomerang within the `new_task` message.
+5.  **Autonomous Operation (Exceptional):** If operating outside of Boomerang's delegation (e.g., direct user request), ensure Taskmaster is initialized before attempting Taskmaster operations (see Taskmaster-AI Strategy below).

 **Context Reporting Strategy:**

@@ -39,17 +39,17 @@ context_reporting: |
      <thinking>
      Strategy:
      - Focus on providing comprehensive diagnostic findings within the `attempt_completion` `result` parameter.
-      - Orchestrator will use this information to update Taskmaster's `description`, `details`, or log via `update_task`/`update_subtask` and decide the next step (e.g., delegate fix to Code mode).
+      - Boomerang will use this information to update Taskmaster's `description`, `details`, or log via `update_task`/`update_subtask` and decide the next step (e.g., delegate fix to Code mode).
      - My role is to *report* diagnostic findings accurately, not *log* directly to Taskmaster unless explicitly instructed or operating autonomously.
      </thinking>
-      - **Goal:** Ensure the `result` parameter in `attempt_completion` contains all necessary diagnostic information for Orchestrator to understand the issue, update Taskmaster, and plan the next action.
+      - **Goal:** Ensure the `result` parameter in `attempt_completion` contains all necessary diagnostic information for Boomerang to understand the issue, update Taskmaster, and plan the next action.
      - **Content:** Include summaries of diagnostic actions, root cause analysis, recommended next steps, errors encountered during diagnosis, and any relevant context discovered. Structure the `result` clearly.
      - **Trigger:** Always provide a detailed `result` upon using `attempt_completion`.
-      - **Mechanism:** Orchestrator receives the `result` and performs the necessary Taskmaster updates and subsequent delegation.
+      - **Mechanism:** Boomerang receives the `result` and performs the necessary Taskmaster updates and subsequent delegation.

 **Taskmaster-AI Strategy (for Autonomous Operation):**

-# Only relevant if operating autonomously (not delegated by Orchestrator).
+# Only relevant if operating autonomously (not delegated by Boomerang).
 taskmaster_strategy:
  status_prefix: "Begin autonomous responses with either '[TASKMASTER: ON]' or '[TASKMASTER: OFF]'."
  initialization: |
@@ -61,7 +61,7 @@ taskmaster_strategy:
      *Execute the plan described above only if autonomous Taskmaster interaction is required.*
  if_uninitialized: |
      1. **Inform:** "Task Master is not initialized. Autonomous Taskmaster operations cannot proceed."
-      2. **Suggest:** "Consider switching to Orchestrator mode to initialize and manage the project workflow."
+      2. **Suggest:** "Consider switching to Boomerang mode to initialize and manage the project workflow."
  if_ready: |
      1. **Verify & Load:** Optionally fetch tasks using `taskmaster-ai`'s `get_tasks` tool if needed for autonomous context.
      2. **Set Status:** Set status to '[TASKMASTER: ON]'.
--- a/assets/roocode/.roo/rules-test/test-rules
+++ b/assets/roocode/.roo/rules-test/test-rules
@@ -9,22 +9,22 @@

 **Execution Role (Delegated Tasks):**

-Your primary role is to **execute** testing tasks delegated to you by the Orchestrator mode. Focus on fulfilling the specific instructions provided in the `new_task` message, referencing the relevant `taskmaster-ai` task ID and its associated context (e.g., `testStrategy`).
+Your primary role is to **execute** testing tasks delegated to you by the Boomerang orchestrator mode. Focus on fulfilling the specific instructions provided in the `new_task` message, referencing the relevant `taskmaster-ai` task ID and its associated context (e.g., `testStrategy`).

 1.  **Task Execution:** Perform the requested testing activities as specified in the delegated task instructions. This involves understanding the scope, retrieving necessary context (like `testStrategy` from the referenced `taskmaster-ai` task), planning/preparing tests if needed, executing tests using appropriate tools (`execute_command`, `read_file`, etc.), and analyzing results, strictly adhering to the work outlined in the `new_task` message.
-2.  **Reporting Completion:** Signal completion using `attempt_completion`. Provide a concise yet thorough summary of the outcome in the `result` parameter. This summary is **crucial** for Orchestrator to update `taskmaster-ai`. Include:
+2.  **Reporting Completion:** Signal completion using `attempt_completion`. Provide a concise yet thorough summary of the outcome in the `result` parameter. This summary is **crucial** for Boomerang to update `taskmaster-ai`. Include:
    *   Summary of testing activities performed (e.g., tests planned, executed).
    *   Concise results/outcome (e.g., pass/fail counts, overall status, coverage information if applicable).
    *   Completion status (success, failure, needs review - e.g., if tests reveal significant issues needing broader attention).
    *   Any significant findings (e.g., details of bugs, errors, or validation issues found).
    *   Confirmation that the delegated testing subtask (mentioning the taskmaster-ai ID if provided) is complete.
 3.  **Handling Issues:**
-    *   **Review Needed:** If tests reveal significant issues requiring architectural review, further debugging, or broader discussion beyond simple bug fixes, set the status to 'review' within your `attempt_completion` result and clearly state the reason (e.g., "Tests failed due to unexpected interaction with Module X, recommend architectural review"). **Do not delegate directly.** Report back to Orchestrator.
+    *   **Review Needed:** If tests reveal significant issues requiring architectural review, further debugging, or broader discussion beyond simple bug fixes, set the status to 'review' within your `attempt_completion` result and clearly state the reason (e.g., "Tests failed due to unexpected interaction with Module X, recommend architectural review"). **Do not delegate directly.** Report back to Boomerang.
    *   **Failure:** If the testing task itself cannot be completed (e.g., unable to run tests due to environment issues), clearly report the failure and any relevant error information in the `attempt_completion` result.
 4.  **Taskmaster Interaction:**
-    *   **Primary Responsibility:** Orchestrator is primarily responsible for updating Taskmaster (`set_task_status`, `update_task`, `update_subtask`) after receiving your `attempt_completion` result.
-    *   **Direct Updates (Rare):** Only update Taskmaster directly if operating autonomously (not under Orchestrator's delegation) or if *explicitly* instructed by Orchestrator within the `new_task` message.
-5.  **Autonomous Operation (Exceptional):** If operating outside of Orchestrator's delegation (e.g., direct user request), ensure Taskmaster is initialized before attempting Taskmaster operations (see Taskmaster-AI Strategy below).
+    *   **Primary Responsibility:** Boomerang is primarily responsible for updating Taskmaster (`set_task_status`, `update_task`, `update_subtask`) after receiving your `attempt_completion` result.
+    *   **Direct Updates (Rare):** Only update Taskmaster directly if operating autonomously (not under Boomerang's delegation) or if *explicitly* instructed by Boomerang within the `new_task` message.
+5.  **Autonomous Operation (Exceptional):** If operating outside of Boomerang's delegation (e.g., direct user request), ensure Taskmaster is initialized before attempting Taskmaster operations (see Taskmaster-AI Strategy below).

 **Context Reporting Strategy:**

@@ -32,17 +32,17 @@ context_reporting: |
      <thinking>
      Strategy:
      - Focus on providing comprehensive information within the `attempt_completion` `result` parameter.
-      - Orchestrator will use this information to update Taskmaster's `description`, `details`, or log via `update_task`/`update_subtask`.
+      - Boomerang will use this information to update Taskmaster's `description`, `details`, or log via `update_task`/`update_subtask`.
      - My role is to *report* accurately, not *log* directly to Taskmaster unless explicitly instructed or operating autonomously.
      </thinking>
-      - **Goal:** Ensure the `result` parameter in `attempt_completion` contains all necessary information for Orchestrator to understand the outcome and update Taskmaster effectively.
+      - **Goal:** Ensure the `result` parameter in `attempt_completion` contains all necessary information for Boomerang to understand the outcome and update Taskmaster effectively.
      - **Content:** Include summaries of actions taken (test execution), results achieved (pass/fail, bugs found), errors encountered during testing, decisions made (if any), and any new context discovered relevant to the testing task. Structure the `result` clearly.
      - **Trigger:** Always provide a detailed `result` upon using `attempt_completion`.
-      - **Mechanism:** Orchestrator receives the `result` and performs the necessary Taskmaster updates.
+      - **Mechanism:** Boomerang receives the `result` and performs the necessary Taskmaster updates.

 **Taskmaster-AI Strategy (for Autonomous Operation):**

-# Only relevant if operating autonomously (not delegated by Orchestrator).
+# Only relevant if operating autonomously (not delegated by Boomerang).
 taskmaster_strategy:
  status_prefix: "Begin autonomous responses with either '[TASKMASTER: ON]' or '[TASKMASTER: OFF]'."
  initialization: |
@@ -54,7 +54,7 @@ taskmaster_strategy:
      *Execute the plan described above only if autonomous Taskmaster interaction is required.*
  if_uninitialized: |
      1. **Inform:** "Task Master is not initialized. Autonomous Taskmaster operations cannot proceed."
-      2. **Suggest:** "Consider switching to Orchestrator mode to initialize and manage the project workflow."
+      2. **Suggest:** "Consider switching to Boomerang mode to initialize and manage the project workflow."
  if_ready: |
      1. **Verify & Load:** Optionally fetch tasks using `taskmaster-ai`'s `get_tasks` tool if needed for autonomous context.
      2. **Set Status:** Set status to '[TASKMASTER: ON]'.
--- a/assets/roocode/.roomodes
+++ b/assets/roocode/.roomodes
@@ -1,8 +1,8 @@
 {
  "customModes": [
    {
-      "slug": "orchestrator",
-      "name": "Orchestrator",
+      "slug": "boomerang",
+      "name": "Boomerang",
      "roleDefinition": "You are Roo, a strategic workflow orchestrator who coordinates complex tasks by delegating them to appropriate specialized modes. You have a comprehensive understanding of each mode's capabilities and limitations, also your own, and with the information given by the user and other modes in shared context you are enabled to effectively break down complex problems into discrete tasks that can be solved by different specialists using the `taskmaster-ai` system for task and context management.",
      "customInstructions": "Your role is to coordinate complex workflows by delegating tasks to specialized modes, using `taskmaster-ai` as the central hub for task definition, progress tracking, and context management. \nAs an orchestrator, you should:\nn1. When given a complex task, use contextual information (which gets updated frequently) to break it down into logical subtasks that can be delegated to appropriate specialized modes.\nn2. For each subtask, use the `new_task` tool to delegate. Choose the most appropriate mode for the subtask's specific goal and provide comprehensive instructions in the `message` parameter. \nThese instructions must include:\n*   All necessary context from the parent task or previous subtasks required to complete the work.\n*   A clearly defined scope, specifying exactly what the subtask should accomplish.\n*   An explicit statement that the subtask should *only* perform the work outlined in these instructions and not deviate.\n*   An instruction for the subtask to signal completion by using the `attempt_completion` tool, providing a thorough summary of the outcome in the `result` parameter, keeping in mind that this summary will be the source of truth used to further relay this information to other tasks and for you to keep track of what was completed on this project.\nn3. Track and manage the progress of all subtasks. When a subtask is completed, acknowledge its results and determine the next steps.\nn4. Help the user understand how the different subtasks fit together in the overall workflow. Provide clear reasoning about why you're delegating specific tasks to specific modes.\nn5. Ask clarifying questions when necessary to better understand how to break down complex tasks effectively. If it seems complex delegate to architect to accomplish that \nn6. Use subtasks to maintain clarity. If a request significantly shifts focus or requires a different expertise (mode), consider creating a subtask rather than overloading the current one.",
      "groups": [
--- a/assets/rules/cursor_rules.mdc
+++ b/assets/rules/cursor_rules.mdc
@@ -1,53 +0,0 @@
---
-description: Guidelines for creating and maintaining Cursor rules to ensure consistency and effectiveness.
-globs: .cursor/rules/*.mdc
-alwaysApply: true
---
-
- **Required Rule Structure:**
-  ```markdown
-  ---
-  description: Clear, one-line description of what the rule enforces
-  globs: path/to/files/*.ext, other/path/**/*
-  alwaysApply: boolean
-  ---
-
-  - **Main Points in Bold**
-    - Sub-points with details
-    - Examples and explanations
-  ```
-
- **File References:**
-  - Use `[filename](mdc:path/to/file)` ([filename](mdc:filename)) to reference files
-  - Example: [prisma.mdc](mdc:.cursor/rules/prisma.mdc) for rule references
-  - Example: [schema.prisma](mdc:prisma/schema.prisma) for code references
-
- **Code Examples:**
-  - Use language-specific code blocks
-  ```typescript
-  // ✅ DO: Show good examples
-  const goodExample = true;
-  
-  // ❌ DON'T: Show anti-patterns
-  const badExample = false;
-  ```
-
- **Rule Content Guidelines:**
-  - Start with high-level overview
-  - Include specific, actionable requirements
-  - Show examples of correct implementation
-  - Reference existing code when possible
-  - Keep rules DRY by referencing other rules
-
- **Rule Maintenance:**
-  - Update rules when new patterns emerge
-  - Add examples from actual codebase
-  - Remove outdated patterns
-  - Cross-reference related rules
-
- **Best Practices:**
-  - Use bullet points for clarity
-  - Keep descriptions concise
-  - Include both DO and DON'T examples
-  - Reference actual code over theoretical examples
-  - Use consistent formatting across rules 
--- a/assets/rules/dev_workflow.mdc
+++ b/assets/rules/dev_workflow.mdc
@@ -1,424 +0,0 @@
---
-description: Guide for using Taskmaster to manage task-driven development workflows
-globs: **/*
-alwaysApply: true
---
-
-# Taskmaster Development Workflow
-
-This guide outlines the standard process for using Taskmaster to manage software development projects. It is written as a set of instructions for you, the AI agent.
-
- **Your Default Stance**: For most projects, the user can work directly within the `master` task context. Your initial actions should operate on this default context unless a clear pattern for multi-context work emerges.
- **Your Goal**: Your role is to elevate the user's workflow by intelligently introducing advanced features like **Tagged Task Lists** when you detect the appropriate context. Do not force tags on the user; suggest them as a helpful solution to a specific need.
-
-## The Basic Loop
-The fundamental development cycle you will facilitate is:
-1.  **`list`**: Show the user what needs to be done.
-2.  **`next`**: Help the user decide what to work on.
-3.  **`show <id>`**: Provide details for a specific task.
-4.  **`expand <id>`**: Break down a complex task into smaller, manageable subtasks.
-5.  **Implement**: The user writes the code and tests.
-6.  **`update-subtask`**: Log progress and findings on behalf of the user.
-7.  **`set-status`**: Mark tasks and subtasks as `done` as work is completed.
-8.  **Repeat**.
-
-All your standard command executions should operate on the user's current task context, which defaults to `master`.
-
---
-
-## Standard Development Workflow Process
-
-### Simple Workflow (Default Starting Point)
-
-For new projects or when users are getting started, operate within the `master` tag context:
-
-   Start new projects by running `initialize_project` tool / `task-master init` or `parse_prd` / `task-master parse-prd --input='<prd-file.txt>'` (see @`taskmaster.mdc`) to generate initial tasks.json with tagged structure
-   Configure rule sets during initialization with `--rules` flag (e.g., `task-master init --rules cursor,windsurf`) or manage them later with `task-master rules add/remove` commands  
-   Begin coding sessions with `get_tasks` / `task-master list` (see @`taskmaster.mdc`) to see current tasks, status, and IDs
-   Determine the next task to work on using `next_task` / `task-master next` (see @`taskmaster.mdc`)
-   Analyze task complexity with `analyze_project_complexity` / `task-master analyze-complexity --research` (see @`taskmaster.mdc`) before breaking down tasks
-   Review complexity report using `complexity_report` / `task-master complexity-report` (see @`taskmaster.mdc`)
-   Select tasks based on dependencies (all marked 'done'), priority level, and ID order
-   View specific task details using `get_task` / `task-master show <id>` (see @`taskmaster.mdc`) to understand implementation requirements
-   Break down complex tasks using `expand_task` / `task-master expand --id=<id> --force --research` (see @`taskmaster.mdc`) with appropriate flags like `--force` (to replace existing subtasks) and `--research`
-   Implement code following task details, dependencies, and project standards
-   Mark completed tasks with `set_task_status` / `task-master set-status --id=<id> --status=done` (see @`taskmaster.mdc`)
-   Update dependent tasks when implementation differs from original plan using `update` / `task-master update --from=<id> --prompt="..."` or `update_task` / `task-master update-task --id=<id> --prompt="..."` (see @`taskmaster.mdc`)
-
---
-
-## Leveling Up: Agent-Led Multi-Context Workflows
-
-While the basic workflow is powerful, your primary opportunity to add value is by identifying when to introduce **Tagged Task Lists**. These patterns are your tools for creating a more organized and efficient development environment for the user, especially if you detect agentic or parallel development happening across the same session.
-
-**Critical Principle**: Most users should never see a difference in their experience. Only introduce advanced workflows when you detect clear indicators that the project has evolved beyond simple task management.
-
-### When to Introduce Tags: Your Decision Patterns
-
-Here are the patterns to look for. When you detect one, you should propose the corresponding workflow to the user.
-
-#### Pattern 1: Simple Git Feature Branching
-This is the most common and direct use case for tags.
-
- **Trigger**: The user creates a new git branch (e.g., `git checkout -b feature/user-auth`).
- **Your Action**: Propose creating a new tag that mirrors the branch name to isolate the feature's tasks from `master`.
- **Your Suggested Prompt**: *"I see you've created a new branch named 'feature/user-auth'. To keep all related tasks neatly organized and separate from your main list, I can create a corresponding task tag for you. This helps prevent merge conflicts in your `tasks.json` file later. Shall I create the 'feature-user-auth' tag?"*
- **Tool to Use**: `task-master add-tag --from-branch`
-
-#### Pattern 2: Team Collaboration
- **Trigger**: The user mentions working with teammates (e.g., "My teammate Alice is handling the database schema," or "I need to review Bob's work on the API.").
- **Your Action**: Suggest creating a separate tag for the user's work to prevent conflicts with shared master context.
- **Your Suggested Prompt**: *"Since you're working with Alice, I can create a separate task context for your work to avoid conflicts. This way, Alice can continue working with the master list while you have your own isolated context. When you're ready to merge your work, we can coordinate the tasks back to master. Shall I create a tag for your current work?"*
- **Tool to Use**: `task-master add-tag my-work --copy-from-current --description="My tasks while collaborating with Alice"`
-
-#### Pattern 3: Experiments or Risky Refactors
- **Trigger**: The user wants to try something that might not be kept (e.g., "I want to experiment with switching our state management library," or "Let's refactor the old API module, but I want to keep the current tasks as a reference.").
- **Your Action**: Propose creating a sandboxed tag for the experimental work.
- **Your Suggested Prompt**: *"This sounds like a great experiment. To keep these new tasks separate from our main plan, I can create a temporary 'experiment-zustand' tag for this work. If we decide not to proceed, we can simply delete the tag without affecting the main task list. Sound good?"*
- **Tool to Use**: `task-master add-tag experiment-zustand --description="Exploring Zustand migration"`
-
-#### Pattern 4: Large Feature Initiatives (PRD-Driven)
-This is a more structured approach for significant new features or epics.
-
- **Trigger**: The user describes a large, multi-step feature that would benefit from a formal plan.
- **Your Action**: Propose a comprehensive, PRD-driven workflow.
- **Your Suggested Prompt**: *"This sounds like a significant new feature. To manage this effectively, I suggest we create a dedicated task context for it. Here's the plan: I'll create a new tag called 'feature-xyz', then we can draft a Product Requirements Document (PRD) together to scope the work. Once the PRD is ready, I'll automatically generate all the necessary tasks within that new tag. How does that sound?"*
- **Your Implementation Flow**:
-    1.  **Create an empty tag**: `task-master add-tag feature-xyz --description "Tasks for the new XYZ feature"`. You can also start by creating a git branch if applicable, and then create the tag from that branch.
-    2.  **Collaborate & Create PRD**: Work with the user to create a detailed PRD file (e.g., `.taskmaster/docs/feature-xyz-prd.txt`).
-    3.  **Parse PRD into the new tag**: `task-master parse-prd .taskmaster/docs/feature-xyz-prd.txt --tag feature-xyz`
-    4.  **Prepare the new task list**: Follow up by suggesting `analyze-complexity` and `expand-all` for the newly created tasks within the `feature-xyz` tag.
-
-#### Pattern 5: Version-Based Development
-Tailor your approach based on the project maturity indicated by tag names.
-
- **Prototype/MVP Tags** (`prototype`, `mvp`, `poc`, `v0.x`):
-  - **Your Approach**: Focus on speed and functionality over perfection
-  - **Task Generation**: Create tasks that emphasize "get it working" over "get it perfect"
-  - **Complexity Level**: Lower complexity, fewer subtasks, more direct implementation paths
-  - **Research Prompts**: Include context like "This is a prototype - prioritize speed and basic functionality over optimization"
-  - **Example Prompt Addition**: *"Since this is for the MVP, I'll focus on tasks that get core functionality working quickly rather than over-engineering."*
-
- **Production/Mature Tags** (`v1.0+`, `production`, `stable`):
-  - **Your Approach**: Emphasize robustness, testing, and maintainability
-  - **Task Generation**: Include comprehensive error handling, testing, documentation, and optimization
-  - **Complexity Level**: Higher complexity, more detailed subtasks, thorough implementation paths
-  - **Research Prompts**: Include context like "This is for production - prioritize reliability, performance, and maintainability"
-  - **Example Prompt Addition**: *"Since this is for production, I'll ensure tasks include proper error handling, testing, and documentation."*
-
-### Advanced Workflow (Tag-Based & PRD-Driven)
-
-**When to Transition**: Recognize when the project has evolved (or has initiated a project which existing code) beyond simple task management. Look for these indicators:
- User mentions teammates or collaboration needs
- Project has grown to 15+ tasks with mixed priorities
- User creates feature branches or mentions major initiatives
- User initializes Taskmaster on an existing, complex codebase
- User describes large features that would benefit from dedicated planning
-
-**Your Role in Transition**: Guide the user to a more sophisticated workflow that leverages tags for organization and PRDs for comprehensive planning.
-
-#### Master List Strategy (High-Value Focus)
-Once you transition to tag-based workflows, the `master` tag should ideally contain only:
- **High-level deliverables** that provide significant business value
- **Major milestones** and epic-level features
- **Critical infrastructure** work that affects the entire project
- **Release-blocking** items
-
-**What NOT to put in master**:
- Detailed implementation subtasks (these go in feature-specific tags' parent tasks)
- Refactoring work (create dedicated tags like `refactor-auth`)
- Experimental features (use `experiment-*` tags)
- Team member-specific tasks (use person-specific tags)
-
-#### PRD-Driven Feature Development
-
-**For New Major Features**:
-1. **Identify the Initiative**: When user describes a significant feature
-2. **Create Dedicated Tag**: `add_tag feature-[name] --description="[Feature description]"`
-3. **Collaborative PRD Creation**: Work with user to create comprehensive PRD in `.taskmaster/docs/feature-[name]-prd.txt`
-4. **Parse & Prepare**: 
-   - `parse_prd .taskmaster/docs/feature-[name]-prd.txt --tag=feature-[name]`
-   - `analyze_project_complexity --tag=feature-[name] --research`
-   - `expand_all --tag=feature-[name] --research`
-5. **Add Master Reference**: Create a high-level task in `master` that references the feature tag
-
-**For Existing Codebase Analysis**:
-When users initialize Taskmaster on existing projects:
-1. **Codebase Discovery**: Use your native tools for producing deep context about the code base. You may use `research` tool with `--tree` and `--files` to collect up to date information using the existing architecture as context.
-2. **Collaborative Assessment**: Work with user to identify improvement areas, technical debt, or new features
-3. **Strategic PRD Creation**: Co-author PRDs that include:
-   - Current state analysis (based on your codebase research)
-   - Proposed improvements or new features
-   - Implementation strategy considering existing code
-4. **Tag-Based Organization**: Parse PRDs into appropriate tags (`refactor-api`, `feature-dashboard`, `tech-debt`, etc.)
-5. **Master List Curation**: Keep only the most valuable initiatives in master
-
-The parse-prd's `--append` flag enables the user to parse multple PRDs within tags or across tags. PRDs should be focused and the number of tasks they are parsed into should be strategically chosen relative to the PRD's complexity and level of detail.
-
-### Workflow Transition Examples
-
-**Example 1: Simple → Team-Based**
-```
-User: "Alice is going to help with the API work"
-Your Response: "Great! To avoid conflicts, I'll create a separate task context for your work. Alice can continue with the master list while you work in your own context. When you're ready to merge, we can coordinate the tasks back together."
-Action: add_tag my-api-work --copy-from-current --description="My API tasks while collaborating with Alice"
-```
-
-**Example 2: Simple → PRD-Driven**
-```
-User: "I want to add a complete user dashboard with analytics, user management, and reporting"
-Your Response: "This sounds like a major feature that would benefit from detailed planning. Let me create a dedicated context for this work and we can draft a PRD together to ensure we capture all requirements."
-Actions: 
-1. add_tag feature-dashboard --description="User dashboard with analytics and management"
-2. Collaborate on PRD creation
-3. parse_prd dashboard-prd.txt --tag=feature-dashboard
-4. Add high-level "User Dashboard" task to master
-```
-
-**Example 3: Existing Project → Strategic Planning**
-```
-User: "I just initialized Taskmaster on my existing React app. It's getting messy and I want to improve it."
-Your Response: "Let me research your codebase to understand the current architecture, then we can create a strategic plan for improvements."
-Actions:
-1. research "Current React app architecture and improvement opportunities" --tree --files=src/
-2. Collaborate on improvement PRD based on findings
-3. Create tags for different improvement areas (refactor-components, improve-state-management, etc.)
-4. Keep only major improvement initiatives in master
-```
-
---
-
-## Primary Interaction: MCP Server vs. CLI
-
-Taskmaster offers two primary ways to interact:
-
-1.  **MCP Server (Recommended for Integrated Tools)**:
-    - For AI agents and integrated development environments (like Cursor), interacting via the **MCP server is the preferred method**.
-    - The MCP server exposes Taskmaster functionality through a set of tools (e.g., `get_tasks`, `add_subtask`).
-    - This method offers better performance, structured data exchange, and richer error handling compared to CLI parsing.
-    - Refer to @`mcp.mdc` for details on the MCP architecture and available tools.
-    - A comprehensive list and description of MCP tools and their corresponding CLI commands can be found in @`taskmaster.mdc`.
-    - **Restart the MCP server** if core logic in `scripts/modules` or MCP tool/direct function definitions change.
-    - **Note**: MCP tools fully support tagged task lists with complete tag management capabilities.
-
-2.  **`task-master` CLI (For Users & Fallback)**:
-    - The global `task-master` command provides a user-friendly interface for direct terminal interaction.
-    - It can also serve as a fallback if the MCP server is inaccessible or a specific function isn't exposed via MCP.
-    - Install globally with `npm install -g task-master-ai` or use locally via `npx task-master-ai ...`.
-    - The CLI commands often mirror the MCP tools (e.g., `task-master list` corresponds to `get_tasks`).
-    - Refer to @`taskmaster.mdc` for a detailed command reference.
-    - **Tagged Task Lists**: CLI fully supports the new tagged system with seamless migration.
-
-## How the Tag System Works (For Your Reference)
-
- **Data Structure**: Tasks are organized into separate contexts (tags) like "master", "feature-branch", or "v2.0".
- **Silent Migration**: Existing projects automatically migrate to use a "master" tag with zero disruption.
- **Context Isolation**: Tasks in different tags are completely separate. Changes in one tag do not affect any other tag.
- **Manual Control**: The user is always in control. There is no automatic switching. You facilitate switching by using `use-tag <name>`.
- **Full CLI & MCP Support**: All tag management commands are available through both the CLI and MCP tools for you to use. Refer to @`taskmaster.mdc` for a full command list.
-
---
-
-## Task Complexity Analysis
-
-   Run `analyze_project_complexity` / `task-master analyze-complexity --research` (see @`taskmaster.mdc`) for comprehensive analysis
-   Review complexity report via `complexity_report` / `task-master complexity-report` (see @`taskmaster.mdc`) for a formatted, readable version.
-   Focus on tasks with highest complexity scores (8-10) for detailed breakdown
-   Use analysis results to determine appropriate subtask allocation
-   Note that reports are automatically used by the `expand_task` tool/command
-
-## Task Breakdown Process
-
-   Use `expand_task` / `task-master expand --id=<id>`. It automatically uses the complexity report if found, otherwise generates default number of subtasks.
-   Use `--num=<number>` to specify an explicit number of subtasks, overriding defaults or complexity report recommendations.
-   Add `--research` flag to leverage Perplexity AI for research-backed expansion.
-   Add `--force` flag to clear existing subtasks before generating new ones (default is to append).
-   Use `--prompt="<context>"` to provide additional context when needed.
-   Review and adjust generated subtasks as necessary.
-   Use `expand_all` tool or `task-master expand --all` to expand multiple pending tasks at once, respecting flags like `--force` and `--research`.
-   If subtasks need complete replacement (regardless of the `--force` flag on `expand`), clear them first with `clear_subtasks` / `task-master clear-subtasks --id=<id>`.
-
-## Implementation Drift Handling
-
-   When implementation differs significantly from planned approach
-   When future tasks need modification due to current implementation choices
-   When new dependencies or requirements emerge
-   Use `update` / `task-master update --from=<futureTaskId> --prompt='<explanation>\nUpdate context...' --research` to update multiple future tasks.
-   Use `update_task` / `task-master update-task --id=<taskId> --prompt='<explanation>\nUpdate context...' --research` to update a single specific task.
-
-## Task Status Management
-
-   Use 'pending' for tasks ready to be worked on
-   Use 'done' for completed and verified tasks
-   Use 'deferred' for postponed tasks
-   Add custom status values as needed for project-specific workflows
-
-## Task Structure Fields
-
- **id**: Unique identifier for the task (Example: `1`, `1.1`)
- **title**: Brief, descriptive title (Example: `"Initialize Repo"`)
- **description**: Concise summary of what the task involves (Example: `"Create a new repository, set up initial structure."`)
- **status**: Current state of the task (Example: `"pending"`, `"done"`, `"deferred"`)
- **dependencies**: IDs of prerequisite tasks (Example: `[1, 2.1]`)
-    - Dependencies are displayed with status indicators (✅ for completed, ⏱️ for pending)
-    - This helps quickly identify which prerequisite tasks are blocking work
- **priority**: Importance level (Example: `"high"`, `"medium"`, `"low"`)
- **details**: In-depth implementation instructions (Example: `"Use GitHub client ID/secret, handle callback, set session token."`) 
- **testStrategy**: Verification approach (Example: `"Deploy and call endpoint to confirm 'Hello World' response."`) 
- **subtasks**: List of smaller, more specific tasks (Example: `[{"id": 1, "title": "Configure OAuth", ...}]`) 
- Refer to task structure details (previously linked to `tasks.mdc`).
-
-## Configuration Management (Updated)
-
-Taskmaster configuration is managed through two main mechanisms:
-
-1.  **`.taskmaster/config.json` File (Primary):**
-    *   Located in the project root directory.
-    *   Stores most configuration settings: AI model selections (main, research, fallback), parameters (max tokens, temperature), logging level, default subtasks/priority, project name, etc.
-    *   **Tagged System Settings**: Includes `global.defaultTag` (defaults to "master") and `tags` section for tag management configuration.
-    *   **Managed via `task-master models --setup` command.** Do not edit manually unless you know what you are doing.
-    *   **View/Set specific models via `task-master models` command or `models` MCP tool.**
-    *   Created automatically when you run `task-master models --setup` for the first time or during tagged system migration.
-
-2.  **Environment Variables (`.env` / `mcp.json`):**
-    *   Used **only** for sensitive API keys and specific endpoint URLs.
-    *   Place API keys (one per provider) in a `.env` file in the project root for CLI usage.
-    *   For MCP/Cursor integration, configure these keys in the `env` section of `.cursor/mcp.json`.
-    *   Available keys/variables: See `assets/env.example` or the Configuration section in the command reference (previously linked to `taskmaster.mdc`).
-
-3.  **`.taskmaster/state.json` File (Tagged System State):**
-    *   Tracks current tag context and migration status.
-    *   Automatically created during tagged system migration.
-    *   Contains: `currentTag`, `lastSwitched`, `migrationNoticeShown`.
-
-**Important:** Non-API key settings (like model selections, `MAX_TOKENS`, `TASKMASTER_LOG_LEVEL`) are **no longer configured via environment variables**. Use the `task-master models` command (or `--setup` for interactive configuration) or the `models` MCP tool.
-**If AI commands FAIL in MCP** verify that the API key for the selected provider is present in the `env` section of `.cursor/mcp.json`.
-**If AI commands FAIL in CLI** verify that the API key for the selected provider is present in the `.env` file in the root of the project.
-
-## Rules Management
-
-Taskmaster supports multiple AI coding assistant rule sets that can be configured during project initialization or managed afterward:
-
- **Available Profiles**: Claude Code, Cline, Codex, Cursor, Roo Code, Trae, Windsurf (claude, cline, codex, cursor, roo, trae, windsurf)
- **During Initialization**: Use `task-master init --rules cursor,windsurf` to specify which rule sets to include
- **After Initialization**: Use `task-master rules add <profiles>` or `task-master rules remove <profiles>` to manage rule sets
- **Interactive Setup**: Use `task-master rules setup` to launch an interactive prompt for selecting rule profiles
- **Default Behavior**: If no `--rules` flag is specified during initialization, all available rule profiles are included
- **Rule Structure**: Each profile creates its own directory (e.g., `.cursor/rules`, `.roo/rules`) with appropriate configuration files
-
-## Determining the Next Task
-
- Run `next_task` / `task-master next` to show the next task to work on.
- The command identifies tasks with all dependencies satisfied
- Tasks are prioritized by priority level, dependency count, and ID
- The command shows comprehensive task information including:
-    - Basic task details and description
-    - Implementation details
-    - Subtasks (if they exist)
-    - Contextual suggested actions
- Recommended before starting any new development work
- Respects your project's dependency structure
- Ensures tasks are completed in the appropriate sequence
- Provides ready-to-use commands for common task actions
-
-## Viewing Specific Task Details
-
- Run `get_task` / `task-master show <id>` to view a specific task.
- Use dot notation for subtasks: `task-master show 1.2` (shows subtask 2 of task 1)
- Displays comprehensive information similar to the next command, but for a specific task
- For parent tasks, shows all subtasks and their current status
- For subtasks, shows parent task information and relationship
- Provides contextual suggested actions appropriate for the specific task
- Useful for examining task details before implementation or checking status
-
-## Managing Task Dependencies
-
- Use `add_dependency` / `task-master add-dependency --id=<id> --depends-on=<id>` to add a dependency.
- Use `remove_dependency` / `task-master remove-dependency --id=<id> --depends-on=<id>` to remove a dependency.
- The system prevents circular dependencies and duplicate dependency entries
- Dependencies are checked for existence before being added or removed
- Task files are automatically regenerated after dependency changes
- Dependencies are visualized with status indicators in task listings and files
-
-## Task Reorganization
-
- Use `move_task` / `task-master move --from=<id> --to=<id>` to move tasks or subtasks within the hierarchy
- This command supports several use cases:
-  - Moving a standalone task to become a subtask (e.g., `--from=5 --to=7`)
-  - Moving a subtask to become a standalone task (e.g., `--from=5.2 --to=7`) 
-  - Moving a subtask to a different parent (e.g., `--from=5.2 --to=7.3`)
-  - Reordering subtasks within the same parent (e.g., `--from=5.2 --to=5.4`)
-  - Moving a task to a new, non-existent ID position (e.g., `--from=5 --to=25`)
-  - Moving multiple tasks at once using comma-separated IDs (e.g., `--from=10,11,12 --to=16,17,18`)
- The system includes validation to prevent data loss:
-  - Allows moving to non-existent IDs by creating placeholder tasks
-  - Prevents moving to existing task IDs that have content (to avoid overwriting)
-  - Validates source tasks exist before attempting to move them
- The system maintains proper parent-child relationships and dependency integrity
- Task files are automatically regenerated after the move operation
- This provides greater flexibility in organizing and refining your task structure as project understanding evolves
- This is especially useful when dealing with potential merge conflicts arising from teams creating tasks on separate branches. Solve these conflicts very easily by moving your tasks and keeping theirs.
-
-## Iterative Subtask Implementation
-
-Once a task has been broken down into subtasks using `expand_task` or similar methods, follow this iterative process for implementation:
-
-1.  **Understand the Goal (Preparation):**
-    *   Use `get_task` / `task-master show <subtaskId>` (see @`taskmaster.mdc`) to thoroughly understand the specific goals and requirements of the subtask.
-
-2.  **Initial Exploration & Planning (Iteration 1):**
-    *   This is the first attempt at creating a concrete implementation plan.
-    *   Explore the codebase to identify the precise files, functions, and even specific lines of code that will need modification.
-    *   Determine the intended code changes (diffs) and their locations.
-    *   Gather *all* relevant details from this exploration phase.
-
-3.  **Log the Plan:**
-    *   Run `update_subtask` / `task-master update-subtask --id=<subtaskId> --prompt='<detailed plan>'`.
-    *   Provide the *complete and detailed* findings from the exploration phase in the prompt. Include file paths, line numbers, proposed diffs, reasoning, and any potential challenges identified. Do not omit details. The goal is to create a rich, timestamped log within the subtask's `details`.
-
-4.  **Verify the Plan:**
-    *   Run `get_task` / `task-master show <subtaskId>` again to confirm that the detailed implementation plan has been successfully appended to the subtask's details.
-
-5.  **Begin Implementation:**
-    *   Set the subtask status using `set_task_status` / `task-master set-status --id=<subtaskId> --status=in-progress`.
-    *   Start coding based on the logged plan.
-
-6.  **Refine and Log Progress (Iteration 2+):**
-    *   As implementation progresses, you will encounter challenges, discover nuances, or confirm successful approaches.
-    *   **Before appending new information**: Briefly review the *existing* details logged in the subtask (using `get_task` or recalling from context) to ensure the update adds fresh insights and avoids redundancy.
-    *   **Regularly** use `update_subtask` / `task-master update-subtask --id=<subtaskId> --prompt='<update details>\n- What worked...\n- What didn't work...'` to append new findings.
-    *   **Crucially, log:**
-        *   What worked ("fundamental truths" discovered).
-        *   What didn't work and why (to avoid repeating mistakes).
-        *   Specific code snippets or configurations that were successful.
-        *   Decisions made, especially if confirmed with user input.
-        *   Any deviations from the initial plan and the reasoning.
-    *   The objective is to continuously enrich the subtask's details, creating a log of the implementation journey that helps the AI (and human developers) learn, adapt, and avoid repeating errors.
-
-7.  **Review & Update Rules (Post-Implementation):**
-    *   Once the implementation for the subtask is functionally complete, review all code changes and the relevant chat history.
-    *   Identify any new or modified code patterns, conventions, or best practices established during the implementation.
-    *   Create new or update existing rules following internal guidelines (previously linked to `cursor_rules.mdc` and `self_improve.mdc`).
-
-8.  **Mark Task Complete:**
-    *   After verifying the implementation and updating any necessary rules, mark the subtask as completed: `set_task_status` / `task-master set-status --id=<subtaskId> --status=done`.
-
-9.  **Commit Changes (If using Git):**
-    *   Stage the relevant code changes and any updated/new rule files (`git add .`).
-    *   Craft a comprehensive Git commit message summarizing the work done for the subtask, including both code implementation and any rule adjustments.
-    *   Execute the commit command directly in the terminal (e.g., `git commit -m 'feat(module): Implement feature X for subtask <subtaskId>\n\n- Details about changes...\n- Updated rule Y for pattern Z'`).
-    *   Consider if a Changeset is needed according to internal versioning guidelines (previously linked to `changeset.mdc`). If so, run `npm run changeset`, stage the generated file, and amend the commit or create a new one.
-
-10. **Proceed to Next Subtask:**
-    *   Identify the next subtask (e.g., using `next_task` / `task-master next`).
-
-## Code Analysis & Refactoring Techniques
-
- **Top-Level Function Search**:
-    - Useful for understanding module structure or planning refactors.
-    - Use grep/ripgrep to find exported functions/constants:
-      `rg "export (async function|function|const) \w+"` or similar patterns.
-    - Can help compare functions between files during migrations or identify potential naming conflicts.
-
---
-*This workflow provides a general guideline. Adapt it based on your specific project needs and team practices.*
--- a/assets/rules/self_improve.mdc
+++ b/assets/rules/self_improve.mdc
@@ -1,72 +0,0 @@
---
-description: Guidelines for continuously improving Cursor rules based on emerging code patterns and best practices.
-globs: **/*
-alwaysApply: true
---
-
- **Rule Improvement Triggers:**
-  - New code patterns not covered by existing rules
-  - Repeated similar implementations across files
-  - Common error patterns that could be prevented
-  - New libraries or tools being used consistently
-  - Emerging best practices in the codebase
-
- **Analysis Process:**
-  - Compare new code with existing rules
-  - Identify patterns that should be standardized
-  - Look for references to external documentation
-  - Check for consistent error handling patterns
-  - Monitor test patterns and coverage
-
- **Rule Updates:**
-  - **Add New Rules When:**
-    - A new technology/pattern is used in 3+ files
-    - Common bugs could be prevented by a rule
-    - Code reviews repeatedly mention the same feedback
-    - New security or performance patterns emerge
-
-  - **Modify Existing Rules When:**
-    - Better examples exist in the codebase
-    - Additional edge cases are discovered
-    - Related rules have been updated
-    - Implementation details have changed
-
- **Example Pattern Recognition:**
-  ```typescript
-  // If you see repeated patterns like:
-  const data = await prisma.user.findMany({
-    select: { id: true, email: true },
-    where: { status: 'ACTIVE' }
-  });
-  
-  // Consider adding to [prisma.mdc](mdc:.cursor/rules/prisma.mdc):
-  // - Standard select fields
-  // - Common where conditions
-  // - Performance optimization patterns
-  ```
-
- **Rule Quality Checks:**
-  - Rules should be actionable and specific
-  - Examples should come from actual code
-  - References should be up to date
-  - Patterns should be consistently enforced
-
- **Continuous Improvement:**
-  - Monitor code review comments
-  - Track common development questions
-  - Update rules after major refactors
-  - Add links to relevant documentation
-  - Cross-reference related rules
-
- **Rule Deprecation:**
-  - Mark outdated patterns as deprecated
-  - Remove rules that no longer apply
-  - Update references to deprecated rules
-  - Document migration paths for old patterns
-
- **Documentation Updates:**
-  - Keep examples synchronized with code
-  - Update references to external docs
-  - Maintain links between related rules
-  - Document breaking changes
-Follow [cursor_rules.mdc](mdc:.cursor/rules/cursor_rules.mdc) for proper rule formatting and structure.
--- a/assets/rules/taskmaster.mdc
+++ b/assets/rules/taskmaster.mdc
@@ -1,558 +0,0 @@
---
-description: Comprehensive reference for Taskmaster MCP tools and CLI commands.
-globs: **/*
-alwaysApply: true
---
-
-# Taskmaster Tool & Command Reference
-
-This document provides a detailed reference for interacting with Taskmaster, covering both the recommended MCP tools, suitable for integrations like Cursor, and the corresponding `task-master` CLI commands, designed for direct user interaction or fallback.
-
-**Note:** For interacting with Taskmaster programmatically or via integrated tools, using the **MCP tools is strongly recommended** due to better performance, structured data, and error handling. The CLI commands serve as a user-friendly alternative and fallback. 
-
-**Important:** Several MCP tools involve AI processing... The AI-powered tools include `parse_prd`, `analyze_project_complexity`, `update_subtask`, `update_task`, `update`, `expand_all`, `expand_task`, and `add_task`.
-
-**🏷️ Tagged Task Lists System:** Task Master now supports **tagged task lists** for multi-context task management. This allows you to maintain separate, isolated lists of tasks for different features, branches, or experiments. Existing projects are seamlessly migrated to use a default "master" tag. Most commands now support a `--tag <name>` flag to specify which context to operate on. If omitted, commands use the currently active tag.
-
---
-
-## Initialization & Setup
-
-### 1. Initialize Project (`init`)
-
-*   **MCP Tool:** `initialize_project`
-*   **CLI Command:** `task-master init [options]`
-*   **Description:** `Set up the basic Taskmaster file structure and configuration in the current directory for a new project.`
-*   **Key CLI Options:**
-    *   `--name <name>`: `Set the name for your project in Taskmaster's configuration.`
-    *   `--description <text>`: `Provide a brief description for your project.`
-    *   `--version <version>`: `Set the initial version for your project, e.g., '0.1.0'.`
-    *   `-y, --yes`: `Initialize Taskmaster quickly using default settings without interactive prompts.`
-*   **Usage:** Run this once at the beginning of a new project.
-*   **MCP Variant Description:** `Set up the basic Taskmaster file structure and configuration in the current directory for a new project by running the 'task-master init' command.`
-*   **Key MCP Parameters/Options:**
-    *   `projectName`: `Set the name for your project.` (CLI: `--name <name>`)
-    *   `projectDescription`: `Provide a brief description for your project.` (CLI: `--description <text>`)
-    *   `projectVersion`: `Set the initial version for your project, e.g., '0.1.0'.` (CLI: `--version <version>`)
-    *   `authorName`: `Author name.` (CLI: `--author <author>`)
-    *   `skipInstall`: `Skip installing dependencies. Default is false.` (CLI: `--skip-install`)
-    *   `addAliases`: `Add shell aliases tm and taskmaster. Default is false.` (CLI: `--aliases`)
-    *   `yes`: `Skip prompts and use defaults/provided arguments. Default is false.` (CLI: `-y, --yes`)
-*   **Usage:** Run this once at the beginning of a new project, typically via an integrated tool like Cursor. Operates on the current working directory of the MCP server. 
-*   **Important:** Once complete, you *MUST* parse a prd in order to generate tasks. There will be no tasks files until then. The next step after initializing should be to create a PRD using the example PRD in .taskmaster/templates/example_prd.txt. 
-*   **Tagging:** Use the `--tag` option to parse the PRD into a specific, non-default tag context. If the tag doesn't exist, it will be created automatically. Example: `task-master parse-prd spec.txt --tag=new-feature`.
-
-### 2. Parse PRD (`parse_prd`)
-
-*   **MCP Tool:** `parse_prd`
-*   **CLI Command:** `task-master parse-prd [file] [options]`
-*   **Description:** `Parse a Product Requirements Document, PRD, or text file with Taskmaster to automatically generate an initial set of tasks in tasks.json.`
-*   **Key Parameters/Options:**
-    *   `input`: `Path to your PRD or requirements text file that Taskmaster should parse for tasks.` (CLI: `[file]` positional or `-i, --input <file>`)
-    *   `output`: `Specify where Taskmaster should save the generated 'tasks.json' file. Defaults to '.taskmaster/tasks/tasks.json'.` (CLI: `-o, --output <file>`)
-    *   `numTasks`: `Approximate number of top-level tasks Taskmaster should aim to generate from the document.` (CLI: `-n, --num-tasks <number>`)
-    *   `force`: `Use this to allow Taskmaster to overwrite an existing 'tasks.json' without asking for confirmation.` (CLI: `-f, --force`)
-*   **Usage:** Useful for bootstrapping a project from an existing requirements document.
-*   **Notes:** Task Master will strictly adhere to any specific requirements mentioned in the PRD, such as libraries, database schemas, frameworks, tech stacks, etc., while filling in any gaps where the PRD isn't fully specified. Tasks are designed to provide the most direct implementation path while avoiding over-engineering.
-*   **Important:** This MCP tool makes AI calls and can take up to a minute to complete. Please inform users to hang tight while the operation is in progress. If the user does not have a PRD, suggest discussing their idea and then use the example PRD in `.taskmaster/templates/example_prd.txt` as a template for creating the PRD based on their idea, for use with `parse-prd`.
-
---
-
-## AI Model Configuration
-
-### 2. Manage Models (`models`)
-*   **MCP Tool:** `models`
-*   **CLI Command:** `task-master models [options]`
-*   **Description:** `View the current AI model configuration or set specific models for different roles (main, research, fallback). Allows setting custom model IDs for Ollama and OpenRouter.`
-*   **Key MCP Parameters/Options:**
-    *   `setMain <model_id>`: `Set the primary model ID for task generation/updates.` (CLI: `--set-main <model_id>`)
-    *   `setResearch <model_id>`: `Set the model ID for research-backed operations.` (CLI: `--set-research <model_id>`)
-    *   `setFallback <model_id>`: `Set the model ID to use if the primary fails.` (CLI: `--set-fallback <model_id>`)
-    *   `ollama <boolean>`: `Indicates the set model ID is a custom Ollama model.` (CLI: `--ollama`)
-    *   `openrouter <boolean>`: `Indicates the set model ID is a custom OpenRouter model.` (CLI: `--openrouter`)
-    *   `listAvailableModels <boolean>`: `If true, lists available models not currently assigned to a role.` (CLI: No direct equivalent; CLI lists available automatically)
-    *   `projectRoot <string>`: `Optional. Absolute path to the project root directory.` (CLI: Determined automatically)
-*   **Key CLI Options:**
-    *   `--set-main <model_id>`: `Set the primary model.`
-    *   `--set-research <model_id>`: `Set the research model.`
-    *   `--set-fallback <model_id>`: `Set the fallback model.`
-    *   `--ollama`: `Specify that the provided model ID is for Ollama (use with --set-*).`
-    *   `--openrouter`: `Specify that the provided model ID is for OpenRouter (use with --set-*). Validates against OpenRouter API.`
-    *   `--bedrock`: `Specify that the provided model ID is for AWS Bedrock (use with --set-*).`
-    *   `--setup`: `Run interactive setup to configure models, including custom Ollama/OpenRouter IDs.`
-*   **Usage (MCP):** Call without set flags to get current config. Use `setMain`, `setResearch`, or `setFallback` with a valid model ID to update the configuration. Use `listAvailableModels: true` to get a list of unassigned models. To set a custom model, provide the model ID and set `ollama: true` or `openrouter: true`.
-*   **Usage (CLI):** Run without flags to view current configuration and available models. Use set flags to update specific roles. Use `--setup` for guided configuration, including custom models. To set a custom model via flags, use `--set-<role>=<model_id>` along with either `--ollama` or `--openrouter`.
-*   **Notes:** Configuration is stored in `.taskmaster/config.json` in the project root. This command/tool modifies that file. Use `listAvailableModels` or `task-master models` to see internally supported models. OpenRouter custom models are validated against their live API. Ollama custom models are not validated live.
-*   **API note:** API keys for selected AI providers (based on their model) need to exist in the mcp.json file to be accessible in MCP context. The API keys must be present in the local .env file for the CLI to be able to read them.
-*   **Model costs:** The costs in supported models are expressed in dollars. An input/output value of 3 is $3.00. A value of 0.8 is $0.80. 
-*   **Warning:** DO NOT MANUALLY EDIT THE .taskmaster/config.json FILE. Use the included commands either in the MCP or CLI format as needed. Always prioritize MCP tools when available and use the CLI as a fallback.
-
---
-
-## Task Listing & Viewing
-
-### 3. Get Tasks (`get_tasks`)
-
-*   **MCP Tool:** `get_tasks`
-*   **CLI Command:** `task-master list [options]`
-*   **Description:** `List your Taskmaster tasks, optionally filtering by status and showing subtasks.`
-*   **Key Parameters/Options:**
-    *   `status`: `Show only Taskmaster tasks matching this status (or multiple statuses, comma-separated), e.g., 'pending' or 'done,in-progress'.` (CLI: `-s, --status <status>`)
-    *   `withSubtasks`: `Include subtasks indented under their parent tasks in the list.` (CLI: `--with-subtasks`)
-    *   `tag`: `Specify which tag context to list tasks from. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Get an overview of the project status, often used at the start of a work session.
-
-### 4. Get Next Task (`next_task`)
-
-*   **MCP Tool:** `next_task`
-*   **CLI Command:** `task-master next [options]`
-*   **Description:** `Ask Taskmaster to show the next available task you can work on, based on status and completed dependencies.`
-*   **Key Parameters/Options:**
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-    *   `tag`: `Specify which tag context to use. Defaults to the current active tag.` (CLI: `--tag <name>`)
-*   **Usage:** Identify what to work on next according to the plan.
-
-### 5. Get Task Details (`get_task`)
-
-*   **MCP Tool:** `get_task`
-*   **CLI Command:** `task-master show [id] [options]`
-*   **Description:** `Display detailed information for one or more specific Taskmaster tasks or subtasks by ID.`
-*   **Key Parameters/Options:**
-    *   `id`: `Required. The ID of the Taskmaster task (e.g., '15'), subtask (e.g., '15.2'), or a comma-separated list of IDs ('1,5,10.2') you want to view.` (CLI: `[id]` positional or `-i, --id <id>`)
-    *   `tag`: `Specify which tag context to get the task(s) from. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Understand the full details for a specific task. When multiple IDs are provided, a summary table is shown.
-*   **CRITICAL INFORMATION** If you need to collect information from multiple tasks, use comma-separated IDs (i.e. 1,2,3) to receive an array of tasks. Do not needlessly get tasks one at a time if you need to get many as that is wasteful.
-
---
-
-## Task Creation & Modification
-
-### 6. Add Task (`add_task`)
-
-*   **MCP Tool:** `add_task`
-*   **CLI Command:** `task-master add-task [options]`
-*   **Description:** `Add a new task to Taskmaster by describing it; AI will structure it.`
-*   **Key Parameters/Options:**
-    *   `prompt`: `Required. Describe the new task you want Taskmaster to create, e.g., "Implement user authentication using JWT".` (CLI: `-p, --prompt <text>`)
-    *   `dependencies`: `Specify the IDs of any Taskmaster tasks that must be completed before this new one can start, e.g., '12,14'.` (CLI: `-d, --dependencies <ids>`)
-    *   `priority`: `Set the priority for the new task: 'high', 'medium', or 'low'. Default is 'medium'.` (CLI: `--priority <priority>`)
-    *   `research`: `Enable Taskmaster to use the research role for potentially more informed task creation.` (CLI: `-r, --research`)
-    *   `tag`: `Specify which tag context to add the task to. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Quickly add newly identified tasks during development.
-*   **Important:** This MCP tool makes AI calls and can take up to a minute to complete. Please inform users to hang tight while the operation is in progress.
-
-### 7. Add Subtask (`add_subtask`)
-
-*   **MCP Tool:** `add_subtask`
-*   **CLI Command:** `task-master add-subtask [options]`
-*   **Description:** `Add a new subtask to a Taskmaster parent task, or convert an existing task into a subtask.`
-*   **Key Parameters/Options:**
-    *   `id` / `parent`: `Required. The ID of the Taskmaster task that will be the parent.` (MCP: `id`, CLI: `-p, --parent <id>`)
-    *   `taskId`: `Use this if you want to convert an existing top-level Taskmaster task into a subtask of the specified parent.` (CLI: `-i, --task-id <id>`)
-    *   `title`: `Required if not using taskId. The title for the new subtask Taskmaster should create.` (CLI: `-t, --title <title>`)
-    *   `description`: `A brief description for the new subtask.` (CLI: `-d, --description <text>`)
-    *   `details`: `Provide implementation notes or details for the new subtask.` (CLI: `--details <text>`)
-    *   `dependencies`: `Specify IDs of other tasks or subtasks, e.g., '15' or '16.1', that must be done before this new subtask.` (CLI: `--dependencies <ids>`)
-    *   `status`: `Set the initial status for the new subtask. Default is 'pending'.` (CLI: `-s, --status <status>`)
-    *   `skipGenerate`: `Prevent Taskmaster from automatically regenerating markdown task files after adding the subtask.` (CLI: `--skip-generate`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Break down tasks manually or reorganize existing tasks.
-
-### 8. Update Tasks (`update`)
-
-*   **MCP Tool:** `update`
-*   **CLI Command:** `task-master update [options]`
-*   **Description:** `Update multiple upcoming tasks in Taskmaster based on new context or changes, starting from a specific task ID.`
-*   **Key Parameters/Options:**
-    *   `from`: `Required. The ID of the first task Taskmaster should update. All tasks with this ID or higher that are not 'done' will be considered.` (CLI: `--from <id>`)
-    *   `prompt`: `Required. Explain the change or new context for Taskmaster to apply to the tasks, e.g., "We are now using React Query instead of Redux Toolkit for data fetching".` (CLI: `-p, --prompt <text>`)
-    *   `research`: `Enable Taskmaster to use the research role for more informed updates. Requires appropriate API key.` (CLI: `-r, --research`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Handle significant implementation changes or pivots that affect multiple future tasks. Example CLI: `task-master update --from='18' --prompt='Switching to React Query.\nNeed to refactor data fetching...'`
-*   **Important:** This MCP tool makes AI calls and can take up to a minute to complete. Please inform users to hang tight while the operation is in progress.
-
-### 9. Update Task (`update_task`)
-
-*   **MCP Tool:** `update_task`
-*   **CLI Command:** `task-master update-task [options]`
-*   **Description:** `Modify a specific Taskmaster task by ID, incorporating new information or changes. By default, this replaces the existing task details.`
-*   **Key Parameters/Options:**
-    *   `id`: `Required. The specific ID of the Taskmaster task, e.g., '15', you want to update.` (CLI: `-i, --id <id>`)
-    *   `prompt`: `Required. Explain the specific changes or provide the new information Taskmaster should incorporate into this task.` (CLI: `-p, --prompt <text>`)
-    *   `append`: `If true, appends the prompt content to the task's details with a timestamp, rather than replacing them. Behaves like update-subtask.` (CLI: `--append`)
-    *   `research`: `Enable Taskmaster to use the research role for more informed updates. Requires appropriate API key.` (CLI: `-r, --research`)
-    *   `tag`: `Specify which tag context the task belongs to. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Refine a specific task based on new understanding. Use `--append` to log progress without creating subtasks.
-*   **Important:** This MCP tool makes AI calls and can take up to a minute to complete. Please inform users to hang tight while the operation is in progress.
-
-### 10. Update Subtask (`update_subtask`)
-
-*   **MCP Tool:** `update_subtask`
-*   **CLI Command:** `task-master update-subtask [options]`
-*   **Description:** `Append timestamped notes or details to a specific Taskmaster subtask without overwriting existing content. Intended for iterative implementation logging.`
-*   **Key Parameters/Options:**
-    *   `id`: `Required. The ID of the Taskmaster subtask, e.g., '5.2', to update with new information.` (CLI: `-i, --id <id>`)
-    *   `prompt`: `Required. The information, findings, or progress notes to append to the subtask's details with a timestamp.` (CLI: `-p, --prompt <text>`)
-    *   `research`: `Enable Taskmaster to use the research role for more informed updates. Requires appropriate API key.` (CLI: `-r, --research`)
-    *   `tag`: `Specify which tag context the subtask belongs to. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Log implementation progress, findings, and discoveries during subtask development. Each update is timestamped and appended to preserve the implementation journey.
-*   **Important:** This MCP tool makes AI calls and can take up to a minute to complete. Please inform users to hang tight while the operation is in progress.
-
-### 11. Set Task Status (`set_task_status`)
-
-*   **MCP Tool:** `set_task_status`
-*   **CLI Command:** `task-master set-status [options]`
-*   **Description:** `Update the status of one or more Taskmaster tasks or subtasks, e.g., 'pending', 'in-progress', 'done'.`
-*   **Key Parameters/Options:**
-    *   `id`: `Required. The ID(s) of the Taskmaster task(s) or subtask(s), e.g., '15', '15.2', or '16,17.1', to update.` (CLI: `-i, --id <id>`)
-    *   `status`: `Required. The new status to set, e.g., 'done', 'pending', 'in-progress', 'review', 'cancelled'.` (CLI: `-s, --status <status>`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Mark progress as tasks move through the development cycle.
-
-### 12. Remove Task (`remove_task`)
-
-*   **MCP Tool:** `remove_task`
-*   **CLI Command:** `task-master remove-task [options]`
-*   **Description:** `Permanently remove a task or subtask from the Taskmaster tasks list.`
-*   **Key Parameters/Options:**
-    *   `id`: `Required. The ID of the Taskmaster task, e.g., '5', or subtask, e.g., '5.2', to permanently remove.` (CLI: `-i, --id <id>`)
-    *   `yes`: `Skip the confirmation prompt and immediately delete the task.` (CLI: `-y, --yes`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Permanently delete tasks or subtasks that are no longer needed in the project.
-*   **Notes:** Use with caution as this operation cannot be undone. Consider using 'blocked', 'cancelled', or 'deferred' status instead if you just want to exclude a task from active planning but keep it for reference. The command automatically cleans up dependency references in other tasks.
-
---
-
-## Task Structure & Breakdown
-
-### 13. Expand Task (`expand_task`)
-
-*   **MCP Tool:** `expand_task`
-*   **CLI Command:** `task-master expand [options]`
-*   **Description:** `Use Taskmaster's AI to break down a complex task into smaller, manageable subtasks. Appends subtasks by default.`
-*   **Key Parameters/Options:**
-    *   `id`: `The ID of the specific Taskmaster task you want to break down into subtasks.` (CLI: `-i, --id <id>`)
-    *   `num`: `Optional: Suggests how many subtasks Taskmaster should aim to create. Uses complexity analysis/defaults otherwise.` (CLI: `-n, --num <number>`)
-    *   `research`: `Enable Taskmaster to use the research role for more informed subtask generation. Requires appropriate API key.` (CLI: `-r, --research`)
-    *   `prompt`: `Optional: Provide extra context or specific instructions to Taskmaster for generating the subtasks.` (CLI: `-p, --prompt <text>`)
-    *   `force`: `Optional: If true, clear existing subtasks before generating new ones. Default is false (append).` (CLI: `--force`)
-    *   `tag`: `Specify which tag context the task belongs to. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Generate a detailed implementation plan for a complex task before starting coding. Automatically uses complexity report recommendations if available and `num` is not specified.
-*   **Important:** This MCP tool makes AI calls and can take up to a minute to complete. Please inform users to hang tight while the operation is in progress.
-
-### 14. Expand All Tasks (`expand_all`)
-
-*   **MCP Tool:** `expand_all`
-*   **CLI Command:** `task-master expand --all [options]` (Note: CLI uses the `expand` command with the `--all` flag)
-*   **Description:** `Tell Taskmaster to automatically expand all eligible pending/in-progress tasks based on complexity analysis or defaults. Appends subtasks by default.`
-*   **Key Parameters/Options:**
-    *   `num`: `Optional: Suggests how many subtasks Taskmaster should aim to create per task.` (CLI: `-n, --num <number>`)
-    *   `research`: `Enable research role for more informed subtask generation. Requires appropriate API key.` (CLI: `-r, --research`)
-    *   `prompt`: `Optional: Provide extra context for Taskmaster to apply generally during expansion.` (CLI: `-p, --prompt <text>`)
-    *   `force`: `Optional: If true, clear existing subtasks before generating new ones for each eligible task. Default is false (append).` (CLI: `--force`)
-    *   `tag`: `Specify which tag context to expand. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Useful after initial task generation or complexity analysis to break down multiple tasks at once.
-*   **Important:** This MCP tool makes AI calls and can take up to a minute to complete. Please inform users to hang tight while the operation is in progress.
-
-### 15. Clear Subtasks (`clear_subtasks`)
-
-*   **MCP Tool:** `clear_subtasks`
-*   **CLI Command:** `task-master clear-subtasks [options]`
-*   **Description:** `Remove all subtasks from one or more specified Taskmaster parent tasks.`
-*   **Key Parameters/Options:**
-    *   `id`: `The ID(s) of the Taskmaster parent task(s) whose subtasks you want to remove, e.g., '15' or '16,18'. Required unless using `all`.) (CLI: `-i, --id <ids>`)
-    *   `all`: `Tell Taskmaster to remove subtasks from all parent tasks.` (CLI: `--all`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Used before regenerating subtasks with `expand_task` if the previous breakdown needs replacement.
-
-### 16. Remove Subtask (`remove_subtask`)
-
-*   **MCP Tool:** `remove_subtask`
-*   **CLI Command:** `task-master remove-subtask [options]`
-*   **Description:** `Remove a subtask from its Taskmaster parent, optionally converting it into a standalone task.`
-*   **Key Parameters/Options:**
-    *   `id`: `Required. The ID(s) of the Taskmaster subtask(s) to remove, e.g., '15.2' or '16.1,16.3'.` (CLI: `-i, --id <id>`)
-    *   `convert`: `If used, Taskmaster will turn the subtask into a regular top-level task instead of deleting it.` (CLI: `-c, --convert`)
-    *   `skipGenerate`: `Prevent Taskmaster from automatically regenerating markdown task files after removing the subtask.` (CLI: `--skip-generate`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Delete unnecessary subtasks or promote a subtask to a top-level task.
-
-### 17. Move Task (`move_task`)
-
-*   **MCP Tool:** `move_task`
-*   **CLI Command:** `task-master move [options]`
-*   **Description:** `Move a task or subtask to a new position within the task hierarchy.`
-*   **Key Parameters/Options:**
-    *   `from`: `Required. ID of the task/subtask to move (e.g., "5" or "5.2"). Can be comma-separated for multiple tasks.` (CLI: `--from <id>`)
-    *   `to`: `Required. ID of the destination (e.g., "7" or "7.3"). Must match the number of source IDs if comma-separated.` (CLI: `--to <id>`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Reorganize tasks by moving them within the hierarchy. Supports various scenarios like:
-    *   Moving a task to become a subtask
-    *   Moving a subtask to become a standalone task
-    *   Moving a subtask to a different parent
-    *   Reordering subtasks within the same parent
-    *   Moving a task to a new, non-existent ID (automatically creates placeholders)
-    *   Moving multiple tasks at once with comma-separated IDs
-*   **Validation Features:**
-    *   Allows moving tasks to non-existent destination IDs (creates placeholder tasks)
-    *   Prevents moving to existing task IDs that already have content (to avoid overwriting)
-    *   Validates that source tasks exist before attempting to move them
-    *   Maintains proper parent-child relationships
-*   **Example CLI:** `task-master move --from=5.2 --to=7.3` to move subtask 5.2 to become subtask 7.3.
-*   **Example Multi-Move:** `task-master move --from=10,11,12 --to=16,17,18` to move multiple tasks to new positions.
-*   **Common Use:** Resolving merge conflicts in tasks.json when multiple team members create tasks on different branches.
-
---
-
-## Dependency Management
-
-### 18. Add Dependency (`add_dependency`)
-
-*   **MCP Tool:** `add_dependency`
-*   **CLI Command:** `task-master add-dependency [options]`
-*   **Description:** `Define a dependency in Taskmaster, making one task a prerequisite for another.`
-*   **Key Parameters/Options:**
-    *   `id`: `Required. The ID of the Taskmaster task that will depend on another.` (CLI: `-i, --id <id>`)
-    *   `dependsOn`: `Required. The ID of the Taskmaster task that must be completed first, the prerequisite.` (CLI: `-d, --depends-on <id>`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <path>`)
-*   **Usage:** Establish the correct order of execution between tasks.
-
-### 19. Remove Dependency (`remove_dependency`)
-
-*   **MCP Tool:** `remove_dependency`
-*   **CLI Command:** `task-master remove-dependency [options]`
-*   **Description:** `Remove a dependency relationship between two Taskmaster tasks.`
-*   **Key Parameters/Options:**
-    *   `id`: `Required. The ID of the Taskmaster task you want to remove a prerequisite from.` (CLI: `-i, --id <id>`)
-    *   `dependsOn`: `Required. The ID of the Taskmaster task that should no longer be a prerequisite.` (CLI: `-d, --depends-on <id>`)
-    *   `tag`: `Specify which tag context to operate on. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Update task relationships when the order of execution changes.
-
-### 20. Validate Dependencies (`validate_dependencies`)
-
-*   **MCP Tool:** `validate_dependencies`
-*   **CLI Command:** `task-master validate-dependencies [options]`
-*   **Description:** `Check your Taskmaster tasks for dependency issues (like circular references or links to non-existent tasks) without making changes.`
-*   **Key Parameters/Options:**
-    *   `tag`: `Specify which tag context to validate. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Audit the integrity of your task dependencies.
-
-### 21. Fix Dependencies (`fix_dependencies`)
-
-*   **MCP Tool:** `fix_dependencies`
-*   **CLI Command:** `task-master fix-dependencies [options]`
-*   **Description:** `Automatically fix dependency issues (like circular references or links to non-existent tasks) in your Taskmaster tasks.`
-*   **Key Parameters/Options:**
-    *   `tag`: `Specify which tag context to fix dependencies in. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Clean up dependency errors automatically.
-
---
-
-## Analysis & Reporting
-
-### 22. Analyze Project Complexity (`analyze_project_complexity`)
-
-*   **MCP Tool:** `analyze_project_complexity`
-*   **CLI Command:** `task-master analyze-complexity [options]`
-*   **Description:** `Have Taskmaster analyze your tasks to determine their complexity and suggest which ones need to be broken down further.`
-*   **Key Parameters/Options:**
-    *   `output`: `Where to save the complexity analysis report. Default is '.taskmaster/reports/task-complexity-report.json' (or '..._tagname.json' if a tag is used).` (CLI: `-o, --output <file>`)
-    *   `threshold`: `The minimum complexity score (1-10) that should trigger a recommendation to expand a task.` (CLI: `-t, --threshold <number>`)
-    *   `research`: `Enable research role for more accurate complexity analysis. Requires appropriate API key.` (CLI: `-r, --research`)
-    *   `tag`: `Specify which tag context to analyze. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Used before breaking down tasks to identify which ones need the most attention.
-*   **Important:** This MCP tool makes AI calls and can take up to a minute to complete. Please inform users to hang tight while the operation is in progress.
-
-### 23. View Complexity Report (`complexity_report`)
-
-*   **MCP Tool:** `complexity_report`
-*   **CLI Command:** `task-master complexity-report [options]`
-*   **Description:** `Display the task complexity analysis report in a readable format.`
-*   **Key Parameters/Options:**
-    *   `tag`: `Specify which tag context to show the report for. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to the complexity report (default: '.taskmaster/reports/task-complexity-report.json').` (CLI: `-f, --file <file>`)
-*   **Usage:** Review and understand the complexity analysis results after running analyze-complexity.
-
---
-
-## File Management
-
-### 24. Generate Task Files (`generate`)
-
-*   **MCP Tool:** `generate`
-*   **CLI Command:** `task-master generate [options]`
-*   **Description:** `Create or update individual Markdown files for each task based on your tasks.json.`
-*   **Key Parameters/Options:**
-    *   `output`: `The directory where Taskmaster should save the task files (default: in a 'tasks' directory).` (CLI: `-o, --output <directory>`)
-    *   `tag`: `Specify which tag context to generate files for. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-*   **Usage:** Run this after making changes to tasks.json to keep individual task files up to date. This command is now manual and no longer runs automatically.
-
---
-
-## AI-Powered Research
-
-### 25. Research (`research`)
-
-*   **MCP Tool:** `research`
-*   **CLI Command:** `task-master research [options]`
-*   **Description:** `Perform AI-powered research queries with project context to get fresh, up-to-date information beyond the AI's knowledge cutoff.`
-*   **Key Parameters/Options:**
-    *   `query`: `Required. Research query/prompt (e.g., "What are the latest best practices for React Query v5?").` (CLI: `[query]` positional or `-q, --query <text>`)
-    *   `taskIds`: `Comma-separated list of task/subtask IDs from the current tag context (e.g., "15,16.2,17").` (CLI: `-i, --id <ids>`)
-    *   `filePaths`: `Comma-separated list of file paths for context (e.g., "src/api.js,docs/readme.md").` (CLI: `-f, --files <paths>`)
-    *   `customContext`: `Additional custom context text to include in the research.` (CLI: `-c, --context <text>`)
-    *   `includeProjectTree`: `Include project file tree structure in context (default: false).` (CLI: `--tree`)
-    *   `detailLevel`: `Detail level for the research response: 'low', 'medium', 'high' (default: medium).` (CLI: `--detail <level>`)
-    *   `saveTo`: `Task or subtask ID (e.g., "15", "15.2") to automatically save the research conversation to.` (CLI: `--save-to <id>`)
-    *   `saveFile`: `If true, saves the research conversation to a markdown file in '.taskmaster/docs/research/'.` (CLI: `--save-file`)
-    *   `noFollowup`: `Disables the interactive follow-up question menu in the CLI.` (CLI: `--no-followup`)
-    *   `tag`: `Specify which tag context to use for task-based context gathering. Defaults to the current active tag.` (CLI: `--tag <name>`)
-    *   `projectRoot`: `The directory of the project. Must be an absolute path.` (CLI: Determined automatically)
-*   **Usage:** **This is a POWERFUL tool that agents should use FREQUENTLY** to:
-    *   Get fresh information beyond knowledge cutoff dates
-    *   Research latest best practices, library updates, security patches
-    *   Find implementation examples for specific technologies
-    *   Validate approaches against current industry standards
-    *   Get contextual advice based on project files and tasks
-*   **When to Consider Using Research:**
-    *   **Before implementing any task** - Research current best practices
-    *   **When encountering new technologies** - Get up-to-date implementation guidance (libraries, apis, etc)
-    *   **For security-related tasks** - Find latest security recommendations
-    *   **When updating dependencies** - Research breaking changes and migration guides
-    *   **For performance optimization** - Get current performance best practices
-    *   **When debugging complex issues** - Research known solutions and workarounds
-*   **Research + Action Pattern:**
-    *   Use `research` to gather fresh information
-    *   Use `update_subtask` to commit findings with timestamps
-    *   Use `update_task` to incorporate research into task details
-    *   Use `add_task` with research flag for informed task creation
-*   **Important:** This MCP tool makes AI calls and can take up to a minute to complete. The research provides FRESH data beyond the AI's training cutoff, making it invaluable for current best practices and recent developments.
-
---
-
-## Tag Management
-
-This new suite of commands allows you to manage different task contexts (tags).
-
-### 26. List Tags (`tags`)
-
-*   **MCP Tool:** `list_tags`
-*   **CLI Command:** `task-master tags [options]`
-*   **Description:** `List all available tags with task counts, completion status, and other metadata.`
-*   **Key Parameters/Options:**
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-    *   `--show-metadata`: `Include detailed metadata in the output (e.g., creation date, description).` (CLI: `--show-metadata`)
-
-### 27. Add Tag (`add_tag`)
-
-*   **MCP Tool:** `add_tag`
-*   **CLI Command:** `task-master add-tag <tagName> [options]`
-*   **Description:** `Create a new, empty tag context, or copy tasks from another tag.`
-*   **Key Parameters/Options:**
-    *   `tagName`: `Name of the new tag to create (alphanumeric, hyphens, underscores).` (CLI: `<tagName>` positional)
-    *   `--from-branch`: `Creates a tag with a name derived from the current git branch, ignoring the <tagName> argument.` (CLI: `--from-branch`)
-    *   `--copy-from-current`: `Copy tasks from the currently active tag to the new tag.` (CLI: `--copy-from-current`)
-    *   `--copy-from <tag>`: `Copy tasks from a specific source tag to the new tag.` (CLI: `--copy-from <tag>`)
-    *   `--description <text>`: `Provide an optional description for the new tag.` (CLI: `-d, --description <text>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-
-### 28. Delete Tag (`delete_tag`)
-
-*   **MCP Tool:** `delete_tag`
-*   **CLI Command:** `task-master delete-tag <tagName> [options]`
-*   **Description:** `Permanently delete a tag and all of its associated tasks.`
-*   **Key Parameters/Options:**
-    *   `tagName`: `Name of the tag to delete.` (CLI: `<tagName>` positional)
-    *   `--yes`: `Skip the confirmation prompt.` (CLI: `-y, --yes`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-
-### 29. Use Tag (`use_tag`)
-
-*   **MCP Tool:** `use_tag`
-*   **CLI Command:** `task-master use-tag <tagName>`
-*   **Description:** `Switch your active task context to a different tag.`
-*   **Key Parameters/Options:**
-    *   `tagName`: `Name of the tag to switch to.` (CLI: `<tagName>` positional)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-
-### 30. Rename Tag (`rename_tag`)
-
-*   **MCP Tool:** `rename_tag`
-*   **CLI Command:** `task-master rename-tag <oldName> <newName>`
-*   **Description:** `Rename an existing tag.`
-*   **Key Parameters/Options:**
-    *   `oldName`: `The current name of the tag.` (CLI: `<oldName>` positional)
-    *   `newName`: `The new name for the tag.` (CLI: `<newName>` positional)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file. Default relies on auto-detection.` (CLI: `-f, --file <file>`)
-
-### 31. Copy Tag (`copy_tag`)
-
-*   **MCP Tool:** `copy_tag`
-*   **CLI Command:** `task-master copy-tag <sourceName> <targetName> [options]`
-*   **Description:** `Copy an entire tag context, including all its tasks and metadata, to a new tag.`
-*   **Key Parameters/Options:**
-    *   `sourceName`: `Name of the tag to copy from.` (CLI: `<sourceName>` positional)
-    *   `targetName`: `Name of the new tag to create.` (CLI: `<targetName>` positional)
-    *   `--description <text>`: `Optional description for the new tag.` (CLI: `-d, --description <text>`)
-
---
-
-## Miscellaneous
-
-### 32. Sync Readme (`sync-readme`) -- experimental
-
-*   **MCP Tool:** N/A
-*   **CLI Command:** `task-master sync-readme [options]`
-*   **Description:** `Exports your task list to your project's README.md file, useful for showcasing progress.`
-*   **Key Parameters/Options:**
-    *   `status`: `Filter tasks by status (e.g., 'pending', 'done').` (CLI: `-s, --status <status>`)
-    *   `withSubtasks`: `Include subtasks in the export.` (CLI: `--with-subtasks`)
-    *   `tag`: `Specify which tag context to export from. Defaults to the current active tag.` (CLI: `--tag <name>`)
-
---
-
-## Environment Variables Configuration (Updated)
-
-Taskmaster primarily uses the **`.taskmaster/config.json`** file (in project root) for configuration (models, parameters, logging level, etc.), managed via `task-master models --setup`.
-
-Environment variables are used **only** for sensitive API keys related to AI providers and specific overrides like the Ollama base URL:
-
-*   **API Keys (Required for corresponding provider):**
-    *   `ANTHROPIC_API_KEY`
-    *   `PERPLEXITY_API_KEY`
-    *   `OPENAI_API_KEY`
-    *   `GOOGLE_API_KEY`
-    *   `MISTRAL_API_KEY`
-    *   `AZURE_OPENAI_API_KEY` (Requires `AZURE_OPENAI_ENDPOINT` too)
-    *   `OPENROUTER_API_KEY`
-    *   `XAI_API_KEY`
-    *   `OLLAMA_API_KEY` (Requires `OLLAMA_BASE_URL` too)
-*   **Endpoints (Optional/Provider Specific inside .taskmaster/config.json):**
-    *   `AZURE_OPENAI_ENDPOINT`
-    *   `OLLAMA_BASE_URL` (Default: `http://localhost:11434/api`)
-
-**Set API keys** in your **`.env`** file in the project root (for CLI use) or within the `env` section of your **`.cursor/mcp.json`** file (for MCP/Cursor integration). All other settings (model choice, max tokens, temperature, log level, custom endpoints) are managed in `.taskmaster/config.json` via `task-master models` command or `models` MCP tool.
-
---
-
-For details on how these commands fit into the development process, see the [Development Workflow Guide](mdc:.cursor/rules/dev_workflow.mdc).
--- a/bin/task-master.js
+++ b/bin/task-master.js
@@ -373,4 +373,8 @@ if (process.argv.length <= 2) {
 }

 // Add exports at the end of the file
-export { detectCamelCaseFlags };
+if (typeof module !== 'undefined') {
+	module.exports = {
+		detectCamelCaseFlags
+	};
+}
--- a/biome.json
+++ b/biome.json
@@ -6,8 +6,7 @@
 			".changeset",
 			"tasks",
 			"package-lock.json",
-			"tests/fixture/*.json",
-			"dist"
+			"tests/fixture/*.json"
 		]
 	},
 	"formatter": {
--- a/docs/command-reference.md
+++ b/docs/command-reference.md
@@ -302,60 +302,8 @@ task-master delete-tag <tag-name> --yes
 ```bash
 # Initialize a new project with Task Master structure
 task-master init
-
-# Initialize a new project applying specific rules
-task-master init --rules cursor,windsurf,vscode
 ```

- The `--rules` flag allows you to specify one or more rule profiles (e.g., `cursor`, `roo`, `windsurf`, `cline`) to apply during initialization.
- If omitted, all available rule profiles are installed by default (claude, cline, codex, cursor, roo, trae, vscode, windsurf).
- You can use multiple comma-separated profiles in a single command.
-
-## Manage Rules
-
-```bash
-# Add rule profiles to your project
-# (e.g., .roo/rules, .windsurf/rules)
-task-master rules add <profile1,profile2,...>
-
-# Remove rule sets from your project
-task-master rules remove <profile1,profile2,...>
-
-# Remove rule sets bypassing safety check (dangerous)
-task-master rules remove <profile1,profile2,...> --force
-
-# Launch interactive rules setup to select rules
-# (does not re-initialize project or ask about shell aliases)
-task-master rules setup
-```
-
- Adding rules creates the profile and rules directory (e.g., `.roo/rules`) and copies/initializes the rules.
- Removing rules deletes the profile and rules directory and associated MCP config.
- **Safety Check**: Attempting to remove rule profiles will trigger a critical warning requiring confirmation. Use `--force` to bypass.
- You can use multiple comma-separated rules in a single command.
- The `setup` action launches an interactive prompt to select which rules to apply. The list of rules is always current with the available profiles, and no manual updates are needed. This command does **not** re-initialize your project or affect shell aliases; it only manages rules interactively.
-
-**Examples:**
-
-```bash
-task-master rules add windsurf,roo,vscode
-task-master rules remove windsurf
-task-master rules setup
-```
-
-### Interactive Rules Setup
-
-You can launch the interactive rules setup at any time with:
-
-```bash
-task-master rules setup
-```
-
-This command opens a prompt where you can select which rule profiles (e.g., Cursor, Roo, Windsurf) you want to add to your project. This does **not** re-initialize your project or ask about shell aliases; it only manages rules.
-
- Use this command to add rule profiles interactively after project creation.
- The same interactive prompt is also used during `init` if you don't specify rules with `--rules`.
-
 ## Configure AI Models

 ```bash
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -2,6 +2,7 @@

 Taskmaster uses two primary methods for configuration:

+1.  **`.taskmaster/config.json` File (Recommended - New Structure)**
 1.  **`.taskmaster/config.json` File (Recommended - New Structure)**

    - This JSON file stores most configuration settings, including AI model selections, parameters, logging levels, and project defaults.
@@ -72,7 +73,6 @@ Taskmaster uses two primary methods for configuration:
  - `XAI_API_KEY`: Your X-AI API key.
 - **Optional Endpoint Overrides:**
  - **Per-role `baseURL` in `.taskmasterconfig`:** You can add a `baseURL` property to any model role (`main`, `research`, `fallback`) to override the default API endpoint for that provider. If omitted, the provider's standard endpoint is used.
-  - **Environment Variable Overrides (`<PROVIDER>_BASE_URL`):** For greater flexibility, especially with third-party services, you can set an environment variable like `OPENAI_BASE_URL` or `MISTRAL_BASE_URL`. This will override any `baseURL` set in the configuration file for that provider. This is the recommended way to connect to OpenAI-compatible APIs.
  - `AZURE_OPENAI_ENDPOINT`: Required if using Azure OpenAI key (can also be set as `baseURL` for the Azure model role).
  - `OLLAMA_BASE_URL`: Override the default Ollama API URL (Default: `http://localhost:11434/api`).
  - `VERTEX_PROJECT_ID`: Your Google Cloud project ID for Vertex AI. Required when using the 'vertex' provider.
@@ -132,14 +132,13 @@ PERPLEXITY_API_KEY=pplx-your-key-here
 # etc.

 # Optional Endpoint Overrides
-# Use a specific provider's base URL, e.g., for an OpenAI-compatible API
-# OPENAI_BASE_URL=https://api.third-party.com/v1
-#
 # AZURE_OPENAI_ENDPOINT=https://your-azure-endpoint.openai.azure.com/
 # OLLAMA_BASE_URL=http://custom-ollama-host:11434/api

 # Google Vertex AI Configuration (Required if using 'vertex' provider)
 # VERTEX_PROJECT_ID=your-gcp-project-id
+# VERTEX_LOCATION=us-central1
+# GOOGLE_APPLICATION_CREDENTIALS=/path/to/service-account-credentials.json
 ```

 ## Troubleshooting
--- a/docs/contributor-docs/testing-roo-integration.md
+++ b/docs/contributor-docs/testing-roo-integration.md
@@ -64,7 +64,7 @@ To manually verify that the Roo files are properly included in the package:
   ls -la .roo/rules
   ls -la .roo/rules-architect
   ls -la .roo/rules-ask
-   ls -la .roo/rules-orchestrator
+   ls -la .roo/rules-boomerang
   ls -la .roo/rules-code
   ls -la .roo/rules-debug
   ls -la .roo/rules-test
--- a/docs/examples/claude-code-usage.md
+++ b/docs/examples/claude-code-usage.md
@@ -1,169 +0,0 @@
-# Claude Code Provider Usage Example
-
-The Claude Code provider allows you to use Claude models through the Claude Code CLI without requiring an API key.
-
-## Configuration
-
-To use the Claude Code provider, update your `.taskmaster/config.json`:
-
-```json
-{
-  "models": {
-    "main": {
-      "provider": "claude-code",
-      "modelId": "sonnet",
-      "maxTokens": 64000,
-      "temperature": 0.2
-    },
-    "research": {
-      "provider": "claude-code",
-      "modelId": "opus",
-      "maxTokens": 32000,
-      "temperature": 0.1
-    },
-    "fallback": {
-      "provider": "claude-code",
-      "modelId": "sonnet",
-      "maxTokens": 64000,
-      "temperature": 0.2
-    }
-  }
-}
-```
-
-## Available Models
-
- `opus` - Claude Opus model (SWE score: 0.725)
- `sonnet` - Claude Sonnet model (SWE score: 0.727)
-
-## Usage
-
-Once configured, you can use Claude Code with all Task Master commands:
-
-```bash
-# Generate tasks from a PRD
-task-master parse-prd --input=prd.txt
-
-# Analyze project complexity
-task-master analyze-complexity
-
-# Show the next task to work on
-task-master next
-
-# View a specific task
-task-master show task-001
-
-# Update task status
-task-master set-status --id=task-001 --status=in-progress
-```
-
-## Requirements
-
-1. Claude Code CLI must be installed and authenticated on your system
-2. Install the optional `@anthropic-ai/claude-code` package if you enable this provider:
-   ```bash
-   npm install @anthropic-ai/claude-code
-   ```
-3. No API key is required in your environment variables or MCP configuration
-
-## Advanced Settings
-
-The Claude Code SDK supports additional settings that provide fine-grained control over Claude's behavior. While these settings are implemented in the underlying SDK (`src/ai-providers/custom-sdk/claude-code/`), they are not currently exposed through Task Master's standard API due to architectural constraints.
-
-### Supported Settings
-
-```javascript
-const settings = {
-  // Maximum conversation turns Claude can make in a single request
-  maxTurns: 5,
-  
-  // Custom system prompt to override Claude Code's default behavior
-  customSystemPrompt: "You are a helpful assistant focused on code quality",
-  
-  // Permission mode for file system operations
-  permissionMode: 'default', // Options: 'default', 'restricted', 'permissive'
-  
-  // Explicitly allow only certain tools
-  allowedTools: ['Read', 'LS'], // Claude can only read files and list directories
-  
-  // Explicitly disallow certain tools
-  disallowedTools: ['Write', 'Edit'], // Prevent Claude from modifying files
-  
-  // MCP servers for additional tool integrations
-  mcpServers: []
-};
-```
-
-### Current Limitations
-
-Task Master uses a standardized `BaseAIProvider` interface that only passes through common parameters (modelId, messages, maxTokens, temperature) to maintain consistency across all providers. The Claude Code advanced settings are implemented in the SDK but not accessible through Task Master's high-level commands.
-
-### Future Integration Options
-
-For developers who need to use these advanced settings, there are three potential approaches:
-
-#### Option 1: Extend BaseAIProvider
-Modify the core Task Master architecture to support provider-specific settings:
-
-```javascript
-// In BaseAIProvider
-const result = await generateText({
-  model: client(params.modelId),
-  messages: params.messages,
-  maxTokens: params.maxTokens,
-  temperature: params.temperature,
-  ...params.providerSettings // New: pass through provider-specific settings
-});
-```
-
-#### Option 2: Override Methods in ClaudeCodeProvider
-Create custom implementations that extract and use Claude-specific settings:
-
-```javascript
-// In ClaudeCodeProvider
-async generateText(params) {
-  const { maxTurns, allowedTools, disallowedTools, ...baseParams } = params;
-  
-  const client = this.getClient({
-    ...baseParams,
-    settings: { maxTurns, allowedTools, disallowedTools }
-  });
-  
-  // Continue with generation...
-}
-```
-
-#### Option 3: Direct SDK Usage
-For immediate access to advanced features, developers can use the Claude Code SDK directly:
-
-```javascript
-import { createClaudeCode } from 'task-master-ai/ai-providers/custom-sdk/claude-code';
-
-const claude = createClaudeCode({
-  defaultSettings: {
-    maxTurns: 5,
-    allowedTools: ['Read', 'LS'],
-    disallowedTools: ['Write', 'Edit']
-  }
-});
-
-const model = claude('sonnet');
-const result = await generateText({
-  model,
-  messages: [{ role: 'user', content: 'Analyze this code...' }]
-});
-```
-
-### Why These Settings Matter
-
- **maxTurns**: Useful for complex refactoring tasks that require multiple iterations
- **customSystemPrompt**: Allows specializing Claude for specific domains or coding standards
- **permissionMode**: Critical for security in production environments
- **allowedTools/disallowedTools**: Enable read-only analysis modes or restrict access to sensitive operations
- **mcpServers**: Future extensibility for custom tool integrations
-
-## Notes
-
- The Claude Code provider doesn't track usage costs (shown as 0 in telemetry)
- Session management is handled automatically for conversation continuity
- Some AI SDK parameters (temperature, maxTokens) are not supported by Claude Code CLI and will be ignored
--- a/docs/models.md
+++ b/docs/models.md
@@ -1,137 +1,128 @@
-# Available Models as of June 20, 2025
+# Available Models as of June 13, 2025

 ## Main Models

-| Provider    | Model Name                                     | SWE Score | Input Cost | Output Cost |
-| ----------- | ---------------------------------------------- | --------- | ---------- | ----------- |
-| bedrock     | us.anthropic.claude-3-7-sonnet-20250219-v1:0   | 0.623     | 3          | 15          |
-| anthropic   | claude-sonnet-4-20250514                       | 0.727     | 3          | 15          |
-| anthropic   | claude-opus-4-20250514                         | 0.725     | 15         | 75          |
-| anthropic   | claude-3-7-sonnet-20250219                     | 0.623     | 3          | 15          |
-| anthropic   | claude-3-5-sonnet-20241022                     | 0.49      | 3          | 15          |
-| openai      | gpt-4o                                         | 0.332     | 2.5        | 10          |
-| openai      | o1                                             | 0.489     | 15         | 60          |
-| openai      | o3                                             | 0.5       | 2          | 8           |
-| openai      | o3-mini                                        | 0.493     | 1.1        | 4.4         |
-| openai      | o4-mini                                        | 0.45      | 1.1        | 4.4         |
-| openai      | o1-mini                                        | 0.4       | 1.1        | 4.4         |
-| openai      | o1-pro                                         | —         | 150        | 600         |
-| openai      | gpt-4-5-preview                                | 0.38      | 75         | 150         |
-| openai      | gpt-4-1-mini                                   | —         | 0.4        | 1.6         |
-| openai      | gpt-4-1-nano                                   | —         | 0.1        | 0.4         |
-| openai      | gpt-4o-mini                                    | 0.3       | 0.15       | 0.6         |
-| google      | gemini-2.5-pro-preview-05-06                   | 0.638     | —          | —           |
-| google      | gemini-2.5-pro-preview-03-25                   | 0.638     | —          | —           |
-| google      | gemini-2.5-flash-preview-04-17                 | 0.604     | —          | —           |
-| google      | gemini-2.0-flash                               | 0.518     | 0.15       | 0.6         |
-| google      | gemini-2.0-flash-lite                          | —         | —          | —           |
-| perplexity  | sonar-pro                                      | —         | 3          | 15          |
-| perplexity  | sonar-reasoning-pro                            | 0.211     | 2          | 8           |
-| perplexity  | sonar-reasoning                                | 0.211     | 1          | 5           |
-| xai         | grok-3                                         | —         | 3          | 15          |
-| xai         | grok-3-fast                                    | —         | 5          | 25          |
-| ollama      | devstral:latest                                | —         | 0          | 0           |
-| ollama      | qwen3:latest                                   | —         | 0          | 0           |
-| ollama      | qwen3:14b                                      | —         | 0          | 0           |
-| ollama      | qwen3:32b                                      | —         | 0          | 0           |
-| ollama      | mistral-small3.1:latest                        | —         | 0          | 0           |
-| ollama      | llama3.3:latest                                | —         | 0          | 0           |
-| ollama      | phi4:latest                                    | —         | 0          | 0           |
-| openrouter  | google/gemini-2.5-flash-preview-05-20          | —         | 0.15       | 0.6         |
-| openrouter  | google/gemini-2.5-flash-preview-05-20:thinking | —         | 0.15       | 3.5         |
-| openrouter  | google/gemini-2.5-pro-exp-03-25                | —         | 0          | 0           |
-| openrouter  | deepseek/deepseek-chat-v3-0324:free            | —         | 0          | 0           |
-| openrouter  | deepseek/deepseek-chat-v3-0324                 | —         | 0.27       | 1.1         |
-| openrouter  | openai/gpt-4.1                                 | —         | 2          | 8           |
-| openrouter  | openai/gpt-4.1-mini                            | —         | 0.4        | 1.6         |
-| openrouter  | openai/gpt-4.1-nano                            | —         | 0.1        | 0.4         |
-| openrouter  | openai/o3                                      | —         | 10         | 40          |
-| openrouter  | openai/codex-mini                              | —         | 1.5        | 6           |
-| openrouter  | openai/gpt-4o-mini                             | —         | 0.15       | 0.6         |
-| openrouter  | openai/o4-mini                                 | 0.45      | 1.1        | 4.4         |
-| openrouter  | openai/o4-mini-high                            | —         | 1.1        | 4.4         |
-| openrouter  | openai/o1-pro                                  | —         | 150        | 600         |
-| openrouter  | meta-llama/llama-3.3-70b-instruct              | —         | 120        | 600         |
-| openrouter  | meta-llama/llama-4-maverick                    | —         | 0.18       | 0.6         |
-| openrouter  | meta-llama/llama-4-scout                       | —         | 0.08       | 0.3         |
-| openrouter  | qwen/qwen-max                                  | —         | 1.6        | 6.4         |
-| openrouter  | qwen/qwen-turbo                                | —         | 0.05       | 0.2         |
-| openrouter  | qwen/qwen3-235b-a22b                           | —         | 0.14       | 2           |
-| openrouter  | mistralai/mistral-small-3.1-24b-instruct:free  | —         | 0          | 0           |
-| openrouter  | mistralai/mistral-small-3.1-24b-instruct       | —         | 0.1        | 0.3         |
-| openrouter  | mistralai/devstral-small                       | —         | 0.1        | 0.3         |
-| openrouter  | mistralai/mistral-nemo                         | —         | 0.03       | 0.07        |
-| openrouter  | thudm/glm-4-32b:free                           | —         | 0          | 0           |
-| claude-code | opus                                           | 0.725     | 0          | 0           |
-| claude-code | sonnet                                         | 0.727     | 0          | 0           |
+| Provider   | Model Name                                     | SWE Score | Input Cost | Output Cost |
+| ---------- | ---------------------------------------------- | --------- | ---------- | ----------- |
+| anthropic  | claude-sonnet-4-20250514                       | 0.727     | 3          | 15          |
+| anthropic  | claude-opus-4-20250514                         | 0.725     | 15         | 75          |
+| anthropic  | claude-3-7-sonnet-20250219                     | 0.623     | 3          | 15          |
+| anthropic  | claude-3-5-sonnet-20241022                     | 0.49      | 3          | 15          |
+| openai     | gpt-4o                                         | 0.332     | 2.5        | 10          |
+| openai     | o1                                             | 0.489     | 15         | 60          |
+| openai     | o3                                             | 0.5       | 2          | 8           |
+| openai     | o3-mini                                        | 0.493     | 1.1        | 4.4         |
+| openai     | o4-mini                                        | 0.45      | 1.1        | 4.4         |
+| openai     | o1-mini                                        | 0.4       | 1.1        | 4.4         |
+| openai     | o1-pro                                         | —         | 150        | 600         |
+| openai     | gpt-4-5-preview                                | 0.38      | 75         | 150         |
+| openai     | gpt-4-1-mini                                   | —         | 0.4        | 1.6         |
+| openai     | gpt-4-1-nano                                   | —         | 0.1        | 0.4         |
+| openai     | gpt-4o-mini                                    | 0.3       | 0.15       | 0.6         |
+| google     | gemini-2.5-pro-preview-05-06                   | 0.638     | —          | —           |
+| google     | gemini-2.5-pro-preview-03-25                   | 0.638     | —          | —           |
+| google     | gemini-2.5-flash-preview-04-17                 | —         | —          | —           |
+| google     | gemini-2.0-flash                               | 0.754     | 0.15       | 0.6         |
+| google     | gemini-2.0-flash-lite                          | —         | —          | —           |
+| perplexity | sonar-pro                                      | —         | 3          | 15          |
+| perplexity | sonar-reasoning-pro                            | 0.211     | 2          | 8           |
+| perplexity | sonar-reasoning                                | 0.211     | 1          | 5           |
+| xai        | grok-3                                         | —         | 3          | 15          |
+| xai        | grok-3-fast                                    | —         | 5          | 25          |
+| ollama     | devstral:latest                                | —         | 0          | 0           |
+| ollama     | qwen3:latest                                   | —         | 0          | 0           |
+| ollama     | qwen3:14b                                      | —         | 0          | 0           |
+| ollama     | qwen3:32b                                      | —         | 0          | 0           |
+| ollama     | mistral-small3.1:latest                        | —         | 0          | 0           |
+| ollama     | llama3.3:latest                                | —         | 0          | 0           |
+| ollama     | phi4:latest                                    | —         | 0          | 0           |
+| openrouter | google/gemini-2.5-flash-preview-05-20          | —         | 0.15       | 0.6         |
+| openrouter | google/gemini-2.5-flash-preview-05-20:thinking | —         | 0.15       | 3.5         |
+| openrouter | google/gemini-2.5-pro-exp-03-25                | —         | 0          | 0           |
+| openrouter | deepseek/deepseek-chat-v3-0324:free            | —         | 0          | 0           |
+| openrouter | deepseek/deepseek-chat-v3-0324                 | —         | 0.27       | 1.1         |
+| openrouter | openai/gpt-4.1                                 | —         | 2          | 8           |
+| openrouter | openai/gpt-4.1-mini                            | —         | 0.4        | 1.6         |
+| openrouter | openai/gpt-4.1-nano                            | —         | 0.1        | 0.4         |
+| openrouter | openai/o3                                      | —         | 10         | 40          |
+| openrouter | openai/codex-mini                              | —         | 1.5        | 6           |
+| openrouter | openai/gpt-4o-mini                             | —         | 0.15       | 0.6         |
+| openrouter | openai/o4-mini                                 | 0.45      | 1.1        | 4.4         |
+| openrouter | openai/o4-mini-high                            | —         | 1.1        | 4.4         |
+| openrouter | openai/o1-pro                                  | —         | 150        | 600         |
+| openrouter | meta-llama/llama-3.3-70b-instruct              | —         | 120        | 600         |
+| openrouter | meta-llama/llama-4-maverick                    | —         | 0.18       | 0.6         |
+| openrouter | meta-llama/llama-4-scout                       | —         | 0.08       | 0.3         |
+| openrouter | qwen/qwen-max                                  | —         | 1.6        | 6.4         |
+| openrouter | qwen/qwen-turbo                                | —         | 0.05       | 0.2         |
+| openrouter | qwen/qwen3-235b-a22b                           | —         | 0.14       | 2           |
+| openrouter | mistralai/mistral-small-3.1-24b-instruct:free  | —         | 0          | 0           |
+| openrouter | mistralai/mistral-small-3.1-24b-instruct       | —         | 0.1        | 0.3         |
+| openrouter | mistralai/devstral-small                       | —         | 0.1        | 0.3         |
+| openrouter | mistralai/mistral-nemo                         | —         | 0.03       | 0.07        |
+| openrouter | thudm/glm-4-32b:free                           | —         | 0          | 0           |

 ## Research Models

-| Provider    | Model Name                 | SWE Score | Input Cost | Output Cost |
-| ----------- | -------------------------- | --------- | ---------- | ----------- |
-| bedrock     | us.deepseek.r1-v1:0        | —         | 1.35       | 5.4         |
-| openai      | gpt-4o-search-preview      | 0.33      | 2.5        | 10          |
-| openai      | gpt-4o-mini-search-preview | 0.3       | 0.15       | 0.6         |
-| perplexity  | sonar-pro                  | —         | 3          | 15          |
-| perplexity  | sonar                      | —         | 1          | 1           |
-| perplexity  | deep-research              | 0.211     | 2          | 8           |
-| perplexity  | sonar-reasoning-pro        | 0.211     | 2          | 8           |
-| perplexity  | sonar-reasoning            | 0.211     | 1          | 5           |
-| xai         | grok-3                     | —         | 3          | 15          |
-| xai         | grok-3-fast                | —         | 5          | 25          |
-| claude-code | opus                       | 0.725     | 0          | 0           |
-| claude-code | sonnet                     | 0.727     | 0          | 0           |
+| Provider   | Model Name                 | SWE Score | Input Cost | Output Cost |
+| ---------- | -------------------------- | --------- | ---------- | ----------- |
+| openai     | gpt-4o-search-preview      | 0.33      | 2.5        | 10          |
+| openai     | gpt-4o-mini-search-preview | 0.3       | 0.15       | 0.6         |
+| perplexity | sonar-pro                  | —         | 3          | 15          |
+| perplexity | sonar                      | —         | 1          | 1           |
+| perplexity | deep-research              | 0.211     | 2          | 8           |
+| perplexity | sonar-reasoning-pro        | 0.211     | 2          | 8           |
+| perplexity | sonar-reasoning            | 0.211     | 1          | 5           |
+| xai        | grok-3                     | —         | 3          | 15          |
+| xai        | grok-3-fast                | —         | 5          | 25          |

 ## Fallback Models

-| Provider    | Model Name                                     | SWE Score | Input Cost | Output Cost |
-| ----------- | ---------------------------------------------- | --------- | ---------- | ----------- |
-| bedrock     | us.anthropic.claude-3-7-sonnet-20250219-v1:0   | 0.623     | 3          | 15          |
-| anthropic   | claude-sonnet-4-20250514                       | 0.727     | 3          | 15          |
-| anthropic   | claude-opus-4-20250514                         | 0.725     | 15         | 75          |
-| anthropic   | claude-3-7-sonnet-20250219                     | 0.623     | 3          | 15          |
-| anthropic   | claude-3-5-sonnet-20241022                     | 0.49      | 3          | 15          |
-| openai      | gpt-4o                                         | 0.332     | 2.5        | 10          |
-| openai      | o3                                             | 0.5       | 2          | 8           |
-| openai      | o4-mini                                        | 0.45      | 1.1        | 4.4         |
-| google      | gemini-2.5-pro-preview-05-06                   | 0.638     | —          | —           |
-| google      | gemini-2.5-pro-preview-03-25                   | 0.638     | —          | —           |
-| google      | gemini-2.5-flash-preview-04-17                 | 0.604     | —          | —           |
-| google      | gemini-2.0-flash                               | 0.518     | 0.15       | 0.6         |
-| google      | gemini-2.0-flash-lite                          | —         | —          | —           |
-| perplexity  | sonar-reasoning-pro                            | 0.211     | 2          | 8           |
-| perplexity  | sonar-reasoning                                | 0.211     | 1          | 5           |
-| xai         | grok-3                                         | —         | 3          | 15          |
-| xai         | grok-3-fast                                    | —         | 5          | 25          |
-| ollama      | devstral:latest                                | —         | 0          | 0           |
-| ollama      | qwen3:latest                                   | —         | 0          | 0           |
-| ollama      | qwen3:14b                                      | —         | 0          | 0           |
-| ollama      | qwen3:32b                                      | —         | 0          | 0           |
-| ollama      | mistral-small3.1:latest                        | —         | 0          | 0           |
-| ollama      | llama3.3:latest                                | —         | 0          | 0           |
-| ollama      | phi4:latest                                    | —         | 0          | 0           |
-| openrouter  | google/gemini-2.5-flash-preview-05-20          | —         | 0.15       | 0.6         |
-| openrouter  | google/gemini-2.5-flash-preview-05-20:thinking | —         | 0.15       | 3.5         |
-| openrouter  | google/gemini-2.5-pro-exp-03-25                | —         | 0          | 0           |
-| openrouter  | deepseek/deepseek-chat-v3-0324:free            | —         | 0          | 0           |
-| openrouter  | openai/gpt-4.1                                 | —         | 2          | 8           |
-| openrouter  | openai/gpt-4.1-mini                            | —         | 0.4        | 1.6         |
-| openrouter  | openai/gpt-4.1-nano                            | —         | 0.1        | 0.4         |
-| openrouter  | openai/o3                                      | —         | 10         | 40          |
-| openrouter  | openai/codex-mini                              | —         | 1.5        | 6           |
-| openrouter  | openai/gpt-4o-mini                             | —         | 0.15       | 0.6         |
-| openrouter  | openai/o4-mini                                 | 0.45      | 1.1        | 4.4         |
-| openrouter  | openai/o4-mini-high                            | —         | 1.1        | 4.4         |
-| openrouter  | openai/o1-pro                                  | —         | 150        | 600         |
-| openrouter  | meta-llama/llama-3.3-70b-instruct              | —         | 120        | 600         |
-| openrouter  | meta-llama/llama-4-maverick                    | —         | 0.18       | 0.6         |
-| openrouter  | meta-llama/llama-4-scout                       | —         | 0.08       | 0.3         |
-| openrouter  | qwen/qwen-max                                  | —         | 1.6        | 6.4         |
-| openrouter  | qwen/qwen-turbo                                | —         | 0.05       | 0.2         |
-| openrouter  | qwen/qwen3-235b-a22b                           | —         | 0.14       | 2           |
-| openrouter  | mistralai/mistral-small-3.1-24b-instruct:free  | —         | 0          | 0           |
-| openrouter  | mistralai/mistral-small-3.1-24b-instruct       | —         | 0.1        | 0.3         |
-| openrouter  | mistralai/mistral-nemo                         | —         | 0.03       | 0.07        |
-| openrouter  | thudm/glm-4-32b:free                           | —         | 0          | 0           |
-| claude-code | opus                                           | 0.725     | 0          | 0           |
-| claude-code | sonnet                                         | 0.727     | 0          | 0           |
+| Provider   | Model Name                                     | SWE Score | Input Cost | Output Cost |
+| ---------- | ---------------------------------------------- | --------- | ---------- | ----------- |
+| anthropic  | claude-sonnet-4-20250514                       | 0.727     | 3          | 15          |
+| anthropic  | claude-opus-4-20250514                         | 0.725     | 15         | 75          |
+| anthropic  | claude-3-7-sonnet-20250219                     | 0.623     | 3          | 15          |
+| anthropic  | claude-3-5-sonnet-20241022                     | 0.49      | 3          | 15          |
+| openai     | gpt-4o                                         | 0.332     | 2.5        | 10          |
+| openai     | o3                                             | 0.5       | 2          | 8           |
+| openai     | o4-mini                                        | 0.45      | 1.1        | 4.4         |
+| google     | gemini-2.5-pro-preview-05-06                   | 0.638     | —          | —           |
+| google     | gemini-2.5-pro-preview-03-25                   | 0.638     | —          | —           |
+| google     | gemini-2.5-flash-preview-04-17                 | —         | —          | —           |
+| google     | gemini-2.0-flash                               | 0.754     | 0.15       | 0.6         |
+| google     | gemini-2.0-flash-lite                          | —         | —          | —           |
+| perplexity | sonar-reasoning-pro                            | 0.211     | 2          | 8           |
+| perplexity | sonar-reasoning                                | 0.211     | 1          | 5           |
+| xai        | grok-3                                         | —         | 3          | 15          |
+| xai        | grok-3-fast                                    | —         | 5          | 25          |
+| ollama     | devstral:latest                                | —         | 0          | 0           |
+| ollama     | qwen3:latest                                   | —         | 0          | 0           |
+| ollama     | qwen3:14b                                      | —         | 0          | 0           |
+| ollama     | qwen3:32b                                      | —         | 0          | 0           |
+| ollama     | mistral-small3.1:latest                        | —         | 0          | 0           |
+| ollama     | llama3.3:latest                                | —         | 0          | 0           |
+| ollama     | phi4:latest                                    | —         | 0          | 0           |
+| openrouter | google/gemini-2.5-flash-preview-05-20          | —         | 0.15       | 0.6         |
+| openrouter | google/gemini-2.5-flash-preview-05-20:thinking | —         | 0.15       | 3.5         |
+| openrouter | google/gemini-2.5-pro-exp-03-25                | —         | 0          | 0           |
+| openrouter | deepseek/deepseek-chat-v3-0324:free            | —         | 0          | 0           |
+| openrouter | openai/gpt-4.1                                 | —         | 2          | 8           |
+| openrouter | openai/gpt-4.1-mini                            | —         | 0.4        | 1.6         |
+| openrouter | openai/gpt-4.1-nano                            | —         | 0.1        | 0.4         |
+| openrouter | openai/o3                                      | —         | 10         | 40          |
+| openrouter | openai/codex-mini                              | —         | 1.5        | 6           |
+| openrouter | openai/gpt-4o-mini                             | —         | 0.15       | 0.6         |
+| openrouter | openai/o4-mini                                 | 0.45      | 1.1        | 4.4         |
+| openrouter | openai/o4-mini-high                            | —         | 1.1        | 4.4         |
+| openrouter | openai/o1-pro                                  | —         | 150        | 600         |
+| openrouter | meta-llama/llama-3.3-70b-instruct              | —         | 120        | 600         |
+| openrouter | meta-llama/llama-4-maverick                    | —         | 0.18       | 0.6         |
+| openrouter | meta-llama/llama-4-scout                       | —         | 0.08       | 0.3         |
+| openrouter | qwen/qwen-max                                  | —         | 1.6        | 6.4         |
+| openrouter | qwen/qwen-turbo                                | —         | 0.05       | 0.2         |
+| openrouter | qwen/qwen3-235b-a22b                           | —         | 0.14       | 2           |
+| openrouter | mistralai/mistral-small-3.1-24b-instruct:free  | —         | 0          | 0           |
+| openrouter | mistralai/mistral-small-3.1-24b-instruct       | —         | 0.1        | 0.3         |
+| openrouter | mistralai/mistral-nemo                         | —         | 0.03       | 0.07        |
+| openrouter | thudm/glm-4-32b:free                           | —         | 0          | 0           |
--- a/index.js
+++ b/index.js
@@ -83,11 +83,6 @@ if (import.meta.url === `file://${process.argv[1]}`) {
 		.option('--skip-install', 'Skip installing dependencies')
 		.option('--dry-run', 'Show what would be done without making changes')
 		.option('--aliases', 'Add shell aliases (tm, taskmaster)')
-		.option('--no-aliases', 'Skip shell aliases (tm, taskmaster)')
-		.option('--git', 'Initialize Git repository')
-		.option('--no-git', 'Skip Git repository initialization')
-		.option('--git-tasks', 'Store tasks in Git')
-		.option('--no-git-tasks', 'No Git storage of tasks')
 		.action(async (cmdOptions) => {
 			try {
 				await runInitCLI(cmdOptions);
--- a/mcp-server/src/core/direct-functions/clear-subtasks.js
+++ b/mcp-server/src/core/direct-functions/clear-subtasks.js
@@ -5,11 +5,9 @@
 import { clearSubtasks } from '../../../../scripts/modules/task-manager.js';
 import {
 	enableSilentMode,
-	disableSilentMode,
-	readJSON
+	disableSilentMode
 } from '../../../../scripts/modules/utils.js';
 import fs from 'fs';
-import path from 'path';

 /**
 * Clear subtasks from specified tasks
@@ -17,13 +15,12 @@ import path from 'path';
 * @param {string} args.tasksJsonPath - Explicit path to the tasks.json file.
 * @param {string} [args.id] - Task IDs (comma-separated) to clear subtasks from
 * @param {boolean} [args.all] - Clear subtasks from all tasks
- * @param {string} [args.tag] - Tag context to operate on (defaults to current active tag)
 * @param {Object} log - Logger object
 * @returns {Promise<{success: boolean, data?: Object, error?: {code: string, message: string}}>}
 */
 export async function clearSubtasksDirect(args, log) {
 	// Destructure expected args
-	const { tasksJsonPath, id, all, tag, projectRoot } = args;
+	const { tasksJsonPath, id, all } = args;
 	try {
 		log.info(`Clearing subtasks with args: ${JSON.stringify(args)}`);

@@ -67,70 +64,52 @@ export async function clearSubtasksDirect(args, log) {

 		let taskIds;

-		// Use readJSON which handles silent migration and tag resolution
-		const data = readJSON(tasksPath, projectRoot, tag);
-
-		if (!data || !data.tasks) {
-			return {
-				success: false,
-				error: {
-					code: 'INPUT_VALIDATION_ERROR',
-					message: `No tasks found in tasks file: ${tasksPath}`
-				}
-			};
-		}
-
-		const currentTag = data.tag || 'master';
-		const tasks = data.tasks;
-
 		// If all is specified, get all task IDs
 		if (all) {
-			log.info(`Clearing subtasks from all tasks in tag '${currentTag}'`);
-			if (tasks.length === 0) {
+			log.info('Clearing subtasks from all tasks');
+			const data = JSON.parse(fs.readFileSync(tasksPath, 'utf8'));
+			if (!data || !data.tasks || data.tasks.length === 0) {
 				return {
 					success: false,
 					error: {
 						code: 'INPUT_VALIDATION_ERROR',
-						message: `No tasks found in tag context '${currentTag}'`
+						message: 'No valid tasks found in the tasks file'
 					}
 				};
 			}
-			taskIds = tasks.map((t) => t.id).join(',');
+			taskIds = data.tasks.map((t) => t.id).join(',');
 		} else {
 			// Use the provided task IDs
 			taskIds = id;
 		}

-		log.info(`Clearing subtasks from tasks: ${taskIds} in tag '${currentTag}'`);
+		log.info(`Clearing subtasks from tasks: ${taskIds}`);

 		// Enable silent mode to prevent console logs from interfering with JSON response
 		enableSilentMode();

 		// Call the core function
-		clearSubtasks(tasksPath, taskIds, { projectRoot, tag: currentTag });
+		clearSubtasks(tasksPath, taskIds);

 		// Restore normal logging
 		disableSilentMode();

 		// Read the updated data to provide a summary
-		const updatedData = readJSON(tasksPath, projectRoot, currentTag);
+		const updatedData = JSON.parse(fs.readFileSync(tasksPath, 'utf8'));
 		const taskIdArray = taskIds.split(',').map((id) => parseInt(id.trim(), 10));

 		// Build a summary of what was done
 		const clearedTasksCount = taskIdArray.length;
-		const updatedTasks = updatedData.tasks || [];
-
 		const taskSummary = taskIdArray.map((id) => {
-			const task = updatedTasks.find((t) => t.id === id);
+			const task = updatedData.tasks.find((t) => t.id === id);
 			return task ? { id, title: task.title } : { id, title: 'Task not found' };
 		});

 		return {
 			success: true,
 			data: {
-				message: `Successfully cleared subtasks from ${clearedTasksCount} task(s) in tag '${currentTag}'`,
-				tasksCleared: taskSummary,
-				tag: currentTag
+				message: `Successfully cleared subtasks from ${clearedTasksCount} task(s)`,
+				tasksCleared: taskSummary
 			}
 		};
 	} catch (error) {
--- a/mcp-server/src/core/direct-functions/expand-task.js
+++ b/mcp-server/src/core/direct-functions/expand-task.js
@@ -26,7 +26,6 @@ import { createLogWrapper } from '../../tools/utils.js';
 * @param {string} [args.prompt] - Additional context to guide subtask generation.
 * @param {boolean} [args.force] - Force expansion even if subtasks exist.
 * @param {string} [args.projectRoot] - Project root directory.
- * @param {string} [args.tag] - Tag for the task
 * @param {Object} log - Logger object
 * @param {Object} context - Context object containing session
 * @param {Object} [context.session] - MCP Session object
@@ -35,8 +34,7 @@ import { createLogWrapper } from '../../tools/utils.js';
 export async function expandTaskDirect(args, log, context = {}) {
 	const { session } = context; // Extract session
 	// Destructure expected args, including projectRoot
-	const { tasksJsonPath, id, num, research, prompt, force, projectRoot, tag } =
-		args;
+	const { tasksJsonPath, id, num, research, prompt, force, projectRoot } = args;

 	// Log session root data for debugging
 	log.info(
@@ -196,8 +194,7 @@ export async function expandTaskDirect(args, log, context = {}) {
 					session,
 					projectRoot,
 					commandName: 'expand-task',
-					outputType: 'mcp',
-					tag
+					outputType: 'mcp'
 				},
 				forceFlag
 			);
--- a/mcp-server/src/core/direct-functions/initialize-project.js
+++ b/mcp-server/src/core/direct-functions/initialize-project.js
@@ -5,13 +5,11 @@ import {
 	// isSilentMode // Not used directly here
 } from '../../../../scripts/modules/utils.js';
 import os from 'os'; // Import os module for home directory check
-import { RULE_PROFILES } from '../../../../src/constants/profiles.js';
-import { convertAllRulesToProfileRules } from '../../../../src/utils/rule-transformer.js';

 /**
 * Direct function wrapper for initializing a project.
 * Derives target directory from session, sets CWD, and calls core init logic.
- * @param {object} args - Arguments containing initialization options (addAliases, initGit, storeTasksInGit, skipInstall, yes, projectRoot, rules)
+ * @param {object} args - Arguments containing initialization options (addAliases, skipInstall, yes, projectRoot)
 * @param {object} log - The FastMCP logger instance.
 * @param {object} context - The context object, must contain { session }.
 * @returns {Promise<{success: boolean, data?: any, error?: {code: string, message: string}}>} - Standard result object.
@@ -65,24 +63,11 @@ export async function initializeProjectDirect(args, log, context = {}) {
 		// Construct options ONLY from the relevant flags in args
 		// The core initializeProject operates in the current CWD, which we just set
 		const options = {
-			addAliases: args.addAliases,
-			initGit: args.initGit,
-			storeTasksInGit: args.storeTasksInGit,
+			aliases: args.addAliases,
 			skipInstall: args.skipInstall,
 			yes: true // Force yes mode
 		};

-		// Handle rules option just like CLI
-		if (Array.isArray(args.rules) && args.rules.length > 0) {
-			options.rules = args.rules;
-			log.info(`Including rules: ${args.rules.join(', ')}`);
-		} else {
-			options.rules = RULE_PROFILES;
-			log.info(
-				`No rule profiles specified, defaulting to: ${RULE_PROFILES.join(', ')}`
-			);
-		}
-
 		log.info(`Initializing project with options: ${JSON.stringify(options)}`);
 		const result = await initializeProject(options); // Call core logic

--- a/mcp-server/src/core/direct-functions/models.js
+++ b/mcp-server/src/core/direct-functions/models.js
@@ -13,41 +13,6 @@ import {
 	disableSilentMode
 } from '../../../../scripts/modules/utils.js';
 import { createLogWrapper } from '../../tools/utils.js';
-import { CUSTOM_PROVIDERS_ARRAY } from '../../../../src/constants/providers.js';
-
-// Define supported roles for model setting
-const MODEL_ROLES = ['main', 'research', 'fallback'];
-
-/**
- * Determine provider hint from custom provider flags
- * @param {Object} args - Arguments containing provider flags
- * @returns {string|undefined} Provider hint or undefined if no custom provider flag is set
- */
-function getProviderHint(args) {
-	return CUSTOM_PROVIDERS_ARRAY.find((provider) => args[provider]);
-}
-
-/**
- * Handle setting models for different roles
- * @param {Object} args - Arguments containing role-specific model IDs
- * @param {Object} context - Context object with session, mcpLog, projectRoot
- * @returns {Object|null} Result if a model was set, null if no model setting was requested
- */
-async function handleModelSetting(args, context) {
-	for (const role of MODEL_ROLES) {
-		const roleKey = `set${role.charAt(0).toUpperCase() + role.slice(1)}`; // setMain, setResearch, setFallback
-
-		if (args[roleKey]) {
-			const providerHint = getProviderHint(args);
-
-			return await setModel(role, args[roleKey], {
-				...context,
-				providerHint
-			});
-		}
-	}
-	return null; // No model setting was requested
-}

 /**
 * Get or update model configuration
@@ -66,21 +31,16 @@ export async function modelsDirect(args, log, context = {}) {
 	log.info(`Executing models_direct with args: ${JSON.stringify(args)}`);
 	log.info(`Using project root: ${projectRoot}`);

-	// Validate flags: only one custom provider flag can be used simultaneously
-	const customProviderFlags = CUSTOM_PROVIDERS_ARRAY.filter(
-		(provider) => args[provider]
-	);
-
-	if (customProviderFlags.length > 1) {
+	// Validate flags: cannot use both openrouter and ollama simultaneously
+	if (args.openrouter && args.ollama) {
 		log.error(
-			'Error: Cannot use multiple custom provider flags simultaneously.'
+			'Error: Cannot use both openrouter and ollama flags simultaneously.'
 		);
 		return {
 			success: false,
 			error: {
 				code: 'INVALID_ARGS',
-				message:
-					'Cannot use multiple custom provider flags simultaneously. Choose only one: openrouter, ollama, bedrock, azure, or vertex.'
+				message: 'Cannot use both openrouter and ollama flags simultaneously.'
 			}
 		};
 	}
@@ -94,22 +54,55 @@ export async function modelsDirect(args, log, context = {}) {
 				return await getAvailableModelsList({
 					session,
 					mcpLog,
-					projectRoot
+					projectRoot // Pass projectRoot to function
 				});
 			}

-			// Handle setting any model role using unified function
-			const modelContext = { session, mcpLog, projectRoot };
-			const modelSetResult = await handleModelSetting(args, modelContext);
-			if (modelSetResult) {
-				return modelSetResult;
+			// Handle setting a specific model
+			if (args.setMain) {
+				return await setModel('main', args.setMain, {
+					session,
+					mcpLog,
+					projectRoot, // Pass projectRoot to function
+					providerHint: args.openrouter
+						? 'openrouter'
+						: args.ollama
+							? 'ollama'
+							: undefined // Pass hint
+				});
+			}
+
+			if (args.setResearch) {
+				return await setModel('research', args.setResearch, {
+					session,
+					mcpLog,
+					projectRoot, // Pass projectRoot to function
+					providerHint: args.openrouter
+						? 'openrouter'
+						: args.ollama
+							? 'ollama'
+							: undefined // Pass hint
+				});
+			}
+
+			if (args.setFallback) {
+				return await setModel('fallback', args.setFallback, {
+					session,
+					mcpLog,
+					projectRoot, // Pass projectRoot to function
+					providerHint: args.openrouter
+						? 'openrouter'
+						: args.ollama
+							? 'ollama'
+							: undefined // Pass hint
+				});
 			}

 			// Default action: get current configuration
 			return await getModelConfiguration({
 				session,
 				mcpLog,
-				projectRoot
+				projectRoot // Pass projectRoot to function
 			});
 		} finally {
 			disableSilentMode();
--- a/mcp-server/src/core/direct-functions/move-task.js
+++ b/mcp-server/src/core/direct-functions/move-task.js
@@ -71,11 +71,7 @@ export async function moveTaskDirect(args, log, context = {}) {
 			tasksPath,
 			args.sourceId,
 			args.destinationId,
-			generateFiles,
-			{
-				projectRoot: args.projectRoot,
-				tag: args.tag
-			}
+			generateFiles
 		);

 		// Restore console output
--- a/mcp-server/src/core/direct-functions/rules.js
+++ b/mcp-server/src/core/direct-functions/rules.js
@@ -1,210 +0,0 @@
-/**
- * rules.js
- * Direct function implementation for adding or removing rules
- */
-
-import {
-	enableSilentMode,
-	disableSilentMode
-} from '../../../../scripts/modules/utils.js';
-import {
-	convertAllRulesToProfileRules,
-	removeProfileRules,
-	getRulesProfile,
-	isValidProfile
-} from '../../../../src/utils/rule-transformer.js';
-import { RULE_PROFILES } from '../../../../src/constants/profiles.js';
-import { RULES_ACTIONS } from '../../../../src/constants/rules-actions.js';
-import {
-	wouldRemovalLeaveNoProfiles,
-	getInstalledProfiles
-} from '../../../../src/utils/profiles.js';
-import path from 'path';
-import fs from 'fs';
-
-/**
- * Direct function wrapper for adding or removing rules.
- * @param {Object} args - Command arguments
- * @param {"add"|"remove"} args.action - Action to perform: add or remove rules
- * @param {string[]} args.profiles - List of profiles to add or remove
- * @param {string} args.projectRoot - Absolute path to the project root
- * @param {boolean} [args.yes=true] - Run non-interactively
- * @param {Object} log - Logger object
- * @param {Object} context - Additional context (session)
- * @returns {Promise<Object>} - Result object { success: boolean, data?: any, error?: { code: string, message: string } }
- */
-export async function rulesDirect(args, log, context = {}) {
-	enableSilentMode();
-	try {
-		const { action, profiles, projectRoot, yes, force } = args;
-		if (
-			!action ||
-			!Array.isArray(profiles) ||
-			profiles.length === 0 ||
-			!projectRoot
-		) {
-			return {
-				success: false,
-				error: {
-					code: 'MISSING_ARGUMENT',
-					message: 'action, profiles, and projectRoot are required.'
-				}
-			};
-		}
-
-		const removalResults = [];
-		const addResults = [];
-
-		if (action === RULES_ACTIONS.REMOVE) {
-			// Safety check: Ensure this won't remove all rule profiles (unless forced)
-			if (!force && wouldRemovalLeaveNoProfiles(projectRoot, profiles)) {
-				const installedProfiles = getInstalledProfiles(projectRoot);
-				const remainingProfiles = installedProfiles.filter(
-					(profile) => !profiles.includes(profile)
-				);
-				return {
-					success: false,
-					error: {
-						code: 'CRITICAL_REMOVAL_BLOCKED',
-						message: `CRITICAL: This operation would remove ALL remaining rule profiles (${profiles.join(', ')}), leaving your project with no rules configurations. This could significantly impact functionality. Currently installed profiles: ${installedProfiles.join(', ')}. If you're certain you want to proceed, set force: true or use the CLI with --force flag.`
-					}
-				};
-			}
-
-			for (const profile of profiles) {
-				if (!isValidProfile(profile)) {
-					removalResults.push({
-						profileName: profile,
-						success: false,
-						error: `The requested rule profile for '${profile}' is unavailable. Supported profiles are: ${RULE_PROFILES.join(', ')}.`
-					});
-					continue;
-				}
-				const profileConfig = getRulesProfile(profile);
-				const result = removeProfileRules(projectRoot, profileConfig);
-				removalResults.push(result);
-			}
-			const successes = removalResults
-				.filter((r) => r.success)
-				.map((r) => r.profileName);
-			const skipped = removalResults
-				.filter((r) => r.skipped)
-				.map((r) => r.profileName);
-			const errors = removalResults.filter(
-				(r) => r.error && !r.success && !r.skipped
-			);
-			const withNotices = removalResults.filter((r) => r.notice);
-
-			let summary = '';
-			if (successes.length > 0) {
-				summary += `Successfully removed Task Master rules: ${successes.join(', ')}.`;
-			}
-			if (skipped.length > 0) {
-				summary += `Skipped (default or protected): ${skipped.join(', ')}.`;
-			}
-			if (errors.length > 0) {
-				summary += errors
-					.map((r) => `Error removing ${r.profileName}: ${r.error}`)
-					.join(' ');
-			}
-			if (withNotices.length > 0) {
-				summary += ` Notices: ${withNotices.map((r) => `${r.profileName} - ${r.notice}`).join('; ')}.`;
-			}
-			disableSilentMode();
-			return {
-				success: errors.length === 0,
-				data: { summary, results: removalResults }
-			};
-		} else if (action === RULES_ACTIONS.ADD) {
-			for (const profile of profiles) {
-				if (!isValidProfile(profile)) {
-					addResults.push({
-						profileName: profile,
-						success: false,
-						error: `Profile not found: static import missing for '${profile}'. Valid profiles: ${RULE_PROFILES.join(', ')}`
-					});
-					continue;
-				}
-				const profileConfig = getRulesProfile(profile);
-				const { success, failed } = convertAllRulesToProfileRules(
-					projectRoot,
-					profileConfig
-				);
-
-				// Determine paths
-				const rulesDir = profileConfig.rulesDir;
-				const profileRulesDir = path.join(projectRoot, rulesDir);
-				const profileDir = profileConfig.profileDir;
-				const mcpConfig = profileConfig.mcpConfig !== false;
-				const mcpPath =
-					mcpConfig && profileConfig.mcpConfigPath
-						? path.join(projectRoot, profileConfig.mcpConfigPath)
-						: null;
-
-				// Check what was created
-				const mcpConfigCreated =
-					mcpConfig && mcpPath ? fs.existsSync(mcpPath) : undefined;
-				const rulesDirCreated = fs.existsSync(profileRulesDir);
-				const profileFolderCreated = fs.existsSync(
-					path.join(projectRoot, profileDir)
-				);
-
-				const error =
-					failed > 0 ? `${failed} rule files failed to convert.` : null;
-				const resultObj = {
-					profileName: profile,
-					mcpConfigCreated,
-					rulesDirCreated,
-					profileFolderCreated,
-					skipped: false,
-					error,
-					success:
-						(mcpConfig ? mcpConfigCreated : true) &&
-						rulesDirCreated &&
-						success > 0 &&
-						!error
-				};
-				addResults.push(resultObj);
-			}
-
-			const successes = addResults
-				.filter((r) => r.success)
-				.map((r) => r.profileName);
-			const errors = addResults.filter((r) => r.error && !r.success);
-
-			let summary = '';
-			if (successes.length > 0) {
-				summary += `Successfully added rules: ${successes.join(', ')}.`;
-			}
-			if (errors.length > 0) {
-				summary += errors
-					.map((r) => ` Error adding ${r.profileName}: ${r.error}`)
-					.join(' ');
-			}
-			disableSilentMode();
-			return {
-				success: errors.length === 0,
-				data: { summary, results: addResults }
-			};
-		} else {
-			disableSilentMode();
-			return {
-				success: false,
-				error: {
-					code: 'INVALID_ACTION',
-					message: `Unknown action. Use "${RULES_ACTIONS.ADD}" or "${RULES_ACTIONS.REMOVE}".`
-				}
-			};
-		}
-	} catch (error) {
-		disableSilentMode();
-		log.error(`[rulesDirect] Error: ${error.message}`);
-		return {
-			success: false,
-			error: {
-				code: error.code || 'RULES_ERROR',
-				message: error.message
-			}
-		};
-	}
-}
--- a/mcp-server/src/tools/clear-subtasks.js
+++ b/mcp-server/src/tools/clear-subtasks.js
@@ -35,8 +35,7 @@ export function registerClearSubtasksTool(server) {
 					),
 				projectRoot: z
 					.string()
-					.describe('The directory of the project. Must be an absolute path.'),
-				tag: z.string().optional().describe('Tag context to operate on')
+					.describe('The directory of the project. Must be an absolute path.')
 			})
 			.refine((data) => data.id || data.all, {
 				message: "Either 'id' or 'all' parameter must be provided",
@@ -65,8 +64,7 @@ export function registerClearSubtasksTool(server) {
 						tasksJsonPath: tasksJsonPath,
 						id: args.id,
 						all: args.all,
-						projectRoot: args.projectRoot,
-						tag: args.tag || 'master'
+						projectRoot: args.projectRoot
 					},
 					log,
 					{ session }
--- a/mcp-server/src/tools/expand-task.js
+++ b/mcp-server/src/tools/expand-task.js
@@ -45,8 +45,7 @@ export function registerExpandTaskTool(server) {
 				.boolean()
 				.optional()
 				.default(false)
-				.describe('Force expansion even if subtasks exist'),
-			tag: z.string().optional().describe('Tag context to operate on')
+				.describe('Force expansion even if subtasks exist')
 		}),
 		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
 			try {
@@ -74,8 +73,7 @@ export function registerExpandTaskTool(server) {
 						research: args.research,
 						prompt: args.prompt,
 						force: args.force,
-						projectRoot: args.projectRoot,
-						tag: args.tag || 'master'
+						projectRoot: args.projectRoot
 					},
 					log,
 					{ session }
--- a/mcp-server/src/tools/index.js
+++ b/mcp-server/src/tools/index.js
@@ -36,7 +36,6 @@ import { registerUseTagTool } from './use-tag.js';
 import { registerRenameTagTool } from './rename-tag.js';
 import { registerCopyTagTool } from './copy-tag.js';
 import { registerResearchTool } from './research.js';
-import { registerRulesTool } from './rules.js';

 /**
 * Register all Task Master tools with the MCP server
@@ -49,7 +48,6 @@ export function registerTaskMasterTools(server) {
 		// Group 1: Initialization & Setup
 		registerInitializeProjectTool(server);
 		registerModelsTool(server);
-		registerRulesTool(server);
 		registerParsePRDTool(server);

 		// Group 2: Task Analysis & Expansion
--- a/mcp-server/src/tools/initialize-project.js
+++ b/mcp-server/src/tools/initialize-project.js
@@ -5,7 +5,6 @@ import {
 	withNormalizedProjectRoot
 } from './utils.js';
 import { initializeProjectDirect } from '../core/task-master-core.js';
-import { RULE_PROFILES } from '../../../src/constants/profiles.js';

 export function registerInitializeProjectTool(server) {
 	server.addTool({
@@ -23,18 +22,8 @@ export function registerInitializeProjectTool(server) {
 			addAliases: z
 				.boolean()
 				.optional()
-				.default(true)
+				.default(false)
 				.describe('Add shell aliases (tm, taskmaster) to shell config file.'),
-			initGit: z
-				.boolean()
-				.optional()
-				.default(true)
-				.describe('Initialize Git repository in project root.'),
-			storeTasksInGit: z
-				.boolean()
-				.optional()
-				.default(true)
-				.describe('Store tasks in Git (tasks.json and tasks/ directory).'),
 			yes: z
 				.boolean()
 				.optional()
@@ -46,12 +35,6 @@ export function registerInitializeProjectTool(server) {
 				.string()
 				.describe(
 					'The root directory for the project. ALWAYS SET THIS TO THE PROJECT ROOT DIRECTORY. IF NOT SET, THE TOOL WILL NOT WORK.'
-				),
-			rules: z
-				.array(z.enum(RULE_PROFILES))
-				.optional()
-				.describe(
-					`List of rule profiles to include at initialization. If omitted, defaults to all available profiles. Available options: ${RULE_PROFILES.join(', ')}`
 				)
 		}),
 		execute: withNormalizedProjectRoot(async (args, context) => {
--- a/mcp-server/src/tools/models.js
+++ b/mcp-server/src/tools/models.js
@@ -55,21 +55,7 @@ export function registerModelsTool(server) {
 			ollama: z
 				.boolean()
 				.optional()
-				.describe('Indicates the set model ID is a custom Ollama model.'),
-			bedrock: z
-				.boolean()
-				.optional()
-				.describe('Indicates the set model ID is a custom AWS Bedrock model.'),
-			azure: z
-				.boolean()
-				.optional()
-				.describe('Indicates the set model ID is a custom Azure OpenAI model.'),
-			vertex: z
-				.boolean()
-				.optional()
-				.describe(
-					'Indicates the set model ID is a custom Google Vertex AI model.'
-				)
+				.describe('Indicates the set model ID is a custom Ollama model.')
 		}),
 		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
 			try {
--- a/mcp-server/src/tools/rules.js
+++ b/mcp-server/src/tools/rules.js
@@ -1,59 +0,0 @@
-/**
- * tools/rules.js
- * Tool to add or remove rules from a project (MCP server)
- */
-
-import { z } from 'zod';
-import {
-	createErrorResponse,
-	handleApiResult,
-	withNormalizedProjectRoot
-} from './utils.js';
-import { rulesDirect } from '../core/direct-functions/rules.js';
-import { RULE_PROFILES } from '../../../src/constants/profiles.js';
-
-/**
- * Register the rules tool with the MCP server
- * @param {Object} server - FastMCP server instance
- */
-export function registerRulesTool(server) {
-	server.addTool({
-		name: 'rules',
-		description: 'Add or remove rule profiles from the project.',
-		parameters: z.object({
-			action: z
-				.enum(['add', 'remove'])
-				.describe('Whether to add or remove rule profiles.'),
-			profiles: z
-				.array(z.enum(RULE_PROFILES))
-				.min(1)
-				.describe(
-					`List of rule profiles to add or remove (e.g., [\"cursor\", \"roo\"]). Available options: ${RULE_PROFILES.join(', ')}`
-				),
-			projectRoot: z
-				.string()
-				.describe(
-					'The root directory of the project. Must be an absolute path.'
-				),
-			force: z
-				.boolean()
-				.optional()
-				.default(false)
-				.describe(
-					'DANGEROUS: Force removal even if it would leave no rule profiles. Only use if you are absolutely certain.'
-				)
-		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
-			try {
-				log.info(
-					`[rules tool] Executing action: ${args.action} for profiles: ${args.profiles.join(', ')} in ${args.projectRoot}`
-				);
-				const result = await rulesDirect(args, log, { session });
-				return handleApiResult(result, log);
-			} catch (error) {
-				log.error(`[rules tool] Error: ${error.message}`);
-				return createErrorResponse(error.message, { details: error.stack });
-			}
-		})
-	});
-}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "task-master-ai",
-	"version": "0.17.1",
+	"version": "0.17.0-rc.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "task-master-ai",
-			"version": "0.17.1",
+			"version": "0.17.0-rc.1",
 			"license": "MIT WITH Commons-Clause",
 			"dependencies": {
 				"@ai-sdk/amazon-bedrock": "^2.2.9",
@@ -20,7 +20,6 @@
 				"@ai-sdk/xai": "^1.2.15",
 				"@anthropic-ai/sdk": "^0.39.0",
 				"@aws-sdk/credential-providers": "^3.817.0",
-				"@inquirer/search": "^3.0.15",
 				"@openrouter/ai-sdk-provider": "^0.4.5",
 				"ai": "^4.3.10",
 				"boxen": "^8.0.1",
@@ -43,6 +42,7 @@
 				"ollama-ai-provider": "^1.2.0",
 				"openai": "^4.89.0",
 				"ora": "^8.2.0",
+				"task-master-ai": "0.17.0-rc.1",
 				"uuid": "^11.1.0",
 				"zod": "^3.23.8"
 			},
@@ -68,9 +68,6 @@
 			},
 			"engines": {
 				"node": ">=18.0.0"
-			},
-			"optionalDependencies": {
-				"@anthropic-ai/claude-code": "^1.0.25"
 			}
 		},
 		"node_modules/@ai-sdk/amazon-bedrock": {
@@ -449,28 +446,6 @@
 				"node": ">=6.0.0"
 			}
 		},
-		"node_modules/@anthropic-ai/claude-code": {
-			"version": "1.0.25",
-			"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.25.tgz",
-			"integrity": "sha512-5p4FLlFO4TuRf0zV0axiOxiAkUC8eer0lqJi/A/pA46LESv31Alw6xaNYgwQVkP6oSbP5PydK36u7YrB9QSaXQ==",
-			"hasInstallScript": true,
-			"license": "SEE LICENSE IN README.md",
-			"optional": true,
-			"bin": {
-				"claude": "cli.js"
-			},
-			"engines": {
-				"node": ">=18.0.0"
-			},
-			"optionalDependencies": {
-				"@img/sharp-darwin-arm64": "^0.33.5",
-				"@img/sharp-darwin-x64": "^0.33.5",
-				"@img/sharp-linux-arm": "^0.33.5",
-				"@img/sharp-linux-arm64": "^0.33.5",
-				"@img/sharp-linux-x64": "^0.33.5",
-				"@img/sharp-win32-x64": "^0.33.5"
-			}
-		},
 		"node_modules/@anthropic-ai/sdk": {
 			"version": "0.39.0",
 			"resolved": "https://registry.npmjs.org/@anthropic-ai/sdk/-/sdk-0.39.0.tgz",
@@ -2676,215 +2651,6 @@
 				"node": ">=18"
 			}
 		},
-		"node_modules/@img/sharp-darwin-arm64": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz",
-			"integrity": "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==",
-			"cpu": [
-				"arm64"
-			],
-			"license": "Apache-2.0",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			},
-			"optionalDependencies": {
-				"@img/sharp-libvips-darwin-arm64": "1.0.4"
-			}
-		},
-		"node_modules/@img/sharp-darwin-x64": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz",
-			"integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==",
-			"cpu": [
-				"x64"
-			],
-			"license": "Apache-2.0",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			},
-			"optionalDependencies": {
-				"@img/sharp-libvips-darwin-x64": "1.0.4"
-			}
-		},
-		"node_modules/@img/sharp-libvips-darwin-arm64": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz",
-			"integrity": "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==",
-			"cpu": [
-				"arm64"
-			],
-			"license": "LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
-		"node_modules/@img/sharp-libvips-darwin-x64": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz",
-			"integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==",
-			"cpu": [
-				"x64"
-			],
-			"license": "LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
-		"node_modules/@img/sharp-libvips-linux-arm": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz",
-			"integrity": "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==",
-			"cpu": [
-				"arm"
-			],
-			"license": "LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
-		"node_modules/@img/sharp-libvips-linux-arm64": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz",
-			"integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==",
-			"cpu": [
-				"arm64"
-			],
-			"license": "LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
-		"node_modules/@img/sharp-libvips-linux-x64": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz",
-			"integrity": "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==",
-			"cpu": [
-				"x64"
-			],
-			"license": "LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
-		"node_modules/@img/sharp-linux-arm": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz",
-			"integrity": "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==",
-			"cpu": [
-				"arm"
-			],
-			"license": "Apache-2.0",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			},
-			"optionalDependencies": {
-				"@img/sharp-libvips-linux-arm": "1.0.5"
-			}
-		},
-		"node_modules/@img/sharp-linux-arm64": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz",
-			"integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==",
-			"cpu": [
-				"arm64"
-			],
-			"license": "Apache-2.0",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			},
-			"optionalDependencies": {
-				"@img/sharp-libvips-linux-arm64": "1.0.4"
-			}
-		},
-		"node_modules/@img/sharp-linux-x64": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz",
-			"integrity": "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==",
-			"cpu": [
-				"x64"
-			],
-			"license": "Apache-2.0",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			},
-			"optionalDependencies": {
-				"@img/sharp-libvips-linux-x64": "1.0.4"
-			}
-		},
-		"node_modules/@img/sharp-win32-x64": {
-			"version": "0.33.5",
-			"resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz",
-			"integrity": "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==",
-			"cpu": [
-				"x64"
-			],
-			"license": "Apache-2.0 AND LGPL-3.0-or-later",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/libvips"
-			}
-		},
 		"node_modules/@inquirer/checkbox": {
 			"version": "4.1.4",
 			"resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.1.4.tgz",
@@ -2931,13 +2697,13 @@
 			}
 		},
 		"node_modules/@inquirer/core": {
-			"version": "10.1.13",
-			"resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.13.tgz",
-			"integrity": "sha512-1viSxebkYN2nJULlzCxES6G9/stgHSepZ9LqqfdIGPHj5OHhiBUXVS0a6R0bEC2A+VL4D9w6QB66ebCr6HGllA==",
+			"version": "10.1.9",
+			"resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.9.tgz",
+			"integrity": "sha512-sXhVB8n20NYkUBfDYgizGHlpRVaCRjtuzNZA6xpALIUbkgfd2Hjz+DfEN6+h1BRnuxw0/P4jCIMjMsEOAMwAJw==",
 			"license": "MIT",
 			"dependencies": {
-				"@inquirer/figures": "^1.0.12",
-				"@inquirer/type": "^3.0.7",
+				"@inquirer/figures": "^1.0.11",
+				"@inquirer/type": "^3.0.5",
 				"ansi-escapes": "^4.3.2",
 				"cli-width": "^4.1.0",
 				"mute-stream": "^2.0.0",
@@ -3057,9 +2823,9 @@
 			}
 		},
 		"node_modules/@inquirer/figures": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.12.tgz",
-			"integrity": "sha512-MJttijd8rMFcKJC8NYmprWr6hD3r9Gd9qUC0XwPNwoEPWSMVJwA2MlXxF+nhZZNMY+HXsWa+o7KY2emWYIn0jQ==",
+			"version": "1.0.11",
+			"resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.11.tgz",
+			"integrity": "sha512-eOg92lvrn/aRUqbxRyvpEWnrvRuTYRifixHkYVpJiygTgVSBIHDqLh0SrMQXkafvULg3ck11V7xvR+zcgvpHFw==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=18"
@@ -3181,14 +2947,14 @@
 			}
 		},
 		"node_modules/@inquirer/search": {
-			"version": "3.0.15",
-			"resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.15.tgz",
-			"integrity": "sha512-YBMwPxYBrADqyvP4nNItpwkBnGGglAvCLVW8u4pRmmvOsHUtCAUIMbUrLX5B3tFL1/WsLGdQ2HNzkqswMs5Uaw==",
+			"version": "3.0.11",
+			"resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.11.tgz",
+			"integrity": "sha512-9CWQT0ikYcg6Ls3TOa7jljsD7PgjcsYEM0bYE+Gkz+uoW9u8eaJCRHJKkucpRE5+xKtaaDbrND+nPDoxzjYyew==",
 			"license": "MIT",
 			"dependencies": {
-				"@inquirer/core": "^10.1.13",
-				"@inquirer/figures": "^1.0.12",
-				"@inquirer/type": "^3.0.7",
+				"@inquirer/core": "^10.1.9",
+				"@inquirer/figures": "^1.0.11",
+				"@inquirer/type": "^3.0.5",
 				"yoctocolors-cjs": "^2.1.2"
 			},
 			"engines": {
@@ -3228,9 +2994,9 @@
 			}
 		},
 		"node_modules/@inquirer/type": {
-			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.7.tgz",
-			"integrity": "sha512-PfunHQcjwnju84L+ycmcMKB/pTPIngjUJvfnRhKY6FKPuYXlM4aQCb/nIdTFR6BEhMjFvngzvng/vBAJMZpLSA==",
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.5.tgz",
+			"integrity": "sha512-ZJpeIYYueOz/i/ONzrfof8g89kNdO2hjGuvULROo3O8rlB2CRtSseE5KeirnyE4t/thAn/EwvS/vuQeJCn+NZg==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=18"
@@ -4102,19 +3868,6 @@
 				"node": ">= 0.6"
 			}
 		},
-		"node_modules/@noble/hashes": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
-			"integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^14.21.3 || >=16"
-			},
-			"funding": {
-				"url": "https://paulmillr.com/funding/"
-			}
-		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.5",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -4213,16 +3966,6 @@
 				"node": ">=8.0.0"
 			}
 		},
-		"node_modules/@paralleldrive/cuid2": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz",
-			"integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@noble/hashes": "^1.1.5"
-			}
-		},
 		"node_modules/@sec-ant/readable-stream": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz",
@@ -5585,9 +5328,9 @@
 			}
 		},
 		"node_modules/brace-expansion": {
-			"version": "1.1.12",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-			"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7416,19 +7159,16 @@
 			}
 		},
 		"node_modules/formidable": {
-			"version": "3.5.4",
-			"resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz",
-			"integrity": "sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==",
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz",
+			"integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@paralleldrive/cuid2": "^2.2.2",
 				"dezalgo": "^1.0.4",
+				"hexoid": "^2.0.0",
 				"once": "^1.4.0"
 			},
-			"engines": {
-				"node": ">=14.0.0"
-			},
 			"funding": {
 				"url": "https://ko-fi.com/tunnckoCore/commissions"
 			}
@@ -7932,6 +7672,16 @@
 				"node": ">=18.0.0"
 			}
 		},
+		"node_modules/hexoid": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz",
+			"integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/highlight.js": {
 			"version": "10.7.3",
 			"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
@@ -11620,6 +11370,58 @@
 				"react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
 			}
 		},
+		"node_modules/task-master-ai": {
+			"version": "0.17.0-rc.1",
+			"resolved": "https://registry.npmjs.org/task-master-ai/-/task-master-ai-0.17.0-rc.1.tgz",
+			"integrity": "sha512-4V70dlqedWj/i5RHXyKeqm2IFwNnFYB0Ndq4S8Mc9wghpENkAhXE1qVg27NscP1n+TrEu1HtgXVOfCMDdgvzag==",
+			"license": "MIT WITH Commons-Clause",
+			"dependencies": {
+				"@ai-sdk/amazon-bedrock": "^2.2.9",
+				"@ai-sdk/anthropic": "^1.2.10",
+				"@ai-sdk/azure": "^1.3.17",
+				"@ai-sdk/google": "^1.2.13",
+				"@ai-sdk/google-vertex": "^2.2.23",
+				"@ai-sdk/mistral": "^1.2.7",
+				"@ai-sdk/openai": "^1.3.20",
+				"@ai-sdk/perplexity": "^1.1.7",
+				"@ai-sdk/xai": "^1.2.15",
+				"@anthropic-ai/sdk": "^0.39.0",
+				"@aws-sdk/credential-providers": "^3.817.0",
+				"@openrouter/ai-sdk-provider": "^0.4.5",
+				"ai": "^4.3.10",
+				"boxen": "^8.0.1",
+				"chalk": "^5.4.1",
+				"cli-highlight": "^2.1.11",
+				"cli-table3": "^0.6.5",
+				"commander": "^11.1.0",
+				"cors": "^2.8.5",
+				"dotenv": "^16.3.1",
+				"express": "^4.21.2",
+				"fastmcp": "^2.2.2",
+				"figlet": "^1.8.0",
+				"fuse.js": "^7.1.0",
+				"gpt-tokens": "^1.3.14",
+				"gradient-string": "^3.0.0",
+				"helmet": "^8.1.0",
+				"inquirer": "^12.5.0",
+				"jsonwebtoken": "^9.0.2",
+				"lru-cache": "^10.2.0",
+				"ollama-ai-provider": "^1.2.0",
+				"openai": "^4.89.0",
+				"ora": "^8.2.0",
+				"task-master-ai": "0.17.0-rc.1",
+				"uuid": "^11.1.0",
+				"zod": "^3.23.8"
+			},
+			"bin": {
+				"task-master": "bin/task-master.js",
+				"task-master-ai": "mcp-server/server.js",
+				"task-master-mcp": "mcp-server/server.js"
+			},
+			"engines": {
+				"node": ">=18.0.0"
+			}
+		},
 		"node_modules/term-size": {
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
@@ -12317,4 +12119,4 @@
 			}
 		}
 	}
-}
+}
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "task-master-ai",
-	"version": "0.18.0-rc.0",
+	"version": "0.17.0-rc.1",
 	"description": "A task management system for ambitious AI-driven development that doesn't overwhelm and confuse Cursor.",
 	"main": "index.js",
 	"type": "module",
@@ -50,7 +50,6 @@
 		"@ai-sdk/xai": "^1.2.15",
 		"@anthropic-ai/sdk": "^0.39.0",
 		"@aws-sdk/credential-providers": "^3.817.0",
-		"@inquirer/search": "^3.0.15",
 		"@openrouter/ai-sdk-provider": "^0.4.5",
 		"ai": "^4.3.10",
 		"boxen": "^8.0.1",
@@ -73,12 +72,10 @@
 		"ollama-ai-provider": "^1.2.0",
 		"openai": "^4.89.0",
 		"ora": "^8.2.0",
+		"task-master-ai": "0.17.0-rc.1",
 		"uuid": "^11.1.0",
 		"zod": "^3.23.8"
 	},
-	"optionalDependencies": {
-		"@anthropic-ai/claude-code": "^1.0.25"
-	},
 	"engines": {
 		"node": ">=18.0.0"
 	},
--- a/scripts/init.js
+++ b/scripts/init.js
@@ -23,14 +23,7 @@ import figlet from 'figlet';
 import boxen from 'boxen';
 import gradient from 'gradient-string';
 import { isSilentMode } from './modules/utils.js';
-import { insideGitWorkTree } from './modules/utils/git-utils.js';
-import { manageGitignoreFile } from '../src/utils/manage-gitignore.js';
-import { RULE_PROFILES } from '../src/constants/profiles.js';
-import {
-	convertAllRulesToProfileRules,
-	getRulesProfile
-} from '../src/utils/rule-transformer.js';
-
+import { convertAllCursorRulesToRooRules } from './modules/rule-transformer.js';
 import { execSync } from 'child_process';
 import {
 	EXAMPLE_PRD_FILE,
@@ -228,9 +221,70 @@ function copyTemplateFile(templateName, targetPath, replacements = {}) {
 		// case 'scripts_README.md':
 		// 	sourcePath = path.join(__dirname, '..', 'assets', 'scripts_README.md');
 		// 	break;
-		// case 'README-task-master.md':
-		// 	sourcePath = path.join(__dirname, '..', 'README-task-master.md');
-		// 	break;
+		case 'dev_workflow.mdc':
+			sourcePath = path.join(
+				__dirname,
+				'..',
+				'.cursor',
+				'rules',
+				'dev_workflow.mdc'
+			);
+			break;
+		case 'taskmaster.mdc':
+			sourcePath = path.join(
+				__dirname,
+				'..',
+				'.cursor',
+				'rules',
+				'taskmaster.mdc'
+			);
+			break;
+		case 'cursor_rules.mdc':
+			sourcePath = path.join(
+				__dirname,
+				'..',
+				'.cursor',
+				'rules',
+				'cursor_rules.mdc'
+			);
+			break;
+		case 'self_improve.mdc':
+			sourcePath = path.join(
+				__dirname,
+				'..',
+				'.cursor',
+				'rules',
+				'self_improve.mdc'
+			);
+			break;
+			// case 'README-task-master.md':
+			// 	sourcePath = path.join(__dirname, '..', 'README-task-master.md');
+			break;
+		case 'windsurfrules':
+			sourcePath = path.join(__dirname, '..', 'assets', '.windsurfrules');
+			break;
+		case '.roomodes':
+			sourcePath = path.join(__dirname, '..', 'assets', 'roocode', '.roomodes');
+			break;
+		case 'architect-rules':
+		case 'ask-rules':
+		case 'boomerang-rules':
+		case 'code-rules':
+		case 'debug-rules':
+		case 'test-rules': {
+			// Extract the mode name from the template name (e.g., 'architect' from 'architect-rules')
+			const mode = templateName.split('-')[0];
+			sourcePath = path.join(
+				__dirname,
+				'..',
+				'assets',
+				'roocode',
+				'.roo',
+				`rules-${mode}`,
+				templateName
+			);
+			break;
+		}
 		default:
 			// For other files like env.example, gitignore, etc. that don't have direct equivalents
 			sourcePath = path.join(__dirname, '..', 'assets', templateName);
@@ -280,6 +334,21 @@ function copyTemplateFile(templateName, targetPath, replacements = {}) {
 			return;
 		}

+		// Handle .windsurfrules - append the entire content
+		if (filename === '.windsurfrules') {
+			log(
+				'info',
+				`${targetPath} already exists, appending content instead of overwriting...`
+			);
+			const existingContent = fs.readFileSync(targetPath, 'utf8');
+
+			// Add a separator comment before appending our content
+			const updatedContent = `${existingContent.trim()}\n\n# Added by Task Master - Development Workflow Rules\n\n${content}`;
+			fs.writeFileSync(targetPath, updatedContent);
+			log('success', `Updated ${targetPath} with additional rules`);
+			return;
+		}
+
 		// Handle README.md - offer to preserve or create a different file
 		if (filename === 'README-task-master.md') {
 			log('info', `${targetPath} already exists`);
@@ -306,7 +375,7 @@ function copyTemplateFile(templateName, targetPath, replacements = {}) {
 	log('info', `Created file: ${targetPath}`);
 }

-// Main function to initialize a new project
+// Main function to initialize a new project (No longer needs isInteractive logic)
 async function initializeProject(options = {}) {
 	// Receives options as argument
 	// Only display banner if not in silent mode
@@ -322,61 +391,12 @@ async function initializeProject(options = {}) {
 	// 	console.log('==================================================');
 	// }

-	// Handle boolean aliases flags
-	if (options.aliases === true) {
-		options.addAliases = true; // --aliases flag provided
-	} else if (options.aliases === false) {
-		options.addAliases = false; // --no-aliases flag provided
-	}
-	// If options.aliases and options.noAliases are undefined, we'll prompt for it
-
-	// Handle boolean git flags
-	if (options.git === true) {
-		options.initGit = true; // --git flag provided
-	} else if (options.git === false) {
-		options.initGit = false; // --no-git flag provided
-	}
-	// If options.git and options.noGit are undefined, we'll prompt for it
-
-	// Handle boolean gitTasks flags
-	if (options.gitTasks === true) {
-		options.storeTasksInGit = true; // --git-tasks flag provided
-	} else if (options.gitTasks === false) {
-		options.storeTasksInGit = false; // --no-git-tasks flag provided
-	}
-	// If options.gitTasks and options.noGitTasks are undefined, we'll prompt for it
-
 	const skipPrompts = options.yes || (options.name && options.description);

 	// if (!isSilentMode()) {
 	// 	console.log('Skip prompts determined:', skipPrompts);
 	// }

-	let selectedRuleProfiles;
-	if (options.rulesExplicitlyProvided) {
-		// If --rules flag was used, always respect it.
-		log(
-			'info',
-			`Using rule profiles provided via command line: ${options.rules.join(', ')}`
-		);
-		selectedRuleProfiles = options.rules;
-	} else if (skipPrompts) {
-		// If non-interactive (e.g., --yes) and no rules specified, default to ALL.
-		log(
-			'info',
-			`No rules specified in non-interactive mode, defaulting to all profiles.`
-		);
-		selectedRuleProfiles = RULE_PROFILES;
-	} else {
-		// If interactive and no rules specified, default to NONE.
-		// The 'rules --setup' wizard will handle selection.
-		log(
-			'info',
-			'No rules specified; interactive setup will be launched to select profiles.'
-		);
-		selectedRuleProfiles = [];
-	}
-
 	if (skipPrompts) {
 		if (!isSilentMode()) {
 			console.log('SKIPPING PROMPTS - Using defaults or provided values');
@@ -389,92 +409,38 @@ async function initializeProject(options = {}) {
 		const projectVersion = options.version || '0.1.0';
 		const authorName = options.author || 'Vibe coder';
 		const dryRun = options.dryRun || false;
-		const addAliases =
-			options.addAliases !== undefined ? options.addAliases : true; // Default to true if not specified
-		const initGit = options.initGit !== undefined ? options.initGit : true; // Default to true if not specified
-		const storeTasksInGit =
-			options.storeTasksInGit !== undefined ? options.storeTasksInGit : true; // Default to true if not specified
+		const addAliases = options.aliases || false;

 		if (dryRun) {
 			log('info', 'DRY RUN MODE: No files will be modified');
 			log('info', 'Would initialize Task Master project');
 			log('info', 'Would create/update necessary project files');
-
-			// Show flag-specific behavior
-			log(
-				'info',
-				`${addAliases ? 'Would add shell aliases (tm, taskmaster)' : 'Would skip shell aliases'}`
-			);
-			log(
-				'info',
-				`${initGit ? 'Would initialize Git repository' : 'Would skip Git initialization'}`
-			);
-			log(
-				'info',
-				`${storeTasksInGit ? 'Would store tasks in Git' : 'Would exclude tasks from Git'}`
-			);
-
+			if (addAliases) {
+				log('info', 'Would add shell aliases for task-master');
+			}
 			return {
 				dryRun: true
 			};
 		}

-		createProjectStructure(
-			addAliases,
-			initGit,
-			storeTasksInGit,
-			dryRun,
-			options,
-			selectedRuleProfiles
-		);
+		createProjectStructure(addAliases, dryRun, options);
 	} else {
 		// Interactive logic
 		log('info', 'Required options not provided, proceeding with prompts.');
+		const rl = readline.createInterface({
+			input: process.stdin,
+			output: process.stdout
+		});

 		try {
-			const rl = readline.createInterface({
-				input: process.stdin,
-				output: process.stdout
-			});
-			// Prompt for shell aliases (skip if --aliases or --no-aliases flag was provided)
-			let addAliasesPrompted = true; // Default to true
-			if (options.addAliases !== undefined) {
-				addAliasesPrompted = options.addAliases; // Use flag value if provided
-			} else {
-				const addAliasesInput = await promptQuestion(
-					rl,
-					chalk.cyan(
-						'Add shell aliases for task-master? This lets you type "tm" instead of "task-master" (Y/n): '
-					)
-				);
-				addAliasesPrompted = addAliasesInput.trim().toLowerCase() !== 'n';
-			}
-
-			// Prompt for Git initialization (skip if --git or --no-git flag was provided)
-			let initGitPrompted = true; // Default to true
-			if (options.initGit !== undefined) {
-				initGitPrompted = options.initGit; // Use flag value if provided
-			} else {
-				const gitInitInput = await promptQuestion(
-					rl,
-					chalk.cyan('Initialize a Git repository in project root? (Y/n): ')
-				);
-				initGitPrompted = gitInitInput.trim().toLowerCase() !== 'n';
-			}
-
-			// Prompt for Git tasks storage (skip if --git-tasks or --no-git-tasks flag was provided)
-			let storeGitPrompted = true; // Default to true
-			if (options.storeTasksInGit !== undefined) {
-				storeGitPrompted = options.storeTasksInGit; // Use flag value if provided
-			} else {
-				const gitTasksInput = await promptQuestion(
-					rl,
-					chalk.cyan(
-						'Store tasks in Git (tasks.json and tasks/ directory)? (Y/n): '
-					)
-				);
-				storeGitPrompted = gitTasksInput.trim().toLowerCase() !== 'n';
-			}
+			// Only prompt for shell aliases
+			const addAliasesInput = await promptQuestion(
+				rl,
+				chalk.cyan(
+					'Add shell aliases for task-master? This lets you type "tm" instead of "task-master" (Y/n): '
+				)
+			);
+			const addAliasesPrompted = addAliasesInput.trim().toLowerCase() !== 'n';

 			// Confirm settings...
 			console.log('\nTask Master Project settings:');
@@ -484,76 +450,38 @@ async function initializeProject(options = {}) {
 				),
 				chalk.white(addAliasesPrompted ? 'Yes' : 'No')
 			);
-			console.log(
-				chalk.blue('Initialize Git repository in project root:'),
-				chalk.white(initGitPrompted ? 'Yes' : 'No')
-			);
-			console.log(
-				chalk.blue('Store tasks in Git (tasks.json and tasks/ directory):'),
-				chalk.white(storeGitPrompted ? 'Yes' : 'No')
-			);

 			const confirmInput = await promptQuestion(
 				rl,
 				chalk.yellow('\nDo you want to continue with these settings? (Y/n): ')
 			);
 			const shouldContinue = confirmInput.trim().toLowerCase() !== 'n';
+			rl.close();

 			if (!shouldContinue) {
-				rl.close();
 				log('info', 'Project initialization cancelled by user');
 				process.exit(0);
 				return;
 			}

-			// Only run interactive rules if rules flag not provided via command line
-			if (options.rulesExplicitlyProvided) {
-				log(
-					'info',
-					`Using rule profiles provided via command line: ${selectedRuleProfiles.join(', ')}`
-				);
-			}
-
 			const dryRun = options.dryRun || false;

 			if (dryRun) {
 				log('info', 'DRY RUN MODE: No files will be modified');
 				log('info', 'Would initialize Task Master project');
 				log('info', 'Would create/update necessary project files');
-
-				// Show flag-specific behavior
-				log(
-					'info',
-					`${addAliasesPrompted ? 'Would add shell aliases (tm, taskmaster)' : 'Would skip shell aliases'}`
-				);
-				log(
-					'info',
-					`${initGitPrompted ? 'Would initialize Git repository' : 'Would skip Git initialization'}`
-				);
-				log(
-					'info',
-					`${storeGitPrompted ? 'Would store tasks in Git' : 'Would exclude tasks from Git'}`
-				);
-
+				if (addAliasesPrompted) {
+					log('info', 'Would add shell aliases for task-master');
+				}
 				return {
 					dryRun: true
 				};
 			}

 			// Create structure using only necessary values
-			createProjectStructure(
-				addAliasesPrompted,
-				initGitPrompted,
-				storeGitPrompted,
-				dryRun,
-				options,
-				selectedRuleProfiles
-			);
-			rl.close();
+			createProjectStructure(addAliasesPrompted, dryRun, options);
 		} catch (error) {
-			if (rl) {
-				rl.close();
-			}
+			rl.close();
 			log('error', `Error during initialization process: ${error.message}`);
 			process.exit(1);
 		}
@@ -570,17 +498,23 @@ function promptQuestion(rl, question) {
 }

 // Function to create the project structure
-function createProjectStructure(
-	addAliases,
-	initGit,
-	storeTasksInGit,
-	dryRun,
-	options,
-	selectedRuleProfiles = RULE_PROFILES
-) {
+function createProjectStructure(addAliases, dryRun, options) {
 	const targetDir = process.cwd();
 	log('info', `Initializing project in ${targetDir}`);

+	// Define Roo modes locally (external integration, not part of core Task Master)
+	const ROO_MODES = ['architect', 'ask', 'boomerang', 'code', 'debug', 'test'];
+
+	// Create directories
+	ensureDirectoryExists(path.join(targetDir, '.cursor/rules'));
+
+	// Create Roo directories
+	ensureDirectoryExists(path.join(targetDir, '.roo'));
+	ensureDirectoryExists(path.join(targetDir, '.roo/rules'));
+	for (const mode of ROO_MODES) {
+		ensureDirectoryExists(path.join(targetDir, '.roo', `rules-${mode}`));
+	}
+
 	// Create NEW .taskmaster directory structure (using constants)
 	ensureDirectoryExists(path.join(targetDir, TASKMASTER_DIR));
 	ensureDirectoryExists(path.join(targetDir, TASKMASTER_TASKS_DIR));
@@ -591,22 +525,14 @@ function createProjectStructure(
 	// Create initial state.json file for tag management
 	createInitialStateFile(targetDir);

+	// Setup MCP configuration for integration with Cursor
+	setupMCPConfiguration(targetDir);
+
 	// Copy template files with replacements
 	const replacements = {
 		year: new Date().getFullYear()
 	};

-	// Helper function to create rule profiles
-	function _processSingleProfile(profileName) {
-		const profile = getRulesProfile(profileName);
-		if (profile) {
-			convertAllRulesToProfileRules(targetDir, profile);
-			// Also triggers MCP config setup (if applicable)
-		} else {
-			log('warn', `Unknown rule profile: ${profileName}`);
-		}
-	}
-
 	// Copy .env.example
 	copyTemplateFile(
 		'env.example',
@@ -623,23 +549,49 @@ function createProjectStructure(
 		}
 	);

-	// Copy .gitignore with GitTasks preference
-	try {
-		const gitignoreTemplatePath = path.join(
-			__dirname,
-			'..',
-			'assets',
-			'gitignore'
+	// Copy .gitignore
+	copyTemplateFile('gitignore', path.join(targetDir, GITIGNORE_FILE));
+
+	// Copy dev_workflow.mdc
+	copyTemplateFile(
+		'dev_workflow.mdc',
+		path.join(targetDir, '.cursor/rules/dev_workflow.mdc')
+	);
+
+	// Copy taskmaster.mdc
+	copyTemplateFile(
+		'taskmaster.mdc',
+		path.join(targetDir, '.cursor/rules/taskmaster.mdc')
+	);
+
+	// Copy cursor_rules.mdc
+	copyTemplateFile(
+		'cursor_rules.mdc',
+		path.join(targetDir, '.cursor/rules/cursor_rules.mdc')
+	);
+
+	// Copy self_improve.mdc
+	copyTemplateFile(
+		'self_improve.mdc',
+		path.join(targetDir, '.cursor/rules/self_improve.mdc')
+	);
+
+	// Generate Roo rules from Cursor rules
+	log('info', 'Generating Roo rules from Cursor rules...');
+	convertAllCursorRulesToRooRules(targetDir);
+
+	// Copy .windsurfrules
+	copyTemplateFile('windsurfrules', path.join(targetDir, '.windsurfrules'));
+
+	// Copy .roomodes for Roo Code integration
+	copyTemplateFile('.roomodes', path.join(targetDir, '.roomodes'));
+
+	// Copy Roo rule files for each mode
+	for (const mode of ROO_MODES) {
+		copyTemplateFile(
+			`${mode}-rules`,
+			path.join(targetDir, '.roo', `rules-${mode}`, `${mode}-rules`)
 		);
-		const templateContent = fs.readFileSync(gitignoreTemplatePath, 'utf8');
-		manageGitignoreFile(
-			path.join(targetDir, GITIGNORE_FILE),
-			templateContent,
-			storeTasksInGit,
-			log
-		);
-	} catch (error) {
-		log('error', `Failed to create .gitignore: ${error.message}`);
 	}

 	// Copy example_prd.txt to NEW location
@@ -647,50 +599,15 @@ function createProjectStructure(

 	// Initialize git repository if git is available
 	try {
-		if (initGit === false) {
-			log('info', 'Git initialization skipped due to --no-git flag.');
-		} else if (initGit === true) {
-			if (insideGitWorkTree()) {
-				log(
-					'info',
-					'Existing Git repository detected – skipping git init despite --git flag.'
-				);
-			} else {
-				log('info', 'Initializing Git repository due to --git flag...');
-				execSync('git init', { cwd: targetDir, stdio: 'ignore' });
-				log('success', 'Git repository initialized');
-			}
-		} else {
-			// Default behavior when no flag is provided (from interactive prompt)
-			if (insideGitWorkTree()) {
-				log('info', 'Existing Git repository detected – skipping git init.');
-			} else {
-				log(
-					'info',
-					'No Git repository detected. Initializing one in project root...'
-				);
-				execSync('git init', { cwd: targetDir, stdio: 'ignore' });
-				log('success', 'Git repository initialized');
-			}
+		if (!fs.existsSync(path.join(targetDir, '.git'))) {
+			log('info', 'Initializing git repository...');
+			execSync('git init', { stdio: 'ignore' });
+			log('success', 'Git repository initialized');
 		}
 	} catch (error) {
 		log('warn', 'Git not available, skipping repository initialization');
 	}

-	// Only run the manual transformer if rules were provided via flags.
-	// The interactive `rules --setup` wizard handles its own installation.
-	if (options.rulesExplicitlyProvided || options.yes) {
-		log('info', 'Generating profile rules from command-line flags...');
-		for (const profileName of selectedRuleProfiles) {
-			_processSingleProfile(profileName);
-		}
-	}
-
-	// Add shell aliases if requested
-	if (addAliases) {
-		addShellAliases();
-	}
-
 	// Run npm install automatically
 	const npmInstallOptions = {
 		cwd: targetDir,
@@ -714,49 +631,6 @@ function createProjectStructure(
 		);
 	}

-	// === Add Rule Profiles Setup Step ===
-	if (
-		!isSilentMode() &&
-		!dryRun &&
-		!options?.yes &&
-		!options.rulesExplicitlyProvided
-	) {
-		console.log(
-			boxen(chalk.cyan('Configuring Rule Profiles...'), {
-				padding: 0.5,
-				margin: { top: 1, bottom: 0.5 },
-				borderStyle: 'round',
-				borderColor: 'blue'
-			})
-		);
-		log(
-			'info',
-			'Running interactive rules setup. Please select which rule profiles to include.'
-		);
-		try {
-			// Correct command confirmed by you.
-			execSync('npx task-master rules --setup', {
-				stdio: 'inherit',
-				cwd: targetDir
-			});
-			log('success', 'Rule profiles configured.');
-		} catch (error) {
-			log('error', 'Failed to configure rule profiles:', error.message);
-			log('warn', 'You may need to run "task-master rules --setup" manually.');
-		}
-	} else if (isSilentMode() || dryRun || options?.yes) {
-		// This branch can log why setup was skipped, similar to the model setup logic.
-		if (options.rulesExplicitlyProvided) {
-			log(
-				'info',
-				'Skipping interactive rules setup because --rules flag was used.'
-			);
-		} else {
-			log('info', 'Skipping interactive rules setup in non-interactive mode.');
-		}
-	}
-	// =====================================
-
 	// === Add Model Configuration Step ===
 	if (!isSilentMode() && !dryRun && !options?.yes) {
 		console.log(
@@ -798,17 +672,6 @@ function createProjectStructure(
 	}
 	// ====================================

-	// Add shell aliases if requested
-	if (addAliases && !dryRun) {
-		log('info', 'Adding shell aliases...');
-		const aliasResult = addShellAliases();
-		if (aliasResult) {
-			log('success', 'Shell aliases added successfully');
-		}
-	} else if (addAliases && dryRun) {
-		log('info', 'DRY RUN: Would add shell aliases (tm, taskmaster)');
-	}
-
 	// Display success message
 	if (!isSilentMode()) {
 		console.log(
@@ -866,5 +729,114 @@ function createProjectStructure(
 	}
 }

+// Function to setup MCP configuration for Cursor integration
+function setupMCPConfiguration(targetDir) {
+	const mcpDirPath = path.join(targetDir, '.cursor');
+	const mcpJsonPath = path.join(mcpDirPath, 'mcp.json');
+
+	log('info', 'Setting up MCP configuration for Cursor integration...');
+
+	// Create .cursor directory if it doesn't exist
+	ensureDirectoryExists(mcpDirPath);
+
+	// New MCP config to be added - references the installed package
+	const newMCPServer = {
+		'task-master-ai': {
+			command: 'npx',
+			args: ['-y', '--package=task-master-ai', 'task-master-ai'],
+			env: {
+				ANTHROPIC_API_KEY: 'ANTHROPIC_API_KEY_HERE',
+				PERPLEXITY_API_KEY: 'PERPLEXITY_API_KEY_HERE',
+				OPENAI_API_KEY: 'OPENAI_API_KEY_HERE',
+				GOOGLE_API_KEY: 'GOOGLE_API_KEY_HERE',
+				XAI_API_KEY: 'XAI_API_KEY_HERE',
+				OPENROUTER_API_KEY: 'OPENROUTER_API_KEY_HERE',
+				MISTRAL_API_KEY: 'MISTRAL_API_KEY_HERE',
+				AZURE_OPENAI_API_KEY: 'AZURE_OPENAI_API_KEY_HERE',
+				OLLAMA_API_KEY: 'OLLAMA_API_KEY_HERE'
+			}
+		}
+	};
+
+	// Check if mcp.json already existsimage.png
+	if (fs.existsSync(mcpJsonPath)) {
+		log(
+			'info',
+			'MCP configuration file already exists, checking for existing task-master-mcp...'
+		);
+		try {
+			// Read existing config
+			const mcpConfig = JSON.parse(fs.readFileSync(mcpJsonPath, 'utf8'));
+
+			// Initialize mcpServers if it doesn't exist
+			if (!mcpConfig.mcpServers) {
+				mcpConfig.mcpServers = {};
+			}
+
+			// Check if any existing server configuration already has task-master-mcp in its args
+			const hasMCPString = Object.values(mcpConfig.mcpServers).some(
+				(server) =>
+					server.args &&
+					server.args.some(
+						(arg) => typeof arg === 'string' && arg.includes('task-master-ai')
+					)
+			);
+
+			if (hasMCPString) {
+				log(
+					'info',
+					'Found existing task-master-ai MCP configuration in mcp.json, leaving untouched'
+				);
+				return; // Exit early, don't modify the existing configuration
+			}
+
+			// Add the task-master-ai server if it doesn't exist
+			if (!mcpConfig.mcpServers['task-master-ai']) {
+				mcpConfig.mcpServers['task-master-ai'] = newMCPServer['task-master-ai'];
+				log(
+					'info',
+					'Added task-master-ai server to existing MCP configuration'
+				);
+			} else {
+				log('info', 'task-master-ai server already configured in mcp.json');
+			}
+
+			// Write the updated configuration
+			fs.writeFileSync(mcpJsonPath, JSON.stringify(mcpConfig, null, 4));
+			log('success', 'Updated MCP configuration file');
+		} catch (error) {
+			log('error', `Failed to update MCP configuration: ${error.message}`);
+			// Create a backup before potentially modifying
+			const backupPath = `${mcpJsonPath}.backup-${Date.now()}`;
+			if (fs.existsSync(mcpJsonPath)) {
+				fs.copyFileSync(mcpJsonPath, backupPath);
+				log('info', `Created backup of existing mcp.json at ${backupPath}`);
+			}
+
+			// Create new configuration
+			const newMCPConfig = {
+				mcpServers: newMCPServer
+			};
+
+			fs.writeFileSync(mcpJsonPath, JSON.stringify(newMCPConfig, null, 4));
+			log(
+				'warn',
+				'Created new MCP configuration file (backup of original file was created if it existed)'
+			);
+		}
+	} else {
+		// If mcp.json doesn't exist, create it
+		const newMCPConfig = {
+			mcpServers: newMCPServer
+		};
+
+		fs.writeFileSync(mcpJsonPath, JSON.stringify(newMCPConfig, null, 4));
+		log('success', 'Created MCP configuration file for Cursor integration');
+	}
+
+	// Add note to console about MCP integration
+	log('info', 'MCP server will use the installed task-master-ai package');
+}
+
 // Ensure necessary functions are exported
-export { initializeProject, log };
+export { initializeProject, log }; // Only export what's needed by commands.js
--- a/scripts/modules/ai-services-unified.js
+++ b/scripts/modules/ai-services-unified.js
@@ -44,8 +44,7 @@ import {
 	OllamaAIProvider,
 	BedrockAIProvider,
 	AzureProvider,
-	VertexAIProvider,
-	ClaudeCodeProvider
+	VertexAIProvider
 } from '../../src/ai-providers/index.js';

 // Create provider instances
@@ -59,8 +58,7 @@ const PROVIDERS = {
 	ollama: new OllamaAIProvider(),
 	bedrock: new BedrockAIProvider(),
 	azure: new AzureProvider(),
-	vertex: new VertexAIProvider(),
-	'claude-code': new ClaudeCodeProvider()
+	vertex: new VertexAIProvider()
 };

 // Helper function to get cost for a specific model
@@ -227,11 +225,6 @@ function _extractErrorMessage(error) {
 * @throws {Error} If a required API key is missing.
 */
 function _resolveApiKey(providerName, session, projectRoot = null) {
-	// Claude Code doesn't require an API key
-	if (providerName === 'claude-code') {
-		return 'claude-code-no-key-required';
-	}
-
 	const keyMap = {
 		openai: 'OPENAI_API_KEY',
 		anthropic: 'ANTHROPIC_API_KEY',
@@ -243,8 +236,7 @@ function _resolveApiKey(providerName, session, projectRoot = null) {
 		xai: 'XAI_API_KEY',
 		ollama: 'OLLAMA_API_KEY',
 		bedrock: 'AWS_ACCESS_KEY_ID',
-		vertex: 'GOOGLE_API_KEY',
-		'claude-code': 'CLAUDE_CODE_API_KEY' // Not actually used, but included for consistency
+		vertex: 'GOOGLE_API_KEY'
 	};

 	const envVarName = keyMap[providerName];
--- a/scripts/modules/commands.js
+++ b/scripts/modules/commands.js
@@ -11,7 +11,6 @@ import fs from 'fs';
 import https from 'https';
 import http from 'http';
 import inquirer from 'inquirer';
-import search from '@inquirer/search';
 import ora from 'ora'; // Import ora

 import {
@@ -72,8 +71,6 @@ import {
 	getBaseUrlForRole
 } from './config-manager.js';

-import { CUSTOM_PROVIDERS } from '../../src/constants/providers.js';
-
 import {
 	COMPLEXITY_REPORT_FILE,
 	PRD_FILE,
@@ -99,14 +96,6 @@ import {
 	displayTaggedTasksFYI,
 	displayCurrentTagIndicator
 } from './ui.js';
-import {
-	confirmProfilesRemove,
-	confirmRemoveAllRemainingProfiles
-} from '../../src/ui/confirm.js';
-import {
-	wouldRemovalLeaveNoProfiles,
-	getInstalledProfiles
-} from '../../src/utils/profiles.js';

 import { initializeProject } from '../init.js';
 import {
@@ -119,27 +108,8 @@ import {
 	isValidTaskStatus,
 	TASK_STATUS_OPTIONS
 } from '../../src/constants/task-status.js';
-import {
-	isValidRulesAction,
-	RULES_ACTIONS,
-	RULES_SETUP_ACTION
-} from '../../src/constants/rules-actions.js';
 import { getTaskMasterVersion } from '../../src/utils/getVersion.js';
 import { syncTasksToReadme } from './sync-readme.js';
-import { RULE_PROFILES } from '../../src/constants/profiles.js';
-import {
-	convertAllRulesToProfileRules,
-	removeProfileRules,
-	isValidProfile,
-	getRulesProfile
-} from '../../src/utils/rule-transformer.js';
-import {
-	runInteractiveProfilesSetup,
-	generateProfileSummary,
-	categorizeProfileResults,
-	generateProfileRemovalSummary,
-	categorizeRemovalResults
-} from '../../src/utils/profiles.js';

 /**
 * Runs the interactive setup process for model configuration.
@@ -294,14 +264,20 @@ async function runInteractiveSetup(projectRoot) {
 				}
 			: null;

-		// Define custom provider options
-		const customProviderOptions = [
-			{ name: '* Custom OpenRouter model', value: '__CUSTOM_OPENROUTER__' },
-			{ name: '* Custom Ollama model', value: '__CUSTOM_OLLAMA__' },
-			{ name: '* Custom Bedrock model', value: '__CUSTOM_BEDROCK__' },
-			{ name: '* Custom Azure model', value: '__CUSTOM_AZURE__' },
-			{ name: '* Custom Vertex model', value: '__CUSTOM_VERTEX__' }
-		];
+		const customOpenRouterOption = {
+			name: '* Custom OpenRouter model', // Symbol updated
+			value: '__CUSTOM_OPENROUTER__'
+		};
+
+		const customOllamaOption = {
+			name: '* Custom Ollama model', // Symbol updated
+			value: '__CUSTOM_OLLAMA__'
+		};
+
+		const customBedrockOption = {
+			name: '* Custom Bedrock model', // Add Bedrock custom option
+			value: '__CUSTOM_BEDROCK__'
+		};

 		let choices = [];
 		let defaultIndex = 0; // Default to 'Cancel'
@@ -341,42 +317,43 @@ async function runInteractiveSetup(projectRoot) {
 			);
 		}

-		// Construct final choices list with custom options moved to bottom
-		const systemOptions = [];
+		// Construct final choices list based on whether 'None' is allowed
+		const commonPrefix = [];
 		if (noChangeOption) {
-			systemOptions.push(noChangeOption);
+			commonPrefix.push(noChangeOption);
 		}
-		systemOptions.push(cancelOption);
+		commonPrefix.push(cancelOption);
+		commonPrefix.push(customOpenRouterOption);
+		commonPrefix.push(customOllamaOption);
+		commonPrefix.push(customBedrockOption);

-		const systemLength = systemOptions.length;
+		const prefixLength = commonPrefix.length; // Initial prefix length

 		if (allowNone) {
 			choices = [
-				...systemOptions,
-				new inquirer.Separator('\n── Standard Models ──'),
-				{ name: '⚪ None (disable)', value: null },
-				...roleChoices,
-				new inquirer.Separator('\n── Custom Providers ──'),
-				...customProviderOptions
+				...commonPrefix,
+				new inquirer.Separator(),
+				{ name: '⚪ None (disable)', value: null }, // Symbol updated
+				new inquirer.Separator(),
+				...roleChoices
 			];
-			// Adjust default index: System + Sep1 + None (+2)
-			const noneOptionIndex = systemLength + 1;
+			// Adjust default index: Prefix + Sep1 + None + Sep2 (+3)
+			const noneOptionIndex = prefixLength + 1;
 			defaultIndex =
 				currentChoiceIndex !== -1
-					? currentChoiceIndex + systemLength + 2 // Offset by system options and separators
+					? currentChoiceIndex + prefixLength + 3 // Offset by prefix and separators
 					: noneOptionIndex; // Default to 'None' if no current model matched
 		} else {
 			choices = [
-				...systemOptions,
-				new inquirer.Separator('\n── Standard Models ──'),
+				...commonPrefix,
+				new inquirer.Separator(),
 				...roleChoices,
-				new inquirer.Separator('\n── Custom Providers ──'),
-				...customProviderOptions
+				new inquirer.Separator()
 			];
-			// Adjust default index: System + Sep (+1)
+			// Adjust default index: Prefix + Sep (+1)
 			defaultIndex =
 				currentChoiceIndex !== -1
-					? currentChoiceIndex + systemLength + 1 // Offset by system options and separator
+					? currentChoiceIndex + prefixLength + 1 // Offset by prefix and separator
 					: noChangeOption
 						? 1
 						: 0; // Default to 'No Change' if present, else 'Cancel'
@@ -399,63 +376,32 @@ async function runInteractiveSetup(projectRoot) {
 	const researchPromptData = getPromptData('research');
 	const fallbackPromptData = getPromptData('fallback', true); // Allow 'None' for fallback

-	// Display helpful intro message
-	console.log(chalk.cyan('\n🎯 Interactive Model Setup'));
-	console.log(chalk.gray('━'.repeat(50)));
-	console.log(chalk.yellow('💡 Navigation tips:'));
-	console.log(chalk.gray('   • Type to search and filter options'));
-	console.log(chalk.gray('   • Use ↑↓ arrow keys to navigate results'));
-	console.log(
-		chalk.gray(
-			'   • Standard models are listed first, custom providers at bottom'
-		)
-	);
-	console.log(chalk.gray('   • Press Enter to select\n'));
-
-	// Helper function to create search source for models
-	const createSearchSource = (choices, defaultValue) => {
-		return (searchTerm = '') => {
-			const filteredChoices = choices.filter((choice) => {
-				if (choice.type === 'separator') return true; // Always show separators
-				const searchText = choice.name || '';
-				return searchText.toLowerCase().includes(searchTerm.toLowerCase());
-			});
-			return Promise.resolve(filteredChoices);
-		};
-	};
-
-	const answers = {};
-
-	// Main model selection
-	answers.mainModel = await search({
-		message: 'Select the main model for generation/updates:',
-		source: createSearchSource(mainPromptData.choices, mainPromptData.default),
-		pageSize: 15
-	});
-
-	if (answers.mainModel !== '__CANCEL__') {
-		// Research model selection
-		answers.researchModel = await search({
+	const answers = await inquirer.prompt([
+		{
+			type: 'list',
+			name: 'mainModel',
+			message: 'Select the main model for generation/updates:',
+			choices: mainPromptData.choices,
+			default: mainPromptData.default
+		},
+		{
+			type: 'list',
+			name: 'researchModel',
 			message: 'Select the research model:',
-			source: createSearchSource(
-				researchPromptData.choices,
-				researchPromptData.default
-			),
-			pageSize: 15
-		});
-
-		if (answers.researchModel !== '__CANCEL__') {
-			// Fallback model selection
-			answers.fallbackModel = await search({
-				message: 'Select the fallback model (optional):',
-				source: createSearchSource(
-					fallbackPromptData.choices,
-					fallbackPromptData.default
-				),
-				pageSize: 15
-			});
+			choices: researchPromptData.choices,
+			default: researchPromptData.default,
+			when: (ans) => ans.mainModel !== '__CANCEL__'
+		},
+		{
+			type: 'list',
+			name: 'fallbackModel',
+			message: 'Select the fallback model (optional):',
+			choices: fallbackPromptData.choices,
+			default: fallbackPromptData.default,
+			when: (ans) =>
+				ans.mainModel !== '__CANCEL__' && ans.researchModel !== '__CANCEL__'
 		}
-	}
+	]);

 	let setupSuccess = true;
 	let setupConfigModified = false;
@@ -495,7 +441,7 @@ async function runInteractiveSetup(projectRoot) {
 				return true; // Continue setup, but don't set this role
 			}
 			modelIdToSet = customId;
-			providerHint = CUSTOM_PROVIDERS.OPENROUTER;
+			providerHint = 'openrouter';
 			// Validate against live OpenRouter list
 			const openRouterModels = await fetchOpenRouterModelsCLI();
 			if (
@@ -524,7 +470,7 @@ async function runInteractiveSetup(projectRoot) {
 				return true; // Continue setup, but don't set this role
 			}
 			modelIdToSet = customId;
-			providerHint = CUSTOM_PROVIDERS.OLLAMA;
+			providerHint = 'ollama';
 			// Get the Ollama base URL from config for this role
 			const ollamaBaseURL = getBaseUrlForRole(role, projectRoot);
 			// Validate against live Ollama list
@@ -565,16 +511,16 @@ async function runInteractiveSetup(projectRoot) {
 				return true; // Continue setup, but don't set this role
 			}
 			modelIdToSet = customId;
-			providerHint = CUSTOM_PROVIDERS.BEDROCK;
+			providerHint = 'bedrock';

 			// Check if AWS environment variables exist
 			if (
 				!process.env.AWS_ACCESS_KEY_ID ||
 				!process.env.AWS_SECRET_ACCESS_KEY
 			) {
-				console.warn(
-					chalk.yellow(
-						'Warning: AWS_ACCESS_KEY_ID and/or AWS_SECRET_ACCESS_KEY environment variables are missing. Will fallback to system configuration. (ex: aws config files or ec2 instance profiles)'
+				console.error(
+					chalk.red(
+						'Error: AWS_ACCESS_KEY_ID and/or AWS_SECRET_ACCESS_KEY environment variables are missing. Please set them before using custom Bedrock models.'
 					)
 				);
 				setupSuccess = false;
@@ -586,76 +532,6 @@ async function runInteractiveSetup(projectRoot) {
 					`Custom Bedrock model "${modelIdToSet}" will be used. No validation performed.`
 				)
 			);
-		} else if (selectedValue === '__CUSTOM_AZURE__') {
-			isCustomSelection = true;
-			const { customId } = await inquirer.prompt([
-				{
-					type: 'input',
-					name: 'customId',
-					message: `Enter the custom Azure OpenAI Model ID for the ${role} role (e.g., gpt-4o):`
-				}
-			]);
-			if (!customId) {
-				console.log(chalk.yellow('No custom ID entered. Skipping role.'));
-				return true; // Continue setup, but don't set this role
-			}
-			modelIdToSet = customId;
-			providerHint = CUSTOM_PROVIDERS.AZURE;
-
-			// Check if Azure environment variables exist
-			if (
-				!process.env.AZURE_OPENAI_API_KEY ||
-				!process.env.AZURE_OPENAI_ENDPOINT
-			) {
-				console.error(
-					chalk.red(
-						'Error: AZURE_OPENAI_API_KEY and/or AZURE_OPENAI_ENDPOINT environment variables are missing. Please set them before using custom Azure models.'
-					)
-				);
-				setupSuccess = false;
-				return true; // Continue setup, but mark as failed
-			}
-
-			console.log(
-				chalk.blue(
-					`Custom Azure OpenAI model "${modelIdToSet}" will be used. No validation performed.`
-				)
-			);
-		} else if (selectedValue === '__CUSTOM_VERTEX__') {
-			isCustomSelection = true;
-			const { customId } = await inquirer.prompt([
-				{
-					type: 'input',
-					name: 'customId',
-					message: `Enter the custom Vertex AI Model ID for the ${role} role (e.g., gemini-1.5-pro-002):`
-				}
-			]);
-			if (!customId) {
-				console.log(chalk.yellow('No custom ID entered. Skipping role.'));
-				return true; // Continue setup, but don't set this role
-			}
-			modelIdToSet = customId;
-			providerHint = CUSTOM_PROVIDERS.VERTEX;
-
-			// Check if Google/Vertex environment variables exist
-			if (
-				!process.env.GOOGLE_API_KEY &&
-				!process.env.GOOGLE_APPLICATION_CREDENTIALS
-			) {
-				console.error(
-					chalk.red(
-						'Error: Either GOOGLE_API_KEY or GOOGLE_APPLICATION_CREDENTIALS environment variable is required. Please set one before using custom Vertex models.'
-					)
-				);
-				setupSuccess = false;
-				return true; // Continue setup, but mark as failed
-			}
-
-			console.log(
-				chalk.blue(
-					`Custom Vertex AI model "${modelIdToSet}" will be used. No validation performed.`
-				)
-			);
 		} else if (
 			selectedValue &&
 			typeof selectedValue === 'object' &&
@@ -1738,7 +1614,7 @@ function registerCommands(programInstance) {
 		.command('research')
 		.description('Perform AI-powered research queries with project context')
 		.argument('[prompt]', 'Research prompt to investigate')
-		.option('--file <file>', 'Path to the tasks file')
+		.option('--file <file>', 'Path to the tasks file', 'tasks/tasks.json')
 		.option(
 			'-i, --id <ids>',
 			'Comma-separated task/subtask IDs to include as context (e.g., "15,16.2")'
@@ -1876,8 +1752,7 @@ function registerCommands(programInstance) {
 			const projectRoot = findProjectRoot() || '.';
 			const tag = options.tag || getCurrentTag(projectRoot) || 'master';
 			const tasksPath =
-				options.file ||
-				path.join(projectRoot, '.taskmaster', 'tasks', 'tasks.json');
+				options.file || path.join(projectRoot, 'tasks', 'tasks.json');

 			// Show current tag context
 			displayCurrentTagIndicator(tag);
@@ -1981,15 +1856,14 @@ function registerCommands(programInstance) {
 					researchOptions,
 					{
 						commandName: 'research',
-						outputType: 'cli',
-						tag: tag
+						outputType: 'cli'
 					},
 					'text',
 					validatedParams.allowFollowUp // Pass follow-up flag
 				);

-				// Auto-save to task/subtask if requested and no interactive save occurred
-				if (validatedParams.saveToId && !result.interactiveSaveOccurred) {
+				// Auto-save to task/subtask if requested
+				if (validatedParams.saveToId) {
 					try {
 						const isSubtask = validatedParams.saveToId.includes('.');

@@ -2018,8 +1892,7 @@ ${result.result}`;
 								{
 									commandName: 'research-save',
 									outputType: 'cli',
-									projectRoot: validatedParams.projectRoot,
-									tag: tag
+									projectRoot: validatedParams.projectRoot
 								},
 								'text'
 							);
@@ -2044,8 +1917,7 @@ ${result.result}`;
 								{
 									commandName: 'research-save',
 									outputType: 'cli',
-									projectRoot: validatedParams.projectRoot,
-									tag: tag
+									projectRoot: validatedParams.projectRoot
 								},
 								'text',
 								true // appendMode = true
@@ -3335,40 +3207,17 @@ ${result.result}
 		.option('-d, --description <description>', 'Project description')
 		.option('-v, --version <version>', 'Project version', '0.1.0') // Set default here
 		.option('-a, --author <author>', 'Author name')
-		.option(
-			'-r, --rules <rules...>',
-			'List of rules to add (roo, windsurf, cursor, ...). Accepts comma or space separated values.'
-		)
 		.option('--skip-install', 'Skip installing dependencies')
 		.option('--dry-run', 'Show what would be done without making changes')
 		.option('--aliases', 'Add shell aliases (tm, taskmaster)')
-		.option('--no-aliases', 'Skip shell aliases (tm, taskmaster)')
-		.option('--git', 'Initialize Git repository')
-		.option('--no-git', 'Skip Git repository initialization')
-		.option('--git-tasks', 'Store tasks in Git')
-		.option('--no-git-tasks', 'No Git storage of tasks')
 		.action(async (cmdOptions) => {
 			// cmdOptions contains parsed arguments
-			// Parse rules: accept space or comma separated, default to all available rules
-			let selectedProfiles = RULE_PROFILES;
-			let rulesExplicitlyProvided = false;
-
-			if (cmdOptions.rules && Array.isArray(cmdOptions.rules)) {
-				const userSpecifiedProfiles = cmdOptions.rules
-					.flatMap((r) => r.split(','))
-					.map((r) => r.trim())
-					.filter(Boolean);
-				// Only override defaults if user specified valid rules
-				if (userSpecifiedProfiles.length > 0) {
-					selectedProfiles = userSpecifiedProfiles;
-					rulesExplicitlyProvided = true;
-				}
-			}
-
-			cmdOptions.rules = selectedProfiles;
-			cmdOptions.rulesExplicitlyProvided = rulesExplicitlyProvided;
-
 			try {
+				console.log('DEBUG: Running init command action in commands.js');
+				console.log(
+					'DEBUG: Options received by action:',
+					JSON.stringify(cmdOptions)
+				);
 				// Directly call the initializeProject function, passing the parsed options
 				await initializeProject(cmdOptions);
 				// initializeProject handles its own flow, including potential process.exit()
@@ -3409,18 +3258,6 @@ ${result.result}
 			'--bedrock',
 			'Allow setting a custom Bedrock model ID (use with --set-*) '
 		)
-		.option(
-			'--claude-code',
-			'Allow setting a Claude Code model ID (use with --set-*)'
-		)
-		.option(
-			'--azure',
-			'Allow setting a custom Azure OpenAI model ID (use with --set-*) '
-		)
-		.option(
-			'--vertex',
-			'Allow setting a custom Vertex AI model ID (use with --set-*) '
-		)
 		.addHelpText(
 			'after',
 			`
@@ -3432,9 +3269,6 @@ Examples:
  $ task-master models --set-main my-custom-model --ollama  # Set custom Ollama model for main role
  $ task-master models --set-main anthropic.claude-3-sonnet-20240229-v1:0 --bedrock # Set custom Bedrock model for main role
  $ task-master models --set-main some/other-model --openrouter # Set custom OpenRouter model for main role
-  $ task-master models --set-main sonnet --claude-code           # Set Claude Code model for main role
-  $ task-master models --set-main gpt-4o --azure # Set custom Azure OpenAI model for main role
-  $ task-master models --set-main claude-3-5-sonnet@20241022 --vertex # Set custom Vertex AI model for main role
  $ task-master models --setup                            # Run interactive setup`
 		)
 		.action(async (options) => {
@@ -3447,13 +3281,12 @@ Examples:
 			const providerFlags = [
 				options.openrouter,
 				options.ollama,
-				options.bedrock,
-				options.claudeCode
+				options.bedrock
 			].filter(Boolean).length;
 			if (providerFlags > 1) {
 				console.error(
 					chalk.red(
-						'Error: Cannot use multiple provider flags (--openrouter, --ollama, --bedrock, --claude-code) simultaneously.'
+						'Error: Cannot use multiple provider flags (--openrouter, --ollama, --bedrock) simultaneously.'
 					)
 				);
 				process.exit(1);
@@ -3495,9 +3328,7 @@ Examples:
 								? 'ollama'
 								: options.bedrock
 									? 'bedrock'
-									: options.claudeCode
-										? 'claude-code'
-										: undefined
+									: undefined
 					});
 					if (result.success) {
 						console.log(chalk.green(`✅ ${result.data.message}`));
@@ -3519,9 +3350,7 @@ Examples:
 								? 'ollama'
 								: options.bedrock
 									? 'bedrock'
-									: options.claudeCode
-										? 'claude-code'
-										: undefined
+									: undefined
 					});
 					if (result.success) {
 						console.log(chalk.green(`✅ ${result.data.message}`));
@@ -3545,9 +3374,7 @@ Examples:
 								? 'ollama'
 								: options.bedrock
 									? 'bedrock'
-									: options.claudeCode
-										? 'claude-code'
-										: undefined
+									: undefined
 					});
 					if (result.success) {
 						console.log(chalk.green(`✅ ${result.data.message}`));
@@ -3713,7 +3540,7 @@ Examples:

 				try {
 					// Read tasks data once to validate destination IDs
-					const tasksData = readJSON(tasksPath, projectRoot, tag);
+					const tasksData = readJSON(tasksPath);
 					if (!tasksData || !tasksData.tasks) {
 						console.error(
 							chalk.red(`Error: Invalid or missing tasks file at ${tasksPath}`)
@@ -3787,277 +3614,6 @@ Examples:
 			}
 		});

-	// Add/remove profile rules command
-	programInstance
-		.command('rules [action] [profiles...]')
-		.description(
-			`Add or remove rules for one or more profiles. Valid actions: ${Object.values(RULES_ACTIONS).join(', ')} (e.g., task-master rules ${RULES_ACTIONS.ADD} windsurf roo)`
-		)
-		.option(
-			'-f, --force',
-			'Skip confirmation prompt when removing rules (dangerous)'
-		)
-		.option(
-			`--${RULES_SETUP_ACTION}`,
-			'Run interactive setup to select rule profiles to add'
-		)
-		.addHelpText(
-			'after',
-			`
-		Examples:
-		$ task-master rules ${RULES_ACTIONS.ADD} windsurf roo          # Add Windsurf and Roo rule sets
-		$ task-master rules ${RULES_ACTIONS.REMOVE} windsurf          # Remove Windsurf rule set
-		$ task-master rules --${RULES_SETUP_ACTION}                  # Interactive setup to select rule profiles`
-		)
-		.action(async (action, profiles, options) => {
-			const projectDir = process.cwd();
-
-			/**
-			 * 'task-master rules --setup' action:
-			 *
-			 * Launches an interactive prompt to select which rule profiles to add to the current project.
-			 * This does NOT perform project initialization or ask about shell aliases—only rules selection.
-			 *
-			 * Example usage:
-			 *   $ task-master rules --setup
-			 *
-			 * Useful for adding rules after project creation.
-			 *
-			 * The list of profiles is always up-to-date with the available profiles.
-			 */
-			if (options[RULES_SETUP_ACTION]) {
-				// Run interactive rules setup ONLY (no project init)
-				const selectedRuleProfiles = await runInteractiveProfilesSetup();
-
-				if (!selectedRuleProfiles || selectedRuleProfiles.length === 0) {
-					console.log(chalk.yellow('No profiles selected. Exiting.'));
-					return;
-				}
-
-				console.log(
-					chalk.blue(
-						`Installing ${selectedRuleProfiles.length} selected profile(s)...`
-					)
-				);
-
-				for (let i = 0; i < selectedRuleProfiles.length; i++) {
-					const profile = selectedRuleProfiles[i];
-					console.log(
-						chalk.blue(
-							`Processing profile ${i + 1}/${selectedRuleProfiles.length}: ${profile}...`
-						)
-					);
-
-					if (!isValidProfile(profile)) {
-						console.warn(
-							`Rule profile for "${profile}" not found. Valid profiles: ${RULE_PROFILES.join(', ')}. Skipping.`
-						);
-						continue;
-					}
-					const profileConfig = getRulesProfile(profile);
-
-					const addResult = convertAllRulesToProfileRules(
-						projectDir,
-						profileConfig
-					);
-
-					console.log(chalk.green(generateProfileSummary(profile, addResult)));
-				}
-
-				console.log(
-					chalk.green(
-						`\nCompleted installation of all ${selectedRuleProfiles.length} profile(s).`
-					)
-				);
-				return;
-			}
-
-			// Validate action for non-setup mode
-			if (!action || !isValidRulesAction(action)) {
-				console.error(
-					chalk.red(
-						`Error: Invalid or missing action '${action || 'none'}'. Valid actions are: ${Object.values(RULES_ACTIONS).join(', ')}`
-					)
-				);
-				console.error(
-					chalk.yellow(
-						`For interactive setup, use: task-master rules --${RULES_SETUP_ACTION}`
-					)
-				);
-				process.exit(1);
-			}
-
-			if (!profiles || profiles.length === 0) {
-				console.error(
-					'Please specify at least one rule profile (e.g., windsurf, roo).'
-				);
-				process.exit(1);
-			}
-
-			// Support both space- and comma-separated profile lists
-			const expandedProfiles = profiles
-				.flatMap((b) => b.split(',').map((s) => s.trim()))
-				.filter(Boolean);
-
-			if (action === RULES_ACTIONS.REMOVE) {
-				let confirmed = true;
-				if (!options.force) {
-					// Check if this removal would leave no profiles remaining
-					if (wouldRemovalLeaveNoProfiles(projectDir, expandedProfiles)) {
-						const installedProfiles = getInstalledProfiles(projectDir);
-						confirmed = await confirmRemoveAllRemainingProfiles(
-							expandedProfiles,
-							installedProfiles
-						);
-					} else {
-						confirmed = await confirmProfilesRemove(expandedProfiles);
-					}
-				}
-				if (!confirmed) {
-					console.log(chalk.yellow('Aborted: No rules were removed.'));
-					return;
-				}
-			}
-
-			const removalResults = [];
-			const addResults = [];
-
-			for (const profile of expandedProfiles) {
-				if (!isValidProfile(profile)) {
-					console.warn(
-						`Rule profile for "${profile}" not found. Valid profiles: ${RULE_PROFILES.join(', ')}. Skipping.`
-					);
-					continue;
-				}
-				const profileConfig = getRulesProfile(profile);
-
-				if (action === RULES_ACTIONS.ADD) {
-					console.log(chalk.blue(`Adding rules for profile: ${profile}...`));
-					const addResult = convertAllRulesToProfileRules(
-						projectDir,
-						profileConfig
-					);
-					if (typeof profileConfig.onAddRulesProfile === 'function') {
-						const assetsDir = path.join(process.cwd(), 'assets');
-						profileConfig.onAddRulesProfile(projectDir, assetsDir);
-					}
-					console.log(
-						chalk.blue(`Completed adding rules for profile: ${profile}`)
-					);
-
-					// Store result with profile name for summary
-					addResults.push({
-						profileName: profile,
-						success: addResult.success,
-						failed: addResult.failed
-					});
-
-					console.log(chalk.green(generateProfileSummary(profile, addResult)));
-				} else if (action === RULES_ACTIONS.REMOVE) {
-					console.log(chalk.blue(`Removing rules for profile: ${profile}...`));
-					const result = removeProfileRules(projectDir, profileConfig);
-					removalResults.push(result);
-					console.log(
-						chalk.green(generateProfileRemovalSummary(profile, result))
-					);
-				} else {
-					console.error(
-						`Unknown action. Use "${RULES_ACTIONS.ADD}" or "${RULES_ACTIONS.REMOVE}".`
-					);
-					process.exit(1);
-				}
-			}
-
-			// Print summary for additions
-			if (action === RULES_ACTIONS.ADD && addResults.length > 0) {
-				const {
-					allSuccessfulProfiles,
-					totalSuccess,
-					totalFailed,
-					simpleProfiles
-				} = categorizeProfileResults(addResults);
-
-				if (allSuccessfulProfiles.length > 0) {
-					console.log(
-						chalk.green(
-							`\nSuccessfully added rules for: ${allSuccessfulProfiles.join(', ')}`
-						)
-					);
-
-					// Create a more descriptive summary
-					if (totalSuccess > 0 && simpleProfiles.length > 0) {
-						console.log(
-							chalk.green(
-								`Total: ${totalSuccess} rules added, ${totalFailed} failed, ${simpleProfiles.length} integration guide(s) copied.`
-							)
-						);
-					} else if (totalSuccess > 0) {
-						console.log(
-							chalk.green(
-								`Total: ${totalSuccess} rules added, ${totalFailed} failed.`
-							)
-						);
-					} else if (simpleProfiles.length > 0) {
-						console.log(
-							chalk.green(
-								`Total: ${simpleProfiles.length} integration guide(s) copied.`
-							)
-						);
-					}
-				}
-			}
-
-			// Print summary for removals
-			if (action === RULES_ACTIONS.REMOVE && removalResults.length > 0) {
-				const {
-					successfulRemovals,
-					skippedRemovals,
-					failedRemovals,
-					removalsWithNotices
-				} = categorizeRemovalResults(removalResults);
-
-				if (successfulRemovals.length > 0) {
-					console.log(
-						chalk.green(
-							`\nSuccessfully removed profiles for: ${successfulRemovals.join(', ')}`
-						)
-					);
-				}
-				if (skippedRemovals.length > 0) {
-					console.log(
-						chalk.yellow(
-							`Skipped (default or protected): ${skippedRemovals.join(', ')}`
-						)
-					);
-				}
-				if (failedRemovals.length > 0) {
-					console.log(chalk.red('\nErrors occurred:'));
-					failedRemovals.forEach((r) => {
-						console.log(chalk.red(`  ${r.profileName}: ${r.error}`));
-					});
-				}
-				// Display notices about preserved files/configurations
-				if (removalsWithNotices.length > 0) {
-					console.log(chalk.cyan('\nNotices:'));
-					removalsWithNotices.forEach((r) => {
-						console.log(chalk.cyan(`  ${r.profileName}: ${r.notice}`));
-					});
-				}
-
-				// Overall summary
-				const totalProcessed = removalResults.length;
-				const totalSuccessful = successfulRemovals.length;
-				const totalSkipped = skippedRemovals.length;
-				const totalFailed = failedRemovals.length;
-
-				console.log(
-					chalk.blue(
-						`\nTotal: ${totalProcessed} profile(s) processed - ${totalSuccessful} removed, ${totalSkipped} skipped, ${totalFailed} failed.`
-					)
-				);
-			}
-		});
-
 	programInstance
 		.command('migrate')
 		.description(
--- a/scripts/modules/config-manager.js
+++ b/scripts/modules/config-manager.js
@@ -5,12 +5,6 @@ import { fileURLToPath } from 'url';
 import { log, findProjectRoot, resolveEnvVariable } from './utils.js';
 import { LEGACY_CONFIG_FILE } from '../../src/constants/paths.js';
 import { findConfigPath } from '../../src/utils/path-utils.js';
-import {
-	VALIDATED_PROVIDERS,
-	CUSTOM_PROVIDERS,
-	CUSTOM_PROVIDERS_ARRAY,
-	ALL_PROVIDERS
-} from '../../src/constants/providers.js';

 // Calculate __dirname in ESM
 const __filename = fileURLToPath(import.meta.url);
@@ -35,6 +29,9 @@ try {
 	process.exit(1); // Exit if models can't be loaded
 }

+// Define valid providers dynamically from the loaded MODEL_MAP
+const VALID_PROVIDERS = Object.keys(MODEL_MAP || {});
+
 // Default configuration values (used if config file is missing or incomplete)
 const DEFAULTS = {
 	models: {
@@ -54,7 +51,7 @@ const DEFAULTS = {
 			// No default fallback provider/model initially
 			provider: 'anthropic',
 			modelId: 'claude-3-5-sonnet',
-			maxTokens: 8192, // Default parameters if fallback IS configured
+			maxTokens: 64000, // Default parameters if fallback IS configured
 			temperature: 0.2
 		}
 	},
@@ -236,25 +233,12 @@ function getConfig(explicitRoot = null, forceReload = false) {
 }

 /**
- * Validates if a provider name is supported.
- * Custom providers (azure, vertex, bedrock, openrouter, ollama) are always allowed.
- * Validated providers must exist in the MODEL_MAP from supported-models.json.
+ * Validates if a provider name is in the list of supported providers.
 * @param {string} providerName The name of the provider.
 * @returns {boolean} True if the provider is valid, false otherwise.
 */
 function validateProvider(providerName) {
-	// Custom providers are always allowed
-	if (CUSTOM_PROVIDERS_ARRAY.includes(providerName)) {
-		return true;
-	}
-
-	// Validated providers must exist in MODEL_MAP
-	if (VALIDATED_PROVIDERS.includes(providerName)) {
-		return !!(MODEL_MAP && MODEL_MAP[providerName]);
-	}
-
-	// Unknown providers are not allowed
-	return false;
+	return VALID_PROVIDERS.includes(providerName);
 }

 /**
@@ -496,22 +480,10 @@ function getParametersForRole(role, explicitRoot = null) {
 */
 function isApiKeySet(providerName, session = null, projectRoot = null) {
 	// Define the expected environment variable name for each provider
-
-	// Providers that don't require API keys for authentication
-	const providersWithoutApiKeys = [
-		CUSTOM_PROVIDERS.OLLAMA,
-		CUSTOM_PROVIDERS.BEDROCK
-	];
-
-	if (providersWithoutApiKeys.includes(providerName?.toLowerCase())) {
+	if (providerName?.toLowerCase() === 'ollama') {
 		return true; // Indicate key status is effectively "OK"
 	}

-	// Claude Code doesn't require an API key
-	if (providerName?.toLowerCase() === 'claude-code') {
-		return true; // No API key needed
-	}
-
 	const keyMap = {
 		openai: 'OPENAI_API_KEY',
 		anthropic: 'ANTHROPIC_API_KEY',
@@ -521,9 +493,7 @@ function isApiKeySet(providerName, session = null, projectRoot = null) {
 		azure: 'AZURE_OPENAI_API_KEY',
 		openrouter: 'OPENROUTER_API_KEY',
 		xai: 'XAI_API_KEY',
-		vertex: 'GOOGLE_API_KEY', // Vertex uses the same key as Google
-		'claude-code': 'CLAUDE_CODE_API_KEY', // Not actually used, but included for consistency
-		bedrock: 'AWS_ACCESS_KEY_ID' // Bedrock uses AWS credentials
+		vertex: 'GOOGLE_API_KEY' // Vertex uses the same key as Google
 		// Add other providers as needed
 	};

@@ -571,11 +541,10 @@ function getMcpApiKeyStatus(providerName, projectRoot = null) {
 		const mcpConfigRaw = fs.readFileSync(mcpConfigPath, 'utf-8');
 		const mcpConfig = JSON.parse(mcpConfigRaw);

-		const mcpEnv =
-			mcpConfig?.mcpServers?.['task-master-ai']?.env ||
-			mcpConfig?.mcpServers?.['taskmaster-ai']?.env;
+		const mcpEnv = mcpConfig?.mcpServers?.['taskmaster-ai']?.env;
 		if (!mcpEnv) {
-			return false;
+			// console.warn(chalk.yellow('Warning: Could not find taskmaster-ai env in mcp.json.'));
+			return false; // Structure missing
 		}

 		let apiKeyToCheck = null;
@@ -608,8 +577,6 @@ function getMcpApiKeyStatus(providerName, projectRoot = null) {
 				break;
 			case 'ollama':
 				return true; // No key needed
-			case 'claude-code':
-				return true; // No key needed
 			case 'mistral':
 				apiKeyToCheck = mcpEnv.MISTRAL_API_KEY;
 				placeholderValue = 'YOUR_MISTRAL_API_KEY_HERE';
@@ -622,10 +589,6 @@ function getMcpApiKeyStatus(providerName, projectRoot = null) {
 				apiKeyToCheck = mcpEnv.GOOGLE_API_KEY; // Vertex uses Google API key
 				placeholderValue = 'YOUR_GOOGLE_API_KEY_HERE';
 				break;
-			case 'bedrock':
-				apiKeyToCheck = mcpEnv.AWS_ACCESS_KEY_ID; // Bedrock uses AWS credentials
-				placeholderValue = 'YOUR_AWS_ACCESS_KEY_ID_HERE';
-				break;
 			default:
 				return false; // Unknown provider
 		}
@@ -673,8 +636,7 @@ function getAvailableModels() {
 					provider: provider,
 					swe_score: sweScore,
 					cost_per_1m_tokens: cost,
-					allowed_roles: allowedRoles,
-					max_tokens: modelObj.max_tokens
+					allowed_roles: allowedRoles
 				});
 			});
 		} else {
@@ -774,24 +736,18 @@ function getUserId(explicitRoot = null) {
 }

 /**
- * Gets a list of all known provider names (both validated and custom).
- * @returns {string[]} An array of all provider names.
+ * Gets a list of all provider names defined in the MODEL_MAP.
+ * @returns {string[]} An array of provider names.
 */
 function getAllProviders() {
-	return ALL_PROVIDERS;
+	return Object.keys(MODEL_MAP || {});
 }

 function getBaseUrlForRole(role, explicitRoot = null) {
 	const roleConfig = getModelConfigForRole(role, explicitRoot);
-	if (roleConfig && typeof roleConfig.baseURL === 'string') {
-		return roleConfig.baseURL;
-	}
-	const provider = roleConfig?.provider;
-	if (provider) {
-		const envVarName = `${provider.toUpperCase()}_BASE_URL`;
-		return resolveEnvVariable(envVarName, null, explicitRoot);
-	}
-	return undefined;
+	return roleConfig && typeof roleConfig.baseURL === 'string'
+		? roleConfig.baseURL
+		: undefined;
 }

 export {
@@ -803,9 +759,7 @@ export {
 	// Validation
 	validateProvider,
 	validateProviderModelCombination,
-	VALIDATED_PROVIDERS,
-	CUSTOM_PROVIDERS,
-	ALL_PROVIDERS,
+	VALID_PROVIDERS,
 	MODEL_MAP,
 	getAvailableModels,
 	// Role-specific getters (No env var overrides)
--- a/scripts/modules/rule-transformer.js
+++ b/scripts/modules/rule-transformer.js
@@ -0,0 +1,314 @@
+/**
+ * Rule Transformer Module
+ * Handles conversion of Cursor rules to Roo rules
+ *
+ * This module procedurally generates .roo/rules files from .cursor/rules files,
+ * eliminating the need to maintain both sets of files manually.
+ */
+import fs from 'fs';
+import path from 'path';
+import { log } from './utils.js';
+
+// Configuration for term conversions - centralized for easier future updates
+const conversionConfig = {
+	// Product and brand name replacements
+	brandTerms: [
+		{ from: /cursor\.so/g, to: 'roocode.com' },
+		{ from: /\[cursor\.so\]/g, to: '[roocode.com]' },
+		{ from: /href="https:\/\/cursor\.so/g, to: 'href="https://roocode.com' },
+		{ from: /\(https:\/\/cursor\.so/g, to: '(https://roocode.com' },
+		{
+			from: /\bcursor\b/gi,
+			to: (match) => (match === 'Cursor' ? 'Roo Code' : 'roo')
+		},
+		{ from: /Cursor/g, to: 'Roo Code' }
+	],
+
+	// File extension replacements
+	fileExtensions: [{ from: /\.mdc\b/g, to: '.md' }],
+
+	// Documentation URL replacements
+	docUrls: [
+		{
+			from: /https:\/\/docs\.cursor\.com\/[^\s)'"]+/g,
+			to: (match) => match.replace('docs.cursor.com', 'docs.roocode.com')
+		},
+		{ from: /https:\/\/docs\.roo\.com\//g, to: 'https://docs.roocode.com/' }
+	],
+
+	// Tool references - direct replacements
+	toolNames: {
+		search: 'search_files',
+		read_file: 'read_file',
+		edit_file: 'apply_diff',
+		create_file: 'write_to_file',
+		run_command: 'execute_command',
+		terminal_command: 'execute_command',
+		use_mcp: 'use_mcp_tool',
+		switch_mode: 'switch_mode'
+	},
+
+	// Tool references in context - more specific replacements
+	toolContexts: [
+		{ from: /\bsearch tool\b/g, to: 'search_files tool' },
+		{ from: /\bedit_file tool\b/g, to: 'apply_diff tool' },
+		{ from: /\buse the search\b/g, to: 'use the search_files' },
+		{ from: /\bThe edit_file\b/g, to: 'The apply_diff' },
+		{ from: /\brun_command executes\b/g, to: 'execute_command executes' },
+		{ from: /\buse_mcp connects\b/g, to: 'use_mcp_tool connects' },
+		// Additional contextual patterns for flexibility
+		{ from: /\bCursor search\b/g, to: 'Roo Code search_files' },
+		{ from: /\bCursor edit\b/g, to: 'Roo Code apply_diff' },
+		{ from: /\bCursor create\b/g, to: 'Roo Code write_to_file' },
+		{ from: /\bCursor run\b/g, to: 'Roo Code execute_command' }
+	],
+
+	// Tool group and category names
+	toolGroups: [
+		{ from: /\bSearch tools\b/g, to: 'Read Group tools' },
+		{ from: /\bEdit tools\b/g, to: 'Edit Group tools' },
+		{ from: /\bRun tools\b/g, to: 'Command Group tools' },
+		{ from: /\bMCP servers\b/g, to: 'MCP Group tools' },
+		{ from: /\bSearch Group\b/g, to: 'Read Group' },
+		{ from: /\bEdit Group\b/g, to: 'Edit Group' },
+		{ from: /\bRun Group\b/g, to: 'Command Group' }
+	],
+
+	// File references in markdown links
+	fileReferences: {
+		pathPattern: /\[(.+?)\]\(mdc:\.cursor\/rules\/(.+?)\.mdc\)/g,
+		replacement: (match, text, filePath) => {
+			// Get the base filename
+			const baseName = path.basename(filePath, '.mdc');
+
+			// Get the new filename (either from mapping or by replacing extension)
+			const newFileName = fileMap[`${baseName}.mdc`] || `${baseName}.md`;
+
+			// Return the updated link
+			return `[${text}](mdc:.roo/rules/${newFileName})`;
+		}
+	}
+};
+
+// File name mapping (specific files with naming changes)
+const fileMap = {
+	'cursor_rules.mdc': 'roo_rules.md',
+	'dev_workflow.mdc': 'dev_workflow.md',
+	'self_improve.mdc': 'self_improve.md',
+	'taskmaster.mdc': 'taskmaster.md'
+	// Add other mappings as needed
+};
+
+/**
+ * Replace basic Cursor terms with Roo equivalents
+ */
+function replaceBasicTerms(content) {
+	let result = content;
+
+	// Apply brand term replacements
+	conversionConfig.brandTerms.forEach((pattern) => {
+		if (typeof pattern.to === 'function') {
+			result = result.replace(pattern.from, pattern.to);
+		} else {
+			result = result.replace(pattern.from, pattern.to);
+		}
+	});
+
+	// Apply file extension replacements
+	conversionConfig.fileExtensions.forEach((pattern) => {
+		result = result.replace(pattern.from, pattern.to);
+	});
+
+	return result;
+}
+
+/**
+ * Replace Cursor tool references with Roo tool equivalents
+ */
+function replaceToolReferences(content) {
+	let result = content;
+
+	// Basic pattern for direct tool name replacements
+	const toolNames = conversionConfig.toolNames;
+	const toolReferencePattern = new RegExp(
+		`\\b(${Object.keys(toolNames).join('|')})\\b`,
+		'g'
+	);
+
+	// Apply direct tool name replacements
+	result = result.replace(toolReferencePattern, (match, toolName) => {
+		return toolNames[toolName] || toolName;
+	});
+
+	// Apply contextual tool replacements
+	conversionConfig.toolContexts.forEach((pattern) => {
+		result = result.replace(pattern.from, pattern.to);
+	});
+
+	// Apply tool group replacements
+	conversionConfig.toolGroups.forEach((pattern) => {
+		result = result.replace(pattern.from, pattern.to);
+	});
+
+	return result;
+}
+
+/**
+ * Update documentation URLs to point to Roo documentation
+ */
+function updateDocReferences(content) {
+	let result = content;
+
+	// Apply documentation URL replacements
+	conversionConfig.docUrls.forEach((pattern) => {
+		if (typeof pattern.to === 'function') {
+			result = result.replace(pattern.from, pattern.to);
+		} else {
+			result = result.replace(pattern.from, pattern.to);
+		}
+	});
+
+	return result;
+}
+
+/**
+ * Update file references in markdown links
+ */
+function updateFileReferences(content) {
+	const { pathPattern, replacement } = conversionConfig.fileReferences;
+	return content.replace(pathPattern, replacement);
+}
+
+/**
+ * Main transformation function that applies all conversions
+ */
+function transformCursorToRooRules(content) {
+	// Apply all transformations in appropriate order
+	let result = content;
+	result = replaceBasicTerms(result);
+	result = replaceToolReferences(result);
+	result = updateDocReferences(result);
+	result = updateFileReferences(result);
+
+	// Super aggressive failsafe pass to catch any variations we might have missed
+	// This ensures critical transformations are applied even in contexts we didn't anticipate
+
+	// 1. Handle cursor.so in any possible context
+	result = result.replace(/cursor\.so/gi, 'roocode.com');
+	// Edge case: URL with different formatting
+	result = result.replace(/cursor\s*\.\s*so/gi, 'roocode.com');
+	result = result.replace(/https?:\/\/cursor\.so/gi, 'https://roocode.com');
+	result = result.replace(
+		/https?:\/\/www\.cursor\.so/gi,
+		'https://www.roocode.com'
+	);
+
+	// 2. Handle tool references - even partial ones
+	result = result.replace(/\bedit_file\b/gi, 'apply_diff');
+	result = result.replace(/\bsearch tool\b/gi, 'search_files tool');
+	result = result.replace(/\bSearch Tool\b/g, 'Search_Files Tool');
+
+	// 3. Handle basic terms (with case handling)
+	result = result.replace(/\bcursor\b/gi, (match) =>
+		match.charAt(0) === 'C' ? 'Roo Code' : 'roo'
+	);
+	result = result.replace(/Cursor/g, 'Roo Code');
+	result = result.replace(/CURSOR/g, 'ROO CODE');
+
+	// 4. Handle file extensions
+	result = result.replace(/\.mdc\b/g, '.md');
+
+	// 5. Handle any missed URL patterns
+	result = result.replace(/docs\.cursor\.com/gi, 'docs.roocode.com');
+	result = result.replace(/docs\.roo\.com/gi, 'docs.roocode.com');
+
+	return result;
+}
+
+/**
+ * Convert a single Cursor rule file to Roo rule format
+ */
+function convertCursorRuleToRooRule(sourcePath, targetPath) {
+	try {
+		log(
+			'info',
+			`Converting Cursor rule ${path.basename(sourcePath)} to Roo rule ${path.basename(targetPath)}`
+		);
+
+		// Read source content
+		const content = fs.readFileSync(sourcePath, 'utf8');
+
+		// Transform content
+		const transformedContent = transformCursorToRooRules(content);
+
+		// Ensure target directory exists
+		const targetDir = path.dirname(targetPath);
+		if (!fs.existsSync(targetDir)) {
+			fs.mkdirSync(targetDir, { recursive: true });
+		}
+
+		// Write transformed content
+		fs.writeFileSync(targetPath, transformedContent);
+		log(
+			'success',
+			`Successfully converted ${path.basename(sourcePath)} to ${path.basename(targetPath)}`
+		);
+
+		return true;
+	} catch (error) {
+		log(
+			'error',
+			`Failed to convert rule file ${path.basename(sourcePath)}: ${error.message}`
+		);
+		return false;
+	}
+}
+
+/**
+ * Process all Cursor rules and convert to Roo rules
+ */
+function convertAllCursorRulesToRooRules(projectDir) {
+	const cursorRulesDir = path.join(projectDir, '.cursor', 'rules');
+	const rooRulesDir = path.join(projectDir, '.roo', 'rules');
+
+	if (!fs.existsSync(cursorRulesDir)) {
+		log('warn', `Cursor rules directory not found: ${cursorRulesDir}`);
+		return { success: 0, failed: 0 };
+	}
+
+	// Ensure Roo rules directory exists
+	if (!fs.existsSync(rooRulesDir)) {
+		fs.mkdirSync(rooRulesDir, { recursive: true });
+		log('info', `Created Roo rules directory: ${rooRulesDir}`);
+	}
+
+	// Count successful and failed conversions
+	let success = 0;
+	let failed = 0;
+
+	// Process each file in the Cursor rules directory
+	fs.readdirSync(cursorRulesDir).forEach((file) => {
+		if (file.endsWith('.mdc')) {
+			const sourcePath = path.join(cursorRulesDir, file);
+
+			// Determine target file name (either from mapping or by replacing extension)
+			const targetFilename = fileMap[file] || file.replace('.mdc', '.md');
+			const targetPath = path.join(rooRulesDir, targetFilename);
+
+			// Convert the file
+			if (convertCursorRuleToRooRule(sourcePath, targetPath)) {
+				success++;
+			} else {
+				failed++;
+			}
+		}
+	});
+
+	log(
+		'info',
+		`Rule conversion complete: ${success} successful, ${failed} failed`
+	);
+	return { success, failed };
+}
+
+export { convertAllCursorRulesToRooRules, convertCursorRuleToRooRule };
--- a/scripts/modules/supported-models.json
+++ b/scripts/modules/supported-models.json
@@ -1,181 +1,113 @@
 {
-	"bedrock": [
-		{
-			"id": "us.anthropic.claude-3-7-sonnet-20250219-v1:0",
-			"swe_score": 0.623,
-			"cost_per_1m_tokens": { "input": 3, "output": 15 },
-			"allowed_roles": ["main", "fallback"],
-			"max_tokens": 65536
-		},
-		{
-			"id": "us.deepseek.r1-v1:0",
-			"swe_score": 0,
-			"cost_per_1m_tokens": { "input": 1.35, "output": 5.4 },
-			"allowed_roles": ["research"],
-			"max_tokens": 65536
-		}
-	],
 	"anthropic": [
 		{
 			"id": "claude-sonnet-4-20250514",
 			"swe_score": 0.727,
-			"cost_per_1m_tokens": {
-				"input": 3.0,
-				"output": 15.0
-			},
+			"cost_per_1m_tokens": { "input": 3.0, "output": 15.0 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 64000
 		},
 		{
 			"id": "claude-opus-4-20250514",
 			"swe_score": 0.725,
-			"cost_per_1m_tokens": {
-				"input": 15.0,
-				"output": 75.0
-			},
+			"cost_per_1m_tokens": { "input": 15.0, "output": 75.0 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 32000
 		},
 		{
 			"id": "claude-3-7-sonnet-20250219",
 			"swe_score": 0.623,
-			"cost_per_1m_tokens": {
-				"input": 3.0,
-				"output": 15.0
-			},
+			"cost_per_1m_tokens": { "input": 3.0, "output": 15.0 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 120000
 		},
 		{
 			"id": "claude-3-5-sonnet-20241022",
 			"swe_score": 0.49,
-			"cost_per_1m_tokens": {
-				"input": 3.0,
-				"output": 15.0
-			},
+			"cost_per_1m_tokens": { "input": 3.0, "output": 15.0 },
 			"allowed_roles": ["main", "fallback"],
-			"max_tokens": 8192
+			"max_tokens": 64000
 		}
 	],
 	"openai": [
 		{
 			"id": "gpt-4o",
 			"swe_score": 0.332,
-			"cost_per_1m_tokens": {
-				"input": 2.5,
-				"output": 10.0
-			},
+			"cost_per_1m_tokens": { "input": 2.5, "output": 10.0 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 16384
 		},
 		{
 			"id": "o1",
 			"swe_score": 0.489,
-			"cost_per_1m_tokens": {
-				"input": 15.0,
-				"output": 60.0
-			},
+			"cost_per_1m_tokens": { "input": 15.0, "output": 60.0 },
 			"allowed_roles": ["main"]
 		},
 		{
 			"id": "o3",
 			"swe_score": 0.5,
-			"cost_per_1m_tokens": {
-				"input": 2.0,
-				"output": 8.0
-			},
-			"allowed_roles": ["main", "fallback"],
-			"max_tokens": 100000
+			"cost_per_1m_tokens": { "input": 2.0, "output": 8.0 },
+			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "o3-mini",
 			"swe_score": 0.493,
-			"cost_per_1m_tokens": {
-				"input": 1.1,
-				"output": 4.4
-			},
+			"cost_per_1m_tokens": { "input": 1.1, "output": 4.4 },
 			"allowed_roles": ["main"],
 			"max_tokens": 100000
 		},
 		{
 			"id": "o4-mini",
 			"swe_score": 0.45,
-			"cost_per_1m_tokens": {
-				"input": 1.1,
-				"output": 4.4
-			},
+			"cost_per_1m_tokens": { "input": 1.1, "output": 4.4 },
 			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "o1-mini",
 			"swe_score": 0.4,
-			"cost_per_1m_tokens": {
-				"input": 1.1,
-				"output": 4.4
-			},
+			"cost_per_1m_tokens": { "input": 1.1, "output": 4.4 },
 			"allowed_roles": ["main"]
 		},
 		{
 			"id": "o1-pro",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 150.0,
-				"output": 600.0
-			},
+			"cost_per_1m_tokens": { "input": 150.0, "output": 600.0 },
 			"allowed_roles": ["main"]
 		},
 		{
 			"id": "gpt-4-5-preview",
 			"swe_score": 0.38,
-			"cost_per_1m_tokens": {
-				"input": 75.0,
-				"output": 150.0
-			},
+			"cost_per_1m_tokens": { "input": 75.0, "output": 150.0 },
 			"allowed_roles": ["main"]
 		},
 		{
 			"id": "gpt-4-1-mini",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.4,
-				"output": 1.6
-			},
+			"cost_per_1m_tokens": { "input": 0.4, "output": 1.6 },
 			"allowed_roles": ["main"]
 		},
 		{
 			"id": "gpt-4-1-nano",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.1,
-				"output": 0.4
-			},
+			"cost_per_1m_tokens": { "input": 0.1, "output": 0.4 },
 			"allowed_roles": ["main"]
 		},
 		{
 			"id": "gpt-4o-mini",
 			"swe_score": 0.3,
-			"cost_per_1m_tokens": {
-				"input": 0.15,
-				"output": 0.6
-			},
+			"cost_per_1m_tokens": { "input": 0.15, "output": 0.6 },
 			"allowed_roles": ["main"]
 		},
 		{
 			"id": "gpt-4o-search-preview",
 			"swe_score": 0.33,
-			"cost_per_1m_tokens": {
-				"input": 2.5,
-				"output": 10.0
-			},
+			"cost_per_1m_tokens": { "input": 2.5, "output": 10.0 },
 			"allowed_roles": ["research"]
 		},
 		{
 			"id": "gpt-4o-mini-search-preview",
 			"swe_score": 0.3,
-			"cost_per_1m_tokens": {
-				"input": 0.15,
-				"output": 0.6
-			},
+			"cost_per_1m_tokens": { "input": 0.15, "output": 0.6 },
 			"allowed_roles": ["research"]
 		}
 	],
@@ -196,18 +128,15 @@
 		},
 		{
 			"id": "gemini-2.5-flash-preview-04-17",
-			"swe_score": 0.604,
+			"swe_score": 0,
 			"cost_per_1m_tokens": null,
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 1048000
 		},
 		{
 			"id": "gemini-2.0-flash",
-			"swe_score": 0.518,
-			"cost_per_1m_tokens": {
-				"input": 0.15,
-				"output": 0.6
-			},
+			"swe_score": 0.754,
+			"cost_per_1m_tokens": { "input": 0.15, "output": 0.6 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 1048000
 		},
@@ -223,50 +152,35 @@
 		{
 			"id": "sonar-pro",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 3,
-				"output": 15
-			},
+			"cost_per_1m_tokens": { "input": 3, "output": 15 },
 			"allowed_roles": ["main", "research"],
 			"max_tokens": 8700
 		},
 		{
 			"id": "sonar",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 1,
-				"output": 1
-			},
+			"cost_per_1m_tokens": { "input": 1, "output": 1 },
 			"allowed_roles": ["research"],
 			"max_tokens": 8700
 		},
 		{
 			"id": "deep-research",
 			"swe_score": 0.211,
-			"cost_per_1m_tokens": {
-				"input": 2,
-				"output": 8
-			},
+			"cost_per_1m_tokens": { "input": 2, "output": 8 },
 			"allowed_roles": ["research"],
 			"max_tokens": 8700
 		},
 		{
 			"id": "sonar-reasoning-pro",
 			"swe_score": 0.211,
-			"cost_per_1m_tokens": {
-				"input": 2,
-				"output": 8
-			},
+			"cost_per_1m_tokens": { "input": 2, "output": 8 },
 			"allowed_roles": ["main", "research", "fallback"],
 			"max_tokens": 8700
 		},
 		{
 			"id": "sonar-reasoning",
 			"swe_score": 0.211,
-			"cost_per_1m_tokens": {
-				"input": 1,
-				"output": 5
-			},
+			"cost_per_1m_tokens": { "input": 1, "output": 5 },
 			"allowed_roles": ["main", "research", "fallback"],
 			"max_tokens": 8700
 		}
@@ -276,10 +190,7 @@
 			"id": "grok-3",
 			"name": "Grok 3",
 			"swe_score": null,
-			"cost_per_1m_tokens": {
-				"input": 3,
-				"output": 15
-			},
+			"cost_per_1m_tokens": { "input": 3, "output": 15 },
 			"allowed_roles": ["main", "fallback", "research"],
 			"max_tokens": 131072
 		},
@@ -287,10 +198,7 @@
 			"id": "grok-3-fast",
 			"name": "Grok 3 Fast",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 5,
-				"output": 25
-			},
+			"cost_per_1m_tokens": { "input": 5, "output": 25 },
 			"allowed_roles": ["main", "fallback", "research"],
 			"max_tokens": 131072
 		}
@@ -299,64 +207,43 @@
 		{
 			"id": "devstral:latest",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0,
-				"output": 0
-			},
+			"cost_per_1m_tokens": { "input": 0, "output": 0 },
 			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "qwen3:latest",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0,
-				"output": 0
-			},
+			"cost_per_1m_tokens": { "input": 0, "output": 0 },
 			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "qwen3:14b",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0,
-				"output": 0
-			},
+			"cost_per_1m_tokens": { "input": 0, "output": 0 },
 			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "qwen3:32b",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0,
-				"output": 0
-			},
+			"cost_per_1m_tokens": { "input": 0, "output": 0 },
 			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "mistral-small3.1:latest",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0,
-				"output": 0
-			},
+			"cost_per_1m_tokens": { "input": 0, "output": 0 },
 			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "llama3.3:latest",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0,
-				"output": 0
-			},
+			"cost_per_1m_tokens": { "input": 0, "output": 0 },
 			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "phi4:latest",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0,
-				"output": 0
-			},
+			"cost_per_1m_tokens": { "input": 0, "output": 0 },
 			"allowed_roles": ["main", "fallback"]
 		}
 	],
@@ -364,268 +251,177 @@
 		{
 			"id": "google/gemini-2.5-flash-preview-05-20",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.15,
-				"output": 0.6
-			},
+			"cost_per_1m_tokens": { "input": 0.15, "output": 0.6 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 1048576
 		},
 		{
 			"id": "google/gemini-2.5-flash-preview-05-20:thinking",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.15,
-				"output": 3.5
-			},
+			"cost_per_1m_tokens": { "input": 0.15, "output": 3.5 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 1048576
 		},
 		{
 			"id": "google/gemini-2.5-pro-exp-03-25",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0,
-				"output": 0
-			},
+			"cost_per_1m_tokens": { "input": 0, "output": 0 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 1000000
 		},
 		{
 			"id": "deepseek/deepseek-chat-v3-0324:free",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0,
-				"output": 0
-			},
+			"cost_per_1m_tokens": { "input": 0, "output": 0 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 163840
 		},
 		{
 			"id": "deepseek/deepseek-chat-v3-0324",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.27,
-				"output": 1.1
-			},
+			"cost_per_1m_tokens": { "input": 0.27, "output": 1.1 },
 			"allowed_roles": ["main"],
 			"max_tokens": 64000
 		},
 		{
 			"id": "openai/gpt-4.1",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 2,
-				"output": 8
-			},
+			"cost_per_1m_tokens": { "input": 2, "output": 8 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 1000000
 		},
 		{
 			"id": "openai/gpt-4.1-mini",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.4,
-				"output": 1.6
-			},
+			"cost_per_1m_tokens": { "input": 0.4, "output": 1.6 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 1000000
 		},
 		{
 			"id": "openai/gpt-4.1-nano",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.1,
-				"output": 0.4
-			},
+			"cost_per_1m_tokens": { "input": 0.1, "output": 0.4 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 1000000
 		},
 		{
 			"id": "openai/o3",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 10,
-				"output": 40
-			},
+			"cost_per_1m_tokens": { "input": 10, "output": 40 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 200000
 		},
 		{
 			"id": "openai/codex-mini",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 1.5,
-				"output": 6
-			},
+			"cost_per_1m_tokens": { "input": 1.5, "output": 6 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 100000
 		},
 		{
 			"id": "openai/gpt-4o-mini",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.15,
-				"output": 0.6
-			},
+			"cost_per_1m_tokens": { "input": 0.15, "output": 0.6 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 100000
 		},
 		{
 			"id": "openai/o4-mini",
 			"swe_score": 0.45,
-			"cost_per_1m_tokens": {
-				"input": 1.1,
-				"output": 4.4
-			},
+			"cost_per_1m_tokens": { "input": 1.1, "output": 4.4 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 100000
 		},
 		{
 			"id": "openai/o4-mini-high",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 1.1,
-				"output": 4.4
-			},
+			"cost_per_1m_tokens": { "input": 1.1, "output": 4.4 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 100000
 		},
 		{
 			"id": "openai/o1-pro",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 150,
-				"output": 600
-			},
+			"cost_per_1m_tokens": { "input": 150, "output": 600 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 100000
 		},
 		{
 			"id": "meta-llama/llama-3.3-70b-instruct",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 120,
-				"output": 600
-			},
+			"cost_per_1m_tokens": { "input": 120, "output": 600 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 1048576
 		},
 		{
 			"id": "meta-llama/llama-4-maverick",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.18,
-				"output": 0.6
-			},
+			"cost_per_1m_tokens": { "input": 0.18, "output": 0.6 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 1000000
 		},
 		{
 			"id": "meta-llama/llama-4-scout",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.08,
-				"output": 0.3
-			},
+			"cost_per_1m_tokens": { "input": 0.08, "output": 0.3 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 1000000
 		},
 		{
 			"id": "qwen/qwen-max",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 1.6,
-				"output": 6.4
-			},
+			"cost_per_1m_tokens": { "input": 1.6, "output": 6.4 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 32768
 		},
 		{
 			"id": "qwen/qwen-turbo",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.05,
-				"output": 0.2
-			},
+			"cost_per_1m_tokens": { "input": 0.05, "output": 0.2 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 1000000
 		},
 		{
 			"id": "qwen/qwen3-235b-a22b",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.14,
-				"output": 2
-			},
+			"cost_per_1m_tokens": { "input": 0.14, "output": 2 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 24000
 		},
 		{
 			"id": "mistralai/mistral-small-3.1-24b-instruct:free",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0,
-				"output": 0
-			},
+			"cost_per_1m_tokens": { "input": 0, "output": 0 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 96000
 		},
 		{
 			"id": "mistralai/mistral-small-3.1-24b-instruct",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.1,
-				"output": 0.3
-			},
+			"cost_per_1m_tokens": { "input": 0.1, "output": 0.3 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 128000
 		},
 		{
 			"id": "mistralai/devstral-small",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.1,
-				"output": 0.3
-			},
+			"cost_per_1m_tokens": { "input": 0.1, "output": 0.3 },
 			"allowed_roles": ["main"],
 			"max_tokens": 110000
 		},
 		{
 			"id": "mistralai/mistral-nemo",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0.03,
-				"output": 0.07
-			},
+			"cost_per_1m_tokens": { "input": 0.03, "output": 0.07 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 100000
 		},
 		{
 			"id": "thudm/glm-4-32b:free",
 			"swe_score": 0,
-			"cost_per_1m_tokens": {
-				"input": 0,
-				"output": 0
-			},
+			"cost_per_1m_tokens": { "input": 0, "output": 0 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 32768
 		}
-	],
-	"claude-code": [
-		{
-			"id": "opus",
-			"swe_score": 0.725,
-			"cost_per_1m_tokens": { "input": 0, "output": 0 },
-			"allowed_roles": ["main", "fallback", "research"],
-			"max_tokens": 32000
-		},
-		{
-			"id": "sonnet",
-			"swe_score": 0.727,
-			"cost_per_1m_tokens": { "input": 0, "output": 0 },
-			"allowed_roles": ["main", "fallback", "research"],
-			"max_tokens": 64000
-		}
 	]
 }
--- a/scripts/modules/task-manager/add-task.js
+++ b/scripts/modules/task-manager/add-task.js
@@ -27,6 +27,7 @@ import {
 } from '../utils.js';
 import { generateObjectService } from '../ai-services-unified.js';
 import { getDefaultPriority } from '../config-manager.js';
+import generateTaskFiles from './generate-task-files.js';
 import ContextGatherer from '../utils/contextGatherer.js';

 // Define Zod schema for the expected AI output object
@@ -43,7 +44,7 @@ const AiTaskDataSchema = z.object({
 		.describe('Detailed approach for verifying task completion'),
 	dependencies: z
 		.array(z.number())
-		.nullable()
+		.optional()
 		.describe(
 			'Array of task IDs that this task depends on (must be completed before this task can start)'
 		)
@@ -557,14 +558,14 @@ async function addTask(
 		report('DEBUG: tasks.json written.', 'debug');

 		// Generate markdown task files
-		// report('Generating task files...', 'info');
-		// report('DEBUG: Calling generateTaskFiles...', 'debug');
-		// // Pass mcpLog if available to generateTaskFiles
-		// await generateTaskFiles(tasksPath, path.dirname(tasksPath), {
-		// 	projectRoot,
-		// 	tag: targetTag
-		// });
-		// report('DEBUG: generateTaskFiles finished.', 'debug');
+		report('Generating task files...', 'info');
+		report('DEBUG: Calling generateTaskFiles...', 'debug');
+		// Pass mcpLog if available to generateTaskFiles
+		await generateTaskFiles(tasksPath, path.dirname(tasksPath), {
+			projectRoot,
+			tag: targetTag
+		});
+		report('DEBUG: generateTaskFiles finished.', 'debug');

 		// Show success message - only for text output (CLI)
 		if (outputFormat === 'text') {
--- a/scripts/modules/task-manager/clear-subtasks.js
+++ b/scripts/modules/task-manager/clear-subtasks.js
@@ -5,6 +5,7 @@ import Table from 'cli-table3';

 import { log, readJSON, writeJSON, truncate, isSilentMode } from '../utils.js';
 import { displayBanner } from '../ui.js';
+import generateTaskFiles from './generate-task-files.js';

 /**
 * Clear subtasks from specified tasks
@@ -98,6 +99,10 @@ function clearSubtasks(tasksPath, taskIds, context = {}) {
 			console.log(summaryTable.toString());
 		}

+		// Regenerate task files to reflect changes
+		log('info', 'Regenerating task files...');
+		generateTaskFiles(tasksPath, path.dirname(tasksPath), { projectRoot, tag });
+
 		// Success message
 		if (!isSilentMode()) {
 			console.log(
--- a/scripts/modules/task-manager/expand-all-tasks.js
+++ b/scripts/modules/task-manager/expand-all-tasks.js
@@ -32,12 +32,7 @@ async function expandAllTasks(
 	context = {},
 	outputFormat = 'text' // Assume text default for CLI
 ) {
-	const {
-		session,
-		mcpLog,
-		projectRoot: providedProjectRoot,
-		tag: contextTag
-	} = context;
+	const { session, mcpLog, projectRoot: providedProjectRoot } = context;
 	const isMCPCall = !!mcpLog; // Determine if called from MCP

 	const projectRoot = providedProjectRoot || findProjectRoot();
@@ -79,7 +74,7 @@ async function expandAllTasks(

 	try {
 		logger.info(`Reading tasks from ${tasksPath}`);
-		const data = readJSON(tasksPath, projectRoot, contextTag);
+		const data = readJSON(tasksPath, projectRoot);
 		if (!data || !data.tasks) {
 			throw new Error(`Invalid tasks data in ${tasksPath}`);
 		}
@@ -129,7 +124,7 @@ async function expandAllTasks(
 					numSubtasks,
 					useResearch,
 					additionalContext,
-					{ ...context, projectRoot, tag: data.tag || contextTag }, // Pass the whole context object with projectRoot and resolved tag
+					{ ...context, projectRoot }, // Pass the whole context object with projectRoot
 					force
 				);
 				expandedCount++;
--- a/scripts/modules/task-manager/expand-task.js
+++ b/scripts/modules/task-manager/expand-task.js
@@ -43,9 +43,8 @@ const subtaskSchema = z
 			),
 		testStrategy: z
 			.string()
-			.nullable()
+			.optional()
 			.describe('Approach for testing this subtask')
-			.default('')
 	})
 	.strict();
 const subtaskArraySchema = z.array(subtaskSchema);
@@ -418,7 +417,7 @@ async function expandTask(
 	context = {},
 	force = false
 ) {
-	const { session, mcpLog, projectRoot: contextProjectRoot, tag } = context;
+	const { session, mcpLog, projectRoot: contextProjectRoot } = context;
 	const outputFormat = mcpLog ? 'json' : 'text';

 	// Determine projectRoot: Use from context if available, otherwise derive from tasksPath
@@ -440,7 +439,7 @@ async function expandTask(
 	try {
 		// --- Task Loading/Filtering (Unchanged) ---
 		logger.info(`Reading tasks from ${tasksPath}`);
-		const data = readJSON(tasksPath, projectRoot, tag);
+		const data = readJSON(tasksPath, projectRoot);
 		if (!data || !data.tasks)
 			throw new Error(`Invalid tasks data in ${tasksPath}`);
 		const taskIndex = data.tasks.findIndex(
@@ -669,8 +668,8 @@ async function expandTask(
 		// --- End Change: Append instead of replace ---

 		data.tasks[taskIndex] = task; // Assign the modified task back
-		writeJSON(tasksPath, data, projectRoot, tag);
-		// await generateTaskFiles(tasksPath, path.dirname(tasksPath));
+		writeJSON(tasksPath, data);
+		await generateTaskFiles(tasksPath, path.dirname(tasksPath));

 		// Display AI Usage Summary for CLI
 		if (
--- a/scripts/modules/task-manager/models.js
+++ b/scripts/modules/task-manager/models.js
@@ -23,7 +23,6 @@ import {
 } from '../config-manager.js';
 import { findConfigPath } from '../../../src/utils/path-utils.js';
 import { log } from '../utils.js';
-import { CUSTOM_PROVIDERS } from '../../../src/constants/providers.js';

 /**
 * Fetches the list of models from OpenRouter API.
@@ -425,7 +424,7 @@ async function setModel(role, modelId, options = {}) {
 		let warningMessage = null;

 		// Find the model data in internal list initially to see if it exists at all
-		let modelData = availableModels.find((m) => m.id === modelId);
+		const modelData = availableModels.find((m) => m.id === modelId);

 		// --- Revised Logic: Prioritize providerHint --- //

@@ -441,7 +440,7 @@ async function setModel(role, modelId, options = {}) {
 			} else {
 				// Either not found internally, OR found but under a DIFFERENT provider than hinted.
 				// Proceed with custom logic based ONLY on the hint.
-				if (providerHint === CUSTOM_PROVIDERS.OPENROUTER) {
+				if (providerHint === 'openrouter') {
 					// Check OpenRouter ONLY because hint was openrouter
 					report('info', `Checking OpenRouter for ${modelId} (as hinted)...`);
 					const openRouterModels = await fetchOpenRouterModels();
@@ -450,7 +449,7 @@ async function setModel(role, modelId, options = {}) {
 						openRouterModels &&
 						openRouterModels.some((m) => m.id === modelId)
 					) {
-						determinedProvider = CUSTOM_PROVIDERS.OPENROUTER;
+						determinedProvider = 'openrouter';

 						// Check if this is a free model (ends with :free)
 						if (modelId.endsWith(':free')) {
@@ -466,7 +465,7 @@ async function setModel(role, modelId, options = {}) {
 							`Model ID "${modelId}" not found in the live OpenRouter model list. Please verify the ID and ensure it's available on OpenRouter.`
 						);
 					}
-				} else if (providerHint === CUSTOM_PROVIDERS.OLLAMA) {
+				} else if (providerHint === 'ollama') {
 					// Check Ollama ONLY because hint was ollama
 					report('info', `Checking Ollama for ${modelId} (as hinted)...`);

@@ -480,7 +479,7 @@ async function setModel(role, modelId, options = {}) {
 							`Unable to connect to Ollama server at ${ollamaBaseURL}. Please ensure Ollama is running and try again.`
 						);
 					} else if (ollamaModels.some((m) => m.model === modelId)) {
-						determinedProvider = CUSTOM_PROVIDERS.OLLAMA;
+						determinedProvider = 'ollama';
 						warningMessage = `Warning: Custom Ollama model '${modelId}' set. Ensure your Ollama server is running and has pulled this model. Taskmaster cannot guarantee compatibility.`;
 						report('warn', warningMessage);
 					} else {
@@ -490,41 +489,13 @@ async function setModel(role, modelId, options = {}) {
 							`Model ID "${modelId}" not found in the Ollama instance. Please verify the model is pulled and available. You can check available models with: curl ${tagsUrl}`
 						);
 					}
-				} else if (providerHint === CUSTOM_PROVIDERS.BEDROCK) {
+				} else if (providerHint === 'bedrock') {
 					// Set provider without model validation since Bedrock models are managed by AWS
-					determinedProvider = CUSTOM_PROVIDERS.BEDROCK;
+					determinedProvider = 'bedrock';
 					warningMessage = `Warning: Custom Bedrock model '${modelId}' set. Please ensure the model ID is valid and accessible in your AWS account.`;
 					report('warn', warningMessage);
-				} else if (providerHint === CUSTOM_PROVIDERS.CLAUDE_CODE) {
-					// Claude Code provider - check if model exists in our list
-					determinedProvider = CUSTOM_PROVIDERS.CLAUDE_CODE;
-					// Re-find modelData specifically for claude-code provider
-					const claudeCodeModels = availableModels.filter(
-						(m) => m.provider === 'claude-code'
-					);
-					const claudeCodeModelData = claudeCodeModels.find(
-						(m) => m.id === modelId
-					);
-					if (claudeCodeModelData) {
-						// Update modelData to the found claude-code model
-						modelData = claudeCodeModelData;
-						report('info', `Setting Claude Code model '${modelId}'.`);
-					} else {
-						warningMessage = `Warning: Claude Code model '${modelId}' not found in supported models. Setting without validation.`;
-						report('warn', warningMessage);
-					}
-				} else if (providerHint === CUSTOM_PROVIDERS.AZURE) {
-					// Set provider without model validation since Azure models are managed by Azure
-					determinedProvider = CUSTOM_PROVIDERS.AZURE;
-					warningMessage = `Warning: Custom Azure model '${modelId}' set. Please ensure the model deployment is valid and accessible in your Azure account.`;
-					report('warn', warningMessage);
-				} else if (providerHint === CUSTOM_PROVIDERS.VERTEX) {
-					// Set provider without model validation since Vertex models are managed by Google Cloud
-					determinedProvider = CUSTOM_PROVIDERS.VERTEX;
-					warningMessage = `Warning: Custom Vertex AI model '${modelId}' set. Please ensure the model is valid and accessible in your Google Cloud project.`;
-					report('warn', warningMessage);
 				} else {
-					// Invalid provider hint - should not happen with our constants
+					// Invalid provider hint - should not happen
 					throw new Error(`Invalid provider hint received: ${providerHint}`);
 				}
 			}
@@ -543,7 +514,7 @@ async function setModel(role, modelId, options = {}) {
 					success: false,
 					error: {
 						code: 'MODEL_NOT_FOUND_NO_HINT',
-						message: `Model ID "${modelId}" not found in Taskmaster's supported models. If this is a custom model, please specify the provider using --openrouter, --ollama, --bedrock, --azure, or --vertex.`
+						message: `Model ID "${modelId}" not found in Taskmaster's supported models. If this is a custom model, please specify the provider using --openrouter or --ollama.`
 					}
 				};
 			}
@@ -565,16 +536,11 @@ async function setModel(role, modelId, options = {}) {

 		// Update configuration
 		currentConfig.models[role] = {
-			...currentConfig.models[role], // Keep existing params like temperature
+			...currentConfig.models[role], // Keep existing params like maxTokens
 			provider: determinedProvider,
 			modelId: modelId
 		};

-		// If model data is available, update maxTokens from supported-models.json
-		if (modelData && modelData.max_tokens) {
-			currentConfig.models[role].maxTokens = modelData.max_tokens;
-		}
-
 		// Write updated configuration
 		const writeResult = writeConfig(currentConfig, projectRoot);
 		if (!writeResult) {
--- a/scripts/modules/task-manager/move-task.js
+++ b/scripts/modules/task-manager/move-task.js
@@ -120,7 +120,7 @@ async function moveTask(

 	// Always write the data object, never the _rawTaggedData directly
 	// The writeJSON function will filter out _rawTaggedData automatically
-	writeJSON(tasksPath, rawData, options.projectRoot, currentTag);
+	writeJSON(tasksPath, rawData);

 	if (generateFiles) {
 		await generateTaskFiles(tasksPath, path.dirname(tasksPath));
--- a/scripts/modules/task-manager/parse-prd.js
+++ b/scripts/modules/task-manager/parse-prd.js
@@ -26,11 +26,11 @@ const prdSingleTaskSchema = z.object({
 	id: z.number().int().positive(),
 	title: z.string().min(1),
 	description: z.string().min(1),
-	details: z.string().nullable(),
-	testStrategy: z.string().nullable(),
-	priority: z.enum(['high', 'medium', 'low']).nullable(),
-	dependencies: z.array(z.number().int().positive()).nullable(),
-	status: z.string().nullable()
+	details: z.string().optional().default(''),
+	testStrategy: z.string().optional().default(''),
+	priority: z.enum(['high', 'medium', 'low']).default('medium'),
+	dependencies: z.array(z.number().int().positive()).optional().default([]),
+	status: z.string().optional().default('pending')
 });

 // Define the Zod schema for the ENTIRE expected AI response object
--- a/scripts/modules/task-manager/research.js
+++ b/scripts/modules/task-manager/research.js
@@ -107,13 +107,8 @@ async function performResearch(
 		let autoDiscoveredIds = [];

 		try {
-			const tasksPath = path.join(
-				projectRoot,
-				'.taskmaster',
-				'tasks',
-				'tasks.json'
-			);
-			const tasksData = await readJSON(tasksPath, projectRoot);
+			const tasksPath = path.join(projectRoot, 'tasks', 'tasks.json');
+			const tasksData = await readJSON(tasksPath);

 			if (tasksData && tasksData.tasks && tasksData.tasks.length > 0) {
 				// Flatten tasks to include subtasks for fuzzy search
@@ -255,9 +250,6 @@ async function performResearch(
 		const tagInfo = aiResult.tagInfo;

 		// Format and display results
-		// Initialize interactive save tracking
-		let interactiveSaveInfo = { interactiveSaveOccurred: false };
-
 		if (outputFormat === 'text') {
 			displayResearchResults(
 				researchResult,
@@ -273,7 +265,7 @@ async function performResearch(

 			// Offer follow-up question option (only for initial CLI queries, not MCP)
 			if (allowFollowUp && !isMCP) {
-				interactiveSaveInfo = await handleFollowUpQuestions(
+				await handleFollowUpQuestions(
 					options,
 					context,
 					outputFormat,
@@ -316,8 +308,7 @@ async function performResearch(
 				detailLevel,
 				telemetryData,
 				tagInfo,
-				savedFilePath,
-				interactiveSaveOccurred: false // MCP save-to-file doesn't count as interactive save
+				savedFilePath
 			};
 		}

@@ -334,9 +325,7 @@ async function performResearch(
 			totalInputTokens,
 			detailLevel,
 			telemetryData,
-			tagInfo,
-			interactiveSaveOccurred:
-				interactiveSaveInfo?.interactiveSaveOccurred || false
+			tagInfo
 		};
 	} catch (error) {
 		logFn.error(`Research query failed: ${error.message}`);
@@ -654,8 +643,6 @@ async function handleFollowUpQuestions(
 	initialQuery,
 	initialResult
 ) {
-	let interactiveSaveOccurred = false;
-
 	try {
 		// Import required modules for saving
 		const { readJSON } = await import('../utils.js');
@@ -706,15 +693,12 @@ async function handleFollowUpQuestions(

 			if (action === 'save') {
 				// Handle save functionality
-				const saveResult = await handleSaveToTask(
+				await handleSaveToTask(
 					conversationHistory,
 					projectRoot,
 					context,
 					logFn
 				);
-				if (saveResult) {
-					interactiveSaveOccurred = true;
-				}
 				continue;
 			}

@@ -778,8 +762,6 @@ async function handleFollowUpQuestions(
 		// silently continue without follow-up functionality
 		logFn.debug(`Follow-up questions not available: ${error.message}`);
 	}
-
-	return { interactiveSaveOccurred };
 }

 /**
@@ -846,10 +828,8 @@ async function handleSaveToTask(
 			return;
 		}

-		// Validate ID exists - use tag from context
-		const { getCurrentTag } = await import('../utils.js');
-		const tag = context.tag || getCurrentTag(projectRoot) || 'master';
-		const data = readJSON(tasksPath, projectRoot, tag);
+		// Validate ID exists
+		const data = readJSON(tasksPath, projectRoot);
 		if (!data || !data.tasks) {
 			console.log(chalk.red('❌ No valid tasks found.'));
 			return;
@@ -883,7 +863,7 @@ async function handleSaveToTask(
 				trimmedTaskId,
 				conversationThread,
 				false, // useResearch = false for simple append
-				{ ...context, tag },
+				context,
 				'text'
 			);

@@ -910,7 +890,7 @@ async function handleSaveToTask(
 				taskIdNum,
 				conversationThread,
 				false, // useResearch = false for simple append
-				{ ...context, tag },
+				context,
 				'text',
 				true // appendMode = true
 			);
@@ -919,12 +899,9 @@ async function handleSaveToTask(
 				chalk.green(`✅ Research conversation saved to task ${trimmedTaskId}`)
 			);
 		}
-
-		return true; // Indicate successful save
 	} catch (error) {
 		console.log(chalk.red(`❌ Error saving conversation: ${error.message}`));
 		logFn.error(`Error saving conversation: ${error.message}`);
-		return false; // Indicate failed save
 	}
 }

--- a/scripts/modules/task-manager/update-subtask-by-id.js
+++ b/scripts/modules/task-manager/update-subtask-by-id.js
@@ -17,8 +17,7 @@ import {
 	truncate,
 	isSilentMode,
 	findProjectRoot,
-	flattenTasksWithSubtasks,
-	getCurrentTag
+	flattenTasksWithSubtasks
 } from '../utils.js';
 import { generateTextService } from '../ai-services-unified.js';
 import { getDebugFlag } from '../config-manager.js';
@@ -47,7 +46,7 @@ async function updateSubtaskById(
 	context = {},
 	outputFormat = context.mcpLog ? 'json' : 'text'
 ) {
-	const { session, mcpLog, projectRoot: providedProjectRoot, tag } = context;
+	const { session, mcpLog, projectRoot: providedProjectRoot } = context;
 	const logFn = mcpLog || consoleLog;
 	const isMCP = !!mcpLog;

@@ -91,10 +90,7 @@ async function updateSubtaskById(
 			throw new Error('Could not determine project root directory');
 		}

-		// Determine the tag to use
-		const currentTag = tag || getCurrentTag(projectRoot) || 'master';
-
-		const data = readJSON(tasksPath, projectRoot, currentTag);
+		const data = readJSON(tasksPath, projectRoot);
 		if (!data || !data.tasks) {
 			throw new Error(
 				`No valid tasks found in ${tasksPath}. The file may be corrupted or have an invalid format.`
@@ -335,7 +331,7 @@ Output Requirements:
 		if (outputFormat === 'text' && getDebugFlag(session)) {
 			console.log('>>> DEBUG: About to call writeJSON with updated data...');
 		}
-		writeJSON(tasksPath, data, projectRoot, currentTag);
+		writeJSON(tasksPath, data, projectRoot);
 		if (outputFormat === 'text' && getDebugFlag(session)) {
 			console.log('>>> DEBUG: writeJSON call completed.');
 		}
--- a/scripts/modules/task-manager/update-task-by-id.js
+++ b/scripts/modules/task-manager/update-task-by-id.js
@@ -12,8 +12,7 @@ import {
 	truncate,
 	isSilentMode,
 	flattenTasksWithSubtasks,
-	findProjectRoot,
-	getCurrentTag
+	findProjectRoot
 } from '../utils.js';

 import {
@@ -24,7 +23,11 @@ import {
 } from '../ui.js';

 import { generateTextService } from '../ai-services-unified.js';
-import { getDebugFlag, isApiKeySet } from '../config-manager.js';
+import {
+	getDebugFlag,
+	isApiKeySet // Keep this check
+} from '../config-manager.js';
+import generateTaskFiles from './generate-task-files.js';
 import { ContextGatherer } from '../utils/contextGatherer.js';
 import { FuzzyTaskSearch } from '../utils/fuzzyTaskSearch.js';

@@ -36,27 +39,10 @@ const updatedTaskSchema = z
 		description: z.string(),
 		status: z.string(),
 		dependencies: z.array(z.union([z.number().int(), z.string()])),
-		priority: z.string().nullable().default('medium'),
-		details: z.string().nullable().default(''),
-		testStrategy: z.string().nullable().default(''),
-		subtasks: z
-			.array(
-				z.object({
-					id: z
-						.number()
-						.int()
-						.positive()
-						.describe('Sequential subtask ID starting from 1'),
-					title: z.string(),
-					description: z.string(),
-					status: z.string(),
-					dependencies: z.array(z.number().int()).nullable().default([]),
-					details: z.string().nullable().default(''),
-					testStrategy: z.string().nullable().default('')
-				})
-			)
-			.nullable()
-			.default([])
+		priority: z.string().optional(),
+		details: z.string().optional(),
+		testStrategy: z.string().optional(),
+		subtasks: z.array(z.any()).optional()
 	})
 	.strip(); // Allows parsing even if AI adds extra fields, but validation focuses on schema

@@ -237,7 +223,7 @@ async function updateTaskById(
 	outputFormat = 'text',
 	appendMode = false
 ) {
-	const { session, mcpLog, projectRoot: providedProjectRoot, tag } = context;
+	const { session, mcpLog, projectRoot: providedProjectRoot } = context;
 	const logFn = mcpLog || consoleLog;
 	const isMCP = !!mcpLog;

@@ -282,11 +268,8 @@ async function updateTaskById(
 			throw new Error('Could not determine project root directory');
 		}

-		// Determine the tag to use
-		const currentTag = tag || getCurrentTag(projectRoot) || 'master';
-
 		// --- Task Loading and Status Check (Keep existing) ---
-		const data = readJSON(tasksPath, projectRoot, currentTag);
+		const data = readJSON(tasksPath, projectRoot);
 		if (!data || !data.tasks)
 			throw new Error(`No valid tasks found in ${tasksPath}.`);
 		const taskIndex = data.tasks.findIndex((task) => task.id === taskId);
@@ -458,8 +441,6 @@ Guidelines:
 9. Instead, add a new subtask that clearly indicates what needs to be changed or replaced
 10. Use the existence of completed subtasks as an opportunity to make new subtasks more specific and targeted
 11. Ensure any new subtasks have unique IDs that don't conflict with existing ones
-12. CRITICAL: For subtask IDs, use ONLY numeric values (1, 2, 3, etc.) NOT strings ("1", "2", "3")
-13. CRITICAL: Subtask IDs should start from 1 and increment sequentially (1, 2, 3...) - do NOT use parent task ID as prefix

 The changes described in the prompt should be thoughtfully applied to make the task more accurate and actionable.`;

@@ -529,7 +510,7 @@ The changes described in the prompt should be thoughtfully applied to make the t

 				// Write the updated task back to file
 				data.tasks[taskIndex] = taskToUpdate;
-				writeJSON(tasksPath, data, projectRoot, currentTag);
+				writeJSON(tasksPath, data);
 				report('success', `Successfully appended to task ${taskId}`);

 				// Display success message for CLI
@@ -592,37 +573,6 @@ The changes described in the prompt should be thoughtfully applied to make the t
 				);
 				updatedTask.status = taskToUpdate.status;
 			}
-			// Fix subtask IDs if they exist (ensure they are numeric and sequential)
-			if (updatedTask.subtasks && Array.isArray(updatedTask.subtasks)) {
-				let currentSubtaskId = 1;
-				updatedTask.subtasks = updatedTask.subtasks.map((subtask) => {
-					// Fix AI-generated subtask IDs that might be strings or use parent ID as prefix
-					const correctedSubtask = {
-						...subtask,
-						id: currentSubtaskId, // Override AI-generated ID with correct sequential ID
-						dependencies: Array.isArray(subtask.dependencies)
-							? subtask.dependencies
-									.map((dep) =>
-										typeof dep === 'string' ? parseInt(dep, 10) : dep
-									)
-									.filter(
-										(depId) =>
-											!Number.isNaN(depId) &&
-											depId >= 1 &&
-											depId < currentSubtaskId
-									)
-							: [],
-						status: subtask.status || 'pending'
-					};
-					currentSubtaskId++;
-					return correctedSubtask;
-				});
-				report(
-					'info',
-					`Fixed ${updatedTask.subtasks.length} subtask IDs to be sequential numeric IDs.`
-				);
-			}
-
 			// Preserve completed subtasks (Keep existing logic)
 			if (taskToUpdate.subtasks?.length > 0) {
 				if (!updatedTask.subtasks) {
@@ -674,7 +624,7 @@ The changes described in the prompt should be thoughtfully applied to make the t
 			// --- End Update Task Data ---

 			// --- Write File and Generate (Unchanged) ---
-			writeJSON(tasksPath, data, projectRoot, currentTag);
+			writeJSON(tasksPath, data);
 			report('success', `Successfully updated task ${taskId}`);
 			// await generateTaskFiles(tasksPath, path.dirname(tasksPath));
 			// --- End Write File ---
--- a/scripts/modules/task-manager/update-tasks.js
+++ b/scripts/modules/task-manager/update-tasks.js
@@ -35,10 +35,10 @@ const updatedTaskSchema = z
 		description: z.string(),
 		status: z.string(),
 		dependencies: z.array(z.union([z.number().int(), z.string()])),
-		priority: z.string().nullable(),
-		details: z.string().nullable(),
-		testStrategy: z.string().nullable(),
-		subtasks: z.array(z.any()).nullable() // Keep subtasks flexible for now
+		priority: z.string().optional(),
+		details: z.string().optional(),
+		testStrategy: z.string().optional(),
+		subtasks: z.array(z.any()).optional() // Keep subtasks flexible for now
 	})
 	.strip(); // Allow potential extra fields during parsing if needed, then validate structure
 const updatedTaskArraySchema = z.array(updatedTaskSchema);
--- a/scripts/modules/utils.js
+++ b/scripts/modules/utils.js
@@ -73,7 +73,7 @@ function resolveEnvVariable(key, session = null, projectRoot = null) {
 */
 function findProjectRoot(
 	startDir = process.cwd(),
-	markers = ['package.json', 'pyproject.toml', '.git', LEGACY_CONFIG_FILE]
+	markers = ['package.json', '.git', LEGACY_CONFIG_FILE]
 ) {
 	let currentPath = path.resolve(startDir);
 	const rootPath = path.parse(currentPath).root;
--- a/scripts/modules/utils/contextGatherer.js
+++ b/scripts/modules/utils/contextGatherer.js
@@ -123,7 +123,7 @@ export class ContextGatherer {

 		// Dependency Graph Analysis
 		if (dependencyTasks.length > 0) {
-			const dependencyResults = this._buildDependencyGraphs(dependencyTasks);
+			const dependencyResults = this._buildDependencyContext(dependencyTasks);
 			dependencyResults.allRelatedTaskIds.forEach((id) =>
 				finalTaskIds.add(String(id))
 			);
--- a/Show More
+++ b/Show More