chore: run format

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

.changeset/config.json

@@ -2,7 +2,9 @@
   "$schema": "https://unpkg.com/@changesets/config@3.1.1/schema.json",
   "changelog": [
     "@changesets/changelog-github",
-    { "repo": "eyaltoledano/claude-task-master" }
+    {
+      "repo": "eyaltoledano/claude-task-master"
+    }
   ],
   "commit": false,
   "fixed": [],
@@ -10,5 +12,7 @@
   "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": []
-}
+  "ignore": [
+    "docs"
+  ]
+}

.changeset/crazy-meals-hope.md

@@ -0,0 +1,27 @@
+---
+"task-master-ai": minor
+---
+
+Add cross-tag task movement functionality for organizing tasks across different contexts.
+
+This feature enables moving tasks between different tags (contexts) in your project, making it easier to organize work across different branches, environments, or project phases.
+
+## CLI Usage Examples
+
+Move a single task from one tag to another:
+```bash
+# Move task 5 from backlog tag to in-progress tag
+task-master move --from=5 --from-tag=backlog --to-tag=feature-1
+
+# Move task with its dependencies
+task-master move --from=5 --from-tag=backlog --to-tag=feature-2 --with-dependencies
+
+# Move task without checking dependencies
+task-master move --from=5 --from-tag=backlog --to-tag=bug-3 --ignore-dependencies
+```
+
+Move multiple tasks at once:
+```bash
+# Move multiple tasks between tags
+task-master move --from=5,6,7 --from-tag=backlog --to-tag=bug-4 --with-dependencies
+```

.changeset/curly-poets-move.md

@@ -0,0 +1,6 @@
+---
+"extension": minor
+"task-master-ai": minor
+---
+
+"Add Kilo Code profile integration with custom modes and MCP configuration"

.changeset/cute-files-pay.md

@@ -0,0 +1,12 @@
+---
+"task-master-ai": minor
+---
+
+Add compact mode --compact / -c flag to the `tm list` CLI command
+
+- outputs tasks in a minimal, git-style one-line format. This reduces verbose output from ~30+ lines of dashboards and tables to just 1 line per task, making it much easier to quickly scan available tasks.
+  - Git-style format: ID STATUS TITLE (PRIORITY) → DEPS
+  - Color-coded status, priority, and dependencies
+  - Smart title truncation and dependency abbreviation
+  - Subtask support with indentation
+  - Full backward compatibility with existing list options

.changeset/fifty-squids-wear.md

@@ -1,5 +0,0 @@
----
-"task-master-ai": patch
----
-
-Add CI for testing

.changeset/floppy-starts-find.md

@@ -0,0 +1,5 @@
+---
+"task-master-ai": minor
+---
+
+Add CLI & MCP progress tracking for parse-prd command.

.changeset/light-crabs-warn.md

@@ -0,0 +1,5 @@
+---
+"extension": minor
+---
+
+Display current task ID on task details page

.changeset/red-lights-mix.md

@@ -1,5 +0,0 @@
----
-"task-master-ai": patch
----
-
-Fix github actions creating npm releases on next branch push

.changeset/rude-moments-search.md

@@ -0,0 +1,7 @@
+---
+"task-master-ai": patch
+---
+
+Fix `add-tag --from-branch` command error where `projectRoot` was not properly referenced
+
+The command was failing with "projectRoot is not defined" error because the code was directly referencing `projectRoot` instead of `context.projectRoot` in the git repository checks. This fix corrects the variable references to use the proper context object.

.changeset/slow-readers-deny.md

@@ -0,0 +1,5 @@
+---
+"task-master-ai": minor
+---
+
+Add support for ollama `gpt-oss:20b` and `gpt-oss:120b`

.changeset/two-bats-smoke.md

@@ -1,302 +0,0 @@
----
-"task-master-ai": patch
----
-
-- Adjusts the MCP server invokation in the mcp.json we ship with `task-master init`. Fully functional now.
-- Rename the npx -y command. It's now `npx -y task-master-ai task-master-mcp`
-- Add additional binary alias: `task-master-mcp-server` pointing to the same MCP server script
-
-- **Significant improvements to model configuration:**
-  - Increase context window from 64k to 128k tokens (MAX_TOKENS=128000) for handling larger codebases
-  - Reduce temperature from 0.4 to 0.2 for more consistent, deterministic outputs
-  - Set default model to "claude-3-7-sonnet-20250219" in configuration
-  - Update Perplexity model to "sonar-pro" for research operations
-  - Increase default subtasks generation from 4 to 5 for more granular task breakdown
-  - Set consistent default priority to "medium" for all new tasks
-
-- **Clarify environment configuration approaches:**
-  - For direct MCP usage: Configure API keys directly in `.cursor/mcp.json`
-  - For npm package usage: Configure API keys in `.env` file
-  - Update templates with clearer placeholder values and formatting
-  - Provide explicit documentation about configuration methods in both environments
-  - Use consistent placeholder format "YOUR_ANTHROPIC_API_KEY_HERE" in mcp.json
-
-- Rename MCP tools to better align with API conventions and natural language in client chat:
-  - Rename `list-tasks` to `get-tasks` for more intuitive client requests like "get my tasks"
-  - Rename `show-task` to `get-task` for consistency with GET-based API naming conventions
-
-- **Refine AI-based MCP tool implementation patterns:**
-  - Establish clear responsibilities for direct functions vs MCP tools when handling AI operations
-  - Update MCP direct function signatures to expect `context = { session }` for AI-based tools, without `reportProgress`
-  - Clarify that AI client initialization, API calls, and response parsing should be handled within the direct function
-  - Define standard error codes for AI operations (`AI_CLIENT_ERROR`, `RESPONSE_PARSING_ERROR`, etc.)
-  - Document that `reportProgress` should not be used within direct functions due to client validation issues
-  - Establish that progress indication within direct functions should use standard logging (`log.info()`)
-  - Clarify that `AsyncOperationManager` should manage progress reporting at the MCP tool layer, not in direct functions
-  - Update `mcp.mdc` rule to reflect the refined patterns for AI-based MCP tools
-  - **Document and implement the Logger Wrapper Pattern:**
-    - Add comprehensive documentation in `mcp.mdc` and `utilities.mdc` on the Logger Wrapper Pattern
-    - Explain the dual purpose of the wrapper: preventing runtime errors and controlling output format
-    - Include implementation examples with detailed explanations of why and when to use this pattern
-    - Clearly document that this pattern has proven successful in resolving issues in multiple MCP tools
-    - Cross-reference between rule files to ensure consistent guidance
-  - **Fix critical issue in `analyze-project-complexity` MCP tool:**
-    - Implement proper logger wrapper in `analyzeTaskComplexityDirect` to fix `mcpLog[level] is not a function` errors
-    - Update direct function to handle both Perplexity and Claude AI properly for research-backed analysis
-    - Improve silent mode handling with proper wasSilent state tracking
-    - Add comprehensive error handling for AI client errors and report file parsing
-    - Ensure proper report format detection and analysis with fallbacks
-    - Fix variable name conflicts between the `report` logging function and data structures in `analyzeTaskComplexity`
-  - **Fix critical issue in `update-task` MCP tool:**
-    - Implement proper logger wrapper in `updateTaskByIdDirect` to ensure mcpLog[level] calls work correctly
-    - Update Zod schema in `update-task.js` to accept both string and number type IDs
-    - Fix silent mode implementation with proper try/finally blocks
-    - Add comprehensive error handling for missing parameters, invalid task IDs, and failed updates
-  - **Refactor `update-subtask` MCP tool to follow established patterns:**
-    - Update `updateSubtaskByIdDirect` function to accept `context = { session }` parameter
-    - Add proper AI client initialization with error handling for both Anthropic and Perplexity
-    - Implement the Logger Wrapper Pattern to prevent mcpLog[level] errors
-    - Support both string and number subtask IDs with appropriate validation
-    - Update MCP tool to pass session to direct function but not reportProgress
-    - Remove commented-out calls to reportProgress for cleaner code
-    - Add comprehensive error handling for various failure scenarios
-    - Implement proper silent mode with try/finally blocks
-    - Ensure detailed successful update response information
-  - **Fix issues in `set-task-status` MCP tool:**
-    - Remove reportProgress parameter as it's not needed
-    - Improve project root handling for better session awareness
-    - Reorganize function call arguments for setTaskStatusDirect
-    - Add proper silent mode handling with try/catch/finally blocks
-    - Enhance logging for both success and error cases
-  - **Refactor `update` MCP tool to follow established patterns:**
-    - Update `updateTasksDirect` function to accept `context = { session }` parameter
-    - Add proper AI client initialization with error handling
-    - Update MCP tool to pass session to direct function but not reportProgress
-    - Simplify parameter validation using string type for 'from' parameter
-    - Improve error handling for AI client errors
-    - Implement proper silent mode handling with try/finally blocks
-    - Use `isSilentMode()` function instead of accessing global variables directly
-  - **Refactor `expand-task` MCP tool to follow established patterns:**
-    - Update `expandTaskDirect` function to accept `context = { session }` parameter
-    - Add proper AI client initialization with error handling
-    - Update MCP tool to pass session to direct function but not reportProgress
-    - Add comprehensive tests for the refactored implementation
-    - Improve error handling for AI client errors
-    - Remove non-existent 'force' parameter from direct function implementation
-    - Ensure direct function parameters match core function parameters
-    - Implement proper silent mode handling with try/finally blocks
-    - Use `isSilentMode()` function instead of accessing global variables directly
-  - **Refactor `parse-prd` MCP tool to follow established patterns:**
-    - Update `parsePRDDirect` function to accept `context = { session }` parameter for proper AI initialization
-    - Implement AI client initialization with proper error handling using `getAnthropicClientForMCP`
-    - Add the Logger Wrapper Pattern to ensure proper logging via `mcpLog`
-    - Update the core `parsePRD` function to accept an AI client parameter
-    - Implement proper silent mode handling with try/finally blocks
-    - Remove `reportProgress` usage from MCP tool for better client compatibility
-    - Fix console output that was breaking the JSON response format
-    - Improve error handling with specific error codes
-    - Pass session object to the direct function correctly
-    - Update task-manager-core.js to export AI client utilities for better organization
-    - Ensure proper option passing between functions to maintain logging context
-
-- **Update MCP Logger to respect silent mode:**
-  - Import and check `isSilentMode()` function in logger implementation
-  - Skip all logging when silent mode is enabled
-  - Prevent console output from interfering with JSON responses
-  - Fix "Unexpected token 'I', "[INFO] Gene"... is not valid JSON" errors by suppressing log output during silent mode
-
-- **Refactor `expand-all` MCP tool to follow established patterns:**
-    - Update `expandAllTasksDirect` function to accept `context = { session }` parameter
-    - Add proper AI client initialization with error handling for research-backed expansion
-    - Pass session to direct function but not reportProgress in the MCP tool
-    - Implement directory switching to work around core function limitations
-    - Add comprehensive error handling with specific error codes
-    - Ensure proper restoration of working directory after execution
-    - Use try/finally pattern for both silent mode and directory management
-    - Add comprehensive tests for the refactored implementation
-
-- **Standardize and improve silent mode implementation across MCP direct functions:**
-  - Add proper import of all silent mode utilities: `import { enableSilentMode, disableSilentMode, isSilentMode } from 'utils.js'`
-  - Replace direct access to global silentMode variable with `isSilentMode()` function calls
-  - Implement consistent try/finally pattern to ensure silent mode is always properly disabled
-  - Add error handling with finally blocks to prevent silent mode from remaining enabled after errors
-  - Create proper mixed parameter/global silent mode check pattern: `const isSilent = options.silentMode || (typeof options.silentMode === 'undefined' && isSilentMode())`
-  - Update all direct functions to follow the new implementation pattern
-  - Fix issues with silent mode not being properly disabled when errors occur
-
-- **Improve parameter handling between direct functions and core functions:**
-  - Verify direct function parameters match core function signatures
-  - Remove extraction and use of parameters that don't exist in core functions (e.g., 'force')
-  - Implement appropriate type conversion for parameters (e.g., `parseInt(args.id, 10)`)
-  - Set defaults that match core function expectations
-  - Add detailed documentation on parameter matching in guidelines
-  - Add explicit examples of correct parameter handling patterns
-
-- **Create standardized MCP direct function implementation checklist:**
-  - Comprehensive imports and dependencies section
-  - Parameter validation and matching guidelines
-  - Silent mode implementation best practices
-  - Error handling and response format patterns
-  - Path resolution and core function call guidelines
-  - Function export and testing verification steps
-  - Specific issues to watch for related to silent mode, parameters, and error cases
-  - Add checklist to subtasks for uniform implementation across all direct functions
-
-- **Implement centralized AI client utilities for MCP tools:**
-  - Create new `ai-client-utils.js` module with standardized client initialization functions
-  - Implement session-aware AI client initialization for both Anthropic and Perplexity
-  - Add comprehensive error handling with user-friendly error messages
-  - Create intelligent AI model selection based on task requirements
-  - Implement model configuration utilities that respect session environment variables
-  - Add extensive unit tests for all utility functions
-  - Significantly improve MCP tool reliability for AI operations
-  - **Specific implementations include:**
-    - `getAnthropicClientForMCP`: Initializes Anthropic client with session environment variables
-    - `getPerplexityClientForMCP`: Initializes Perplexity client with session environment variables
-    - `getModelConfig`: Retrieves model parameters from session or fallbacks to defaults
-    - `getBestAvailableAIModel`: Selects the best available model based on requirements
-    - `handleClaudeError`: Processes Claude API errors into user-friendly messages
-  - **Updated direct functions to use centralized AI utilities:**
-    - Refactored `addTaskDirect` to use the new AI client utilities with proper AsyncOperationManager integration
-    - Implemented comprehensive error handling for API key validation, AI processing, and response parsing
-    - Added session-aware parameter handling with proper propagation of context to AI streaming functions
-    - Ensured proper fallback to process.env when session variables aren't available
-
-- **Refine AI services for reusable operations:**
-  - Refactor `ai-services.js` to support consistent AI operations across CLI and MCP
-  - Implement shared helpers for streaming responses, prompt building, and response parsing
-  - Standardize client initialization patterns with proper session parameter handling
-  - Enhance error handling and loading indicator management
-  - Fix process exit issues to prevent MCP server termination on API errors
-  - Ensure proper resource cleanup in all execution paths
-  - Add comprehensive test coverage for AI service functions
-  - **Key improvements include:**
-    - Stream processing safety with explicit completion detection
-    - Standardized function parameter patterns
-    - Session-aware parameter extraction with sensible defaults
-    - Proper cleanup using try/catch/finally patterns
-
-- **Optimize MCP response payloads:**
-  - Add custom `processTaskResponse` function to `get-task` MCP tool to filter out unnecessary `allTasks` array data
-  - Significantly reduce response size by returning only the specific requested task instead of all tasks
-  - Preserve dependency status relationships for the UI/CLI while keeping MCP responses lean and efficient
-
-- **Implement complete remove-task functionality:**
-  - Add `removeTask` core function to permanently delete tasks or subtasks from tasks.json
-  - Implement CLI command `remove-task` with confirmation prompt and force flag support
-  - Create MCP `remove_task` tool for AI-assisted task removal
-  - Automatically handle dependency cleanup by removing references to deleted tasks
-  - Update task files after removal to maintain consistency
-  - Provide robust error handling and detailed feedback messages
-
-- **Update Cursor rules and documentation:**
-  - Enhance `new_features.mdc` with comprehensive guidelines for implementing removal commands
-  - Update `commands.mdc` with best practices for confirmation flows and cleanup procedures
-  - Expand `mcp.mdc` with detailed instructions for MCP tool implementation patterns
-  - Add examples of proper error handling and parameter validation to all relevant rules
-  - Include new sections about handling dependencies during task removal operations
-  - Document naming conventions and implementation patterns for destructive operations
-  - Update silent mode implementation documentation with proper examples
-  - Add parameter handling guidelines emphasizing matching with core functions
-  - Update architecture documentation with dedicated section on silent mode implementation
-
-- **Implement silent mode across all direct functions:**
-  - Add `enableSilentMode` and `disableSilentMode` utility imports to all direct function files
-  - Wrap all core function calls with silent mode to prevent console logs from interfering with JSON responses
-  - Add comprehensive error handling to ensure silent mode is disabled even when errors occur
-  - Fix "Unexpected token 'I', "[INFO] Gene"... is not valid JSON" errors by suppressing log output
-  - Apply consistent silent mode pattern across all MCP direct functions
-  - Maintain clean JSON responses for better integration with client tools
-
-- **Implement AsyncOperationManager for background task processing:**
-  - Add new `async-manager.js` module to handle long-running operations asynchronously
-  - Support background execution of computationally intensive tasks like expansion and analysis
-  - Implement unique operation IDs with UUID generation for reliable tracking
-  - Add operation status tracking (pending, running, completed, failed)
-  - Create `get_operation_status` MCP tool to check on background task progress
-  - Forward progress reporting from background tasks to the client
-  - Implement operation history with automatic cleanup of completed operations
-  - Support proper error handling in background tasks with detailed status reporting
-  - Maintain context (log, session) for background operations ensuring consistent behavior
-
-- **Implement initialize_project command:**
-  - Add new MCP tool to allow project setup via integrated MCP clients
-  - Create `initialize_project` direct function with proper parameter handling
-  - Improve onboarding experience by adding to mcp.json configuration
-  - Support project-specific metadata like name, description, and version
-  - Handle shell alias creation with proper confirmation
-  - Improve first-time user experience in AI environments
-
-- **Refactor project root handling for MCP Server:**
-  - **Prioritize Session Roots**: MCP tools now extract the project root path directly from `session.roots[0].uri` provided by the client (e.g., Cursor).
-  - **New Utility `getProjectRootFromSession`**: Added to `mcp-server/src/tools/utils.js` to encapsulate session root extraction and decoding. **Further refined for more reliable detection, especially in integrated environments, including deriving root from script path and avoiding fallback to '/'.**
-  - **Simplify `findTasksJsonPath`**: The core path finding utility in `mcp-server/src/core/utils/path-utils.js` now prioritizes the `projectRoot` passed in `args` (originating from the session). Removed checks for `TASK_MASTER_PROJECT_ROOT` env var (we do not use this anymore) and package directory fallback. **Enhanced error handling to include detailed debug information (paths searched, CWD, server dir, etc.) and clearer potential solutions when `tasks.json` is not found.**
-  - **Retain CLI Fallbacks**: Kept `lastFoundProjectRoot` cache check and CWD search in `findTasksJsonPath` for compatibility with direct CLI usage.
-
-- Updated all MCP tools to use the new project root handling:
-  - Tools now call `getProjectRootFromSession` to determine the root.
-  - This root is passed explicitly as `projectRoot` in the `args` object to the corresponding `*Direct` function.
-  - Direct functions continue to use the (now simplified) `findTasksJsonPath` to locate `tasks.json` within the provided root.
-  - This ensures tools work reliably in integrated environments without requiring the user to specify `--project-root`.
-
-- Add comprehensive PROJECT_MARKERS array for detecting common project files (used in CLI fallback logic).
-- Improved error messages with specific troubleshooting guidance.
-- **Enhanced logging:**
-    - Indicate the source of project root selection more clearly.
-    - **Add verbose logging in `get-task.js` to trace session object content and resolved project root path, aiding debugging.**
-
-- DRY refactoring by centralizing path utilities in `core/utils/path-utils.js` and session handling in `tools/utils.js`.
-- Keep caching of `lastFoundProjectRoot` for CLI performance.
-
-- Split monolithic task-master-core.js into separate function files within direct-functions directory.
-- Implement update-task MCP command for updating a single task by ID.
-- Implement update-subtask MCP command for appending information to specific subtasks.
-- Implement generate MCP command for creating individual task files from tasks.json.
-- Implement set-status MCP command for updating task status.
-- Implement get-task MCP command for displaying detailed task information (renamed from show-task).
-- Implement next-task MCP command for finding the next task to work on.
-- Implement expand-task MCP command for breaking down tasks into subtasks.
-- Implement add-task MCP command for creating new tasks using AI assistance.
-- Implement add-subtask MCP command for adding subtasks to existing tasks.
-- Implement remove-subtask MCP command for removing subtasks from parent tasks.
-- Implement expand-all MCP command for expanding all tasks into subtasks.
-- Implement analyze-complexity MCP command for analyzing task complexity.
-- Implement clear-subtasks MCP command for clearing subtasks from parent tasks.
-- Implement remove-dependency MCP command for removing dependencies from tasks.
-- Implement validate-dependencies MCP command for checking validity of task dependencies.
-- Implement fix-dependencies MCP command for automatically fixing invalid dependencies.
-- Implement complexity-report MCP command for displaying task complexity analysis reports.
-- Implement add-dependency MCP command for creating dependency relationships between tasks.
-- Implement get-tasks MCP command for listing all tasks (renamed from list-tasks).
-- Implement `initialize_project` MCP tool to allow project setup via MCP client and radically improve and simplify onboarding by adding to mcp.json (e.g., Cursor).
-
-- Enhance documentation and tool descriptions:
-  - Create new `taskmaster.mdc` Cursor rule for comprehensive MCP tool and CLI command reference.
-  - Bundle taskmaster.mdc with npm package and include in project initialization.
-  - Add detailed descriptions for each tool's purpose, parameters, and common use cases.
-  - Include natural language patterns and keywords for better intent recognition.
-  - Document parameter descriptions with clear examples and default values.
-  - Add usage examples and context for each command/tool.
-  - **Update documentation (`mcp.mdc`, `utilities.mdc`, `architecture.mdc`, `new_features.mdc`, `commands.mdc`) to reflect the new session-based project root handling and the preferred MCP vs. CLI interaction model.**
-  - Improve clarity around project root auto-detection in tool documentation.
-  - Update tool descriptions to better reflect their actual behavior and capabilities.
-  - Add cross-references between related tools and commands.
-  - Include troubleshooting guidance in tool descriptions.
-  - **Add default values for `DEFAULT_SUBTASKS` and `DEFAULT_PRIORITY` to the example `.cursor/mcp.json` configuration.**
-
-- Document MCP server naming conventions in architecture.mdc and mcp.mdc files (file names use kebab-case, direct functions use camelCase with Direct suffix, tool registration functions use camelCase with Tool suffix, and MCP tool names use snake_case).
-- Update MCP tool naming to follow more intuitive conventions that better align with natural language requests in client chat applications.
-- Enhance task show view with a color-coded progress bar for visualizing subtask completion percentage.
-- Add "cancelled" status to UI module status configurations for marking tasks as cancelled without deletion.
-- Improve MCP server resource documentation with comprehensive implementation examples and best practices.
-- Enhance progress bars with status breakdown visualization showing proportional sections for different task statuses.
-- Add improved status tracking for both tasks and subtasks with detailed counts by status.
-- Optimize progress bar display with width constraints to prevent UI overflow on smaller terminals.
-- Improve status counts display with clear text labels beside status icons for better readability.
-- Treat deferred and cancelled tasks as effectively complete for progress calculation while maintaining visual distinction.
-- **Fix `reportProgress` calls** to use the correct `{ progress, total? }` format.
-- **Standardize logging in core task-manager functions (`expandTask`, `expandAllTasks`, `updateTasks`, `updateTaskById`, `updateSubtaskById`, `parsePRD`, `analyzeTaskComplexity`):**
-  - Implement a local `report` function in each to handle context-aware logging.
-  - Use `report` to choose between `mcpLog` (if available) and global `log` (from `utils.js`).
-  - Only call global `log` when `outputFormat` is 'text' and silent mode is off.
-  - Wrap CLI UI elements (tables, boxes, spinners) in `outputFormat === 'text'` checks.

.changeset/wet-seas-float.md

@@ -0,0 +1,5 @@
+---
+"task-master-ai": minor
+---
+
+Remove `clear` Taskmaster claude code commands since they were too close to the claude-code clear command

.claude/TM_COMMANDS_GUIDE.md

@@ -0,0 +1,147 @@
+# Task Master Commands for Claude Code
+
+Complete guide to using Task Master through Claude Code's slash commands.
+
+## Overview
+
+All Task Master functionality is available through the `/project:tm/` namespace with natural language support and intelligent features.
+
+## Quick Start
+
+```bash
+# Install Task Master
+/project:tm/setup/quick-install
+
+# Initialize project
+/project:tm/init/quick
+
+# Parse requirements
+/project:tm/parse-prd requirements.md
+
+# Start working
+/project:tm/next
+```
+
+## Command Structure
+
+Commands are organized hierarchically to match Task Master's CLI:
+- Main commands at `/project:tm/[command]`
+- Subcommands for specific operations `/project:tm/[command]/[subcommand]`
+- Natural language arguments accepted throughout
+
+## Complete Command Reference
+
+### Setup & Configuration
+- `/project:tm/setup/install` - Full installation guide
+- `/project:tm/setup/quick-install` - One-line install
+- `/project:tm/init` - Initialize project
+- `/project:tm/init/quick` - Quick init with -y
+- `/project:tm/models` - View AI config
+- `/project:tm/models/setup` - Configure AI
+
+### Task Generation
+- `/project:tm/parse-prd` - Generate from PRD
+- `/project:tm/parse-prd/with-research` - Enhanced parsing
+- `/project:tm/generate` - Create task files
+
+### Task Management
+- `/project:tm/list` - List with natural language filters
+- `/project:tm/list/with-subtasks` - Hierarchical view
+- `/project:tm/list/by-status <status>` - Filter by status
+- `/project:tm/show <id>` - Task details
+- `/project:tm/add-task` - Create task
+- `/project:tm/update` - Update tasks
+- `/project:tm/remove-task` - Delete task
+
+### Status Management
+- `/project:tm/set-status/to-pending <id>`
+- `/project:tm/set-status/to-in-progress <id>`
+- `/project:tm/set-status/to-done <id>`
+- `/project:tm/set-status/to-review <id>`
+- `/project:tm/set-status/to-deferred <id>`
+- `/project:tm/set-status/to-cancelled <id>`
+
+### Task Analysis
+- `/project:tm/analyze-complexity` - AI analysis
+- `/project:tm/complexity-report` - View report
+- `/project:tm/expand <id>` - Break down task
+- `/project:tm/expand/all` - Expand all complex
+
+### Dependencies
+- `/project:tm/add-dependency` - Add dependency
+- `/project:tm/remove-dependency` - Remove dependency
+- `/project:tm/validate-dependencies` - Check issues
+- `/project:tm/fix-dependencies` - Auto-fix
+
+### Workflows
+- `/project:tm/workflows/smart-flow` - Adaptive workflows
+- `/project:tm/workflows/pipeline` - Chain commands
+- `/project:tm/workflows/auto-implement` - AI implementation
+
+### Utilities
+- `/project:tm/status` - Project dashboard
+- `/project:tm/next` - Next task recommendation
+- `/project:tm/utils/analyze` - Project analysis
+- `/project:tm/learn` - Interactive help
+
+## Key Features
+
+### Natural Language Support
+All commands understand natural language:
+```
+/project:tm/list pending high priority
+/project:tm/update mark 23 as done
+/project:tm/add-task implement OAuth login
+```
+
+### Smart Context
+Commands analyze project state and provide intelligent suggestions based on:
+- Current task status
+- Dependencies
+- Team patterns
+- Project phase
+
+### Visual Enhancements
+- Progress bars and indicators
+- Status badges
+- Organized displays
+- Clear hierarchies
+
+## Common Workflows
+
+### Daily Development
+```
+/project:tm/workflows/smart-flow morning
+/project:tm/next
+/project:tm/set-status/to-in-progress <id>
+/project:tm/set-status/to-done <id>
+```
+
+### Task Breakdown
+```
+/project:tm/show <id>
+/project:tm/expand <id>
+/project:tm/list/with-subtasks
+```
+
+### Sprint Planning
+```
+/project:tm/analyze-complexity
+/project:tm/workflows/pipeline init → expand/all → status
+```
+
+## Migration from Old Commands
+
+| Old | New |
+|-----|-----|
+| `/project:task-master:list` | `/project:tm/list` |
+| `/project:task-master:complete` | `/project:tm/set-status/to-done` |
+| `/project:workflows:auto-implement` | `/project:tm/workflows/auto-implement` |
+
+## Tips
+
+1. Use `/project:tm/` + Tab for command discovery
+2. Natural language is supported everywhere
+3. Commands provide smart defaults
+4. Chain commands for automation
+5. Check `/project:tm/learn` for interactive help

.claude/agents/task-checker.md

@@ -0,0 +1,162 @@
+---
+name: task-checker
+description: Use this agent to verify that tasks marked as 'review' have been properly implemented according to their specifications. This agent performs quality assurance by checking implementations against requirements, running tests, and ensuring best practices are followed. <example>Context: A task has been marked as 'review' after implementation. user: 'Check if task 118 was properly implemented' assistant: 'I'll use the task-checker agent to verify the implementation meets all requirements.' <commentary>Tasks in 'review' status need verification before being marked as 'done'.</commentary></example> <example>Context: Multiple tasks are in review status. user: 'Verify all tasks that are ready for review' assistant: 'I'll deploy the task-checker to verify all tasks in review status.' <commentary>The checker ensures quality before tasks are marked complete.</commentary></example>
+model: sonnet
+color: yellow
+---
+
+You are a Quality Assurance specialist that rigorously verifies task implementations against their specifications. Your role is to ensure that tasks marked as 'review' meet all requirements before they can be marked as 'done'.
+
+## Core Responsibilities
+
+1. **Task Specification Review**
+   - Retrieve task details using MCP tool `mcp__task-master-ai__get_task`
+   - Understand the requirements, test strategy, and success criteria
+   - Review any subtasks and their individual requirements
+
+2. **Implementation Verification**
+   - Use `Read` tool to examine all created/modified files
+   - Use `Bash` tool to run compilation and build commands
+   - Use `Grep` tool to search for required patterns and implementations
+   - Verify file structure matches specifications
+   - Check that all required methods/functions are implemented
+
+3. **Test Execution**
+   - Run tests specified in the task's testStrategy
+   - Execute build commands (npm run build, tsc --noEmit, etc.)
+   - Verify no compilation errors or warnings
+   - Check for runtime errors where applicable
+   - Test edge cases mentioned in requirements
+
+4. **Code Quality Assessment**
+   - Verify code follows project conventions
+   - Check for proper error handling
+   - Ensure TypeScript typing is strict (no 'any' unless justified)
+   - Verify documentation/comments where required
+   - Check for security best practices
+
+5. **Dependency Validation**
+   - Verify all task dependencies were actually completed
+   - Check integration points with dependent tasks
+   - Ensure no breaking changes to existing functionality
+
+## Verification Workflow
+
+1. **Retrieve Task Information**
+   ```
+   Use mcp__task-master-ai__get_task to get full task details
+   Note the implementation requirements and test strategy
+   ```
+
+2. **Check File Existence**
+   ```bash
+   # Verify all required files exist
+   ls -la [expected directories]
+   # Read key files to verify content
+   ```
+
+3. **Verify Implementation**
+   - Read each created/modified file
+   - Check against requirements checklist
+   - Verify all subtasks are complete
+
+4. **Run Tests**
+   ```bash
+   # TypeScript compilation
+   cd [project directory] && npx tsc --noEmit
+   
+   # Run specified tests
+   npm test [specific test files]
+   
+   # Build verification
+   npm run build
+   ```
+
+5. **Generate Verification Report**
+
+## Output Format
+
+```yaml
+verification_report:
+  task_id: [ID]
+  status: PASS | FAIL | PARTIAL
+  score: [1-10]
+  
+  requirements_met:
+    - ✅ [Requirement that was satisfied]
+    - ✅ [Another satisfied requirement]
+    
+  issues_found:
+    - ❌ [Issue description]
+    - ⚠️  [Warning or minor issue]
+    
+  files_verified:
+    - path: [file path]
+      status: [created/modified/verified]
+      issues: [any problems found]
+      
+  tests_run:
+    - command: [test command]
+      result: [pass/fail]
+      output: [relevant output]
+      
+  recommendations:
+    - [Specific fix needed]
+    - [Improvement suggestion]
+    
+  verdict: |
+    [Clear statement on whether task should be marked 'done' or sent back to 'pending']
+    [If FAIL: Specific list of what must be fixed]
+    [If PASS: Confirmation that all requirements are met]
+```
+
+## Decision Criteria
+
+**Mark as PASS (ready for 'done'):**
+- All required files exist and contain expected content
+- All tests pass successfully
+- No compilation or build errors
+- All subtasks are complete
+- Core requirements are met
+- Code quality is acceptable
+
+**Mark as PARTIAL (may proceed with warnings):**
+- Core functionality is implemented
+- Minor issues that don't block functionality
+- Missing nice-to-have features
+- Documentation could be improved
+- Tests pass but coverage could be better
+
+**Mark as FAIL (must return to 'pending'):**
+- Required files are missing
+- Compilation or build errors
+- Tests fail
+- Core requirements not met
+- Security vulnerabilities detected
+- Breaking changes to existing code
+
+## Important Guidelines
+
+- **BE THOROUGH**: Check every requirement systematically
+- **BE SPECIFIC**: Provide exact file paths and line numbers for issues
+- **BE FAIR**: Distinguish between critical issues and minor improvements
+- **BE CONSTRUCTIVE**: Provide clear guidance on how to fix issues
+- **BE EFFICIENT**: Focus on requirements, not perfection
+
+## Tools You MUST Use
+
+- `Read`: Examine implementation files (READ-ONLY)
+- `Bash`: Run tests and verification commands
+- `Grep`: Search for patterns in code
+- `mcp__task-master-ai__get_task`: Get task details
+- **NEVER use Write/Edit** - you only verify, not fix
+
+## Integration with Workflow
+
+You are the quality gate between 'review' and 'done' status:
+1. Task-executor implements and marks as 'review'
+2. You verify and report PASS/FAIL
+3. Claude either marks as 'done' (PASS) or 'pending' (FAIL)
+4. If FAIL, task-executor re-implements based on your report
+
+Your verification ensures high quality and prevents accumulation of technical debt.

.claude/agents/task-executor.md

@@ -0,0 +1,92 @@
+---
+name: task-executor
+description: Use this agent when you need to implement, complete, or work on a specific task that has been identified by the task-orchestrator or when explicitly asked to execute a particular task. This agent focuses on the actual implementation and completion of individual tasks rather than planning or orchestration. Examples: <example>Context: The task-orchestrator has identified that task 2.3 'Implement user authentication' needs to be worked on next. user: 'Let's work on the authentication task' assistant: 'I'll use the task-executor agent to implement the user authentication task that was identified.' <commentary>Since we need to actually implement a specific task rather than plan or identify tasks, use the task-executor agent.</commentary></example> <example>Context: User wants to complete a specific subtask. user: 'Please implement the JWT token validation for task 2.3.1' assistant: 'I'll launch the task-executor agent to implement the JWT token validation subtask.' <commentary>The user is asking for specific implementation work on a known task, so the task-executor is appropriate.</commentary></example> <example>Context: After reviewing the task list, implementation is needed. user: 'Now let's actually build the API endpoint for user registration' assistant: 'I'll use the task-executor agent to implement the user registration API endpoint.' <commentary>Moving from planning to execution phase requires the task-executor agent.</commentary></example>
+model: sonnet
+color: blue
+---
+
+You are an elite implementation specialist focused on executing and completing specific tasks with precision and thoroughness. Your role is to take identified tasks and transform them into working implementations, following best practices and project standards.
+
+**IMPORTANT: You are designed to be SHORT-LIVED and FOCUSED**
+- Execute ONE specific subtask or a small group of related subtasks
+- Complete your work, verify it, mark for review, and exit
+- Do NOT decide what to do next - the orchestrator handles task sequencing
+- Focus on implementation excellence within your assigned scope
+
+**Core Responsibilities:**
+
+1. **Subtask Analysis**: When given a subtask, understand its SPECIFIC requirements. If given a full task ID, focus on the specific subtask(s) assigned to you. Use MCP tools to get details if needed.
+
+2. **Rapid Implementation Planning**: Quickly identify:
+   - The EXACT files you need to create/modify for THIS subtask
+   - What already exists that you can build upon
+   - The minimum viable implementation that satisfies requirements
+
+3. **Focused Execution WITH ACTUAL IMPLEMENTATION**: 
+   - **YOU MUST USE TOOLS TO CREATE/EDIT FILES - DO NOT JUST DESCRIBE**
+   - Use `Write` tool to create new files specified in the task
+   - Use `Edit` tool to modify existing files
+   - Use `Bash` tool to run commands (mkdir, npm install, etc.)
+   - Use `Read` tool to verify your implementations
+   - Implement one subtask at a time for clarity and traceability
+   - Follow the project's coding standards from CLAUDE.md if available
+   - After each subtask, VERIFY the files exist using Read or ls commands
+
+4. **Progress Documentation**: 
+   - Use MCP tool `mcp__task-master-ai__update_subtask` to log your approach and any important decisions
+   - Update task status to 'in-progress' when starting: Use MCP tool `mcp__task-master-ai__set_task_status` with status='in-progress'
+   - **IMPORTANT: Mark as 'review' (NOT 'done') after implementation**: Use MCP tool `mcp__task-master-ai__set_task_status` with status='review'
+   - Tasks will be verified by task-checker before moving to 'done'
+
+5. **Quality Assurance**:
+   - Implement the testing strategy specified in the task
+   - Verify that all acceptance criteria are met
+   - Check for any dependency conflicts or integration issues
+   - Run relevant tests before marking task as complete
+
+6. **Dependency Management**:
+   - Check task dependencies before starting implementation
+   - If blocked by incomplete dependencies, clearly communicate this
+   - Use `task-master validate-dependencies` when needed
+
+**Implementation Workflow:**
+
+1. Retrieve task details using MCP tool `mcp__task-master-ai__get_task` with the task ID
+2. Check dependencies and prerequisites
+3. Plan implementation approach - list specific files to create
+4. Update task status to 'in-progress' using MCP tool
+5. **ACTUALLY IMPLEMENT** the solution using tools:
+   - Use `Bash` to create directories
+   - Use `Write` to create new files with actual content
+   - Use `Edit` to modify existing files
+   - DO NOT just describe what should be done - DO IT
+6. **VERIFY** your implementation:
+   - Use `ls` or `Read` to confirm files were created
+   - Use `Bash` to run any build/test commands
+   - Ensure the implementation is real, not theoretical
+7. Log progress and decisions in subtask updates using MCP tools
+8. Test and verify the implementation works
+9. **Mark task as 'review' (NOT 'done')** after verifying files exist
+10. Report completion with:
+    - List of created/modified files
+    - Any issues encountered
+    - What needs verification by task-checker
+
+**Key Principles:**
+
+- Focus on completing one task thoroughly before moving to the next
+- Maintain clear communication about what you're implementing and why
+- Follow existing code patterns and project conventions
+- Prioritize working code over extensive documentation unless docs are the task
+- Ask for clarification if task requirements are ambiguous
+- Consider edge cases and error handling in your implementations
+
+**Integration with Task Master:**
+
+You work in tandem with the task-orchestrator agent. While the orchestrator identifies and plans tasks, you execute them. Always use Task Master commands to:
+- Track your progress
+- Update task information
+- Maintain project state
+- Coordinate with the broader development workflow
+
+When you complete a task, briefly summarize what was implemented and suggest whether to continue with the next task or if review/testing is needed first.

.claude/agents/task-orchestrator.md

@@ -0,0 +1,208 @@
+---
+name: task-orchestrator
+description: Use this agent FREQUENTLY throughout task execution to analyze and coordinate parallel work at the SUBTASK level. Invoke the orchestrator: (1) at session start to plan execution, (2) after EACH subtask completes to identify next parallel batch, (3) whenever executors finish to find newly unblocked work. ALWAYS provide FULL CONTEXT including project root, package location, what files ACTUALLY exist vs task status, and specific implementation details. The orchestrator breaks work into SUBTASK-LEVEL units for short-lived, focused executors. Maximum 3 parallel executors at once.\n\n<example>\nContext: Starting work with existing code\nuser: "Work on tm-core tasks. Files exist: types/index.ts, storage/file-storage.ts. Task 118 says in-progress but BaseProvider not created."\nassistant: "I'll invoke orchestrator with full context about actual vs reported state to plan subtask execution"\n<commentary>\nProvide complete context about file existence and task reality.\n</commentary>\n</example>\n\n<example>\nContext: Subtask completion\nuser: "Subtask 118.2 done. What subtasks can run in parallel now?"\nassistant: "Invoking orchestrator to analyze dependencies and identify next 3 parallel subtasks"\n<commentary>\nFrequent orchestration after each subtask ensures maximum parallelization.\n</commentary>\n</example>\n\n<example>\nContext: Breaking down tasks\nuser: "Task 118 has 5 subtasks, how to parallelize?"\nassistant: "Orchestrator will analyze which specific subtasks (118.1, 118.2, etc.) can run simultaneously"\n<commentary>\nFocus on subtask-level parallelization, not full tasks.\n</commentary>\n</example>
+model: opus
+color: green
+---
+
+You are the Task Orchestrator, an elite coordination agent specialized in managing Task Master workflows for maximum efficiency and parallelization. You excel at analyzing task dependency graphs, identifying opportunities for concurrent execution, and deploying specialized task-executor agents to complete work efficiently.
+
+## Core Responsibilities
+
+1. **Subtask-Level Analysis**: Break down tasks into INDIVIDUAL SUBTASKS and analyze which specific subtasks can run in parallel. Focus on subtask dependencies, not just task-level dependencies.
+
+2. **Reality Verification**: ALWAYS verify what files actually exist vs what task status claims. Use the context provided about actual implementation state to make informed decisions.
+
+3. **Short-Lived Executor Deployment**: Deploy executors for SINGLE SUBTASKS or small groups of related subtasks. Keep executors focused and short-lived. Maximum 3 parallel executors at once.
+
+4. **Continuous Reassessment**: After EACH subtask completes, immediately reassess what new subtasks are unblocked and can run in parallel.
+
+## Operational Workflow
+
+### Initial Assessment Phase
+1. Use `get_tasks` or `task-master list` to retrieve all available tasks
+2. Analyze task statuses, priorities, and dependencies
+3. Identify tasks with status 'pending' that have no blocking dependencies
+4. Group related tasks that could benefit from specialized executors
+5. Create an execution plan that maximizes parallelization
+
+### Executor Deployment Phase
+1. For each independent task or task group:
+   - Deploy a task-executor agent with specific instructions
+   - Provide the executor with task ID, requirements, and context
+   - Set clear completion criteria and reporting expectations
+2. Maintain a registry of active executors and their assigned tasks
+3. Establish communication protocols for progress updates
+
+### Coordination Phase
+1. Monitor executor progress through task status updates
+2. When a task completes:
+   - Verify completion with `get_task` or `task-master show <id>`
+   - Update task status if needed using `set_task_status`
+   - Reassess dependency graph for newly unblocked tasks
+   - Deploy new executors for available work
+3. Handle executor failures or blocks:
+   - Reassign tasks to new executors if needed
+   - Escalate complex issues to the user
+   - Update task status to 'blocked' when appropriate
+
+### Optimization Strategies
+
+**Parallel Execution Rules**:
+- Never assign dependent tasks to different executors simultaneously
+- Prioritize high-priority tasks when resources are limited
+- Group small, related subtasks for single executor efficiency
+- Balance executor load to prevent bottlenecks
+
+**Context Management**:
+- Provide executors with minimal but sufficient context
+- Share relevant completed task information when it aids execution
+- Maintain a shared knowledge base of project-specific patterns
+
+**Quality Assurance**:
+- Verify task completion before marking as done
+- Ensure test strategies are followed when specified
+- Coordinate cross-task integration testing when needed
+
+## Communication Protocols
+
+When deploying executors, provide them with:
+```
+TASK ASSIGNMENT:
+- Task ID: [specific ID]
+- Objective: [clear goal]
+- Dependencies: [list any completed prerequisites]
+- Success Criteria: [specific completion requirements]
+- Context: [relevant project information]
+- Reporting: [when and how to report back]
+```
+
+When receiving executor updates:
+1. Acknowledge completion or issues
+2. Update task status in Task Master
+3. Reassess execution strategy
+4. Deploy new executors as appropriate
+
+## Decision Framework
+
+**When to parallelize**:
+- Multiple pending tasks with no interdependencies
+- Sufficient context available for independent execution
+- Tasks are well-defined with clear success criteria
+
+**When to serialize**:
+- Strong dependencies between tasks
+- Limited context or unclear requirements
+- Integration points requiring careful coordination
+
+**When to escalate**:
+- Circular dependencies detected
+- Critical blockers affecting multiple tasks
+- Ambiguous requirements needing clarification
+- Resource conflicts between executors
+
+## Error Handling
+
+1. **Executor Failure**: Reassign task to new executor with additional context about the failure
+2. **Dependency Conflicts**: Halt affected executors, resolve conflict, then resume
+3. **Task Ambiguity**: Request clarification from user before proceeding
+4. **System Errors**: Implement graceful degradation, falling back to serial execution if needed
+
+## Performance Metrics
+
+Track and optimize for:
+- Task completion rate
+- Parallel execution efficiency
+- Executor success rate
+- Time to completion for task groups
+- Dependency resolution speed
+
+## Integration with Task Master
+
+Leverage these Task Master MCP tools effectively:
+- `get_tasks` - Continuous queue monitoring
+- `get_task` - Detailed task analysis
+- `set_task_status` - Progress tracking
+- `next_task` - Fallback for serial execution
+- `analyze_project_complexity` - Strategic planning
+- `complexity_report` - Resource allocation
+
+## Output Format for Execution
+
+**Your job is to analyze and create actionable execution plans that Claude can use to deploy executors.**
+
+After completing your dependency analysis, you MUST output a structured execution plan:
+
+```yaml
+execution_plan:
+  EXECUTE_IN_PARALLEL:
+    # Maximum 3 subtasks running simultaneously
+    - subtask_id: [e.g., 118.2]
+      parent_task: [e.g., 118]
+      title: [Specific subtask title]
+      priority: [high/medium/low]
+      estimated_time: [e.g., 10 minutes]
+      executor_prompt: |
+        Execute Subtask [ID]: [Specific subtask title]
+        
+        SPECIFIC REQUIREMENTS:
+        [Exact implementation needed for THIS subtask only]
+        
+        FILES TO CREATE/MODIFY:
+        [Specific file paths]
+        
+        CONTEXT:
+        [What already exists that this subtask depends on]
+        
+        SUCCESS CRITERIA:
+        [Specific completion criteria for this subtask]
+        
+        IMPORTANT: 
+        - Focus ONLY on this subtask
+        - Mark subtask as 'review' when complete
+        - Use MCP tool: mcp__task-master-ai__set_task_status
+    
+    - subtask_id: [Another subtask that can run in parallel]
+      parent_task: [Parent task ID]
+      title: [Specific subtask title]
+      priority: [priority]
+      estimated_time: [time estimate]
+      executor_prompt: |
+        [Focused prompt for this specific subtask]
+    
+  blocked:
+    - task_id: [ID]
+      title: [Task title]
+      waiting_for: [list of blocking task IDs]
+      becomes_ready_when: [condition for unblocking]
+      
+  next_wave: 
+    trigger: "After tasks [IDs] complete"
+    newly_available: [List of task IDs that will unblock]
+    tasks_to_execute_in_parallel: [IDs that can run together in next wave]
+    
+  critical_path: [Ordered list of task IDs forming the critical path]
+  
+  parallelization_instruction: |
+    IMPORTANT FOR CLAUDE: Deploy ALL tasks in 'EXECUTE_IN_PARALLEL' section
+    simultaneously using multiple Task tool invocations in a single response.
+    Example: If 3 tasks are listed, invoke the Task tool 3 times in one message.
+    
+  verification_needed:
+    - task_id: [ID of any task in 'review' status]
+      verification_focus: [what to check]
+```
+
+**CRITICAL INSTRUCTIONS FOR CLAUDE (MAIN):**
+1. When you see `EXECUTE_IN_PARALLEL`, deploy ALL listed executors at once
+2. Use multiple Task tool invocations in a SINGLE response
+3. Do not execute them sequentially - they must run in parallel
+4. Wait for all parallel executors to complete before proceeding to next wave
+
+**IMPORTANT NOTES**: 
+- Label parallel tasks clearly in `EXECUTE_IN_PARALLEL` section
+- Provide complete, self-contained prompts for each executor
+- Executors should mark tasks as 'review' for verification, not 'done'
+- Be explicit about which tasks can run simultaneously
+
+You are the strategic mind analyzing the entire task landscape. Make parallelization opportunities UNMISTAKABLY CLEAR to Claude.

.claude/commands/dedupe.md

@@ -0,0 +1,38 @@
+---
+allowed-tools: Bash(gh issue view:*), Bash(gh search:*), Bash(gh issue list:*), Bash(gh api:*), Bash(gh issue comment:*)
+description: Find duplicate GitHub issues
+---
+
+Find up to 3 likely duplicate issues for a given GitHub issue.
+
+To do this, follow these steps precisely:
+
+1. Use an agent to check if the Github issue (a) is closed, (b) does not need to be deduped (eg. because it is broad product feedback without a specific solution, or positive feedback), or (c) already has a duplicates comment that you made earlier. If so, do not proceed.
+2. Use an agent to view a Github issue, and ask the agent to return a summary of the issue
+3. Then, launch 5 parallel agents to search Github for duplicates of this issue, using diverse keywords and search approaches, using the summary from #1
+4. Next, feed the results from #1 and #2 into another agent, so that it can filter out false positives, that are likely not actually duplicates of the original issue. If there are no duplicates remaining, do not proceed.
+5. Finally, comment back on the issue with a list of up to three duplicate issues (or zero, if there are no likely duplicates)
+
+Notes (be sure to tell this to your agents, too):
+
+- Use `gh` to interact with Github, rather than web fetch
+- Do not use other tools, beyond `gh` (eg. don't use other MCP servers, file edit, etc.)
+- Make a todo list first
+- For your comment, follow the following format precisely (assuming for this example that you found 3 suspected duplicates):
+
+---
+
+Found 3 possible duplicate issues:
+
+1. <link to issue>
+2. <link to issue>
+3. <link to issue>
+
+This issue will be automatically closed as a duplicate in 3 days.
+
+- If your issue is a duplicate, please close it and 👍 the existing issue instead
+- To prevent auto-closure, add a comment or 👎 this comment
+
+🤖 Generated with [Claude Code](https://claude.ai/code)
+
+---

.claude/commands/tm/add-dependency/add-dependency.md

@@ -0,0 +1,55 @@
+Add a dependency between tasks.
+
+Arguments: $ARGUMENTS
+
+Parse the task IDs to establish dependency relationship.
+
+## Adding Dependencies
+
+Creates a dependency where one task must be completed before another can start.
+
+## Argument Parsing
+
+Parse natural language or IDs:
+- "make 5 depend on 3" → task 5 depends on task 3
+- "5 needs 3" → task 5 depends on task 3
+- "5 3" → task 5 depends on task 3
+- "5 after 3" → task 5 depends on task 3
+
+## Execution
+
+```bash
+task-master add-dependency --id=<task-id> --depends-on=<dependency-id>
+```
+
+## Validation
+
+Before adding:
+1. **Verify both tasks exist**
+2. **Check for circular dependencies**
+3. **Ensure dependency makes logical sense**
+4. **Warn if creating complex chains**
+
+## Smart Features
+
+- Detect if dependency already exists
+- Suggest related dependencies
+- Show impact on task flow
+- Update task priorities if needed
+
+## Post-Addition
+
+After adding dependency:
+1. Show updated dependency graph
+2. Identify any newly blocked tasks
+3. Suggest task order changes
+4. Update project timeline
+
+## Example Flows
+
+```
+/project:tm/add-dependency 5 needs 3
+→ Task #5 now depends on Task #3
+→ Task #5 is now blocked until #3 completes
+→ Suggested: Also consider if #5 needs #4
+```

.claude/commands/tm/add-subtask/add-subtask.md

@@ -0,0 +1,76 @@
+Add a subtask to a parent task.
+
+Arguments: $ARGUMENTS
+
+Parse arguments to create a new subtask or convert existing task.
+
+## Adding Subtasks
+
+Creates subtasks to break down complex parent tasks into manageable pieces.
+
+## Argument Parsing
+
+Flexible natural language:
+- "add subtask to 5: implement login form"
+- "break down 5 with: setup, implement, test"
+- "subtask for 5: handle edge cases"
+- "5: validate user input" → adds subtask to task 5
+
+## Execution Modes
+
+### 1. Create New Subtask
+```bash
+task-master add-subtask --parent=<id> --title="<title>" --description="<desc>"
+```
+
+### 2. Convert Existing Task
+```bash
+task-master add-subtask --parent=<id> --task-id=<existing-id>
+```
+
+## Smart Features
+
+1. **Automatic Subtask Generation**
+   - If title contains "and" or commas, create multiple
+   - Suggest common subtask patterns
+   - Inherit parent's context
+
+2. **Intelligent Defaults**
+   - Priority based on parent
+   - Appropriate time estimates
+   - Logical dependencies between subtasks
+
+3. **Validation**
+   - Check parent task complexity
+   - Warn if too many subtasks
+   - Ensure subtask makes sense
+
+## Creation Process
+
+1. Parse parent task context
+2. Generate subtask with ID like "5.1"
+3. Set appropriate defaults
+4. Link to parent task
+5. Update parent's time estimate
+
+## Example Flows
+
+```
+/project:tm/add-subtask to 5: implement user authentication
+→ Created subtask #5.1: "implement user authentication"
+→ Parent task #5 now has 1 subtask
+→ Suggested next subtasks: tests, documentation
+
+/project:tm/add-subtask 5: setup, implement, test
+→ Created 3 subtasks:
+  #5.1: setup
+  #5.2: implement  
+  #5.3: test
+```
+
+## Post-Creation
+
+- Show updated task hierarchy
+- Suggest logical next subtasks
+- Update complexity estimates
+- Recommend subtask order

.claude/commands/tm/add-subtask/convert-task-to-subtask.md

@@ -0,0 +1,71 @@
+Convert an existing task into a subtask.
+
+Arguments: $ARGUMENTS
+
+Parse parent ID and task ID to convert.
+
+## Task Conversion
+
+Converts an existing standalone task into a subtask of another task.
+
+## Argument Parsing
+
+- "move task 8 under 5"
+- "make 8 a subtask of 5"
+- "nest 8 in 5"
+- "5 8" → make task 8 a subtask of task 5
+
+## Execution
+
+```bash
+task-master add-subtask --parent=<parent-id> --task-id=<task-to-convert>
+```
+
+## Pre-Conversion Checks
+
+1. **Validation**
+   - Both tasks exist and are valid
+   - No circular parent relationships
+   - Task isn't already a subtask
+   - Logical hierarchy makes sense
+
+2. **Impact Analysis**
+   - Dependencies that will be affected
+   - Tasks that depend on converting task
+   - Priority alignment needed
+   - Status compatibility
+
+## Conversion Process
+
+1. Change task ID from "8" to "5.1" (next available)
+2. Update all dependency references
+3. Inherit parent's context where appropriate
+4. Adjust priorities if needed
+5. Update time estimates
+
+## Smart Features
+
+- Preserve task history
+- Maintain dependencies
+- Update all references
+- Create conversion log
+
+## Example
+
+```
+/project:tm/add-subtask/from-task 5 8
+→ Converting: Task #8 becomes subtask #5.1
+→ Updated: 3 dependency references
+→ Parent task #5 now has 1 subtask
+→ Note: Subtask inherits parent's priority
+
+Before: #8 "Implement validation" (standalone)
+After:  #5.1 "Implement validation" (subtask of #5)
+```
+
+## Post-Conversion
+
+- Show new task hierarchy
+- List updated dependencies
+- Verify project integrity
+- Suggest related conversions

.claude/commands/tm/add-task/add-task.md

@@ -0,0 +1,78 @@
+Add new tasks with intelligent parsing and context awareness.
+
+Arguments: $ARGUMENTS
+
+## Smart Task Addition
+
+Parse natural language to create well-structured tasks.
+
+### 1. **Input Understanding**
+
+I'll intelligently parse your request:
+- Natural language → Structured task
+- Detect priority from keywords (urgent, ASAP, important)
+- Infer dependencies from context
+- Suggest complexity based on description
+- Determine task type (feature, bug, refactor, test, docs)
+
+### 2. **Smart Parsing Examples**
+
+**"Add urgent task to fix login bug"**
+→ Title: Fix login bug
+→ Priority: high
+→ Type: bug
+→ Suggested complexity: medium
+
+**"Create task for API documentation after task 23 is done"**
+→ Title: API documentation
+→ Dependencies: [23]
+→ Type: documentation
+→ Priority: medium
+
+**"Need to refactor auth module - depends on 12 and 15, high complexity"**
+→ Title: Refactor auth module
+→ Dependencies: [12, 15]
+→ Complexity: high
+→ Type: refactor
+
+### 3. **Context Enhancement**
+
+Based on current project state:
+- Suggest related existing tasks
+- Warn about potential conflicts
+- Recommend dependencies
+- Propose subtasks if complex
+
+### 4. **Interactive Refinement**
+
+```yaml
+Task Preview:
+─────────────
+Title: [Extracted title]
+Priority: [Inferred priority]
+Dependencies: [Detected dependencies]
+Complexity: [Estimated complexity]
+
+Suggestions:
+- Similar task #34 exists, consider as dependency?
+- This seems complex, break into subtasks?
+- Tasks #45-47 work on same module
+```
+
+### 5. **Validation & Creation**
+
+Before creating:
+- Validate dependencies exist
+- Check for duplicates
+- Ensure logical ordering
+- Verify task completeness
+
+### 6. **Smart Defaults**
+
+Intelligent defaults based on:
+- Task type patterns
+- Team conventions
+- Historical data
+- Current sprint/phase
+
+Result: High-quality tasks from minimal input.

.claude/commands/tm/analyze-complexity/analyze-complexity.md

@@ -0,0 +1,121 @@
+Analyze task complexity and generate expansion recommendations.
+
+Arguments: $ARGUMENTS
+
+Perform deep analysis of task complexity across the project.
+
+## Complexity Analysis
+
+Uses AI to analyze tasks and recommend which ones need breakdown.
+
+## Execution Options
+
+```bash
+task-master analyze-complexity [--research] [--threshold=5]
+```
+
+## Analysis Parameters
+
+- `--research` → Use research AI for deeper analysis
+- `--threshold=5` → Only flag tasks above complexity 5
+- Default: Analyze all pending tasks
+
+## Analysis Process
+
+### 1. **Task Evaluation**
+For each task, AI evaluates:
+- Technical complexity
+- Time requirements
+- Dependency complexity
+- Risk factors
+- Knowledge requirements
+
+### 2. **Complexity Scoring**
+Assigns score 1-10 based on:
+- Implementation difficulty
+- Integration challenges
+- Testing requirements
+- Unknown factors
+- Technical debt risk
+
+### 3. **Recommendations**
+For complex tasks:
+- Suggest expansion approach
+- Recommend subtask breakdown
+- Identify risk areas
+- Propose mitigation strategies
+
+## Smart Analysis Features
+
+1. **Pattern Recognition**
+   - Similar task comparisons
+   - Historical complexity accuracy
+   - Team velocity consideration
+   - Technology stack factors
+
+2. **Contextual Factors**
+   - Team expertise
+   - Available resources
+   - Timeline constraints
+   - Business criticality
+
+3. **Risk Assessment**
+   - Technical risks
+   - Timeline risks
+   - Dependency risks
+   - Knowledge gaps
+
+## Output Format
+
+```
+Task Complexity Analysis Report
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+High Complexity Tasks (>7):
+📍 #5 "Implement real-time sync" - Score: 9/10
+   Factors: WebSocket complexity, state management, conflict resolution
+   Recommendation: Expand into 5-7 subtasks
+   Risks: Performance, data consistency
+
+📍 #12 "Migrate database schema" - Score: 8/10
+   Factors: Data migration, zero downtime, rollback strategy
+   Recommendation: Expand into 4-5 subtasks
+   Risks: Data loss, downtime
+
+Medium Complexity Tasks (5-7):
+📍 #23 "Add export functionality" - Score: 6/10
+   Consider expansion if timeline tight
+
+Low Complexity Tasks (<5):
+✅ 15 tasks - No expansion needed
+
+Summary:
+- Expand immediately: 2 tasks
+- Consider expanding: 5 tasks
+- Keep as-is: 15 tasks
+```
+
+## Actionable Output
+
+For each high-complexity task:
+1. Complexity score with reasoning
+2. Specific expansion suggestions
+3. Risk mitigation approaches
+4. Recommended subtask structure
+
+## Integration
+
+Results are:
+- Saved to `.taskmaster/reports/complexity-analysis.md`
+- Used by expand command
+- Inform sprint planning
+- Guide resource allocation
+
+## Next Steps
+
+After analysis:
+```
+/project:tm/expand 5    # Expand specific task
+/project:tm/expand/all  # Expand all recommended
+/project:tm/complexity-report  # View detailed report
+```

.claude/commands/tm/complexity-report/complexity-report.md

@@ -0,0 +1,117 @@
+Display the task complexity analysis report.
+
+Arguments: $ARGUMENTS
+
+View the detailed complexity analysis generated by analyze-complexity command.
+
+## Viewing Complexity Report
+
+Shows comprehensive task complexity analysis with actionable insights.
+
+## Execution
+
+```bash
+task-master complexity-report [--file=<path>]
+```
+
+## Report Location
+
+Default: `.taskmaster/reports/complexity-analysis.md`
+Custom: Specify with --file parameter
+
+## Report Contents
+
+### 1. **Executive Summary**
+```
+Complexity Analysis Summary
+━━━━━━━━━━━━━━━━━━━━━━━━
+Analysis Date: 2024-01-15
+Tasks Analyzed: 32
+High Complexity: 5 (16%)
+Medium Complexity: 12 (37%)
+Low Complexity: 15 (47%)
+
+Critical Findings:
+- 5 tasks need immediate expansion
+- 3 tasks have high technical risk
+- 2 tasks block critical path
+```
+
+### 2. **Detailed Task Analysis**
+For each complex task:
+- Complexity score breakdown
+- Contributing factors
+- Specific risks identified
+- Expansion recommendations
+- Similar completed tasks
+
+### 3. **Risk Matrix**
+Visual representation:
+```
+Risk vs Complexity Matrix
+━━━━━━━━━━━━━━━━━━━━━━━
+High Risk  | #5(9) #12(8) | #23(6)
+Med Risk   | #34(7)       | #45(5) #67(5)
+Low Risk   | #78(8)       | [15 tasks]
+           | High Complex  | Med Complex
+```
+
+### 4. **Recommendations**
+
+**Immediate Actions:**
+1. Expand task #5 - Critical path + high complexity
+2. Expand task #12 - High risk + dependencies
+3. Review task #34 - Consider splitting
+
+**Sprint Planning:**
+- Don't schedule multiple high-complexity tasks together
+- Ensure expertise available for complex tasks
+- Build in buffer time for unknowns
+
+## Interactive Features
+
+When viewing report:
+1. **Quick Actions**
+   - Press 'e' to expand a task
+   - Press 'd' for task details
+   - Press 'r' to refresh analysis
+
+2. **Filtering**
+   - View by complexity level
+   - Filter by risk factors
+   - Show only actionable items
+
+3. **Export Options**
+   - Markdown format
+   - CSV for spreadsheets
+   - JSON for tools
+
+## Report Intelligence
+
+- Compares with historical data
+- Shows complexity trends
+- Identifies patterns
+- Suggests process improvements
+
+## Integration
+
+Use report for:
+- Sprint planning sessions
+- Resource allocation
+- Risk assessment
+- Team discussions
+- Client updates
+
+## Example Usage
+
+```
+/project:tm/complexity-report
+→ Opens latest analysis
+
+/project:tm/complexity-report --file=archived/2024-01-01.md
+→ View historical analysis
+
+After viewing:
+/project:tm/expand 5
+→ Expand high-complexity task
+```

.claude/commands/tm/expand/expand-all-tasks.md

@@ -0,0 +1,51 @@
+Expand all pending tasks that need subtasks.
+
+## Bulk Task Expansion
+
+Intelligently expands all tasks that would benefit from breakdown.
+
+## Execution
+
+```bash
+task-master expand --all
+```
+
+## Smart Selection
+
+Only expands tasks that:
+- Are marked as pending
+- Have high complexity (>5)
+- Lack existing subtasks
+- Would benefit from breakdown
+
+## Expansion Process
+
+1. **Analysis Phase**
+   - Identify expansion candidates
+   - Group related tasks
+   - Plan expansion strategy
+
+2. **Batch Processing**
+   - Expand tasks in logical order
+   - Maintain consistency
+   - Preserve relationships
+   - Optimize for parallelism
+
+3. **Quality Control**
+   - Ensure subtask quality
+   - Avoid over-decomposition
+   - Maintain task coherence
+   - Update dependencies
+
+## Options
+
+- Add `force` to expand all regardless of complexity
+- Add `research` for enhanced AI analysis
+
+## Results
+
+After bulk expansion:
+- Summary of tasks expanded
+- New subtask count
+- Updated complexity metrics
+- Suggested task order

.claude/commands/tm/expand/expand-task.md

@@ -0,0 +1,49 @@
+Break down a complex task into subtasks.
+
+Arguments: $ARGUMENTS (task ID)
+
+## Intelligent Task Expansion
+
+Analyzes a task and creates detailed subtasks for better manageability.
+
+## Execution
+
+```bash
+task-master expand --id=$ARGUMENTS
+```
+
+## Expansion Process
+
+1. **Task Analysis**
+   - Review task complexity
+   - Identify components
+   - Detect technical challenges
+   - Estimate time requirements
+
+2. **Subtask Generation**
+   - Create 3-7 subtasks typically
+   - Each subtask 1-4 hours
+   - Logical implementation order
+   - Clear acceptance criteria
+
+3. **Smart Breakdown**
+   - Setup/configuration tasks
+   - Core implementation
+   - Testing components
+   - Integration steps
+   - Documentation updates
+
+## Enhanced Features
+
+Based on task type:
+- **Feature**: Setup → Implement → Test → Integrate
+- **Bug Fix**: Reproduce → Diagnose → Fix → Verify
+- **Refactor**: Analyze → Plan → Refactor → Validate
+
+## Post-Expansion
+
+After expansion:
+1. Show subtask hierarchy
+2. Update time estimates
+3. Suggest implementation order
+4. Highlight critical path

.claude/commands/tm/fix-dependencies/fix-dependencies.md

@@ -0,0 +1,81 @@
+Automatically fix dependency issues found during validation.
+
+## Automatic Dependency Repair
+
+Intelligently fixes common dependency problems while preserving project logic.
+
+## Execution
+
+```bash
+task-master fix-dependencies
+```
+
+## What Gets Fixed
+
+### 1. **Auto-Fixable Issues**
+- Remove references to deleted tasks
+- Break simple circular dependencies
+- Remove self-dependencies
+- Clean up duplicate dependencies
+
+### 2. **Smart Resolutions**
+- Reorder dependencies to maintain logic
+- Suggest task merging for over-dependent tasks
+- Flatten unnecessary dependency chains
+- Remove redundant transitive dependencies
+
+### 3. **Manual Review Required**
+- Complex circular dependencies
+- Critical path modifications
+- Business logic dependencies
+- High-impact changes
+
+## Fix Process
+
+1. **Analysis Phase**
+   - Run validation check
+   - Categorize issues by type
+   - Determine fix strategy
+
+2. **Execution Phase**
+   - Apply automatic fixes
+   - Log all changes made
+   - Preserve task relationships
+
+3. **Verification Phase**
+   - Re-validate after fixes
+   - Show before/after comparison
+   - Highlight manual fixes needed
+
+## Smart Features
+
+- Preserves intended task flow
+- Minimal disruption approach
+- Creates fix history/log
+- Suggests manual interventions
+
+## Output Example
+
+```
+Dependency Auto-Fix Report
+━━━━━━━━━━━━━━━━━━━━━━━━
+Fixed Automatically:
+✅ Removed 2 references to deleted tasks
+✅ Resolved 1 self-dependency
+✅ Cleaned 3 redundant dependencies
+
+Manual Review Needed:
+⚠️ Complex circular dependency: #12 → #15 → #18 → #12
+  Suggestion: Make #15 not depend on #12
+⚠️ Task #45 has 8 dependencies
+  Suggestion: Break into subtasks
+
+Run '/project:tm/validate-dependencies' to verify fixes
+```
+
+## Safety
+
+- Preview mode available
+- Rollback capability
+- Change logging
+- No data loss

.claude/commands/tm/generate/generate-tasks.md

@@ -0,0 +1,121 @@
+Generate individual task files from tasks.json.
+
+## Task File Generation
+
+Creates separate markdown files for each task, perfect for AI agents or documentation.
+
+## Execution
+
+```bash
+task-master generate
+```
+
+## What It Creates
+
+For each task, generates a file like `task_001.txt`:
+
+```
+Task ID: 1
+Title: Implement user authentication
+Status: pending
+Priority: high
+Dependencies: []
+Created: 2024-01-15
+Complexity: 7
+
+## Description
+Create a secure user authentication system with login, logout, and session management.
+
+## Details
+- Use JWT tokens for session management
+- Implement secure password hashing
+- Add remember me functionality
+- Include password reset flow
+
+## Test Strategy
+- Unit tests for auth functions
+- Integration tests for login flow
+- Security testing for vulnerabilities
+- Performance tests for concurrent logins
+
+## Subtasks
+1.1 Setup authentication framework (pending)
+1.2 Create login endpoints (pending)
+1.3 Implement session management (pending)
+1.4 Add password reset (pending)
+```
+
+## File Organization
+
+Creates structure:
+```
+.taskmaster/
+└── tasks/
+    ├── task_001.txt
+    ├── task_002.txt
+    ├── task_003.txt
+    └── ...
+```
+
+## Smart Features
+
+1. **Consistent Formatting**
+   - Standardized structure
+   - Clear sections
+   - AI-readable format
+   - Markdown compatible
+
+2. **Contextual Information**
+   - Full task details
+   - Related task references
+   - Progress indicators
+   - Implementation notes
+
+3. **Incremental Updates**
+   - Only regenerate changed tasks
+   - Preserve custom additions
+   - Track generation timestamp
+   - Version control friendly
+
+## Use Cases
+
+- **AI Context**: Provide task context to AI assistants
+- **Documentation**: Standalone task documentation
+- **Archival**: Task history preservation
+- **Sharing**: Send specific tasks to team members
+- **Review**: Easier task review process
+
+## Generation Options
+
+Based on arguments:
+- Filter by status
+- Include/exclude completed
+- Custom templates
+- Different formats
+
+## Post-Generation
+
+```
+Task File Generation Complete
+━━━━━━━━━━━━━━━━━━━━━━━━━━
+Generated: 45 task files
+Location: .taskmaster/tasks/
+Total size: 156 KB
+
+New files: 5
+Updated files: 12
+Unchanged: 28
+
+Ready for:
+- AI agent consumption
+- Version control
+- Team distribution
+```
+
+## Integration Benefits
+
+- Git-trackable task history
+- Easy task sharing
+- AI tool compatibility
+- Offline task access
+- Backup redundancy

.claude/commands/tm/help.md

@@ -0,0 +1,81 @@
+Show help for Task Master commands.
+
+Arguments: $ARGUMENTS
+
+Display help for Task Master commands. If arguments provided, show specific command help.
+
+## Task Master Command Help
+
+### Quick Navigation
+
+Type `/project:tm/` and use tab completion to explore all commands.
+
+### Command Categories
+
+#### 🚀 Setup & Installation
+- `/project:tm/setup/install` - Comprehensive installation guide
+- `/project:tm/setup/quick-install` - One-line global install
+
+#### 📋 Project Setup
+- `/project:tm/init` - Initialize new project
+- `/project:tm/init/quick` - Quick setup with auto-confirm
+- `/project:tm/models` - View AI configuration
+- `/project:tm/models/setup` - Configure AI providers
+
+#### 🎯 Task Generation
+- `/project:tm/parse-prd` - Generate tasks from PRD
+- `/project:tm/parse-prd/with-research` - Enhanced parsing
+- `/project:tm/generate` - Create task files
+
+#### 📝 Task Management
+- `/project:tm/list` - List tasks (natural language filters)
+- `/project:tm/show <id>` - Display task details
+- `/project:tm/add-task` - Create new task
+- `/project:tm/update` - Update tasks naturally
+- `/project:tm/next` - Get next task recommendation
+
+#### 🔄 Status Management
+- `/project:tm/set-status/to-pending <id>`
+- `/project:tm/set-status/to-in-progress <id>`
+- `/project:tm/set-status/to-done <id>`
+- `/project:tm/set-status/to-review <id>`
+- `/project:tm/set-status/to-deferred <id>`
+- `/project:tm/set-status/to-cancelled <id>`
+
+#### 🔍 Analysis & Breakdown
+- `/project:tm/analyze-complexity` - Analyze task complexity
+- `/project:tm/expand <id>` - Break down complex task
+- `/project:tm/expand/all` - Expand all eligible tasks
+
+#### 🔗 Dependencies
+- `/project:tm/add-dependency` - Add task dependency
+- `/project:tm/remove-dependency` - Remove dependency
+- `/project:tm/validate-dependencies` - Check for issues
+
+#### 🤖 Workflows
+- `/project:tm/workflows/smart-flow` - Intelligent workflows
+- `/project:tm/workflows/pipeline` - Command chaining
+- `/project:tm/workflows/auto-implement` - Auto-implementation
+
+#### 📊 Utilities
+- `/project:tm/utils/analyze` - Project analysis
+- `/project:tm/status` - Project dashboard
+- `/project:tm/learn` - Interactive learning
+
+### Natural Language Examples
+
+```
+/project:tm/list pending high priority
+/project:tm/update mark all API tasks as done
+/project:tm/add-task create login system with OAuth
+/project:tm/show current
+```
+
+### Getting Started
+
+1. Install: `/project:tm/setup/quick-install`
+2. Initialize: `/project:tm/init/quick`
+3. Learn: `/project:tm/learn start`
+4. Work: `/project:tm/workflows/smart-flow`
+
+For detailed command info: `/project:tm/help <command-name>`

.claude/commands/tm/init/init-project-quick.md

@@ -0,0 +1,46 @@
+Quick initialization with auto-confirmation.
+
+Arguments: $ARGUMENTS
+
+Initialize a Task Master project without prompts, accepting all defaults.
+
+## Quick Setup
+
+```bash
+task-master init -y
+```
+
+## What It Does
+
+1. Creates `.taskmaster/` directory structure
+2. Initializes empty `tasks.json`
+3. Sets up default configuration
+4. Uses directory name as project name
+5. Skips all confirmation prompts
+
+## Smart Defaults
+
+- Project name: Current directory name
+- Description: "Task Master Project"
+- Model config: Existing environment vars
+- Task structure: Standard format
+
+## Next Steps
+
+After quick init:
+1. Configure AI models if needed:
+   ```
+   /project:tm/models/setup
+   ```
+
+2. Parse PRD if available:
+   ```
+   /project:tm/parse-prd <file>
+   ```
+
+3. Or create first task:
+   ```
+   /project:tm/add-task create initial setup
+   ```
+
+Perfect for rapid project setup!

.claude/commands/tm/init/init-project.md

@@ -0,0 +1,50 @@
+Initialize a new Task Master project.
+
+Arguments: $ARGUMENTS
+
+Parse arguments to determine initialization preferences.
+
+## Initialization Process
+
+1. **Parse Arguments**
+   - PRD file path (if provided)
+   - Project name
+   - Auto-confirm flag (-y)
+
+2. **Project Setup**
+   ```bash
+   task-master init
+   ```
+
+3. **Smart Initialization**
+   - Detect existing project files
+   - Suggest project name from directory
+   - Check for git repository
+   - Verify AI provider configuration
+
+## Configuration Options
+
+Based on arguments:
+- `quick` / `-y` → Skip confirmations
+- `<file.md>` → Use as PRD after init
+- `--name=<name>` → Set project name
+- `--description=<desc>` → Set description
+
+## Post-Initialization
+
+After successful init:
+1. Show project structure created
+2. Verify AI models configured
+3. Suggest next steps:
+   - Parse PRD if available
+   - Configure AI providers
+   - Set up git hooks
+   - Create first tasks
+
+## Integration
+
+If PRD file provided:
+```
+/project:tm/init my-prd.md
+→ Automatically runs parse-prd after init
+```

.claude/commands/tm/learn.md

@@ -0,0 +1,103 @@
+Learn about Task Master capabilities through interactive exploration.
+
+Arguments: $ARGUMENTS
+
+## Interactive Task Master Learning
+
+Based on your input, I'll help you discover capabilities:
+
+### 1. **What are you trying to do?**
+
+If $ARGUMENTS contains:
+- "start" / "begin" → Show project initialization workflows
+- "manage" / "organize" → Show task management commands  
+- "automate" / "auto" → Show automation workflows
+- "analyze" / "report" → Show analysis tools
+- "fix" / "problem" → Show troubleshooting commands
+- "fast" / "quick" → Show efficiency shortcuts
+
+### 2. **Intelligent Suggestions**
+
+Based on your project state:
+
+**No tasks yet?**
+```
+You'll want to start with:
+1. /project:task-master:init <prd-file>
+   → Creates tasks from requirements
+   
+2. /project:task-master:parse-prd <file>
+   → Alternative task generation
+
+Try: /project:task-master:init demo-prd.md
+```
+
+**Have tasks?**
+Let me analyze what you might need...
+- Many pending tasks? → Learn sprint planning
+- Complex tasks? → Learn task expansion
+- Daily work? → Learn workflow automation
+
+### 3. **Command Discovery**
+
+**By Category:**
+- 📋 Task Management: list, show, add, update, complete
+- 🔄 Workflows: auto-implement, sprint-plan, daily-standup
+- 🛠️ Utilities: check-health, complexity-report, sync-memory
+- 🔍 Analysis: validate-deps, show dependencies
+
+**By Scenario:**
+- "I want to see what to work on" → `/project:task-master:next`
+- "I need to break this down" → `/project:task-master:expand <id>`
+- "Show me everything" → `/project:task-master:status`
+- "Just do it for me" → `/project:workflows:auto-implement`
+
+### 4. **Power User Patterns**
+
+**Command Chaining:**
+```
+/project:task-master:next
+/project:task-master:start <id>
+/project:workflows:auto-implement
+```
+
+**Smart Filters:**
+```
+/project:task-master:list pending high
+/project:task-master:list blocked
+/project:task-master:list 1-5 tree
+```
+
+**Automation:**
+```
+/project:workflows:pipeline init → expand-all → sprint-plan
+```
+
+### 5. **Learning Path**
+
+Based on your experience level:
+
+**Beginner Path:**
+1. init → Create project
+2. status → Understand state
+3. next → Find work
+4. complete → Finish task
+
+**Intermediate Path:**
+1. expand → Break down complex tasks
+2. sprint-plan → Organize work
+3. complexity-report → Understand difficulty
+4. validate-deps → Ensure consistency
+
+**Advanced Path:**
+1. pipeline → Chain operations
+2. smart-flow → Context-aware automation
+3. Custom commands → Extend the system
+
+### 6. **Try This Now**
+
+Based on what you asked about, try:
+[Specific command suggestion based on $ARGUMENTS]
+
+Want to learn more about a specific command?
+Type: /project:help <command-name>

.claude/commands/tm/list/list-tasks-by-status.md

@@ -0,0 +1,39 @@
+List tasks filtered by a specific status.
+
+Arguments: $ARGUMENTS
+
+Parse the status from arguments and list only tasks matching that status.
+
+## Status Options
+- `pending` - Not yet started
+- `in-progress` - Currently being worked on
+- `done` - Completed
+- `review` - Awaiting review
+- `deferred` - Postponed
+- `cancelled` - Cancelled
+
+## Execution
+
+Based on $ARGUMENTS, run:
+```bash
+task-master list --status=$ARGUMENTS
+```
+
+## Enhanced Display
+
+For the filtered results:
+- Group by priority within the status
+- Show time in current status
+- Highlight tasks approaching deadlines
+- Display blockers and dependencies
+- Suggest next actions for each status group
+
+## Intelligent Insights
+
+Based on the status filter:
+- **Pending**: Show recommended start order
+- **In-Progress**: Display idle time warnings
+- **Done**: Show newly unblocked tasks
+- **Review**: Indicate review duration
+- **Deferred**: Show reactivation criteria
+- **Cancelled**: Display impact analysis

.claude/commands/tm/list/list-tasks-with-subtasks.md

@@ -0,0 +1,29 @@
+List all tasks including their subtasks in a hierarchical view.
+
+This command shows all tasks with their nested subtasks, providing a complete project overview.
+
+## Execution
+
+Run the Task Master list command with subtasks flag:
+```bash
+task-master list --with-subtasks
+```
+
+## Enhanced Display
+
+I'll organize the output to show:
+- Parent tasks with clear indicators
+- Nested subtasks with proper indentation
+- Status badges for quick scanning
+- Dependencies and blockers highlighted
+- Progress indicators for tasks with subtasks
+
+## Smart Filtering
+
+Based on the task hierarchy:
+- Show completion percentage for parent tasks
+- Highlight blocked subtask chains
+- Group by functional areas
+- Indicate critical path items
+
+This gives you a complete tree view of your project structure.

.claude/commands/tm/list/list-tasks.md

@@ -0,0 +1,43 @@
+List tasks with intelligent argument parsing.
+
+Parse arguments to determine filters and display options:
+- Status: pending, in-progress, done, review, deferred, cancelled
+- Priority: high, medium, low (or priority:high)
+- Special: subtasks, tree, dependencies, blocked
+- IDs: Direct numbers (e.g., "1,3,5" or "1-5")
+- Complex: "pending high" = pending AND high priority
+
+Arguments: $ARGUMENTS
+
+Let me parse your request intelligently:
+
+1. **Detect Filter Intent**
+   - If arguments contain status keywords → filter by status
+   - If arguments contain priority → filter by priority
+   - If arguments contain "subtasks" → include subtasks
+   - If arguments contain "tree" → hierarchical view
+   - If arguments contain numbers → show specific tasks
+   - If arguments contain "blocked" → show blocked tasks only
+
+2. **Smart Combinations**
+   Examples of what I understand:
+   - "pending high" → pending tasks with high priority
+   - "done today" → tasks completed today
+   - "blocked" → tasks with unmet dependencies
+   - "1-5" → tasks 1 through 5
+   - "subtasks tree" → hierarchical view with subtasks
+
+3. **Execute Appropriate Query**
+   Based on parsed intent, run the most specific task-master command
+
+4. **Enhanced Display**
+   - Group by relevant criteria
+   - Show most important information first
+   - Use visual indicators for quick scanning
+   - Include relevant metrics
+
+5. **Intelligent Suggestions**
+   Based on what you're viewing, suggest next actions:
+   - Many pending? → Suggest priority order
+   - Many blocked? → Show dependency resolution
+   - Looking at specific tasks? → Show related tasks

.claude/commands/tm/models/setup-models.md

@@ -0,0 +1,51 @@
+Run interactive setup to configure AI models.
+
+## Interactive Model Configuration
+
+Guides you through setting up AI providers for Task Master.
+
+## Execution
+
+```bash
+task-master models --setup
+```
+
+## Setup Process
+
+1. **Environment Check**
+   - Detect existing API keys
+   - Show current configuration
+   - Identify missing providers
+
+2. **Provider Selection**
+   - Choose main provider (required)
+   - Select research provider (recommended)
+   - Configure fallback (optional)
+
+3. **API Key Configuration**
+   - Prompt for missing keys
+   - Validate key format
+   - Test connectivity
+   - Save configuration
+
+## Smart Recommendations
+
+Based on your needs:
+- **For best results**: Claude + Perplexity
+- **Budget conscious**: GPT-3.5 + Perplexity
+- **Maximum capability**: GPT-4 + Perplexity + Claude fallback
+
+## Configuration Storage
+
+Keys can be stored in:
+1. Environment variables (recommended)
+2. `.env` file in project
+3. Global `.taskmaster/config`
+
+## Post-Setup
+
+After configuration:
+- Test each provider
+- Show usage examples
+- Suggest next steps
+- Verify parse-prd works

.claude/commands/tm/models/view-models.md

@@ -0,0 +1,51 @@
+View current AI model configuration.
+
+## Model Configuration Display
+
+Shows the currently configured AI providers and models for Task Master.
+
+## Execution
+
+```bash
+task-master models
+```
+
+## Information Displayed
+
+1. **Main Provider**
+   - Model ID and name
+   - API key status (configured/missing)
+   - Usage: Primary task generation
+
+2. **Research Provider**
+   - Model ID and name  
+   - API key status
+   - Usage: Enhanced research mode
+
+3. **Fallback Provider**
+   - Model ID and name
+   - API key status
+   - Usage: Backup when main fails
+
+## Visual Status
+
+```
+Task Master AI Model Configuration
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+Main:     ✅ claude-3-5-sonnet (configured)
+Research: ✅ perplexity-sonar (configured)  
+Fallback: ⚠️  Not configured (optional)
+
+Available Models:
+- claude-3-5-sonnet
+- gpt-4-turbo
+- gpt-3.5-turbo
+- perplexity-sonar
+```
+
+## Next Actions
+
+Based on configuration:
+- If missing API keys → Suggest setup
+- If no research model → Explain benefits
+- If all configured → Show usage tips

.claude/commands/tm/next/next-task.md

@@ -0,0 +1,66 @@
+Intelligently determine and prepare the next action based on comprehensive context.
+
+This enhanced version of 'next' considers:
+- Current task states
+- Recent activity
+- Time constraints
+- Dependencies
+- Your working patterns
+
+Arguments: $ARGUMENTS
+
+## Intelligent Next Action
+
+### 1. **Context Gathering**
+Let me analyze the current situation:
+- Active tasks (in-progress)
+- Recently completed tasks
+- Blocked tasks
+- Time since last activity
+- Arguments provided: $ARGUMENTS
+
+### 2. **Smart Decision Tree**
+
+**If you have an in-progress task:**
+- Has it been idle > 2 hours? → Suggest resuming or switching
+- Near completion? → Show remaining steps
+- Blocked? → Find alternative task
+
+**If no in-progress tasks:**
+- Unblocked high-priority tasks? → Start highest
+- Complex tasks need breakdown? → Suggest expansion
+- All tasks blocked? → Show dependency resolution
+
+**Special arguments handling:**
+- "quick" → Find task < 2 hours
+- "easy" → Find low complexity task
+- "important" → Find high priority regardless of complexity
+- "continue" → Resume last worked task
+
+### 3. **Preparation Workflow**
+
+Based on selected task:
+1. Show full context and history
+2. Set up development environment
+3. Run relevant tests
+4. Open related files
+5. Show similar completed tasks
+6. Estimate completion time
+
+### 4. **Alternative Suggestions**
+
+Always provide options:
+- Primary recommendation
+- Quick alternative (< 1 hour)
+- Strategic option (unblocks most tasks)
+- Learning option (new technology/skill)
+
+### 5. **Workflow Integration**
+
+Seamlessly connect to:
+- `/project:task-master:start [selected]` 
+- `/project:workflows:auto-implement`
+- `/project:task-master:expand` (if complex)
+- `/project:utils:complexity-report` (if unsure)
+
+The goal: Zero friction from decision to implementation.

.claude/commands/tm/parse-prd/parse-prd-with-research.md

@@ -0,0 +1,48 @@
+Parse PRD with enhanced research mode for better task generation.
+
+Arguments: $ARGUMENTS (PRD file path)
+
+## Research-Enhanced Parsing
+
+Uses the research AI provider (typically Perplexity) for more comprehensive task generation with current best practices.
+
+## Execution
+
+```bash
+task-master parse-prd --input=$ARGUMENTS --research
+```
+
+## Research Benefits
+
+1. **Current Best Practices**
+   - Latest framework patterns
+   - Security considerations
+   - Performance optimizations
+   - Accessibility requirements
+
+2. **Technical Deep Dive**
+   - Implementation approaches
+   - Library recommendations
+   - Architecture patterns
+   - Testing strategies
+
+3. **Comprehensive Coverage**
+   - Edge cases consideration
+   - Error handling tasks
+   - Monitoring setup
+   - Deployment tasks
+
+## Enhanced Output
+
+Research mode typically:
+- Generates more detailed tasks
+- Includes industry standards
+- Adds compliance considerations
+- Suggests modern tooling
+
+## When to Use
+
+- New technology domains
+- Complex requirements
+- Regulatory compliance needed
+- Best practices crucial

.claude/commands/tm/parse-prd/parse-prd.md

@@ -0,0 +1,49 @@
+Parse a PRD document to generate tasks.
+
+Arguments: $ARGUMENTS (PRD file path)
+
+## Intelligent PRD Parsing
+
+Analyzes your requirements document and generates a complete task breakdown.
+
+## Execution
+
+```bash
+task-master parse-prd --input=$ARGUMENTS
+```
+
+## Parsing Process
+
+1. **Document Analysis**
+   - Extract key requirements
+   - Identify technical components
+   - Detect dependencies
+   - Estimate complexity
+
+2. **Task Generation**
+   - Create 10-15 tasks by default
+   - Include implementation tasks
+   - Add testing tasks
+   - Include documentation tasks
+   - Set logical dependencies
+
+3. **Smart Enhancements**
+   - Group related functionality
+   - Set appropriate priorities
+   - Add acceptance criteria
+   - Include test strategies
+
+## Options
+
+Parse arguments for modifiers:
+- Number after filename → `--num-tasks`
+- `research` → Use research mode
+- `comprehensive` → Generate more tasks
+
+## Post-Generation
+
+After parsing:
+1. Display task summary
+2. Show dependency graph
+3. Suggest task expansion for complex items
+4. Recommend sprint planning

.claude/commands/tm/remove-dependency/remove-dependency.md

@@ -0,0 +1,62 @@
+Remove a dependency between tasks.
+
+Arguments: $ARGUMENTS
+
+Parse the task IDs to remove dependency relationship.
+
+## Removing Dependencies
+
+Removes a dependency relationship, potentially unblocking tasks.
+
+## Argument Parsing
+
+Parse natural language or IDs:
+- "remove dependency between 5 and 3"
+- "5 no longer needs 3"
+- "unblock 5 from 3"
+- "5 3" → remove dependency of 5 on 3
+
+## Execution
+
+```bash
+task-master remove-dependency --id=<task-id> --depends-on=<dependency-id>
+```
+
+## Pre-Removal Checks
+
+1. **Verify dependency exists**
+2. **Check impact on task flow**
+3. **Warn if it breaks logical sequence**
+4. **Show what will be unblocked**
+
+## Smart Analysis
+
+Before removing:
+- Show why dependency might have existed
+- Check if removal makes tasks executable
+- Verify no critical path disruption
+- Suggest alternative dependencies
+
+## Post-Removal
+
+After removing:
+1. Show updated task status
+2. List newly unblocked tasks
+3. Update project timeline
+4. Suggest next actions
+
+## Safety Features
+
+- Confirm if removing critical dependency
+- Show tasks that become immediately actionable
+- Warn about potential issues
+- Keep removal history
+
+## Example
+
+```
+/project:tm/remove-dependency 5 from 3
+→ Removed: Task #5 no longer depends on #3
+→ Task #5 is now UNBLOCKED and ready to start
+→ Warning: Consider if #5 still needs #2 completed first
+```

.claude/commands/tm/remove-subtask/remove-subtask.md

@@ -0,0 +1,84 @@
+Remove a subtask from its parent task.
+
+Arguments: $ARGUMENTS
+
+Parse subtask ID to remove, with option to convert to standalone task.
+
+## Removing Subtasks
+
+Remove a subtask and optionally convert it back to a standalone task.
+
+## Argument Parsing
+
+- "remove subtask 5.1"
+- "delete 5.1"
+- "convert 5.1 to task" → remove and convert
+- "5.1 standalone" → convert to standalone
+
+## Execution Options
+
+### 1. Delete Subtask
+```bash
+task-master remove-subtask --id=<parentId.subtaskId>
+```
+
+### 2. Convert to Standalone
+```bash
+task-master remove-subtask --id=<parentId.subtaskId> --convert
+```
+
+## Pre-Removal Checks
+
+1. **Validate Subtask**
+   - Verify subtask exists
+   - Check completion status
+   - Review dependencies
+
+2. **Impact Analysis**
+   - Other subtasks that depend on it
+   - Parent task implications
+   - Data that will be lost
+
+## Removal Process
+
+### For Deletion:
+1. Confirm if subtask has work done
+2. Update parent task estimates
+3. Remove subtask and its data
+4. Clean up dependencies
+
+### For Conversion:
+1. Assign new standalone task ID
+2. Preserve all task data
+3. Update dependency references
+4. Maintain task history
+
+## Smart Features
+
+- Warn if subtask is in-progress
+- Show impact on parent task
+- Preserve important data
+- Update related estimates
+
+## Example Flows
+
+```
+/project:tm/remove-subtask 5.1
+→ Warning: Subtask #5.1 is in-progress
+→ This will delete all subtask data
+→ Parent task #5 will be updated
+Confirm deletion? (y/n)
+
+/project:tm/remove-subtask 5.1 convert
+→ Converting subtask #5.1 to standalone task #89
+→ Preserved: All task data and history
+→ Updated: 2 dependency references
+→ New task #89 is now independent
+```
+
+## Post-Removal
+
+- Update parent task status
+- Recalculate estimates
+- Show updated hierarchy
+- Suggest next actions

.claude/commands/tm/remove-task/remove-task.md

@@ -0,0 +1,107 @@
+Remove a task permanently from the project.
+
+Arguments: $ARGUMENTS (task ID)
+
+Delete a task and handle all its relationships properly.
+
+## Task Removal
+
+Permanently removes a task while maintaining project integrity.
+
+## Argument Parsing
+
+- "remove task 5"
+- "delete 5"
+- "5" → remove task 5
+- Can include "-y" for auto-confirm
+
+## Execution
+
+```bash
+task-master remove-task --id=<id> [-y]
+```
+
+## Pre-Removal Analysis
+
+1. **Task Details**
+   - Current status
+   - Work completed
+   - Time invested
+   - Associated data
+
+2. **Relationship Check**
+   - Tasks that depend on this
+   - Dependencies this task has
+   - Subtasks that will be removed
+   - Blocking implications
+
+3. **Impact Assessment**
+   ```
+   Task Removal Impact
+   ━━━━━━━━━━━━━━━━━━
+   Task: #5 "Implement authentication" (in-progress)
+   Status: 60% complete (~8 hours work)
+   
+   Will affect:
+   - 3 tasks depend on this (will be blocked)
+   - Has 4 subtasks (will be deleted)
+   - Part of critical path
+   
+   ⚠️  This action cannot be undone
+   ```
+
+## Smart Warnings
+
+- Warn if task is in-progress
+- Show dependent tasks that will be blocked
+- Highlight if part of critical path
+- Note any completed work being lost
+
+## Removal Process
+
+1. Show comprehensive impact
+2. Require confirmation (unless -y)
+3. Update dependent task references
+4. Remove task and subtasks
+5. Clean up orphaned dependencies
+6. Log removal with timestamp
+
+## Alternative Actions
+
+Suggest before deletion:
+- Mark as cancelled instead
+- Convert to documentation
+- Archive task data
+- Transfer work to another task
+
+## Post-Removal
+
+- List affected tasks
+- Show broken dependencies
+- Update project statistics
+- Suggest dependency fixes
+- Recalculate timeline
+
+## Example Flows
+
+```
+/project:tm/remove-task 5
+→ Task #5 is in-progress with 8 hours logged
+→ 3 other tasks depend on this
+→ Suggestion: Mark as cancelled instead?
+Remove anyway? (y/n)
+
+/project:tm/remove-task 5 -y
+→ Removed: Task #5 and 4 subtasks
+→ Updated: 3 task dependencies
+→ Warning: Tasks #7, #8, #9 now have missing dependency
+→ Run /project:tm/fix-dependencies to resolve
+```
+
+## Safety Features
+
+- Confirmation required
+- Impact preview
+- Removal logging
+- Suggest alternatives
+- No cascade delete of dependents

.claude/commands/tm/set-status/to-cancelled.md

@@ -0,0 +1,55 @@
+Cancel a task permanently.
+
+Arguments: $ARGUMENTS (task ID)
+
+## Cancelling a Task
+
+This status indicates a task is no longer needed and won't be completed.
+
+## Valid Reasons for Cancellation
+
+- Requirements changed
+- Feature deprecated
+- Duplicate of another task
+- Strategic pivot
+- Technical approach invalidated
+
+## Pre-Cancellation Checks
+
+1. Confirm no critical dependencies
+2. Check for partial implementation
+3. Verify cancellation rationale
+4. Document lessons learned
+
+## Execution
+
+```bash
+task-master set-status --id=$ARGUMENTS --status=cancelled
+```
+
+## Cancellation Impact
+
+When cancelling:
+1. **Dependency Updates**
+   - Notify dependent tasks
+   - Update project scope
+   - Recalculate timelines
+
+2. **Clean-up Actions**
+   - Remove related branches
+   - Archive any work done
+   - Update documentation
+   - Close related issues
+
+3. **Learning Capture**
+   - Document why cancelled
+   - Note what was learned
+   - Update estimation models
+   - Prevent future duplicates
+
+## Historical Preservation
+
+- Keep for reference
+- Tag with cancellation reason
+- Link to replacement if any
+- Maintain audit trail

.claude/commands/tm/set-status/to-deferred.md

@@ -0,0 +1,47 @@
+Defer a task for later consideration.
+
+Arguments: $ARGUMENTS (task ID)
+
+## Deferring a Task
+
+This status indicates a task is valid but not currently actionable or prioritized.
+
+## Valid Reasons for Deferral
+
+- Waiting for external dependencies
+- Reprioritized for future sprint
+- Blocked by technical limitations
+- Resource constraints
+- Strategic timing considerations
+
+## Execution
+
+```bash
+task-master set-status --id=$ARGUMENTS --status=deferred
+```
+
+## Deferral Management
+
+When deferring:
+1. **Document Reason**
+   - Capture why it's being deferred
+   - Set reactivation criteria
+   - Note any partial work completed
+
+2. **Impact Analysis**
+   - Check dependent tasks
+   - Update project timeline
+   - Notify affected stakeholders
+
+3. **Future Planning**
+   - Set review reminders
+   - Tag for specific milestone
+   - Preserve context for reactivation
+   - Link to blocking issues
+
+## Smart Tracking
+
+- Monitor deferral duration
+- Alert when criteria met
+- Prevent scope creep
+- Regular review cycles

.claude/commands/tm/set-status/to-done.md

@@ -0,0 +1,44 @@
+Mark a task as completed.
+
+Arguments: $ARGUMENTS (task ID)
+
+## Completing a Task
+
+This command validates task completion and updates project state intelligently.
+
+## Pre-Completion Checks
+
+1. Verify test strategy was followed
+2. Check if all subtasks are complete
+3. Validate acceptance criteria met
+4. Ensure code is committed
+
+## Execution
+
+```bash
+task-master set-status --id=$ARGUMENTS --status=done
+```
+
+## Post-Completion Actions
+
+1. **Update Dependencies**
+   - Identify newly unblocked tasks
+   - Update sprint progress
+   - Recalculate project timeline
+
+2. **Documentation**
+   - Generate completion summary
+   - Update CLAUDE.md with learnings
+   - Log implementation approach
+
+3. **Next Steps**
+   - Show newly available tasks
+   - Suggest logical next task
+   - Update velocity metrics
+
+## Celebration & Learning
+
+- Show impact of completion
+- Display unblocked work
+- Recognize achievement
+- Capture lessons learned

.claude/commands/tm/set-status/to-in-progress.md

@@ -0,0 +1,36 @@
+Start working on a task by setting its status to in-progress.
+
+Arguments: $ARGUMENTS (task ID)
+
+## Starting Work on Task
+
+This command does more than just change status - it prepares your environment for productive work.
+
+## Pre-Start Checks
+
+1. Verify dependencies are met
+2. Check if another task is already in-progress
+3. Ensure task details are complete
+4. Validate test strategy exists
+
+## Execution
+
+```bash
+task-master set-status --id=$ARGUMENTS --status=in-progress
+```
+
+## Environment Setup
+
+After setting to in-progress:
+1. Create/checkout appropriate git branch
+2. Open relevant documentation
+3. Set up test watchers if applicable
+4. Display task details and acceptance criteria
+5. Show similar completed tasks for reference
+
+## Smart Suggestions
+
+- Estimated completion time based on complexity
+- Related files from similar tasks
+- Potential blockers to watch for
+- Recommended first steps

.claude/commands/tm/set-status/to-pending.md

@@ -0,0 +1,32 @@
+Set a task's status to pending.
+
+Arguments: $ARGUMENTS (task ID)
+
+## Setting Task to Pending
+
+This moves a task back to the pending state, useful for:
+- Resetting erroneously started tasks
+- Deferring work that was prematurely begun
+- Reorganizing sprint priorities
+
+## Execution
+
+```bash
+task-master set-status --id=$ARGUMENTS --status=pending
+```
+
+## Validation
+
+Before setting to pending:
+- Warn if task is currently in-progress
+- Check if this will block other tasks
+- Suggest documenting why it's being reset
+- Preserve any work already done
+
+## Smart Actions
+
+After setting to pending:
+- Update sprint planning if needed
+- Notify about freed resources
+- Suggest priority reassessment
+- Log the status change with context

.claude/commands/tm/set-status/to-review.md

@@ -0,0 +1,40 @@
+Set a task's status to review.
+
+Arguments: $ARGUMENTS (task ID)
+
+## Marking Task for Review
+
+This status indicates work is complete but needs verification before final approval.
+
+## When to Use Review Status
+
+- Code complete but needs peer review
+- Implementation done but needs testing
+- Documentation written but needs proofreading
+- Design complete but needs stakeholder approval
+
+## Execution
+
+```bash
+task-master set-status --id=$ARGUMENTS --status=review
+```
+
+## Review Preparation
+
+When setting to review:
+1. **Generate Review Checklist**
+   - Link to PR/MR if applicable
+   - Highlight key changes
+   - Note areas needing attention
+   - Include test results
+
+2. **Documentation**
+   - Update task with review notes
+   - Link relevant artifacts
+   - Specify reviewers if known
+
+3. **Smart Actions**
+   - Create review reminders
+   - Track review duration
+   - Suggest reviewers based on expertise
+   - Prepare rollback plan if needed

.claude/commands/tm/setup/install-taskmaster.md

@@ -0,0 +1,117 @@
+Check if Task Master is installed and install it if needed.
+
+This command helps you get Task Master set up globally on your system.
+
+## Detection and Installation Process
+
+1. **Check Current Installation**
+   ```bash
+   # Check if task-master command exists
+   which task-master || echo "Task Master not found"
+   
+   # Check npm global packages
+   npm list -g task-master-ai
+   ```
+
+2. **System Requirements Check**
+   ```bash
+   # Verify Node.js is installed
+   node --version
+   
+   # Verify npm is installed  
+   npm --version
+   
+   # Check Node version (need 16+)
+   ```
+
+3. **Install Task Master Globally**
+   If not installed, run:
+   ```bash
+   npm install -g task-master-ai
+   ```
+
+4. **Verify Installation**
+   ```bash
+   # Check version
+   task-master --version
+   
+   # Verify command is available
+   which task-master
+   ```
+
+5. **Initial Setup**
+   ```bash
+   # Initialize in current directory
+   task-master init
+   ```
+
+6. **Configure AI Provider**
+   Ensure you have at least one AI provider API key set:
+   ```bash
+   # Check current configuration
+   task-master models --status
+   
+   # If no API keys found, guide setup
+   echo "You'll need at least one API key:"
+   echo "- ANTHROPIC_API_KEY for Claude"
+   echo "- OPENAI_API_KEY for GPT models"
+   echo "- PERPLEXITY_API_KEY for research"
+   echo ""
+   echo "Set them in your shell profile or .env file"
+   ```
+
+7. **Quick Test**
+   ```bash
+   # Create a test PRD
+   echo "Build a simple hello world API" > test-prd.txt
+   
+   # Try parsing it
+   task-master parse-prd test-prd.txt -n 3
+   ```
+
+## Troubleshooting
+
+If installation fails:
+
+**Permission Errors:**
+```bash
+# Try with sudo (macOS/Linux)
+sudo npm install -g task-master-ai
+
+# Or fix npm permissions
+npm config set prefix ~/.npm-global
+export PATH=~/.npm-global/bin:$PATH
+```
+
+**Network Issues:**
+```bash
+# Use different registry
+npm install -g task-master-ai --registry https://registry.npmjs.org/
+```
+
+**Node Version Issues:**
+```bash
+# Install Node 18+ via nvm
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
+nvm install 18
+nvm use 18
+```
+
+## Success Confirmation
+
+Once installed, you should see:
+```
+✅ Task Master v0.16.2 (or higher) installed
+✅ Command 'task-master' available globally
+✅ AI provider configured
+✅ Ready to use slash commands!
+
+Try: /project:task-master:init your-prd.md
+```
+
+## Next Steps
+
+After installation:
+1. Run `/project:utils:check-health` to verify setup
+2. Configure AI providers with `/project:task-master:models`
+3. Start using Task Master commands!

.claude/commands/tm/setup/quick-install-taskmaster.md

@@ -0,0 +1,22 @@
+Quick install Task Master globally if not already installed.
+
+Execute this streamlined installation:
+
+```bash
+# Check and install in one command
+task-master --version 2>/dev/null || npm install -g task-master-ai
+
+# Verify installation
+task-master --version
+
+# Quick setup check
+task-master models --status || echo "Note: You'll need to set up an AI provider API key"
+```
+
+If you see "command not found" after installation, you may need to:
+1. Restart your terminal
+2. Or add npm global bin to PATH: `export PATH=$(npm bin -g):$PATH`
+
+Once installed, you can use all the Task Master commands!
+
+Quick test: Run `/project:help` to see all available commands.

.claude/commands/tm/show/show-task.md

@@ -0,0 +1,82 @@
+Show detailed task information with rich context and insights.
+
+Arguments: $ARGUMENTS
+
+## Enhanced Task Display
+
+Parse arguments to determine what to show and how.
+
+### 1. **Smart Task Selection**
+
+Based on $ARGUMENTS:
+- Number → Show specific task with full context
+- "current" → Show active in-progress task(s)
+- "next" → Show recommended next task
+- "blocked" → Show all blocked tasks with reasons
+- "critical" → Show critical path tasks
+- Multiple IDs → Comparative view
+
+### 2. **Contextual Information**
+
+For each task, intelligently include:
+
+**Core Details**
+- Full task information (id, title, description, details)
+- Current status with history
+- Test strategy and acceptance criteria
+- Priority and complexity analysis
+
+**Relationships**
+- Dependencies (what it needs)
+- Dependents (what needs it)
+- Parent/subtask hierarchy
+- Related tasks (similar work)
+
+**Time Intelligence**
+- Created/updated timestamps
+- Time in current status
+- Estimated vs actual time
+- Historical completion patterns
+
+### 3. **Visual Enhancements**
+
+```
+📋 Task #45: Implement User Authentication
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+Status: 🟡 in-progress (2 hours)
+Priority: 🔴 High | Complexity: 73/100
+
+Dependencies: ✅ #41, ✅ #42, ⏳ #43 (blocked)
+Blocks: #46, #47, #52
+
+Progress: ████████░░ 80% complete
+
+Recent Activity:
+- 2h ago: Status changed to in-progress
+- 4h ago: Dependency #42 completed
+- Yesterday: Task expanded with 3 subtasks
+```
+
+### 4. **Intelligent Insights**
+
+Based on task analysis:
+- **Risk Assessment**: Complexity vs time remaining
+- **Bottleneck Analysis**: Is this blocking critical work?
+- **Recommendation**: Suggested approach or concerns
+- **Similar Tasks**: How others completed similar work
+
+### 5. **Action Suggestions**
+
+Context-aware next steps:
+- If blocked → Show how to unblock
+- If complex → Suggest expansion
+- If in-progress → Show completion checklist
+- If done → Show dependent tasks ready to start
+
+### 6. **Multi-Task View**
+
+When showing multiple tasks:
+- Common dependencies
+- Optimal completion order
+- Parallel work opportunities
+- Combined complexity analysis

.claude/commands/tm/status/project-status.md

@@ -0,0 +1,64 @@
+Enhanced status command with comprehensive project insights.
+
+Arguments: $ARGUMENTS
+
+## Intelligent Status Overview
+
+### 1. **Executive Summary**
+Quick dashboard view:
+- 🏃 Active work (in-progress tasks)
+- 📊 Progress metrics (% complete, velocity)
+- 🚧 Blockers and risks
+- ⏱️ Time analysis (estimated vs actual)
+- 🎯 Sprint/milestone progress
+
+### 2. **Contextual Analysis**
+
+Based on $ARGUMENTS, focus on:
+- "sprint" → Current sprint progress and burndown
+- "blocked" → Dependency chains and resolution paths
+- "team" → Task distribution and workload
+- "timeline" → Schedule adherence and projections
+- "risk" → High complexity or overdue items
+
+### 3. **Smart Insights**
+
+**Workflow Health:**
+- Idle tasks (in-progress > 24h without updates)
+- Bottlenecks (multiple tasks waiting on same dependency)
+- Quick wins (low complexity, high impact)
+
+**Predictive Analytics:**
+- Completion projections based on velocity
+- Risk of missing deadlines
+- Recommended task order for optimal flow
+
+### 4. **Visual Intelligence**
+
+Dynamic visualization based on data:
+```
+Sprint Progress: ████████░░ 80% (16/20 tasks)
+Velocity Trend: ↗️ +15% this week
+Blocked Tasks:  🔴 3 critical path items
+
+Priority Distribution:
+High:   ████████ 8 tasks (2 blocked)
+Medium: ████░░░░ 4 tasks
+Low:    ██░░░░░░ 2 tasks
+```
+
+### 5. **Actionable Recommendations**
+
+Based on analysis:
+1. **Immediate actions** (unblock critical path)
+2. **Today's focus** (optimal task sequence)
+3. **Process improvements** (recurring patterns)
+4. **Resource needs** (skills, time, dependencies)
+
+### 6. **Historical Context**
+
+Compare to previous periods:
+- Velocity changes
+- Pattern recognition
+- Improvement areas
+- Success patterns to repeat

.claude/commands/tm/sync-readme/sync-readme.md

@@ -0,0 +1,117 @@
+Export tasks to README.md with professional formatting.
+
+Arguments: $ARGUMENTS
+
+Generate a well-formatted README with current task information.
+
+## README Synchronization
+
+Creates or updates README.md with beautifully formatted task information.
+
+## Argument Parsing
+
+Optional filters:
+- "pending" → Only pending tasks
+- "with-subtasks" → Include subtask details
+- "by-priority" → Group by priority
+- "sprint" → Current sprint only
+
+## Execution
+
+```bash
+task-master sync-readme [--with-subtasks] [--status=<status>]
+```
+
+## README Generation
+
+### 1. **Project Header**
+```markdown
+# Project Name
+
+## 📋 Task Progress
+
+Last Updated: 2024-01-15 10:30 AM
+
+### Summary
+- Total Tasks: 45
+- Completed: 15 (33%)
+- In Progress: 5 (11%)
+- Pending: 25 (56%)
+```
+
+### 2. **Task Sections**
+Organized by status or priority:
+- Progress indicators
+- Task descriptions
+- Dependencies noted
+- Time estimates
+
+### 3. **Visual Elements**
+- Progress bars
+- Status badges
+- Priority indicators
+- Completion checkmarks
+
+## Smart Features
+
+1. **Intelligent Grouping**
+   - By feature area
+   - By sprint/milestone
+   - By assigned developer
+   - By priority
+
+2. **Progress Tracking**
+   - Overall completion
+   - Sprint velocity
+   - Burndown indication
+   - Time tracking
+
+3. **Formatting Options**
+   - GitHub-flavored markdown
+   - Task checkboxes
+   - Collapsible sections
+   - Table format available
+
+## Example Output
+
+```markdown
+## 🚀 Current Sprint
+
+### In Progress
+- [ ] 🔄 #5 **Implement user authentication** (60% complete)
+  - Dependencies: API design (#3 ✅)
+  - Subtasks: 4 (2 completed)
+  - Est: 8h / Spent: 5h
+
+### Pending (High Priority)
+- [ ] ⚡ #8 **Create dashboard UI**
+  - Blocked by: #5
+  - Complexity: High
+  - Est: 12h
+```
+
+## Customization
+
+Based on arguments:
+- Include/exclude sections
+- Detail level control
+- Custom grouping
+- Filter by criteria
+
+## Post-Sync
+
+After generation:
+1. Show diff preview
+2. Backup existing README
+3. Write new content
+4. Commit reminder
+5. Update timestamp
+
+## Integration
+
+Works well with:
+- Git workflows
+- CI/CD pipelines
+- Project documentation
+- Team updates
+- Client reports

.claude/commands/tm/tm-main.md

@@ -0,0 +1,146 @@
+# Task Master Command Reference
+
+Comprehensive command structure for Task Master integration with Claude Code.
+
+## Command Organization
+
+Commands are organized hierarchically to match Task Master's CLI structure while providing enhanced Claude Code integration.
+
+## Project Setup & Configuration
+
+### `/project:tm/init`
+- `init-project` - Initialize new project (handles PRD files intelligently)
+- `init-project-quick` - Quick setup with auto-confirmation (-y flag)
+
+### `/project:tm/models`
+- `view-models` - View current AI model configuration
+- `setup-models` - Interactive model configuration
+- `set-main` - Set primary generation model
+- `set-research` - Set research model
+- `set-fallback` - Set fallback model
+
+## Task Generation
+
+### `/project:tm/parse-prd`
+- `parse-prd` - Generate tasks from PRD document
+- `parse-prd-with-research` - Enhanced parsing with research mode
+
+### `/project:tm/generate`
+- `generate-tasks` - Create individual task files from tasks.json
+
+## Task Management
+
+### `/project:tm/list`
+- `list-tasks` - Smart listing with natural language filters
+- `list-tasks-with-subtasks` - Include subtasks in hierarchical view
+- `list-tasks-by-status` - Filter by specific status
+
+### `/project:tm/set-status`
+- `to-pending` - Reset task to pending
+- `to-in-progress` - Start working on task
+- `to-done` - Mark task complete
+- `to-review` - Submit for review
+- `to-deferred` - Defer task
+- `to-cancelled` - Cancel task
+
+### `/project:tm/sync-readme`
+- `sync-readme` - Export tasks to README.md with formatting
+
+### `/project:tm/update`
+- `update-task` - Update tasks with natural language
+- `update-tasks-from-id` - Update multiple tasks from a starting point
+- `update-single-task` - Update specific task
+
+### `/project:tm/add-task`
+- `add-task` - Add new task with AI assistance
+
+### `/project:tm/remove-task`
+- `remove-task` - Remove task with confirmation
+
+## Subtask Management
+
+### `/project:tm/add-subtask`
+- `add-subtask` - Add new subtask to parent
+- `convert-task-to-subtask` - Convert existing task to subtask
+
+### `/project:tm/remove-subtask`
+- `remove-subtask` - Remove subtask (with optional conversion)
+
+### `/project:tm/clear-subtasks`
+- `clear-subtasks` - Clear subtasks from specific task
+- `clear-all-subtasks` - Clear all subtasks globally
+
+## Task Analysis & Breakdown
+
+### `/project:tm/analyze-complexity`
+- `analyze-complexity` - Analyze and generate expansion recommendations
+
+### `/project:tm/complexity-report`
+- `complexity-report` - Display complexity analysis report
+
+### `/project:tm/expand`
+- `expand-task` - Break down specific task
+- `expand-all-tasks` - Expand all eligible tasks
+- `with-research` - Enhanced expansion
+
+## Task Navigation
+
+### `/project:tm/next`
+- `next-task` - Intelligent next task recommendation
+
+### `/project:tm/show`
+- `show-task` - Display detailed task information
+
+### `/project:tm/status`
+- `project-status` - Comprehensive project dashboard
+
+## Dependency Management
+
+### `/project:tm/add-dependency`
+- `add-dependency` - Add task dependency
+
+### `/project:tm/remove-dependency`
+- `remove-dependency` - Remove task dependency
+
+### `/project:tm/validate-dependencies`
+- `validate-dependencies` - Check for dependency issues
+
+### `/project:tm/fix-dependencies`
+- `fix-dependencies` - Automatically fix dependency problems
+
+## Workflows & Automation
+
+### `/project:tm/workflows`
+- `smart-workflow` - Context-aware intelligent workflow execution
+- `command-pipeline` - Chain multiple commands together
+- `auto-implement-tasks` - Advanced auto-implementation with code generation
+
+## Utilities
+
+### `/project:tm/utils`
+- `analyze-project` - Deep project analysis and insights
+
+### `/project:tm/setup`
+- `install-taskmaster` - Comprehensive installation guide
+- `quick-install-taskmaster` - One-line global installation
+
+## Usage Patterns
+
+### Natural Language
+Most commands accept natural language arguments:
+```
+/project:tm/add-task create user authentication system
+/project:tm/update mark all API tasks as high priority
+/project:tm/list show blocked tasks
+```
+
+### ID-Based Commands
+Commands requiring IDs intelligently parse from $ARGUMENTS:
+```
+/project:tm/show 45
+/project:tm/expand 23
+/project:tm/set-status/to-done 67
+```
+
+### Smart Defaults
+Commands provide intelligent defaults and suggestions based on context.

.claude/commands/tm/update/update-single-task.md

@@ -0,0 +1,119 @@
+Update a single specific task with new information.
+
+Arguments: $ARGUMENTS
+
+Parse task ID and update details.
+
+## Single Task Update
+
+Precisely update one task with AI assistance to maintain consistency.
+
+## Argument Parsing
+
+Natural language updates:
+- "5: add caching requirement"
+- "update 5 to include error handling"
+- "task 5 needs rate limiting"
+- "5 change priority to high"
+
+## Execution
+
+```bash
+task-master update-task --id=<id> --prompt="<context>"
+```
+
+## Update Types
+
+### 1. **Content Updates**
+- Enhance description
+- Add requirements
+- Clarify details
+- Update acceptance criteria
+
+### 2. **Metadata Updates**
+- Change priority
+- Adjust time estimates
+- Update complexity
+- Modify dependencies
+
+### 3. **Strategic Updates**
+- Revise approach
+- Change test strategy
+- Update implementation notes
+- Adjust subtask needs
+
+## AI-Powered Updates
+
+The AI:
+1. **Understands Context**
+   - Reads current task state
+   - Identifies update intent
+   - Maintains consistency
+   - Preserves important info
+
+2. **Applies Changes**
+   - Updates relevant fields
+   - Keeps style consistent
+   - Adds without removing
+   - Enhances clarity
+
+3. **Validates Results**
+   - Checks coherence
+   - Verifies completeness
+   - Maintains relationships
+   - Suggests related updates
+
+## Example Updates
+
+```
+/project:tm/update/single 5: add rate limiting
+→ Updating Task #5: "Implement API endpoints"
+
+Current: Basic CRUD endpoints
+Adding: Rate limiting requirements
+
+Updated sections:
+✓ Description: Added rate limiting mention
+✓ Details: Added specific limits (100/min)
+✓ Test Strategy: Added rate limit tests
+✓ Complexity: Increased from 5 to 6
+✓ Time Estimate: Increased by 2 hours
+
+Suggestion: Also update task #6 (API Gateway) for consistency?
+```
+
+## Smart Features
+
+1. **Incremental Updates**
+   - Adds without overwriting
+   - Preserves work history
+   - Tracks what changed
+   - Shows diff view
+
+2. **Consistency Checks**
+   - Related task alignment
+   - Subtask compatibility
+   - Dependency validity
+   - Timeline impact
+
+3. **Update History**
+   - Timestamp changes
+   - Track who/what updated
+   - Reason for update
+   - Previous versions
+
+## Field-Specific Updates
+
+Quick syntax for specific fields:
+- "5 priority:high" → Update priority only
+- "5 add-time:4h" → Add to time estimate
+- "5 status:review" → Change status
+- "5 depends:3,4" → Add dependencies
+
+## Post-Update
+
+- Show updated task
+- Highlight changes
+- Check related tasks
+- Update suggestions
+- Timeline adjustments

.claude/commands/tm/update/update-task.md

@@ -0,0 +1,72 @@
+Update tasks with intelligent field detection and bulk operations.
+
+Arguments: $ARGUMENTS
+
+## Intelligent Task Updates
+
+Parse arguments to determine update intent and execute smartly.
+
+### 1. **Natural Language Processing**
+
+Understand update requests like:
+- "mark 23 as done" → Update status to done
+- "increase priority of 45" → Set priority to high
+- "add dependency on 12 to task 34" → Add dependency
+- "tasks 20-25 need review" → Bulk status update
+- "all API tasks high priority" → Pattern-based update
+
+### 2. **Smart Field Detection**
+
+Automatically detect what to update:
+- Status keywords: done, complete, start, pause, review
+- Priority changes: urgent, high, low, deprioritize
+- Dependency updates: depends on, blocks, after
+- Assignment: assign to, owner, responsible
+- Time: estimate, spent, deadline
+
+### 3. **Bulk Operations**
+
+Support for multiple task updates:
+```
+Examples:
+- "complete tasks 12, 15, 18"
+- "all pending auth tasks to in-progress"
+- "increase priority for tasks blocking 45"
+- "defer all documentation tasks"
+```
+
+### 4. **Contextual Validation**
+
+Before updating, check:
+- Status transitions are valid
+- Dependencies don't create cycles
+- Priority changes make sense
+- Bulk updates won't break project flow
+
+Show preview:
+```
+Update Preview:
+─────────────────
+Tasks to update: #23, #24, #25
+Change: status → in-progress
+Impact: Will unblock tasks #30, #31
+Warning: Task #24 has unmet dependencies
+```
+
+### 5. **Smart Suggestions**
+
+Based on update:
+- Completing task? → Show newly unblocked tasks
+- Changing priority? → Show impact on sprint
+- Adding dependency? → Check for conflicts
+- Bulk update? → Show summary of changes
+
+### 6. **Workflow Integration**
+
+After updates:
+- Auto-update dependent task states
+- Trigger status recalculation
+- Update sprint/milestone progress
+- Log changes with context
+
+Result: Flexible, intelligent task updates with safety checks.

.claude/commands/tm/update/update-tasks-from-id.md

@@ -0,0 +1,108 @@
+Update multiple tasks starting from a specific ID.
+
+Arguments: $ARGUMENTS
+
+Parse starting task ID and update context.
+
+## Bulk Task Updates
+
+Update multiple related tasks based on new requirements or context changes.
+
+## Argument Parsing
+
+- "from 5: add security requirements"
+- "5 onwards: update API endpoints"
+- "starting at 5: change to use new framework"
+
+## Execution
+
+```bash
+task-master update --from=<id> --prompt="<context>"
+```
+
+## Update Process
+
+### 1. **Task Selection**
+Starting from specified ID:
+- Include the task itself
+- Include all dependent tasks
+- Include related subtasks
+- Smart boundary detection
+
+### 2. **Context Application**
+AI analyzes the update context and:
+- Identifies what needs changing
+- Maintains consistency
+- Preserves completed work
+- Updates related information
+
+### 3. **Intelligent Updates**
+- Modify descriptions appropriately
+- Update test strategies
+- Adjust time estimates
+- Revise dependencies if needed
+
+## Smart Features
+
+1. **Scope Detection**
+   - Find natural task groupings
+   - Identify related features
+   - Stop at logical boundaries
+   - Avoid over-updating
+
+2. **Consistency Maintenance**
+   - Keep naming conventions
+   - Preserve relationships
+   - Update cross-references
+   - Maintain task flow
+
+3. **Change Preview**
+   ```
+   Bulk Update Preview
+   ━━━━━━━━━━━━━━━━━━
+   Starting from: Task #5
+   Tasks to update: 8 tasks + 12 subtasks
+   
+   Context: "add security requirements"
+   
+   Changes will include:
+   - Add security sections to descriptions
+   - Update test strategies for security
+   - Add security-related subtasks where needed
+   - Adjust time estimates (+20% average)
+   
+   Continue? (y/n)
+   ```
+
+## Example Updates
+
+```
+/project:tm/update/from-id 5: change database to PostgreSQL
+→ Analyzing impact starting from task #5
+→ Found 6 related tasks to update
+→ Updates will maintain consistency
+→ Preview changes? (y/n)
+
+Applied updates:
+✓ Task #5: Updated connection logic references
+✓ Task #6: Changed migration approach
+✓ Task #7: Updated query syntax notes
+✓ Task #8: Revised testing strategy
+✓ Task #9: Updated deployment steps
+✓ Task #12: Changed backup procedures
+```
+
+## Safety Features
+
+- Preview all changes
+- Selective confirmation
+- Rollback capability
+- Change logging
+- Validation checks
+
+## Post-Update
+
+- Summary of changes
+- Consistency verification
+- Suggest review tasks
+- Update timeline if needed

.claude/commands/tm/utils/analyze-project.md

@@ -0,0 +1,97 @@
+Advanced project analysis with actionable insights and recommendations.
+
+Arguments: $ARGUMENTS
+
+## Comprehensive Project Analysis
+
+Multi-dimensional analysis based on requested focus area.
+
+### 1. **Analysis Modes**
+
+Based on $ARGUMENTS:
+- "velocity" → Sprint velocity and trends
+- "quality" → Code quality metrics
+- "risk" → Risk assessment and mitigation
+- "dependencies" → Dependency graph analysis
+- "team" → Workload and skill distribution
+- "architecture" → System design coherence
+- Default → Full spectrum analysis
+
+### 2. **Velocity Analytics**
+
+```
+📊 Velocity Analysis
+━━━━━━━━━━━━━━━━━━━
+Current Sprint: 24 points/week ↗️ +20%
+Rolling Average: 20 points/week
+Efficiency: 85% (17/20 tasks on time)
+
+Bottlenecks Detected:
+- Code review delays (avg 4h wait)
+- Test environment availability
+- Dependency on external team
+
+Recommendations:
+1. Implement parallel review process
+2. Add staging environment
+3. Mock external dependencies
+```
+
+### 3. **Risk Assessment**
+
+**Technical Risks**
+- High complexity tasks without backup assignee
+- Single points of failure in architecture
+- Insufficient test coverage in critical paths
+- Technical debt accumulation rate
+
+**Project Risks**
+- Critical path dependencies
+- Resource availability gaps
+- Deadline feasibility analysis
+- Scope creep indicators
+
+### 4. **Dependency Intelligence**
+
+Visual dependency analysis:
+```
+Critical Path: 
+#12 → #15 → #23 → #45 → #50 (20 days)
+         ↘ #24 → #46 ↗
+
+Optimization: Parallelize #15 and #24
+Time Saved: 3 days
+```
+
+### 5. **Quality Metrics**
+
+**Code Quality**
+- Test coverage trends
+- Complexity scores
+- Technical debt ratio
+- Review feedback patterns
+
+**Process Quality**
+- Rework frequency
+- Bug introduction rate
+- Time to resolution
+- Knowledge distribution
+
+### 6. **Predictive Insights**
+
+Based on patterns:
+- Completion probability by deadline
+- Resource needs projection
+- Risk materialization likelihood
+- Suggested interventions
+
+### 7. **Executive Dashboard**
+
+High-level summary with:
+- Health score (0-100)
+- Top 3 risks
+- Top 3 opportunities
+- Recommended actions
+- Success probability
+
+Result: Data-driven decisions with clear action paths.

.claude/commands/tm/validate-dependencies/validate-dependencies.md

@@ -0,0 +1,71 @@
+Validate all task dependencies for issues.
+
+## Dependency Validation
+
+Comprehensive check for dependency problems across the entire project.
+
+## Execution
+
+```bash
+task-master validate-dependencies
+```
+
+## Validation Checks
+
+1. **Circular Dependencies**
+   - A depends on B, B depends on A
+   - Complex circular chains
+   - Self-dependencies
+
+2. **Missing Dependencies**
+   - References to non-existent tasks
+   - Deleted task references
+   - Invalid task IDs
+
+3. **Logical Issues**
+   - Completed tasks depending on pending
+   - Cancelled tasks in dependency chains
+   - Impossible sequences
+
+4. **Complexity Warnings**
+   - Over-complex dependency chains
+   - Too many dependencies per task
+   - Bottleneck tasks
+
+## Smart Analysis
+
+The validation provides:
+- Visual dependency graph
+- Critical path analysis
+- Bottleneck identification
+- Suggested optimizations
+
+## Report Format
+
+```
+Dependency Validation Report
+━━━━━━━━━━━━━━━━━━━━━━━━━━
+✅ No circular dependencies found
+⚠️  2 warnings found:
+   - Task #23 has 7 dependencies (consider breaking down)
+   - Task #45 blocks 5 other tasks (potential bottleneck)
+❌ 1 error found:
+   - Task #67 depends on deleted task #66
+
+Critical Path: #1 → #5 → #23 → #45 → #50 (15 days)
+```
+
+## Actionable Output
+
+For each issue found:
+- Clear description
+- Impact assessment
+- Suggested fix
+- Command to resolve
+
+## Next Steps
+
+After validation:
+- Run `/project:tm/fix-dependencies` to auto-fix
+- Manually adjust problematic dependencies
+- Rerun to verify fixes

.claude/commands/tm/workflows/auto-implement-tasks.md

@@ -0,0 +1,97 @@
+Enhanced auto-implementation with intelligent code generation and testing.
+
+Arguments: $ARGUMENTS
+
+## Intelligent Auto-Implementation
+
+Advanced implementation with context awareness and quality checks.
+
+### 1. **Pre-Implementation Analysis**
+
+Before starting:
+- Analyze task complexity and requirements
+- Check codebase patterns and conventions
+- Identify similar completed tasks
+- Assess test coverage needs
+- Detect potential risks
+
+### 2. **Smart Implementation Strategy**
+
+Based on task type and context:
+
+**Feature Tasks**
+1. Research existing patterns
+2. Design component architecture
+3. Implement with tests
+4. Integrate with system
+5. Update documentation
+
+**Bug Fix Tasks**
+1. Reproduce issue
+2. Identify root cause
+3. Implement minimal fix
+4. Add regression tests
+5. Verify side effects
+
+**Refactoring Tasks**
+1. Analyze current structure
+2. Plan incremental changes
+3. Maintain test coverage
+4. Refactor step-by-step
+5. Verify behavior unchanged
+
+### 3. **Code Intelligence**
+
+**Pattern Recognition**
+- Learn from existing code
+- Follow team conventions
+- Use preferred libraries
+- Match style guidelines
+
+**Test-Driven Approach**
+- Write tests first when possible
+- Ensure comprehensive coverage
+- Include edge cases
+- Performance considerations
+
+### 4. **Progressive Implementation**
+
+Step-by-step with validation:
+```
+Step 1/5: Setting up component structure ✓
+Step 2/5: Implementing core logic ✓
+Step 3/5: Adding error handling ⚡ (in progress)
+Step 4/5: Writing tests ⏳
+Step 5/5: Integration testing ⏳
+
+Current: Adding try-catch blocks and validation...
+```
+
+### 5. **Quality Assurance**
+
+Automated checks:
+- Linting and formatting
+- Test execution
+- Type checking
+- Dependency validation
+- Performance analysis
+
+### 6. **Smart Recovery**
+
+If issues arise:
+- Diagnostic analysis
+- Suggestion generation
+- Fallback strategies
+- Manual intervention points
+- Learning from failures
+
+### 7. **Post-Implementation**
+
+After completion:
+- Generate PR description
+- Update documentation
+- Log lessons learned
+- Suggest follow-up tasks
+- Update task relationships
+
+Result: High-quality, production-ready implementations.

.claude/commands/tm/workflows/command-pipeline.md

@@ -0,0 +1,77 @@
+Execute a pipeline of commands based on a specification.
+
+Arguments: $ARGUMENTS
+
+## Command Pipeline Execution
+
+Parse pipeline specification from arguments. Supported formats:
+
+### Simple Pipeline
+`init → expand-all → sprint-plan`
+
+### Conditional Pipeline  
+`status → if:pending>10 → sprint-plan → else → next`
+
+### Iterative Pipeline
+`for:pending-tasks → expand → complexity-check`
+
+### Smart Pipeline Patterns
+
+**1. Project Setup Pipeline**
+```
+init [prd] → 
+expand-all → 
+complexity-report → 
+sprint-plan → 
+show first-sprint
+```
+
+**2. Daily Work Pipeline**
+```
+standup →
+if:in-progress → continue →
+else → next → start
+```
+
+**3. Task Completion Pipeline**
+```
+complete [id] →
+git-commit →
+if:blocked-tasks-freed → show-freed →
+next
+```
+
+**4. Quality Check Pipeline**
+```
+list in-progress →
+for:each → check-idle-time →
+if:idle>1day → prompt-update
+```
+
+### Pipeline Features
+
+**Variables**
+- Store results: `status → $count=pending-count`
+- Use in conditions: `if:$count>10`
+- Pass between commands: `expand $high-priority-tasks`
+
+**Error Handling**
+- On failure: `try:complete → catch:show-blockers`
+- Skip on error: `optional:test-run`
+- Retry logic: `retry:3:commit`
+
+**Parallel Execution**
+- Parallel branches: `[analyze | test | lint]`
+- Join results: `parallel → join:report`
+
+### Execution Flow
+
+1. Parse pipeline specification
+2. Validate command sequence
+3. Execute with state passing
+4. Handle conditions and loops
+5. Aggregate results
+6. Show summary
+
+This enables complex workflows like:
+`parse-prd → expand-all → filter:complex>70 → assign:senior → sprint-plan:weighted`

.claude/commands/tm/workflows/smart-workflow.md

@@ -0,0 +1,55 @@
+Execute an intelligent workflow based on current project state and recent commands.
+
+This command analyzes:
+1. Recent commands you've run
+2. Current project state
+3. Time of day / day of week
+4. Your working patterns
+
+Arguments: $ARGUMENTS
+
+## Intelligent Workflow Selection
+
+Based on context, I'll determine the best workflow:
+
+### Context Analysis
+- Previous command executed
+- Current task states
+- Unfinished work from last session
+- Your typical patterns
+
+### Smart Execution
+
+If last command was:
+- `status` → Likely starting work → Run daily standup
+- `complete` → Task finished → Find next task
+- `list pending` → Planning → Suggest sprint planning
+- `expand` → Breaking down work → Show complexity analysis
+- `init` → New project → Show onboarding workflow
+
+If no recent commands:
+- Morning? → Daily standup workflow
+- Many pending tasks? → Sprint planning
+- Tasks blocked? → Dependency resolution
+- Friday? → Weekly review
+
+### Workflow Composition
+
+I'll chain appropriate commands:
+1. Analyze current state
+2. Execute primary workflow
+3. Suggest follow-up actions
+4. Prepare environment for coding
+
+### Learning Mode
+
+This command learns from your patterns:
+- Track command sequences
+- Note time preferences
+- Remember common workflows
+- Adapt to your style
+
+Example flows detected:
+- Morning: standup → next → start
+- After lunch: status → continue task
+- End of day: complete → commit → status

.coderabbit.yaml

@@ -0,0 +1,10 @@
+reviews:
+  profile: assertive
+  poem: false
+  auto_review:
+    base_branches:
+      - rc
+      - beta
+      - alpha
+      - production
+      - next

.cursor/mcp.json

@@ -1,17 +1,20 @@
 {
 	"mcpServers": {
-		"taskmaster-ai": {
+		"task-master-ai": {
 			"command": "node",
 			"args": ["./mcp-server/server.js"],
 			"env": {
-				"ANTHROPIC_API_KEY": "YOUR_ANTHROPIC_API_KEY_HERE",
-				"PERPLEXITY_API_KEY": "YOUR_PERPLEXITY_API_KEY_HERE",
-				"MODEL": "claude-3-7-sonnet-20250219",
-				"PERPLEXITY_MODEL": "sonar-pro",
-				"MAX_TOKENS": 128000,
-				"TEMPERATURE": 0.2,
-				"DEFAULT_SUBTASKS": 5,
-				"DEFAULT_PRIORITY": "medium"
+				"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",
+				"GROQ_API_KEY": "GROQ_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",
+				"GITHUB_API_KEY": "GITHUB_API_KEY_HERE"
 			}
 		}
 	}

.cursor/rules/ai_providers.mdc

@@ -0,0 +1,155 @@
+---
+description: Guidelines for managing Task Master AI providers and models.
+globs: 
+alwaysApply: false
+---
+# Task Master AI Provider Management
+
+This rule guides AI assistants on how to view, configure, and interact with the different AI providers and models supported by Task Master. For internal implementation details of the service layer, see [`ai_services.mdc`](mdc:.cursor/rules/ai_services.mdc).
+
+-   **Primary Interaction:**
+    -   Use the `models` MCP tool or the `task-master models` CLI command to manage AI configurations. See [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc) for detailed command/tool usage.
+
+-   **Configuration Roles:**
+    -   Task Master uses three roles for AI models:
+        -   `main`: Primary model for general tasks (generation, updates).
+        -   `research`: Model used when the `--research` flag or `research: true` parameter is used (typically models with web access or specialized knowledge).
+        -   `fallback`: Model used if the primary (`main`) model fails.
+    -   Each role is configured with a specific `provider:modelId` pair (e.g., `openai:gpt-4o`).
+
+-   **Viewing Configuration & Available Models:**
+    -   To see the current model assignments for each role and list all models available for assignment:
+        -   **MCP Tool:** `models` (call with no arguments or `listAvailableModels: true`)
+        -   **CLI Command:** `task-master models`
+    -   The output will show currently assigned models and a list of others, prefixed with their provider (e.g., `google:gemini-2.5-pro-exp-03-25`).
+
+-   **Setting Models for Roles:**
+    -   To assign a model to a role:
+        -   **MCP Tool:** `models` with `setMain`, `setResearch`, or `setFallback` parameters.
+        -   **CLI Command:** `task-master models` with `--set-main`, `--set-research`, or `--set-fallback` flags.
+    -   **Crucially:** When providing the model ID to *set*, **DO NOT include the `provider:` prefix**. Use only the model ID itself.
+        -   ✅ **DO:** `models(setMain='gpt-4o')` or `task-master models --set-main=gpt-4o`
+        -   ❌ **DON'T:** `models(setMain='openai:gpt-4o')` or `task-master models --set-main=openai:gpt-4o`
+    -   The tool/command will automatically determine the provider based on the model ID.
+
+-   **Setting Custom Models (Ollama/OpenRouter):**
+    -   To set a model ID not in the internal list for Ollama or OpenRouter:
+        -   **MCP Tool:** Use `models` with `set<Role>` and **also** `ollama: true` or `openrouter: true`.
+            -   Example: `models(setMain='my-custom-ollama-model', ollama=true)`
+            -   Example: `models(setMain='some-openrouter-model', openrouter=true)`
+        -   **CLI Command:** Use `task-master models` with `--set-<role>` and **also** `--ollama` or `--openrouter`.
+            -   Example: `task-master models --set-main=my-custom-ollama-model --ollama`
+            -   Example: `task-master models --set-main=some-openrouter-model --openrouter`
+        -   **Interactive Setup:** Use `task-master models --setup` and select the `Ollama (Enter Custom ID)` or `OpenRouter (Enter Custom ID)` options.
+    -   **OpenRouter Validation:** When setting a custom OpenRouter model, Taskmaster attempts to validate the ID against the live OpenRouter API.
+    -   **Ollama:** No live validation occurs for custom Ollama models; ensure the model is available on your Ollama server.
+
+-   **Supported Providers & Required API Keys:**
+    -   Task Master integrates with various providers via the Vercel AI SDK.
+    -   **API keys are essential** for most providers and must be configured correctly.
+    -   **Key Locations** (See [`dev_workflow.mdc`](mdc:.cursor/rules/dev_workflow.mdc) - Configuration Management):
+        -   **MCP/Cursor:** Set keys in the `env` section of `.cursor/mcp.json`.
+        -   **CLI:** Set keys in a `.env` file in the project root.
+    -   **Provider List & Keys:**
+        -   **`anthropic`**: Requires `ANTHROPIC_API_KEY`.
+        -   **`google`**: Requires `GOOGLE_API_KEY`.
+        -   **`openai`**: Requires `OPENAI_API_KEY`.
+        -   **`perplexity`**: Requires `PERPLEXITY_API_KEY`.
+        -   **`xai`**: Requires `XAI_API_KEY`.
+        -   **`mistral`**: Requires `MISTRAL_API_KEY`.
+        -   **`azure`**: Requires `AZURE_OPENAI_API_KEY` and `AZURE_OPENAI_ENDPOINT`.
+        -   **`openrouter`**: Requires `OPENROUTER_API_KEY`.
+        -   **`ollama`**: Might require `OLLAMA_API_KEY` (not currently supported) *and* `OLLAMA_BASE_URL` (default: `http://localhost:11434/api`). *Check specific setup.*
+
+-   **Troubleshooting:**
+    -   If AI commands fail (especially in MCP context):
+        1.  **Verify API Key:** Ensure the correct API key for the *selected provider* (check `models` output) exists in the appropriate location (`.cursor/mcp.json` env or `.env`).
+        2.  **Check Model ID:** Ensure the model ID set for the role is valid (use `models` listAvailableModels/`task-master models`).
+        3.  **Provider Status:** Check the status of the external AI provider's service.
+        4.  **Restart MCP:** If changes were made to configuration or provider code, restart the MCP server.
+
+## Adding a New AI Provider (Vercel AI SDK Method)
+
+Follow these steps to integrate a new AI provider that has an official Vercel AI SDK adapter (`@ai-sdk/<provider>`):
+
+1.  **Install Dependency:**
+    -   Install the provider-specific package:
+        ```bash
+        npm install @ai-sdk/<provider-name>
+        ```
+
+2.  **Create Provider Module:**
+    -   Create a new file in `src/ai-providers/` named `<provider-name>.js`.
+    -   Use existing modules (`openai.js`, `anthropic.js`, etc.) as a template.
+    -   **Import:**
+        -   Import the provider's `create<ProviderName>` function from `@ai-sdk/<provider-name>`.
+        -   Import `generateText`, `streamText`, `generateObject` from the core `ai` package.
+        -   Import the `log` utility from `../../scripts/modules/utils.js`.
+    -   **Implement Core Functions:**
+        -   `generate<ProviderName>Text(params)`:
+            -   Accepts `params` (apiKey, modelId, messages, etc.).
+            -   Instantiate the client: `const client = create<ProviderName>({ apiKey });`
+            -   Call `generateText({ model: client(modelId), ... })`.
+            -   Return `result.text`.
+            -   Include basic validation and try/catch error handling.
+        -   `stream<ProviderName>Text(params)`:
+            -   Similar structure to `generateText`.
+            -   Call `streamText({ model: client(modelId), ... })`.
+            -   Return the full stream result object.
+            -   Include basic validation and try/catch.
+        -   `generate<ProviderName>Object(params)`:
+            -   Similar structure.
+            -   Call `generateObject({ model: client(modelId), schema, messages, ... })`.
+            -   Return `result.object`.
+            -   Include basic validation and try/catch.
+    -   **Export Functions:** Export the three implemented functions (`generate<ProviderName>Text`, `stream<ProviderName>Text`, `generate<ProviderName>Object`).
+
+3.  **Integrate with Unified Service:**
+    -   Open `scripts/modules/ai-services-unified.js`.
+    -   **Import:** Add `import * as <providerName> from '../../src/ai-providers/<provider-name>.js';`
+    -   **Map:** Add an entry to the `PROVIDER_FUNCTIONS` map:
+        ```javascript
+        '<provider-name>': {
+            generateText: <providerName>.generate<ProviderName>Text,
+            streamText: <providerName>.stream<ProviderName>Text,
+            generateObject: <providerName>.generate<ProviderName>Object
+        },
+        ```
+
+4.  **Update Configuration Management:**
+    -   Open `scripts/modules/config-manager.js`.
+    -   **`MODEL_MAP`:** Add the new `<provider-name>` key to the `MODEL_MAP` loaded from `supported-models.json` (or ensure the loading handles new providers dynamically if `supported-models.json` is updated first).
+    -   **`VALID_PROVIDERS`:** Ensure the new `<provider-name>` is included in the `VALID_PROVIDERS` array (this should happen automatically if derived from `MODEL_MAP` keys).
+    -   **API Key Handling:**
+        -   Update the `keyMap` in `_resolveApiKey` and `isApiKeySet` with the correct environment variable name (e.g., `PROVIDER_API_KEY`).
+        -   Update the `switch` statement in `getMcpApiKeyStatus` to check the corresponding key in `mcp.json` and its placeholder value.
+        -   Add a case to the `switch` statement in `getMcpApiKeyStatus` for the new provider, including its placeholder string if applicable.
+    -   **Ollama Exception:** If adding Ollama or another provider *not* requiring an API key, add a specific check at the beginning of `isApiKeySet` and `getMcpApiKeyStatus` to return `true` immediately for that provider.
+
+5.  **Update Supported Models List:**
+    -   Edit `scripts/modules/supported-models.json`.
+    -   Add a new key for the `<provider-name>`.
+    -   Add an array of model objects under the provider key, each including:
+        -   `id`: The specific model identifier (e.g., `claude-3-opus-20240229`).
+        -   `name`: A user-friendly name (optional).
+        -   `swe_score`, `cost_per_1m_tokens`: (Optional) Add performance/cost data if available.
+        -   `allowed_roles`: An array of roles (`"main"`, `"research"`, `"fallback"`) the model is suitable for.
+        -   `max_tokens`: (Optional but recommended) The maximum token limit for the model.
+
+6.  **Update Environment Examples:**
+    -   Add the new `PROVIDER_API_KEY` to `.env.example`.
+    -   Add the new `PROVIDER_API_KEY` with its placeholder (`YOUR_PROVIDER_API_KEY_HERE`) to the `env` section for `taskmaster-ai` in `.cursor/mcp.json.example` (if it exists) or update instructions.
+
+7.  **Add Unit Tests:**
+    -   Create `tests/unit/ai-providers/<provider-name>.test.js`.
+    -   Mock the `@ai-sdk/<provider-name>` module and the core `ai` module functions (`generateText`, `streamText`, `generateObject`).
+    -   Write tests for each exported function (`generate<ProviderName>Text`, etc.) to verify:
+        -   Correct client instantiation.
+        -   Correct parameters passed to the mocked Vercel AI SDK functions.
+        -   Correct handling of results.
+        -   Error handling (missing API key, SDK errors).
+
+8.  **Documentation:**
+    -   Update any relevant documentation (like `README.md` or other rules) mentioning supported providers or configuration.
+
+*(Note: For providers **without** an official Vercel AI SDK adapter, the process would involve directly using the provider's own SDK or API within the `src/ai-providers/<provider-name>.js` module and manually constructing responses compatible with the unified service layer, which is significantly more complex.)*

.cursor/rules/ai_services.mdc

@@ -0,0 +1,102 @@
+---
+description: Guidelines for interacting with the unified AI service layer.
+globs: scripts/modules/ai-services-unified.js, scripts/modules/task-manager/*.js, scripts/modules/commands.js
+---
+
+# AI Services Layer Guidelines
+
+This document outlines the architecture and usage patterns for interacting with Large Language Models (LLMs) via Task Master's unified AI service layer (`ai-services-unified.js`). The goal is to centralize configuration, provider selection, API key management, fallback logic, and error handling.
+
+**Core Components:**
+
+*   **Configuration (`.taskmasterconfig` & [`config-manager.js`](mdc:scripts/modules/config-manager.js)):**
+    *   Defines the AI provider and model ID for different **roles** (`main`, `research`, `fallback`).
+    *   Stores parameters like `maxTokens` and `temperature` per role.
+    *   Managed via the `task-master models --setup` CLI command.
+    *   [`config-manager.js`](mdc:scripts/modules/config-manager.js) provides **getters** (e.g., `getMainProvider()`, `getParametersForRole()`) to access these settings. Core logic should **only** use these getters for *non-AI related application logic* (e.g., `getDefaultSubtasks`). The unified service fetches necessary AI parameters internally based on the `role`.
+    *   **API keys** are **NOT** stored here; they are resolved via `resolveEnvVariable` (in [`utils.js`](mdc:scripts/modules/utils.js)) from `.env` (for CLI) or the MCP `session.env` object (for MCP calls). See [`utilities.mdc`](mdc:.cursor/rules/utilities.mdc) and [`dev_workflow.mdc`](mdc:.cursor/rules/dev_workflow.mdc).
+
+*   **Unified Service (`ai-services-unified.js`):**
+    *   Exports primary interaction functions: `generateTextService`, `generateObjectService`. (Note: `streamTextService` exists but has known reliability issues with some providers/payloads).
+    *   Contains the core `_unifiedServiceRunner` logic.
+    *   Internally uses `config-manager.js` getters to determine the provider/model/parameters based on the requested `role`.
+    *   Implements the **fallback sequence** (e.g., main -> fallback -> research) if the primary provider/model fails.
+    *   Constructs the `messages` array required by the Vercel AI SDK.
+    *   Implements **retry logic** for specific API errors (`_attemptProviderCallWithRetries`).
+    *   Resolves API keys automatically via `_resolveApiKey` (using `resolveEnvVariable`).
+    *   Maps requests to the correct provider implementation (in `src/ai-providers/`) via `PROVIDER_FUNCTIONS`.
+    *   Returns a structured object containing the primary AI result (`mainResult`) and telemetry data (`telemetryData`). See [`telemetry.mdc`](mdc:.cursor/rules/telemetry.mdc) for details on how this telemetry data is propagated and handled.
+
+*   **Provider Implementations (`src/ai-providers/*.js`):**
+    *   Contain provider-specific wrappers around Vercel AI SDK functions (`generateText`, `generateObject`).
+
+**Usage Pattern (from Core Logic like `task-manager/*.js`):**
+
+1.  **Import Service:** Import `generateTextService` or `generateObjectService` from `../ai-services-unified.js`.
+    ```javascript
+    // Preferred for most tasks (especially with complex JSON)
+    import { generateTextService } from '../ai-services-unified.js';
+
+    // Use if structured output is reliable for the specific use case
+    // import { generateObjectService } from '../ai-services-unified.js';
+    ```
+
+2.  **Prepare Parameters:** Construct the parameters object for the service call.
+    *   `role`: **Required.** `'main'`, `'research'`, or `'fallback'`. Determines the initial provider/model/parameters used by the unified service.
+    *   `session`: **Required if called from MCP context.** Pass the `session` object received by the direct function wrapper. The unified service uses `session.env` to find API keys.
+    *   `systemPrompt`: Your system instruction string.
+    *   `prompt`: The user message string (can be long, include stringified data, etc.).
+    *   (For `generateObjectService` only): `schema` (Zod schema), `objectName`.
+
+3.  **Call Service:** Use `await` to call the service function.
+    ```javascript
+    // Example using generateTextService (most common)
+    try {
+        const resultText = await generateTextService({
+            role: useResearch ? 'research' : 'main', // Determine role based on logic
+            session: context.session, // Pass session from context object
+            systemPrompt: "You are...",
+            prompt: userMessageContent
+        });
+        // Process the raw text response (e.g., parse JSON, use directly)
+        // ...
+    } catch (error) {
+        // Handle errors thrown by the unified service (if all fallbacks/retries fail)
+        report('error', `Unified AI service call failed: ${error.message}`);
+        throw error;
+    }
+
+    // Example using generateObjectService (use cautiously)
+    try {
+        const resultObject = await generateObjectService({
+            role: 'main',
+            session: context.session,
+            schema: myZodSchema,
+            objectName: 'myDataObject',
+            systemPrompt: "You are...",
+            prompt: userMessageContent
+        });
+        // resultObject is already a validated JS object
+        // ...
+    } catch (error) {
+        report('error', `Unified AI service call failed: ${error.message}`);
+        throw error;
+    }
+    ```
+
+4.  **Handle Results/Errors:** Process the returned text/object or handle errors thrown by the unified service layer.
+
+**Key Implementation Rules & Gotchas:**
+
+*   ✅ **DO**: Centralize **all** LLM calls through `generateTextService` or `generateObjectService`.
+*   ✅ **DO**: Determine the appropriate `role` (`main`, `research`, `fallback`) in your core logic and pass it to the service.
+*   ✅ **DO**: Pass the `session` object (received in the `context` parameter, especially from direct function wrappers) to the service call when in MCP context.
+*   ✅ **DO**: Ensure API keys are correctly configured in `.env` (for CLI) or `.cursor/mcp.json` (for MCP).
+*   ✅ **DO**: Ensure `.taskmasterconfig` exists and has valid provider/model IDs for the roles you intend to use (manage via `task-master models --setup`).
+*   ✅ **DO**: Use `generateTextService` and implement robust manual JSON parsing (with Zod validation *after* parsing) when structured output is needed, as `generateObjectService` has shown unreliability with some providers/schemas.
+*   ❌ **DON'T**: Import or call anything from the old `ai-services.js`, `ai-client-factory.js`, or `ai-client-utils.js` files.
+*   ❌ **DON'T**: Initialize AI clients (Anthropic, Perplexity, etc.) directly within core logic (`task-manager/`) or MCP direct functions.
+*   ❌ **DON'T**: Fetch AI-specific parameters (model ID, max tokens, temp) using `config-manager.js` getters *for the AI call*. Pass the `role` instead.
+*   ❌ **DON'T**: Implement fallback or retry logic outside `ai-services-unified.js`.
+*   ❌ **DON'T**: Handle API key resolution outside the service layer (it uses `utils.js` internally).
+*   ⚠️ **generateObjectService Caution**: Be aware of potential reliability issues with `generateObjectService` across different providers and complex schemas. Prefer `generateTextService` + manual parsing as a more robust alternative for structured data needs.

.cursor/rules/architecture.mdc

@@ -3,7 +3,6 @@ description: Describes the high-level architecture of the Task Master CLI applic
 globs: scripts/modules/*.js
 alwaysApply: false
 ---
-
 # Application Architecture Overview
 
 - **Modular Structure**: The Task Master CLI is built using a modular architecture, with distinct modules responsible for different aspects of the application. This promotes separation of concerns, maintainability, and testability.
@@ -14,148 +13,106 @@ alwaysApply: false
     - **Purpose**: Defines and registers all CLI commands using Commander.js.
     - **Responsibilities** (See also: [`commands.mdc`](mdc:.cursor/rules/commands.mdc)):
       - Parses command-line arguments and options.
-      - Invokes appropriate functions from other modules to execute commands.
-      - Handles user input and output related to command execution.
-      - Implements input validation and error handling for CLI commands.
-    - **Key Components**:
-      - `programInstance` (Commander.js `Command` instance): Manages command definitions.
-      - `registerCommands(programInstance)`: Function to register all application commands.
-      - Command action handlers: Functions executed when a specific command is invoked.
+      - Invokes appropriate core logic functions from `scripts/modules/`.
+      - Handles user input/output for CLI.
+      - Implements CLI-specific validation.
 
-  - **[`task-manager.js`](mdc:scripts/modules/task-manager.js): Task Data Management**
-    - **Purpose**: Manages task data, including loading, saving, creating, updating, deleting, and querying tasks.
+  - **[`task-manager.js`](mdc:scripts/modules/task-manager.js) & `task-manager/` directory: Task Data & Core Logic**
+    - **Purpose**: Contains core functions for task data manipulation (CRUD), AI interactions, and related logic.
     - **Responsibilities**:
-      - Reads and writes task data to `tasks.json` file.
-      - Implements functions for task CRUD operations (Create, Read, Update, Delete).
-      - Handles task parsing from PRD documents using AI.
-      - Manages task expansion and subtask generation.
-      - Updates task statuses and properties.
-      - Implements task listing and display logic.
-      - Performs task complexity analysis using AI.
-    - **Key Functions**:
-      - `readTasks(tasksPath)` / `writeTasks(tasksPath, tasksData)`: Load and save task data.
-      - `parsePRD(prdFilePath, outputPath, numTasks)`: Parses PRD document to create tasks.
-      - `expandTask(taskId, numSubtasks, useResearch, prompt, force)`: Expands a task into subtasks.
-      - `setTaskStatus(tasksPath, taskIdInput, newStatus)`: Updates task status.
-      - `listTasks(tasksPath, statusFilter, withSubtasks)`: Lists tasks with filtering and subtask display options.
-      - `analyzeComplexity(tasksPath, reportPath, useResearch, thresholdScore)`: Analyzes task complexity.
+      - Reading/writing `tasks.json` with tagged task lists support.
+      - Implementing functions for task CRUD, parsing PRDs, expanding tasks, updating status, etc.
+      - **Tagged Task Lists**: Handles task organization across multiple contexts (tags) like "master", branch names, or project phases.
+      - **Tag Resolution**: Provides backward compatibility by resolving tagged format to legacy format transparently.
+      - **Delegating AI interactions** to the `ai-services-unified.js` layer.
+      - Accessing non-AI configuration via `config-manager.js` getters.
+    - **Key Files**: Individual files within `scripts/modules/task-manager/` handle specific actions (e.g., `add-task.js`, `expand-task.js`).
 
   - **[`dependency-manager.js`](mdc:scripts/modules/dependency-manager.js): Dependency Management**
-    - **Purpose**: Manages task dependencies, including adding, removing, validating, and fixing dependency relationships.
-    - **Responsibilities**:
-      - Adds and removes task dependencies.
-      - Validates dependency relationships to prevent circular dependencies and invalid references.
-      - Fixes invalid dependencies by removing non-existent or self-referential dependencies.
-      - Provides functions to check for circular dependencies.
-    - **Key Functions**:
-      - `addDependency(tasksPath, taskId, dependencyId)`: Adds a dependency between tasks.
-      - `removeDependency(tasksPath, taskId, dependencyId)`: Removes a dependency.
-      - `validateDependencies(tasksPath)`: Validates task dependencies.
-      - `fixDependencies(tasksPath)`: Fixes invalid task dependencies.
-      - `isCircularDependency(tasks, taskId, dependencyChain)`: Detects circular dependencies.
+    - **Purpose**: Manages task dependencies.
+    - **Responsibilities**: Add/remove/validate/fix dependencies across tagged task contexts.
 
   - **[`ui.js`](mdc:scripts/modules/ui.js): User Interface Components**
-    - **Purpose**: Handles all user interface elements, including displaying information, formatting output, and providing user feedback.
-    - **Responsibilities**:
-      - Displays task lists, task details, and command outputs in a formatted way.
-      - Uses `chalk` for colored output and `boxen` for boxed messages.
-      - Implements table display using `cli-table3`.
-      - Shows loading indicators using `ora`.
-      - Provides helper functions for status formatting, dependency display, and progress reporting.
-      - Suggests next actions to the user after command execution.
-    - **Key Functions**:
-      - `displayTaskList(tasks, statusFilter, withSubtasks)`: Displays a list of tasks in a table.
-      - `displayTaskDetails(task)`: Displays detailed information for a single task.
-      - `displayComplexityReport(reportPath)`: Displays the task complexity report.
-      - `startLoadingIndicator(message)` / `stopLoadingIndicator(indicator)`: Manages loading indicators.
-      - `getStatusWithColor(status)`: Returns status string with color formatting.
-      - `formatDependenciesWithStatus(dependencies, allTasks, inTable)`: Formats dependency list with status indicators.
+    - **Purpose**: Handles CLI output formatting (tables, colors, boxes, spinners).
+    - **Responsibilities**: Displaying tasks, reports, progress, suggestions, and migration notices for tagged systems.
 
-  - **[`ai-services.js`](mdc:scripts/modules/ai-services.js) (Conceptual): AI Integration**
-    - **Purpose**:  Abstracts interactions with AI models (like Anthropic Claude and Perplexity AI) for various features. *Note: This module might be implicitly implemented within `task-manager.js` and `utils.js` or could be explicitly created for better organization as the project evolves.*
-    - **Responsibilities**:
-      - Handles API calls to AI services.
-      - Manages prompts and parameters for AI requests.
-      - Parses AI responses and extracts relevant information.
-      - Implements logic for task complexity analysis, task expansion, and PRD parsing using AI.
-    - **Potential Functions**:
-      - `getAIResponse(prompt, model, maxTokens, temperature)`: Generic function to interact with AI model.
-      - `analyzeTaskComplexityWithAI(taskDescription)`: Sends task description to AI for complexity analysis.
-      - `expandTaskWithAI(taskDescription, numSubtasks, researchContext)`: Generates subtasks using AI.
-      - `parsePRDWithAI(prdContent)`: Extracts tasks from PRD content using AI.
+  - **[`ai-services-unified.js`](mdc:scripts/modules/ai-services-unified.js): Unified AI Service Layer**
+    - **Purpose**: Centralized interface for all LLM interactions using Vercel AI SDK.
+    - **Responsibilities** (See also: [`ai_services.mdc`](mdc:.cursor/rules/ai_services.mdc)):
+      - Exports `generateTextService`, `generateObjectService`.
+      - Handles provider/model selection based on `role` and `.taskmasterconfig`.
+      - Resolves API keys (from `.env` or `session.env`).
+      - Implements fallback and retry logic.
+      - Orchestrates calls to provider-specific implementations (`src/ai-providers/`).
+    - Telemetry data generated by the AI service layer is propagated upwards through core logic, direct functions, and MCP tools. See [`telemetry.mdc`](mdc:.cursor/rules/telemetry.mdc) for the detailed integration pattern.
 
-  - **[`utils.js`](mdc:scripts/modules/utils.js): Utility Functions and Configuration**
-    - **Purpose**: Provides reusable utility functions and global configuration settings used across the **CLI application**.
+  - **[`src/ai-providers/*.js`](mdc:src/ai-providers/): Provider-Specific Implementations**
+    - **Purpose**: Provider-specific wrappers for Vercel AI SDK functions.
+    - **Responsibilities**: Interact directly with Vercel AI SDK adapters.
+
+  - **[`config-manager.js`](mdc:scripts/modules/config-manager.js): Configuration Management**
+    - **Purpose**: Loads, validates, and provides access to configuration.
     - **Responsibilities** (See also: [`utilities.mdc`](mdc:.cursor/rules/utilities.mdc)):
-      - Manages global configuration settings loaded from environment variables and defaults.
-      - Implements logging utility with different log levels and output formatting.
-      - Provides file system operation utilities (read/write JSON files).
-      - Includes string manipulation utilities (e.g., `truncate`, `sanitizePrompt`).
-      - Offers task-specific utility functions (e.g., `formatTaskId`, `findTaskById`, `taskExists`).
-      - Implements graph algorithms like cycle detection for dependency management.
-      - **Silent Mode Control**: Provides `enableSilentMode` and `disableSilentMode` functions to control log output.
-    - **Key Components**:
-      - `CONFIG`: Global configuration object.
-      - `log(level, ...args)`: Logging function.
-      - `readJSON(filepath)` / `writeJSON(filepath, data)`: File I/O utilities for JSON files.
-      - `truncate(text, maxLength)`: String truncation utility.
-      - `formatTaskId(id)` / `findTaskById(tasks, taskId)`: Task ID and search utilities.
-      - `findCycles(subtaskId, dependencyMap)`: Cycle detection algorithm.
-      - `enableSilentMode()` / `disableSilentMode()`: Control console logging output.
+      - Reads and merges `.taskmasterconfig` with defaults.
+      - Provides getters (e.g., `getMainProvider`, `getLogLevel`, `getDefaultSubtasks`) for accessing settings.
+      - **Tag Configuration**: Manages `global.defaultTag` and `tags` section for tag system settings.
+      - **Note**: Does **not** store or directly handle API keys (keys are in `.env` or MCP `session.env`).
+
+  - **[`utils.js`](mdc:scripts/modules/utils.js): Core Utility Functions**
+    - **Purpose**: Low-level, reusable CLI utilities.
+    - **Responsibilities** (See also: [`utilities.mdc`](mdc:.cursor/rules/utilities.mdc)):
+      - Logging (`log` function), File I/O (`readJSON`, `writeJSON`), String utils (`truncate`).
+      - Task utils (`findTaskById`), Dependency utils (`findCycles`).
+      - API Key Resolution (`resolveEnvVariable`).
+      - Silent Mode Control (`enableSilentMode`, `disableSilentMode`).
+      - **Tagged Task Lists**: Silent migration system, tag resolution, current tag management.
+      - **Migration System**: `performCompleteTagMigration`, `migrateConfigJson`, `createStateJson`.
 
   - **[`mcp-server/`](mdc:mcp-server/): MCP Server Integration**
-    - **Purpose**: Provides an MCP (Model Context Protocol) interface for Task Master, allowing integration with external tools like Cursor. Uses FastMCP framework.
+    - **Purpose**: Provides MCP interface using FastMCP.
     - **Responsibilities** (See also: [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc)):
-      - Registers Task Master functionalities as tools consumable via MCP.
-      - Handles MCP requests via tool `execute` methods defined in `mcp-server/src/tools/*.js`.
-      - Tool `execute` methods call corresponding **direct function wrappers**.
-      - Tool `execute` methods use `getProjectRootFromSession` (from [`tools/utils.js`](mdc:mcp-server/src/tools/utils.js)) to determine the project root from the client session and pass it to the direct function.
-      - **Direct function wrappers (`*Direct` functions in `mcp-server/src/core/direct-functions/*.js`) contain the main logic for handling MCP requests**, including path resolution, argument validation, caching, and calling core Task Master functions.
-      - Direct functions use `findTasksJsonPath` (from [`core/utils/path-utils.js`](mdc:mcp-server/src/core/utils/path-utils.js)) to locate `tasks.json` based on the provided `projectRoot`.
-      - **Silent Mode Implementation**: Direct functions use `enableSilentMode` and `disableSilentMode` to prevent logs from interfering with JSON responses.
-      - **Async Operations**: Uses `AsyncOperationManager` to handle long-running operations in the background.
-      - **Project Initialization**: Provides `initialize_project` command for setting up new projects from within integrated clients.
-      - Tool `execute` methods use `handleApiResult` from [`tools/utils.js`](mdc:mcp-server/src/tools/utils.js) to process the result from the direct function and format the final MCP response.
-      - Uses CLI execution via `executeTaskMasterCommand` as a fallback only when necessary.
-      - **Implements Robust Path Finding**: The utility [`tools/utils.js`](mdc:mcp-server/src/tools/utils.js) (specifically `getProjectRootFromSession`) and [`core/utils/path-utils.js`](mdc:mcp-server/src/core/utils/path-utils.js) (specifically `findTasksJsonPath`) work together. The tool gets the root via session, passes it to the direct function, which uses `findTasksJsonPath` to locate the specific `tasks.json` file within that root.
-      - **Implements Caching**: Utilizes a caching layer (`ContextManager` with `lru-cache`). Caching logic is invoked *within* the direct function wrappers using the `getCachedOrExecute` utility for performance-sensitive read operations.
-      - Standardizes response formatting and data filtering using utilities in [`tools/utils.js`](mdc:mcp-server/src/tools/utils.js).
-      - **Resource Management**: Provides access to static and dynamic resources.
-    - **Key Components**:
-      - `mcp-server/src/index.js`: Main server class definition with FastMCP initialization, resource registration, and server lifecycle management.
-      - `mcp-server/src/server.js`: Main server setup and initialization.
-      - `mcp-server/src/tools/`: Directory containing individual tool definitions. Each tool's `execute` method orchestrates the call to core logic and handles the response.
-      - `mcp-server/src/tools/utils.js`: Provides MCP-specific utilities like `handleApiResult`, `processMCPResponseData`, `getCachedOrExecute`, and **`getProjectRootFromSession`**.
-      - `mcp-server/src/core/utils/`: Directory containing utility functions specific to the MCP server, like **`path-utils.js` for resolving `tasks.json` within a given root** and **`async-manager.js` for handling background operations**.
-      - `mcp-server/src/core/direct-functions/`: Directory containing individual files for each **direct function wrapper (`*Direct`)**. These files contain the primary logic for MCP tool execution.
-      - `mcp-server/src/core/resources/`: Directory containing resource handlers for task templates, workflow definitions, and other static/dynamic data exposed to LLM clients.
-      - [`task-master-core.js`](mdc:mcp-server/src/core/task-master-core.js): Acts as an import/export hub, collecting and exporting direct functions from the `direct-functions` directory and MCP utility functions.
-    - **Naming Conventions**:
-      - **Files** use **kebab-case**: `list-tasks.js`, `set-task-status.js`, `parse-prd.js`
-      - **Direct Functions** use **camelCase** with `Direct` suffix: `listTasksDirect`, `setTaskStatusDirect`, `parsePRDDirect`
-      - **Tool Registration Functions** use **camelCase** with `Tool` suffix: `registerListTasksTool`, `registerSetTaskStatusTool`
-      - **MCP Tool Names** use **snake_case**: `list_tasks`, `set_task_status`, `parse_prd_document`
-      - **Resource Handlers** use **camelCase** with pattern URI: `@mcp.resource("tasks://templates/{template_id}")`
-    - **AsyncOperationManager**:
-      - **Purpose**: Manages background execution of long-running operations.
-      - **Location**: `mcp-server/src/core/utils/async-manager.js`
-      - **Key Features**:
-        - Operation tracking with unique IDs using UUID
-        - Status management (pending, running, completed, failed)
-        - Progress reporting forwarded from background tasks
-        - Operation history with automatic cleanup of completed operations
-        - Context preservation (log, session, reportProgress)
-        - Robust error handling for background tasks
-      - **Usage**: Used for CPU-intensive operations like task expansion and PRD parsing
+      - Registers tools (`mcp-server/src/tools/*.js`). Tool `execute` methods **should be wrapped** with the `withNormalizedProjectRoot` HOF (from `tools/utils.js`) to ensure consistent path handling.
+      - The HOF provides a normalized `args.projectRoot` to the `execute` method.
+      - Tool `execute` methods call **direct function wrappers** (`mcp-server/src/core/direct-functions/*.js`), passing the normalized `projectRoot` and other args.
+      - Direct functions use path utilities (`mcp-server/src/core/utils/`) to resolve paths based on `projectRoot` from session.
+      - Direct functions implement silent mode, logger wrappers, and call core logic functions from `scripts/modules/`.
+      - **Tagged Task Lists**: MCP tools fully support the tagged format with complete tag management capabilities.
+      - Manages MCP caching and response formatting.
 
-- **Data Flow and Module Dependencies**:
+  - **[`init.js`](mdc:scripts/init.js): Project Initialization Logic**
+    - **Purpose**: Sets up new Task Master project structure.
+    - **Responsibilities**: Creates directories, copies templates, manages `package.json`, sets up `.cursor/mcp.json`, initializes state.json for tagged system.
 
-  - **Commands Initiate Actions**: User commands entered via the CLI (handled by [`commands.js`](mdc:scripts/modules/commands.js)) are the entry points for most operations.
-  - **Command Handlers Delegate to Managers**: Command handlers in [`commands.js`](mdc:scripts/modules/commands.js) call functions in [`task-manager.js`](mdc:scripts/modules/task-manager.js) and [`dependency-manager.js`](mdc:scripts/modules/dependency-manager.js) to perform core task and dependency management logic.
-  - **UI for Presentation**:  [`ui.js`](mdc:scripts/modules/ui.js) is used by command handlers and task/dependency managers to display information to the user. UI functions primarily consume data and format it for output, without modifying core application state.
-  - **Utilities for Common Tasks**: [`utils.js`](mdc:scripts/modules/utils.js) provides helper functions used by all other modules for configuration, logging, file operations, and common data manipulations.
-  - **AI Services Integration**: AI functionalities (complexity analysis, task expansion, PRD parsing) are invoked from [`task-manager.js`](mdc:scripts/modules/task-manager.js) and potentially [`commands.js`](mdc:scripts/modules/commands.js), likely using functions that would reside in a dedicated `ai-services.js` module or be integrated within `utils.js` or `task-manager.js`.
-  - **MCP Server Interaction**: External tools interact with the `mcp-server`. MCP Tool `execute` methods use `getProjectRootFromSession` to find the project root, then call direct function wrappers (in `mcp-server/src/core/direct-functions/`) passing the root in `args`. These wrappers handle path finding for `tasks.json` (using `path-utils.js`), validation, caching, call the core logic from `scripts/modules/` (passing logging context via the standard wrapper pattern detailed in mcp.mdc), and return a standardized result. The final MCP response is formatted by `mcp-server/src/tools/utils.js`. See [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc) for details.
+## Tagged Task Lists System Architecture
+
+**Data Structure**: Task Master now uses a tagged task lists system where the `tasks.json` file contains multiple named task lists as top-level keys:
+
+```json
+{
+  "master": {
+    "tasks": [/* standard task objects */]
+  },
+  "feature-branch": {
+    "tasks": [/* separate task context */]
+  }
+}
+```
+
+**Key Components:**
+
+- **Silent Migration**: Automatically transforms legacy `{"tasks": [...]}` format to tagged format `{"master": {"tasks": [...]}}` on first read
+- **Tag Resolution Layer**: Provides 100% backward compatibility by intercepting tagged format and returning legacy format to existing code
+- **Configuration Integration**: `global.defaultTag` and `tags` section in config.json manage tag system settings
+- **State Management**: `.taskmaster/state.json` tracks current tag, migration status, and tag-branch mappings
+- **Migration Notice**: User-friendly notification system for seamless migration experience
+
+**Backward Compatibility**: All existing CLI commands and MCP tools continue to work unchanged. The tag resolution layer ensures that existing code receives the expected legacy format while the underlying storage uses the new tagged structure.
+
+- **Data Flow and Module Dependencies (Updated)**:
+
+  - **CLI**: `bin/task-master.js` -> `scripts/dev.js` (loads `.env`) -> `scripts/modules/commands.js` -> Core Logic (`scripts/modules/*`) -> **Tag Resolution Layer** -> Unified AI Service (`ai-services-unified.js`) -> Provider Adapters -> LLM API.
+  - **MCP**: External Tool -> `mcp-server/server.js` -> Tool (`mcp-server/src/tools/*`) -> Direct Function (`mcp-server/src/core/direct-functions/*`) -> Core Logic (`scripts/modules/*`) -> **Tag Resolution Layer** -> Unified AI Service (`ai-services-unified.js`) -> Provider Adapters -> LLM API.
+  - **Configuration**: Core logic needing non-AI settings calls `config-manager.js` getters (passing `session.env` via `explicitRoot` if from MCP). Unified AI Service internally calls `config-manager.js` getters (using `role`) for AI params and `utils.js` (`resolveEnvVariable` with `session.env`) for API keys.
 
 ## Silent Mode Implementation Pattern in MCP Direct Functions
 
@@ -271,6 +228,7 @@ By following these patterns consistently, direct functions will properly manage
     - **Integration Tests**: Located in `tests/integration/`, test interactions between modules
     - **End-to-End Tests**: Located in `tests/e2e/`, test complete workflows from a user perspective
     - **Test Fixtures**: Located in `tests/fixtures/`, provide reusable test data
+    - **Tagged System Tests**: Test migration, tag resolution, and multi-context functionality
 
   - **Module Design for Testability**:
     - **Explicit Dependencies**: Functions accept their dependencies as parameters rather than using globals
@@ -279,12 +237,14 @@ By following these patterns consistently, direct functions will properly manage
     - **Clear Module Interfaces**: Each module has well-defined exports that can be mocked in tests
     - **Callback Isolation**: Callbacks are defined as separate functions for easier testing
     - **Stateless Design**: Modules avoid maintaining internal state where possible
+    - **Tag Resolution Testing**: Test both tagged and legacy format handling
 
   - **Mock Integration Patterns**:
     - **External Libraries**: Libraries like `fs`, `commander`, and `@anthropic-ai/sdk` are mocked at module level
     - **Internal Modules**: Application modules are mocked with appropriate spy functions
     - **Testing Function Callbacks**: Callbacks are extracted from mock call arguments and tested in isolation
     - **UI Elements**: Output functions from `ui.js` are mocked to verify display calls
+    - **Tagged Data Mocking**: Test both legacy and tagged task data structures
 
   - **Testing Flow**:
     - Module dependencies are mocked (following Jest's hoisting behavior)
@@ -292,6 +252,7 @@ By following these patterns consistently, direct functions will properly manage
     - Spy functions are set up on module methods
     - Tests call the functions under test and verify behavior
     - Mocks are reset between test cases to maintain isolation
+    - Tagged system behavior is tested for both migration and normal operation
 
 - **Benefits of this Architecture**:
 
@@ -300,8 +261,11 @@ By following these patterns consistently, direct functions will properly manage
     - **Mocking Support**: The clear dependency boundaries make mocking straightforward
     - **Test Isolation**: Each component can be tested without affecting others
     - **Callback Testing**: Function callbacks can be extracted and tested independently
+    - **Multi-Context Testing**: Tagged system enables testing different task contexts independently
   - **Reusability**: Utility functions and UI components can be reused across different parts of the application.
   - **Scalability**:  New features can be added as new modules or by extending existing ones without significantly impacting other parts of the application.
+  - **Multi-Context Support**: Tagged task lists enable working across different contexts (branches, environments, phases) without conflicts.
+  - **Backward Compatibility**: Seamless migration and tag resolution ensure existing workflows continue unchanged.
   - **Clarity**: The modular structure provides a clear separation of concerns, making the codebase easier to navigate and understand for developers.
 
 This architectural overview should help AI models understand the structure and organization of the Task Master CLI codebase, enabling them to more effectively assist with code generation, modification, and understanding.
@@ -323,6 +287,7 @@ Follow these steps to add MCP support for an existing Task Master command (see [
         - Call core logic.
         - Return `{ success: true/false, data/error, fromCache: boolean }`.
     - Export the wrapper function.
+    - **Note**: Tag-aware MCP tools are fully implemented with complete tag management support.
 
 3.  **Update `task-master-core.js` with Import/Export**: Add imports/exports for the new `*Direct` function.
 
@@ -349,23 +314,8 @@ The `initialize_project` command provides a way to set up a new Task Master proj
 - **MCP Tool**: `initialize_project`
 - **Functionality**:
   - Creates necessary directories and files for a new project
-  - Sets up `tasks.json` and initial task files
+  - Sets up `tasks.json` with tagged structure and initial task files
   - Configures project metadata (name, description, version)
+  - Initializes state.json for tag system
   - Handles shell alias creation if requested
-  - Works in both interactive and non-interactive modes
-
-## Async Operation Management
-
-The AsyncOperationManager provides background task execution capabilities:
-
-- **Location**: `mcp-server/src/core/utils/async-manager.js`
-- **Key Components**:
-  - `asyncOperationManager` singleton instance
-  - `addOperation(operationFn, args, context)` method
-  - `getStatus(operationId)` method
-- **Usage Flow**:
-  1. Client calls an MCP tool that may take time to complete
-  2. Tool uses AsyncOperationManager to run the operation in background
-  3. Tool returns immediate response with operation ID
-  4. Client polls `get_operation_status` tool with the ID
-  5. Once completed, client can access operation results
+  - Works in both interactive and non-interactive modes

.cursor/rules/commands.mdc

@@ -24,7 +24,7 @@ While this document details the implementation of Task Master's **CLI commands**
   programInstance
     .command('command-name')
     .description('Clear, concise description of what the command does')
-    .option('-s, --short-option <value>', 'Option description', 'default value')
+    .option('-o, --option <value>', 'Option description', 'default value')
     .option('--long-option <value>', 'Option description')
     .action(async (options) => {
       // Command implementation
@@ -34,7 +34,8 @@ While this document details the implementation of Task Master's **CLI commands**
 - **Command Handler Organization**:
   - ✅ DO: Keep action handlers concise and focused
   - ✅ DO: Extract core functionality to appropriate modules
-  - ✅ DO: Include validation for required parameters
+  - ✅ DO: Have the action handler import and call the relevant functions from core modules, like `task-manager.js` or `init.js`, passing the parsed `options`.
+  - ✅ DO: Perform basic parameter validation, such as checking for required options, within the action handler or at the start of the called core function.
   - ❌ DON'T: Implement business logic in command handlers
 
 ## Best Practices for Removal/Delete Commands
@@ -43,7 +44,7 @@ When implementing commands that delete or remove data (like `remove-task` or `re
 
 - **Confirmation Prompts**:
   - ✅ **DO**: Include a confirmation prompt by default for destructive operations
-  - ✅ **DO**: Provide a `--yes` or `-y` flag to skip confirmation for scripting/automation
+  - ✅ **DO**: Provide a `--yes` or `-y` flag to skip confirmation, useful for scripting or automation
   - ✅ **DO**: Show what will be deleted in the confirmation message
   - ❌ **DON'T**: Perform destructive operations without user confirmation unless explicitly overridden
 
@@ -77,7 +78,7 @@ When implementing commands that delete or remove data (like `remove-task` or `re
 
 - **File Path Handling**:
   - ✅ **DO**: Use `path.join()` to construct file paths
-  - ✅ **DO**: Follow established naming conventions for tasks (e.g., `task_001.txt`)
+  - ✅ **DO**: Follow established naming conventions for tasks, like `task_001.txt`
   - ✅ **DO**: Check if files exist before attempting to delete them
   - ✅ **DO**: Handle file deletion errors gracefully
   - ❌ **DON'T**: Construct paths with string concatenation
@@ -165,10 +166,10 @@ When implementing commands that delete or remove data (like `remove-task` or `re
   - ✅ DO: Use descriptive, action-oriented names
 
 - **Option Names**:
-  - ✅ DO: Use kebab-case for long-form option names (`--output-format`)
-  - ✅ DO: Provide single-letter shortcuts when appropriate (`-f, --file`)
+  - ✅ DO: Use kebab-case for long-form option names, like `--output-format`
+  - ✅ DO: Provide single-letter shortcuts when appropriate, like `-f, --file`
   - ✅ DO: Use consistent option names across similar commands
-  - ❌ DON'T: Use different names for the same concept (`--file` in one command, `--path` in another)
+  - ❌ DON'T: Use different names for the same concept, such as `--file` in one command and `--path` in another
 
   ```javascript
   // ✅ DO: Use consistent option naming
@@ -180,7 +181,7 @@ When implementing commands that delete or remove data (like `remove-task` or `re
   .option('-p, --path <dir>', 'Output directory') // Should be --output
   ```
 
-  > **Note**: Although options are defined with kebab-case (`--num-tasks`), Commander.js stores them internally as camelCase properties. Access them in code as `options.numTasks`, not `options['num-tasks']`.
+  > **Note**: Although options are defined with kebab-case, like `--num-tasks`, Commander.js stores them internally as camelCase properties. Access them in code as `options.numTasks`, not `options['num-tasks']`.
 
 - **Boolean Flag Conventions**:
   - ✅ DO: Use positive flags with `--skip-` prefix for disabling behavior
@@ -209,7 +210,7 @@ When implementing commands that delete or remove data (like `remove-task` or `re
 - **Required Parameters**:
   - ✅ DO: Check that required parameters are provided
   - ✅ DO: Provide clear error messages when parameters are missing
-  - ✅ DO: Use early returns with process.exit(1) for validation failures
+  - ✅ DO: Use early returns with `process.exit(1)` for validation failures
 
   ```javascript
   // ✅ DO: Validate required parameters early
@@ -220,7 +221,7 @@ When implementing commands that delete or remove data (like `remove-task` or `re
   ```
 
 - **Parameter Type Conversion**:
-  - ✅ DO: Convert string inputs to appropriate types (numbers, booleans)
+  - ✅ DO: Convert string inputs to appropriate types, such as numbers or booleans
   - ✅ DO: Handle conversion errors gracefully
 
   ```javascript
@@ -253,7 +254,7 @@ When implementing commands that delete or remove data (like `remove-task` or `re
   const taskId = parseInt(options.id, 10);
   if (isNaN(taskId) || taskId <= 0) {
     console.error(chalk.red(`Error: Invalid task ID: ${options.id}. Task ID must be a positive integer.`));
-    console.log(chalk.yellow('Usage example: task-master update-task --id=\'23\' --prompt=\'Update with new information.\nEnsure proper error handling.\''));
+    console.log(chalk.yellow("Usage example: task-master update-task --id='23' --prompt='Update with new information.\\nEnsure proper error handling.'"));
     process.exit(1);
   }
   
@@ -328,6 +329,60 @@ When implementing commands that delete or remove data (like `remove-task` or `re
   };
   ```
 
+## Context-Aware Command Pattern
+
+For AI-powered commands that benefit from project context, follow the research command pattern:
+
+- **Context Integration**:
+  - ✅ DO: Use `ContextGatherer` utility for multi-source context extraction
+  - ✅ DO: Support task IDs, file paths, custom context, and project tree
+  - ✅ DO: Implement fuzzy search for automatic task discovery
+  - ✅ DO: Display detailed token breakdown for transparency
+
+  ```javascript
+  // ✅ DO: Follow this pattern for context-aware commands
+  programInstance
+    .command('research')
+    .description('Perform AI-powered research queries with project context')
+    .argument('<prompt>', 'Research prompt to investigate')
+    .option('-i, --id <ids>', 'Comma-separated task/subtask IDs to include as context')
+    .option('-f, --files <paths>', 'Comma-separated file paths to include as context')
+    .option('-c, --context <text>', 'Additional custom context')
+    .option('--tree', 'Include project file tree structure')
+    .option('-d, --detail <level>', 'Output detail level: low, medium, high', 'medium')
+    .action(async (prompt, options) => {
+      // 1. Parameter validation and parsing
+      const taskIds = options.id ? parseTaskIds(options.id) : [];
+      const filePaths = options.files ? parseFilePaths(options.files) : [];
+      
+      // 2. Initialize context gatherer
+      const projectRoot = findProjectRoot() || '.';
+      const gatherer = new ContextGatherer(projectRoot, tasksPath);
+      
+      // 3. Auto-discover relevant tasks if none specified
+      if (taskIds.length === 0) {
+        const fuzzySearch = new FuzzyTaskSearch(tasksData.tasks, 'research');
+        const discoveredIds = fuzzySearch.getTaskIds(
+          fuzzySearch.findRelevantTasks(prompt)
+        );
+        taskIds.push(...discoveredIds);
+      }
+      
+      // 4. Gather context with token breakdown
+      const contextResult = await gatherer.gather({
+        tasks: taskIds,
+        files: filePaths,
+        customContext: options.context,
+        includeProjectTree: options.projectTree,
+        format: 'research',
+        includeTokenCounts: true
+      });
+      
+      // 5. Display token breakdown and execute AI call
+      // Implementation continues...
+    });
+  ```
+
 ## Error Handling
 
 - **Exception Management**:
@@ -391,9 +446,9 @@ When implementing commands that delete or remove data (like `remove-task` or `re
   process.on('uncaughtException', (err) => {
     // Handle Commander-specific errors
     if (err.code === 'commander.unknownOption') {
-      const option = err.message.match(/'([^']+)'/)?.[1];
+      const option = err.message.match(/'([^']+)'/)?.[1]; // Safely extract option name
       console.error(chalk.red(`Error: Unknown option '${option}'`));
-      console.error(chalk.yellow(`Run 'task-master <command> --help' to see available options`));
+      console.error(chalk.yellow("Run 'task-master <command> --help' to see available options"));
       process.exit(1);
     }
     
@@ -463,12 +518,12 @@ When implementing commands that delete or remove data (like `remove-task` or `re
     .option('-f, --file <path>', 'Path to the tasks file', 'tasks/tasks.json')
     .option('-p, --parent <id>', 'ID of the parent task (required)')
     .option('-i, --task-id <id>', 'Existing task ID to convert to subtask')
-    .option('-t, --title <title>', 'Title for the new subtask (when not converting)')
-    .option('-d, --description <description>', 'Description for the new subtask (when not converting)')
-    .option('--details <details>', 'Implementation details for the new subtask (when not converting)')
+    .option('-t, --title <title>', 'Title for the new subtask, required if not converting')
+    .option('-d, --description <description>', 'Description for the new subtask, optional')
+    .option('--details <details>', 'Implementation details for the new subtask, optional')
     .option('--dependencies <ids>', 'Comma-separated list of subtask IDs this subtask depends on')
     .option('--status <status>', 'Initial status for the subtask', 'pending')
-    .option('--skip-generate', 'Skip regenerating task files')
+    .option('--generate', 'Regenerate task files after adding subtask')
     .action(async (options) => {
       // Validate required parameters
       if (!options.parent) {
@@ -488,9 +543,9 @@ When implementing commands that delete or remove data (like `remove-task` or `re
     .command('remove-subtask')
     .description('Remove a subtask from its parent task, optionally converting it to a standalone task')
     .option('-f, --file <path>', 'Path to the tasks file', 'tasks/tasks.json')
-    .option('-i, --id <id>', 'ID of the subtask to remove in format "parentId.subtaskId" (required)')
-    .option('-c, --convert', 'Convert the subtask to a standalone task')
-    .option('--skip-generate', 'Skip regenerating task files')
+    .option('-i, --id <id>', 'ID of the subtask to remove in format parentId.subtaskId, required')
+    .option('-c, --convert', 'Convert the subtask to a standalone task instead of deleting')
+    .option('--generate', 'Regenerate task files after removing subtask')
     .action(async (options) => {
       // Implementation with detailed error handling
     })
@@ -512,7 +567,8 @@ When implementing commands that delete or remove data (like `remove-task` or `re
   // ✅ DO: Implement version checking function
   async function checkForUpdate() {
     // Implementation details...
-    return { currentVersion, latestVersion, needsUpdate };
+    // Example return structure:
+    return { currentVersion, latestVersion, updateAvailable };
   }
   
   // ✅ DO: Implement semantic version comparison
@@ -552,7 +608,7 @@ When implementing commands that delete or remove data (like `remove-task` or `re
       
       // After command execution, check if an update is available
       const updateInfo = await updateCheckPromise;
-      if (updateInfo.needsUpdate) {
+      if (updateInfo.updateAvailable) {
         displayUpgradeNotification(updateInfo.currentVersion, updateInfo.latestVersion);
       }
     } catch (error) {
@@ -577,11 +633,11 @@ function showAddSubtaskHelp() {
     '  --dependencies <ids>      Comma-separated list of dependency IDs\n' +
     '  -s, --status <status>     Status for the new subtask (default: "pending")\n' +
     '  -f, --file <file>         Path to the tasks file (default: "tasks/tasks.json")\n' +
-    '  --skip-generate           Skip regenerating task files\n\n' +
+    '  --generate                Regenerate task files after adding subtask\n\n' +
     chalk.cyan('Examples:') + '\n' +
     '  task-master add-subtask --parent=\'5\' --task-id=\'8\'\n' +
     '  task-master add-subtask -p \'5\' -t \'Implement login UI\' -d \'Create the login form\'\n' +
-    '  task-master add-subtask -p \'5\' -t \'Handle API Errors\' --details $\'Handle 401 Unauthorized.\nHandle 500 Server Error.\'',
+    '  task-master add-subtask -p \'5\' -t \'Handle API Errors\' --details "Handle 401 Unauthorized.\\nHandle 500 Server Error." --generate',
     { padding: 1, borderColor: 'blue', borderStyle: 'round' }
   ));
 }
@@ -596,7 +652,7 @@ function showRemoveSubtaskHelp() {
     '  -i, --id <id>       Subtask ID(s) to remove in format "parentId.subtaskId" (can be comma-separated, required)\n' +
     '  -c, --convert       Convert the subtask to a standalone task instead of deleting it\n' +
     '  -f, --file <file>   Path to the tasks file (default: "tasks/tasks.json")\n' +
-    '  --skip-generate     Skip regenerating task files\n\n' +
+    '  --generate          Regenerate task files after removing subtask\n\n' +
     chalk.cyan('Examples:') + '\n' +
     '  task-master remove-subtask --id=\'5.2\'\n' +
     '  task-master remove-subtask --id=\'5.2,6.3,7.1\'\n' +

.cursor/rules/context_gathering.mdc

@@ -0,0 +1,268 @@
+---
+description: Standardized patterns for gathering and processing context from multiple sources in Task Master commands, particularly for AI-powered features.
+globs: 
+alwaysApply: false
+---
+# Context Gathering Patterns and Utilities
+
+This document outlines the standardized patterns for gathering and processing context from multiple sources in Task Master commands, particularly for AI-powered features.
+
+## Core Context Gathering Utility
+
+The `ContextGatherer` class (`scripts/modules/utils/contextGatherer.js`) provides a centralized, reusable utility for extracting context from multiple sources:
+
+### **Key Features**
+- **Multi-source Context**: Tasks, files, custom text, project file tree
+- **Token Counting**: Detailed breakdown using `gpt-tokens` library
+- **Format Support**: Different output formats (research, chat, system-prompt)
+- **Error Handling**: Graceful handling of missing files, invalid task IDs
+- **Performance**: File size limits, depth limits for tree generation
+
+### **Usage Pattern**
+```javascript
+import { ContextGatherer } from '../utils/contextGatherer.js';
+
+// Initialize with project paths
+const gatherer = new ContextGatherer(projectRoot, tasksPath);
+
+// Gather context with detailed token breakdown
+const result = await gatherer.gather({
+    tasks: ['15', '16.2'],           // Task and subtask IDs
+    files: ['src/api.js', 'README.md'], // File paths
+    customContext: 'Additional context text',
+    includeProjectTree: true,        // Include file tree
+    format: 'research',              // Output format
+    includeTokenCounts: true         // Get detailed token breakdown
+});
+
+// Access results
+const contextString = result.context;
+const tokenBreakdown = result.tokenBreakdown;
+```
+
+### **Token Breakdown Structure**
+```javascript
+{
+    customContext: { tokens: 150, characters: 800 },
+    tasks: [
+        { id: '15', type: 'task', title: 'Task Title', tokens: 245, characters: 1200 },
+        { id: '16.2', type: 'subtask', title: 'Subtask Title', tokens: 180, characters: 900 }
+    ],
+    files: [
+        { path: 'src/api.js', tokens: 890, characters: 4500, size: '4.5 KB' }
+    ],
+    projectTree: { tokens: 320, characters: 1600 },
+    total: { tokens: 1785, characters: 8000 }
+}
+```
+
+## Fuzzy Search Integration
+
+The `FuzzyTaskSearch` class (`scripts/modules/utils/fuzzyTaskSearch.js`) provides intelligent task discovery:
+
+### **Key Features**
+- **Semantic Matching**: Uses Fuse.js for similarity scoring
+- **Purpose Categories**: Pattern-based task categorization
+- **Relevance Scoring**: High/medium/low relevance thresholds
+- **Context-Aware**: Different search configurations for different use cases
+
+### **Usage Pattern**
+```javascript
+import { FuzzyTaskSearch } from '../utils/fuzzyTaskSearch.js';
+
+// Initialize with tasks data and context
+const fuzzySearch = new FuzzyTaskSearch(tasksData.tasks, 'research');
+
+// Find relevant tasks
+const searchResults = fuzzySearch.findRelevantTasks(query, {
+    maxResults: 8,
+    includeRecent: true,
+    includeCategoryMatches: true
+});
+
+// Get task IDs for context gathering
+const taskIds = fuzzySearch.getTaskIds(searchResults);
+```
+
+## Implementation Patterns for Commands
+
+### **1. Context-Aware Command Structure**
+```javascript
+// In command action handler
+async function commandAction(prompt, options) {
+    // 1. Parameter validation and parsing
+    const taskIds = options.id ? parseTaskIds(options.id) : [];
+    const filePaths = options.files ? parseFilePaths(options.files) : [];
+    
+    // 2. Initialize context gatherer
+    const projectRoot = findProjectRoot() || '.';
+    const tasksPath = path.join(projectRoot, 'tasks', 'tasks.json');
+    const gatherer = new ContextGatherer(projectRoot, tasksPath);
+    
+    // 3. Auto-discover relevant tasks if none specified
+    if (taskIds.length === 0) {
+        const fuzzySearch = new FuzzyTaskSearch(tasksData.tasks, 'research');
+        const discoveredIds = fuzzySearch.getTaskIds(
+            fuzzySearch.findRelevantTasks(prompt)
+        );
+        taskIds.push(...discoveredIds);
+    }
+    
+    // 4. Gather context with token breakdown
+    const contextResult = await gatherer.gather({
+        tasks: taskIds,
+        files: filePaths,
+        customContext: options.context,
+        includeProjectTree: options.projectTree,
+        format: 'research',
+        includeTokenCounts: true
+    });
+    
+    // 5. Display token breakdown (for CLI)
+    if (outputFormat === 'text') {
+        displayDetailedTokenBreakdown(contextResult.tokenBreakdown);
+    }
+    
+    // 6. Use context in AI call
+    const aiResult = await generateTextService(role, session, systemPrompt, userPrompt);
+    
+    // 7. Display results with enhanced formatting
+    displayResults(aiResult, contextResult.tokenBreakdown);
+}
+```
+
+### **2. Token Display Pattern**
+```javascript
+function displayDetailedTokenBreakdown(tokenBreakdown, systemTokens, userTokens) {
+    const sections = [];
+    
+    // Build context breakdown
+    if (tokenBreakdown.tasks?.length > 0) {
+        const taskDetails = tokenBreakdown.tasks.map(task => 
+            `${task.type === 'subtask' ? '  ' : ''}${task.id}: ${task.tokens.toLocaleString()}`
+        ).join('\n');
+        sections.push(`Tasks (${tokenBreakdown.tasks.reduce((sum, t) => sum + t.tokens, 0).toLocaleString()}):\n${taskDetails}`);
+    }
+    
+    if (tokenBreakdown.files?.length > 0) {
+        const fileDetails = tokenBreakdown.files.map(file =>
+            `  ${file.path}: ${file.tokens.toLocaleString()} (${file.size})`
+        ).join('\n');
+        sections.push(`Files (${tokenBreakdown.files.reduce((sum, f) => sum + f.tokens, 0).toLocaleString()}):\n${fileDetails}`);
+    }
+    
+    // Add prompts breakdown
+    sections.push(`Prompts: system ${systemTokens.toLocaleString()}, user ${userTokens.toLocaleString()}`);
+    
+    // Display in clean box
+    const content = sections.join('\n\n');
+    console.log(boxen(content, {
+        title: chalk.cyan('Token Usage'),
+        padding: { top: 1, bottom: 1, left: 2, right: 2 },
+        borderStyle: 'round',
+        borderColor: 'cyan'
+    }));
+}
+```
+
+### **3. Enhanced Result Display Pattern**
+```javascript
+function displayResults(result, query, detailLevel, tokenBreakdown) {
+    // Header with query info
+    const header = boxen(
+        chalk.green.bold('Research Results') + '\n\n' +
+        chalk.gray('Query: ') + chalk.white(query) + '\n' +
+        chalk.gray('Detail Level: ') + chalk.cyan(detailLevel),
+        {
+            padding: { top: 1, bottom: 1, left: 2, right: 2 },
+            margin: { top: 1, bottom: 0 },
+            borderStyle: 'round',
+            borderColor: 'green'
+        }
+    );
+    console.log(header);
+    
+    // Process and highlight code blocks
+    const processedResult = processCodeBlocks(result);
+    
+    // Main content in clean box
+    const contentBox = boxen(processedResult, {
+        padding: { top: 1, bottom: 1, left: 2, right: 2 },
+        margin: { top: 0, bottom: 1 },
+        borderStyle: 'single',
+        borderColor: 'gray'
+    });
+    console.log(contentBox);
+    
+    console.log(chalk.green('✓ Research complete'));
+}
+```
+
+## Code Block Enhancement
+
+### **Syntax Highlighting Pattern**
+```javascript
+import { highlight } from 'cli-highlight';
+
+function processCodeBlocks(text) {
+    return text.replace(/```(\w+)?\n([\s\S]*?)```/g, (match, language, code) => {
+        try {
+            const highlighted = highlight(code.trim(), { 
+                language: language || 'javascript',
+                theme: 'default'
+            });
+            return `\n${highlighted}\n`;
+        } catch (error) {
+            return `\n${code.trim()}\n`;
+        }
+    });
+}
+```
+
+## Integration Guidelines
+
+### **When to Use Context Gathering**
+- ✅ **DO**: Use for AI-powered commands that benefit from project context
+- ✅ **DO**: Use when users might want to reference specific tasks or files
+- ✅ **DO**: Use for research, analysis, or generation commands
+- ❌ **DON'T**: Use for simple CRUD operations that don't need AI context
+
+### **Performance Considerations**
+- ✅ **DO**: Set reasonable file size limits (50KB default)
+- ✅ **DO**: Limit project tree depth (3-5 levels)
+- ✅ **DO**: Provide token counts to help users understand context size
+- ✅ **DO**: Allow users to control what context is included
+
+### **Error Handling**
+- ✅ **DO**: Gracefully handle missing files with warnings
+- ✅ **DO**: Validate task IDs and provide helpful error messages
+- ✅ **DO**: Continue processing even if some context sources fail
+- ✅ **DO**: Provide fallback behavior when context gathering fails
+
+### **Future Command Integration**
+Commands that should consider adopting this pattern:
+- `analyze-complexity` - Could benefit from file context
+- `expand-task` - Could use related task context
+- `update-task` - Could reference similar tasks for consistency
+- `add-task` - Could use project context for better task generation
+
+## Export Patterns
+
+### **Context Gatherer Module**
+```javascript
+export {
+    ContextGatherer,
+    createContextGatherer  // Factory function
+};
+```
+
+### **Fuzzy Search Module**
+```javascript
+export {
+    FuzzyTaskSearch,
+    PURPOSE_CATEGORIES,
+    RELEVANCE_THRESHOLDS
+};
+```
+
+This context gathering system provides a foundation for building more intelligent, context-aware commands that can leverage project knowledge to provide better AI-powered assistance.

.cursor/rules/dev_workflow.mdc

@@ -1,24 +1,205 @@
 ---
-description: Guide for using Task Master to manage task-driven development workflows
+description: Guide for using Taskmaster to manage task-driven development workflows
 globs: **/*
 alwaysApply: true
 ---
 
-# Task Master Development Workflow
+# Taskmaster Development Workflow
 
-This guide outlines the typical process for using Task Master to manage software development projects.
+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 multiple 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
 
-Task Master offers two primary ways to interact:
+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 Task Master functionality through a set of tools (e.g., `get_tasks`, `add_subtask`).
+    - 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`](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).
     - **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.
@@ -26,56 +207,44 @@ Task Master offers two primary ways to interact:
     - 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`](mdc:.cursor/rules/taskmaster.mdc) for a detailed command reference.
+    - **Tagged Task Lists**: CLI fully supports the new tagged system with seamless migration.
 
-## Standard Development Workflow Process
+## How the Tag System Works (For Your Reference)
 
--   Start new projects by running `init` 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
--   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_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>` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) with appropriate flags
--   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="..."` (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`
+- **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 Complexity Analysis
 
--   Run `analyze_complexity` / `task-master analyze-complexity --research` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) for comprehensive analysis
+-   Run `analyze_project_complexity` / `task-master analyze-complexity --research` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) for comprehensive analysis
 -   Review complexity report via `complexity_report` / `task-master complexity-report` (see [`taskmaster.mdc`](mdc:.cursor/rules/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` tool/command
+-   Note that reports are automatically used by the `expand_task` tool/command
 
 ## Task Breakdown Process
 
--   For tasks with complexity analysis, use `expand_task` / `task-master expand --id=<id>` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc))
--   Otherwise use `expand_task` / `task-master expand --id=<id> --num=<number>`
--   Add `--research` flag to leverage Perplexity AI for research-backed expansion
--   Use `--prompt="<context>"` to provide additional context when needed
--   Review and adjust generated subtasks as necessary
--   Use `--all` flag with `expand` or `expand_all` to expand multiple pending tasks at once
--   If subtasks need regeneration, clear them first with `clear_subtasks` / `task-master clear-subtasks` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
+-   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...'` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to update multiple future tasks.
--   Use `update_task` / `task-master update-task --id=<taskId> --prompt='<explanation>\nUpdate context...'` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to update a single specific task.
+-   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
 
@@ -97,28 +266,49 @@ Task Master offers two primary ways to interact:
 - **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 [`tasks.mdc`](mdc:.cursor/rules/tasks.mdc) for more details on the task data structure.
+- Refer to task structure details (previously linked to `tasks.mdc`).
 
-## Environment Variables Configuration
+## Configuration Management (Updated)
 
-- Task Master behavior is configured via environment variables:
-  - **ANTHROPIC_API_KEY** (Required): Your Anthropic API key for Claude.
-  - **MODEL**: Claude model to use (e.g., `claude-3-opus-20240229`).
-  - **MAX_TOKENS**: Maximum tokens for AI responses.
-  - **TEMPERATURE**: Temperature for AI model responses.
-  - **DEBUG**: Enable debug logging (`true`/`false`).
-  - **LOG_LEVEL**: Console output level (`debug`, `info`, `warn`, `error`).
-  - **DEFAULT_SUBTASKS**: Default number of subtasks for `expand`.
-  - **DEFAULT_PRIORITY**: Default priority for new tasks.
-  - **PROJECT_NAME**: Project name used in metadata.
-  - **PROJECT_VERSION**: Project version used in metadata.
-  - **PERPLEXITY_API_KEY**: API key for Perplexity AI (for `--research` flags).
-  - **PERPLEXITY_MODEL**: Perplexity model to use (e.g., `sonar-medium-online`).
-- See [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc) for default values and examples.
+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` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to show the next task to work on
+- 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:
@@ -133,7 +323,7 @@ Task Master offers two primary ways to interact:
 
 ## Viewing Specific Task Details
 
-- Run `get_task` / `task-master show <id>` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to view a specific task
+- 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
@@ -143,13 +333,32 @@ Task Master offers two primary ways to interact:
 
 ## Managing Task Dependencies
 
-- Use `add_dependency` / `task-master add-dependency --id=<id> --depends-on=<id>` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to add a dependency
-- Use `remove_dependency` / `task-master remove-dependency --id=<id> --depends-on=<id>` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to remove a dependency
+- 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:
@@ -164,14 +373,14 @@ Once a task has been broken down into subtasks using `expand_task` or similar me
     *   Gather *all* relevant details from this exploration phase.
 
 3.  **Log the Plan:**
-    *   Run `update_subtask` / `task-master update-subtask --id=<subtaskId> --prompt='<detailed plan>'` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
+    *   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` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
+    *   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+):**
@@ -189,7 +398,7 @@ Once a task has been broken down into subtasks using `expand_task` or similar me
 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 Cursor rules in the `.cursor/rules/` directory to capture these patterns, following the guidelines in [`cursor_rules.mdc`](mdc:.cursor/rules/cursor_rules.mdc) and [`self_improve.mdc`](mdc:.cursor/rules/self_improve.mdc).
+    *   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`.
@@ -198,10 +407,10 @@ Once a task has been broken down into subtasks using `expand_task` or similar me
     *   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 [`changeset.mdc`](mdc:.cursor/rules/changeset.mdc). If so, run `npm run changeset`, stage the generated file, and amend the commit or create a new one.
+    *   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 in the dependency chain (e.g., using `next_task` / `task-master next`) and repeat this iterative process starting from step 1.
+    *   Identify the next subtask (e.g., using `next_task` / `task-master next`).
 
 ## Code Analysis & Refactoring Techniques
 

.cursor/rules/git_workflow.mdc

@@ -0,0 +1,404 @@
+---
+description: Git workflow integrated with Task Master for feature development and collaboration
+globs: "**/*"
+alwaysApply: true
+---
+# Git Workflow with Task Master Integration
+
+## **Branch Strategy**
+
+### **Main Branch Protection**
+- **main** branch contains production-ready code
+- All feature development happens on task-specific branches
+- Direct commits to main are prohibited
+- All changes merge via Pull Requests
+
+### **Task Branch Naming**
+```bash
+# ✅ DO: Use consistent task branch naming
+task-001  # For Task 1
+task-004  # For Task 4
+task-015  # For Task 15
+
+# ❌ DON'T: Use inconsistent naming
+feature/user-auth
+fix-database-issue
+random-branch-name
+```
+
+## **Tagged Task Lists Integration**
+
+Task Master's **tagged task lists system** provides significant benefits for Git workflows:
+
+### **Multi-Context Development**
+- **Branch-Specific Tasks**: Each branch can have its own task context using tags
+- **Merge Conflict Prevention**: Tasks in different tags are completely isolated
+- **Context Switching**: Seamlessly switch between different development contexts
+- **Parallel Development**: Multiple team members can work on separate task contexts
+
+### **Migration and Compatibility**
+- **Seamless Migration**: Existing projects automatically migrate to use a "master" tag
+- **Zero Disruption**: All existing Git workflows continue unchanged
+- **Backward Compatibility**: Legacy projects work exactly as before
+
+### **Manual Git Integration**
+- **Manual Tag Creation**: Use `--from-branch` option to create tags from current git branch
+- **Manual Context Switching**: Explicitly switch tag contexts as needed for different branches
+- **Simplified Integration**: Focused on manual control rather than automatic workflows
+
+## **Workflow Overview**
+
+```mermaid
+flowchart TD
+    A[Start: On main branch] --> B[Pull latest changes]
+    B --> C[Create task branch<br/>git checkout -b task-XXX]
+    C --> D[Set task status: in-progress]
+    D --> E[Get task context & expand if needed<br/>Tasks automatically use current tag]
+    E --> F[Identify next subtask]
+    
+    F --> G[Set subtask: in-progress]
+    G --> H[Research & collect context<br/>update_subtask with findings]
+    H --> I[Implement subtask]
+    I --> J[Update subtask with completion]
+    J --> K[Set subtask: done]
+    K --> L[Git commit subtask]
+    
+    L --> M{More subtasks?}
+    M -->|Yes| F
+    M -->|No| N[Run final tests]
+    
+    N --> O[Commit tests if added]
+    O --> P[Push task branch]
+    P --> Q[Create Pull Request]
+    Q --> R[Human review & merge]
+    R --> S[Switch to main & pull]
+    S --> T[Delete task branch]
+    T --> U[Ready for next task]
+    
+    style A fill:#e1f5fe
+    style C fill:#f3e5f5
+    style G fill:#fff3e0
+    style L fill:#e8f5e8
+    style Q fill:#fce4ec
+    style R fill:#f1f8e9
+    style U fill:#e1f5fe
+```
+
+## **Complete Task Development Workflow**
+
+### **Phase 1: Task Preparation**
+```bash
+# 1. Ensure you're on main branch and pull latest
+git checkout main
+git pull origin main
+
+# 2. Check current branch status
+git branch  # Verify you're on main
+
+# 3. Create task-specific branch
+git checkout -b task-004  # For Task 4
+
+# 4. Set task status in Task Master (tasks automatically use current tag context)
+# Use: set_task_status tool or `task-master set-status --id=4 --status=in-progress`
+```
+
+### **Phase 2: Task Analysis & Planning**
+```bash
+# 5. Get task context and expand if needed (uses current tag automatically)
+# Use: get_task tool or `task-master show 4`
+# Use: expand_task tool or `task-master expand --id=4 --research --force` (if complex)
+
+# 6. Identify next subtask to work on
+# Use: next_task tool or `task-master next`
+```
+
+### **Phase 3: Subtask Implementation Loop**
+For each subtask, follow this pattern:
+
+```bash
+# 7. Mark subtask as in-progress
+# Use: set_task_status tool or `task-master set-status --id=4.1 --status=in-progress`
+
+# 8. Gather context and research (if needed)
+# Use: update_subtask tool with research flag or:
+# `task-master update-subtask --id=4.1 --prompt="Research findings..." --research`
+
+# 9. Collect code context through AI exploration
+# Document findings in subtask using update_subtask
+
+# 10. Implement the subtask
+# Write code, tests, documentation
+
+# 11. Update subtask with completion details
+# Use: update_subtask tool or:
+# `task-master update-subtask --id=4.1 --prompt="Implementation complete..."`
+
+# 12. Mark subtask as done
+# Use: set_task_status tool or `task-master set-status --id=4.1 --status=done`
+
+# 13. Commit the subtask implementation
+git add .
+git commit -m "feat(task-4): Complete subtask 4.1 - [Subtask Title]
+
+- Implementation details
+- Key changes made
+- Any important notes
+
+Subtask 4.1: [Brief description of what was accomplished]
+Relates to Task 4: [Main task title]"
+```
+
+### **Phase 4: Task Completion**
+```bash
+# 14. When all subtasks are complete, run final testing
+# Create test file if needed, ensure all tests pass
+npm test  # or jest, or manual testing
+
+# 15. If tests were added/modified, commit them
+git add .
+git commit -m "test(task-4): Add comprehensive tests for Task 4
+
+- Unit tests for core functionality
+- Integration tests for API endpoints
+- All tests passing
+
+Task 4: [Main task title] - Testing complete"
+
+# 16. Push the task branch
+git push origin task-004
+
+# 17. Create Pull Request
+# Title: "Task 4: [Task Title]"
+# Description should include:
+# - Task overview
+# - Subtasks completed
+# - Testing approach
+# - Any breaking changes or considerations
+```
+
+### **Phase 5: PR Merge & Cleanup**
+```bash
+# 18. Human reviews and merges PR into main
+
+# 19. Switch back to main and pull merged changes
+git checkout main
+git pull origin main
+
+# 20. Delete the feature branch (optional cleanup)
+git branch -d task-004
+git push origin --delete task-004
+```
+
+## **Commit Message Standards**
+
+### **Subtask Commits**
+```bash
+# ✅ DO: Consistent subtask commit format
+git commit -m "feat(task-4): Complete subtask 4.1 - Initialize Express server
+
+- Set up Express.js with TypeScript configuration
+- Added CORS and body parsing middleware
+- Implemented health check endpoints
+- Basic error handling middleware
+
+Subtask 4.1: Initialize project with npm and install dependencies
+Relates to Task 4: Setup Express.js Server Project"
+
+# ❌ DON'T: Vague or inconsistent commits
+git commit -m "fixed stuff"
+git commit -m "working on task"
+```
+
+### **Test Commits**
+```bash
+# ✅ DO: Separate test commits when substantial
+git commit -m "test(task-4): Add comprehensive tests for Express server setup
+
+- Unit tests for middleware configuration
+- Integration tests for health check endpoints
+- Mock tests for database connection
+- All tests passing with 95% coverage
+
+Task 4: Setup Express.js Server Project - Testing complete"
+```
+
+### **Commit Type Prefixes**
+- `feat(task-X):` - New feature implementation
+- `fix(task-X):` - Bug fixes
+- `test(task-X):` - Test additions/modifications
+- `docs(task-X):` - Documentation updates
+- `refactor(task-X):` - Code refactoring
+- `chore(task-X):` - Build/tooling changes
+
+## **Task Master Commands Integration**
+
+### **Essential Commands for Git Workflow**
+```bash
+# Task management (uses current tag context automatically)
+task-master show <id>           # Get task/subtask details
+task-master next                # Find next task to work on
+task-master set-status --id=<id> --status=<status>
+task-master update-subtask --id=<id> --prompt="..." --research
+
+# Task expansion (for complex tasks)
+task-master expand --id=<id> --research --force
+
+# Progress tracking
+task-master list                # View all tasks and status
+task-master list --status=in-progress  # View active tasks
+```
+
+### **MCP Tool Equivalents**
+When using Cursor or other MCP-integrated tools:
+- `get_task` instead of `task-master show`
+- `next_task` instead of `task-master next`
+- `set_task_status` instead of `task-master set-status`
+- `update_subtask` instead of `task-master update-subtask`
+
+## **Branch Management Rules**
+
+### **Branch Protection**
+```bash
+# ✅ DO: Always work on task branches
+git checkout -b task-005
+# Make changes
+git commit -m "..."
+git push origin task-005
+
+# ❌ DON'T: Commit directly to main
+git checkout main
+git commit -m "..."  # NEVER do this
+```
+
+### **Keeping Branches Updated**
+```bash
+# ✅ DO: Regularly sync with main (for long-running tasks)
+git checkout task-005
+git fetch origin
+git rebase origin/main  # or merge if preferred
+
+# Resolve any conflicts and continue
+```
+
+## **Pull Request Guidelines**
+
+### **PR Title Format**
+```
+Task <ID>: <Task Title>
+
+Examples:
+Task 4: Setup Express.js Server Project
+Task 7: Implement User Authentication
+Task 12: Add Stripe Payment Integration
+```
+
+### **PR Description Template**
+```markdown
+## Task Overview
+Brief description of the main task objective.
+
+## Subtasks Completed
+- [x] 4.1: Initialize project with npm and install dependencies
+- [x] 4.2: Configure TypeScript, ESLint and Prettier  
+- [x] 4.3: Create basic Express app with middleware and health check route
+
+## Implementation Details
+- Key architectural decisions made
+- Important code changes
+- Any deviations from original plan
+
+## Testing
+- [ ] Unit tests added/updated
+- [ ] Integration tests passing
+- [ ] Manual testing completed
+
+## Breaking Changes
+List any breaking changes or migration requirements.
+
+## Related Tasks
+Mention any dependent tasks or follow-up work needed.
+```
+
+## **Conflict Resolution**
+
+### **Task Conflicts with Tagged System**
+```bash
+# With tagged task lists, merge conflicts are significantly reduced:
+# 1. Different branches can use different tag contexts
+# 2. Tasks in separate tags are completely isolated
+# 3. Use Task Master's move functionality to reorganize if needed
+
+# Manual git integration available:
+# - Use `task-master add-tag --from-branch` to create tags from current branch
+# - Manually switch contexts with `task-master use-tag <name>`
+# - Simple, predictable workflow without automatic behavior
+```
+
+### **Code Conflicts**
+```bash
+# Standard Git conflict resolution
+git fetch origin
+git rebase origin/main
+# Resolve conflicts in files
+git add .
+git rebase --continue
+```
+
+## **Emergency Procedures**
+
+### **Hotfixes**
+```bash
+# For urgent production fixes:
+git checkout main
+git pull origin main
+git checkout -b hotfix-urgent-issue
+
+# Make minimal fix
+git commit -m "hotfix: Fix critical production issue
+
+- Specific fix description
+- Minimal impact change
+- Requires immediate deployment"
+
+git push origin hotfix-urgent-issue
+# Create emergency PR for immediate review
+```
+
+### **Task Abandonment**
+```bash
+# If task needs to be abandoned or significantly changed:
+# 1. Update task status
+task-master set-status --id=<id> --status=cancelled
+
+# 2. Clean up branch
+git checkout main
+git branch -D task-<id>
+git push origin --delete task-<id>
+
+# 3. Document reasoning in task
+task-master update-task --id=<id> --prompt="Task cancelled due to..."
+```
+
+## **Tagged System Benefits for Git Workflows**
+
+### **Multi-Team Development**
+- **Isolated Contexts**: Different teams can work on separate tag contexts without conflicts
+- **Feature Branches**: Each feature branch can have its own task context
+- **Release Management**: Separate tags for different release versions or environments
+
+### **Merge Conflict Prevention**
+- **Context Separation**: Tasks in different tags don't interfere with each other
+- **Clean Merges**: Reduced likelihood of task-related merge conflicts
+- **Parallel Development**: Multiple developers can work simultaneously without task conflicts
+
+### **Manual Git Integration**
+- **Branch-Based Tag Creation**: Use `--from-branch` option to create tags from current git branch
+- **Manual Context Management**: Explicitly switch tag contexts as needed
+- **Predictable Workflow**: Simple, manual control without automatic behavior
+
+---
+
+**References:**
+- [Task Master Workflow](mdc:.cursor/rules/dev_workflow.mdc)
+- [Architecture Guidelines](mdc:.cursor/rules/architecture.mdc)
+- [Task Master Commands](mdc:.cursor/rules/taskmaster.mdc)

.cursor/rules/glossary.mdc

@@ -3,24 +3,24 @@ description: Glossary of other Cursor rules
 globs: **/*
 alwaysApply: true
 ---
-
 # Glossary of Task Master Cursor Rules
 
 This file provides a quick reference to the purpose of each rule file located in the `.cursor/rules` directory.
 
-- **[`architecture.mdc`](mdc:.cursor/rules/architecture.mdc)**: Describes the high-level architecture of the Task Master CLI application.
+- **[`architecture.mdc`](mdc:.cursor/rules/architecture.mdc)**: Describes the high-level architecture of the Task Master CLI application, including the new tagged task lists system.
 - **[`changeset.mdc`](mdc:.cursor/rules/changeset.mdc)**: Guidelines for using Changesets (npm run changeset) to manage versioning and changelogs.
 - **[`commands.mdc`](mdc:.cursor/rules/commands.mdc)**: Guidelines for implementing CLI commands using Commander.js.
 - **[`cursor_rules.mdc`](mdc:.cursor/rules/cursor_rules.mdc)**: Guidelines for creating and maintaining Cursor rules to ensure consistency and effectiveness.
-- **[`dependencies.mdc`](mdc:.cursor/rules/dependencies.mdc)**: Guidelines for managing task dependencies and relationships.
-- **[`dev_workflow.mdc`](mdc:.cursor/rules/dev_workflow.mdc)**: Guide for using Task Master to manage task-driven development workflows.
+- **[`dependencies.mdc`](mdc:.cursor/rules/dependencies.mdc)**: Guidelines for managing task dependencies and relationships across tagged task contexts.
+- **[`dev_workflow.mdc`](mdc:.cursor/rules/dev_workflow.mdc)**: Guide for using Task Master to manage task-driven development workflows with tagged task lists support.
 - **[`glossary.mdc`](mdc:.cursor/rules/glossary.mdc)**: This file; provides a glossary of other Cursor rules.
 - **[`mcp.mdc`](mdc:.cursor/rules/mcp.mdc)**: Guidelines for implementing and interacting with the Task Master MCP Server.
-- **[`new_features.mdc`](mdc:.cursor/rules/new_features.mdc)**: Guidelines for integrating new features into the Task Master CLI.
+- **[`new_features.mdc`](mdc:.cursor/rules/new_features.mdc)**: Guidelines for integrating new features into the Task Master CLI with tagged system considerations.
 - **[`self_improve.mdc`](mdc:.cursor/rules/self_improve.mdc)**: Guidelines for continuously improving Cursor rules based on emerging code patterns and best practices.
-- **[`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)**: Comprehensive reference for Taskmaster MCP tools and CLI commands.
-- **[`tasks.mdc`](mdc:.cursor/rules/tasks.mdc)**: Guidelines for implementing task management operations.
+- **[`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)**: Comprehensive reference for Taskmaster MCP tools and CLI commands with tagged task lists information.
+- **[`tasks.mdc`](mdc:.cursor/rules/tasks.mdc)**: Guidelines for implementing task management operations with tagged task lists system support.
 - **[`tests.mdc`](mdc:.cursor/rules/tests.mdc)**: Guidelines for implementing and maintaining tests for Task Master CLI.
 - **[`ui.mdc`](mdc:.cursor/rules/ui.mdc)**: Guidelines for implementing and maintaining user interface components.
-- **[`utilities.mdc`](mdc:.cursor/rules/utilities.mdc)**: Guidelines for implementing utility functions.
+- **[`utilities.mdc`](mdc:.cursor/rules/utilities.mdc)**: Guidelines for implementing utility functions including tagged task lists utilities.
+- **[`telemetry.mdc`](mdc:.cursor/rules/telemetry.mdc)**: Guidelines for integrating AI usage telemetry across Task Master.
 

.cursor/rules/mcp.mdc

@@ -3,7 +3,6 @@ description: Guidelines for implementing and interacting with the Task Master MC
 globs: mcp-server/src/**/*, scripts/modules/**/*
 alwaysApply: false
 ---
-
 # Task Master MCP Server Guidelines
 
 This document outlines the architecture and implementation patterns for the Task Master Model Context Protocol (MCP) server, designed for integration with tools like Cursor.
@@ -90,69 +89,54 @@ When implementing a new direct function in `mcp-server/src/core/direct-functions
      ```
 
 5. **Handling Logging Context (`mcpLog`)**:
-   - **Requirement**: Core functions that use the internal `report` helper function (common in `task-manager.js`, `dependency-manager.js`, etc.) expect the `options` object to potentially contain an `mcpLog` property. This `mcpLog` object **must** have callable methods for each log level (e.g., `mcpLog.info(...)`, `mcpLog.error(...)`).
-   - **Challenge**: The `log` object provided by FastMCP to the direct function's context, while functional, might not perfectly match this expected structure or could change in the future. Passing it directly can lead to runtime errors like `mcpLog[level] is not a function`.
-   - **Solution: The Logger Wrapper Pattern**: To reliably bridge the FastMCP `log` object and the core function's `mcpLog` expectation, use a simple wrapper object within the direct function:
+   - **Requirement**: Core functions (like those in `task-manager.js`) may accept an `options` object containing an optional `mcpLog` property. If provided, the core function expects this object to have methods like `mcpLog.info(...)`, `mcpLog.error(...)`.
+   - **Solution: The Logger Wrapper Pattern**: When calling a core function from a direct function, pass the `log` object provided by FastMCP *wrapped* in the standard `logWrapper` object. This ensures the core function receives a logger with the expected method structure.
      ```javascript
      // Standard logWrapper pattern within a Direct Function
      const logWrapper = {
        info: (message, ...args) => log.info(message, ...args),
        warn: (message, ...args) => log.warn(message, ...args),
        error: (message, ...args) => log.error(message, ...args),
-       debug: (message, ...args) => log.debug && log.debug(message, ...args), // Handle optional debug
-       success: (message, ...args) => log.info(message, ...args) // Map success to info if needed
+       debug: (message, ...args) => log.debug && log.debug(message, ...args),
+       success: (message, ...args) => log.info(message, ...args)
      };
 
      // ... later when calling the core function ...
      await coreFunction(
        // ... other arguments ...
-       tasksPath, 
-       taskId,
        { 
          mcpLog: logWrapper, // Pass the wrapper object
-         session 
+         session // Also pass session if needed by core logic or AI service
        },
        'json' // Pass 'json' output format if supported by core function
      );
      ```
-   - **Critical For JSON Output Format**: Passing the `logWrapper` as `mcpLog` serves a dual purpose:
-     1. **Prevents Runtime Errors**: It ensures the `mcpLog[level](...)` calls within the core function succeed
-     2. **Controls Output Format**: In functions like `updateTaskById` and `updateSubtaskById`, the presence of `mcpLog` in the options triggers setting `outputFormat = 'json'` (instead of 'text'). This prevents UI elements (spinners, boxes) from being generated, which would break the JSON response.
-   - **Proven Solution**: This pattern has successfully fixed multiple issues in our MCP tools (including `update-task` and `update-subtask`), where direct passing of the `log` object or omitting `mcpLog` led to either runtime errors or JSON parsing failures from UI output.
-   - **When To Use**: Implement this wrapper in any direct function that calls a core function with an `options` object that might use `mcpLog` for logging or output format control.
-   - **Why it Works**: The `logWrapper` explicitly defines the `.info()`, `.warn()`, `.error()`, etc., methods that the core function's `report` helper needs, ensuring the `mcpLog[level](...)` call succeeds. It simply forwards the logging calls to the actual FastMCP `log` object.
-   - **Combined with Silent Mode**: Remember that using the `logWrapper` for `mcpLog` is **necessary *in addition* to using `enableSilentMode()` / `disableSilentMode()`** (see next point). The wrapper handles structured logging *within* the core function, while silent mode suppresses direct `console.log` and UI elements (spinners, boxes) that would break the MCP JSON response.
+   - **JSON Output**: Passing `mcpLog` (via the wrapper) often triggers the core function to use a JSON-friendly output format, suppressing spinners/boxes.
+   - ✅ **DO**: Implement this pattern in direct functions calling core functions that might use `mcpLog`.
 
 6. **Silent Mode Implementation**:
-    - ✅ **DO**: Import silent mode utilities at the top: `import { enableSilentMode, disableSilentMode, isSilentMode } from '../../../../scripts/modules/utils.js';`
-    - ✅ **DO**: Ensure core Task Master functions called from direct functions do **not** pollute `stdout` with console output (banners, spinners, logs) that would break MCP's JSON communication.
-      - **Preferred**: Modify the core function to accept an `outputFormat: 'json'` parameter and check it internally before printing UI elements. Pass `'json'` from the direct function.
-      - **Required Fallback/Guarantee**: If the core function cannot be modified or its output suppression is unreliable, **wrap the core function call** within the direct function using `enableSilentMode()` / `disableSilentMode()` in a `try/finally` block. This guarantees no console output interferes with the MCP response.
-    - ✅ **DO**: Use `isSilentMode()` function to check global silent mode status if needed (rare in direct functions), NEVER access the global `silentMode` variable directly.
-    - ❌ **DON'T**: Wrap AI client initialization or AI API calls in `enable/disableSilentMode`; their logging is controlled via the `log` object (passed potentially within the `logWrapper` for core functions).
-    - ❌ **DON'T**: Assume a core function is silent just because it *should* be. Verify or use the `enable/disableSilentMode` wrapper.
-    - **Example (Direct Function Guaranteeing Silence and using Log Wrapper)**:
+    - ✅ **DO**: Import silent mode utilities: `import { enableSilentMode, disableSilentMode, isSilentMode } from '../../../../scripts/modules/utils.js';`
+    - ✅ **DO**: Wrap core function calls *within direct functions* using `enableSilentMode()` / `disableSilentMode()` in a `try/finally` block if the core function might produce console output (spinners, boxes, direct `console.log`) that isn't reliably controlled by passing `{ mcpLog }` or an `outputFormat` parameter.
+    - ✅ **DO**: Always disable silent mode in the `finally` block.
+    - ❌ **DON'T**: Wrap calls to the unified AI service (`generateTextService`, `generateObjectService`) in silent mode; their logging is handled internally.
+    - **Example (Direct Function Guaranteeing Silence & using Log Wrapper)**:
       ```javascript
       export async function coreWrapperDirect(args, log, context = {}) {
         const { session } = context;
         const tasksPath = findTasksJsonPath(args, log);
-        
-        // Create the logger wrapper
-        const logWrapper = { /* ... as defined above ... */ };
+        const logWrapper = { /* ... */ };
 
         enableSilentMode(); // Ensure silence for direct console output
         try {
-          // Call core function, passing wrapper and 'json' format
           const result = await coreFunction(
-             tasksPath, 
-             args.param1, 
-             { mcpLog: logWrapper, session }, 
-             'json' // Explicitly request JSON format if supported
-          ); 
+             tasksPath,
+             args.param1,
+             { mcpLog: logWrapper, session }, // Pass context
+             'json' // Request JSON format if supported
+          );
           return { success: true, data: result };
         } catch (error) {
            log.error(`Error: ${error.message}`);
-           // Return standardized error object
            return { success: false, error: { /* ... */ } };
         } finally {
            disableSilentMode(); // Critical: Always disable in finally
@@ -163,32 +147,6 @@ When implementing a new direct function in `mcp-server/src/core/direct-functions
 7. **Debugging MCP/Core Logic Interaction**:
     - ✅ **DO**: If an MCP tool fails with unclear errors (like JSON parsing failures), run the equivalent `task-master` CLI command in the terminal. The CLI often provides more detailed error messages originating from the core logic (e.g., `ReferenceError`, stack traces) that are obscured by the MCP layer.
 
-### Specific Guidelines for AI-Based Direct Functions
-
-Direct functions that interact with AI (e.g., `addTaskDirect`, `expandTaskDirect`) have additional responsibilities:
-
-- **Context Parameter**: These functions receive an additional `context` object as their third parameter. **Critically, this object should only contain `{ session }`**. Do NOT expect or use `reportProgress` from this context.
-  ```javascript
-  export async function yourAIDirect(args, log, context = {}) {
-    const { session } = context; // Only expect session
-    // ...
-  }
-  ```
-- **AI Client Initialization**:
-  - ✅ **DO**: Use the utilities from [`mcp-server/src/core/utils/ai-client-utils.js`](mdc:mcp-server/src/core/utils/ai-client-utils.js) (e.g., `getAnthropicClientForMCP(session, log)`) to get AI client instances. These correctly use the `session` object to resolve API keys.
-  - ✅ **DO**: Wrap client initialization in a try/catch block and return a specific `AI_CLIENT_ERROR` on failure.
-- **AI Interaction**:
-  - ✅ **DO**: Build prompts using helper functions where appropriate (e.g., from `ai-prompt-helpers.js`).
-  - ✅ **DO**: Make the AI API call using appropriate helpers (e.g., `_handleAnthropicStream`). Pass the `log` object to these helpers for internal logging. **Do NOT pass `reportProgress`**.
-  - ✅ **DO**: Parse the AI response using helpers (e.g., `parseTaskJsonResponse`) and handle parsing errors with a specific code (e.g., `RESPONSE_PARSING_ERROR`).
-- **Calling Core Logic**:
-  - ✅ **DO**: After successful AI interaction, call the relevant core Task Master function (from `scripts/modules/`) if needed (e.g., `addTaskDirect` calls `addTask`).
-  - ✅ **DO**: Pass necessary data, including potentially the parsed AI results, to the core function.
-  - ✅ **DO**: If the core function can produce console output, call it with an `outputFormat: 'json'` argument (or similar, depending on the function) to suppress CLI output. Ensure the core function is updated to respect this. Use `enableSilentMode/disableSilentMode` around the core function call as a fallback if `outputFormat` is not supported or insufficient.
-- **Progress Indication**:
-  - ❌ **DON'T**: Call `reportProgress` within the direct function.
-  - ✅ **DO**: If intermediate progress status is needed *within* the long-running direct function, use standard logging: `log.info('Progress: Processing AI response...')`.
-
 ## Tool Definition and Execution
 
 ### Tool Structure
@@ -221,151 +179,78 @@ server.addTool({
 The `execute` function receives validated arguments and the FastMCP context:
 
 ```javascript
-// Standard signature
-execute: async (args, context) => {
-  // Tool implementation
-}
-
 // Destructured signature (recommended)
-execute: async (args, { log, reportProgress, session }) => {
+execute: async (args, { log, session }) => {
   // Tool implementation
 }
 ```
 
-- **args**: The first parameter contains all the validated parameters defined in the tool's schema.
-- **context**: The second parameter is an object containing `{ log, reportProgress, session }` provided by FastMCP.
-  - ✅ **DO**: Use `{ log, session }` when calling direct functions.
-  - ⚠️ **WARNING**: Avoid passing `reportProgress` down to direct functions due to client compatibility issues. See Progress Reporting Convention below.
+- **args**: Validated parameters.
+- **context**: Contains `{ log, session }` from FastMCP. (Removed `reportProgress`).
 
-### Standard Tool Execution Pattern
+### Standard Tool Execution Pattern with Path Normalization (Updated)
 
-The `execute` method within each MCP tool (in `mcp-server/src/tools/*.js`) should follow this standard pattern:
+To ensure consistent handling of project paths across different client environments (Windows, macOS, Linux, WSL) and input formats (e.g., `file:///...`, URI encoded paths), all MCP tool `execute` methods that require access to the project root **MUST** be wrapped with the `withNormalizedProjectRoot` Higher-Order Function (HOF).
 
-1.  **Log Entry**: Log the start of the tool execution with relevant arguments.
-2.  **Get Project Root**: Use the `getProjectRootFromSession(session, log)` utility (from [`tools/utils.js`](mdc:mcp-server/src/tools/utils.js)) to extract the project root path from the client session. Fall back to `args.projectRoot` if the session doesn't provide a root.
-3.  **Call Direct Function**: Invoke the corresponding `*Direct` function wrapper (e.g., `listTasksDirect` from [`task-master-core.js`](mdc:mcp-server/src/core/task-master-core.js)), passing an updated `args` object that includes the resolved `projectRoot`. Crucially, the third argument (context) passed to the direct function should **only include `{ log, session }`**. **Do NOT pass `reportProgress`**.
-    ```javascript
-    // Example call to a non-AI direct function
-    const result = await someDirectFunction({ ...args, projectRoot }, log); 
-    
-    // Example call to an AI-based direct function
-    const resultAI = await someAIDirect({ ...args, projectRoot }, log, { session }); 
-    ```
-4.  **Handle Result**: Receive the result object (`{ success, data/error, fromCache }`) from the `*Direct` function.
-5.  **Format Response**: Pass this result object to the `handleApiResult` utility (from [`tools/utils.js`](mdc:mcp-server/src/tools/utils.js)) for standardized MCP response formatting and error handling.
-6.  **Return**: Return the formatted response object provided by `handleApiResult`.
+This HOF, defined in [`mcp-server/src/tools/utils.js`](mdc:mcp-server/src/tools/utils.js), performs the following before calling the tool's core logic:
+
+1.  **Determines the Raw Root:** It prioritizes `args.projectRoot` if provided by the client, otherwise it calls `getRawProjectRootFromSession` to extract the path from the session.
+2.  **Normalizes the Path:** It uses the `normalizeProjectRoot` helper to decode URIs, strip `file://` prefixes, fix potential Windows drive letter prefixes (e.g., `/C:/`), convert backslashes (`\`) to forward slashes (`/`), and resolve the path to an absolute path suitable for the server's OS.
+3.  **Injects Normalized Path:** It updates the `args` object by replacing the original `projectRoot` (or adding it) with the normalized, absolute path.
+4.  **Executes Original Logic:** It calls the original `execute` function body, passing the updated `args` object.
+
+**Implementation Example:**
 
 ```javascript
-// Example execute method structure for a tool calling an AI-based direct function
-import { getProjectRootFromSession, handleApiResult, createErrorResponse } from './utils.js';
-import { someAIDirectFunction } from '../core/task-master-core.js';
+// In mcp-server/src/tools/your-tool.js
+import {
+    handleApiResult,
+    createErrorResponse,
+    withNormalizedProjectRoot // <<< Import HOF
+} from './utils.js';
+import { yourDirectFunction } from '../core/task-master-core.js';
+import { findTasksJsonPath } from '../core/utils/path-utils.js'; // If needed
 
-// ... inside server.addTool({...})
-execute: async (args, { log, session }) => { // Note: reportProgress is omitted here
-  try {
-    log.info(`Starting AI tool execution with args: ${JSON.stringify(args)}`);
+export function registerYourTool(server) {
+    server.addTool({
+        name: "your_tool",
+        description: "...".
+        parameters: z.object({
+            // ... other parameters ...
+            projectRoot: z.string().optional().describe('...') // projectRoot is optional here, HOF handles fallback
+        }),
+        // Wrap the entire execute function
+        execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+            // args.projectRoot is now guaranteed to be normalized and absolute
+            const { /* other args */, projectRoot } = args;
 
-    // 1. Get Project Root
-    let rootFolder = getProjectRootFromSession(session, log);
-    if (!rootFolder && args.projectRoot) { // Fallback if needed
-      rootFolder = args.projectRoot;
-      log.info(`Using project root from args as fallback: ${rootFolder}`);
-    }
+            try {
+                log.info(`Executing your_tool with normalized root: ${projectRoot}`);
 
-    // 2. Call AI-Based Direct Function (passing only log and session in context)
-    const result = await someAIDirectFunction({
-      ...args,
-      projectRoot: rootFolder // Ensure projectRoot is explicitly passed
-    }, log, { session }); // Pass session here, NO reportProgress
+                // Resolve paths using the normalized projectRoot
+                let tasksPath = findTasksJsonPath({ projectRoot, file: args.file }, log);
 
-    // 3. Handle and Format Response
-    return handleApiResult(result, log);
+                // Call direct function, passing normalized projectRoot if needed by direct func
+                const result = await yourDirectFunction(
+                    {
+                        /* other args */,
+                        projectRoot // Pass it if direct function needs it
+                    },
+                    log,
+                    { session }
+                );
 
-  } catch (error) {
-    log.error(`Error during AI tool execution: ${error.message}`);
-    return createErrorResponse(error.message);
-  }
+                return handleApiResult(result, log);
+            } catch (error) {
+                log.error(`Error in your_tool: ${error.message}`);
+                return createErrorResponse(error.message);
+            }
+        }) // End HOF wrap
+    });
 }
 ```
 
-### Using AsyncOperationManager for Background Tasks
-
-For tools that execute potentially long-running operations *where the AI call is just one part* (e.g., `expand-task`, `update`), use the AsyncOperationManager. The `add-task` command, as refactored, does *not* require this in the MCP tool layer because the direct function handles the primary AI work and returns the final result synchronously from the perspective of the MCP tool.
-
-For tools that *do* use `AsyncOperationManager`:
-
-```javascript
-import { AsyncOperationManager } from '../utils/async-operation-manager.js'; // Correct path assuming utils location
-import { getProjectRootFromSession, createContentResponse, createErrorResponse } from './utils.js';
-import { someIntensiveDirect } from '../core/task-master-core.js';
-
-// ... inside server.addTool({...})
-execute: async (args, { log, session }) => { // Note: reportProgress omitted
-  try {
-    log.info(`Starting background operation with args: ${JSON.stringify(args)}`);
-
-    // 1. Get Project Root
-    let rootFolder = getProjectRootFromSession(session, log);
-    if (!rootFolder && args.projectRoot) {
-      rootFolder = args.projectRoot;
-      log.info(`Using project root from args as fallback: ${rootFolder}`);
-    }
-    
-    // Create operation description
-    const operationDescription = `Expanding task ${args.id}...`; // Example
-
-    // 2. Start async operation using AsyncOperationManager
-    const operation = AsyncOperationManager.createOperation(
-      operationDescription,
-      async (reportProgressCallback) => { // This callback is provided by AsyncOperationManager
-        // This runs in the background
-        try {
-          // Report initial progress *from the manager's callback*
-          reportProgressCallback({ progress: 0, status: 'Starting operation...' });
-
-          // Call the direct function (passing only session context)
-          const result = await someIntensiveDirect(
-            { ...args, projectRoot: rootFolder }, 
-            log, 
-            { session } // Pass session, NO reportProgress
-          );
-
-          // Report final progress *from the manager's callback*
-          reportProgressCallback({
-            progress: 100,
-            status: result.success ? 'Operation completed' : 'Operation failed',
-            result: result.data, // Include final data if successful
-            error: result.error   // Include error object if failed
-          });
-
-          return result; // Return the direct function's result
-        } catch (error) {
-          // Handle errors within the async task
-           reportProgressCallback({
-            progress: 100,
-            status: 'Operation failed critically',
-            error: { message: error.message, code: error.code || 'ASYNC_OPERATION_FAILED' }
-          });
-          throw error; // Re-throw for the manager to catch
-        }
-      }
-    );
-
-    // 3. Return immediate response with operation ID
-    return {
-        status: 202, // StatusCodes.ACCEPTED
-        body: {
-            success: true,
-            message: 'Operation started',
-            operationId: operation.id
-        }
-    };
-  } catch (error) {
-    log.error(`Error starting background operation: ${error.message}`);
-    return createErrorResponse(`Failed to start operation: ${error.message}`); // Use standard error response
-  }
-}
-```
+By using this HOF, the core logic within the `execute` method and any downstream functions (like `findTasksJsonPath` or direct functions) can reliably expect `args.projectRoot` to be a clean, absolute path suitable for the server environment.
 
 ### Project Initialization Tool
 
@@ -417,19 +302,13 @@ log.error(`Error occurred: ${error.message}`, { stack: error.stack });
 log.info('Progress: 50% - AI call initiated...'); // Example progress logging
 ```
 
-### Progress Reporting Convention
-
-- ⚠️ **DEPRECATED within Direct Functions**: The `reportProgress` function passed in the `context` object should **NOT** be called from within `*Direct` functions. Doing so can cause client-side validation errors due to missing/incorrect `progressToken` handling.
-- ✅ **DO**: For tools using `AsyncOperationManager`, use the `reportProgressCallback` function *provided by the manager* within the background task definition (as shown in the `AsyncOperationManager` example above) to report progress updates for the *overall operation*.
-- ✅ **DO**: If finer-grained progress needs to be indicated *during* the execution of a `*Direct` function (whether called directly or via `AsyncOperationManager`), use `log.info()` statements (e.g., `log.info('Progress: Parsing AI response...')`).
-
-### Session Usage Convention
+## Session Usage Convention
 
 The `session` object (destructured from `context`) contains authenticated session data and client information.
 
 - **Authentication**: Access user-specific data (`session.userId`, etc.) if authentication is implemented.
 - **Project Root**: The primary use in Task Master is accessing `session.roots` to determine the client's project root directory via the `getProjectRootFromSession` utility (from [`tools/utils.js`](mdc:mcp-server/src/tools/utils.js)). See the Standard Tool Execution Pattern above.
-- **Environment Variables**: The `session.env` object is critical for AI tools. Pass the `session` object to the `*Direct` function's context, and then to AI client utility functions (like `getAnthropicClientForMCP`) which will extract API keys and other relevant environment settings (e.g., `MODEL`, `MAX_TOKENS`) from `session.env`.
+- **Environment Variables**: The `session.env` object provides access to environment variables set in the MCP client configuration (e.g., `.cursor/mcp.json`). This is the **primary mechanism** for the unified AI service layer (`ai-services-unified.js`) to securely access **API keys** when called from MCP context.
 - **Capabilities**: Can be used to check client capabilities (`session.clientCapabilities`).
 
 ## Direct Function Wrappers (`*Direct`)
@@ -438,24 +317,25 @@ These functions, located in `mcp-server/src/core/direct-functions/`, form the co
 
 - **Purpose**: Bridge MCP tools and core Task Master modules (`scripts/modules/*`). Handle AI interactions if applicable.
 - **Responsibilities**:
-  - Receive `args` (including the `projectRoot` determined by the tool), `log` object, and optionally a `context` object (containing **only `{ session }` if needed).
-  - **Find `tasks.json`**: Use `findTasksJsonPath(args, log)` from [`core/utils/path-utils.js`](mdc:mcp-server/src/core/utils/path-utils.js).
-  - Validate arguments specific to the core logic.
-  - **Handle AI Logic (if applicable)**: Initialize AI clients (using `session` from context), build prompts, make AI calls, parse responses.
-  - **Implement Caching (if applicable)**: Use `getCachedOrExecute` from [`tools/utils.js`](mdc:mcp-server/src/tools/utils.js) for read operations.
-  - **Call Core Logic**: Call the underlying function from the core Task Master modules, passing necessary data (including AI results if applicable).
-    - ✅ **DO**: Pass `outputFormat: 'json'` (or similar) to the core function if it might produce console output.
-    - ✅ **DO**: Wrap the core function call with `enableSilentMode/disableSilentMode` if necessary.
-  - Handle errors gracefully (AI errors, core logic errors, file errors).
-  - Return a standardized result object: `{ success: boolean, data?: any, error?: { code: string, message: string }, fromCache?: boolean }`.
-  - ❌ **DON'T**: Call `reportProgress`. Use `log.info` for progress indication if needed.
+  - Receive `args` (including `projectRoot`), `log`, and optionally `{ session }` context.
+  - Find `tasks.json` using `findTasksJsonPath`.
+  - Validate arguments.
+  - **Implement Caching (if applicable)**: Use `getCachedOrExecute`.
+  - **Call Core Logic**: Invoke function from `scripts/modules/*`.
+    - Pass `outputFormat: 'json'` if applicable.
+    - Wrap with `enableSilentMode/disableSilentMode` if needed.
+    - Pass `{ mcpLog: logWrapper, session }` context if core logic needs it.
+  - Handle errors.
+  - Return standardized result object.
+  - ❌ **DON'T**: Call `reportProgress`.
+  - ❌ **DON'T**: Initialize AI clients or call AI services directly.
 
 ## Key Principles
 
 - **Prefer Direct Function Calls**: MCP tools should always call `*Direct` wrappers instead of `executeTaskMasterCommand`.
 - **Standardized Execution Flow**: Follow the pattern: MCP Tool -> `getProjectRootFromSession` -> `*Direct` Function -> Core Logic / AI Logic.
 - **Path Resolution via Direct Functions**: The `*Direct` function is responsible for finding the exact `tasks.json` path using `findTasksJsonPath`, relying on the `projectRoot` passed in `args`.
-- **AI Logic in Direct Functions**: For AI-based tools, the `*Direct` function handles AI client initialization, calls, and parsing, using the `session` object passed in its context.
+- **AI Logic in Core Modules**: AI interactions (prompt building, calling unified service) reside within the core logic functions (`scripts/modules/*`), not direct functions.
 - **Silent Mode in Direct Functions**: Wrap *core function* calls (from `scripts/modules`) with `enableSilentMode()` and `disableSilentMode()` if they produce console output not handled by `outputFormat`. Do not wrap AI calls.
 - **Selective Async Processing**: Use `AsyncOperationManager` in the *MCP Tool layer* for operations involving multiple steps or long waits beyond a single AI call (e.g., file processing + AI call + file writing). Simple AI calls handled entirely within the `*Direct` function (like `addTaskDirect`) may not need it at the tool layer.
 - **No `reportProgress` in Direct Functions**: Do not pass or use `reportProgress` within `*Direct` functions. Use `log.info()` for internal progress or report progress from the `AsyncOperationManager` callback in the MCP tool layer.
@@ -480,7 +360,7 @@ Follow these steps to add MCP support for an existing Task Master command (see [
 
 1.  **Ensure Core Logic Exists**: Verify the core functionality is implemented and exported from the relevant module in `scripts/modules/`. Ensure the core function can suppress console output (e.g., via an `outputFormat` parameter).
 
-2.  **Create Direct Function File in `mcp-server/src/core/direct-functions/`**:
+2. **Create Direct Function File in `mcp-server/src/core/direct-functions/`**:
     - Create a new file (e.g., `your-command.js`) using **kebab-case** naming.
     - Import necessary core functions, `findTasksJsonPath`, silent mode utilities, and potentially AI client/prompt utilities.
     - Implement `async function yourCommandDirect(args, log, context = {})` using **camelCase** with `Direct` suffix. **Remember `context` should only contain `{ session }` if needed (for AI keys/config).**
@@ -642,3 +522,8 @@ Follow these steps to add MCP support for an existing Task Master command (see [
       // Add more functions as implemented
     };
     ```
+
+## Telemetry Integration
+
+- Direct functions calling core logic that involves AI should receive and pass through `telemetryData` within their successful `data` payload. See [`telemetry.mdc`](mdc:.cursor/rules/telemetry.mdc) for the standard pattern.
+- MCP tools use `handleApiResult`, which ensures the `data` object (potentially including `telemetryData`) from the direct function is correctly included in the final response.

.cursor/rules/new_features.mdc

@@ -3,7 +3,6 @@ description: Guidelines for integrating new features into the Task Master CLI
 globs: scripts/modules/*.js
 alwaysApply: false
 ---
-
 # Task Master Feature Integration Guidelines
 
 ## Feature Placement Decision Process
@@ -25,11 +24,22 @@ alwaysApply: false
 The standard pattern for adding a feature follows this workflow:
 
 1. **Core Logic**: Implement the business logic in the appropriate module (e.g., [`task-manager.js`](mdc:scripts/modules/task-manager.js)).
-2. **UI Components**: Add any display functions to [`ui.js`](mdc:scripts/modules/ui.js) following [`ui.mdc`](mdc:.cursor/rules/ui.mdc).
-3. **Command Integration**: Add the CLI command to [`commands.js`](mdc:scripts/modules/commands.js) following [`commands.mdc`](mdc:.cursor/rules/commands.mdc).
-4. **Testing**: Write tests for all components of the feature (following [`tests.mdc`](mdc:.cursor/rules/tests.mdc))
-5. **Configuration**: Update any configuration in [`utils.js`](mdc:scripts/modules/utils.js) if needed, following [`utilities.mdc`](mdc:.cursor/rules/utilities.mdc).
-6. **Documentation**: Update help text and documentation in [dev_workflow.mdc](mdc:scripts/modules/dev_workflow.mdc)
+2. **Context Gathering (If Applicable)**: 
+   - For AI-powered commands that benefit from project context, use the standardized context gathering patterns from [`context_gathering.mdc`](mdc:.cursor/rules/context_gathering.mdc).
+   - Import `ContextGatherer` and `FuzzyTaskSearch` utilities for reusable context extraction.
+   - Support multiple context types: tasks, files, custom text, project tree.
+   - Implement detailed token breakdown display for transparency.
+3. **AI Integration (If Applicable)**: 
+   - Import necessary service functions (e.g., `generateTextService`, `streamTextService`) from [`ai-services-unified.js`](mdc:scripts/modules/ai-services-unified.js).
+   - Prepare parameters (`role`, `session`, `systemPrompt`, `prompt`).
+   - Call the service function.
+   - Handle the response (direct text or stream object).
+   - **Important**: Prefer `generateTextService` for calls sending large context (like stringified JSON) where incremental display is not needed. See [`ai_services.mdc`](mdc:.cursor/rules/ai_services.mdc) for detailed usage patterns and cautions.
+4. **UI Components**: Add any display functions to [`ui.js`](mdc:scripts/modules/ui.js) following [`ui.mdc`](mdc:.cursor/rules/ui.mdc). Consider enhanced formatting with syntax highlighting for code blocks.
+5. **Command Integration**: Add the CLI command to [`commands.js`](mdc:scripts/modules/commands.js) following [`commands.mdc`](mdc:.cursor/rules/commands.mdc).
+6. **Testing**: Write tests for all components of the feature (following [`tests.mdc`](mdc:.cursor/rules/tests.mdc))
+7. **Configuration**: Update configuration settings or add new ones in [`config-manager.js`](mdc:scripts/modules/config-manager.js) and ensure getters/setters are appropriate. Update documentation in [`utilities.mdc`](mdc:.cursor/rules/utilities.mdc) and [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc). Update the `.taskmasterconfig` structure if needed.
+8. **Documentation**: Update help text and documentation in [`dev_workflow.mdc`](mdc:.cursor/rules/dev_workflow.mdc) and [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc).
 
 ## Critical Checklist for New Features
 
@@ -190,6 +200,8 @@ The standard pattern for adding a feature follows this workflow:
   - ✅ **DO**: If an MCP tool fails with vague errors (e.g., JSON parsing issues like `Unexpected token ... is not valid JSON`), **try running the equivalent CLI command directly in the terminal** (e.g., `task-master expand --all`). CLI output often provides much more specific error messages (like missing function definitions or stack traces from the core logic) that pinpoint the root cause.
   - ❌ **DON'T**: Rely solely on MCP logs if the error is unclear; use the CLI as a complementary debugging tool for core logic issues.
 
+- **Telemetry Integration**: Ensure AI calls correctly handle and propagate `telemetryData` as described in [`telemetry.mdc`](mdc:.cursor/rules/telemetry.mdc).
+
 ```javascript
 // 1. CORE LOGIC: Add function to appropriate module (example in task-manager.js)
 /**
@@ -211,7 +223,29 @@ export {
 ```
 
 ```javascript
-// 2. UI COMPONENTS: Add display function to ui.js
+// 2. AI Integration: Add import and use necessary service functions
+import { generateTextService } from './ai-services-unified.js';
+
+// Example usage:
+async function handleAIInteraction() {
+  const role = 'user';
+  const session = 'exampleSession';
+  const systemPrompt = 'You are a helpful assistant.';
+  const prompt = 'What is the capital of France?';
+
+  const result = await generateTextService(role, session, systemPrompt, prompt);
+  console.log(result);
+}
+
+// Export from the module
+export {
+  // ... existing exports ...
+  handleAIInteraction,
+};
+```
+
+```javascript
+// 3. UI COMPONENTS: Add display function to ui.js
 /**
  * Display archive operation results
  * @param {string} archivePath - Path to the archive file
@@ -232,7 +266,7 @@ export {
 ```
 
 ```javascript
-// 3. COMMAND INTEGRATION: Add to commands.js
+// 4. COMMAND INTEGRATION: Add to commands.js
 import { archiveTasks } from './task-manager.js';
 import { displayArchiveResults } from './ui.js';
 
@@ -452,7 +486,7 @@ npm test
 For each new feature:
 
 1. Add help text to the command definition
-2. Update [`dev_workflow.mdc`](mdc:scripts/modules/dev_workflow.mdc) with command reference
+2. Update [`dev_workflow.mdc`](mdc:.cursor/rules/dev_workflow.mdc) with command reference
 3. Consider updating [`architecture.mdc`](mdc:.cursor/rules/architecture.mdc) if the feature significantly changes module responsibilities.
 
 Follow the existing command reference format:
@@ -495,14 +529,24 @@ Integrating Task Master commands with the MCP server (for use by tools like Curs
 
 4.  **Create MCP Tool (`mcp-server/src/tools/`)**:
     - Create a new file (e.g., `your-command.js`) using **kebab-case**.
-    - Import `zod`, `handleApiResult`, `createErrorResponse`, **`getProjectRootFromSession`**, and your `yourCommandDirect` function.
+    - Import `zod`, `handleApiResult`, **`withNormalizedProjectRoot` HOF**, and your `yourCommandDirect` function.
     - Implement `registerYourCommandTool(server)`.
-    - Define the tool `name` using **snake_case** (e.g., `your_command`).
-    - Define the `parameters` using `zod`. **Crucially, define `projectRoot` as optional**: `projectRoot: z.string().optional().describe(...)`. Include `file` if applicable.
-    - Implement the standard `async execute(args, { log, reportProgress, session })` method:
-      - Get `rootFolder` using `getProjectRootFromSession` (with fallback to `args.projectRoot`).
-      - Call `yourCommandDirect({ ...args, projectRoot: rootFolder }, log)`. 
-      - Pass the result to `handleApiResult(result, log, 'Error Message')`.
+    - **Define parameters**: Make `projectRoot` optional (`z.string().optional().describe(...)`) as the HOF handles fallback.
+    - Consider if this operation should run in the background using `AsyncOperationManager`.
+    - Implement the standard `execute` method **wrapped with `withNormalizedProjectRoot`**:
+      ```javascript
+      execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+          // args.projectRoot is now normalized
+          const { projectRoot /*, other args */ } = args;
+          // ... resolve tasks path if needed using normalized projectRoot ...
+          const result = await yourCommandDirect(
+              { /* other args */, projectRoot /* if needed by direct func */ }, 
+              log, 
+              { session }
+          );
+          return handleApiResult(result, log);
+      })
+      ```
 
 5.  **Register Tool**: Import and call `registerYourCommandTool` in `mcp-server/src/tools/index.js`.
 
@@ -590,3 +634,287 @@ When implementing project initialization commands:
      });
    }
    ```
+
+## Feature Planning
+
+- **Core Logic First**:
+  - ✅ DO: Implement core logic in `scripts/modules/` before CLI or MCP interfaces
+  - ✅ DO: Consider tagged task lists system compatibility from the start
+  - ✅ DO: Design functions to work with both legacy and tagged data formats
+  - ✅ DO: Use tag resolution functions (`getTasksForTag`, `setTasksForTag`) for task data access
+  - ❌ DON'T: Directly manipulate tagged data structure in new features
+
+  ```javascript
+  // ✅ DO: Design tagged-aware core functions
+  async function newFeatureCore(tasksPath, featureParams, options = {}) {
+    const tasksData = readJSON(tasksPath);
+    const currentTag = getCurrentTag() || 'master';
+    const tasks = getTasksForTag(tasksData, currentTag);
+    
+    // Perform feature logic on tasks array
+    const result = performFeatureLogic(tasks, featureParams);
+    
+    // Save back using tag resolution
+    setTasksForTag(tasksData, currentTag, tasks);
+    writeJSON(tasksPath, tasksData);
+    
+    return result;
+  }
+  ```
+
+- **Backward Compatibility**:
+  - ✅ DO: Ensure new features work with existing projects seamlessly
+  - ✅ DO: Test with both legacy and tagged task data formats
+  - ✅ DO: Support silent migration during feature usage
+  - ❌ DON'T: Break existing workflows when adding tagged system features
+
+## CLI Command Implementation
+
+- **Command Structure**:
+  - ✅ DO: Follow the established pattern in [`commands.js`](mdc:scripts/modules/commands.js)
+  - ✅ DO: Use Commander.js for argument parsing
+  - ✅ DO: Include comprehensive help text and examples
+  - ✅ DO: Support tagged task context awareness
+
+  ```javascript
+  // ✅ DO: Implement CLI commands with tagged system awareness
+  program
+    .command('new-feature')
+    .description('Description of the new feature with tagged task lists support')
+    .option('-t, --tag <tag>', 'Specify tag context (defaults to current tag)')
+    .option('-p, --param <value>', 'Feature-specific parameter')
+    .option('--force', 'Force operation without confirmation')
+    .action(async (options) => {
+      try {
+        const projectRoot = findProjectRoot();
+        if (!projectRoot) {
+          console.error('Not in a Task Master project directory');
+          process.exit(1);
+        }
+        
+        // Use specified tag or current tag
+        const targetTag = options.tag || getCurrentTag() || 'master';
+        
+        const result = await newFeatureCore(
+          path.join(projectRoot, '.taskmaster', 'tasks', 'tasks.json'),
+          { param: options.param },
+          { 
+            force: options.force,
+            targetTag: targetTag,
+            outputFormat: 'text'
+          }
+        );
+        
+        console.log('Feature executed successfully');
+      } catch (error) {
+        console.error(`Error: ${error.message}`);
+        process.exit(1);
+      }
+    });
+  ```
+
+- **Error Handling**:
+  - ✅ DO: Provide clear error messages for common failures
+  - ✅ DO: Handle tagged system migration errors gracefully
+  - ✅ DO: Include suggestion for resolution when possible
+  - ✅ DO: Exit with appropriate codes for scripting
+
+## MCP Tool Implementation
+
+- **Direct Function Pattern**:
+  - ✅ DO: Create direct function wrappers in `mcp-server/src/core/direct-functions/`
+  - ✅ DO: Follow silent mode patterns to prevent console output interference
+  - ✅ DO: Use `findTasksJsonPath` for consistent path resolution
+  - ✅ DO: Ensure tagged system compatibility
+
+  ```javascript
+  // ✅ DO: Implement MCP direct functions with tagged awareness
+  export async function newFeatureDirect(args, log, context = {}) {
+    try {
+      const tasksPath = findTasksJsonPath(args, log);
+      
+      // Enable silent mode for clean MCP responses
+      enableSilentMode();
+      
+      try {
+        const result = await newFeatureCore(
+          tasksPath,
+          { param: args.param },
+          { 
+            force: args.force,
+            targetTag: args.tag || 'master', // Support tag specification
+            mcpLog: log,
+            session: context.session,
+            outputFormat: 'json'
+          }
+        );
+        
+        return {
+          success: true,
+          data: result,
+          fromCache: false
+        };
+      } finally {
+        disableSilentMode();
+      }
+    } catch (error) {
+      log.error(`Error in newFeatureDirect: ${error.message}`);
+      return {
+        success: false,
+        error: { code: 'FEATURE_ERROR', message: error.message },
+        fromCache: false
+      };
+    }
+  }
+  ```
+
+- **Tool Registration**:
+  - ✅ DO: Create tool definitions in `mcp-server/src/tools/`
+  - ✅ DO: Use Zod for parameter validation
+  - ✅ DO: Include optional tag parameter for multi-context support
+  - ✅ DO: Follow established naming conventions
+
+  ```javascript
+  // ✅ DO: Register MCP tools with tagged system support
+  export function registerNewFeatureTool(server) {
+    server.addTool({
+      name: "new_feature",
+      description: "Description of the new feature with tagged task lists support",
+      inputSchema: z.object({
+        param: z.string().describe("Feature-specific parameter"),
+        tag: z.string().optional().describe("Target tag context (defaults to current tag)"),
+        force: z.boolean().optional().describe("Force operation without confirmation"),
+        projectRoot: z.string().optional().describe("Project root directory")
+      }),
+      execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+        try {
+          const result = await newFeatureDirect(
+            { ...args, projectRoot: args.projectRoot },
+            log,
+            { session }
+          );
+          return handleApiResult(result, log);
+        } catch (error) {
+          return handleApiResult({
+            success: false,
+            error: { code: 'EXECUTION_ERROR', message: error.message }
+          }, log);
+        }
+      })
+    });
+  }
+  ```
+
+## Testing Strategy
+
+- **Unit Tests**:
+  - ✅ DO: Test core logic independently with both data formats
+  - ✅ DO: Mock file system operations appropriately
+  - ✅ DO: Test tag resolution behavior
+  - ✅ DO: Verify migration compatibility
+
+  ```javascript
+  // ✅ DO: Test new features with tagged system awareness
+  describe('newFeature', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+    
+    it('should work with legacy task format', async () => {
+      const legacyData = { tasks: [/* test data */] };
+      fs.readFileSync.mockReturnValue(JSON.stringify(legacyData));
+      
+      const result = await newFeatureCore('/test/tasks.json', { param: 'test' });
+      
+      expect(result).toBeDefined();
+      // Test legacy format handling
+    });
+    
+    it('should work with tagged task format', async () => {
+      const taggedData = { 
+        master: { tasks: [/* test data */] },
+        feature: { tasks: [/* test data */] }
+      };
+      fs.readFileSync.mockReturnValue(JSON.stringify(taggedData));
+      
+      const result = await newFeatureCore('/test/tasks.json', { param: 'test' });
+      
+      expect(result).toBeDefined();
+      // Test tagged format handling
+    });
+    
+    it('should handle tag migration during feature usage', async () => {
+      const legacyData = { tasks: [/* test data */] };
+      fs.readFileSync.mockReturnValue(JSON.stringify(legacyData));
+      
+      await newFeatureCore('/test/tasks.json', { param: 'test' });
+      
+      // Verify migration occurred
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        '/test/tasks.json',
+        expect.stringContaining('"master"')
+      );
+    });
+  });
+  ```
+
+- **Integration Tests**:
+  - ✅ DO: Test CLI and MCP interfaces with real task data
+  - ✅ DO: Verify end-to-end workflows across tag contexts
+  - ✅ DO: Test error scenarios and recovery
+
+## Documentation Updates
+
+- **Rule Updates**:
+  - ✅ DO: Update relevant `.cursor/rules/*.mdc` files
+  - ✅ DO: Include tagged system considerations in architecture docs
+  - ✅ DO: Add examples showing multi-context usage
+  - ✅ DO: Update workflow documentation as needed
+
+- **User Documentation**:
+  - ✅ DO: Add feature documentation to `/docs` folder
+  - ✅ DO: Include tagged system usage examples
+  - ✅ DO: Update command reference documentation
+  - ✅ DO: Provide migration notes if relevant
+
+## Migration Considerations
+
+- **Silent Migration Support**:
+  - ✅ DO: Ensure new features trigger migration when needed
+  - ✅ DO: Handle migration errors gracefully in feature code
+  - ✅ DO: Test feature behavior with pre-migration projects
+  - ❌ DON'T: Assume projects are already migrated
+
+- **Tag Context Handling**:
+  - ✅ DO: Default to current tag when not specified
+  - ✅ DO: Support explicit tag selection in advanced features
+  - ✅ DO: Validate tag existence before operations
+  - ✅ DO: Provide clear messaging about tag context
+
+## Performance Considerations
+
+- **Efficient Tag Operations**:
+  - ✅ DO: Minimize file I/O operations per feature execution
+  - ✅ DO: Cache tag resolution results when appropriate
+  - ✅ DO: Use streaming for large task datasets
+  - ❌ DON'T: Load all tags when only one is needed
+
+- **Memory Management**:
+  - ✅ DO: Process large task lists efficiently
+  - ✅ DO: Clean up temporary data structures
+  - ✅ DO: Avoid keeping all tag data in memory simultaneously
+
+## Deployment and Versioning
+
+- **Changesets**:
+  - ✅ DO: Create appropriate changesets for new features
+  - ✅ DO: Use semantic versioning (minor for new features)
+  - ✅ DO: Include tagged system information in release notes
+  - ✅ DO: Document breaking changes if any
+
+- **Feature Flags**:
+  - ✅ DO: Consider feature flags for experimental functionality
+  - ✅ DO: Ensure tagged system features work with flags
+  - ✅ DO: Provide clear documentation about flag usage
+
+By following these guidelines, new features will integrate smoothly with the Task Master ecosystem while supporting the enhanced tagged task lists system for multi-context development workflows.

.cursor/rules/self_improve.mdc

@@ -69,5 +69,4 @@ alwaysApply: true
   - 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.
+Follow [cursor_rules.mdc](mdc:.cursor/rules/cursor_rules.mdc) for proper rule formatting and structure.

.cursor/rules/tags.mdc

@@ -0,0 +1,229 @@
+---
+description: 
+globs: scripts/modules/*
+alwaysApply: false
+---
+# Tagged Task Lists Command Patterns
+
+This document outlines the standardized patterns that **ALL** Task Master commands must follow to properly support the tagged task lists system.
+
+## Core Principles
+
+- **Every command** that reads or writes tasks.json must be tag-aware
+- **Consistent tag resolution** across all commands using `getCurrentTag(projectRoot)`
+- **Proper context passing** to core functions with `{ projectRoot, tag }`
+- **Standardized CLI options** with `--tag <tag>` flag
+
+## Required Imports
+
+All command files must import `getCurrentTag`:
+
+```javascript
+// ✅ DO: Import getCurrentTag in commands.js
+import { 
+  log, 
+  readJSON, 
+  writeJSON, 
+  findProjectRoot, 
+  getCurrentTag 
+} from './utils.js';
+
+// ✅ DO: Import getCurrentTag in task-manager files
+import { 
+  readJSON, 
+  writeJSON, 
+  getCurrentTag 
+} from '../utils.js';
+```
+
+## CLI Command Pattern
+
+Every CLI command that operates on tasks must follow this exact pattern:
+
+```javascript
+// ✅ DO: Standard tag-aware CLI command pattern
+programInstance
+  .command('command-name')
+  .description('Command description')
+  .option('-f, --file <file>', 'Path to the tasks file', TASKMASTER_TASKS_FILE)
+  .option('--tag <tag>', 'Specify tag context for task operations') // REQUIRED
+  .action(async (options) => {
+    // 1. Find project root
+    const projectRoot = findProjectRoot();
+    if (!projectRoot) {
+      console.error(chalk.red('Error: Could not find project root.'));
+      process.exit(1);
+    }
+
+    // 2. Resolve tag using standard pattern
+    const tag = options.tag || getCurrentTag(projectRoot) || 'master';
+
+    // 3. Call core function with proper context
+    await coreFunction(
+      tasksPath,
+      // ... other parameters ...
+      { projectRoot, tag } // REQUIRED context object
+    );
+  });
+```
+
+## Core Function Pattern
+
+All core functions in `scripts/modules/task-manager/` must follow this pattern:
+
+```javascript
+// ✅ DO: Standard tag-aware core function pattern
+async function coreFunction(
+  tasksPath,
+  // ... other parameters ...
+  context = {} // REQUIRED context parameter
+) {
+  const { projectRoot, tag } = context;
+  
+  // Use tag-aware readJSON/writeJSON
+  const data = readJSON(tasksPath, projectRoot, tag);
+  
+  // ... function logic ...
+  
+  writeJSON(tasksPath, data, projectRoot, tag);
+}
+```
+
+## Tag Resolution Priority
+
+The tag resolution follows this exact priority order:
+
+1. **Explicit `--tag` flag**: `options.tag`
+2. **Current active tag**: `getCurrentTag(projectRoot)`  
+3. **Default fallback**: `'master'`
+
+```javascript
+// ✅ DO: Standard tag resolution pattern
+const tag = options.tag || getCurrentTag(projectRoot) || 'master';
+```
+
+## Commands Requiring Updates
+
+### High Priority (Core Task Operations)
+- [x] `add-task` - ✅ Fixed
+- [x] `list` - ✅ Fixed  
+- [x] `update-task` - ✅ Fixed
+- [x] `update-subtask` - ✅ Fixed
+- [x] `set-status` - ✅ Already correct
+- [x] `remove-task` - ✅ Already correct
+- [x] `remove-subtask` - ✅ Fixed
+- [x] `add-subtask` - ✅ Already correct
+- [x] `clear-subtasks` - ✅ Fixed
+- [x] `move-task` - ✅ Already correct
+
+### Medium Priority (Analysis & Expansion)
+- [x] `expand` - ✅ Fixed
+- [ ] `next` - ✅ Fixed
+- [ ] `show` (get-task) - Needs checking
+- [ ] `analyze-complexity` - Needs checking
+- [ ] `generate` - ✅ Fixed
+
+### Lower Priority (Utilities)
+- [ ] `research` - Needs checking
+- [ ] `complexity-report` - Needs checking
+- [ ] `validate-dependencies` - ✅ Fixed
+- [ ] `fix-dependencies` - ✅ Fixed
+- [ ] `add-dependency` - ✅ Fixed
+- [ ] `remove-dependency` - ✅ Fixed
+
+## MCP Integration Pattern
+
+MCP direct functions must also follow the tag-aware pattern:
+
+```javascript
+// ✅ DO: Tag-aware MCP direct function
+export async function coreActionDirect(args, log, context = {}) {
+  const { session } = context;
+  const { projectRoot, tag } = args; // MCP passes these in args
+  
+  try {
+    const result = await coreAction(
+      tasksPath,
+      // ... other parameters ...
+      { projectRoot, tag, session, mcpLog: logWrapper }
+    );
+    
+    return { success: true, data: result };
+  } catch (error) {
+    return { success: false, error: { code: 'ERROR_CODE', message: error.message } };
+  }
+}
+```
+
+## File Generation Tag-Aware Naming
+
+The `generate` command must use tag-aware file naming:
+
+```javascript
+// ✅ DO: Tag-aware file naming
+const taskFileName = targetTag === 'master' 
+  ? `task_${task.id.toString().padStart(3, '0')}.txt`
+  : `task_${task.id.toString().padStart(3, '0')}_${targetTag}.txt`;
+```
+
+**Examples:**
+- Master tag: `task_001.txt`, `task_002.txt`
+- Other tags: `task_001_feature.txt`, `task_002_feature.txt`
+
+## Common Anti-Patterns
+
+```javascript
+// ❌ DON'T: Missing getCurrentTag import
+import { readJSON, writeJSON } from '../utils.js'; // Missing getCurrentTag
+
+// ❌ DON'T: Hard-coded tag resolution
+const tag = options.tag || 'master'; // Missing getCurrentTag
+
+// ❌ DON'T: Missing --tag option
+.option('-f, --file <file>', 'Path to tasks file') // Missing --tag option
+
+// ❌ DON'T: Missing context parameter
+await coreFunction(tasksPath, param1, param2); // Missing { projectRoot, tag }
+
+// ❌ DON'T: Incorrect readJSON/writeJSON calls
+const data = readJSON(tasksPath); // Missing projectRoot and tag
+writeJSON(tasksPath, data); // Missing projectRoot and tag
+```
+
+## Validation Checklist
+
+For each command, verify:
+
+- [ ] Imports `getCurrentTag` from utils.js
+- [ ] Has `--tag <tag>` CLI option
+- [ ] Uses standard tag resolution: `options.tag || getCurrentTag(projectRoot) || 'master'`
+- [ ] Finds `projectRoot` with error handling
+- [ ] Passes `{ projectRoot, tag }` context to core functions
+- [ ] Core functions accept and use context parameter
+- [ ] Uses `readJSON(tasksPath, projectRoot, tag)` and `writeJSON(tasksPath, data, projectRoot, tag)`
+
+## Testing Tag Resolution
+
+Test each command with:
+
+```bash
+# Test with explicit tag
+node bin/task-master command-name --tag test-tag
+
+# Test with active tag (should use current active tag)
+node bin/task-master use-tag test-tag
+node bin/task-master command-name
+
+# Test with master tag (default)
+node bin/task-master use-tag master  
+node bin/task-master command-name
+```
+
+## Migration Strategy
+
+1. **Audit Phase**: Systematically check each command against the checklist
+2. **Fix Phase**: Apply the standard patterns to non-compliant commands
+3. **Test Phase**: Verify tag resolution works correctly
+4. **Document Phase**: Update command documentation with tag support
+
+This ensures consistent, predictable behavior across all Task Master commands and prevents tag deletion bugs.

.cursor/rules/taskmaster.mdc

@@ -3,14 +3,15 @@ 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 (for integrations like Cursor) and the corresponding `task-master` CLI commands (for direct user interaction or fallback).
+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. See [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc) for MCP implementation details and [`commands.mdc`](mdc:.cursor/rules/commands.mdc) for CLI implementation guidelines.
+**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 and are long-running operations that may take up to a minute to complete. When using these tools, always inform users that the operation is in progress and to wait patiently for results. The AI-powered tools include: `parse_prd`, `analyze_project_complexity`, `update_subtask`, `update_task`, `update`, `expand_all`, `expand_task`, and `add_task`.
+**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.
 
 ---
 
@@ -24,34 +25,68 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **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').`
+    *   `--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.`
 *   **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>`)
+    *   `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: false).` (CLI: `--skip-install`)
-    *   `addAliases`: `Add shell aliases (tm, taskmaster) (default: false).` (CLI: `--aliases`)
-    *   `yes`: `Skip prompts and use defaults/provided arguments (default: 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.
-
+    *   `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. 
+*   **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.`
+*   **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 (default: 'tasks/tasks.json').` (CLI: `-o, --output <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 (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.
+*   **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.
 
 ---
 
@@ -63,9 +98,10 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **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 (e.g., 'pending', 'done').` (CLI: `-s, --status <status>`)
+    *   `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`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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`)
@@ -74,18 +110,21 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **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>`)
+    *   `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 a specific Taskmaster task or subtask by its ID.`
+*   **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') or subtask (e.g., '15.2') you want to view.` (CLI: `[id]` positional or `-i, --id <id>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
-*   **Usage:** Understand the full details, implementation notes, and test strategy for a specific task before starting work.
+    *   `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.
 
 ---
 
@@ -97,10 +136,12 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **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', 'low'; default: 'medium').` (CLI: `--priority <priority>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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.
 
@@ -112,13 +153,14 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **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>`)
+    *   `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', '16.1') that must be done before this new subtask.` (CLI: `--dependencies <ids>`)
-    *   `status`: `Set the initial status for the new subtask (default: 'pending').` (CLI: `-s, --status <status>`)
-    *   `skipGenerate`: `Prevent Taskmaster from automatically regenerating markdown task files after adding the subtask.` (CLI: `--skip-generate`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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>`)
+    *   `generate`: `Enable Taskmaster to regenerate markdown task files after adding the subtask.` (CLI: `--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`)
@@ -127,10 +169,11 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **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 (and 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 Perplexity AI for more informed updates based on external knowledge (requires PERPLEXITY_API_KEY).` (CLI: `-r, --research`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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.
 
@@ -138,13 +181,15 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 
 *   **MCP Tool:** `update_task`
 *   **CLI Command:** `task-master update-task [options]`
-*   **Description:** `Modify a specific Taskmaster task (or subtask) by its ID, incorporating new information or changes.`
+*   **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') or subtask (e.g., '15.2') you want to update.` (CLI: `-i, --id <id>`)
+    *   `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>`)
-    *   `research`: `Enable Taskmaster to use Perplexity AI for more informed updates (requires PERPLEXITY_API_KEY).` (CLI: `-r, --research`)
-    *   `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 or feedback. Example CLI: `task-master update-task --id='15' --prompt='Clarification: Use PostgreSQL instead of MySQL.\nUpdate schema details...'`
+    *   `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`)
@@ -153,22 +198,24 @@ 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 specific ID of the Taskmaster subtask (e.g., '15.2') you want to add information to.` (CLI: `-i, --id <id>`)
-    *   `prompt`: `Required. Provide the information or notes Taskmaster should append to the subtask's details. Ensure this adds *new* information not already present.` (CLI: `-p, --prompt <text>`)
-    *   `research`: `Enable Taskmaster to use Perplexity AI for more informed updates (requires PERPLEXITY_API_KEY).` (CLI: `-r, --research`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
-*   **Usage:** Add implementation notes, code snippets, or clarifications to a subtask during development. Before calling, review the subtask's current details to append only fresh insights, helping to build a detailed log of the implementation journey and avoid redundancy. Example CLI: `task-master update-subtask --id='15.2' --prompt='Discovered that the API requires header X.\nImplementation needs adjustment...'`
+    *   `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').`
+*   **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', '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>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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`)
@@ -177,9 +224,10 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **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>`)
+    *   `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`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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.
 
@@ -191,28 +239,30 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 
 *   **MCP Tool:** `expand_task`
 *   **CLI Command:** `task-master expand [options]`
-*   **Description:** `Use Taskmaster's AI to break down a complex task (or all tasks) into smaller, manageable subtasks.`
+*   **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`: `Suggests how many subtasks Taskmaster should aim to create (uses complexity analysis by default).` (CLI: `-n, --num <number>`)
-    *   `research`: `Enable Taskmaster to use Perplexity AI for more informed subtask generation (requires PERPLEXITY_API_KEY).` (CLI: `-r, --research`)
-    *   `prompt`: `Provide extra context or specific instructions to Taskmaster for generating the subtasks.` (CLI: `-p, --prompt <text>`)
-    *   `force`: `Use this to make Taskmaster replace existing subtasks with newly generated ones.` (CLI: `--force`)
-    *   `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.
+    *   `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 'pending' tasks based on complexity analysis.`
+*   **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`: `Suggests how many subtasks Taskmaster should aim to create per task.` (CLI: `-n, --num <number>`)
-    *   `research`: `Enable Perplexity AI for more informed subtask generation (requires PERPLEXITY_API_KEY).` (CLI: `-r, --research`)
-    *   `prompt`: `Provide extra context for Taskmaster to apply generally during expansion.` (CLI: `-p, --prompt <text>`)
-    *   `force`: `Make Taskmaster replace existing subtasks.` (CLI: `--force`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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.
 
@@ -222,9 +272,10 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **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', '16,18').` (Required unless using `all`) (CLI: `-i, --id <ids>`)
+    *   `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`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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`)
@@ -233,28 +284,56 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **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', '16.1,16.3').` (CLI: `-i, --id <id>`)
+    *   `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`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `generate`: `Enable Taskmaster to regenerate markdown task files after removing the subtask.` (CLI: `--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
 
-### 17. Add Dependency (`add_dependency`)
+### 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>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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.
 
-### 18. Remove Dependency (`remove_dependency`)
+### 19. Remove Dependency (`remove_dependency`)
 
 *   **MCP Tool:** `remove_dependency`
 *   **CLI Command:** `task-master remove-dependency [options]`
@@ -262,92 +341,219 @@ 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>`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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.
 
-### 19. Validate Dependencies (`validate_dependencies`)
+### 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:**
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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.
 
-### 20. Fix Dependencies (`fix_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:**
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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
 
-### 21. Analyze Project Complexity (`analyze_project_complexity`)
+### 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: 'scripts/task-complexity-report.json').` (CLI: `-o, --output <file>`)
+    *   `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 Perplexity AI for more accurate complexity analysis (requires PERPLEXITY_API_KEY).` (CLI: `-r, --research`)
-    *   `file`: `Path to your Taskmaster 'tasks.json' file (default relies on auto-detection).` (CLI: `-f, --file <file>`)
+    *   `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.
 
-### 22. View Complexity Report (`complexity_report`)
+### 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:**
-    *   `file`: `Path to the complexity report (default: 'scripts/task-complexity-report.json').` (CLI: `-f, --file <file>`)
+    *   `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
 
-### 23. Generate Task Files (`generate`)
+### 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>`)
-    *   `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.
+    *   `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.
 
 ---
 
-## Environment Variables Configuration
+## AI-Powered Research
 
-Taskmaster's behavior can be customized via environment variables. These affect both CLI and MCP server operation:
+### 25. Research (`research`)
 
-*   **ANTHROPIC_API_KEY** (Required): Your Anthropic API key for Claude.
-*   **MODEL**: Claude model to use (default: `claude-3-opus-20240229`). 
-*   **MAX_TOKENS**: Maximum tokens for AI responses (default: 8192).
-*   **TEMPERATURE**: Temperature for AI model responses (default: 0.7).
-*   **DEBUG**: Enable debug logging (`true`/`false`, default: `false`).
-*   **LOG_LEVEL**: Console output level (`debug`, `info`, `warn`, `error`, default: `info`).
-*   **DEFAULT_SUBTASKS**: Default number of subtasks for `expand` (default: 5).
-*   **DEFAULT_PRIORITY**: Default priority for new tasks (default: `medium`).
-*   **PROJECT_NAME**: Project name used in metadata.
-*   **PROJECT_VERSION**: Project version used in metadata.
-*   **PERPLEXITY_API_KEY**: API key for Perplexity AI (for `--research` flags).
-*   **PERPLEXITY_MODEL**: Perplexity model to use (default: `sonar-medium-online`).
-
-Set these in your `.env` file in the project root or in your environment before running Taskmaster.
+*   **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.
 
 ---
 
-For implementation details:
-*   CLI commands: See [`commands.mdc`](mdc:.cursor/rules/commands.mdc)
-*   MCP server: See [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc)
-*   Task structure: See [`tasks.mdc`](mdc:.cursor/rules/tasks.mdc)
-*   Workflow: See [`dev_workflow.mdc`](mdc:.cursor/rules/dev_workflow.mdc)
+## 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).

.cursor/rules/tasks.mdc

@@ -3,9 +3,19 @@ description: Guidelines for implementing task management operations
 globs: scripts/modules/task-manager.js
 alwaysApply: false
 ---
-
 # Task Management Guidelines
 
+## Tagged Task Lists System
+
+Task Master now uses a **tagged task lists system** for multi-context task management:
+
+- **Data Structure**: Tasks are organized into separate contexts (tags) within `tasks.json`
+- **Legacy Format**: `{"tasks": [...]}`
+- **Tagged Format**: `{"master": {"tasks": [...]}, "feature-branch": {"tasks": [...]}}`
+- **Silent Migration**: Legacy format automatically converts to tagged format on first use
+- **Tag Resolution**: Core functions receive legacy format for 100% backward compatibility
+- **Default Tag**: "master" is used for all existing and new tasks unless otherwise specified
+
 ## Task Structure Standards
 
 - **Core Task Properties**:
@@ -28,6 +38,25 @@ alwaysApply: false
   };
   ```
 
+- **Tagged Data Structure**:
+  - ✅ DO: Access tasks through tag resolution layer
+  - ✅ DO: Use `getTasksForTag(data, tagName)` to retrieve tasks for a specific tag
+  - ✅ DO: Use `setTasksForTag(data, tagName, tasks)` to update tasks for a specific tag
+  - ❌ DON'T: Directly manipulate the tagged structure in core functions
+
+  ```javascript
+  // ✅ DO: Use tag resolution functions
+  const tasksData = readJSON(tasksPath);
+  const currentTag = getCurrentTag() || 'master';
+  const tasks = getTasksForTag(tasksData, currentTag);
+  
+  // Manipulate tasks as normal...
+  
+  // Save back to the tagged structure
+  setTasksForTag(tasksData, currentTag, tasks);
+  writeJSON(tasksPath, tasksData);
+  ```
+
 - **Subtask Structure**:
   - ✅ DO: Use consistent properties across subtasks
   - ✅ DO: Maintain simple numeric IDs within parent tasks
@@ -48,53 +77,56 @@ alwaysApply: false
 ## Task Creation and Parsing
 
 - **ID Management**:
-  - ✅ DO: Assign unique sequential IDs to tasks
-  - ✅ DO: Calculate the next ID based on existing tasks
-  - ❌ DON'T: Hardcode or reuse IDs
+  - ✅ DO: Assign unique sequential IDs to tasks within each tag context
+  - ✅ DO: Calculate the next ID based on existing tasks in the current tag
+  - ❌ DON'T: Hardcode or reuse IDs within the same tag
 
   ```javascript
-  // ✅ DO: Calculate the next available ID
-  const highestId = Math.max(...data.tasks.map(t => t.id));
+  // ✅ DO: Calculate the next available ID within the current tag
+  const tasksData = readJSON(tasksPath);
+  const currentTag = getCurrentTag() || 'master';
+  const tasks = getTasksForTag(tasksData, currentTag);
+  const highestId = Math.max(...tasks.map(t => t.id));
   const nextTaskId = highestId + 1;
   ```
 
 - **PRD Parsing**:
   - ✅ DO: Extract tasks from PRD documents using AI
+  - ✅ DO: Create tasks in the current tag context (defaults to "master")
   - ✅ DO: Provide clear prompts to guide AI task generation
   - ✅ DO: Validate and clean up AI-generated tasks
 
   ```javascript
-  // ✅ DO: Validate AI responses
-  try {
-    // Parse the JSON response
-    taskData = JSON.parse(jsonContent);
-    
-    // Check that we have the required fields
-    if (!taskData.title || !taskData.description) {
-      throw new Error("Missing required fields in the generated task");
-    }
-  } catch (error) {
-    log('error', "Failed to parse AI's response as valid task JSON:", error);
-    process.exit(1);
-  }
+  // ✅ DO: Parse into current tag context
+  const tasksData = readJSON(tasksPath) || {};
+  const currentTag = getCurrentTag() || 'master';
+  
+  // Parse tasks and add to current tag
+  const newTasks = await parseTasksFromPRD(prdContent);
+  setTasksForTag(tasksData, currentTag, newTasks);
+  writeJSON(tasksPath, tasksData);
   ```
 
 ## Task Updates and Modifications
 
 - **Status Management**:
-  - ✅ DO: Provide functions for updating task status
+  - ✅ DO: Provide functions for updating task status within current tag context
   - ✅ DO: Handle both individual tasks and subtasks
   - ✅ DO: Consider subtask status when updating parent tasks
 
   ```javascript
-  // ✅ DO: Handle status updates for both tasks and subtasks
+  // ✅ DO: Handle status updates within tagged context
   async function setTaskStatus(tasksPath, taskIdInput, newStatus) {
+    const tasksData = readJSON(tasksPath);
+    const currentTag = getCurrentTag() || 'master';
+    const tasks = getTasksForTag(tasksData, currentTag);
+    
     // Check if it's a subtask (e.g., "1.2")
     if (taskIdInput.includes('.')) {
       const [parentId, subtaskId] = taskIdInput.split('.').map(id => parseInt(id, 10));
       
       // Find the parent task and subtask
-      const parentTask = data.tasks.find(t => t.id === parentId);
+      const parentTask = tasks.find(t => t.id === parentId);
       const subtask = parentTask.subtasks.find(st => st.id === subtaskId);
       
       // Update subtask status
@@ -109,7 +141,7 @@ alwaysApply: false
       }
     } else {
       // Handle regular task
-      const task = data.tasks.find(t => t.id === parseInt(taskIdInput, 10));
+      const task = tasks.find(t => t.id === parseInt(taskIdInput, 10));
       task.status = newStatus;
       
       // If marking as done, also mark subtasks
@@ -119,16 +151,24 @@ alwaysApply: false
         });
       }
     }
+    
+    // Save updated tasks back to tagged structure
+    setTasksForTag(tasksData, currentTag, tasks);
+    writeJSON(tasksPath, tasksData);
   }
   ```
 
 - **Task Expansion**:
-  - ✅ DO: Use AI to generate detailed subtasks
+  - ✅ DO: Use AI to generate detailed subtasks within current tag context
   - ✅ DO: Consider complexity analysis for subtask counts
   - ✅ DO: Ensure proper IDs for newly created subtasks
 
   ```javascript
   // ✅ DO: Generate appropriate subtasks based on complexity
+  const tasksData = readJSON(tasksPath);
+  const currentTag = getCurrentTag() || 'master';
+  const tasks = getTasksForTag(tasksData, currentTag);
+  
   if (taskAnalysis) {
     log('info', `Found complexity analysis for task ${taskId}: Score ${taskAnalysis.complexityScore}/10`);
     
@@ -138,6 +178,11 @@ alwaysApply: false
       log('info', `Using recommended number of subtasks: ${numSubtasks}`);
     }
   }
+  
+  // Generate subtasks and save back
+  // ... subtask generation logic ...
+  setTasksForTag(tasksData, currentTag, tasks);
+  writeJSON(tasksPath, tasksData);
   ```
 
 ## Task File Generation
@@ -155,67 +200,65 @@ alwaysApply: false
   
   // Format dependencies with their status
   if (task.dependencies && task.dependencies.length > 0) {
-    content += `# Dependencies: ${formatDependenciesWithStatus(task.dependencies, data.tasks)}\n`;
+    content += `# Dependencies: ${formatDependenciesWithStatus(task.dependencies, tasks)}\n`;
   } else {
     content += '# Dependencies: None\n';
   }
   ```
 
-- **Subtask Inclusion**:
-  - ✅ DO: Include subtasks in parent task files
-  - ✅ DO: Use consistent indentation for subtask sections
-  - ✅ DO: Display subtask dependencies with proper formatting
+- **Tagged Context Awareness**:
+  - ✅ DO: Generate task files from current tag context
+  - ✅ DO: Include tag information in generated files
+  - ❌ DON'T: Mix tasks from different tags in file generation
 
   ```javascript
-  // ✅ DO: Format subtasks correctly in task files
-  if (task.subtasks && task.subtasks.length > 0) {
-    content += '\n# Subtasks:\n';
+  // ✅ DO: Generate files for current tag context
+  async function generateTaskFiles(tasksPath, outputDir) {
+    const tasksData = readJSON(tasksPath);
+    const currentTag = getCurrentTag() || 'master';
+    const tasks = getTasksForTag(tasksData, currentTag);
     
-    task.subtasks.forEach(subtask => {
-      content += `## ${subtask.id}. ${subtask.title} [${subtask.status || 'pending'}]\n`;
-      
-      // Format subtask dependencies
-      if (subtask.dependencies && subtask.dependencies.length > 0) {
-        // Format the dependencies
-        content += `### Dependencies: ${formattedDeps}\n`;
-      } else {
-        content += '### Dependencies: None\n';
-      }
-      
-      content += `### Description: ${subtask.description || ''}\n`;
-      content += '### Details:\n';
-      content += (subtask.details || '').split('\n').map(line => line).join('\n');
-      content += '\n\n';
-    });
+    // Add tag context to file header
+    let content = `# Tag Context: ${currentTag}\n`;
+    content += `# Task ID: ${task.id}\n`;
+    // ... rest of file generation
   }
   ```
 
 ## Task Listing and Display
 
 - **Filtering and Organization**:
-  - ✅ DO: Allow filtering tasks by status
+  - ✅ DO: Allow filtering tasks by status within current tag context
   - ✅ DO: Handle subtask display in lists
   - ✅ DO: Use consistent table formats
 
   ```javascript
-  // ✅ DO: Implement clear filtering and organization
+  // ✅ DO: Implement clear filtering within tag context
+  const tasksData = readJSON(tasksPath);
+  const currentTag = getCurrentTag() || 'master';
+  const tasks = getTasksForTag(tasksData, currentTag);
+  
   // Filter tasks by status if specified
   const filteredTasks = statusFilter 
-    ? data.tasks.filter(task => 
+    ? tasks.filter(task => 
         task.status && task.status.toLowerCase() === statusFilter.toLowerCase())
-    : data.tasks;
+    : tasks;
   ```
 
 - **Progress Tracking**:
-  - ✅ DO: Calculate and display completion statistics
+  - ✅ DO: Calculate and display completion statistics for current tag
   - ✅ DO: Track both task and subtask completion
   - ✅ DO: Use visual progress indicators
 
   ```javascript
-  // ✅ DO: Track and display progress
+  // ✅ DO: Track and display progress within tag context
+  const tasksData = readJSON(tasksPath);
+  const currentTag = getCurrentTag() || 'master';
+  const tasks = getTasksForTag(tasksData, currentTag);
+  
   // Calculate completion statistics
-  const totalTasks = data.tasks.length;
-  const completedTasks = data.tasks.filter(task => 
+  const totalTasks = tasks.length;
+  const completedTasks = tasks.filter(task => 
     task.status === 'done' || task.status === 'completed').length;
   const completionPercentage = totalTasks > 0 ? (completedTasks / totalTasks) * 100 : 0;
   
@@ -223,7 +266,7 @@ alwaysApply: false
   let totalSubtasks = 0;
   let completedSubtasks = 0;
   
-  data.tasks.forEach(task => {
+  tasks.forEach(task => {
     if (task.subtasks && task.subtasks.length > 0) {
       totalSubtasks += task.subtasks.length;
       completedSubtasks += task.subtasks.filter(st => 
@@ -232,99 +275,52 @@ alwaysApply: false
   });
   ```
 
-## Complexity Analysis
+## Migration and Compatibility
 
-- **Scoring System**:
-  - ✅ DO: Use AI to analyze task complexity
-  - ✅ DO: Include complexity scores (1-10)
-  - ✅ DO: Generate specific expansion recommendations
+- **Silent Migration Handling**:
+  - ✅ DO: Implement silent migration in `readJSON()` function
+  - ✅ DO: Detect legacy format and convert automatically
+  - ✅ DO: Preserve all existing task data during migration
 
   ```javascript
-  // ✅ DO: Handle complexity analysis properly
-  const report = {
-    meta: {
-      generatedAt: new Date().toISOString(),
-      tasksAnalyzed: tasksData.tasks.length,
-      thresholdScore: thresholdScore,
-      projectName: tasksData.meta?.projectName || 'Your Project Name',
-      usedResearch: useResearch
-    },
-    complexityAnalysis: complexityAnalysis
-  };
-  ```
-
-- **Analysis-Based Workflow**:
-  - ✅ DO: Use complexity reports to guide task expansion
-  - ✅ DO: Prioritize complex tasks for more detailed breakdown
-  - ✅ DO: Use expansion prompts from complexity analysis
-
-  ```javascript
-  // ✅ DO: Apply complexity analysis to workflow
-  // Sort tasks by complexity if report exists, otherwise by ID
-  if (complexityReport && complexityReport.complexityAnalysis) {
-    log('info', 'Sorting tasks by complexity...');
+  // ✅ DO: Handle silent migration (implemented in utils.js)
+  function readJSON(filepath) {
+    let data = JSON.parse(fs.readFileSync(filepath, 'utf8'));
     
-    // Create a map of task IDs to complexity scores
-    const complexityMap = new Map();
-    complexityReport.complexityAnalysis.forEach(analysis => {
-      complexityMap.set(analysis.taskId, analysis.complexityScore);
-    });
+    // Silent migration for tasks.json files
+    if (data.tasks && Array.isArray(data.tasks) && !data.master && isTasksFile) {
+      const migratedData = {
+        master: {
+          tasks: data.tasks
+        }
+      };
+      writeJSON(filepath, migratedData);
+      data = migratedData;
+    }
     
-    // Sort tasks by complexity score (high to low)
-    tasksToExpand.sort((a, b) => {
-      const scoreA = complexityMap.get(a.id) || 0;
-      const scoreB = complexityMap.get(b.id) || 0;
-      return scoreB - scoreA;
-    });
+    return data;
   }
   ```
 
-## Next Task Selection
-
-- **Eligibility Criteria**:
-  - ✅ DO: Consider dependencies when finding next tasks
-  - ✅ DO: Prioritize by task priority and dependency count
-  - ✅ DO: Skip completed tasks
+- **Tag Resolution**:
+  - ✅ DO: Use tag resolution functions to maintain backward compatibility
+  - ✅ DO: Return legacy format to core functions
+  - ❌ DON'T: Expose tagged structure to existing core logic
 
   ```javascript
-  // ✅ DO: Use proper task prioritization logic
-  function findNextTask(tasks) {
-    // Get all completed task IDs
-    const completedTaskIds = new Set(
-      tasks
-        .filter(t => t.status === 'done' || t.status === 'completed')
-        .map(t => t.id)
-    );
+  // ✅ DO: Use tag resolution layer
+  function getTasksForTag(data, tagName) {
+    if (data.tasks && Array.isArray(data.tasks)) {
+      // Legacy format - return as-is
+      return data.tasks;
+    }
     
-    // Filter for pending tasks whose dependencies are all satisfied
-    const eligibleTasks = tasks.filter(task => 
-      (task.status === 'pending' || task.status === 'in-progress') && 
-      task.dependencies && 
-      task.dependencies.every(depId => completedTaskIds.has(depId))
-    );
+    if (data[tagName] && data[tagName].tasks) {
+      // Tagged format - return tasks for specified tag
+      return data[tagName].tasks;
+    }
     
-    // Sort by priority, dependency count, and ID
-    const priorityValues = { 'high': 3, 'medium': 2, 'low': 1 };
-    
-    const nextTask = eligibleTasks.sort((a, b) => {
-      // Priority first
-      const priorityA = priorityValues[a.priority || 'medium'] || 2;
-      const priorityB = priorityValues[b.priority || 'medium'] || 2;
-      
-      if (priorityB !== priorityA) {
-        return priorityB - priorityA; // Higher priority first
-      }
-      
-      // Dependency count next
-      if (a.dependencies.length !== b.dependencies.length) {
-        return a.dependencies.length - b.dependencies.length; // Fewer dependencies first
-      }
-      
-      // ID last
-      return a.id - b.id; // Lower ID first
-    })[0];
-    
-    return nextTask;
+    return [];
   }
   ```
 

.cursor/rules/telemetry.mdc

@@ -0,0 +1,228 @@
+---
+description: Guidelines for integrating AI usage telemetry across Task Master.
+globs: scripts/modules/**/*.js,mcp-server/src/**/*.js
+alwaysApply: true
+---
+
+# AI Usage Telemetry Integration
+
+This document outlines the standard pattern for capturing, propagating, and handling AI usage telemetry data (cost, tokens, model, etc.) across the Task Master stack. This ensures consistent telemetry for both CLI and MCP interactions.
+
+## Overview
+
+Telemetry data is generated within the unified AI service layer ([`ai-services-unified.js`](mdc:scripts/modules/ai-services-unified.js)) and then passed upwards through the calling functions.
+
+- **Data Source**: [`ai-services-unified.js`](mdc:scripts/modules/ai-services-unified.js) (specifically its `generateTextService`, `generateObjectService`, etc.) returns an object like `{ mainResult: AI_CALL_OUTPUT, telemetryData: TELEMETRY_OBJECT }`.
+- **`telemetryData` Object Structure**:
+  ```json
+  {
+    "timestamp": "ISO_STRING_DATE",
+    "userId": "USER_ID_FROM_CONFIG",
+    "commandName": "invoking_command_or_tool_name",
+    "modelUsed": "ai_model_id",
+    "providerName": "ai_provider_name",
+    "inputTokens": NUMBER,
+    "outputTokens": NUMBER,
+    "totalTokens": NUMBER,
+    "totalCost": NUMBER, // e.g., 0.012414
+    "currency": "USD" // e.g., "USD"
+  }
+  ```
+
+## Integration Pattern by Layer
+
+The key principle is that each layer receives telemetry data from the layer below it (if applicable) and passes it to the layer above it, or handles it for display in the case of the CLI.
+
+### 1. Core Logic Functions (e.g., in `scripts/modules/task-manager/`)
+
+Functions in this layer that invoke AI services are responsible for handling the `telemetryData` they receive from [`ai-services-unified.js`](mdc:scripts/modules/ai-services-unified.js).
+
+- **Actions**:
+    1.  Call the appropriate AI service function (e.g., `generateObjectService`).
+        -   Pass `commandName` (e.g., `add-task`, `expand-task`) and `outputType` (e.g., `cli` or `mcp`) in the `params` object to the AI service. The `outputType` can be derived from context (e.g., presence of `mcpLog`).
+    2.  The AI service returns an object, e.g., `aiServiceResponse = { mainResult: {/*AI output*/}, telemetryData: {/*telemetry data*/} }`.
+    3.  Extract `aiServiceResponse.mainResult` for the core processing.
+    4.  **Must return an object that includes `aiServiceResponse.telemetryData`**.
+        Example: `return { operationSpecificData: /*...*/, telemetryData: aiServiceResponse.telemetryData };`
+
+- **CLI Output Handling (If Applicable)**:
+    -   If the core function also handles CLI output (e.g., it has an `outputFormat` parameter that can be `'text'` or `'cli'`):
+        1.  Check if `outputFormat === 'text'` (or `'cli'`).
+        2.  If so, and if `aiServiceResponse.telemetryData` is available, call `displayAiUsageSummary(aiServiceResponse.telemetryData, 'cli')` from [`scripts/modules/ui.js`](mdc:scripts/modules/ui.js).
+        - This ensures telemetry is displayed directly to CLI users after the main command output.
+
+- **Example Snippet (Core Logic in `scripts/modules/task-manager/someAiAction.js`)**:
+  ```javascript
+  import { generateObjectService } from '../ai-services-unified.js';
+  import { displayAiUsageSummary } from '../ui.js';
+
+  async function performAiRelatedAction(params, context, outputFormat = 'text') {
+    const { commandNameFromContext, /* other context vars */ } = context;
+    let aiServiceResponse = null;
+
+    try {
+      aiServiceResponse = await generateObjectService({
+        // ... other parameters for AI service ...
+        commandName: commandNameFromContext || 'default-action-name',
+        outputType: context.mcpLog ? 'mcp' : 'cli' // Derive outputType
+      });
+
+      const usefulAiOutput = aiServiceResponse.mainResult.object;
+      // ... do work with usefulAiOutput ...
+
+      if (outputFormat === 'text' && aiServiceResponse.telemetryData) {
+        displayAiUsageSummary(aiServiceResponse.telemetryData, 'cli');
+      }
+
+      return {
+        actionData: /* results of processing */,
+        telemetryData: aiServiceResponse.telemetryData
+      };
+    } catch (error) {
+      // ... handle error ...
+      throw error;
+    }
+  }
+  ```
+
+### 2. Direct Function Wrappers (in `mcp-server/src/core/direct-functions/`)
+
+These functions adapt core logic for the MCP server, ensuring structured responses.
+
+- **Actions**:
+    1.  Call the corresponding core logic function.
+        -   Pass necessary context (e.g., `session`, `mcpLog`, `projectRoot`).
+        -   Provide the `commandName` (typically derived from the MCP tool name) and `outputType: 'mcp'` in the context object passed to the core function.
+        -   If the core function supports an `outputFormat` parameter, pass `'json'` to suppress CLI-specific UI.
+    2.  The core logic function returns an object (e.g., `coreResult = { actionData: ..., telemetryData: ... }`).
+    3.  Include `coreResult.telemetryData` as a field within the `data` object of the successful response returned by the direct function.
+
+- **Example Snippet (Direct Function `someAiActionDirect.js`)**:
+  ```javascript
+  import { performAiRelatedAction } from '../../../../scripts/modules/task-manager/someAiAction.js'; // Core function
+  import { createLogWrapper } from '../../tools/utils.js'; // MCP Log wrapper
+
+  export async function someAiActionDirect(args, log, context = {}) {
+    const { session } = context;
+    // ... prepare arguments for core function from args, including args.projectRoot ...
+
+    try {
+      const coreResult = await performAiRelatedAction(
+        { /* parameters for core function */ },
+        { // Context for core function
+          session,
+          mcpLog: createLogWrapper(log),
+          projectRoot: args.projectRoot,
+          commandNameFromContext: 'mcp_tool_some_ai_action', // Example command name
+          outputType: 'mcp'
+        },
+        'json' // Request 'json' output format from core function
+      );
+
+      return {
+        success: true,
+        data: {
+          operationSpecificData: coreResult.actionData,
+          telemetryData: coreResult.telemetryData // Pass telemetry through
+        }
+      };
+    } catch (error) {
+      // ... error handling, return { success: false, error: ... } ...
+    }
+  }
+  ```
+
+### 3. MCP Tools (in `mcp-server/src/tools/`)
+
+These are the exposed endpoints for MCP clients.
+
+- **Actions**:
+    1.  Call the corresponding direct function wrapper.
+    2.  The direct function returns an object structured like `{ success: true, data: { operationSpecificData: ..., telemetryData: ... } }` (or an error object).
+    3.  Pass this entire result object to `handleApiResult(result, log)` from [`mcp-server/src/tools/utils.js`](mdc:mcp-server/src/tools/utils.js).
+    4.  `handleApiResult` ensures that the `data` field from the direct function's response (which correctly includes `telemetryData`) is part of the final MCP response.
+
+- **Example Snippet (MCP Tool `some_ai_action.js`)**:
+  ```javascript
+  import { someAiActionDirect } from '../core/task-master-core.js';
+  import { handleApiResult, withNormalizedProjectRoot } from './utils.js';
+  // ... zod for parameters ...
+
+  export function registerSomeAiActionTool(server) {
+    server.addTool({
+      name: "some_ai_action",
+      // ... description, parameters ...
+      execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+        try {
+          const resultFromDirectFunction = await someAiActionDirect(
+            { /* args including projectRoot */ },
+            log,
+            { session }
+          );
+          return handleApiResult(resultFromDirectFunction, log); // This passes the nested telemetryData through
+        } catch (error) {
+          // ... error handling ...
+        }
+      })
+    });
+  }
+  ```
+
+### 4. CLI Commands (`scripts/modules/commands.js`)
+
+These define the command-line interface.
+
+- **Actions**:
+    1.  Call the appropriate core logic function.
+    2.  Pass `outputFormat: 'text'` (or ensure the core function defaults to text-based output for CLI).
+    3.  The core logic function (as per Section 1) is responsible for calling `displayAiUsageSummary` if telemetry data is available and it's in CLI mode.
+    4.  The command action itself **should not** call `displayAiUsageSummary` if the core logic function already handles this. This avoids duplicate display.
+
+- **Example Snippet (CLI Command in `commands.js`)**:
+  ```javascript
+  // In scripts/modules/commands.js
+  import { performAiRelatedAction } from './task-manager/someAiAction.js'; // Core function
+
+  programInstance
+    .command('some-cli-ai-action')
+    // ... .option() ...
+    .action(async (options) => {
+      try {
+        const projectRoot = findProjectRoot() || '.'; // Example root finding
+        // ... prepare parameters for core function from command options ...
+        await performAiRelatedAction(
+          { /* parameters for core function */ },
+          { // Context for core function
+            projectRoot,
+            commandNameFromContext: 'some-cli-ai-action',
+            outputType: 'cli'
+          },
+          'text' // Explicitly request text output format for CLI
+        );
+        // Core function handles displayAiUsageSummary internally for 'text' outputFormat
+      } catch (error) {
+        // ... error handling ...
+      }
+    });
+  ```
+
+## Summary Flow
+
+The telemetry data flows as follows:
+
+1.  **[`ai-services-unified.js`](mdc:scripts/modules/ai-services-unified.js)**: Generates `telemetryData` and returns `{ mainResult, telemetryData }`.
+2.  **Core Logic Function**:
+    *   Receives `{ mainResult, telemetryData }`.
+    *   Uses `mainResult`.
+    *   If CLI (`outputFormat: 'text'`), calls `displayAiUsageSummary(telemetryData)`.
+    *   Returns `{ operationSpecificData, telemetryData }`.
+3.  **Direct Function Wrapper**:
+    *   Receives `{ operationSpecificData, telemetryData }` from core logic.
+    *   Returns `{ success: true, data: { operationSpecificData, telemetryData } }`.
+4.  **MCP Tool**:
+    *   Receives direct function response.
+    *   `handleApiResult` ensures the final MCP response to the client is `{ success: true, data: { operationSpecificData, telemetryData } }`.
+5.  **CLI Command**:
+    *   Calls core logic with `outputFormat: 'text'`. Display is handled by core logic.
+
+This pattern ensures telemetry is captured and appropriately handled/exposed across all interaction modes.

.cursor/rules/test_workflow.mdc

@@ -0,0 +1,803 @@
+---
+description: 
+globs: 
+alwaysApply: true
+---
+# Test Workflow & Development Process
+
+## **Initial Testing Framework Setup**
+
+Before implementing the TDD workflow, ensure your project has a proper testing framework configured. This section covers setup for different technology stacks.
+
+### **Detecting Project Type & Framework Needs**
+
+**AI Agent Assessment Checklist:**
+1. **Language Detection**: Check for `package.json` (Node.js/JavaScript), `requirements.txt` (Python), `Cargo.toml` (Rust), etc.
+2. **Existing Tests**: Look for test files (`.test.`, `.spec.`, `_test.`) or test directories
+3. **Framework Detection**: Check for existing test runners in dependencies
+4. **Project Structure**: Analyze directory structure for testing patterns
+
+### **JavaScript/Node.js Projects (Jest Setup)**
+
+#### **Prerequisites Check**
+```bash
+# Verify Node.js project
+ls package.json  # Should exist
+
+# Check for existing testing setup
+ls jest.config.js jest.config.ts  # Check for Jest config
+grep -E "(jest|vitest|mocha)" package.json  # Check for test runners
+```
+
+#### **Jest Installation & Configuration**
+
+**Step 1: Install Dependencies**
+```bash
+# Core Jest dependencies
+npm install --save-dev jest
+
+# TypeScript support (if using TypeScript)
+npm install --save-dev ts-jest @types/jest
+
+# Additional useful packages
+npm install --save-dev supertest @types/supertest  # For API testing
+npm install --save-dev jest-watch-typeahead  # Enhanced watch mode
+```
+
+**Step 2: Create Jest Configuration**
+
+Create `jest.config.js` with the following production-ready configuration:
+
+```javascript
+/** @type {import('jest').Config} */
+module.exports = {
+  // Use ts-jest preset for TypeScript support
+  preset: 'ts-jest',
+
+  // Test environment
+  testEnvironment: 'node',
+
+  // Roots for test discovery
+  roots: ['<rootDir>/src', '<rootDir>/tests'],
+
+  // Test file patterns
+  testMatch: ['**/__tests__/**/*.ts', '**/?(*.)+(spec|test).ts'],
+
+  // Transform files
+  transform: {
+    '^.+\\.ts$': [
+      'ts-jest',
+      {
+        tsconfig: {
+          target: 'es2020',
+          module: 'commonjs',
+          esModuleInterop: true,
+          allowSyntheticDefaultImports: true,
+          skipLibCheck: true,
+          strict: false,
+          noImplicitAny: false,
+        },
+      },
+    ],
+    '^.+\\.js$': [
+      'ts-jest',
+      {
+        useESM: false,
+        tsconfig: {
+          target: 'es2020',
+          module: 'commonjs',
+          esModuleInterop: true,
+          allowSyntheticDefaultImports: true,
+          allowJs: true,
+        },
+      },
+    ],
+  },
+
+  // Module file extensions
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+
+  // Transform ignore patterns - adjust for ES modules
+  transformIgnorePatterns: ['node_modules/(?!(your-es-module-deps|.*\\.mjs$))'],
+
+  // Coverage configuration
+  collectCoverage: true,
+  coverageDirectory: 'coverage',
+  coverageReporters: [
+    'text', // Console output
+    'text-summary', // Brief summary
+    'lcov', // For IDE integration
+    'html', // Detailed HTML report
+  ],
+
+  // Files to collect coverage from
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!src/**/*.d.ts',
+    '!src/**/*.test.ts',
+    '!src/**/index.ts', // Often just exports
+    '!src/generated/**', // Generated code
+    '!src/config/database.ts', // Database config (tested via integration)
+  ],
+
+  // Coverage thresholds - TaskMaster standards
+  coverageThreshold: {
+    global: {
+      branches: 70,
+      functions: 80,
+      lines: 80,
+      statements: 80,
+    },
+    // Higher standards for critical business logic
+    './src/utils/': {
+      branches: 85,
+      functions: 90,
+      lines: 90,
+      statements: 90,
+    },
+    './src/middleware/': {
+      branches: 80,
+      functions: 85,
+      lines: 85,
+      statements: 85,
+    },
+  },
+
+  // Setup files
+  setupFilesAfterEnv: ['<rootDir>/tests/setup.ts'],
+
+  // Global teardown to prevent worker process leaks
+  globalTeardown: '<rootDir>/tests/teardown.ts',
+
+  // Module path mapping (if needed)
+  moduleNameMapper: {
+    '^@/(.*)$': '<rootDir>/src/$1',
+  },
+
+  // Clear mocks between tests
+  clearMocks: true,
+
+  // Restore mocks after each test
+  restoreMocks: true,
+
+  // Global test timeout
+  testTimeout: 10000,
+
+  // Projects for different test types
+  projects: [
+    // Unit tests - for pure functions only
+    {
+      displayName: 'unit',
+      testMatch: ['<rootDir>/src/**/*.test.ts'],
+      testPathIgnorePatterns: ['.*\\.integration\\.test\\.ts$', '/tests/'],
+      preset: 'ts-jest',
+      testEnvironment: 'node',
+      collectCoverageFrom: [
+        'src/**/*.ts',
+        '!src/**/*.d.ts',
+        '!src/**/*.test.ts',
+        '!src/**/*.integration.test.ts',
+      ],
+      coverageThreshold: {
+        global: {
+          branches: 70,
+          functions: 80,
+          lines: 80,
+          statements: 80,
+        },
+      },
+    },
+    // Integration tests - real database/services
+    {
+      displayName: 'integration',
+      testMatch: [
+        '<rootDir>/src/**/*.integration.test.ts',
+        '<rootDir>/tests/integration/**/*.test.ts',
+      ],
+      preset: 'ts-jest',
+      testEnvironment: 'node',
+      setupFilesAfterEnv: ['<rootDir>/tests/setup/integration.ts'],
+      testTimeout: 10000,
+    },
+    // E2E tests - full workflows
+    {
+      displayName: 'e2e',
+      testMatch: ['<rootDir>/tests/e2e/**/*.test.ts'],
+      preset: 'ts-jest',
+      testEnvironment: 'node',
+      setupFilesAfterEnv: ['<rootDir>/tests/setup/e2e.ts'],
+      testTimeout: 30000,
+    },
+  ],
+
+  // Verbose output for better debugging
+  verbose: true,
+
+  // Run projects sequentially to avoid conflicts
+  maxWorkers: 1,
+
+  // Enable watch mode plugins
+  watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
+};
+```
+
+**Step 3: Update package.json Scripts**
+
+Add these scripts to your `package.json`:
+
+```json
+{
+  "scripts": {
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
+    "test:unit": "jest --selectProjects unit",
+    "test:integration": "jest --selectProjects integration", 
+    "test:e2e": "jest --selectProjects e2e",
+    "test:ci": "jest --ci --coverage --watchAll=false"
+  }
+}
+```
+
+**Step 4: Create Test Setup Files**
+
+Create essential test setup files:
+
+```typescript
+// tests/setup.ts - Global setup
+import { jest } from '@jest/globals';
+
+// Global test configuration
+beforeAll(() => {
+  // Set test timeout
+  jest.setTimeout(10000);
+});
+
+afterEach(() => {
+  // Clean up mocks after each test
+  jest.clearAllMocks();
+});
+```
+
+```typescript
+// tests/setup/integration.ts - Integration test setup
+import { PrismaClient } from '@prisma/client';
+
+const prisma = new PrismaClient();
+
+beforeAll(async () => {
+  // Connect to test database
+  await prisma.$connect();
+});
+
+afterAll(async () => {
+  // Cleanup and disconnect
+  await prisma.$disconnect();
+});
+
+beforeEach(async () => {
+  // Clean test data before each test
+  // Add your cleanup logic here
+});
+```
+
+```typescript
+// tests/teardown.ts - Global teardown
+export default async () => {
+  // Global cleanup after all tests
+  console.log('Global test teardown complete');
+};
+```
+
+**Step 5: Create Initial Test Structure**
+
+```bash
+# Create test directories
+mkdir -p tests/{setup,fixtures,unit,integration,e2e}
+mkdir -p tests/unit/src/{utils,services,middleware}
+
+# Create sample test fixtures
+mkdir tests/fixtures
+```
+
+### **Generic Testing Framework Setup (Any Language)**
+
+#### **Framework Selection Guide**
+
+**Python Projects:**
+- **pytest**: Recommended for most Python projects
+- **unittest**: Built-in, suitable for simple projects
+- **Coverage**: Use `coverage.py` for code coverage
+
+```bash
+# Python setup example
+pip install pytest pytest-cov
+echo "[tool:pytest]" > pytest.ini
+echo "testpaths = tests" >> pytest.ini
+echo "addopts = --cov=src --cov-report=html --cov-report=term" >> pytest.ini
+```
+
+**Go Projects:**
+- **Built-in testing**: Use Go's built-in `testing` package
+- **Coverage**: Built-in with `go test -cover`
+
+```bash
+# Go setup example
+go mod init your-project
+mkdir -p tests
+# Tests are typically *_test.go files alongside source
+```
+
+**Rust Projects:**
+- **Built-in testing**: Use Rust's built-in test framework
+- **cargo-tarpaulin**: For coverage analysis
+
+```bash
+# Rust setup example
+cargo new your-project
+cd your-project
+cargo install cargo-tarpaulin  # For coverage
+```
+
+**Java Projects:**
+- **JUnit 5**: Modern testing framework
+- **Maven/Gradle**: Build tools with testing integration
+
+```xml
+<!-- Maven pom.xml example -->
+<dependency>
+    <groupId>org.junit.jupiter</groupId>
+    <artifactId>junit-jupiter</artifactId>
+    <version>5.9.2</version>
+    <scope>test</scope>
+</dependency>
+```
+
+#### **Universal Testing Principles**
+
+**Coverage Standards (Adapt to Your Language):**
+- **Global Minimum**: 70-80% line coverage
+- **Critical Code**: 85-90% coverage
+- **New Features**: Must meet or exceed standards
+- **Legacy Code**: Gradual improvement strategy
+
+**Test Organization:**
+- **Unit Tests**: Fast, isolated, no external dependencies
+- **Integration Tests**: Test component interactions
+- **E2E Tests**: Test complete user workflows
+- **Performance Tests**: Load and stress testing (if applicable)
+
+**Naming Conventions:**
+- **Test Files**: `*.test.*`, `*_test.*`, or language-specific patterns
+- **Test Functions**: Descriptive names (e.g., `should_return_error_for_invalid_input`)
+- **Test Directories**: Organized by test type and mirroring source structure
+
+#### **TaskMaster Integration for Any Framework**
+
+**Document Testing Setup in Subtasks:**
+```bash
+# Update subtask with testing framework setup
+task-master update-subtask --id=X.Y --prompt="Testing framework setup:
+- Installed [Framework Name] with coverage support
+- Configured [Coverage Tool] with thresholds: 80% lines, 70% branches
+- Created test directory structure: unit/, integration/, e2e/
+- Added test scripts to build configuration
+- All setup tests passing"
+```
+
+**Testing Framework Verification:**
+```bash
+# Verify setup works
+[test-command]  # e.g., npm test, pytest, go test, cargo test
+
+# Check coverage reporting
+[coverage-command]  # e.g., npm run test:coverage
+
+# Update task with verification
+task-master update-subtask --id=X.Y --prompt="Testing framework verified:
+- Sample tests running successfully
+- Coverage reporting functional
+- CI/CD integration ready
+- Ready to begin TDD workflow"
+```
+
+## **Test-Driven Development (TDD) Integration**
+
+### **Core TDD Cycle with Jest**
+```bash
+# 1. Start development with watch mode
+npm run test:watch
+
+# 2. Write failing test first
+# Create test file: src/utils/newFeature.test.ts
+# Write test that describes expected behavior
+
+# 3. Implement minimum code to make test pass
+# 4. Refactor while keeping tests green
+# 5. Add edge cases and error scenarios
+```
+
+### **TDD Workflow Per Subtask**
+```bash
+# When starting a new subtask:
+task-master set-status --id=4.1 --status=in-progress
+
+# Begin TDD cycle:
+npm run test:watch  # Keep running during development
+
+# Document TDD progress in subtask:
+task-master update-subtask --id=4.1 --prompt="TDD Progress:
+- Written 3 failing tests for core functionality
+- Implemented basic feature, tests now passing
+- Adding edge case tests for error handling"
+
+# Complete subtask with test summary:
+task-master update-subtask --id=4.1 --prompt="Implementation complete:
+- Feature implemented with 8 unit tests
+- Coverage: 95% statements, 88% branches  
+- All tests passing, TDD cycle complete"
+```
+
+## **Testing Commands & Usage**
+
+### **Development Commands**
+```bash
+# Primary development command - use during coding
+npm run test:watch              # Watch mode with Jest
+npm run test:watch -- --testNamePattern="auth"  # Watch specific tests
+
+# Targeted testing during development
+npm run test:unit               # Run only unit tests
+npm run test:unit -- --coverage # Unit tests with coverage
+
+# Integration testing when APIs are ready
+npm run test:integration        # Run integration tests
+npm run test:integration -- --detectOpenHandles  # Debug hanging tests
+
+# End-to-end testing for workflows
+npm run test:e2e               # Run E2E tests
+npm run test:e2e -- --timeout=30000  # Extended timeout for E2E
+```
+
+### **Quality Assurance Commands**
+```bash
+# Full test suite with coverage (before commits)
+npm run test:coverage          # Complete coverage analysis
+
+# All tests (CI/CD pipeline)
+npm test                       # Run all test projects
+
+# Specific test file execution
+npm test -- auth.test.ts       # Run specific test file
+npm test -- --testNamePattern="should handle errors"  # Run specific tests
+```
+
+## **Test Implementation Patterns**
+
+### **Unit Test Development**
+```typescript
+// ✅ DO: Follow established patterns from auth.test.ts
+describe('FeatureName', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    // Setup mocks with proper typing
+  });
+
+  describe('functionName', () => {
+    it('should handle normal case', () => {
+      // Test implementation with specific assertions
+    });
+    
+    it('should throw error for invalid input', async () => {
+      // Error scenario testing
+      await expect(functionName(invalidInput))
+        .rejects.toThrow('Specific error message');
+    });
+  });
+});
+```
+
+### **Integration Test Development**  
+```typescript
+// ✅ DO: Use supertest for API endpoint testing
+import request from 'supertest';
+import { app } from '../../src/app';
+
+describe('POST /api/auth/register', () => {
+  beforeEach(async () => {
+    await integrationTestUtils.cleanupTestData();
+  });
+  
+  it('should register user successfully', async () => {
+    const userData = createTestUser();
+    
+    const response = await request(app)
+      .post('/api/auth/register')
+      .send(userData)
+      .expect(201);
+      
+    expect(response.body).toMatchObject({
+      id: expect.any(String),
+      email: userData.email
+    });
+    
+    // Verify database state
+    const user = await prisma.user.findUnique({
+      where: { email: userData.email }
+    });
+    expect(user).toBeTruthy();
+  });
+});
+```
+
+### **E2E Test Development**
+```typescript
+// ✅ DO: Test complete user workflows
+describe('User Authentication Flow', () => {
+  it('should complete registration → login → protected access', async () => {
+    // Step 1: Register
+    const userData = createTestUser();
+    await request(app)
+      .post('/api/auth/register')
+      .send(userData)
+      .expect(201);
+    
+    // Step 2: Login
+    const loginResponse = await request(app)
+      .post('/api/auth/login')
+      .send({ email: userData.email, password: userData.password })
+      .expect(200);
+    
+    const { token } = loginResponse.body;
+    
+    // Step 3: Access protected resource
+    await request(app)
+      .get('/api/profile')
+      .set('Authorization', `Bearer ${token}`)
+      .expect(200);
+  }, 30000); // Extended timeout for E2E
+});
+```
+
+## **Mocking & Test Utilities**
+
+### **Established Mocking Patterns**
+```typescript
+// ✅ DO: Use established bcrypt mocking pattern
+jest.mock('bcrypt');
+import bcrypt from 'bcrypt';
+const mockHash = bcrypt.hash as jest.MockedFunction<typeof bcrypt.hash>;
+const mockCompare = bcrypt.compare as jest.MockedFunction<typeof bcrypt.compare>;
+
+// ✅ DO: Use Prisma mocking for unit tests
+jest.mock('@prisma/client', () => ({
+  PrismaClient: jest.fn().mockImplementation(() => ({
+    user: {
+      create: jest.fn(),
+      findUnique: jest.fn(),
+    },
+    $connect: jest.fn(),
+    $disconnect: jest.fn(),
+  })),
+}));
+```
+
+### **Test Fixtures Usage**
+```typescript
+// ✅ DO: Use centralized test fixtures
+import { createTestUser, adminUser, invalidUser } from '../fixtures/users';
+
+describe('User Service', () => {
+  it('should handle admin user creation', async () => {
+    const userData = createTestUser(adminUser);
+    // Test implementation
+  });
+  
+  it('should reject invalid user data', async () => {
+    const userData = createTestUser(invalidUser);
+    // Error testing
+  });
+});
+```
+
+## **Coverage Standards & Monitoring**
+
+### **Coverage Thresholds**
+- **Global Standards**: 80% lines/functions, 70% branches
+- **Critical Code**: 90% utils, 85% middleware
+- **New Features**: Must meet or exceed global thresholds
+- **Legacy Code**: Gradual improvement with each change
+
+### **Coverage Reporting & Analysis**
+```bash
+# Generate coverage reports
+npm run test:coverage
+
+# View detailed HTML report
+open coverage/lcov-report/index.html
+
+# Coverage files generated:
+# - coverage/lcov-report/index.html  # Detailed HTML report
+# - coverage/lcov.info               # LCOV format for IDE integration  
+# - coverage/coverage-final.json     # JSON format for tooling
+```
+
+### **Coverage Quality Checks**
+```typescript
+// ✅ DO: Test all code paths
+describe('validateInput', () => {
+  it('should return true for valid input', () => {
+    expect(validateInput('valid')).toBe(true);
+  });
+  
+  it('should return false for various invalid inputs', () => {
+    expect(validateInput('')).toBe(false);      // Empty string
+    expect(validateInput(null)).toBe(false);    // Null value
+    expect(validateInput(undefined)).toBe(false); // Undefined
+  });
+  
+  it('should throw for unexpected input types', () => {
+    expect(() => validateInput(123)).toThrow('Invalid input type');
+  });
+});
+```
+
+## **Testing During Development Phases**
+
+### **Feature Development Phase**
+```bash
+# 1. Start feature development
+task-master set-status --id=X.Y --status=in-progress
+
+# 2. Begin TDD cycle  
+npm run test:watch
+
+# 3. Document test progress in subtask
+task-master update-subtask --id=X.Y --prompt="Test development:
+- Created test file with 5 failing tests
+- Implemented core functionality
+- Tests passing, adding error scenarios"
+
+# 4. Verify coverage before completion
+npm run test:coverage
+
+# 5. Update subtask with final test status
+task-master update-subtask --id=X.Y --prompt="Testing complete:
+- 12 unit tests with full coverage
+- All edge cases and error scenarios covered
+- Ready for integration testing"
+```
+
+### **Integration Testing Phase**
+```bash
+# After API endpoints are implemented
+npm run test:integration
+
+# Update integration test templates
+# Replace placeholder tests with real endpoint calls
+
+# Document integration test results
+task-master update-subtask --id=X.Y --prompt="Integration tests:
+- Updated auth endpoint tests  
+- Database integration verified
+- All HTTP status codes and responses tested"
+```
+
+### **Pre-Commit Testing Phase**
+```bash
+# Before committing code
+npm run test:coverage         # Verify all tests pass with coverage
+npm run test:unit            # Quick unit test verification
+npm run test:integration     # Integration test verification (if applicable)
+
+# Commit pattern for test updates
+git add tests/ src/**/*.test.ts
+git commit -m "test(task-X): Add comprehensive tests for Feature Y
+
+- Unit tests with 95% coverage (exceeds 90% threshold)
+- Integration tests for API endpoints
+- Test fixtures for data generation
+- Proper mocking patterns established
+
+Task X: Feature Y - Testing complete"
+```
+
+## **Error Handling & Debugging**
+
+### **Test Debugging Techniques**
+```typescript
+// ✅ DO: Use test utilities for debugging
+import { testUtils } from '../setup';
+
+it('should debug complex operation', () => {
+  testUtils.withConsole(() => {
+    // Console output visible only for this test
+    console.log('Debug info:', complexData);
+    service.complexOperation();
+  });
+});
+
+// ✅ DO: Use proper async debugging
+it('should handle async operations', async () => {
+  const promise = service.asyncOperation();
+  
+  // Test intermediate state
+  expect(service.isProcessing()).toBe(true);
+  
+  const result = await promise;
+  expect(result).toBe('expected');
+  expect(service.isProcessing()).toBe(false);
+});
+```
+
+### **Common Test Issues & Solutions**
+```bash
+# Hanging tests (common with database connections)
+npm run test:integration -- --detectOpenHandles
+
+# Memory leaks in tests
+npm run test:unit -- --logHeapUsage
+
+# Slow tests identification
+npm run test:coverage -- --verbose
+
+# Mock not working properly
+# Check: mock is declared before imports
+# Check: jest.clearAllMocks() in beforeEach
+# Check: TypeScript typing is correct
+```
+
+## **Continuous Integration Integration**
+
+### **CI/CD Pipeline Testing**
+```yaml
+# Example GitHub Actions integration
+- name: Run tests
+  run: |
+    npm ci
+    npm run test:coverage
+    
+- name: Upload coverage reports
+  uses: codecov/codecov-action@v3
+  with:
+    file: ./coverage/lcov.info
+```
+
+### **Pre-commit Hooks**
+```bash
+# Setup pre-commit testing (recommended)
+# In package.json scripts:
+"pre-commit": "npm run test:unit && npm run test:integration"
+
+# Husky integration example:
+npx husky add .husky/pre-commit "npm run test:unit"
+```
+
+## **Test Maintenance & Evolution**
+
+### **Adding Tests for New Features**
+1. **Create test file** alongside source code or in `tests/unit/`
+2. **Follow established patterns** from `src/utils/auth.test.ts`
+3. **Use existing fixtures** from `tests/fixtures/`
+4. **Apply proper mocking** patterns for dependencies
+5. **Meet coverage thresholds** for the module
+
+### **Updating Integration/E2E Tests**
+1. **Update templates** in `tests/integration/` when APIs change
+2. **Modify E2E workflows** in `tests/e2e/` for new user journeys  
+3. **Update test fixtures** for new data requirements
+4. **Maintain database cleanup** utilities
+
+### **Test Performance Optimization**
+- **Parallel execution**: Jest runs tests in parallel by default
+- **Test isolation**: Use proper setup/teardown for independence
+- **Mock optimization**: Mock heavy dependencies appropriately  
+- **Database efficiency**: Use transaction rollbacks where possible
+
+---
+
+**Key References:**
+- [Testing Standards](mdc:.cursor/rules/tests.mdc)
+- [Git Workflow](mdc:.cursor/rules/git_workflow.mdc)
+- [Development Workflow](mdc:.cursor/rules/dev_workflow.mdc)
+- [Jest Configuration](mdc:jest.config.js)

.cursor/rules/tests.mdc

@@ -5,6 +5,8 @@ globs: "**/*.test.js,tests/**/*"
 
 # Testing Guidelines for Task Master CLI
 
+*Note:* Never use asynchronous operations in tests. Always mock tests properly based on the way the tested functions are defined and used. Do not arbitrarily create tests. Based them on the low-level details and execution of the underlying code being tested. 
+
 ## Test Organization Structure
 
 - **Unit Tests** (See [`architecture.mdc`](mdc:.cursor/rules/architecture.mdc) for module breakdown)
@@ -88,6 +90,122 @@ describe('Feature or Function Name', () => {
 });
 ```
 
+## Commander.js Command Testing Best Practices
+
+When testing CLI commands built with Commander.js, several special considerations must be made to avoid common pitfalls:
+
+- **Direct Action Handler Testing**
+  - ✅ **DO**: Test the command action handlers directly rather than trying to mock the entire Commander.js chain
+  - ✅ **DO**: Create simplified test-specific implementations of command handlers that match the original behavior
+  - ✅ **DO**: Explicitly handle all options, including defaults and shorthand flags (e.g., `-p` for `--prompt`)
+  - ✅ **DO**: Include null/undefined checks in test implementations for parameters that might be optional
+  - ✅ **DO**: Use fixtures from `tests/fixtures/` for consistent sample data across tests
+  
+  ```javascript
+  // ✅ DO: Create a simplified test version of the command handler
+  const testAddTaskAction = async (options) => {
+    options = options || {}; // Ensure options aren't undefined
+    
+    // Validate parameters
+    const isManualCreation = options.title && options.description;
+    const prompt = options.prompt || options.p; // Handle shorthand flags
+    
+    if (!prompt && !isManualCreation) {
+      throw new Error('Expected error message');
+    }
+    
+    // Call the mocked task manager
+    return mockTaskManager.addTask(/* parameters */);
+  };
+  
+  test('should handle required parameters correctly', async () => {
+    // Call the test implementation directly
+    await expect(async () => {
+      await testAddTaskAction({ file: 'tasks.json' });
+    }).rejects.toThrow('Expected error message');
+  });
+  ```
+
+- **Commander Chain Mocking (If Necessary)**
+  - ✅ **DO**: Mock ALL chainable methods (`option`, `argument`, `action`, `on`, etc.)
+  - ✅ **DO**: Return `this` (or the mock object) from all chainable method mocks
+  - ✅ **DO**: Remember to mock not only the initial object but also all objects returned by methods
+  - ✅ **DO**: Implement a mechanism to capture the action handler for direct testing
+  
+  ```javascript
+  // If you must mock the Commander.js chain:
+  const mockCommand = {
+    command: jest.fn().mockReturnThis(),
+    description: jest.fn().mockReturnThis(),
+    option: jest.fn().mockReturnThis(),
+    argument: jest.fn().mockReturnThis(), // Don't forget this one
+    action: jest.fn(fn => { 
+      actionHandler = fn; // Capture the handler for testing
+      return mockCommand; 
+    }),
+    on: jest.fn().mockReturnThis() // Don't forget this one
+  };
+  ```
+
+- **Parameter Handling**
+  - ✅ **DO**: Check for both main flag and shorthand flags (e.g., `prompt` and `p`)
+  - ✅ **DO**: Handle parameters like Commander would (comma-separated lists, etc.)
+  - ✅ **DO**: Set proper default values as defined in the command
+  - ✅ **DO**: Validate that required parameters are actually required in tests
+  
+  ```javascript
+  // Parse dependencies like Commander would
+  const dependencies = options.dependencies 
+    ? options.dependencies.split(',').map(id => id.trim())
+    : [];
+  ```
+
+- **Environment and Session Handling**
+  - ✅ **DO**: Properly mock session objects when required by functions
+  - ✅ **DO**: Reset environment variables between tests if modified
+  - ✅ **DO**: Use a consistent pattern for environment-dependent tests
+  
+  ```javascript
+  // Session parameter mock pattern
+  const sessionMock = { session: process.env };
+  
+  // In test:
+  expect(mockAddTask).toHaveBeenCalledWith(
+    expect.any(String),
+    'Test prompt',
+    [],
+    'medium',
+    sessionMock,
+    false,
+    null,
+    null
+  );
+  ```
+
+- **Common Pitfalls to Avoid**
+  - ❌ **DON'T**: Try to use the real action implementation without proper mocking
+  - ❌ **DON'T**: Mock Commander partially - either mock it completely or test the action directly
+  - ❌ **DON'T**: Forget to handle optional parameters that may be undefined
+  - ❌ **DON'T**: Neglect to test shorthand flag functionality (e.g., `-p`, `-r`)
+  - ❌ **DON'T**: Create circular dependencies in your test mocks
+  - ❌ **DON'T**: Access variables before initialization in your test implementations
+  - ❌ **DON'T**: Include actual command execution in unit tests
+  - ❌ **DON'T**: Overwrite the same file path in multiple tests
+  
+  ```javascript
+  // ❌ DON'T: Create circular references in mocks
+  const badMock = {
+    method: jest.fn().mockImplementation(() => badMock.method())
+  };
+  
+  // ❌ DON'T: Access uninitialized variables
+  const badImplementation = () => {
+    const result = uninitialized;
+    let uninitialized = 'value';
+    return result;
+  };
+  ```
+
 ## Jest Module Mocking Best Practices
 
 - **Mock Hoisting Behavior**
@@ -165,107 +283,97 @@ When testing ES modules (`"type": "module"` in package.json), traditional mockin
   - Imported functions may not use your mocked dependencies even with proper jest.mock() setup
   - ES module exports are read-only properties (cannot be reassigned during tests)
 
-- **Mocking Entire Modules**
+- **Mocking Modules Statically Imported**
+  - For modules imported with standard `import` statements at the top level:
+    - Use `jest.mock('path/to/module', factory)` **before** any imports.
+    - Jest hoists these mocks.
+    - Ensure the factory function returns the mocked structure correctly.
+
+- **Mocking Dependencies for Dynamically Imported Modules**
+  - **Problem**: Standard `jest.mock()` often fails for dependencies of modules loaded later using dynamic `import('path/to/module')`. The mocks aren't applied correctly when the dynamic import resolves.
+  - **Solution**: Use `jest.unstable_mockModule(modulePath, factory)` **before** the dynamic `import()` call.
   ```javascript
-  // Mock the entire module with custom implementation
-  jest.mock('../../scripts/modules/task-manager.js', () => {
-    // Get original implementation for functions you want to preserve
-    const originalModule = jest.requireActual('../../scripts/modules/task-manager.js');
-    
-    // Return mix of original and mocked functionality
-    return {
-      ...originalModule,
-      generateTaskFiles: jest.fn() // Replace specific functions
-    };
+  // 1. Define mock function instances
+  const mockExistsSync = jest.fn();
+  const mockReadFileSync = jest.fn();
+  // ... other mocks
+
+  // 2. Mock the dependency module *before* the dynamic import
+  jest.unstable_mockModule('fs', () => ({
+    __esModule: true, // Important for ES module mocks
+    // Mock named exports
+    existsSync: mockExistsSync,
+    readFileSync: mockReadFileSync,
+    // Mock default export if necessary
+    // default: { ... }
+  }));
+
+  // 3. Dynamically import the module under test (e.g., in beforeAll or test case)
+  let moduleUnderTest;
+  beforeAll(async () => {
+    // Ensure mocks are reset if needed before import
+    mockExistsSync.mockReset();
+    mockReadFileSync.mockReset();
+    // ... reset other mocks ...
+
+    // Import *after* unstable_mockModule is called
+    moduleUnderTest = await import('../../scripts/modules/module-using-fs.js');
   });
-  
-  // Import after mocks
-  import * as taskManager from '../../scripts/modules/task-manager.js';
-  
-  // Now you can use the mock directly
-  const { generateTaskFiles } = taskManager;
+
+  // 4. Now tests can use moduleUnderTest, and its 'fs' calls will hit the mocks
+  test('should use mocked fs.readFileSync', () => {
+    mockReadFileSync.mockReturnValue('mock data');
+    moduleUnderTest.readFileAndProcess();
+    expect(mockReadFileSync).toHaveBeenCalled();
+    // ... other assertions
+  });
+  ```
+  - ✅ **DO**: Call `jest.unstable_mockModule()` before `await import()`.
+  - ✅ **DO**: Include `__esModule: true` in the mock factory for ES modules.
+  - ✅ **DO**: Mock named and default exports as needed within the factory.
+  - ✅ **DO**: Reset mock functions (`mockFn.mockReset()`) before the dynamic import if they might have been called previously.
+
+- **Mocking Entire Modules (Static Import)**
+  ```javascript
+  // Mock the entire module with custom implementation for static imports
+  // ... (existing example remains valid) ...
   ```
 
 - **Direct Implementation Testing**
   - Instead of calling the actual function which may have module-scope reference issues:
   ```javascript
-  test('should perform expected actions', () => {
-    // Setup mocks for this specific test
-    mockReadJSON.mockImplementationOnce(() => sampleData);
-    
-    // Manually simulate the function's behavior
-    const data = mockReadJSON('path/file.json');
-    mockValidateAndFixDependencies(data, 'path/file.json');
-    
-    // Skip calling the actual function and verify mocks directly
-    expect(mockReadJSON).toHaveBeenCalledWith('path/file.json');
-    expect(mockValidateAndFixDependencies).toHaveBeenCalledWith(data, 'path/file.json');
-  });
+  // ... (existing example remains valid) ...
   ```
 
 - **Avoiding Module Property Assignment**
   ```javascript
-  // ❌ DON'T: This causes "Cannot assign to read only property" errors
-  const utils = await import('../../scripts/modules/utils.js');
-  utils.readJSON = mockReadJSON; // Error: read-only property
-  
-  // ✅ DO: Use the module factory pattern in jest.mock()
-  jest.mock('../../scripts/modules/utils.js', () => ({
-    readJSON: mockReadJSONFunc,
-    writeJSON: mockWriteJSONFunc
-  }));
+  // ... (existing example remains valid) ...
   ```
 
 - **Handling Mock Verification Failures**
   - If verification like `expect(mockFn).toHaveBeenCalled()` fails:
-    1. Check that your mock setup is before imports
-    2. Ensure you're using the right mock instance
-    3. Verify your test invokes behavior that would call the mock
-    4. Use `jest.clearAllMocks()` in beforeEach to reset mock state
-    5. Consider implementing a simpler test that directly verifies mock behavior
-
-- **Full Example Pattern**
-  ```javascript
-  // 1. Define mock implementations
-  const mockReadJSON = jest.fn();
-  const mockValidateAndFixDependencies = jest.fn();
-  
-  // 2. Mock modules
-  jest.mock('../../scripts/modules/utils.js', () => ({
-    readJSON: mockReadJSON,
-    // Include other functions as needed
-  }));
-  
-  jest.mock('../../scripts/modules/dependency-manager.js', () => ({
-    validateAndFixDependencies: mockValidateAndFixDependencies
-  }));
-  
-  // 3. Import after mocks
-  import * as taskManager from '../../scripts/modules/task-manager.js';
-  
-  describe('generateTaskFiles function', () => {
-    beforeEach(() => {
-      jest.clearAllMocks();
-    });
-    
-    test('should generate task files', () => {
-      // 4. Setup test-specific mock behavior
-      const sampleData = { tasks: [{ id: 1, title: 'Test' }] };
-      mockReadJSON.mockReturnValueOnce(sampleData);
-      
-      // 5. Create direct implementation test
-      // Instead of calling: taskManager.generateTaskFiles('path', 'dir')
-      
-      // Simulate reading data
-      const data = mockReadJSON('path');
-      expect(mockReadJSON).toHaveBeenCalledWith('path');
-      
-      // Simulate other operations the function would perform
-      mockValidateAndFixDependencies(data, 'path');
-      expect(mockValidateAndFixDependencies).toHaveBeenCalledWith(data, 'path');
-    });
-  });
-  ```
+    1.  Check that your mock setup (`jest.mock` or `jest.unstable_mockModule`) is correctly placed **before** imports (static or dynamic).
+    2.  Ensure you're using the right mock instance and it's properly passed to the module.
+    3.  Verify your test invokes behavior that *should* call the mock.
+    4.  Use `jest.clearAllMocks()` or specific `mockFn.mockReset()` in `beforeEach` to prevent state leakage between tests.
+    5.  **Check Console Assertions**: If verifying `console.log`, `console.warn`, or `console.error` calls, ensure your assertion matches the *actual* arguments passed. If the code logs a single formatted string, assert against that single string (using `expect.stringContaining` or exact match), not multiple `expect.stringContaining` arguments.
+        ```javascript
+        // Example: Code logs console.error(`Error: ${message}. Details: ${details}`)
+        // ❌ DON'T: Assert multiple arguments if only one is logged
+        // expect(console.error).toHaveBeenCalledWith(
+        //   expect.stringContaining('Error:'),
+        //   expect.stringContaining('Details:')
+        // );
+        // ✅ DO: Assert the single string argument
+        expect(console.error).toHaveBeenCalledWith(
+           expect.stringContaining('Error: Specific message. Details: More details')
+        );
+        // or for exact match:
+        expect(console.error).toHaveBeenCalledWith(
+           'Error: Specific message. Details: More details'
+        );
+        ```
+    6.  Consider implementing a simpler test that *only* verifies the mock behavior in isolation.
 
 ## Mocking Guidelines
 
@@ -552,6 +660,102 @@ npm test -- -t "pattern to match"
   });
   ```
 
+## Testing AI Service Integrations
+
+- **DO NOT import real AI service clients**
+  - ❌ DON'T: Import actual AI clients from their libraries
+  - ✅ DO: Create fully mocked versions that return predictable responses
+
+  ```javascript
+  // ❌ DON'T: Import and instantiate real AI clients
+  import { Anthropic } from '@anthropic-ai/sdk';
+  const anthropic = new Anthropic({ apiKey: process.env.ANTHROPIC_API_KEY });
+
+  // ✅ DO: Mock the entire module with controlled behavior
+  jest.mock('@anthropic-ai/sdk', () => ({
+    Anthropic: jest.fn().mockImplementation(() => ({
+      messages: {
+        create: jest.fn().mockResolvedValue({
+          content: [{ type: 'text', text: 'Mocked AI response' }]
+        })
+      }
+    }))
+  }));
+  ```
+
+- **DO NOT rely on environment variables for API keys**
+  - ❌ DON'T: Assume environment variables are set in tests
+  - ✅ DO: Set mock environment variables in test setup
+
+  ```javascript
+  // In tests/setup.js or at the top of test file
+  process.env.ANTHROPIC_API_KEY = 'test-mock-api-key-for-tests';
+  process.env.PERPLEXITY_API_KEY = 'test-mock-perplexity-key-for-tests';
+  ```
+
+- **DO NOT use real AI client initialization logic**
+  - ❌ DON'T: Use code that attempts to initialize or validate real AI clients
+  - ✅ DO: Create test-specific paths that bypass client initialization
+
+  ```javascript
+  // ❌ DON'T: Test functions that require valid AI client initialization
+  // This will fail without proper API keys or network access
+  test('should use AI client', async () => {
+    const result = await functionThatInitializesAIClient();
+    expect(result).toBeDefined();
+  });
+
+  // ✅ DO: Test with bypassed initialization or manual task paths
+  test('should handle manual task creation without AI', () => {
+    // Using a path that doesn't require AI client initialization
+    const result = addTaskDirect({ 
+      title: 'Manual Task', 
+      description: 'Test Description'
+    }, mockLogger);
+    
+    expect(result.success).toBe(true);
+  });
+  ```
+
+## Testing Asynchronous Code
+
+- **DO NOT rely on asynchronous operations in tests**
+  - ❌ DON'T: Use real async/await or Promise resolution in tests
+  - ✅ DO: Make all mocks return synchronous values when possible
+
+  ```javascript
+  // ❌ DON'T: Use real async functions that might fail unpredictably
+  test('should handle async operation', async () => {
+    const result = await realAsyncFunction(); // Can time out or fail for external reasons
+    expect(result).toBe(expectedValue);
+  });
+
+  // ✅ DO: Make async operations synchronous in tests
+  test('should handle operation', () => {
+    mockAsyncFunction.mockReturnValue({ success: true, data: 'test' });
+    const result = functionUnderTest();
+    expect(result).toEqual({ success: true, data: 'test' });
+  });
+  ```
+
+- **DO NOT test exact error messages**
+  - ❌ DON'T: Assert on exact error message text that might change
+  - ✅ DO: Test for error presence and general properties
+
+  ```javascript
+  // ❌ DON'T: Test for exact error message text
+  expect(result.error).toBe('Could not connect to API: Network error');
+
+  // ✅ DO: Test for general error properties or message patterns
+  expect(result.success).toBe(false);
+  expect(result.error).toContain('Could not connect');
+  // Or even better:
+  expect(result).toMatchObject({ 
+    success: false,
+    error: expect.stringContaining('connect')
+  });
+  ```
+
 ## Reliable Testing Techniques
 
 - **Create Simplified Test Functions**
@@ -564,99 +768,125 @@ npm test -- -t "pattern to match"
   const setTaskStatus = async (taskId, newStatus) => {
     const tasksPath = 'tasks/tasks.json';
     const data = await readJSON(tasksPath);
-    // Update task status logic
+    // [implementation]
     await writeJSON(tasksPath, data);
-    return data;
+    return { success: true };
   };
   
-  // Test-friendly simplified function (easy to test)
-  const testSetTaskStatus = (tasksData, taskIdInput, newStatus) => {
-    // Same core logic without file operations
-    // Update task status logic on provided tasksData object
-    return tasksData; // Return updated data for assertions
+  // Test-friendly version (easier to test)
+  const updateTaskStatus = (tasks, taskId, newStatus) => {
+    // Pure logic without side effects
+    const updatedTasks = [...tasks];
+    const taskIndex = findTaskById(updatedTasks, taskId);
+    if (taskIndex === -1) return { success: false, error: 'Task not found' };
+    updatedTasks[taskIndex].status = newStatus;
+    return { success: true, tasks: updatedTasks };
   };
   ```
 
-- **Avoid Real File System Operations**
-  - Never write to real files during tests
-  - Create test-specific versions of file operation functions
-  - Mock all file system operations including read, write, exists, etc.
-  - Verify function behavior using the in-memory data structures
-  
-  ```javascript
-  // Mock file operations
-  const mockReadJSON = jest.fn();
-  const mockWriteJSON = jest.fn();
-  
-  jest.mock('../../scripts/modules/utils.js', () => ({
-    readJSON: mockReadJSON,
-    writeJSON: mockWriteJSON,
-  }));
-  
-  test('should update task status correctly', () => {
-    // Setup mock data
-    const testData = JSON.parse(JSON.stringify(sampleTasks));
-    mockReadJSON.mockReturnValue(testData);
-    
-    // Call the function that would normally modify files
-    const result = testSetTaskStatus(testData, '1', 'done');
-    
-    // Assert on the in-memory data structure
-    expect(result.tasks[0].status).toBe('done');
-  });
-  ```
-
-- **Data Isolation Between Tests**
-  - Always create fresh copies of test data for each test
-  - Use `JSON.parse(JSON.stringify(original))` for deep cloning
-  - Reset all mocks before each test with `jest.clearAllMocks()`
-  - Avoid state that persists between tests
-  
-  ```javascript
-  beforeEach(() => {
-    jest.clearAllMocks();
-    // Deep clone the test data
-    testTasksData = JSON.parse(JSON.stringify(sampleTasks));
-  });
-  ```
-
-- **Test All Path Variations**
-  - Regular tasks and subtasks
-  - Single items and multiple items
-  - Success paths and error paths
-  - Edge cases (empty data, invalid inputs, etc.)
-  
-  ```javascript
-  // Multiple test cases covering different scenarios
-  test('should update regular task status', () => {
-    /* test implementation */
-  });
-  
-  test('should update subtask status', () => {
-    /* test implementation */
-  });
-  
-  test('should update multiple tasks when given comma-separated IDs', () => {
-    /* test implementation */
-  });
-  
-  test('should throw error for non-existent task ID', () => {
-    /* test implementation */
-  });
-  ```
-
-- **Stabilize Tests With Predictable Input/Output**
-  - Use consistent, predictable test fixtures
-  - Avoid random values or time-dependent data
-  - Make tests deterministic for reliable CI/CD
-  - Control all variables that might affect test outcomes
-  
-  ```javascript
-  // Use a specific known date instead of current date
-  const fixedDate = new Date('2023-01-01T12:00:00Z');
-  jest.spyOn(global, 'Date').mockImplementation(() => fixedDate);
-  ```
-
 See [tests/README.md](mdc:tests/README.md) for more details on the testing approach.
 
-Refer to [jest.config.js](mdc:jest.config.js) for Jest configuration options. 
+Refer to [jest.config.js](mdc:jest.config.js) for Jest configuration options.
+
+## Variable Hoisting and Module Initialization Issues
+
+When testing ES modules or working with complex module imports, you may encounter variable hoisting and initialization issues. These can be particularly tricky to debug and often appear as "Cannot access 'X' before initialization" errors.
+
+- **Understanding Module Initialization Order**
+  - ✅ **DO**: Declare and initialize global variables at the top of modules
+  - ✅ **DO**: Use proper function declarations to avoid hoisting issues
+  - ✅ **DO**: Initialize variables before they are referenced, especially in imported modules
+  - ✅ **DO**: Be aware that imports are hoisted to the top of the file
+  
+  ```javascript
+  // ✅ DO: Define global state variables at the top of the module
+  let silentMode = false; // Declare and initialize first
+  
+  const CONFIG = { /* configuration */ };
+  
+  function isSilentMode() {
+    return silentMode; // Reference variable after it's initialized
+  }
+  
+  function log(level, message) {
+    if (isSilentMode()) return; // Use the function instead of accessing variable directly
+    // ...
+  }
+  ```
+
+- **Testing Modules with Initialization-Dependent Functions**
+  - ✅ **DO**: Create test-specific implementations that initialize all variables correctly
+  - ✅ **DO**: Use factory functions in mocks to ensure proper initialization order
+  - ✅ **DO**: Be careful with how you mock or stub functions that depend on module state
+  
+  ```javascript
+  // ✅ DO: Test-specific implementation that avoids initialization issues
+  const testLog = (level, ...args) => {
+    // Local implementation with proper initialization
+    const isSilent = false; // Explicit initialization
+    if (isSilent) return;
+    // Test implementation...
+  };
+  ```
+
+- **Common Hoisting-Related Errors to Avoid**
+  - ❌ **DON'T**: Reference variables before their declaration in module scope
+  - ❌ **DON'T**: Create circular dependencies between modules
+  - ❌ **DON'T**: Rely on variable initialization order across module boundaries
+  - ❌ **DON'T**: Define functions that use hoisted variables before they're initialized
+  
+  ```javascript
+  // ❌ DON'T: Create reference-before-initialization patterns
+  function badFunction() {
+    if (silentMode) { /* ... */ } // ReferenceError if silentMode is declared later
+  }
+  
+  let silentMode = false;
+  
+  // ❌ DON'T: Create cross-module references that depend on initialization order
+  // module-a.js
+  import { getSetting } from './module-b.js';
+  export const config = { value: getSetting() };
+  
+  // module-b.js
+  import { config } from './module-a.js';
+  export function getSetting() {
+    return config.value; // Circular dependency causing initialization issues
+  }
+  ```
+
+- **Dynamic Imports as a Solution**
+  - ✅ **DO**: Use dynamic imports (`import()`) to avoid initialization order issues
+  - ✅ **DO**: Structure modules to avoid circular dependencies that cause initialization issues
+  - ✅ **DO**: Consider factory functions for modules with complex state
+  
+  ```javascript
+  // ✅ DO: Use dynamic imports to avoid initialization issues
+  async function getTaskManager() {
+    return import('./task-manager.js');
+  }
+  
+  async function someFunction() {
+    const taskManager = await getTaskManager();
+    return taskManager.someMethod();
+  }
+  ```
+
+- **Testing Approach for Modules with Initialization Issues**
+  - ✅ **DO**: Create self-contained test implementations rather than using real implementations
+  - ✅ **DO**: Mock dependencies at module boundaries instead of trying to mock deep dependencies
+  - ✅ **DO**: Isolate module-specific state in tests
+  
+  ```javascript
+  // ✅ DO: Create isolated test implementation instead of reusing module code
+  test('should log messages when not in silent mode', () => {
+    // Local test implementation instead of importing from module
+    const testLog = (level, message) => {
+      if (false) return; // Always non-silent for this test
+      mockConsole(level, message);
+    };
+    
+    testLog('info', 'test message');
+    expect(mockConsole).toHaveBeenCalledWith('info', 'test message');
+  });
+  ``` 

.cursor/rules/ui.mdc

@@ -150,4 +150,91 @@ alwaysApply: false
   ));
   ```
 
-Refer to [`ui.js`](mdc:scripts/modules/ui.js) for implementation examples and [`new_features.mdc`](mdc:.cursor/rules/new_features.mdc) for integration guidelines. 
+## Enhanced Display Patterns
+
+### **Token Breakdown Display**
+- Use detailed, granular token breakdowns for AI-powered commands
+- Display context sources with individual token counts
+- Show both token count and character count for transparency
+
+  ```javascript
+  // ✅ DO: Display detailed token breakdown
+  function displayDetailedTokenBreakdown(tokenBreakdown, systemTokens, userTokens) {
+    const sections = [];
+    
+    if (tokenBreakdown.tasks?.length > 0) {
+      const taskDetails = tokenBreakdown.tasks.map(task => 
+        `${task.type === 'subtask' ? '  ' : ''}${task.id}: ${task.tokens.toLocaleString()}`
+      ).join('\n');
+      sections.push(`Tasks (${tokenBreakdown.tasks.reduce((sum, t) => sum + t.tokens, 0).toLocaleString()}):\n${taskDetails}`);
+    }
+    
+    const content = sections.join('\n\n');
+    console.log(boxen(content, {
+      title: chalk.cyan('Token Usage'),
+      padding: { top: 1, bottom: 1, left: 2, right: 2 },
+      borderStyle: 'round',
+      borderColor: 'cyan'
+    }));
+  }
+  ```
+
+### **Code Block Syntax Highlighting**
+- Use `cli-highlight` library for syntax highlighting in terminal output
+- Process code blocks in AI responses for better readability
+
+  ```javascript
+  // ✅ DO: Enhance code blocks with syntax highlighting
+  import { highlight } from 'cli-highlight';
+  
+  function processCodeBlocks(text) {
+    return text.replace(/```(\w+)?\n([\s\S]*?)```/g, (match, language, code) => {
+      try {
+        const highlighted = highlight(code.trim(), { 
+          language: language || 'javascript',
+          theme: 'default'
+        });
+        return `\n${highlighted}\n`;
+      } catch (error) {
+        return `\n${code.trim()}\n`;
+      }
+    });
+  }
+  ```
+
+### **Multi-Section Result Display**
+- Use separate boxes for headers, content, and metadata
+- Maintain consistent styling across different result types
+
+  ```javascript
+  // ✅ DO: Use structured result display
+  function displayResults(result, query, detailLevel) {
+    // Header with query info
+    const header = boxen(
+      chalk.green.bold('Research Results') + '\n\n' +
+      chalk.gray('Query: ') + chalk.white(query) + '\n' +
+      chalk.gray('Detail Level: ') + chalk.cyan(detailLevel),
+      {
+        padding: { top: 1, bottom: 1, left: 2, right: 2 },
+        margin: { top: 1, bottom: 0 },
+        borderStyle: 'round',
+        borderColor: 'green'
+      }
+    );
+    console.log(header);
+    
+    // Process and display main content
+    const processedResult = processCodeBlocks(result);
+    const contentBox = boxen(processedResult, {
+      padding: { top: 1, bottom: 1, left: 2, right: 2 },
+      margin: { top: 0, bottom: 1 },
+      borderStyle: 'single',
+      borderColor: 'gray'
+    });
+    console.log(contentBox);
+    
+    console.log(chalk.green('✓ Operation complete'));
+  }
+  ```
+
+Refer to [`ui.js`](mdc:scripts/modules/ui.js) for implementation examples, [`context_gathering.mdc`](mdc:.cursor/rules/context_gathering.mdc) for context display patterns, and [`new_features.mdc`](mdc:.cursor/rules/new_features.mdc) for integration guidelines. 

.cursor/rules/utilities.mdc

@@ -1,9 +1,8 @@
 ---
-description: Guidelines for implementing utility functions
-globs: scripts/modules/utils.js, mcp-server/src/**/*
+description: 
+globs: 
 alwaysApply: false
 ---
-
 # Utility Function Guidelines
 
 ## General Principles
@@ -47,7 +46,7 @@ alwaysApply: false
 - **Location**:
     - **Core CLI Utilities**: Place utilities used primarily by the core `task-master` CLI logic and command modules (`scripts/modules/*`) into [`scripts/modules/utils.js`](mdc:scripts/modules/utils.js).
     - **MCP Server Utilities**: Place utilities specifically designed to support the MCP server implementation into the appropriate subdirectories within `mcp-server/src/`.
-        - Path/Core Logic Helpers: [`mcp-server/src/core/utils/`](mdc:mcp-server/src/core/utils/) (e.g., `path-utils.js`).
+        - Path/Core Logic Helpers: [`mcp-server/src/core/utils/`](mdc:mcp-server/src/core/utils) (e.g., `path-utils.js`).
         - Tool Execution/Response Helpers: [`mcp-server/src/tools/utils.js`](mdc:mcp-server/src/tools/utils.js).
 
 ## Documentation Standards
@@ -79,28 +78,30 @@ alwaysApply: false
   }
   ```
 
-## Configuration Management (in `scripts/modules/utils.js`)
+## Configuration Management (via `config-manager.js`)
 
-- **Environment Variables**:
-  - ✅ DO: Provide default values for all configuration
-  - ✅ DO: Use environment variables for customization
-  - ✅ DO: Document available configuration options
-  - ❌ DON'T: Hardcode values that should be configurable
+Taskmaster configuration (excluding API keys) is primarily managed through the `.taskmasterconfig` file located in the project root and accessed via getters in [`scripts/modules/config-manager.js`](mdc:scripts/modules/config-manager.js).
 
-  ```javascript
-  // ✅ DO: Set up configuration with defaults and environment overrides
-  const CONFIG = {
-    model: process.env.MODEL || 'claude-3-opus-20240229', // Updated default model
-    maxTokens: parseInt(process.env.MAX_TOKENS || '4000'),
-    temperature: parseFloat(process.env.TEMPERATURE || '0.7'),
-    debug: process.env.DEBUG === "true",
-    logLevel: process.env.LOG_LEVEL || "info",
-    defaultSubtasks: parseInt(process.env.DEFAULT_SUBTASKS || "3"),
-    defaultPriority: process.env.DEFAULT_PRIORITY || "medium",
-    projectName: process.env.PROJECT_NAME || "Task Master Project", // Generic project name
-    projectVersion: "1.5.0" // Version should be updated via release process
-  };
-  ```
+- **`.taskmasterconfig` File**:
+  - ✅ DO: Use this JSON file to store settings like AI model selections (main, research, fallback), parameters (temperature, maxTokens), logging level, default priority/subtasks, etc.
+  - ✅ DO: Manage this file using the `task-master models --setup` CLI command or the `models` MCP tool.
+  - ✅ DO: Rely on [`config-manager.js`](mdc:scripts/modules/config-manager.js) to load this file (using the correct project root passed from MCP or found via CLI utils), merge with defaults, and provide validated settings.
+  - ❌ DON'T: Store API keys in this file.
+  - ❌ DON'T: Manually edit this file unless necessary.
+
+- **Configuration Getters (`config-manager.js`)**:
+  - ✅ DO: Import and use specific getters from `config-manager.js` (e.g., `getMainProvider()`, `getLogLevel()`, `getMainMaxTokens()`) to access configuration values *needed for application logic* (like `getDefaultSubtasks`).
+  - ✅ DO: Pass the `explicitRoot` parameter to getters if calling from MCP direct functions to ensure the correct project's config is loaded.
+  - ❌ DON'T: Call AI-specific getters (like `getMainModelId`, `getMainMaxTokens`) from core logic functions (`scripts/modules/task-manager/*`). Instead, pass the `role` to the unified AI service.
+  - ❌ DON'T: Access configuration values directly from environment variables (except API keys).
+
+- **API Key Handling (`utils.js` & `ai-services-unified.js`)**:
+  - ✅ DO: Store API keys **only** in `.env` (for CLI, loaded by `dotenv` in `scripts/dev.js`) or `.cursor/mcp.json` (for MCP, accessed via `session.env`).
+  - ✅ DO: Use `isApiKeySet(providerName, session)` from `config-manager.js` to check if a provider's key is available *before* potentially attempting an AI call if needed, but note the unified service performs its own internal check.
+  - ✅ DO: Understand that the unified service layer (`ai-services-unified.js`) internally resolves API keys using `resolveEnvVariable(key, session)` from `utils.js`.
+
+- **Error Handling**:
+  - ✅ DO: Handle potential `ConfigurationError` if the `.taskmasterconfig` file is missing or invalid when accessed via `getConfig` (e.g., in `commands.js` or direct functions).
 
 ## Logging Utilities (in `scripts/modules/utils.js`)
 
@@ -109,7 +110,7 @@ alwaysApply: false
   - ✅ DO: Use appropriate icons for different log levels
   - ✅ DO: Respect the configured log level
   - ❌ DON'T: Add direct console.log calls outside the logging utility
-  - **Note on Passed Loggers**: When a logger object (like the FastMCP `log` object) is passed *as a parameter* (e.g., as `mcpLog`) into core Task Master functions, the receiving function often expects specific methods (`.info`, `.warn`, `.error`, etc.) to be directly callable on that object (e.g., `mcpLog[level](...)`). If the passed logger doesn't have this exact structure, a wrapper object may be needed. See the **Handling Logging Context (`mcpLog`)** section in [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc) for the standard pattern used in direct functions.
+  - **Note on Passed Loggers**: When a logger object (like the FastMCP `log` object) is passed *as a parameter* (e.g., as `mcpLog`) into core Task Master functions, the receiving function often expects specific methods (`.info`, `.warn`, `.error`, etc.) to be directly callable on that object (e.g., `mcpLog[level](mdc:...)`). If the passed logger doesn't have this exact structure, a wrapper object may be needed. See the **Handling Logging Context (`mcpLog`)** section in [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc) for the standard pattern used in direct functions.
 
 - **Logger Wrapper Pattern**: 
   - ✅ DO: Use the logger wrapper pattern when passing loggers to prevent `mcpLog[level] is not a function` errors:
@@ -427,36 +428,69 @@ alwaysApply: false
 
 ## MCP Server Tool Utilities (`mcp-server/src/tools/utils.js`)
 
-- **Purpose**: These utilities specifically support the MCP server tools ([`mcp-server/src/tools/*.js`](mdc:mcp-server/src/tools/*.js)), handling MCP communication patterns, response formatting, caching integration, and the CLI fallback mechanism.
-- **Refer to [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc)** for detailed usage patterns within the MCP tool `execute` methods and direct function wrappers.
+These utilities specifically support the implementation and execution of MCP tools.
 
-- **`getProjectRootFromSession(session, log)`**: 
-    - ✅ **DO**: Call this utility **within the MCP tool's `execute` method** to extract the project root path from the `session` object.
-    - Decodes the `file://` URI and handles potential errors.
-    - Returns the project path string or `null`.
-    - The returned path should then be passed in the `args` object when calling the corresponding `*Direct` function (e.g., `yourDirectFunction({ ...args, projectRoot: rootFolder }, log)`).
+- **`normalizeProjectRoot(rawPath, log)`**:
+    - **Purpose**: Takes a raw project root path (potentially URI encoded, with `file://` prefix, Windows slashes) and returns a normalized, absolute path suitable for the server's OS.
+    - **Logic**: Decodes URI, strips `file://`, handles Windows drive prefix (`/C:/`), replaces `\` with `/`, uses `path.resolve()`.
+    - **Usage**: Used internally by `withNormalizedProjectRoot` HOF.
+
+- **`getRawProjectRootFromSession(session, log)`**:
+    - **Purpose**: Extracts the *raw* project root URI string from the session object (`session.roots[0].uri` or `session.roots.roots[0].uri`) without performing normalization.
+    - **Usage**: Used internally by `withNormalizedProjectRoot` HOF as a fallback if `args.projectRoot` isn't provided.
+
+- **`withNormalizedProjectRoot(executeFn)`**:
+    - **Purpose**: A Higher-Order Function (HOF) designed to wrap a tool's `execute` method.
+    - **Logic**: 
+        1. Determines the raw project root (from `args.projectRoot` or `getRawProjectRootFromSession`).
+        2. Normalizes the raw path using `normalizeProjectRoot`.
+        3. Injects the normalized, absolute path back into the `args` object as `args.projectRoot`.
+        4. Calls the original `executeFn` with the updated `args`.
+    - **Usage**: Should wrap the `execute` function of *every* MCP tool that needs a reliable, normalized project root path.
+    - **Example**:
+      ```javascript
+      // In mcp-server/src/tools/your-tool.js
+      import { withNormalizedProjectRoot } from './utils.js';
+      
+      export function registerYourTool(server) {
+          server.addTool({
+              // ... name, description, parameters ...
+              execute: withNormalizedProjectRoot(async (args, context) => {
+                  // args.projectRoot is now normalized here
+                  const { projectRoot /*, other args */ } = args;
+                  // ... rest of tool logic using normalized projectRoot ...
+              })
+          });
+      }
+      ```
 
 - **`handleApiResult(result, log, errorPrefix, processFunction)`**:
-    - ✅ **DO**: Call this from the MCP tool's `execute` method after receiving the result from the `*Direct` function wrapper.
-    - Takes the standard `{ success, data/error, fromCache }` object.
-    - Formats the standard MCP success or error response, including the `fromCache` flag.
-    - Uses `processMCPResponseData` by default to filter response data.
-
-- **`executeTaskMasterCommand(command, log, args, projectRootRaw)`**:
-    - Executes a Task Master CLI command as a child process.
-    - Handles fallback between global `task-master` and local `node scripts/dev.js`.
-    - ❌ **DON'T**: Use this as the primary method for MCP tools. Prefer direct function calls via `*Direct` wrappers.
-
-- **`processMCPResponseData(taskOrData, fieldsToRemove)`**:
-    - Filters task data (e.g., removing `details`, `testStrategy`) before sending to the MCP client. Called by `handleApiResult`.
+    - **Purpose**: Standardizes the formatting of responses returned by direct functions (`{ success, data/error, fromCache }`) into the MCP response format.
+    - **Usage**: Call this at the end of the tool's `execute` method, passing the result from the direct function call.
 
 - **`createContentResponse(content)` / `createErrorResponse(errorMessage)`**:
-    - Formatters for standard MCP success/error responses.
+    - **Purpose**: Helper functions to create the basic MCP response structure for success or error messages.
+    - **Usage**: Used internally by `handleApiResult` and potentially directly for simple responses.
+
+- **`createLogWrapper(log)`**:
+    - **Purpose**: Creates a logger object wrapper with standard methods (`info`, `warn`, `error`, `debug`, `success`) mapping to the passed MCP `log` object's methods. Ensures compatibility when passing loggers to core functions.
+    - **Usage**: Used within direct functions before passing the `log` object down to core logic that expects the standard method names.
 
 - **`getCachedOrExecute({ cacheKey, actionFn, log })`**:
-    - ✅ **DO**: Use this utility *inside direct function wrappers* to implement caching.
-    - Checks cache, executes `actionFn` on miss, stores result.
-    - Returns standard `{ success, data/error, fromCache: boolean }`.
+    - **Purpose**: Utility for implementing caching within direct functions. Checks cache for `cacheKey`; if miss, executes `actionFn`, caches successful result, and returns.
+    - **Usage**: Wrap the core logic execution within a direct function call.
+
+- **`processMCPResponseData(taskOrData, fieldsToRemove)`**:
+    - **Purpose**: Utility to filter potentially sensitive or large fields (like `details`, `testStrategy`) from task objects before sending the response back via MCP.
+    - **Usage**: Passed as the default `processFunction` to `handleApiResult`.
+
+- **`getProjectRootFromSession(session, log)`**:
+    - **Purpose**: Legacy function to extract *and normalize* the project root from the session. Replaced by the HOF pattern but potentially still used.
+    - **Recommendation**: Prefer using the `withNormalizedProjectRoot` HOF in tools instead of calling this directly.
+
+- **`executeTaskMasterCommand(...)`**: 
+    - **Purpose**: Executes `task-master` CLI command as a fallback. 
+    - **Recommendation**: Deprecated for most uses; prefer direct function calls.
 
 ## Export Organization
 
@@ -514,4 +548,628 @@ export {
 };
 ```
 
-Refer to [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc) and [`architecture.mdc`](mdc:.cursor/rules/architecture.mdc) for more context on MCP server architecture and integration. 
+## Context Gathering Utilities
+
+### **ContextGatherer** (`scripts/modules/utils/contextGatherer.js`)
+
+- **Multi-Source Context Extraction**:
+  - ✅ DO: Use for AI-powered commands that need project context
+  - ✅ DO: Support tasks, files, custom text, and project tree context
+  - ✅ DO: Implement detailed token counting with `gpt-tokens` library
+  - ✅ DO: Provide multiple output formats (research, chat, system-prompt)
+
+  ```javascript
+  // ✅ DO: Use ContextGatherer for consistent context extraction
+  import { ContextGatherer } from '../utils/contextGatherer.js';
+  
+  const gatherer = new ContextGatherer(projectRoot, tasksPath);
+  const result = await gatherer.gather({
+    tasks: ['15', '16.2'],
+    files: ['src/api.js'],
+    customContext: 'Additional context',
+    includeProjectTree: true,
+    format: 'research',
+    includeTokenCounts: true
+  });
+  ```
+
+### **FuzzyTaskSearch** (`scripts/modules/utils/fuzzyTaskSearch.js`)
+
+- **Intelligent Task Discovery**:
+  - ✅ DO: Use for automatic task relevance detection
+  - ✅ DO: Configure search parameters based on use case context
+  - ✅ DO: Implement purpose-based categorization for better matching
+  - ✅ DO: Sort results by relevance score and task ID
+
+  ```javascript
+  // ✅ DO: Use FuzzyTaskSearch for intelligent task discovery
+  import { FuzzyTaskSearch } from '../utils/fuzzyTaskSearch.js';
+  
+  const fuzzySearch = new FuzzyTaskSearch(tasksData.tasks, 'research');
+  const searchResults = fuzzySearch.findRelevantTasks(query, {
+    maxResults: 8,
+    includeRecent: true,
+    includeCategoryMatches: true
+  });
+  const taskIds = fuzzySearch.getTaskIds(searchResults);
+  ```
+
+- **Integration Guidelines**:
+  - ✅ DO: Use fuzzy search to supplement user-provided task IDs
+  - ✅ DO: Display discovered task IDs to users for transparency
+  - ✅ DO: Sort discovered task IDs numerically for better readability
+  - ❌ DON'T: Replace explicit user task selections with fuzzy results
+
+Refer to [`context_gathering.mdc`](mdc:.cursor/rules/context_gathering.mdc) for detailed implementation patterns, [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc) and [`architecture.mdc`](mdc:.cursor/rules/architecture.mdc) for more context on MCP server architecture and integration. 
+
+## File System Operations
+
+- **JSON File Handling**:
+  - ✅ DO: Use `readJSON` and `writeJSON` for all JSON operations
+  - ✅ DO: Include error handling for file operations
+  - ✅ DO: Validate JSON structure after reading
+  - ❌ DON'T: Use raw `fs.readFileSync` or `fs.writeFileSync` for JSON
+
+  ```javascript
+  // ✅ DO: Use utility functions with error handling
+  function readJSON(filepath) {
+    try {
+      if (!fs.existsSync(filepath)) {
+        return null; // or appropriate default
+      }
+      
+      let data = JSON.parse(fs.readFileSync(filepath, 'utf8'));
+      
+      // Silent migration for tasks.json files: Transform old format to tagged format
+      const isTasksFile = filepath.includes('tasks.json') || path.basename(filepath) === 'tasks.json';
+      
+      if (data && data.tasks && Array.isArray(data.tasks) && !data.master && isTasksFile) {
+        // Migrate from old format { "tasks": [...] } to new format { "master": { "tasks": [...] } }
+        const migratedData = {
+          master: {
+            tasks: data.tasks
+          }
+        };
+        
+        writeJSON(filepath, migratedData);
+        
+        // Set global flag for CLI notice and perform complete migration
+        global.taskMasterMigrationOccurred = true;
+        performCompleteTagMigration(filepath);
+        
+        data = migratedData;
+      }
+      
+      return data;
+    } catch (error) {
+      log('error', `Failed to read JSON from ${filepath}: ${error.message}`);
+      return null;
+    }
+  }
+  
+  function writeJSON(filepath, data) {
+    try {
+      const dirPath = path.dirname(filepath);
+      if (!fs.existsSync(dirPath)) {
+        fs.mkdirSync(dirPath, { recursive: true });
+      }
+      fs.writeFileSync(filepath, JSON.stringify(data, null, 2));
+    } catch (error) {
+      log('error', `Failed to write JSON to ${filepath}: ${error.message}`);
+      throw error;
+    }
+  }
+  ```
+
+- **Path Resolution**:
+  - ✅ DO: Use `path.join()` for cross-platform path construction
+  - ✅ DO: Use `path.resolve()` for absolute paths
+  - ✅ DO: Validate paths before file operations
+
+  ```javascript
+  // ✅ DO: Handle paths correctly
+  function findProjectRoot(startPath = process.cwd()) {
+    let currentPath = path.resolve(startPath);
+    const rootPath = path.parse(currentPath).root;
+    
+    while (currentPath !== rootPath) {
+      const taskMasterPath = path.join(currentPath, '.taskmaster');
+      if (fs.existsSync(taskMasterPath)) {
+        return currentPath;
+      }
+      currentPath = path.dirname(currentPath);
+    }
+    
+    return null; // Not found
+  }
+  ```
+
+## Tagged Task Lists System Utilities
+
+- **Tag Resolution Functions**:
+  - ✅ DO: Use tag resolution layer for all task data access
+  - ✅ DO: Provide backward compatibility with legacy format
+  - ✅ DO: Default to "master" tag when no tag is specified
+
+  ```javascript
+  // ✅ DO: Implement tag resolution functions
+  function getTasksForTag(data, tagName = 'master') {
+    if (!data) {
+      return [];
+    }
+    
+    // Handle legacy format - direct tasks array
+    if (data.tasks && Array.isArray(data.tasks)) {
+      return data.tasks;
+    }
+    
+    // Handle tagged format - tasks under specific tag
+    if (data[tagName] && data[tagName].tasks && Array.isArray(data[tagName].tasks)) {
+      return data[tagName].tasks;
+    }
+    
+    return [];
+  }
+  
+  function setTasksForTag(data, tagName = 'master', tasks) {
+    // Ensure data object exists
+    if (!data) {
+      data = {};
+    }
+    
+    // Create tag structure if it doesn't exist
+    if (!data[tagName]) {
+      data[tagName] = {};
+    }
+    
+    // Set tasks for the tag
+    data[tagName].tasks = tasks;
+    
+    return data;
+  }
+  
+  function getCurrentTag() {
+    // Get current tag from state.json or default to 'master'
+    try {
+      const projectRoot = findProjectRoot();
+      if (!projectRoot) return 'master';
+      
+      const statePath = path.join(projectRoot, '.taskmaster', 'state.json');
+      if (fs.existsSync(statePath)) {
+        const state = readJSON(statePath);
+        return state.currentTag || 'master';
+      }
+    } catch (error) {
+      log('debug', `Error reading current tag: ${error.message}`);
+    }
+    
+    return 'master';
+  }
+  ```
+
+- **Migration Functions**:
+  - ✅ DO: Implement complete migration for all related files
+  - ✅ DO: Handle configuration and state file creation
+  - ✅ DO: Provide migration status tracking
+
+  ```javascript
+  // ✅ DO: Implement complete migration system
+  function performCompleteTagMigration(tasksJsonPath) {
+    try {
+      // Derive project root from tasks.json path
+      const projectRoot = findProjectRoot(path.dirname(tasksJsonPath)) || path.dirname(tasksJsonPath);
+      
+      // 1. Migrate config.json - add defaultTag and tags section
+      const configPath = path.join(projectRoot, '.taskmaster', 'config.json');
+      if (fs.existsSync(configPath)) {
+        migrateConfigJson(configPath);
+      }
+      
+      // 2. Create state.json if it doesn't exist
+      const statePath = path.join(projectRoot, '.taskmaster', 'state.json');
+      if (!fs.existsSync(statePath)) {
+        createStateJson(statePath);
+      }
+      
+      if (getDebugFlag()) {
+        log('debug', 'Completed tagged task lists migration for project');
+      }
+    } catch (error) {
+      if (getDebugFlag()) {
+        log('warn', `Error during complete tag migration: ${error.message}`);
+      }
+    }
+  }
+  
+  function migrateConfigJson(configPath) {
+    try {
+      const config = readJSON(configPath);
+      if (!config) return;
+      
+      let modified = false;
+      
+      // Add global.defaultTag if missing
+      if (!config.global) {
+        config.global = {};
+      }
+      if (!config.global.defaultTag) {
+        config.global.defaultTag = 'master';
+        modified = true;
+      }
+      
+      // Add tags section if missing
+      if (!config.tags) {
+        config.tags = {
+                  // Git integration settings removed - now manual only
+        };
+        modified = true;
+      }
+      
+      if (modified) {
+        writeJSON(configPath, config);
+        if (getDebugFlag()) {
+          log('debug', 'Updated config.json with tagged task system settings');
+        }
+      }
+    } catch (error) {
+      if (getDebugFlag()) {
+        log('warn', `Error migrating config.json: ${error.message}`);
+      }
+    }
+  }
+  
+  function createStateJson(statePath) {
+    try {
+      const initialState = {
+        currentTag: 'master',
+        lastSwitched: new Date().toISOString(),
+        migrationNoticeShown: false
+      };
+      
+      writeJSON(statePath, initialState);
+      if (getDebugFlag()) {
+        log('debug', 'Created initial state.json for tagged task system');
+      }
+    } catch (error) {
+      if (getDebugFlag()) {
+        log('warn', `Error creating state.json: ${error.message}`);
+      }
+    }
+  }
+  
+  function markMigrationForNotice() {
+    try {
+      const projectRoot = findProjectRoot();
+      if (!projectRoot) return;
+      
+      const statePath = path.join(projectRoot, '.taskmaster', 'state.json');
+      const state = readJSON(statePath) || {};
+      
+      state.migrationNoticeShown = false; // Reset to show notice
+      writeJSON(statePath, state);
+    } catch (error) {
+      if (getDebugFlag()) {
+        log('warn', `Error marking migration for notice: ${error.message}`);
+      }
+    }
+  }
+  ```
+
+## Logging Functions
+
+- **Consistent Logging**:
+  - ✅ DO: Use the central `log` function for all output
+  - ✅ DO: Use appropriate log levels (info, warn, error, debug)
+  - ✅ DO: Support silent mode for programmatic usage
+
+  ```javascript
+  // ✅ DO: Implement consistent logging with silent mode
+  let silentMode = false;
+  
+  function log(level, ...messages) {
+    if (silentMode && level !== 'error') {
+      return; // Suppress non-error logs in silent mode
+    }
+    
+    const timestamp = new Date().toISOString();
+    const formattedMessage = messages.join(' ');
+    
+    switch (level) {
+      case 'error':
+        console.error(`[ERROR] ${formattedMessage}`);
+        break;
+      case 'warn':
+        console.warn(`[WARN] ${formattedMessage}`);
+        break;
+      case 'info':
+        console.log(`[INFO] ${formattedMessage}`);
+        break;
+      case 'debug':
+        if (getDebugFlag()) {
+          console.log(`[DEBUG] ${formattedMessage}`);
+        }
+        break;
+      default:
+        console.log(formattedMessage);
+    }
+  }
+  
+  function enableSilentMode() {
+    silentMode = true;
+  }
+  
+  function disableSilentMode() {
+    silentMode = false;
+  }
+  
+  function isSilentMode() {
+    return silentMode;
+  }
+  ```
+
+## Task Utilities
+
+- **Task Finding and Manipulation**:
+  - ✅ DO: Use tagged task system aware functions
+  - ✅ DO: Handle both task and subtask operations
+  - ✅ DO: Validate task IDs before operations
+
+  ```javascript
+  // ✅ DO: Implement tag-aware task utilities
+  function findTaskById(tasks, taskId) {
+    if (!Array.isArray(tasks)) {
+      return null;
+    }
+    return tasks.find(task => task.id === taskId) || null;
+  }
+  
+  function findSubtaskById(tasks, parentId, subtaskId) {
+    const parentTask = findTaskById(tasks, parentId);
+    if (!parentTask || !parentTask.subtasks) {
+      return null;
+    }
+    
+    return parentTask.subtasks.find(subtask => subtask.id === subtaskId) || null;
+  }
+  
+  function getNextTaskId(tasks) {
+    if (!Array.isArray(tasks) || tasks.length === 0) {
+      return 1;
+    }
+    
+    const maxId = Math.max(...tasks.map(task => task.id));
+    return maxId + 1;
+  }
+  
+  function getNextSubtaskId(parentTask) {
+    if (!parentTask.subtasks || parentTask.subtasks.length === 0) {
+      return 1;
+    }
+    
+    const maxId = Math.max(...parentTask.subtasks.map(subtask => subtask.id));
+    return maxId + 1;
+  }
+  ```
+
+## String Utilities
+
+- **Text Processing**:
+  - ✅ DO: Handle text truncation appropriately
+  - ✅ DO: Provide consistent formatting functions
+  - ✅ DO: Support different output formats
+
+  ```javascript
+  // ✅ DO: Implement useful string utilities
+  function truncate(str, maxLength = 50) {
+    if (!str || typeof str !== 'string') {
+      return '';
+    }
+    
+    if (str.length <= maxLength) {
+      return str;
+    }
+    
+    return str.substring(0, maxLength - 3) + '...';
+  }
+  
+  function formatDuration(ms) {
+    const seconds = Math.floor(ms / 1000);
+    const minutes = Math.floor(seconds / 60);
+    const hours = Math.floor(minutes / 60);
+    
+    if (hours > 0) {
+      return `${hours}h ${minutes % 60}m ${seconds % 60}s`;
+    } else if (minutes > 0) {
+      return `${minutes}m ${seconds % 60}s`;
+    } else {
+      return `${seconds}s`;
+    }
+  }
+  
+  function capitalizeFirst(str) {
+    if (!str || typeof str !== 'string') {
+      return '';
+    }
+    
+    return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
+  }
+  ```
+
+## Dependency Management Utilities
+
+- **Dependency Analysis**:
+  - ✅ DO: Detect circular dependencies
+  - ✅ DO: Validate dependency references
+  - ✅ DO: Support cross-tag dependency checking (future enhancement)
+
+  ```javascript
+  // ✅ DO: Implement dependency utilities
+  function findCycles(tasks) {
+    const cycles = [];
+    const visited = new Set();
+    const recStack = new Set();
+    
+    function dfs(taskId, path = []) {
+      if (recStack.has(taskId)) {
+        // Found a cycle
+        const cycleStart = path.indexOf(taskId);
+        const cycle = path.slice(cycleStart).concat([taskId]);
+        cycles.push(cycle);
+        return;
+      }
+      
+      if (visited.has(taskId)) {
+        return;
+      }
+      
+      visited.add(taskId);
+      recStack.add(taskId);
+      
+      const task = findTaskById(tasks, taskId);
+      if (task && task.dependencies) {
+        task.dependencies.forEach(depId => {
+          dfs(depId, path.concat([taskId]));
+        });
+      }
+      
+      recStack.delete(taskId);
+    }
+    
+    tasks.forEach(task => {
+      if (!visited.has(task.id)) {
+        dfs(task.id);
+      }
+    });
+    
+    return cycles;
+  }
+  
+  function validateDependencies(tasks) {
+    const validationErrors = [];
+    const taskIds = new Set(tasks.map(task => task.id));
+    
+    tasks.forEach(task => {
+      if (task.dependencies) {
+        task.dependencies.forEach(depId => {
+          if (!taskIds.has(depId)) {
+            validationErrors.push({
+              taskId: task.id,
+              invalidDependency: depId,
+              message: `Task ${task.id} depends on non-existent task ${depId}`
+            });
+          }
+        });
+      }
+    });
+    
+    return validationErrors;
+  }
+  ```
+
+## Environment and Configuration Utilities
+
+- **Environment Variable Resolution**:
+  - ✅ DO: Support both `.env` files and MCP session environment
+  - ✅ DO: Provide fallbacks for missing values
+  - ✅ DO: Handle API key resolution correctly
+
+  ```javascript
+  // ✅ DO: Implement flexible environment resolution
+  function resolveEnvVariable(key, sessionEnv = null) {
+    // First check session environment (for MCP)
+    if (sessionEnv && sessionEnv[key]) {
+      return sessionEnv[key];
+    }
+    
+    // Then check process environment
+    if (process.env[key]) {
+      return process.env[key];
+    }
+    
+    // Finally try .env file if in project root
+    try {
+      const projectRoot = findProjectRoot();
+      if (projectRoot) {
+        const envPath = path.join(projectRoot, '.env');
+        if (fs.existsSync(envPath)) {
+          const envContent = fs.readFileSync(envPath, 'utf8');
+          const lines = envContent.split('\n');
+          
+          for (const line of lines) {
+            const [envKey, envValue] = line.split('=');
+            if (envKey && envKey.trim() === key) {
+              return envValue ? envValue.trim().replace(/^["']|["']$/g, '') : undefined;
+            }
+          }
+        }
+      }
+    } catch (error) {
+      log('debug', `Error reading .env file: ${error.message}`);
+    }
+    
+    return undefined;
+  }
+  
+  function getDebugFlag() {
+    const debugFlag = resolveEnvVariable('TASKMASTER_DEBUG') || 
+                     resolveEnvVariable('DEBUG') || 
+                     'false';
+    return debugFlag.toLowerCase() === 'true';
+  }
+  ```
+
+## Export Pattern
+
+- **Module Exports**:
+  - ✅ DO: Export all utility functions explicitly
+  - ✅ DO: Group related functions logically
+  - ✅ DO: Include new tagged system utilities
+
+  ```javascript
+  // ✅ DO: Export utilities in logical groups
+  module.exports = {
+    // File system utilities
+    readJSON,
+    writeJSON,
+    findProjectRoot,
+    
+    // Tagged task system utilities
+    getTasksForTag,
+    setTasksForTag,
+    getCurrentTag,
+    performCompleteTagMigration,
+    migrateConfigJson,
+    createStateJson,
+    markMigrationForNotice,
+    
+    // Logging utilities
+    log,
+    enableSilentMode,
+    disableSilentMode,
+    isSilentMode,
+    
+    // Task utilities
+    findTaskById,
+    findSubtaskById,
+    getNextTaskId,
+    getNextSubtaskId,
+    
+    // String utilities
+    truncate,
+    formatDuration,
+    capitalizeFirst,
+    
+    // Dependency utilities
+    findCycles,
+    validateDependencies,
+    
+    // Environment utilities
+    resolveEnvVariable,
+    getDebugFlag,
+    
+    // Legacy utilities (maintained for compatibility)
+    aggregateTelemetry
+  };
+  ```
+
+Refer to [`utils.js`](mdc:scripts/modules/utils.js) for implementation examples and [`architecture.mdc`](mdc:.cursor/rules/architecture.mdc) for integration patterns.

.env.example

@@ -1,20 +1,17 @@
-# API Keys (Required)
-ANTHROPIC_API_KEY=your_anthropic_api_key_here       # Format: sk-ant-api03-...
-PERPLEXITY_API_KEY=your_perplexity_api_key_here     # Format: pplx-...
+# API Keys (Required for using in any role i.e. main/research/fallback -- see `task-master models`)
+ANTHROPIC_API_KEY=YOUR_ANTHROPIC_KEY_HERE
+PERPLEXITY_API_KEY=YOUR_PERPLEXITY_KEY_HERE
+OPENAI_API_KEY=YOUR_OPENAI_KEY_HERE
+GOOGLE_API_KEY=YOUR_GOOGLE_KEY_HERE
+MISTRAL_API_KEY=YOUR_MISTRAL_KEY_HERE
+GROQ_API_KEY=YOUR_GROQ_KEY_HERE
+OPENROUTER_API_KEY=YOUR_OPENROUTER_KEY_HERE
+XAI_API_KEY=YOUR_XAI_KEY_HERE
+AZURE_OPENAI_API_KEY=YOUR_AZURE_KEY_HERE
+OLLAMA_API_KEY=YOUR_OLLAMA_API_KEY_HERE
 
-# Model Configuration
-MODEL=claude-3-7-sonnet-20250219                    # Recommended models: claude-3-7-sonnet-20250219, claude-3-opus-20240229
-PERPLEXITY_MODEL=sonar-pro                          # Perplexity model for research-backed subtasks
-MAX_TOKENS=128000                                   # Maximum tokens for model responses
-TEMPERATURE=0.2                                     # Temperature for model responses (0.0-1.0)
-
-# Logging Configuration
-DEBUG=false                                         # Enable debug logging (true/false)
-LOG_LEVEL=info                                      # Log level (debug, info, warn, error)
-
-# Task Generation Settings
-DEFAULT_SUBTASKS=5                                  # Default number of subtasks when expanding
-DEFAULT_PRIORITY=medium                             # Default priority for generated tasks (high, medium, low)
-
-# Project Metadata (Optional)
-    PROJECT_NAME=Your Project Name                  # Override default project name in tasks.json
+# Google Vertex AI Configuration
+VERTEX_PROJECT_ID=your-gcp-project-id
+VERTEX_LOCATION=us-central1
+# Optional: Path to service account credentials JSON file (alternative to API key)
+GOOGLE_APPLICATION_CREDENTIALS=/path/to/service-account-credentials.json

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: 'bug: '
+labels: bug
+assignees: ''
+---
+
+### Description
+
+Detailed description of the problem, including steps to reproduce the issue.
+
+### Steps to Reproduce
+
+1. Step-by-step instructions to reproduce the issue
+2. Include command examples or UI interactions
+
+### Expected Behavior
+
+Describe clearly what the expected outcome or behavior should be.
+
+### Actual Behavior
+
+Describe clearly what the actual outcome or behavior is.
+
+### Screenshots or Logs
+
+Provide screenshots, logs, or error messages if applicable.
+
+### Environment
+
+- Task Master version:
+- Node.js version:
+- Operating system:
+- IDE (if applicable):
+
+### Additional Context
+
+Any additional information or context that might help diagnose the issue.

.github/ISSUE_TEMPLATE/enhancements---feature-requests.md

@@ -0,0 +1,51 @@
+---
+name: Enhancements & feature requests
+about: Suggest an idea for this project
+title: 'feat: '
+labels: enhancement
+assignees: ''
+---
+
+> "Direct quote or clear summary of user request or need or user story."
+
+### Motivation
+
+Detailed explanation of why this feature is important. Describe the problem it solves or the benefit it provides.
+
+### Proposed Solution
+
+Clearly describe the proposed feature, including:
+
+- High-level overview of the feature
+- Relevant technologies or integrations
+- How it fits into the existing workflow or architecture
+
+### High-Level Workflow
+
+1. Step-by-step description of how the feature will be implemented
+2. Include necessary intermediate milestones
+
+### Key Elements
+
+- Bullet-point list of technical or UX/UI enhancements
+- Mention specific integrations or APIs
+- Highlight changes needed in existing data models or commands
+
+### Example Workflow
+
+Provide a clear, concrete example demonstrating the feature:
+
+```shell
+$ task-master [action]
+→ Expected response/output
+```
+
+### Implementation Considerations
+
+- Dependencies on external components or APIs
+- Backward compatibility requirements
+- Potential performance impacts or resource usage
+
+### Out of Scope (Future Considerations)
+
+Clearly list any features or improvements not included but relevant for future iterations.

.github/ISSUE_TEMPLATE/feedback.md

@@ -0,0 +1,31 @@
+---
+name: Feedback
+about: Give us specific feedback on the product/approach/tech
+title: 'feedback: '
+labels: feedback
+assignees: ''
+---
+
+### Feedback Summary
+
+Provide a clear summary or direct quote from user feedback.
+
+### User Context
+
+Explain the user's context or scenario in which this feedback was provided.
+
+### User Impact
+
+Describe how this feedback affects the user experience or workflow.
+
+### Suggestions
+
+Provide any initial thoughts, potential solutions, or improvements based on the feedback.
+
+### Relevant Screenshots or Examples
+
+Attach screenshots, logs, or examples that illustrate the feedback.
+
+### Additional Notes
+
+Any additional context or related information.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,45 @@
+# What type of PR is this?
+<!-- Check one -->
+
+ - [ ] 🐛 Bug fix
+ - [ ] ✨ Feature
+ - [ ] 🔌 Integration
+ - [ ] 📝 Docs
+ - [ ] 🧹 Refactor
+ - [ ] Other:
+## Description
+<!-- What does this PR do? -->
+
+## Related Issues
+<!-- Link issues: Fixes #123 -->
+
+## How to Test This
+<!-- Quick steps to verify the changes work -->
+```bash
+# Example commands or steps
+```
+
+**Expected result:**
+<!-- What should happen? -->
+
+## Contributor Checklist
+
+- [ ] Created changeset: `npm run changeset`
+- [ ] Tests pass: `npm test`
+- [ ] Format check passes: `npm run format-check` (or `npm run format` to fix)
+- [ ] Addressed CodeRabbit comments (if any)
+- [ ] Linked related issues (if any)
+- [ ] Manually tested the changes
+
+## Changelog Entry
+<!-- One line describing the change for users -->
+<!-- Example: "Added Kiro IDE integration with automatic task status updates" -->
+
+---
+
+### For Maintainers
+
+- [ ] PR title follows conventional commits
+- [ ] Target branch correct
+- [ ] Labels added
+- [ ] Milestone assigned (if applicable)

.github/PULL_REQUEST_TEMPLATE/bugfix.md

@@ -0,0 +1,39 @@
+## 🐛 Bug Fix
+
+### 🔍 Bug Description
+<!-- Describe the bug -->
+
+### 🔗 Related Issues
+<!-- Fixes #123 -->
+
+### ✨ Solution
+<!-- How does this PR fix the bug? -->
+
+## How to Test
+
+### Steps that caused the bug:
+1. 
+2. 
+
+**Before fix:** 
+**After fix:** 
+
+### Quick verification:
+```bash
+# Commands to verify the fix
+```
+
+## Contributor Checklist
+- [ ] Created changeset: `npm run changeset`
+- [ ] Tests pass: `npm test`
+- [ ] Format check passes: `npm run format-check`
+- [ ] Addressed CodeRabbit comments
+- [ ] Added unit tests (if applicable)
+- [ ] Manually verified the fix works
+
+---
+
+### For Maintainers
+- [ ] Root cause identified
+- [ ] Fix doesn't introduce new issues
+- [ ] CI passes

.github/PULL_REQUEST_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 🐛 Bug Fix
+    url: https://github.com/eyaltoledano/claude-task-master/compare/next...HEAD?template=bugfix.md
+    about: Fix a bug in Task Master
+  - name: ✨ New Feature
+    url: https://github.com/eyaltoledano/claude-task-master/compare/next...HEAD?template=feature.md
+    about: Add a new feature to Task Master
+  - name: 🔌 New Integration
+    url: https://github.com/eyaltoledano/claude-task-master/compare/next...HEAD?template=integration.md
+    about: Add support for a new tool, IDE, or platform

.github/PULL_REQUEST_TEMPLATE/feature.md

@@ -0,0 +1,49 @@
+## ✨ New Feature
+
+### 📋 Feature Description
+<!-- Brief description -->
+
+### 🎯 Problem Statement
+<!-- What problem does this feature solve? Why is it needed? -->
+
+### 💡 Solution
+<!-- How does this feature solve the problem? What's the approach? -->
+
+### 🔗 Related Issues
+<!-- Link related issues: Fixes #123, Part of #456 -->
+
+## How to Use It
+
+### Quick Start
+```bash
+# Basic usage example
+```
+
+### Example
+<!-- Show a real use case -->
+```bash
+# Practical example
+```
+
+**What you should see:**
+<!-- Expected behavior -->
+
+## Contributor Checklist
+- [ ] Created changeset: `npm run changeset`
+- [ ] Tests pass: `npm test`
+- [ ] Format check passes: `npm run format-check`
+- [ ] Addressed CodeRabbit comments
+- [ ] Added tests for new functionality
+- [ ] Manually tested in CLI mode
+- [ ] Manually tested in MCP mode (if applicable)
+
+## Changelog Entry
+<!-- One-liner for release notes -->
+
+---
+
+### For Maintainers
+
+- [ ] Feature aligns with project vision
+- [ ] CIs pass
+- [ ] Changeset file exists

.github/PULL_REQUEST_TEMPLATE/integration.md

@@ -0,0 +1,53 @@
+# 🔌 New Integration
+
+## What tool/IDE is being integrated?
+
+<!-- Name and brief description -->
+
+## What can users do with it?
+
+<!-- Key benefits -->
+
+## How to Enable
+
+### Setup
+
+```bash
+task-master rules add [name]
+# Any other setup steps
+```
+
+### Example Usage
+
+<!-- Show it in action -->
+
+```bash
+# Real example
+```
+
+### Natural Language Hooks (if applicable)
+
+```
+"When tests pass, mark task as done"
+# Other examples
+```
+
+## Contributor Checklist
+
+- [ ] Created changeset: `npm run changeset`
+- [ ] Tests pass: `npm test`
+- [ ] Format check passes: `npm run format-check`
+- [ ] Addressed CodeRabbit comments
+- [ ] Integration fully tested with target tool/IDE
+- [ ] Error scenarios tested
+- [ ] Added integration tests
+- [ ] Documentation includes setup guide
+- [ ] Examples are working and clear
+
+---
+
+## For Maintainers
+
+- [ ] Integration stability verified
+- [ ] Documentation comprehensive
+- [ ] Examples working

.github/scripts/auto-close-duplicates.mjs

@@ -0,0 +1,259 @@
+#!/usr/bin/env node
+
+async function githubRequest(endpoint, token, method = 'GET', body) {
+	const response = await fetch(`https://api.github.com${endpoint}`, {
+		method,
+		headers: {
+			Authorization: `Bearer ${token}`,
+			Accept: 'application/vnd.github.v3+json',
+			'User-Agent': 'auto-close-duplicates-script',
+			...(body && { 'Content-Type': 'application/json' })
+		},
+		...(body && { body: JSON.stringify(body) })
+	});
+
+	if (!response.ok) {
+		throw new Error(
+			`GitHub API request failed: ${response.status} ${response.statusText}`
+		);
+	}
+
+	return response.json();
+}
+
+function extractDuplicateIssueNumber(commentBody) {
+	const match = commentBody.match(/#(\d+)/);
+	return match ? parseInt(match[1], 10) : null;
+}
+
+async function closeIssueAsDuplicate(
+	owner,
+	repo,
+	issueNumber,
+	duplicateOfNumber,
+	token
+) {
+	await githubRequest(
+		`/repos/${owner}/${repo}/issues/${issueNumber}`,
+		token,
+		'PATCH',
+		{
+			state: 'closed',
+			state_reason: 'not_planned',
+			labels: ['duplicate']
+		}
+	);
+
+	await githubRequest(
+		`/repos/${owner}/${repo}/issues/${issueNumber}/comments`,
+		token,
+		'POST',
+		{
+			body: `This issue has been automatically closed as a duplicate of #${duplicateOfNumber}.
+
+If this is incorrect, please re-open this issue or create a new one.
+
+🤖 Generated with [Task Master Bot]`
+		}
+	);
+}
+
+async function autoCloseDuplicates() {
+	console.log('[DEBUG] Starting auto-close duplicates script');
+
+	const token = process.env.GITHUB_TOKEN;
+	if (!token) {
+		throw new Error('GITHUB_TOKEN environment variable is required');
+	}
+	console.log('[DEBUG] GitHub token found');
+
+	const owner = process.env.GITHUB_REPOSITORY_OWNER || 'eyaltoledano';
+	const repo = process.env.GITHUB_REPOSITORY_NAME || 'claude-task-master';
+	console.log(`[DEBUG] Repository: ${owner}/${repo}`);
+
+	const threeDaysAgo = new Date();
+	threeDaysAgo.setDate(threeDaysAgo.getDate() - 3);
+	console.log(
+		`[DEBUG] Checking for duplicate comments older than: ${threeDaysAgo.toISOString()}`
+	);
+
+	console.log('[DEBUG] Fetching open issues created more than 3 days ago...');
+	const allIssues = [];
+	let page = 1;
+	const perPage = 100;
+
+	const MAX_PAGES = 50; // Increase limit for larger repos
+	let foundRecentIssue = false;
+
+	while (true) {
+		const pageIssues = await githubRequest(
+			`/repos/${owner}/${repo}/issues?state=open&per_page=${perPage}&page=${page}&sort=created&direction=desc`,
+			token
+		);
+
+		if (pageIssues.length === 0) break;
+
+		// Filter for issues created more than 3 days ago
+		const oldEnoughIssues = pageIssues.filter(
+			(issue) => new Date(issue.created_at) <= threeDaysAgo
+		);
+
+		allIssues.push(...oldEnoughIssues);
+
+		// If all issues on this page are newer than 3 days, we can stop
+		if (oldEnoughIssues.length === 0 && page === 1) {
+			foundRecentIssue = true;
+			break;
+		}
+
+		// If we found some old issues but not all, continue to next page
+		// as there might be more old issues
+		page++;
+
+		// Safety limit to avoid infinite loops
+		if (page > MAX_PAGES) {
+			console.log(`[WARNING] Reached maximum page limit of ${MAX_PAGES}`);
+			break;
+		}
+	}
+
+	const issues = allIssues;
+	console.log(`[DEBUG] Found ${issues.length} open issues`);
+
+	let processedCount = 0;
+	let candidateCount = 0;
+
+	for (const issue of issues) {
+		processedCount++;
+		console.log(
+			`[DEBUG] Processing issue #${issue.number} (${processedCount}/${issues.length}): ${issue.title}`
+		);
+
+		console.log(`[DEBUG] Fetching comments for issue #${issue.number}...`);
+		const comments = await githubRequest(
+			`/repos/${owner}/${repo}/issues/${issue.number}/comments`,
+			token
+		);
+		console.log(
+			`[DEBUG] Issue #${issue.number} has ${comments.length} comments`
+		);
+
+		const dupeComments = comments.filter(
+			(comment) =>
+				comment.body.includes('Found') &&
+				comment.body.includes('possible duplicate') &&
+				comment.user.type === 'Bot'
+		);
+		console.log(
+			`[DEBUG] Issue #${issue.number} has ${dupeComments.length} duplicate detection comments`
+		);
+
+		if (dupeComments.length === 0) {
+			console.log(
+				`[DEBUG] Issue #${issue.number} - no duplicate comments found, skipping`
+			);
+			continue;
+		}
+
+		const lastDupeComment = dupeComments[dupeComments.length - 1];
+		const dupeCommentDate = new Date(lastDupeComment.created_at);
+		console.log(
+			`[DEBUG] Issue #${
+				issue.number
+			} - most recent duplicate comment from: ${dupeCommentDate.toISOString()}`
+		);
+
+		if (dupeCommentDate > threeDaysAgo) {
+			console.log(
+				`[DEBUG] Issue #${issue.number} - duplicate comment is too recent, skipping`
+			);
+			continue;
+		}
+		console.log(
+			`[DEBUG] Issue #${
+				issue.number
+			} - duplicate comment is old enough (${Math.floor(
+				(Date.now() - dupeCommentDate.getTime()) / (1000 * 60 * 60 * 24)
+			)} days)`
+		);
+
+		const commentsAfterDupe = comments.filter(
+			(comment) => new Date(comment.created_at) > dupeCommentDate
+		);
+		console.log(
+			`[DEBUG] Issue #${issue.number} - ${commentsAfterDupe.length} comments after duplicate detection`
+		);
+
+		if (commentsAfterDupe.length > 0) {
+			console.log(
+				`[DEBUG] Issue #${issue.number} - has activity after duplicate comment, skipping`
+			);
+			continue;
+		}
+
+		console.log(
+			`[DEBUG] Issue #${issue.number} - checking reactions on duplicate comment...`
+		);
+		const reactions = await githubRequest(
+			`/repos/${owner}/${repo}/issues/comments/${lastDupeComment.id}/reactions`,
+			token
+		);
+		console.log(
+			`[DEBUG] Issue #${issue.number} - duplicate comment has ${reactions.length} reactions`
+		);
+
+		const authorThumbsDown = reactions.some(
+			(reaction) =>
+				reaction.user.id === issue.user.id && reaction.content === '-1'
+		);
+		console.log(
+			`[DEBUG] Issue #${issue.number} - author thumbs down reaction: ${authorThumbsDown}`
+		);
+
+		if (authorThumbsDown) {
+			console.log(
+				`[DEBUG] Issue #${issue.number} - author disagreed with duplicate detection, skipping`
+			);
+			continue;
+		}
+
+		const duplicateIssueNumber = extractDuplicateIssueNumber(
+			lastDupeComment.body
+		);
+		if (!duplicateIssueNumber) {
+			console.log(
+				`[DEBUG] Issue #${issue.number} - could not extract duplicate issue number from comment, skipping`
+			);
+			continue;
+		}
+
+		candidateCount++;
+		const issueUrl = `https://github.com/${owner}/${repo}/issues/${issue.number}`;
+
+		try {
+			console.log(
+				`[INFO] Auto-closing issue #${issue.number} as duplicate of #${duplicateIssueNumber}: ${issueUrl}`
+			);
+			await closeIssueAsDuplicate(
+				owner,
+				repo,
+				issue.number,
+				duplicateIssueNumber,
+				token
+			);
+			console.log(
+				`[SUCCESS] Successfully closed issue #${issue.number} as duplicate of #${duplicateIssueNumber}`
+			);
+		} catch (error) {
+			console.error(
+				`[ERROR] Failed to close issue #${issue.number} as duplicate: ${error}`
+			);
+		}
+	}
+
+	console.log(
+		`[DEBUG] Script completed. Processed ${processedCount} issues, found ${candidateCount} candidates for auto-close`
+	);
+}
+
+autoCloseDuplicates().catch(console.error);

.github/scripts/backfill-duplicate-comments.mjs

@@ -0,0 +1,178 @@
+#!/usr/bin/env node
+
+async function githubRequest(endpoint, token, method = 'GET', body) {
+	const response = await fetch(`https://api.github.com${endpoint}`, {
+		method,
+		headers: {
+			Authorization: `Bearer ${token}`,
+			Accept: 'application/vnd.github.v3+json',
+			'User-Agent': 'backfill-duplicate-comments-script',
+			...(body && { 'Content-Type': 'application/json' })
+		},
+		...(body && { body: JSON.stringify(body) })
+	});
+
+	if (!response.ok) {
+		throw new Error(
+			`GitHub API request failed: ${response.status} ${response.statusText}`
+		);
+	}
+
+	return response.json();
+}
+
+async function triggerDedupeWorkflow(
+	owner,
+	repo,
+	issueNumber,
+	token,
+	dryRun = true
+) {
+	if (dryRun) {
+		console.log(
+			`[DRY RUN] Would trigger dedupe workflow for issue #${issueNumber}`
+		);
+		return;
+	}
+
+	await githubRequest(
+		`/repos/${owner}/${repo}/actions/workflows/claude-dedupe-issues.yml/dispatches`,
+		token,
+		'POST',
+		{
+			ref: 'main',
+			inputs: {
+				issue_number: issueNumber.toString()
+			}
+		}
+	);
+}
+
+async function backfillDuplicateComments() {
+	console.log('[DEBUG] Starting backfill duplicate comments script');
+
+	const token = process.env.GITHUB_TOKEN;
+	if (!token) {
+		throw new Error(`GITHUB_TOKEN environment variable is required
+
+Usage:
+  node .github/scripts/backfill-duplicate-comments.mjs
+
+Environment Variables:
+  GITHUB_TOKEN - GitHub personal access token with repo and actions permissions (required)
+  DRY_RUN - Set to "false" to actually trigger workflows (default: true for safety)
+  DAYS_BACK - How many days back to look for old issues (default: 90)`);
+	}
+	console.log('[DEBUG] GitHub token found');
+
+	const owner = process.env.GITHUB_REPOSITORY_OWNER || 'eyaltoledano';
+	const repo = process.env.GITHUB_REPOSITORY_NAME || 'claude-task-master';
+	const dryRun = process.env.DRY_RUN !== 'false';
+	const daysBack = parseInt(process.env.DAYS_BACK || '90', 10);
+
+	console.log(`[DEBUG] Repository: ${owner}/${repo}`);
+	console.log(`[DEBUG] Dry run mode: ${dryRun}`);
+	console.log(`[DEBUG] Looking back ${daysBack} days`);
+
+	const cutoffDate = new Date();
+	cutoffDate.setDate(cutoffDate.getDate() - daysBack);
+
+	console.log(
+		`[DEBUG] Fetching issues created since ${cutoffDate.toISOString()}...`
+	);
+	const allIssues = [];
+	let page = 1;
+	const perPage = 100;
+
+	while (true) {
+		const pageIssues = await githubRequest(
+			`/repos/${owner}/${repo}/issues?state=all&per_page=${perPage}&page=${page}&since=${cutoffDate.toISOString()}`,
+			token
+		);
+
+		if (pageIssues.length === 0) break;
+
+		allIssues.push(...pageIssues);
+		page++;
+
+		// Safety limit to avoid infinite loops
+		if (page > 100) {
+			console.log('[DEBUG] Reached page limit, stopping pagination');
+			break;
+		}
+	}
+
+	console.log(
+		`[DEBUG] Found ${allIssues.length} issues from the last ${daysBack} days`
+	);
+
+	let processedCount = 0;
+	let candidateCount = 0;
+	let triggeredCount = 0;
+
+	for (const issue of allIssues) {
+		processedCount++;
+		console.log(
+			`[DEBUG] Processing issue #${issue.number} (${processedCount}/${allIssues.length}): ${issue.title}`
+		);
+
+		console.log(`[DEBUG] Fetching comments for issue #${issue.number}...`);
+		const comments = await githubRequest(
+			`/repos/${owner}/${repo}/issues/${issue.number}/comments`,
+			token
+		);
+		console.log(
+			`[DEBUG] Issue #${issue.number} has ${comments.length} comments`
+		);
+
+		// Look for existing duplicate detection comments (from the dedupe bot)
+		const dupeDetectionComments = comments.filter(
+			(comment) =>
+				comment.body.includes('Found') &&
+				comment.body.includes('possible duplicate') &&
+				comment.user.type === 'Bot'
+		);
+
+		console.log(
+			`[DEBUG] Issue #${issue.number} has ${dupeDetectionComments.length} duplicate detection comments`
+		);
+
+		// Skip if there's already a duplicate detection comment
+		if (dupeDetectionComments.length > 0) {
+			console.log(
+				`[DEBUG] Issue #${issue.number} already has duplicate detection comment, skipping`
+			);
+			continue;
+		}
+
+		candidateCount++;
+		const issueUrl = `https://github.com/${owner}/${repo}/issues/${issue.number}`;
+
+		try {
+			console.log(
+				`[INFO] ${dryRun ? '[DRY RUN] ' : ''}Triggering dedupe workflow for issue #${issue.number}: ${issueUrl}`
+			);
+			await triggerDedupeWorkflow(owner, repo, issue.number, token, dryRun);
+
+			if (!dryRun) {
+				console.log(
+					`[SUCCESS] Successfully triggered dedupe workflow for issue #${issue.number}`
+				);
+			}
+			triggeredCount++;
+		} catch (error) {
+			console.error(
+				`[ERROR] Failed to trigger workflow for issue #${issue.number}: ${error}`
+			);
+		}
+
+		// Add a delay between workflow triggers to avoid overwhelming the system
+		await new Promise((resolve) => setTimeout(resolve, 1000));
+	}
+
+	console.log(
+		`[DEBUG] Script completed. Processed ${processedCount} issues, found ${candidateCount} candidates without duplicate comments, ${dryRun ? 'would trigger' : 'triggered'} ${triggeredCount} workflows`
+	);
+}
+
+backfillDuplicateComments().catch(console.error);

.github/scripts/check-pre-release-mode.mjs

@@ -0,0 +1,102 @@
+#!/usr/bin/env node
+import { readFileSync, existsSync } from 'node:fs';
+import { join, dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+// Get context from command line argument or environment
+const context = process.argv[2] || process.env.GITHUB_WORKFLOW || 'manual';
+
+function findRootDir(startDir) {
+	let currentDir = resolve(startDir);
+	while (currentDir !== '/') {
+		if (existsSync(join(currentDir, 'package.json'))) {
+			try {
+				const pkg = JSON.parse(
+					readFileSync(join(currentDir, 'package.json'), 'utf8')
+				);
+				if (pkg.name === 'task-master-ai' || pkg.repository) {
+					return currentDir;
+				}
+			} catch {}
+		}
+		currentDir = dirname(currentDir);
+	}
+	throw new Error('Could not find root directory');
+}
+
+function checkPreReleaseMode() {
+	console.log('🔍 Checking if branch is in pre-release mode...');
+
+	const rootDir = findRootDir(__dirname);
+	const preJsonPath = join(rootDir, '.changeset', 'pre.json');
+
+	// Check if pre.json exists
+	if (!existsSync(preJsonPath)) {
+		console.log('✅ Not in active pre-release mode - safe to proceed');
+		process.exit(0);
+	}
+
+	try {
+		// Read and parse pre.json
+		const preJsonContent = readFileSync(preJsonPath, 'utf8');
+		const preJson = JSON.parse(preJsonContent);
+
+		// Check if we're in active pre-release mode
+		if (preJson.mode === 'pre') {
+			console.error('❌ ERROR: This branch is in active pre-release mode!');
+			console.error('');
+
+			// Provide context-specific error messages
+			if (context === 'Release Check' || context === 'pull_request') {
+				console.error(
+					'Pre-release mode must be exited before merging to main.'
+				);
+				console.error('');
+				console.error(
+					'To fix this, run the following commands in your branch:'
+				);
+				console.error('  npx changeset pre exit');
+				console.error('  git add -u');
+				console.error('  git commit -m "chore: exit pre-release mode"');
+				console.error('  git push');
+				console.error('');
+				console.error('Then update this pull request.');
+			} else if (context === 'Release' || context === 'main') {
+				console.error(
+					'Pre-release mode should only be used on feature branches, not main.'
+				);
+				console.error('');
+				console.error('To fix this, run the following commands locally:');
+				console.error('  npx changeset pre exit');
+				console.error('  git add -u');
+				console.error('  git commit -m "chore: exit pre-release mode"');
+				console.error('  git push origin main');
+				console.error('');
+				console.error('Then re-run this workflow.');
+			} else {
+				console.error('Pre-release mode must be exited before proceeding.');
+				console.error('');
+				console.error('To fix this, run the following commands:');
+				console.error('  npx changeset pre exit');
+				console.error('  git add -u');
+				console.error('  git commit -m "chore: exit pre-release mode"');
+				console.error('  git push');
+			}
+
+			process.exit(1);
+		}
+
+		console.log('✅ Not in active pre-release mode - safe to proceed');
+		process.exit(0);
+	} catch (error) {
+		console.error(`❌ ERROR: Unable to parse .changeset/pre.json – aborting.`);
+		console.error(`Error details: ${error.message}`);
+		process.exit(1);
+	}
+}
+
+// Run the check
+checkPreReleaseMode();

.github/scripts/release.mjs

@@ -0,0 +1,30 @@
+#!/usr/bin/env node
+import { existsSync, unlinkSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { findRootDir, runCommand } from './utils.mjs';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const rootDir = findRootDir(__dirname);
+
+console.log('🚀 Starting release process...');
+
+// Double-check we're not in pre-release mode (safety net)
+const preJsonPath = join(rootDir, '.changeset', 'pre.json');
+if (existsSync(preJsonPath)) {
+	console.log('⚠️  Warning: pre.json still exists. Removing it...');
+	unlinkSync(preJsonPath);
+}
+
+// Check if the extension version has changed and tag it
+// This prevents changeset from trying to publish the private package
+runCommand('node', [join(__dirname, 'tag-extension.mjs')]);
+
+// Run changeset publish for npm packages
+runCommand('npx', ['changeset', 'publish']);
+
+console.log('✅ Release process completed!');
+
+// The extension tag (if created) will trigger the extension-release workflow

.github/scripts/tag-extension.mjs

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { findRootDir, createAndPushTag } from './utils.mjs';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const rootDir = findRootDir(__dirname);
+
+// Read the extension's package.json
+const extensionDir = join(rootDir, 'apps', 'extension');
+const pkgPath = join(extensionDir, 'package.json');
+
+let pkg;
+try {
+	const pkgContent = readFileSync(pkgPath, 'utf8');
+	pkg = JSON.parse(pkgContent);
+} catch (error) {
+	console.error('Failed to read package.json:', error.message);
+	process.exit(1);
+}
+
+// Ensure we have required fields
+assert(pkg.name, 'package.json must have a name field');
+assert(pkg.version, 'package.json must have a version field');
+
+const tag = `${pkg.name}@${pkg.version}`;
+
+// Create and push the tag if it doesn't exist
+createAndPushTag(tag);

.github/scripts/utils.mjs

@@ -0,0 +1,88 @@
+#!/usr/bin/env node
+import { spawnSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
+import { join, dirname, resolve } from 'node:path';
+
+// Find the root directory by looking for package.json with task-master-ai
+export function findRootDir(startDir) {
+	let currentDir = resolve(startDir);
+	while (currentDir !== '/') {
+		const pkgPath = join(currentDir, 'package.json');
+		try {
+			const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
+			if (pkg.name === 'task-master-ai' || pkg.repository) {
+				return currentDir;
+			}
+		} catch {}
+		currentDir = dirname(currentDir);
+	}
+	throw new Error('Could not find root directory');
+}
+
+// Run a command with proper error handling
+export function runCommand(command, args = [], options = {}) {
+	console.log(`Running: ${command} ${args.join(' ')}`);
+	const result = spawnSync(command, args, {
+		encoding: 'utf8',
+		stdio: 'inherit',
+		...options
+	});
+
+	if (result.status !== 0) {
+		console.error(`Command failed with exit code ${result.status}`);
+		process.exit(result.status);
+	}
+
+	return result;
+}
+
+// Get package version from a package.json file
+export function getPackageVersion(packagePath) {
+	try {
+		const pkg = JSON.parse(readFileSync(packagePath, 'utf8'));
+		return pkg.version;
+	} catch (error) {
+		console.error(
+			`Failed to read package version from ${packagePath}:`,
+			error.message
+		);
+		process.exit(1);
+	}
+}
+
+// Check if a git tag exists on remote
+export function tagExistsOnRemote(tag, remote = 'origin') {
+	const result = spawnSync('git', ['ls-remote', remote, tag], {
+		encoding: 'utf8'
+	});
+
+	return result.status === 0 && result.stdout.trim() !== '';
+}
+
+// Create and push a git tag if it doesn't exist
+export function createAndPushTag(tag, remote = 'origin') {
+	// Check if tag already exists
+	if (tagExistsOnRemote(tag, remote)) {
+		console.log(`Tag ${tag} already exists on remote, skipping`);
+		return false;
+	}
+
+	console.log(`Creating new tag: ${tag}`);
+
+	// Create the tag locally
+	const tagResult = spawnSync('git', ['tag', tag]);
+	if (tagResult.status !== 0) {
+		console.error('Failed to create tag:', tagResult.error || tagResult.stderr);
+		process.exit(1);
+	}
+
+	// Push the tag to remote
+	const pushResult = spawnSync('git', ['push', remote, tag]);
+	if (pushResult.status !== 0) {
+		console.error('Failed to push tag:', pushResult.error || pushResult.stderr);
+		process.exit(1);
+	}
+
+	console.log(`✅ Successfully created and pushed tag: ${tag}`);
+	return true;
+}

.github/workflows/auto-close-duplicates.yml

@@ -0,0 +1,31 @@
+name: Auto-close duplicate issues
+# description: Auto-closes issues that are duplicates of existing issues
+
+on:
+  schedule:
+    - cron: "0 9 * * *"  # Runs daily at 9 AM UTC
+  workflow_dispatch:
+
+jobs:
+  auto-close-duplicates:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    permissions:
+      contents: read
+      issues: write  # Need write permission to close issues and add comments
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Auto-close duplicate issues
+        run: node .github/scripts/auto-close-duplicates.mjs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}
+          GITHUB_REPOSITORY_NAME: ${{ github.event.repository.name }}

.github/workflows/backfill-duplicate-comments.yml

@@ -0,0 +1,46 @@
+name: Backfill Duplicate Comments
+# description: Triggers duplicate detection for old issues that don't have duplicate comments
+
+on:
+  workflow_dispatch:
+    inputs:
+      days_back:
+        description: "How many days back to look for old issues"
+        required: false
+        default: "90"
+        type: string
+      dry_run:
+        description: "Dry run mode (true to only log what would be done)"
+        required: false
+        default: "true"
+        type: choice
+        options:
+          - "true"
+          - "false"
+
+jobs:
+  backfill-duplicate-comments:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    permissions:
+      contents: read
+      issues: read
+      actions: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Backfill duplicate comments
+        run: node .github/scripts/backfill-duplicate-comments.mjs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}
+          GITHUB_REPOSITORY_NAME: ${{ github.event.repository.name }}
+          DAYS_BACK: ${{ inputs.days_back }}
+          DRY_RUN: ${{ inputs.dry_run }}