diff --git a/mcp-server/src/tools/add-dependency.js b/mcp-server/src/tools/add-dependency.js
index 22d78812..e500bc42 100644
--- a/mcp-server/src/tools/add-dependency.js
+++ b/mcp-server/src/tools/add-dependency.js
@@ -22,7 +22,7 @@ export function registerAddDependencyTool(server) {
       id: z.string().describe("ID of task that will depend on another task"),
       dependsOn: z.string().describe("ID of task that will become a dependency"),
       file: z.string().optional().describe("Path to the tasks file (default: tasks/tasks.json)"),
-      projectRoot: z.string().optional().describe("Root directory of the project (default: current working directory)")
+      projectRoot: z.string().describe("Root directory of the project (default: current working directory)")
     }),
     execute: async (args, { log }) => {
       try {
diff --git a/mcp-server/src/tools/add-subtask.js b/mcp-server/src/tools/add-subtask.js
index b3abc761..7a0e29dd 100644
--- a/mcp-server/src/tools/add-subtask.js
+++ b/mcp-server/src/tools/add-subtask.js
@@ -28,7 +28,7 @@ export function registerAddSubtaskTool(server) {
       dependencies: z.string().optional().describe("Comma-separated list of dependency IDs for the new subtask"),
       file: z.string().optional().describe("Path to the tasks file (default: tasks/tasks.json)"),
       skipGenerate: z.boolean().optional().describe("Skip regenerating task files"),
-      projectRoot: z.string().optional().describe("Root directory of the project (default: current working directory)")
+      projectRoot: z.string().describe("Root directory of the project (default: current working directory)")
     }),
     execute: async (args, { log }) => {
       try {
diff --git a/mcp-server/src/tools/add-task.js b/mcp-server/src/tools/add-task.js
index 4ea8c9cd..6fea5d8b 100644
--- a/mcp-server/src/tools/add-task.js
+++ b/mcp-server/src/tools/add-task.js
@@ -23,7 +23,7 @@ export function registerAddTaskTool(server) {
       dependencies: z.string().optional().describe("Comma-separated list of task IDs this task depends on"),
       priority: z.string().optional().describe("Task priority (high, medium, low)"),
       file: z.string().optional().describe("Path to the tasks file"),
-      projectRoot: z.string().optional().describe("Root directory of the project (default: current working directory)")
+      projectRoot: z.string().describe("Root directory of the project (default: current working directory)")
     }),
     execute: async ({ prompt, dependencies, priority, file, projectRoot }, log) => {
       try {
diff --git a/mcp-server/src/tools/analyze.js b/mcp-server/src/tools/analyze.js
index 2fc35581..ffac81e0 100644
--- a/mcp-server/src/tools/analyze.js
+++ b/mcp-server/src/tools/analyze.js
@@ -24,7 +24,7 @@ export function registerAnalyzeTool(server) {
       threshold: z.union([z.number(), z.string()]).optional().describe("Minimum complexity score to recommend expansion (1-10) (default: 5)"),
       file: z.string().optional().describe("Path to the tasks file (default: tasks/tasks.json)"),
       research: z.boolean().optional().describe("Use Perplexity AI for research-backed complexity analysis"),
-      projectRoot: z.string().optional().describe("Root directory of the project (default: current working directory)")
+      projectRoot: z.string().describe("Root directory of the project (default: current working directory)")
     }),
     execute: async (args, { log }) => {
       try {
diff --git a/mcp-server/src/tools/clear-subtasks.js b/mcp-server/src/tools/clear-subtasks.js
index 60f52c2b..b0c2d561 100644
--- a/mcp-server/src/tools/clear-subtasks.js
+++ b/mcp-server/src/tools/clear-subtasks.js
@@ -22,7 +22,7 @@ export function registerClearSubtasksTool(server) {
       id: z.string().optional().describe("Task IDs (comma-separated) to clear subtasks from"),
       all: z.boolean().optional().describe("Clear subtasks from all tasks"),
       file: z.string().optional().describe("Path to the tasks file (default: tasks/tasks.json)"),
-      projectRoot: z.string().optional().describe("Root directory of the project (default: current working directory)")
+      projectRoot: z.string().describe("Root directory of the project (default: current working directory)")
     }).refine(data => data.id || data.all, {
       message: "Either 'id' or 'all' parameter must be provided",
       path: ["id", "all"]
diff --git a/mcp-server/src/tools/complexity-report.js b/mcp-server/src/tools/complexity-report.js
index 415ad713..d8c37257 100644
--- a/mcp-server/src/tools/complexity-report.js
+++ b/mcp-server/src/tools/complexity-report.js
@@ -20,7 +20,7 @@ export function registerComplexityReportTool(server) {
     description: "Display the complexity analysis report in a readable format",
     parameters: z.object({
       file: z.string().optional().describe("Path to the report file (default: scripts/task-complexity-report.json)"),
-      projectRoot: z.string().optional().describe("Root directory of the project (default: current working directory)")
+      projectRoot: z.string().describe("Root directory of the project (default: current working directory)")
     }),
     execute: async (args, { log }) => {
       try {
diff --git a/mcp-server/src/tools/expand-all.js b/mcp-server/src/tools/expand-all.js
index ddd6fbff..e088c4e7 100644
--- a/mcp-server/src/tools/expand-all.js
+++ b/mcp-server/src/tools/expand-all.js
@@ -24,7 +24,7 @@ export function registerExpandAllTool(server) {
       prompt: z.string().optional().describe("Additional context to guide subtask generation"),
       force: z.boolean().optional().describe("Force regeneration of subtasks for tasks that already have them"),
       file: z.string().optional().describe("Path to the tasks file (default: tasks/tasks.json)"),
-      projectRoot: z.string().optional().describe("Root directory of the project (default: current working directory)")
+      projectRoot: z.string().describe("Root directory of the project (default: current working directory)")
     }),
     execute: async (args, { log }) => {
       try {
diff --git a/mcp-server/src/tools/expand-task.js b/mcp-server/src/tools/expand-task.js
index 598f9f4a..ecef0eee 100644
--- a/mcp-server/src/tools/expand-task.js
+++ b/mcp-server/src/tools/expand-task.js
@@ -27,7 +27,6 @@ export function registerExpandTaskTool(server) {
       file: z.string().optional().describe("Path to the tasks file"),
       projectRoot: z
         .string()
-        .optional()
         .describe(
           "Root directory of the project (default: current working directory)"
         ),
diff --git a/mcp-server/src/tools/fix-dependencies.js b/mcp-server/src/tools/fix-dependencies.js
index 70340c67..62219542 100644
--- a/mcp-server/src/tools/fix-dependencies.js
+++ b/mcp-server/src/tools/fix-dependencies.js
@@ -20,7 +20,7 @@ export function registerFixDependenciesTool(server) {
     description: "Fix invalid dependencies in tasks automatically",
     parameters: z.object({
       file: z.string().optional().describe("Path to the tasks file"),
-      projectRoot: z.string().optional().describe("Root directory of the project (default: current working directory)")
+      projectRoot: z.string().describe("Root directory of the project (default: current working directory)")
     }),
     execute: async (args, { log }) => {
       try {
diff --git a/mcp-server/src/tools/generate.js b/mcp-server/src/tools/generate.js
index 50f1093a..e42f4ef4 100644
--- a/mcp-server/src/tools/generate.js
+++ b/mcp-server/src/tools/generate.js
@@ -23,7 +23,6 @@ export function registerGenerateTool(server) {
       output: z.string().optional().describe("Output directory (default: same directory as tasks file)"),
       projectRoot: z
         .string()
-        .optional()
         .describe(
           "Root directory of the project (default: current working directory)"
         ),
diff --git a/mcp-server/src/tools/list-tasks.js b/mcp-server/src/tools/list-tasks.js
index f7bc17ed..667baef7 100644
--- a/mcp-server/src/tools/list-tasks.js
+++ b/mcp-server/src/tools/list-tasks.js
@@ -27,7 +27,7 @@ export function registerListTasksTool(server) {
       file: z.string().optional().describe("Path to the tasks file"),
       projectRoot: z
         .string()
-        .optional()
+        // .optional()
         .describe(
           "Root directory of the project (default: current working directory)"
         ),
diff --git a/mcp-server/src/tools/next-task.js b/mcp-server/src/tools/next-task.js
index 6d4c40f2..c6b4b81d 100644
--- a/mcp-server/src/tools/next-task.js
+++ b/mcp-server/src/tools/next-task.js
@@ -22,7 +22,6 @@ export function registerNextTaskTool(server) {
       file: z.string().optional().describe("Path to the tasks file"),
       projectRoot: z
         .string()
-        .optional()
         .describe(
           "Root directory of the project (default: current working directory)"
         ),
diff --git a/mcp-server/src/tools/parse-prd.js b/mcp-server/src/tools/parse-prd.js
index 12987f3b..2846072c 100644
--- a/mcp-server/src/tools/parse-prd.js
+++ b/mcp-server/src/tools/parse-prd.js
@@ -24,7 +24,6 @@ export function registerParsePRDTool(server) {
       output: z.string().optional().describe("Output path for tasks.json file (default: tasks/tasks.json)"),
       projectRoot: z
         .string()
-        .optional()
         .describe(
           "Root directory of the project (default: current working directory)"
         ),
diff --git a/mcp-server/src/tools/remove-dependency.js b/mcp-server/src/tools/remove-dependency.js
index 2cecf3d6..c9d2dacb 100644
--- a/mcp-server/src/tools/remove-dependency.js
+++ b/mcp-server/src/tools/remove-dependency.js
@@ -22,7 +22,7 @@ export function registerRemoveDependencyTool(server) {
       id: z.string().describe("Task ID to remove dependency from"),
       dependsOn: z.string().describe("Task ID to remove as a dependency"),
       file: z.string().optional().describe("Path to the tasks file (default: tasks/tasks.json)"),
-      projectRoot: z.string().optional().describe("Root directory of the project (default: current working directory)")
+      projectRoot: z.string().describe("Root directory of the project (default: current working directory)")
     }),
     execute: async (args, { log }) => {
       try {
diff --git a/mcp-server/src/tools/remove-subtask.js b/mcp-server/src/tools/remove-subtask.js
index 786de1fe..1878aa9c 100644
--- a/mcp-server/src/tools/remove-subtask.js
+++ b/mcp-server/src/tools/remove-subtask.js
@@ -23,7 +23,7 @@ export function registerRemoveSubtaskTool(server) {
       convert: z.boolean().optional().describe("Convert the subtask to a standalone task instead of deleting it"),
       file: z.string().optional().describe("Path to the tasks file (default: tasks/tasks.json)"),
       skipGenerate: z.boolean().optional().describe("Skip regenerating task files"),
-      projectRoot: z.string().optional().describe("Root directory of the project (default: current working directory)")
+      projectRoot: z.string().describe("Root directory of the project (default: current working directory)")
     }),
     execute: async (args, { log }) => {
       try {