feat(research): Enhance research command with follow-up menu, save functionality, and fix ContextGatherer token counting

mcp-server/src/core/direct-functions/create-tag-from-branch.js

@@ -0,0 +1,159 @@
+/**
+ * create-tag-from-branch.js
+ * Direct function implementation for creating tags from git branches
+ */
+
+import { createTagFromBranch } from '../../../../scripts/modules/task-manager/tag-management.js';
+import {
+	getCurrentBranch,
+	isGitRepository
+} from '../../../../scripts/modules/utils/git-utils.js';
+import {
+	enableSilentMode,
+	disableSilentMode
+} from '../../../../scripts/modules/utils.js';
+import { createLogWrapper } from '../../tools/utils.js';
+
+/**
+ * Direct function wrapper for creating tags from git branches with error handling.
+ *
+ * @param {Object} args - Command arguments
+ * @param {string} args.tasksJsonPath - Path to the tasks.json file (resolved by tool)
+ * @param {string} [args.branchName] - Git branch name (optional, uses current branch if not provided)
+ * @param {boolean} [args.copyFromCurrent] - Copy tasks from current tag
+ * @param {string} [args.copyFromTag] - Copy tasks from specific tag
+ * @param {string} [args.description] - Custom description for the tag
+ * @param {boolean} [args.autoSwitch] - Automatically switch to the new tag
+ * @param {string} [args.projectRoot] - Project root path
+ * @param {Object} log - Logger object
+ * @param {Object} context - Additional context (session)
+ * @returns {Promise<Object>} - Result object { success: boolean, data?: any, error?: { code: string, message: string } }
+ */
+export async function createTagFromBranchDirect(args, log, context = {}) {
+	// Destructure expected args
+	const {
+		tasksJsonPath,
+		branchName,
+		copyFromCurrent,
+		copyFromTag,
+		description,
+		autoSwitch,
+		projectRoot
+	} = args;
+	const { session } = context;
+
+	// Enable silent mode to prevent console logs from interfering with JSON response
+	enableSilentMode();
+
+	// Create logger wrapper using the utility
+	const mcpLog = createLogWrapper(log);
+
+	try {
+		// Check if tasksJsonPath was provided
+		if (!tasksJsonPath) {
+			log.error('createTagFromBranchDirect called without tasksJsonPath');
+			disableSilentMode();
+			return {
+				success: false,
+				error: {
+					code: 'MISSING_ARGUMENT',
+					message: 'tasksJsonPath is required'
+				}
+			};
+		}
+
+		// Check if projectRoot was provided
+		if (!projectRoot) {
+			log.error('createTagFromBranchDirect called without projectRoot');
+			disableSilentMode();
+			return {
+				success: false,
+				error: {
+					code: 'MISSING_ARGUMENT',
+					message: 'projectRoot is required'
+				}
+			};
+		}
+
+		// Check if we're in a git repository
+		if (!(await isGitRepository(projectRoot))) {
+			log.error('Not in a git repository');
+			disableSilentMode();
+			return {
+				success: false,
+				error: {
+					code: 'NOT_GIT_REPOSITORY',
+					message: 'Not in a git repository. Cannot create tag from branch.'
+				}
+			};
+		}
+
+		// Determine branch name
+		let targetBranch = branchName;
+		if (!targetBranch) {
+			targetBranch = await getCurrentBranch(projectRoot);
+			if (!targetBranch) {
+				log.error('Could not determine current git branch');
+				disableSilentMode();
+				return {
+					success: false,
+					error: {
+						code: 'NO_CURRENT_BRANCH',
+						message: 'Could not determine current git branch'
+					}
+				};
+			}
+		}
+
+		log.info(`Creating tag from git branch: ${targetBranch}`);
+
+		// Prepare options
+		const options = {
+			copyFromCurrent: copyFromCurrent || false,
+			copyFromTag,
+			description:
+				description || `Tag created from git branch "${targetBranch}"`,
+			autoSwitch: autoSwitch || false
+		};
+
+		// Call the createTagFromBranch function
+		const result = await createTagFromBranch(
+			tasksJsonPath,
+			targetBranch,
+			options,
+			{
+				session,
+				mcpLog,
+				projectRoot
+			},
+			'json' // outputFormat - use 'json' to suppress CLI UI
+		);
+
+		// Restore normal logging
+		disableSilentMode();
+
+		return {
+			success: true,
+			data: {
+				branchName: result.branchName,
+				tagName: result.tagName,
+				created: result.created,
+				mappingUpdated: result.mappingUpdated,
+				autoSwitched: result.autoSwitched,
+				message: `Successfully created tag "${result.tagName}" from branch "${result.branchName}"`
+			}
+		};
+	} catch (error) {
+		// Make sure to restore normal logging even if there's an error
+		disableSilentMode();
+
+		log.error(`Error in createTagFromBranchDirect: ${error.message}`);
+		return {
+			success: false,
+			error: {
+				code: error.code || 'CREATE_TAG_FROM_BRANCH_ERROR',
+				message: error.message
+			}
+		};
+	}
+}

mcp-server/src/core/direct-functions/research.js

@@ -22,6 +22,7 @@ import { createLogWrapper } from '../../tools/utils.js';
  * @param {boolean} [args.includeProjectTree=false] - Include project file tree in context
  * @param {string} [args.detailLevel='medium'] - Detail level: 'low', 'medium', 'high'
  * @param {string} [args.saveTo] - Automatically save to task/subtask ID (e.g., "15" or "15.2")
+ * @param {boolean} [args.saveToFile=false] - Save research results to .taskmaster/docs/research/ directory
  * @param {string} [args.projectRoot] - Project root path
  * @param {Object} log - Logger object
  * @param {Object} context - Additional context (session)
@@ -37,6 +38,7 @@ export async function researchDirect(args, log, context = {}) {
 		includeProjectTree = false,
 		detailLevel = 'medium',
 		saveTo,
+		saveToFile = false,
 		projectRoot
 	} = args;
 	const { session } = context; // Destructure session from context
@@ -108,7 +110,8 @@ export async function researchDirect(args, log, context = {}) {
 			customContext: customContext || '',
 			includeProjectTree,
 			detailLevel,
-			projectRoot
+			projectRoot,
+			saveToFile
 		};
 
 		// Prepare context for the research function
@@ -226,7 +229,8 @@ ${result.result}`;
 				totalInputTokens: result.totalInputTokens,
 				detailLevel: result.detailLevel,
 				telemetryData: result.telemetryData,
-				tagInfo: result.tagInfo
+				tagInfo: result.tagInfo,
+				savedFilePath: result.savedFilePath
 			}
 		};
 	} catch (error) {

mcp-server/src/tools/research.js

@@ -53,6 +53,12 @@ export function registerResearchTool(server) {
 				.describe(
 					'Automatically save research results to specified task/subtask ID (e.g., "15" or "15.2")'
 				),
+			saveToFile: z
+				.boolean()
+				.optional()
+				.describe(
+					'Save research results to .taskmaster/docs/research/ directory (default: false)'
+				),
 			projectRoot: z
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
@@ -73,6 +79,7 @@ export function registerResearchTool(server) {
 						includeProjectTree: args.includeProjectTree || false,
 						detailLevel: args.detailLevel || 'medium',
 						saveTo: args.saveTo,
+						saveToFile: args.saveToFile || false,
 						projectRoot: args.projectRoot
 					},
 					log,