Merge branch 'next' of https://github.com/eyaltoledano/claude-task-master into joedanz/flexible-brand-rules

# Conflicts:
#	scripts/modules/commands.js

tests/unit/scripts/modules/task-manager/add-task.test.js

@@ -22,6 +22,10 @@ jest.unstable_mockModule('../../../../../scripts/modules/ui.js', () => ({
 	getStatusWithColor: jest.fn((status) => status),
 	startLoadingIndicator: jest.fn(),
 	stopLoadingIndicator: jest.fn(),
+	succeedLoadingIndicator: jest.fn(),
+	failLoadingIndicator: jest.fn(),
+	warnLoadingIndicator: jest.fn(),
+	infoLoadingIndicator: jest.fn(),
 	displayAiUsageSummary: jest.fn()
 }));
 

tests/unit/ui.test.js

@@ -82,19 +82,19 @@ describe('UI Module', () => {
 		test('should return done status with emoji for console output', () => {
 			const result = getStatusWithColor('done');
 			expect(result).toMatch(/done/);
-			expect(result).toContain('✅');
+			expect(result).toContain('✓');
 		});
 
 		test('should return pending status with emoji for console output', () => {
 			const result = getStatusWithColor('pending');
 			expect(result).toMatch(/pending/);
-			expect(result).toContain('⏱️');
+			expect(result).toContain('○');
 		});
 
 		test('should return deferred status with emoji for console output', () => {
 			const result = getStatusWithColor('deferred');
 			expect(result).toMatch(/deferred/);
-			expect(result).toContain('⏱️');
+			expect(result).toContain('x');
 		});
 
 		test('should return in-progress status with emoji for console output', () => {
@@ -222,25 +222,25 @@ describe('UI Module', () => {
 		test('should return high complexity in red', () => {
 			const result = getComplexityWithColor(8);
 			expect(result).toMatch(/8/);
-			expect(result).toContain('🔴');
+			expect(result).toContain('●');
 		});
 
 		test('should return medium complexity in yellow', () => {
 			const result = getComplexityWithColor(5);
 			expect(result).toMatch(/5/);
-			expect(result).toContain('🟡');
+			expect(result).toContain('●');
 		});
 
 		test('should return low complexity in green', () => {
 			const result = getComplexityWithColor(3);
 			expect(result).toMatch(/3/);
-			expect(result).toContain('🟢');
+			expect(result).toContain('●');
 		});
 
 		test('should handle non-numeric inputs', () => {
 			const result = getComplexityWithColor('high');
 			expect(result).toMatch(/high/);
-			expect(result).toContain('🔴');
+			expect(result).toContain('●');
 		});
 	});
 });