fix: env variables and wrapper

.changeset/curvy-candies-eat.md

@@ -1,9 +0,0 @@
----
-'task-master-ai': patch
----
-
-Better support for file paths on Windows, Linux & WSL.
-
-- Standardizes handling of different path formats (URI encoded, Windows, Linux, WSL).
-- Ensures tools receive a clean, absolute path suitable for the server OS.
-- Simplifies tool implementation by centralizing normalization logic.

.changeset/fine-monkeys-eat.md

@@ -1,8 +0,0 @@
----
-'task-master-ai': patch
----
-
-Improved update-subtask
-    - Now it has context about the parent task details
-    - It also has context about the subtask before it and the subtask after it (if they exist)
-    - Not passing all subtasks to stay token efficient

.changeset/pre.json

@@ -1,27 +0,0 @@
-{
-  "mode": "pre",
-  "tag": "rc",
-  "initialVersions": {
-    "task-master-ai": "0.12.1"
-  },
-  "changesets": [
-    "beige-rats-accept",
-    "blue-spies-kick",
-    "cuddly-zebras-matter",
-    "curvy-candies-eat",
-    "easy-toys-wash",
-    "every-stars-sell",
-    "fine-monkeys-eat",
-    "fine-signs-add",
-    "gentle-views-jump",
-    "mighty-mirrors-watch",
-    "neat-donkeys-shave",
-    "nine-rocks-sink",
-    "ninety-ghosts-relax",
-    "ninety-wombats-pull",
-    "public-cooks-fetch",
-    "tricky-papayas-hang",
-    "violet-papayas-see",
-    "violet-parrots-march"
-  ]
-}

.cursor/rules/architecture.mdc

@@ -65,9 +65,8 @@ alwaysApply: false
   - **[`mcp-server/`](mdc:mcp-server/): MCP Server Integration**
     - **Purpose**: Provides MCP interface using FastMCP.
     - **Responsibilities** (See also: [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc)):
-      - Registers tools (`mcp-server/src/tools/*.js`). Tool `execute` methods **should be wrapped** with the `withNormalizedProjectRoot` HOF (from `tools/utils.js`) to ensure consistent path handling.
-      - The HOF provides a normalized `args.projectRoot` to the `execute` method.
-      - Tool `execute` methods call **direct function wrappers** (`mcp-server/src/core/direct-functions/*.js`), passing the normalized `projectRoot` and other args.
+      - Registers tools (`mcp-server/src/tools/*.js`).
+      - Tool `execute` methods call **direct function wrappers** (`mcp-server/src/core/direct-functions/*.js`).
       - Direct functions use path utilities (`mcp-server/src/core/utils/`) to resolve paths based on `projectRoot` from session.
       - Direct functions implement silent mode, logger wrappers, and call core logic functions from `scripts/modules/`.
       - Manages MCP caching and response formatting.

.cursor/rules/mcp.mdc

@@ -188,70 +188,58 @@ execute: async (args, { log, session }) => {
 - **args**: Validated parameters.
 - **context**: Contains `{ log, session }` from FastMCP. (Removed `reportProgress`).
 
-### Standard Tool Execution Pattern with Path Normalization (Updated)
+### Standard Tool Execution Pattern
 
-To ensure consistent handling of project paths across different client environments (Windows, macOS, Linux, WSL) and input formats (e.g., `file:///...`, URI encoded paths), all MCP tool `execute` methods that require access to the project root **MUST** be wrapped with the `withNormalizedProjectRoot` Higher-Order Function (HOF).
+The `execute` method within each MCP tool (in `mcp-server/src/tools/*.js`) should follow this standard pattern:
 
-This HOF, defined in [`mcp-server/src/tools/utils.js`](mdc:mcp-server/src/tools/utils.js), performs the following before calling the tool's core logic:
-
-1.  **Determines the Raw Root:** It prioritizes `args.projectRoot` if provided by the client, otherwise it calls `getRawProjectRootFromSession` to extract the path from the session.
-2.  **Normalizes the Path:** It uses the `normalizeProjectRoot` helper to decode URIs, strip `file://` prefixes, fix potential Windows drive letter prefixes (e.g., `/C:/`), convert backslashes (`\`) to forward slashes (`/`), and resolve the path to an absolute path suitable for the server's OS.
-3.  **Injects Normalized Path:** It updates the `args` object by replacing the original `projectRoot` (or adding it) with the normalized, absolute path.
-4.  **Executes Original Logic:** It calls the original `execute` function body, passing the updated `args` object.
-
-**Implementation Example:**
+1.  **Log Entry**: Log the start of the tool execution with relevant arguments.
+2.  **Get Project Root**: Use the `getProjectRootFromSession(session, log)` utility (from [`tools/utils.js`](mdc:mcp-server/src/tools/utils.js)) to extract the project root path from the client session. Fall back to `args.projectRoot` if the session doesn't provide a root.
+3.  **Call Direct Function**: Invoke the corresponding `*Direct` function wrapper (e.g., `listTasksDirect` from [`task-master-core.js`](mdc:mcp-server/src/core/task-master-core.js)), passing an updated `args` object that includes the resolved `projectRoot`. Crucially, the third argument (context) passed to the direct function should **only include `{ log, session }`**. **Do NOT pass `reportProgress`**.
+    ```javascript
+    // Example call (applies to both AI and non-AI direct functions now)
+    const result = await someDirectFunction(
+        { ...args, projectRoot }, // Args including resolved root
+        log,                   // MCP logger
+        { session }            // Context containing session
+    ); 
+    ```
+4.  **Handle Result**: Receive the result object (`{ success, data/error, fromCache }`) from the `*Direct` function.
+5.  **Format Response**: Pass this result object to the `handleApiResult` utility (from [`tools/utils.js`](mdc:mcp-server/src/tools/utils.js)) for standardized MCP response formatting and error handling.
+6.  **Return**: Return the formatted response object provided by `handleApiResult`.
 
 ```javascript
-// In mcp-server/src/tools/your-tool.js
-import {
-    handleApiResult,
-    createErrorResponse,
-    withNormalizedProjectRoot // <<< Import HOF
-} from './utils.js';
-import { yourDirectFunction } from '../core/task-master-core.js';
-import { findTasksJsonPath } from '../core/utils/path-utils.js'; // If needed
+// Example execute method structure for a tool calling an AI-based direct function
+import { getProjectRootFromSession, handleApiResult, createErrorResponse } from './utils.js';
+import { someAIDirectFunction } from '../core/task-master-core.js';
 
-export function registerYourTool(server) {
-    server.addTool({
-        name: "your_tool",
-        description: "...".
-        parameters: z.object({
-            // ... other parameters ...
-            projectRoot: z.string().optional().describe('...') // projectRoot is optional here, HOF handles fallback
-        }),
-        // Wrap the entire execute function
-        execute: withNormalizedProjectRoot(async (args, { log, session }) => {
-            // args.projectRoot is now guaranteed to be normalized and absolute
-            const { /* other args */, projectRoot } = args;
+// ... inside server.addTool({...})
+execute: async (args, { log, session }) => { // Note: reportProgress is omitted here
+  try {
+    log.info(`Starting AI tool execution with args: ${JSON.stringify(args)}`);
 
-            try {
-                log.info(`Executing your_tool with normalized root: ${projectRoot}`);
+    // 1. Get Project Root
+    let rootFolder = getProjectRootFromSession(session, log);
+    if (!rootFolder && args.projectRoot) { // Fallback if needed
+      rootFolder = args.projectRoot;
+      log.info(`Using project root from args as fallback: ${rootFolder}`);
+    }
 
-                // Resolve paths using the normalized projectRoot
-                let tasksPath = findTasksJsonPath({ projectRoot, file: args.file }, log);
+    // 2. Call AI-Based Direct Function (passing only log and session in context)
+    const result = await someAIDirectFunction({
+      ...args,
+      projectRoot: rootFolder // Ensure projectRoot is explicitly passed
+    }, log, { session }); // Pass session here, NO reportProgress
 
-                // Call direct function, passing normalized projectRoot if needed by direct func
-                const result = await yourDirectFunction(
-                    {
-                        /* other args */,
-                        projectRoot // Pass it if direct function needs it
-                    },
-                    log,
-                    { session }
-                );
+    // 3. Handle and Format Response
+    return handleApiResult(result, log);
 
-                return handleApiResult(result, log);
-            } catch (error) {
-                log.error(`Error in your_tool: ${error.message}`);
-                return createErrorResponse(error.message);
-            }
-        }) // End HOF wrap
-    });
+  } catch (error) {
+    log.error(`Error during AI tool execution: ${error.message}`);
+    return createErrorResponse(error.message);
+  }
 }
 ```
 
-By using this HOF, the core logic within the `execute` method and any downstream functions (like `findTasksJsonPath` or direct functions) can reliably expect `args.projectRoot` to be a clean, absolute path suitable for the server environment.
-
 ### Project Initialization Tool
 
 The `initialize_project` tool allows integrated clients like Cursor to set up a new Task Master project:

.cursor/rules/new_features.mdc

@@ -523,24 +523,14 @@ Integrating Task Master commands with the MCP server (for use by tools like Curs
 
 4.  **Create MCP Tool (`mcp-server/src/tools/`)**:
     - Create a new file (e.g., `your-command.js`) using **kebab-case**.
-    - Import `zod`, `handleApiResult`, **`withNormalizedProjectRoot` HOF**, and your `yourCommandDirect` function.
+    - Import `zod`, `handleApiResult`, `createErrorResponse`, **`getProjectRootFromSession`**, and your `yourCommandDirect` function.
     - Implement `registerYourCommandTool(server)`.
-    - **Define parameters**: Make `projectRoot` optional (`z.string().optional().describe(...)`) as the HOF handles fallback.
-    - Consider if this operation should run in the background using `AsyncOperationManager`.
-    - Implement the standard `execute` method **wrapped with `withNormalizedProjectRoot`**:
-      ```javascript
-      execute: withNormalizedProjectRoot(async (args, { log, session }) => {
-          // args.projectRoot is now normalized
-          const { projectRoot /*, other args */ } = args;
-          // ... resolve tasks path if needed using normalized projectRoot ...
-          const result = await yourCommandDirect(
-              { /* other args */, projectRoot /* if needed by direct func */ }, 
-              log, 
-              { session }
-          );
-          return handleApiResult(result, log);
-      })
-      ```
+    - Define the tool `name` using **snake_case** (e.g., `your_command`).
+    - Define the `parameters` using `zod`. **Crucially, define `projectRoot` as optional**: `projectRoot: z.string().optional().describe(...)`. Include `file` if applicable.
+    - Implement the standard `async execute(args, { log, reportProgress, session })` method:
+      - Get `rootFolder` using `getProjectRootFromSession` (with fallback to `args.projectRoot`).
+      - Call `yourCommandDirect({ ...args, projectRoot: rootFolder }, log)`. 
+      - Pass the result to `handleApiResult(result, log, 'Error Message')`.
 
 5.  **Register Tool**: Import and call `registerYourCommandTool` in `mcp-server/src/tools/index.js`.
 
@@ -628,3 +618,8 @@ When implementing project initialization commands:
      });
    }
    ```
+
+       }
+     });
+   }
+   ```

.cursor/rules/taskmaster.mdc

@@ -79,7 +79,6 @@ This document provides a detailed reference for interacting with Taskmaster, cov
 *   **Usage (CLI):** Run without flags to view current configuration and available models. Use set flags to update specific roles. Use `--setup` for guided configuration, including custom models. To set a custom model via flags, use `--set-<role>=<model_id>` along with either `--ollama` or `--openrouter`.
 *   **Notes:** Configuration is stored in `.taskmasterconfig` in the project root. This command/tool modifies that file. Use `listAvailableModels` or `task-master models` to see internally supported models. OpenRouter custom models are validated against their live API. Ollama custom models are not validated live.
 *   **API note:** API keys for selected AI providers (based on their model) need to exist in the mcp.json file to be accessible in MCP context. The API keys must be present in the local .env file for the CLI to be able to read them.
-*   **Model costs:** The costs in supported models are expressed in dollars. An input/output value of 3 is $3.00. A value of 0.8 is $0.80. 
 *   **Warning:** DO NOT MANUALLY EDIT THE .taskmasterconfig FILE. Use the included commands either in the MCP or CLI format as needed. Always prioritize MCP tools when available and use the CLI as a fallback.
 
 ---

.cursor/rules/utilities.mdc

@@ -428,69 +428,36 @@ Taskmaster configuration (excluding API keys) is primarily managed through the `
 
 ## MCP Server Tool Utilities (`mcp-server/src/tools/utils.js`)
 
-These utilities specifically support the implementation and execution of MCP tools.
+- **Purpose**: These utilities specifically support the MCP server tools ([`mcp-server/src/tools/*.js`](mdc:mcp-server/src/tools/*.js)), handling MCP communication patterns, response formatting, caching integration, and the CLI fallback mechanism.
+- **Refer to [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc)** for detailed usage patterns within the MCP tool `execute` methods and direct function wrappers.
 
-- **`normalizeProjectRoot(rawPath, log)`**:
-    - **Purpose**: Takes a raw project root path (potentially URI encoded, with `file://` prefix, Windows slashes) and returns a normalized, absolute path suitable for the server's OS.
-    - **Logic**: Decodes URI, strips `file://`, handles Windows drive prefix (`/C:/`), replaces `\` with `/`, uses `path.resolve()`.
-    - **Usage**: Used internally by `withNormalizedProjectRoot` HOF.
-
-- **`getRawProjectRootFromSession(session, log)`**:
-    - **Purpose**: Extracts the *raw* project root URI string from the session object (`session.roots[0].uri` or `session.roots.roots[0].uri`) without performing normalization.
-    - **Usage**: Used internally by `withNormalizedProjectRoot` HOF as a fallback if `args.projectRoot` isn't provided.
-
-- **`withNormalizedProjectRoot(executeFn)`**:
-    - **Purpose**: A Higher-Order Function (HOF) designed to wrap a tool's `execute` method.
-    - **Logic**: 
-        1. Determines the raw project root (from `args.projectRoot` or `getRawProjectRootFromSession`).
-        2. Normalizes the raw path using `normalizeProjectRoot`.
-        3. Injects the normalized, absolute path back into the `args` object as `args.projectRoot`.
-        4. Calls the original `executeFn` with the updated `args`.
-    - **Usage**: Should wrap the `execute` function of *every* MCP tool that needs a reliable, normalized project root path.
-    - **Example**:
-      ```javascript
-      // In mcp-server/src/tools/your-tool.js
-      import { withNormalizedProjectRoot } from './utils.js';
-      
-      export function registerYourTool(server) {
-          server.addTool({
-              // ... name, description, parameters ...
-              execute: withNormalizedProjectRoot(async (args, context) => {
-                  // args.projectRoot is now normalized here
-                  const { projectRoot /*, other args */ } = args;
-                  // ... rest of tool logic using normalized projectRoot ...
-              })
-          });
-      }
-      ```
+- **`getProjectRootFromSession(session, log)`**: 
+    - ✅ **DO**: Call this utility **within the MCP tool's `execute` method** to extract the project root path from the `session` object.
+    - Decodes the `file://` URI and handles potential errors.
+    - Returns the project path string or `null`.
+    - The returned path should then be passed in the `args` object when calling the corresponding `*Direct` function (e.g., `yourDirectFunction({ ...args, projectRoot: rootFolder }, log)`).
 
 - **`handleApiResult(result, log, errorPrefix, processFunction)`**:
-    - **Purpose**: Standardizes the formatting of responses returned by direct functions (`{ success, data/error, fromCache }`) into the MCP response format.
-    - **Usage**: Call this at the end of the tool's `execute` method, passing the result from the direct function call.
+    - ✅ **DO**: Call this from the MCP tool's `execute` method after receiving the result from the `*Direct` function wrapper.
+    - Takes the standard `{ success, data/error, fromCache }` object.
+    - Formats the standard MCP success or error response, including the `fromCache` flag.
+    - Uses `processMCPResponseData` by default to filter response data.
 
-- **`createContentResponse(content)` / `createErrorResponse(errorMessage)`**:
-    - **Purpose**: Helper functions to create the basic MCP response structure for success or error messages.
-    - **Usage**: Used internally by `handleApiResult` and potentially directly for simple responses.
-
-- **`createLogWrapper(log)`**:
-    - **Purpose**: Creates a logger object wrapper with standard methods (`info`, `warn`, `error`, `debug`, `success`) mapping to the passed MCP `log` object's methods. Ensures compatibility when passing loggers to core functions.
-    - **Usage**: Used within direct functions before passing the `log` object down to core logic that expects the standard method names.
-
-- **`getCachedOrExecute({ cacheKey, actionFn, log })`**:
-    - **Purpose**: Utility for implementing caching within direct functions. Checks cache for `cacheKey`; if miss, executes `actionFn`, caches successful result, and returns.
-    - **Usage**: Wrap the core logic execution within a direct function call.
+- **`executeTaskMasterCommand(command, log, args, projectRootRaw)`**:
+    - Executes a Task Master CLI command as a child process.
+    - Handles fallback between global `task-master` and local `node scripts/dev.js`.
+    - ❌ **DON'T**: Use this as the primary method for MCP tools. Prefer direct function calls via `*Direct` wrappers.
 
 - **`processMCPResponseData(taskOrData, fieldsToRemove)`**:
-    - **Purpose**: Utility to filter potentially sensitive or large fields (like `details`, `testStrategy`) from task objects before sending the response back via MCP.
-    - **Usage**: Passed as the default `processFunction` to `handleApiResult`.
+    - Filters task data (e.g., removing `details`, `testStrategy`) before sending to the MCP client. Called by `handleApiResult`.
 
-- **`getProjectRootFromSession(session, log)`**:
-    - **Purpose**: Legacy function to extract *and normalize* the project root from the session. Replaced by the HOF pattern but potentially still used.
-    - **Recommendation**: Prefer using the `withNormalizedProjectRoot` HOF in tools instead of calling this directly.
+- **`createContentResponse(content)` / `createErrorResponse(errorMessage)`**:
+    - Formatters for standard MCP success/error responses.
 
-- **`executeTaskMasterCommand(...)`**: 
-    - **Purpose**: Executes `task-master` CLI command as a fallback. 
-    - **Recommendation**: Deprecated for most uses; prefer direct function calls.
+- **`getCachedOrExecute({ cacheKey, actionFn, log })`**:
+    - ✅ **DO**: Use this utility *inside direct function wrappers* to implement caching.
+    - Checks cache, executes `actionFn` on miss, stores result.
+    - Returns standard `{ success, data/error, fromCache: boolean }`.
 
 ## Export Organization
 

.taskmasterconfig

@@ -7,14 +7,14 @@
       "temperature": 0.2
     },
     "research": {
-      "provider": "perplexity",
-      "modelId": "sonar-pro",
+      "provider": "xai",
+      "modelId": "grok-3",
       "maxTokens": 8700,
       "temperature": 0.1
     },
     "fallback": {
       "provider": "anthropic",
-      "modelId": "claude-3-7-sonnet-20250219",
+      "modelId": "claude-3-5-sonnet-20241022",
       "maxTokens": 120000,
       "temperature": 0.2
     }

CHANGELOG.md

@@ -1,58 +1,5 @@
 # task-master-ai
 
-## 0.13.0-rc.0
-
-### Minor Changes
-
-- ef782ff: feat(expand): Enhance `expand` and `expand-all` commands
-
-  - Integrate `task-complexity-report.json` to automatically determine the number of subtasks and use tailored prompts for expansion based on prior analysis. You no longer need to try copy-pasting the recommended prompt. If it exists, it will use it for you. You can just run `task-master update --id=[id of task] --research` and it will use that prompt automatically. No extra prompt needed.
-  - Change default behavior to _append_ new subtasks to existing ones. Use the `--force` flag to clear existing subtasks before expanding. This is helpful if you need to add more subtasks to a task but you want to do it by the batch from a given prompt. Use force if you want to start fresh with a task's subtasks.
-
-- 87d97bb: Adds support for the OpenRouter AI provider. Users can now configure models available through OpenRouter (requiring an `OPENROUTER_API_KEY`) via the `task-master models` command, granting access to a wide range of additional LLMs. - IMPORTANT FYI ABOUT OPENROUTER: Taskmaster relies on AI SDK, which itself relies on tool use. It looks like **free** models sometimes do not include tool use. For example, Gemini 2.5 pro (free) failed via OpenRouter (no tool use) but worked fine on the paid version of the model. Custom model support for Open Router is considered experimental and likely will not be further improved for some time.
-- 1ab836f: Adds model management and new configuration file .taskmasterconfig which houses the models used for main, research and fallback. Adds models command and setter flags. Adds a --setup flag with an interactive setup. We should be calling this during init. Shows a table of active and available models when models is called without flags. Includes SWE scores and token costs, which are manually entered into the supported_models.json, the new place where models are defined for support. Config-manager.js is the core module responsible for managing the new config."
-- c8722b0: Adds custom model ID support for Ollama and OpenRouter providers.
-  - Adds the `--ollama` and `--openrouter` flags to `task-master models --set-<role>` command to set models for those providers outside of the support models list.
-  - Updated `task-master models --setup` interactive mode with options to explicitly enter custom Ollama or OpenRouter model IDs.
-  - Implemented live validation against OpenRouter API (`/api/v1/models`) when setting a custom OpenRouter model ID (via flag or setup).
-  - Refined logic to prioritize explicit provider flags/choices over internal model list lookups in case of ID conflicts.
-  - Added warnings when setting custom/unvalidated models.
-  - We obviously don't recommend going with a custom, unproven model. If you do and find performance is good, please let us know so we can add it to the list of supported models.
-- 2517bc1: Integrate OpenAI as a new AI provider. - Enhance `models` command/tool to display API key status. - Implement model-specific `maxTokens` override based on `supported-models.json` to save you if you use an incorrect max token value.
-- 9a48278: Tweaks Perplexity AI calls for research mode to max out input tokens and get day-fresh information - Forces temp at 0.1 for highly deterministic output, no variations - Adds a system prompt to further improve the output - Correctly uses the maximum input tokens (8,719, used 8,700) for perplexity - Specificies to use a high degree of research across the web - Specifies to use information that is as fresh as today; this support stuff like capturing brand new announcements like new GPT models and being able to query for those in research. 🔥
-
-### Patch Changes
-
-- 842eaf7: - Add support for Google Gemini models via Vercel AI SDK integration.
-- ed79d4f: Add xAI provider and Grok models support
-- ad89253: Better support for file paths on Windows, Linux & WSL.
-
-  - Standardizes handling of different path formats (URI encoded, Windows, Linux, WSL).
-  - Ensures tools receive a clean, absolute path suitable for the server OS.
-  - Simplifies tool implementation by centralizing normalization logic.
-
-- 2acba94: Add integration for Roo Code
-- d63964a: Improved update-subtask - Now it has context about the parent task details - It also has context about the subtask before it and the subtask after it (if they exist) - Not passing all subtasks to stay token efficient
-- 5f504fa: Improve and adjust `init` command for robustness and updated dependencies.
-
-  - **Update Initialization Dependencies:** Ensure newly initialized projects (`task-master init`) include all required AI SDK dependencies (`@ai-sdk/*`, `ai`, provider wrappers) in their `package.json` for out-of-the-box AI feature compatibility. Remove unnecessary dependencies (e.g., `uuid`) from the init template.
-  - **Silence `npm install` during `init`:** Prevent `npm install` output from interfering with non-interactive/MCP initialization by suppressing its stdio in silent mode.
-  - **Improve Conditional Model Setup:** Reliably skip interactive `models --setup` during non-interactive `init` runs (e.g., `init -y` or MCP) by checking `isSilentMode()` instead of passing flags.
-  - **Refactor `init.js`:** Remove internal `isInteractive` flag logic.
-  - **Update `init` Instructions:** Tweak the "Getting Started" text displayed after `init`.
-  - **Fix MCP Server Launch:** Update `.cursor/mcp.json` template to use `node ./mcp-server/server.js` instead of `npx task-master-mcp`.
-  - **Update Default Model:** Change the default main model in the `.taskmasterconfig` template.
-
-- 96aeeff: Fixes an issue with add-task which did not use the manually defined properties and still needlessly hit the AI endpoint.
-- 5aea93d: Fixes an issue that prevented remove-subtask with comma separated tasks/subtasks from being deleted (only the first ID was being deleted). Closes #140
-- 66ac9ab: Improves next command to be subtask-aware - The logic for determining the "next task" (findNextTask function, used by task-master next and the next_task MCP tool) has been significantly improved. Previously, it only considered top-level tasks, making its recommendation less useful when a parent task containing subtasks was already marked 'in-progress'. - The updated logic now prioritizes finding the next available subtask within any 'in-progress' parent task, considering subtask dependencies and priority. - If no suitable subtask is found within active parent tasks, it falls back to recommending the next eligible top-level task based on the original criteria (status, dependencies, priority).
-
-  This change makes the next command much more relevant and helpful during the implementation phase of complex tasks.
-
-- ca7b045: Add `--status` flag to `show` command to filter displayed subtasks.
-- 5a2371b: Fix --task to --num-tasks in ui + related tests - issue #324
-- 6cb213e: Adds a 'models' CLI and MCP command to get the current model configuration, available models, and gives the ability to set main/research/fallback models." - In the CLI, `task-master models` shows the current models config. Using the `--setup` flag launches an interactive set up that allows you to easily select the models you want to use for each of the three roles. Use `q` during the interactive setup to cancel the setup. - In the MCP, responses are simplified in RESTful format (instead of the full CLI output). The agent can use the `models` tool with different arguments, including `listAvailableModels` to get available models. Run without arguments, it will return the current configuration. Arguments are available to set the model for each of the three roles. This allows you to manage Taskmaster AI providers and models directly from either the CLI or MCP or both. - Updated the CLI help menu when you run `task-master` to include missing commands and .taskmasterconfig information. - Adds `--research` flag to `add-task` so you can hit up Perplexity right from the add-task flow, rather than having to add a task and then update it.
-
 ## 0.12.1
 
 ### Patch Changes

README-task-master.md

@@ -47,7 +47,7 @@ npm install task-master-ai
 task-master init
 
 # If installed locally
-npx task-master init
+npx task-master-init
 ```
 
 This will prompt you for project details and set up a new project with the necessary files and structure.

docs/tutorial.md

@@ -89,7 +89,7 @@ Initialize a new project:
 task-master init
 
 # If installed locally
-npx task-master init
+npx task-master-init
 ```
 
 This will prompt you for project details and set up a new project with the necessary files and structure.

mcp-server/src/core/direct-functions/add-task.js

@@ -23,21 +23,13 @@ import { createLogWrapper } from '../../tools/utils.js';
  * @param {string} [args.priority='medium'] - Task priority (high, medium, low)
  * @param {string} [args.tasksJsonPath] - Path to the tasks.json file (resolved by tool)
  * @param {boolean} [args.research=false] - Whether to use research capabilities for task creation
- * @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 addTaskDirect(args, log, context = {}) {
-	// Destructure expected args (including research and projectRoot)
-	const {
-		tasksJsonPath,
-		prompt,
-		dependencies,
-		priority,
-		research,
-		projectRoot
-	} = args;
+	// Destructure expected args (including research)
+	const { tasksJsonPath, prompt, dependencies, priority, research } = args;
 	const { session } = context; // Destructure session from context
 
 	// Enable silent mode to prevent console logs from interfering with JSON response
@@ -116,13 +108,11 @@ export async function addTaskDirect(args, log, context = {}) {
 				taskPriority,
 				{
 					session,
-					mcpLog,
-					projectRoot
+					mcpLog
 				},
 				'json', // outputFormat
 				manualTaskData, // Pass the manual task data
-				false, // research flag is false for manual creation
-				projectRoot // Pass projectRoot
+				false // research flag is false for manual creation
 			);
 		} else {
 			// AI-driven task creation
@@ -138,8 +128,7 @@ export async function addTaskDirect(args, log, context = {}) {
 				taskPriority,
 				{
 					session,
-					mcpLog,
-					projectRoot
+					mcpLog
 				},
 				'json', // outputFormat
 				null, // manualTaskData is null for AI creation

mcp-server/src/core/direct-functions/analyze-task-complexity.js

@@ -18,17 +18,15 @@ import { createLogWrapper } from '../../tools/utils.js'; // Import the new utili
  * @param {string} args.outputPath - Explicit absolute path to save the report.
  * @param {string|number} [args.threshold] - Minimum complexity score to recommend expansion (1-10)
  * @param {boolean} [args.research] - Use Perplexity AI for research-backed complexity analysis
- * @param {string} [args.projectRoot] - Project root path.
  * @param {Object} log - Logger object
  * @param {Object} [context={}] - Context object containing session data
  * @param {Object} [context.session] - MCP session object
  * @returns {Promise<{success: boolean, data?: Object, error?: {code: string, message: string}}>}
  */
 export async function analyzeTaskComplexityDirect(args, log, context = {}) {
-	const { session } = context;
-	const { tasksJsonPath, outputPath, threshold, research, projectRoot } = args;
-
-	const logWrapper = createLogWrapper(log);
+	const { session } = context; // Extract session
+	// Destructure expected args
+	const { tasksJsonPath, outputPath, model, threshold, research } = args; // Model is ignored by core function now
 
 	// --- Initial Checks (remain the same) ---
 	try {
@@ -62,34 +60,35 @@ export async function analyzeTaskComplexityDirect(args, log, context = {}) {
 			log.info('Using research role for complexity analysis');
 		}
 
-		// Prepare options for the core function - REMOVED mcpLog and session here
-		const coreOptions = {
-			file: tasksJsonPath,
-			output: outputPath,
+		// Prepare options for the core function
+		const options = {
+			file: tasksPath,
+			output: resolvedOutputPath,
+			// model: model, // No longer needed
 			threshold: threshold,
-			research: research === true, // Ensure boolean
-			projectRoot: projectRoot // Pass projectRoot here
+			research: research === true // Ensure boolean
 		};
 		// --- End Initial Checks ---
 
-		// --- Silent Mode and Logger Wrapper ---
+		// --- Silent Mode and Logger Wrapper (remain the same) ---
 		const wasSilent = isSilentMode();
 		if (!wasSilent) {
-			enableSilentMode(); // Still enable silent mode as a backup
+			enableSilentMode();
 		}
 
-		let report;
+		// Create logger wrapper using the utility
+		const mcpLog = createLogWrapper(log);
+
+		let report; // To store the result from the core function
 
 		try {
-			// --- Call Core Function (Pass context separately) ---
-			// Pass coreOptions as the first argument
-			// Pass context object { session, mcpLog } as the second argument
-			report = await analyzeTaskComplexity(
-				coreOptions, // Pass options object
-				{ session, mcpLog: logWrapper } // Pass context object
-				// Removed the explicit 'json' format argument, assuming context handling is sufficient
-				// If issues persist, we might need to add an explicit format param to analyzeTaskComplexity
-			);
+			// --- Call Core Function (Updated Context Passing) ---
+			// Call the core function, passing options and the context object { session, mcpLog }
+			report = await analyzeTaskComplexity(options, {
+				session, // Pass the session object
+				mcpLog // Pass the logger wrapper
+			});
+			// --- End Core Function Call ---
 		} catch (error) {
 			log.error(
 				`Error in analyzeTaskComplexity core function: ${error.message}`
@@ -101,7 +100,7 @@ export async function analyzeTaskComplexityDirect(args, log, context = {}) {
 			return {
 				success: false,
 				error: {
-					code: 'ANALYZE_CORE_ERROR',
+					code: 'ANALYZE_CORE_ERROR', // More specific error code
 					message: `Error running core complexity analysis: ${error.message}`
 				}
 			};
@@ -125,10 +124,10 @@ export async function analyzeTaskComplexityDirect(args, log, context = {}) {
 			};
 		}
 
-		// Added a check to ensure report is defined before accessing its properties
-		if (!report || typeof report !== 'object') {
+		// The core function now returns the report object directly
+		if (!report || !report.complexityAnalysis) {
 			log.error(
-				'Core analysis function returned an invalid or undefined response.'
+				'Core analyzeTaskComplexity function did not return a valid report object.'
 			);
 			return {
 				success: false,
@@ -140,10 +139,7 @@ export async function analyzeTaskComplexityDirect(args, log, context = {}) {
 		}
 
 		try {
-			// Ensure complexityAnalysis exists and is an array
-			const analysisArray = Array.isArray(report.complexityAnalysis)
-				? report.complexityAnalysis
-				: [];
+			const analysisArray = report.complexityAnalysis; // Already an array
 
 			// Count tasks by complexity (remains the same)
 			const highComplexityTasks = analysisArray.filter(
@@ -159,15 +155,16 @@ export async function analyzeTaskComplexityDirect(args, log, context = {}) {
 			return {
 				success: true,
 				data: {
-					message: `Task complexity analysis complete. Report saved to ${outputPath}`, // Use outputPath from args
-					reportPath: outputPath, // Use outputPath from args
+					message: `Task complexity analysis complete. Report saved to ${resolvedOutputPath}`,
+					reportPath: resolvedOutputPath,
 					reportSummary: {
 						taskCount: analysisArray.length,
 						highComplexityTasks,
 						mediumComplexityTasks,
 						lowComplexityTasks
-					},
-					fullReport: report // Now includes the full report
+					}
+					// Include the full report data if needed by the client
+					// fullReport: report
 				}
 			};
 		} catch (parseError) {

mcp-server/src/core/direct-functions/expand-all-tasks.js

@@ -17,15 +17,14 @@ import { createLogWrapper } from '../../tools/utils.js';
  * @param {boolean} [args.research] - Enable research-backed subtask generation
  * @param {string} [args.prompt] - Additional context to guide subtask generation
  * @param {boolean} [args.force] - Force regeneration of subtasks for tasks that already have them
- * @param {string} [args.projectRoot] - Project root path.
  * @param {Object} log - Logger object from FastMCP
  * @param {Object} context - Context object containing session
  * @returns {Promise<{success: boolean, data?: Object, error?: {code: string, message: string}}>}
  */
 export async function expandAllTasksDirect(args, log, context = {}) {
 	const { session } = context; // Extract session
-	// Destructure expected args, including projectRoot
-	const { tasksJsonPath, num, research, prompt, force, projectRoot } = args;
+	// Destructure expected args
+	const { tasksJsonPath, num, research, prompt, force } = args;
 
 	// Create logger wrapper using the utility
 	const mcpLog = createLogWrapper(log);
@@ -44,7 +43,7 @@ export async function expandAllTasksDirect(args, log, context = {}) {
 	enableSilentMode(); // Enable silent mode for the core function call
 	try {
 		log.info(
-			`Calling core expandAllTasks with args: ${JSON.stringify({ num, research, prompt, force, projectRoot })}`
+			`Calling core expandAllTasks with args: ${JSON.stringify({ num, research, prompt, force })}`
 		);
 
 		// Parse parameters (ensure correct types)
@@ -53,14 +52,14 @@ export async function expandAllTasksDirect(args, log, context = {}) {
 		const additionalContext = prompt || '';
 		const forceFlag = force === true;
 
-		// Call the core function, passing options and the context object { session, mcpLog, projectRoot }
+		// Call the core function, passing options and the context object { session, mcpLog }
 		const result = await expandAllTasks(
 			tasksJsonPath,
 			numSubtasks,
 			useResearch,
 			additionalContext,
 			forceFlag,
-			{ session, mcpLog, projectRoot }
+			{ session, mcpLog }
 		);
 
 		// Core function now returns a summary object

mcp-server/src/core/direct-functions/expand-task.js

@@ -25,7 +25,6 @@ import { createLogWrapper } from '../../tools/utils.js';
  * @param {boolean} [args.research] - Enable research role for subtask generation.
  * @param {string} [args.prompt] - Additional context to guide subtask generation.
  * @param {boolean} [args.force] - Force expansion even if subtasks exist.
- * @param {string} [args.projectRoot] - Project root directory.
  * @param {Object} log - Logger object
  * @param {Object} context - Context object containing session
  * @param {Object} [context.session] - MCP Session object
@@ -33,8 +32,8 @@ import { createLogWrapper } from '../../tools/utils.js';
  */
 export async function expandTaskDirect(args, log, context = {}) {
 	const { session } = context; // Extract session
-	// Destructure expected args, including projectRoot
-	const { tasksJsonPath, id, num, research, prompt, force, projectRoot } = args;
+	// Destructure expected args
+	const { tasksJsonPath, id, num, research, prompt, force } = args;
 
 	// Log session root data for debugging
 	log.info(
@@ -185,22 +184,20 @@ export async function expandTaskDirect(args, log, context = {}) {
 		// Create logger wrapper using the utility
 		const mcpLog = createLogWrapper(log);
 
-		let wasSilent; // Declare wasSilent outside the try block
 		// Process the request
 		try {
 			// Enable silent mode to prevent console logs from interfering with JSON response
-			wasSilent = isSilentMode(); // Assign inside the try block
+			const wasSilent = isSilentMode();
 			if (!wasSilent) enableSilentMode();
 
-			// Call the core expandTask function with the wrapped logger and projectRoot
-			const updatedTaskResult = await expandTask(
+			// Call the core expandTask function with the wrapped logger
+			const result = await expandTask(
 				tasksPath,
 				taskId,
 				numSubtasks,
 				useResearch,
 				additionalContext,
-				{ mcpLog, session, projectRoot },
-				forceFlag
+				{ mcpLog, session }
 			);
 
 			// Restore normal logging

mcp-server/src/core/direct-functions/initialize-project-direct.js

@@ -4,6 +4,7 @@ import {
 	disableSilentMode
 	// isSilentMode // Not used directly here
 } from '../../../../scripts/modules/utils.js';
+import { getProjectRootFromSession } from '../../tools/utils.js'; // Adjust path if necessary
 import os from 'os'; // Import os module for home directory check
 
 /**
@@ -15,32 +16,60 @@ import os from 'os'; // Import os module for home directory check
  * @returns {Promise<{success: boolean, data?: any, error?: {code: string, message: string}}>} - Standard result object.
  */
 export async function initializeProjectDirect(args, log, context = {}) {
-	const { session } = context; // Keep session if core logic needs it
+	const { session } = context;
 	const homeDir = os.homedir();
+	let targetDirectory = null;
 
+	log.info(
+		`CONTEXT received in direct function: ${context ? JSON.stringify(Object.keys(context)) : 'MISSING or Falsy'}`
+	);
+	log.info(
+		`SESSION extracted in direct function: ${session ? 'Exists' : 'MISSING or Falsy'}`
+	);
 	log.info(`Args received in direct function: ${JSON.stringify(args)}`);
 
 	// --- Determine Target Directory ---
-	// TRUST the projectRoot passed from the tool layer via args
-	// The HOF in the tool layer already normalized and validated it came from a reliable source (args or session)
-	const targetDirectory = args.projectRoot;
-
-	// --- Validate the targetDirectory (basic sanity checks) ---
+	// 1. Prioritize projectRoot passed directly in args
+	// Ensure it's not null, '/', or the home directory
 	if (
-		!targetDirectory ||
-		typeof targetDirectory !== 'string' || // Ensure it's a string
-		targetDirectory === '/' ||
-		targetDirectory === homeDir
+		args.projectRoot &&
+		args.projectRoot !== '/' &&
+		args.projectRoot !== homeDir
 	) {
-		log.error(
-			`Invalid target directory received from tool layer: '${targetDirectory}'`
+		log.info(`Using projectRoot directly from args: ${args.projectRoot}`);
+		targetDirectory = args.projectRoot;
+	} else {
+		// 2. If args.projectRoot is missing or invalid, THEN try session (as a fallback)
+		log.warn(
+			`args.projectRoot ('${args.projectRoot}') is missing or invalid. Attempting to derive from session.`
 		);
+		const sessionDerivedPath = getProjectRootFromSession(session, log);
+		// Validate the session-derived path as well
+		if (
+			sessionDerivedPath &&
+			sessionDerivedPath !== '/' &&
+			sessionDerivedPath !== homeDir
+		) {
+			log.info(
+				`Using project root derived from session: ${sessionDerivedPath}`
+			);
+			targetDirectory = sessionDerivedPath;
+		} else {
+			log.error(
+				`Could not determine a valid project root. args.projectRoot='${args.projectRoot}', sessionDerivedPath='${sessionDerivedPath}'`
+			);
+		}
+	}
+
+	// 3. Validate the final targetDirectory
+	if (!targetDirectory) {
+		// This error now covers cases where neither args.projectRoot nor session provided a valid path
 		return {
 			success: false,
 			error: {
 				code: 'INVALID_TARGET_DIRECTORY',
-				message: `Cannot initialize project: Invalid target directory '${targetDirectory}' received. Please ensure a valid workspace/folder is open or specified.`,
-				details: `Received args.projectRoot: ${args.projectRoot}` // Show what was received
+				message: `Cannot initialize project: Could not determine a valid target directory. Please ensure a workspace/folder is open or specify projectRoot.`,
+				details: `Attempted args.projectRoot: ${args.projectRoot}`
 			},
 			fromCache: false
 		};
@@ -57,12 +86,11 @@ export async function initializeProjectDirect(args, log, context = {}) {
 	log.info(
 		`Temporarily changing CWD to ${targetDirectory} for initialization.`
 	);
-	process.chdir(targetDirectory); // Change CWD to the HOF-provided root
+	process.chdir(targetDirectory); // Change CWD to the *validated* targetDirectory
 
-	enableSilentMode();
+	enableSilentMode(); // Enable silent mode BEFORE calling the core function
 	try {
-		// Construct options ONLY from the relevant flags in args
-		// The core initializeProject operates in the current CWD, which we just set
+		// Always force yes: true when called via MCP to avoid interactive prompts
 		const options = {
 			aliases: args.addAliases,
 			skipInstall: args.skipInstall,
@@ -72,11 +100,12 @@ export async function initializeProjectDirect(args, log, context = {}) {
 		log.info(`Initializing project with options: ${JSON.stringify(options)}`);
 		const result = await initializeProject(options); // Call core logic
 
+		// Format success result for handleApiResult
 		resultData = {
 			message: 'Project initialized successfully.',
 			next_step:
 				'Now that the project is initialized, the next step is to create the tasks by parsing a PRD. This will create the tasks folder and the initial task files (tasks folder will be created when parse-prd is run). The parse-prd tool will require a prd.txt file as input (typically found in the project root directory, scripts/ directory). You can create a prd.txt file by asking the user about their idea, and then using the scripts/example_prd.txt file as a template to genrate a prd.txt file in scripts/. You may skip all of this if the user already has a prd.txt file. You can THEN use the parse-prd tool to create the tasks. So: step 1 after initialization is to create a prd.txt file in scripts/prd.txt or confirm the user already has one. Step 2 is to use the parse-prd tool to create the tasks. Do not bother looking for tasks after initialization, just use the parse-prd tool to create the tasks after creating a prd.txt from which to parse the tasks. You do NOT need to reinitialize the project to parse-prd.',
-			...result
+			...result // Include details returned by initializeProject
 		};
 		success = true;
 		log.info(
@@ -91,11 +120,12 @@ export async function initializeProjectDirect(args, log, context = {}) {
 		};
 		success = false;
 	} finally {
-		disableSilentMode();
+		disableSilentMode(); // ALWAYS disable silent mode in finally
 		log.info(`Restoring original CWD: ${originalCwd}`);
-		process.chdir(originalCwd);
+		process.chdir(originalCwd); // Change back to original CWD
 	}
 
+	// Return in format expected by handleApiResult
 	if (success) {
 		return { success: true, data: resultData, fromCache: false };
 	} else {

mcp-server/src/core/direct-functions/next-task.js

@@ -71,34 +71,24 @@ export async function nextTaskDirect(args, log) {
 					data: {
 						message:
 							'No eligible next task found. All tasks are either completed or have unsatisfied dependencies',
-						nextTask: null
+						nextTask: null,
+						allTasks: data.tasks
 					}
 				};
 			}
 
-			// Check if it's a subtask
-			const isSubtask =
-				typeof nextTask.id === 'string' && nextTask.id.includes('.');
-
-			const taskOrSubtask = isSubtask ? 'subtask' : 'task';
-
-			const additionalAdvice = isSubtask
-				? 'Subtasks can be updated with timestamped details as you implement them. This is useful for tracking progress, marking milestones and insights (of successful or successive falures in attempting to implement the subtask). Research can be used when updating the subtask to collect up-to-date information, and can be helpful to solve a repeating problem the agent is unable to solve. It is a good idea to get-task the parent task to collect the overall context of the task, and to get-task the subtask to collect the specific details of the subtask.'
-				: 'Tasks can be updated to reflect a change in the direction of the task, or to reformulate the task per your prompt. Research can be used when updating the task to collect up-to-date information. It is best to update subtasks as you work on them, and to update the task for more high-level changes that may affect pending subtasks or the general direction of the task.';
-
 			// Restore normal logging
 			disableSilentMode();
 
 			// Return the next task data with the full tasks array for reference
 			log.info(
-				`Successfully found next task ${nextTask.id}: ${nextTask.title}. Is subtask: ${isSubtask}`
+				`Successfully found next task ${nextTask.id}: ${nextTask.title}`
 			);
 			return {
 				success: true,
 				data: {
 					nextTask,
-					isSubtask,
-					nextSteps: `When ready to work on the ${taskOrSubtask}, use set-status to set the status to "in progress" ${additionalAdvice}`
+					allTasks: data.tasks
 				}
 			};
 		} catch (error) {

mcp-server/src/core/direct-functions/parse-prd.js

@@ -8,11 +8,9 @@ import fs from 'fs';
 import { parsePRD } from '../../../../scripts/modules/task-manager.js';
 import {
 	enableSilentMode,
-	disableSilentMode,
-	isSilentMode
+	disableSilentMode
 } from '../../../../scripts/modules/utils.js';
 import { createLogWrapper } from '../../tools/utils.js';
-import { getDefaultNumTasks } from '../../../../scripts/modules/config-manager.js';
 
 /**
  * Direct function wrapper for parsing PRD documents and generating tasks.
@@ -23,158 +21,177 @@ import { getDefaultNumTasks } from '../../../../scripts/modules/config-manager.j
  * @returns {Promise<Object>} - Result object with success status and data/error information.
  */
 export async function parsePRDDirect(args, log, context = {}) {
-	const { session } = context;
-	// Extract projectRoot from args
-	const {
-		input: inputArg,
-		output: outputArg,
-		numTasks: numTasksArg,
-		force,
-		append,
-		projectRoot
-	} = args;
-
-	// Create the standard logger wrapper
-	const logWrapper = createLogWrapper(log);
-
-	// --- Input Validation and Path Resolution ---
-	if (!projectRoot) {
-		logWrapper.error('parsePRDDirect requires a projectRoot argument.');
-		return {
-			success: false,
-			error: {
-				code: 'MISSING_ARGUMENT',
-				message: 'projectRoot is required.'
-			}
-		};
-	}
-	if (!inputArg) {
-		logWrapper.error('parsePRDDirect called without input path');
-		return {
-			success: false,
-			error: { code: 'MISSING_ARGUMENT', message: 'Input path is required' }
-		};
-	}
-
-	// Resolve input and output paths relative to projectRoot
-	const inputPath = path.resolve(projectRoot, inputArg);
-	const outputPath = outputArg
-		? path.resolve(projectRoot, outputArg)
-		: path.resolve(projectRoot, 'tasks', 'tasks.json'); // Default output path
-
-	// Check if input file exists
-	if (!fs.existsSync(inputPath)) {
-		const errorMsg = `Input PRD file not found at resolved path: ${inputPath}`;
-		logWrapper.error(errorMsg);
-		return {
-			success: false,
-			error: { code: 'FILE_NOT_FOUND', message: errorMsg }
-		};
-	}
-
-	const outputDir = path.dirname(outputPath);
-	try {
-		if (!fs.existsSync(outputDir)) {
-			logWrapper.info(`Creating output directory: ${outputDir}`);
-			fs.mkdirSync(outputDir, { recursive: true });
-		}
-	} catch (dirError) {
-		logWrapper.error(
-			`Failed to create output directory ${outputDir}: ${dirError.message}`
-		);
-		// Return an error response immediately if dir creation fails
-		return {
-			success: false,
-			error: {
-				code: 'DIRECTORY_CREATION_ERROR',
-				message: `Failed to create output directory: ${dirError.message}`
-			}
-		};
-	}
-
-	let numTasks = getDefaultNumTasks(projectRoot);
-	if (numTasksArg) {
-		numTasks =
-			typeof numTasksArg === 'string' ? parseInt(numTasksArg, 10) : numTasksArg;
-		if (isNaN(numTasks) || numTasks <= 0) {
-			// Ensure positive number
-			numTasks = getDefaultNumTasks(projectRoot); // Fallback to default if parsing fails or invalid
-			logWrapper.warn(
-				`Invalid numTasks value: ${numTasksArg}. Using default: ${numTasks}`
-			);
-		}
-	}
-
-	const useForce = force === true;
-	const useAppend = append === true;
-	if (useAppend) {
-		logWrapper.info('Append mode enabled.');
-		if (useForce) {
-			logWrapper.warn(
-				'Both --force and --append flags were provided. --force takes precedence; append mode will be ignored.'
-			);
-		}
-	}
-
-	logWrapper.info(
-		`Parsing PRD via direct function. Input: ${inputPath}, Output: ${outputPath}, NumTasks: ${numTasks}, Force: ${useForce}, Append: ${useAppend}, ProjectRoot: ${projectRoot}`
-	);
-
-	const wasSilent = isSilentMode();
-	if (!wasSilent) {
-		enableSilentMode();
-	}
+	const { session } = context; // Only extract session
 
 	try {
-		// Call the core parsePRD function
-		const result = await parsePRD(
-			inputPath,
-			outputPath,
-			numTasks,
-			{ session, mcpLog: logWrapper, projectRoot, useForce, useAppend },
-			'json'
-		);
+		log.info(`Parsing PRD document with args: ${JSON.stringify(args)}`);
 
-		// parsePRD returns { success: true, tasks: processedTasks } on success
-		if (result && result.success && Array.isArray(result.tasks)) {
-			logWrapper.success(
-				`Successfully parsed PRD. Generated ${result.tasks.length} tasks.`
-			);
+		// Validate required parameters
+		if (!args.projectRoot) {
+			const errorMessage = 'Project root is required for parsePRDDirect';
+			log.error(errorMessage);
 			return {
-				success: true,
-				data: {
-					message: `Successfully parsed PRD and generated ${result.tasks.length} tasks.`,
-					outputPath: outputPath,
-					taskCount: result.tasks.length
-				}
+				success: false,
+				error: { code: 'MISSING_PROJECT_ROOT', message: errorMessage },
+				fromCache: false
 			};
-		} else {
-			// Handle case where core function didn't return expected success structure
-			logWrapper.error(
-				'Core parsePRD function did not return a successful structure.'
-			);
+		}
+		if (!args.input) {
+			const errorMessage = 'Input file path is required for parsePRDDirect';
+			log.error(errorMessage);
+			return {
+				success: false,
+				error: { code: 'MISSING_INPUT_PATH', message: errorMessage },
+				fromCache: false
+			};
+		}
+		if (!args.output) {
+			const errorMessage = 'Output file path is required for parsePRDDirect';
+			log.error(errorMessage);
+			return {
+				success: false,
+				error: { code: 'MISSING_OUTPUT_PATH', message: errorMessage },
+				fromCache: false
+			};
+		}
+
+		// Resolve input path (expecting absolute path or path relative to project root)
+		const projectRoot = args.projectRoot;
+		const inputPath = path.isAbsolute(args.input)
+			? args.input
+			: path.resolve(projectRoot, args.input);
+
+		// Verify input file exists
+		if (!fs.existsSync(inputPath)) {
+			const errorMessage = `Input file not found: ${inputPath}`;
+			log.error(errorMessage);
 			return {
 				success: false,
 				error: {
-					code: 'CORE_FUNCTION_ERROR',
-					message:
-						result?.message ||
-						'Core function failed to parse PRD or returned unexpected result.'
-				}
+					code: 'INPUT_FILE_NOT_FOUND',
+					message: errorMessage,
+					details: `Checked path: ${inputPath}\nProject root: ${projectRoot}\nInput argument: ${args.input}`
+				},
+				fromCache: false
 			};
 		}
+
+		// Resolve output path (expecting absolute path or path relative to project root)
+		const outputPath = path.isAbsolute(args.output)
+			? args.output
+			: path.resolve(projectRoot, args.output);
+
+		// Ensure output directory exists
+		const outputDir = path.dirname(outputPath);
+		if (!fs.existsSync(outputDir)) {
+			log.info(`Creating output directory: ${outputDir}`);
+			fs.mkdirSync(outputDir, { recursive: true });
+		}
+
+		// Parse number of tasks - handle both string and number values
+		let numTasks = 10; // Default
+		if (args.numTasks) {
+			numTasks =
+				typeof args.numTasks === 'string'
+					? parseInt(args.numTasks, 10)
+					: args.numTasks;
+			if (isNaN(numTasks)) {
+				numTasks = 10; // Fallback to default if parsing fails
+				log.warn(`Invalid numTasks value: ${args.numTasks}. Using default: 10`);
+			}
+		}
+
+		// Extract the append flag from args
+		const append = Boolean(args.append) === true;
+
+		// Log key parameters including append flag
+		log.info(
+			`Preparing to parse PRD from ${inputPath} and output to ${outputPath} with ${numTasks} tasks, append mode: ${append}`
+		);
+
+		// --- Logger Wrapper ---
+		const mcpLog = createLogWrapper(log);
+
+		// Prepare options for the core function
+		const options = {
+			mcpLog,
+			session
+		};
+
+		// Enable silent mode to prevent console logs from interfering with JSON response
+		enableSilentMode();
+		try {
+			// Make sure the output directory exists
+			const outputDir = path.dirname(outputPath);
+			if (!fs.existsSync(outputDir)) {
+				log.info(`Creating output directory: ${outputDir}`);
+				fs.mkdirSync(outputDir, { recursive: true });
+			}
+
+			// Execute core parsePRD function with AI client
+			const tasksDataResult = await parsePRD(
+				inputPath,
+				outputPath,
+				numTasks,
+				{
+					mcpLog: logWrapper,
+					session,
+					append
+				},
+				aiClient,
+				modelConfig
+			);
+
+			// Since parsePRD doesn't return a value but writes to a file, we'll read the result
+			// to return it to the caller
+			if (fs.existsSync(outputPath)) {
+				const tasksData = JSON.parse(fs.readFileSync(outputPath, 'utf8'));
+				const actionVerb = append ? 'appended' : 'generated';
+				const message = `Successfully ${actionVerb} ${tasksData.tasks?.length || 0} tasks from PRD`;
+
+				if (!tasksDataResult || !tasksDataResult.tasks || !tasksData) {
+					throw new Error(
+						'Core parsePRD function did not return valid task data.'
+					);
+				}
+
+				log.info(message);
+
+				return {
+					success: true,
+					data: {
+						message,
+						taskCount: tasksDataResult.tasks?.length || 0,
+						outputPath,
+						appended: append
+					},
+					fromCache: false // This operation always modifies state and should never be cached
+				};
+			} else {
+				const errorMessage = `Tasks file was not created at ${outputPath}`;
+				log.error(errorMessage);
+				return {
+					success: false,
+					error: { code: 'OUTPUT_FILE_NOT_CREATED', message: errorMessage },
+					fromCache: false
+				};
+			}
+		} finally {
+			// Always restore normal logging
+			disableSilentMode();
+		}
 	} catch (error) {
-		logWrapper.error(`Error executing core parsePRD: ${error.message}`);
+		// Make sure to restore normal logging even if there's an error
+		disableSilentMode();
+
+		log.error(`Error parsing PRD: ${error.message}`);
 		return {
 			success: false,
 			error: {
-				code: 'PARSE_PRD_CORE_ERROR',
+				code: error.code || 'PARSE_PRD_ERROR', // Use error code if available
 				message: error.message || 'Unknown error parsing PRD'
-			}
+			},
+			fromCache: false
 		};
-	} finally {
-		if (!wasSilent && isSilentMode()) {
-			disableSilentMode();
-		}
 	}
 }

mcp-server/src/core/direct-functions/show-task.js

@@ -3,100 +3,151 @@
  * Direct function implementation for showing task details
  */
 
-import { findTaskById, readJSON } from '../../../../scripts/modules/utils.js';
+import { findTaskById } from '../../../../scripts/modules/utils.js';
+import { readJSON } from '../../../../scripts/modules/utils.js';
 import { getCachedOrExecute } from '../../tools/utils.js';
 import {
 	enableSilentMode,
 	disableSilentMode
 } from '../../../../scripts/modules/utils.js';
-import { findTasksJsonPath } from '../utils/path-utils.js';
 
 /**
- * Direct function wrapper for getting task details.
+ * Direct function wrapper for showing task details with error handling and caching.
  *
- * @param {Object} args - Command arguments.
- * @param {string} args.id - Task ID to show.
- * @param {string} [args.file] - Optional path to the tasks file (passed to findTasksJsonPath).
+ * @param {Object} args - Command arguments
+ * @param {string} args.tasksJsonPath - Explicit path to the tasks.json file.
+ * @param {string} args.id - The ID of the task or subtask to show.
  * @param {string} [args.status] - Optional status to filter subtasks by.
- * @param {string} args.projectRoot - Absolute path to the project root directory (already normalized by tool).
- * @param {Object} log - Logger object.
- * @param {Object} context - Context object containing session data.
- * @returns {Promise<Object>} - Result object with success status and data/error information.
+ * @param {Object} log - Logger object
+ * @returns {Promise<Object>} - Task details result { success: boolean, data?: any, error?: { code: string, message: string }, fromCache: boolean }
  */
 export async function showTaskDirect(args, log) {
-	// Destructure session from context if needed later, otherwise ignore
-	// const { session } = context;
-	// Destructure projectRoot and other args. projectRoot is assumed normalized.
-	const { id, file, status, projectRoot } = args;
+	// Destructure expected args
+	const { tasksJsonPath, id, status } = args;
 
-	log.info(
-		`Showing task direct function. ID: ${id}, File: ${file}, Status Filter: ${status}, ProjectRoot: ${projectRoot}`
-	);
-
-	// --- Path Resolution using the passed (already normalized) projectRoot ---
-	let tasksJsonPath;
-	try {
-		// Use the projectRoot passed directly from args
-		tasksJsonPath = findTasksJsonPath(
-			{ projectRoot: projectRoot, file: file },
-			log
-		);
-		log.info(`Resolved tasks path: ${tasksJsonPath}`);
-	} catch (error) {
-		log.error(`Error finding tasks.json: ${error.message}`);
+	if (!tasksJsonPath) {
+		log.error('showTaskDirect called without tasksJsonPath');
 		return {
 			success: false,
 			error: {
-				code: 'TASKS_FILE_NOT_FOUND',
-				message: `Failed to find tasks.json: ${error.message}`
-			}
+				code: 'MISSING_ARGUMENT',
+				message: 'tasksJsonPath is required'
+			},
+			fromCache: false
 		};
 	}
-	// --- End Path Resolution ---
 
-	// --- Rest of the function remains the same, using tasksJsonPath ---
-	try {
-		const tasksData = readJSON(tasksJsonPath);
-		if (!tasksData || !tasksData.tasks) {
+	// Validate task ID
+	const taskId = id;
+	if (!taskId) {
+		log.error('Task ID is required');
+		return {
+			success: false,
+			error: {
+				code: 'INPUT_VALIDATION_ERROR',
+				message: 'Task ID is required'
+			},
+			fromCache: false
+		};
+	}
+
+	// Generate cache key using the provided task path, ID, and status filter
+	const cacheKey = `showTask:${tasksJsonPath}:${taskId}:${status || 'all'}`;
+
+	// Define the action function to be executed on cache miss
+	const coreShowTaskAction = async () => {
+		try {
+			// Enable silent mode to prevent console logs from interfering with JSON response
+			enableSilentMode();
+
+			log.info(
+				`Retrieving task details for ID: ${taskId} from ${tasksJsonPath}${status ? ` (filtering by status: ${status})` : ''}`
+			);
+
+			// Read tasks data using the provided path
+			const data = readJSON(tasksJsonPath);
+			if (!data || !data.tasks) {
+				disableSilentMode(); // Disable before returning
+				return {
+					success: false,
+					error: {
+						code: 'INVALID_TASKS_FILE',
+						message: `No valid tasks found in ${tasksJsonPath}`
+					}
+				};
+			}
+
+			// Find the specific task, passing the status filter
+			const { task, originalSubtaskCount } = findTaskById(
+				data.tasks,
+				taskId,
+				status
+			);
+
+			if (!task) {
+				disableSilentMode(); // Disable before returning
+				return {
+					success: false,
+					error: {
+						code: 'TASK_NOT_FOUND',
+						message: `Task with ID ${taskId} not found${status ? ` or no subtasks match status '${status}'` : ''}`
+					}
+				};
+			}
+
+			// Restore normal logging
+			disableSilentMode();
+
+			// Return the task data, the original subtask count (if applicable),
+			// and the full tasks array for reference (needed for formatDependenciesWithStatus function in UI)
+			log.info(
+				`Successfully found task ${taskId}${status ? ` (with status filter: ${status})` : ''}`
+			);
 			return {
-				success: false,
-				error: { code: 'INVALID_TASKS_DATA', message: 'Invalid tasks data' }
+				success: true,
+				data: {
+					task,
+					originalSubtaskCount,
+					allTasks: data.tasks
+				}
 			};
-		}
+		} catch (error) {
+			// Make sure to restore normal logging even if there's an error
+			disableSilentMode();
 
-		const { task, originalSubtaskCount } = findTaskById(
-			tasksData.tasks,
-			id,
-			status
-		);
-
-		if (!task) {
+			log.error(`Error showing task: ${error.message}`);
 			return {
 				success: false,
 				error: {
-					code: 'TASK_NOT_FOUND',
-					message: `Task or subtask with ID ${id} not found`
+					code: 'CORE_FUNCTION_ERROR',
+					message: error.message || 'Failed to show task details'
 				}
 			};
 		}
+	};
 
-		log.info(`Successfully retrieved task ${id}.`);
-
-		const returnData = { ...task };
-		if (originalSubtaskCount !== null) {
-			returnData._originalSubtaskCount = originalSubtaskCount;
-			returnData._subtaskFilter = status;
-		}
-
-		return { success: true, data: returnData };
+	// Use the caching utility
+	try {
+		const result = await getCachedOrExecute({
+			cacheKey,
+			actionFn: coreShowTaskAction,
+			log
+		});
+		log.info(`showTaskDirect completed. From cache: ${result.fromCache}`);
+		return result; // Returns { success, data/error, fromCache }
 	} catch (error) {
-		log.error(`Error showing task ${id}: ${error.message}`);
+		// Catch unexpected errors from getCachedOrExecute itself
+		disableSilentMode();
+		log.error(
+			`Unexpected error during getCachedOrExecute for showTask: ${error.message}`
+		);
 		return {
 			success: false,
 			error: {
-				code: 'TASK_OPERATION_ERROR',
+				code: 'UNEXPECTED_ERROR',
 				message: error.message
-			}
+			},
+			fromCache: false
 		};
 	}
 }

mcp-server/src/core/direct-functions/update-subtask-by-id.js

@@ -6,40 +6,29 @@
 import { updateSubtaskById } from '../../../../scripts/modules/task-manager.js';
 import {
 	enableSilentMode,
-	disableSilentMode,
-	isSilentMode
+	disableSilentMode
 } from '../../../../scripts/modules/utils.js';
 import { createLogWrapper } from '../../tools/utils.js';
 
 /**
  * Direct function wrapper for updateSubtaskById with error handling.
  *
- * @param {Object} args - Command arguments containing id, prompt, useResearch, tasksJsonPath, and projectRoot.
- * @param {string} args.tasksJsonPath - Explicit path to the tasks.json file.
- * @param {string} args.id - Subtask ID in format "parent.sub".
- * @param {string} args.prompt - Information to append to the subtask.
- * @param {boolean} [args.research] - Whether to use research role.
- * @param {string} [args.projectRoot] - Project root path.
+ * @param {Object} args - Command arguments containing id, prompt, useResearch and tasksJsonPath.
  * @param {Object} log - Logger object.
  * @param {Object} context - Context object containing session data.
  * @returns {Promise<Object>} - Result object with success status and data/error information.
  */
 export async function updateSubtaskByIdDirect(args, log, context = {}) {
-	const { session } = context;
-	// Destructure expected args, including projectRoot
-	const { tasksJsonPath, id, prompt, research, projectRoot } = args;
-
-	const logWrapper = createLogWrapper(log);
+	const { session } = context; // Only extract session, not reportProgress
+	const { tasksJsonPath, id, prompt, research } = args;
 
 	try {
-		logWrapper.info(
-			`Updating subtask by ID via direct function. ID: ${id}, ProjectRoot: ${projectRoot}`
-		);
+		log.info(`Updating subtask with args: ${JSON.stringify(args)}`);
 
 		// Check if tasksJsonPath was provided
 		if (!tasksJsonPath) {
 			const errorMessage = 'tasksJsonPath is required but was not provided.';
-			logWrapper.error(errorMessage);
+			log.error(errorMessage);
 			return {
 				success: false,
 				error: { code: 'MISSING_ARGUMENT', message: errorMessage },
@@ -47,22 +36,22 @@ export async function updateSubtaskByIdDirect(args, log, context = {}) {
 			};
 		}
 
-		// Basic validation for ID format (e.g., '5.2')
-		if (!id || typeof id !== 'string' || !id.includes('.')) {
+		// Check required parameters (id and prompt)
+		if (!id) {
 			const errorMessage =
-				'Invalid subtask ID format. Must be in format "parentId.subtaskId" (e.g., "5.2").';
-			logWrapper.error(errorMessage);
+				'No subtask ID specified. Please provide a subtask ID to update.';
+			log.error(errorMessage);
 			return {
 				success: false,
-				error: { code: 'INVALID_SUBTASK_ID', message: errorMessage },
+				error: { code: 'MISSING_SUBTASK_ID', message: errorMessage },
 				fromCache: false
 			};
 		}
 
 		if (!prompt) {
 			const errorMessage =
-				'No prompt specified. Please provide the information to append.';
-			logWrapper.error(errorMessage);
+				'No prompt specified. Please provide a prompt with information to add to the subtask.';
+			log.error(errorMessage);
 			return {
 				success: false,
 				error: { code: 'MISSING_PROMPT', message: errorMessage },
@@ -95,41 +84,51 @@ export async function updateSubtaskByIdDirect(args, log, context = {}) {
 
 		// Use the provided path
 		const tasksPath = tasksJsonPath;
+
+		// Get research flag
 		const useResearch = research === true;
 
 		log.info(
 			`Updating subtask with ID ${subtaskIdStr} with prompt "${prompt}" and research: ${useResearch}`
 		);
 
-		const wasSilent = isSilentMode();
-		if (!wasSilent) {
-			enableSilentMode();
-		}
-
 		try {
+			// Enable silent mode to prevent console logs from interfering with JSON response
+			enableSilentMode();
+
+			// Create the logger wrapper using the utility function
+			const mcpLog = createLogWrapper(log);
+
 			// Execute core updateSubtaskById function
+			// Pass both session and logWrapper as mcpLog to ensure outputFormat is 'json'
 			const updatedSubtask = await updateSubtaskById(
 				tasksPath,
 				subtaskIdStr,
 				prompt,
 				useResearch,
-				{ mcpLog: logWrapper, session, projectRoot },
-				'json'
+				{
+					session,
+					mcpLog
+				}
 			);
 
-			if (updatedSubtask === null) {
-				const message = `Subtask ${id} or its parent task not found.`;
-				logWrapper.error(message); // Log as error since it couldn't be found
+			// Restore normal logging
+			disableSilentMode();
+
+			// Handle the case where the subtask couldn't be updated (e.g., already marked as done)
+			if (!updatedSubtask) {
 				return {
 					success: false,
-					error: { code: 'SUBTASK_NOT_FOUND', message: message },
+					error: {
+						code: 'SUBTASK_UPDATE_FAILED',
+						message:
+							'Failed to update subtask. It may be marked as completed, or another error occurred.'
+					},
 					fromCache: false
 				};
 			}
 
-			// Subtask updated successfully
-			const successMessage = `Successfully updated subtask with ID ${subtaskIdStr}`;
-			logWrapper.success(successMessage);
+			// Return the updated subtask information
 			return {
 				success: true,
 				data: {
@@ -140,33 +139,23 @@ export async function updateSubtaskByIdDirect(args, log, context = {}) {
 					tasksPath,
 					useResearch
 				},
-				fromCache: false
+				fromCache: false // This operation always modifies state and should never be cached
 			};
 		} catch (error) {
-			logWrapper.error(`Error updating subtask by ID: ${error.message}`);
-			return {
-				success: false,
-				error: {
-					code: 'UPDATE_SUBTASK_CORE_ERROR',
-					message: error.message || 'Unknown error updating subtask'
-				},
-				fromCache: false
-			};
-		} finally {
-			if (!wasSilent && isSilentMode()) {
-				disableSilentMode();
-			}
+			// Make sure to restore normal logging even if there's an error
+			disableSilentMode();
+			throw error; // Rethrow to be caught by outer catch block
 		}
 	} catch (error) {
-		logWrapper.error(
-			`Setup error in updateSubtaskByIdDirect: ${error.message}`
-		);
-		if (isSilentMode()) disableSilentMode();
+		// Ensure silent mode is disabled
+		disableSilentMode();
+
+		log.error(`Error updating subtask by ID: ${error.message}`);
 		return {
 			success: false,
 			error: {
-				code: 'DIRECT_FUNCTION_SETUP_ERROR',
-				message: error.message || 'Unknown setup error'
+				code: 'UPDATE_SUBTASK_ERROR',
+				message: error.message || 'Unknown error updating subtask'
 			},
 			fromCache: false
 		};

mcp-server/src/core/direct-functions/update-task-by-id.js

@@ -6,40 +6,30 @@
 import { updateTaskById } from '../../../../scripts/modules/task-manager.js';
 import {
 	enableSilentMode,
-	disableSilentMode,
-	isSilentMode
+	disableSilentMode
 } from '../../../../scripts/modules/utils.js';
 import { createLogWrapper } from '../../tools/utils.js';
 
 /**
  * Direct function wrapper for updateTaskById with error handling.
  *
- * @param {Object} args - Command arguments containing id, prompt, useResearch, tasksJsonPath, and projectRoot.
- * @param {string} args.tasksJsonPath - Explicit path to the tasks.json file.
- * @param {string} args.id - Task ID (or subtask ID like "1.2").
- * @param {string} args.prompt - New information/context prompt.
- * @param {boolean} [args.research] - Whether to use research role.
- * @param {string} [args.projectRoot] - Project root path.
+ * @param {Object} args - Command arguments containing id, prompt, useResearch and tasksJsonPath.
  * @param {Object} log - Logger object.
  * @param {Object} context - Context object containing session data.
  * @returns {Promise<Object>} - Result object with success status and data/error information.
  */
 export async function updateTaskByIdDirect(args, log, context = {}) {
-	const { session } = context;
-	// Destructure expected args, including projectRoot
-	const { tasksJsonPath, id, prompt, research, projectRoot } = args;
-
-	const logWrapper = createLogWrapper(log);
+	const { session } = context; // Only extract session, not reportProgress
+	// Destructure expected args, including the resolved tasksJsonPath
+	const { tasksJsonPath, id, prompt, research } = args;
 
 	try {
-		logWrapper.info(
-			`Updating task by ID via direct function. ID: ${id}, ProjectRoot: ${projectRoot}`
-		);
+		log.info(`Updating task with args: ${JSON.stringify(args)}`);
 
 		// Check if tasksJsonPath was provided
 		if (!tasksJsonPath) {
 			const errorMessage = 'tasksJsonPath is required but was not provided.';
-			logWrapper.error(errorMessage);
+			log.error(errorMessage);
 			return {
 				success: false,
 				error: { code: 'MISSING_ARGUMENT', message: errorMessage },
@@ -51,7 +41,7 @@ export async function updateTaskByIdDirect(args, log, context = {}) {
 		if (!id) {
 			const errorMessage =
 				'No task ID specified. Please provide a task ID to update.';
-			logWrapper.error(errorMessage);
+			log.error(errorMessage);
 			return {
 				success: false,
 				error: { code: 'MISSING_TASK_ID', message: errorMessage },
@@ -62,7 +52,7 @@ export async function updateTaskByIdDirect(args, log, context = {}) {
 		if (!prompt) {
 			const errorMessage =
 				'No prompt specified. Please provide a prompt with new information for the task update.';
-			logWrapper.error(errorMessage);
+			log.error(errorMessage);
 			return {
 				success: false,
 				error: { code: 'MISSING_PROMPT', message: errorMessage },
@@ -81,7 +71,7 @@ export async function updateTaskByIdDirect(args, log, context = {}) {
 				taskId = parseInt(id, 10);
 				if (isNaN(taskId)) {
 					const errorMessage = `Invalid task ID: ${id}. Task ID must be a positive integer or subtask ID (e.g., "5.2").`;
-					logWrapper.error(errorMessage);
+					log.error(errorMessage);
 					return {
 						success: false,
 						error: { code: 'INVALID_TASK_ID', message: errorMessage },
@@ -99,80 +89,66 @@ export async function updateTaskByIdDirect(args, log, context = {}) {
 		// Get research flag
 		const useResearch = research === true;
 
-		logWrapper.info(
+		log.info(
 			`Updating task with ID ${taskId} with prompt "${prompt}" and research: ${useResearch}`
 		);
 
-		const wasSilent = isSilentMode();
-		if (!wasSilent) {
-			enableSilentMode();
-		}
-
 		try {
+			// Enable silent mode to prevent console logs from interfering with JSON response
+			enableSilentMode();
+
+			// Create the logger wrapper using the utility function
+			const mcpLog = createLogWrapper(log);
+
 			// Execute core updateTaskById function with proper parameters
-			const updatedTask = await updateTaskById(
+			await updateTaskById(
 				tasksPath,
 				taskId,
 				prompt,
 				useResearch,
 				{
-					mcpLog: logWrapper,
-					session,
-					projectRoot
+					mcpLog, // Pass the wrapped logger
+					session
 				},
 				'json'
 			);
 
-			// Check if the core function indicated the task wasn't updated (e.g., status was 'done')
-			if (updatedTask === null) {
-				// Core function logs the reason, just return success with info
-				const message = `Task ${taskId} was not updated (likely already completed).`;
-				logWrapper.info(message);
-				return {
-					success: true,
-					data: { message: message, taskId: taskId, updated: false },
-					fromCache: false
-				};
-			}
-
-			// Task was updated successfully
-			const successMessage = `Successfully updated task with ID ${taskId} based on the prompt`;
-			logWrapper.success(successMessage);
+			// Since updateTaskById doesn't return a value but modifies the tasks file,
+			// we'll return a success message
 			return {
 				success: true,
 				data: {
-					message: successMessage,
-					taskId: taskId,
-					tasksPath: tasksPath,
-					useResearch: useResearch,
-					updated: true,
-					updatedTask: updatedTask
+					message: `Successfully updated task with ID ${taskId} based on the prompt`,
+					taskId,
+					tasksPath: tasksPath, // Return the used path
+					useResearch
 				},
-				fromCache: false
+				fromCache: false // This operation always modifies state and should never be cached
 			};
 		} catch (error) {
-			logWrapper.error(`Error updating task by ID: ${error.message}`);
+			log.error(`Error updating task by ID: ${error.message}`);
 			return {
 				success: false,
 				error: {
-					code: 'UPDATE_TASK_CORE_ERROR',
+					code: 'UPDATE_TASK_ERROR',
 					message: error.message || 'Unknown error updating task'
 				},
 				fromCache: false
 			};
 		} finally {
-			if (!wasSilent && isSilentMode()) {
-				disableSilentMode();
-			}
+			// Make sure to restore normal logging even if there's an error
+			disableSilentMode();
 		}
 	} catch (error) {
-		logWrapper.error(`Setup error in updateTaskByIdDirect: ${error.message}`);
-		if (isSilentMode()) disableSilentMode();
+		// Ensure silent mode is disabled
+		disableSilentMode();
+
+		log.error(`Error updating task by ID: ${error.message}`);
 		return {
 			success: false,
 			error: {
-				code: 'DIRECT_FUNCTION_SETUP_ERROR',
-				message: error.message || 'Unknown setup error'
+				code: 'UPDATE_TASK_ERROR',
+				message: error.message || 'Unknown error updating task'
 			},
 			fromCache: false
 		};

mcp-server/src/core/direct-functions/update-tasks.js

@@ -1,122 +1,128 @@
 /**
  * update-tasks.js
- * Direct function implementation for updating tasks based on new context
+ * Direct function implementation for updating tasks based on new context/prompt
  */
 
-import path from 'path';
 import { updateTasks } from '../../../../scripts/modules/task-manager.js';
+import {
+	enableSilentMode,
+	disableSilentMode
+} from '../../../../scripts/modules/utils.js';
 import { createLogWrapper } from '../../tools/utils.js';
 
 /**
- * Direct function wrapper for updating tasks based on new context.
+ * Direct function wrapper for updating tasks based on new context/prompt.
  *
- * @param {Object} args - Command arguments containing projectRoot, from, prompt, research options.
+ * @param {Object} args - Command arguments containing from, prompt, research and tasksJsonPath.
  * @param {Object} log - Logger object.
  * @param {Object} context - Context object containing session data.
  * @returns {Promise<Object>} - Result object with success status and data/error information.
  */
 export async function updateTasksDirect(args, log, context = {}) {
-	const { session } = context;
-	const { from, prompt, research, file: fileArg, projectRoot } = args;
+	const { session } = context; // Extract session
+	const { tasksJsonPath, from, prompt, research } = args;
 
 	// Create the standard logger wrapper
-	const logWrapper = createLogWrapper(log);
+	const logWrapper = {
+		info: (message, ...args) => log.info(message, ...args),
+		warn: (message, ...args) => log.warn(message, ...args),
+		error: (message, ...args) => log.error(message, ...args),
+		debug: (message, ...args) => log.debug && log.debug(message, ...args),
+		success: (message, ...args) => log.info(message, ...args)
+	};
 
-	// --- Input Validation ---
-	if (!projectRoot) {
-		logWrapper.error('updateTasksDirect requires a projectRoot argument.');
+	// --- Input Validation (Keep existing checks) ---
+	if (!tasksJsonPath) {
+		log.error('updateTasksDirect called without tasksJsonPath');
 		return {
 			success: false,
-			error: {
-				code: 'MISSING_ARGUMENT',
-				message: 'projectRoot is required.'
-			}
+			error: { code: 'MISSING_ARGUMENT', message: 'tasksJsonPath is required' },
+			fromCache: false
+		};
+	}
+	if (args.id !== undefined && from === undefined) {
+		// Keep 'from' vs 'id' check
+		const errorMessage =
+			"Use 'from' parameter, not 'id', or use 'update_task' tool.";
+		log.error(errorMessage);
+		return {
+			success: false,
+			error: { code: 'PARAMETER_MISMATCH', message: errorMessage },
+			fromCache: false
 		};
 	}
-
 	if (!from) {
-		logWrapper.error('updateTasksDirect called without from ID');
+		log.error('Missing from ID.');
 		return {
 			success: false,
-			error: {
-				code: 'MISSING_ARGUMENT',
-				message: 'Starting task ID (from) is required'
-			}
+			error: { code: 'MISSING_FROM_ID', message: 'No from ID specified.' },
+			fromCache: false
 		};
 	}
-
 	if (!prompt) {
-		logWrapper.error('updateTasksDirect called without prompt');
+		log.error('Missing prompt.');
+		return {
+			success: false,
+			error: { code: 'MISSING_PROMPT', message: 'No prompt specified.' },
+			fromCache: false
+		};
+	}
+	let fromId;
+	try {
+		fromId = parseInt(from, 10);
+		if (isNaN(fromId) || fromId <= 0) throw new Error();
+	} catch {
+		log.error(`Invalid from ID: ${from}`);
 		return {
 			success: false,
 			error: {
-				code: 'MISSING_ARGUMENT',
-				message: 'Update prompt is required'
-			}
+				code: 'INVALID_FROM_ID',
+				message: `Invalid from ID: ${from}. Must be a positive integer.`
+			},
+			fromCache: false
 		};
 	}
+	const useResearch = research === true;
+	// --- End Input Validation ---
 
-	// Resolve tasks file path
-	const tasksFile = fileArg
-		? path.resolve(projectRoot, fileArg)
-		: path.resolve(projectRoot, 'tasks', 'tasks.json');
-
-	logWrapper.info(
-		`Updating tasks via direct function. From: ${from}, Research: ${research}, File: ${tasksFile}, ProjectRoot: ${projectRoot}`
-	);
+	log.info(`Updating tasks from ID ${fromId}. Research: ${useResearch}`);
 
 	enableSilentMode(); // Enable silent mode
 	try {
-		// Call the core updateTasks function
-		const result = await updateTasks(
-			tasksFile,
-			from,
+		// Create logger wrapper using the utility
+		const mcpLog = createLogWrapper(log);
+
+		// Execute core updateTasks function, passing session context
+		await updateTasks(
+			tasksJsonPath,
+			fromId,
 			prompt,
-			research,
-			{
-				session,
-				mcpLog: logWrapper,
-				projectRoot
-			},
-			'json'
+			useResearch,
+			// Pass context with logger wrapper and session
+			{ mcpLog, session },
+			'json' // Explicitly request JSON format for MCP
 		);
 
-		// updateTasks returns { success: true, updatedTasks: [...] } on success
-		if (result && result.success && Array.isArray(result.updatedTasks)) {
-			logWrapper.success(
-				`Successfully updated ${result.updatedTasks.length} tasks.`
-			);
-			return {
-				success: true,
-				data: {
-					message: `Successfully updated ${result.updatedTasks.length} tasks.`,
-					tasksFile,
-					updatedCount: result.updatedTasks.length
-				}
-			};
-		} else {
-			// Handle case where core function didn't return expected success structure
-			logWrapper.error(
-				'Core updateTasks function did not return a successful structure.'
-			);
-			return {
-				success: false,
-				error: {
-					code: 'CORE_FUNCTION_ERROR',
-					message:
-						result?.message ||
-						'Core function failed to update tasks or returned unexpected result.'
-				}
-			};
-		}
+		// Since updateTasks modifies file and doesn't return data, create success message
+		return {
+			success: true,
+			data: {
+				message: `Successfully initiated update for tasks from ID ${fromId} based on the prompt.`,
+				fromId,
+				tasksPath: tasksJsonPath,
+				useResearch
+			},
+			fromCache: false // Modifies state
+		};
 	} catch (error) {
-		logWrapper.error(`Error executing core updateTasks: ${error.message}`);
+		log.error(`Error executing core updateTasks: ${error.message}`);
 		return {
 			success: false,
 			error: {
 				code: 'UPDATE_TASKS_CORE_ERROR',
 				message: error.message || 'Unknown error updating tasks'
-			}
+			},
+			fromCache: false
 		};
 	} finally {
 		disableSilentMode(); // Ensure silent mode is disabled

mcp-server/src/core/task-master-core.js

@@ -28,7 +28,7 @@ import { fixDependenciesDirect } from './direct-functions/fix-dependencies.js';
 import { complexityReportDirect } from './direct-functions/complexity-report.js';
 import { addDependencyDirect } from './direct-functions/add-dependency.js';
 import { removeTaskDirect } from './direct-functions/remove-task.js';
-import { initializeProjectDirect } from './direct-functions/initialize-project.js';
+import { initializeProjectDirect } from './direct-functions/initialize-project-direct.js';
 import { modelsDirect } from './direct-functions/models.js';
 
 // Re-export utility functions

mcp-server/src/tools/add-dependency.js

@@ -7,8 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	getProjectRootFromSession,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { addDependencyDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -36,16 +35,28 @@ export function registerAddDependencyTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(
 					`Adding dependency for task ${args.id} to depend on ${args.dependsOn}`
 				);
 
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
@@ -81,6 +92,6 @@ export function registerAddDependencyTool(server) {
 				log.error(`Error in addDependency tool: ${error.message}`);
 				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/add-subtask.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { addSubtaskDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -60,15 +60,24 @@ export function registerAddSubtaskTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Adding subtask with args: ${JSON.stringify(args)}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
@@ -104,6 +113,6 @@ export function registerAddSubtaskTool(server) {
 				log.error(`Error in addSubtask tool: ${error.message}`);
 				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/add-task.js

@@ -6,8 +6,8 @@
 import { z } from 'zod';
 import {
 	createErrorResponse,
-	handleApiResult,
-	withNormalizedProjectRoot
+	withProjectContext,
+	handleApiResult
 } from './utils.js';
 import { addTaskDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -63,11 +63,13 @@ export function registerAddTaskTool(server) {
 				.optional()
 				.describe('Whether to use research capabilities for task creation')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: withProjectContext(async (args, { log, session }) => {
 			try {
 				log.info(`Starting add-task with args: ${JSON.stringify(args)}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Note: projectRoot is now guaranteed to be normalized by withProjectContext
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
@@ -81,10 +83,12 @@ export function registerAddTaskTool(server) {
 					);
 				}
 
-				// Call the direct functionP
+				// Call the direct function
 				const result = await addTaskDirect(
 					{
+						// Pass the explicitly resolved path
 						tasksJsonPath: tasksJsonPath,
+						// Pass other relevant args
 						prompt: args.prompt,
 						title: args.title,
 						description: args.description,
@@ -92,13 +96,13 @@ export function registerAddTaskTool(server) {
 						testStrategy: args.testStrategy,
 						dependencies: args.dependencies,
 						priority: args.priority,
-						research: args.research,
-						projectRoot: args.projectRoot
+						research: args.research
 					},
 					log,
 					{ session }
 				);
 
+				// Return the result
 				return handleApiResult(result, log);
 			} catch (error) {
 				log.error(`Error in add-task tool: ${error.message}`);

mcp-server/src/tools/analyze.js

@@ -4,128 +4,121 @@
  */
 
 import { z } from 'zod';
-import path from 'path';
-import fs from 'fs'; // Import fs for directory check/creation
-import {
-	handleApiResult,
-	createErrorResponse,
-	withNormalizedProjectRoot
-} from './utils.js';
-import { analyzeTaskComplexityDirect } from '../core/task-master-core.js'; // Assuming core functions are exported via task-master-core.js
+import { handleApiResult, createErrorResponse } from './utils.js';
+import { analyzeTaskComplexityDirect } from '../core/direct-functions/analyze-task-complexity.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
+import path from 'path';
+import fs from 'fs';
 
 /**
- * Register the analyze_project_complexity tool
+ * Register the analyze tool with the MCP server
  * @param {Object} server - FastMCP server instance
  */
-export function registerAnalyzeProjectComplexityTool(server) {
+export function registerAnalyzeTool(server) {
 	server.addTool({
 		name: 'analyze_project_complexity',
 		description:
-			'Analyze task complexity and generate expansion recommendations.',
+			'Analyze task complexity and generate expansion recommendations',
 		parameters: z.object({
-			threshold: z.coerce // Use coerce for number conversion from string if needed
-				.number()
-				.int()
-				.min(1)
-				.max(10)
-				.optional()
-				.default(5) // Default threshold
-				.describe('Complexity score threshold (1-10) to recommend expansion.'),
-			research: z
-				.boolean()
-				.optional()
-				.default(false)
-				.describe('Use Perplexity AI for research-backed analysis.'),
 			output: z
 				.string()
 				.optional()
 				.describe(
-					'Output file path relative to project root (default: scripts/task-complexity-report.json).'
+					'Output file path relative to project root (default: scripts/task-complexity-report.json)'
+				),
+			threshold: z.coerce
+				.number()
+				.min(1)
+				.max(10)
+				.optional()
+				.describe(
+					'Minimum complexity score to recommend expansion (1-10) (default: 5)'
 				),
 			file: z
 				.string()
 				.optional()
 				.describe(
-					'Path to the tasks file relative to project root (default: tasks/tasks.json).'
+					'Absolute path to the tasks file in the /tasks folder inside the project root (default: tasks/tasks.json)'
 				),
+			research: z
+				.boolean()
+				.optional()
+				.default(false)
+				.describe('Use research role for complexity analysis'),
 			projectRoot: z
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
-			const toolName = 'analyze_project_complexity'; // Define tool name for logging
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(
-					`Executing ${toolName} tool with args: ${JSON.stringify(args)}`
+					`Executing analyze_project_complexity tool with args: ${JSON.stringify(args)}`
 				);
 
+				const rootFolder = args.projectRoot;
+				if (!rootFolder) {
+					return createErrorResponse('projectRoot is required.');
+				}
+				if (!path.isAbsolute(rootFolder)) {
+					return createErrorResponse('projectRoot must be an absolute path.');
+				}
+
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
-					log.info(`${toolName}: Resolved tasks path: ${tasksJsonPath}`);
 				} catch (error) {
-					log.error(`${toolName}: Error finding tasks.json: ${error.message}`);
+					log.error(`Error finding tasks.json: ${error.message}`);
 					return createErrorResponse(
-						`Failed to find tasks.json within project root '${args.projectRoot}': ${error.message}`
+						`Failed to find tasks.json within project root '${rootFolder}': ${error.message}`
 					);
 				}
 
 				const outputPath = args.output
-					? path.resolve(args.projectRoot, args.output)
-					: path.resolve(
-							args.projectRoot,
-							'scripts',
-							'task-complexity-report.json'
-						);
+					? path.resolve(rootFolder, args.output)
+					: path.resolve(rootFolder, 'scripts', 'task-complexity-report.json');
 
-				log.info(`${toolName}: Report output path: ${outputPath}`);
-
-				// Ensure output directory exists
 				const outputDir = path.dirname(outputPath);
 				try {
 					if (!fs.existsSync(outputDir)) {
 						fs.mkdirSync(outputDir, { recursive: true });
-						log.info(`${toolName}: Created output directory: ${outputDir}`);
+						log.info(`Created output directory: ${outputDir}`);
 					}
 				} catch (dirError) {
 					log.error(
-						`${toolName}: Failed to create output directory ${outputDir}: ${dirError.message}`
+						`Failed to create output directory ${outputDir}: ${dirError.message}`
 					);
 					return createErrorResponse(
 						`Failed to create output directory: ${dirError.message}`
 					);
 				}
 
-				// 3. Call Direct Function - Pass projectRoot in first arg object
 				const result = await analyzeTaskComplexityDirect(
 					{
 						tasksJsonPath: tasksJsonPath,
 						outputPath: outputPath,
 						threshold: args.threshold,
-						research: args.research,
-						projectRoot: args.projectRoot
+						research: args.research
 					},
 					log,
 					{ session }
 				);
 
-				// 4. Handle Result
-				log.info(
-					`${toolName}: Direct function result: success=${result.success}`
-				);
+				if (result.success) {
+					log.info(`Tool analyze_project_complexity finished successfully.`);
+				} else {
+					log.error(
+						`Tool analyze_project_complexity failed: ${result.error?.message || 'Unknown error'}`
+					);
+				}
+
 				return handleApiResult(result, log, 'Error analyzing task complexity');
 			} catch (error) {
-				log.error(
-					`Critical error in ${toolName} tool execute: ${error.message}`
-				);
-				return createErrorResponse(
-					`Internal tool error (${toolName}): ${error.message}`
-				);
+				log.error(`Critical error in analyze tool execute: ${error.message}`);
+				return createErrorResponse(`Internal tool error: ${error.message}`);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/clear-subtasks.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { clearSubtasksDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -41,15 +41,26 @@ export function registerClearSubtasksTool(server) {
 				message: "Either 'id' or 'all' parameter must be provided",
 				path: ['id', 'all']
 			}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Clearing subtasks with args: ${JSON.stringify(args)}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
@@ -61,11 +72,14 @@ export function registerClearSubtasksTool(server) {
 
 				const result = await clearSubtasksDirect(
 					{
+						// Pass the explicitly resolved path
 						tasksJsonPath: tasksJsonPath,
+						// Pass other relevant args
 						id: args.id,
 						all: args.all
 					},
 					log
+					// Remove context object as clearSubtasksDirect likely doesn't need session/reportProgress
 				);
 
 				if (result.success) {
@@ -79,6 +93,6 @@ export function registerClearSubtasksTool(server) {
 				log.error(`Error in clearSubtasks tool: ${error.message}`);
 				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

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

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { complexityReportDirect } from '../core/task-master-core.js';
 import path from 'path';
@@ -31,24 +31,34 @@ export function registerComplexityReportTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(
 					`Getting complexity report with args: ${JSON.stringify(args)}`
 				);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Resolve the path to the complexity report file
+				// Default to scripts/task-complexity-report.json relative to root
 				const reportPath = args.file
-					? path.resolve(args.projectRoot, args.file)
-					: path.resolve(
-							args.projectRoot,
-							'scripts',
-							'task-complexity-report.json'
-						);
+					? path.resolve(rootFolder, args.file)
+					: path.resolve(rootFolder, 'scripts', 'task-complexity-report.json');
 
 				const result = await complexityReportDirect(
 					{
+						// Pass the explicitly resolved path
 						reportPath: reportPath
+						// No other args specific to this tool
 					},
 					log
 				);
@@ -74,6 +84,6 @@ export function registerComplexityReportTool(server) {
 					`Failed to retrieve complexity report: ${error.message}`
 				);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/expand-all.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { expandAllTasksDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -59,16 +59,25 @@ export function registerExpandAllTool(server) {
 					'Absolute path to the project root directory (derived from session if possible)'
 				)
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(
 					`Tool expand_all execution started with args: ${JSON.stringify(args)}`
 				);
 
+				const rootFolder = getProjectRootFromSession(session, log);
+				if (!rootFolder) {
+					log.error('Could not determine project root from session.');
+					return createErrorResponse(
+						'Could not determine project root from session.'
+					);
+				}
+				log.info(`Project root determined: ${rootFolder}`);
+
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 					log.info(`Resolved tasks.json path: ${tasksJsonPath}`);
@@ -85,8 +94,7 @@ export function registerExpandAllTool(server) {
 						num: args.num,
 						research: args.research,
 						prompt: args.prompt,
-						force: args.force,
-						projectRoot: args.projectRoot
+						force: args.force
 					},
 					log,
 					{ session }
@@ -104,6 +112,6 @@ export function registerExpandAllTool(server) {
 					`An unexpected error occurred: ${error.message}`
 				);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/expand-task.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { expandTaskDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -47,15 +47,28 @@ export function registerExpandTaskTool(server) {
 				.default(false)
 				.describe('Force expansion even if subtasks exist')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Starting expand-task with args: ${JSON.stringify(args)}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				log.info(`Project root resolved to: ${rootFolder}`);
+
+				// Resolve the path to tasks.json using the utility
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
@@ -65,25 +78,29 @@ export function registerExpandTaskTool(server) {
 					);
 				}
 
+				// Call direct function with only session in the context, not reportProgress
+				// Use the pattern recommended in the MCP guidelines
 				const result = await expandTaskDirect(
 					{
+						// Pass the explicitly resolved path
 						tasksJsonPath: tasksJsonPath,
+						// Pass other relevant args
 						id: args.id,
 						num: args.num,
 						research: args.research,
 						prompt: args.prompt,
-						force: args.force,
-						projectRoot: args.projectRoot
+						force: args.force // Need to add force to parameters
 					},
 					log,
 					{ session }
-				);
+				); // Only pass session, NOT reportProgress
 
+				// Return the result
 				return handleApiResult(result, log, 'Error expanding task');
 			} catch (error) {
-				log.error(`Error in expand-task tool: ${error.message}`);
+				log.error(`Error in expand task tool: ${error.message}`);
 				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/fix-dependencies.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { fixDependenciesDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -26,15 +26,24 @@ export function registerFixDependenciesTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Fixing dependencies with args: ${JSON.stringify(args)}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
@@ -62,6 +71,6 @@ export function registerFixDependenciesTool(server) {
 				log.error(`Error in fixDependencies tool: ${error.message}`);
 				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/generate.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { generateTaskFilesDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -32,15 +32,26 @@ export function registerGenerateTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Generating task files with args: ${JSON.stringify(args)}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
@@ -50,14 +61,17 @@ export function registerGenerateTool(server) {
 					);
 				}
 
+				// Determine output directory: use explicit arg or default to tasks.json directory
 				const outputDir = args.output
-					? path.resolve(args.projectRoot, args.output)
+					? path.resolve(rootFolder, args.output) // Resolve relative to root if needed
 					: path.dirname(tasksJsonPath);
 
 				const result = await generateTaskFilesDirect(
 					{
+						// Pass the explicitly resolved paths
 						tasksJsonPath: tasksJsonPath,
 						outputDir: outputDir
+						// No other args specific to this tool
 					},
 					log
 				);
@@ -75,6 +89,6 @@ export function registerGenerateTool(server) {
 				log.error(`Error in generate tool: ${error.message}`);
 				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/get-task.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { showTaskDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -21,10 +21,8 @@ function processTaskResponse(data) {
 	if (!data) return data;
 
 	// If we have the expected structure with task and allTasks
-	if (typeof data === 'object' && data !== null && data.id && data.title) {
-		// If the data itself looks like the task object, return it
-		return data;
-	} else if (data.task) {
+	if (data.task) {
+		// Return only the task object, removing the allTasks array
 		return data.task;
 	}
 
@@ -46,33 +44,44 @@ export function registerShowTaskTool(server) {
 				.string()
 				.optional()
 				.describe("Filter subtasks by status (e.g., 'pending', 'done')"),
-			file: z
-				.string()
-				.optional()
-				.describe('Path to the tasks file relative to project root'),
+			file: z.string().optional().describe('Absolute path to the tasks file'),
 			projectRoot: z
 				.string()
-				.optional()
-				.describe(
-					'Absolute path to the project root directory (Optional, usually from session)'
-				)
+				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log }) => {
-			const { id, file, status, projectRoot } = args;
+		execute: async (args, { log, session }) => {
+			// Log the session right at the start of execute
+			log.info(
+				`Session object received in execute: ${JSON.stringify(session)}`
+			); // Use JSON.stringify for better visibility
 
 			try {
 				log.info(
-					`Getting task details for ID: ${id}${status ? ` (filtering subtasks by status: ${status})` : ''} in root: ${projectRoot}`
+					`Getting task details for ID: ${args.id}${args.status ? ` (filtering subtasks by status: ${args.status})` : ''}`
 				);
 
-				// Resolve the path to tasks.json using the NORMALIZED projectRoot from args
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				log.info(`Attempting to use project root: ${rootFolder}`); // Log the final resolved root
+
+				log.info(`Root folder: ${rootFolder}`); // Log the final resolved root
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: projectRoot, file: file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
-					log.info(`Resolved tasks path: ${tasksJsonPath}`);
 				} catch (error) {
 					log.error(`Error finding tasks.json: ${error.message}`);
 					return createErrorResponse(
@@ -80,13 +89,13 @@ export function registerShowTaskTool(server) {
 					);
 				}
 
-				// Call the direct function, passing the normalized projectRoot
+				log.info(`Attempting to use tasks file path: ${tasksJsonPath}`);
+
 				const result = await showTaskDirect(
 					{
 						tasksJsonPath: tasksJsonPath,
-						id: id,
-						status: status,
-						projectRoot: projectRoot
+						id: args.id,
+						status: args.status
 					},
 					log
 				);
@@ -99,7 +108,7 @@ export function registerShowTaskTool(server) {
 					log.error(`Failed to get task: ${result.error.message}`);
 				}
 
-				// Use our custom processor function
+				// Use our custom processor function to remove allTasks from the response
 				return handleApiResult(
 					result,
 					log,
@@ -107,9 +116,9 @@ export function registerShowTaskTool(server) {
 					processTaskResponse
 				);
 			} catch (error) {
-				log.error(`Error in get-task tool: ${error.message}\n${error.stack}`);
+				log.error(`Error in get-task tool: ${error.message}\n${error.stack}`); // Add stack trace
 				return createErrorResponse(`Failed to get task: ${error.message}`);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/get-tasks.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	createErrorResponse,
 	handleApiResult,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { listTasksDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -42,19 +42,31 @@ export function registerListTasksTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Getting tasks with filters: ${JSON.stringify(args)}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
 					log.error(`Error finding tasks.json: ${error.message}`);
+					// Use the error message from findTasksJsonPath for better context
 					return createErrorResponse(
 						`Failed to find tasks.json: ${error.message}`
 					);
@@ -77,7 +89,7 @@ export function registerListTasksTool(server) {
 				log.error(`Error getting tasks: ${error.message}`);
 				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }
 

mcp-server/src/tools/index.js

@@ -17,7 +17,7 @@ import { registerExpandTaskTool } from './expand-task.js';
 import { registerAddTaskTool } from './add-task.js';
 import { registerAddSubtaskTool } from './add-subtask.js';
 import { registerRemoveSubtaskTool } from './remove-subtask.js';
-import { registerAnalyzeProjectComplexityTool } from './analyze.js';
+import { registerAnalyzeTool } from './analyze.js';
 import { registerClearSubtasksTool } from './clear-subtasks.js';
 import { registerExpandAllTool } from './expand-all.js';
 import { registerRemoveDependencyTool } from './remove-dependency.js';
@@ -63,7 +63,7 @@ export function registerTaskMasterTools(server) {
 		registerClearSubtasksTool(server);
 
 		// Group 5: Task Analysis & Expansion
-		registerAnalyzeProjectComplexityTool(server);
+		registerAnalyzeTool(server);
 		registerExpandTaskTool(server);
 		registerExpandAllTool(server);
 

mcp-server/src/tools/initialize-project.js

@@ -1,9 +1,5 @@
 import { z } from 'zod';
-import {
-	createErrorResponse,
-	handleApiResult,
-	withNormalizedProjectRoot
-} from './utils.js';
+import { createErrorResponse, handleApiResult } from './utils.js';
 import { initializeProjectDirect } from '../core/task-master-core.js';
 
 export function registerInitializeProjectTool(server) {
@@ -37,10 +33,19 @@ export function registerInitializeProjectTool(server) {
 					'The root directory for the project. ALWAYS SET THIS TO THE PROJECT ROOT DIRECTORY. IF NOT SET, THE TOOL WILL NOT WORK.'
 				)
 		}),
-		execute: withNormalizedProjectRoot(async (args, context) => {
+		execute: async (args, context) => {
 			const { log } = context;
 			const session = context.session;
 
+			log.info(
+				'>>> Full Context Received by Tool:',
+				JSON.stringify(context, null, 2)
+			);
+			log.info(`Context received in tool function: ${context}`);
+			log.info(
+				`Session received in tool function: ${session ? session : 'undefined'}`
+			);
+
 			try {
 				log.info(
 					`Executing initialize_project tool with args: ${JSON.stringify(args)}`
@@ -54,6 +59,6 @@ export function registerInitializeProjectTool(server) {
 				log.error(errorMessage, error);
 				return createErrorResponse(errorMessage, { details: error.stack });
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/models.js

@@ -5,9 +5,9 @@
 
 import { z } from 'zod';
 import {
+	getProjectRootFromSession,
 	handleApiResult,
-	createErrorResponse,
-	withNormalizedProjectRoot
+	createErrorResponse
 } from './utils.js';
 import { modelsDirect } from '../core/task-master-core.js';
 
@@ -42,9 +42,7 @@ export function registerModelsTool(server) {
 			listAvailableModels: z
 				.boolean()
 				.optional()
-				.describe(
-					'List all available models not currently in use. Input/output costs values are in dollars (3 is $3.00).'
-				),
+				.describe('List all available models not currently in use.'),
 			projectRoot: z
 				.string()
 				.optional()
@@ -58,22 +56,34 @@ export function registerModelsTool(server) {
 				.optional()
 				.describe('Indicates the set model ID is a custom Ollama model.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Starting models tool with args: ${JSON.stringify(args)}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Call the direct function
 				const result = await modelsDirect(
-					{ ...args, projectRoot: args.projectRoot },
+					{ ...args, projectRoot: rootFolder },
 					log,
 					{ session }
 				);
 
+				// Handle and return the result
 				return handleApiResult(result, log);
 			} catch (error) {
 				log.error(`Error in models tool: ${error.message}`);
 				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/next-task.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { nextTaskDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -27,15 +27,26 @@ export function registerNextTaskTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Finding next task with args: ${JSON.stringify(args)}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
@@ -47,7 +58,9 @@ export function registerNextTaskTool(server) {
 
 				const result = await nextTaskDirect(
 					{
+						// Pass the explicitly resolved path
 						tasksJsonPath: tasksJsonPath
+						// No other args specific to this tool
 					},
 					log
 				);
@@ -67,6 +80,6 @@ export function registerNextTaskTool(server) {
 				log.error(`Error in nextTask tool: ${error.message}`);
 				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/parse-prd.js

@@ -4,16 +4,16 @@
  */
 
 import { z } from 'zod';
-import path from 'path';
 import {
+	getProjectRootFromSession,
 	handleApiResult,
-	createErrorResponse,
-	withNormalizedProjectRoot
+	createErrorResponse
 } from './utils.js';
 import { parsePRDDirect } from '../core/task-master-core.js';
+import { resolveProjectPaths } from '../core/utils/path-utils.js';
 
 /**
- * Register the parse_prd tool
+ * Register the parsePRD tool with the MCP server
  * @param {Object} server - FastMCP server instance
  */
 export function registerParsePRDTool(server) {
@@ -42,50 +42,72 @@ export function registerParsePRDTool(server) {
 			force: z
 				.boolean()
 				.optional()
-				.default(false)
-				.describe('Overwrite existing output file without prompting.'),
+				.describe('Allow overwriting an existing tasks.json file.'),
 			append: z
 				.boolean()
 				.optional()
-				.default(false)
-				.describe('Append generated tasks to existing file.'),
+				.describe(
+					'Append new tasks to existing tasks.json instead of overwriting'
+				),
 			projectRoot: z
 				.string()
-				.describe('The directory of the project. Must be an absolute path.')
+				.describe('The directory of the project. Must be absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
-			const toolName = 'parse_prd';
+		execute: async (args, { log, session }) => {
 			try {
-				log.info(
-					`Executing ${toolName} tool with args: ${JSON.stringify(args)}`
+				log.info(`Parsing PRD with args: ${JSON.stringify(args)}`);
+
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Resolve input (PRD) and output (tasks.json) paths using the utility
+				const { projectRoot, prdPath, tasksJsonPath } = resolveProjectPaths(
+					rootFolder,
+					args,
+					log
 				);
 
-				// Call Direct Function - Pass relevant args including projectRoot
+				// Check if PRD path was found (resolveProjectPaths returns null if not found and not provided)
+				if (!prdPath) {
+					return createErrorResponse(
+						'No PRD document found or provided. Please ensure a PRD file exists (e.g., PRD.md) or provide a valid input file path.'
+					);
+				}
+
+				// Call the direct function with fully resolved paths
 				const result = await parsePRDDirect(
 					{
-						input: args.input,
-						output: args.output,
+						projectRoot: projectRoot,
+						input: prdPath,
+						output: tasksJsonPath,
 						numTasks: args.numTasks,
 						force: args.force,
-						append: args.append,
-						projectRoot: args.projectRoot
+						append: args.append
 					},
 					log,
 					{ session }
 				);
 
-				log.info(
-					`${toolName}: Direct function result: success=${result.success}`
-				);
+				if (result.success) {
+					log.info(`Successfully parsed PRD: ${result.data.message}`);
+				} else {
+					log.error(
+						`Failed to parse PRD: ${result.error?.message || 'Unknown error'}`
+					);
+				}
+
 				return handleApiResult(result, log, 'Error parsing PRD');
 			} catch (error) {
-				log.error(
-					`Critical error in ${toolName} tool execute: ${error.message}`
-				);
-				return createErrorResponse(
-					`Internal tool error (${toolName}): ${error.message}`
-				);
+				log.error(`Error in parse-prd tool: ${error.message}`);
+				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/remove-dependency.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { removeDependencyDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -33,17 +33,28 @@ export function registerRemoveDependencyTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(
 					`Removing dependency for task ${args.id} from ${args.dependsOn} with args: ${JSON.stringify(args)}`
 				);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
@@ -55,7 +66,9 @@ export function registerRemoveDependencyTool(server) {
 
 				const result = await removeDependencyDirect(
 					{
+						// Pass the explicitly resolved path
 						tasksJsonPath: tasksJsonPath,
+						// Pass other relevant args
 						id: args.id,
 						dependsOn: args.dependsOn
 					},
@@ -73,6 +86,6 @@ export function registerRemoveDependencyTool(server) {
 				log.error(`Error in removeDependency tool: ${error.message}`);
 				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/remove-subtask.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { removeSubtaskDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -46,15 +46,26 @@ export function registerRemoveSubtaskTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Removing subtask with args: ${JSON.stringify(args)}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
@@ -66,7 +77,9 @@ export function registerRemoveSubtaskTool(server) {
 
 				const result = await removeSubtaskDirect(
 					{
+						// Pass the explicitly resolved path
 						tasksJsonPath: tasksJsonPath,
+						// Pass other relevant args
 						id: args.id,
 						convert: args.convert,
 						skipGenerate: args.skipGenerate
@@ -85,6 +98,6 @@ export function registerRemoveSubtaskTool(server) {
 				log.error(`Error in removeSubtask tool: ${error.message}`);
 				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/remove-task.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { removeTaskDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -35,15 +35,28 @@ export function registerRemoveTaskTool(server) {
 				.optional()
 				.describe('Whether to skip confirmation prompt (default: false)')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Removing task(s) with ID(s): ${args.id}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				log.info(`Using project root: ${rootFolder}`);
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
@@ -55,6 +68,7 @@ export function registerRemoveTaskTool(server) {
 
 				log.info(`Using tasks file path: ${tasksJsonPath}`);
 
+				// Assume client has already handled confirmation if needed
 				const result = await removeTaskDirect(
 					{
 						tasksJsonPath: tasksJsonPath,
@@ -74,6 +88,6 @@ export function registerRemoveTaskTool(server) {
 				log.error(`Error in remove-task tool: ${error.message}`);
 				return createErrorResponse(`Failed to remove task: ${error.message}`);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/set-task-status.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { setTaskStatusDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -36,15 +36,26 @@ export function registerSetTaskStatusTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Setting status of task(s) ${args.id} to: ${args.status}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
@@ -54,15 +65,19 @@ export function registerSetTaskStatusTool(server) {
 					);
 				}
 
+				// Call the direct function with the resolved path
 				const result = await setTaskStatusDirect(
 					{
+						// Pass the explicitly resolved path
 						tasksJsonPath: tasksJsonPath,
+						// Pass other relevant args
 						id: args.id,
 						status: args.status
 					},
 					log
 				);
 
+				// Log the result
 				if (result.success) {
 					log.info(
 						`Successfully updated status for task(s) ${args.id} to "${args.status}": ${result.data.message}`
@@ -73,6 +88,7 @@ export function registerSetTaskStatusTool(server) {
 					);
 				}
 
+				// Format and return the result
 				return handleApiResult(result, log, 'Error setting task status');
 			} catch (error) {
 				log.error(`Error in setTaskStatus tool: ${error.message}`);
@@ -80,6 +96,6 @@ export function registerSetTaskStatusTool(server) {
 					`Error setting task status: ${error.message}`
 				);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/update-subtask.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { updateSubtaskByIdDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -37,19 +37,30 @@ export function registerUpdateSubtaskTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
-			const toolName = 'update_subtask';
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Updating subtask with args: ${JSON.stringify(args)}`);
 
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
-					log.error(`${toolName}: Error finding tasks.json: ${error.message}`);
+					log.error(`Error finding tasks.json: ${error.message}`);
 					return createErrorResponse(
 						`Failed to find tasks.json: ${error.message}`
 					);
@@ -57,11 +68,12 @@ export function registerUpdateSubtaskTool(server) {
 
 				const result = await updateSubtaskByIdDirect(
 					{
+						// Pass the explicitly resolved path
 						tasksJsonPath: tasksJsonPath,
+						// Pass other relevant args
 						id: args.id,
 						prompt: args.prompt,
-						research: args.research,
-						projectRoot: args.projectRoot
+						research: args.research
 					},
 					log,
 					{ session }
@@ -77,13 +89,9 @@ export function registerUpdateSubtaskTool(server) {
 
 				return handleApiResult(result, log, 'Error updating subtask');
 			} catch (error) {
-				log.error(
-					`Critical error in ${toolName} tool execute: ${error.message}`
-				);
-				return createErrorResponse(
-					`Internal tool error (${toolName}): ${error.message}`
-				);
+				log.error(`Error in update_subtask tool: ${error.message}`);
+				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/update-task.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { updateTaskByIdDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -23,7 +23,7 @@ export function registerUpdateTaskTool(server) {
 			'Updates a single task by ID with new information or context provided in the prompt.',
 		parameters: z.object({
 			id: z
-				.string() // ID can be number or string like "1.2"
+				.string()
 				.describe(
 					"ID of the task (e.g., '15') to update. Subtasks are supported using the update-subtask tool."
 				),
@@ -39,53 +39,61 @@ export function registerUpdateTaskTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
-			const toolName = 'update_task';
+		execute: async (args, { log, session }) => {
 			try {
-				log.info(
-					`Executing ${toolName} tool with args: ${JSON.stringify(args)}`
-				);
+				log.info(`Updating task with args: ${JSON.stringify(args)}`);
 
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				// Ensure project root was determined
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
+				// Resolve the path to tasks.json
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
-					log.info(`${toolName}: Resolved tasks path: ${tasksJsonPath}`);
 				} catch (error) {
-					log.error(`${toolName}: Error finding tasks.json: ${error.message}`);
+					log.error(`Error finding tasks.json: ${error.message}`);
 					return createErrorResponse(
 						`Failed to find tasks.json: ${error.message}`
 					);
 				}
 
-				// 3. Call Direct Function - Include projectRoot
 				const result = await updateTaskByIdDirect(
 					{
+						// Pass the explicitly resolved path
 						tasksJsonPath: tasksJsonPath,
+						// Pass other relevant args
 						id: args.id,
 						prompt: args.prompt,
-						research: args.research,
-						projectRoot: args.projectRoot
+						research: args.research
 					},
 					log,
 					{ session }
 				);
 
-				// 4. Handle Result
-				log.info(
-					`${toolName}: Direct function result: success=${result.success}`
-				);
+				if (result.success) {
+					log.info(`Successfully updated task with ID ${args.id}`);
+				} else {
+					log.error(
+						`Failed to update task: ${result.error?.message || 'Unknown error'}`
+					);
+				}
+
 				return handleApiResult(result, log, 'Error updating task');
 			} catch (error) {
-				log.error(
-					`Critical error in ${toolName} tool execute: ${error.message}`
-				);
-				return createErrorResponse(
-					`Internal tool error (${toolName}): ${error.message}`
-				);
+				log.error(`Error in update_task tool: ${error.message}`);
+				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/update.js

@@ -4,13 +4,10 @@
  */
 
 import { z } from 'zod';
-import {
-	handleApiResult,
-	createErrorResponse,
-	withNormalizedProjectRoot
-} from './utils.js';
+import { handleApiResult, createErrorResponse } from './utils.js';
 import { updateTasksDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
+import path from 'path';
 
 /**
  * Register the update tool with the MCP server
@@ -34,61 +31,58 @@ export function registerUpdateTool(server) {
 				.boolean()
 				.optional()
 				.describe('Use Perplexity AI for research-backed updates'),
-			file: z
-				.string()
-				.optional()
-				.describe('Path to the tasks file relative to project root'),
+			file: z.string().optional().describe('Absolute path to the tasks file'),
 			projectRoot: z
 				.string()
-				.optional()
-				.describe(
-					'The directory of the project. (Optional, usually from session)'
-				)
+				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
-			const toolName = 'update';
-			const { from, prompt, research, file, projectRoot } = args;
-
+		execute: async (args, { log, session }) => {
 			try {
-				log.info(
-					`Executing ${toolName} tool with normalized root: ${projectRoot}`
-				);
+				log.info(`Executing update tool with args: ${JSON.stringify(args)}`);
 
+				// 1. Get Project Root
+				const rootFolder = args.projectRoot;
+				if (!rootFolder || !path.isAbsolute(rootFolder)) {
+					return createErrorResponse(
+						'projectRoot is required and must be absolute.'
+					);
+				}
+				log.info(`Project root: ${rootFolder}`);
+
+				// 2. Resolve Path
 				let tasksJsonPath;
 				try {
-					tasksJsonPath = findTasksJsonPath({ projectRoot, file }, log);
-					log.info(`${toolName}: Resolved tasks path: ${tasksJsonPath}`);
+					tasksJsonPath = findTasksJsonPath(
+						{ projectRoot: rootFolder, file: args.file },
+						log
+					);
+					log.info(`Resolved tasks path: ${tasksJsonPath}`);
 				} catch (error) {
-					log.error(`${toolName}: Error finding tasks.json: ${error.message}`);
+					log.error(`Error finding tasks.json: ${error.message}`);
 					return createErrorResponse(
-						`Failed to find tasks.json within project root '${projectRoot}': ${error.message}`
+						`Failed to find tasks.json: ${error.message}`
 					);
 				}
 
+				// 3. Call Direct Function
 				const result = await updateTasksDirect(
 					{
 						tasksJsonPath: tasksJsonPath,
-						from: from,
-						prompt: prompt,
-						research: research,
-						projectRoot: projectRoot
+						from: args.from,
+						prompt: args.prompt,
+						research: args.research
 					},
 					log,
 					{ session }
 				);
 
-				log.info(
-					`${toolName}: Direct function result: success=${result.success}`
-				);
+				// 4. Handle Result
+				log.info(`updateTasksDirect result: success=${result.success}`);
 				return handleApiResult(result, log, 'Error updating tasks');
 			} catch (error) {
-				log.error(
-					`Critical error in ${toolName} tool execute: ${error.message}`
-				);
-				return createErrorResponse(
-					`Internal tool error (${toolName}): ${error.message}`
-				);
+				log.error(`Critical error in update tool execute: ${error.message}`);
+				return createErrorResponse(`Internal tool error: ${error.message}`);
 			}
-		})
+		}
 	});
 }

mcp-server/src/tools/utils.js

@@ -7,7 +7,7 @@ import { spawnSync } from 'child_process';
 import path from 'path';
 import fs from 'fs';
 import { contextManager } from '../core/context-manager.js'; // Import the singleton
-
+import { withSessionEnv } from '../core/utils/env-utils.js';
 // Import path utilities to ensure consistent path resolution
 import {
 	lastFoundProjectRoot,
@@ -83,10 +83,10 @@ function getProjectRoot(projectRootRaw, log) {
 }
 
 /**
- * Extracts and normalizes the project root path from the MCP session object.
- * @param {Object} session - The MCP session object.
- * @param {Object} log - The MCP logger object.
- * @returns {string|null} - The normalized absolute project root path or null if not found/invalid.
+ * Extracts the project root path from the FastMCP session object.
+ * @param {Object} session - The FastMCP session object.
+ * @param {Object} log - Logger object.
+ * @returns {string|null} - The absolute path to the project root, or null if not found.
  */
 function getProjectRootFromSession(session, log) {
 	try {
@@ -107,87 +107,68 @@ function getProjectRootFromSession(session, log) {
 			})}`
 		);
 
-		let rawRootPath = null;
-		let decodedPath = null;
-		let finalPath = null;
-
-		// Check primary location
-		if (session?.roots?.[0]?.uri) {
-			rawRootPath = session.roots[0].uri;
-			log.info(`Found raw root URI in session.roots[0].uri: ${rawRootPath}`);
-		}
-		// Check alternate location
-		else if (session?.roots?.roots?.[0]?.uri) {
-			rawRootPath = session.roots.roots[0].uri;
-			log.info(
-				`Found raw root URI in session.roots.roots[0].uri: ${rawRootPath}`
-			);
-		}
-
-		if (rawRootPath) {
-			// Decode URI and strip file:// protocol
-			decodedPath = rawRootPath.startsWith('file://')
-				? decodeURIComponent(rawRootPath.slice(7))
-				: rawRootPath; // Assume non-file URI is already decoded? Or decode anyway? Let's decode.
-			if (!rawRootPath.startsWith('file://')) {
-				decodedPath = decodeURIComponent(rawRootPath); // Decode even if no file://
-			}
-
-			// Handle potential Windows drive prefix after stripping protocol (e.g., /C:/...)
-			if (
-				decodedPath.startsWith('/') &&
-				/[A-Za-z]:/.test(decodedPath.substring(1, 3))
-			) {
-				decodedPath = decodedPath.substring(1); // Remove leading slash if it's like /C:/...
-			}
-
-			log.info(`Decoded path: ${decodedPath}`);
-
-			// Normalize slashes and resolve
-			const normalizedSlashes = decodedPath.replace(/\\/g, '/');
-			finalPath = path.resolve(normalizedSlashes); // Resolve to absolute path for current OS
-
-			log.info(`Normalized and resolved session path: ${finalPath}`);
-			return finalPath;
-		}
-
-		// Fallback Logic (remains the same)
-		log.warn('No project root URI found in session. Attempting fallbacks...');
+		// ALWAYS ensure we return a valid path for project root
 		const cwd = process.cwd();
 
-		// Fallback 1: Use server path deduction (Cursor IDE)
-		const serverPath = process.argv[1];
+		// If we have a session with roots array
+		if (session?.roots?.[0]?.uri) {
+			const rootUri = session.roots[0].uri;
+			log.info(`Found rootUri in session.roots[0].uri: ${rootUri}`);
+			const rootPath = rootUri.startsWith('file://')
+				? decodeURIComponent(rootUri.slice(7))
+				: rootUri;
+			log.info(`Decoded rootPath: ${rootPath}`);
+			return rootPath;
+		}
+
+		// If we have a session with roots.roots array (different structure)
+		if (session?.roots?.roots?.[0]?.uri) {
+			const rootUri = session.roots.roots[0].uri;
+			log.info(`Found rootUri in session.roots.roots[0].uri: ${rootUri}`);
+			const rootPath = rootUri.startsWith('file://')
+				? decodeURIComponent(rootUri.slice(7))
+				: rootUri;
+			log.info(`Decoded rootPath: ${rootPath}`);
+			return rootPath;
+		}
+
+		// Get the server's location and try to find project root -- this is a fallback necessary in Cursor IDE
+		const serverPath = process.argv[1]; // This should be the path to server.js, which is in mcp-server/
 		if (serverPath && serverPath.includes('mcp-server')) {
+			// Find the mcp-server directory first
 			const mcpServerIndex = serverPath.indexOf('mcp-server');
 			if (mcpServerIndex !== -1) {
-				const projectRoot = path.dirname(
-					serverPath.substring(0, mcpServerIndex)
-				); // Go up one level
+				// Get the path up to mcp-server, which should be the project root
+				const projectRoot = serverPath.substring(0, mcpServerIndex - 1); // -1 to remove trailing slash
 
+				// Verify this looks like our project root by checking for key files/directories
 				if (
 					fs.existsSync(path.join(projectRoot, '.cursor')) ||
 					fs.existsSync(path.join(projectRoot, 'mcp-server')) ||
 					fs.existsSync(path.join(projectRoot, 'package.json'))
 				) {
-					log.info(
-						`Using project root derived from server path: ${projectRoot}`
-					);
-					return projectRoot; // Already absolute
+					log.info(`Found project root from server path: ${projectRoot}`);
+					return projectRoot;
 				}
 			}
 		}
 
-		// Fallback 2: Use CWD
+		// ALWAYS ensure we return a valid path as a last resort
 		log.info(`Using current working directory as ultimate fallback: ${cwd}`);
-		return cwd; // Already absolute
-	} catch (e) {
-		log.error(`Error in getProjectRootFromSession: ${e.message}`);
-		// Attempt final fallback to CWD on error
-		const cwd = process.cwd();
-		log.warn(
-			`Returning CWD (${cwd}) due to error during session root processing.`
-		);
 		return cwd;
+	} catch (e) {
+		// If we have a server path, use it as a basis for project root
+		const serverPath = process.argv[1];
+		if (serverPath && serverPath.includes('mcp-server')) {
+			const mcpServerIndex = serverPath.indexOf('mcp-server');
+			return mcpServerIndex !== -1
+				? serverPath.substring(0, mcpServerIndex - 1)
+				: process.cwd();
+		}
+
+		// Only use cwd if it's not "/"
+		const cwd = process.cwd();
+		return cwd !== '/' ? cwd : '/';
 	}
 }
 
@@ -494,143 +475,80 @@ function createLogWrapper(log) {
 }
 
 /**
- * Resolves and normalizes a project root path from various formats.
- * Handles URI encoding, Windows paths, and file protocols.
- * @param {string | undefined | null} rawPath - The raw project root path.
- * @param {object} [log] - Optional logger object.
- * @returns {string | null} Normalized absolute path or null if input is invalid/empty.
+ * Resolves and normalizes a project root path
+ * @param {string} rawPath - The raw project root path that might be URI encoded
+ * @returns {string} Normalized absolute path
  */
-function normalizeProjectRoot(rawPath, log) {
+function normalizeProjectRoot(rawPath) {
 	if (!rawPath) return null;
+
 	try {
-		let pathString = Array.isArray(rawPath) ? rawPath[0] : String(rawPath);
-		if (!pathString) return null;
+		// Handle URI encoded paths (e.g. /c%20/path/with%20spaces)
+		const decoded = decodeURIComponent(rawPath);
 
-		// 1. Decode URI Encoding
-		// Use try-catch for decoding as malformed URIs can throw
-		try {
-			pathString = decodeURIComponent(pathString);
-		} catch (decodeError) {
-			if (log)
-				log.warn(
-					`Could not decode URI component for path "${rawPath}": ${decodeError.message}. Proceeding with raw string.`
-				);
-			// Proceed with the original string if decoding fails
-			pathString = Array.isArray(rawPath) ? rawPath[0] : String(rawPath);
-		}
+		// Convert Windows-style paths if needed
+		const normalized = decoded.replace(/\\/g, '/');
 
-		// 2. Strip file:// prefix (handle 2 or 3 slashes)
-		if (pathString.startsWith('file:///')) {
-			pathString = pathString.slice(7); // Slice 7 for file:///, may leave leading / on Windows
-		} else if (pathString.startsWith('file://')) {
-			pathString = pathString.slice(7); // Slice 7 for file://
-		}
+		// Remove any file:// prefix
+		const withoutProtocol = normalized.replace(/^file:\/\//, '');
 
-		// 3. Handle potential Windows leading slash after stripping prefix (e.g., /C:/...)
-		// This checks if it starts with / followed by a drive letter C: D: etc.
-		if (
-			pathString.startsWith('/') &&
-			/[A-Za-z]:/.test(pathString.substring(1, 3))
-		) {
-			pathString = pathString.substring(1); // Remove the leading slash
-		}
-
-		// 4. Normalize backslashes to forward slashes
-		pathString = pathString.replace(/\\/g, '/');
-
-		// 5. Resolve to absolute path using server's OS convention
-		const resolvedPath = path.resolve(pathString);
-		return resolvedPath;
+		// Ensure absolute path
+		return path.resolve(withoutProtocol);
 	} catch (error) {
-		if (log) {
-			log.error(
-				`Error normalizing project root path "${rawPath}": ${error.message}`
-			);
-		}
-		return null; // Return null on error
-	}
-}
-
-/**
- * Extracts the raw project root path from the session (without normalization).
- * Used as a fallback within the HOF.
- * @param {Object} session - The MCP session object.
- * @param {Object} log - The MCP logger object.
- * @returns {string|null} The raw path string or null.
- */
-function getRawProjectRootFromSession(session, log) {
-	try {
-		// Check primary location
-		if (session?.roots?.[0]?.uri) {
-			return session.roots[0].uri;
-		}
-		// Check alternate location
-		else if (session?.roots?.roots?.[0]?.uri) {
-			return session.roots.roots[0].uri;
-		}
-		return null; // Not found in expected session locations
-	} catch (e) {
-		log.error(`Error accessing session roots: ${e.message}`);
 		return null;
 	}
 }
 
 /**
- * Higher-order function to wrap MCP tool execute methods.
- * Ensures args.projectRoot is present and normalized before execution.
- * @param {Function} executeFn - The original async execute(args, context) function.
- * @returns {Function} The wrapped async execute function.
+ * Higher-order function that wraps an MCP tool's execute method to provide:
+ * 1. Normalized project root resolution
+ * 2. Environment variable setup from both .env and session
+ * 3. Error handling
+ *
+ * @param {Function} executeFn - The original execute function to wrap
+ * @returns {Function} Wrapped execute function with project context
  */
-function withNormalizedProjectRoot(executeFn) {
+export function withProjectContext(executeFn) {
 	return async (args, context) => {
 		const { log, session } = context;
-		let normalizedRoot = null;
-		let rootSource = 'unknown';
 
 		try {
-			// Determine raw root: prioritize args, then session
-			let rawRoot = args.projectRoot;
-			if (!rawRoot) {
-				rawRoot = getRawProjectRootFromSession(session, log);
-				rootSource = 'session';
-			} else {
-				rootSource = 'args';
-			}
+			// 1. Resolve and normalize project root
+			const rawRoot =
+				args.projectRoot || getProjectRootFromSession(session, log);
+			const projectRoot = normalizeProjectRoot(rawRoot);
 
-			if (!rawRoot) {
-				log.error('Could not determine project root from args or session.');
+			if (!projectRoot) {
 				return createErrorResponse(
-					'Could not determine project root. Please provide projectRoot argument or ensure session contains root info.'
+					'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
 				);
 			}
 
-			// Normalize the determined raw root
-			normalizedRoot = normalizeProjectRoot(rawRoot, log);
+			// 2. Load .env from project root if it exists
+			const envPath = path.join(projectRoot, '.env');
+			let localEnv = {};
 
-			if (!normalizedRoot) {
-				log.error(
-					`Failed to normalize project root obtained from ${rootSource}: ${rawRoot}`
-				);
-				return createErrorResponse(
-					`Invalid project root provided or derived from ${rootSource}: ${rawRoot}`
-				);
+			if (fs.existsSync(envPath)) {
+				try {
+					localEnv = require('dotenv').config({ path: envPath }).parsed || {};
+				} catch (error) {
+					log.warn(`Failed to load .env from ${envPath}: ${error.message}`);
+				}
 			}
 
-			// Inject the normalized root back into args
-			const updatedArgs = { ...args, projectRoot: normalizedRoot };
+			// 3. Combine with session env and execute
+			const combinedEnv = {
+				...localEnv,
+				...(session?.env || {})
+			};
 
-			// Execute the original function with normalized root in args
-			return await executeFn(updatedArgs, context);
+			return await withSessionEnv(combinedEnv, async () => {
+				// Pass normalized projectRoot to the execute function
+				return await executeFn({ ...args, projectRoot }, context);
+			});
 		} catch (error) {
-			log.error(
-				`Error within withNormalizedProjectRoot HOF (Normalized Root: ${normalizedRoot}): ${error.message}`
-			);
-			// Add stack trace if available and debug enabled
-			if (error.stack && log.debug) {
-				log.debug(error.stack);
-			}
-			// Return a generic error or re-throw depending on desired behavior
-			return createErrorResponse(`Operation failed: ${error.message}`);
+			log.error(`Error in project context: ${error.message}`);
+			return createErrorResponse(error.message);
 		}
 	};
 }
@@ -645,8 +563,5 @@ export {
 	processMCPResponseData,
 	createContentResponse,
 	createErrorResponse,
-	createLogWrapper,
-	normalizeProjectRoot,
-	getRawProjectRootFromSession,
-	withNormalizedProjectRoot
+	createLogWrapper
 };

mcp-server/src/tools/validate-dependencies.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import {
 	handleApiResult,
 	createErrorResponse,
-	withNormalizedProjectRoot
+	getProjectRootFromSession
 } from './utils.js';
 import { validateDependenciesDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
@@ -27,15 +27,24 @@ export function registerValidateDependenciesTool(server) {
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
 		}),
-		execute: withNormalizedProjectRoot(async (args, { log, session }) => {
+		execute: async (args, { log, session }) => {
 			try {
 				log.info(`Validating dependencies with args: ${JSON.stringify(args)}`);
 
-				// Use args.projectRoot directly (guaranteed by withNormalizedProjectRoot)
+				// Get project root from args or session
+				const rootFolder =
+					args.projectRoot || getProjectRootFromSession(session, log);
+
+				if (!rootFolder) {
+					return createErrorResponse(
+						'Could not determine project root. Please provide it explicitly or ensure your session contains valid root information.'
+					);
+				}
+
 				let tasksJsonPath;
 				try {
 					tasksJsonPath = findTasksJsonPath(
-						{ projectRoot: args.projectRoot, file: args.file },
+						{ projectRoot: rootFolder, file: args.file },
 						log
 					);
 				} catch (error) {
@@ -65,6 +74,6 @@ export function registerValidateDependenciesTool(server) {
 				log.error(`Error in validateDependencies tool: ${error.message}`);
 				return createErrorResponse(error.message);
 			}
-		})
+		}
 	});
 }

package.json

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

scripts/init.js

@@ -180,9 +180,9 @@ function copyTemplateFile(templateName, targetPath, replacements = {}) {
 
 	// Map template names to their actual source paths
 	switch (templateName) {
-		// case 'scripts_README.md':
-		// 	sourcePath = path.join(__dirname, '..', 'assets', 'scripts_README.md');
-		// 	break;
+		case 'scripts_README.md':
+			sourcePath = path.join(__dirname, '..', 'assets', 'scripts_README.md');
+			break;
 		case 'dev_workflow.mdc':
 			sourcePath = path.join(
 				__dirname,
@@ -219,8 +219,8 @@ function copyTemplateFile(templateName, targetPath, replacements = {}) {
 				'self_improve.mdc'
 			);
 			break;
-			// case 'README-task-master.md':
-			// 	sourcePath = path.join(__dirname, '..', 'README-task-master.md');
+		case 'README-task-master.md':
+			sourcePath = path.join(__dirname, '..', 'README-task-master.md');
 			break;
 		case 'windsurfrules':
 			sourcePath = path.join(__dirname, '..', 'assets', '.windsurfrules');
@@ -351,18 +351,18 @@ async function initializeProject(options = {}) {
 	}
 
 	// Debug logging only if not in silent mode
-	// if (!isSilentMode()) {
-	// 	console.log('===== DEBUG: INITIALIZE PROJECT OPTIONS RECEIVED =====');
-	// 	console.log('Full options object:', JSON.stringify(options));
-	// 	console.log('options.yes:', options.yes);
-	// 	console.log('==================================================');
-	// }
+	if (!isSilentMode()) {
+		console.log('===== DEBUG: INITIALIZE PROJECT OPTIONS RECEIVED =====');
+		console.log('Full options object:', JSON.stringify(options));
+		console.log('options.yes:', options.yes);
+		console.log('==================================================');
+	}
 
 	const skipPrompts = options.yes || (options.name && options.description);
 
-	// if (!isSilentMode()) {
-	// 	console.log('Skip prompts determined:', skipPrompts);
-	// }
+	if (!isSilentMode()) {
+		console.log('Skip prompts determined:', skipPrompts);
+	}
 
 	if (skipPrompts) {
 		if (!isSilentMode()) {
@@ -565,12 +565,12 @@ function createProjectStructure(addAliases, dryRun) {
 		path.join(targetDir, 'scripts', 'example_prd.txt')
 	);
 
-	// // Create main README.md
-	// copyTemplateFile(
-	// 	'README-task-master.md',
-	// 	path.join(targetDir, 'README-task-master.md'),
-	// 	replacements
-	// );
+	// Create main README.md
+	copyTemplateFile(
+		'README-task-master.md',
+		path.join(targetDir, 'README-task-master.md'),
+		replacements
+	);
 
 	// Initialize git repository if git is available
 	try {
@@ -761,22 +761,21 @@ function setupMCPConfiguration(targetDir) {
 	const newMCPServer = {
 		'task-master-ai': {
 			command: 'npx',
-			args: ['-y', '--package=task-master-ai', 'task-master-ai'],
+			args: ['-y', 'task-master-mcp'],
 			env: {
-				ANTHROPIC_API_KEY: 'ANTHROPIC_API_KEY_HERE',
-				PERPLEXITY_API_KEY: 'PERPLEXITY_API_KEY_HERE',
-				OPENAI_API_KEY: 'OPENAI_API_KEY_HERE',
-				GOOGLE_API_KEY: 'GOOGLE_API_KEY_HERE',
-				XAI_API_KEY: 'XAI_API_KEY_HERE',
-				OPENROUTER_API_KEY: 'OPENROUTER_API_KEY_HERE',
-				MISTRAL_API_KEY: 'MISTRAL_API_KEY_HERE',
-				AZURE_OPENAI_API_KEY: 'AZURE_OPENAI_API_KEY_HERE',
-				OLLAMA_API_KEY: 'OLLAMA_API_KEY_HERE'
+				ANTHROPIC_API_KEY: 'YOUR_ANTHROPIC_API_KEY',
+				PERPLEXITY_API_KEY: 'YOUR_PERPLEXITY_API_KEY',
+				MODEL: 'claude-3-7-sonnet-20250219',
+				PERPLEXITY_MODEL: 'sonar-pro',
+				MAX_TOKENS: '64000',
+				TEMPERATURE: '0.2',
+				DEFAULT_SUBTASKS: '5',
+				DEFAULT_PRIORITY: 'medium'
 			}
 		}
 	};
 
-	// Check if mcp.json already existsimage.png
+	// Check if mcp.json already exists
 	if (fs.existsSync(mcpJsonPath)) {
 		log(
 			'info',
@@ -796,14 +795,14 @@ function setupMCPConfiguration(targetDir) {
 				(server) =>
 					server.args &&
 					server.args.some(
-						(arg) => typeof arg === 'string' && arg.includes('task-master-ai')
+						(arg) => typeof arg === 'string' && arg.includes('task-master-mcp')
 					)
 			);
 
 			if (hasMCPString) {
 				log(
 					'info',
-					'Found existing task-master-ai MCP configuration in mcp.json, leaving untouched'
+					'Found existing task-master-mcp configuration in mcp.json, leaving untouched'
 				);
 				return; // Exit early, don't modify the existing configuration
 			}

scripts/modules/ai-services-unified.js

@@ -16,7 +16,7 @@ import {
 	getFallbackModelId,
 	getParametersForRole
 } from './config-manager.js';
-import { log, resolveEnvVariable, findProjectRoot } from './utils.js';
+import { log, resolveEnvVariable } from './utils.js';
 
 import * as anthropic from '../../src/ai-providers/anthropic.js';
 import * as perplexity from '../../src/ai-providers/perplexity.js';
@@ -136,11 +136,10 @@ function _extractErrorMessage(error) {
  * Internal helper to resolve the API key for a given provider.
  * @param {string} providerName - The name of the provider (lowercase).
  * @param {object|null} session - Optional MCP session object.
- * @param {string|null} projectRoot - Optional project root path for .env fallback.
  * @returns {string|null} The API key or null if not found/needed.
  * @throws {Error} If a required API key is missing.
  */
-function _resolveApiKey(providerName, session, projectRoot = null) {
+function _resolveApiKey(providerName, session) {
 	const keyMap = {
 		openai: 'OPENAI_API_KEY',
 		anthropic: 'ANTHROPIC_API_KEY',
@@ -164,10 +163,10 @@ function _resolveApiKey(providerName, session, projectRoot = null) {
 		);
 	}
 
-	const apiKey = resolveEnvVariable(envVarName, session, projectRoot);
+	const apiKey = resolveEnvVariable(envVarName, session);
 	if (!apiKey) {
 		throw new Error(
-			`Required API key ${envVarName} for provider '${providerName}' is not set in environment, session, or .env file.`
+			`Required API key ${envVarName} for provider '${providerName}' is not set in environment or session.`
 		);
 	}
 	return apiKey;
@@ -242,35 +241,27 @@ async function _attemptProviderCallWithRetries(
  * Base logic for unified service functions.
  * @param {string} serviceType - Type of service ('generateText', 'streamText', 'generateObject').
  * @param {object} params - Original parameters passed to the service function.
- * @param {string} [params.projectRoot] - Optional project root path.
  * @returns {Promise<any>} Result from the underlying provider call.
  */
 async function _unifiedServiceRunner(serviceType, params) {
 	const {
 		role: initialRole,
 		session,
-		projectRoot,
 		systemPrompt,
 		prompt,
 		schema,
 		objectName,
 		...restApiParams
 	} = params;
-	log('info', `${serviceType}Service called`, {
-		role: initialRole,
-		projectRoot
-	});
-
-	// Determine the effective project root (passed in or detected)
-	const effectiveProjectRoot = projectRoot || findProjectRoot();
+	log('info', `${serviceType}Service called`, { role: initialRole });
 
 	let sequence;
 	if (initialRole === 'main') {
 		sequence = ['main', 'fallback', 'research'];
-	} else if (initialRole === 'research') {
-		sequence = ['research', 'fallback', 'main'];
 	} else if (initialRole === 'fallback') {
-		sequence = ['fallback', 'main', 'research'];
+		sequence = ['fallback', 'research'];
+	} else if (initialRole === 'research') {
+		sequence = ['research', 'fallback'];
 	} else {
 		log(
 			'warn',
@@ -290,16 +281,16 @@ async function _unifiedServiceRunner(serviceType, params) {
 			log('info', `New AI service call with role: ${currentRole}`);
 
 			// 1. Get Config: Provider, Model, Parameters for the current role
-			// Pass effectiveProjectRoot to config getters
+			// Call individual getters based on the current role
 			if (currentRole === 'main') {
-				providerName = getMainProvider(effectiveProjectRoot);
-				modelId = getMainModelId(effectiveProjectRoot);
+				providerName = getMainProvider();
+				modelId = getMainModelId();
 			} else if (currentRole === 'research') {
-				providerName = getResearchProvider(effectiveProjectRoot);
-				modelId = getResearchModelId(effectiveProjectRoot);
+				providerName = getResearchProvider();
+				modelId = getResearchModelId();
 			} else if (currentRole === 'fallback') {
-				providerName = getFallbackProvider(effectiveProjectRoot);
-				modelId = getFallbackModelId(effectiveProjectRoot);
+				providerName = getFallbackProvider();
+				modelId = getFallbackModelId();
 			} else {
 				log(
 					'error',
@@ -323,8 +314,7 @@ async function _unifiedServiceRunner(serviceType, params) {
 				continue;
 			}
 
-			// Pass effectiveProjectRoot to getParametersForRole
-			roleParams = getParametersForRole(currentRole, effectiveProjectRoot);
+			roleParams = getParametersForRole(currentRole);
 
 			// 2. Get Provider Function Set
 			providerFnSet = PROVIDER_FUNCTIONS[providerName?.toLowerCase()];
@@ -355,12 +345,7 @@ async function _unifiedServiceRunner(serviceType, params) {
 			}
 
 			// 3. Resolve API Key (will throw if required and missing)
-			// Pass effectiveProjectRoot to _resolveApiKey
-			apiKey = _resolveApiKey(
-				providerName?.toLowerCase(),
-				session,
-				effectiveProjectRoot
-			);
+			apiKey = _resolveApiKey(providerName?.toLowerCase(), session);
 
 			// 4. Construct Messages Array
 			const messages = [];
@@ -458,7 +443,6 @@ async function _unifiedServiceRunner(serviceType, params) {
  * @param {object} params - Parameters for the service call.
  * @param {string} params.role - The initial client role ('main', 'research', 'fallback').
  * @param {object} [params.session=null] - Optional MCP session object.
- * @param {string} [params.projectRoot=null] - Optional project root path for .env fallback.
  * @param {string} params.prompt - The prompt for the AI.
  * @param {string} [params.systemPrompt] - Optional system prompt.
  * // Other specific generateText params can be included here.
@@ -475,7 +459,6 @@ async function generateTextService(params) {
  * @param {object} params - Parameters for the service call.
  * @param {string} params.role - The initial client role ('main', 'research', 'fallback').
  * @param {object} [params.session=null] - Optional MCP session object.
- * @param {string} [params.projectRoot=null] - Optional project root path for .env fallback.
  * @param {string} params.prompt - The prompt for the AI.
  * @param {string} [params.systemPrompt] - Optional system prompt.
  * // Other specific streamText params can be included here.
@@ -492,7 +475,6 @@ async function streamTextService(params) {
  * @param {object} params - Parameters for the service call.
  * @param {string} params.role - The initial client role ('main', 'research', 'fallback').
  * @param {object} [params.session=null] - Optional MCP session object.
- * @param {string} [params.projectRoot=null] - Optional project root path for .env fallback.
  * @param {import('zod').ZodSchema} params.schema - The Zod schema for the expected object.
  * @param {string} params.prompt - The prompt for the AI.
  * @param {string} [params.systemPrompt] - Optional system prompt.

scripts/modules/commands.js

@@ -10,7 +10,6 @@ import boxen from 'boxen';
 import fs from 'fs';
 import https from 'https';
 import inquirer from 'inquirer';
-import ora from 'ora'; // Import ora
 
 import { log, readJSON } from './utils.js';
 import {
@@ -515,111 +514,80 @@ function registerCommands(programInstance) {
 			const outputPath = options.output;
 			const force = options.force || false;
 			const append = options.append || false;
-			let useForce = false;
-			let useAppend = false;
 
 			// Helper function to check if tasks.json exists and confirm overwrite
 			async function confirmOverwriteIfNeeded() {
-				if (fs.existsSync(outputPath) && !useForce && !useAppend) {
-					const overwrite = await confirmTaskOverwrite(outputPath);
-					if (!overwrite) {
-						log('info', 'Operation cancelled.');
+				if (fs.existsSync(outputPath) && !force && !append) {
+					const shouldContinue = await confirmTaskOverwrite(outputPath);
+					if (!shouldContinue) {
+						console.log(chalk.yellow('Operation cancelled by user.'));
 						return false;
 					}
-					// If user confirms 'y', we should set useForce = true for the parsePRD call
-					// Only overwrite if not appending
-					useForce = true;
 				}
 				return true;
 			}
 
-			let spinner;
+			// If no input file specified, check for default PRD location
+			if (!inputFile) {
+				if (fs.existsSync(defaultPrdPath)) {
+					console.log(chalk.blue(`Using default PRD file: ${defaultPrdPath}`));
 
-			try {
-				if (!inputFile) {
-					if (fs.existsSync(defaultPrdPath)) {
-						console.log(
-							chalk.blue(`Using default PRD file path: ${defaultPrdPath}`)
-						);
-						if (!(await confirmOverwriteIfNeeded())) return;
+					// Check for existing tasks.json before proceeding
+					if (!(await confirmOverwriteIfNeeded())) return;
 
-						console.log(chalk.blue(`Generating ${numTasks} tasks...`));
-						spinner = ora('Parsing PRD and generating tasks...').start();
-						await parsePRD(defaultPrdPath, outputPath, numTasks, {
-							useAppend,
-							useForce
-						});
-						spinner.succeed('Tasks generated successfully!');
-						return;
-					}
-
-					console.log(
-						chalk.yellow(
-							'No PRD file specified and default PRD file not found at scripts/prd.txt.'
-						)
-					);
-					console.log(
-						boxen(
-							chalk.white.bold('Parse PRD Help') +
-								'\n\n' +
-								chalk.cyan('Usage:') +
-								'\n' +
-								`  task-master parse-prd <prd-file.txt> [options]\n\n` +
-								chalk.cyan('Options:') +
-								'\n' +
-								'  -i, --input <file>       Path to the PRD file (alternative to positional argument)\n' +
-								'  -o, --output <file>      Output file path (default: "tasks/tasks.json")\n' +
-								'  -n, --num-tasks <number> Number of tasks to generate (default: 10)\n' +
-								'  -f, --force              Skip confirmation when overwriting existing tasks\n' +
-								'  --append                 Append new tasks to existing tasks.json instead of overwriting\n\n' +
-								chalk.cyan('Example:') +
-								'\n' +
-								'  task-master parse-prd requirements.txt --num-tasks 15\n' +
-								'  task-master parse-prd --input=requirements.txt\n' +
-								'  task-master parse-prd --force\n' +
-								'  task-master parse-prd requirements_v2.txt --append\n\n' +
-								chalk.yellow('Note: This command will:') +
-								'\n' +
-								'  1. Look for a PRD file at scripts/prd.txt by default\n' +
-								'  2. Use the file specified by --input or positional argument if provided\n' +
-								'  3. Generate tasks from the PRD and either:\n' +
-								'     - Overwrite any existing tasks.json file (default)\n' +
-								'     - Append to existing tasks.json if --append is used',
-							{ padding: 1, borderColor: 'blue', borderStyle: 'round' }
-						)
-					);
+					console.log(chalk.blue(`Generating ${numTasks} tasks...`));
+					await parsePRD(defaultPrdPath, outputPath, numTasks, { append });
 					return;
 				}
 
-				if (!fs.existsSync(inputFile)) {
-					console.error(
-						chalk.red(`Error: Input PRD file not found: ${inputFile}`)
-					);
-					process.exit(1);
-				}
-
-				if (!(await confirmOverwriteIfNeeded())) return;
-
-				console.log(chalk.blue(`Parsing PRD file: ${inputFile}`));
-				console.log(chalk.blue(`Generating ${numTasks} tasks...`));
-				if (append) {
-					console.log(chalk.blue('Appending to existing tasks...'));
-				}
-
-				spinner = ora('Parsing PRD and generating tasks...').start();
-				await parsePRD(inputFile, outputPath, numTasks, {
-					append: useAppend,
-					force: useForce
-				});
-				spinner.succeed('Tasks generated successfully!');
-			} catch (error) {
-				if (spinner) {
-					spinner.fail(`Error parsing PRD: ${error.message}`);
-				} else {
-					console.error(chalk.red(`Error parsing PRD: ${error.message}`));
-				}
-				process.exit(1);
+				console.log(
+					chalk.yellow(
+						'No PRD file specified and default PRD file not found at scripts/prd.txt.'
+					)
+				);
+				console.log(
+					boxen(
+						chalk.white.bold('Parse PRD Help') +
+							'\n\n' +
+							chalk.cyan('Usage:') +
+							'\n' +
+							`  task-master parse-prd <prd-file.txt> [options]\n\n` +
+							chalk.cyan('Options:') +
+							'\n' +
+							'  -i, --input <file>       Path to the PRD file (alternative to positional argument)\n' +
+							'  -o, --output <file>      Output file path (default: "tasks/tasks.json")\n' +
+							'  -n, --num-tasks <number> Number of tasks to generate (default: 10)\n' +
+							'  -f, --force              Skip confirmation when overwriting existing tasks\n' +
+							'  --append                 Append new tasks to existing tasks.json instead of overwriting\n\n' +
+							chalk.cyan('Example:') +
+							'\n' +
+							'  task-master parse-prd requirements.txt --num-tasks 15\n' +
+							'  task-master parse-prd --input=requirements.txt\n' +
+							'  task-master parse-prd --force\n' +
+							'  task-master parse-prd requirements_v2.txt --append\n\n' +
+							chalk.yellow('Note: This command will:') +
+							'\n' +
+							'  1. Look for a PRD file at scripts/prd.txt by default\n' +
+							'  2. Use the file specified by --input or positional argument if provided\n' +
+							'  3. Generate tasks from the PRD and either:\n' +
+							'     - Overwrite any existing tasks.json file (default)\n' +
+							'     - Append to existing tasks.json if --append is used',
+						{ padding: 1, borderColor: 'blue', borderStyle: 'round' }
+					)
+				);
+				return;
 			}
+
+			// Check for existing tasks.json before proceeding with specified input file
+			if (!(await confirmOverwriteIfNeeded())) return;
+
+			console.log(chalk.blue(`Parsing PRD file: ${inputFile}`));
+			console.log(chalk.blue(`Generating ${numTasks} tasks...`));
+			if (append) {
+				console.log(chalk.blue('Appending to existing tasks...'));
+			}
+
+			await parsePRD(inputFile, outputPath, numTasks, { append });
 		});
 
 	// update command

scripts/modules/config-manager.js

@@ -345,12 +345,6 @@ function getDefaultSubtasks(explicitRoot = null) {
 	return isNaN(parsedVal) ? DEFAULTS.global.defaultSubtasks : parsedVal;
 }
 
-function getDefaultNumTasks(explicitRoot = null) {
-	const val = getGlobalConfig(explicitRoot).defaultNumTasks;
-	const parsedVal = parseInt(val, 10);
-	return isNaN(parsedVal) ? DEFAULTS.global.defaultNumTasks : parsedVal;
-}
-
 function getDefaultPriority(explicitRoot = null) {
 	// Directly return value from config
 	return getGlobalConfig(explicitRoot).defaultPriority;
@@ -430,13 +424,12 @@ function getParametersForRole(role, explicitRoot = null) {
 
 /**
  * Checks if the API key for a given provider is set in the environment.
- * Checks process.env first, then session.env if session is provided, then .env file if projectRoot provided.
+ * Checks process.env first, then session.env if session is provided.
  * @param {string} providerName - The name of the provider (e.g., 'openai', 'anthropic').
  * @param {object|null} [session=null] - The MCP session object (optional).
- * @param {string|null} [projectRoot=null] - The project root directory (optional, for .env file check).
  * @returns {boolean} True if the API key is set, false otherwise.
  */
-function isApiKeySet(providerName, session = null, projectRoot = null) {
+function isApiKeySet(providerName, session = null) {
 	// Define the expected environment variable name for each provider
 	if (providerName?.toLowerCase() === 'ollama') {
 		return true; // Indicate key status is effectively "OK"
@@ -461,7 +454,7 @@ function isApiKeySet(providerName, session = null, projectRoot = null) {
 	}
 
 	const envVarName = keyMap[providerKey];
-	const apiKeyValue = resolveEnvVariable(envVarName, session, projectRoot);
+	const apiKeyValue = resolveEnvVariable(envVarName, session);
 
 	// Check if the key exists, is not empty, and is not a placeholder
 	return (
@@ -708,7 +701,6 @@ export {
 	// Global setting getters (No env var overrides)
 	getLogLevel,
 	getDebugFlag,
-	getDefaultNumTasks,
 	getDefaultSubtasks,
 	getDefaultPriority,
 	getProjectName,

scripts/modules/dependency-manager.js

@@ -195,7 +195,7 @@ async function addDependency(tasksPath, taskId, dependencyId) {
 		}
 
 		// Generate updated task files
-		await generateTaskFiles(tasksPath, path.dirname(tasksPath));
+		await generateTaskFiles(tasksPath, 'tasks');
 
 		log('info', 'Task files regenerated with updated dependencies.');
 	} else {
@@ -334,7 +334,7 @@ async function removeDependency(tasksPath, taskId, dependencyId) {
 	}
 
 	// Regenerate task files
-	await generateTaskFiles(tasksPath, path.dirname(tasksPath));
+	await generateTaskFiles(tasksPath, 'tasks');
 }
 
 /**

scripts/modules/supported-models.json

@@ -13,6 +13,20 @@
 			"cost_per_1m_tokens": { "input": 3.0, "output": 15.0 },
 			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 64000
+		},
+		{
+			"id": "claude-3-5-haiku-20241022",
+			"swe_score": 0.406,
+			"cost_per_1m_tokens": { "input": 0.8, "output": 4.0 },
+			"allowed_roles": ["main", "fallback"],
+			"max_tokens": 64000
+		},
+		{
+			"id": "claude-3-opus-20240229",
+			"swe_score": 0,
+			"cost_per_1m_tokens": { "input": 15, "output": 75 },
+			"allowed_roles": ["main", "fallback"],
+			"max_tokens": 64000
 		}
 	],
 	"openai": [
@@ -27,7 +41,7 @@
 			"id": "o1",
 			"swe_score": 0.489,
 			"cost_per_1m_tokens": { "input": 15.0, "output": 60.0 },
-			"allowed_roles": ["main"]
+			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "o3",
@@ -39,7 +53,7 @@
 			"id": "o3-mini",
 			"swe_score": 0.493,
 			"cost_per_1m_tokens": { "input": 1.1, "output": 4.4 },
-			"allowed_roles": ["main"],
+			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 100000
 		},
 		{
@@ -52,49 +66,49 @@
 			"id": "o1-mini",
 			"swe_score": 0.4,
 			"cost_per_1m_tokens": { "input": 1.1, "output": 4.4 },
-			"allowed_roles": ["main"]
+			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "o1-pro",
 			"swe_score": 0,
 			"cost_per_1m_tokens": { "input": 150.0, "output": 600.0 },
-			"allowed_roles": ["main"]
+			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "gpt-4-5-preview",
 			"swe_score": 0.38,
 			"cost_per_1m_tokens": { "input": 75.0, "output": 150.0 },
-			"allowed_roles": ["main"]
+			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "gpt-4-1-mini",
 			"swe_score": 0,
 			"cost_per_1m_tokens": { "input": 0.4, "output": 1.6 },
-			"allowed_roles": ["main"]
+			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "gpt-4-1-nano",
 			"swe_score": 0,
 			"cost_per_1m_tokens": { "input": 0.1, "output": 0.4 },
-			"allowed_roles": ["main"]
+			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "gpt-4o-mini",
 			"swe_score": 0.3,
 			"cost_per_1m_tokens": { "input": 0.15, "output": 0.6 },
-			"allowed_roles": ["main"]
+			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "gpt-4o-search-preview",
 			"swe_score": 0.33,
 			"cost_per_1m_tokens": { "input": 2.5, "output": 10.0 },
-			"allowed_roles": ["research"]
+			"allowed_roles": ["main", "fallback", "research"]
 		},
 		{
 			"id": "gpt-4o-mini-search-preview",
 			"swe_score": 0.3,
 			"cost_per_1m_tokens": { "input": 0.15, "output": 0.6 },
-			"allowed_roles": ["research"]
+			"allowed_roles": ["main", "fallback", "research"]
 		}
 	],
 	"google": [
@@ -175,6 +189,14 @@
 			"allowed_roles": ["main", "fallback", "research"],
 			"max_tokens": 131072
 		},
+		{
+			"id": "grok-3-mini",
+			"name": "Grok 3 Mini",
+			"swe_score": 0,
+			"cost_per_1m_tokens": { "input": 0.3, "output": 0.5 },
+			"allowed_roles": ["main", "fallback", "research"],
+			"max_tokens": 131072
+		},
 		{
 			"id": "grok-3-fast",
 			"name": "Grok 3 Fast",
@@ -182,6 +204,13 @@
 			"cost_per_1m_tokens": { "input": 5, "output": 25 },
 			"allowed_roles": ["main", "fallback", "research"],
 			"max_tokens": 131072
+		},
+		{
+			"id": "grok-3-mini-fast",
+			"swe_score": 0,
+			"cost_per_1m_tokens": { "input": 0.6, "output": 4 },
+			"allowed_roles": ["main", "fallback", "research"],
+			"max_tokens": 131072
 		}
 	],
 	"ollama": [
@@ -254,7 +283,7 @@
 			"id": "deepseek/deepseek-chat-v3-0324",
 			"swe_score": 0,
 			"cost_per_1m_tokens": { "input": 0.27, "output": 1.1 },
-			"allowed_roles": ["main"],
+			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 64000
 		},
 		{
@@ -283,14 +312,14 @@
 			"id": "google/gemini-2.5-flash-preview",
 			"swe_score": 0,
 			"cost_per_1m_tokens": { "input": 0.15, "output": 0.6 },
-			"allowed_roles": ["main"],
+			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 65535
 		},
 		{
 			"id": "google/gemini-2.5-flash-preview:thinking",
 			"swe_score": 0,
 			"cost_per_1m_tokens": { "input": 0.15, "output": 3.5 },
-			"allowed_roles": ["main"],
+			"allowed_roles": ["main", "fallback"],
 			"max_tokens": 65535
 		},
 		{

scripts/modules/task-manager/add-task.js

@@ -10,7 +10,7 @@ import {
 	startLoadingIndicator,
 	stopLoadingIndicator
 } from '../ui.js';
-import { readJSON, writeJSON, log as consoleLog, truncate } from '../utils.js';
+import { log, readJSON, writeJSON, truncate } from '../utils.js';
 import { generateObjectService } from '../ai-services-unified.js';
 import { getDefaultPriority } from '../config-manager.js';
 import generateTaskFiles from './generate-task-files.js';
@@ -42,41 +42,19 @@ const AiTaskDataSchema = z.object({
  * @param {Object} customEnv - Custom environment variables (optional) - Note: AI params override deprecated
  * @param {Object} manualTaskData - Manual task data (optional, for direct task creation without AI)
  * @param {boolean} useResearch - Whether to use the research model (passed to unified service)
- * @param {Object} context - Context object containing session and potentially projectRoot
- * @param {string} [context.projectRoot] - Project root path (for MCP/env fallback)
  * @returns {number} The new task ID
  */
 async function addTask(
 	tasksPath,
 	prompt,
 	dependencies = [],
-	priority = null,
-	context = {},
-	outputFormat = 'text', // Default to text for CLI
+	priority = getDefaultPriority(), // Keep getter for default priority
+	{ reportProgress, mcpLog, session } = {},
+	outputFormat = 'text',
+	// customEnv = null, // Removed as AI param overrides are deprecated
 	manualTaskData = null,
-	useResearch = false
+	useResearch = false // <-- Add useResearch parameter
 ) {
-	const { session, mcpLog, projectRoot } = context;
-	const isMCP = !!mcpLog;
-
-	// Create a consistent logFn object regardless of context
-	const logFn = isMCP
-		? mcpLog // Use MCP logger if provided
-		: {
-				// Create a wrapper around consoleLog for CLI
-				info: (...args) => consoleLog('info', ...args),
-				warn: (...args) => consoleLog('warn', ...args),
-				error: (...args) => consoleLog('error', ...args),
-				debug: (...args) => consoleLog('debug', ...args),
-				success: (...args) => consoleLog('success', ...args)
-			};
-
-	const effectivePriority = priority || getDefaultPriority(projectRoot);
-
-	logFn.info(
-		`Adding new task with prompt: "${prompt}", Priority: ${effectivePriority}, Dependencies: ${dependencies.join(', ') || 'None'}, Research: ${useResearch}, ProjectRoot: ${projectRoot}`
-	);
-
 	let loadingIndicator = null;
 
 	// Create custom reporter that checks for MCP log
@@ -84,7 +62,7 @@ async function addTask(
 		if (mcpLog) {
 			mcpLog[level](message);
 		} else if (outputFormat === 'text') {
-			consoleLog(level, message);
+			log(level, message);
 		}
 	};
 
@@ -242,11 +220,11 @@ async function addTask(
 				const aiGeneratedTaskData = await generateObjectService({
 					role: serviceRole, // <-- Use the determined role
 					session: session, // Pass session for API key resolution
-					projectRoot: projectRoot, // <<< Pass projectRoot here
 					schema: AiTaskDataSchema, // Pass the Zod schema
 					objectName: 'newTaskData', // Name for the object
 					systemPrompt: systemPrompt,
-					prompt: userPrompt
+					prompt: userPrompt,
+					reportProgress // Pass progress reporter if available
 				});
 				report('DEBUG: generateObjectService returned successfully.', 'debug');
 
@@ -276,7 +254,7 @@ async function addTask(
 			testStrategy: taskData.testStrategy || '',
 			status: 'pending',
 			dependencies: numericDependencies, // Use validated numeric dependencies
-			priority: effectivePriority,
+			priority: priority,
 			subtasks: [] // Initialize with empty subtasks array
 		};
 

scripts/modules/task-manager/analyze-task-complexity.js

@@ -46,7 +46,6 @@ Do not include any explanatory text, markdown formatting, or code block markers
  * @param {string} options.output - Path to report output file
  * @param {string|number} [options.threshold] - Complexity threshold
  * @param {boolean} [options.research] - Use research role
- * @param {string} [options.projectRoot] - Project root path (for MCP/env fallback).
  * @param {Object} [options._filteredTasksData] - Pre-filtered task data (internal use)
  * @param {number} [options._originalTaskCount] - Original task count (internal use)
  * @param {Object} context - Context object, potentially containing session and mcpLog
@@ -60,7 +59,6 @@ async function analyzeTaskComplexity(options, context = {}) {
 	const outputPath = options.output || 'scripts/task-complexity-report.json';
 	const thresholdScore = parseFloat(options.threshold || '5');
 	const useResearch = options.research || false;
-	const projectRoot = options.projectRoot;
 
 	const outputFormat = mcpLog ? 'json' : 'text';
 
@@ -211,13 +209,15 @@ async function analyzeTaskComplexity(options, context = {}) {
 			const role = useResearch ? 'research' : 'main';
 			reportLog(`Using AI service with role: ${role}`, 'info');
 
+			// *** CHANGED: Use generateTextService ***
 			fullResponse = await generateTextService({
 				prompt,
 				systemPrompt,
 				role,
-				session,
-				projectRoot
+				session
+				// No schema or objectName needed
 			});
+			// *** End Service Call Change ***
 
 			reportLog(
 				'Successfully received text response via AI service',

scripts/modules/task-manager/clear-subtasks.js

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import boxen from 'boxen';
 import Table from 'cli-table3';
 
-import { log, readJSON, writeJSON, truncate, isSilentMode } from '../utils.js';
+import { log, readJSON, writeJSON, truncate } from '../utils.js';
 import { displayBanner } from '../ui.js';
 import generateTaskFiles from './generate-task-files.js';
 
@@ -22,16 +22,14 @@ function clearSubtasks(tasksPath, taskIds) {
 		process.exit(1);
 	}
 
-	if (!isSilentMode()) {
-		console.log(
-			boxen(chalk.white.bold('Clearing Subtasks'), {
-				padding: 1,
-				borderColor: 'blue',
-				borderStyle: 'round',
-				margin: { top: 1, bottom: 1 }
-			})
-		);
-	}
+	console.log(
+		boxen(chalk.white.bold('Clearing Subtasks'), {
+			padding: 1,
+			borderColor: 'blue',
+			borderStyle: 'round',
+			margin: { top: 1, bottom: 1 }
+		})
+	);
 
 	// Handle multiple task IDs (comma-separated)
 	const taskIdArray = taskIds.split(',').map((id) => id.trim());
@@ -87,65 +85,59 @@ function clearSubtasks(tasksPath, taskIds) {
 		writeJSON(tasksPath, data);
 
 		// Show summary table
-		if (!isSilentMode()) {
-			console.log(
-				boxen(chalk.white.bold('Subtask Clearing Summary:'), {
-					padding: { left: 2, right: 2, top: 0, bottom: 0 },
-					margin: { top: 1, bottom: 0 },
-					borderColor: 'blue',
-					borderStyle: 'round'
-				})
-			);
-			console.log(summaryTable.toString());
-		}
+		console.log(
+			boxen(chalk.white.bold('Subtask Clearing Summary:'), {
+				padding: { left: 2, right: 2, top: 0, bottom: 0 },
+				margin: { top: 1, bottom: 0 },
+				borderColor: 'blue',
+				borderStyle: 'round'
+			})
+		);
+		console.log(summaryTable.toString());
 
 		// Regenerate task files to reflect changes
 		log('info', 'Regenerating task files...');
 		generateTaskFiles(tasksPath, path.dirname(tasksPath));
 
 		// Success message
-		if (!isSilentMode()) {
-			console.log(
-				boxen(
-					chalk.green(
-						`Successfully cleared subtasks from ${chalk.bold(clearedCount)} task(s)`
-					),
-					{
-						padding: 1,
-						borderColor: 'green',
-						borderStyle: 'round',
-						margin: { top: 1 }
-					}
-				)
-			);
-
-			// Next steps suggestion
-			console.log(
-				boxen(
-					chalk.white.bold('Next Steps:') +
-						'\n\n' +
-						`${chalk.cyan('1.')} Run ${chalk.yellow('task-master expand --id=<id>')} to generate new subtasks\n` +
-						`${chalk.cyan('2.')} Run ${chalk.yellow('task-master list --with-subtasks')} to verify changes`,
-					{
-						padding: 1,
-						borderColor: 'cyan',
-						borderStyle: 'round',
-						margin: { top: 1 }
-					}
-				)
-			);
-		}
-	} else {
-		if (!isSilentMode()) {
-			console.log(
-				boxen(chalk.yellow('No subtasks were cleared'), {
+		console.log(
+			boxen(
+				chalk.green(
+					`Successfully cleared subtasks from ${chalk.bold(clearedCount)} task(s)`
+				),
+				{
 					padding: 1,
-					borderColor: 'yellow',
+					borderColor: 'green',
 					borderStyle: 'round',
 					margin: { top: 1 }
-				})
-			);
-		}
+				}
+			)
+		);
+
+		// Next steps suggestion
+		console.log(
+			boxen(
+				chalk.white.bold('Next Steps:') +
+					'\n\n' +
+					`${chalk.cyan('1.')} Run ${chalk.yellow('task-master expand --id=<id>')} to generate new subtasks\n` +
+					`${chalk.cyan('2.')} Run ${chalk.yellow('task-master list --with-subtasks')} to verify changes`,
+				{
+					padding: 1,
+					borderColor: 'cyan',
+					borderStyle: 'round',
+					margin: { top: 1 }
+				}
+			)
+		);
+	} else {
+		console.log(
+			boxen(chalk.yellow('No subtasks were cleared'), {
+				padding: 1,
+				borderColor: 'yellow',
+				borderStyle: 'round',
+				margin: { top: 1 }
+			})
+		);
 	}
 }
 

scripts/modules/task-manager/expand-task.js

@@ -503,8 +503,7 @@ async function expandTask(
 				prompt: promptContent,
 				systemPrompt: systemPrompt, // Use the determined system prompt
 				role,
-				session,
-				projectRoot
+				session
 			});
 			logger.info(
 				'Successfully received text response from AI service',

scripts/modules/task-manager/models.js

@@ -77,7 +77,7 @@ function fetchOpenRouterModels() {
  * @returns {Object} RESTful response with current model configuration
  */
 async function getModelConfiguration(options = {}) {
-	const { mcpLog, projectRoot, session } = options;
+	const { mcpLog, projectRoot } = options;
 
 	const report = (level, ...args) => {
 		if (mcpLog && typeof mcpLog[level] === 'function') {
@@ -125,16 +125,12 @@ async function getModelConfiguration(options = {}) {
 		const fallbackModelId = getFallbackModelId(projectRoot);
 
 		// Check API keys
-		const mainCliKeyOk = isApiKeySet(mainProvider, session, projectRoot);
+		const mainCliKeyOk = isApiKeySet(mainProvider);
 		const mainMcpKeyOk = getMcpApiKeyStatus(mainProvider, projectRoot);
-		const researchCliKeyOk = isApiKeySet(
-			researchProvider,
-			session,
-			projectRoot
-		);
+		const researchCliKeyOk = isApiKeySet(researchProvider);
 		const researchMcpKeyOk = getMcpApiKeyStatus(researchProvider, projectRoot);
 		const fallbackCliKeyOk = fallbackProvider
-			? isApiKeySet(fallbackProvider, session, projectRoot)
+			? isApiKeySet(fallbackProvider)
 			: true;
 		const fallbackMcpKeyOk = fallbackProvider
 			? getMcpApiKeyStatus(fallbackProvider, projectRoot)
@@ -527,7 +523,7 @@ async function getApiKeyStatusReport(options = {}) {
 		); // Ollama is not a provider, it's a service, doesn't need an api key usually
 		const statusReport = providersToCheck.map((provider) => {
 			// Use provided projectRoot for MCP status check
-			const cliOk = isApiKeySet(provider, session, projectRoot); // Pass session and projectRoot for CLI check
+			const cliOk = isApiKeySet(provider, session); // Pass session for CLI check too
 			const mcpOk = getMcpApiKeyStatus(provider, projectRoot);
 			return {
 				provider,

scripts/modules/task-manager/parse-prd.js

@@ -9,30 +9,28 @@ import {
 	writeJSON,
 	enableSilentMode,
 	disableSilentMode,
-	isSilentMode,
-	readJSON,
-	findTaskById
+	isSilentMode
 } from '../utils.js';
 
 import { generateObjectService } from '../ai-services-unified.js';
 import { getDebugFlag } from '../config-manager.js';
 import generateTaskFiles from './generate-task-files.js';
 
-// Define the Zod schema for a SINGLE task object
-const prdSingleTaskSchema = z.object({
-	id: z.number().int().positive(),
-	title: z.string().min(1),
-	description: z.string().min(1),
-	details: z.string().optional().default(''),
-	testStrategy: z.string().optional().default(''),
-	priority: z.enum(['high', 'medium', 'low']).default('medium'),
-	dependencies: z.array(z.number().int().positive()).optional().default([]),
-	status: z.string().optional().default('pending')
+// Define Zod schema for task validation
+const TaskSchema = z.object({
+	id: z.number(),
+	title: z.string(),
+	description: z.string(),
+	status: z.string().default('pending'),
+	dependencies: z.array(z.number()).default([]),
+	priority: z.string().default('medium'),
+	details: z.string().optional(),
+	testStrategy: z.string().optional()
 });
 
-// Define the Zod schema for the ENTIRE expected AI response object
-const prdResponseSchema = z.object({
-	tasks: z.array(prdSingleTaskSchema),
+// Define Zod schema for the complete tasks data
+const TasksDataSchema = z.object({
+	tasks: z.array(TaskSchema),
 	metadata: z.object({
 		projectName: z.string(),
 		totalTasks: z.number(),
@@ -47,114 +45,35 @@ const prdResponseSchema = z.object({
  * @param {string} tasksPath - Path to the tasks.json file
  * @param {number} numTasks - Number of tasks to generate
  * @param {Object} options - Additional options
- * @param {boolean} [options.useForce=false] - Whether to overwrite existing tasks.json.
- * @param {boolean} [options.useAppend=false] - Append to existing tasks file.
- * @param {Object} [options.reportProgress] - Function to report progress (optional, likely unused).
- * @param {Object} [options.mcpLog] - MCP logger object (optional).
- * @param {Object} [options.session] - Session object from MCP server (optional).
- * @param {string} [options.projectRoot] - Project root path (for MCP/env fallback).
- * @param {string} [outputFormat='text'] - Output format ('text' or 'json').
+ * @param {Object} options.reportProgress - Function to report progress to MCP server (optional)
+ * @param {Object} options.mcpLog - MCP logger object (optional)
+ * @param {Object} options.session - Session object from MCP server (optional)
  */
 async function parsePRD(prdPath, tasksPath, numTasks, options = {}) {
-	const {
-		reportProgress,
-		mcpLog,
-		session,
-		projectRoot,
-		useForce = false,
-		useAppend = false
-	} = options;
-	const isMCP = !!mcpLog;
-	const outputFormat = isMCP ? 'json' : 'text';
+	const { reportProgress, mcpLog, session } = options;
 
-	const logFn = mcpLog
-		? mcpLog
-		: {
-				// Wrapper for CLI
-				info: (...args) => log('info', ...args),
-				warn: (...args) => log('warn', ...args),
-				error: (...args) => log('error', ...args),
-				debug: (...args) => log('debug', ...args),
-				success: (...args) => log('success', ...args)
-			};
+	// Determine output format based on mcpLog presence (simplification)
+	const outputFormat = mcpLog ? 'json' : 'text';
 
-	// Create custom reporter using logFn
+	// Create custom reporter that checks for MCP log and silent mode
 	const report = (message, level = 'info') => {
-		// Check logFn directly
-		if (logFn && typeof logFn[level] === 'function') {
-			logFn[level](message);
+		if (mcpLog) {
+			mcpLog[level](message);
 		} else if (!isSilentMode() && outputFormat === 'text') {
-			// Fallback to original log only if necessary and in CLI text mode
+			// Only log to console if not in silent mode and outputFormat is 'text'
 			log(level, message);
 		}
 	};
 
-	report(
-		`Parsing PRD file: ${prdPath}, Force: ${useForce}, Append: ${useAppend}`
-	);
-
-	let existingTasks = [];
-	let nextId = 1;
-
 	try {
-		// Handle file existence and overwrite/append logic
-		if (fs.existsSync(tasksPath)) {
-			if (useAppend) {
-				report(
-					`Append mode enabled. Reading existing tasks from ${tasksPath}`,
-					'info'
-				);
-				const existingData = readJSON(tasksPath); // Use readJSON utility
-				if (existingData && Array.isArray(existingData.tasks)) {
-					existingTasks = existingData.tasks;
-					if (existingTasks.length > 0) {
-						nextId = Math.max(...existingTasks.map((t) => t.id || 0)) + 1;
-						report(
-							`Found ${existingTasks.length} existing tasks. Next ID will be ${nextId}.`,
-							'info'
-						);
-					}
-				} else {
-					report(
-						`Could not read existing tasks from ${tasksPath} or format is invalid. Proceeding without appending.`,
-						'warn'
-					);
-					existingTasks = []; // Reset if read fails
-				}
-			} else if (!useForce) {
-				// Not appending and not forcing overwrite
-				const overwriteError = new Error(
-					`Output file ${tasksPath} already exists. Use --force to overwrite or --append.`
-				);
-				report(overwriteError.message, 'error');
-				if (outputFormat === 'text') {
-					console.error(chalk.red(overwriteError.message));
-					process.exit(1);
-				} else {
-					throw overwriteError;
-				}
-			} else {
-				// Force overwrite is true
-				report(
-					`Force flag enabled. Overwriting existing file: ${tasksPath}`,
-					'info'
-				);
-			}
-		}
+		report(`Parsing PRD file: ${prdPath}`, 'info');
 
-		report(`Reading PRD content from ${prdPath}`, 'info');
+		// Read the PRD content
 		const prdContent = fs.readFileSync(prdPath, 'utf8');
-		if (!prdContent) {
-			throw new Error(`Input file ${prdPath} is empty or could not be read.`);
-		}
 
 		// Build system prompt for PRD parsing
-		const systemPrompt = `You are an AI assistant specialized in analyzing Product Requirements Documents (PRDs) and generating a structured, logically ordered, dependency-aware and sequenced list of development tasks in JSON format.
-Analyze the provided PRD content and generate approximately ${numTasks} top-level development tasks. If the complexity or the level of detail of the PRD is high, generate more tasks relative to the complexity of the PRD
-Each task should represent a logical unit of work needed to implement the requirements and focus on the most direct and effective way to implement the requirements without unnecessary complexity or overengineering. Include pseudo-code, implementation details, and test strategy for each task. Find the most up to date information to implement each task.
-Assign sequential IDs starting from ${nextId}. Infer title, description, details, and test strategy for each task based *only* on the PRD content.
-Set status to 'pending', dependencies to an empty array [], and priority to 'medium' initially for all tasks.
-Respond ONLY with a valid JSON object containing a single key "tasks", where the value is an array of task objects adhering to the provided Zod schema. Do not include any explanation or markdown formatting.
+		const systemPrompt = `You are an AI assistant helping to break down a Product Requirements Document (PRD) into a set of sequential development tasks. 
+Your goal is to create ${numTasks} well-structured, actionable development tasks based on the PRD provided.
 
 Each task should follow this JSON structure:
 {
@@ -169,12 +88,12 @@ Each task should follow this JSON structure:
 }
 
 Guidelines:
-1. Unless complexity warrants otherwise, create exactly ${numTasks} tasks, numbered sequentially starting from ${nextId}
-2. Each task should be atomic and focused on a single responsibility following the most up to date best practices and standards
+1. Create exactly ${numTasks} tasks, numbered from 1 to ${numTasks}
+2. Each task should be atomic and focused on a single responsibility
 3. Order tasks logically - consider dependencies and implementation sequence
 4. Early tasks should focus on setup, core functionality first, then advanced features
 5. Include clear validation/testing approach for each task
-6. Set appropriate dependency IDs (a task can only depend on tasks with lower IDs, potentially including existing tasks with IDs less than ${nextId} if applicable)
+6. Set appropriate dependency IDs (a task can only depend on tasks with lower IDs)
 7. Assign priority (high/medium/low) based on criticality and dependency order
 8. Include detailed implementation guidance in the "details" field
 9. If the PRD contains specific requirements for libraries, database schemas, frameworks, tech stacks, or any other implementation details, STRICTLY ADHERE to these requirements in your task breakdown and do not discard them under any circumstance
@@ -182,40 +101,41 @@ Guidelines:
 11. Always aim to provide the most direct path to implementation, avoiding over-engineering or roundabout approaches`;
 
 		// Build user prompt with PRD content
-		const userPrompt = `Here's the Product Requirements Document (PRD) to break down into approximately ${numTasks} tasks, starting IDs from ${nextId}:\n\n${prdContent}\n\n
+		const userPrompt = `Here's the Product Requirements Document (PRD) to break down into ${numTasks} tasks:
 
-		Return your response in this format:
+${prdContent}
+
+Return your response in this format:
 {
-    "tasks": [
-        {
-            "id": 1,
-            "title": "Setup Project Repository",
-            "description": "...",
-            ...
-        },
-        ...
-    ],
-    "metadata": {
-        "projectName": "PRD Implementation",
-        "totalTasks": ${numTasks},
-        "sourceFile": "${prdPath}",
-        "generatedAt": "YYYY-MM-DD"
-    }
+	"tasks": [
+		{
+			"id": 1,
+			"title": "Setup Project Repository",
+			"description": "...",
+			...
+		},
+		...
+	],
+	"metadata": {
+		"projectName": "PRD Implementation",
+		"totalTasks": ${numTasks},
+		"sourceFile": "${prdPath}",
+		"generatedAt": "YYYY-MM-DD"
+	}
 }`;
 
 		// Call the unified AI service
 		report('Calling AI service to generate tasks from PRD...', 'info');
 
-		// Call generateObjectService with the CORRECT schema
-		const generatedData = await generateObjectService({
-			role: 'main',
-			session: session,
-			projectRoot: projectRoot,
-			schema: prdResponseSchema,
-			objectName: 'tasks_data',
-			systemPrompt: systemPrompt,
-			prompt: userPrompt,
-			reportProgress
+		// Call generateObjectService with proper parameters
+		const tasksData = await generateObjectService({
+			role: 'main', // Use 'main' role to get the model from config
+			session: session, // Pass session for API key resolution
+			schema: TasksDataSchema, // Pass the schema for validation
+			objectName: 'tasks_data', // Name the generated object
+			systemPrompt: systemPrompt, // System instructions
+			prompt: userPrompt, // User prompt with PRD content
+			reportProgress // Progress reporting function
 		});
 
 		// Create the directory if it doesn't exist
@@ -223,58 +143,11 @@ Guidelines:
 		if (!fs.existsSync(tasksDir)) {
 			fs.mkdirSync(tasksDir, { recursive: true });
 		}
-		logFn.success('Successfully parsed PRD via AI service.'); // Assumes generateObjectService validated
-
-		// Validate and Process Tasks
-		if (!generatedData || !Array.isArray(generatedData.tasks)) {
-			// This error *shouldn't* happen if generateObjectService enforced prdResponseSchema
-			// But keep it as a safeguard
-			logFn.error(
-				`Internal Error: generateObjectService returned unexpected data structure: ${JSON.stringify(generatedData)}`
-			);
-			throw new Error(
-				'AI service returned unexpected data structure after validation.'
-			);
-		}
-
-		let currentId = nextId;
-		const taskMap = new Map();
-		const processedNewTasks = generatedData.tasks.map((task) => {
-			const newId = currentId++;
-			taskMap.set(task.id, newId);
-			return {
-				...task,
-				id: newId,
-				status: 'pending',
-				priority: task.priority || 'medium',
-				dependencies: Array.isArray(task.dependencies) ? task.dependencies : [],
-				subtasks: []
-			};
-		});
-
-		// Remap dependencies for the NEWLY processed tasks
-		processedNewTasks.forEach((task) => {
-			task.dependencies = task.dependencies
-				.map((depId) => taskMap.get(depId)) // Map old AI ID to new sequential ID
-				.filter(
-					(newDepId) =>
-						newDepId != null && // Must exist
-						newDepId < task.id && // Must be a lower ID (could be existing or newly generated)
-						(findTaskById(existingTasks, newDepId) || // Check if it exists in old tasks OR
-							processedNewTasks.some((t) => t.id === newDepId)) // check if it exists in new tasks
-				);
-		});
-
-		const allTasks = useAppend
-			? [...existingTasks, ...processedNewTasks]
-			: processedNewTasks;
-
-		const finalTaskData = { tasks: allTasks }; // Use the combined list
 
 		// Write the tasks to the file
-		writeJSON(tasksPath, finalTaskData);
+		writeJSON(tasksPath, tasksData);
 		report(
-			`Successfully wrote ${allTasks.length} total tasks to ${tasksPath} (${processedNewTasks.length} new).`,
+			`Successfully generated ${tasksData.tasks.length} tasks from PRD`,
 			'success'
 		);
 		report(`Tasks saved to: ${tasksPath}`, 'info');
@@ -283,10 +156,10 @@ Guidelines:
 		if (reportProgress && mcpLog) {
 			// Enable silent mode when being called from MCP server
 			enableSilentMode();
-			await generateTaskFiles(tasksPath, path.dirname(tasksPath));
+			await generateTaskFiles(tasksPath, tasksDir);
 			disableSilentMode();
 		} else {
-			await generateTaskFiles(tasksPath, path.dirname(tasksPath));
+			await generateTaskFiles(tasksPath, tasksDir);
 		}
 
 		// Only show success boxes for text output (CLI)
@@ -294,7 +167,7 @@ Guidelines:
 			console.log(
 				boxen(
 					chalk.green(
-						`Successfully generated ${processedNewTasks.length} new tasks. Total tasks in ${tasksPath}: ${allTasks.length}`
+						`Successfully generated ${tasksData.tasks.length} tasks from PRD`
 					),
 					{ padding: 1, borderColor: 'green', borderStyle: 'round' }
 				)
@@ -316,7 +189,7 @@ Guidelines:
 			);
 		}
 
-		return { success: true, tasks: processedNewTasks };
+		return tasksData;
 	} catch (error) {
 		report(`Error parsing PRD: ${error.message}`, 'error');
 
@@ -324,8 +197,8 @@ Guidelines:
 		if (outputFormat === 'text') {
 			console.error(chalk.red(`Error: ${error.message}`));
 
-			if (getDebugFlag(projectRoot)) {
-				// Use projectRoot for debug flag check
+			if (getDebugFlag(session)) {
+				// Use getter
 				console.error(error);
 			}
 

scripts/modules/task-manager/update-subtask-by-id.js

@@ -3,7 +3,6 @@ import path from 'path';
 import chalk from 'chalk';
 import boxen from 'boxen';
 import Table from 'cli-table3';
-import { z } from 'zod';
 
 import {
 	getStatusWithColor,
@@ -17,10 +16,7 @@ import {
 	truncate,
 	isSilentMode
 } from '../utils.js';
-import {
-	generateObjectService,
-	generateTextService
-} from '../ai-services-unified.js';
+import { generateTextService } from '../ai-services-unified.js';
 import { getDebugFlag } from '../config-manager.js';
 import generateTaskFiles from './generate-task-files.js';
 
@@ -33,7 +29,6 @@ import generateTaskFiles from './generate-task-files.js';
  * @param {Object} context - Context object containing session and mcpLog.
  * @param {Object} [context.session] - Session object from MCP server.
  * @param {Object} [context.mcpLog] - MCP logger object.
- * @param {string} [context.projectRoot] - Project root path (needed for AI service key resolution).
  * @param {string} [outputFormat='text'] - Output format ('text' or 'json'). Automatically 'json' if mcpLog is present.
  * @returns {Promise<Object|null>} - The updated subtask or null if update failed.
  */
@@ -45,7 +40,7 @@ async function updateSubtaskById(
 	context = {},
 	outputFormat = context.mcpLog ? 'json' : 'text'
 ) {
-	const { session, mcpLog, projectRoot } = context;
+	const { session, mcpLog } = context;
 	const logFn = mcpLog || consoleLog;
 	const isMCP = !!mcpLog;
 
@@ -135,16 +130,36 @@ async function updateSubtaskById(
 
 		const subtask = parentTask.subtasks[subtaskIndex];
 
-		const subtaskSchema = z.object({
-			id: z.number().int().positive(),
-			title: z.string(),
-			description: z.string().optional(),
-			status: z.string(),
-			dependencies: z.array(z.union([z.string(), z.number()])).optional(),
-			priority: z.string().optional(),
-			details: z.string().optional(),
-			testStrategy: z.string().optional()
-		});
+		// Check if subtask is already completed
+		if (subtask.status === 'done' || subtask.status === 'completed') {
+			report(
+				'warn',
+				`Subtask ${subtaskId} is already marked as done and cannot be updated`
+			);
+
+			// Only show UI elements for text output (CLI)
+			if (outputFormat === 'text') {
+				console.log(
+					boxen(
+						chalk.yellow(
+							`Subtask ${subtaskId} is already marked as ${subtask.status} and cannot be updated.`
+						) +
+							'\n\n' +
+							chalk.white(
+								'Completed subtasks are locked to maintain consistency. To modify a completed subtask, you must first:'
+							) +
+							'\n' +
+							chalk.white(
+								'1. Change its status to "pending" or "in-progress"'
+							) +
+							'\n' +
+							chalk.white('2. Then run the update-subtask command'),
+						{ padding: 1, borderColor: 'yellow', borderStyle: 'round' }
+					)
+				);
+			}
+			return null;
+		}
 
 		// Only show UI elements for text output (CLI)
 		if (outputFormat === 'text') {
@@ -177,161 +192,101 @@ async function updateSubtaskById(
 
 			// Start the loading indicator - only for text output
 			loadingIndicator = startLoadingIndicator(
-				useResearch
-					? 'Updating subtask with research...'
-					: 'Updating subtask...'
+				'Generating additional information with AI...'
 			);
 		}
 
-		let parsedAIResponse;
+		let additionalInformation = '';
 		try {
-			// --- GET PARENT & SIBLING CONTEXT ---
-			const parentContext = {
-				id: parentTask.id,
-				title: parentTask.title
-				// Avoid sending full parent description/details unless necessary
-			};
+			// Reverted: Keep the original system prompt
+			const systemPrompt = `You are an AI assistant helping to update software development subtasks with additional information.
+Given a subtask, you will provide additional details, implementation notes, or technical insights based on user request.
+Focus only on adding content that enhances the subtask - don't repeat existing information.
+Be technical, specific, and implementation-focused rather than general.
+Provide concrete examples, code snippets, or implementation details when relevant.`;
 
-			const prevSubtask =
-				subtaskIndex > 0
-					? {
-							id: `${parentTask.id}.${parentTask.subtasks[subtaskIndex - 1].id}`,
-							title: parentTask.subtasks[subtaskIndex - 1].title,
-							status: parentTask.subtasks[subtaskIndex - 1].status
-						}
-					: null;
+			// Reverted: Use the full JSON stringification for the user message
+			const subtaskData = JSON.stringify(subtask, null, 2);
+			const userMessageContent = `Here is the subtask to enhance:\n${subtaskData}\n\nPlease provide additional information addressing this request:\n${prompt}\n\nReturn ONLY the new information to add - do not repeat existing content.`;
 
-			const nextSubtask =
-				subtaskIndex < parentTask.subtasks.length - 1
-					? {
-							id: `${parentTask.id}.${parentTask.subtasks[subtaskIndex + 1].id}`,
-							title: parentTask.subtasks[subtaskIndex + 1].title,
-							status: parentTask.subtasks[subtaskIndex + 1].status
-						}
-					: null;
+			const serviceRole = useResearch ? 'research' : 'main';
+			report('info', `Calling AI text service with role: ${serviceRole}`);
 
-			const contextString = `
-Parent Task: ${JSON.stringify(parentContext)}
-${prevSubtask ? `Previous Subtask: ${JSON.stringify(prevSubtask)}` : ''}
-${nextSubtask ? `Next Subtask: ${JSON.stringify(nextSubtask)}` : ''}
-`;
-
-			const systemPrompt = `You are an AI assistant updating a parent task's subtask. This subtask will be part of a larger parent task and will be used to direct AI agents to complete the subtask. Your goal is to GENERATE new, relevant information based on the user's request (which may be high-level, mid-level or low-level) and APPEND it to the existing subtask 'details' field, wrapped in specific XML-like tags with an ISO 8601 timestamp. Intelligently determine the level of detail to include based on the user's request. Some requests are meant simply to update the subtask with some mid-implementation details, while others are meant to update the subtask with a detailed plan or strategy.
-
-Context Provided:
-- The current subtask object.
-- Basic info about the parent task (ID, title).
-- Basic info about the immediately preceding subtask (ID, title, status), if it exists.
-- Basic info about the immediately succeeding subtask (ID, title, status), if it exists.
-- A user request string.
-
-Guidelines:
-1. Analyze the user request considering the provided subtask details AND the context of the parent and sibling tasks.
-2. GENERATE new, relevant text content that should be added to the 'details' field. Focus *only* on the substance of the update based on the user request and context. Do NOT add timestamps or any special formatting yourself. Avoid over-engineering the details, provide .
-3. Update the 'details' field in the subtask object with the GENERATED text content. It's okay if this overwrites previous details in the object you return, as the calling code will handle the final appending.
-4. Return the *entire* updated subtask object (with your generated content in the 'details' field) as a valid JSON object conforming to the provided schema. Do NOT return explanations or markdown formatting.`;
-
-			const subtaskDataString = JSON.stringify(subtask, null, 2);
-			// Updated user prompt including context
-			const userPrompt = `Task Context:\n${contextString}\nCurrent Subtask:\n${subtaskDataString}\n\nUser Request: "${prompt}"\n\nPlease GENERATE new, relevant text content for the 'details' field based on the user request and the provided context. Return the entire updated subtask object as a valid JSON object matching the schema, with the newly generated text placed in the 'details' field.`;
-			// --- END UPDATED PROMPTS ---
-
-			// Call Unified AI Service using generateObjectService
-			const role = useResearch ? 'research' : 'main';
-			report('info', `Using AI object service with role: ${role}`);
-
-			parsedAIResponse = await generateObjectService({
-				prompt: userPrompt,
+			const streamResult = await generateTextService({
+				role: serviceRole,
+				session: session,
 				systemPrompt: systemPrompt,
-				schema: subtaskSchema,
-				objectName: 'updatedSubtask',
-				role,
-				session,
-				projectRoot,
-				maxRetries: 2
+				prompt: userMessageContent
 			});
-			report(
-				'success',
-				'Successfully received object response from AI service'
-			);
 
 			if (outputFormat === 'text' && loadingIndicator) {
+				// Stop indicator immediately since generateText is blocking
 				stopLoadingIndicator(loadingIndicator);
 				loadingIndicator = null;
 			}
 
-			if (!parsedAIResponse || typeof parsedAIResponse !== 'object') {
-				throw new Error('AI did not return a valid object.');
-			}
+			// Assign the result directly (generateTextService returns the text string)
+			additionalInformation = streamResult ? streamResult.trim() : '';
 
+			if (!additionalInformation) {
+				throw new Error('AI returned empty response.'); // Changed error message slightly
+			}
 			report(
+				// Corrected log message to reflect generateText
 				'success',
-				`Successfully generated object using AI role: ${role}.`
+				`Successfully generated text using AI role: ${serviceRole}.`
 			);
 		} catch (aiError) {
 			report('error', `AI service call failed: ${aiError.message}`);
-			if (outputFormat === 'text' && loadingIndicator) {
-				stopLoadingIndicator(loadingIndicator); // Ensure stop on error
-				loadingIndicator = null;
-			}
 			throw aiError;
-		}
+		} // Removed the inner finally block as streamingInterval is gone
 
-		// --- TIMESTAMP & FORMATTING LOGIC (Handled Locally) ---
-		// Extract only the generated content from the AI's response details field.
-		const generatedContent = parsedAIResponse.details || ''; // Default to empty string
+		const currentDate = new Date();
 
-		if (generatedContent.trim()) {
-			// Generate timestamp locally
-			const timestamp = new Date().toISOString(); // <<< Local Timestamp
-
-			// Format the content with XML-like tags and timestamp LOCALLY
-			const formattedBlock = `<info added on ${timestamp}>\n${generatedContent.trim()}\n</info added on ${timestamp}>`; // <<< Local Formatting
-
-			// Append the formatted block to the *original* subtask details
-			subtask.details =
-				(subtask.details ? subtask.details + '\n' : '') + formattedBlock; // <<< Local Appending
-			report(
-				'info',
-				'Appended timestamped, formatted block with AI-generated content to subtask.details.'
-			);
-		} else {
-			report(
-				'warn',
-				'AI response object did not contain generated content in the "details" field. Original details remain unchanged.'
-			);
-		}
-		// --- END TIMESTAMP & FORMATTING LOGIC ---
-
-		// Get a reference to the subtask *after* its details have been updated
-		const updatedSubtask = parentTask.subtasks[subtaskIndex]; // subtask === updatedSubtask now
-
-		report('info', 'Updated subtask details locally after AI generation.');
-		// --- END UPDATE SUBTASK ---
+		// Format the additional information with timestamp
+		const formattedInformation = `\n\n<info added on ${currentDate.toISOString()}>\n${additionalInformation}\n</info added on ${currentDate.toISOString()}>`;
 
 		// Only show debug info for text output (CLI)
 		if (outputFormat === 'text' && getDebugFlag(session)) {
 			console.log(
-				'>>> DEBUG: Subtask details AFTER AI update:',
-				updatedSubtask.details // Use updatedSubtask
+				'>>> DEBUG: formattedInformation:',
+				formattedInformation.substring(0, 70) + '...'
 			);
 		}
 
-		// Description update logic (keeping as is for now)
-		if (updatedSubtask.description) {
-			// Use updatedSubtask
-			if (prompt.length < 100) {
+		// Append to subtask details and description
+		// Only show debug info for text output (CLI)
+		if (outputFormat === 'text' && getDebugFlag(session)) {
+			console.log('>>> DEBUG: Subtask details BEFORE append:', subtask.details);
+		}
+
+		if (subtask.details) {
+			subtask.details += formattedInformation;
+		} else {
+			subtask.details = `${formattedInformation}`;
+		}
+
+		// Only show debug info for text output (CLI)
+		if (outputFormat === 'text' && getDebugFlag(session)) {
+			console.log('>>> DEBUG: Subtask details AFTER append:', subtask.details);
+		}
+
+		if (subtask.description) {
+			// Only append to description if it makes sense (for shorter updates)
+			if (additionalInformation.length < 200) {
+				// Only show debug info for text output (CLI)
 				if (outputFormat === 'text' && getDebugFlag(session)) {
 					console.log(
 						'>>> DEBUG: Subtask description BEFORE append:',
-						updatedSubtask.description // Use updatedSubtask
+						subtask.description
 					);
 				}
-				updatedSubtask.description += ` [Updated: ${new Date().toLocaleDateString()}]`; // Use updatedSubtask
+				subtask.description += ` [Updated: ${currentDate.toLocaleDateString()}]`;
+				// Only show debug info for text output (CLI)
 				if (outputFormat === 'text' && getDebugFlag(session)) {
 					console.log(
 						'>>> DEBUG: Subtask description AFTER append:',
-						updatedSubtask.description // Use updatedSubtask
+						subtask.description
 					);
 				}
 			}
@@ -342,7 +297,10 @@ Guidelines:
 			console.log('>>> DEBUG: About to call writeJSON with updated data...');
 		}
 
-		// Write the updated tasks to the file (parentTask already contains the updated subtask)
+		// Update the subtask in the parent task's array
+		parentTask.subtasks[subtaskIndex] = subtask;
+
+		// Write the updated tasks to the file
 		writeJSON(tasksPath, data);
 
 		// Only show debug info for text output (CLI)
@@ -368,18 +326,17 @@ Guidelines:
 						'\n\n' +
 						chalk.white.bold('Title:') +
 						' ' +
-						updatedSubtask.title +
+						subtask.title +
 						'\n\n' +
-						// Update the display to show the new details field
-						chalk.white.bold('Updated Details:') +
+						chalk.white.bold('Information Added:') +
 						'\n' +
-						chalk.white(truncate(updatedSubtask.details || '', 500, true)), // Use updatedSubtask
+						chalk.white(truncate(additionalInformation, 300, true)),
 					{ padding: 1, borderColor: 'green', borderStyle: 'round' }
 				)
 			);
 		}
 
-		return updatedSubtask; // Return the modified subtask object
+		return subtask;
 	} catch (error) {
 		// Outer catch block handles final errors after loop/attempts
 		// Stop indicator on error - only for text output (CLI)

scripts/modules/task-manager/update-task-by-id.js

@@ -70,80 +70,29 @@ function parseUpdatedTaskFromText(text, expectedTaskId, logFn, isMCP) {
 
 	let cleanedResponse = text.trim();
 	const originalResponseForDebug = cleanedResponse;
-	let parseMethodUsed = 'raw'; // Keep track of which method worked
 
-	// --- NEW Step 1: Try extracting between {} first ---
-	const firstBraceIndex = cleanedResponse.indexOf('{');
-	const lastBraceIndex = cleanedResponse.lastIndexOf('}');
-	let potentialJsonFromBraces = null;
-
-	if (firstBraceIndex !== -1 && lastBraceIndex > firstBraceIndex) {
-		potentialJsonFromBraces = cleanedResponse.substring(
-			firstBraceIndex,
-			lastBraceIndex + 1
-		);
-		if (potentialJsonFromBraces.length <= 2) {
-			potentialJsonFromBraces = null; // Ignore empty braces {}
-		}
-	}
-
-	// If {} extraction yielded something, try parsing it immediately
-	if (potentialJsonFromBraces) {
-		try {
-			const testParse = JSON.parse(potentialJsonFromBraces);
-			// It worked! Use this as the primary cleaned response.
-			cleanedResponse = potentialJsonFromBraces;
-			parseMethodUsed = 'braces';
-			report(
-				'info',
-				'Successfully parsed JSON content extracted between first { and last }.'
-			);
-		} catch (e) {
-			report(
-				'info',
-				'Content between {} looked promising but failed initial parse. Proceeding to other methods.'
-			);
-			// Reset cleanedResponse to original if brace parsing failed
-			cleanedResponse = originalResponseForDebug;
-		}
-	}
-
-	// --- Step 2: If brace parsing didn't work or wasn't applicable, try code block extraction ---
-	if (parseMethodUsed === 'raw') {
-		const codeBlockMatch = cleanedResponse.match(
-			/```(?:json|javascript)?\s*([\s\S]*?)\s*```/i
-		);
-		if (codeBlockMatch) {
-			cleanedResponse = codeBlockMatch[1].trim();
-			parseMethodUsed = 'codeblock';
-			report('info', 'Extracted JSON content from Markdown code block.');
+	// Extract from Markdown code block first
+	const codeBlockMatch = cleanedResponse.match(
+		/```(?:json)?\s*([\s\S]*?)\s*```/
+	);
+	if (codeBlockMatch) {
+		cleanedResponse = codeBlockMatch[1].trim();
+		report('info', 'Extracted JSON content from Markdown code block.');
+	} else {
+		// If no code block, find first '{' and last '}' for the object
+		const firstBrace = cleanedResponse.indexOf('{');
+		const lastBrace = cleanedResponse.lastIndexOf('}');
+		if (firstBrace !== -1 && lastBrace > firstBrace) {
+			cleanedResponse = cleanedResponse.substring(firstBrace, lastBrace + 1);
+			report('info', 'Extracted content between first { and last }.');
 		} else {
-			// --- Step 3: If code block failed, try stripping prefixes ---
-			const commonPrefixes = [
-				'json\n',
-				'javascript\n'
-				// ... other prefixes ...
-			];
-			let prefixFound = false;
-			for (const prefix of commonPrefixes) {
-				if (cleanedResponse.toLowerCase().startsWith(prefix)) {
-					cleanedResponse = cleanedResponse.substring(prefix.length).trim();
-					parseMethodUsed = 'prefix';
-					report('info', `Stripped prefix: "${prefix.trim()}"`);
-					prefixFound = true;
-					break;
-				}
-			}
-			if (!prefixFound) {
-				report(
-					'warn',
-					'Response does not appear to contain {}, code block, or known prefix. Attempting raw parse.'
-				);
-			}
+			report(
+				'warn',
+				'Response does not appear to contain a JSON object structure. Parsing raw response.'
+			);
 		}
 	}
 
-	// --- Step 4: Attempt final parse ---
 	let parsedTask;
 	try {
 		parsedTask = JSON.parse(cleanedResponse);
@@ -219,7 +168,7 @@ async function updateTaskById(
 	context = {},
 	outputFormat = 'text'
 ) {
-	const { session, mcpLog, projectRoot } = context;
+	const { session, mcpLog } = context;
 	const logFn = mcpLog || consoleLog;
 	const isMCP = !!mcpLog;
 
@@ -380,7 +329,7 @@ The changes described in the prompt should be thoughtfully applied to make the t
 		let loadingIndicator = null;
 		if (outputFormat === 'text') {
 			loadingIndicator = startLoadingIndicator(
-				useResearch ? 'Updating task with research...\n' : 'Updating task...\n'
+				useResearch ? 'Updating task with research...' : 'Updating task...'
 			);
 		}
 
@@ -394,8 +343,7 @@ The changes described in the prompt should be thoughtfully applied to make the t
 				prompt: userPrompt,
 				systemPrompt: systemPrompt,
 				role,
-				session,
-				projectRoot
+				session
 			});
 			report('success', 'Successfully received text response from AI service');
 			// --- End AI Service Call ---

scripts/modules/task-manager/update-tasks.js

@@ -21,7 +21,6 @@ import {
 import { getDebugFlag } from '../config-manager.js';
 import generateTaskFiles from './generate-task-files.js';
 import { generateTextService } from '../ai-services-unified.js';
-import { getModelConfiguration } from './models.js';
 
 // Zod schema for validating the structure of tasks AFTER parsing
 const updatedTaskSchema = z
@@ -43,12 +42,13 @@ const updatedTaskArraySchema = z.array(updatedTaskSchema);
  * Parses an array of task objects from AI's text response.
  * @param {string} text - Response text from AI.
  * @param {number} expectedCount - Expected number of tasks.
- * @param {Function | Object} logFn - The logging function or MCP log object.
+ * @param {Function | Object} logFn - The logging function (consoleLog) or MCP log object.
  * @param {boolean} isMCP - Flag indicating if logFn is MCP logger.
  * @returns {Array} Parsed and validated tasks array.
  * @throws {Error} If parsing or validation fails.
  */
 function parseUpdatedTasksFromText(text, expectedCount, logFn, isMCP) {
+	// Helper for consistent logging inside parser
 	const report = (level, ...args) => {
 		if (isMCP) {
 			if (typeof logFn[level] === 'function') logFn[level](...args);
@@ -68,98 +68,38 @@ function parseUpdatedTasksFromText(text, expectedCount, logFn, isMCP) {
 
 	let cleanedResponse = text.trim();
 	const originalResponseForDebug = cleanedResponse;
-	let parseMethodUsed = 'raw'; // Track which method worked
 
-	// --- NEW Step 1: Try extracting between [] first ---
-	const firstBracketIndex = cleanedResponse.indexOf('[');
-	const lastBracketIndex = cleanedResponse.lastIndexOf(']');
-	let potentialJsonFromArray = null;
-
-	if (firstBracketIndex !== -1 && lastBracketIndex > firstBracketIndex) {
-		potentialJsonFromArray = cleanedResponse.substring(
-			firstBracketIndex,
-			lastBracketIndex + 1
-		);
-		// Basic check to ensure it's not just "[]" or malformed
-		if (potentialJsonFromArray.length <= 2) {
-			potentialJsonFromArray = null; // Ignore empty array
-		}
-	}
-
-	// If [] extraction yielded something, try parsing it immediately
-	if (potentialJsonFromArray) {
-		try {
-			const testParse = JSON.parse(potentialJsonFromArray);
-			// It worked! Use this as the primary cleaned response.
-			cleanedResponse = potentialJsonFromArray;
-			parseMethodUsed = 'brackets';
-			report(
-				'info',
-				'Successfully parsed JSON content extracted between first [ and last ].'
+	// Extract from Markdown code block first
+	const codeBlockMatch = cleanedResponse.match(
+		/```(?:json)?\s*([\s\S]*?)\s*```/
+	);
+	if (codeBlockMatch) {
+		cleanedResponse = codeBlockMatch[1].trim();
+		report('info', 'Extracted JSON content from Markdown code block.');
+	} else {
+		// If no code block, find first '[' and last ']' for the array
+		const firstBracket = cleanedResponse.indexOf('[');
+		const lastBracket = cleanedResponse.lastIndexOf(']');
+		if (firstBracket !== -1 && lastBracket > firstBracket) {
+			cleanedResponse = cleanedResponse.substring(
+				firstBracket,
+				lastBracket + 1
 			);
-		} catch (e) {
-			report(
-				'info',
-				'Content between [] looked promising but failed initial parse. Proceeding to other methods.'
-			);
-			// Reset cleanedResponse to original if bracket parsing failed
-			cleanedResponse = originalResponseForDebug;
-		}
-	}
-
-	// --- Step 2: If bracket parsing didn't work or wasn't applicable, try code block extraction ---
-	if (parseMethodUsed === 'raw') {
-		// Only look for ```json blocks now
-		const codeBlockMatch = cleanedResponse.match(
-			/```json\s*([\s\S]*?)\s*```/i // Only match ```json
-		);
-		if (codeBlockMatch) {
-			cleanedResponse = codeBlockMatch[1].trim();
-			parseMethodUsed = 'codeblock';
-			report('info', 'Extracted JSON content from JSON Markdown code block.');
+			report('info', 'Extracted content between first [ and last ].');
 		} else {
-			report('info', 'No JSON code block found.');
-			// --- Step 3: If code block failed, try stripping prefixes ---
-			const commonPrefixes = [
-				'json\n',
-				'javascript\n', // Keep checking common prefixes just in case
-				'python\n',
-				'here are the updated tasks:',
-				'here is the updated json:',
-				'updated tasks:',
-				'updated json:',
-				'response:',
-				'output:'
-			];
-			let prefixFound = false;
-			for (const prefix of commonPrefixes) {
-				if (cleanedResponse.toLowerCase().startsWith(prefix)) {
-					cleanedResponse = cleanedResponse.substring(prefix.length).trim();
-					parseMethodUsed = 'prefix';
-					report('info', `Stripped prefix: "${prefix.trim()}"`);
-					prefixFound = true;
-					break;
-				}
-			}
-			if (!prefixFound) {
-				report(
-					'warn',
-					'Response does not appear to contain [], JSON code block, or known prefix. Attempting raw parse.'
-				);
-			}
+			report(
+				'warn',
+				'Response does not appear to contain a JSON array structure. Parsing raw response.'
+			);
 		}
 	}
 
-	// --- Step 4: Attempt final parse ---
+	// Attempt to parse the array
 	let parsedTasks;
 	try {
 		parsedTasks = JSON.parse(cleanedResponse);
 	} catch (parseError) {
 		report('error', `Failed to parse JSON array: ${parseError.message}`);
-		report(
-			'error',
-			`Extraction method used: ${parseMethodUsed}` // Log which method failed
-		);
 		report(
 			'error',
 			`Problematic JSON string (first 500 chars): ${cleanedResponse.substring(0, 500)}`
@@ -173,7 +113,7 @@ function parseUpdatedTasksFromText(text, expectedCount, logFn, isMCP) {
 		);
 	}
 
-	// --- Step 5 & 6: Validate Array structure and Zod schema ---
+	// Validate Array structure
 	if (!Array.isArray(parsedTasks)) {
 		report(
 			'error',
@@ -194,6 +134,7 @@ function parseUpdatedTasksFromText(text, expectedCount, logFn, isMCP) {
 		);
 	}
 
+	// Validate each task object using Zod
 	const validationResult = updatedTaskArraySchema.safeParse(parsedTasks);
 	if (!validationResult.success) {
 		report('error', 'Parsed task array failed Zod validation.');
@@ -206,6 +147,7 @@ function parseUpdatedTasksFromText(text, expectedCount, logFn, isMCP) {
 	}
 
 	report('info', 'Successfully validated task structure.');
+	// Return the validated data, potentially filtering/adjusting length if needed
 	return validationResult.data.slice(
 		0,
 		expectedCount || validationResult.data.length
@@ -231,7 +173,7 @@ async function updateTasks(
 	context = {},
 	outputFormat = 'text' // Default to text for CLI
 ) {
-	const { session, mcpLog, projectRoot } = context;
+	const { session, mcpLog } = context;
 	// Use mcpLog if available, otherwise use the imported consoleLog function
 	const logFn = mcpLog || consoleLog;
 	// Flag to easily check which logger type we have
@@ -275,7 +217,7 @@ async function updateTasks(
 					chalk.cyan.bold('Title'),
 					chalk.cyan.bold('Status')
 				],
-				colWidths: [5, 70, 20]
+				colWidths: [5, 60, 10]
 			});
 
 			tasksToUpdate.forEach((task) => {
@@ -352,7 +294,9 @@ The changes described in the prompt should be applied to ALL tasks in the list.`
 
 		let loadingIndicator = null;
 		if (outputFormat === 'text') {
-			loadingIndicator = startLoadingIndicator('Updating tasks...\n');
+			loadingIndicator = startLoadingIndicator(
+				'Calling AI service to update tasks...'
+			);
 		}
 
 		let responseText = '';
@@ -368,8 +312,7 @@ The changes described in the prompt should be applied to ALL tasks in the list.`
 				prompt: userPrompt,
 				systemPrompt: systemPrompt,
 				role,
-				session,
-				projectRoot
+				session
 			});
 			if (isMCP) logFn.info('Successfully received text response');
 			else

scripts/modules/ui.js

@@ -9,13 +9,7 @@ import boxen from 'boxen';
 import ora from 'ora';
 import Table from 'cli-table3';
 import gradient from 'gradient-string';
-import {
-	log,
-	findTaskById,
-	readJSON,
-	truncate,
-	isSilentMode
-} from './utils.js';
+import { log, findTaskById, readJSON, truncate } from './utils.js';
 import path from 'path';
 import fs from 'fs';
 import { findNextTask, analyzeTaskComplexity } from './task-manager.js';
@@ -29,8 +23,6 @@ const warmGradient = gradient(['#fb8b24', '#e36414', '#9a031e']);
  * Display a fancy banner for the CLI
  */
 function displayBanner() {
-	if (isSilentMode()) return;
-
 	console.clear();
 	const bannerText = figlet.textSync('Task Master', {
 		font: 'Standard',

scripts/modules/utils.js

@@ -6,7 +6,6 @@
 import fs from 'fs';
 import path from 'path';
 import chalk from 'chalk';
-import dotenv from 'dotenv';
 // Import specific config getters needed here
 import { getLogLevel, getDebugFlag } from './config-manager.js';
 
@@ -15,47 +14,16 @@ let silentMode = false;
 
 // --- Environment Variable Resolution Utility ---
 /**
- * Resolves an environment variable's value.
- * Precedence:
- * 1. session.env (if session provided)
- * 2. process.env
- * 3. .env file at projectRoot (if projectRoot provided)
- * @param {string} key - The environment variable key.
- * @param {object|null} [session=null] - The MCP session object.
- * @param {string|null} [projectRoot=null] - The project root directory (for .env fallback).
+ * Resolves an environment variable by checking process.env first, then session.env.
+ * @param {string} varName - The name of the environment variable.
+ * @param {string|null} session - The MCP session object (optional).
  * @returns {string|undefined} The value of the environment variable or undefined if not found.
  */
-function resolveEnvVariable(key, session = null, projectRoot = null) {
-	// 1. Check session.env
-	if (session?.env?.[key]) {
-		return session.env[key];
-	}
-
-	// 2. Read .env file at projectRoot
-	if (projectRoot) {
-		const envPath = path.join(projectRoot, '.env');
-		if (fs.existsSync(envPath)) {
-			try {
-				const envFileContent = fs.readFileSync(envPath, 'utf-8');
-				const parsedEnv = dotenv.parse(envFileContent); // Use dotenv to parse
-				if (parsedEnv && parsedEnv[key]) {
-					// console.log(`DEBUG: Found key ${key} in ${envPath}`); // Optional debug log
-					return parsedEnv[key];
-				}
-			} catch (error) {
-				// Log error but don't crash, just proceed as if key wasn't found in file
-				log('warn', `Could not read or parse ${envPath}: ${error.message}`);
-			}
-		}
-	}
-
-	// 3. Fallback: Check process.env
-	if (process.env[key]) {
-		return process.env[key];
-	}
-
-	// Not found anywhere
-	return undefined;
+function resolveEnvVariable(varName, session) {
+	// Ensure session and session.env exist before attempting access
+	const sessionValue =
+		session && session.env ? session.env[varName] : undefined;
+	return process.env[varName] ?? sessionValue;
 }
 
 // --- Project Root Finding Utility ---
@@ -510,6 +478,8 @@ function detectCamelCaseFlags(args) {
 
 // Export all utility functions and configuration
 export {
+	// CONFIG, <-- Already Removed
+	// getConfig <-- Removing now
 	LOG_LEVELS,
 	log,
 	readJSON,
@@ -530,4 +500,5 @@ export {
 	resolveEnvVariable,
 	getTaskManager,
 	findProjectRoot
+	// getConfig <-- Removed
 };

scripts/sample-prd.txt

@@ -0,0 +1,3 @@
+Task Master PRD
+
+Create a CLI tool for task management

scripts/task-complexity-report.json

@@ -1,299 +1,259 @@
 {
 	"meta": {
-		"generatedAt": "2025-05-03T04:45:36.864Z",
-		"tasksAnalyzed": 36,
+		"generatedAt": "2025-04-25T02:29:42.258Z",
+		"tasksAnalyzed": 31,
 		"thresholdScore": 5,
-		"projectName": "Taskmaster",
+		"projectName": "Task Master",
 		"usedResearch": false
 	},
 	"complexityAnalysis": [
 		{
 			"taskId": 24,
 			"taskTitle": "Implement AI-Powered Test Generation Command",
-			"complexityScore": 8,
-			"recommendedSubtasks": 5,
-			"expansionPrompt": "Expand the 'Implement AI-Powered Test Generation Command' task by detailing the specific steps required for AI prompt engineering, including data extraction, prompt formatting, and error handling.",
-			"reasoning": "Requires AI integration, complex logic, and thorough testing. Prompt engineering and API interaction add significant complexity."
+			"complexityScore": 9,
+			"recommendedSubtasks": 10,
+			"expansionPrompt": "Break down the implementation of an AI-powered test generation command into granular steps, covering CLI integration, task retrieval, AI prompt construction, API integration, test file formatting, error handling, documentation, and comprehensive testing (unit, integration, error cases, and manual verification).",
+			"reasoning": "This task involves advanced CLI development, deep integration with external AI APIs, dynamic prompt engineering, file system operations, error handling, and extensive testing. It requires orchestrating multiple subsystems and ensuring robust, user-friendly output. The cognitive and technical demands are high, justifying a high complexity score and a need for further decomposition into at least 10 subtasks to manage risk and ensure quality.[1][3][4][5]"
 		},
 		{
 			"taskId": 26,
 			"taskTitle": "Implement Context Foundation for AI Operations",
 			"complexityScore": 7,
-			"recommendedSubtasks": 6,
-			"expansionPrompt": "Expand the 'Implement Context Foundation for AI Operations' task by detailing the specific steps for integrating file reading, cursor rules, and basic context extraction into the Claude API prompts.",
-			"reasoning": "Involves modifying multiple commands and integrating different context sources. Error handling and backwards compatibility are crucial."
+			"recommendedSubtasks": 8,
+			"expansionPrompt": "Expand the context foundation implementation into detailed subtasks for CLI flag integration, file reading utilities, error handling, context formatting, command handler updates, documentation, and comprehensive testing for both functionality and error scenarios.",
+			"reasoning": "This task introduces foundational context management across multiple commands, requiring careful CLI design, file I/O, error handling, and integration with AI prompt construction. While less complex than full AI-powered features, it still spans several modules and requires robust validation, suggesting a moderate-to-high complexity and a need for further breakdown.[1][3][4]"
 		},
 		{
 			"taskId": 27,
 			"taskTitle": "Implement Context Enhancements for AI Operations",
 			"complexityScore": 8,
-			"recommendedSubtasks": 6,
-			"expansionPrompt": "Expand the 'Implement Context Enhancements for AI Operations' task by detailing the specific steps for code context extraction, task history integration, and PRD context integration, including parsing, summarization, and formatting.",
-			"reasoning": "Builds upon the previous task with more sophisticated context extraction and integration. Requires intelligent parsing and summarization."
+			"recommendedSubtasks": 10,
+			"expansionPrompt": "Decompose the context enhancement task into subtasks for code context extraction, task history integration, PRD summarization, context formatting, token optimization, error handling, and comprehensive testing for each new context type.",
+			"reasoning": "This phase builds on the foundation to add sophisticated context extraction (code, history, PRD), requiring advanced parsing, summarization, and prompt engineering. The need to optimize for token limits and maintain performance across large codebases increases both technical and cognitive complexity, warranting a high score and further subtask expansion.[1][3][4][5]"
 		},
 		{
 			"taskId": 28,
 			"taskTitle": "Implement Advanced ContextManager System",
-			"complexityScore": 9,
-			"recommendedSubtasks": 7,
-			"expansionPrompt": "Expand the 'Implement Advanced ContextManager System' task by detailing the specific steps for creating the ContextManager class, implementing the optimization pipeline, and adding command interface enhancements, including caching and performance monitoring.",
-			"reasoning": "A comprehensive system requiring careful design, optimization, and testing. Involves complex algorithms and performance considerations."
+			"complexityScore": 10,
+			"recommendedSubtasks": 12,
+			"expansionPrompt": "Expand the ContextManager implementation into subtasks for class design, context source integration, optimization algorithms, caching, token management, command interface updates, AI service integration, performance monitoring, logging, and comprehensive testing (unit, integration, performance, and user experience).",
+			"reasoning": "This is a highly complex architectural task involving advanced class design, optimization algorithms, dynamic context prioritization, caching, and integration with multiple AI services. It requires deep system knowledge, careful performance considerations, and robust error handling, making it one of the most complex tasks in the set and justifying a large number of subtasks.[1][3][4][5]"
 		},
 		{
 			"taskId": 32,
 			"taskTitle": "Implement \"learn\" Command for Automatic Cursor Rule Generation",
 			"complexityScore": 9,
-			"recommendedSubtasks": 10,
-			"expansionPrompt": "Expand the 'Implement \"learn\" Command for Automatic Cursor Rule Generation' task by detailing the specific steps for Cursor data analysis, rule management, and AI integration, including error handling and performance optimization.",
-			"reasoning": "Requires deep integration with Cursor's data, complex pattern analysis, and AI interaction. Significant error handling and performance optimization are needed."
+			"recommendedSubtasks": 15,
+			"expansionPrompt": "Break down the 'learn' command implementation into subtasks for file structure setup, path utilities, chat history analysis, rule management, AI integration, error handling, performance optimization, CLI integration, logging, and comprehensive testing.",
+			"reasoning": "This task requires orchestrating file system operations, parsing complex chat and code histories, managing rule templates, integrating with AI for pattern extraction, and ensuring robust error handling and performance. The breadth and depth of required functionality, along with the need for both automatic and manual triggers, make this a highly complex task needing extensive decomposition.[1][3][4][5]"
+		},
+		{
+			"taskId": 35,
+			"taskTitle": "Integrate Grok3 API for Research Capabilities",
+			"complexityScore": 7,
+			"recommendedSubtasks": 8,
+			"expansionPrompt": "Expand the Grok3 API integration into subtasks for API client development, service layer updates, payload/response adaptation, error handling, configuration management, UI updates, backward compatibility, and documentation/testing.",
+			"reasoning": "This migration task involves replacing a core external API, adapting to new request/response formats, updating configuration and UI, and ensuring backward compatibility. While not as cognitively complex as some AI tasks, the risk and breadth of impact across the system justify a moderate-to-high complexity and further breakdown.[1][3][4]"
+		},
+		{
+			"taskId": 36,
+			"taskTitle": "Add Ollama Support for AI Services as Claude Alternative",
+			"complexityScore": 7,
+			"recommendedSubtasks": 8,
+			"expansionPrompt": "Decompose the Ollama integration into subtasks for service class implementation, configuration, model selection, prompt formatting, error handling, fallback logic, documentation, and comprehensive testing.",
+			"reasoning": "Adding a local AI provider requires interface compatibility, configuration management, error handling, and fallback logic, as well as user documentation. The technical complexity is moderate-to-high, especially in ensuring seamless switching and robust error handling, warranting further subtasking.[1][3][4]"
+		},
+		{
+			"taskId": 37,
+			"taskTitle": "Add Gemini Support for Main AI Services as Claude Alternative",
+			"complexityScore": 7,
+			"recommendedSubtasks": 8,
+			"expansionPrompt": "Expand Gemini integration into subtasks for service class creation, authentication, prompt/response mapping, configuration, error handling, streaming support, documentation, and comprehensive testing.",
+			"reasoning": "Integrating a new cloud AI provider involves authentication, API adaptation, configuration, and ensuring feature parity. The complexity is similar to other provider integrations, requiring careful planning and multiple subtasks for robust implementation and testing.[1][3][4]"
 		},
 		{
 			"taskId": 40,
 			"taskTitle": "Implement 'plan' Command for Task Implementation Planning",
 			"complexityScore": 6,
-			"recommendedSubtasks": 4,
-			"expansionPrompt": "Expand the 'Implement 'plan' Command for Task Implementation Planning' task by detailing the steps for retrieving task content, generating implementation plans with AI, and formatting the plan within XML tags.",
-			"reasoning": "Involves AI integration and requires careful formatting and error handling. Switching between Claude and Perplexity adds complexity."
+			"recommendedSubtasks": 6,
+			"expansionPrompt": "Break down the 'plan' command implementation into subtasks for CLI integration, task/subtask retrieval, AI prompt construction, plan formatting, error handling, and testing.",
+			"reasoning": "This task involves AI prompt engineering, CLI integration, and content formatting, but is more focused and less technically demanding than full AI service or context management features. It still requires careful error handling and testing, suggesting a moderate complexity and a handful of subtasks.[1][3][4]"
 		},
 		{
 			"taskId": 41,
 			"taskTitle": "Implement Visual Task Dependency Graph in Terminal",
 			"complexityScore": 8,
-			"recommendedSubtasks": 8,
-			"expansionPrompt": "Expand the 'Implement Visual Task Dependency Graph in Terminal' task by detailing the steps for designing the graph rendering system, implementing layout algorithms, and handling circular dependencies and filtering options.",
-			"reasoning": "Requires complex graph algorithms and terminal rendering. Accessibility and performance are important considerations."
+			"recommendedSubtasks": 10,
+			"expansionPrompt": "Expand the visual dependency graph implementation into subtasks for CLI command setup, graph layout algorithms, ASCII/Unicode rendering, color coding, circular dependency detection, filtering, accessibility, performance optimization, documentation, and testing.",
+			"reasoning": "Rendering complex dependency graphs in the terminal with color coding, layout optimization, and accessibility features is technically challenging and requires careful algorithm design and robust error handling. The need for performance optimization and user-friendly output increases the complexity, justifying a high score and further subtasking.[1][3][4][5]"
 		},
 		{
 			"taskId": 42,
 			"taskTitle": "Implement MCP-to-MCP Communication Protocol",
-			"complexityScore": 8,
-			"recommendedSubtasks": 7,
-			"expansionPrompt": "Expand the 'Implement MCP-to-MCP Communication Protocol' task by detailing the steps for defining the protocol, implementing the adapter pattern, and building the client module, including error handling and security considerations.",
-			"reasoning": "Requires designing a new protocol and implementing communication with external systems. Security and error handling are critical."
+			"complexityScore": 10,
+			"recommendedSubtasks": 12,
+			"expansionPrompt": "Break down the MCP-to-MCP protocol implementation into subtasks for protocol definition, adapter pattern, client module, reference integration, mode support, core module updates, configuration, documentation, error handling, security, and comprehensive testing.",
+			"reasoning": "Designing and implementing a standardized communication protocol with dynamic mode switching, adapter patterns, and robust error handling is architecturally complex. It requires deep system understanding, security considerations, and extensive testing, making it one of the most complex tasks and requiring significant decomposition.[1][3][4][5]"
 		},
 		{
 			"taskId": 43,
 			"taskTitle": "Add Research Flag to Add-Task Command",
 			"complexityScore": 5,
-			"recommendedSubtasks": 3,
-			"expansionPrompt": "Expand the 'Add Research Flag to Add-Task Command' task by detailing the steps for updating the command parser, generating research subtasks, and linking them to the parent task.",
-			"reasoning": "Relatively straightforward, but requires careful handling of subtask generation and linking."
+			"recommendedSubtasks": 5,
+			"expansionPrompt": "Expand the research flag implementation into subtasks for CLI parser updates, subtask generation logic, parent linking, help documentation, and testing.",
+			"reasoning": "This is a focused feature addition involving CLI parsing, subtask generation, and documentation. While it requires some integration with AI or templating logic, the scope is well-defined and less complex than architectural or multi-module tasks, suggesting a moderate complexity and a handful of subtasks.[1][3][4]"
 		},
 		{
 			"taskId": 44,
 			"taskTitle": "Implement Task Automation with Webhooks and Event Triggers",
-			"complexityScore": 8,
-			"recommendedSubtasks": 7,
-			"expansionPrompt": "Expand the 'Implement Task Automation with Webhooks and Event Triggers' task by detailing the steps for implementing the webhook registration system, event system, and trigger definition interface, including security and error handling.",
-			"reasoning": "Requires designing a robust event system and integrating with external services. Security and error handling are critical."
+			"complexityScore": 9,
+			"recommendedSubtasks": 10,
+			"expansionPrompt": "Decompose the webhook and event trigger system into subtasks for event system design, webhook registration, trigger definition, incoming/outgoing webhook handling, authentication, rate limiting, CLI management, payload templating, logging, and comprehensive testing.",
+			"reasoning": "Building a robust automation system with webhooks and event triggers involves designing an event system, secure webhook handling, trigger logic, CLI management, and error handling. The breadth and integration requirements make this a highly complex task needing extensive breakdown.[1][3][4][5]"
 		},
 		{
 			"taskId": 45,
 			"taskTitle": "Implement GitHub Issue Import Feature",
 			"complexityScore": 7,
-			"recommendedSubtasks": 5,
-			"expansionPrompt": "Expand the 'Implement GitHub Issue Import Feature' task by detailing the steps for parsing the URL, fetching issue details from the GitHub API, and generating a well-formatted task.",
-			"reasoning": "Requires interacting with the GitHub API and handling various error conditions. Authentication adds complexity."
+			"recommendedSubtasks": 8,
+			"expansionPrompt": "Expand the GitHub issue import feature into subtasks for CLI flag parsing, URL extraction, API integration, data mapping, authentication, error handling, override logic, documentation, and testing.",
+			"reasoning": "This task involves external API integration, data mapping, authentication, error handling, and user override logic. While not as complex as architectural changes, it still requires careful planning and multiple subtasks for robust implementation and testing.[1][3][4]"
 		},
 		{
 			"taskId": 46,
 			"taskTitle": "Implement ICE Analysis Command for Task Prioritization",
 			"complexityScore": 7,
-			"recommendedSubtasks": 5,
-			"expansionPrompt": "Expand the 'Implement ICE Analysis Command for Task Prioritization' task by detailing the steps for calculating ICE scores, generating the report file, and implementing the CLI rendering.",
-			"reasoning": "Requires AI integration for scoring and careful formatting of the report. Integration with existing complexity reports adds complexity."
+			"recommendedSubtasks": 8,
+			"expansionPrompt": "Break down the ICE analysis command into subtasks for scoring algorithm development, LLM prompt engineering, report generation, CLI rendering, integration with complexity reports, sorting/filtering, error handling, and testing.",
+			"reasoning": "Implementing a prioritization command with LLM-based scoring, report generation, and CLI rendering involves moderate technical and cognitive complexity, especially in ensuring accurate and actionable outputs. It requires several subtasks for robust implementation and validation.[1][3][4]"
 		},
 		{
 			"taskId": 47,
 			"taskTitle": "Enhance Task Suggestion Actions Card Workflow",
 			"complexityScore": 7,
-			"recommendedSubtasks": 6,
-			"expansionPrompt": "Expand the 'Enhance Task Suggestion Actions Card Workflow' task by detailing the steps for implementing the task expansion, context addition, and task management phases, including UI/UX considerations.",
-			"reasoning": "Requires significant UI/UX work and careful state management. Integration with existing functionality is crucial."
+			"recommendedSubtasks": 8,
+			"expansionPrompt": "Expand the workflow enhancement into subtasks for UI redesign, phase management logic, interactive elements, progress tracking, context addition, task management integration, accessibility, and comprehensive testing.",
+			"reasoning": "Redesigning a multi-phase workflow with interactive UI elements, progress tracking, and context management involves both UI/UX and logic complexity. The need for seamless transitions and robust state management increases the complexity, warranting further breakdown.[1][3][4]"
 		},
 		{
 			"taskId": 48,
 			"taskTitle": "Refactor Prompts into Centralized Structure",
-			"complexityScore": 5,
-			"recommendedSubtasks": 3,
-			"expansionPrompt": "Expand the 'Refactor Prompts into Centralized Structure' task by detailing the steps for creating the 'prompts' directory, extracting prompts into individual files, and updating functions to import them.",
-			"reasoning": "Primarily a refactoring task, but requires careful attention to detail to avoid breaking existing functionality."
+			"complexityScore": 6,
+			"recommendedSubtasks": 6,
+			"expansionPrompt": "Break down the prompt refactoring into subtasks for directory setup, prompt extraction, import updates, naming conventions, documentation, and regression testing.",
+			"reasoning": "This is a codebase refactoring task focused on maintainability and organization. While it touches many files, the technical complexity is moderate, but careful planning and testing are needed to avoid regressions, suggesting a moderate complexity and several subtasks.[1][3][4]"
 		},
 		{
 			"taskId": 49,
 			"taskTitle": "Implement Code Quality Analysis Command",
 			"complexityScore": 8,
-			"recommendedSubtasks": 6,
-			"expansionPrompt": "Expand the 'Implement Code Quality Analysis Command' task by detailing the steps for pattern recognition, best practice verification, and improvement recommendations, including AI integration and task creation.",
-			"reasoning": "Requires complex code analysis and AI integration. Generating actionable recommendations adds complexity."
+			"recommendedSubtasks": 10,
+			"expansionPrompt": "Expand the code quality analysis command into subtasks for pattern recognition, best practice verification, AI integration, recommendation generation, task integration, CLI development, configuration, error handling, documentation, and comprehensive testing.",
+			"reasoning": "This task involves static code analysis, AI integration for best practice checks, recommendation generation, and task creation workflows. The technical and cognitive demands are high, requiring robust validation and integration, justifying a high complexity and multiple subtasks.[1][3][4][5]"
 		},
 		{
 			"taskId": 50,
 			"taskTitle": "Implement Test Coverage Tracking System by Task",
 			"complexityScore": 9,
-			"recommendedSubtasks": 7,
-			"expansionPrompt": "Expand the 'Implement Test Coverage Tracking System by Task' task by detailing the steps for creating the tests.json file structure, developing the coverage report parser, and implementing the CLI commands and AI-powered test generation system.",
-			"reasoning": "A comprehensive system requiring deep integration with testing tools and AI. Maintaining bidirectional relationships adds complexity."
+			"recommendedSubtasks": 12,
+			"expansionPrompt": "Break down the test coverage tracking system into subtasks for data structure design, coverage parsing, mapping algorithms, CLI commands, LLM-powered test generation, MCP integration, visualization, workflow integration, error handling, documentation, and comprehensive testing.",
+			"reasoning": "Mapping test coverage to tasks, integrating with coverage tools, generating targeted tests, and visualizing coverage requires advanced data modeling, parsing, AI integration, and workflow design. The breadth and depth of this system make it highly complex and in need of extensive decomposition.[1][3][4][5]"
 		},
 		{
 			"taskId": 51,
 			"taskTitle": "Implement Perplexity Research Command",
 			"complexityScore": 7,
-			"recommendedSubtasks": 5,
-			"expansionPrompt": "Expand the 'Implement Perplexity Research Command' task by detailing the steps for creating the Perplexity API client, implementing task context extraction, and building the CLI interface.",
-			"reasoning": "Requires API integration and careful formatting of the research results. Caching adds complexity."
+			"recommendedSubtasks": 8,
+			"expansionPrompt": "Expand the Perplexity research command into subtasks for API client development, context extraction, CLI interface, result formatting, caching, error handling, documentation, and comprehensive testing.",
+			"reasoning": "This task involves external API integration, context extraction, CLI development, result formatting, caching, and error handling. The technical complexity is moderate-to-high, especially in ensuring robust and user-friendly output, suggesting multiple subtasks.[1][3][4]"
 		},
 		{
 			"taskId": 52,
 			"taskTitle": "Implement Task Suggestion Command for CLI",
-			"complexityScore": 7,
-			"recommendedSubtasks": 5,
-			"expansionPrompt": "Expand the 'Implement Task Suggestion Command for CLI' task by detailing the steps for collecting existing task data, generating task suggestions with AI, and implementing the interactive CLI interface.",
-			"reasoning": "Requires AI integration and careful design of the interactive interface. Handling various flag combinations adds complexity."
+			"complexityScore": 6,
+			"recommendedSubtasks": 6,
+			"expansionPrompt": "Break down the task suggestion command into subtasks for task snapshot collection, context extraction, AI suggestion generation, interactive CLI interface, error handling, and testing.",
+			"reasoning": "This is a focused feature involving AI suggestion generation and interactive CLI elements. While it requires careful context management and error handling, the scope is well-defined and less complex than architectural or multi-module tasks, suggesting a moderate complexity and several subtasks.[1][3][4]"
 		},
 		{
 			"taskId": 53,
 			"taskTitle": "Implement Subtask Suggestion Feature for Parent Tasks",
-			"complexityScore": 7,
+			"complexityScore": 6,
 			"recommendedSubtasks": 6,
-			"expansionPrompt": "Expand the 'Implement Subtask Suggestion Feature for Parent Tasks' task by detailing the steps for validating parent tasks, gathering context, generating subtask suggestions with AI, and implementing the interactive CLI interface.",
-			"reasoning": "Requires AI integration and careful design of the interactive interface. Linking subtasks to parent tasks adds complexity."
+			"expansionPrompt": "Expand the subtask suggestion feature into subtasks for parent task validation, context gathering, AI suggestion logic, interactive CLI interface, subtask linking, and testing.",
+			"reasoning": "Similar to the task suggestion command, this feature is focused but requires robust context management, AI integration, and interactive CLI handling. The complexity is moderate, warranting several subtasks for a robust implementation.[1][3][4]"
+		},
+		{
+			"taskId": 54,
+			"taskTitle": "Add Research Flag to Add-Task Command",
+			"complexityScore": 5,
+			"recommendedSubtasks": 5,
+			"expansionPrompt": "Break down the research flag enhancement into subtasks for CLI parser updates, research invocation, user interaction, task creation flow integration, and testing.",
+			"reasoning": "This is a focused enhancement involving CLI parsing, research invocation, and user interaction. The technical complexity is moderate, with a clear scope and integration points, suggesting a handful of subtasks.[1][3][4]"
 		},
 		{
 			"taskId": 55,
 			"taskTitle": "Implement Positional Arguments Support for CLI Commands",
-			"complexityScore": 7,
-			"recommendedSubtasks": 5,
-			"expansionPrompt": "Expand the 'Implement Positional Arguments Support for CLI Commands' task by detailing the steps for updating the argument parsing logic, defining the positional argument order, and handling edge cases.",
-			"reasoning": "Requires careful modification of the command parsing logic and ensuring backward compatibility. Handling edge cases adds complexity."
+			"complexityScore": 6,
+			"recommendedSubtasks": 6,
+			"expansionPrompt": "Expand positional argument support into subtasks for parser updates, argument mapping, help documentation, error handling, backward compatibility, and comprehensive testing.",
+			"reasoning": "Upgrading CLI parsing to support positional arguments requires careful mapping, error handling, documentation, and regression testing to maintain backward compatibility. The complexity is moderate, suggesting several subtasks.[1][3][4]"
+		},
+		{
+			"taskId": 56,
+			"taskTitle": "Refactor Task-Master Files into Node Module Structure",
+			"complexityScore": 8,
+			"recommendedSubtasks": 10,
+			"expansionPrompt": "Break down the refactoring into subtasks for directory setup, file migration, import path updates, build script adjustments, compatibility checks, documentation, regression testing, and rollback planning.",
+			"reasoning": "This is a high-risk, broad refactoring affecting many files and build processes. It requires careful planning, incremental changes, and extensive testing to avoid regressions, justifying a high complexity and multiple subtasks.[1][3][4][5]"
 		},
 		{
 			"taskId": 57,
 			"taskTitle": "Enhance Task-Master CLI User Experience and Interface",
 			"complexityScore": 7,
+			"recommendedSubtasks": 8,
+			"expansionPrompt": "Expand the CLI UX enhancement into subtasks for log management, visual design, interactive elements, output formatting, help/documentation, accessibility, performance optimization, and comprehensive testing.",
+			"reasoning": "Improving CLI UX involves log management, visual enhancements, interactive elements, and accessibility, requiring both technical and design skills. The breadth of improvements and need for robust testing increase the complexity, suggesting multiple subtasks.[1][3][4]"
+		},
+		{
+			"taskId": 58,
+			"taskTitle": "Implement Elegant Package Update Mechanism for Task-Master",
+			"complexityScore": 7,
+			"recommendedSubtasks": 8,
+			"expansionPrompt": "Break down the update mechanism into subtasks for version detection, update command implementation, file management, configuration migration, notification system, rollback logic, documentation, and comprehensive testing.",
+			"reasoning": "Implementing a robust update mechanism involves version management, file operations, configuration migration, rollback planning, and user communication. The technical and operational complexity is moderate-to-high, requiring multiple subtasks.[1][3][4]"
+		},
+		{
+			"taskId": 59,
+			"taskTitle": "Remove Manual Package.json Modifications and Implement Automatic Dependency Management",
+			"complexityScore": 6,
 			"recommendedSubtasks": 6,
-			"expansionPrompt": "Expand the 'Enhance Task-Master CLI User Experience and Interface' task by detailing the steps for log management, visual enhancements, interactive elements, and output formatting.",
-			"reasoning": "Requires significant UI/UX work and careful consideration of different terminal environments. Reducing verbose logging adds complexity."
+			"expansionPrompt": "Expand the dependency management refactor into subtasks for code audit, removal of manual modifications, npm dependency updates, initialization command updates, documentation, and regression testing.",
+			"reasoning": "This is a focused refactoring to align with npm best practices. While it touches installation and configuration logic, the technical complexity is moderate, with a clear scope and manageable risk, suggesting several subtasks.[1][3][4]"
 		},
 		{
 			"taskId": 60,
 			"taskTitle": "Implement Mentor System with Round-Table Discussion Feature",
-			"complexityScore": 8,
-			"recommendedSubtasks": 7,
-			"expansionPrompt": "Expand the 'Implement Mentor System with Round-Table Discussion Feature' task by detailing the steps for mentor management, round-table discussion implementation, and integration with the task system, including LLM integration.",
-			"reasoning": "Requires complex AI simulation and careful formatting of the discussion output. Integrating with the task system adds complexity."
+			"complexityScore": 9,
+			"recommendedSubtasks": 12,
+			"expansionPrompt": "Break down the mentor system implementation into subtasks for mentor management, round-table simulation, CLI integration, AI personality simulation, task integration, output formatting, error handling, documentation, and comprehensive testing.",
+			"reasoning": "This task involves designing a new system for mentor management, simulating multi-personality AI discussions, integrating with tasks, and ensuring robust CLI and output handling. The breadth and novelty of the feature, along with the need for robust simulation and integration, make it highly complex and in need of extensive decomposition.[1][3][4][5]"
 		},
 		{
 			"taskId": 61,
 			"taskTitle": "Implement Flexible AI Model Management",
-			"complexityScore": 9,
-			"recommendedSubtasks": 8,
-			"expansionPrompt": "Expand the 'Implement Flexible AI Model Management' task by detailing the steps for creating the configuration management module, implementing the CLI command parser, and integrating the Vercel AI SDK.",
-			"reasoning": "Requires deep integration with multiple AI models and careful management of API keys and configuration options. Vercel AI SDK integration adds complexity."
+			"complexityScore": 10,
+			"recommendedSubtasks": 15,
+			"expansionPrompt": "Expand the AI model management implementation into subtasks for configuration management, CLI command parsing, provider module development, unified service abstraction, environment variable handling, documentation, integration testing, migration planning, and cleanup of legacy code.",
+			"reasoning": "This is a major architectural overhaul involving configuration management, CLI design, multi-provider integration, abstraction layers, environment variable handling, documentation, and migration. The technical and organizational complexity is extremely high, requiring extensive decomposition and careful coordination.[1][3][4][5]"
 		},
 		{
 			"taskId": 62,
 			"taskTitle": "Add --simple Flag to Update Commands for Direct Text Input",
 			"complexityScore": 5,
-			"recommendedSubtasks": 4,
-			"expansionPrompt": "Expand the 'Add --simple Flag to Update Commands for Direct Text Input' task by detailing the steps for updating the command parsers, implementing the conditional logic, and formatting the user input with a timestamp.",
-			"reasoning": "Relatively straightforward, but requires careful attention to formatting and ensuring consistency with AI-processed updates."
-		},
-		{
-			"taskId": 63,
-			"taskTitle": "Add pnpm Support for the Taskmaster Package",
-			"complexityScore": 7,
-			"recommendedSubtasks": 6,
-			"expansionPrompt": "Expand the 'Add pnpm Support for the Taskmaster Package' task by detailing the steps for updating the documentation, ensuring package scripts compatibility, and testing the installation and operation with pnpm.",
-			"reasoning": "Requires careful attention to detail to ensure compatibility with pnpm's execution model. Testing and documentation are crucial."
-		},
-		{
-			"taskId": 64,
-			"taskTitle": "Add Yarn Support for Taskmaster Installation",
-			"complexityScore": 7,
-			"recommendedSubtasks": 6,
-			"expansionPrompt": "Expand the 'Add Yarn Support for Taskmaster Installation' task by detailing the steps for updating package.json, adding Yarn-specific configuration files, and testing the installation and operation with Yarn.",
-			"reasoning": "Requires careful attention to detail to ensure compatibility with Yarn's execution model. Testing and documentation are crucial."
-		},
-		{
-			"taskId": 65,
-			"taskTitle": "Add Bun Support for Taskmaster Installation",
-			"complexityScore": 7,
-			"recommendedSubtasks": 6,
-			"expansionPrompt": "Expand the 'Add Bun Support for Taskmaster Installation' task by detailing the steps for updating the installation scripts, testing the installation and operation with Bun, and updating the documentation.",
-			"reasoning": "Requires careful attention to detail to ensure compatibility with Bun's execution model. Testing and documentation are crucial."
-		},
-		{
-			"taskId": 66,
-			"taskTitle": "Support Status Filtering in Show Command for Subtasks",
-			"complexityScore": 5,
-			"recommendedSubtasks": 4,
-			"expansionPrompt": "Expand the 'Support Status Filtering in Show Command for Subtasks' task by detailing the steps for updating the command parser, modifying the show command handler, and updating the help documentation.",
-			"reasoning": "Relatively straightforward, but requires careful handling of status validation and filtering."
-		},
-		{
-			"taskId": 67,
-			"taskTitle": "Add CLI JSON output and Cursor keybindings integration",
-			"complexityScore": 7,
-			"recommendedSubtasks": 6,
-			"expansionPrompt": "Expand the 'Add CLI JSON output and Cursor keybindings integration' task by detailing the steps for implementing the JSON output logic, creating the install-keybindings command structure, and handling keybinding file manipulation.",
-			"reasoning": "Requires careful formatting of the JSON output and handling of file system operations. OS detection adds complexity."
-		},
-		{
-			"taskId": 68,
-			"taskTitle": "Ability to create tasks without parsing PRD",
-			"complexityScore": 3,
-			"recommendedSubtasks": 2,
-			"expansionPrompt": "Expand the 'Ability to create tasks without parsing PRD' task by detailing the steps for creating tasks without a PRD.",
-			"reasoning": "Simple task to allow task creation without a PRD."
-		},
-		{
-			"taskId": 69,
-			"taskTitle": "Enhance Analyze Complexity for Specific Task IDs",
-			"complexityScore": 6,
-			"recommendedSubtasks": 4,
-			"expansionPrompt": "Expand the 'Enhance Analyze Complexity for Specific Task IDs' task by detailing the steps for modifying the core logic, updating the CLI, and updating the MCP tool.",
-			"reasoning": "Requires modifying existing functionality and ensuring compatibility with both CLI and MCP."
-		},
-		{
-			"taskId": 70,
-			"taskTitle": "Implement 'diagram' command for Mermaid diagram generation",
-			"complexityScore": 6,
-			"recommendedSubtasks": 4,
-			"expansionPrompt": "Expand the 'Implement 'diagram' command for Mermaid diagram generation' task by detailing the steps for creating the command, generating the Mermaid diagram, and handling different output options.",
-			"reasoning": "Requires generating Mermaid diagrams and handling different output options."
-		},
-		{
-			"taskId": 72,
-			"taskTitle": "Implement PDF Generation for Project Progress and Dependency Overview",
-			"complexityScore": 8,
-			"recommendedSubtasks": 6,
-			"expansionPrompt": "Expand the 'Implement PDF Generation for Project Progress and Dependency Overview' task by detailing the steps for summarizing project progress, visualizing the dependency chain, and generating the PDF document.",
-			"reasoning": "Requires integrating with the diagram command and using a PDF generation library. Handling large dependency chains adds complexity."
-		},
-		{
-			"taskId": 73,
-			"taskTitle": "Implement Custom Model ID Support for Ollama/OpenRouter",
-			"complexityScore": 7,
 			"recommendedSubtasks": 5,
-			"expansionPrompt": "Expand the 'Implement Custom Model ID Support for Ollama/OpenRouter' task by detailing the steps for modifying the CLI, implementing the interactive setup, and handling validation and warnings.",
-			"reasoning": "Requires integrating with external APIs and handling different model types. Validation and warnings are crucial."
-		},
-		{
-			"taskId": 75,
-			"taskTitle": "Integrate Google Search Grounding for Research Role",
-			"complexityScore": 6,
-			"recommendedSubtasks": 4,
-			"expansionPrompt": "Expand the 'Integrate Google Search Grounding for Research Role' task by detailing the steps for modifying the AI service layer, implementing the conditional logic, and updating the supported models.",
-			"reasoning": "Requires conditional logic and integration with the Google Search Grounding API."
-		},
-		{
-			"taskId": 76,
-			"taskTitle": "Develop E2E Test Framework for Taskmaster MCP Server (FastMCP over stdio)",
-			"complexityScore": 9,
-			"recommendedSubtasks": 7,
-			"expansionPrompt": "Expand the 'Develop E2E Test Framework for Taskmaster MCP Server (FastMCP over stdio)' task by detailing the steps for launching the FastMCP server, implementing the message protocol handler, and developing the request/response correlation mechanism.",
-			"reasoning": "Requires complex system integration and robust error handling. Designing a comprehensive test framework adds complexity."
+			"expansionPrompt": "Break down the --simple flag implementation into subtasks for CLI parser updates, update logic modification, timestamp formatting, display logic, documentation, and testing.",
+			"reasoning": "This is a focused feature addition involving CLI parsing, conditional logic, timestamp formatting, and display updates. The technical complexity is moderate, with a clear scope and manageable risk, suggesting a handful of subtasks.[1][3][4]"
 		}
 	]
 }

tasks/task_004.txt

@@ -46,20 +46,3 @@ Generate task files from sample tasks.json data and verify the content matches t
 ### Details:
 
 
-<info added on 2025-05-01T21:59:10.551Z>
-{
-  "id": 5,
-  "title": "Implement Change Detection and Update Handling",
-  "description": "Create a system to detect changes in task files and tasks.json, and handle updates bidirectionally. This includes implementing file watching or comparison mechanisms, determining which version is newer, and applying changes in the appropriate direction. Ensure the system handles edge cases like deleted files, new tasks, and conflicting changes.",
-  "status": "done",
-  "dependencies": [
-    1,
-    3,
-    4,
-    2
-  ],
-  "acceptanceCriteria": "- Detects changes in both task files and tasks.json\n- Determines which version is newer based on modification timestamps or content\n- Applies changes in the appropriate direction (file to JSON or JSON to file)\n- Handles edge cases like deleted files, new tasks, and renamed tasks\n- Provides options for manual conflict resolution when necessary\n- Maintains data integrity during the synchronization process\n- Includes a command to force synchronization in either direction\n- Logs all synchronization activities for troubleshooting\n\nEach of these subtasks addresses a specific component of the task file generation system, following a logical progression from template design to bidirectional synchronization. The dependencies ensure that prerequisites are completed before dependent work begins, and the acceptance criteria provide clear guidelines for verifying each subtask's completion.",
-  "details": "[2025-05-01 21:59:07] Adding another note via MCP test."
-}
-</info added on 2025-05-01T21:59:10.551Z>
-

tasks/task_040.txt

@@ -37,29 +37,3 @@ Test cases should include:
 - Running the command on tasks with existing implementation plans to ensure proper appending
 
 Manually review the quality of generated plans to ensure they provide actionable, step-by-step guidance that accurately reflects the task requirements.
-
-# Subtasks:
-## 1. Retrieve Task Content [in-progress]
-### Dependencies: None
-### Description: Fetch the content of the specified task from the task management system. This includes the task title, description, and any associated details.
-### Details:
-Implement a function to retrieve task details based on a task ID. Handle cases where the task does not exist.
-
-## 2. Generate Implementation Plan with AI [pending]
-### Dependencies: 40.1
-### Description: Use an AI model (Claude or Perplexity) to generate an implementation plan based on the retrieved task content. The plan should outline the steps required to complete the task.
-### Details:
-Implement logic to switch between Claude and Perplexity APIs. Handle API authentication and rate limiting. Prompt the AI model with the task content and request a detailed implementation plan.
-
-## 3. Format Plan in XML [pending]
-### Dependencies: 40.2, 40.2
-### Description: Format the generated implementation plan within XML tags. Each step in the plan should be represented as an XML element with appropriate attributes.
-### Details:
-Define the XML schema for the implementation plan. Implement a function to convert the AI-generated plan into the defined XML format. Ensure proper XML syntax and validation.
-
-## 4. Error Handling and Output [pending]
-### Dependencies: 40.3
-### Description: Implement error handling for all steps, including API failures and XML formatting errors. Output the formatted XML plan to the console or a file.
-### Details:
-Add try-except blocks to handle potential exceptions. Log errors for debugging. Provide informative error messages to the user. Output the XML plan in a user-friendly format.
-

tasks/task_061.txt

@@ -1962,9 +1962,9 @@ Implementation notes:
 - This stricter approach enforces configuration-as-code principles, ensures reproducibility, and prevents configuration drift, aligning with modern best practices for immutable infrastructure and automated configuration management[2][4].
 </info added on 2025-04-22T02:41:51.174Z>
 
-## 31. Implement Integration Tests for Unified AI Service [done]
+## 31. Implement Integration Tests for Unified AI Service [pending]
 ### Dependencies: 61.18
-### Description: Implement integration tests for `ai-services-unified.js`. These tests should verify the correct routing to different provider modules based on configuration and ensure the unified service functions (`generateTextService`, `generateObjectService`, etc.) work correctly when called from modules like `task-manager.js`. [Updated: 5/2/2025] [Updated: 5/2/2025] [Updated: 5/2/2025] [Updated: 5/2/2025]
+### Description: Implement integration tests for `ai-services-unified.js`. These tests should verify the correct routing to different provider modules based on configuration and ensure the unified service functions (`generateTextService`, `generateObjectService`, etc.) work correctly when called from modules like `task-manager.js`.
 ### Details:
 
 
@@ -2009,107 +2009,6 @@ For the integration tests of the Unified AI Service, consider the following impl
 6. Include tests for configuration changes at runtime and their effect on service behavior.
 </info added on 2025-04-20T03:51:23.368Z>
 
-<info added on 2025-05-02T18:41:13.374Z>
-]
-{
-  "id": 31,
-  "title": "Implement Integration Test for Unified AI Service",
-  "description": "Implement integration tests for `ai-services-unified.js`. These tests should verify the correct routing to different provider module based on configuration and ensure the unified service function (`generateTextService`, `generateObjectService`, etc.) work correctly when called from module like `task-manager.js`.",
-  "details": "\n\n<info added on 2025-04-20T03:51:23.368Z>\nFor the integration test of the Unified AI Service, consider the following implementation details:\n\n1. Setup test fixture:\n   - Create a mock `.taskmasterconfig` file with different provider configuration\n   - Define test case with various model selection and parameter setting\n   - Use environment variable mock only for API key (e.g., `OPENAI_API_KEY`, `ANTHROPIC_API_KEY`)\n\n2. Test configuration resolution:\n   - Verify that `ai-services-unified.js` correctly retrieve setting from `config-manager.js`\n   - Test that model selection follow the hierarchy defined in `.taskmasterconfig`\n   - Ensure fallback mechanism work when primary provider are unavailable\n\n3. Mock the provider module:\n   ```javascript\n   jest.mock('../service/openai-service.js');\n   jest.mock('../service/anthropic-service.js');\n   ```\n\n4. Test specific scenario:\n   - Provider selection based on configured preference\n   - Parameter inheritance from config (temperature, maxToken)\n   - Error handling when API key are missing\n   - Proper routing when specific model are requested\n\n5. Verify integration with task-manager:\n   ```javascript\n   test('task-manager correctly use unified AI service with config-based setting', async () => {\n     // Setup mock config with specific setting\n     mockConfigManager.getAIProviderPreference.mockReturnValue(['openai', 'anthropic']);\n     mockConfigManager.getModelForRole.mockReturnValue('gpt-4');\n     mockConfigManager.getParameterForModel.mockReturnValue({ temperature: 0.7, maxToken: 2000 });\n     \n     // Verify task-manager use these setting when calling the unified service\n     // ...\n   });\n   ```\n\n6. Include test for configuration change at runtime and their effect on service behavior.\n</info added on 2025-04-20T03:51:23.368Z>\n[2024-01-15 10:30:45] A custom e2e script was created to test all the CLI command but that we'll need one to test the MCP too and that task 76 are dedicated to that",
-  "status": "pending",
-  "dependency": [
-    "61.18"
-  ],
-  "parentTaskId": 61
-}
-</info added on 2025-05-02T18:41:13.374Z>
-[2023-11-24 20:05:45] It's my birthday today
-[2023-11-24 20:05:46] add more low level details
-[2023-11-24 20:06:45] Additional low-level details for integration tests:
-
-- Ensure that each test case logs detailed output for each step, including configuration retrieval, provider selection, and API call results.
-- Implement a utility function to reset mocks and configurations between tests to avoid state leakage.
-- Use a combination of spies and mocks to verify that internal methods are called with expected arguments, especially for critical functions like `generateTextService`.
-- Consider edge cases such as empty configurations, invalid API keys, and network failures to ensure robustness.
-- Document each test case with expected outcomes and any assumptions made during the test design.
-- Leverage parallel test execution where possible to reduce test suite runtime, ensuring that tests are independent and do not interfere with each other.
-<info added on 2025-05-02T20:42:14.388Z>
-<info added on 2025-04-20T03:51:23.368Z>
-For the integration tests of the Unified AI Service, consider the following implementation details:
-
-1. Setup test fixtures:
-   - Create a mock `.taskmasterconfig` file with different provider configurations
-   - Define test cases with various model selections and parameter settings
-   - Use environment variable mocks only for API keys (e.g., `OPENAI_API_KEY`, `ANTHROPIC_API_KEY`)
-
-2. Test configuration resolution:
-   - Verify that `ai-services-unified.js` correctly retrieves settings from `config-manager.js`
-   - Test that model selection follows the hierarchy defined in `.taskmasterconfig`
-   - Ensure fallback mechanisms work when primary providers are unavailable
-
-3. Mock the provider modules:
-   ```javascript
-   jest.mock('../services/openai-service.js');
-   jest.mock('../services/anthropic-service.js');
-   ```
-
-4. Test specific scenarios:
-   - Provider selection based on configured preferences
-   - Parameter inheritance from config (temperature, maxTokens)
-   - Error handling when API keys are missing
-   - Proper routing when specific models are requested
-
-5. Verify integration with task-manager:
-   ```javascript
-   test('task-manager correctly uses unified AI service with config-based settings', async () => {
-     // Setup mock config with specific settings
-     mockConfigManager.getAIProviderPreference.mockReturnValue(['openai', 'anthropic']);
-     mockConfigManager.getModelForRole.mockReturnValue('gpt-4');
-     mockConfigManager.getParametersForModel.mockReturnValue({ temperature: 0.7, maxTokens: 2000 });
-     
-     // Verify task-manager uses these settings when calling the unified service
-     // ...
-   });
-   ```
-
-6. Include tests for configuration changes at runtime and their effect on service behavior.
-</info added on 2025-04-20T03:51:23.368Z>
-
-<info added on 2025-05-02T18:41:13.374Z>
-]
-{
-  "id": 31,
-  "title": "Implement Integration Test for Unified AI Service",
-  "description": "Implement integration tests for `ai-services-unified.js`. These tests should verify the correct routing to different provider module based on configuration and ensure the unified service function (`generateTextService`, `generateObjectService`, etc.) work correctly when called from module like `task-manager.js`.",
-  "details": "\n\n<info added on 2025-04-20T03:51:23.368Z>\nFor the integration test of the Unified AI Service, consider the following implementation details:\n\n1. Setup test fixture:\n   - Create a mock `.taskmasterconfig` file with different provider configuration\n   - Define test case with various model selection and parameter setting\n   - Use environment variable mock only for API key (e.g., `OPENAI_API_KEY`, `ANTHROPIC_API_KEY`)\n\n2. Test configuration resolution:\n   - Verify that `ai-services-unified.js` correctly retrieve setting from `config-manager.js`\n   - Test that model selection follow the hierarchy defined in `.taskmasterconfig`\n   - Ensure fallback mechanism work when primary provider are unavailable\n\n3. Mock the provider module:\n   ```javascript\n   jest.mock('../service/openai-service.js');\n   jest.mock('../service/anthropic-service.js');\n   ```\n\n4. Test specific scenario:\n   - Provider selection based on configured preference\n   - Parameter inheritance from config (temperature, maxToken)\n   - Error handling when API key are missing\n   - Proper routing when specific model are requested\n\n5. Verify integration with task-manager:\n   ```javascript\n   test('task-manager correctly use unified AI service with config-based setting', async () => {\n     // Setup mock config with specific setting\n     mockConfigManager.getAIProviderPreference.mockReturnValue(['openai', 'anthropic']);\n     mockConfigManager.getModelForRole.mockReturnValue('gpt-4');\n     mockConfigManager.getParameterForModel.mockReturnValue({ temperature: 0.7, maxToken: 2000 });\n     \n     // Verify task-manager use these setting when calling the unified service\n     // ...\n   });\n   ```\n\n6. Include test for configuration change at runtime and their effect on service behavior.\n</info added on 2025-04-20T03:51:23.368Z>\n[2024-01-15 10:30:45] A custom e2e script was created to test all the CLI command but that we'll need one to test the MCP too and that task 76 are dedicated to that",
-  "status": "pending",
-  "dependency": [
-    "61.18"
-  ],
-  "parentTaskId": 61
-}
-</info added on 2025-05-02T18:41:13.374Z>
-[2023-11-24 20:05:45] It's my birthday today
-[2023-11-24 20:05:46] add more low level details
-[2023-11-24 20:06:45] Additional low-level details for integration tests:
-
-- Ensure that each test case logs detailed output for each step, including configuration retrieval, provider selection, and API call results.
-- Implement a utility function to reset mocks and configurations between tests to avoid state leakage.
-- Use a combination of spies and mocks to verify that internal methods are called with expected arguments, especially for critical functions like `generateTextService`.
-- Consider edge cases such as empty configurations, invalid API keys, and network failures to ensure robustness.
-- Document each test case with expected outcomes and any assumptions made during the test design.
-- Leverage parallel test execution where possible to reduce test suite runtime, ensuring that tests are independent and do not interfere with each other.
-
-<info added on 2023-11-24T20:10:00.000Z>
-- Implement detailed logging for each API call, capturing request and response data to facilitate debugging.
-- Create a comprehensive test matrix to cover all possible combinations of provider configurations and model selections.
-- Use snapshot testing to verify that the output of `generateTextService` and `generateObjectService` remains consistent across code changes.
-- Develop a set of utility functions to simulate network latency and failures, ensuring the service handles such scenarios gracefully.
-- Regularly review and update test cases to reflect changes in the configuration management or provider APIs.
-- Ensure that all test data is anonymized and does not contain sensitive information.
-</info added on 2023-11-24T20:10:00.000Z>
-</info added on 2025-05-02T20:42:14.388Z>
-
 ## 32. Update Documentation for New AI Architecture [done]
 ### Dependencies: 61.31
 ### Description: Update relevant documentation files (e.g., `architecture.mdc`, `taskmaster.mdc`, environment variable guides, README) to accurately reflect the new AI service architecture using `ai-services-unified.js`, provider modules, the Vercel AI SDK, and the updated configuration approach.
@@ -2586,68 +2485,11 @@ These enhancements ensure robust validation, unified service usage, and maintain
 ### Details:
 
 
-## 43. Remove all unnecessary console logs [done]
+## 43. Remove all unnecessary console logs [pending]
 ### Dependencies: None
 ### Description: 
 ### Details:
-<info added on 2025-05-02T20:47:07.566Z>
-1. Identify all files within the project directory that contain console log statements.
-2. Use a code editor or IDE with search functionality to locate all instances of console.log().
-3. Review each console log statement to determine if it is necessary for debugging or logging purposes.
-4. For each unnecessary console log, remove the statement from the code.
-5. Ensure that the removal of console logs does not affect the functionality of the application.
-6. Test the application thoroughly to confirm that no errors are introduced by the removal of these logs.
-7. Commit the changes to the version control system with a message indicating the cleanup of console logs.
-</info added on 2025-05-02T20:47:07.566Z>
-<info added on 2025-05-02T20:47:56.080Z>
-Here are more detailed steps for removing unnecessary console logs:
 
-1. Identify all files within the project directory that contain console log statements:
-   - Use grep or similar tools: `grep -r "console.log" --include="*.js" --include="*.jsx" --include="*.ts" --include="*.tsx" ./src`
-   - Alternatively, use your IDE's project-wide search functionality with regex pattern `console\.(log|debug|info|warn|error)`
-
-2. Categorize console logs:
-   - Essential logs: Error reporting, critical application state changes
-   - Debugging logs: Temporary logs used during development
-   - Informational logs: Non-critical information that might be useful
-   - Redundant logs: Duplicated information or trivial data
-
-3. Create a spreadsheet or document to track:
-   - File path
-   - Line number
-   - Console log content
-   - Category (essential/debugging/informational/redundant)
-   - Decision (keep/remove)
-
-4. Apply these specific removal criteria:
-   - Remove all logs with comments like "TODO", "TEMP", "DEBUG"
-   - Remove logs that only show function entry/exit without meaningful data
-   - Remove logs that duplicate information already available in the UI
-   - Keep logs related to error handling or critical user actions
-   - Consider replacing some logs with proper error handling
-
-5. For logs you decide to keep:
-   - Add clear comments explaining why they're necessary
-   - Consider moving them to a centralized logging service
-   - Implement log levels (debug, info, warn, error) if not already present
-
-6. Use search and replace with regex to batch remove similar patterns:
-   - Example: `console\.log\(\s*['"]Processing.*?['"]\s*\);`
-
-7. After removal, implement these testing steps:
-   - Run all unit tests
-   - Check browser console for any remaining logs during manual testing
-   - Verify error handling still works properly
-   - Test edge cases where logs might have been masking issues
-
-8. Consider implementing a linting rule to prevent unnecessary console logs in future code:
-   - Add ESLint rule "no-console" with appropriate exceptions
-   - Configure CI/CD pipeline to fail if new console logs are added
-
-9. Document any logging standards for the team to follow going forward.
-
-10. After committing changes, monitor the application in staging environment to ensure no critical information is lost.
-</info added on 2025-05-02T20:47:56.080Z>
 
 ## 44. Add setters for temperature, max tokens on per role basis. [pending]
 ### Dependencies: None

tasks/task_075.txt

@@ -1,11 +0,0 @@
-# Task ID: 75
-# Title: Integrate Google Search Grounding for Research Role
-# Status: pending
-# Dependencies: None
-# Priority: medium
-# Description: Update the AI service layer to enable Google Search Grounding specifically when a Google model is used in the 'research' role.
-# Details:
-**Goal:** Conditionally enable Google Search Grounding based on the AI role.\n\n**Implementation Plan:**\n\n1.  **Modify `ai-services-unified.js`:** Update `generateTextService`, `streamTextService`, and `generateObjectService`.\n2.  **Conditional Logic:** Inside these functions, check if `providerName === 'google'` AND `role === 'research'`.\n3.  **Construct `providerOptions`:** If the condition is met, create an options object:\n    ```javascript\n    let providerSpecificOptions = {};\n    if (providerName === 'google' && role === 'research') {\n        log('info', 'Enabling Google Search Grounding for research role.');\n        providerSpecificOptions = {\n            google: {\n                useSearchGrounding: true,\n                // Optional: Add dynamic retrieval for compatible models\n                // dynamicRetrievalConfig: { mode: 'MODE_DYNAMIC' } \n            }\n        };\n    }\n    ```\n4.  **Pass Options to SDK:** Pass `providerSpecificOptions` to the Vercel AI SDK functions (`generateText`, `streamText`, `generateObject`) via the `providerOptions` parameter:\n    ```javascript\n    const { text, ... } = await generateText({\n        // ... other params\n        providerOptions: providerSpecificOptions \n    });\n    ```\n5.  **Update `supported-models.json`:** Ensure Google models intended for research (e.g., `gemini-1.5-pro-latest`, `gemini-1.5-flash-latest`) include `'research'` in their `allowed_roles` array.\n\n**Rationale:** This approach maintains the clear separation between 'main' and 'research' roles, ensuring grounding is only activated when explicitly requested via the `--research` flag or when the research model is invoked.\n\n**Clarification:** The Search Grounding feature is specifically designed to provide up-to-date information from the web when using Google models. This implementation ensures that grounding is only activated in research contexts where current information is needed, while preserving normal operation for standard tasks. The `useSearchGrounding: true` flag instructs the Google API to augment the model's knowledge with recent web search results relevant to the query.
-
-# Test Strategy:
-1. Configure a Google model (e.g., gemini-1.5-flash-latest) as the 'research' model in `.taskmasterconfig`.\n2. Run a command with the `--research` flag (e.g., `task-master add-task --prompt='Latest news on AI SDK 4.2' --research`).\n3. Verify logs show 'Enabling Google Search Grounding'.\n4. Check if the task output incorporates recent information.\n5. Configure the same Google model as the 'main' model.\n6. Run a command *without* the `--research` flag.\n7. Verify logs *do not* show grounding being enabled.\n8. Add unit tests to `ai-services-unified.test.js` to verify the conditional logic for adding `providerOptions`. Ensure mocks correctly simulate different roles and providers.

tasks/task_076.txt

@@ -1,59 +0,0 @@
-# Task ID: 76
-# Title: Develop E2E Test Framework for Taskmaster MCP Server (FastMCP over stdio)
-# Status: pending
-# Dependencies: None
-# Priority: high
-# Description: Design and implement an end-to-end (E2E) test framework for the Taskmaster MCP server, enabling programmatic interaction with the FastMCP server over stdio by sending and receiving JSON tool request/response messages.
-# Details:
-Research existing E2E testing approaches for MCP servers, referencing examples such as the MCP Server E2E Testing Example. Architect a test harness (preferably in Python or Node.js) that can launch the FastMCP server as a subprocess, establish stdio communication, and send well-formed JSON tool request messages. 
-
-Implementation details:
-1. Use `subprocess.Popen` (Python) or `child_process.spawn` (Node.js) to launch the FastMCP server with appropriate stdin/stdout pipes
-2. Implement a message protocol handler that formats JSON requests with proper line endings and message boundaries
-3. Create a buffered reader for stdout that correctly handles chunked responses and reconstructs complete JSON objects
-4. Develop a request/response correlation mechanism using unique IDs for each request
-5. Implement timeout handling for requests that don't receive responses
-
-Implement robust parsing of JSON responses, including error handling for malformed or unexpected output. The framework should support defining test cases as scripts or data files, allowing for easy addition of new scenarios. 
-
-Test case structure should include:
-- Setup phase for environment preparation
-- Sequence of tool requests with expected responses
-- Validation functions for response verification
-- Teardown phase for cleanup
-
-Ensure the framework can assert on both the structure and content of responses, and provide clear logging for debugging. Document setup, usage, and extension instructions. Consider cross-platform compatibility and CI integration.
-
-**Clarification:** The E2E test framework should focus on testing the FastMCP server's ability to correctly process tool requests and return appropriate responses. This includes verifying that the server properly handles different types of tool calls (e.g., file operations, web requests, task management), validates input parameters, and returns well-structured responses. The framework should be designed to be extensible, allowing new test cases to be added as the server's capabilities evolve. Tests should cover both happy paths and error conditions to ensure robust server behavior under various scenarios.
-
-# Test Strategy:
-Verify the framework by implementing a suite of representative E2E tests that cover typical tool requests and edge cases. Specific test cases should include:
-
-1. Basic tool request/response validation
-   - Send a simple file_read request and verify response structure
-   - Test with valid and invalid file paths
-   - Verify error handling for non-existent files
-
-2. Concurrent request handling
-   - Send multiple requests in rapid succession
-   - Verify all responses are received and correlated correctly
-
-3. Large payload testing
-   - Test with large file contents (>1MB)
-   - Verify correct handling of chunked responses
-
-4. Error condition testing
-   - Malformed JSON requests
-   - Invalid tool names
-   - Missing required parameters
-   - Server crash recovery
-
-Confirm that tests can start and stop the FastMCP server, send requests, and accurately parse and validate responses. Implement specific assertions for response timing, structure validation using JSON schema, and content verification. Intentionally introduce malformed requests and simulate server errors to ensure robust error handling. 
-
-Implement detailed logging with different verbosity levels:
-- ERROR: Failed tests and critical issues
-- WARNING: Unexpected but non-fatal conditions
-- INFO: Test progress and results
-- DEBUG: Raw request/response data
-
-Run the test suite in a clean environment and confirm all expected assertions and logs are produced. Validate that new test cases can be added with minimal effort and that the framework integrates with CI pipelines. Create a CI configuration that runs tests on each commit.

tests/e2e/run_e2e.sh

@@ -5,47 +5,6 @@ set -u
 # Prevent errors in pipelines from being masked.
 set -o pipefail
 
-# --- Default Settings ---
-run_verification_test=true
-
-# --- Argument Parsing ---
-# Simple loop to check for the skip flag
-# Note: This needs to happen *before* the main block piped to tee
-# if we want the decision logged early. Or handle args inside.
-# Let's handle it before for clarity.
-processed_args=()
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --skip-verification)
-      run_verification_test=false
-      echo "[INFO] Argument '--skip-verification' detected. Fallback verification will be skipped."
-      shift # Consume the flag
-      ;;
-    --analyze-log)
-      # Keep the analyze-log flag handling separate for now
-      # It exits early, so doesn't conflict with the main run flags
-      processed_args+=("$1")
-      if [[ $# -gt 1 ]]; then
-        processed_args+=("$2")
-        shift 2
-      else
-        shift 1
-      fi
-      ;;
-    *)
-      # Unknown argument, pass it along or handle error
-      # For now, just pass it along in case --analyze-log needs it later
-      processed_args+=("$1")
-      shift
-      ;;
-  esac
-done
-# Restore processed arguments ONLY if the array is not empty
-if [ ${#processed_args[@]} -gt 0 ]; then
-  set -- "${processed_args[@]}"
-fi
-
-
 # --- Configuration ---
 # Assumes script is run from the project root (claude-task-master)
 TASKMASTER_SOURCE_DIR="." # Current directory is the source
@@ -61,11 +20,9 @@ MAIN_ENV_FILE="$TASKMASTER_SOURCE_DIR/.env"
 
 # <<< Source the helper script >>>
 source "$TASKMASTER_SOURCE_DIR/tests/e2e/e2e_helpers.sh"
-# <<< Export helper functions for subshells >>>
-export -f log_info log_success log_error log_step _format_duration _get_elapsed_time_for_log
 
 # --- Argument Parsing for Analysis-Only Mode ---
-# This remains the same, as it exits early if matched
+# Check if the first argument is --analyze-log
 if [ "$#" -ge 1 ] && [ "$1" == "--analyze-log" ]; then
   LOG_TO_ANALYZE=""
   # Check if a log file path was provided as the second argument
@@ -93,7 +50,7 @@ if [ "$#" -ge 1 ] && [ "$1" == "--analyze-log" ]; then
   fi
   echo "[INFO] Running in analysis-only mode for log: $LOG_TO_ANALYZE"
 
-  # --- Derive TEST_RUN_DIR from log file path ---
+  # --- Derive TEST_RUN_DIR from log file path --- 
   # Extract timestamp like YYYYMMDD_HHMMSS from e2e_run_YYYYMMDD_HHMMSS.log
   log_basename=$(basename "$LOG_TO_ANALYZE")
   # Ensure the sed command matches the .log suffix correctly
@@ -117,7 +74,7 @@ if [ "$#" -ge 1 ] && [ "$1" == "--analyze-log" ]; then
 
   # Save original dir before changing
   ORIGINAL_DIR=$(pwd)
-
+  
   echo "[INFO] Changing directory to $EXPECTED_RUN_DIR_ABS for analysis context..."
   cd "$EXPECTED_RUN_DIR_ABS"
 
@@ -212,21 +169,6 @@ log_step() {
   # called *inside* this block depend on it. If not, it can be removed.
   start_time_for_helpers=$(date +%s) # Keep if needed by helpers called inside this block
 
-  # Log the verification decision
-  if [ "$run_verification_test" = true ]; then
-      log_info "Fallback verification test will be run as part of this E2E test."
-  else
-      log_info "Fallback verification test will be SKIPPED (--skip-verification flag detected)."
-  fi
-
-  # --- Dependency Checks ---
-  log_step "Checking for dependencies (jq)"
-  if ! command -v jq &> /dev/null; then
-      log_error "Dependency 'jq' is not installed or not found in PATH. Please install jq (e.g., 'brew install jq' or 'sudo apt-get install jq')."
-      exit 1
-  fi
-  log_success "Dependency 'jq' found."
-
   # --- Test Setup (Output to tee) ---
   log_step "Setting up test environment"
 
@@ -299,7 +241,11 @@ log_step() {
   fi
   log_success "PRD parsed successfully."
 
-  log_step "Expanding Task 1 (to ensure subtask 1.1 exists)"
+  log_step "Listing tasks"
+  task-master list > task_list_output.log
+  log_success "Task list saved to task_list_output.log"
+
+  log_step "Analyzing complexity"
   # Add --research flag if needed and API keys support it
   task-master analyze-complexity --research --output complexity_results.json
   if [ ! -f "complexity_results.json" ]; then
@@ -352,39 +298,7 @@ log_step() {
 
   # === End Model Commands Test ===
 
-  # === Fallback Model generateObjectService Verification ===
-  if [ "$run_verification_test" = true ]; then
-    log_step "Starting Fallback Model (generateObjectService) Verification (Calls separate script)"
-    verification_script_path="$ORIGINAL_DIR/tests/e2e/run_fallback_verification.sh"
-
-    if [ -x "$verification_script_path" ]; then
-        log_info "--- Executing Fallback Verification Script: $verification_script_path ---"
-        # Execute the script directly, allowing output to flow to tee
-        # Pass the current directory (the test run dir) as the argument
-        "$verification_script_path" "$(pwd)"
-        verification_exit_code=$? # Capture exit code immediately
-        log_info "--- Finished Fallback Verification Script Execution (Exit Code: $verification_exit_code) ---"
-
-        # Log success/failure based on captured exit code
-        if [ $verification_exit_code -eq 0 ]; then
-            log_success "Fallback verification script reported success."
-        else
-            log_error "Fallback verification script reported FAILURE (Exit Code: $verification_exit_code)."
-            # Decide whether to exit the main script or just log the error
-            # exit 1 # Uncomment to make verification failure fatal
-        fi
-    else
-        log_error "Fallback verification script not found or not executable at $verification_script_path. Skipping verification."
-        # Decide whether to exit or continue
-        # exit 1
-    fi
-  else
-      log_info "Skipping Fallback Verification test as requested by flag."
-  fi
-  # === END Verification Section ===
-
-
-  # === Multi-Provider Add-Task Test (Keep as is) ===
+  # === Multi-Provider Add-Task Test ===
   log_step "Starting Multi-Provider Add-Task Test Sequence"
 
   # Define providers, models, and flags
@@ -394,9 +308,9 @@ log_step() {
     "claude-3-7-sonnet-20250219"
     "gpt-4o"
     "gemini-2.5-pro-exp-03-25"
-    "sonar-pro" # Note: This is research-only, add-task might fail if not using research model
+    "sonar-pro"
     "grok-3"
-    "anthropic/claude-3.7-sonnet" # OpenRouter uses Claude 3.7
+    "anthropic/claude-3.7-sonnet" # OpenRouter uses Claude 3.7 
   )
   # Flags: Add provider-specific flags here, e.g., --openrouter. Use empty string if none.
   declare -a flags=("" "" "" "" "" "--openrouter")
@@ -404,7 +318,6 @@ log_step() {
   # Consistent prompt for all providers
   add_task_prompt="Create a task to implement user authentication using OAuth 2.0 with Google as the provider. Include steps for registering the app, handling the callback, and storing user sessions."
   log_info "Using consistent prompt for add-task tests: \"$add_task_prompt\""
-  echo "--- Multi-Provider Add Task Summary ---" > provider_add_task_summary.log # Initialize summary log
 
   for i in "${!providers[@]}"; do
     provider="${providers[$i]}"
@@ -428,7 +341,7 @@ log_step() {
 
     # 2. Run add-task
     log_info "Running add-task with prompt..."
-    add_task_output_file="add_task_raw_output_${provider}_${model//\//_}.log" # Sanitize ID
+    add_task_output_file="add_task_raw_output_${provider}.log"
     # Run add-task and capture ALL output (stdout & stderr) to a file AND a variable
     add_task_cmd_output=$(task-master add-task --prompt "$add_task_prompt" 2>&1 | tee "$add_task_output_file")
     add_task_exit_code=${PIPESTATUS[0]}
@@ -475,30 +388,29 @@ log_step() {
   echo "Provider add-task summary log available at: provider_add_task_summary.log"
   # === End Multi-Provider Add-Task Test ===
 
-  log_step "Listing tasks again (after multi-add)"
-  task-master list --with-subtasks > task_list_after_multi_add.log
-  log_success "Task list after multi-add saved to task_list_after_multi_add.log"
+  log_step "Listing tasks again (final)"
+  task-master list --with-subtasks > task_list_final.log
+  log_success "Final task list saved to task_list_final.log"
 
-
-  # === Resume Core Task Commands Test ===
-  log_step "Listing tasks (for core tests)"
-  task-master list > task_list_core_test_start.log
-  log_success "Core test initial task list saved."
+  # === Test Core Task Commands ===
+  log_step "Listing tasks (initial)"
+  task-master list > task_list_initial.log
+  log_success "Initial task list saved to task_list_initial.log"
 
   log_step "Getting next task"
-  task-master next > next_task_core_test.log
-  log_success "Core test next task saved."
+  task-master next > next_task_initial.log
+  log_success "Initial next task saved to next_task_initial.log"
 
   log_step "Showing Task 1 details"
-  task-master show 1 > task_1_details_core_test.log
-  log_success "Task 1 details saved."
+  task-master show 1 > task_1_details.log
+  log_success "Task 1 details saved to task_1_details.log"
 
   log_step "Adding dependency (Task 2 depends on Task 1)"
   task-master add-dependency --id=2 --depends-on=1
   log_success "Added dependency 2->1."
 
   log_step "Validating dependencies (after add)"
-  task-master validate-dependencies > validate_dependencies_after_add_core.log
+  task-master validate-dependencies > validate_dependencies_after_add.log
   log_success "Dependency validation after add saved."
 
   log_step "Removing dependency (Task 2 depends on Task 1)"
@@ -506,7 +418,7 @@ log_step() {
   log_success "Removed dependency 2->1."
 
   log_step "Fixing dependencies (should be no-op now)"
-  task-master fix-dependencies > fix_dependencies_output_core.log
+  task-master fix-dependencies > fix_dependencies_output.log
   log_success "Fix dependencies attempted."
 
   # === Start New Test Section: Validate/Fix Bad Dependencies ===
@@ -571,20 +483,15 @@ log_step() {
 
   # === End New Test Section ===
 
-  # Find the next available task ID dynamically instead of hardcoding 11, 12
-  # Assuming tasks are added sequentially and we didn't remove any core tasks yet
-  last_task_id=$(jq '[.tasks[].id] | max' tasks/tasks.json)
-  manual_task_id=$((last_task_id + 1))
-  ai_task_id=$((manual_task_id + 1))
-
-  log_step "Adding Task $manual_task_id (Manual)"
+  log_step "Adding Task 11 (Manual)"
   task-master add-task --title="Manual E2E Task" --description="Add basic health check endpoint" --priority=low --dependencies=3 # Depends on backend setup
-  log_success "Added Task $manual_task_id manually."
+  # Assuming the new task gets ID 11 (adjust if PRD parsing changes)
+  log_success "Added Task 11 manually."
 
-  log_step "Adding Task $ai_task_id (AI)"
+  log_step "Adding Task 12 (AI)"
   task-master add-task --prompt="Implement basic UI styling using CSS variables for colors and spacing" --priority=medium --dependencies=1 # Depends on frontend setup
-  log_success "Added Task $ai_task_id via AI prompt."
-
+  # Assuming the new task gets ID 12
+  log_success "Added Task 12 via AI prompt."
 
   log_step "Updating Task 3 (update-task AI)"
   task-master update-task --id=3 --prompt="Update backend server setup: Ensure CORS is configured to allow requests from the frontend origin."
@@ -617,8 +524,8 @@ log_step() {
   log_success "Set status for Task 1 to done."
 
   log_step "Getting next task (after status change)"
-  task-master next > next_task_after_change_core.log
-  log_success "Next task after change saved."
+  task-master next > next_task_after_change.log
+  log_success "Next task after change saved to next_task_after_change.log"
 
   # === Start New Test Section: List Filtering ===
   log_step "Listing tasks filtered by status 'done'"
@@ -636,10 +543,10 @@ log_step() {
   task-master clear-subtasks --id=8
   log_success "Attempted to clear subtasks from Task 8."
 
-  log_step "Removing Tasks $manual_task_id and $ai_task_id (multi-ID)"
+  log_step "Removing Tasks 11 and 12 (multi-ID)"
   # Remove the tasks we added earlier
-  task-master remove-task --id="$manual_task_id,$ai_task_id" -y
-  log_success "Removed tasks $manual_task_id and $ai_task_id."
+  task-master remove-task --id=11,12 -y
+  log_success "Removed tasks 11 and 12."
 
   # === Start New Test Section: Subtasks & Dependencies ===
 
@@ -662,11 +569,6 @@ log_step() {
   log_step "Expanding Task 1 again (to have subtasks for next test)"
   task-master expand --id=1
   log_success "Attempted to expand Task 1 again."
-  # Verify 1.1 exists again
-  if ! jq -e '.tasks[] | select(.id == 1) | .subtasks[] | select(.id == 1)' tasks/tasks.json > /dev/null; then
-      log_error "Subtask 1.1 not found in tasks.json after re-expanding Task 1."
-      exit 1
-  fi
 
   log_step "Adding dependency: Task 3 depends on Subtask 1.1"
   task-master add-dependency --id=3 --depends-on=1.1
@@ -691,17 +593,25 @@ log_step() {
   log_success "Generated task files."
   # === End Core Task Commands Test ===
 
-  # === AI Commands (Re-test some after changes) ===
-  log_step "Analyzing complexity (AI with Research - Final Check)"
-  task-master analyze-complexity --research --output complexity_results_final.json
-  if [ ! -f "complexity_results_final.json" ]; then log_error "Final Complexity analysis failed."; exit 1; fi
-  log_success "Final Complexity analysis saved."
+  # === AI Commands (Tested earlier implicitly with add/update/expand) ===
+  log_step "Analyzing complexity (AI with Research)"
+  task-master analyze-complexity --research --output complexity_results.json
+  if [ ! -f "complexity_results.json" ]; then log_error "Complexity analysis failed."; exit 1; fi
+  log_success "Complexity analysis saved to complexity_results.json"
 
-  log_step "Generating complexity report (Non-AI - Final Check)"
-  task-master complexity-report --file complexity_results_final.json > complexity_report_formatted_final.log
-  log_success "Final Formatted complexity report saved."
+  log_step "Generating complexity report (Non-AI)"
+  task-master complexity-report --file complexity_results.json > complexity_report_formatted.log
+  log_success "Formatted complexity report saved to complexity_report_formatted.log"
 
-  # === End AI Commands Re-test ===
+  # Expand All (Commented Out)
+  # log_step "Expanding All Tasks (AI - Heavy Operation, Commented Out)"
+  # task-master expand --all --research
+  # log_success "Attempted to expand all tasks."
+
+  log_step "Expanding Task 1 (AI - Note: Subtasks were removed/cleared)"
+  task-master expand --id=1
+  log_success "Attempted to expand Task 1 again."
+  # === End AI Commands ===
 
   log_step "Listing tasks again (final)"
   task-master list --with-subtasks > task_list_final.log
@@ -713,7 +623,17 @@ log_step() {
   ABS_TEST_RUN_DIR="$(pwd)"
   echo "Test artifacts and logs are located in: $ABS_TEST_RUN_DIR"
   echo "Key artifact files (within above dir):"
-  ls -1 # List files in the current directory
+  echo "  - .env (Copied from source)"
+  echo "  - tasks/tasks.json"
+  echo "  - task_list_output.log"
+  echo "  - complexity_results.json"
+  echo "  - complexity_report_formatted.log"
+  echo "  - task_list_after_changes.log"
+  echo "  - models_initial_config.log, models_final_config.log"
+  echo "  - task_list_final.log"
+  echo "  - task_list_initial.log, next_task_initial.log, task_1_details.log"
+  echo "  - validate_dependencies_after_add.log, fix_dependencies_output.log"
+  echo "  - complexity_*.log"
   echo ""
   echo "Full script log also available at: $LOG_FILE (relative to project root)"
 

tests/e2e/run_fallback_verification.sh

@@ -1,270 +0,0 @@
-#!/bin/bash
-
-# --- Fallback Model Verification Script ---
-# Purpose: Tests models marked as 'fallback' in supported-models.json
-#          to see if they work with generateObjectService (via update-subtask).
-# Usage:   1. Run from within a prepared E2E test run directory:
-#             ./path/to/script.sh .
-#          2. Run from project root (or anywhere) to use the latest run dir:
-#             ./tests/e2e/run_fallback_verification.sh
-#          3. Run from project root (or anywhere) targeting a specific run dir:
-#             ./tests/e2e/run_fallback_verification.sh /path/to/tests/e2e/_runs/run_YYYYMMDD_HHMMSS
-# Output: Prints a summary report to standard output. Errors to standard error.
-
-# Treat unset variables as an error when substituting.
-set -u
-# Prevent errors in pipelines from being masked.
-set -o pipefail
-
-# --- Embedded Helper Functions ---
-# Copied from e2e_helpers.sh to make this script standalone
-
-_format_duration() {
-  local total_seconds=$1
-  local minutes=$((total_seconds / 60))
-  local seconds=$((total_seconds % 60))
-  printf "%dm%02ds" "$minutes" "$seconds"
-}
-
-_get_elapsed_time_for_log() {
-  # Needs overall_start_time defined in the main script body
-  local current_time=$(date +%s)
-  local elapsed_seconds=$((current_time - overall_start_time))
-  _format_duration "$elapsed_seconds"
-}
-
-log_info() {
-  echo "[INFO] [$(_get_elapsed_time_for_log)] $(date +"%Y-%m-%d %H:%M:%S") $1"
-}
-
-log_success() {
-  echo "[SUCCESS] [$(_get_elapsed_time_for_log)] $(date +"%Y-%m-%d %H:%M:%S") $1"
-}
-
-log_error() {
-  echo "[ERROR] [$(_get_elapsed_time_for_log)] $(date +"%Y-%m-%d %H:%M:%S") $1" >&2
-}
-
-log_step() {
-  # Needs test_step_count defined and incremented in the main script body
-  test_step_count=$((test_step_count + 1))
-  echo ""
-  echo "============================================="
-  echo "  STEP ${test_step_count}: [$(_get_elapsed_time_for_log)] $(date +"%Y-%m-%d %H:%M:%S") $1"
-  echo "============================================="
-}
-
-# --- Signal Handling ---
-# Global variable to hold child PID
-child_pid=0
-# Use a persistent log file name
-PROGRESS_LOG_FILE="fallback_verification_progress.log"
-
-cleanup() {
-    echo "" # Newline after ^C
-    log_error "Interrupt received. Cleaning up any running child process..."
-    if [ "$child_pid" -ne 0 ]; then
-        log_info "Killing child process (PID: $child_pid) and its group..."
-        kill -TERM -- "-$child_pid" 2>/dev/null || kill -KILL -- "-$child_pid" 2>/dev/null
-        child_pid=0
-    fi
-    # DO NOT delete the progress log file on interrupt
-    log_info "Progress saved in: $PROGRESS_LOG_FILE"
-    exit 130 # Exit with code indicating interrupt
-}
-
-# Trap SIGINT (Ctrl+C) and SIGTERM
-trap cleanup INT TERM
-
-# --- Configuration ---
-# Determine the project root relative to this script's location
-# Use a robust method to find the script's own directory
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-# Assumes this script is in tests/e2e/
-PROJECT_ROOT_DIR="$( cd "$SCRIPT_DIR/../.." &> /dev/null && pwd )"
-SUPPORTED_MODELS_FILE="$PROJECT_ROOT_DIR/scripts/modules/supported-models.json"
-BASE_RUNS_DIR="$PROJECT_ROOT_DIR/tests/e2e/_runs"
-
-# --- Determine Target Run Directory ---
-TARGET_RUN_DIR=""
-if [ "$#" -ge 1 ] && [ -n "$1" ]; then
-    # Use provided argument if it exists
-    TARGET_RUN_DIR="$1"
-     # Make path absolute if it's relative
-    if [[ "$TARGET_RUN_DIR" != /* ]]; then
-        TARGET_RUN_DIR="$(pwd)/$TARGET_RUN_DIR"
-    fi
-    echo "[INFO] Using provided target run directory: $TARGET_RUN_DIR"
-else
-    # Find the latest run directory
-    echo "[INFO] No run directory provided, finding latest in $BASE_RUNS_DIR..."
-    TARGET_RUN_DIR=$(ls -td "$BASE_RUNS_DIR"/run_* 2>/dev/null | head -n 1)
-    if [ -z "$TARGET_RUN_DIR" ]; then
-        echo "[ERROR] No run directories found matching 'run_*' in $BASE_RUNS_DIR. Cannot proceed." >&2
-        exit 1
-    fi
-     echo "[INFO] Found latest run directory: $TARGET_RUN_DIR"
-fi
-
-# Validate the target directory
-if [ ! -d "$TARGET_RUN_DIR" ]; then
-    echo "[ERROR] Target run directory not found or is not a directory: $TARGET_RUN_DIR" >&2
-    exit 1
-fi
-
-# --- Change to Target Directory ---
-echo "[INFO] Changing working directory to: $TARGET_RUN_DIR"
-if ! cd "$TARGET_RUN_DIR"; then
-     echo "[ERROR] Failed to cd into target directory: $TARGET_RUN_DIR" >&2
-     exit 1
-fi
-echo "[INFO] Now operating inside: $(pwd)"
-
-# --- Now we are inside the target run directory ---
-overall_start_time=$(date +%s)
-test_step_count=0
-log_info "Starting fallback verification script execution in $(pwd)"
-log_info "Progress will be logged to: $(pwd)/$PROGRESS_LOG_FILE"
-
-# --- Dependency Checks ---
-log_step "Checking for dependencies (jq) in verification script"
-if ! command -v jq &> /dev/null; then
-    log_error "Dependency 'jq' is not installed or not found in PATH."
-    exit 1
-fi
-log_success "Dependency 'jq' found."
-
-# --- Verification Logic ---
-log_step "Starting/Resuming Fallback Model (generateObjectService) Verification"
-# Ensure progress log exists, create if not
-touch "$PROGRESS_LOG_FILE"
-
-# Ensure the supported models file exists (using absolute path)
-if [ ! -f "$SUPPORTED_MODELS_FILE" ]; then
-    log_error "supported-models.json not found at absolute path: $SUPPORTED_MODELS_FILE."
-    exit 1
-fi
-log_info "Using supported models file: $SUPPORTED_MODELS_FILE"
-
-# Ensure subtask 1.1 exists (basic check, main script should guarantee)
-# Check for tasks.json in the current directory (which is now the run dir)
-if [ ! -f "tasks/tasks.json" ]; then
-    log_error "tasks/tasks.json not found in current directory ($(pwd)). Was this run directory properly initialized?"
-    exit 1
-fi
-if ! jq -e '.tasks[] | select(.id == 1) | .subtasks[] | select(.id == 1)' tasks/tasks.json > /dev/null 2>&1; then
-    log_error "Subtask 1.1 not found in tasks.json within $(pwd). Cannot perform update-subtask tests."
-    exit 1
-fi
-log_info "Subtask 1.1 found in $(pwd)/tasks/tasks.json, proceeding with verification."
-
-# Read providers and models using jq
-jq -c 'to_entries[] | .key as $provider | .value[] | select(.allowed_roles[]? == "fallback") | {provider: $provider, id: .id}' "$SUPPORTED_MODELS_FILE" | while IFS= read -r model_info; do
-    provider=$(echo "$model_info" | jq -r '.provider')
-    model_id=$(echo "$model_info" | jq -r '.id')
-    flag="" # Default flag
-
-    # Check if already tested
-    # Use grep -Fq for fixed string and quiet mode
-    if grep -Fq "${provider},${model_id}," "$PROGRESS_LOG_FILE"; then
-        log_info "--- Skipping: $provider / $model_id (already tested, result in $PROGRESS_LOG_FILE) ---"
-        continue
-    fi
-
-    log_info "--- Verifying: $provider / $model_id ---"
-
-    # Determine provider flag
-    if [ "$provider" == "openrouter" ]; then
-        flag="--openrouter"
-    elif [ "$provider" == "ollama" ]; then
-        flag="--ollama"
-    fi
-
-    # 1. Set the main model
-    if ! command -v task-master &> /dev/null; then
-        log_error "task-master command not found."
-        echo "[INSTRUCTION] Please run 'npm link task-master-ai' in the project root first."
-        exit 1
-    fi
-    log_info "Setting main model to $model_id ${flag:+using flag $flag}..."
-    set_model_cmd="task-master models --set-main \"$model_id\" $flag"
-    model_set_status="SUCCESS"
-    if ! eval $set_model_cmd > /dev/null 2>&1; then
-        log_error "Failed to set main model for $provider / $model_id. Skipping test."
-        echo "$provider,$model_id,SET_MODEL_FAILED" >> "$PROGRESS_LOG_FILE"
-        continue # Skip the actual test if setting fails
-    fi
-    log_info "Set main model ok."
-
-    # 2. Run update-subtask
-    log_info "Running update-subtask --id=1.1 --prompt='Test generateObjectService' (timeout 120s)"
-    update_subtask_output_file="update_subtask_raw_output_${provider}_${model_id//\//_}.log"
-
-    timeout 120s task-master update-subtask --id=1.1 --prompt="Simple test prompt to verify generateObjectService call." > "$update_subtask_output_file" 2>&1 &
-    child_pid=$!
-    wait "$child_pid"
-    update_subtask_exit_code=$?
-    child_pid=0
-
-    # 3. Check result and log persistently
-    result_status=""
-    if [ $update_subtask_exit_code -eq 0 ] && grep -q "Successfully updated subtask #1.1" "$update_subtask_output_file"; then
-        log_success "update-subtask succeeded for $provider / $model_id (Verified Output)."
-        result_status="SUCCESS"
-    elif [ $update_subtask_exit_code -eq 124 ]; then
-        log_error "update-subtask TIMED OUT for $provider / $model_id. Check $update_subtask_output_file."
-        result_status="FAILED_TIMEOUT"
-    elif [ $update_subtask_exit_code -eq 130 ] || [ $update_subtask_exit_code -eq 143 ]; then
-         log_error "update-subtask INTERRUPTED for $provider / $model_id."
-         result_status="INTERRUPTED" # Record interruption
-         # Don't exit the loop, allow script to finish or be interrupted again
-    else
-        log_error "update-subtask FAILED for $provider / $model_id (Exit Code: $update_subtask_exit_code). Check $update_subtask_output_file."
-        result_status="FAILED"
-    fi
-
-    # Append result to the persistent log file
-    echo "$provider,$model_id,$result_status" >> "$PROGRESS_LOG_FILE"
-
-done # End of fallback verification loop
-
-# --- Generate Final Verification Report to STDOUT ---
-# Report reads from the persistent PROGRESS_LOG_FILE
-echo ""
-echo "--- Fallback Model Verification Report (via $0) ---"
-echo "Executed inside run directory: $(pwd)"
-echo "Progress log: $(pwd)/$PROGRESS_LOG_FILE"
-echo ""
-echo "Test Command: task-master update-subtask --id=1.1 --prompt=\"...\" (tests generateObjectService)"
-echo "Models were tested by setting them as the 'main' model temporarily."
-echo "Results based on exit code and output verification:"
-echo ""
-echo "Models CONFIRMED to support generateObjectService (Keep 'fallback' role):"
-awk -F',' '$3 == "SUCCESS" { print "- " $1 " / " $2 }' "$PROGRESS_LOG_FILE" | sort
-echo ""
-echo "Models FAILED generateObjectService test (Suggest REMOVING 'fallback' role):"
-awk -F',' '$3 == "FAILED" { print "- " $1 " / " $2 }' "$PROGRESS_LOG_FILE" | sort
-echo ""
-echo "Models TIMED OUT during test (Suggest REMOVING 'fallback' role):"
-awk -F',' '$3 == "FAILED_TIMEOUT" { print "- " $1 " / " $2 }' "$PROGRESS_LOG_FILE" | sort
-echo ""
-echo "Models where setting the model failed (Inconclusive):"
-awk -F',' '$3 == "SET_MODEL_FAILED" { print "- " $1 " / " $2 }' "$PROGRESS_LOG_FILE" | sort
-echo ""
-echo "Models INTERRUPTED during test (Inconclusive - Rerun):"
-awk -F',' '$3 == "INTERRUPTED" { print "- " $1 " / " $2 }' "$PROGRESS_LOG_FILE" | sort
-echo ""
-echo "-------------------------------------------------------"
-echo ""
-
-# Don't clean up the progress log
-# if [ -f "$PROGRESS_LOG_FILE" ]; then
-#     rm "$PROGRESS_LOG_FILE"
-# fi
-
-log_info "Finished Fallback Model (generateObjectService) Verification Script"
-
-# Remove trap before exiting normally
-trap - INT TERM
-
-exit 0 # Exit successfully after printing the report

tests/unit/ai-services-unified.test.js

@@ -40,14 +40,12 @@ jest.unstable_mockModule('../../src/ai-providers/perplexity.js', () => ({
 
 // ... Mock other providers (google, openai, etc.) similarly ...
 
-// Mock utils logger, API key resolver, AND findProjectRoot
+// Mock utils logger and API key resolver
 const mockLog = jest.fn();
 const mockResolveEnvVariable = jest.fn();
-const mockFindProjectRoot = jest.fn();
 jest.unstable_mockModule('../../scripts/modules/utils.js', () => ({
 	log: mockLog,
-	resolveEnvVariable: mockResolveEnvVariable,
-	findProjectRoot: mockFindProjectRoot
+	resolveEnvVariable: mockResolveEnvVariable
 }));
 
 // Import the module to test (AFTER mocks)
@@ -56,8 +54,6 @@ const { generateTextService } = await import(
 );
 
 describe('Unified AI Services', () => {
-	const fakeProjectRoot = '/fake/project/root'; // Define for reuse
-
 	beforeEach(() => {
 		// Clear mocks before each test
 		jest.clearAllMocks(); // Clears all mocks
@@ -80,9 +76,6 @@ describe('Unified AI Services', () => {
 			if (key === 'PERPLEXITY_API_KEY') return 'mock-perplexity-key';
 			return null;
 		});
-
-		// Set a default behavior for the new mock
-		mockFindProjectRoot.mockReturnValue(fakeProjectRoot);
 	});
 
 	describe('generateTextService', () => {
@@ -98,16 +91,12 @@ describe('Unified AI Services', () => {
 			const result = await generateTextService(params);
 
 			expect(result).toBe('Main provider response');
-			expect(mockGetMainProvider).toHaveBeenCalledWith(fakeProjectRoot);
-			expect(mockGetMainModelId).toHaveBeenCalledWith(fakeProjectRoot);
-			expect(mockGetParametersForRole).toHaveBeenCalledWith(
-				'main',
-				fakeProjectRoot
-			);
+			expect(mockGetMainProvider).toHaveBeenCalled();
+			expect(mockGetMainModelId).toHaveBeenCalled();
+			expect(mockGetParametersForRole).toHaveBeenCalledWith('main');
 			expect(mockResolveEnvVariable).toHaveBeenCalledWith(
 				'ANTHROPIC_API_KEY',
-				params.session,
-				fakeProjectRoot
+				params.session
 			);
 			expect(mockGenerateAnthropicText).toHaveBeenCalledTimes(1);
 			expect(mockGenerateAnthropicText).toHaveBeenCalledWith({
@@ -120,43 +109,26 @@ describe('Unified AI Services', () => {
 					{ role: 'user', content: 'Test' }
 				]
 			});
+			// Verify other providers NOT called
 			expect(mockGeneratePerplexityText).not.toHaveBeenCalled();
 		});
 
 		test('should fall back to fallback provider if main fails', async () => {
 			const mainError = new Error('Main provider failed');
 			mockGenerateAnthropicText
-				.mockRejectedValueOnce(mainError)
-				.mockResolvedValueOnce('Fallback provider response');
+				.mockRejectedValueOnce(mainError) // Main fails first
+				.mockResolvedValueOnce('Fallback provider response'); // Fallback succeeds
 
-			const explicitRoot = '/explicit/test/root';
-			const params = {
-				role: 'main',
-				prompt: 'Fallback test',
-				projectRoot: explicitRoot
-			};
+			const params = { role: 'main', prompt: 'Fallback test' };
 			const result = await generateTextService(params);
 
 			expect(result).toBe('Fallback provider response');
-			expect(mockGetMainProvider).toHaveBeenCalledWith(explicitRoot);
-			expect(mockGetFallbackProvider).toHaveBeenCalledWith(explicitRoot);
-			expect(mockGetParametersForRole).toHaveBeenCalledWith(
-				'main',
-				explicitRoot
-			);
-			expect(mockGetParametersForRole).toHaveBeenCalledWith(
-				'fallback',
-				explicitRoot
-			);
+			expect(mockGetMainProvider).toHaveBeenCalled();
+			expect(mockGetFallbackProvider).toHaveBeenCalled(); // Fallback was tried
+			expect(mockGenerateAnthropicText).toHaveBeenCalledTimes(2); // Called for main (fail) and fallback (success)
+			expect(mockGeneratePerplexityText).not.toHaveBeenCalled(); // Research not called
 
-			expect(mockResolveEnvVariable).toHaveBeenCalledWith(
-				'ANTHROPIC_API_KEY',
-				undefined,
-				explicitRoot
-			);
-
-			expect(mockGenerateAnthropicText).toHaveBeenCalledTimes(2);
-			expect(mockGeneratePerplexityText).not.toHaveBeenCalled();
+			// Check log messages for fallback attempt
 			expect(mockLog).toHaveBeenCalledWith(
 				'error',
 				expect.stringContaining('Service call failed for role main')
@@ -181,40 +153,12 @@ describe('Unified AI Services', () => {
 			const result = await generateTextService(params);
 
 			expect(result).toBe('Research provider response');
-			expect(mockGetMainProvider).toHaveBeenCalledWith(fakeProjectRoot);
-			expect(mockGetFallbackProvider).toHaveBeenCalledWith(fakeProjectRoot);
-			expect(mockGetResearchProvider).toHaveBeenCalledWith(fakeProjectRoot);
-			expect(mockGetParametersForRole).toHaveBeenCalledWith(
-				'main',
-				fakeProjectRoot
-			);
-			expect(mockGetParametersForRole).toHaveBeenCalledWith(
-				'fallback',
-				fakeProjectRoot
-			);
-			expect(mockGetParametersForRole).toHaveBeenCalledWith(
-				'research',
-				fakeProjectRoot
-			);
+			expect(mockGetMainProvider).toHaveBeenCalled();
+			expect(mockGetFallbackProvider).toHaveBeenCalled();
+			expect(mockGetResearchProvider).toHaveBeenCalled(); // Research was tried
+			expect(mockGenerateAnthropicText).toHaveBeenCalledTimes(2); // main, fallback
+			expect(mockGeneratePerplexityText).toHaveBeenCalledTimes(1); // research
 
-			expect(mockResolveEnvVariable).toHaveBeenCalledWith(
-				'ANTHROPIC_API_KEY',
-				undefined,
-				fakeProjectRoot
-			);
-			expect(mockResolveEnvVariable).toHaveBeenCalledWith(
-				'ANTHROPIC_API_KEY',
-				undefined,
-				fakeProjectRoot
-			);
-			expect(mockResolveEnvVariable).toHaveBeenCalledWith(
-				'PERPLEXITY_API_KEY',
-				undefined,
-				fakeProjectRoot
-			);
-
-			expect(mockGenerateAnthropicText).toHaveBeenCalledTimes(2);
-			expect(mockGeneratePerplexityText).toHaveBeenCalledTimes(1);
 			expect(mockLog).toHaveBeenCalledWith(
 				'error',
 				expect.stringContaining('Service call failed for role fallback')
@@ -260,23 +204,6 @@ describe('Unified AI Services', () => {
 			);
 		});
 
-		test('should use default project root or handle null if findProjectRoot returns null', async () => {
-			mockFindProjectRoot.mockReturnValue(null); // Simulate not finding root
-			mockGenerateAnthropicText.mockResolvedValue('Response with no root');
-
-			const params = { role: 'main', prompt: 'No root test' }; // No explicit root passed
-			await generateTextService(params);
-
-			expect(mockGetMainProvider).toHaveBeenCalledWith(null);
-			expect(mockGetParametersForRole).toHaveBeenCalledWith('main', null);
-			expect(mockResolveEnvVariable).toHaveBeenCalledWith(
-				'ANTHROPIC_API_KEY',
-				undefined,
-				null
-			);
-			expect(mockGenerateAnthropicText).toHaveBeenCalledTimes(1);
-		});
-
 		// Add more tests for edge cases:
 		// - Missing API keys (should throw from _resolveApiKey)
 		// - Unsupported provider configured (should skip and log)