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

tests/integration/roo-files-inclusion.test.js

@@ -0,0 +1,74 @@
+import { jest } from '@jest/globals';
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { execSync } from 'child_process';
+
+describe('Roo Files Inclusion in Package', () => {
+	// This test verifies that the required Roo files are included in the final package
+
+	test('package.json includes assets/** in the "files" array for Roo source files', () => {
+		// Read the package.json file
+		const packageJsonPath = path.join(process.cwd(), 'package.json');
+		const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+
+		// Check if assets/** is included in the files array (which contains Roo files)
+		expect(packageJson.files).toContain('assets/**');
+	});
+
+	test('prepare-package.js verifies required Roo files', () => {
+		// Read the prepare-package.js file
+		const preparePackagePath = path.join(
+			process.cwd(),
+			'scripts',
+			'prepare-package.js'
+		);
+		const preparePackageContent = fs.readFileSync(preparePackagePath, 'utf8');
+
+		// Check if prepare-package.js includes verification for Roo files
+		expect(preparePackageContent).toContain('.roo/rules/');
+		expect(preparePackageContent).toContain('.roomodes');
+		expect(preparePackageContent).toContain('assets/roocode/');
+	});
+
+	test('init.js creates Roo directories and copies files', () => {
+		// Read the init.js file
+		const initJsPath = path.join(process.cwd(), 'scripts', 'init.js');
+		const initJsContent = fs.readFileSync(initJsPath, 'utf8');
+
+		// Check for Roo directory creation (using more flexible pattern matching)
+		const hasRooDir = initJsContent.includes(
+			"ensureDirectoryExists(path.join(targetDir, '.roo"
+		);
+		expect(hasRooDir).toBe(true);
+
+		// Check for .roomodes file copying
+		const hasRoomodes = initJsContent.includes("copyTemplateFile('.roomodes'");
+		expect(hasRoomodes).toBe(true);
+
+		// Check for mode-specific patterns (using more flexible pattern matching)
+		const hasArchitect = initJsContent.includes('architect');
+		const hasAsk = initJsContent.includes('ask');
+		const hasBoomerang = initJsContent.includes('boomerang');
+		const hasCode = initJsContent.includes('code');
+		const hasDebug = initJsContent.includes('debug');
+		const hasTest = initJsContent.includes('test');
+
+		expect(hasArchitect).toBe(true);
+		expect(hasAsk).toBe(true);
+		expect(hasBoomerang).toBe(true);
+		expect(hasCode).toBe(true);
+		expect(hasDebug).toBe(true);
+		expect(hasTest).toBe(true);
+	});
+
+	test('source Roo files exist in assets directory', () => {
+		// Verify that the source files for Roo integration exist
+		expect(
+			fs.existsSync(path.join(process.cwd(), 'assets', 'roocode', '.roo'))
+		).toBe(true);
+		expect(
+			fs.existsSync(path.join(process.cwd(), 'assets', 'roocode', '.roomodes'))
+		).toBe(true);
+	});
+});

tests/integration/roo-init-functionality.test.js

@@ -0,0 +1,69 @@
+import { jest } from '@jest/globals';
+import fs from 'fs';
+import path from 'path';
+
+describe('Roo Initialization Functionality', () => {
+	let initJsContent;
+
+	beforeAll(() => {
+		// Read the init.js file content once for all tests
+		const initJsPath = path.join(process.cwd(), 'scripts', 'init.js');
+		initJsContent = fs.readFileSync(initJsPath, 'utf8');
+	});
+
+	test('init.js creates Roo directories in createProjectStructure function', () => {
+		// Check if createProjectStructure function exists
+		expect(initJsContent).toContain('function createProjectStructure');
+
+		// Check for the line that creates the .roo directory
+		const hasRooDir = initJsContent.includes(
+			"ensureDirectoryExists(path.join(targetDir, '.roo'))"
+		);
+		expect(hasRooDir).toBe(true);
+
+		// Check for the line that creates .roo/rules directory
+		const hasRooRulesDir = initJsContent.includes(
+			"ensureDirectoryExists(path.join(targetDir, '.roo', 'rules'))"
+		);
+		expect(hasRooRulesDir).toBe(true);
+
+		// Check for the for loop that creates mode-specific directories
+		const hasRooModeLoop =
+			initJsContent.includes(
+				"for (const mode of ['architect', 'ask', 'boomerang', 'code', 'debug', 'test'])"
+			) ||
+			(initJsContent.includes('for (const mode of [') &&
+				initJsContent.includes('architect') &&
+				initJsContent.includes('ask') &&
+				initJsContent.includes('boomerang') &&
+				initJsContent.includes('code') &&
+				initJsContent.includes('debug') &&
+				initJsContent.includes('test'));
+		expect(hasRooModeLoop).toBe(true);
+	});
+
+	test('init.js copies Roo files from assets/roocode directory', () => {
+		// Check for the .roomodes case in the copyTemplateFile function
+		const casesRoomodes = initJsContent.includes("case '.roomodes':");
+		expect(casesRoomodes).toBe(true);
+
+		// Check that assets/roocode appears somewhere in the file
+		const hasRoocodePath = initJsContent.includes("'assets', 'roocode'");
+		expect(hasRoocodePath).toBe(true);
+
+		// Check that roomodes file is copied
+		const copiesRoomodes = initJsContent.includes(
+			"copyTemplateFile('.roomodes'"
+		);
+		expect(copiesRoomodes).toBe(true);
+	});
+
+	test('init.js has code to copy rule files for each mode', () => {
+		// Look for template copying for rule files
+		const hasModeRulesCopying =
+			initJsContent.includes('copyTemplateFile(') &&
+			initJsContent.includes('rules-') &&
+			initJsContent.includes('-rules');
+		expect(hasModeRulesCopying).toBe(true);
+	});
+});