fix(typo): second typo in the readme this time.

.changeset/beige-rats-accept.md

@@ -0,0 +1,5 @@
+---
+'task-master-ai': patch
+---
+
+- Add support for Google Gemini models via Vercel AI SDK integration.

.changeset/blue-spies-kick.md

@@ -0,0 +1,5 @@
+---
+'task-master-ai': patch
+---
+
+Add xAI provider and Grok models support

.changeset/cuddly-zebras-matter.md

@@ -0,0 +1,8 @@
+---
+'task-master-ai': minor
+---
+
+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.

.changeset/curvy-candies-eat.md

@@ -0,0 +1,9 @@
+---
+'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/easy-toys-wash.md

@@ -0,0 +1,7 @@
+---
+'task-master-ai': minor
+---
+
+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.
+

.changeset/every-stars-sell.md

@@ -0,0 +1,5 @@
+---
+'task-master-ai': patch
+---
+
+Add integration for Roo Code

.changeset/fine-monkeys-eat.md

@@ -0,0 +1,8 @@
+---
+'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/fine-signs-add.md

@@ -0,0 +1,13 @@
+---
+'task-master-ai': patch
+---
+
+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.

.changeset/gentle-views-jump.md

@@ -0,0 +1,5 @@
+---
+'task-master-ai': patch
+---
+
+Fixes an issue with add-task which did not use the manually defined properties and still needlessly hit the AI endpoint.

.changeset/mighty-mirrors-watch.md

@@ -0,0 +1,5 @@
+---
+'task-master-ai': minor
+---
+
+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."

.changeset/neat-donkeys-shave.md

@@ -0,0 +1,5 @@
+---
+'task-master-ai': patch
+---
+
+Fixes an issue that prevented remove-subtask with comma separated tasks/subtasks from being deleted (only the first ID was being deleted). Closes #140

.changeset/nine-rocks-sink.md

@@ -0,0 +1,10 @@
+---
+'task-master-ai': patch
+---
+
+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.

.changeset/ninety-ghosts-relax.md

@@ -0,0 +1,11 @@
+---
+'task-master-ai': minor
+---
+
+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.

.changeset/ninety-wombats-pull.md

@@ -0,0 +1,5 @@
+---
+'task-master-ai': patch
+---
+
+Add `--status` flag to `show` command to filter displayed subtasks.

.changeset/public-cooks-fetch.md

@@ -0,0 +1,7 @@
+---
+'task-master-ai': minor
+---
+
+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.

.changeset/tricky-papayas-hang.md

@@ -0,0 +1,9 @@
+---
+'task-master-ai': minor
+---
+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. 🔥

.changeset/violet-papayas-see.md

@@ -0,0 +1,5 @@
+---
+'task-master-ai': patch
+---
+
+Fix --task to --num-tasks in ui + related tests - issue #324

.changeset/violet-parrots-march.md

@@ -0,0 +1,9 @@
+---
+'task-master-ai': patch
+---
+
+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.

.cursor/rules/ai_services.mdc

@@ -25,7 +25,6 @@ This document outlines the architecture and usage patterns for interacting with
     *   Implements **retry logic** for specific API errors (`_attemptProviderCallWithRetries`).
     *   Resolves API keys automatically via `_resolveApiKey` (using `resolveEnvVariable`).
     *   Maps requests to the correct provider implementation (in `src/ai-providers/`) via `PROVIDER_FUNCTIONS`.
-    *   Returns a structured object containing the primary AI result (`mainResult`) and telemetry data (`telemetryData`). See [`telemetry.mdc`](mdc:.cursor/rules/telemetry.mdc) for details on how this telemetry data is propagated and handled.
 
 *   **Provider Implementations (`src/ai-providers/*.js`):**
     *   Contain provider-specific wrappers around Vercel AI SDK functions (`generateText`, `generateObject`).

.cursor/rules/architecture.mdc

@@ -42,7 +42,6 @@ alwaysApply: false
       - Resolves API keys (from `.env` or `session.env`).
       - Implements fallback and retry logic.
       - Orchestrates calls to provider-specific implementations (`src/ai-providers/`).
-    - Telemetry data generated by the AI service layer is propagated upwards through core logic, direct functions, and MCP tools. See [`telemetry.mdc`](mdc:.cursor/rules/telemetry.mdc) for the detailed integration pattern.
 
   - **[`src/ai-providers/*.js`](mdc:src/ai-providers/): Provider-Specific Implementations**
     - **Purpose**: Provider-specific wrappers for Vercel AI SDK functions.

.cursor/rules/dev_workflow.mdc

@@ -116,7 +116,7 @@ Taskmaster configuration is managed through two main mechanisms:
     *   For MCP/Cursor integration, configure these keys in the `env` section of `.cursor/mcp.json`.
     *   Available keys/variables: See `assets/env.example` or the Configuration section in the command reference (previously linked to `taskmaster.mdc`).
 
-**Important:** Non-API key settings (like model selections, `MAX_TOKENS`, `TASKMASTER_LOG_LEVEL`) are **no longer configured via environment variables**. Use the `task-master models` command (or `--setup` for interactive configuration) or the `models` MCP tool.
+**Important:** Non-API key settings (like model selections, `MAX_TOKENS`, `LOG_LEVEL`) are **no longer configured via environment variables**. Use the `task-master models` command (or `--setup` for interactive configuration) or the `models` MCP tool.
 **If AI commands FAIL in MCP** verify that the API key for the selected provider is present in the `env` section of `.cursor/mcp.json`.
 **If AI commands FAIL in CLI** verify that the API key for the selected provider is present in the `.env` file in the root of the project.
 

.cursor/rules/glossary.mdc

@@ -3,6 +3,7 @@ description: Glossary of other Cursor rules
 globs: **/*
 alwaysApply: true
 ---
+
 # Glossary of Task Master Cursor Rules
 
 This file provides a quick reference to the purpose of each rule file located in the `.cursor/rules` directory.
@@ -22,5 +23,4 @@ This file provides a quick reference to the purpose of each rule file located in
 - **[`tests.mdc`](mdc:.cursor/rules/tests.mdc)**: Guidelines for implementing and maintaining tests for Task Master CLI.
 - **[`ui.mdc`](mdc:.cursor/rules/ui.mdc)**: Guidelines for implementing and maintaining user interface components.
 - **[`utilities.mdc`](mdc:.cursor/rules/utilities.mdc)**: Guidelines for implementing utility functions.
-- **[`telemetry.mdc`](mdc:.cursor/rules/telemetry.mdc)**: Guidelines for integrating AI usage telemetry across Task Master.
 

.cursor/rules/mcp.mdc

@@ -522,8 +522,3 @@ Follow these steps to add MCP support for an existing Task Master command (see [
       // Add more functions as implemented
     };
     ```
-
-## Telemetry Integration
-
-- Direct functions calling core logic that involves AI should receive and pass through `telemetryData` within their successful `data` payload. See [`telemetry.mdc`](mdc:.cursor/rules/telemetry.mdc) for the standard pattern.
-- MCP tools use `handleApiResult`, which ensures the `data` object (potentially including `telemetryData`) from the direct function is correctly included in the final response.

.cursor/rules/new_features.mdc

@@ -3,6 +3,7 @@ description: Guidelines for integrating new features into the Task Master CLI
 globs: scripts/modules/*.js
 alwaysApply: false
 ---
+
 # Task Master Feature Integration Guidelines
 
 ## Feature Placement Decision Process
@@ -195,8 +196,6 @@ The standard pattern for adding a feature follows this workflow:
   - ✅ **DO**: If an MCP tool fails with vague errors (e.g., JSON parsing issues like `Unexpected token ... is not valid JSON`), **try running the equivalent CLI command directly in the terminal** (e.g., `task-master expand --all`). CLI output often provides much more specific error messages (like missing function definitions or stack traces from the core logic) that pinpoint the root cause.
   - ❌ **DON'T**: Rely solely on MCP logs if the error is unclear; use the CLI as a complementary debugging tool for core logic issues.
 
-- **Telemetry Integration**: Ensure AI calls correctly handle and propagate `telemetryData` as described in [`telemetry.mdc`](mdc:.cursor/rules/telemetry.mdc).
-
 ```javascript
 // 1. CORE LOGIC: Add function to appropriate module (example in task-manager.js)
 /**

.cursor/rules/telemetry.mdc

@@ -1,228 +0,0 @@
----
-description: Guidelines for integrating AI usage telemetry across Task Master.
-globs: scripts/modules/**/*.js,mcp-server/src/**/*.js
-alwaysApply: true
----
-
-# AI Usage Telemetry Integration
-
-This document outlines the standard pattern for capturing, propagating, and handling AI usage telemetry data (cost, tokens, model, etc.) across the Task Master stack. This ensures consistent telemetry for both CLI and MCP interactions.
-
-## Overview
-
-Telemetry data is generated within the unified AI service layer ([`ai-services-unified.js`](mdc:scripts/modules/ai-services-unified.js)) and then passed upwards through the calling functions.
-
-- **Data Source**: [`ai-services-unified.js`](mdc:scripts/modules/ai-services-unified.js) (specifically its `generateTextService`, `generateObjectService`, etc.) returns an object like `{ mainResult: AI_CALL_OUTPUT, telemetryData: TELEMETRY_OBJECT }`.
-- **`telemetryData` Object Structure**:
-  ```json
-  {
-    "timestamp": "ISO_STRING_DATE",
-    "userId": "USER_ID_FROM_CONFIG",
-    "commandName": "invoking_command_or_tool_name",
-    "modelUsed": "ai_model_id",
-    "providerName": "ai_provider_name",
-    "inputTokens": NUMBER,
-    "outputTokens": NUMBER,
-    "totalTokens": NUMBER,
-    "totalCost": NUMBER, // e.g., 0.012414
-    "currency": "USD" // e.g., "USD"
-  }
-  ```
-
-## Integration Pattern by Layer
-
-The key principle is that each layer receives telemetry data from the layer below it (if applicable) and passes it to the layer above it, or handles it for display in the case of the CLI.
-
-### 1. Core Logic Functions (e.g., in `scripts/modules/task-manager/`)
-
-Functions in this layer that invoke AI services are responsible for handling the `telemetryData` they receive from [`ai-services-unified.js`](mdc:scripts/modules/ai-services-unified.js).
-
-- **Actions**:
-    1.  Call the appropriate AI service function (e.g., `generateObjectService`).
-        -   Pass `commandName` (e.g., `add-task`, `expand-task`) and `outputType` (e.g., `cli` or `mcp`) in the `params` object to the AI service. The `outputType` can be derived from context (e.g., presence of `mcpLog`).
-    2.  The AI service returns an object, e.g., `aiServiceResponse = { mainResult: {/*AI output*/}, telemetryData: {/*telemetry data*/} }`.
-    3.  Extract `aiServiceResponse.mainResult` for the core processing.
-    4.  **Must return an object that includes `aiServiceResponse.telemetryData`**.
-        Example: `return { operationSpecificData: /*...*/, telemetryData: aiServiceResponse.telemetryData };`
-
-- **CLI Output Handling (If Applicable)**:
-    -   If the core function also handles CLI output (e.g., it has an `outputFormat` parameter that can be `'text'` or `'cli'`):
-        1.  Check if `outputFormat === 'text'` (or `'cli'`).
-        2.  If so, and if `aiServiceResponse.telemetryData` is available, call `displayAiUsageSummary(aiServiceResponse.telemetryData, 'cli')` from [`scripts/modules/ui.js`](mdc:scripts/modules/ui.js).
-        - This ensures telemetry is displayed directly to CLI users after the main command output.
-
-- **Example Snippet (Core Logic in `scripts/modules/task-manager/someAiAction.js`)**:
-  ```javascript
-  import { generateObjectService } from '../ai-services-unified.js';
-  import { displayAiUsageSummary } from '../ui.js';
-
-  async function performAiRelatedAction(params, context, outputFormat = 'text') {
-    const { commandNameFromContext, /* other context vars */ } = context;
-    let aiServiceResponse = null;
-
-    try {
-      aiServiceResponse = await generateObjectService({
-        // ... other parameters for AI service ...
-        commandName: commandNameFromContext || 'default-action-name',
-        outputType: context.mcpLog ? 'mcp' : 'cli' // Derive outputType
-      });
-
-      const usefulAiOutput = aiServiceResponse.mainResult.object;
-      // ... do work with usefulAiOutput ...
-
-      if (outputFormat === 'text' && aiServiceResponse.telemetryData) {
-        displayAiUsageSummary(aiServiceResponse.telemetryData, 'cli');
-      }
-
-      return {
-        actionData: /* results of processing */,
-        telemetryData: aiServiceResponse.telemetryData
-      };
-    } catch (error) {
-      // ... handle error ...
-      throw error;
-    }
-  }
-  ```
-
-### 2. Direct Function Wrappers (in `mcp-server/src/core/direct-functions/`)
-
-These functions adapt core logic for the MCP server, ensuring structured responses.
-
-- **Actions**:
-    1.  Call the corresponding core logic function.
-        -   Pass necessary context (e.g., `session`, `mcpLog`, `projectRoot`).
-        -   Provide the `commandName` (typically derived from the MCP tool name) and `outputType: 'mcp'` in the context object passed to the core function.
-        -   If the core function supports an `outputFormat` parameter, pass `'json'` to suppress CLI-specific UI.
-    2.  The core logic function returns an object (e.g., `coreResult = { actionData: ..., telemetryData: ... }`).
-    3.  Include `coreResult.telemetryData` as a field within the `data` object of the successful response returned by the direct function.
-
-- **Example Snippet (Direct Function `someAiActionDirect.js`)**:
-  ```javascript
-  import { performAiRelatedAction } from '../../../../scripts/modules/task-manager/someAiAction.js'; // Core function
-  import { createLogWrapper } from '../../tools/utils.js'; // MCP Log wrapper
-
-  export async function someAiActionDirect(args, log, context = {}) {
-    const { session } = context;
-    // ... prepare arguments for core function from args, including args.projectRoot ...
-
-    try {
-      const coreResult = await performAiRelatedAction(
-        { /* parameters for core function */ },
-        { // Context for core function
-          session,
-          mcpLog: createLogWrapper(log),
-          projectRoot: args.projectRoot,
-          commandNameFromContext: 'mcp_tool_some_ai_action', // Example command name
-          outputType: 'mcp'
-        },
-        'json' // Request 'json' output format from core function
-      );
-
-      return {
-        success: true,
-        data: {
-          operationSpecificData: coreResult.actionData,
-          telemetryData: coreResult.telemetryData // Pass telemetry through
-        }
-      };
-    } catch (error) {
-      // ... error handling, return { success: false, error: ... } ...
-    }
-  }
-  ```
-
-### 3. MCP Tools (in `mcp-server/src/tools/`)
-
-These are the exposed endpoints for MCP clients.
-
-- **Actions**:
-    1.  Call the corresponding direct function wrapper.
-    2.  The direct function returns an object structured like `{ success: true, data: { operationSpecificData: ..., telemetryData: ... } }` (or an error object).
-    3.  Pass this entire result object to `handleApiResult(result, log)` from [`mcp-server/src/tools/utils.js`](mdc:mcp-server/src/tools/utils.js).
-    4.  `handleApiResult` ensures that the `data` field from the direct function's response (which correctly includes `telemetryData`) is part of the final MCP response.
-
-- **Example Snippet (MCP Tool `some_ai_action.js`)**:
-  ```javascript
-  import { someAiActionDirect } from '../core/task-master-core.js';
-  import { handleApiResult, withNormalizedProjectRoot } from './utils.js';
-  // ... zod for parameters ...
-
-  export function registerSomeAiActionTool(server) {
-    server.addTool({
-      name: "some_ai_action",
-      // ... description, parameters ...
-      execute: withNormalizedProjectRoot(async (args, { log, session }) => {
-        try {
-          const resultFromDirectFunction = await someAiActionDirect(
-            { /* args including projectRoot */ },
-            log,
-            { session }
-          );
-          return handleApiResult(resultFromDirectFunction, log); // This passes the nested telemetryData through
-        } catch (error) {
-          // ... error handling ...
-        }
-      })
-    });
-  }
-  ```
-
-### 4. CLI Commands (`scripts/modules/commands.js`)
-
-These define the command-line interface.
-
-- **Actions**:
-    1.  Call the appropriate core logic function.
-    2.  Pass `outputFormat: 'text'` (or ensure the core function defaults to text-based output for CLI).
-    3.  The core logic function (as per Section 1) is responsible for calling `displayAiUsageSummary` if telemetry data is available and it's in CLI mode.
-    4.  The command action itself **should not** call `displayAiUsageSummary` if the core logic function already handles this. This avoids duplicate display.
-
-- **Example Snippet (CLI Command in `commands.js`)**:
-  ```javascript
-  // In scripts/modules/commands.js
-  import { performAiRelatedAction } from './task-manager/someAiAction.js'; // Core function
-
-  programInstance
-    .command('some-cli-ai-action')
-    // ... .option() ...
-    .action(async (options) => {
-      try {
-        const projectRoot = findProjectRoot() || '.'; // Example root finding
-        // ... prepare parameters for core function from command options ...
-        await performAiRelatedAction(
-          { /* parameters for core function */ },
-          { // Context for core function
-            projectRoot,
-            commandNameFromContext: 'some-cli-ai-action',
-            outputType: 'cli'
-          },
-          'text' // Explicitly request text output format for CLI
-        );
-        // Core function handles displayAiUsageSummary internally for 'text' outputFormat
-      } catch (error) {
-        // ... error handling ...
-      }
-    });
-  ```
-
-## Summary Flow
-
-The telemetry data flows as follows:
-
-1.  **[`ai-services-unified.js`](mdc:scripts/modules/ai-services-unified.js)**: Generates `telemetryData` and returns `{ mainResult, telemetryData }`.
-2.  **Core Logic Function**:
-    *   Receives `{ mainResult, telemetryData }`.
-    *   Uses `mainResult`.
-    *   If CLI (`outputFormat: 'text'`), calls `displayAiUsageSummary(telemetryData)`.
-    *   Returns `{ operationSpecificData, telemetryData }`.
-3.  **Direct Function Wrapper**:
-    *   Receives `{ operationSpecificData, telemetryData }` from core logic.
-    *   Returns `{ success: true, data: { operationSpecificData, telemetryData } }`.
-4.  **MCP Tool**:
-    *   Receives direct function response.
-    *   `handleApiResult` ensures the final MCP response to the client is `{ success: true, data: { operationSpecificData, telemetryData } }`.
-5.  **CLI Command**:
-    *   Calls core logic with `outputFormat: 'text'`. Display is handled by core logic.
-
-This pattern ensures telemetry is captured and appropriately handled/exposed across all interaction modes.

.github/workflows/pre-release.yml

@@ -1,62 +0,0 @@
-name: Pre-Release (RC)
-
-on:
-  workflow_dispatch: # Allows manual triggering from GitHub UI/API
-
-concurrency: pre-release-${{ github.ref }}
-
-jobs:
-  rc:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: 'npm'
-
-      - name: Cache node_modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            */*/node_modules
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - name: Install dependencies
-        run: npm ci
-        timeout-minutes: 2
-
-      - name: Enter RC mode
-        run: |
-          npx changeset pre exit || true
-          npx changeset pre enter rc
-
-      - name: Version RC packages
-        run: npx changeset version
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Create Release Candidate Pull Request or Publish Release Candidate to npm
-        uses: changesets/action@v1
-        with:
-          publish: npm run release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Exit RC mode
-        run: npx changeset pre exit
-
-      - name: Commit & Push changes
-        uses: actions-js/push@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
-          message: 'chore: rc version bump'

.github/workflows/release.yml

@@ -33,9 +33,6 @@ jobs:
         run: npm ci
         timeout-minutes: 2
 
-      - name: Exit pre-release mode (safety check)
-        run: npx changeset pre exit || true
-
       - name: Create Release Pull Request or Publish to npm
         uses: changesets/action@v1
         with:

.gitignore

@@ -61,6 +61,3 @@ dist
 *.debug
 init-debug.log
 dev-debug.log
-
-# NPMRC
-.npmrc

.taskmasterconfig

@@ -1,32 +1,31 @@
 {
-	"models": {
-		"main": {
-			"provider": "anthropic",
-			"modelId": "claude-3-7-sonnet-20250219",
-			"maxTokens": 100000,
-			"temperature": 0.2
-		},
-		"research": {
-			"provider": "perplexity",
-			"modelId": "sonar-pro",
-			"maxTokens": 8700,
-			"temperature": 0.1
-		},
-		"fallback": {
-			"provider": "anthropic",
-			"modelId": "claude-3-7-sonnet-20250219",
-			"maxTokens": 8192,
-			"temperature": 0.2
-		}
-	},
-	"global": {
-		"logLevel": "info",
-		"debug": false,
-		"defaultSubtasks": 5,
-		"defaultPriority": "medium",
-		"projectName": "Taskmaster",
-		"ollamaBaseUrl": "http://localhost:11434/api",
-		"userId": "1234567890",
-		"azureOpenaiBaseUrl": "https://your-endpoint.openai.azure.com/"
-	}
-}
+  "models": {
+    "main": {
+      "provider": "google",
+      "modelId": "gemini-2.0-flash",
+      "maxTokens": 100000,
+      "temperature": 0.2
+    },
+    "research": {
+      "provider": "perplexity",
+      "modelId": "sonar-pro",
+      "maxTokens": 8700,
+      "temperature": 0.1
+    },
+    "fallback": {
+      "provider": "anthropic",
+      "modelId": "claude-3-7-sonnet-20250219",
+      "maxTokens": 120000,
+      "temperature": 0.2
+    }
+  },
+  "global": {
+    "logLevel": "info",
+    "debug": false,
+    "defaultSubtasks": 5,
+    "defaultPriority": "medium",
+    "projectName": "Taskmaster",
+    "ollamaBaseUrl": "http://localhost:11434/api",
+    "azureOpenaiBaseUrl": "https://your-endpoint.openai.azure.com/"
+  }
+}

CHANGELOG.md

@@ -1,197 +1,5 @@
 # task-master-ai
 
-## 0.14.0
-
-### Minor Changes
-
-- [#521](https://github.com/eyaltoledano/claude-task-master/pull/521) [`ed17cb0`](https://github.com/eyaltoledano/claude-task-master/commit/ed17cb0e0a04dedde6c616f68f24f3660f68dd04) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - .taskmasterconfig now supports a baseUrl field per model role (main, research, fallback), allowing endpoint overrides for any provider.
-
-- [#536](https://github.com/eyaltoledano/claude-task-master/pull/536) [`f4a83ec`](https://github.com/eyaltoledano/claude-task-master/commit/f4a83ec047b057196833e3a9b861d4bceaec805d) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Add Ollama as a supported AI provider.
-
-  - You can now add it by running `task-master models --setup` and selecting it.
-  - Ollama is a local model provider, so no API key is required.
-  - Ollama models are available at `http://localhost:11434/api` by default.
-  - You can change the default URL by setting the `OLLAMA_BASE_URL` environment variable or by adding a `baseUrl` property to the `ollama` model role in `.taskmasterconfig`.
-    - If you want to use a custom API key, you can set it in the `OLLAMA_API_KEY` environment variable.
-
-- [#528](https://github.com/eyaltoledano/claude-task-master/pull/528) [`58b417a`](https://github.com/eyaltoledano/claude-task-master/commit/58b417a8ce697e655f749ca4d759b1c20014c523) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Display task complexity scores in task lists, next task, and task details views.
-
-### Patch Changes
-
-- [#402](https://github.com/eyaltoledano/claude-task-master/pull/402) [`01963af`](https://github.com/eyaltoledano/claude-task-master/commit/01963af2cb6f77f43b2ad8a6e4a838ec205412bc) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Resolve all issues related to MCP
-
-- [#478](https://github.com/eyaltoledano/claude-task-master/pull/478) [`4117f71`](https://github.com/eyaltoledano/claude-task-master/commit/4117f71c18ee4d321a9c91308d00d5d69bfac61e) Thanks [@joedanz](https://github.com/joedanz)! - Fix CLI --force flag for parse-prd command
-
-  Previously, the --force flag was not respected when running `parse-prd`, causing the command to prompt for confirmation or fail even when --force was provided. This patch ensures that the flag is correctly passed and handled, allowing users to overwrite existing tasks.json files as intended.
-
-  - Fixes #477
-
-- [#511](https://github.com/eyaltoledano/claude-task-master/pull/511) [`17294ff`](https://github.com/eyaltoledano/claude-task-master/commit/17294ff25918d64278674e558698a1a9ad785098) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Task Master no longer tells you to update when you're already up to date
-
-- [#442](https://github.com/eyaltoledano/claude-task-master/pull/442) [`2b3ae8b`](https://github.com/eyaltoledano/claude-task-master/commit/2b3ae8bf89dc471c4ce92f3a12ded57f61faa449) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Adds costs information to AI commands using input/output tokens and model costs.
-
-- [#402](https://github.com/eyaltoledano/claude-task-master/pull/402) [`01963af`](https://github.com/eyaltoledano/claude-task-master/commit/01963af2cb6f77f43b2ad8a6e4a838ec205412bc) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix ERR_MODULE_NOT_FOUND when trying to run MCP Server
-
-- [#402](https://github.com/eyaltoledano/claude-task-master/pull/402) [`01963af`](https://github.com/eyaltoledano/claude-task-master/commit/01963af2cb6f77f43b2ad8a6e4a838ec205412bc) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Add src directory to exports
-
-- [#523](https://github.com/eyaltoledano/claude-task-master/pull/523) [`da317f2`](https://github.com/eyaltoledano/claude-task-master/commit/da317f2607ca34db1be78c19954996f634c40923) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix the error handling of task status settings
-
-- [#527](https://github.com/eyaltoledano/claude-task-master/pull/527) [`a8dabf4`](https://github.com/eyaltoledano/claude-task-master/commit/a8dabf44856713f488960224ee838761716bba26) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Remove caching layer from MCP direct functions for task listing, next task, and complexity report
-
-  - Fixes issues users where having where they were getting stale data
-
-- [#417](https://github.com/eyaltoledano/claude-task-master/pull/417) [`a1f8d52`](https://github.com/eyaltoledano/claude-task-master/commit/a1f8d52474fdbdf48e17a63e3f567a6d63010d9f) Thanks [@ksylvan](https://github.com/ksylvan)! - Fix for issue #409 LOG_LEVEL Pydantic validation error
-
-- [#442](https://github.com/eyaltoledano/claude-task-master/pull/442) [`0288311`](https://github.com/eyaltoledano/claude-task-master/commit/0288311965ae2a343ebee4a0c710dde94d2ae7e7) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Small fixes - `next` command no longer incorrectly suggests that subtasks be broken down into subtasks in the CLI - fixes the `append` flag so it properly works in the CLI
-
-- [#501](https://github.com/eyaltoledano/claude-task-master/pull/501) [`0a61184`](https://github.com/eyaltoledano/claude-task-master/commit/0a611843b56a856ef0a479dc34078326e05ac3a8) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix initial .env.example to work out of the box
-
-  - Closes #419
-
-- [#435](https://github.com/eyaltoledano/claude-task-master/pull/435) [`a96215a`](https://github.com/eyaltoledano/claude-task-master/commit/a96215a359b25061fd3b3f3c7b10e8ac0390c062) Thanks [@lebsral](https://github.com/lebsral)! - Fix default fallback model and maxTokens in Taskmaster initialization
-
-- [#517](https://github.com/eyaltoledano/claude-task-master/pull/517) [`e96734a`](https://github.com/eyaltoledano/claude-task-master/commit/e96734a6cc6fec7731de72eb46b182a6e3743d02) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix bug when updating tasks on the MCP server (#412)
-
-- [#496](https://github.com/eyaltoledano/claude-task-master/pull/496) [`efce374`](https://github.com/eyaltoledano/claude-task-master/commit/efce37469bc58eceef46763ba32df1ed45242211) Thanks [@joedanz](https://github.com/joedanz)! - Fix duplicate output on CLI help screen
-
-  - Prevent the Task Master CLI from printing the help screen more than once when using `-h` or `--help`.
-  - Removed redundant manual event handlers and guards for help output; now only the Commander `.helpInformation` override is used for custom help.
-  - Simplified logic so that help is only shown once for both "no arguments" and help flag flows.
-  - Ensures a clean, branded help experience with no repeated content.
-  - Fixes #339
-
-## 0.14.0-rc.1
-
-### Minor Changes
-
-- [#536](https://github.com/eyaltoledano/claude-task-master/pull/536) [`f4a83ec`](https://github.com/eyaltoledano/claude-task-master/commit/f4a83ec047b057196833e3a9b861d4bceaec805d) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Add Ollama as a supported AI provider.
-
-  - You can now add it by running `task-master models --setup` and selecting it.
-  - Ollama is a local model provider, so no API key is required.
-  - Ollama models are available at `http://localhost:11434/api` by default.
-  - You can change the default URL by setting the `OLLAMA_BASE_URL` environment variable or by adding a `baseUrl` property to the `ollama` model role in `.taskmasterconfig`.
-    - If you want to use a custom API key, you can set it in the `OLLAMA_API_KEY` environment variable.
-
-### Patch Changes
-
-- [#442](https://github.com/eyaltoledano/claude-task-master/pull/442) [`2b3ae8b`](https://github.com/eyaltoledano/claude-task-master/commit/2b3ae8bf89dc471c4ce92f3a12ded57f61faa449) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Adds costs information to AI commands using input/output tokens and model costs.
-
-- [#442](https://github.com/eyaltoledano/claude-task-master/pull/442) [`0288311`](https://github.com/eyaltoledano/claude-task-master/commit/0288311965ae2a343ebee4a0c710dde94d2ae7e7) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Small fixes - `next` command no longer incorrectly suggests that subtasks be broken down into subtasks in the CLI - fixes the `append` flag so it properly works in the CLI
-
-## 0.14.0-rc.0
-
-### Minor Changes
-
-- [#521](https://github.com/eyaltoledano/claude-task-master/pull/521) [`ed17cb0`](https://github.com/eyaltoledano/claude-task-master/commit/ed17cb0e0a04dedde6c616f68f24f3660f68dd04) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - .taskmasterconfig now supports a baseUrl field per model role (main, research, fallback), allowing endpoint overrides for any provider.
-
-- [#528](https://github.com/eyaltoledano/claude-task-master/pull/528) [`58b417a`](https://github.com/eyaltoledano/claude-task-master/commit/58b417a8ce697e655f749ca4d759b1c20014c523) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Display task complexity scores in task lists, next task, and task details views.
-
-### Patch Changes
-
-- [#478](https://github.com/eyaltoledano/claude-task-master/pull/478) [`4117f71`](https://github.com/eyaltoledano/claude-task-master/commit/4117f71c18ee4d321a9c91308d00d5d69bfac61e) Thanks [@joedanz](https://github.com/joedanz)! - Fix CLI --force flag for parse-prd command
-
-  Previously, the --force flag was not respected when running `parse-prd`, causing the command to prompt for confirmation or fail even when --force was provided. This patch ensures that the flag is correctly passed and handled, allowing users to overwrite existing tasks.json files as intended.
-
-  - Fixes #477
-
-- [#511](https://github.com/eyaltoledano/claude-task-master/pull/511) [`17294ff`](https://github.com/eyaltoledano/claude-task-master/commit/17294ff25918d64278674e558698a1a9ad785098) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Task Master no longer tells you to update when you're already up to date
-
-- [#523](https://github.com/eyaltoledano/claude-task-master/pull/523) [`da317f2`](https://github.com/eyaltoledano/claude-task-master/commit/da317f2607ca34db1be78c19954996f634c40923) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix the error handling of task status settings
-
-- [#527](https://github.com/eyaltoledano/claude-task-master/pull/527) [`a8dabf4`](https://github.com/eyaltoledano/claude-task-master/commit/a8dabf44856713f488960224ee838761716bba26) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Remove caching layer from MCP direct functions for task listing, next task, and complexity report
-
-  - Fixes issues users where having where they were getting stale data
-
-- [#417](https://github.com/eyaltoledano/claude-task-master/pull/417) [`a1f8d52`](https://github.com/eyaltoledano/claude-task-master/commit/a1f8d52474fdbdf48e17a63e3f567a6d63010d9f) Thanks [@ksylvan](https://github.com/ksylvan)! - Fix for issue #409 LOG_LEVEL Pydantic validation error
-
-- [#501](https://github.com/eyaltoledano/claude-task-master/pull/501) [`0a61184`](https://github.com/eyaltoledano/claude-task-master/commit/0a611843b56a856ef0a479dc34078326e05ac3a8) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix initial .env.example to work out of the box
-
-  - Closes #419
-
-- [#435](https://github.com/eyaltoledano/claude-task-master/pull/435) [`a96215a`](https://github.com/eyaltoledano/claude-task-master/commit/a96215a359b25061fd3b3f3c7b10e8ac0390c062) Thanks [@lebsral](https://github.com/lebsral)! - Fix default fallback model and maxTokens in Taskmaster initialization
-
-- [#517](https://github.com/eyaltoledano/claude-task-master/pull/517) [`e96734a`](https://github.com/eyaltoledano/claude-task-master/commit/e96734a6cc6fec7731de72eb46b182a6e3743d02) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix bug when updating tasks on the MCP server (#412)
-
-- [#496](https://github.com/eyaltoledano/claude-task-master/pull/496) [`efce374`](https://github.com/eyaltoledano/claude-task-master/commit/efce37469bc58eceef46763ba32df1ed45242211) Thanks [@joedanz](https://github.com/joedanz)! - Fix duplicate output on CLI help screen
-
-  - Prevent the Task Master CLI from printing the help screen more than once when using `-h` or `--help`.
-  - Removed redundant manual event handlers and guards for help output; now only the Commander `.helpInformation` override is used for custom help.
-  - Simplified logic so that help is only shown once for both "no arguments" and help flag flows.
-  - Ensures a clean, branded help experience with no repeated content.
-  - Fixes #339
-
-## 0.13.1
-
-### Patch Changes
-
-- [#399](https://github.com/eyaltoledano/claude-task-master/pull/399) [`734a4fd`](https://github.com/eyaltoledano/claude-task-master/commit/734a4fdcfc89c2e089255618cf940561ad13a3c8) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix ERR_MODULE_NOT_FOUND when trying to run MCP Server
-
-## 0.13.0
-
-### Minor Changes
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`ef782ff`](https://github.com/eyaltoledano/claude-task-master/commit/ef782ff5bd4ceb3ed0dc9ea82087aae5f79ac933) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - 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.
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`87d97bb`](https://github.com/eyaltoledano/claude-task-master/commit/87d97bba00d84e905756d46ef96b2d5b984e0f38) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - 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.
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`1ab836f`](https://github.com/eyaltoledano/claude-task-master/commit/1ab836f191cb8969153593a9a0bd47fc9aa4a831) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - 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."
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`c8722b0`](https://github.com/eyaltoledano/claude-task-master/commit/c8722b0a7a443a73b95d1bcd4a0b68e0fce2a1cd) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - 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.
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`2517bc1`](https://github.com/eyaltoledano/claude-task-master/commit/2517bc112c9a497110f3286ca4bfb4130c9addcb) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - 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.
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`9a48278`](https://github.com/eyaltoledano/claude-task-master/commit/9a482789f7894f57f655fb8d30ba68542bd0df63) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - 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
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`842eaf7`](https://github.com/eyaltoledano/claude-task-master/commit/842eaf722498ddf7307800b4cdcef4ac4fd7e5b0) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - - Add support for Google Gemini models via Vercel AI SDK integration.
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`ed79d4f`](https://github.com/eyaltoledano/claude-task-master/commit/ed79d4f4735dfab4124fa189214c0bd5e23a6860) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Add xAI provider and Grok models support
-
-- [#378](https://github.com/eyaltoledano/claude-task-master/pull/378) [`ad89253`](https://github.com/eyaltoledano/claude-task-master/commit/ad89253e313a395637aa48b9f92cc39b1ef94ad8) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - 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.
-
-- [#285](https://github.com/eyaltoledano/claude-task-master/pull/285) [`2acba94`](https://github.com/eyaltoledano/claude-task-master/commit/2acba945c0afee9460d8af18814c87e80f747e9f) Thanks [@neno-is-ooo](https://github.com/neno-is-ooo)! - Add integration for Roo Code
-
-- [#378](https://github.com/eyaltoledano/claude-task-master/pull/378) [`d63964a`](https://github.com/eyaltoledano/claude-task-master/commit/d63964a10eed9be17856757661ff817ad6bacfdc) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - 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
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`5f504fa`](https://github.com/eyaltoledano/claude-task-master/commit/5f504fafb8bdaa0043c2d20dee8bbb8ec2040d85) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - 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.
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`96aeeff`](https://github.com/eyaltoledano/claude-task-master/commit/96aeeffc195372722c6a07370540e235bfe0e4d8) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Fixes an issue with add-task which did not use the manually defined properties and still needlessly hit the AI endpoint.
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`5aea93d`](https://github.com/eyaltoledano/claude-task-master/commit/5aea93d4c0490c242d7d7042a210611977848e0a) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Fixes an issue that prevented remove-subtask with comma separated tasks/subtasks from being deleted (only the first ID was being deleted). Closes #140
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`66ac9ab`](https://github.com/eyaltoledano/claude-task-master/commit/66ac9ab9f66d006da518d6e8a3244e708af2764d) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - 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.
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`ca7b045`](https://github.com/eyaltoledano/claude-task-master/commit/ca7b0457f1dc65fd9484e92527d9fd6d69db758d) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - Add `--status` flag to `show` command to filter displayed subtasks.
-
-- [#328](https://github.com/eyaltoledano/claude-task-master/pull/328) [`5a2371b`](https://github.com/eyaltoledano/claude-task-master/commit/5a2371b7cc0c76f5e95d43921c1e8cc8081bf14e) Thanks [@knoxgraeme](https://github.com/knoxgraeme)! - Fix --task to --num-tasks in ui + related tests - issue #324
-
-- [#240](https://github.com/eyaltoledano/claude-task-master/pull/240) [`6cb213e`](https://github.com/eyaltoledano/claude-task-master/commit/6cb213ebbd51116ae0688e35b575d09443d17c3b) Thanks [@eyaltoledano](https://github.com/eyaltoledano)! - 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.md

@@ -11,20 +11,8 @@ A task management system for AI-driven development with Claude, designed to work
 
 ## Requirements
 
-Taskmaster utilizes AI across several commands, and those require a separate API key. You can use a variety of models from different AI providers provided you add your API keys. For example, if you want to use Claude 3.7, you'll need an Anthropic API key.
-
-You can define 3 types of models to be used: the main model, the research model, and the fallback model (in case either the main or research fail). Whatever model you use, its provider API key must be present in either mcp.json or .env.
-
-At least one (1) of the following is required:
-
 - Anthropic API key (Claude API)
-- OpenAI API key
-- Google Gemini API key
-- Perplexity API key (for research model)
-- xAI API Key (for research or main model)
-- OpenRouter API Key (for research or main model)
-
-Using the research model is optional but highly recommended. You will need at least ONE API key. Adding all API keys enables you to seamlessly switch between model providers at will.
+- OpenAI SDK (for Perplexity API integration, optional)
 
 ## Quick Start
 
@@ -48,8 +36,7 @@ MCP (Model Control Protocol) provides the easiest way to get started with Task M
 				"MISTRAL_API_KEY": "YOUR_MISTRAL_KEY_HERE",
 				"OPENROUTER_API_KEY": "YOUR_OPENROUTER_KEY_HERE",
 				"XAI_API_KEY": "YOUR_XAI_KEY_HERE",
-				"AZURE_OPENAI_API_KEY": "YOUR_AZURE_KEY_HERE",
-				"OLLAMA_API_KEY": "YOUR_OLLAMA_API_KEY_HERE"
+				"AZURE_OPENAI_API_KEY": "YOUR_AZURE_KEY_HERE"
 			}
 		}
 	}

assets/.taskmasterconfig

@@ -14,8 +14,8 @@
 		},
 		"fallback": {
 			"provider": "anthropic",
-			"modelId": "claude-3-5-sonnet-20240620",
-			"maxTokens": 8192,
+			"modelId": "claude-3.5-sonnet-20240620",
+			"maxTokens": 120000,
 			"temperature": 0.1
 		}
 	},

assets/.windsurfrules

@@ -198,7 +198,7 @@ alwaysApply: true
   - **MAX_TOKENS** (Default: `"4000"`): Maximum tokens for responses (Example: `MAX_TOKENS=8000`)
   - **TEMPERATURE** (Default: `"0.7"`): Temperature for model responses (Example: `TEMPERATURE=0.5`)
   - **DEBUG** (Default: `"false"`): Enable debug logging (Example: `DEBUG=true`)
-  - **TASKMASTER_LOG_LEVEL** (Default: `"info"`): Console output level (Example: `TASKMASTER_LOG_LEVEL=debug`)
+  - **LOG_LEVEL** (Default: `"info"`): Console output level (Example: `LOG_LEVEL=debug`)
   - **DEFAULT_SUBTASKS** (Default: `"3"`): Default subtask count (Example: `DEFAULT_SUBTASKS=5`)
   - **DEFAULT_PRIORITY** (Default: `"medium"`): Default priority (Example: `DEFAULT_PRIORITY=high`)
   - **PROJECT_NAME** (Default: `"MCP SaaS MVP"`): Project name in metadata (Example: `PROJECT_NAME=My Awesome Project`)

assets/env.example

@@ -1,9 +1,8 @@
 # API Keys (Required to enable respective provider)
-ANTHROPIC_API_KEY="your_anthropic_api_key_here"       # Required: Format: sk-ant-api03-...
-PERPLEXITY_API_KEY="your_perplexity_api_key_here"     # Optional: Format: pplx-...
-OPENAI_API_KEY="your_openai_api_key_here"             # Optional, for OpenAI/OpenRouter models. Format: sk-proj-...
-GOOGLE_API_KEY="your_google_api_key_here"             # Optional, for Google Gemini models.
-MISTRAL_API_KEY="your_mistral_key_here"               # Optional, for Mistral AI models.
-XAI_API_KEY="YOUR_XAI_KEY_HERE"                       # Optional, for xAI AI models.
-AZURE_OPENAI_API_KEY="your_azure_key_here"            # Optional, for Azure OpenAI models (requires endpoint in .taskmasterconfig).
-OLLAMA_API_KEY="your_ollama_api_key_here"             # Optional: For remote Ollama servers that require authentication.
+ANTHROPIC_API_KEY=your_anthropic_api_key_here       # Required: Format: sk-ant-api03-...
+PERPLEXITY_API_KEY=your_perplexity_api_key_here     # Optional: Format: pplx-...
+OPENAI_API_KEY=your_openai_api_key_here             # Optional, for OpenAI/OpenRouter models. Format: sk-proj-...
+GOOGLE_API_KEY=your_google_api_key_here             # Optional, for Google Gemini models.
+MISTRAL_API_KEY=your_mistral_key_here               # Optional, for Mistral AI models.
+XAI_API_KEY=YOUR_XAI_KEY_HERE                       # Optional, for xAI AI models.
+AZURE_OPENAI_API_KEY=your_azure_key_here            # Optional, for Azure OpenAI models (requires endpoint in .taskmasterconfig).

assets/roocode/.roomodes

@@ -39,7 +39,7 @@
     {
       "slug": "debug",
       "name": "Debug",
-      "roleDefinition": "You are Roo, an expert software debugger specializing in systematic problem diagnosis and resolution. When activated by another mode, your task is to meticulously analyze the provided debugging request (potentially referencing Taskmaster tasks, logs, or metrics), use diagnostic tools as instructed to investigate the issue, identify the root cause, and report your findings and recommended next steps back via `attempt_completion`. You focus solely on diagnostics within the scope defined by the delegated task.",
+      "roleDefinition": "You are Roo, an expert software debugger specializing in systematic problem diagnosis and resolution. When activated by another mdode, your task is to meticulously analyze the provided debugging request (potentially referencing Taskmaster tasks, logs, or metrics), use diagnostic tools as instructed to investigate the issue, identify the root cause, and report your findings and recommended next steps back via `attempt_completion`. You focus solely on diagnostics within the scope defined by the delegated task.",
       "customInstructions": "Reflect on 5-7 different possible sources of the problem, distill those down to 1-2 most likely sources, and then add logs to validate your assumptions. Explicitly ask the user to confirm the diagnosis before fixing the problem.",
       "groups": [
         "read",

assets/scripts_README.md

@@ -31,7 +31,7 @@ Task Master configuration is now managed through two primary methods:
     - Create a `.env` file in your project root for CLI usage.
     - See `assets/env.example` for required key names.
 
-**Important:** Settings like `MODEL`, `MAX_TOKENS`, `TEMPERATURE`, `TASKMASTER_LOG_LEVEL`, etc., are **no longer set via `.env`**. Use `task-master models --setup` instead.
+**Important:** Settings like `MODEL`, `MAX_TOKENS`, `TEMPERATURE`, `LOG_LEVEL`, etc., are **no longer set via `.env`**. Use `task-master models --setup` instead.
 
 ## How It Works
 
@@ -42,7 +42,7 @@ Task Master configuration is now managed through two primary methods:
    - Tasks can have `subtasks` for more detailed implementation steps.
    - Dependencies are displayed with status indicators (✅ for completed, ⏱️ for pending) to easily track progress.
 
-2. **CLI Commands**
+2. **CLI Commands**  
    You can run the commands via:
 
    ```bash
@@ -200,7 +200,7 @@ Notes:
 
 ## Logging
 
-The script supports different logging levels controlled by the `TASKMASTER_LOG_LEVEL` environment variable:
+The script supports different logging levels controlled by the `LOG_LEVEL` environment variable:
 
 - `debug`: Detailed information, typically useful for troubleshooting
 - `info`: Confirmation that things are working as expected (default)

context/chats/max-min-tokens.txt.md

@@ -1,368 +0,0 @@
-We want to refine how Task Master handles AI model token limits to be more precise, by:
-
-1.  Distinguishing between `maxInputTokens` and `maxOutputTokens` in the configuration.
-2.  Dynamically adjusting the `maxOutputTokens` for an API call based on the actual prompt length to stay within the model's total context window (or respecting separate input/output limits if the API and model support that).
-3.  Ensuring that `ai-services-unified.js` uses these more granular limits.
-
-This is a good improvement for both cost control and preventing errors.
-
-Here's a plan:
-
-**Phase 1: Configuration and Core Logic Updates**
-
-1.  **Update `.taskmasterconfig` Structure:**
-    - I'll modify the `models` section in your `.taskmasterconfig`. For each role (`main`, `research`, `fallback`), `maxTokens` will be replaced with `maxInputTokens` and `maxOutputTokens`.
-      - We'll need to decide on reasonable default values for these new fields. We can look at the current `maxTokens` and the model's known limits to make an initial guess.
-2.  **Update `MODEL_MAP` in `ai-services-unified.js`:**
-    - This array already stores cost data. We need to ensure it also stores the _absolute_ maximum input and output tokens for each model listed (e.g., `model_max_input_tokens`, `model_max_output_tokens`). If these fields are not present, they will need to be added. The values in `.taskmasterconfig` will then represent user-defined operational limits, which should ideally be validated against these absolute maximums.
-3.  **Update `config-manager.js`:**
-    - Getter functions like `getParametersForRole` will be updated to fetch `maxInputTokens` and `maxOutputTokens` instead of the singular `maxTokens`.
-    - New getters might be needed if we want to access the model's absolute limits directly from `MODEL_MAP` via `config-manager.js`.
-4.  **Update `ai-services-unified.js` (`_unifiedServiceRunner`):**
-    - **Token Counting:** This is a crucial step. Before an API call, we need to estimate the token count of the combined `systemPrompt` and `userPrompt`.
-      - The Vercel AI SDK or the individual provider SDKs might offer utilities for this. For example, some SDKs expose a `tokenizer` or a way to count tokens for a given string.
-      - If a direct utility isn't available through the Vercel SDK for the specific provider, we might need to use a library like `tiktoken` for OpenAI/Anthropic models or investigate provider-specific tokenization. This could be complex as tokenization varies between models.
-      - For now, let's assume we can get a reasonable estimate.
-    - **Dynamic Output Token Calculation & Validation:**
-      - Retrieve `configured_max_input_tokens` and `configured_max_output_tokens` from `config-manager.js` for the current role.
-      - Retrieve `model_absolute_max_input_tokens` and `model_absolute_max_output_tokens` from `MODEL_MAP`.
-      - Let `prompt_tokens = countTokens(systemPrompt + userPrompt)`.
-      - **Input Validation:** If `prompt_tokens > configured_max_input_tokens` OR `prompt_tokens > model_absolute_max_input_tokens`, throw an error. (We might also consider auto-truncation strategies in the future, but an error is safer to start).
-      - **Output Calculation:** The `max_tokens` parameter sent to the API (which typically refers to the _max number of tokens to generate_) should be `configured_max_output_tokens`. We also need to ensure this doesn't violate the model's absolute output limit.
-      - Some models have a _total_ context window (input + output). If this is the case for a model, the `max_tokens` parameter for the API call might need to be `min(configured_max_output_tokens, model_absolute_total_tokens - prompt_tokens)`. However, many modern APIs handle separate input and output limits, simplifying this. We'll aim to pass `configured_max_output_tokens` as the API's `max_tokens` parameter, assuming the input validation has passed.
-    - **API Call Parameter:** Update the `callParams` to use the correctly determined `max_tokens` for generation (which will be our `configured_max_output_tokens`).
-
-**Phase 2: Error Handling and Refinements**
-
-1.  **Enhanced Error Handling:** Provide clear error messages if prompt tokens exceed input limits, or if API calls fail due to token issues despite our calculations.
-2.  **Validation:** Add validation (perhaps in `config-manager.js` or when `task-master models --setup` is run) to ensure `configured_max_input_tokens` and `configured_max_output_tokens` in `.taskmasterconfig` do not exceed the `model_absolute_max_input_tokens` and `model_absolute_max_output_tokens` from `MODEL_MAP`.
-
-Let's start by inspecting `scripts/modules/config-manager.js` to see how parameters and `MODEL_MAP` are currently handled. This will inform the changes needed for `.taskmasterconfig` and `ai-services-unified.js`.
-
-I will now read `scripts/modules/config-manager.js`.
-
-Okay, I've reviewed `scripts/modules/config-manager.js`. Here's what I've gathered and how it impacts the plan:
-
-- **`MODEL_MAP` Source:** `MODEL_MAP` is loaded from `supported-models.json`. This is excellent, as it means we can update the model capabilities (including new token limits) in a structured JSON file.
-- **Configuration Loading:** `_loadAndValidateConfig` handles loading `.taskmasterconfig` and merging it with `DEFAULTS`.
-- **Getters:** There are specific getters for `maxTokens` for each role (e.g., `getMainMaxTokens`). We will need to update these.
-- **`getParametersForRole`:** This function already exists and is a good candidate for returning the new `maxInputTokens` and `maxOutputTokens`.
-
-Here's the refined plan:
-
-**Phase 1: Configuration and Data Structures**
-
-1.  **Update `supported-models.json`:**
-
-    - For each model entry in `supported-models.json`, we need to add `maxInputTokens` and `maxOutputTokens` fields. These should reflect the _absolute maximums_ for that specific model.
-    - Example entry change:
-
-      ```json
-      // Before
-      {
-          "id": "claude-3-7-sonnet-20250219",
-          "name": "Claude 3.7 Sonnet (Preview)",
-          "context_window": 200000, // This might be total context
-          "cost_per_1m_tokens": { "input": 3, "output": 15, "currency": "USD" }
-      }
-
-      // After (assuming 200k is total, and we make a reasonable split or find official numbers)
-      {
-          "id": "claude-3-7-sonnet-20250219",
-          "name": "Claude 3.7 Sonnet (Preview)",
-          "maxInputTokens": 190000, // Example
-          "maxOutputTokens": 8192,  // Example, often smaller for generation
-          "cost_per_1m_tokens": { "input": 3, "output": 15, "currency": "USD" }
-      }
-      ```
-
-    - I will need to find the official input/output token limits for the models currently in your `MODEL_MAP`. If you have this information handy, it would speed things up. Otherwise, I can make educated guesses or search for them.
-
-2.  **Update `.taskmasterconfig` (Defaults and User File):**
-    - In `scripts/modules/config-manager.js`, modify the `DEFAULTS` object. For each role (`main`, `research`, `fallback`), replace `maxTokens` with:
-      - `maxInputTokens`: A sensible default (e.g., a large portion of the model's capability, but user-configurable).
-      - `maxOutputTokens`: A sensible default for generation (e.g., 4096 or 8192).
-    - You will then need to manually update your existing `.taskmasterconfig` file to reflect this new structure. I can provide the snippet for you to paste.
-3.  **Update `config-manager.js`:**
-    - Modify `getParametersForRole(role, explicitRoot = null)`:
-      - It currently fetches `maxTokens` and `temperature`.
-      - Update it to fetch `maxInputTokens`, `maxOutputTokens`, and `temperature` from the loaded config for the given role.
-    - Remove the role-specific `getMaxTokens` functions (e.g., `getMainMaxTokens`, `getResearchMaxTokens`, `getFallbackMaxTokens`). The `getParametersForRole` will be the central way to get these.
-    - (Optional, for later validation) Consider adding a new function `getModelCapabilities(providerName, modelId)` that reads from `MODEL_MAP` to return the absolute `maxInputTokens` and `maxOutputTokens` for a given model. This would be useful for validating the user's settings in `.taskmasterconfig`.
-
-**Phase 2: Core Logic in `ai-services-unified.js`**
-
-1.  **Token Counting (`_unifiedServiceRunner`):**
-
-    - This is the most complex part. We need a reliable way to count tokens for the prompts.
-      - **Strategy 1 (Ideal):** Leverage Vercel AI SDK. The SDK might provide a way to get a tokenizer for the active model or a utility function. We'll need to investigate its capabilities.
-      - **Strategy 2 (Fallback):** Use a library like `tiktoken` for models compatible with OpenAI's tokenization (many are, including some Anthropic models). For other models, we might need provider-specific tokenizers or make estimations (less ideal).
-      - **Initial Approach:** Let's try to find a Vercel AI SDK utility first. If not, we'll start with `tiktoken` as a common case and acknowledge that other models might need specific handling later.
-    - The function `_unifiedServiceRunner` will call this token counting utility:
-
-      ```javascript
-      // Placeholder for token counting
-      function countTokens(text, modelId /* or providerName */) {
-      	// ... implementation using SDK or library ...
-      	// This is a simplification; actual tokenization is model-specific.
-      	// For now, a rough estimate might be (text.length / 4) as a placeholder
-      	// if a proper tokenizer isn't immediately available.
-      	if (!text) return 0;
-      	return Math.ceil(text.length / 3.5); // Very rough general estimate
-      }
-
-      const promptTokens = countTokens(systemPrompt) + countTokens(prompt);
-      ```
-
-2.  **Dynamic Output Token Calculation & Validation (`_unifiedServiceRunner`):**
-
-    - Fetch parameters using the updated `getParametersForRole` from `config-manager.js`:
-      ```javascript
-      const roleParams = getParametersForRole(
-      	currentRole,
-      	effectiveProjectRoot
-      );
-      // roleParams will now contain { maxInputTokens, maxOutputTokens, temperature }
-      ```
-    - Fetch model's absolute limits from `MODEL_MAP` (we'll need a helper in `config-manager.js` or do it directly in `ai-services-unified.js` for now):
-      ```javascript
-      // Simplified; ideally use a robust getter from config-manager
-      const modelInfo = MODEL_MAP[providerName?.toLowerCase()]?.find(
-      	(m) => m.id === modelId
-      );
-      const modelAbsoluteMaxInput = modelInfo?.maxInputTokens || Infinity;
-      const modelAbsoluteMaxOutput =
-      	modelInfo?.maxOutputTokens || roleParams.maxOutputTokens; // Fallback to configured if not in map
-      ```
-    - **Input Validation:**
-      ```javascript
-      if (promptTokens > roleParams.maxInputTokens) {
-      	throw new Error(
-      		`Prompt (${promptTokens} tokens) exceeds configured max input tokens (${roleParams.maxInputTokens}) for role '${currentRole}'.`
-      	);
-      }
-      if (promptTokens > modelAbsoluteMaxInput) {
-      	throw new Error(
-      		`Prompt (${promptTokens} tokens) exceeds model's absolute max input tokens (${modelAbsoluteMaxInput}) for ${modelId}.`
-      	);
-      }
-      ```
-    - **API Call Parameter (`max_tokens` for generation):**
-      The `max_tokens` parameter passed to the provider's API call should be `roleParams.maxOutputTokens`. We must also ensure this doesn't exceed the model's absolute output capability.
-
-      ```javascript
-      const apiMaxOutputTokens = Math.min(
-      	roleParams.maxOutputTokens,
-      	modelAbsoluteMaxOutput
-      );
-
-      const callParams = {
-      	apiKey,
-      	modelId,
-      	// Use apiMaxOutputTokens for the actual API call
-      	maxTokens: apiMaxOutputTokens, // This usually means max tokens to GENERATE
-      	temperature: roleParams.temperature,
-      	messages,
-      	baseUrl,
-      	...(serviceType === 'generateObject' && { schema, objectName }),
-      	...restApiParams
-      };
-      ```
-
-3.  **Update `logAiUsage`:**
-    - The cost calculation in `logAiUsage` seems correct as it already uses `inputCost` and `outputCost` per 1M tokens. This part should remain compatible.
-
-**Next Steps:**
-
-1.  **Modify `supported-models.json`:** I need the content of this file to propose the new `maxInputTokens` and `maxOutputTokens` fields. Please provide it.
-2.  **Decide on Tokenizer Strategy:** What are your thoughts on the token counting? Are you aware of any utilities within Vercel AI SDK for this, or should we plan to integrate `tiktoken` initially?
-
-Once I have the content of `supported-models.json`, I can draft the changes for it and then proceed to `config-manager.js` and `.taskmasterconfig`.
-
-```json
-        // Before
-        {
-            "id": "claude-3-7-sonnet-20250219",
-            "name": "Claude 3.7 Sonnet (Preview)",
-            "context_window": 200000, // This might be total context
-            "cost_per_1m_tokens": { "input": 3, "output": 15, "currency": "USD" }
-        }
-
-        // After (assuming 200k is total, and we make a reasonable split or find official numbers)
-        {
-            "id": "claude-3-7-sonnet-20250219",
-            "name": "Claude 3.7 Sonnet (Preview)",
-            "maxInputTokens": 190000, // Example
-            "maxOutputTokens": 8192,  // Example, often smaller for generation
-            "cost_per_1m_tokens": { "input": 3, "output": 15, "currency": "USD" }
-        }
-```
-
-```javascript
-// Placeholder for token counting
-function countTokens(text, modelId /* or providerName */) {
-	// ... implementation using SDK or library ...
-	// This is a simplification; actual tokenization is model-specific.
-	// For now, a rough estimate might be (text.length / 4) as a placeholder
-	// if a proper tokenizer isn't immediately available.
-	if (!text) return 0;
-	return Math.ceil(text.length / 3.5); // Very rough general estimate
-}
-
-const promptTokens = countTokens(systemPrompt) + countTokens(prompt);
-```
-
-```javascript
-const roleParams = getParametersForRole(currentRole, effectiveProjectRoot);
-// roleParams will now contain { maxInputTokens, maxOutputTokens, temperature }
-```
-
-```javascript
-// Simplified; ideally use a robust getter from config-manager
-const modelInfo = MODEL_MAP[providerName?.toLowerCase()]?.find(
-	(m) => m.id === modelId
-);
-const modelAbsoluteMaxInput = modelInfo?.maxInputTokens || Infinity;
-const modelAbsoluteMaxOutput =
-	modelInfo?.maxOutputTokens || roleParams.maxOutputTokens; // Fallback to configured if not in map
-```
-
-```javascript
-if (promptTokens > roleParams.maxInputTokens) {
-	throw new Error(
-		`Prompt (${promptTokens} tokens) exceeds configured max input tokens (${roleParams.maxInputTokens}) for role '${currentRole}'.`
-	);
-}
-if (promptTokens > modelAbsoluteMaxInput) {
-	throw new Error(
-		`Prompt (${promptTokens} tokens) exceeds model's absolute max input tokens (${modelAbsoluteMaxInput}) for ${modelId}.`
-	);
-}
-```
-
-```javascript
-const apiMaxOutputTokens = Math.min(
-	roleParams.maxOutputTokens,
-	modelAbsoluteMaxOutput
-);
-
-const callParams = {
-	apiKey,
-	modelId,
-	// Use apiMaxOutputTokens for the actual API call
-	maxTokens: apiMaxOutputTokens, // This usually means max tokens to GENERATE
-	temperature: roleParams.temperature,
-	messages,
-	baseUrl,
-	...(serviceType === 'generateObject' && { schema, objectName }),
-	...restApiParams
-};
-```
-
-Okay, I have the contents of `supported-models.json`.
-
-It seems many models have a `max_tokens` field, which I assume is the _total context window_. Some don't have it, and for others (like OpenAI `gpt-4o`), the listed `max_tokens` (16384) is known to be its _output_ token limit when using the Chat Completions API, while the context window is much larger (128k). This highlights the complexity: `max_tokens` in `supported-models.json` is used inconsistently.
-
-**Revised Plan for `supported-models.json` and Token Definitions:**
-
-To bring clarity, we'll introduce two new fields and ensure their meaning is consistent:
-
-- `contextWindowTokens`: The total number of tokens the model can process (input + output). This would replace the current ambiguous `max_tokens`.
-- `maxOutputTokens`: The maximum number of tokens the model can _generate_ in a single response. This is often smaller than the total context window, especially for larger models.
-
-If a model _only_ specifies a total context window, we'll have to make a reasonable assumption for `maxOutputTokens` (e.g., 4096 or 8192, or a fraction of the total context window). If it only specifies an output token limit (like some OpenAI models in certain API modes), we'll need to find its total context window.
-
-**Updated `supported-models.json` Structure (Example):**
-
-```json
-// For a model like Anthropic Claude 3.7 Sonnet (Preview)
-{
-    "id": "claude-3-7-sonnet-20250219",
-    "swe_score": 0.623,
-    "cost_per_1m_tokens": { "input": 3.0, "output": 15.0 },
-    "allowed_roles": ["main", "fallback"],
-    "contextWindowTokens": 200000, // From Anthropic's documentation
-    "maxOutputTokens": 8192     // Anthropic default, user can override in .taskmasterconfig
-}
-
-// For a model like OpenAI GPT-4o
-{
-    "id": "gpt-4o",
-    "swe_score": 0.332,
-    "cost_per_1m_tokens": { "input": 2.5, "output": 10.0 },
-    "allowed_roles": ["main", "fallback"],
-    "contextWindowTokens": 128000, // Official context window
-    "maxOutputTokens": 16384    // Max output for chat completions is 16k for gpt-4o (used to be 4k/8k for older gpt-4)
-                                // but the model card mentions 128k total. The API call parameter for `max_tokens` sets this output cap.
-}
-```
-
-I will proceed to generate the updated `supported-models.json` content. This will be a significant change. I will make my best effort to find the correct `contextWindowTokens` and `maxOutputTokens` for each model. If official numbers are ambiguous or not readily available, I'll use sensible defaults and add a comment.
-
-**Regarding Tokenizer Strategy:**
-
-- **Vercel AI SDK:** The `ai` package (Vercel AI SDK) itself is a lightweight wrapper. Tokenization is usually handled by the underlying provider-specific SDKs (e.g., `@anthropic-ai/sdk`, `openai`). The Vercel SDK doesn't provide a universal tokenizer.
-- **Provider SDKs:**
-  - `@anthropic-ai/sdk`: Does not expose a public tokenizer directly. Anthropic recommends counting based on their guidelines (roughly 3.5 chars/token for English).
-  - `openai` (for Node.js): The `gpt-3-encoder` or `tiktoken` libraries are commonly used. `tiktoken` is more current.
-- **`tiktoken`:** This is a good general-purpose library for OpenAI models and those that use compatible tokenization (many models fine-tuned from Llama, etc., might be close). It supports various encodings.
-- **Recommendation:**
-  1.  Start by integrating `tiktoken`. We can select the encoding based on the provider or even specific model if needed (e.g., `cl100k_base` for gpt-4, gpt-3.5-turbo, DALL-E models).
-  2.  For providers where `tiktoken` is not accurate (e.g., Google's Gemini, Perplexity if they have proprietary tokenizers), we might have to rely on character-based estimations (e.g., `length / N`) as a rougher guide or investigate if their specific SDKs offer token counting.
-  3.  The Vercel AI SDK's `experimental_streamObject` and other functions _might_ internally handle some aspects of token counting for request preparation, but we need explicit counting for our logic _before_ the call.
-
-For now, let's assume we'll add a `countTokens` utility that uses `tiktoken` for OpenAI and Anthropic (as Anthropic's guidance is character-based but `cl100k_base` is often a decent proxy for their tokenization for rough estimates, though not perfect), and a character-based fallback for others.
-
-I will now generate the proposed changes for `scripts/modules/supported-models.json`. This will be a large diff.
-
-After this, we'll move to:
-
-1.  Updating `.taskmasterconfig` defaults in `config-manager.js` and providing you the snippet for your user file.
-2.  Updating `config-manager.js` getters.
-3.  Implementing the logic in `ai-services-unified.js`.
-
-```json
-// For a model like Anthropic Claude 3.7 Sonnet (Preview)
-{
-    "id": "claude-3-7-sonnet-20250219",
-    "swe_score": 0.623,
-    "cost_per_1m_tokens": { "input": 3.0, "output": 15.0 },
-    "allowed_roles": ["main", "fallback"],
-    "contextWindowTokens": 200000, // From Anthropic's documentation
-    "maxOutputTokens": 8192     // Anthropic default, user can override in .taskmasterconfig
-}
-
-// For a model like OpenAI GPT-4o
-{
-    "id": "gpt-4o",
-    "swe_score": 0.332,
-    "cost_per_1m_tokens": { "input": 2.5, "output": 10.0 },
-    "allowed_roles": ["main", "fallback"],
-    "contextWindowTokens": 128000, // Official context window
-    "maxOutputTokens": 16384    // Max output for chat completions is 16k for gpt-4o (used to be 4k/8k for older gpt-4)
-                                // but the model card mentions 128k total. The API call parameter for `max_tokens` sets this output cap.
-}
-```
-
-```json
-// For a model like Anthropic Claude 3.7 Sonnet (Preview)
-{
-    "id": "claude-3-7-sonnet-20250219",
-    "swe_score": 0.623,
-    "cost_per_1m_tokens": { "input": 3.0, "output": 15.0 },
-    "allowed_roles": ["main", "fallback"],
-    "contextWindowTokens": 200000, // From Anthropic's documentation
-    "maxOutputTokens": 8192     // Anthropic default, user can override in .taskmasterconfig
-}
-
-// For a model like OpenAI GPT-4o
-{
-    "id": "gpt-4o",
-    "swe_score": 0.332,
-    "cost_per_1m_tokens": { "input": 2.5, "output": 10.0 },
-    "allowed_roles": ["main", "fallback"],
-    "contextWindowTokens": 128000, // Official context window
-    "maxOutputTokens": 16384    // Max output for chat completions is 16k for gpt-4o (used to be 4k/8k for older gpt-4)
-                                // but the model card mentions 128k total. The API call parameter for `max_tokens` sets this output cap.
-}
-```

docs/configuration.md

@@ -15,15 +15,13 @@ Taskmaster uses two primary methods for configuration:
       			"provider": "anthropic",
       			"modelId": "claude-3-7-sonnet-20250219",
       			"maxTokens": 64000,
-      			"temperature": 0.2,
-      			"baseUrl": "https://api.anthropic.com/v1"
+      			"temperature": 0.2
       		},
       		"research": {
       			"provider": "perplexity",
       			"modelId": "sonar-pro",
       			"maxTokens": 8700,
-      			"temperature": 0.1,
-      			"baseUrl": "https://api.perplexity.ai/v1"
+      			"temperature": 0.1
       		},
       		"fallback": {
       			"provider": "anthropic",
@@ -58,9 +56,8 @@ Taskmaster uses two primary methods for configuration:
       - `AZURE_OPENAI_API_KEY`: Your Azure OpenAI API key (also requires `AZURE_OPENAI_ENDPOINT`).
       - `OPENROUTER_API_KEY`: Your OpenRouter API key.
       - `XAI_API_KEY`: Your X-AI API key.
-    - **Optional Endpoint Overrides:**
-      - **Per-role `baseUrl` in `.taskmasterconfig`:** You can add a `baseUrl` property to any model role (`main`, `research`, `fallback`) to override the default API endpoint for that provider. If omitted, the provider's standard endpoint is used.
-      - `AZURE_OPENAI_ENDPOINT`: Required if using Azure OpenAI key (can also be set as `baseUrl` for the Azure model role).
+    - **Optional Endpoint Overrides (in .taskmasterconfig):**
+      - `AZURE_OPENAI_ENDPOINT`: Required if using Azure OpenAI key.
       - `OLLAMA_BASE_URL`: Override the default Ollama API URL (Default: `http://localhost:11434/api`).
 
 **Important:** Settings like model ID selections (`main`, `research`, `fallback`), `maxTokens`, `temperature`, `logLevel`, `defaultSubtasks`, `defaultPriority`, and `projectName` are **managed in `.taskmasterconfig`**, not environment variables.

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

@@ -94,7 +94,6 @@ export async function addTaskDirect(args, log, context = {}) {
 
 		let manualTaskData = null;
 		let newTaskId;
-		let telemetryData;
 
 		if (isManualCreation) {
 			// Create manual task data object
@@ -110,7 +109,7 @@ export async function addTaskDirect(args, log, context = {}) {
 			);
 
 			// Call the addTask function with manual task data
-			const result = await addTask(
+			newTaskId = await addTask(
 				tasksPath,
 				null, // prompt is null for manual creation
 				taskDependencies,
@@ -118,17 +117,13 @@ export async function addTaskDirect(args, log, context = {}) {
 				{
 					session,
 					mcpLog,
-					projectRoot,
-					commandName: 'add-task',
-					outputType: 'mcp'
+					projectRoot
 				},
 				'json', // outputFormat
 				manualTaskData, // Pass the manual task data
 				false, // research flag is false for manual creation
 				projectRoot // Pass projectRoot
 			);
-			newTaskId = result.newTaskId;
-			telemetryData = result.telemetryData;
 		} else {
 			// AI-driven task creation
 			log.info(
@@ -136,7 +131,7 @@ export async function addTaskDirect(args, log, context = {}) {
 			);
 
 			// Call the addTask function, passing the research flag
-			const result = await addTask(
+			newTaskId = await addTask(
 				tasksPath,
 				prompt, // Use the prompt for AI creation
 				taskDependencies,
@@ -144,16 +139,12 @@ export async function addTaskDirect(args, log, context = {}) {
 				{
 					session,
 					mcpLog,
-					projectRoot,
-					commandName: 'add-task',
-					outputType: 'mcp'
+					projectRoot
 				},
 				'json', // outputFormat
 				null, // manualTaskData is null for AI creation
 				research // Pass the research flag
 			);
-			newTaskId = result.newTaskId;
-			telemetryData = result.telemetryData;
 		}
 
 		// Restore normal logging
@@ -163,8 +154,7 @@ export async function addTaskDirect(args, log, context = {}) {
 			success: true,
 			data: {
 				taskId: newTaskId,
-				message: `Successfully added new task #${newTaskId}`,
-				telemetryData: telemetryData
+				message: `Successfully added new task #${newTaskId}`
 			}
 		};
 	} catch (error) {

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

@@ -79,19 +79,17 @@ export async function analyzeTaskComplexityDirect(args, log, context = {}) {
 		}
 
 		let report;
-		let coreResult;
 
 		try {
 			// --- Call Core Function (Pass context separately) ---
 			// Pass coreOptions as the first argument
 			// Pass context object { session, mcpLog } as the second argument
-			coreResult = await analyzeTaskComplexity(coreOptions, {
-				session,
-				mcpLog: logWrapper,
-				commandName: 'analyze-complexity',
-				outputType: 'mcp'
-			});
-			report = coreResult.report;
+			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
+			);
 		} catch (error) {
 			log.error(
 				`Error in analyzeTaskComplexity core function: ${error.message}`
@@ -127,11 +125,8 @@ export async function analyzeTaskComplexityDirect(args, log, context = {}) {
 			};
 		}
 
-		if (
-			!coreResult ||
-			!coreResult.report ||
-			typeof coreResult.report !== 'object'
-		) {
+		// Added a check to ensure report is defined before accessing its properties
+		if (!report || typeof report !== 'object') {
 			log.error(
 				'Core analysis function returned an invalid or undefined response.'
 			);
@@ -146,8 +141,8 @@ export async function analyzeTaskComplexityDirect(args, log, context = {}) {
 
 		try {
 			// Ensure complexityAnalysis exists and is an array
-			const analysisArray = Array.isArray(coreResult.report.complexityAnalysis)
-				? coreResult.report.complexityAnalysis
+			const analysisArray = Array.isArray(report.complexityAnalysis)
+				? report.complexityAnalysis
 				: [];
 
 			// Count tasks by complexity (remains the same)
@@ -164,16 +159,15 @@ export async function analyzeTaskComplexityDirect(args, log, context = {}) {
 			return {
 				success: true,
 				data: {
-					message: `Task complexity analysis complete. Report saved to ${outputPath}`,
-					reportPath: outputPath,
+					message: `Task complexity analysis complete. Report saved to ${outputPath}`, // Use outputPath from args
+					reportPath: outputPath, // Use outputPath from args
 					reportSummary: {
 						taskCount: analysisArray.length,
 						highComplexityTasks,
 						mediumComplexityTasks,
 						lowComplexityTasks
 					},
-					fullReport: coreResult.report,
-					telemetryData: coreResult.telemetryData
+					fullReport: report // Now includes the full report
 				}
 			};
 		} catch (parseError) {

mcp-server/src/core/direct-functions/complexity-report.js

@@ -8,6 +8,7 @@ import {
 	enableSilentMode,
 	disableSilentMode
 } from '../../../../scripts/modules/utils.js';
+import { getCachedOrExecute } from '../../tools/utils.js';
 
 /**
  * Direct function wrapper for displaying the complexity report with error handling and caching.
@@ -85,20 +86,30 @@ export async function complexityReportDirect(args, log) {
 
 		// Use the caching utility
 		try {
-			const result = await coreActionFn();
-			log.info('complexityReportDirect completed');
-			return result;
+			const result = await getCachedOrExecute({
+				cacheKey,
+				actionFn: coreActionFn,
+				log
+			});
+			log.info(
+				`complexityReportDirect completed. From cache: ${result.fromCache}`
+			);
+			return result; // Returns { success, data/error, fromCache }
 		} catch (error) {
+			// Catch unexpected errors from getCachedOrExecute itself
 			// Ensure silent mode is disabled
 			disableSilentMode();
 
-			log.error(`Unexpected error during complexityReport: ${error.message}`);
+			log.error(
+				`Unexpected error during getCachedOrExecute for complexityReport: ${error.message}`
+			);
 			return {
 				success: false,
 				error: {
 					code: 'UNEXPECTED_ERROR',
 					message: error.message
-				}
+				},
+				fromCache: false
 			};
 		}
 	} catch (error) {

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

@@ -63,18 +63,12 @@ export async function expandAllTasksDirect(args, log, context = {}) {
 			{ session, mcpLog, projectRoot }
 		);
 
-		// Core function now returns a summary object including the *aggregated* telemetryData
+		// Core function now returns a summary object
 		return {
 			success: true,
 			data: {
 				message: `Expand all operation completed. Expanded: ${result.expandedCount}, Failed: ${result.failedCount}, Skipped: ${result.skippedCount}`,
-				details: {
-					expandedCount: result.expandedCount,
-					failedCount: result.failedCount,
-					skippedCount: result.skippedCount,
-					tasksToExpand: result.tasksToExpand
-				},
-				telemetryData: result.telemetryData // Pass the aggregated object
+				details: result // Include the full result details
 			}
 		};
 	} catch (error) {

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

@@ -193,19 +193,13 @@ export async function expandTaskDirect(args, log, context = {}) {
 			if (!wasSilent) enableSilentMode();
 
 			// Call the core expandTask function with the wrapped logger and projectRoot
-			const coreResult = await expandTask(
+			const updatedTaskResult = await expandTask(
 				tasksPath,
 				taskId,
 				numSubtasks,
 				useResearch,
 				additionalContext,
-				{
-					mcpLog,
-					session,
-					projectRoot,
-					commandName: 'expand-task',
-					outputType: 'mcp'
-				},
+				{ mcpLog, session, projectRoot },
 				forceFlag
 			);
 
@@ -221,17 +215,16 @@ export async function expandTaskDirect(args, log, context = {}) {
 				? updatedTask.subtasks.length - subtasksCountBefore
 				: 0;
 
-			// Return the result, including telemetryData
+			// Return the result
 			log.info(
 				`Successfully expanded task ${taskId} with ${subtasksAdded} new subtasks`
 			);
 			return {
 				success: true,
 				data: {
-					task: coreResult.task,
+					task: updatedTask,
 					subtasksAdded,
-					hasExistingSubtasks,
-					telemetryData: coreResult.telemetryData
+					hasExistingSubtasks
 				},
 				fromCache: false
 			};

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

@@ -4,6 +4,7 @@
  */
 
 import { listTasks } from '../../../../scripts/modules/task-manager.js';
+import { getCachedOrExecute } from '../../tools/utils.js';
 import {
 	enableSilentMode,
 	disableSilentMode
@@ -18,7 +19,7 @@ import {
  */
 export async function listTasksDirect(args, log) {
 	// Destructure the explicit tasksJsonPath from args
-	const { tasksJsonPath, reportPath, status, withSubtasks } = args;
+	const { tasksJsonPath, status, withSubtasks } = args;
 
 	if (!tasksJsonPath) {
 		log.error('listTasksDirect called without tasksJsonPath');
@@ -35,6 +36,7 @@ export async function listTasksDirect(args, log) {
 	// Use the explicit tasksJsonPath for cache key
 	const statusFilter = status || 'all';
 	const withSubtasksFilter = withSubtasks || false;
+	const cacheKey = `listTasks:${tasksJsonPath}:${statusFilter}:${withSubtasksFilter}`;
 
 	// Define the action function to be executed on cache miss
 	const coreListTasksAction = async () => {
@@ -49,7 +51,6 @@ export async function listTasksDirect(args, log) {
 			const resultData = listTasks(
 				tasksJsonPath,
 				statusFilter,
-				reportPath,
 				withSubtasksFilter,
 				'json'
 			);
@@ -64,7 +65,6 @@ export async function listTasksDirect(args, log) {
 					}
 				};
 			}
-
 			log.info(
 				`Core listTasks function retrieved ${resultData.tasks.length} tasks`
 			);
@@ -88,19 +88,25 @@ export async function listTasksDirect(args, log) {
 		}
 	};
 
+	// Use the caching utility
 	try {
-		const result = await coreListTasksAction();
-		log.info('listTasksDirect completed');
-		return result;
+		const result = await getCachedOrExecute({
+			cacheKey,
+			actionFn: coreListTasksAction,
+			log
+		});
+		log.info(`listTasksDirect completed. From cache: ${result.fromCache}`);
+		return result; // Returns { success, data/error, fromCache }
 	} catch (error) {
-		log.error(`Unexpected error during listTasks: ${error.message}`);
+		// Catch unexpected errors from getCachedOrExecute itself (though unlikely)
+		log.error(
+			`Unexpected error during getCachedOrExecute for listTasks: ${error.message}`
+		);
 		console.error(error.stack);
 		return {
 			success: false,
-			error: {
-				code: 'UNEXPECTED_ERROR',
-				message: error.message
-			}
+			error: { code: 'CACHE_UTIL_ERROR', message: error.message },
+			fromCache: false
 		};
 	}
 }

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

@@ -4,10 +4,8 @@
  */
 
 import { findNextTask } from '../../../../scripts/modules/task-manager.js';
-import {
-	readJSON,
-	readComplexityReport
-} from '../../../../scripts/modules/utils.js';
+import { readJSON } from '../../../../scripts/modules/utils.js';
+import { getCachedOrExecute } from '../../tools/utils.js';
 import {
 	enableSilentMode,
 	disableSilentMode
@@ -23,7 +21,7 @@ import {
  */
 export async function nextTaskDirect(args, log) {
 	// Destructure expected args
-	const { tasksJsonPath, reportPath } = args;
+	const { tasksJsonPath } = args;
 
 	if (!tasksJsonPath) {
 		log.error('nextTaskDirect called without tasksJsonPath');
@@ -37,6 +35,9 @@ export async function nextTaskDirect(args, log) {
 		};
 	}
 
+	// Generate cache key using the provided task path
+	const cacheKey = `nextTask:${tasksJsonPath}`;
+
 	// Define the action function to be executed on cache miss
 	const coreNextTaskAction = async () => {
 		try {
@@ -58,11 +59,8 @@ export async function nextTaskDirect(args, log) {
 				};
 			}
 
-			// Read the complexity report
-			const complexityReport = readComplexityReport(reportPath);
-
 			// Find the next task
-			const nextTask = findNextTask(data.tasks, complexityReport);
+			const nextTask = findNextTask(data.tasks);
 
 			if (!nextTask) {
 				log.info(
@@ -120,11 +118,18 @@ export async function nextTaskDirect(args, log) {
 
 	// Use the caching utility
 	try {
-		const result = await coreNextTaskAction();
-		log.info(`nextTaskDirect completed.`);
-		return result;
+		const result = await getCachedOrExecute({
+			cacheKey,
+			actionFn: coreNextTaskAction,
+			log
+		});
+		log.info(`nextTaskDirect completed. From cache: ${result.fromCache}`);
+		return result; // Returns { success, data/error, fromCache }
 	} catch (error) {
-		log.error(`Unexpected error during nextTask: ${error.message}`);
+		// Catch unexpected errors from getCachedOrExecute itself
+		log.error(
+			`Unexpected error during getCachedOrExecute for nextTask: ${error.message}`
+		);
 		return {
 			success: false,
 			error: {

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

@@ -105,9 +105,11 @@ export async function parsePRDDirect(args, log, context = {}) {
 		}
 	}
 
-	if (append) {
+	const useForce = force === true;
+	const useAppend = append === true;
+	if (useAppend) {
 		logWrapper.info('Append mode enabled.');
-		if (force) {
+		if (useForce) {
 			logWrapper.warn(
 				'Both --force and --append flags were provided. --force takes precedence; append mode will be ignored.'
 			);
@@ -115,7 +117,7 @@ export async function parsePRDDirect(args, log, context = {}) {
 	}
 
 	logWrapper.info(
-		`Parsing PRD via direct function. Input: ${inputPath}, Output: ${outputPath}, NumTasks: ${numTasks}, Force: ${force}, Append: ${append}, ProjectRoot: ${projectRoot}`
+		`Parsing PRD via direct function. Input: ${inputPath}, Output: ${outputPath}, NumTasks: ${numTasks}, Force: ${useForce}, Append: ${useAppend}, ProjectRoot: ${projectRoot}`
 	);
 
 	const wasSilent = isSilentMode();
@@ -129,28 +131,21 @@ export async function parsePRDDirect(args, log, context = {}) {
 			inputPath,
 			outputPath,
 			numTasks,
-			{
-				session,
-				mcpLog: logWrapper,
-				projectRoot,
-				force,
-				append,
-				commandName: 'parse-prd',
-				outputType: 'mcp'
-			},
+			{ session, mcpLog: logWrapper, projectRoot, useForce, useAppend },
 			'json'
 		);
 
-		// Adjust check for the new return structure
-		if (result && result.success) {
-			const successMsg = `Successfully parsed PRD and generated tasks in ${result.tasksPath}`;
-			logWrapper.success(successMsg);
+		// 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.`
+			);
 			return {
 				success: true,
 				data: {
-					message: successMsg,
-					outputPath: result.tasksPath,
-					telemetryData: result.telemetryData
+					message: `Successfully parsed PRD and generated ${result.tasks.length} tasks.`,
+					outputPath: outputPath,
+					taskCount: result.tasks.length
 				}
 			};
 		} else {

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

@@ -3,10 +3,11 @@
  * Direct function implementation for showing task details
  */
 
+import { findTaskById, readJSON } from '../../../../scripts/modules/utils.js';
+import { getCachedOrExecute } from '../../tools/utils.js';
 import {
-	findTaskById,
-	readComplexityReport,
-	readJSON
+	enableSilentMode,
+	disableSilentMode
 } from '../../../../scripts/modules/utils.js';
 import { findTasksJsonPath } from '../utils/path-utils.js';
 
@@ -16,7 +17,6 @@ import { findTasksJsonPath } from '../utils/path-utils.js';
  * @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 {string} args.reportPath - Explicit path to the complexity report file.
  * @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.
@@ -27,7 +27,7 @@ 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, reportPath, status, projectRoot } = args;
+	const { id, file, status, projectRoot } = args;
 
 	log.info(
 		`Showing task direct function. ID: ${id}, File: ${file}, Status Filter: ${status}, ProjectRoot: ${projectRoot}`
@@ -64,12 +64,9 @@ export async function showTaskDirect(args, log) {
 			};
 		}
 
-		const complexityReport = readComplexityReport(reportPath);
-
 		const { task, originalSubtaskCount } = findTaskById(
 			tasksData.tasks,
 			id,
-			complexityReport,
 			status
 		);
 

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

@@ -108,24 +108,18 @@ export async function updateSubtaskByIdDirect(args, log, context = {}) {
 
 		try {
 			// Execute core updateSubtaskById function
-			const coreResult = await updateSubtaskById(
+			const updatedSubtask = await updateSubtaskById(
 				tasksPath,
 				subtaskIdStr,
 				prompt,
 				useResearch,
-				{
-					mcpLog: logWrapper,
-					session,
-					projectRoot,
-					commandName: 'update-subtask',
-					outputType: 'mcp'
-				},
+				{ mcpLog: logWrapper, session, projectRoot },
 				'json'
 			);
 
-			if (!coreResult || coreResult.updatedSubtask === null) {
+			if (updatedSubtask === null) {
 				const message = `Subtask ${id} or its parent task not found.`;
-				logWrapper.error(message);
+				logWrapper.error(message); // Log as error since it couldn't be found
 				return {
 					success: false,
 					error: { code: 'SUBTASK_NOT_FOUND', message: message },
@@ -142,10 +136,9 @@ export async function updateSubtaskByIdDirect(args, log, context = {}) {
 					message: `Successfully updated subtask with ID ${subtaskIdStr}`,
 					subtaskId: subtaskIdStr,
 					parentId: subtaskIdStr.split('.')[0],
-					subtask: coreResult.updatedSubtask,
+					subtask: updatedSubtask,
 					tasksPath,
-					useResearch,
-					telemetryData: coreResult.telemetryData
+					useResearch
 				},
 				fromCache: false
 			};

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

@@ -110,7 +110,7 @@ export async function updateTaskByIdDirect(args, log, context = {}) {
 
 		try {
 			// Execute core updateTaskById function with proper parameters
-			const coreResult = await updateTaskById(
+			const updatedTask = await updateTaskById(
 				tasksPath,
 				taskId,
 				prompt,
@@ -118,26 +118,19 @@ export async function updateTaskByIdDirect(args, log, context = {}) {
 				{
 					mcpLog: logWrapper,
 					session,
-					projectRoot,
-					commandName: 'update-task',
-					outputType: 'mcp'
+					projectRoot
 				},
 				'json'
 			);
 
-			// Check if the core function returned null or an object without success
-			if (!coreResult || coreResult.updatedTask === null) {
+			// 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,
-						telemetryData: coreResult?.telemetryData
-					},
+					data: { message: message, taskId: taskId, updated: false },
 					fromCache: false
 				};
 			}
@@ -153,8 +146,7 @@ export async function updateTaskByIdDirect(args, log, context = {}) {
 					tasksPath: tasksPath,
 					useResearch: useResearch,
 					updated: true,
-					updatedTask: coreResult.updatedTask,
-					telemetryData: coreResult.telemetryData
+					updatedTask: updatedTask
 				},
 				fromCache: false
 			};

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

@@ -6,10 +6,6 @@
 import path from 'path';
 import { updateTasks } from '../../../../scripts/modules/task-manager.js';
 import { createLogWrapper } from '../../tools/utils.js';
-import {
-	enableSilentMode,
-	disableSilentMode
-} from '../../../../scripts/modules/utils.js';
 
 /**
  * Direct function wrapper for updating tasks based on new context.
@@ -85,6 +81,7 @@ export async function updateTasksDirect(args, log, context = {}) {
 			'json'
 		);
 
+		// updateTasks returns { success: true, updatedTasks: [...] } on success
 		if (result && result.success && Array.isArray(result.updatedTasks)) {
 			logWrapper.success(
 				`Successfully updated ${result.updatedTasks.length} tasks.`
@@ -94,8 +91,7 @@ export async function updateTasksDirect(args, log, context = {}) {
 				data: {
 					message: `Successfully updated ${result.updatedTasks.length} tasks.`,
 					tasksFile,
-					updatedCount: result.updatedTasks.length,
-					telemetryData: result.telemetryData
+					updatedCount: result.updatedTasks.length
 				}
 			};
 		} else {

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

@@ -339,49 +339,6 @@ export function findPRDDocumentPath(projectRoot, explicitPath, log) {
 	return null;
 }
 
-export function findComplexityReportPath(projectRoot, explicitPath, log) {
-	// If explicit path is provided, check if it exists
-	if (explicitPath) {
-		const fullPath = path.isAbsolute(explicitPath)
-			? explicitPath
-			: path.resolve(projectRoot, explicitPath);
-
-		if (fs.existsSync(fullPath)) {
-			log.info(`Using provided PRD document path: ${fullPath}`);
-			return fullPath;
-		} else {
-			log.warn(
-				`Provided PRD document path not found: ${fullPath}, will search for alternatives`
-			);
-		}
-	}
-
-	// Common locations and file patterns for PRD documents
-	const commonLocations = [
-		'', // Project root
-		'scripts/'
-	];
-
-	const commonFileNames = [
-		'complexity-report.json',
-		'task-complexity-report.json'
-	];
-
-	// Check all possible combinations
-	for (const location of commonLocations) {
-		for (const fileName of commonFileNames) {
-			const potentialPath = path.join(projectRoot, location, fileName);
-			if (fs.existsSync(potentialPath)) {
-				log.info(`Found PRD document at: ${potentialPath}`);
-				return potentialPath;
-			}
-		}
-	}
-
-	log.warn(`No PRD document found in common locations within ${projectRoot}`);
-	return null;
-}
-
 /**
  * Resolves the tasks output directory path
  * @param {string} projectRoot - The project root directory

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

@@ -10,10 +10,7 @@ import {
 	withNormalizedProjectRoot
 } from './utils.js';
 import { showTaskDirect } from '../core/task-master-core.js';
-import {
-	findTasksJsonPath,
-	findComplexityReportPath
-} from '../core/utils/path-utils.js';
+import { findTasksJsonPath } from '../core/utils/path-utils.js';
 
 /**
  * Custom processor function that removes allTasks from the response
@@ -53,12 +50,6 @@ export function registerShowTaskTool(server) {
 				.string()
 				.optional()
 				.describe('Path to the tasks file relative to project root'),
-			complexityReport: z
-				.string()
-				.optional()
-				.describe(
-					'Path to the complexity report file (relative to project root or absolute)'
-				),
 			projectRoot: z
 				.string()
 				.optional()
@@ -90,22 +81,9 @@ export function registerShowTaskTool(server) {
 				}
 
 				// Call the direct function, passing the normalized projectRoot
-				// Resolve the path to complexity report
-				let complexityReportPath;
-				try {
-					complexityReportPath = findComplexityReportPath(
-						projectRoot,
-						args.complexityReport,
-						log
-					);
-				} catch (error) {
-					log.error(`Error finding complexity report: ${error.message}`);
-				}
 				const result = await showTaskDirect(
 					{
 						tasksJsonPath: tasksJsonPath,
-						reportPath: complexityReportPath,
-						// Pass other relevant args
 						id: id,
 						status: status,
 						projectRoot: projectRoot

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

@@ -10,10 +10,7 @@ import {
 	withNormalizedProjectRoot
 } from './utils.js';
 import { listTasksDirect } from '../core/task-master-core.js';
-import {
-	findTasksJsonPath,
-	findComplexityReportPath
-} from '../core/utils/path-utils.js';
+import { findTasksJsonPath } from '../core/utils/path-utils.js';
 
 /**
  * Register the getTasks tool with the MCP server
@@ -41,12 +38,6 @@ export function registerListTasksTool(server) {
 				.describe(
 					'Path to the tasks file (relative to project root or absolute)'
 				),
-			complexityReport: z
-				.string()
-				.optional()
-				.describe(
-					'Path to the complexity report file (relative to project root or absolute)'
-				),
 			projectRoot: z
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
@@ -69,23 +60,11 @@ export function registerListTasksTool(server) {
 					);
 				}
 
-				// Resolve the path to complexity report
-				let complexityReportPath;
-				try {
-					complexityReportPath = findComplexityReportPath(
-						args.projectRoot,
-						args.complexityReport,
-						log
-					);
-				} catch (error) {
-					log.error(`Error finding complexity report: ${error.message}`);
-				}
 				const result = await listTasksDirect(
 					{
 						tasksJsonPath: tasksJsonPath,
 						status: args.status,
-						withSubtasks: args.withSubtasks,
-						reportPath: complexityReportPath
+						withSubtasks: args.withSubtasks
 					},
 					log
 				);

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

@@ -10,10 +10,7 @@ import {
 	withNormalizedProjectRoot
 } from './utils.js';
 import { nextTaskDirect } from '../core/task-master-core.js';
-import {
-	findTasksJsonPath,
-	findComplexityReportPath
-} from '../core/utils/path-utils.js';
+import { findTasksJsonPath } from '../core/utils/path-utils.js';
 
 /**
  * Register the next-task tool with the MCP server
@@ -26,12 +23,6 @@ export function registerNextTaskTool(server) {
 			'Find the next task to work on based on dependencies and status',
 		parameters: z.object({
 			file: z.string().optional().describe('Absolute path to the tasks file'),
-			complexityReport: z
-				.string()
-				.optional()
-				.describe(
-					'Path to the complexity report file (relative to project root or absolute)'
-				),
 			projectRoot: z
 				.string()
 				.describe('The directory of the project. Must be an absolute path.')
@@ -54,21 +45,9 @@ export function registerNextTaskTool(server) {
 					);
 				}
 
-				// Resolve the path to complexity report
-				let complexityReportPath;
-				try {
-					complexityReportPath = findComplexityReportPath(
-						args.projectRoot,
-						args.complexityReport,
-						log
-					);
-				} catch (error) {
-					log.error(`Error finding complexity report: ${error.message}`);
-				}
 				const result = await nextTaskDirect(
 					{
-						tasksJsonPath: tasksJsonPath,
-						reportPath: complexityReportPath
+						tasksJsonPath: tasksJsonPath
 					},
 					log
 				);

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

@@ -11,7 +11,6 @@ import {
 } from './utils.js';
 import { setTaskStatusDirect } from '../core/task-master-core.js';
 import { findTasksJsonPath } from '../core/utils/path-utils.js';
-import { TASK_STATUS_OPTIONS } from '../../../src/constants/task-status.js';
 
 /**
  * Register the setTaskStatus tool with the MCP server
@@ -28,7 +27,7 @@ export function registerSetTaskStatusTool(server) {
 					"Task ID or subtask ID (e.g., '15', '15.2'). Can be comma-separated to update multiple tasks/subtasks at once."
 				),
 			status: z
-				.enum(TASK_STATUS_OPTIONS)
+				.string()
 				.describe(
 					"New status to set (e.g., 'pending', 'done', 'in-progress', 'review', 'deferred', 'cancelled'."
 				),

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "task-master-ai",
-	"version": "0.13.2",
+	"version": "0.12.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "task-master-ai",
-			"version": "0.13.2",
+			"version": "0.12.1",
 			"license": "MIT WITH Commons-Clause",
 			"dependencies": {
 				"@ai-sdk/anthropic": "^1.2.10",
@@ -19,9 +19,6 @@
 				"@anthropic-ai/sdk": "^0.39.0",
 				"@openrouter/ai-sdk-provider": "^0.4.5",
 				"ai": "^4.3.10",
-				"boxen": "^8.0.1",
-				"chalk": "^5.4.1",
-				"cli-table3": "^0.6.5",
 				"commander": "^11.1.0",
 				"cors": "^2.8.5",
 				"dotenv": "^16.3.1",
@@ -37,8 +34,7 @@
 				"ollama-ai-provider": "^1.2.0",
 				"openai": "^4.89.0",
 				"ora": "^8.2.0",
-				"uuid": "^11.1.0",
-				"zod": "^3.23.8"
+				"uuid": "^11.1.0"
 			},
 			"bin": {
 				"task-master": "bin/task-master.js",
@@ -49,6 +45,9 @@
 				"@changesets/changelog-github": "^0.5.1",
 				"@changesets/cli": "^2.28.1",
 				"@types/jest": "^29.5.14",
+				"boxen": "^8.0.1",
+				"chalk": "^5.4.1",
+				"cli-table3": "^0.6.5",
 				"execa": "^8.0.1",
 				"ink": "^5.0.1",
 				"jest": "^29.7.0",
@@ -58,7 +57,8 @@
 				"prettier": "^3.5.3",
 				"react": "^18.3.1",
 				"supertest": "^7.1.0",
-				"tsx": "^4.16.2"
+				"tsx": "^4.16.2",
+				"zod": "^3.23.8"
 			},
 			"engines": {
 				"node": ">=14.0.0"
@@ -1238,6 +1238,7 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
 			"integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"engines": {
@@ -3306,6 +3307,7 @@
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
 			"integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
+			"dev": true,
 			"license": "ISC",
 			"dependencies": {
 				"string-width": "^4.1.0"
@@ -3315,6 +3317,7 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
 			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=8"
@@ -3324,12 +3327,14 @@
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
 			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/ansi-align/node_modules/string-width": {
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"emoji-regex": "^8.0.0",
@@ -3344,6 +3349,7 @@
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
 			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"ansi-regex": "^5.0.1"
@@ -3693,6 +3699,7 @@
 			"version": "8.0.1",
 			"resolved": "https://registry.npmjs.org/boxen/-/boxen-8.0.1.tgz",
 			"integrity": "sha512-F3PH5k5juxom4xktynS7MoFY+NUWH5LC4CnH11YB8NPew+HLpmBLCybSAEyb2F+4pRXhuhWqFesoQd6DAyc2hw==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"ansi-align": "^3.0.1",
@@ -3843,6 +3850,7 @@
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-8.0.0.tgz",
 			"integrity": "sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=16"
@@ -3927,6 +3935,7 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz",
 			"integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=10"
@@ -3966,6 +3975,7 @@
 			"version": "0.6.5",
 			"resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz",
 			"integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"string-width": "^4.2.0"
@@ -3981,6 +3991,7 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
 			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=8"
@@ -3990,12 +4001,14 @@
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
 			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/cli-table3/node_modules/string-width": {
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"emoji-regex": "^8.0.0",
@@ -4010,6 +4023,7 @@
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
 			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"ansi-regex": "^5.0.1"
@@ -9474,6 +9488,7 @@
 			"version": "4.37.0",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.37.0.tgz",
 			"integrity": "sha512-S/5/0kFftkq27FPNye0XM1e2NsnoD/3FS+pBmbjmmtLT6I+i344KoOf7pvXreaFsDamWeaJX55nczA1m5PsBDg==",
+			"dev": true,
 			"license": "(MIT OR CC0-1.0)",
 			"engines": {
 				"node": ">=16"
@@ -9683,6 +9698,7 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/widest-line/-/widest-line-5.0.0.tgz",
 			"integrity": "sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"string-width": "^7.0.0"
@@ -9698,6 +9714,7 @@
 			"version": "9.0.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
 			"integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"ansi-styles": "^6.2.1",
@@ -9715,6 +9732,7 @@
 			"version": "6.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
 			"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=12"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "task-master-ai",
-	"version": "0.14.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",
@@ -49,9 +49,6 @@
 		"@anthropic-ai/sdk": "^0.39.0",
 		"@openrouter/ai-sdk-provider": "^0.4.5",
 		"ai": "^4.3.10",
-		"boxen": "^8.0.1",
-		"chalk": "^5.4.1",
-		"cli-table3": "^0.6.5",
 		"commander": "^11.1.0",
 		"cors": "^2.8.5",
 		"dotenv": "^16.3.1",
@@ -67,8 +64,7 @@
 		"ollama-ai-provider": "^1.2.0",
 		"openai": "^4.89.0",
 		"ora": "^8.2.0",
-		"uuid": "^11.1.0",
-		"zod": "^3.23.8"
+		"uuid": "^11.1.0"
 	},
 	"engines": {
 		"node": ">=14.0.0"
@@ -82,14 +78,15 @@
 		"url": "https://github.com/eyaltoledano/claude-task-master/issues"
 	},
 	"files": [
-		"scripts/**",
+		"scripts/init.js",
+		"scripts/dev.js",
+		"scripts/modules/**",
 		"assets/**",
 		".cursor/**",
 		"README-task-master.md",
 		"index.js",
 		"bin/**",
-		"mcp-server/**",
-		"src/**"
+		"mcp-server/**"
 	],
 	"overrides": {
 		"node-fetch": "^3.3.2",
@@ -99,6 +96,9 @@
 		"@changesets/changelog-github": "^0.5.1",
 		"@changesets/cli": "^2.28.1",
 		"@types/jest": "^29.5.14",
+		"boxen": "^8.0.1",
+		"chalk": "^5.4.1",
+		"cli-table3": "^0.6.5",
 		"execa": "^8.0.1",
 		"ink": "^5.0.1",
 		"jest": "^29.7.0",
@@ -108,6 +108,7 @@
 		"prettier": "^3.5.3",
 		"react": "^18.3.1",
 		"supertest": "^7.1.0",
-		"tsx": "^4.16.2"
+		"tsx": "^4.16.2",
+		"zod": "^3.23.8"
 	}
 }

scripts/README.md

@@ -32,7 +32,7 @@ The script can be configured through environment variables in a `.env` file at t
 - `PERPLEXITY_API_KEY`: Your Perplexity API key for research-backed subtask generation
 - `PERPLEXITY_MODEL`: Specify which Perplexity model to use (default: "sonar-medium-online")
 - `DEBUG`: Enable debug logging (default: false)
-- `TASKMASTER_LOG_LEVEL`: Log level - debug, info, warn, error (default: info)
+- `LOG_LEVEL`: Log level - debug, info, warn, error (default: info)
 - `DEFAULT_SUBTASKS`: Default number of subtasks when expanding (default: 3)
 - `DEFAULT_PRIORITY`: Default priority for generated tasks (default: medium)
 - `PROJECT_NAME`: Override default project name in tasks.json
@@ -47,7 +47,7 @@ The script can be configured through environment variables in a `.env` file at t
    - Tasks can have `subtasks` for more detailed implementation steps.
    - Dependencies are displayed with status indicators (✅ for completed, ⏱️ for pending) to easily track progress.
 
-2. **Script Commands**
+2. **Script Commands**  
    You can run the script via:
 
    ```bash
@@ -225,7 +225,7 @@ To use the Perplexity integration:
 
 ## Logging
 
-The script supports different logging levels controlled by the `TASKMASTER_LOG_LEVEL` environment variable:
+The script supports different logging levels controlled by the `LOG_LEVEL` environment variable:
 
 - `debug`: Detailed information, typically useful for troubleshooting
 - `info`: Confirmation that things are working as expected (default)

scripts/init.js

@@ -38,10 +38,10 @@ const LOG_LEVELS = {
 	success: 4
 };
 
-// Determine log level from environment variable or default to 'info'
-const LOG_LEVEL = process.env.TASKMASTER_LOG_LEVEL
-	? LOG_LEVELS[process.env.TASKMASTER_LOG_LEVEL.toLowerCase()]
-	: LOG_LEVELS.info; // Default to info
+// Get log level from environment or default to info
+const LOG_LEVEL = process.env.LOG_LEVEL
+	? LOG_LEVELS[process.env.LOG_LEVEL.toLowerCase()]
+	: LOG_LEVELS.info;
 
 // Create a color gradient for the banner
 const coolGradient = gradient(['#00b4d8', '#0077b6', '#03045e']);

scripts/modules/ai-services-unified.js

@@ -14,13 +14,9 @@ import {
 	getResearchModelId,
 	getFallbackProvider,
 	getFallbackModelId,
-	getParametersForRole,
-	getUserId,
-	MODEL_MAP,
-	getDebugFlag,
-	getBaseUrlForRole
+	getParametersForRole
 } from './config-manager.js';
-import { log, resolveEnvVariable, isSilentMode } from './utils.js';
+import { log, resolveEnvVariable, findProjectRoot } from './utils.js';
 
 import * as anthropic from '../../src/ai-providers/anthropic.js';
 import * as perplexity from '../../src/ai-providers/perplexity.js';
@@ -28,39 +24,8 @@ import * as google from '../../src/ai-providers/google.js';
 import * as openai from '../../src/ai-providers/openai.js';
 import * as xai from '../../src/ai-providers/xai.js';
 import * as openrouter from '../../src/ai-providers/openrouter.js';
-import * as ollama from '../../src/ai-providers/ollama.js';
 // TODO: Import other provider modules when implemented (ollama, etc.)
 
-// Helper function to get cost for a specific model
-function _getCostForModel(providerName, modelId) {
-	if (!MODEL_MAP || !MODEL_MAP[providerName]) {
-		log(
-			'warn',
-			`Provider "${providerName}" not found in MODEL_MAP. Cannot determine cost for model ${modelId}.`
-		);
-		return { inputCost: 0, outputCost: 0, currency: 'USD' }; // Default to zero cost
-	}
-
-	const modelData = MODEL_MAP[providerName].find((m) => m.id === modelId);
-
-	if (!modelData || !modelData.cost_per_1m_tokens) {
-		log(
-			'debug',
-			`Cost data not found for model "${modelId}" under provider "${providerName}". Assuming zero cost.`
-		);
-		return { inputCost: 0, outputCost: 0, currency: 'USD' }; // Default to zero cost
-	}
-
-	// Ensure currency is part of the returned object, defaulting if not present
-	const currency = modelData.cost_per_1m_tokens.currency || 'USD';
-
-	return {
-		inputCost: modelData.cost_per_1m_tokens.input || 0,
-		outputCost: modelData.cost_per_1m_tokens.output || 0,
-		currency: currency
-	};
-}
-
 // --- Provider Function Map ---
 // Maps provider names (lowercase) to their respective service functions
 const PROVIDER_FUNCTIONS = {
@@ -97,11 +62,6 @@ const PROVIDER_FUNCTIONS = {
 		generateText: openrouter.generateOpenRouterText,
 		streamText: openrouter.streamOpenRouterText,
 		generateObject: openrouter.generateOpenRouterObject
-	},
-	ollama: {
-		generateText: ollama.generateOllamaText,
-		streamText: ollama.streamOllamaText,
-		generateObject: ollama.generateOllamaObject
 	}
 	// TODO: Add entries for ollama, etc. when implemented
 };
@@ -189,10 +149,14 @@ function _resolveApiKey(providerName, session, projectRoot = null) {
 		mistral: 'MISTRAL_API_KEY',
 		azure: 'AZURE_OPENAI_API_KEY',
 		openrouter: 'OPENROUTER_API_KEY',
-		xai: 'XAI_API_KEY',
-		ollama: 'OLLAMA_API_KEY'
+		xai: 'XAI_API_KEY'
 	};
 
+	// Double check this -- I have had to use an api key for ollama in the past
+	// if (providerName === 'ollama') {
+	// 	return null; // Ollama typically doesn't require an API key for basic setup
+	// }
+
 	const envVarName = keyMap[providerName];
 	if (!envVarName) {
 		throw new Error(
@@ -201,13 +165,6 @@ function _resolveApiKey(providerName, session, projectRoot = null) {
 	}
 
 	const apiKey = resolveEnvVariable(envVarName, session, projectRoot);
-
-	// Special handling for Ollama - API key is optional
-	if (providerName === 'ollama') {
-		return apiKey || null;
-	}
-
-	// For all other providers, API key is required
 	if (!apiKey) {
 		throw new Error(
 			`Required API key ${envVarName} for provider '${providerName}' is not set in environment, session, or .env file.`
@@ -239,22 +196,18 @@ async function _attemptProviderCallWithRetries(
 
 	while (retries <= MAX_RETRIES) {
 		try {
-			if (getDebugFlag()) {
-				log(
-					'info',
-					`Attempt ${retries + 1}/${MAX_RETRIES + 1} calling ${fnName} (Provider: ${providerName}, Model: ${modelId}, Role: ${attemptRole})`
-				);
-			}
+			log(
+				'info',
+				`Attempt ${retries + 1}/${MAX_RETRIES + 1} calling ${fnName} (Provider: ${providerName}, Model: ${modelId}, Role: ${attemptRole})`
+			);
 
 			// Call the specific provider function directly
 			const result = await providerApiFn(callParams);
 
-			if (getDebugFlag()) {
-				log(
-					'info',
-					`${fnName} succeeded for role ${attemptRole} (Provider: ${providerName}) on attempt ${retries + 1}`
-				);
-			}
+			log(
+				'info',
+				`${fnName} succeeded for role ${attemptRole} (Provider: ${providerName}) on attempt ${retries + 1}`
+			);
 			return result;
 		} catch (error) {
 			log(
@@ -267,13 +220,13 @@ async function _attemptProviderCallWithRetries(
 				const delay = INITIAL_RETRY_DELAY_MS * Math.pow(2, retries - 1);
 				log(
 					'info',
-					`Something went wrong on the provider side. Retrying in ${delay / 1000}s...`
+					`Retryable error detected. Retrying in ${delay / 1000}s...`
 				);
 				await new Promise((resolve) => setTimeout(resolve, delay));
 			} else {
 				log(
 					'error',
-					`Something went wrong on the provider side. Max retries reached for role ${attemptRole} (${fnName} / ${providerName}).`
+					`Non-retryable error or max retries reached for role ${attemptRole} (${fnName} / ${providerName}).`
 				);
 				throw error;
 			}
@@ -289,15 +242,7 @@ 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.role - The initial client role.
- * @param {object} [params.session=null] - Optional MCP session object.
  * @param {string} [params.projectRoot] - Optional project root path.
- * @param {string} params.commandName - Name of the command invoking the service.
- * @param {string} params.outputType - 'cli' or 'mcp'.
- * @param {string} [params.systemPrompt] - Optional system prompt.
- * @param {string} [params.prompt] - The prompt for the AI.
- * @param {string} [params.schema] - The Zod schema for the expected object.
- * @param {string} [params.objectName] - Name for object/tool.
  * @returns {Promise<any>} Result from the underlying provider call.
  */
 async function _unifiedServiceRunner(serviceType, params) {
@@ -309,25 +254,15 @@ async function _unifiedServiceRunner(serviceType, params) {
 		prompt,
 		schema,
 		objectName,
-		commandName,
-		outputType,
 		...restApiParams
 	} = params;
-	if (getDebugFlag()) {
-		log('info', `${serviceType}Service called`, {
-			role: initialRole,
-			commandName,
-			outputType,
-			projectRoot
-		});
-	}
+	log('info', `${serviceType}Service called`, {
+		role: initialRole,
+		projectRoot
+	});
 
-	// Determine the effective project root (passed in or detected if needed by config getters)
-	const { findProjectRoot: detectProjectRoot } = await import('./utils.js'); // Dynamically import if needed
-	const effectiveProjectRoot = projectRoot || detectProjectRoot();
-
-	// Get userId from config - ensure effectiveProjectRoot is passed
-	const userId = getUserId(effectiveProjectRoot);
+	// Determine the effective project root (passed in or detected)
+	const effectiveProjectRoot = projectRoot || findProjectRoot();
 
 	let sequence;
 	if (initialRole === 'main') {
@@ -349,15 +284,7 @@ async function _unifiedServiceRunner(serviceType, params) {
 		'AI service call failed for all configured roles.';
 
 	for (const currentRole of sequence) {
-		let providerName,
-			modelId,
-			apiKey,
-			roleParams,
-			providerFnSet,
-			providerApiFn,
-			baseUrl,
-			providerResponse,
-			telemetryData = null;
+		let providerName, modelId, apiKey, roleParams, providerFnSet, providerApiFn;
 
 		try {
 			log('info', `New AI service call with role: ${currentRole}`);
@@ -398,7 +325,6 @@ async function _unifiedServiceRunner(serviceType, params) {
 
 			// Pass effectiveProjectRoot to getParametersForRole
 			roleParams = getParametersForRole(currentRole, effectiveProjectRoot);
-			baseUrl = getBaseUrlForRole(currentRole, effectiveProjectRoot);
 
 			// 2. Get Provider Function Set
 			providerFnSet = PROVIDER_FUNCTIONS[providerName?.toLowerCase()];
@@ -475,13 +401,12 @@ async function _unifiedServiceRunner(serviceType, params) {
 				maxTokens: roleParams.maxTokens,
 				temperature: roleParams.temperature,
 				messages,
-				baseUrl,
 				...(serviceType === 'generateObject' && { schema, objectName }),
 				...restApiParams
 			};
 
 			// 6. Attempt the call with retries
-			providerResponse = await _attemptProviderCallWithRetries(
+			const result = await _attemptProviderCallWithRetries(
 				providerApiFn,
 				callParams,
 				providerName,
@@ -489,53 +414,9 @@ async function _unifiedServiceRunner(serviceType, params) {
 				currentRole
 			);
 
-			// --- Log Telemetry & Capture Data ---
-			// Use providerResponse which contains the usage data directly for text/object
-			if (userId && providerResponse && providerResponse.usage) {
-				try {
-					telemetryData = await logAiUsage({
-						userId,
-						commandName,
-						providerName,
-						modelId,
-						inputTokens: providerResponse.usage.inputTokens,
-						outputTokens: providerResponse.usage.outputTokens,
-						outputType
-					});
-				} catch (telemetryError) {
-					// logAiUsage already logs its own errors and returns null on failure
-					// No need to log again here, telemetryData will remain null
-				}
-			} else if (userId && providerResponse && !providerResponse.usage) {
-				log(
-					'warn',
-					`Cannot log telemetry for ${commandName} (${providerName}/${modelId}): AI result missing 'usage' data. (May be expected for streams)`
-				);
-			}
-			// --- End Log Telemetry ---
+			log('info', `${serviceType}Service succeeded using role: ${currentRole}`);
 
-			// --- Extract the correct main result based on serviceType ---
-			let finalMainResult;
-			if (serviceType === 'generateText') {
-				finalMainResult = providerResponse.text;
-			} else if (serviceType === 'generateObject') {
-				finalMainResult = providerResponse.object;
-			} else if (serviceType === 'streamText') {
-				finalMainResult = providerResponse; // Return the whole stream object
-			} else {
-				log(
-					'error',
-					`Unknown serviceType in _unifiedServiceRunner: ${serviceType}`
-				);
-				finalMainResult = providerResponse; // Default to returning the whole object as fallback
-			}
-			// --- End Main Result Extraction ---
-
-			// Return a composite object including the extracted main result and telemetry data
-			return {
-				mainResult: finalMainResult,
-				telemetryData: telemetryData
-			};
+			return result;
 		} catch (error) {
 			const cleanMessage = _extractErrorMessage(error);
 			log(
@@ -580,16 +461,11 @@ async function _unifiedServiceRunner(serviceType, params) {
  * @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.
- * @param {string} params.commandName - Name of the command invoking the service.
- * @param {string} [params.outputType='cli'] - 'cli' or 'mcp'.
- * @returns {Promise<object>} Result object containing generated text and usage data.
+ * // Other specific generateText params can be included here.
+ * @returns {Promise<string>} The generated text content.
  */
 async function generateTextService(params) {
-	// Ensure default outputType if not provided
-	const defaults = { outputType: 'cli' };
-	const combinedParams = { ...defaults, ...params };
-	// TODO: Validate commandName exists?
-	return _unifiedServiceRunner('generateText', combinedParams);
+	return _unifiedServiceRunner('generateText', params);
 }
 
 /**
@@ -602,18 +478,11 @@ async function generateTextService(params) {
  * @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.
- * @param {string} params.commandName - Name of the command invoking the service.
- * @param {string} [params.outputType='cli'] - 'cli' or 'mcp'.
- * @returns {Promise<object>} Result object containing the stream and usage data.
+ * // Other specific streamText params can be included here.
+ * @returns {Promise<ReadableStream<string>>} A readable stream of text deltas.
  */
 async function streamTextService(params) {
-	const defaults = { outputType: 'cli' };
-	const combinedParams = { ...defaults, ...params };
-	// TODO: Validate commandName exists?
-	// NOTE: Telemetry for streaming might be tricky as usage data often comes at the end.
-	// The current implementation logs *after* the stream is returned.
-	// We might need to adjust how usage is captured/logged for streams.
-	return _unifiedServiceRunner('streamText', combinedParams);
+	return _unifiedServiceRunner('streamText', params);
 }
 
 /**
@@ -629,89 +498,15 @@ async function streamTextService(params) {
  * @param {string} [params.systemPrompt] - Optional system prompt.
  * @param {string} [params.objectName='generated_object'] - Name for object/tool.
  * @param {number} [params.maxRetries=3] - Max retries for object generation.
- * @param {string} params.commandName - Name of the command invoking the service.
- * @param {string} [params.outputType='cli'] - 'cli' or 'mcp'.
- * @returns {Promise<object>} Result object containing the generated object and usage data.
+ * @returns {Promise<object>} The generated object matching the schema.
  */
 async function generateObjectService(params) {
 	const defaults = {
 		objectName: 'generated_object',
-		maxRetries: 3,
-		outputType: 'cli'
+		maxRetries: 3
 	};
 	const combinedParams = { ...defaults, ...params };
-	// TODO: Validate commandName exists?
 	return _unifiedServiceRunner('generateObject', combinedParams);
 }
 
-// --- Telemetry Function ---
-/**
- * Logs AI usage telemetry data.
- * For now, it just logs to the console. Sending will be implemented later.
- * @param {object} params - Telemetry parameters.
- * @param {string} params.userId - Unique user identifier.
- * @param {string} params.commandName - The command that triggered the AI call.
- * @param {string} params.providerName - The AI provider used (e.g., 'openai').
- * @param {string} params.modelId - The specific AI model ID used.
- * @param {number} params.inputTokens - Number of input tokens.
- * @param {number} params.outputTokens - Number of output tokens.
- */
-async function logAiUsage({
-	userId,
-	commandName,
-	providerName,
-	modelId,
-	inputTokens,
-	outputTokens,
-	outputType
-}) {
-	try {
-		const isMCP = outputType === 'mcp';
-		const timestamp = new Date().toISOString();
-		const totalTokens = (inputTokens || 0) + (outputTokens || 0);
-
-		// Destructure currency along with costs
-		const { inputCost, outputCost, currency } = _getCostForModel(
-			providerName,
-			modelId
-		);
-
-		const totalCost =
-			((inputTokens || 0) / 1_000_000) * inputCost +
-			((outputTokens || 0) / 1_000_000) * outputCost;
-
-		const telemetryData = {
-			timestamp,
-			userId,
-			commandName,
-			modelUsed: modelId, // Consistent field name from requirements
-			providerName, // Keep provider name for context
-			inputTokens: inputTokens || 0,
-			outputTokens: outputTokens || 0,
-			totalTokens,
-			totalCost: parseFloat(totalCost.toFixed(6)),
-			currency // Add currency to the telemetry data
-		};
-
-		if (getDebugFlag()) {
-			log('info', 'AI Usage Telemetry:', telemetryData);
-		}
-
-		// TODO (Subtask 77.2): Send telemetryData securely to the external endpoint.
-
-		return telemetryData;
-	} catch (error) {
-		log('error', `Failed to log AI usage telemetry: ${error.message}`, {
-			error
-		});
-		// Don't re-throw; telemetry failure shouldn't block core functionality.
-		return null;
-	}
-}
-
-export {
-	generateTextService,
-	streamTextService,
-	generateObjectService,
-	logAiUsage
-};
+export { generateTextService, streamTextService, generateObjectService };

scripts/modules/commands.js

@@ -62,8 +62,7 @@ import {
 	stopLoadingIndicator,
 	displayModelConfiguration,
 	displayAvailableModels,
-	displayApiKeyStatus,
-	displayAiUsageSummary
+	displayApiKeyStatus
 } from './ui.js';
 
 import { initializeProject } from '../init.js';
@@ -74,11 +73,7 @@ import {
 	getApiKeyStatusReport
 } from './task-manager/models.js';
 import { findProjectRoot } from './utils.js';
-import {
-	isValidTaskStatus,
-	TASK_STATUS_OPTIONS
-} from '../../src/constants/task-status.js';
-import { getTaskMasterVersion } from '../../src/utils/getVersion.js';
+
 /**
  * Runs the interactive setup process for model configuration.
  * @param {string|null} projectRoot - The resolved project root directory.
@@ -491,6 +486,11 @@ function registerCommands(programInstance) {
 		process.exit(1);
 	});
 
+	// Default help
+	programInstance.on('--help', function () {
+		displayHelp();
+	});
+
 	// parse-prd command
 	programInstance
 		.command('parse-prd')
@@ -515,8 +515,8 @@ function registerCommands(programInstance) {
 			const outputPath = options.output;
 			const force = options.force || false;
 			const append = options.append || false;
-			let useForce = force;
-			let useAppend = append;
+			let useForce = false;
+			let useAppend = false;
 
 			// Helper function to check if tasks.json exists and confirm overwrite
 			async function confirmOverwriteIfNeeded() {
@@ -544,10 +544,10 @@ function registerCommands(programInstance) {
 						if (!(await confirmOverwriteIfNeeded())) return;
 
 						console.log(chalk.blue(`Generating ${numTasks} tasks...`));
-						spinner = ora('Parsing PRD and generating tasks...\n').start();
+						spinner = ora('Parsing PRD and generating tasks...').start();
 						await parsePRD(defaultPrdPath, outputPath, numTasks, {
-							append: useAppend, // Changed key from useAppend to append
-							force: useForce // Changed key from useForce to force
+							useAppend,
+							useForce
 						});
 						spinner.succeed('Tasks generated successfully!');
 						return;
@@ -606,10 +606,10 @@ function registerCommands(programInstance) {
 					console.log(chalk.blue('Appending to existing tasks...'));
 				}
 
-				spinner = ora('Parsing PRD and generating tasks...\n').start();
+				spinner = ora('Parsing PRD and generating tasks...').start();
 				await parsePRD(inputFile, outputPath, numTasks, {
-					useAppend: useAppend,
-					useForce: useForce
+					append: useAppend,
+					force: useForce
 				});
 				spinner.succeed('Tasks generated successfully!');
 			} catch (error) {
@@ -1038,7 +1038,7 @@ function registerCommands(programInstance) {
 		)
 		.option(
 			'-s, --status <status>',
-			`New status (one of: ${TASK_STATUS_OPTIONS.join(', ')})`
+			'New status (todo, in-progress, review, done)'
 		)
 		.option('-f, --file <file>', 'Path to the tasks file', 'tasks/tasks.json')
 		.action(async (options) => {
@@ -1051,16 +1051,6 @@ function registerCommands(programInstance) {
 				process.exit(1);
 			}
 
-			if (!isValidTaskStatus(status)) {
-				console.error(
-					chalk.red(
-						`Error: Invalid status value: ${status}. Use one of: ${TASK_STATUS_OPTIONS.join(', ')}`
-					)
-				);
-
-				process.exit(1);
-			}
-
 			console.log(
 				chalk.blue(`Setting status of task(s) ${taskId} to: ${status}`)
 			);
@@ -1073,16 +1063,10 @@ function registerCommands(programInstance) {
 		.command('list')
 		.description('List all tasks')
 		.option('-f, --file <file>', 'Path to the tasks file', 'tasks/tasks.json')
-		.option(
-			'-r, --report <report>',
-			'Path to the complexity report file',
-			'scripts/task-complexity-report.json'
-		)
 		.option('-s, --status <status>', 'Filter by status')
 		.option('--with-subtasks', 'Show subtasks for each task')
 		.action(async (options) => {
 			const tasksPath = options.file;
-			const reportPath = options.report;
 			const statusFilter = options.status;
 			const withSubtasks = options.withSubtasks || false;
 
@@ -1094,7 +1078,7 @@ function registerCommands(programInstance) {
 				console.log(chalk.blue('Including subtasks in listing'));
 			}
 
-			await listTasks(tasksPath, statusFilter, reportPath, withSubtasks);
+			await listTasks(tasksPath, statusFilter, withSubtasks);
 		});
 
 	// expand command
@@ -1144,6 +1128,12 @@ function registerCommands(programInstance) {
 						{} // Pass empty context for CLI calls
 						// outputFormat defaults to 'text' in expandAllTasks for CLI
 					);
+					// Optional: Display summary from result
+					console.log(chalk.green(`Expansion Summary:`));
+					console.log(chalk.green(` - Attempted: ${result.tasksToExpand}`));
+					console.log(chalk.green(` - Expanded:  ${result.expandedCount}`));
+					console.log(chalk.yellow(` - Skipped:   ${result.skippedCount}`));
+					console.log(chalk.red(` - Failed:    ${result.failedCount}`));
 				} catch (error) {
 					console.error(
 						chalk.red(`Error expanding all tasks: ${error.message}`)
@@ -1273,7 +1263,7 @@ function registerCommands(programInstance) {
 	// add-task command
 	programInstance
 		.command('add-task')
-		.description('Add a new task using AI, optionally providing manual details')
+		.description('Add a new task using AI or manual input')
 		.option('-f, --file <file>', 'Path to the tasks file', 'tasks/tasks.json')
 		.option(
 			'-p, --prompt <prompt>',
@@ -1288,6 +1278,10 @@ function registerCommands(programInstance) {
 			'--details <details>',
 			'Implementation details (for manual task creation)'
 		)
+		.option(
+			'--test-strategy <testStrategy>',
+			'Test strategy (for manual task creation)'
+		)
 		.option(
 			'--dependencies <dependencies>',
 			'Comma-separated list of task IDs this task depends on'
@@ -1314,70 +1308,74 @@ function registerCommands(programInstance) {
 				process.exit(1);
 			}
 
-			const tasksPath =
-				options.file ||
-				path.join(findProjectRoot() || '.', 'tasks', 'tasks.json') || // Ensure tasksPath is also relative to a found root or current dir
-				'tasks/tasks.json';
-
-			// Correctly determine projectRoot
-			const projectRoot = findProjectRoot();
-
-			let manualTaskData = null;
-			if (isManualCreation) {
-				manualTaskData = {
-					title: options.title,
-					description: options.description,
-					details: options.details || '',
-					testStrategy: options.testStrategy || ''
-				};
-				// Restore specific logging for manual creation
-				console.log(
-					chalk.blue(`Creating task manually with title: "${options.title}"`)
-				);
-			} else {
-				// Restore specific logging for AI creation
-				console.log(
-					chalk.blue(`Creating task with AI using prompt: "${options.prompt}"`)
-				);
-			}
-
-			// Log dependencies and priority if provided (restored)
-			const dependenciesArray = options.dependencies
-				? options.dependencies.split(',').map((id) => id.trim())
-				: [];
-			if (dependenciesArray.length > 0) {
-				console.log(
-					chalk.blue(`Dependencies: [${dependenciesArray.join(', ')}]`)
-				);
-			}
-			if (options.priority) {
-				console.log(chalk.blue(`Priority: ${options.priority}`));
-			}
-
-			const context = {
-				projectRoot,
-				commandName: 'add-task',
-				outputType: 'cli'
-			};
-
 			try {
-				const { newTaskId, telemetryData } = await addTask(
-					tasksPath,
-					options.prompt,
-					dependenciesArray,
+				// Prepare dependencies if provided
+				let dependencies = [];
+				if (options.dependencies) {
+					dependencies = options.dependencies
+						.split(',')
+						.map((id) => parseInt(id.trim(), 10));
+				}
+
+				// Create manual task data if title and description are provided
+				let manualTaskData = null;
+				if (isManualCreation) {
+					manualTaskData = {
+						title: options.title,
+						description: options.description,
+						details: options.details || '',
+						testStrategy: options.testStrategy || ''
+					};
+
+					console.log(
+						chalk.blue(`Creating task manually with title: "${options.title}"`)
+					);
+					if (dependencies.length > 0) {
+						console.log(
+							chalk.blue(`Dependencies: [${dependencies.join(', ')}]`)
+						);
+					}
+					if (options.priority) {
+						console.log(chalk.blue(`Priority: ${options.priority}`));
+					}
+				} else {
+					console.log(
+						chalk.blue(
+							`Creating task with AI using prompt: "${options.prompt}"`
+						)
+					);
+					if (dependencies.length > 0) {
+						console.log(
+							chalk.blue(`Dependencies: [${dependencies.join(', ')}]`)
+						);
+					}
+					if (options.priority) {
+						console.log(chalk.blue(`Priority: ${options.priority}`));
+					}
+				}
+
+				// Pass mcpLog and session for MCP mode
+				const newTaskId = await addTask(
+					options.file,
+					options.prompt, // Pass prompt (will be null/undefined if not provided)
+					dependencies,
 					options.priority,
-					context,
-					'text',
-					manualTaskData,
-					options.research
+					{
+						// For CLI, session context isn't directly available like MCP
+						// We don't need to pass session here for CLI API key resolution
+						// as dotenv loads .env, and utils.resolveEnvVariable checks process.env
+					},
+					'text', // outputFormat
+					manualTaskData, // Pass the potentially created manualTaskData object
+					options.research || false // Pass the research flag value
 				);
 
-				// addTask handles detailed CLI success logging AND telemetry display when outputFormat is 'text'
-				// No need to call displayAiUsageSummary here anymore.
+				console.log(chalk.green(`✓ Added new task #${newTaskId}`));
+				console.log(chalk.gray('Next: Complete this task or add more tasks'));
 			} catch (error) {
 				console.error(chalk.red(`Error adding task: ${error.message}`));
-				if (error.details) {
-					console.error(chalk.red(error.details));
+				if (error.stack && getDebugFlag()) {
+					console.error(error.stack);
 				}
 				process.exit(1);
 			}
@@ -1390,15 +1388,9 @@ function registerCommands(programInstance) {
 			`Show the next task to work on based on dependencies and status${chalk.reset('')}`
 		)
 		.option('-f, --file <file>', 'Path to the tasks file', 'tasks/tasks.json')
-		.option(
-			'-r, --report <report>',
-			'Path to the complexity report file',
-			'scripts/task-complexity-report.json'
-		)
 		.action(async (options) => {
 			const tasksPath = options.file;
-			const reportPath = options.report;
-			await displayNextTask(tasksPath, reportPath);
+			await displayNextTask(tasksPath);
 		});
 
 	// show command
@@ -1411,11 +1403,6 @@ function registerCommands(programInstance) {
 		.option('-i, --id <id>', 'Task ID to show')
 		.option('-s, --status <status>', 'Filter subtasks by status') // ADDED status option
 		.option('-f, --file <file>', 'Path to the tasks file', 'tasks/tasks.json')
-		.option(
-			'-r, --report <report>',
-			'Path to the complexity report file',
-			'scripts/task-complexity-report.json'
-		)
 		.action(async (taskId, options) => {
 			const idArg = taskId || options.id;
 			const statusFilter = options.status; // ADDED: Capture status filter
@@ -1426,9 +1413,8 @@ function registerCommands(programInstance) {
 			}
 
 			const tasksPath = options.file;
-			const reportPath = options.report;
 			// PASS statusFilter to the display function
-			await displayTaskById(tasksPath, idArg, reportPath, statusFilter);
+			await displayTaskById(tasksPath, idArg, statusFilter);
 		});
 
 	// add-dependency command
@@ -1677,7 +1663,6 @@ function registerCommands(programInstance) {
 				}
 			} catch (error) {
 				console.error(chalk.red(`Error: ${error.message}`));
-				showAddSubtaskHelp();
 				process.exit(1);
 			}
 		})
@@ -2084,7 +2069,7 @@ function registerCommands(programInstance) {
 					);
 
 					// Exit with error if any removals failed
-					if (result.removedTasks.length === 0) {
+					if (successfulRemovals.length === 0) {
 						process.exit(1);
 					}
 				}
@@ -2381,7 +2366,14 @@ function setupCLI() {
 			return 'unknown'; // Default fallback if package.json fails
 		})
 		.helpOption('-h, --help', 'Display help')
-		.addHelpCommand(false); // Disable default help command
+		.addHelpCommand(false) // Disable default help command
+		.on('--help', () => {
+			displayHelp(); // Use your custom help display instead
+		})
+		.on('-h', () => {
+			displayHelp();
+			process.exit(0);
+		});
 
 	// Modify the help option to use your custom display
 	programInstance.helpInformation = () => {
@@ -2401,7 +2393,28 @@ function setupCLI() {
  */
 async function checkForUpdate() {
 	// Get current version from package.json ONLY
-	const currentVersion = getTaskMasterVersion();
+	let currentVersion = 'unknown'; // Initialize with a default
+	try {
+		// Try to get the version from the installed package (if applicable) or current dir
+		let packageJsonPath = path.join(
+			process.cwd(),
+			'node_modules',
+			'task-master-ai',
+			'package.json'
+		);
+		// Fallback to current directory package.json if not found in node_modules
+		if (!fs.existsSync(packageJsonPath)) {
+			packageJsonPath = path.join(process.cwd(), 'package.json');
+		}
+
+		if (fs.existsSync(packageJsonPath)) {
+			const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+			currentVersion = packageJson.version;
+		}
+	} catch (error) {
+		// Silently fail and use default
+		log('debug', `Error reading current package version: ${error.message}`);
+	}
 
 	return new Promise((resolve) => {
 		// Get the latest version from npm registry

scripts/modules/config-manager.js

@@ -669,34 +669,6 @@ function isConfigFilePresent(explicitRoot = null) {
 	return fs.existsSync(configPath);
 }
 
-/**
- * Gets the user ID from the configuration.
- * @param {string|null} explicitRoot - Optional explicit path to the project root.
- * @returns {string|null} The user ID or null if not found.
- */
-function getUserId(explicitRoot = null) {
-	const config = getConfig(explicitRoot);
-	if (!config.global) {
-		config.global = {}; // Ensure global object exists
-	}
-	if (!config.global.userId) {
-		config.global.userId = '1234567890';
-		// Attempt to write the updated config.
-		// It's important that writeConfig correctly resolves the path
-		// using explicitRoot, similar to how getConfig does.
-		const success = writeConfig(config, explicitRoot);
-		if (!success) {
-			// Log an error or handle the failure to write,
-			// though for now, we'll proceed with the in-memory default.
-			log(
-				'warning',
-				'Failed to write updated configuration with new userId. Please let the developers know.'
-			);
-		}
-	}
-	return config.global.userId;
-}
-
 /**
  * Gets a list of all provider names defined in the MODEL_MAP.
  * @returns {string[]} An array of provider names.
@@ -705,19 +677,12 @@ function getAllProviders() {
 	return Object.keys(MODEL_MAP || {});
 }
 
-function getBaseUrlForRole(role, explicitRoot = null) {
-	const roleConfig = getModelConfigForRole(role, explicitRoot);
-	return roleConfig && typeof roleConfig.baseUrl === 'string'
-		? roleConfig.baseUrl
-		: undefined;
-}
-
 export {
 	// Core config access
 	getConfig,
 	writeConfig,
-	ConfigurationError,
-	isConfigFilePresent,
+	ConfigurationError, // Export custom error type
+	isConfigFilePresent, // Add the new function export
 
 	// Validation
 	validateProvider,
@@ -739,7 +704,6 @@ export {
 	getFallbackModelId,
 	getFallbackMaxTokens,
 	getFallbackTemperature,
-	getBaseUrlForRole,
 
 	// Global setting getters (No env var overrides)
 	getLogLevel,
@@ -750,7 +714,7 @@ export {
 	getProjectName,
 	getOllamaBaseUrl,
 	getParametersForRole,
-	getUserId,
+
 	// API Key Checkers (still relevant)
 	isApiKeySet,
 	getMcpApiKeyStatus,

scripts/modules/supported-models.json

@@ -99,39 +99,34 @@
 	],
 	"google": [
 		{
-			"id": "gemini-2.5-pro-preview-05-06",
+			"id": "gemini-2.5-pro-exp-03-25",
 			"swe_score": 0.638,
 			"cost_per_1m_tokens": null,
-			"allowed_roles": ["main", "fallback"],
-			"max_tokens": 1048000
-		},
-		{
-			"id": "gemini-2.5-pro-preview-03-25",
-			"swe_score": 0.638,
-			"cost_per_1m_tokens": null,
-			"allowed_roles": ["main", "fallback"],
-			"max_tokens": 1048000
+			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "gemini-2.5-flash-preview-04-17",
 			"swe_score": 0,
 			"cost_per_1m_tokens": null,
-			"allowed_roles": ["main", "fallback"],
-			"max_tokens": 1048000
+			"allowed_roles": ["main", "fallback"]
 		},
 		{
 			"id": "gemini-2.0-flash",
 			"swe_score": 0.754,
 			"cost_per_1m_tokens": { "input": 0.15, "output": 0.6 },
-			"allowed_roles": ["main", "fallback"],
-			"max_tokens": 1048000
+			"allowed_roles": ["main", "fallback"]
 		},
 		{
-			"id": "gemini-2.0-flash-lite",
+			"id": "gemini-2.0-flash-thinking-experimental",
+			"swe_score": 0.754,
+			"cost_per_1m_tokens": { "input": 0.15, "output": 0.6 },
+			"allowed_roles": ["main", "fallback"]
+		},
+		{
+			"id": "gemini-2.0-pro",
 			"swe_score": 0,
 			"cost_per_1m_tokens": null,
-			"allowed_roles": ["main", "fallback"],
-			"max_tokens": 1048000
+			"allowed_roles": ["main", "fallback"]
 		}
 	],
 	"perplexity": [

scripts/modules/task-manager.js

@@ -23,7 +23,7 @@ import updateSubtaskById from './task-manager/update-subtask-by-id.js';
 import removeTask from './task-manager/remove-task.js';
 import taskExists from './task-manager/task-exists.js';
 import isTaskDependentOn from './task-manager/is-task-dependent.js';
-import { readComplexityReport } from './utils.js';
+
 // Export task manager functions
 export {
 	parsePRD,
@@ -45,6 +45,5 @@ export {
 	removeTask,
 	findTaskById,
 	taskExists,
-	isTaskDependentOn,
-	readComplexityReport
+	isTaskDependentOn
 };

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

@@ -8,8 +8,7 @@ import {
 	displayBanner,
 	getStatusWithColor,
 	startLoadingIndicator,
-	stopLoadingIndicator,
-	displayAiUsageSummary
+	stopLoadingIndicator
 } from '../ui.js';
 import { readJSON, writeJSON, log as consoleLog, truncate } from '../utils.js';
 import { generateObjectService } from '../ai-services-unified.js';
@@ -45,9 +44,7 @@ const AiTaskDataSchema = z.object({
  * @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)
- * @param {string} [context.commandName] - The name of the command being executed (for telemetry)
- * @param {string} [context.outputType] - The output type ('cli' or 'mcp', for telemetry)
- * @returns {Promise<object>} An object containing newTaskId and telemetryData
+ * @returns {number} The new task ID
  */
 async function addTask(
 	tasksPath,
@@ -59,7 +56,7 @@ async function addTask(
 	manualTaskData = null,
 	useResearch = false
 ) {
-	const { session, mcpLog, projectRoot, commandName, outputType } = context;
+	const { session, mcpLog, projectRoot } = context;
 	const isMCP = !!mcpLog;
 
 	// Create a consistent logFn object regardless of context
@@ -81,7 +78,6 @@ async function addTask(
 	);
 
 	let loadingIndicator = null;
-	let aiServiceResponse = null; // To store the full response from AI service
 
 	// Create custom reporter that checks for MCP log
 	const report = (message, level = 'info') => {
@@ -93,6 +89,20 @@ async function addTask(
 	};
 
 	try {
+		// Only display banner and UI elements for text output (CLI)
+		if (outputFormat === 'text') {
+			displayBanner();
+
+			console.log(
+				boxen(chalk.white.bold(`Creating New Task`), {
+					padding: 1,
+					borderColor: 'blue',
+					borderStyle: 'round',
+					margin: { top: 1, bottom: 1 }
+				})
+			);
+		}
+
 		// Read the existing tasks
 		const data = readJSON(tasksPath);
 		if (!data || !data.tasks) {
@@ -159,7 +169,7 @@ async function addTask(
 		} else {
 			report('DEBUG: Taking AI task generation path.', 'debug');
 			// --- Refactored AI Interaction ---
-			report(`Generating task data with AI with prompt:\n${prompt}`, 'info');
+			report('Generating task data with AI...', 'info');
 
 			// Create context string for task creation prompt
 			let contextTasks = '';
@@ -219,51 +229,29 @@ async function addTask(
 			// Start the loading indicator - only for text mode
 			if (outputFormat === 'text') {
 				loadingIndicator = startLoadingIndicator(
-					`Generating new task with ${useResearch ? 'Research' : 'Main'} AI...\n`
+					`Generating new task with ${useResearch ? 'Research' : 'Main'} AI...`
 				);
 			}
 
 			try {
+				// Determine the service role based on the useResearch flag
 				const serviceRole = useResearch ? 'research' : 'main';
-				report('DEBUG: Calling generateObjectService...', 'debug');
 
-				aiServiceResponse = await generateObjectService({
-					// Capture the full response
-					role: serviceRole,
-					session: session,
-					projectRoot: projectRoot,
-					schema: AiTaskDataSchema,
-					objectName: 'newTaskData',
+				report('DEBUG: Calling generateObjectService...', 'debug');
+				// Call the unified AI service
+				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,
-					commandName: commandName || 'add-task', // Use passed commandName or default
-					outputType: outputType || (isMCP ? 'mcp' : 'cli') // Use passed outputType or derive
+					prompt: userPrompt
 				});
 				report('DEBUG: generateObjectService returned successfully.', 'debug');
 
-				if (!aiServiceResponse || !aiServiceResponse.mainResult) {
-					throw new Error(
-						'AI service did not return the expected object structure.'
-					);
-				}
-
-				// Prefer mainResult if it looks like a valid task object, otherwise try mainResult.object
-				if (
-					aiServiceResponse.mainResult.title &&
-					aiServiceResponse.mainResult.description
-				) {
-					taskData = aiServiceResponse.mainResult;
-				} else if (
-					aiServiceResponse.mainResult.object &&
-					aiServiceResponse.mainResult.object.title &&
-					aiServiceResponse.mainResult.object.description
-				) {
-					taskData = aiServiceResponse.mainResult.object;
-				} else {
-					throw new Error('AI service did not return a valid task object.');
-				}
-
 				report('Successfully generated task data from AI.', 'success');
+				taskData = aiGeneratedTaskData; // Assign the validated object
 			} catch (error) {
 				report(
 					`DEBUG: generateObjectService caught error: ${error.message}`,
@@ -374,25 +362,11 @@ async function addTask(
 					{ padding: 1, borderColor: 'green', borderStyle: 'round' }
 				)
 			);
-
-			// Display AI Usage Summary if telemetryData is available
-			if (
-				aiServiceResponse &&
-				aiServiceResponse.telemetryData &&
-				(outputType === 'cli' || outputType === 'text')
-			) {
-				displayAiUsageSummary(aiServiceResponse.telemetryData, 'cli');
-			}
 		}
 
-		report(
-			`DEBUG: Returning new task ID: ${newTaskId} and telemetry.`,
-			'debug'
-		);
-		return {
-			newTaskId: newTaskId,
-			telemetryData: aiServiceResponse ? aiServiceResponse.telemetryData : null
-		};
+		// Return the new task ID
+		report(`DEBUG: Returning new task ID: ${newTaskId}`, 'debug');
+		return newTaskId;
 	} catch (error) {
 		// Stop any loading indicator on error
 		if (loadingIndicator) {

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

@@ -4,11 +4,7 @@ import readline from 'readline';
 
 import { log, readJSON, writeJSON, isSilentMode } from '../utils.js';
 
-import {
-	startLoadingIndicator,
-	stopLoadingIndicator,
-	displayAiUsageSummary
-} from '../ui.js';
+import { startLoadingIndicator, stopLoadingIndicator } from '../ui.js';
 
 import { generateTextService } from '../ai-services-unified.js';
 
@@ -200,32 +196,35 @@ async function analyzeTaskComplexity(options, context = {}) {
 		}
 
 		const prompt = generateInternalComplexityAnalysisPrompt(tasksData);
+		// System prompt remains simple for text generation
 		const systemPrompt =
 			'You are an expert software architect and project manager analyzing task complexity. Respond only with the requested valid JSON array.';
 
 		let loadingIndicator = null;
 		if (outputFormat === 'text') {
-			loadingIndicator = startLoadingIndicator(
-				`${useResearch ? 'Researching' : 'Analyzing'} the complexity of your tasks with AI...\n`
-			);
+			loadingIndicator = startLoadingIndicator('Calling AI service...');
 		}
 
-		let aiServiceResponse = null;
-		let complexityAnalysis = null;
+		let fullResponse = ''; // To store the raw text response
 
 		try {
 			const role = useResearch ? 'research' : 'main';
+			reportLog(`Using AI service with role: ${role}`, 'info');
 
-			aiServiceResponse = await generateTextService({
+			fullResponse = await generateTextService({
 				prompt,
 				systemPrompt,
 				role,
 				session,
-				projectRoot,
-				commandName: 'analyze-complexity',
-				outputType: mcpLog ? 'mcp' : 'cli'
+				projectRoot
 			});
 
+			reportLog(
+				'Successfully received text response via AI service',
+				'success'
+			);
+
+			// --- Stop Loading Indicator (Unchanged) ---
 			if (loadingIndicator) {
 				stopLoadingIndicator(loadingIndicator);
 				loadingIndicator = null;
@@ -237,18 +236,26 @@ async function analyzeTaskComplexity(options, context = {}) {
 					chalk.green('AI service call complete. Parsing response...')
 				);
 			}
+			// --- End Stop Loading Indicator ---
 
+			// --- Re-introduce Manual JSON Parsing & Cleanup ---
 			reportLog(`Parsing complexity analysis from text response...`, 'info');
+			let complexityAnalysis;
 			try {
-				let cleanedResponse = aiServiceResponse.mainResult;
+				let cleanedResponse = fullResponse;
+				// Basic trim first
 				cleanedResponse = cleanedResponse.trim();
 
+				// Remove potential markdown code block fences
 				const codeBlockMatch = cleanedResponse.match(
 					/```(?:json)?\s*([\s\S]*?)\s*```/
 				);
 				if (codeBlockMatch) {
-					cleanedResponse = codeBlockMatch[1].trim();
+					cleanedResponse = codeBlockMatch[1].trim(); // Trim content inside block
+					reportLog('Extracted JSON from code block', 'info');
 				} else {
+					// If no code block, ensure it starts with '[' and ends with ']'
+					// This is less robust but a common fallback
 					const firstBracket = cleanedResponse.indexOf('[');
 					const lastBracket = cleanedResponse.lastIndexOf(']');
 					if (firstBracket !== -1 && lastBracket > firstBracket) {
@@ -256,11 +263,13 @@ async function analyzeTaskComplexity(options, context = {}) {
 							firstBracket,
 							lastBracket + 1
 						);
+						reportLog('Extracted content between first [ and last ]', 'info');
 					} else {
 						reportLog(
 							'Warning: Response does not appear to be a JSON array.',
 							'warn'
 						);
+						// Keep going, maybe JSON.parse can handle it or will fail informatively
 					}
 				}
 
@@ -274,23 +283,48 @@ async function analyzeTaskComplexity(options, context = {}) {
 					);
 				}
 
-				complexityAnalysis = JSON.parse(cleanedResponse);
-			} catch (parseError) {
-				if (loadingIndicator) stopLoadingIndicator(loadingIndicator);
+				try {
+					complexityAnalysis = JSON.parse(cleanedResponse);
+				} catch (jsonError) {
+					reportLog(
+						'Initial JSON parsing failed. Raw response might be malformed.',
+						'error'
+					);
+					reportLog(`Original JSON Error: ${jsonError.message}`, 'error');
+					if (outputFormat === 'text' && getDebugFlag(session)) {
+						console.log(chalk.red('--- Start Raw Malformed Response ---'));
+						console.log(chalk.gray(fullResponse));
+						console.log(chalk.red('--- End Raw Malformed Response ---'));
+					}
+					// Re-throw the specific JSON parsing error
+					throw new Error(
+						`Failed to parse JSON response: ${jsonError.message}`
+					);
+				}
+
+				// Ensure it's an array after parsing
+				if (!Array.isArray(complexityAnalysis)) {
+					throw new Error('Parsed response is not a valid JSON array.');
+				}
+			} catch (error) {
+				// Catch errors specifically from the parsing/cleanup block
+				if (loadingIndicator) stopLoadingIndicator(loadingIndicator); // Ensure indicator stops
 				reportLog(
-					`Error parsing complexity analysis JSON: ${parseError.message}`,
+					`Error parsing complexity analysis JSON: ${error.message}`,
 					'error'
 				);
 				if (outputFormat === 'text') {
 					console.error(
 						chalk.red(
-							`Error parsing complexity analysis JSON: ${parseError.message}`
+							`Error parsing complexity analysis JSON: ${error.message}`
 						)
 					);
 				}
-				throw parseError;
+				throw error; // Re-throw parsing error
 			}
+			// --- End Manual JSON Parsing & Cleanup ---
 
+			// --- Post-processing (Missing Task Check) - (Unchanged) ---
 			const taskIds = tasksData.tasks.map((t) => t.id);
 			const analysisTaskIds = complexityAnalysis.map((a) => a.taskId);
 			const missingTaskIds = taskIds.filter(
@@ -325,8 +359,10 @@ async function analyzeTaskComplexity(options, context = {}) {
 					}
 				}
 			}
+			// --- End Post-processing ---
 
-			const report = {
+			// --- Report Creation & Writing (Unchanged) ---
+			const finalReport = {
 				meta: {
 					generatedAt: new Date().toISOString(),
 					tasksAnalyzed: tasksData.tasks.length,
@@ -337,13 +373,15 @@ async function analyzeTaskComplexity(options, context = {}) {
 				complexityAnalysis: complexityAnalysis
 			};
 			reportLog(`Writing complexity report to ${outputPath}...`, 'info');
-			writeJSON(outputPath, report);
+			writeJSON(outputPath, finalReport);
 
 			reportLog(
 				`Task complexity analysis complete. Report written to ${outputPath}`,
 				'success'
 			);
+			// --- End Report Creation & Writing ---
 
+			// --- Display CLI Summary (Unchanged) ---
 			if (outputFormat === 'text') {
 				console.log(
 					chalk.green(
@@ -397,28 +435,23 @@ async function analyzeTaskComplexity(options, context = {}) {
 				if (getDebugFlag(session)) {
 					console.debug(
 						chalk.gray(
-							`Final analysis object: ${JSON.stringify(report, null, 2)}`
+							`Final analysis object: ${JSON.stringify(finalReport, null, 2)}`
 						)
 					);
 				}
-
-				if (aiServiceResponse.telemetryData) {
-					displayAiUsageSummary(aiServiceResponse.telemetryData, 'cli');
-				}
 			}
+			// --- End Display CLI Summary ---
 
-			return {
-				report: report,
-				telemetryData: aiServiceResponse?.telemetryData
-			};
-		} catch (aiError) {
+			return finalReport;
+		} catch (error) {
+			// Catches errors from generateTextService call
 			if (loadingIndicator) stopLoadingIndicator(loadingIndicator);
-			reportLog(`Error during AI service call: ${aiError.message}`, 'error');
+			reportLog(`Error during AI service call: ${error.message}`, 'error');
 			if (outputFormat === 'text') {
 				console.error(
-					chalk.red(`Error during AI service call: ${aiError.message}`)
+					chalk.red(`Error during AI service call: ${error.message}`)
 				);
-				if (aiError.message.includes('API key')) {
+				if (error.message.includes('API key')) {
 					console.log(
 						chalk.yellow(
 							'\nPlease ensure your API keys are correctly configured in .env or ~/.taskmaster/.env'
@@ -429,9 +462,10 @@ async function analyzeTaskComplexity(options, context = {}) {
 					);
 				}
 			}
-			throw aiError;
+			throw error; // Re-throw AI service error
 		}
 	} catch (error) {
+		// Catches general errors (file read, etc.)
 		reportLog(`Error analyzing task complexity: ${error.message}`, 'error');
 		if (outputFormat === 'text') {
 			console.error(

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

@@ -1,14 +1,7 @@
 import { log, readJSON, isSilentMode } from '../utils.js';
-import {
-	startLoadingIndicator,
-	stopLoadingIndicator,
-	displayAiUsageSummary
-} from '../ui.js';
+import { startLoadingIndicator, stopLoadingIndicator } from '../ui.js';
 import expandTask from './expand-task.js';
 import { getDebugFlag } from '../config-manager.js';
-import { aggregateTelemetry } from '../utils.js';
-import chalk from 'chalk';
-import boxen from 'boxen';
 
 /**
  * Expand all eligible pending or in-progress tasks using the expandTask function.
@@ -21,7 +14,7 @@ import boxen from 'boxen';
  * @param {Object} [context.session] - Session object from MCP.
  * @param {Object} [context.mcpLog] - MCP logger object.
  * @param {string} [outputFormat='text'] - Output format ('text' or 'json'). MCP calls should use 'json'.
- * @returns {Promise<{success: boolean, expandedCount: number, failedCount: number, skippedCount: number, tasksToExpand: number, telemetryData: Array<Object>}>} - Result summary.
+ * @returns {Promise<{success: boolean, expandedCount: number, failedCount: number, skippedCount: number, tasksToExpand: number, message?: string}>} - Result summary.
  */
 async function expandAllTasks(
 	tasksPath,
@@ -58,8 +51,8 @@ async function expandAllTasks(
 	let loadingIndicator = null;
 	let expandedCount = 0;
 	let failedCount = 0;
-	let tasksToExpandCount = 0;
-	const allTelemetryData = []; // Still collect individual data first
+	// No skipped count needed now as the filter handles it upfront
+	let tasksToExpandCount = 0; // Renamed for clarity
 
 	if (!isMCPCall && outputFormat === 'text') {
 		loadingIndicator = startLoadingIndicator(
@@ -97,7 +90,6 @@ async function expandAllTasks(
 				failedCount: 0,
 				skippedCount: 0,
 				tasksToExpand: 0,
-				telemetryData: allTelemetryData,
 				message: 'No tasks eligible for expansion.'
 			};
 			// --- End Fix ---
@@ -105,6 +97,19 @@ async function expandAllTasks(
 
 		// Iterate over the already filtered tasks
 		for (const task of tasksToExpand) {
+			// --- Remove Redundant Check ---
+			// The check below is no longer needed as the initial filter handles it
+			/*
+			if (task.subtasks && task.subtasks.length > 0 && !force) {
+				logger.info(
+					`Skipping task ${task.id}: Already has subtasks. Use --force to overwrite.`
+				);
+				skippedCount++;
+				continue;
+			}
+			*/
+			// --- End Removed Redundant Check ---
+
 			// Start indicator for individual task expansion in CLI mode
 			let taskIndicator = null;
 			if (!isMCPCall && outputFormat === 'text') {
@@ -112,23 +117,17 @@ async function expandAllTasks(
 			}
 
 			try {
-				// Call the refactored expandTask function AND capture result
-				const result = await expandTask(
+				// Call the refactored expandTask function
+				await expandTask(
 					tasksPath,
 					task.id,
-					numSubtasks,
+					numSubtasks, // Pass numSubtasks, expandTask handles defaults/complexity
 					useResearch,
 					additionalContext,
 					context, // Pass the whole context object { session, mcpLog }
-					force
+					force // Pass the force flag down
 				);
 				expandedCount++;
-
-				// Collect individual telemetry data
-				if (result && result.telemetryData) {
-					allTelemetryData.push(result.telemetryData);
-				}
-
 				if (taskIndicator) {
 					stopLoadingIndicator(taskIndicator, `Task ${task.id} expanded.`);
 				}
@@ -147,48 +146,18 @@ async function expandAllTasks(
 			}
 		}
 
-		// --- AGGREGATION AND DISPLAY ---
+		// Log final summary (removed skipped count from message)
 		logger.info(
 			`Expansion complete: ${expandedCount} expanded, ${failedCount} failed.`
 		);
 
-		// Aggregate the collected telemetry data
-		const aggregatedTelemetryData = aggregateTelemetry(
-			allTelemetryData,
-			'expand-all-tasks'
-		);
-
-		if (outputFormat === 'text') {
-			const summaryContent =
-				`${chalk.white.bold('Expansion Summary:')}\n\n` +
-				`${chalk.cyan('-')} Attempted: ${chalk.bold(tasksToExpandCount)}\n` +
-				`${chalk.green('-')} Expanded:  ${chalk.bold(expandedCount)}\n` +
-				// Skipped count is always 0 now due to pre-filtering
-				`${chalk.gray('-')} Skipped:   ${chalk.bold(0)}\n` +
-				`${chalk.red('-')} Failed:    ${chalk.bold(failedCount)}`;
-
-			console.log(
-				boxen(summaryContent, {
-					padding: 1,
-					margin: { top: 1 },
-					borderColor: failedCount > 0 ? 'red' : 'green', // Red if failures, green otherwise
-					borderStyle: 'round'
-				})
-			);
-		}
-
-		if (outputFormat === 'text' && aggregatedTelemetryData) {
-			displayAiUsageSummary(aggregatedTelemetryData, 'cli');
-		}
-
-		// Return summary including the AGGREGATED telemetry data
+		// Return summary (skippedCount is now 0) - Add success: true here as well for consistency
 		return {
-			success: true,
+			success: true, // Indicate overall success
 			expandedCount,
 			failedCount,
 			skippedCount: 0,
-			tasksToExpand: tasksToExpandCount,
-			telemetryData: aggregatedTelemetryData
+			tasksToExpand: tasksToExpandCount
 		};
 	} catch (error) {
 		if (loadingIndicator)

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

@@ -4,11 +4,7 @@ import { z } from 'zod';
 
 import { log, readJSON, writeJSON, isSilentMode } from '../utils.js';
 
-import {
-	startLoadingIndicator,
-	stopLoadingIndicator,
-	displayAiUsageSummary
-} from '../ui.js';
+import { startLoadingIndicator, stopLoadingIndicator } from '../ui.js';
 
 import { generateTextService } from '../ai-services-unified.js';
 
@@ -146,7 +142,7 @@ function generateResearchUserPrompt(
       "id": <number>, // Sequential ID starting from ${nextSubtaskId}
       "title": "<string>",
       "description": "<string>",
-      "dependencies": [<number>], // e.g., [${nextSubtaskId + 1}]. If no dependencies, use an empty array [].
+      "dependencies": [<number>], // e.g., [${nextSubtaskId + 1}]
       "details": "<string>",
       "testStrategy": "<string>" // Optional
     },
@@ -166,8 +162,6 @@ ${contextPrompt}
 CRITICAL: Respond ONLY with a valid JSON object containing a single key "subtasks". The value must be an array of the generated subtasks, strictly matching this structure:
 ${schemaDescription}
 
-Important: For the 'dependencies' field, if a subtask has no dependencies, you MUST use an empty array, for example: "dependencies": []. Do not use null or omit the field.
-
 Do not include ANY explanatory text, markdown, or code block markers. Just the JSON object.`;
 }
 
@@ -188,153 +182,77 @@ function parseSubtasksFromText(
 	parentTaskId,
 	logger
 ) {
-	if (typeof text !== 'string') {
-		logger.error(
-			`AI response text is not a string. Received type: ${typeof text}, Value: ${text}`
-		);
-		throw new Error('AI response text is not a string.');
-	}
-
+	logger.info('Attempting to parse subtasks object from text response...');
 	if (!text || text.trim() === '') {
-		throw new Error('AI response text is empty after trimming.');
+		throw new Error('AI response text is empty.');
 	}
 
-	const originalTrimmedResponse = text.trim(); // Store the original trimmed response
-	let jsonToParse = originalTrimmedResponse; // Initialize jsonToParse with it
+	let cleanedResponse = text.trim();
+	const originalResponseForDebug = cleanedResponse;
 
-	logger.debug(
-		`Original AI Response for parsing (full length: ${jsonToParse.length}): ${jsonToParse.substring(0, 1000)}...`
+	// 1. Extract from Markdown code block first
+	const codeBlockMatch = cleanedResponse.match(
+		/```(?:json)?\s*([\s\S]*?)\s*```/
 	);
-
-	// --- Pre-emptive cleanup for known AI JSON issues ---
-	// Fix for "dependencies": , or "dependencies":,
-	if (jsonToParse.includes('"dependencies":')) {
-		const malformedPattern = /"dependencies":\s*,/g;
-		if (malformedPattern.test(jsonToParse)) {
-			logger.warn('Attempting to fix malformed "dependencies": , issue.');
-			jsonToParse = jsonToParse.replace(
-				malformedPattern,
-				'"dependencies": [],'
-			);
-			logger.debug(
-				`JSON after fixing "dependencies": ${jsonToParse.substring(0, 500)}...`
-			);
-		}
-	}
-	// --- End pre-emptive cleanup ---
-
-	let parsedObject;
-	let primaryParseAttemptFailed = false;
-
-	// --- Attempt 1: Simple Parse (with optional Markdown cleanup) ---
-	logger.debug('Attempting simple parse...');
-	try {
-		// Check for markdown code block
-		const codeBlockMatch = jsonToParse.match(/```(?:json)?\s*([\s\S]*?)\s*```/);
-		let contentToParseDirectly = jsonToParse;
-		if (codeBlockMatch && codeBlockMatch[1]) {
-			contentToParseDirectly = codeBlockMatch[1].trim();
-			logger.debug('Simple parse: Extracted content from markdown code block.');
+	if (codeBlockMatch) {
+		cleanedResponse = codeBlockMatch[1].trim();
+		logger.info('Extracted JSON content from Markdown code block.');
+	} else {
+		// 2. 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);
+			logger.info('Extracted content between first { and last }.');
 		} else {
-			logger.debug(
-				'Simple parse: No markdown code block found, using trimmed original.'
-			);
-		}
-
-		parsedObject = JSON.parse(contentToParseDirectly);
-		logger.debug('Simple parse successful!');
-
-		// Quick check if it looks like our target object
-		if (
-			!parsedObject ||
-			typeof parsedObject !== 'object' ||
-			!Array.isArray(parsedObject.subtasks)
-		) {
 			logger.warn(
-				'Simple parse succeeded, but result is not the expected {"subtasks": []} structure. Will proceed to advanced extraction.'
-			);
-			primaryParseAttemptFailed = true;
-			parsedObject = null; // Reset parsedObject so we enter the advanced logic
-		}
-		// If it IS the correct structure, we'll skip advanced extraction.
-	} catch (e) {
-		logger.warn(
-			`Simple parse failed: ${e.message}. Proceeding to advanced extraction logic.`
-		);
-		primaryParseAttemptFailed = true;
-		// jsonToParse is already originalTrimmedResponse if simple parse failed before modifying it for markdown
-	}
-
-	// --- Attempt 2: Advanced Extraction (if simple parse failed or produced wrong structure) ---
-	if (primaryParseAttemptFailed || !parsedObject) {
-		// Ensure we try advanced if simple parse gave wrong structure
-		logger.debug('Attempting advanced extraction logic...');
-		// Reset jsonToParse to the original full trimmed response for advanced logic
-		jsonToParse = originalTrimmedResponse;
-
-		// (Insert the more complex extraction logic here - the one we worked on with:
-		//  - targetPattern = '{"subtasks":';
-		//  - careful brace counting for that targetPattern
-		//  - fallbacks to last '{' and '}' if targetPattern logic fails)
-		//  This was the logic from my previous message. Let's assume it's here.
-		//  This block should ultimately set `jsonToParse` to the best candidate string.
-
-		// Example snippet of that advanced logic's start:
-		const targetPattern = '{"subtasks":';
-		const patternStartIndex = jsonToParse.indexOf(targetPattern);
-
-		if (patternStartIndex !== -1) {
-			let openBraces = 0;
-			let firstBraceFound = false;
-			let extractedJsonBlock = '';
-			// ... (loop for brace counting as before) ...
-			// ... (if successful, jsonToParse = extractedJsonBlock) ...
-			// ... (if that fails, fallbacks as before) ...
-		} else {
-			// ... (fallback to last '{' and '}' if targetPattern not found) ...
-		}
-		// End of advanced logic excerpt
-
-		logger.debug(
-			`Advanced extraction: JSON string that will be parsed: ${jsonToParse.substring(0, 500)}...`
-		);
-		try {
-			parsedObject = JSON.parse(jsonToParse);
-			logger.debug('Advanced extraction parse successful!');
-		} catch (parseError) {
-			logger.error(
-				`Advanced extraction: Failed to parse JSON object: ${parseError.message}`
-			);
-			logger.error(
-				`Advanced extraction: Problematic JSON string for parse (first 500 chars): ${jsonToParse.substring(0, 500)}`
-			);
-			throw new Error( // Re-throw a more specific error if advanced also fails
-				`Failed to parse JSON response object after both simple and advanced attempts: ${parseError.message}`
+				'Response does not appear to contain a JSON object structure. Parsing raw response.'
 			);
 		}
 	}
 
-	// --- Validation (applies to successfully parsedObject from either attempt) ---
+	// 3. Attempt to parse the object
+	let parsedObject;
+	try {
+		parsedObject = JSON.parse(cleanedResponse);
+	} catch (parseError) {
+		logger.error(`Failed to parse JSON object: ${parseError.message}`);
+		logger.error(
+			`Problematic JSON string (first 500 chars): ${cleanedResponse.substring(0, 500)}`
+		);
+		logger.error(
+			`Original Raw Response (first 500 chars): ${originalResponseForDebug.substring(0, 500)}`
+		);
+		throw new Error(
+			`Failed to parse JSON response object: ${parseError.message}`
+		);
+	}
+
+	// 4. Validate the object structure and extract the subtasks array
 	if (
 		!parsedObject ||
 		typeof parsedObject !== 'object' ||
 		!Array.isArray(parsedObject.subtasks)
 	) {
 		logger.error(
-			`Final parsed content is not an object or missing 'subtasks' array. Content: ${JSON.stringify(parsedObject).substring(0, 200)}`
+			`Parsed content is not an object or missing 'subtasks' array. Content: ${JSON.stringify(parsedObject).substring(0, 200)}`
 		);
 		throw new Error(
-			'Parsed AI response is not a valid object containing a "subtasks" array after all attempts.'
+			'Parsed AI response is not a valid object containing a "subtasks" array.'
 		);
 	}
-	const parsedSubtasks = parsedObject.subtasks;
+	const parsedSubtasks = parsedObject.subtasks; // Extract the array
 
+	logger.info(
+		`Successfully parsed ${parsedSubtasks.length} potential subtasks from the object.`
+	);
 	if (expectedCount && parsedSubtasks.length !== expectedCount) {
 		logger.warn(
 			`Expected ${expectedCount} subtasks, but parsed ${parsedSubtasks.length}.`
 		);
 	}
 
+	// 5. Validate and Normalize each subtask using Zod schema
 	let currentId = startId;
 	const validatedSubtasks = [];
 	const validationErrors = [];
@@ -342,21 +260,22 @@ function parseSubtasksFromText(
 	for (const rawSubtask of parsedSubtasks) {
 		const correctedSubtask = {
 			...rawSubtask,
-			id: currentId,
+			id: currentId, // Enforce sequential ID
 			dependencies: Array.isArray(rawSubtask.dependencies)
 				? rawSubtask.dependencies
 						.map((dep) => (typeof dep === 'string' ? parseInt(dep, 10) : dep))
 						.filter(
 							(depId) => !isNaN(depId) && depId >= startId && depId < currentId
-						)
+						) // Ensure deps are numbers, valid range
 				: [],
-			status: 'pending'
+			status: 'pending' // Enforce pending status
+			// parentTaskId can be added if needed: parentTaskId: parentTaskId
 		};
 
 		const result = subtaskSchema.safeParse(correctedSubtask);
 
 		if (result.success) {
-			validatedSubtasks.push(result.data);
+			validatedSubtasks.push(result.data); // Add the validated data
 		} else {
 			logger.warn(
 				`Subtask validation failed for raw data: ${JSON.stringify(rawSubtask).substring(0, 100)}...`
@@ -366,14 +285,18 @@ function parseSubtasksFromText(
 				logger.warn(errorMessage);
 				validationErrors.push(`Subtask ${currentId}: ${errorMessage}`);
 			});
+			// Optionally, decide whether to include partially valid tasks or skip them
+			// For now, we'll skip invalid ones
 		}
-		currentId++;
+		currentId++; // Increment ID for the next *potential* subtask
 	}
 
 	if (validationErrors.length > 0) {
 		logger.error(
 			`Found ${validationErrors.length} validation errors in the generated subtasks.`
 		);
+		// Optionally throw an error here if strict validation is required
+		// throw new Error(`Subtask validation failed:\n${validationErrors.join('\n')}`);
 		logger.warn('Proceeding with only the successfully validated subtasks.');
 	}
 
@@ -382,6 +305,8 @@ function parseSubtasksFromText(
 			'AI response contained potential subtasks, but none passed validation.'
 		);
 	}
+
+	// Ensure we don't return more than expected, preferring validated ones
 	return validatedSubtasks.slice(0, expectedCount || validatedSubtasks.length);
 }
 
@@ -411,13 +336,9 @@ async function expandTask(
 	context = {},
 	force = false
 ) {
-	const { session, mcpLog, projectRoot: contextProjectRoot } = context;
+	const { session, mcpLog } = context;
 	const outputFormat = mcpLog ? 'json' : 'text';
 
-	// Determine projectRoot: Use from context if available, otherwise derive from tasksPath
-	const projectRoot =
-		contextProjectRoot || path.dirname(path.dirname(tasksPath));
-
 	// Use mcpLog if available, otherwise use the default console log wrapper
 	const logger = mcpLog || {
 		info: (msg) => !isSilentMode() && log('info', msg),
@@ -442,9 +363,7 @@ async function expandTask(
 		);
 		if (taskIndex === -1) throw new Error(`Task ${taskId} not found`);
 		const task = data.tasks[taskIndex];
-		logger.info(
-			`Expanding task ${taskId}: ${task.title}${useResearch ? ' with research' : ''}`
-		);
+		logger.info(`Expanding task ${taskId}: ${task.title}`);
 		// --- End Task Loading/Filtering ---
 
 		// --- Handle Force Flag: Clear existing subtasks if force=true ---
@@ -462,6 +381,7 @@ async function expandTask(
 		let complexityReasoningContext = '';
 		let systemPrompt; // Declare systemPrompt here
 
+		const projectRoot = path.dirname(path.dirname(tasksPath));
 		const complexityReportPath = path.join(
 			projectRoot,
 			'scripts/task-complexity-report.json'
@@ -568,27 +488,28 @@ async function expandTask(
 		let loadingIndicator = null;
 		if (outputFormat === 'text') {
 			loadingIndicator = startLoadingIndicator(
-				`Generating ${finalSubtaskCount} subtasks...\n`
+				`Generating ${finalSubtaskCount} subtasks...`
 			);
 		}
 
 		let responseText = '';
-		let aiServiceResponse = null;
 
 		try {
 			const role = useResearch ? 'research' : 'main';
+			logger.info(`Using AI service with role: ${role}`);
 
-			// Call generateTextService with the determined prompts and telemetry params
-			aiServiceResponse = await generateTextService({
+			// Call generateTextService with the determined prompts
+			responseText = await generateTextService({
 				prompt: promptContent,
-				systemPrompt: systemPrompt,
+				systemPrompt: systemPrompt, // Use the determined system prompt
 				role,
 				session,
-				projectRoot,
-				commandName: 'expand-task',
-				outputType: outputFormat
+				projectRoot
 			});
-			responseText = aiServiceResponse.mainResult;
+			logger.info(
+				'Successfully received text response from AI service',
+				'success'
+			);
 
 			// Parse Subtasks
 			generatedSubtasks = parseSubtasksFromText(
@@ -629,23 +550,14 @@ async function expandTask(
 		// --- End Change: Append instead of replace ---
 
 		data.tasks[taskIndex] = task; // Assign the modified task back
+		logger.info(`Writing updated tasks to ${tasksPath}`);
 		writeJSON(tasksPath, data);
+		logger.info(`Generating individual task files...`);
 		await generateTaskFiles(tasksPath, path.dirname(tasksPath));
+		logger.info(`Task files generated.`);
+		// --- End Task Update & File Writing ---
 
-		// Display AI Usage Summary for CLI
-		if (
-			outputFormat === 'text' &&
-			aiServiceResponse &&
-			aiServiceResponse.telemetryData
-		) {
-			displayAiUsageSummary(aiServiceResponse.telemetryData, 'cli');
-		}
-
-		// Return the updated task object AND telemetry data
-		return {
-			task,
-			telemetryData: aiServiceResponse?.telemetryData
-		};
+		return task; // Return the updated task object
 	} catch (error) {
 		// Catches errors from file reading, parsing, AI call etc.
 		logger.error(`Error expanding task ${taskId}: ${error.message}`, 'error');

scripts/modules/task-manager/find-next-task.js

@@ -1,6 +1,3 @@
-import { log } from '../utils.js';
-import { addComplexityToTask } from '../utils.js';
-
 /**
  * Return the next work item:
  *   •  Prefer an eligible SUBTASK that belongs to any parent task
@@ -18,10 +15,9 @@ import { addComplexityToTask } from '../utils.js';
  *  ─ parentId      →  number  (present only when it's a subtask)
  *
  * @param {Object[]} tasks  – full array of top-level tasks, each may contain .subtasks[]
- * @param {Object} [complexityReport=null] - Optional complexity report object
  * @returns {Object|null}   – next work item or null if nothing is eligible
  */
-function findNextTask(tasks, complexityReport = null) {
+function findNextTask(tasks) {
 	// ---------- helpers ----------------------------------------------------
 	const priorityValues = { high: 3, medium: 2, low: 1 };
 
@@ -95,14 +91,7 @@ function findNextTask(tasks, complexityReport = null) {
 			if (aPar !== bPar) return aPar - bPar;
 			return aSub - bSub;
 		});
-		const nextTask = candidateSubtasks[0];
-
-		// Add complexity to the task before returning
-		if (nextTask && complexityReport) {
-			addComplexityToTask(nextTask, complexityReport);
-		}
-
-		return nextTask;
+		return candidateSubtasks[0];
 	}
 
 	// ---------- 2) fall back to top-level tasks (original logic) ------------
@@ -127,11 +116,6 @@ function findNextTask(tasks, complexityReport = null) {
 		return a.id - b.id;
 	})[0];
 
-	// Add complexity to the task before returning
-	if (nextTask && complexityReport) {
-		addComplexityToTask(nextTask, complexityReport);
-	}
-
 	return nextTask;
 }
 

scripts/modules/task-manager/generate-task-files.js

@@ -19,6 +19,8 @@ function generateTaskFiles(tasksPath, outputDir, options = {}) {
 		// Determine if we're in MCP mode by checking for mcpLog
 		const isMcpMode = !!options?.mcpLog;
 
+		log('info', `Preparing to regenerate task files in ${tasksPath}`);
+
 		const data = readJSON(tasksPath);
 		if (!data || !data.tasks) {
 			throw new Error(`No valid tasks found in ${tasksPath}`);
@@ -29,7 +31,7 @@ function generateTaskFiles(tasksPath, outputDir, options = {}) {
 			fs.mkdirSync(outputDir, { recursive: true });
 		}
 
-		log('info', `Preparing to regenerate ${data.tasks.length} task files`);
+		log('info', `Found ${data.tasks.length} tasks to regenerate`);
 
 		// Validate and fix dependencies before generating files
 		log('info', `Validating and fixing dependencies`);

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

@@ -2,20 +2,13 @@ import chalk from 'chalk';
 import boxen from 'boxen';
 import Table from 'cli-table3';
 
-import {
-	log,
-	readJSON,
-	truncate,
-	readComplexityReport,
-	addComplexityToTask
-} from '../utils.js';
+import { log, readJSON, truncate } from '../utils.js';
 import findNextTask from './find-next-task.js';
 
 import {
 	displayBanner,
 	getStatusWithColor,
 	formatDependenciesWithStatus,
-	getComplexityWithColor,
 	createProgressBar
 } from '../ui.js';
 
@@ -23,7 +16,6 @@ import {
  * List all tasks
  * @param {string} tasksPath - Path to the tasks.json file
  * @param {string} statusFilter - Filter by status
- * @param {string} reportPath - Path to the complexity report
  * @param {boolean} withSubtasks - Whether to show subtasks
  * @param {string} outputFormat - Output format (text or json)
  * @returns {Object} - Task list result for json format
@@ -31,7 +23,6 @@ import {
 function listTasks(
 	tasksPath,
 	statusFilter,
-	reportPath = null,
 	withSubtasks = false,
 	outputFormat = 'text'
 ) {
@@ -46,13 +37,6 @@ function listTasks(
 			throw new Error(`No valid tasks found in ${tasksPath}`);
 		}
 
-		// Add complexity scores to tasks if report exists
-		const complexityReport = readComplexityReport(reportPath);
-		// Apply complexity scores to tasks
-		if (complexityReport && complexityReport.complexityAnalysis) {
-			data.tasks.forEach((task) => addComplexityToTask(task, complexityReport));
-		}
-
 		// Filter tasks by status if specified
 		const filteredTasks =
 			statusFilter && statusFilter.toLowerCase() !== 'all' // <-- Added check for 'all'
@@ -273,8 +257,8 @@ function listTasks(
 		);
 		const avgDependenciesPerTask = totalDependencies / data.tasks.length;
 
-		// Find next task to work on, passing the complexity report
-		const nextItem = findNextTask(data.tasks, complexityReport);
+		// Find next task to work on
+		const nextItem = findNextTask(data.tasks);
 
 		// Get terminal width - more reliable method
 		let terminalWidth;
@@ -317,11 +301,8 @@ function listTasks(
 			`${chalk.blue('•')} ${chalk.white('Avg dependencies per task:')} ${avgDependenciesPerTask.toFixed(1)}\n\n` +
 			chalk.cyan.bold('Next Task to Work On:') +
 			'\n' +
-			`ID: ${chalk.cyan(nextItem ? nextItem.id : 'N/A')} - ${nextItem ? chalk.white.bold(truncate(nextItem.title, 40)) : chalk.yellow('No task available')}
-` +
-			`Priority: ${nextItem ? chalk.white(nextItem.priority || 'medium') : ''}  Dependencies: ${nextItem ? formatDependenciesWithStatus(nextItem.dependencies, data.tasks, true, complexityReport) : ''}
-` +
-			`Complexity: ${nextItem && nextItem.complexityScore ? getComplexityWithColor(nextItem.complexityScore) : chalk.gray('N/A')}`;
+			`ID: ${chalk.cyan(nextItem ? nextItem.id : 'N/A')} - ${nextItem ? chalk.white.bold(truncate(nextItem.title, 40)) : chalk.yellow('No task available')}\n` +
+			`Priority: ${nextItem ? chalk.white(nextItem.priority || 'medium') : ''}  Dependencies: ${nextItem ? formatDependenciesWithStatus(nextItem.dependencies, data.tasks, true) : ''}`;
 
 		// Calculate width for side-by-side display
 		// Box borders, padding take approximately 4 chars on each side
@@ -431,16 +412,9 @@ function listTasks(
 		// Make dependencies column smaller as requested (-20%)
 		const depsWidthPct = 20;
 
-		const complexityWidthPct = 10;
-
 		// Calculate title/description width as remaining space (+20% from dependencies reduction)
 		const titleWidthPct =
-			100 -
-			idWidthPct -
-			statusWidthPct -
-			priorityWidthPct -
-			depsWidthPct -
-			complexityWidthPct;
+			100 - idWidthPct - statusWidthPct - priorityWidthPct - depsWidthPct;
 
 		// Allow 10 characters for borders and padding
 		const availableWidth = terminalWidth - 10;
@@ -450,9 +424,6 @@ function listTasks(
 		const statusWidth = Math.floor(availableWidth * (statusWidthPct / 100));
 		const priorityWidth = Math.floor(availableWidth * (priorityWidthPct / 100));
 		const depsWidth = Math.floor(availableWidth * (depsWidthPct / 100));
-		const complexityWidth = Math.floor(
-			availableWidth * (complexityWidthPct / 100)
-		);
 		const titleWidth = Math.floor(availableWidth * (titleWidthPct / 100));
 
 		// Create a table with correct borders and spacing
@@ -462,17 +433,9 @@ function listTasks(
 				chalk.cyan.bold('Title'),
 				chalk.cyan.bold('Status'),
 				chalk.cyan.bold('Priority'),
-				chalk.cyan.bold('Dependencies'),
-				chalk.cyan.bold('Complexity')
-			],
-			colWidths: [
-				idWidth,
-				titleWidth,
-				statusWidth,
-				priorityWidth,
-				depsWidth,
-				complexityWidth // Added complexity column width
+				chalk.cyan.bold('Dependencies')
 			],
+			colWidths: [idWidth, titleWidth, statusWidth, priorityWidth, depsWidth],
 			style: {
 				head: [], // No special styling for header
 				border: [], // No special styling for border
@@ -491,8 +454,7 @@ function listTasks(
 				depText = formatDependenciesWithStatus(
 					task.dependencies,
 					data.tasks,
-					true,
-					complexityReport
+					true
 				);
 			} else {
 				depText = chalk.gray('None');
@@ -518,10 +480,7 @@ function listTasks(
 				truncate(cleanTitle, titleWidth - 3),
 				status,
 				priorityColor(truncate(task.priority || 'medium', priorityWidth - 2)),
-				depText,
-				task.complexityScore
-					? getComplexityWithColor(task.complexityScore)
-					: chalk.gray('N/A')
+				depText // No truncation for dependencies
 			]);
 
 			// Add subtasks if requested
@@ -557,8 +516,6 @@ function listTasks(
 								// Default to regular task dependency
 								const depTask = data.tasks.find((t) => t.id === depId);
 								if (depTask) {
-									// Add complexity to depTask before checking status
-									addComplexityToTask(depTask, complexityReport);
 									const isDone =
 										depTask.status === 'done' || depTask.status === 'completed';
 									const isInProgress = depTask.status === 'in-progress';
@@ -584,10 +541,7 @@ function listTasks(
 						chalk.dim(`└─ ${truncate(subtask.title, titleWidth - 5)}`),
 						getStatusWithColor(subtask.status, true),
 						chalk.dim('-'),
-						subtaskDepText,
-						subtask.complexityScore
-							? chalk.gray(`${subtask.complexityScore}`)
-							: chalk.gray('N/A')
+						subtaskDepText // No truncation for dependencies
 					]);
 				});
 			}
@@ -643,8 +597,6 @@ function listTasks(
 				subtasksSection = `\n\n${chalk.white.bold('Subtasks:')}\n`;
 				subtasksSection += parentTaskForSubtasks.subtasks
 					.map((subtask) => {
-						// Add complexity to subtask before display
-						addComplexityToTask(subtask, complexityReport);
 						// Using a more simplified format for subtask status display
 						const status = subtask.status || 'pending';
 						const statusColors = {
@@ -673,8 +625,8 @@ function listTasks(
 						'\n\n' +
 						// Use nextItem.priority, nextItem.status, nextItem.dependencies
 						`${chalk.white('Priority:')} ${priorityColors[nextItem.priority || 'medium'](nextItem.priority || 'medium')}   ${chalk.white('Status:')} ${getStatusWithColor(nextItem.status, true)}\n` +
-						`${chalk.white('Dependencies:')} ${nextItem.dependencies && nextItem.dependencies.length > 0 ? formatDependenciesWithStatus(nextItem.dependencies, data.tasks, true, complexityReport) : chalk.gray('None')}\n\n` +
-						// Use nextTask.description (Note: findNextTask doesn't return description, need to fetch original task/subtask for this)
+						`${chalk.white('Dependencies:')} ${nextItem.dependencies && nextItem.dependencies.length > 0 ? formatDependenciesWithStatus(nextItem.dependencies, data.tasks, true) : chalk.gray('None')}\n\n` +
+						// Use nextItem.description (Note: findNextTask doesn't return description, need to fetch original task/subtask for this)
 						// *** Fetching original item for description and details ***
 						`${chalk.white('Description:')} ${getWorkItemDescription(nextItem, data.tasks)}` +
 						subtasksSection + // <-- Subtasks are handled above now

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

@@ -17,7 +17,6 @@ import {
 import { generateObjectService } from '../ai-services-unified.js';
 import { getDebugFlag } from '../config-manager.js';
 import generateTaskFiles from './generate-task-files.js';
-import { displayAiUsageSummary } from '../ui.js';
 
 // Define the Zod schema for a SINGLE task object
 const prdSingleTaskSchema = z.object({
@@ -48,8 +47,8 @@ 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.force=false] - Whether to overwrite existing tasks.json.
- * @param {boolean} [options.append=false] - Append to existing tasks file.
+ * @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).
@@ -62,8 +61,8 @@ async function parsePRD(prdPath, tasksPath, numTasks, options = {}) {
 		mcpLog,
 		session,
 		projectRoot,
-		force = false,
-		append = false
+		useForce = false,
+		useAppend = false
 	} = options;
 	const isMCP = !!mcpLog;
 	const outputFormat = isMCP ? 'json' : 'text';
@@ -90,16 +89,17 @@ async function parsePRD(prdPath, tasksPath, numTasks, options = {}) {
 		}
 	};
 
-	report(`Parsing PRD file: ${prdPath}, Force: ${force}, Append: ${append}`);
+	report(
+		`Parsing PRD file: ${prdPath}, Force: ${useForce}, Append: ${useAppend}`
+	);
 
 	let existingTasks = [];
 	let nextId = 1;
-	let aiServiceResponse = null;
 
 	try {
 		// Handle file existence and overwrite/append logic
 		if (fs.existsSync(tasksPath)) {
-			if (append) {
+			if (useAppend) {
 				report(
 					`Append mode enabled. Reading existing tasks from ${tasksPath}`,
 					'info'
@@ -121,7 +121,7 @@ async function parsePRD(prdPath, tasksPath, numTasks, options = {}) {
 					);
 					existingTasks = []; // Reset if read fails
 				}
-			} else if (!force) {
+			} else if (!useForce) {
 				// Not appending and not forcing overwrite
 				const overwriteError = new Error(
 					`Output file ${tasksPath} already exists. Use --force to overwrite or --append.`
@@ -206,8 +206,8 @@ Guidelines:
 		// Call the unified AI service
 		report('Calling AI service to generate tasks from PRD...', 'info');
 
-		// Call generateObjectService with the CORRECT schema and additional telemetry params
-		aiServiceResponse = await generateObjectService({
+		// Call generateObjectService with the CORRECT schema
+		const generatedData = await generateObjectService({
 			role: 'main',
 			session: session,
 			projectRoot: projectRoot,
@@ -215,8 +215,7 @@ Guidelines:
 			objectName: 'tasks_data',
 			systemPrompt: systemPrompt,
 			prompt: userPrompt,
-			commandName: 'parse-prd',
-			outputType: isMCP ? 'mcp' : 'cli'
+			reportProgress
 		});
 
 		// Create the directory if it doesn't exist
@@ -224,32 +223,12 @@ Guidelines:
 		if (!fs.existsSync(tasksDir)) {
 			fs.mkdirSync(tasksDir, { recursive: true });
 		}
-		logFn.success('Successfully parsed PRD via AI service.\n');
+		logFn.success('Successfully parsed PRD via AI service.'); // Assumes generateObjectService validated
 
 		// Validate and Process Tasks
-		// const generatedData = aiServiceResponse?.mainResult?.object;
-
-		// Robustly get the actual AI-generated object
-		let generatedData = null;
-		if (aiServiceResponse?.mainResult) {
-			if (
-				typeof aiServiceResponse.mainResult === 'object' &&
-				aiServiceResponse.mainResult !== null &&
-				'tasks' in aiServiceResponse.mainResult
-			) {
-				// If mainResult itself is the object with a 'tasks' property
-				generatedData = aiServiceResponse.mainResult;
-			} else if (
-				typeof aiServiceResponse.mainResult.object === 'object' &&
-				aiServiceResponse.mainResult.object !== null &&
-				'tasks' in aiServiceResponse.mainResult.object
-			) {
-				// If mainResult.object is the object with a 'tasks' property
-				generatedData = aiServiceResponse.mainResult.object;
-			}
-		}
-
 		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)}`
 			);
@@ -286,27 +265,36 @@ Guidelines:
 				);
 		});
 
-		const finalTasks = append
+		const allTasks = useAppend
 			? [...existingTasks, ...processedNewTasks]
 			: processedNewTasks;
-		const outputData = { tasks: finalTasks };
 
-		// Write the final tasks to the file
-		writeJSON(tasksPath, outputData);
+		const finalTaskData = { tasks: allTasks }; // Use the combined list
+
+		// Write the tasks to the file
+		writeJSON(tasksPath, finalTaskData);
 		report(
-			`Successfully ${append ? 'appended' : 'generated'} ${processedNewTasks.length} tasks in ${tasksPath}`,
+			`Successfully wrote ${allTasks.length} total tasks to ${tasksPath} (${processedNewTasks.length} new).`,
 			'success'
 		);
+		report(`Tasks saved to: ${tasksPath}`, 'info');
 
-		// Generate markdown task files after writing tasks.json
-		await generateTaskFiles(tasksPath, path.dirname(tasksPath), { mcpLog });
+		// Generate individual task files
+		if (reportProgress && mcpLog) {
+			// Enable silent mode when being called from MCP server
+			enableSilentMode();
+			await generateTaskFiles(tasksPath, path.dirname(tasksPath));
+			disableSilentMode();
+		} else {
+			await generateTaskFiles(tasksPath, path.dirname(tasksPath));
+		}
 
-		// Handle CLI output (e.g., success message)
+		// Only show success boxes for text output (CLI)
 		if (outputFormat === 'text') {
 			console.log(
 				boxen(
 					chalk.green(
-						`Successfully generated ${processedNewTasks.length} new tasks. Total tasks in ${tasksPath}: ${finalTasks.length}`
+						`Successfully generated ${processedNewTasks.length} new tasks. Total tasks in ${tasksPath}: ${allTasks.length}`
 					),
 					{ padding: 1, borderColor: 'green', borderStyle: 'round' }
 				)
@@ -326,18 +314,9 @@ Guidelines:
 					}
 				)
 			);
-
-			if (aiServiceResponse && aiServiceResponse.telemetryData) {
-				displayAiUsageSummary(aiServiceResponse.telemetryData, 'cli');
-			}
 		}
 
-		// Return telemetry data
-		return {
-			success: true,
-			tasksPath,
-			telemetryData: aiServiceResponse?.telemetryData
-		};
+		return { success: true, tasks: processedNewTasks };
 	} catch (error) {
 		report(`Error parsing PRD: ${error.message}`, 'error');
 

scripts/modules/task-manager/set-task-status.js

@@ -8,10 +8,6 @@ import { validateTaskDependencies } from '../dependency-manager.js';
 import { getDebugFlag } from '../config-manager.js';
 import updateSingleTaskStatus from './update-single-task-status.js';
 import generateTaskFiles from './generate-task-files.js';
-import {
-	isValidTaskStatus,
-	TASK_STATUS_OPTIONS
-} from '../../../src/constants/task-status.js';
 
 /**
  * Set the status of a task
@@ -23,11 +19,6 @@ import {
  */
 async function setTaskStatus(tasksPath, taskIdInput, newStatus, options = {}) {
 	try {
-		if (!isValidTaskStatus(newStatus)) {
-			throw new Error(
-				`Error: Invalid status value: ${newStatus}. Use one of: ${TASK_STATUS_OPTIONS.join(', ')}`
-			);
-		}
 		// Determine if we're in MCP mode by checking for mcpLog
 		const isMcpMode = !!options?.mcpLog;
 

scripts/modules/task-manager/update-single-task-status.js

@@ -1,7 +1,6 @@
 import chalk from 'chalk';
 
 import { log } from '../utils.js';
-import { isValidTaskStatus } from '../../../src/constants/task-status.js';
 
 /**
  * Update the status of a single task
@@ -18,12 +17,6 @@ async function updateSingleTaskStatus(
 	data,
 	showUi = true
 ) {
-	if (!isValidTaskStatus(newStatus)) {
-		throw new Error(
-			`Error: Invalid status value: ${newStatus}. Use one of: ${TASK_STATUS_OPTIONS.join(', ')}`
-		);
-	}
-
 	// Check if it's a subtask (e.g., "1.2")
 	if (taskIdInput.includes('.')) {
 		const [parentId, subtaskId] = taskIdInput

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

@@ -3,12 +3,12 @@ import path from 'path';
 import chalk from 'chalk';
 import boxen from 'boxen';
 import Table from 'cli-table3';
+import { z } from 'zod';
 
 import {
 	getStatusWithColor,
 	startLoadingIndicator,
-	stopLoadingIndicator,
-	displayAiUsageSummary
+	stopLoadingIndicator
 } from '../ui.js';
 import {
 	log as consoleLog,
@@ -17,7 +17,10 @@ import {
 	truncate,
 	isSilentMode
 } from '../utils.js';
-import { generateTextService } from '../ai-services-unified.js';
+import {
+	generateObjectService,
+	generateTextService
+} from '../ai-services-unified.js';
 import { getDebugFlag } from '../config-manager.js';
 import generateTaskFiles from './generate-task-files.js';
 
@@ -61,6 +64,7 @@ async function updateSubtaskById(
 	try {
 		report('info', `Updating subtask ${subtaskId} with prompt: "${prompt}"`);
 
+		// Validate subtask ID format
 		if (
 			!subtaskId ||
 			typeof subtaskId !== 'string' ||
@@ -71,16 +75,19 @@ async function updateSubtaskById(
 			);
 		}
 
+		// Validate prompt
 		if (!prompt || typeof prompt !== 'string' || prompt.trim() === '') {
 			throw new Error(
 				'Prompt cannot be empty. Please provide context for the subtask update.'
 			);
 		}
 
+		// Validate tasks file exists
 		if (!fs.existsSync(tasksPath)) {
 			throw new Error(`Tasks file not found at path: ${tasksPath}`);
 		}
 
+		// Read the tasks file
 		const data = readJSON(tasksPath);
 		if (!data || !data.tasks) {
 			throw new Error(
@@ -88,6 +95,7 @@ async function updateSubtaskById(
 			);
 		}
 
+		// Parse parent and subtask IDs
 		const [parentIdStr, subtaskIdStr] = subtaskId.split('.');
 		const parentId = parseInt(parentIdStr, 10);
 		const subtaskIdNum = parseInt(subtaskIdStr, 10);
@@ -103,6 +111,7 @@ async function updateSubtaskById(
 			);
 		}
 
+		// Find the parent task
 		const parentTask = data.tasks.find((task) => task.id === parentId);
 		if (!parentTask) {
 			throw new Error(
@@ -110,6 +119,7 @@ async function updateSubtaskById(
 			);
 		}
 
+		// Find the subtask
 		if (!parentTask.subtasks || !Array.isArray(parentTask.subtasks)) {
 			throw new Error(`Parent task ${parentId} has no subtasks.`);
 		}
@@ -125,7 +135,20 @@ 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()
+		});
+
+		// Only show UI elements for text output (CLI)
 		if (outputFormat === 'text') {
+			// Show the subtask that will be updated
 			const table = new Table({
 				head: [
 					chalk.cyan.bold('ID'),
@@ -134,11 +157,13 @@ async function updateSubtaskById(
 				],
 				colWidths: [10, 55, 10]
 			});
+
 			table.push([
 				subtaskId,
 				truncate(subtask.title, 52),
 				getStatusWithColor(subtask.status)
 			]);
+
 			console.log(
 				boxen(chalk.white.bold(`Updating Subtask #${subtaskId}`), {
 					padding: 1,
@@ -147,7 +172,10 @@ async function updateSubtaskById(
 					margin: { top: 1, bottom: 0 }
 				})
 			);
+
 			console.log(table.toString());
+
+			// Start the loading indicator - only for text output
 			loadingIndicator = startLoadingIndicator(
 				useResearch
 					? 'Updating subtask with research...'
@@ -155,15 +183,15 @@ async function updateSubtaskById(
 			);
 		}
 
-		let generatedContentString = '';
-		let newlyAddedSnippet = '';
-		let aiServiceResponse = null;
-
+		let parsedAIResponse;
 		try {
+			// --- GET PARENT & SIBLING CONTEXT ---
 			const parentContext = {
 				id: parentTask.id,
 				title: parentTask.title
+				// Avoid sending full parent description/details unless necessary
 			};
+
 			const prevSubtask =
 				subtaskIndex > 0
 					? {
@@ -172,6 +200,7 @@ async function updateSubtaskById(
 							status: parentTask.subtasks[subtaskIndex - 1].status
 						}
 					: null;
+
 			const nextSubtask =
 				subtaskIndex < parentTask.subtasks.length - 1
 					? {
@@ -185,123 +214,154 @@ async function updateSubtaskById(
 Parent Task: ${JSON.stringify(parentContext)}
 ${prevSubtask ? `Previous Subtask: ${JSON.stringify(prevSubtask)}` : ''}
 ${nextSubtask ? `Next Subtask: ${JSON.stringify(nextSubtask)}` : ''}
-Current Subtask Details (for context only):\n${subtask.details || '(No existing details)'}
 `;
 
-			const systemPrompt = `You are an AI assistant helping to update a subtask. You will be provided with the subtask's existing details, context about its parent and sibling tasks, and a user request string.
+			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.
 
-Your Goal: Based *only* on the user's request and all the provided context (including existing details if relevant to the request), GENERATE the new text content that should be added to the subtask's details.
-Focus *only* on generating the substance of the update.
+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.
 
-Output Requirements:
-1. Return *only* the newly generated text content as a plain string. Do NOT return a JSON object or any other structured data.
-2. Your string response should NOT include any of the subtask's original details, unless the user's request explicitly asks to rephrase, summarize, or directly modify existing text.
-3. Do NOT include any timestamps, XML-like tags, markdown, or any other special formatting in your string response.
-4. Ensure the generated text is concise yet complete for the update based on the user request. Avoid conversational fillers or explanations about what you are doing (e.g., do not start with "Okay, here's the update...").`;
+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.`;
 
-			// Pass the existing subtask.details in the user prompt for the AI's context.
-			const userPrompt = `Task Context:\n${contextString}\n\nUser Request: "${prompt}"\n\nBased on the User Request and all the Task Context (including current subtask details provided above), what is the new information or text that should be appended to this subtask's details? Return ONLY this new text as a plain string.`;
+			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 text service with role: ${role}`);
+			report('info', `Using AI object service with role: ${role}`);
 
-			aiServiceResponse = await generateTextService({
+			parsedAIResponse = await generateObjectService({
 				prompt: userPrompt,
 				systemPrompt: systemPrompt,
+				schema: subtaskSchema,
+				objectName: 'updatedSubtask',
 				role,
 				session,
 				projectRoot,
-				maxRetries: 2,
-				commandName: 'update-subtask',
-				outputType: isMCP ? 'mcp' : 'cli'
+				maxRetries: 2
 			});
-
-			if (
-				aiServiceResponse &&
-				aiServiceResponse.mainResult &&
-				typeof aiServiceResponse.mainResult === 'string'
-			) {
-				generatedContentString = aiServiceResponse.mainResult;
-			} else {
-				generatedContentString = '';
-				report(
-					'warn',
-					'AI service response did not contain expected text string.'
-				);
-			}
+			report(
+				'success',
+				'Successfully received object response from AI service'
+			);
 
 			if (outputFormat === 'text' && loadingIndicator) {
 				stopLoadingIndicator(loadingIndicator);
 				loadingIndicator = null;
 			}
+
+			if (!parsedAIResponse || typeof parsedAIResponse !== 'object') {
+				throw new Error('AI did not return a valid object.');
+			}
+
+			report(
+				'success',
+				`Successfully generated object using AI role: ${role}.`
+			);
 		} catch (aiError) {
 			report('error', `AI service call failed: ${aiError.message}`);
 			if (outputFormat === 'text' && loadingIndicator) {
-				stopLoadingIndicator(loadingIndicator);
+				stopLoadingIndicator(loadingIndicator); // Ensure stop on error
 				loadingIndicator = null;
 			}
 			throw aiError;
 		}
 
-		if (generatedContentString && generatedContentString.trim()) {
-			// Check if the string is not empty
-			const timestamp = new Date().toISOString();
-			const formattedBlock = `<info added on ${timestamp}>\n${generatedContentString.trim()}\n</info added on ${timestamp}>`;
-			newlyAddedSnippet = formattedBlock; // <--- ADD THIS LINE: Store for display
+		// --- 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
 
+		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;
+				(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 was empty or whitespace after trimming. Original details remain unchanged.'
+				'AI response object did not contain generated content in the "details" field. Original details remain unchanged.'
 			);
-			newlyAddedSnippet = 'No new details were added by the AI.';
 		}
+		// --- END TIMESTAMP & FORMATTING LOGIC ---
 
-		const updatedSubtask = parentTask.subtasks[subtaskIndex];
+		// 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 ---
+
+		// Only show debug info for text output (CLI)
 		if (outputFormat === 'text' && getDebugFlag(session)) {
 			console.log(
 				'>>> DEBUG: Subtask details AFTER AI update:',
-				updatedSubtask.details
+				updatedSubtask.details // Use updatedSubtask
 			);
 		}
 
+		// Description update logic (keeping as is for now)
 		if (updatedSubtask.description) {
+			// Use updatedSubtask
 			if (prompt.length < 100) {
 				if (outputFormat === 'text' && getDebugFlag(session)) {
 					console.log(
 						'>>> DEBUG: Subtask description BEFORE append:',
-						updatedSubtask.description
+						updatedSubtask.description // Use updatedSubtask
 					);
 				}
-				updatedSubtask.description += ` [Updated: ${new Date().toLocaleDateString()}]`;
+				updatedSubtask.description += ` [Updated: ${new Date().toLocaleDateString()}]`; // Use updatedSubtask
 				if (outputFormat === 'text' && getDebugFlag(session)) {
 					console.log(
 						'>>> DEBUG: Subtask description AFTER append:',
-						updatedSubtask.description
+						updatedSubtask.description // Use updatedSubtask
 					);
 				}
 			}
 		}
 
+		// Only show debug info for text output (CLI)
 		if (outputFormat === 'text' && getDebugFlag(session)) {
 			console.log('>>> DEBUG: About to call writeJSON with updated data...');
 		}
+
+		// Write the updated tasks to the file (parentTask already contains the updated subtask)
 		writeJSON(tasksPath, data);
+
+		// Only show debug info for text output (CLI)
 		if (outputFormat === 'text' && getDebugFlag(session)) {
 			console.log('>>> DEBUG: writeJSON call completed.');
 		}
 
 		report('success', `Successfully updated subtask ${subtaskId}`);
+
+		// Generate individual task files
 		await generateTaskFiles(tasksPath, path.dirname(tasksPath));
 
+		// Stop indicator before final console output - only for text output (CLI)
 		if (outputFormat === 'text') {
 			if (loadingIndicator) {
 				stopLoadingIndicator(loadingIndicator);
 				loadingIndicator = null;
 			}
+
 			console.log(
 				boxen(
 					chalk.green(`Successfully updated subtask #${subtaskId}`) +
@@ -310,30 +370,31 @@ Output Requirements:
 						' ' +
 						updatedSubtask.title +
 						'\n\n' +
-						chalk.white.bold('Newly Added Snippet:') +
+						// Update the display to show the new details field
+						chalk.white.bold('Updated Details:') +
 						'\n' +
-						chalk.white(newlyAddedSnippet),
+						chalk.white(truncate(updatedSubtask.details || '', 500, true)), // Use updatedSubtask
 					{ padding: 1, borderColor: 'green', borderStyle: 'round' }
 				)
 			);
 		}
 
-		if (outputFormat === 'text' && aiServiceResponse.telemetryData) {
-			displayAiUsageSummary(aiServiceResponse.telemetryData, 'cli');
-		}
-
-		return {
-			updatedSubtask: updatedSubtask,
-			telemetryData: aiServiceResponse.telemetryData
-		};
+		return updatedSubtask; // Return the modified subtask object
 	} catch (error) {
+		// Outer catch block handles final errors after loop/attempts
+		// Stop indicator on error - only for text output (CLI)
 		if (outputFormat === 'text' && loadingIndicator) {
 			stopLoadingIndicator(loadingIndicator);
 			loadingIndicator = null;
 		}
+
 		report('error', `Error updating subtask: ${error.message}`);
+
+		// Only show error UI for text output (CLI)
 		if (outputFormat === 'text') {
 			console.error(chalk.red(`Error: ${error.message}`));
+
+			// Provide helpful error messages based on error type
 			if (error.message?.includes('ANTHROPIC_API_KEY')) {
 				console.log(
 					chalk.yellow('\nTo fix this issue, set your Anthropic API key:')
@@ -348,6 +409,7 @@ Output Requirements:
 					'  2. Or run without the research flag: task-master update-subtask --id=<id> --prompt="..."'
 				);
 			} else if (error.message?.includes('overloaded')) {
+				// Catch final overload error
 				console.log(
 					chalk.yellow(
 						'\nAI model overloaded, and fallback failed or was unavailable:'
@@ -355,6 +417,7 @@ Output Requirements:
 				);
 				console.log('  1. Try again in a few minutes.');
 				console.log('  2. Ensure PERPLEXITY_API_KEY is set for fallback.');
+				console.log('  3. Consider breaking your prompt into smaller updates.');
 			} else if (error.message?.includes('not found')) {
 				console.log(chalk.yellow('\nTo fix this issue:'));
 				console.log(
@@ -363,22 +426,22 @@ Output Requirements:
 				console.log(
 					'  2. Use a valid subtask ID with the --id parameter in format "parentId.subtaskId"'
 				);
-			} else if (
-				error.message?.includes('empty stream response') ||
-				error.message?.includes('AI did not return a valid text string')
-			) {
+			} else if (error.message?.includes('empty stream response')) {
 				console.log(
 					chalk.yellow(
-						'\nThe AI model returned an empty or invalid response. This might be due to the prompt or API issues. Try rephrasing or trying again later.'
+						'\nThe AI model returned an empty response. This might be due to the prompt or API issues. Try rephrasing or trying again later.'
 					)
 				);
 			}
+
 			if (getDebugFlag(session)) {
+				// Use getter
 				console.error(error);
 			}
 		} else {
-			throw error;
+			throw error; // Re-throw for JSON output
 		}
+
 		return null;
 	}
 }

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

@@ -16,8 +16,7 @@ import {
 import {
 	getStatusWithColor,
 	startLoadingIndicator,
-	stopLoadingIndicator,
-	displayAiUsageSummary
+	stopLoadingIndicator
 } from '../ui.js';
 
 import { generateTextService } from '../ai-services-unified.js';
@@ -95,6 +94,10 @@ function parseUpdatedTaskFromText(text, expectedTaskId, logFn, isMCP) {
 			// 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',
@@ -373,125 +376,29 @@ The changes described in the prompt should be thoughtfully applied to make the t
 		const userPrompt = `Here is the task to update:\n${taskDataString}\n\nPlease update this task based on the following new context:\n${prompt}\n\nIMPORTANT: In the task JSON above, any subtasks with "status": "done" or "status": "completed" should be preserved exactly as is. Build your changes around these completed items.\n\nReturn only the updated task as a valid JSON object.`;
 		// --- End Build Prompts ---
 
+		let updatedTask;
 		let loadingIndicator = null;
-		let aiServiceResponse = null;
-
-		if (!isMCP && outputFormat === 'text') {
+		if (outputFormat === 'text') {
 			loadingIndicator = startLoadingIndicator(
 				useResearch ? 'Updating task with research...\n' : 'Updating task...\n'
 			);
 		}
 
+		let responseText = '';
 		try {
-			const serviceRole = useResearch ? 'research' : 'main';
-			aiServiceResponse = await generateTextService({
-				role: serviceRole,
-				session: session,
-				projectRoot: projectRoot,
-				systemPrompt: systemPrompt,
+			// --- Call Unified AI Service (generateTextService) ---
+			const role = useResearch ? 'research' : 'main';
+			report('info', `Using AI service with role: ${role}`);
+
+			responseText = await generateTextService({
 				prompt: userPrompt,
-				commandName: 'update-task',
-				outputType: isMCP ? 'mcp' : 'cli'
+				systemPrompt: systemPrompt,
+				role,
+				session,
+				projectRoot
 			});
-
-			if (loadingIndicator)
-				stopLoadingIndicator(loadingIndicator, 'AI update complete.');
-
-			// Use mainResult (text) for parsing
-			const updatedTask = parseUpdatedTaskFromText(
-				aiServiceResponse.mainResult,
-				taskId,
-				logFn,
-				isMCP
-			);
-
-			// --- Task Validation/Correction (Keep existing logic) ---
-			if (!updatedTask || typeof updatedTask !== 'object')
-				throw new Error('Received invalid task object from AI.');
-			if (!updatedTask.title || !updatedTask.description)
-				throw new Error('Updated task missing required fields.');
-			// Preserve ID if AI changed it
-			if (updatedTask.id !== taskId) {
-				report('warn', `AI changed task ID. Restoring original ID ${taskId}.`);
-				updatedTask.id = taskId;
-			}
-			// Preserve status if AI changed it
-			if (
-				updatedTask.status !== taskToUpdate.status &&
-				!prompt.toLowerCase().includes('status')
-			) {
-				report(
-					'warn',
-					`AI changed task status. Restoring original status '${taskToUpdate.status}'.`
-				);
-				updatedTask.status = taskToUpdate.status;
-			}
-			// Preserve completed subtasks (Keep existing logic)
-			if (taskToUpdate.subtasks?.length > 0) {
-				if (!updatedTask.subtasks) {
-					report(
-						'warn',
-						'Subtasks removed by AI. Restoring original subtasks.'
-					);
-					updatedTask.subtasks = taskToUpdate.subtasks;
-				} else {
-					const completedOriginal = taskToUpdate.subtasks.filter(
-						(st) => st.status === 'done' || st.status === 'completed'
-					);
-					completedOriginal.forEach((compSub) => {
-						const updatedSub = updatedTask.subtasks.find(
-							(st) => st.id === compSub.id
-						);
-						if (
-							!updatedSub ||
-							JSON.stringify(updatedSub) !== JSON.stringify(compSub)
-						) {
-							report(
-								'warn',
-								`Completed subtask ${compSub.id} was modified or removed. Restoring.`
-							);
-							// Remove potentially modified version
-							updatedTask.subtasks = updatedTask.subtasks.filter(
-								(st) => st.id !== compSub.id
-							);
-							// Add back original
-							updatedTask.subtasks.push(compSub);
-						}
-					});
-					// Deduplicate just in case
-					const subtaskIds = new Set();
-					updatedTask.subtasks = updatedTask.subtasks.filter((st) => {
-						if (!subtaskIds.has(st.id)) {
-							subtaskIds.add(st.id);
-							return true;
-						}
-						report('warn', `Duplicate subtask ID ${st.id} removed.`);
-						return false;
-					});
-				}
-			}
-			// --- End Task Validation/Correction ---
-
-			// --- Update Task Data (Keep existing) ---
-			data.tasks[taskIndex] = updatedTask;
-			// --- End Update Task Data ---
-
-			// --- Write File and Generate (Unchanged) ---
-			writeJSON(tasksPath, data);
-			report('success', `Successfully updated task ${taskId}`);
-			await generateTaskFiles(tasksPath, path.dirname(tasksPath));
-			// --- End Write File ---
-
-			// --- Display CLI Telemetry ---
-			if (outputFormat === 'text' && aiServiceResponse.telemetryData) {
-				displayAiUsageSummary(aiServiceResponse.telemetryData, 'cli'); // <<< ADD display
-			}
-
-			// --- Return Success with Telemetry ---
-			return {
-				updatedTask: updatedTask, // Return the updated task object
-				telemetryData: aiServiceResponse.telemetryData // <<< ADD telemetryData
-			};
+			report('success', 'Successfully received text response from AI service');
+			// --- End AI Service Call ---
 		} catch (error) {
 			// Catch errors from generateTextService
 			if (loadingIndicator) stopLoadingIndicator(loadingIndicator);
@@ -500,7 +407,114 @@ The changes described in the prompt should be thoughtfully applied to make the t
 				report('error', 'Please ensure API keys are configured correctly.');
 			}
 			throw error; // Re-throw error
+		} finally {
+			if (loadingIndicator) stopLoadingIndicator(loadingIndicator);
 		}
+
+		// --- Parse and Validate Response ---
+		try {
+			// Pass logFn and isMCP flag to the parser
+			updatedTask = parseUpdatedTaskFromText(
+				responseText,
+				taskId,
+				logFn,
+				isMCP
+			);
+		} catch (parseError) {
+			report(
+				'error',
+				`Failed to parse updated task from AI response: ${parseError.message}`
+			);
+			if (getDebugFlag(session)) {
+				report('error', `Raw AI Response:\n${responseText}`);
+			}
+			throw new Error(
+				`Failed to parse valid updated task from AI response: ${parseError.message}`
+			);
+		}
+		// --- End Parse/Validate ---
+
+		// --- Task Validation/Correction (Keep existing logic) ---
+		if (!updatedTask || typeof updatedTask !== 'object')
+			throw new Error('Received invalid task object from AI.');
+		if (!updatedTask.title || !updatedTask.description)
+			throw new Error('Updated task missing required fields.');
+		// Preserve ID if AI changed it
+		if (updatedTask.id !== taskId) {
+			report('warn', `AI changed task ID. Restoring original ID ${taskId}.`);
+			updatedTask.id = taskId;
+		}
+		// Preserve status if AI changed it
+		if (
+			updatedTask.status !== taskToUpdate.status &&
+			!prompt.toLowerCase().includes('status')
+		) {
+			report(
+				'warn',
+				`AI changed task status. Restoring original status '${taskToUpdate.status}'.`
+			);
+			updatedTask.status = taskToUpdate.status;
+		}
+		// Preserve completed subtasks (Keep existing logic)
+		if (taskToUpdate.subtasks?.length > 0) {
+			if (!updatedTask.subtasks) {
+				report('warn', 'Subtasks removed by AI. Restoring original subtasks.');
+				updatedTask.subtasks = taskToUpdate.subtasks;
+			} else {
+				const completedOriginal = taskToUpdate.subtasks.filter(
+					(st) => st.status === 'done' || st.status === 'completed'
+				);
+				completedOriginal.forEach((compSub) => {
+					const updatedSub = updatedTask.subtasks.find(
+						(st) => st.id === compSub.id
+					);
+					if (
+						!updatedSub ||
+						JSON.stringify(updatedSub) !== JSON.stringify(compSub)
+					) {
+						report(
+							'warn',
+							`Completed subtask ${compSub.id} was modified or removed. Restoring.`
+						);
+						// Remove potentially modified version
+						updatedTask.subtasks = updatedTask.subtasks.filter(
+							(st) => st.id !== compSub.id
+						);
+						// Add back original
+						updatedTask.subtasks.push(compSub);
+					}
+				});
+				// Deduplicate just in case
+				const subtaskIds = new Set();
+				updatedTask.subtasks = updatedTask.subtasks.filter((st) => {
+					if (!subtaskIds.has(st.id)) {
+						subtaskIds.add(st.id);
+						return true;
+					}
+					report('warn', `Duplicate subtask ID ${st.id} removed.`);
+					return false;
+				});
+			}
+		}
+		// --- End Task Validation/Correction ---
+
+		// --- Update Task Data (Keep existing) ---
+		data.tasks[taskIndex] = updatedTask;
+		// --- End Update Task Data ---
+
+		// --- Write File and Generate (Keep existing) ---
+		writeJSON(tasksPath, data);
+		report('success', `Successfully updated task ${taskId}`);
+		await generateTaskFiles(tasksPath, path.dirname(tasksPath));
+		// --- End Write File ---
+
+		// --- Final CLI Output (Keep existing) ---
+		if (outputFormat === 'text') {
+			/* ... success boxen ... */
+		}
+		// --- End Final CLI Output ---
+
+		return updatedTask; // Return the updated task
 	} catch (error) {
 		// General error catch
 		// --- General Error Handling (Keep existing) ---

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

@@ -15,8 +15,7 @@ import {
 import {
 	getStatusWithColor,
 	startLoadingIndicator,
-	stopLoadingIndicator,
-	displayAiUsageSummary
+	stopLoadingIndicator
 } from '../ui.js';
 
 import { getDebugFlag } from '../config-manager.js';
@@ -94,6 +93,10 @@ function parseUpdatedTasksFromText(text, expectedCount, logFn, isMCP) {
 			// It worked! Use this as the primary cleaned response.
 			cleanedResponse = potentialJsonFromArray;
 			parseMethodUsed = 'brackets';
+			report(
+				'info',
+				'Successfully parsed JSON content extracted between first [ and last ].'
+			);
 		} catch (e) {
 			report(
 				'info',
@@ -347,100 +350,31 @@ The changes described in the prompt should be applied to ALL tasks in the list.`
 		const userPrompt = `Here are the tasks to update:\n${taskDataString}\n\nPlease update these tasks based on the following new context:\n${prompt}\n\nIMPORTANT: In the tasks JSON above, any subtasks with "status": "done" or "status": "completed" should be preserved exactly as is. Build your changes around these completed items.\n\nReturn only the updated tasks as a valid JSON array.`;
 		// --- End Build Prompts ---
 
-		// --- AI Call ---
 		let loadingIndicator = null;
-		let aiServiceResponse = null;
-
-		if (!isMCP && outputFormat === 'text') {
-			loadingIndicator = startLoadingIndicator('Updating tasks with AI...\n');
+		if (outputFormat === 'text') {
+			loadingIndicator = startLoadingIndicator('Updating tasks...\n');
 		}
 
+		let responseText = '';
+		let updatedTasks;
+
 		try {
-			// Determine role based on research flag
-			const serviceRole = useResearch ? 'research' : 'main';
+			// --- Call Unified AI Service ---
+			const role = useResearch ? 'research' : 'main';
+			if (isMCP) logFn.info(`Using AI service with role: ${role}`);
+			else logFn('info', `Using AI service with role: ${role}`);
 
-			// Call the unified AI service
-			aiServiceResponse = await generateTextService({
-				role: serviceRole,
-				session: session,
-				projectRoot: projectRoot,
-				systemPrompt: systemPrompt,
+			responseText = await generateTextService({
 				prompt: userPrompt,
-				commandName: 'update-tasks',
-				outputType: isMCP ? 'mcp' : 'cli'
+				systemPrompt: systemPrompt,
+				role,
+				session,
+				projectRoot
 			});
-
-			if (loadingIndicator)
-				stopLoadingIndicator(loadingIndicator, 'AI update complete.');
-
-			// Use the mainResult (text) for parsing
-			const parsedUpdatedTasks = parseUpdatedTasksFromText(
-				aiServiceResponse.mainResult,
-				tasksToUpdate.length,
-				logFn,
-				isMCP
-			);
-
-			// --- Update Tasks Data (Unchanged) ---
-			if (!Array.isArray(parsedUpdatedTasks)) {
-				// Should be caught by parser, but extra check
-				throw new Error(
-					'Parsed AI response for updated tasks was not an array.'
-				);
-			}
-			if (isMCP)
-				logFn.info(
-					`Received ${parsedUpdatedTasks.length} updated tasks from AI.`
-				);
+			if (isMCP) logFn.info('Successfully received text response');
 			else
-				logFn(
-					'info',
-					`Received ${parsedUpdatedTasks.length} updated tasks from AI.`
-				);
-			// Create a map for efficient lookup
-			const updatedTasksMap = new Map(
-				parsedUpdatedTasks.map((task) => [task.id, task])
-			);
-
-			let actualUpdateCount = 0;
-			data.tasks.forEach((task, index) => {
-				if (updatedTasksMap.has(task.id)) {
-					// Only update if the task was part of the set sent to AI
-					data.tasks[index] = updatedTasksMap.get(task.id);
-					actualUpdateCount++;
-				}
-			});
-			if (isMCP)
-				logFn.info(
-					`Applied updates to ${actualUpdateCount} tasks in the dataset.`
-				);
-			else
-				logFn(
-					'info',
-					`Applied updates to ${actualUpdateCount} tasks in the dataset.`
-				);
-
-			writeJSON(tasksPath, data);
-			if (isMCP)
-				logFn.info(
-					`Successfully updated ${actualUpdateCount} tasks in ${tasksPath}`
-				);
-			else
-				logFn(
-					'success',
-					`Successfully updated ${actualUpdateCount} tasks in ${tasksPath}`
-				);
-			await generateTaskFiles(tasksPath, path.dirname(tasksPath));
-
-			if (outputFormat === 'text' && aiServiceResponse.telemetryData) {
-				displayAiUsageSummary(aiServiceResponse.telemetryData, 'cli');
-			}
-
-			return {
-				success: true,
-				updatedTasks: parsedUpdatedTasks,
-				telemetryData: aiServiceResponse.telemetryData
-			};
+				logFn('success', 'Successfully received text response via AI service');
+			// --- End AI Service Call ---
 		} catch (error) {
 			if (loadingIndicator) stopLoadingIndicator(loadingIndicator);
 			if (isMCP) logFn.error(`Error during AI service call: ${error.message}`);
@@ -456,10 +390,98 @@ The changes described in the prompt should be applied to ALL tasks in the list.`
 						'Please ensure API keys are configured correctly in .env or mcp.json.'
 					);
 			}
-			throw error;
+			throw error; // Re-throw error
 		} finally {
 			if (loadingIndicator) stopLoadingIndicator(loadingIndicator);
 		}
+
+		// --- Parse and Validate Response ---
+		try {
+			updatedTasks = parseUpdatedTasksFromText(
+				responseText,
+				tasksToUpdate.length,
+				logFn,
+				isMCP
+			);
+		} catch (parseError) {
+			if (isMCP)
+				logFn.error(
+					`Failed to parse updated tasks from AI response: ${parseError.message}`
+				);
+			else
+				logFn(
+					'error',
+					`Failed to parse updated tasks from AI response: ${parseError.message}`
+				);
+			if (getDebugFlag(session)) {
+				if (isMCP) logFn.error(`Raw AI Response:\n${responseText}`);
+				else logFn('error', `Raw AI Response:\n${responseText}`);
+			}
+			throw new Error(
+				`Failed to parse valid updated tasks from AI response: ${parseError.message}`
+			);
+		}
+		// --- End Parse/Validate ---
+
+		// --- Update Tasks Data (Unchanged) ---
+		if (!Array.isArray(updatedTasks)) {
+			// Should be caught by parser, but extra check
+			throw new Error('Parsed AI response for updated tasks was not an array.');
+		}
+		if (isMCP)
+			logFn.info(`Received ${updatedTasks.length} updated tasks from AI.`);
+		else
+			logFn('info', `Received ${updatedTasks.length} updated tasks from AI.`);
+		// Create a map for efficient lookup
+		const updatedTasksMap = new Map(
+			updatedTasks.map((task) => [task.id, task])
+		);
+
+		// Iterate through the original data and update based on the map
+		let actualUpdateCount = 0;
+		data.tasks.forEach((task, index) => {
+			if (updatedTasksMap.has(task.id)) {
+				// Only update if the task was part of the set sent to AI
+				data.tasks[index] = updatedTasksMap.get(task.id);
+				actualUpdateCount++;
+			}
+		});
+		if (isMCP)
+			logFn.info(
+				`Applied updates to ${actualUpdateCount} tasks in the dataset.`
+			);
+		else
+			logFn(
+				'info',
+				`Applied updates to ${actualUpdateCount} tasks in the dataset.`
+			);
+		// --- End Update Tasks Data ---
+
+		// --- Write File and Generate (Unchanged) ---
+		writeJSON(tasksPath, data);
+		if (isMCP)
+			logFn.info(
+				`Successfully updated ${actualUpdateCount} tasks in ${tasksPath}`
+			);
+		else
+			logFn(
+				'success',
+				`Successfully updated ${actualUpdateCount} tasks in ${tasksPath}`
+			);
+		await generateTaskFiles(tasksPath, path.dirname(tasksPath));
+		// --- End Write File ---
+
+		// --- Final CLI Output (Unchanged) ---
+		if (outputFormat === 'text') {
+			console.log(
+				boxen(chalk.green(`Successfully updated ${actualUpdateCount} tasks`), {
+					padding: 1,
+					borderColor: 'green',
+					borderStyle: 'round'
+				})
+			);
+		}
+		// --- End Final CLI Output ---
 	} catch (error) {
 		// --- General Error Handling (Unchanged) ---
 		if (isMCP) logFn.error(`Error updating tasks: ${error.message}`);

scripts/modules/ui.js

@@ -16,15 +16,10 @@ import {
 	truncate,
 	isSilentMode
 } from './utils.js';
+import path from 'path';
 import fs from 'fs';
-import {
-	findNextTask,
-	analyzeTaskComplexity,
-	readComplexityReport
-} from './task-manager.js';
+import { findNextTask, analyzeTaskComplexity } from './task-manager.js';
 import { getProjectName, getDefaultSubtasks } from './config-manager.js';
-import { TASK_STATUS_OPTIONS } from '../../src/constants/task-status.js';
-import { getTaskMasterVersion } from '../../src/utils/getVersion.js';
 
 // Create a color gradient for the banner
 const coolGradient = gradient(['#00b4d8', '#0077b6', '#03045e']);
@@ -51,7 +46,17 @@ function displayBanner() {
 	);
 
 	// Read version directly from package.json
-	const version = getTaskMasterVersion();
+	let version = 'unknown'; // Initialize with a default
+	try {
+		const packageJsonPath = path.join(process.cwd(), 'package.json');
+		if (fs.existsSync(packageJsonPath)) {
+			const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+			version = packageJson.version;
+		}
+	} catch (error) {
+		// Silently fall back to default version
+		log('warn', 'Could not read package.json for version info.');
+	}
 
 	console.log(
 		boxen(
@@ -268,14 +273,12 @@ function getStatusWithColor(status, forTable = false) {
  * @param {Array} dependencies - Array of dependency IDs
  * @param {Array} allTasks - Array of all tasks
  * @param {boolean} forConsole - Whether the output is for console display
- * @param {Object|null} complexityReport - Optional pre-loaded complexity report
  * @returns {string} Formatted dependencies string
  */
 function formatDependenciesWithStatus(
 	dependencies,
 	allTasks,
-	forConsole = false,
-	complexityReport = null // Add complexityReport parameter
+	forConsole = false
 ) {
 	if (
 		!dependencies ||
@@ -339,11 +342,7 @@ function formatDependenciesWithStatus(
 			typeof depId === 'string' ? parseInt(depId, 10) : depId;
 
 		// Look up the task using the numeric ID
-		const depTaskResult = findTaskById(
-			allTasks,
-			numericDepId,
-			complexityReport
-		);
+		const depTaskResult = findTaskById(allTasks, numericDepId);
 		const depTask = depTaskResult.task; // Access the task object from the result
 
 		if (!depTask) {
@@ -459,7 +458,7 @@ function displayHelp() {
 				{
 					name: 'set-status',
 					args: '--id=<id> --status=<status>',
-					desc: `Update task status (${TASK_STATUS_OPTIONS.join(', ')})`
+					desc: 'Update task status (done, pending, etc.)'
 				},
 				{
 					name: 'update',
@@ -762,7 +761,7 @@ function truncateString(str, maxLength) {
  * Display the next task to work on
  * @param {string} tasksPath - Path to the tasks.json file
  */
-async function displayNextTask(tasksPath, complexityReportPath = null) {
+async function displayNextTask(tasksPath) {
 	displayBanner();
 
 	// Read the tasks file
@@ -772,11 +771,8 @@ async function displayNextTask(tasksPath, complexityReportPath = null) {
 		process.exit(1);
 	}
 
-	// Read complexity report once
-	const complexityReport = readComplexityReport(complexityReportPath);
-
 	// Find the next task
-	const nextTask = findNextTask(data.tasks, complexityReport);
+	const nextTask = findNextTask(data.tasks);
 
 	if (!nextTask) {
 		console.log(
@@ -813,7 +809,12 @@ async function displayNextTask(tasksPath, complexityReportPath = null) {
 			'padding-bottom': 0,
 			compact: true
 		},
-		chars: { mid: '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' },
+		chars: {
+			mid: '',
+			'left-mid': '',
+			'mid-mid': '',
+			'right-mid': ''
+		},
 		colWidths: [15, Math.min(75, process.stdout.columns - 20 || 60)],
 		wordWrap: true
 	});
@@ -837,18 +838,7 @@ async function displayNextTask(tasksPath, complexityReportPath = null) {
 		],
 		[
 			chalk.cyan.bold('Dependencies:'),
-			formatDependenciesWithStatus(
-				nextTask.dependencies,
-				data.tasks,
-				true,
-				complexityReport
-			)
-		],
-		[
-			chalk.cyan.bold('Complexity:'),
-			nextTask.complexityScore
-				? getComplexityWithColor(nextTask.complexityScore)
-				: chalk.gray('N/A')
+			formatDependenciesWithStatus(nextTask.dependencies, data.tasks, true)
 		],
 		[chalk.cyan.bold('Description:'), nextTask.description]
 	);
@@ -870,11 +860,8 @@ async function displayNextTask(tasksPath, complexityReportPath = null) {
 		);
 	}
 
-	// Determine if the nextTask is a subtask
-	const isSubtask = !!nextTask.parentId;
-
-	// Show subtasks if they exist (only for parent tasks)
-	if (!isSubtask && nextTask.subtasks && nextTask.subtasks.length > 0) {
+	// Show subtasks if they exist
+	if (nextTask.subtasks && nextTask.subtasks.length > 0) {
 		console.log(
 			boxen(chalk.white.bold('Subtasks'), {
 				padding: { top: 0, bottom: 0, left: 1, right: 1 },
@@ -915,7 +902,12 @@ async function displayNextTask(tasksPath, complexityReportPath = null) {
 				'padding-bottom': 0,
 				compact: true
 			},
-			chars: { mid: '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' },
+			chars: {
+				mid: '',
+				'left-mid': '',
+				'mid-mid': '',
+				'right-mid': ''
+			},
 			wordWrap: true
 		});
 
@@ -974,10 +966,8 @@ async function displayNextTask(tasksPath, complexityReportPath = null) {
 		});
 
 		console.log(subtaskTable.toString());
-	}
-
-	// Suggest expanding if no subtasks (only for parent tasks without subtasks)
-	if (!isSubtask && (!nextTask.subtasks || nextTask.subtasks.length === 0)) {
+	} else {
+		// Suggest expanding if no subtasks
 		console.log(
 			boxen(
 				chalk.yellow('No subtasks found. Consider breaking down this task:') +
@@ -996,30 +986,22 @@ async function displayNextTask(tasksPath, complexityReportPath = null) {
 	}
 
 	// Show action suggestions
-	let suggestedActionsContent = chalk.white.bold('Suggested Actions:') + '\n';
-	if (isSubtask) {
-		// Suggested actions for a subtask
-		suggestedActionsContent +=
-			`${chalk.cyan('1.')} Mark as in-progress: ${chalk.yellow(`task-master set-status --id=${nextTask.id} --status=in-progress`)}\n` +
-			`${chalk.cyan('2.')} Mark as done when completed: ${chalk.yellow(`task-master set-status --id=${nextTask.id} --status=done`)}\n` +
-			`${chalk.cyan('3.')} View parent task: ${chalk.yellow(`task-master show --id=${nextTask.parentId}`)}`;
-	} else {
-		// Suggested actions for a parent task
-		suggestedActionsContent +=
-			`${chalk.cyan('1.')} Mark as in-progress: ${chalk.yellow(`task-master set-status --id=${nextTask.id} --status=in-progress`)}\n` +
-			`${chalk.cyan('2.')} Mark as done when completed: ${chalk.yellow(`task-master set-status --id=${nextTask.id} --status=done`)}\n` +
-			(nextTask.subtasks && nextTask.subtasks.length > 0
-				? `${chalk.cyan('3.')} Update subtask status: ${chalk.yellow(`task-master set-status --id=${nextTask.id}.1 --status=done`)}` // Example: first subtask
-				: `${chalk.cyan('3.')} Break down into subtasks: ${chalk.yellow(`task-master expand --id=${nextTask.id}`)}`);
-	}
-
 	console.log(
-		boxen(suggestedActionsContent, {
-			padding: { top: 0, bottom: 0, left: 1, right: 1 },
-			borderColor: 'green',
-			borderStyle: 'round',
-			margin: { top: 1 }
-		})
+		boxen(
+			chalk.white.bold('Suggested Actions:') +
+				'\n' +
+				`${chalk.cyan('1.')} Mark as in-progress: ${chalk.yellow(`task-master set-status --id=${nextTask.id} --status=in-progress`)}\n` +
+				`${chalk.cyan('2.')} Mark as done when completed: ${chalk.yellow(`task-master set-status --id=${nextTask.id} --status=done`)}\n` +
+				(nextTask.subtasks && nextTask.subtasks.length > 0
+					? `${chalk.cyan('3.')} Update subtask status: ${chalk.yellow(`task-master set-status --id=${nextTask.id}.1 --status=done`)}`
+					: `${chalk.cyan('3.')} Break down into subtasks: ${chalk.yellow(`task-master expand --id=${nextTask.id}`)}`),
+			{
+				padding: { top: 0, bottom: 0, left: 1, right: 1 },
+				borderColor: 'green',
+				borderStyle: 'round',
+				margin: { top: 1 }
+			}
+		)
 	);
 }
 
@@ -1029,12 +1011,7 @@ async function displayNextTask(tasksPath, complexityReportPath = null) {
  * @param {string|number} taskId - The ID of the task to display
  * @param {string} [statusFilter] - Optional status to filter subtasks by
  */
-async function displayTaskById(
-	tasksPath,
-	taskId,
-	complexityReportPath = null,
-	statusFilter = null
-) {
+async function displayTaskById(tasksPath, taskId, statusFilter = null) {
 	displayBanner();
 
 	// Read the tasks file
@@ -1044,15 +1021,11 @@ async function displayTaskById(
 		process.exit(1);
 	}
 
-	// Read complexity report once
-	const complexityReport = readComplexityReport(complexityReportPath);
-
 	// Find the task by ID, applying the status filter if provided
 	// Returns { task, originalSubtaskCount, originalSubtasks }
 	const { task, originalSubtaskCount, originalSubtasks } = findTaskById(
 		data.tasks,
 		taskId,
-		complexityReport,
 		statusFilter
 	);
 
@@ -1107,12 +1080,6 @@ async function displayTaskById(
 				chalk.cyan.bold('Status:'),
 				getStatusWithColor(task.status || 'pending', true)
 			],
-			[
-				chalk.cyan.bold('Complexity:'),
-				task.complexityScore
-					? getComplexityWithColor(task.complexityScore)
-					: chalk.gray('N/A')
-			],
 			[
 				chalk.cyan.bold('Description:'),
 				task.description || 'No description provided.'
@@ -1191,18 +1158,7 @@ async function displayTaskById(
 		[chalk.cyan.bold('Priority:'), priorityColor(task.priority || 'medium')],
 		[
 			chalk.cyan.bold('Dependencies:'),
-			formatDependenciesWithStatus(
-				task.dependencies,
-				data.tasks,
-				true,
-				complexityReport
-			)
-		],
-		[
-			chalk.cyan.bold('Complexity:'),
-			task.complexityScore
-				? getComplexityWithColor(task.complexityScore)
-				: chalk.gray('N/A')
+			formatDependenciesWithStatus(task.dependencies, data.tasks, true)
 		],
 		[chalk.cyan.bold('Description:'), task.description]
 	);
@@ -2018,51 +1974,6 @@ function displayAvailableModels(availableModels) {
 	);
 }
 
-/**
- * Displays AI usage telemetry summary in the CLI.
- * @param {object} telemetryData - The telemetry data object.
- * @param {string} outputType - 'cli' or 'mcp' (though typically only called for 'cli').
- */
-function displayAiUsageSummary(telemetryData, outputType = 'cli') {
-	if (
-		(outputType !== 'cli' && outputType !== 'text') ||
-		!telemetryData ||
-		isSilentMode()
-	) {
-		return; // Only display for CLI and if data exists and not in silent mode
-	}
-
-	const {
-		modelUsed,
-		providerName,
-		inputTokens,
-		outputTokens,
-		totalTokens,
-		totalCost,
-		commandName
-	} = telemetryData;
-
-	let summary = chalk.bold.blue('AI Usage Summary:') + '\n';
-	summary += chalk.gray(`  Command: ${commandName}\n`);
-	summary += chalk.gray(`  Provider: ${providerName}\n`);
-	summary += chalk.gray(`  Model: ${modelUsed}\n`);
-	summary += chalk.gray(
-		`  Tokens: ${totalTokens} (Input: ${inputTokens}, Output: ${outputTokens})\n`
-	);
-	summary += chalk.gray(`  Est. Cost: $${totalCost.toFixed(6)}`);
-
-	console.log(
-		boxen(summary, {
-			padding: 1,
-			margin: { top: 1 },
-			borderColor: 'blue',
-			borderStyle: 'round',
-			title: '💡 Telemetry',
-			titleAlignment: 'center'
-		})
-	);
-}
-
 // Export UI functions
 export {
 	displayBanner,
@@ -2080,6 +1991,5 @@ export {
 	confirmTaskOverwrite,
 	displayApiKeyStatus,
 	displayModelConfiguration,
-	displayAvailableModels,
-	displayAiUsageSummary
+	displayAvailableModels
 };

scripts/modules/utils.js

@@ -275,22 +275,6 @@ function findTaskInComplexityReport(report, taskId) {
 	return report.complexityAnalysis.find((task) => task.taskId === taskId);
 }
 
-function addComplexityToTask(task, complexityReport) {
-	let taskId;
-	if (task.isSubtask) {
-		taskId = task.parentTask.id;
-	} else if (task.parentId) {
-		taskId = task.parentId;
-	} else {
-		taskId = task.id;
-	}
-
-	const taskAnalysis = findTaskInComplexityReport(complexityReport, taskId);
-	if (taskAnalysis) {
-		task.complexityScore = taskAnalysis.complexityScore;
-	}
-}
-
 /**
  * Checks if a task exists in the tasks array
  * @param {Array} tasks - The tasks array
@@ -341,17 +325,10 @@ function formatTaskId(id) {
  * Finds a task by ID in the tasks array. Optionally filters subtasks by status.
  * @param {Array} tasks - The tasks array
  * @param {string|number} taskId - The task ID to find
- * @param {Object|null} complexityReport - Optional pre-loaded complexity report
- * @returns {Object|null} The task object or null if not found
  * @param {string} [statusFilter] - Optional status to filter subtasks by
  * @returns {{task: Object|null, originalSubtaskCount: number|null}} The task object (potentially with filtered subtasks) and the original subtask count if filtered, or nulls if not found.
  */
-function findTaskById(
-	tasks,
-	taskId,
-	complexityReport = null,
-	statusFilter = null
-) {
+function findTaskById(tasks, taskId, statusFilter = null) {
 	if (!taskId || !tasks || !Array.isArray(tasks)) {
 		return { task: null, originalSubtaskCount: null };
 	}
@@ -379,17 +356,10 @@ function findTaskById(
 			subtask.isSubtask = true;
 		}
 
-		// If we found a task, check for complexity data
-		if (subtask && complexityReport) {
-			addComplexityToTask(subtask, complexityReport);
-		}
-
+		// Return the found subtask (or null) and null for originalSubtaskCount
 		return { task: subtask || null, originalSubtaskCount: null };
 	}
 
-	let taskResult = null;
-	let originalSubtaskCount = null;
-
 	// Find the main task
 	const id = parseInt(taskId, 10);
 	const task = tasks.find((t) => t.id === id) || null;
@@ -399,8 +369,6 @@ function findTaskById(
 		return { task: null, originalSubtaskCount: null };
 	}
 
-	taskResult = task;
-
 	// If task found and statusFilter provided, filter its subtasks
 	if (statusFilter && task.subtasks && Array.isArray(task.subtasks)) {
 		const originalSubtaskCount = task.subtasks.length;
@@ -411,18 +379,12 @@ function findTaskById(
 				subtask.status &&
 				subtask.status.toLowerCase() === statusFilter.toLowerCase()
 		);
-
-		taskResult = filteredTask;
-		originalSubtaskCount = originalSubtaskCount;
+		// Return the filtered task and the original count
+		return { task: filteredTask, originalSubtaskCount: originalSubtaskCount };
 	}
 
-	// If task found and complexityReport provided, add complexity data
-	if (taskResult && complexityReport) {
-		addComplexityToTask(taskResult, complexityReport);
-	}
-
-	// Return the found task and original subtask count
-	return { task: taskResult, originalSubtaskCount };
+	// Return original task and null count if no filter or no subtasks
+	return { task: task, originalSubtaskCount: null };
 }
 
 /**
@@ -546,61 +508,6 @@ function detectCamelCaseFlags(args) {
 	return camelCaseFlags;
 }
 
-/**
- * Aggregates an array of telemetry objects into a single summary object.
- * @param {Array<Object>} telemetryArray - Array of telemetryData objects.
- * @param {string} overallCommandName - The name for the aggregated command.
- * @returns {Object|null} Aggregated telemetry object or null if input is empty.
- */
-function aggregateTelemetry(telemetryArray, overallCommandName) {
-	if (!telemetryArray || telemetryArray.length === 0) {
-		return null;
-	}
-
-	const aggregated = {
-		timestamp: new Date().toISOString(), // Use current time for aggregation time
-		userId: telemetryArray[0].userId, // Assume userId is consistent
-		commandName: overallCommandName,
-		modelUsed: 'Multiple', // Default if models vary
-		providerName: 'Multiple', // Default if providers vary
-		inputTokens: 0,
-		outputTokens: 0,
-		totalTokens: 0,
-		totalCost: 0,
-		currency: telemetryArray[0].currency || 'USD' // Assume consistent currency or default
-	};
-
-	const uniqueModels = new Set();
-	const uniqueProviders = new Set();
-	const uniqueCurrencies = new Set();
-
-	telemetryArray.forEach((item) => {
-		aggregated.inputTokens += item.inputTokens || 0;
-		aggregated.outputTokens += item.outputTokens || 0;
-		aggregated.totalCost += item.totalCost || 0;
-		uniqueModels.add(item.modelUsed);
-		uniqueProviders.add(item.providerName);
-		uniqueCurrencies.add(item.currency || 'USD');
-	});
-
-	aggregated.totalTokens = aggregated.inputTokens + aggregated.outputTokens;
-	aggregated.totalCost = parseFloat(aggregated.totalCost.toFixed(6)); // Fix precision
-
-	if (uniqueModels.size === 1) {
-		aggregated.modelUsed = [...uniqueModels][0];
-	}
-	if (uniqueProviders.size === 1) {
-		aggregated.providerName = [...uniqueProviders][0];
-	}
-	if (uniqueCurrencies.size > 1) {
-		aggregated.currency = 'Multiple'; // Mark if currencies actually differ
-	} else if (uniqueCurrencies.size === 1) {
-		aggregated.currency = [...uniqueCurrencies][0];
-	}
-
-	return aggregated;
-}
-
 // Export all utility functions and configuration
 export {
 	LOG_LEVELS,
@@ -617,12 +524,10 @@ export {
 	findCycles,
 	toKebabCase,
 	detectCamelCaseFlags,
-	disableSilentMode,
 	enableSilentMode,
-	getTaskManager,
+	disableSilentMode,
 	isSilentMode,
-	addComplexityToTask,
 	resolveEnvVariable,
-	findProjectRoot,
-	aggregateTelemetry
+	getTaskManager,
+	findProjectRoot
 };

scripts/task-complexity-report.json

@@ -1,7 +1,7 @@
 {
 	"meta": {
-		"generatedAt": "2025-05-17T22:29:22.179Z",
-		"tasksAnalyzed": 40,
+		"generatedAt": "2025-05-03T04:45:36.864Z",
+		"tasksAnalyzed": 36,
 		"thresholdScore": 5,
 		"projectName": "Taskmaster",
 		"usedResearch": false
@@ -10,322 +10,290 @@
 		{
 			"taskId": 24,
 			"taskTitle": "Implement AI-Powered Test Generation Command",
-			"complexityScore": 7,
+			"complexityScore": 8,
 			"recommendedSubtasks": 5,
-			"expansionPrompt": "Break down the implementation of the AI-powered test generation command into detailed subtasks covering: command structure setup, AI prompt engineering, test file generation logic, integration with Claude API, and comprehensive error handling.",
-			"reasoning": "This task involves complex integration with an AI service (Claude), requires sophisticated prompt engineering, and needs to generate structured code files. The existing 3 subtasks are a good start but could be expanded to include more detailed steps for AI integration, error handling, and test file formatting."
+			"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."
 		},
 		{
 			"taskId": 26,
 			"taskTitle": "Implement Context Foundation for AI Operations",
-			"complexityScore": 6,
-			"recommendedSubtasks": 4,
-			"expansionPrompt": "The current 4 subtasks for implementing the context foundation appear comprehensive. Consider if any additional subtasks are needed for testing, documentation, or integration with existing systems.",
-			"reasoning": "This task involves creating a foundation for context integration with several well-defined components. The existing 4 subtasks cover the main implementation areas (context-file flag, cursor rules integration, context extraction utility, and command handler updates). The complexity is moderate as it requires careful integration with existing systems but has clear requirements."
+			"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."
 		},
 		{
 			"taskId": 27,
 			"taskTitle": "Implement Context Enhancements for AI Operations",
-			"complexityScore": 7,
-			"recommendedSubtasks": 4,
-			"expansionPrompt": "The current 4 subtasks for implementing context enhancements appear well-structured. Consider if any additional subtasks are needed for testing, documentation, or performance optimization.",
-			"reasoning": "This task builds upon the foundation from Task #26 and adds more sophisticated context handling features. The 4 existing subtasks cover the main implementation areas (code context extraction, task history context, PRD context integration, and context formatting). The complexity is higher than the foundation task due to the need for intelligent context selection and optimization."
+			"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."
 		},
 		{
 			"taskId": 28,
 			"taskTitle": "Implement Advanced ContextManager System",
-			"complexityScore": 8,
-			"recommendedSubtasks": 5,
-			"expansionPrompt": "The current 5 subtasks for implementing the advanced ContextManager system appear comprehensive. Consider if any additional subtasks are needed for testing, documentation, or backward compatibility with previous context implementations.",
-			"reasoning": "This task represents the most complex phase of the context implementation, requiring a sophisticated class design, optimization algorithms, and integration with multiple systems. The 5 existing subtasks cover the core implementation areas, but the complexity is high due to the need for intelligent context prioritization, token management, and performance monitoring."
+			"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."
+		},
+		{
+			"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."
 		},
 		{
 			"taskId": 40,
 			"taskTitle": "Implement 'plan' Command for Task Implementation Planning",
-			"complexityScore": 5,
+			"complexityScore": 6,
 			"recommendedSubtasks": 4,
-			"expansionPrompt": "The current 4 subtasks for implementing the 'plan' command appear well-structured. Consider if any additional subtasks are needed for testing, documentation, or integration with existing task management workflows.",
-			"reasoning": "This task involves creating a new command that leverages AI to generate implementation plans. The existing 4 subtasks cover the main implementation areas (retrieving task content, generating plans with AI, formatting in XML, and error handling). The complexity is moderate as it builds on existing patterns for task updates but requires careful AI integration."
+			"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."
 		},
 		{
 			"taskId": 41,
 			"taskTitle": "Implement Visual Task Dependency Graph in Terminal",
 			"complexityScore": 8,
-			"recommendedSubtasks": 10,
-			"expansionPrompt": "The current 10 subtasks for implementing the visual task dependency graph appear comprehensive. Consider if any additional subtasks are needed for performance optimization with large graphs or additional visualization options.",
-			"reasoning": "This task involves creating a sophisticated visualization system for terminal display, which is inherently complex due to layout algorithms, ASCII/Unicode rendering, and handling complex dependency relationships. The 10 existing subtasks cover all major aspects of implementation, from CLI interface to accessibility features."
+			"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."
 		},
 		{
 			"taskId": 42,
 			"taskTitle": "Implement MCP-to-MCP Communication Protocol",
-			"complexityScore": 9,
-			"recommendedSubtasks": 8,
-			"expansionPrompt": "The current 8 subtasks for implementing the MCP-to-MCP communication protocol appear well-structured. Consider if any additional subtasks are needed for security hardening, performance optimization, or comprehensive documentation.",
-			"reasoning": "This task involves designing and implementing a complex communication protocol between different MCP tools and servers. It requires sophisticated adapter patterns, client-server architecture, and handling of multiple operational modes. The complexity is very high due to the need for standardization, security, and backward compatibility."
+			"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."
+		},
+		{
+			"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."
 		},
 		{
 			"taskId": 44,
 			"taskTitle": "Implement Task Automation with Webhooks and Event Triggers",
 			"complexityScore": 8,
 			"recommendedSubtasks": 7,
-			"expansionPrompt": "The current 7 subtasks for implementing task automation with webhooks appear comprehensive. Consider if any additional subtasks are needed for security testing, rate limiting implementation, or webhook monitoring tools.",
-			"reasoning": "This task involves creating a sophisticated event system with webhooks for integration with external services. The complexity is high due to the need for secure authentication, reliable delivery mechanisms, and handling of various webhook formats and protocols. The existing subtasks cover the main implementation areas but security and monitoring could be emphasized more."
+			"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."
 		},
 		{
 			"taskId": 45,
 			"taskTitle": "Implement GitHub Issue Import Feature",
-			"complexityScore": 6,
+			"complexityScore": 7,
 			"recommendedSubtasks": 5,
-			"expansionPrompt": "The current 5 subtasks for implementing the GitHub issue import feature appear well-structured. Consider if any additional subtasks are needed for handling GitHub API rate limiting, caching, or supporting additional issue metadata.",
-			"reasoning": "This task involves integrating with the GitHub API to import issues as tasks. The complexity is moderate as it requires API authentication, data mapping, and error handling. The existing 5 subtasks cover the main implementation areas from design to end-to-end implementation."
+			"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."
 		},
 		{
 			"taskId": 46,
 			"taskTitle": "Implement ICE Analysis Command for Task Prioritization",
 			"complexityScore": 7,
 			"recommendedSubtasks": 5,
-			"expansionPrompt": "The current 5 subtasks for implementing the ICE analysis command appear comprehensive. Consider if any additional subtasks are needed for visualization of ICE scores or integration with other prioritization methods.",
-			"reasoning": "This task involves creating an AI-powered analysis system for task prioritization using the ICE methodology. The complexity is high due to the need for sophisticated scoring algorithms, AI integration, and report generation. The existing subtasks cover the main implementation areas from algorithm design to integration with existing systems."
+			"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."
 		},
 		{
 			"taskId": 47,
 			"taskTitle": "Enhance Task Suggestion Actions Card Workflow",
-			"complexityScore": 6,
+			"complexityScore": 7,
 			"recommendedSubtasks": 6,
-			"expansionPrompt": "The current 6 subtasks for enhancing the task suggestion actions card workflow appear well-structured. Consider if any additional subtasks are needed for user testing, accessibility improvements, or performance optimization.",
-			"reasoning": "This task involves redesigning the UI workflow for task expansion and management. The complexity is moderate as it requires careful UX design and state management but builds on existing components. The 6 existing subtasks cover the main implementation areas from design to testing."
+			"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."
 		},
 		{
 			"taskId": 48,
 			"taskTitle": "Refactor Prompts into Centralized Structure",
-			"complexityScore": 4,
+			"complexityScore": 5,
 			"recommendedSubtasks": 3,
-			"expansionPrompt": "The current 3 subtasks for refactoring prompts into a centralized structure appear appropriate. Consider if any additional subtasks are needed for prompt versioning, documentation, or testing.",
-			"reasoning": "This task involves a straightforward refactoring to improve code organization. The complexity is relatively low as it primarily involves moving code rather than creating new functionality. The 3 existing subtasks cover the main implementation areas from directory structure to integration."
+			"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."
 		},
 		{
 			"taskId": 49,
 			"taskTitle": "Implement Code Quality Analysis Command",
 			"complexityScore": 8,
 			"recommendedSubtasks": 6,
-			"expansionPrompt": "The current 6 subtasks for implementing the code quality analysis command appear comprehensive. Consider if any additional subtasks are needed for performance optimization with large codebases or integration with existing code quality tools.",
-			"reasoning": "This task involves creating a sophisticated code analysis system with pattern recognition, best practice verification, and AI-powered recommendations. The complexity is high due to the need for code parsing, complex analysis algorithms, and integration with AI services. The existing subtasks cover the main implementation areas from algorithm design to user interface."
+			"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."
 		},
 		{
 			"taskId": 50,
 			"taskTitle": "Implement Test Coverage Tracking System by Task",
 			"complexityScore": 9,
-			"recommendedSubtasks": 5,
-			"expansionPrompt": "The current 5 subtasks for implementing the test coverage tracking system appear well-structured. Consider if any additional subtasks are needed for integration with CI/CD systems, performance optimization, or visualization tools.",
-			"reasoning": "This task involves creating a complex system that maps test coverage to specific tasks and subtasks. The complexity is very high due to the need for sophisticated data structures, integration with coverage tools, and AI-powered test generation. The existing subtasks are comprehensive and cover the main implementation areas from data structure design to AI integration."
+			"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."
 		},
 		{
 			"taskId": 51,
 			"taskTitle": "Implement Perplexity Research Command",
-			"complexityScore": 6,
+			"complexityScore": 7,
 			"recommendedSubtasks": 5,
-			"expansionPrompt": "The current 5 subtasks for implementing the Perplexity research command appear comprehensive. Consider if any additional subtasks are needed for caching optimization, result formatting, or integration with other research tools.",
-			"reasoning": "This task involves creating a new command that integrates with the Perplexity AI API for research. The complexity is moderate as it requires API integration, context extraction, and result formatting. The 5 existing subtasks cover the main implementation areas from API client to caching system."
+			"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."
 		},
 		{
 			"taskId": 52,
 			"taskTitle": "Implement Task Suggestion Command for CLI",
-			"complexityScore": 6,
+			"complexityScore": 7,
 			"recommendedSubtasks": 5,
-			"expansionPrompt": "The current 5 subtasks for implementing the task suggestion command appear well-structured. Consider if any additional subtasks are needed for suggestion quality evaluation, user feedback collection, or integration with existing task workflows.",
-			"reasoning": "This task involves creating a new CLI command that generates contextually relevant task suggestions using AI. The complexity is moderate as it requires AI integration, context collection, and interactive CLI interfaces. The existing subtasks cover the main implementation areas from data collection to user interface."
+			"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."
 		},
 		{
 			"taskId": 53,
 			"taskTitle": "Implement Subtask Suggestion Feature for Parent Tasks",
-			"complexityScore": 6,
+			"complexityScore": 7,
 			"recommendedSubtasks": 6,
-			"expansionPrompt": "The current 6 subtasks for implementing the subtask suggestion feature appear comprehensive. Consider if any additional subtasks are needed for suggestion quality metrics, user feedback collection, or performance optimization.",
-			"reasoning": "This task involves creating a feature that suggests contextually relevant subtasks for parent tasks. The complexity is moderate as it builds on existing task management systems but requires sophisticated AI integration and context analysis. The 6 existing subtasks cover the main implementation areas from validation to testing."
+			"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."
 		},
 		{
 			"taskId": 55,
 			"taskTitle": "Implement Positional Arguments Support for CLI Commands",
-			"complexityScore": 5,
+			"complexityScore": 7,
 			"recommendedSubtasks": 5,
-			"expansionPrompt": "The current 5 subtasks for implementing positional arguments support appear well-structured. Consider if any additional subtasks are needed for backward compatibility testing, documentation updates, or user experience improvements.",
-			"reasoning": "This task involves modifying the command parsing logic to support positional arguments alongside the existing flag-based syntax. The complexity is moderate as it requires careful handling of different argument styles and edge cases. The 5 existing subtasks cover the main implementation areas from analysis to documentation."
+			"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."
 		},
 		{
 			"taskId": 57,
 			"taskTitle": "Enhance Task-Master CLI User Experience and Interface",
 			"complexityScore": 7,
 			"recommendedSubtasks": 6,
-			"expansionPrompt": "The current 6 subtasks for enhancing the CLI user experience appear comprehensive. Consider if any additional subtasks are needed for accessibility testing, internationalization, or performance optimization.",
-			"reasoning": "This task involves a significant overhaul of the CLI interface to improve user experience. The complexity is high due to the breadth of changes (logging, visual elements, interactive components, etc.) and the need for consistent design across all commands. The 6 existing subtasks cover the main implementation areas from log management to help systems."
+			"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."
 		},
 		{
 			"taskId": 60,
 			"taskTitle": "Implement Mentor System with Round-Table Discussion Feature",
 			"complexityScore": 8,
 			"recommendedSubtasks": 7,
-			"expansionPrompt": "The current 7 subtasks for implementing the mentor system appear well-structured. Consider if any additional subtasks are needed for mentor personality consistency, discussion quality evaluation, or performance optimization with multiple mentors.",
-			"reasoning": "This task involves creating a sophisticated mentor simulation system with round-table discussions. The complexity is high due to the need for personality simulation, complex LLM integration, and structured discussion management. The 7 existing subtasks cover the main implementation areas from architecture to testing."
+			"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."
+		},
+		{
+			"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."
 		},
 		{
 			"taskId": 62,
 			"taskTitle": "Add --simple Flag to Update Commands for Direct Text Input",
-			"complexityScore": 4,
-			"recommendedSubtasks": 8,
-			"expansionPrompt": "The current 8 subtasks for implementing the --simple flag appear comprehensive. Consider if any additional subtasks are needed for user experience testing or documentation updates.",
-			"reasoning": "This task involves adding a simple flag option to bypass AI processing for updates. The complexity is relatively low as it primarily involves modifying existing command handlers and adding a flag. The 8 existing subtasks are very detailed and cover all aspects of implementation from command parsing to testing."
+			"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": 5,
-			"recommendedSubtasks": 8,
-			"expansionPrompt": "The current 8 subtasks for adding pnpm support appear comprehensive. Consider if any additional subtasks are needed for CI/CD integration, performance comparison, or documentation updates.",
-			"reasoning": "This task involves ensuring the package works correctly with pnpm as an alternative package manager. The complexity is moderate as it requires careful testing of installation processes and scripts across different environments. The 8 existing subtasks cover all major aspects from documentation to binary verification."
+			"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": 5,
-			"recommendedSubtasks": 9,
-			"expansionPrompt": "The current 9 subtasks for adding Yarn support appear comprehensive. Consider if any additional subtasks are needed for performance testing, CI/CD integration, or compatibility with different Yarn versions.",
-			"reasoning": "This task involves ensuring the package works correctly with Yarn as an alternative package manager. The complexity is moderate as it requires careful testing of installation processes and scripts across different environments. The 9 existing subtasks are very detailed and cover all aspects from configuration to testing."
+			"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": 6,
+			"complexityScore": 7,
 			"recommendedSubtasks": 6,
-			"expansionPrompt": "The current 6 subtasks for adding Bun support appear well-structured. Consider if any additional subtasks are needed for handling Bun-specific issues, performance testing, or documentation updates.",
-			"reasoning": "This task involves adding support for the newer Bun package manager. The complexity is slightly higher than the other package manager tasks due to Bun's differences from Node.js and potential compatibility issues. The 6 existing subtasks cover the main implementation areas from research to documentation."
+			"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": 5,
-			"recommendedSubtasks": 5,
-			"expansionPrompt": "The current 5 subtasks for implementing JSON output and Cursor keybindings appear well-structured. Consider if any additional subtasks are needed for testing across different operating systems, documentation updates, or user experience improvements.",
-			"reasoning": "This task involves two distinct features: adding JSON output to CLI commands and creating a keybindings installation command. The complexity is moderate as it requires careful handling of different output formats and OS-specific file paths. The 5 existing subtasks cover the main implementation areas for both features."
+			"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": "The current 2 subtasks for implementing task creation without PRD appear appropriate. Consider if any additional subtasks are needed for validation, error handling, or integration with existing task management workflows.",
-			"reasoning": "This task involves a relatively simple modification to allow task creation without requiring a PRD document. The complexity is low as it primarily involves creating a form interface and saving functionality. The 2 existing subtasks cover the main implementation areas of UI design and data saving."
+			"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": 5,
+			"complexityScore": 6,
 			"recommendedSubtasks": 4,
-			"expansionPrompt": "The current 4 subtasks for enhancing the analyze-complexity feature appear well-structured. Consider if any additional subtasks are needed for performance optimization with large task sets or visualization improvements.",
-			"reasoning": "This task involves modifying the existing analyze-complexity feature to support analyzing specific task IDs and updating reports. The complexity is moderate as it requires careful handling of report merging and filtering logic. The 4 existing subtasks cover the main implementation areas from core logic to testing."
+			"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": "The current 4 subtasks for implementing the 'diagram' command appear well-structured. Consider if any additional subtasks are needed for handling large dependency graphs, additional output formats, or integration with existing visualization tools.",
-			"reasoning": "This task involves creating a new command that generates Mermaid diagrams to visualize task dependencies. The complexity is moderate as it requires parsing task relationships, generating proper Mermaid syntax, and handling various output options. The 4 existing subtasks cover the main implementation areas from interface design to documentation."
+			"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": 7,
+			"complexityScore": 8,
 			"recommendedSubtasks": 6,
-			"expansionPrompt": "The current 6 subtasks for implementing PDF generation appear comprehensive. Consider if any additional subtasks are needed for handling large projects, additional visualization options, or integration with existing reporting tools.",
-			"reasoning": "This task involves creating a feature to generate PDF reports of project progress and dependency visualization. The complexity is high due to the need for PDF generation, data collection, and visualization integration. The 6 existing subtasks cover the main implementation areas from library selection to export options."
+			"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": 5,
+			"complexityScore": 6,
 			"recommendedSubtasks": 4,
-			"expansionPrompt": "The current 4 subtasks for integrating Google Search Grounding appear well-structured. Consider if any additional subtasks are needed for testing with different query types, error handling, or performance optimization.",
-			"reasoning": "This task involves updating the AI service layer to enable Google Search Grounding for research roles. The complexity is moderate as it requires careful integration with the existing AI service architecture and conditional logic. The 4 existing subtasks cover the main implementation areas from service layer modification to testing."
+			"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": 8,
+			"complexityScore": 9,
 			"recommendedSubtasks": 7,
-			"expansionPrompt": "The current 7 subtasks for developing the E2E test framework appear comprehensive. Consider if any additional subtasks are needed for test result reporting, CI/CD integration, or performance benchmarking.",
-			"reasoning": "This task involves creating a sophisticated end-to-end testing framework for the MCP server. The complexity is high due to the need for subprocess management, protocol handling, and robust test case definition. The 7 existing subtasks cover the main implementation areas from architecture to documentation."
-		},
-		{
-			"taskId": 77,
-			"taskTitle": "Implement AI Usage Telemetry for Taskmaster (with external analytics endpoint)",
-			"complexityScore": 7,
-			"recommendedSubtasks": 18,
-			"expansionPrompt": "The current 18 subtasks for implementing AI usage telemetry appear very comprehensive. Consider if any additional subtasks are needed for security hardening, privacy compliance, or user feedback collection.",
-			"reasoning": "This task involves creating a telemetry system to track AI usage metrics. The complexity is high due to the need for secure data transmission, comprehensive data collection, and integration across multiple commands. The 18 existing subtasks are extremely detailed and cover all aspects of implementation from core utility to provider-specific updates."
-		},
-		{
-			"taskId": 80,
-			"taskTitle": "Implement Unique User ID Generation and Storage During Installation",
-			"complexityScore": 4,
-			"recommendedSubtasks": 5,
-			"expansionPrompt": "The current 5 subtasks for implementing unique user ID generation appear well-structured. Consider if any additional subtasks are needed for privacy compliance, security auditing, or integration with the telemetry system.",
-			"reasoning": "This task involves generating and storing a unique user identifier during installation. The complexity is relatively low as it primarily involves UUID generation and configuration file management. The 5 existing subtasks cover the main implementation areas from script structure to documentation."
-		},
-		{
-			"taskId": 81,
-			"taskTitle": "Task #81: Implement Comprehensive Local Telemetry System with Future Server Integration Capability",
-			"complexityScore": 8,
-			"recommendedSubtasks": 6,
-			"expansionPrompt": "The current 6 subtasks for implementing the comprehensive local telemetry system appear well-structured. Consider if any additional subtasks are needed for data migration, storage optimization, or visualization tools.",
-			"reasoning": "This task involves expanding the telemetry system to capture additional metrics and implement local storage with future server integration capability. The complexity is high due to the breadth of data collection, storage requirements, and privacy considerations. The 6 existing subtasks cover the main implementation areas from data collection to user-facing benefits."
-		},
-		{
-			"taskId": 82,
-			"taskTitle": "Update supported-models.json with token limit fields",
-			"complexityScore": 3,
-			"recommendedSubtasks": 1,
-			"expansionPrompt": "This task appears straightforward enough to be implemented without further subtasks. Focus on researching accurate token limit values for each model and ensuring backward compatibility.",
-			"reasoning": "This task involves a simple update to the supported-models.json file to include new token limit fields. The complexity is low as it primarily involves research and data entry. No subtasks are necessary as the task is well-defined and focused."
-		},
-		{
-			"taskId": 83,
-			"taskTitle": "Update config-manager.js defaults and getters",
-			"complexityScore": 4,
-			"recommendedSubtasks": 1,
-			"expansionPrompt": "This task appears straightforward enough to be implemented without further subtasks. Focus on updating the DEFAULTS object and related getter functions while maintaining backward compatibility.",
-			"reasoning": "This task involves updating the config-manager.js module to replace maxTokens with more specific token limit fields. The complexity is relatively low as it primarily involves modifying existing code rather than creating new functionality. No subtasks are necessary as the task is well-defined and focused."
-		},
-		{
-			"taskId": 84,
-			"taskTitle": "Implement token counting utility",
-			"complexityScore": 5,
-			"recommendedSubtasks": 1,
-			"expansionPrompt": "This task appears well-defined enough to be implemented without further subtasks. Focus on implementing accurate token counting for different models and proper fallback mechanisms.",
-			"reasoning": "This task involves creating a utility function to count tokens for different AI models. The complexity is moderate as it requires integration with the tiktoken library and handling different tokenization schemes. No subtasks are necessary as the task is well-defined and focused."
-		},
-		{
-			"taskId": 85,
-			"taskTitle": "Update ai-services-unified.js for dynamic token limits",
-			"complexityScore": 6,
-			"recommendedSubtasks": 1,
-			"expansionPrompt": "This task appears well-defined enough to be implemented without further subtasks. Focus on implementing dynamic token limit adjustment based on input length and model capabilities.",
-			"reasoning": "This task involves modifying the AI service runner to use the new token counting utility and dynamically adjust output token limits. The complexity is moderate to high as it requires careful integration with existing code and handling various edge cases. No subtasks are necessary as the task is well-defined and focused."
-		},
-		{
-			"taskId": 86,
-			"taskTitle": "Update .taskmasterconfig schema and user guide",
-			"complexityScore": 4,
-			"recommendedSubtasks": 1,
-			"expansionPrompt": "This task appears straightforward enough to be implemented without further subtasks. Focus on creating clear migration guidance and updating documentation.",
-			"reasoning": "This task involves creating a migration guide for users to update their configuration files and documenting the new token limit options. The complexity is relatively low as it primarily involves documentation and schema validation. No subtasks are necessary as the task is well-defined and focused."
-		},
-		{
-			"taskId": 87,
-			"taskTitle": "Implement validation and error handling",
-			"complexityScore": 5,
-			"recommendedSubtasks": 1,
-			"expansionPrompt": "This task appears well-defined enough to be implemented without further subtasks. Focus on comprehensive validation and helpful error messages throughout the system.",
-			"reasoning": "This task involves adding validation and error handling for token limits throughout the system. The complexity is moderate as it requires careful integration with multiple components and creating helpful error messages. No subtasks are necessary as the task is well-defined and focused."
+			"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."
 		}
 	]
 }

src/ai-providers/anthropic.js

@@ -5,7 +5,7 @@
  * using the Vercel AI SDK.
  */
 import { createAnthropic } from '@ai-sdk/anthropic';
-import { generateText, streamText, generateObject } from 'ai';
+import { generateText, streamText, generateObject, streamObject } from 'ai';
 import { log } from '../../scripts/modules/utils.js'; // Assuming utils is accessible
 
 // TODO: Implement standardized functions for generateText, streamText, generateObject
@@ -17,7 +17,7 @@ import { log } from '../../scripts/modules/utils.js'; // Assuming utils is acces
 // Remove the global variable and caching logic
 // let anthropicClient;
 
-function getClient(apiKey, baseUrl) {
+function getClient(apiKey) {
 	if (!apiKey) {
 		// In a real scenario, this would use the config resolver.
 		// Throwing error here if key isn't passed for simplicity.
@@ -30,12 +30,14 @@ function getClient(apiKey, baseUrl) {
 	// Create and return a new instance directly with standard version header
 	return createAnthropic({
 		apiKey: apiKey,
-		...(baseUrl && { baseURL: baseUrl }),
+		baseURL: 'https://api.anthropic.com/v1',
 		// Use standard version header instead of beta
 		headers: {
 			'anthropic-beta': 'output-128k-2025-02-19'
 		}
 	});
+	// }
+	// return anthropicClient;
 }
 
 // --- Standardized Service Function Implementations ---
@@ -49,8 +51,7 @@ function getClient(apiKey, baseUrl) {
  * @param {Array<object>} params.messages - The messages array (e.g., [{ role: 'user', content: '...' }]).
  * @param {number} [params.maxTokens] - Maximum tokens for the response.
  * @param {number} [params.temperature] - Temperature for generation.
- * @param {string} [params.baseUrl] - The base URL for the Anthropic API.
- * @returns {Promise<object>} The generated text content and usage.
+ * @returns {Promise<string>} The generated text content.
  * @throws {Error} If the API call fails.
  */
 export async function generateAnthropicText({
@@ -58,12 +59,11 @@ export async function generateAnthropicText({
 	modelId,
 	messages,
 	maxTokens,
-	temperature,
-	baseUrl
+	temperature
 }) {
 	log('debug', `Generating Anthropic text with model: ${modelId}`);
 	try {
-		const client = getClient(apiKey, baseUrl);
+		const client = getClient(apiKey);
 		const result = await generateText({
 			model: client(modelId),
 			messages: messages,
@@ -76,14 +76,7 @@ export async function generateAnthropicText({
 			'debug',
 			`Anthropic generateText result received. Tokens: ${result.usage.completionTokens}/${result.usage.promptTokens}`
 		);
-		// Return both text and usage
-		return {
-			text: result.text,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
+		return result.text;
 	} catch (error) {
 		log('error', `Anthropic generateText failed: ${error.message}`);
 		// Consider more specific error handling or re-throwing a standardized error
@@ -100,7 +93,6 @@ export async function generateAnthropicText({
  * @param {Array<object>} params.messages - The messages array.
  * @param {number} [params.maxTokens] - Maximum tokens for the response.
  * @param {number} [params.temperature] - Temperature for generation.
- * @param {string} [params.baseUrl] - The base URL for the Anthropic API.
  * @returns {Promise<object>} The full stream result object from the Vercel AI SDK.
  * @throws {Error} If the API call fails to initiate the stream.
  */
@@ -109,20 +101,20 @@ export async function streamAnthropicText({
 	modelId,
 	messages,
 	maxTokens,
-	temperature,
-	baseUrl
+	temperature
 }) {
 	log('debug', `Streaming Anthropic text with model: ${modelId}`);
 	try {
-		const client = getClient(apiKey, baseUrl);
+		const client = getClient(apiKey);
 
+		// --- DEBUG LOGGING --- >>
 		log(
 			'debug',
 			'[streamAnthropicText] Parameters received by streamText:',
 			JSON.stringify(
 				{
-					modelId: modelId,
-					messages: messages,
+					modelId: modelId, // Log modelId being used
+					messages: messages, // Log the messages array
 					maxTokens: maxTokens,
 					temperature: temperature
 				},
@@ -130,19 +122,25 @@ export async function streamAnthropicText({
 				2
 			)
 		);
+		// --- << DEBUG LOGGING ---
 
 		const stream = await streamText({
 			model: client(modelId),
 			messages: messages,
 			maxTokens: maxTokens,
 			temperature: temperature
+			// Beta header moved to client initialization
 			// TODO: Add other relevant parameters
 		});
 
 		// *** RETURN THE FULL STREAM OBJECT, NOT JUST stream.textStream ***
 		return stream;
 	} catch (error) {
-		log('error', `Anthropic streamText failed: ${error.message}`, error.stack);
+		log(
+			'error',
+			`Anthropic streamText failed: ${error.message}`,
+			error.stack // Log stack trace for more details
+		);
 		throw error;
 	}
 }
@@ -162,8 +160,7 @@ export async function streamAnthropicText({
  * @param {number} [params.maxTokens] - Maximum tokens for the response.
  * @param {number} [params.temperature] - Temperature for generation.
  * @param {number} [params.maxRetries] - Max retries for validation/generation.
- * @param {string} [params.baseUrl] - The base URL for the Anthropic API.
- * @returns {Promise<object>} The generated object matching the schema and usage.
+ * @returns {Promise<object>} The generated object matching the schema.
  * @throws {Error} If generation or validation fails.
  */
 export async function generateAnthropicObject({
@@ -174,22 +171,24 @@ export async function generateAnthropicObject({
 	objectName = 'generated_object',
 	maxTokens,
 	temperature,
-	maxRetries = 3,
-	baseUrl
+	maxRetries = 3
 }) {
 	log(
 		'debug',
 		`Generating Anthropic object ('${objectName}') with model: ${modelId}`
 	);
 	try {
-		const client = getClient(apiKey, baseUrl);
+		const client = getClient(apiKey);
+
+		// Log basic debug info
 		log(
 			'debug',
 			`Using maxTokens: ${maxTokens}, temperature: ${temperature}, model: ${modelId}`
 		);
+
 		const result = await generateObject({
 			model: client(modelId),
-			mode: 'tool',
+			mode: 'tool', // Anthropic generally uses 'tool' mode for structured output
 			schema: schema,
 			messages: messages,
 			tool: {
@@ -200,19 +199,14 @@ export async function generateAnthropicObject({
 			temperature: temperature,
 			maxRetries: maxRetries
 		});
+
 		log(
 			'debug',
 			`Anthropic generateObject result received. Tokens: ${result.usage.completionTokens}/${result.usage.promptTokens}`
 		);
-		// Return both object and usage
-		return {
-			object: result.object,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
+		return result.object;
 	} catch (error) {
+		// Simple error logging
 		log(
 			'error',
 			`Anthropic generateObject ('${objectName}') failed: ${error.message}`

src/ai-providers/google.js

@@ -9,19 +9,9 @@ import { generateText, streamText, generateObject } from 'ai'; // Import from ma
 import { log } from '../../scripts/modules/utils.js'; // Import logging utility
 
 // Consider making model configurable via config-manager.js later
-const DEFAULT_MODEL = 'gemini-2.5-pro-exp-03-25'; // Or a suitable default
+const DEFAULT_MODEL = 'gemini-2.0-pro'; // Or a suitable default
 const DEFAULT_TEMPERATURE = 0.2; // Or a suitable default
 
-function getClient(apiKey, baseUrl) {
-	if (!apiKey) {
-		throw new Error('Google API key is required.');
-	}
-	return createGoogleGenerativeAI({
-		apiKey: apiKey,
-		...(baseUrl && { baseURL: baseUrl })
-	});
-}
-
 /**
  * Generates text using a Google AI model.
  *
@@ -39,8 +29,7 @@ async function generateGoogleText({
 	modelId = DEFAULT_MODEL,
 	temperature = DEFAULT_TEMPERATURE,
 	messages,
-	maxTokens,
-	baseUrl
+	maxTokens // Note: Vercel SDK might handle this differently, needs verification
 }) {
 	if (!apiKey) {
 		throw new Error('Google API key is required.');
@@ -48,31 +37,28 @@ async function generateGoogleText({
 	log('info', `Generating text with Google model: ${modelId}`);
 
 	try {
-		const googleProvider = getClient(apiKey, baseUrl);
-		const model = googleProvider(modelId);
+		// const google = new GoogleGenerativeAI({ apiKey }); // Incorrect instantiation
+		const googleProvider = createGoogleGenerativeAI({ apiKey }); // Correct instantiation
+		// const model = google.getGenerativeModel({ model: modelId }); // Incorrect model retrieval
+		const model = googleProvider(modelId); // Correct model retrieval
+
+		// Construct payload suitable for Vercel SDK's generateText
+		// Note: The exact structure might depend on how messages are passed
 		const result = await generateText({
-			model,
-			messages,
+			model, // Pass the model instance
+			messages, // Pass the messages array directly
 			temperature,
-			maxOutputTokens: maxTokens
+			maxOutputTokens: maxTokens // Map to correct Vercel SDK param if available
 		});
 
 		// Assuming result structure provides text directly or within a property
-		// return result.text; // Adjust based on actual SDK response
-		// Return both text and usage
-		return {
-			text: result.text,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
+		return result.text; // Adjust based on actual SDK response
 	} catch (error) {
 		log(
 			'error',
 			`Error generating text with Google (${modelId}): ${error.message}`
 		);
-		throw error;
+		throw error; // Re-throw for unified service handler
 	}
 }
 
@@ -93,8 +79,7 @@ async function streamGoogleText({
 	modelId = DEFAULT_MODEL,
 	temperature = DEFAULT_TEMPERATURE,
 	messages,
-	maxTokens,
-	baseUrl
+	maxTokens
 }) {
 	if (!apiKey) {
 		throw new Error('Google API key is required.');
@@ -102,15 +87,19 @@ async function streamGoogleText({
 	log('info', `Streaming text with Google model: ${modelId}`);
 
 	try {
-		const googleProvider = getClient(apiKey, baseUrl);
-		const model = googleProvider(modelId);
+		// const google = new GoogleGenerativeAI({ apiKey }); // Incorrect instantiation
+		const googleProvider = createGoogleGenerativeAI({ apiKey }); // Correct instantiation
+		// const model = google.getGenerativeModel({ model: modelId }); // Incorrect model retrieval
+		const model = googleProvider(modelId); // Correct model retrieval
+
 		const stream = await streamText({
-			model,
+			model, // Pass the model instance
 			messages,
 			temperature,
 			maxOutputTokens: maxTokens
 		});
-		return stream;
+
+		return stream; // Return the stream directly
 	} catch (error) {
 		log(
 			'error',
@@ -141,8 +130,7 @@ async function generateGoogleObject({
 	messages,
 	schema,
 	objectName, // Note: Vercel SDK might use this differently or not at all
-	maxTokens,
-	baseUrl
+	maxTokens
 }) {
 	if (!apiKey) {
 		throw new Error('Google API key is required.');
@@ -150,25 +138,23 @@ async function generateGoogleObject({
 	log('info', `Generating object with Google model: ${modelId}`);
 
 	try {
-		const googleProvider = getClient(apiKey, baseUrl);
-		const model = googleProvider(modelId);
-		const result = await generateObject({
-			model,
+		// const google = new GoogleGenerativeAI({ apiKey }); // Incorrect instantiation
+		const googleProvider = createGoogleGenerativeAI({ apiKey }); // Correct instantiation
+		// const model = google.getGenerativeModel({ model: modelId }); // Incorrect model retrieval
+		const model = googleProvider(modelId); // Correct model retrieval
+
+		const { object } = await generateObject({
+			model, // Pass the model instance
 			schema,
 			messages,
 			temperature,
 			maxOutputTokens: maxTokens
+			// Note: 'objectName' or 'mode' might not be directly applicable here
+			// depending on how `@ai-sdk/google` handles `generateObject`.
+			// Check SDK docs if specific tool calling/JSON mode needs explicit setup.
 		});
 
-		// return object; // Return the parsed object
-		// Return both object and usage
-		return {
-			object: result.object,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
+		return object; // Return the parsed object
 	} catch (error) {
 		log(
 			'error',

src/ai-providers/ollama.js

@@ -1,163 +0,0 @@
-/**
- * ollama.js
- * AI provider implementation for Ollama models using the ollama-ai-provider package.
- */
-
-import { createOllama } from 'ollama-ai-provider';
-import { log } from '../../scripts/modules/utils.js'; // Import logging utility
-import { generateObject, generateText, streamText } from 'ai';
-
-// Consider making model configurable via config-manager.js later
-const DEFAULT_MODEL = 'llama3'; // Or a suitable default for Ollama
-const DEFAULT_TEMPERATURE = 0.2;
-
-function getClient(baseUrl) {
-	// baseUrl is optional, defaults to http://localhost:11434
-	return createOllama({
-		baseUrl: baseUrl || undefined
-	});
-}
-
-/**
- * Generates text using an Ollama model.
- *
- * @param {object} params - Parameters for the generation.
- * @param {string} params.modelId - Specific model ID to use (overrides default).
- * @param {number} params.temperature - Generation temperature.
- * @param {Array<object>} params.messages - The conversation history (system/user prompts).
- * @param {number} [params.maxTokens] - Optional max tokens.
- * @param {string} [params.baseUrl] - Optional Ollama base URL.
- * @returns {Promise<string>} The generated text content.
- * @throws {Error} If API call fails.
- */
-async function generateOllamaText({
-	modelId = DEFAULT_MODEL,
-	messages,
-	maxTokens,
-	temperature = DEFAULT_TEMPERATURE,
-	baseUrl
-}) {
-	log('info', `Generating text with Ollama model: ${modelId}`);
-
-	try {
-		const client = getClient(baseUrl);
-		const result = await generateText({
-			model: client(modelId),
-			messages,
-			maxTokens,
-			temperature
-		});
-		log('debug', `Ollama generated text: ${result.text}`);
-		return {
-			text: result.text,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
-	} catch (error) {
-		log(
-			'error',
-			`Error generating text with Ollama (${modelId}): ${error.message}`
-		);
-		throw error;
-	}
-}
-
-/**
- * Streams text using an Ollama model.
- *
- * @param {object} params - Parameters for the streaming.
- * @param {string} params.modelId - Specific model ID to use (overrides default).
- * @param {number} params.temperature - Generation temperature.
- * @param {Array<object>} params.messages - The conversation history.
- * @param {number} [params.maxTokens] - Optional max tokens.
- * @param {string} [params.baseUrl] - Optional Ollama base URL.
- * @returns {Promise<ReadableStream>} A readable stream of text deltas.
- * @throws {Error} If API call fails.
- */
-async function streamOllamaText({
-	modelId = DEFAULT_MODEL,
-	temperature = DEFAULT_TEMPERATURE,
-	messages,
-	maxTokens,
-	baseUrl
-}) {
-	log('info', `Streaming text with Ollama model: ${modelId}`);
-
-	try {
-		const ollama = getClient(baseUrl);
-		const stream = await streamText({
-			model: modelId,
-			messages,
-			temperature,
-			maxTokens
-		});
-		return stream;
-	} catch (error) {
-		log(
-			'error',
-			`Error streaming text with Ollama (${modelId}): ${error.message}`
-		);
-		throw error;
-	}
-}
-
-/**
- * Generates a structured object using an Ollama model using the Vercel AI SDK's generateObject.
- *
- * @param {object} params - Parameters for the object generation.
- * @param {string} params.modelId - Specific model ID to use (overrides default).
- * @param {number} params.temperature - Generation temperature.
- * @param {Array<object>} params.messages - The conversation history.
- * @param {import('zod').ZodSchema} params.schema - Zod schema for the expected object.
- * @param {string} params.objectName - Name for the object generation context.
- * @param {number} [params.maxTokens] - Optional max tokens.
- * @param {number} [params.maxRetries] - Max retries for validation/generation.
- * @param {string} [params.baseUrl] - Optional Ollama base URL.
- * @returns {Promise<object>} The generated object matching the schema.
- * @throws {Error} If generation or validation fails.
- */
-async function generateOllamaObject({
-	modelId = DEFAULT_MODEL,
-	temperature = DEFAULT_TEMPERATURE,
-	messages,
-	schema,
-	objectName = 'generated_object',
-	maxTokens,
-	maxRetries = 3,
-	baseUrl
-}) {
-	log('info', `Generating object with Ollama model: ${modelId}`);
-	try {
-		const ollama = getClient(baseUrl);
-		const result = await generateObject({
-			model: ollama(modelId),
-			mode: 'tool',
-			schema: schema,
-			messages: messages,
-			tool: {
-				name: objectName,
-				description: `Generate a ${objectName} based on the prompt.`
-			},
-			maxOutputTokens: maxTokens,
-			temperature: temperature,
-			maxRetries: maxRetries
-		});
-		return {
-			object: result.object,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
-	} catch (error) {
-		log(
-			'error',
-			`Ollama generateObject ('${objectName}') failed: ${error.message}`
-		);
-		throw error;
-	}
-}
-
-export { generateOllamaText, streamOllamaText, generateOllamaObject };

src/ai-providers/openai.js

@@ -1,26 +1,16 @@
-import { createOpenAI } from '@ai-sdk/openai'; // Using openai provider from Vercel AI SDK
-import { generateObject, generateText } from 'ai'; // Import necessary functions from 'ai'
+import { createOpenAI, openai } from '@ai-sdk/openai'; // Using openai provider from Vercel AI SDK
+import { generateText, streamText, generateObject } from 'ai'; // Import necessary functions from 'ai'
 import { log } from '../../scripts/modules/utils.js';
 
-function getClient(apiKey, baseUrl) {
-	if (!apiKey) {
-		throw new Error('OpenAI API key is required.');
-	}
-	return createOpenAI({
-		apiKey: apiKey,
-		...(baseUrl && { baseURL: baseUrl })
-	});
-}
-
 /**
  * Generates text using OpenAI models via Vercel AI SDK.
  *
- * @param {object} params - Parameters including apiKey, modelId, messages, maxTokens, temperature, baseUrl.
- * @returns {Promise<object>} The generated text content and usage.
+ * @param {object} params - Parameters including apiKey, modelId, messages, maxTokens, temperature.
+ * @returns {Promise<string>} The generated text content.
  * @throws {Error} If API call fails.
  */
 export async function generateOpenAIText(params) {
-	const { apiKey, modelId, messages, maxTokens, temperature, baseUrl } = params;
+	const { apiKey, modelId, messages, maxTokens, temperature } = params;
 	log('debug', `generateOpenAIText called with model: ${modelId}`);
 
 	if (!apiKey) {
@@ -33,17 +23,21 @@ export async function generateOpenAIText(params) {
 		throw new Error('Invalid or empty messages array provided for OpenAI.');
 	}
 
-	const openaiClient = getClient(apiKey, baseUrl);
+	const openaiClient = createOpenAI({ apiKey });
 
 	try {
-		const result = await generateText({
-			model: openaiClient(modelId),
-			messages,
-			maxTokens,
+		const result = await openaiClient.chat(messages, {
+			// Updated: Use openaiClient.chat directly
+			model: modelId,
+			max_tokens: maxTokens,
 			temperature
 		});
 
-		if (!result || !result.text) {
+		// Adjust based on actual Vercel SDK response structure for openaiClient.chat
+		// This might need refinement based on testing the SDK's output.
+		const textContent = result?.choices?.[0]?.message?.content?.trim();
+
+		if (!textContent) {
 			log(
 				'warn',
 				'OpenAI generateText response did not contain expected content.',
@@ -55,13 +49,7 @@ export async function generateOpenAIText(params) {
 			'debug',
 			`OpenAI generateText completed successfully for model: ${modelId}`
 		);
-		return {
-			text: result.text.trim(),
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
+		return textContent;
 	} catch (error) {
 		log(
 			'error',
@@ -77,12 +65,12 @@ export async function generateOpenAIText(params) {
 /**
  * Streams text using OpenAI models via Vercel AI SDK.
  *
- * @param {object} params - Parameters including apiKey, modelId, messages, maxTokens, temperature, baseUrl.
+ * @param {object} params - Parameters including apiKey, modelId, messages, maxTokens, temperature.
  * @returns {Promise<ReadableStream>} A readable stream of text deltas.
  * @throws {Error} If API call fails.
  */
 export async function streamOpenAIText(params) {
-	const { apiKey, modelId, messages, maxTokens, temperature, baseUrl } = params;
+	const { apiKey, modelId, messages, maxTokens, temperature } = params;
 	log('debug', `streamOpenAIText called with model: ${modelId}`);
 
 	if (!apiKey) {
@@ -97,10 +85,12 @@ export async function streamOpenAIText(params) {
 		);
 	}
 
-	const openaiClient = getClient(apiKey, baseUrl);
+	const openaiClient = createOpenAI({ apiKey });
 
 	try {
+		// Use the streamText function from Vercel AI SDK core
 		const stream = await openaiClient.chat.stream(messages, {
+			// Updated: Use openaiClient.chat.stream
 			model: modelId,
 			max_tokens: maxTokens,
 			temperature
@@ -110,6 +100,7 @@ export async function streamOpenAIText(params) {
 			'debug',
 			`OpenAI streamText initiated successfully for model: ${modelId}`
 		);
+		// The Vercel SDK's streamText should directly return the stream object
 		return stream;
 	} catch (error) {
 		log(
@@ -126,8 +117,8 @@ export async function streamOpenAIText(params) {
 /**
  * Generates structured objects using OpenAI models via Vercel AI SDK.
  *
- * @param {object} params - Parameters including apiKey, modelId, messages, schema, objectName, maxTokens, temperature, baseUrl.
- * @returns {Promise<object>} The generated object matching the schema and usage.
+ * @param {object} params - Parameters including apiKey, modelId, messages, schema, objectName, maxTokens, temperature.
+ * @returns {Promise<object>} The generated object matching the schema.
  * @throws {Error} If API call fails or object generation fails.
  */
 export async function generateOpenAIObject(params) {
@@ -138,8 +129,7 @@ export async function generateOpenAIObject(params) {
 		schema,
 		objectName,
 		maxTokens,
-		temperature,
-		baseUrl
+		temperature
 	} = params;
 	log(
 		'debug',
@@ -155,9 +145,10 @@ export async function generateOpenAIObject(params) {
 	if (!objectName)
 		throw new Error('Object name is required for OpenAI object generation.');
 
-	const openaiClient = getClient(apiKey, baseUrl);
+	const openaiClient = createOpenAI({ apiKey });
 
 	try {
+		// Use the imported generateObject function from 'ai' package
 		const result = await generateObject({
 			model: openaiClient(modelId),
 			schema: schema,
@@ -171,21 +162,7 @@ export async function generateOpenAIObject(params) {
 			'debug',
 			`OpenAI generateObject completed successfully for model: ${modelId}`
 		);
-		if (!result || typeof result.object === 'undefined') {
-			log(
-				'warn',
-				'OpenAI generateObject response did not contain expected object.',
-				{ result }
-			);
-			throw new Error('Failed to extract object from OpenAI response.');
-		}
-		return {
-			object: result.object,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
+		return result.object;
 	} catch (error) {
 		log(
 			'error',

src/ai-providers/openrouter.js

@@ -2,14 +2,6 @@ import { createOpenRouter } from '@openrouter/ai-sdk-provider';
 import { generateText, streamText, generateObject } from 'ai';
 import { log } from '../../scripts/modules/utils.js'; // Assuming utils.js is in scripts/modules
 
-function getClient(apiKey, baseUrl) {
-	if (!apiKey) throw new Error('OpenRouter API key is required.');
-	return createOpenRouter({
-		apiKey,
-		...(baseUrl && { baseURL: baseUrl })
-	});
-}
-
 /**
  * Generates text using an OpenRouter chat model.
  *
@@ -19,7 +11,6 @@ function getClient(apiKey, baseUrl) {
  * @param {Array<object>} params.messages - Array of message objects (system, user, assistant).
  * @param {number} [params.maxTokens] - Maximum tokens to generate.
  * @param {number} [params.temperature] - Sampling temperature.
- * @param {string} [params.baseUrl] - Base URL for the OpenRouter API.
  * @returns {Promise<string>} The generated text content.
  * @throws {Error} If the API call fails.
  */
@@ -29,7 +20,6 @@ async function generateOpenRouterText({
 	messages,
 	maxTokens,
 	temperature,
-	baseUrl,
 	...rest // Capture any other Vercel AI SDK compatible parameters
 }) {
 	if (!apiKey) throw new Error('OpenRouter API key is required.');
@@ -38,56 +28,23 @@ async function generateOpenRouterText({
 		throw new Error('Messages array cannot be empty.');
 
 	try {
-		const openrouter = getClient(apiKey, baseUrl);
+		const openrouter = createOpenRouter({ apiKey });
 		const model = openrouter.chat(modelId); // Assuming chat model
 
-		// Capture the full result from generateText
-		const result = await generateText({
+		const { text } = await generateText({
 			model,
 			messages,
 			maxTokens,
 			temperature,
 			...rest // Pass any additional parameters
 		});
-
-		// Check if text and usage are present
-		if (!result || typeof result.text !== 'string') {
-			log(
-				'warn',
-				`OpenRouter generateText for model ${modelId} did not return expected text.`,
-				{ result }
-			);
-			throw new Error('Failed to extract text from OpenRouter response.');
-		}
-		if (!result.usage) {
-			log(
-				'warn',
-				`OpenRouter generateText for model ${modelId} did not return usage data.`,
-				{ result }
-			);
-			// Decide if this is critical. For now, let it pass but telemetry will be incomplete.
-		}
-
-		log('debug', `OpenRouter generateText completed for model ${modelId}`);
-		// Return text and usage
-		return {
-			text: result.text,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
+		return text;
 	} catch (error) {
-		let detailedMessage = `OpenRouter generateText failed for model ${modelId}: ${error.message}`;
-		if (error.cause) {
-			detailedMessage += `\n\nCause:\n\n ${typeof error.cause === 'string' ? error.cause : JSON.stringify(error.cause)}`;
-		}
-		// Vercel AI SDK sometimes wraps the actual API error response in error.data
-		if (error.data) {
-			detailedMessage += `\n\nData:\n\n ${JSON.stringify(error.data)}`;
-		}
-		// Log the original error object for full context if needed for deeper debugging
-		log('error', detailedMessage, { originalErrorObject: error });
+		log(
+			'error',
+			`OpenRouter generateText failed for model ${modelId}: ${error.message}`
+		);
+		// Re-throw the error for the unified layer to handle retries/fallbacks
 		throw error;
 	}
 }
@@ -101,7 +58,6 @@ async function generateOpenRouterText({
  * @param {Array<object>} params.messages - Array of message objects (system, user, assistant).
  * @param {number} [params.maxTokens] - Maximum tokens to generate.
  * @param {number} [params.temperature] - Sampling temperature.
- * @param {string} [params.baseUrl] - Base URL for the OpenRouter API.
  * @returns {Promise<ReadableStream<string>>} A readable stream of text deltas.
  * @throws {Error} If the API call fails.
  */
@@ -111,7 +67,6 @@ async function streamOpenRouterText({
 	messages,
 	maxTokens,
 	temperature,
-	baseUrl,
 	...rest
 }) {
 	if (!apiKey) throw new Error('OpenRouter API key is required.');
@@ -120,7 +75,7 @@ async function streamOpenRouterText({
 		throw new Error('Messages array cannot be empty.');
 
 	try {
-		const openrouter = getClient(apiKey, baseUrl);
+		const openrouter = createOpenRouter({ apiKey });
 		const model = openrouter.chat(modelId);
 
 		// Directly return the stream from the Vercel AI SDK function
@@ -133,14 +88,10 @@ async function streamOpenRouterText({
 		});
 		return stream;
 	} catch (error) {
-		let detailedMessage = `OpenRouter streamText failed for model ${modelId}: ${error.message}`;
-		if (error.cause) {
-			detailedMessage += `\n\nCause:\n\n ${typeof error.cause === 'string' ? error.cause : JSON.stringify(error.cause)}`;
-		}
-		if (error.data) {
-			detailedMessage += `\n\nData:\n\n ${JSON.stringify(error.data)}`;
-		}
-		log('error', detailedMessage, { originalErrorObject: error });
+		log(
+			'error',
+			`OpenRouter streamText failed for model ${modelId}: ${error.message}`
+		);
 		throw error;
 	}
 }
@@ -157,7 +108,6 @@ async function streamOpenRouterText({
  * @param {number} [params.maxRetries=3] - Max retries for object generation.
  * @param {number} [params.maxTokens] - Maximum tokens.
  * @param {number} [params.temperature] - Temperature.
- * @param {string} [params.baseUrl] - Base URL for the OpenRouter API.
  * @returns {Promise<object>} The generated object matching the schema.
  * @throws {Error} If the API call fails or validation fails.
  */
@@ -170,7 +120,6 @@ async function generateOpenRouterObject({
 	maxRetries = 3,
 	maxTokens,
 	temperature,
-	baseUrl,
 	...rest
 }) {
 	if (!apiKey) throw new Error('OpenRouter API key is required.');
@@ -180,15 +129,15 @@ async function generateOpenRouterObject({
 		throw new Error('Messages array cannot be empty.');
 
 	try {
-		const openrouter = getClient(apiKey, baseUrl);
+		const openrouter = createOpenRouter({ apiKey });
 		const model = openrouter.chat(modelId);
 
-		// Capture the full result from generateObject
-		const result = await generateObject({
+		const { object } = await generateObject({
 			model,
 			schema,
-			mode: 'tool',
+			mode: 'tool', // Standard mode for most object generation
 			tool: {
+				// Define the tool based on the schema
 				name: objectName,
 				description: `Generate an object conforming to the ${objectName} schema.`,
 				parameters: schema
@@ -196,45 +145,15 @@ async function generateOpenRouterObject({
 			messages,
 			maxTokens,
 			temperature,
-			maxRetries,
+			maxRetries, // Pass maxRetries if supported by generateObject
 			...rest
 		});
-
-		// Check if object and usage are present
-		if (!result || typeof result.object === 'undefined') {
-			log(
-				'warn',
-				`OpenRouter generateObject for model ${modelId} did not return expected object.`,
-				{ result }
-			);
-			throw new Error('Failed to extract object from OpenRouter response.');
-		}
-		if (!result.usage) {
-			log(
-				'warn',
-				`OpenRouter generateObject for model ${modelId} did not return usage data.`,
-				{ result }
-			);
-		}
-
-		log('debug', `OpenRouter generateObject completed for model ${modelId}`);
-		// Return object and usage
-		return {
-			object: result.object,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
+		return object;
 	} catch (error) {
-		let detailedMessage = `OpenRouter generateObject failed for model ${modelId}: ${error.message}`;
-		if (error.cause) {
-			detailedMessage += `\n\nCause:\n\n ${typeof error.cause === 'string' ? error.cause : JSON.stringify(error.cause)}`;
-		}
-		if (error.data) {
-			detailedMessage += `\n\nData:\n\n ${JSON.stringify(error.data)}`;
-		}
-		log('error', detailedMessage, { originalErrorObject: error });
+		log(
+			'error',
+			`OpenRouter generateObject failed for model ${modelId}: ${error.message}`
+		);
 		throw error;
 	}
 }

src/ai-providers/perplexity.js

@@ -10,13 +10,13 @@ import { log } from '../../scripts/modules/utils.js';
 
 // --- Client Instantiation ---
 // Similar to Anthropic, this expects the resolved API key to be passed in.
-function getClient(apiKey, baseUrl) {
+function getClient(apiKey) {
 	if (!apiKey) {
 		throw new Error('Perplexity API key is required.');
 	}
+	// Create and return a new instance directly
 	return createPerplexity({
-		apiKey: apiKey,
-		...(baseUrl && { baseURL: baseUrl })
+		apiKey: apiKey
 	});
 }
 
@@ -31,7 +31,6 @@ function getClient(apiKey, baseUrl) {
  * @param {Array<object>} params.messages - The messages array.
  * @param {number} [params.maxTokens] - Maximum tokens for the response.
  * @param {number} [params.temperature] - Temperature for generation.
- * @param {string} [params.baseUrl] - Base URL for the Perplexity API.
  * @returns {Promise<string>} The generated text content.
  * @throws {Error} If the API call fails.
  */
@@ -40,12 +39,11 @@ export async function generatePerplexityText({
 	modelId,
 	messages,
 	maxTokens,
-	temperature,
-	baseUrl
+	temperature
 }) {
 	log('debug', `Generating Perplexity text with model: ${modelId}`);
 	try {
-		const client = getClient(apiKey, baseUrl);
+		const client = getClient(apiKey);
 		const result = await generateText({
 			model: client(modelId),
 			messages: messages,
@@ -56,14 +54,7 @@ export async function generatePerplexityText({
 			'debug',
 			`Perplexity generateText result received. Tokens: ${result.usage.completionTokens}/${result.usage.promptTokens}`
 		);
-
-		return {
-			text: result.text,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
+		return result.text;
 	} catch (error) {
 		log('error', `Perplexity generateText failed: ${error.message}`);
 		throw error;
@@ -79,7 +70,6 @@ export async function generatePerplexityText({
  * @param {Array<object>} params.messages - The messages array.
  * @param {number} [params.maxTokens] - Maximum tokens for the response.
  * @param {number} [params.temperature] - Temperature for generation.
- * @param {string} [params.baseUrl] - Base URL for the Perplexity API.
  * @returns {Promise<object>} The full stream result object from the Vercel AI SDK.
  * @throws {Error} If the API call fails to initiate the stream.
  */
@@ -88,12 +78,11 @@ export async function streamPerplexityText({
 	modelId,
 	messages,
 	maxTokens,
-	temperature,
-	baseUrl
+	temperature
 }) {
 	log('debug', `Streaming Perplexity text with model: ${modelId}`);
 	try {
-		const client = getClient(apiKey, baseUrl);
+		const client = getClient(apiKey);
 		const stream = await streamText({
 			model: client(modelId),
 			messages: messages,
@@ -123,7 +112,6 @@ export async function streamPerplexityText({
  * @param {number} [params.maxTokens] - Maximum tokens for the response.
  * @param {number} [params.temperature] - Temperature for generation.
  * @param {number} [params.maxRetries] - Max retries for validation/generation.
- * @param {string} [params.baseUrl] - Base URL for the Perplexity API.
  * @returns {Promise<object>} The generated object matching the schema.
  * @throws {Error} If generation or validation fails or is unsupported.
  */
@@ -135,8 +123,7 @@ export async function generatePerplexityObject({
 	objectName = 'generated_object',
 	maxTokens,
 	temperature,
-	maxRetries = 1,
-	baseUrl
+	maxRetries = 1 // Lower retries as support might be limited
 }) {
 	log(
 		'debug',
@@ -147,7 +134,8 @@ export async function generatePerplexityObject({
 		'generateObject support for Perplexity might be limited or experimental.'
 	);
 	try {
-		const client = getClient(apiKey, baseUrl);
+		const client = getClient(apiKey);
+		// Attempt using generateObject, but be prepared for potential issues
 		const result = await generateObject({
 			model: client(modelId),
 			schema: schema,
@@ -160,13 +148,7 @@ export async function generatePerplexityObject({
 			'debug',
 			`Perplexity generateObject result received. Tokens: ${result.usage.completionTokens}/${result.usage.promptTokens}`
 		);
-		return {
-			object: result.object,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
+		return result.object;
 	} catch (error) {
 		log(
 			'error',

src/ai-providers/xai.js

@@ -9,13 +9,14 @@ import { generateText, streamText, generateObject } from 'ai'; // Only import wh
 import { log } from '../../scripts/modules/utils.js'; // Assuming utils is accessible
 
 // --- Client Instantiation ---
-function getClient(apiKey, baseUrl) {
+function getClient(apiKey) {
 	if (!apiKey) {
 		throw new Error('xAI API key is required.');
 	}
+	// Create and return a new instance directly
 	return createXai({
-		apiKey: apiKey,
-		...(baseUrl && { baseURL: baseUrl })
+		apiKey: apiKey
+		// Add baseURL or other options if needed later
 	});
 }
 
@@ -30,8 +31,7 @@ function getClient(apiKey, baseUrl) {
  * @param {Array<object>} params.messages - The messages array (e.g., [{ role: 'user', content: '...' }]).
  * @param {number} [params.maxTokens] - Maximum tokens for the response.
  * @param {number} [params.temperature] - Temperature for generation.
- * @param {string} [params.baseUrl] - The base URL for the xAI API.
- * @returns {Promise<object>} The generated text content and usage.
+ * @returns {Promise<string>} The generated text content.
  * @throws {Error} If the API call fails.
  */
 export async function generateXaiText({
@@ -39,14 +39,13 @@ export async function generateXaiText({
 	modelId,
 	messages,
 	maxTokens,
-	temperature,
-	baseUrl
+	temperature
 }) {
 	log('debug', `Generating xAI text with model: ${modelId}`);
 	try {
-		const client = getClient(apiKey, baseUrl);
+		const client = getClient(apiKey);
 		const result = await generateText({
-			model: client(modelId),
+			model: client(modelId), // Correct model invocation
 			messages: messages,
 			maxTokens: maxTokens,
 			temperature: temperature
@@ -55,14 +54,7 @@ export async function generateXaiText({
 			'debug',
 			`xAI generateText result received. Tokens: ${result.usage.completionTokens}/${result.usage.promptTokens}`
 		);
-		// Return text and usage
-		return {
-			text: result.text,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
+		return result.text;
 	} catch (error) {
 		log('error', `xAI generateText failed: ${error.message}`);
 		throw error;
@@ -78,7 +70,6 @@ export async function generateXaiText({
  * @param {Array<object>} params.messages - The messages array.
  * @param {number} [params.maxTokens] - Maximum tokens for the response.
  * @param {number} [params.temperature] - Temperature for generation.
- * @param {string} [params.baseUrl] - The base URL for the xAI API.
  * @returns {Promise<object>} The full stream result object from the Vercel AI SDK.
  * @throws {Error} If the API call fails to initiate the stream.
  */
@@ -87,19 +78,18 @@ export async function streamXaiText({
 	modelId,
 	messages,
 	maxTokens,
-	temperature,
-	baseUrl
+	temperature
 }) {
 	log('debug', `Streaming xAI text with model: ${modelId}`);
 	try {
-		const client = getClient(apiKey, baseUrl);
+		const client = getClient(apiKey);
 		const stream = await streamText({
-			model: client(modelId),
+			model: client(modelId), // Correct model invocation
 			messages: messages,
 			maxTokens: maxTokens,
 			temperature: temperature
 		});
-		return stream;
+		return stream; // Return the full stream object
 	} catch (error) {
 		log('error', `xAI streamText failed: ${error.message}`, error.stack);
 		throw error;
@@ -120,8 +110,7 @@ export async function streamXaiText({
  * @param {number} [params.maxTokens] - Maximum tokens for the response.
  * @param {number} [params.temperature] - Temperature for generation.
  * @param {number} [params.maxRetries] - Max retries for validation/generation.
- * @param {string} [params.baseUrl] - The base URL for the xAI API.
- * @returns {Promise<object>} The generated object matching the schema and its usage.
+ * @returns {Promise<object>} The generated object matching the schema.
  * @throws {Error} If generation or validation fails.
  */
 export async function generateXaiObject({
@@ -132,25 +121,23 @@ export async function generateXaiObject({
 	objectName = 'generated_xai_object',
 	maxTokens,
 	temperature,
-	maxRetries = 3,
-	baseUrl
+	maxRetries = 3
 }) {
 	log(
-		'warn',
+		'warn', // Log warning as this is likely unsupported
 		`Attempting to generate xAI object ('${objectName}') with model: ${modelId}. This may not be supported by the provider.`
 	);
 	try {
-		const client = getClient(apiKey, baseUrl);
+		const client = getClient(apiKey);
 		const result = await generateObject({
-			model: client(modelId),
+			model: client(modelId), // Correct model invocation
 			// Note: mode might need adjustment if xAI ever supports object generation differently
 			mode: 'tool',
 			schema: schema,
 			messages: messages,
 			tool: {
 				name: objectName,
-				description: `Generate a ${objectName} based on the prompt.`,
-				parameters: schema
+				description: `Generate a ${objectName} based on the prompt.`
 			},
 			maxTokens: maxTokens,
 			temperature: temperature,
@@ -160,19 +147,12 @@ export async function generateXaiObject({
 			'debug',
 			`xAI generateObject result received. Tokens: ${result.usage.completionTokens}/${result.usage.promptTokens}`
 		);
-		// Return object and usage
-		return {
-			object: result.object,
-			usage: {
-				inputTokens: result.usage.promptTokens,
-				outputTokens: result.usage.completionTokens
-			}
-		};
+		return result.object;
 	} catch (error) {
 		log(
 			'error',
 			`xAI generateObject ('${objectName}') failed: ${error.message}. (Likely unsupported by provider)`
 		);
-		throw error;
+		throw error; // Re-throw the error
 	}
 }

src/constants/task-status.js

@@ -1,32 +0,0 @@
-/**
- * @typedef {'pending' | 'done' | 'in-progress' | 'review' | 'deferred' | 'cancelled'} TaskStatus
- */
-
-/**
- * Task status options list
- * @type {TaskStatus[]}
- * @description Defines possible task statuses:
- * - pending: Task waiting to start
- * - done: Task completed
- * - in-progress: Task in progress
- * - review: Task completed and waiting for review
- * - deferred: Task postponed or paused
- * - cancelled: Task cancelled and will not be completed
- */
-export const TASK_STATUS_OPTIONS = [
-	'pending',
-	'done',
-	'in-progress',
-	'review',
-	'deferred',
-	'cancelled'
-];
-
-/**
- * Check if a given status is a valid task status
- * @param {string} status - The status to check
- * @returns {boolean} True if the status is valid, false otherwise
- */
-export function isValidTaskStatus(status) {
-	return TASK_STATUS_OPTIONS.includes(status);
-}

src/utils/getVersion.js

@@ -1,35 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import { log } from '../../scripts/modules/utils.js';
-
-/**
- * Reads the version from the nearest package.json relative to this file.
- * Returns 'unknown' if not found or on error.
- * @returns {string} The version string or 'unknown'.
- */
-export function getTaskMasterVersion() {
-	let version = 'unknown';
-	try {
-		// Get the directory of the current module (getPackageVersion.js)
-		const currentModuleFilename = fileURLToPath(import.meta.url);
-		const currentModuleDirname = path.dirname(currentModuleFilename);
-		// Construct the path to package.json relative to this file (../../package.json)
-		const packageJsonPath = path.join(
-			currentModuleDirname,
-			'..',
-			'..',
-			'package.json'
-		);
-
-		if (fs.existsSync(packageJsonPath)) {
-			const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf8');
-			const packageJson = JSON.parse(packageJsonContent);
-			version = packageJson.version;
-		}
-	} catch (error) {
-		// Silently fall back to default version
-		log('warn', 'Could not read own package.json for version info.', error);
-	}
-	return version;
-}

tasks/task_032.txt

@@ -1,6 +1,6 @@
 # Task ID: 32
 # Title: Implement "learn" Command for Automatic Cursor Rule Generation
-# Status: deferred
+# Status: pending
 # Dependencies: None
 # Priority: high
 # Description: Create a new "learn" command that analyzes Cursor's chat history and code changes to automatically generate or update rule files in the .cursor/rules directory, following the cursor_rules.mdc template format. This command will help Cursor autonomously improve its ability to follow development standards by learning from successful implementations.

tasks/task_043.txt

@@ -1,6 +1,6 @@
 # Task ID: 43
 # Title: Add Research Flag to Add-Task Command
-# Status: done
+# Status: pending
 # Dependencies: None
 # Priority: medium
 # Description: Implement a '--research' flag for the add-task command that enables users to automatically generate research-related subtasks when creating a new task.

tasks/task_044.txt

@@ -48,47 +48,3 @@ Testing should verify both the functionality and security of the webhook system:
 5. Manual verification:
    - Set up integrations with common services (GitHub, Slack, etc.) to verify real-world functionality
    - Verify that the CLI interface for managing webhooks works as expected
-
-# Subtasks:
-## 1. Design webhook registration API endpoints [pending]
-### Dependencies: None
-### Description: Create API endpoints for registering, updating, and deleting webhook subscriptions
-### Details:
-Implement RESTful API endpoints that allow clients to register webhook URLs, specify event types they want to subscribe to, and manage their subscriptions. Include validation for URL format, required parameters, and authentication requirements.
-
-## 2. Implement webhook authentication and security measures [pending]
-### Dependencies: 44.1
-### Description: Develop security mechanisms for webhook verification and payload signing
-### Details:
-Implement signature verification using HMAC, rate limiting to prevent abuse, IP whitelisting options, and webhook secret management. Create a secure token system for webhook verification and implement TLS for all webhook communications.
-
-## 3. Create event trigger definition interface [pending]
-### Dependencies: None
-### Description: Design and implement the interface for defining event triggers and conditions
-### Details:
-Develop a user interface or API that allows defining what events should trigger webhooks. Include support for conditional triggers based on event properties, filtering options, and the ability to specify payload formats.
-
-## 4. Build event processing and queuing system [pending]
-### Dependencies: 44.1, 44.3
-### Description: Implement a robust system for processing and queuing events before webhook delivery
-### Details:
-Create an event queue using a message broker (like RabbitMQ or Kafka) to handle high volumes of events. Implement event deduplication, prioritization, and persistence to ensure reliable delivery even during system failures.
-
-## 5. Develop webhook delivery and retry mechanism [pending]
-### Dependencies: 44.2, 44.4
-### Description: Create a reliable system for webhook delivery with retry logic and failure handling
-### Details:
-Implement exponential backoff retry logic, configurable retry attempts, and dead letter queues for failed deliveries. Add monitoring for webhook delivery success rates and performance metrics. Include timeout handling for unresponsive webhook endpoints.
-
-## 6. Implement comprehensive error handling and logging [pending]
-### Dependencies: 44.5
-### Description: Create robust error handling, logging, and monitoring for the webhook system
-### Details:
-Develop detailed error logging for webhook failures, including response codes, error messages, and timing information. Implement alerting for critical failures and create a dashboard for monitoring system health. Add debugging tools for webhook delivery issues.
-
-## 7. Create webhook testing and simulation tools [pending]
-### Dependencies: 44.3, 44.5, 44.6
-### Description: Develop tools for testing webhook integrations and simulating event triggers
-### Details:
-Build a webhook testing console that allows manual triggering of events, viewing delivery history, and replaying failed webhooks. Create a webhook simulator for developers to test their endpoint implementations without generating real system events.
-

tasks/task_045.txt

@@ -53,35 +53,3 @@ Testing should cover the following scenarios:
    - Test the interaction with other flags and commands
 
 Create mock GitHub API responses for testing to avoid hitting rate limits during development and testing. Use environment variables to configure test credentials if needed.
-
-# Subtasks:
-## 1. Design GitHub API integration architecture [pending]
-### Dependencies: None
-### Description: Create a technical design document outlining the architecture for GitHub API integration, including authentication flow, rate limiting considerations, and error handling strategies.
-### Details:
-Document should include: API endpoints to be used, authentication method (OAuth vs Personal Access Token), data flow diagrams, and security considerations. Research GitHub API rate limits and implement appropriate throttling mechanisms.
-
-## 2. Implement GitHub URL parsing and validation [pending]
-### Dependencies: 45.1
-### Description: Create a module to parse and validate GitHub issue URLs, extracting repository owner, repository name, and issue number.
-### Details:
-Handle various GitHub URL formats (e.g., github.com/owner/repo/issues/123, github.com/owner/repo/pull/123). Implement validation to ensure the URL points to a valid issue or pull request. Return structured data with owner, repo, and issue number for valid URLs.
-
-## 3. Develop GitHub API client for issue fetching [pending]
-### Dependencies: 45.1, 45.2
-### Description: Create a service to authenticate with GitHub and fetch issue details using the GitHub REST API.
-### Details:
-Implement authentication using GitHub Personal Access Tokens or OAuth. Handle API responses, including error cases (rate limiting, authentication failures, not found). Extract relevant issue data: title, description, labels, assignees, and comments.
-
-## 4. Create task formatter for GitHub issues [pending]
-### Dependencies: 45.3
-### Description: Develop a formatter to convert GitHub issue data into the application's task format.
-### Details:
-Map GitHub issue fields to task fields (title, description, etc.). Convert GitHub markdown to the application's supported format. Handle special GitHub features like issue references and user mentions. Generate appropriate tags based on GitHub labels.
-
-## 5. Implement end-to-end import flow with UI [pending]
-### Dependencies: 45.4
-### Description: Create the user interface and workflow for importing GitHub issues, including progress indicators and error handling.
-### Details:
-Design and implement UI for URL input and import confirmation. Show loading states during API calls. Display meaningful error messages for various failure scenarios. Allow users to review and modify imported task details before saving. Add automated tests for the entire import flow.
-

tasks/task_046.txt

@@ -53,35 +53,3 @@ The command should follow the same design patterns as `analyze-complexity` for c
    - The ranking should prioritize high-impact, high-confidence, easy-to-implement tasks
    - Performance should be acceptable even with a large number of tasks
    - The command should handle edge cases gracefully (empty projects, missing data)
-
-# Subtasks:
-## 1. Design ICE scoring algorithm [pending]
-### Dependencies: None
-### Description: Create the algorithm for calculating Impact, Confidence, and Ease scores for tasks
-### Details:
-Define the mathematical formula for ICE scoring (Impact × Confidence × Ease). Determine the scale for each component (e.g., 1-10). Create rules for how AI will evaluate each component based on task attributes like complexity, dependencies, and descriptions. Document the scoring methodology for future reference.
-
-## 2. Implement AI integration for ICE scoring [pending]
-### Dependencies: 46.1
-### Description: Develop the AI component that will analyze tasks and generate ICE scores
-### Details:
-Create prompts for the AI to evaluate Impact, Confidence, and Ease. Implement error handling for AI responses. Add caching to prevent redundant AI calls. Ensure the AI provides justification for each score component. Test with various task types to ensure consistent scoring.
-
-## 3. Create report file generator [pending]
-### Dependencies: 46.2
-### Description: Build functionality to generate a structured report file with ICE analysis results
-### Details:
-Design the report file format (JSON, CSV, or Markdown). Implement sorting of tasks by ICE score. Include task details, individual I/C/E scores, and final ICE score in the report. Add timestamp and project metadata. Create a function to save the report to the specified location.
-
-## 4. Implement CLI rendering for ICE analysis [pending]
-### Dependencies: 46.3
-### Description: Develop the command-line interface for displaying ICE analysis results
-### Details:
-Design a tabular format for displaying ICE scores in the terminal. Use color coding to highlight high/medium/low priority tasks. Implement filtering options (by score range, task type, etc.). Add sorting capabilities. Create a summary view that shows top N tasks by ICE score.
-
-## 5. Integrate with existing complexity reports [pending]
-### Dependencies: 46.3, 46.4
-### Description: Connect the ICE analysis functionality with the existing complexity reporting system
-### Details:
-Modify the existing complexity report to include ICE scores. Ensure consistent formatting between complexity and ICE reports. Add cross-referencing between reports. Update the command-line help documentation. Test the integrated system with various project sizes and configurations.
-

tasks/task_047.txt

@@ -64,41 +64,3 @@ Testing should verify the complete workflow functions correctly:
 5. Regression Testing:
    - Verify that existing functionality continues to work
    - Ensure compatibility with keyboard shortcuts and accessibility features
-
-# Subtasks:
-## 1. Design Task Expansion UI Components [pending]
-### Dependencies: None
-### Description: Create UI components for the expanded task suggestion actions card that allow for task breakdown and additional context input.
-### Details:
-Design mockups for expanded card view, including subtask creation interface, context input fields, and task management controls. Ensure the design is consistent with existing UI patterns and responsive across different screen sizes. Include animations for card expansion/collapse.
-
-## 2. Implement State Management for Task Expansion [pending]
-### Dependencies: 47.1
-### Description: Develop the state management logic to handle expanded task states, subtask creation, and context additions.
-### Details:
-Create state handlers for expanded/collapsed states, subtask array management, and context data. Implement proper validation for user inputs and error handling. Ensure state persistence across user sessions and synchronization with backend services.
-
-## 3. Build Context Addition Functionality [pending]
-### Dependencies: 47.2
-### Description: Create the functionality that allows users to add additional context to tasks and subtasks.
-### Details:
-Implement context input fields with support for rich text, attachments, links, and references to other tasks. Add auto-save functionality for context changes and version history if applicable. Include context suggestion features based on task content.
-
-## 4. Develop Task Management Controls [pending]
-### Dependencies: 47.2
-### Description: Implement controls for managing tasks within the expanded card view, including prioritization, scheduling, and assignment.
-### Details:
-Create UI controls for task prioritization (drag-and-drop ranking), deadline setting with calendar integration, assignee selection with user search, and status updates. Implement notification triggers for task changes and deadline reminders.
-
-## 5. Integrate with Existing Task Systems [pending]
-### Dependencies: 47.3, 47.4
-### Description: Ensure the enhanced actions card workflow integrates seamlessly with existing task management functionality.
-### Details:
-Connect the new UI components to existing backend APIs. Update data models if necessary to support new features. Ensure compatibility with existing task filters, search, and reporting features. Implement data migration plan for existing tasks if needed.
-
-## 6. Test and Optimize User Experience [pending]
-### Dependencies: 47.5
-### Description: Conduct thorough testing of the enhanced workflow and optimize based on user feedback and performance metrics.
-### Details:
-Perform usability testing with representative users. Collect metrics on task completion time, error rates, and user satisfaction. Optimize performance for large task lists and complex subtask hierarchies. Implement A/B testing for alternative UI approaches if needed.
-

tasks/task_048.txt

@@ -42,23 +42,3 @@ Testing should verify that the refactoring maintains identical functionality whi
 4. Documentation:
    - Verify documentation is updated to reflect the new prompt organization
    - Confirm the index.js export pattern works as expected for importing prompts
-
-# Subtasks:
-## 1. Create prompts directory structure [pending]
-### Dependencies: None
-### Description: Create a centralized 'prompts' directory with appropriate subdirectories for different prompt categories
-### Details:
-Create a 'prompts' directory at the project root. Within this directory, create subdirectories based on functional categories (e.g., 'core', 'agents', 'utils'). Add an index.js file in each subdirectory to facilitate imports. Create a root index.js file that re-exports all prompts for easy access.
-
-## 2. Extract prompts into individual files [pending]
-### Dependencies: 48.1
-### Description: Identify all hardcoded prompts in the codebase and extract them into individual files in the prompts directory
-### Details:
-Search through the codebase for all hardcoded prompt strings. For each prompt, create a new file in the appropriate subdirectory with a descriptive name (e.g., 'taskBreakdownPrompt.js'). Format each file to export the prompt string as a constant. Add JSDoc comments to document the purpose and expected usage of each prompt.
-
-## 3. Update functions to import prompts [pending]
-### Dependencies: 48.1, 48.2
-### Description: Modify all functions that use hardcoded prompts to import them from the centralized structure
-### Details:
-For each function that previously used a hardcoded prompt, add an import statement to pull in the prompt from the centralized structure. Test each function after modification to ensure it still works correctly. Update any tests that might be affected by the refactoring. Create a pull request with the changes and document the new prompt structure in the project documentation.
-

tasks/task_049.txt

@@ -64,41 +64,3 @@ Testing should verify all aspects of the code analysis command:
    - Generated recommendations are specific and actionable
    - Created tasks follow the project's task format standards
    - Analysis results are consistent across multiple runs on the same codebase
-
-# Subtasks:
-## 1. Design pattern recognition algorithm [pending]
-### Dependencies: None
-### Description: Create an algorithm to identify common code patterns and anti-patterns in the codebase
-### Details:
-Develop a system that can scan code files and identify common design patterns (Factory, Singleton, etc.) and anti-patterns (God objects, excessive coupling, etc.). Include detection for language-specific patterns and create a classification system for identified patterns.
-
-## 2. Implement best practice verification [pending]
-### Dependencies: 49.1
-### Description: Build verification checks against established coding standards and best practices
-### Details:
-Create a framework to compare code against established best practices for the specific language/framework. Include checks for naming conventions, function length, complexity metrics, comment coverage, and other industry-standard quality indicators.
-
-## 3. Develop AI integration for code analysis [pending]
-### Dependencies: 49.1, 49.2
-### Description: Integrate AI capabilities to enhance code analysis and provide intelligent recommendations
-### Details:
-Connect to AI services (like OpenAI) to analyze code beyond rule-based checks. Configure the AI to understand context, project-specific patterns, and provide nuanced analysis that rule-based systems might miss.
-
-## 4. Create recommendation generation system [pending]
-### Dependencies: 49.2, 49.3
-### Description: Build a system to generate actionable improvement recommendations based on analysis results
-### Details:
-Develop algorithms to transform analysis results into specific, actionable recommendations. Include priority levels, effort estimates, and potential impact assessments for each recommendation.
-
-## 5. Implement task creation functionality [pending]
-### Dependencies: 49.4
-### Description: Add capability to automatically create tasks from code quality recommendations
-### Details:
-Build functionality to convert recommendations into tasks in the project management system. Include appropriate metadata, assignee suggestions based on code ownership, and integration with existing workflow systems.
-
-## 6. Create comprehensive reporting interface [pending]
-### Dependencies: 49.4, 49.5
-### Description: Develop a user interface to display analysis results and recommendations
-### Details:
-Build a dashboard showing code quality metrics, identified patterns, recommendations, and created tasks. Include filtering options, trend analysis over time, and the ability to drill down into specific issues with code snippets and explanations.
-

tasks/task_052.txt

@@ -49,35 +49,3 @@ Testing should verify both the functionality and user experience of the suggest-
    - Test with extremely large numbers of existing tasks
 
 Manually verify the command produces contextually appropriate suggestions that align with the project's current state and needs.
-
-# Subtasks:
-## 1. Design data collection mechanism for existing tasks [pending]
-### Dependencies: None
-### Description: Create a module to collect and format existing task data from the system for AI processing
-### Details:
-Implement a function that retrieves all existing tasks from storage, formats them appropriately for AI context, and handles edge cases like empty task lists or corrupted data. Include metadata like task status, dependencies, and creation dates to provide rich context for suggestions.
-
-## 2. Implement AI integration for task suggestions [pending]
-### Dependencies: 52.1
-### Description: Develop the core functionality to generate task suggestions using AI based on existing tasks
-### Details:
-Create an AI prompt template that effectively communicates the existing task context and request for suggestions. Implement error handling for API failures, rate limiting, and malformed responses. Include parameters for controlling suggestion quantity and specificity.
-
-## 3. Build interactive CLI interface for suggestions [pending]
-### Dependencies: 52.2
-### Description: Create the command-line interface for requesting and displaying task suggestions
-### Details:
-Design a user-friendly CLI command structure with appropriate flags for customization. Implement progress indicators during AI processing and format the output of suggestions in a clear, readable format. Include help text and examples in the command documentation.
-
-## 4. Implement suggestion selection and task creation [pending]
-### Dependencies: 52.3
-### Description: Allow users to interactively select suggestions to convert into actual tasks
-### Details:
-Create an interactive selection interface where users can review suggestions, select which ones to create as tasks, and optionally modify them before creation. Implement batch creation capabilities and validation to ensure new tasks meet system requirements.
-
-## 5. Add configuration options and flag handling [pending]
-### Dependencies: 52.3, 52.4
-### Description: Implement various configuration options and command flags for customizing suggestion behavior
-### Details:
-Create a comprehensive set of command flags for controlling suggestion quantity, specificity, format, and other parameters. Implement persistent configuration options that users can set as defaults. Document all available options and provide examples of common usage patterns.
-

tasks/task_055.txt

@@ -48,35 +48,3 @@ Testing should verify both the new positional argument functionality and continu
    - Verify examples in documentation show both styles where appropriate
 
 All tests should pass with 100% of commands supporting both argument styles without any regression in existing functionality.
-
-# Subtasks:
-## 1. Analyze current CLI argument parsing structure [pending]
-### Dependencies: None
-### Description: Review the existing CLI argument parsing code to understand how arguments are currently processed and identify integration points for positional arguments.
-### Details:
-Document the current argument parsing flow, identify key classes and methods responsible for argument handling, and determine how named arguments are currently processed. Create a technical design document outlining the current architecture and proposed changes.
-
-## 2. Design positional argument specification format [pending]
-### Dependencies: 55.1
-### Description: Create a specification for how positional arguments will be defined in command definitions, including their order, required/optional status, and type validation.
-### Details:
-Define a clear syntax for specifying positional arguments in command definitions. Consider how to handle mixed positional and named arguments, default values, and type constraints. Document the specification with examples for different command types.
-
-## 3. Implement core positional argument parsing logic [pending]
-### Dependencies: 55.1, 55.2
-### Description: Modify the argument parser to recognize and process positional arguments according to the specification, while maintaining compatibility with existing named arguments.
-### Details:
-Update the parser to identify arguments without flags as positional, map them to the correct parameter based on order, and apply appropriate validation. Ensure the implementation handles missing required positional arguments and provides helpful error messages.
-
-## 4. Handle edge cases and error conditions [pending]
-### Dependencies: 55.3
-### Description: Implement robust handling for edge cases such as too many/few arguments, type mismatches, and ambiguous situations between positional and named arguments.
-### Details:
-Create comprehensive error handling for scenarios like: providing both positional and named version of the same argument, incorrect argument types, missing required positional arguments, and excess positional arguments. Ensure error messages are clear and actionable for users.
-
-## 5. Update documentation and create usage examples [pending]
-### Dependencies: 55.2, 55.3, 55.4
-### Description: Update CLI documentation to explain positional argument support and provide clear examples showing how to use positional arguments with different commands.
-### Details:
-Revise user documentation to include positional argument syntax, update command reference with positional argument information, and create example command snippets showing both positional and named argument usage. Include a migration guide for users transitioning from named-only to positional arguments.
-

tasks/task_057.txt

@@ -65,41 +65,3 @@ Acceptance Criteria:
 - Help text is comprehensive and includes examples
 - Interface is visually consistent across all commands
 - Tool remains fully functional in non-interactive environments
-
-# Subtasks:
-## 1. Implement Configurable Log Levels [pending]
-### Dependencies: None
-### Description: Create a logging system with different verbosity levels that users can configure
-### Details:
-Design and implement a logging system with at least 4 levels (ERROR, WARNING, INFO, DEBUG). Add command-line options to set the verbosity level. Ensure logs are color-coded by severity and can be redirected to files. Include timestamp formatting options.
-
-## 2. Design Terminal Color Scheme and Visual Elements [pending]
-### Dependencies: None
-### Description: Create a consistent and accessible color scheme for the CLI interface
-### Details:
-Define a color palette that works across different terminal environments. Implement color-coding for different task states, priorities, and command categories. Add support for terminals without color capabilities. Design visual separators, headers, and footers for different output sections.
-
-## 3. Implement Progress Indicators and Loading Animations [pending]
-### Dependencies: 57.2
-### Description: Add visual feedback for long-running operations
-### Details:
-Create spinner animations for operations that take time to complete. Implement progress bars for operations with known completion percentages. Ensure animations degrade gracefully in terminals with limited capabilities. Add estimated time remaining calculations where possible.
-
-## 4. Develop Interactive Selection Menus [pending]
-### Dependencies: 57.2
-### Description: Create interactive menus for task selection and configuration
-### Details:
-Implement arrow-key navigation for selecting tasks from a list. Add checkbox and radio button interfaces for multi-select and single-select options. Include search/filter functionality for large task lists. Ensure keyboard shortcuts are consistent and documented.
-
-## 5. Design Tabular and Structured Output Formats [pending]
-### Dependencies: 57.2
-### Description: Improve the formatting of task lists and detailed information
-### Details:
-Create table layouts with proper column alignment for task lists. Implement tree views for displaying task hierarchies and dependencies. Add support for different output formats (plain text, JSON, CSV). Ensure outputs are properly paginated for large datasets.
-
-## 6. Create Help System and Interactive Documentation [pending]
-### Dependencies: 57.2, 57.4, 57.5
-### Description: Develop an in-CLI help system with examples and contextual assistance
-### Details:
-Implement a comprehensive help command with examples for each feature. Add contextual help that suggests relevant commands based on user actions. Create interactive tutorials for new users. Include command auto-completion suggestions and syntax highlighting for command examples.
-