Merge remote-tracking branch 'origin/next' into v017-adds-ralph

V016 last touches

.changeset/large-wolves-strive.md

@@ -0,0 +1,5 @@
+---
+"task-master-ai": patch
+---
+
+Update o3 model price

.changeset/nasty-chefs-add.md

@@ -0,0 +1,8 @@
+---
+"task-master-ai": patch
+---
+
+Fixes issue with expand CLI command "Complexity report not found"
+
+- Closes #735
+- Closes #728

.taskmaster/config.json

@@ -31,4 +31,4 @@
 		"azureBaseURL": "https://your-endpoint.azure.com/",
 		"defaultTag": "master"
 	}
-}
+}

.taskmaster/reports/task-complexity-report.json

@@ -370,4 +370,4 @@
 			"reasoning": "This task involves designing and implementing a robust, extensible export system with deep integration into GitHub, including bidirectional workflows, complex data mapping, error handling, and support for future platforms. The requirements span CLI design, API integration, content transformation, metadata management, extensibility, configuration, and extensive testing. The breadth and depth of these requirements, along with the need for maintainability and future extensibility, place this task at a high complexity level. Breaking it into at least 10 subtasks will ensure each major component and concern is addressed systematically, reducing risk and improving quality."
 		}
 	]
-}
+}

.taskmaster/tasks/task_095.txt

@@ -0,0 +1,149 @@
+# Task ID: 95
+# Title: Implement .taskmaster Directory Structure
+# Status: done
+# Dependencies: 1, 3, 4, 17
+# Priority: high
+# Description: Consolidate all Task Master-managed files in user projects into a clean, centralized .taskmaster/ directory structure to improve organization and keep user project directories clean, based on GitHub issue #275.
+# Details:
+This task involves restructuring how Task Master organizes files within user projects to improve maintainability and keep project directories clean:
+
+1. Create a new `.taskmaster/` directory structure in user projects:
+   - Move task files from `tasks/` to `.taskmaster/tasks/`
+   - Move PRD files from `scripts/` to `.taskmaster/docs/`
+   - Move analysis reports to `.taskmaster/reports/`
+   - Move configuration from `.taskmasterconfig` to `.taskmaster/config.json`
+   - Create `.taskmaster/templates/` for user templates
+
+2. Update all Task Master code that creates/reads user files:
+   - Modify task file generation to use `.taskmaster/tasks/`
+   - Update PRD file handling to use `.taskmaster/docs/`
+   - Adjust report generation to save to `.taskmaster/reports/`
+   - Update configuration loading to look for `.taskmaster/config.json`
+   - Modify any path resolution logic in Task Master's codebase
+
+3. Ensure backward compatibility during migration:
+   - Implement path fallback logic that checks both old and new locations
+   - Add deprecation warnings when old paths are detected
+   - Create a migration command to help users transition to the new structure
+   - Preserve existing user data during migration
+
+4. Update the project initialization process:
+   - Modify the init command to create the new `.taskmaster/` directory structure
+   - Update default file creation to use new paths
+
+5. Benefits of the new structure:
+   - Keeps user project directories clean and organized
+   - Clearly separates Task Master files from user project files
+   - Makes it easier to add Task Master to .gitignore if desired
+   - Provides logical grouping of different file types
+
+6. Test thoroughly to ensure all functionality works with the new structure:
+   - Verify all Task Master commands work with the new paths
+   - Ensure backward compatibility functions correctly
+   - Test migration process preserves all user data
+
+7. Update documentation:
+   - Update README.md to reflect the new user file structure
+   - Add migration guide for existing users
+   - Document the benefits of the cleaner organization
+
+# Test Strategy:
+1. Unit Testing:
+   - Create unit tests for path resolution that verify both new and old paths work
+   - Test configuration loading with both `.taskmasterconfig` and `.taskmaster/config.json`
+   - Verify the migration command correctly moves files and preserves content
+   - Test file creation in all new subdirectories
+
+2. Integration Testing:
+   - Run all existing integration tests with the new directory structure
+   - Verify that all Task Master commands function correctly with new paths
+   - Test backward compatibility by running commands with old file structure
+
+3. Migration Testing:
+   - Test the migration process on sample projects with existing tasks and files
+   - Verify all tasks, PRDs, reports, and configurations are correctly moved
+   - Ensure no data loss occurs during migration
+   - Test migration with partial existing structures (e.g., only tasks/ exists)
+
+4. User Workflow Testing:
+   - Test complete workflows: init → create tasks → generate reports → update PRDs
+   - Verify all generated files go to correct locations in `.taskmaster/`
+   - Test that user project directories remain clean
+
+5. Manual Testing:
+   - Perform end-to-end testing with the new structure
+   - Create, update, and delete tasks using the new structure
+   - Generate reports and verify they're saved to `.taskmaster/reports/`
+
+6. Documentation Verification:
+   - Review all documentation to ensure it accurately reflects the new user file structure
+   - Verify the migration guide provides clear instructions
+
+7. Regression Testing:
+   - Run the full test suite to ensure no regressions were introduced
+   - Verify existing user projects continue to work during transition period
+
+# Subtasks:
+## 1. Create .taskmaster directory structure [done]
+### Dependencies: None
+### Description: Create the new .taskmaster directory and move existing files to their new locations
+### Details:
+Create a new .taskmaster/ directory in the project root. Move the tasks/ directory to .taskmaster/tasks/. Move the scripts/ directory to .taskmaster/scripts/. Move the .taskmasterconfig file to .taskmaster/config.json. Ensure proper file permissions are maintained during the move.
+<info added on 2025-05-29T15:03:56.912Z>
+Create the new .taskmaster/ directory structure in user projects with subdirectories for tasks/, docs/, reports/, and templates/. Move the existing .taskmasterconfig file to .taskmaster/config.json. Since this project is also a Task Master user, move this project's current user files (tasks.json, PRD files, etc.) to the new .taskmaster/ structure to test the implementation. This subtask focuses on user project directory structure, not Task Master source code relocation.
+</info added on 2025-05-29T15:03:56.912Z>
+
+## 2. Update Task Master code for new user file paths [done]
+### Dependencies: 95.1
+### Description: Modify all Task Master code that creates or reads user project files to use the new .taskmaster structure
+### Details:
+Update Task Master's file handling code to use the new paths: tasks in .taskmaster/tasks/, PRD files in .taskmaster/docs/, reports in .taskmaster/reports/, and config in .taskmaster/config.json. Modify path resolution logic throughout the Task Master codebase to reference the new user file locations.
+
+## 3. Update task file generation system [done]
+### Dependencies: 95.1
+### Description: Modify the task file generation system to use the new directory structure
+### Details:
+Update the task file generation system to create and read task files from .taskmaster/tasks/ instead of tasks/. Ensure all template paths are updated. Modify any path resolution logic specific to task file handling.
+
+## 4. Implement backward compatibility logic [done]
+### Dependencies: 95.2, 95.3
+### Description: Add fallback mechanisms to support both old and new file locations during transition
+### Details:
+Implement path fallback logic that checks both old and new locations when files aren't found. Add deprecation warnings when old paths are used, informing users about the new structure. Ensure error messages are clear about the transition.
+
+## 5. Create migration command for users [done]
+### Dependencies: 95.1, 95.4
+### Description: Develop a Task Master command to help users transition their existing projects to the new structure
+### Details:
+Create a 'taskmaster migrate' command that automatically moves user files from old locations to the new .taskmaster structure. Move tasks/ to .taskmaster/tasks/, scripts/prd.txt to .taskmaster/docs/, reports to .taskmaster/reports/, and .taskmasterconfig to .taskmaster/config.json. Include backup functionality and validation to ensure migration completed successfully.
+
+## 6. Update project initialization process [done]
+### Dependencies: 95.1
+### Description: Modify the init command to create the new directory structure for new projects
+### Details:
+Update the init command to create the .taskmaster directory and its subdirectories (tasks/, docs/, reports/, templates/). Modify default file creation to use the new paths. Ensure new projects are created with the correct structure from the start.
+
+## 7. Update PRD and report file handling [done]
+### Dependencies: 95.2, 95.6
+### Description: Modify PRD file creation and report generation to use the new directory structure
+### Details:
+Update PRD file handling to create and read files from .taskmaster/docs/ instead of scripts/. Modify report generation (like task-complexity-report.json) to save to .taskmaster/reports/. Ensure all file operations use the new paths consistently.
+
+## 8. Update documentation and create migration guide [done]
+### Dependencies: 95.5, 95.6, 95.7
+### Description: Update all documentation to reflect the new directory structure and provide migration guidance
+### Details:
+Update README.md and other documentation to reflect the new .taskmaster structure for user projects. Create a comprehensive migration guide explaining the benefits of the new structure and how to migrate existing projects. Include examples of the new directory layout and explain how it keeps user project directories clean.
+
+## 9. Add templates directory support [done]
+### Dependencies: 95.2, 95.6
+### Description: Implement support for user templates in the .taskmaster/templates/ directory
+### Details:
+Create functionality to support user-defined templates in .taskmaster/templates/. Allow users to store custom task templates, PRD templates, or other reusable files. Update Task Master commands to recognize and use templates from this directory when available.
+
+## 10. Verify clean user project directories [done]
+### Dependencies: 95.8, 95.9
+### Description: Ensure the new structure keeps user project root directories clean and organized
+### Details:
+Validate that after implementing the new structure, user project root directories only contain their actual project files plus the single .taskmaster/ directory. Verify that no Task Master files are created outside of .taskmaster/. Test that users can easily add .taskmaster/ to .gitignore if they choose to exclude Task Master files from version control.
+

.taskmaster/tasks/task_096.txt

@@ -0,0 +1,37 @@
+# Task ID: 96
+# Title: Create Export Command for On-Demand Task File and PDF Generation
+# Status: pending
+# Dependencies: 2, 4, 95
+# Priority: medium
+# Description: Develop an 'export' CLI command that generates task files and comprehensive PDF exports on-demand, replacing automatic file generation and providing users with flexible export options.
+# Details:
+Implement a new 'export' command in the CLI that supports two primary modes: (1) generating individual task files on-demand (superseding the current automatic generation system), and (2) producing a comprehensive PDF export. The PDF should include: a first page with the output of 'tm list --with-subtasks', followed by individual pages for each task (using 'tm show <task_id>') and each subtask (using 'tm show <subtask_id>'). Integrate PDF generation using a robust library (e.g., pdfkit, Puppeteer, or jsPDF) to ensure high-quality output and proper pagination. Refactor or disable any existing automatic file generation logic to avoid performance overhead. Ensure the command supports flexible output paths and options for exporting only files, only PDF, or both. Update documentation and help output to reflect the new export capabilities. Consider concurrency and error handling for large projects. Ensure the export process is efficient and does not block the main CLI thread unnecessarily.
+
+# Test Strategy:
+1. Run the 'export' command with various options and verify that task files are generated only on-demand, not automatically. 2. Generate a PDF export and confirm that the first page contains the correct 'tm list --with-subtasks' output, and that each subsequent page accurately reflects the output of 'tm show <task_id>' and 'tm show <subtask_id>' for all tasks and subtasks. 3. Test exporting in projects with large numbers of tasks and subtasks to ensure performance and correctness. 4. Attempt exports with invalid paths or missing data to verify robust error handling. 5. Confirm that no automatic file generation occurs during normal task operations. 6. Review CLI help output and documentation for accuracy regarding the new export functionality.
+
+# Subtasks:
+## 1. Remove Automatic Task File Generation from Task Operations [pending]
+### Dependencies: None
+### Description: Eliminate all calls to generateTaskFiles() from task operations such as add-task, remove-task, set-status, and similar commands to prevent unnecessary performance overhead.
+### Details:
+Audit the codebase for any automatic invocations of generateTaskFiles() and remove or refactor them to ensure task files are not generated automatically during task operations.
+
+## 2. Implement Export Command Infrastructure with On-Demand Task File Generation [pending]
+### Dependencies: 96.1
+### Description: Develop the CLI 'export' command infrastructure, enabling users to generate task files on-demand by invoking the preserved generateTaskFiles function only when requested.
+### Details:
+Create the export command with options for output paths and modes (files, PDF, or both). Ensure generateTaskFiles is only called within this command and not elsewhere.
+
+## 3. Implement Comprehensive PDF Export Functionality [pending]
+### Dependencies: 96.2
+### Description: Add PDF export capability to the export command, generating a structured PDF with a first page listing all tasks and subtasks, followed by individual pages for each task and subtask, using a robust PDF library.
+### Details:
+Integrate a PDF generation library (e.g., pdfkit, Puppeteer, or jsPDF). Ensure the PDF includes the output of 'tm list --with-subtasks' on the first page, and uses 'tm show <task_id>' and 'tm show <subtask_id>' for subsequent pages. Handle pagination, concurrency, and error handling for large projects.
+
+## 4. Update Documentation, Tests, and CLI Help for Export Workflow [pending]
+### Dependencies: 96.2, 96.3
+### Description: Revise all relevant documentation, automated tests, and CLI help output to reflect the new export-based workflow and available options.
+### Details:
+Update user guides, README files, and CLI help text. Add or modify tests to cover the new export command and its options. Ensure all documentation accurately describes the new workflow and usage.
+

assets/env.example

@@ -5,6 +5,6 @@ OPENAI_API_KEY="your_openai_api_key_here"             # Optional, for OpenAI/Ope
 GOOGLE_API_KEY="your_google_api_key_here"             # Optional, for Google Gemini models.
 MISTRAL_API_KEY="your_mistral_key_here"               # Optional, for Mistral AI models.
 XAI_API_KEY="YOUR_XAI_KEY_HERE"                       # Optional, for xAI AI models.
-AZURE_OPENAI_API_KEY="your_azure_key_here"            # Optional, for Azure OpenAI models (requires endpoint in .taskmasterconfig).
+AZURE_OPENAI_API_KEY="your_azure_key_here"            # Optional, for Azure OpenAI models (requires endpoint in .taskmaster/config.json).
 OLLAMA_API_KEY="your_ollama_api_key_here"             # Optional: For remote Ollama servers that require authentication.
 GITHUB_API_KEY="your_github_api_key_here"             # Optional: For GitHub import/export features. Format: ghp_... or github_pat_...

docs/configuration.md

@@ -2,6 +2,7 @@
 
 Taskmaster uses two primary methods for configuration:
 
+1.  **`.taskmaster/config.json` File (Recommended - New Structure)**
 1.  **`.taskmaster/config.json` File (Recommended - New Structure)**
 
     - This JSON file stores most configuration settings, including AI model selections, parameters, logging levels, and project defaults.

docs/models.md

@@ -1,4 +1,4 @@
-# Available Models as of June 8, 2025
+# Available Models as of June 13, 2025
 
 ## Main Models
 
@@ -10,7 +10,7 @@
 | anthropic  | claude-3-5-sonnet-20241022                     | 0.49      | 3          | 15          |
 | openai     | gpt-4o                                         | 0.332     | 2.5        | 10          |
 | openai     | o1                                             | 0.489     | 15         | 60          |
-| openai     | o3                                             | 0.5       | 10         | 40          |
+| openai     | o3                                             | 0.5       | 2          | 8           |
 | openai     | o3-mini                                        | 0.493     | 1.1        | 4.4         |
 | openai     | o4-mini                                        | 0.45      | 1.1        | 4.4         |
 | openai     | o1-mini                                        | 0.4       | 1.1        | 4.4         |
@@ -85,7 +85,7 @@
 | anthropic  | claude-3-7-sonnet-20250219                     | 0.623     | 3          | 15          |
 | anthropic  | claude-3-5-sonnet-20241022                     | 0.49      | 3          | 15          |
 | openai     | gpt-4o                                         | 0.332     | 2.5        | 10          |
-| openai     | o3                                             | 0.5       | 10         | 40          |
+| openai     | o3                                             | 0.5       | 2          | 8           |
 | openai     | o4-mini                                        | 0.45      | 1.1        | 4.4         |
 | google     | gemini-2.5-pro-preview-05-06                   | 0.638     | —          | —           |
 | google     | gemini-2.5-pro-preview-03-25                   | 0.638     | —          | —           |

mcp-server/src/tools/next-task.js

@@ -11,8 +11,8 @@ import {
 } from './utils.js';
 import { nextTaskDirect } from '../core/task-master-core.js';
 import {
-	findTasksPath,
+	resolveTasksPath,
-	findComplexityReportPath
+	resolveComplexityReportPath
 } from '../core/utils/path-utils.js';
 
 /**
@@ -40,13 +40,10 @@ export function registerNextTaskTool(server) {
 			try {
 				log.info(`Finding next task with args: ${JSON.stringify(args)}`);
 
-				// Resolve the path to tasks.json
+				// Resolve the path to tasks.json using new path utilities
 				let tasksJsonPath;
 				try {
-					tasksJsonPath = findTasksPath(
+					tasksJsonPath = resolveTasksPath(args, session);
-						{ projectRoot: args.projectRoot, file: args.file },
-						log
-					);
 				} catch (error) {
 					log.error(`Error finding tasks.json: ${error.message}`);
 					return createErrorResponse(
@@ -57,13 +54,7 @@ export function registerNextTaskTool(server) {
 				// Resolve the path to complexity report (optional)
 				let complexityReportPath;
 				try {
-					complexityReportPath = findComplexityReportPath(
+					complexityReportPath = resolveComplexityReportPath(args, session);
-						{
-							projectRoot: args.projectRoot,
-							complexityReport: args.complexityReport
-						},
-						log
-					);
 				} catch (error) {
 					log.error(`Error finding complexity report: ${error.message}`);
 					// This is optional, so we don't fail the operation

scripts/modules/supported-models.json

@@ -46,7 +46,7 @@
 		{
 			"id": "o3",
 			"swe_score": 0.5,
-			"cost_per_1m_tokens": { "input": 10.0, "output": 40.0 },
+			"cost_per_1m_tokens": { "input": 2.0, "output": 8.0 },
 			"allowed_roles": ["main", "fallback"]
 		},
 		{

scripts/modules/task-manager/expand-task.js

@@ -421,10 +421,7 @@ async function expandTask(
 	const outputFormat = mcpLog ? 'json' : 'text';
 
 	// Determine projectRoot: Use from context if available, otherwise derive from tasksPath
-	const projectRoot =
+	const projectRoot = contextProjectRoot || findProjectRoot(tasksPath);
-		contextProjectRoot ||
-		findProjectRoot() ||
-		path.dirname(path.dirname(tasksPath));
 
 	// Use mcpLog if available, otherwise use the default console log wrapper
 	const logger = mcpLog || {