fix merge conflicts to prep for merge with branch next

- Enhance E2E testing and LLM analysis report and:
  - Add --analyze-log flag to run_e2e.sh to re-run LLM analysis on existing logs.
  - Add test:e2e and analyze-log scripts to package.json for easier execution.

- Correct display errors and dependency validation output:
  - Update chalk usage in add-task.js to use bracket notation (chalk[color]) compatible with v5, resolving 'chalk.keyword is not a function' error.
  - Modify fix-dependencies command output to show red failure box with issue count instead of green success box when validation fails.

- Refactor interactive model setup:
  - Verify inclusion of 'No change' option during interactive model setup flow (task-master models --setup).

- Update model definitions:
  - Add max_tokens field for gpt-4o in supported-models.json.

- Remove unused scripts:
  - Delete prepare-package.js and rule-transformer.test.js.

Release candidate

docs/contributor-docs/testing-roo-integration.md

@@ -0,0 +1,94 @@
+# Testing Roo Integration
+
+This document provides instructions for testing the Roo integration in the Task Master package.
+
+## Running Tests
+
+To run the tests for the Roo integration:
+
+```bash
+# Run all tests
+npm test
+
+# Run only Roo integration tests
+npm test -- -t "Roo"
+
+# Run specific test file
+npm test -- tests/integration/roo-files-inclusion.test.js
+```
+
+## Manual Testing
+
+To manually verify that the Roo files are properly included in the package:
+
+1. Create a test directory:
+
+   ```bash
+   mkdir test-tm
+   cd test-tm
+   ```
+
+2. Create a package.json file:
+
+   ```bash
+   npm init -y
+   ```
+
+3. Install the task-master-ai package locally:
+
+   ```bash
+   # From the root of the claude-task-master repository
+   cd ..
+   npm pack
+   # This will create a file like task-master-ai-0.12.0.tgz
+
+   # Move back to the test directory
+   cd test-tm
+   npm install ../task-master-ai-0.12.0.tgz
+   ```
+
+4. Initialize a new Task Master project:
+
+   ```bash
+   npx task-master init --yes
+   ```
+
+5. Verify that all Roo files and directories are created:
+
+   ```bash
+   # Check that .roomodes file exists
+   ls -la | grep .roomodes
+
+   # Check that .roo directory exists and contains all mode directories
+   ls -la .roo
+   ls -la .roo/rules
+   ls -la .roo/rules-architect
+   ls -la .roo/rules-ask
+   ls -la .roo/rules-boomerang
+   ls -la .roo/rules-code
+   ls -la .roo/rules-debug
+   ls -la .roo/rules-test
+   ```
+
+## What to Look For
+
+When running the tests or performing manual verification, ensure that:
+
+1. The package includes `.roo/**` and `.roomodes` in the `files` array in package.json
+2. The `prepare-package.js` script verifies the existence of all required Roo files
+3. The `init.js` script creates all necessary .roo directories and copies .roomodes file
+4. All source files for Roo integration exist in `assets/roocode/.roo` and `assets/roocode/.roomodes`
+
+## Compatibility
+
+Ensure that the Roo integration works alongside existing Cursor functionality:
+
+1. Initialize a new project that uses both Cursor and Roo:
+
+   ```bash
+   npx task-master init --yes
+   ```
+
+2. Verify that both `.cursor` and `.roo` directories are created
+3. Verify that both `.windsurfrules` and `.roomodes` files are created
+4. Confirm that existing functionality continues to work as expected

docs/tutorial.md

@@ -23,7 +23,7 @@ npm i -g task-master-ai
 	"mcpServers": {
 		"taskmaster-ai": {
 			"command": "npx",
-			"args": ["-y", "task-master-mcp"],
+			"args": ["-y", "--package=task-master-ai", "task-master-ai"],
 			"env": {
 				"ANTHROPIC_API_KEY": "YOUR_ANTHROPIC_API_KEY_HERE",
 				"PERPLEXITY_API_KEY": "YOUR_PERPLEXITY_API_KEY_HERE",
@@ -145,7 +145,7 @@ You can also set up the MCP server in Cursor settings:
 4. Configure with the following details:
    - Name: "Task Master"
    - Type: "Command"
-   - Command: "npx -y task-master-mcp"
+   - Command: "npx -y --package=task-master-ai task-master-ai"
 5. Save the settings
 
 Once configured, you can interact with Task Master's task management commands directly through Cursor's interface, providing a more integrated experience.