Update README.md - Remove trailing commas (#673)

JSON doesn't allow for trailing commas, so these need to be removed in order for this to work

.changeset/curly-months-go.md

@@ -1,5 +0,0 @@
----
-"task-master-ai": patch
----
-
-Fix bedrock issues

.changeset/dirty-webs-jam.md

@@ -1,5 +0,0 @@
----
-"task-master-ai": patch
----
-
-Fix MCP tool calls logging errors

.changeset/hungry-geese-work.md

@@ -1,5 +0,0 @@
----
-'task-master-ai': minor
----
-
-Add AWS bedrock support

.changeset/itchy-taxes-sip.md

@@ -1,13 +0,0 @@
----
-'task-master-ai': minor
----
-
-# Add Google Vertex AI Provider Integration
-
-- Implemented `VertexAIProvider` class extending BaseAIProvider
-- Added authentication and configuration handling for Vertex AI
-- Updated configuration manager with Vertex-specific getters
-- Modified AI services unified system to integrate the provider
-- Added documentation for Vertex AI setup and configuration
-- Updated environment variable examples for Vertex AI support
-- Implemented specialized error handling for Vertex-specific issues

.changeset/lemon-apes-sort.md

@@ -1,5 +0,0 @@
----
-'task-master-ai': minor
----
-
-Add support for Azure

.changeset/loud-dolls-yell.md

@@ -1,5 +0,0 @@
----
-"task-master-ai": patch
----
-
-Update rules for new directory structure

.changeset/new-colts-flow.md

@@ -1,5 +0,0 @@
----
-"task-master-ai": minor
----
-
-Increased minimum required node version to > 18 (was > 14)

.changeset/odd-banks-fly.md

@@ -1,5 +0,0 @@
----
-"task-master-ai": patch
----
-
-Fix bug in expand_all mcp tool

.changeset/pink-houses-lay.md

@@ -0,0 +1,7 @@
+---
+"task-master-ai": patch
+---
+
+Fix double .taskmaster directory paths in file resolution utilities
+
+- Closes #636

.changeset/plain-bottles-stand.md

@@ -1,5 +0,0 @@
----
-'task-master-ai': minor
----
-
-Renamed baseUrl to baseURL

.changeset/polite-areas-shave.md

@@ -0,0 +1,5 @@
+---
+"task-master-ai": patch
+---
+
+Add one-click MCP server installation for Cursor

.changeset/pre.json

@@ -1,18 +0,0 @@
-{
-  "mode": "exit",
-  "tag": "rc",
-  "initialVersions": {
-    "task-master-ai": "0.15.0"
-  },
-  "changesets": [
-    "hungry-geese-work",
-    "itchy-taxes-sip",
-    "lemon-apes-sort",
-    "new-colts-flow",
-    "plain-bottles-stand",
-    "shaggy-rice-exist",
-    "sharp-flies-call",
-    "spotty-buttons-walk",
-    "tidy-seals-rule"
-  ]
-}

.changeset/shaggy-rice-exist.md

@@ -1,5 +0,0 @@
----
-'task-master-ai': patch
----
-
-Fix max_tokens error when trying to use claude-sonnet-4 and claude-opus-4

.changeset/sharp-flies-call.md

@@ -1,7 +0,0 @@
----
-'task-master-ai': minor
----
-
-Add TASK_MASTER_PROJECT_ROOT env variable supported in mcp.json and .env for project root resolution
-
-- Some users were having issues where the MCP wasn't able to detect the location of their project root, you can now set the `TASK_MASTER_PROJECT_ROOT` environment variable to the root of your project.

.changeset/spotty-buttons-walk.md

@@ -1,31 +0,0 @@
----
-"task-master-ai": minor
----
-
-Consolidate Task Master files into unified .taskmaster directory structure
-
-This release introduces a new consolidated directory structure that organizes all Task Master files under a single `.taskmaster/` directory for better project organization and cleaner workspace management.
-
-**New Directory Structure:**
-
-- `.taskmaster/tasks/` - Task files (previously `tasks/`)
-- `.taskmaster/docs/` - Documentation including PRD files (previously `scripts/`)
-- `.taskmaster/reports/` - Complexity analysis reports (previously `scripts/`)
-- `.taskmaster/templates/` - Template files like example PRD
-- `.taskmaster/config.json` - Configuration (previously `.taskmasterconfig`)
-
-**Migration & Backward Compatibility:**
-
-- Existing projects continue to work with legacy file locations
-- New projects use the consolidated structure automatically
-- Run `task-master migrate` to move existing projects to the new structure
-- All CLI commands and MCP tools automatically detect and use appropriate file locations
-
-**Benefits:**
-
-- Cleaner project root with Task Master files organized in one location
-- Reduced file scatter across multiple directories
-- Improved project navigation and maintenance
-- Consistent file organization across all Task Master projects
-
-This change maintains full backward compatibility while providing a migration path to the improved structure.

.changeset/tall-symbols-call.md

@@ -1,5 +0,0 @@
----
-"task-master-ai": patch
----
-
-Fix MCP crashing after certain commands due to console logs

.changeset/tidy-seals-rule.md

@@ -1,5 +0,0 @@
----
-'task-master-ai': patch
----
-
-Fix add-task MCP command causing an error

.cursor/rules/taskmaster.mdc

@@ -395,7 +395,7 @@ Environment variables are used **only** for sensitive API keys related to AI pro
     *   `AZURE_OPENAI_API_KEY` (Requires `AZURE_OPENAI_ENDPOINT` too)
     *   `OPENROUTER_API_KEY`
     *   `XAI_API_KEY`
-    *   `OLLANA_API_KEY` (Requires `OLLAMA_BASE_URL` too)
+    *   `OLLAMA_API_KEY` (Requires `OLLAMA_BASE_URL` too)
 *   **Endpoints (Optional/Provider Specific inside .taskmaster/config.json):**
     *   `AZURE_OPENAI_ENDPOINT`
     *   `OLLAMA_BASE_URL` (Default: `http://localhost:11434/api`)

CHANGELOG.md

@@ -1,5 +1,79 @@
 # task-master-ai
 
+## 0.16.1
+
+### Patch Changes
+
+- [#641](https://github.com/eyaltoledano/claude-task-master/pull/641) [`ad61276`](https://github.com/eyaltoledano/claude-task-master/commit/ad612763ffbdd35aa1b593c9613edc1dc27a8856) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix bedrock issues
+
+- [#648](https://github.com/eyaltoledano/claude-task-master/pull/648) [`9b4168b`](https://github.com/eyaltoledano/claude-task-master/commit/9b4168bb4e4dfc2f4fb0cf6bd5f81a8565879176) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix MCP tool calls logging errors
+
+- [#641](https://github.com/eyaltoledano/claude-task-master/pull/641) [`ad61276`](https://github.com/eyaltoledano/claude-task-master/commit/ad612763ffbdd35aa1b593c9613edc1dc27a8856) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Update rules for new directory structure
+
+- [#648](https://github.com/eyaltoledano/claude-task-master/pull/648) [`9b4168b`](https://github.com/eyaltoledano/claude-task-master/commit/9b4168bb4e4dfc2f4fb0cf6bd5f81a8565879176) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix bug in expand_all mcp tool
+
+- [#641](https://github.com/eyaltoledano/claude-task-master/pull/641) [`ad61276`](https://github.com/eyaltoledano/claude-task-master/commit/ad612763ffbdd35aa1b593c9613edc1dc27a8856) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix MCP crashing after certain commands due to console logs
+
+## 0.16.0
+
+### Minor Changes
+
+- [#607](https://github.com/eyaltoledano/claude-task-master/pull/607) [`6a8a68e`](https://github.com/eyaltoledano/claude-task-master/commit/6a8a68e1a3f34dcdf40b355b4602a08d291f8e38) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Add AWS bedrock support
+
+- [#607](https://github.com/eyaltoledano/claude-task-master/pull/607) [`6a8a68e`](https://github.com/eyaltoledano/claude-task-master/commit/6a8a68e1a3f34dcdf40b355b4602a08d291f8e38) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - # Add Google Vertex AI Provider Integration
+
+  - Implemented `VertexAIProvider` class extending BaseAIProvider
+  - Added authentication and configuration handling for Vertex AI
+  - Updated configuration manager with Vertex-specific getters
+  - Modified AI services unified system to integrate the provider
+  - Added documentation for Vertex AI setup and configuration
+  - Updated environment variable examples for Vertex AI support
+  - Implemented specialized error handling for Vertex-specific issues
+
+- [#607](https://github.com/eyaltoledano/claude-task-master/pull/607) [`6a8a68e`](https://github.com/eyaltoledano/claude-task-master/commit/6a8a68e1a3f34dcdf40b355b4602a08d291f8e38) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Add support for Azure
+
+- [#612](https://github.com/eyaltoledano/claude-task-master/pull/612) [`669b744`](https://github.com/eyaltoledano/claude-task-master/commit/669b744ced454116a7b29de6c58b4b8da977186a) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Increased minimum required node version to > 18 (was > 14)
+
+- [#607](https://github.com/eyaltoledano/claude-task-master/pull/607) [`6a8a68e`](https://github.com/eyaltoledano/claude-task-master/commit/6a8a68e1a3f34dcdf40b355b4602a08d291f8e38) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Renamed baseUrl to baseURL
+
+- [#604](https://github.com/eyaltoledano/claude-task-master/pull/604) [`80735f9`](https://github.com/eyaltoledano/claude-task-master/commit/80735f9e60c7dda7207e169697f8ac07b6733634) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Add TASK_MASTER_PROJECT_ROOT env variable supported in mcp.json and .env for project root resolution
+
+  - Some users were having issues where the MCP wasn't able to detect the location of their project root, you can now set the `TASK_MASTER_PROJECT_ROOT` environment variable to the root of your project.
+
+- [#619](https://github.com/eyaltoledano/claude-task-master/pull/619) [`3f64202`](https://github.com/eyaltoledano/claude-task-master/commit/3f64202c9feef83f2bf383c79e4367d337c37e20) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Consolidate Task Master files into unified .taskmaster directory structure
+
+  This release introduces a new consolidated directory structure that organizes all Task Master files under a single `.taskmaster/` directory for better project organization and cleaner workspace management.
+
+  **New Directory Structure:**
+
+  - `.taskmaster/tasks/` - Task files (previously `tasks/`)
+  - `.taskmaster/docs/` - Documentation including PRD files (previously `scripts/`)
+  - `.taskmaster/reports/` - Complexity analysis reports (previously `scripts/`)
+  - `.taskmaster/templates/` - Template files like example PRD
+  - `.taskmaster/config.json` - Configuration (previously `.taskmasterconfig`)
+
+  **Migration & Backward Compatibility:**
+
+  - Existing projects continue to work with legacy file locations
+  - New projects use the consolidated structure automatically
+  - Run `task-master migrate` to move existing projects to the new structure
+  - All CLI commands and MCP tools automatically detect and use appropriate file locations
+
+  **Benefits:**
+
+  - Cleaner project root with Task Master files organized in one location
+  - Reduced file scatter across multiple directories
+  - Improved project navigation and maintenance
+  - Consistent file organization across all Task Master projects
+
+  This change maintains full backward compatibility while providing a migration path to the improved structure.
+
+### Patch Changes
+
+- [#607](https://github.com/eyaltoledano/claude-task-master/pull/607) [`6a8a68e`](https://github.com/eyaltoledano/claude-task-master/commit/6a8a68e1a3f34dcdf40b355b4602a08d291f8e38) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix max_tokens error when trying to use claude-sonnet-4 and claude-opus-4
+
+- [#625](https://github.com/eyaltoledano/claude-task-master/pull/625) [`2d520de`](https://github.com/eyaltoledano/claude-task-master/commit/2d520de2694da3efe537b475ca52baf3c869edda) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix add-task MCP command causing an error
+
 ## 0.16.0-rc.0
 
 ### Minor Changes

README.md

@@ -39,9 +39,17 @@ MCP (Model Control Protocol) lets you run Task Master directly from your editor.
 | **Cursor**   | Global  | `~/.cursor/mcp.json`                  | `%USERPROFILE%\.cursor\mcp.json`                  | `mcpServers` |
 |              | Project | `<project_folder>/.cursor/mcp.json`   | `<project_folder>\.cursor\mcp.json`               | `mcpServers` |
 | **Windsurf** | Global  | `~/.codeium/windsurf/mcp_config.json` | `%USERPROFILE%\.codeium\windsurf\mcp_config.json` | `mcpServers` |
-| **VS Code**  | Project | `<project_folder>/.vscode/mcp.json`   | `<project_folder>\.vscode\mcp.json`               | `servers`    |
+| **VS Code**  | Project | `<project_folder>/.vscode/mcp.json`   | `<project_folder>\.vscode\mcp.json`               | `servers`    |
 
-##### Cursor & Windsurf (`mcpServers`)
+##### Quick Install for Cursor (One-Click)
+
+[<img src="https://cursor.com/deeplink/mcp-install-dark.png" alt="Add Task Master MCP server to Cursor" style="max-height: 32px;">](cursor://anysphere.cursor-deeplink/mcp/install?name=taskmaster-ai&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyIteSIsIi0tcGFja2FnZT10YXNrLW1hc3Rlci1haSIsInRhc2stbWFzdGVyLWFpIl0sImVudiI6eyJBTlRIUk9QSUNfQVBJX0tFWSI6IllPVVJfQU5USFJPUElDX0FQSV9LRVlfSEVSRSIsIlBFUlBMRVhJVFlfQVBJX0tFWSI6IllPVVJfUEVSUExFWElUWV9BUElfS0VZX0hFUkUiLCJPUEVOQUlfQVBJX0tFWSI6IllPVVJfT1BFTkFJX0tFWV9IRVJFIiwiR09PR0xFX0FQSV9LRVkiOiJZT1VSX0dPT0dMRV9LRVlfSEVSRSIsIk1JU1RSQUxfQVBJX0tFWSI6IllPVVJfTUlTVFJBTF9LRVlfSEVSRSIsIk9QRU5ST1VURVJfQVBJX0tFWSI6IllPVVJfT1BFTlJPVVRFUl9LRVlfSEVSRSIsIlhBSV9BUElfS0VZIjoiWU9VUl9YQUlfS0VZX0hFUkUiLCJBWlVSRV9PUEVOQUJFX0FQSV9LRVkiOiJZT1VSX0FaVVJFX0tFWV9IRVJFIiwiT0xMQU1BX0FQSV9LRVkiOiJZT1VSX09MTEFNQV9BUElfS0VZX0hFUkUifX0%3D)
+
+> **Note:** After clicking the install button, you'll still need to add your API keys to the configuration. The button installs the MCP server with placeholder keys that you'll need to replace with your actual API keys.
+
+##### Manual Configuration
+
+###### Cursor & Windsurf (`mcpServers`)
 
 ```jsonc
 {
@@ -58,16 +66,16 @@ MCP (Model Control Protocol) lets you run Task Master directly from your editor.
         "OPENROUTER_API_KEY": "YOUR_OPENROUTER_KEY_HERE",
         "XAI_API_KEY": "YOUR_XAI_KEY_HERE",
         "AZURE_OPENAI_API_KEY": "YOUR_AZURE_KEY_HERE",
-        "OLLAMA_API_KEY": "YOUR_OLLAMA_API_KEY_HERE",
-      },
-    },
-  },
+        "OLLAMA_API_KEY": "YOUR_OLLAMA_API_KEY_HERE"
+      }
+    }
+  }
 }
 ```
 
 > 🔑 Replace `YOUR_…_KEY_HERE` with your real API keys. You can remove keys you don't use.
 
-##### VS Code (`servers` + `type`)
+###### VS Code (`servers` + `type`)
 
 ```jsonc
 {
@@ -83,11 +91,11 @@ MCP (Model Control Protocol) lets you run Task Master directly from your editor.
         "MISTRAL_API_KEY": "YOUR_MISTRAL_KEY_HERE",
         "OPENROUTER_API_KEY": "YOUR_OPENROUTER_KEY_HERE",
         "XAI_API_KEY": "YOUR_XAI_KEY_HERE",
-        "AZURE_OPENAI_API_KEY": "YOUR_AZURE_KEY_HERE",
+        "AZURE_OPENAI_API_KEY": "YOUR_AZURE_KEY_HERE"
       },
-      "type": "stdio",
-    },
-  },
+      "type": "stdio"
+    }
+  }
 }
 ```
 

llms-install.md

@@ -1,4 +1,4 @@
-``# Taskmaster AI Installation Guide
+# Taskmaster AI Installation Guide
 
 This guide helps AI assistants install and configure Taskmaster for users in their development projects.
 

mcp-server/src/core/utils/path-utils.js

@@ -3,7 +3,8 @@ import {
 	findTasksPath as coreFindTasksPath,
 	findPRDPath as coreFindPrdPath,
 	findComplexityReportPath as coreFindComplexityReportPath,
-	findProjectRoot as coreFindProjectRoot
+	findProjectRoot as coreFindProjectRoot,
+	normalizeProjectRoot
 } from '../../../../src/utils/path-utils.js';
 import { PROJECT_MARKERS } from '../../../../src/constants/paths.js';
 
@@ -49,19 +50,24 @@ export function findPrdPath(explicitPath, args = null, log = silentLogger) {
 export function resolveTasksPath(args, log = silentLogger) {
 	// Get explicit path from args.file if provided
 	const explicitPath = args?.file;
-	const projectRoot = args?.projectRoot;
+	const rawProjectRoot = args?.projectRoot;
 
 	// If explicit path is provided and absolute, use it directly
 	if (explicitPath && path.isAbsolute(explicitPath)) {
 		return explicitPath;
 	}
 
-	// If explicit path is relative, resolve it relative to projectRoot
+	// Normalize project root if provided
+	const projectRoot = rawProjectRoot
+		? normalizeProjectRoot(rawProjectRoot)
+		: null;
+
+	// If explicit path is relative, resolve it relative to normalized projectRoot
 	if (explicitPath && projectRoot) {
 		return path.resolve(projectRoot, explicitPath);
 	}
 
-	// Use core findTasksPath with explicit path and projectRoot context
+	// Use core findTasksPath with explicit path and normalized projectRoot context
 	if (projectRoot) {
 		return coreFindTasksPath(explicitPath, { projectRoot }, log);
 	}
@@ -79,19 +85,24 @@ export function resolveTasksPath(args, log = silentLogger) {
 export function resolvePrdPath(args, log = silentLogger) {
 	// Get explicit path from args.input if provided
 	const explicitPath = args?.input;
-	const projectRoot = args?.projectRoot;
+	const rawProjectRoot = args?.projectRoot;
 
 	// If explicit path is provided and absolute, use it directly
 	if (explicitPath && path.isAbsolute(explicitPath)) {
 		return explicitPath;
 	}
 
-	// If explicit path is relative, resolve it relative to projectRoot
+	// Normalize project root if provided
+	const projectRoot = rawProjectRoot
+		? normalizeProjectRoot(rawProjectRoot)
+		: null;
+
+	// If explicit path is relative, resolve it relative to normalized projectRoot
 	if (explicitPath && projectRoot) {
 		return path.resolve(projectRoot, explicitPath);
 	}
 
-	// Use core findPRDPath with explicit path and projectRoot context
+	// Use core findPRDPath with explicit path and normalized projectRoot context
 	if (projectRoot) {
 		return coreFindPrdPath(explicitPath, { projectRoot }, log);
 	}
@@ -109,19 +120,24 @@ export function resolvePrdPath(args, log = silentLogger) {
 export function resolveComplexityReportPath(args, log = silentLogger) {
 	// Get explicit path from args.complexityReport if provided
 	const explicitPath = args?.complexityReport;
-	const projectRoot = args?.projectRoot;
+	const rawProjectRoot = args?.projectRoot;
 
 	// If explicit path is provided and absolute, use it directly
 	if (explicitPath && path.isAbsolute(explicitPath)) {
 		return explicitPath;
 	}
 
-	// If explicit path is relative, resolve it relative to projectRoot
+	// Normalize project root if provided
+	const projectRoot = rawProjectRoot
+		? normalizeProjectRoot(rawProjectRoot)
+		: null;
+
+	// If explicit path is relative, resolve it relative to normalized projectRoot
 	if (explicitPath && projectRoot) {
 		return path.resolve(projectRoot, explicitPath);
 	}
 
-	// Use core findComplexityReportPath with explicit path and projectRoot context
+	// Use core findComplexityReportPath with explicit path and normalized projectRoot context
 	if (projectRoot) {
 		return coreFindComplexityReportPath(explicitPath, { projectRoot }, log);
 	}
@@ -142,13 +158,16 @@ export function resolveProjectPath(relativePath, args) {
 		throw new Error('projectRoot is required in args to resolve project paths');
 	}
 
+	// Normalize the project root to prevent double .taskmaster paths
+	const projectRoot = normalizeProjectRoot(args.projectRoot);
+
 	// If already absolute, return as-is
 	if (path.isAbsolute(relativePath)) {
 		return relativePath;
 	}
 
-	// Resolve relative to projectRoot
-	return path.resolve(args.projectRoot, relativePath);
+	// Resolve relative to normalized projectRoot
+	return path.resolve(projectRoot, relativePath);
 }
 
 /**

mcp-server/src/tools/complexity-report.js

@@ -11,7 +11,7 @@ import {
 } from './utils.js';
 import { complexityReportDirect } from '../core/task-master-core.js';
 import { COMPLEXITY_REPORT_FILE } from '../../../src/constants/paths.js';
-import path from 'path';
+import { findComplexityReportPath } from '../core/utils/path-utils.js';
 
 /**
  * Register the complexityReport tool with the MCP server
@@ -38,10 +38,18 @@ export function registerComplexityReportTool(server) {
 					`Getting complexity report with args: ${JSON.stringify(args)}`
 				);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
-				const reportPath = args.file
-					? path.resolve(args.projectRoot, args.file)
-					: path.resolve(args.projectRoot, COMPLEXITY_REPORT_FILE);
+				const pathArgs = {
+					projectRoot: args.projectRoot,
+					complexityReport: args.file
+				};
+
+				const reportPath = findComplexityReportPath(pathArgs, log);
+
+				if (!reportPath) {
+					return createErrorResponse(
+						'No complexity report found. Run task-master analyze-complexity first.'
+					);
+				}
 
 				const result = await complexityReportDirect(
 					{

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "task-master-ai",
-	"version": "0.16.0-rc.0",
+	"version": "0.16.1",
 	"description": "A task management system for ambitious AI-driven development that doesn't overwhelm and confuse Cursor.",
 	"main": "index.js",
 	"type": "module",

src/utils/path-utils.js

@@ -16,6 +16,32 @@ import {
 } from '../constants/paths.js';
 import { getLoggerOrDefault } from './logger-utils.js';
 
+/**
+ * Normalize project root to ensure it doesn't end with .taskmaster
+ * This prevents double .taskmaster paths when using constants that include .taskmaster
+ * @param {string} projectRoot - The project root path to normalize
+ * @returns {string} - Normalized project root path
+ */
+export function normalizeProjectRoot(projectRoot) {
+	if (!projectRoot) return projectRoot;
+
+	// Split the path into segments
+	const segments = projectRoot.split(path.sep);
+
+	// Find the index of .taskmaster segment
+	const taskmasterIndex = segments.findIndex(
+		(segment) => segment === '.taskmaster'
+	);
+
+	if (taskmasterIndex !== -1) {
+		// If .taskmaster is found, return everything up to but not including .taskmaster
+		const normalizedSegments = segments.slice(0, taskmasterIndex);
+		return normalizedSegments.join(path.sep) || path.sep;
+	}
+
+	return projectRoot;
+}
+
 /**
  * Find the project root directory by looking for project markers
  * @param {string} startDir - Directory to start searching from
@@ -80,14 +106,17 @@ export function findTasksPath(explicitPath = null, args = null, log = null) {
 	}
 
 	// 2. Try to get project root from args (MCP) or find it
-	const projectRoot = args?.projectRoot || findProjectRoot();
+	const rawProjectRoot = args?.projectRoot || findProjectRoot();
 
-	if (!projectRoot) {
+	if (!rawProjectRoot) {
 		logger.warn?.('Could not determine project root directory');
 		return null;
 	}
 
-	// 3. Check possible locations in order of preference
+	// 3. Normalize project root to prevent double .taskmaster paths
+	const projectRoot = normalizeProjectRoot(rawProjectRoot);
+
+	// 4. Check possible locations in order of preference
 	const possiblePaths = [
 		path.join(projectRoot, TASKMASTER_TASKS_FILE), // .taskmaster/tasks/tasks.json (NEW)
 		path.join(projectRoot, 'tasks.json'), // tasks.json in root (LEGACY)
@@ -151,14 +180,17 @@ export function findPRDPath(explicitPath = null, args = null, log = null) {
 	}
 
 	// 2. Try to get project root from args (MCP) or find it
-	const projectRoot = args?.projectRoot || findProjectRoot();
+	const rawProjectRoot = args?.projectRoot || findProjectRoot();
 
-	if (!projectRoot) {
+	if (!rawProjectRoot) {
 		logger.warn?.('Could not determine project root directory');
 		return null;
 	}
 
-	// 3. Check possible locations in order of preference
+	// 3. Normalize project root to prevent double .taskmaster paths
+	const projectRoot = normalizeProjectRoot(rawProjectRoot);
+
+	// 4. Check possible locations in order of preference
 	const locations = [
 		TASKMASTER_DOCS_DIR, // .taskmaster/docs/ (NEW)
 		'scripts/', // Legacy location
@@ -220,14 +252,17 @@ export function findComplexityReportPath(
 	}
 
 	// 2. Try to get project root from args (MCP) or find it
-	const projectRoot = args?.projectRoot || findProjectRoot();
+	const rawProjectRoot = args?.projectRoot || findProjectRoot();
 
-	if (!projectRoot) {
+	if (!rawProjectRoot) {
 		logger.warn?.('Could not determine project root directory');
 		return null;
 	}
 
-	// 3. Check possible locations in order of preference
+	// 3. Normalize project root to prevent double .taskmaster paths
+	const projectRoot = normalizeProjectRoot(rawProjectRoot);
+
+	// 4. Check possible locations in order of preference
 	const locations = [
 		TASKMASTER_REPORTS_DIR, // .taskmaster/reports/ (NEW)
 		'scripts/', // Legacy location
@@ -283,9 +318,13 @@ export function resolveTasksOutputPath(
 	}
 
 	// 2. Try to get project root from args (MCP) or find it
-	const projectRoot = args?.projectRoot || findProjectRoot() || process.cwd();
+	const rawProjectRoot =
+		args?.projectRoot || findProjectRoot() || process.cwd();
 
-	// 3. Use new .taskmaster structure by default
+	// 3. Normalize project root to prevent double .taskmaster paths
+	const projectRoot = normalizeProjectRoot(rawProjectRoot);
+
+	// 4. Use new .taskmaster structure by default
 	const defaultPath = path.join(projectRoot, TASKMASTER_TASKS_FILE);
 	logger.info?.(`Using default output path: ${defaultPath}`);
 
@@ -326,9 +365,13 @@ export function resolveComplexityReportOutputPath(
 	}
 
 	// 2. Try to get project root from args (MCP) or find it
-	const projectRoot = args?.projectRoot || findProjectRoot() || process.cwd();
+	const rawProjectRoot =
+		args?.projectRoot || findProjectRoot() || process.cwd();
 
-	// 3. Use new .taskmaster structure by default
+	// 3. Normalize project root to prevent double .taskmaster paths
+	const projectRoot = normalizeProjectRoot(rawProjectRoot);
+
+	// 4. Use new .taskmaster structure by default
 	const defaultPath = path.join(projectRoot, COMPLEXITY_REPORT_FILE);
 	logger.info?.(`Using default complexity report output path: ${defaultPath}`);
 
@@ -369,14 +412,17 @@ export function findConfigPath(explicitPath = null, args = null, log = null) {
 	}
 
 	// 2. Try to get project root from args (MCP) or find it
-	const projectRoot = args?.projectRoot || findProjectRoot();
+	const rawProjectRoot = args?.projectRoot || findProjectRoot();
 
-	if (!projectRoot) {
+	if (!rawProjectRoot) {
 		logger.warn?.('Could not determine project root directory');
 		return null;
 	}
 
-	// 3. Check possible locations in order of preference
+	// 3. Normalize project root to prevent double .taskmaster paths
+	const projectRoot = normalizeProjectRoot(rawProjectRoot);
+
+	// 4. Check possible locations in order of preference
 	const possiblePaths = [
 		path.join(projectRoot, TASKMASTER_CONFIG_FILE), // NEW location
 		path.join(projectRoot, LEGACY_CONFIG_FILE) // LEGACY location