docs: auto-update documentation based on changes in next branch

This PR was automatically generated to update documentation based on recent changes.

  Original commit: fix: add complexity score to tm list and tm show (#1270)\n\n\n

  Co-authored-by: Claude <claude-assistant@anthropic.com>

.changeset/chore-fix-docs.md

@@ -0,0 +1,5 @@
+---
+"task-master-ai": patch
+---
+
+Improve `analyze-complexity` cli docs and `--research` flag documentation

.changeset/cursor-slash-commands.md

@@ -0,0 +1,7 @@
+---
+"task-master-ai": minor
+---
+
+Add Cursor IDE custom slash command support
+
+Expose Task Master commands as Cursor slash commands by copying assets/claude/commands to .cursor/commands on profile add and cleaning up on remove.

.changeset/curvy-weeks-flow.md

@@ -0,0 +1,5 @@
+---
+"task-master-ai": patch
+---
+
+Change parent task back to "pending" when all subtasks are in "pending" state

.changeset/flat-cities-say.md

@@ -0,0 +1,5 @@
+---
+"task-master-ai": minor
+---
+
+Added api keys page on docs website: docs.task-master.dev/getting-started/api-keys

.changeset/forty-tables-invite.md

@@ -0,0 +1,10 @@
+---
+"task-master-ai": minor
+---
+
+Move to AI SDK v5:
+
+- Works better with claude-code and gemini-cli as ai providers
+- Improved openai model family compatibility
+- Migrate ollama provider to v2
+- Closes #1223, #1013, #1161, #1174

.changeset/gentle-cats-dance.md

@@ -0,0 +1,30 @@
+---
+"task-master-ai": minor
+---
+
+Migrate AI services to use generateObject for structured data generation
+
+This update migrates all AI service calls from generateText to generateObject, ensuring more reliable and structured responses across all commands.
+
+### Key Changes:
+
+- **Unified AI Service**: Replaced separate generateText implementations with a single generateObjectService that handles structured data generation
+- **JSON Mode Support**: Added proper JSON mode configuration for providers that support it (OpenAI, Anthropic, Google, Groq)
+- **Schema Validation**: Integrated Zod schemas for all AI-generated content with automatic validation
+- **Provider Compatibility**: Maintained compatibility with all existing providers while leveraging their native structured output capabilities
+- **Improved Reliability**: Structured output generation reduces parsing errors and ensures consistent data formats
+
+### Technical Improvements:
+
+- Centralized provider configuration in `ai-providers-unified.js`
+- Added `generateObject` support detection for each provider
+- Implemented proper error handling for schema validation failures
+- Maintained backward compatibility with existing prompt structures
+
+### Bug Fixes:
+
+- Fixed subtask ID numbering issue where AI was generating inconsistent IDs (101-105, 601-603) instead of sequential numbering (1, 2, 3...)
+- Enhanced prompt instructions to enforce proper ID generation patterns
+- Ensured subtasks display correctly as X.1, X.2, X.3 format
+
+This migration improves the reliability and consistency of AI-generated content throughout the Task Master application.

.changeset/mcp-timeout-configuration.md

@@ -0,0 +1,13 @@
+---
+"task-master-ai": minor
+---
+
+Enhanced Roo Code profile with MCP timeout configuration for improved reliability during long-running AI operations. The Roo profile now automatically configures a 300-second timeout for MCP server operations, preventing timeouts during complex tasks like `parse-prd`, `expand-all`, `analyze-complexity`, and `research` operations. This change also replaces static MCP configuration files with programmatic generation for better maintainability.
+
+**What's New:**
+- 300-second timeout for MCP operations (up from default 60 seconds)
+- Programmatic MCP configuration generation (replaces static asset files)
+- Enhanced reliability for AI-powered operations
+- Consistent with other AI coding assistant profiles
+
+**Migration:** No user action required - existing Roo Code installations will automatically receive the enhanced MCP configuration on next initialization.

.changeset/petite-ideas-grab.md

@@ -0,0 +1,5 @@
+---
+"task-master-ai": patch
+---
+
+Fix Claude Code settings validation for pathToClaudeCodeExecutable

.changeset/silly-pandas-find.md

@@ -0,0 +1,5 @@
+---
+"task-master-ai": patch
+---
+
+Fix sonar deep research model failing, should be called `sonar-deep-research`

.changeset/sweet-maps-rule.md

@@ -0,0 +1,5 @@
+---
+"task-master-ai": minor
+---
+
+Upgrade grok-cli ai provider to ai sdk v5

.changeset/whole-pigs-say.md

@@ -0,0 +1,8 @@
+---
+"task-master-ai": patch
+---
+
+Fix complexity score not showing for `task-master show` and `task-master list`
+
+- Added complexity score on "next task" when running `task-master list`
+- Added colors to complexity to reflect complexity (easy, medium, hard)

.github/workflows/ci.yml

@@ -6,9 +6,6 @@ on:
       - main
       - next
   pull_request:
-    branches:
-      - main
-      - next
   workflow_dispatch:
 
 concurrency:

.github/workflows/extension-ci.yml

@@ -41,8 +41,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
 
-      - name: Install Extension Dependencies
-        working-directory: apps/extension
+      - name: Install Monorepo Dependencies
         run: npm ci
         timeout-minutes: 5
 
@@ -68,7 +67,6 @@ jobs:
             ${{ runner.os }}-node-
 
       - name: Install if cache miss
-        working-directory: apps/extension
         run: npm ci
         timeout-minutes: 3
 
@@ -100,7 +98,6 @@ jobs:
             ${{ runner.os }}-node-
 
       - name: Install if cache miss
-        working-directory: apps/extension
         run: npm ci
         timeout-minutes: 3
 

.github/workflows/extension-release.yml

@@ -31,8 +31,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
 
-      - name: Install Extension Dependencies
-        working-directory: apps/extension
+      - name: Install Monorepo Dependencies
         run: npm ci
         timeout-minutes: 5
 

CHANGELOG.md

@@ -1,5 +1,20 @@
 # task-master-ai
 
+## 0.27.3
+
+### Patch Changes
+
+- [#1254](https://github.com/eyaltoledano/claude-task-master/pull/1254) [`af53525`](https://github.com/eyaltoledano/claude-task-master/commit/af53525cbc660a595b67d4bb90d906911c71f45d) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fixed issue where `tm show` command could not find subtasks using dotted notation IDs (e.g., '8.1').
+  - The command now properly searches within parent task subtasks and returns the correct subtask information.
+
+## 0.27.2
+
+### Patch Changes
+
+- [#1248](https://github.com/eyaltoledano/claude-task-master/pull/1248) [`044a7bf`](https://github.com/eyaltoledano/claude-task-master/commit/044a7bfc98049298177bc655cf341d7a8b6a0011) Thanks [@Crunchyman-ralph](https://github.com/Crunchyman-ralph)! - Fix set-status for subtasks:
+  - Parent tasks are now set as `done` when subtasks are all `done`
+  - Parent tasks are now set as `in-progress` when at least one subtask is `in-progress` or `done`
+
 ## 0.27.1
 
 ### Patch Changes

README.md

@@ -60,6 +60,19 @@ The following documentation is also available in the `docs` directory:
 
 > **Note:** After clicking the link, you'll still need to add your API keys to the configuration. The link installs the MCP server with placeholder keys that you'll need to replace with your actual API keys.
 
+#### Claude Code Quick Install
+
+For Claude Code users:
+
+```bash
+claude mcp add taskmaster-ai -- npx -y task-master-ai
+```
+
+Don't forget to add your API keys to the configuration:
+- in the root .env of your Project
+- in the "env" section of your mcp config for taskmaster-ai
+
+
 ## 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.
@@ -92,10 +105,11 @@ MCP (Model Control Protocol) lets you run Task Master directly from your editor.
 |              | Project | `<project_folder>/.cursor/mcp.json`   | `<project_folder>\.cursor\mcp.json`               | `mcpServers` |
 | **Windsurf** | Global  | `~/.codeium/windsurf/mcp_config.json` | `%USERPROFILE%\.codeium\windsurf\mcp_config.json` | `mcpServers` |
 | **VS Code**  | Project | `<project_folder>/.vscode/mcp.json`   | `<project_folder>\.vscode\mcp.json`               | `servers`    |
+| **Q CLI**    | Global  | `~/.aws/amazonq/mcp.json`             |                                                   | `mcpServers` |
 
 ##### Manual Configuration
 
-###### Cursor & Windsurf (`mcpServers`)
+###### Cursor & Windsurf & Q Developer CLI (`mcpServers`)
 
 ```json
 {

apps/cli/package.json

@@ -35,7 +35,7 @@
 		"@types/inquirer": "^9.0.3",
 		"@types/node": "^22.10.5",
 		"tsx": "^4.20.4",
-		"typescript": "^5.7.3",
+		"typescript": "^5.9.2",
 		"vitest": "^2.1.8"
 	},
 	"engines": {

apps/cli/src/commands/list.command.ts

@@ -281,9 +281,14 @@ export class ListTasksCommand extends Command {
 		const priorityBreakdown = getPriorityBreakdown(tasks);
 
 		// Find next task following the same logic as findNextTask
-		const nextTask = this.findNextTask(tasks);
+		const nextTaskInfo = this.findNextTask(tasks);
 
-		// Display dashboard boxes
+		// Get the full task object with complexity data already included
+		const nextTask = nextTaskInfo
+			? tasks.find((t) => String(t.id) === String(nextTaskInfo.id))
+			: undefined;
+
+		// Display dashboard boxes (nextTask already has complexity from storage enrichment)
 		displayDashboards(
 			taskStats,
 			subtaskStats,
@@ -303,14 +308,16 @@ export class ListTasksCommand extends Command {
 
 		// Display recommended next task section immediately after table
 		if (nextTask) {
-			// Find the full task object to get description
-			const fullTask = tasks.find((t) => String(t.id) === String(nextTask.id));
-			const description = fullTask ? getTaskDescription(fullTask) : undefined;
+			const description = getTaskDescription(nextTask);
 
 			displayRecommendedNextTask({
-				...nextTask,
-				status: 'pending', // Next task is typically pending
-				description
+				id: nextTask.id,
+				title: nextTask.title,
+				priority: nextTask.priority,
+				status: nextTask.status,
+				dependencies: nextTask.dependencies,
+				description,
+				complexity: nextTask.complexity as number | undefined
 			});
 		} else {
 			displayRecommendedNextTask(undefined);

apps/cli/src/ui/components/dashboard.component.ts

@@ -6,6 +6,7 @@
 import chalk from 'chalk';
 import boxen from 'boxen';
 import type { Task, TaskPriority } from '@tm/core/types';
+import { getComplexityWithColor } from '../../utils/ui.js';
 
 /**
  * Statistics for task collection
@@ -479,7 +480,7 @@ export function displayDependencyDashboard(
 				? chalk.cyan(nextTask.dependencies.join(', '))
 				: chalk.gray('None')
 		}\n` +
-		`Complexity: ${nextTask?.complexity || chalk.gray('N/A')}`;
+		`Complexity: ${nextTask?.complexity !== undefined ? getComplexityWithColor(nextTask.complexity) : chalk.gray('N/A')}`;
 
 	return content;
 }

apps/cli/src/ui/components/next-task.component.ts

@@ -6,6 +6,7 @@
 import chalk from 'chalk';
 import boxen from 'boxen';
 import type { Task } from '@tm/core/types';
+import { getComplexityWithColor } from '../../utils/ui.js';
 
 /**
  * Next task display options
@@ -17,6 +18,7 @@ export interface NextTaskDisplayOptions {
 	status?: string;
 	dependencies?: (string | number)[];
 	description?: string;
+	complexity?: number;
 }
 
 /**
@@ -82,6 +84,11 @@ export function displayRecommendedNextTask(
 			: chalk.cyan(task.dependencies.join(', '));
 	content.push(`Dependencies: ${depsDisplay}`);
 
+	// Complexity with color and label
+	if (typeof task.complexity === 'number') {
+		content.push(`Complexity: ${getComplexityWithColor(task.complexity)}`);
+	}
+
 	// Description if available
 	if (task.description) {
 		content.push('');

apps/cli/src/ui/components/task-detail.component.ts

@@ -9,7 +9,11 @@ import Table from 'cli-table3';
 import { marked, MarkedExtension } from 'marked';
 import { markedTerminal } from 'marked-terminal';
 import type { Task } from '@tm/core/types';
-import { getStatusWithColor, getPriorityWithColor } from '../../utils/ui.js';
+import {
+	getStatusWithColor,
+	getPriorityWithColor,
+	getComplexityWithColor
+} from '../../utils/ui.js';
 
 // Configure marked to use terminal renderer with subtle colors
 marked.use(
@@ -108,7 +112,9 @@ export function displayTaskProperties(task: Task): void {
 		getStatusWithColor(task.status),
 		getPriorityWithColor(task.priority),
 		deps,
-		'N/A',
+		typeof task.complexity === 'number'
+			? getComplexityWithColor(task.complexity)
+			: chalk.gray('N/A'),
 		task.description || ''
 	].join('\n');
 

apps/cli/src/utils/auto-update.ts

@@ -158,10 +158,18 @@ export function displayUpgradeNotification(
 export async function performAutoUpdate(
 	latestVersion: string
 ): Promise<boolean> {
-	if (process.env.TASKMASTER_SKIP_AUTO_UPDATE === '1' || process.env.CI) {
-		console.log(
-			chalk.dim('Skipping auto-update (TASKMASTER_SKIP_AUTO_UPDATE/CI).')
-		);
+	if (
+		process.env.TASKMASTER_SKIP_AUTO_UPDATE === '1' ||
+		process.env.CI ||
+		process.env.NODE_ENV === 'test'
+	) {
+		const reason =
+			process.env.TASKMASTER_SKIP_AUTO_UPDATE === '1'
+				? 'TASKMASTER_SKIP_AUTO_UPDATE=1'
+				: process.env.CI
+					? 'CI environment'
+					: 'NODE_ENV=test';
+		console.log(chalk.dim(`Skipping auto-update (${reason})`));
 		return false;
 	}
 	const spinner = ora({

apps/cli/src/utils/ui.ts

@@ -84,7 +84,23 @@ export function getPriorityWithColor(priority: TaskPriority): string {
 }
 
 /**
- * Get colored complexity display
+ * Get complexity color and label based on score thresholds
+ */
+function getComplexityLevel(score: number): {
+	color: (text: string) => string;
+	label: string;
+} {
+	if (score >= 7) {
+		return { color: chalk.hex('#CC0000'), label: 'High' };
+	} else if (score >= 4) {
+		return { color: chalk.hex('#FF8800'), label: 'Medium' };
+	} else {
+		return { color: chalk.green, label: 'Low' };
+	}
+}
+
+/**
+ * Get colored complexity display with dot indicator (simple format)
  */
 export function getComplexityWithColor(complexity: number | string): string {
 	const score =
@@ -94,13 +110,20 @@ export function getComplexityWithColor(complexity: number | string): string {
 		return chalk.gray('N/A');
 	}
 
-	if (score >= 8) {
-		return chalk.red.bold(`${score} (High)`);
-	} else if (score >= 5) {
-		return chalk.yellow(`${score} (Medium)`);
-	} else {
-		return chalk.green(`${score} (Low)`);
+	const { color } = getComplexityLevel(score);
+	return color(`● ${score}`);
+}
+
+/**
+ * Get colored complexity display with /10 format (for dashboards)
+ */
+export function getComplexityWithScore(complexity: number | undefined): string {
+	if (typeof complexity !== 'number') {
+		return chalk.gray('N/A');
 	}
+
+	const { color, label } = getComplexityLevel(complexity);
+	return color(`${complexity}/10 (${label})`);
 }
 
 /**
@@ -323,8 +346,12 @@ export function createTaskTable(
 		}
 
 		if (showComplexity) {
-			// Show N/A if no complexity score
-			row.push(chalk.gray('N/A'));
+			// Show complexity score from report if available
+			if (typeof task.complexity === 'number') {
+				row.push(getComplexityWithColor(task.complexity));
+			} else {
+				row.push(chalk.gray('N/A'));
+			}
 		}
 
 		table.push(row);

apps/docs/README.md

@@ -1,22 +1,24 @@
 # Task Master Documentation
 
-Welcome to the Task Master documentation. Use the links below to navigate to the information you need:
+Welcome to the Task Master documentation. This documentation site provides comprehensive guides for getting started with Task Master.
 
 ## Getting Started
 
-- [Configuration Guide](archive/configuration.md) - Set up environment variables and customize Task Master
-- [Tutorial](archive/ctutorial.md) - Step-by-step guide to getting started with Task Master
+- [Quick Start Guide](/getting-started/quick-start) - Complete setup and first-time usage guide
+- [Requirements](/getting-started/quick-start/requirements) - What you need to get started
+- [Installation](/getting-started/quick-start/installation) - How to install Task Master
 
-## Reference
+## Core Capabilities
 
-- [Command Reference](archive/ccommand-reference.md) - Complete list of all available commands
-- [Task Structure](archive/ctask-structure.md) - Understanding the task format and features
+- [MCP Tools](/capabilities/mcp) - Model Control Protocol integration
+- [CLI Commands](/capabilities/cli-root-commands) - Command line interface reference
+- [Task Structure](/capabilities/task-structure) - Understanding tasks and subtasks
 
-## Examples & Licensing
+## Best Practices
 
-- [Example Interactions](archive/cexamples.md) - Common Cursor AI interaction examples
-- [Licensing Information](archive/clicensing.md) - Detailed information about the license
+- [Advanced Configuration](/best-practices/configuration-advanced) - Detailed configuration options
+- [Advanced Tasks](/best-practices/advanced-tasks) - Working with complex task structures
 
 ## Need More Help?
 
-If you can't find what you're looking for in these docs, please check the [main README](../README.md) or visit our [GitHub repository](https://github.com/eyaltoledano/claude-task-master).
+If you can't find what you're looking for in these docs, please check the root README.md or visit our [GitHub repository](https://github.com/eyaltoledano/claude-task-master).

apps/docs/capabilities/cli-root-commands.mdx

@@ -29,6 +29,11 @@ sidebarTitle: "CLI Commands"
     # List tasks with a specific status and include subtasks
     task-master list --status=<status> --with-subtasks
     ```
+    
+    **Complexity Display**: If you've run `analyze-complexity`, task complexity scores will be displayed with color-coded indicators:
+    - 🟢 **Easy** (1-3): Green
+    - 🟡 **Medium** (4-6): Yellow  
+    - 🔴 **Hard** (7-10): Red
   </Accordion>
 
   <Accordion title="Show Next Task">
@@ -36,6 +41,8 @@ sidebarTitle: "CLI Commands"
     # Show the next task to work on based on dependencies and status
     task-master next
     ```
+    
+    **Complexity Display**: If complexity analysis has been performed, the next task will display its complexity score with a color-coded indicator.
   </Accordion>
 
   <Accordion title="Show Specific Task">
@@ -48,6 +55,8 @@ sidebarTitle: "CLI Commands"
     # View a specific subtask (e.g., subtask 2 of task 1)
     task-master show 1.2
     ```
+    
+    **Complexity Display**: If complexity analysis has been performed, the task details will include the complexity score with a color-coded indicator and the recommended number of subtasks.
   </Accordion>
 
   <Accordion title="Update Tasks">
@@ -156,7 +165,7 @@ sidebarTitle: "CLI Commands"
     # Use an alternative tasks file
     task-master analyze-complexity --file=custom-tasks.json
 
-    # Use Perplexity AI for research-backed complexity analysis
+    # Use your configured research model for research-backed complexity analysis
     task-master analyze-complexity --research
     ```
   </Accordion>

apps/docs/docs.json

@@ -32,6 +32,7 @@
 									"getting-started/quick-start/execute-quick"
 								]
 							},
+							"getting-started/api-keys",
 							"getting-started/faq",
 							"getting-started/contribute"
 						]

apps/docs/getting-started/api-keys.mdx

@@ -0,0 +1,267 @@
+# API Keys Configuration
+
+Task Master supports multiple AI providers through environment variables. This page lists all available API keys and their configuration requirements.
+
+## Required API Keys
+
+> **Note**: At least one required API key must be configured for Task Master to function.
+>
+> "Required: Yes" below means "required to use that specific provider," not "required globally." You only need at least one provider configured.
+
+### ANTHROPIC_API_KEY (Recommended)
+- **Provider**: Anthropic Claude models
+- **Format**: `sk-ant-api03-...`
+- **Required**: ✅ **Yes**
+- **Models**: Claude 3.5 Sonnet, Claude 3 Haiku, Claude 3 Opus
+- **Get Key**: [Anthropic Console](https://console.anthropic.com/)
+
+```bash
+ANTHROPIC_API_KEY="sk-ant-api03-your-key-here"
+```
+
+### PERPLEXITY_API_KEY (Highly Recommended for Research)
+- **Provider**: Perplexity AI (Research features)
+- **Format**: `pplx-...`
+- **Required**: ✅ **Yes**
+- **Purpose**: Enables research-backed task expansions and updates
+- **Models**: Perplexity Sonar models
+- **Get Key**: [Perplexity API](https://www.perplexity.ai/settings/api)
+
+```bash
+PERPLEXITY_API_KEY="pplx-your-key-here"
+```
+
+### OPENAI_API_KEY
+- **Provider**: OpenAI GPT models
+- **Format**: `sk-proj-...` or `sk-...`
+- **Required**: ✅ **Yes**
+- **Models**: GPT-4, GPT-4 Turbo, GPT-3.5 Turbo, O1 models
+- **Get Key**: [OpenAI Platform](https://platform.openai.com/api-keys)
+
+```bash
+OPENAI_API_KEY="sk-proj-your-key-here"
+```
+
+### GOOGLE_API_KEY
+- **Provider**: Google Gemini models
+- **Format**: Various formats
+- **Required**: ✅ **Yes**
+- **Models**: Gemini Pro, Gemini Flash, Gemini Ultra
+- **Get Key**: [Google AI Studio](https://aistudio.google.com/app/apikey)
+- **Alternative**: Use `GOOGLE_APPLICATION_CREDENTIALS` for service account (Google Vertex)
+
+```bash
+GOOGLE_API_KEY="your-google-api-key-here"
+```
+
+### GROQ_API_KEY
+- **Provider**: Groq (High-performance inference)
+- **Required**: ✅ **Yes**
+- **Models**: Llama models, Mixtral models (via Groq)
+- **Get Key**: [Groq Console](https://console.groq.com/keys)
+
+```bash
+GROQ_API_KEY="your-groq-key-here"
+```
+
+### OPENROUTER_API_KEY
+- **Provider**: OpenRouter (Multiple model access)
+- **Required**: ✅ **Yes**
+- **Models**: Access to various models through single API
+- **Get Key**: [OpenRouter](https://openrouter.ai/keys)
+
+```bash
+OPENROUTER_API_KEY="your-openrouter-key-here"
+```
+
+### AZURE_OPENAI_API_KEY
+- **Provider**: Azure OpenAI Service
+- **Required**: ✅ **Yes**
+- **Requirements**: Also requires `AZURE_OPENAI_ENDPOINT` configuration
+- **Models**: GPT models via Azure
+- **Get Key**: [Azure Portal](https://portal.azure.com/)
+
+```bash
+AZURE_OPENAI_API_KEY="your-azure-key-here"
+```
+
+### XAI_API_KEY
+- **Provider**: xAI (Grok) models
+- **Required**: ✅ **Yes**
+- **Models**: Grok models
+- **Get Key**: [xAI Console](https://console.x.ai/)
+
+```bash
+XAI_API_KEY="your-xai-key-here"
+```
+
+## Optional API Keys
+
+> **Note**: These API keys are optional - providers will work without them or use alternative authentication methods.
+
+### AWS_ACCESS_KEY_ID (Bedrock)
+- **Provider**: AWS Bedrock
+- **Required**: ❌ **No** (uses AWS credential chain)
+- **Models**: Claude models via AWS Bedrock
+- **Authentication**: Uses AWS credential chain (profiles, IAM roles, etc.)
+- **Get Key**: [AWS Console](https://console.aws.amazon.com/iam/)
+
+```bash
+# Optional - AWS credential chain is preferred
+AWS_ACCESS_KEY_ID="your-aws-access-key"
+AWS_SECRET_ACCESS_KEY="your-aws-secret-key"
+```
+
+### CLAUDE_CODE_API_KEY
+- **Provider**: Claude Code CLI
+- **Required**: ❌ **No** (uses OAuth tokens)
+- **Purpose**: Integration with local Claude Code CLI
+- **Authentication**: Uses OAuth tokens, no API key needed
+
+```bash
+# Not typically needed
+CLAUDE_CODE_API_KEY="not-usually-required"
+```
+
+### GEMINI_API_KEY
+- **Provider**: Gemini CLI
+- **Required**: ❌ **No** (uses OAuth authentication)
+- **Purpose**: Integration with Gemini CLI
+- **Authentication**: Primarily uses OAuth via CLI, API key is optional
+
+```bash
+# Optional - OAuth via CLI is preferred
+GEMINI_API_KEY="your-gemini-key-here"
+```
+
+### GROK_CLI_API_KEY
+- **Provider**: Grok CLI
+- **Required**: ❌ **No** (can use CLI config)
+- **Purpose**: Integration with Grok CLI
+- **Authentication**: Can use Grok CLI's own config file
+
+```bash
+# Optional - CLI config is preferred
+GROK_CLI_API_KEY="your-grok-cli-key"
+```
+
+### OLLAMA_API_KEY
+- **Provider**: Ollama (Local/Remote)
+- **Required**: ❌ **No** (local installation doesn't need key)
+- **Purpose**: For remote Ollama servers that require authentication
+- **Requirements**: Only needed for remote servers with authentication
+- **Note**: Not needed for local Ollama installations
+
+```bash
+# Only needed for remote Ollama servers
+OLLAMA_API_KEY="your-ollama-api-key-here"
+```
+
+### GITHUB_API_KEY
+- **Provider**: GitHub (Import/Export features)
+- **Format**: `ghp_...` or `github_pat_...`
+- **Required**: ❌ **No** (for GitHub features only)
+- **Purpose**: GitHub import/export features
+- **Get Key**: [GitHub Settings](https://github.com/settings/tokens)
+
+```bash
+GITHUB_API_KEY="ghp-your-github-key-here"
+```
+
+## Configuration Methods
+
+### Method 1: Environment File (.env)
+Create a `.env` file in your project root:
+
+```bash
+# Copy from .env.example
+cp .env.example .env
+
+# Edit with your keys
+vim .env
+```
+
+### Method 2: System Environment Variables
+```bash
+export ANTHROPIC_API_KEY="your-key-here"
+export PERPLEXITY_API_KEY="your-key-here"
+# ... other keys
+```
+
+### Method 3: MCP Server Configuration
+For Claude Code integration, configure keys in `.mcp.json`:
+
+```json
+{
+  "mcpServers": {
+    "task-master-ai": {
+      "command": "npx",
+      "args": ["-y", "task-master-ai"],
+      "env": {
+        "ANTHROPIC_API_KEY": "your-key-here",
+        "PERPLEXITY_API_KEY": "your-key-here",
+        "OPENAI_API_KEY": "your-key-here"
+      }
+    }
+  }
+}
+```
+
+## Key Requirements
+
+### Minimum Requirements
+- **At least one** AI provider key is required
+- **ANTHROPIC_API_KEY** is recommended as the primary provider
+- **PERPLEXITY_API_KEY** is highly recommended for research features
+
+### Provider-Specific Requirements
+- **Azure OpenAI**: Requires both `AZURE_OPENAI_API_KEY` and `AZURE_OPENAI_ENDPOINT` configuration
+- **Google Vertex**: Requires `VERTEX_PROJECT_ID` and `VERTEX_LOCATION` environment variables
+- **AWS Bedrock**: Uses AWS credential chain (profiles, IAM roles, etc.) instead of API keys
+- **Ollama**: Only needs API key for remote servers with authentication
+- **CLI Providers**: Gemini CLI, Grok CLI, and Claude Code use OAuth/CLI config instead of API keys
+
+## Model Configuration
+
+After setting up API keys, configure which models to use:
+
+```bash
+# Interactive model setup
+task-master models --setup
+
+# Set specific models
+task-master models --set-main claude-3-5-sonnet-20241022
+task-master models --set-research perplexity-llama-3.1-sonar-large-128k-online
+task-master models --set-fallback gpt-4o-mini
+```
+
+## Security Best Practices
+
+1. **Never commit API keys** to version control
+2. **Use .env files** and add them to `.gitignore`
+3. **Rotate keys regularly** especially if compromised
+4. **Use minimal permissions** for service accounts
+5. **Monitor usage** to detect unauthorized access
+
+## Troubleshooting
+
+### Key Validation
+```bash
+# Check if keys are properly configured
+task-master models
+
+# Test specific provider
+task-master add-task --prompt="test task" --model=claude-3-5-sonnet-20241022
+```
+
+### Common Issues
+- **Invalid key format**: Check the expected format for each provider
+- **Insufficient permissions**: Ensure keys have necessary API access
+- **Rate limits**: Some providers have usage limits
+- **Regional restrictions**: Some models may not be available in all regions
+
+### Getting Help
+If you encounter issues with API key configuration:
+- Check the [FAQ](/getting-started/faq) for common solutions
+- Join our [Discord community](https://discord.gg/fWJkU7rf) for support
+- Report issues on [GitHub](https://github.com/eyaltoledano/claude-task-master/issues)

apps/docs/getting-started/quick-start/configuration-quick.mdx

@@ -108,5 +108,5 @@ You don’t need to configure everything up front. Most settings can be left as
 </Accordion>
 
 <Note>
-For advanced configuration options and detailed customization, see our [Advanced Configuration Guide](/docs/best-practices/configuration-advanced) page.
+For advanced configuration options and detailed customization, see our [Advanced Configuration Guide](/best-practices/configuration-advanced) page.
 </Note>

apps/docs/getting-started/quick-start/execute-quick.mdx

@@ -56,4 +56,4 @@ If you ran into problems and had to debug errors you can create new rules as you
 
 By now you have all you need to get started executing code faster and smarter with Task Master.
 
-If you have any questions please check out [Frequently Asked Questions](/docs/getting-started/faq)
+If you have any questions please check out [Frequently Asked Questions](/getting-started/faq)

apps/docs/getting-started/quick-start/installation.mdx

@@ -30,6 +30,19 @@ cursor://anysphere.cursor-deeplink/mcp/install?name=taskmaster-ai&config=eyJjb21
 ```
 
 > **Note:** After clicking the link, you'll still need to add your API keys to the configuration. The link installs the MCP server with placeholder keys that you'll need to replace with your actual API keys.
+
+### Claude Code Quick Install
+
+For Claude Code users:
+
+```bash
+claude mcp add taskmaster-ai -- npx -y task-master-ai
+```
+
+Don't forget to add your API keys to the configuration:
+- in the root .env of your Project
+- in the "env" section of your mcp config for taskmaster-ai
+
 </Accordion>
 ## Installation Options
 

apps/docs/getting-started/quick-start/quick-start.mdx

@@ -6,13 +6,13 @@ sidebarTitle: "Quick Start"
 This guide is for new users who want to start using Task Master with minimal setup time.
 
 It covers:
-- [Requirements](/docs/getting-started/quick-start/requirements): You will need Node.js and an AI model API Key.
-- [Installation](/docs/getting-started/quick-start/installation): How to Install Task Master.
-- [Configuration](/docs/getting-started/quick-start/configuration-quick): Setting up your API Key, MCP, and more.
-- [PRD](/docs/getting-started/quick-start/prd-quick): Writing and parsing your first PRD.
-- [Task Setup](/docs/getting-started/quick-start/tasks-quick): Preparing your tasks for execution.
-- [Executing Tasks](/docs/getting-started/quick-start/execute-quick): Using Task Master to execute tasks.
-- [Rules & Context](/docs/getting-started/quick-start/rules-quick): Learn how and why to build context in your project over time.
+- [Requirements](/getting-started/quick-start/requirements): You will need Node.js and an AI model API Key.
+- [Installation](/getting-started/quick-start/installation): How to Install Task Master.
+- [Configuration](/getting-started/quick-start/configuration-quick): Setting up your API Key, MCP, and more.
+- [PRD](/getting-started/quick-start/prd-quick): Writing and parsing your first PRD.
+- [Task Setup](/getting-started/quick-start/tasks-quick): Preparing your tasks for execution.
+- [Executing Tasks](/getting-started/quick-start/execute-quick): Using Task Master to execute tasks.
+- [Rules & Context](/getting-started/quick-start/rules-quick): Learn how and why to build context in your project over time.
 
 <Tip>
 By the end of this guide, you'll have everything you need to begin working productively with Task Master.

apps/docs/getting-started/quick-start/tasks-quick.mdx

@@ -61,9 +61,25 @@ Task Master can provide a complexity report which can be helpful to read before
 Can you analyze the complexity of our tasks to help me understand which ones need to be broken down further?
 ```
 
+The agent will use the `analyze_project_complexity` MCP tool, or you can run it directly with the CLI command:
+```bash
+task-master analyze-complexity
+```
+
+For more comprehensive analysis using your configured research model, you can use:
+```bash
+task-master analyze-complexity --research
+```
+
+<Tip>
+The `--research` flag uses whatever research model you have configured in `.taskmaster/config.json` (configurable via `task-master models --setup`) for research-backed complexity analysis, providing more informed recommendations.
+</Tip>
+
 You can view the report in a friendly table using:
 ```
 Can you show me the complexity report in a more readable format?
 ```
 
-<Check>Now you are ready to begin [executing tasks](/docs/getting-started/quick-start/execute-quick)</Check>
+For more detailed CLI options, see the [Analyze Task Complexity](/capabilities/cli-root-commands#analyze-task-complexity) section.
+
+<Check>Now you are ready to begin [executing tasks](/getting-started/quick-start/execute-quick)</Check>

apps/docs/introduction.mdx

@@ -4,7 +4,7 @@ Welcome to v1 of the Task Master Docs. Expect weekly updates as we expand and re
 
 We've organized the docs into three sections depending on your experience level and goals:
 
-### Getting Started - Jump in to [Quick Start](/docs/getting-started/quick-start)
+### Getting Started - Jump in to [Quick Start](/getting-started/quick-start)
 Designed for first-time users. Get set up, create your first PRD, and run your first task.
 
 ### Best Practices

apps/extension/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## 0.25.4
+
+### Patch Changes
+
+- Updated dependencies [[`af53525`](https://github.com/eyaltoledano/claude-task-master/commit/af53525cbc660a595b67d4bb90d906911c71f45d)]:
+  - task-master-ai@0.27.3
+
+## 0.25.3
+
+### Patch Changes
+
+- Updated dependencies [[`044a7bf`](https://github.com/eyaltoledano/claude-task-master/commit/044a7bfc98049298177bc655cf341d7a8b6a0011)]:
+  - task-master-ai@0.27.2
+
 ## 0.25.2
 
 ### Patch Changes

apps/extension/package.json

@@ -3,7 +3,7 @@
 	"private": true,
 	"displayName": "TaskMaster",
 	"description": "A visual Kanban board interface for TaskMaster projects in VS Code",
-	"version": "0.25.2",
+	"version": "0.25.4",
 	"publisher": "Hamster",
 	"icon": "assets/icon.png",
 	"engines": {
@@ -240,7 +240,7 @@
 		"check-types": "tsc --noEmit"
 	},
 	"dependencies": {
-		"task-master-ai": "0.27.1"
+		"task-master-ai": "*"
 	},
 	"devDependencies": {
 		"@dnd-kit/core": "^6.3.1",
@@ -276,7 +276,8 @@
 		"react-dom": "^19.0.0",
 		"tailwind-merge": "^3.3.1",
 		"tailwindcss": "4.1.11",
-		"typescript": "^5.7.3"
+		"typescript": "^5.9.2",
+		"@tm/core": "*"
 	},
 	"overrides": {
 		"glob@<8": "^10.4.5",

apps/extension/package.publish.json

@@ -2,7 +2,7 @@
 	"name": "task-master-hamster",
 	"displayName": "Taskmaster AI",
 	"description": "A visual Kanban board interface for Taskmaster projects in VS Code",
-	"version": "0.23.1",
+	"version": "0.25.3",
 	"publisher": "Hamster",
 	"icon": "assets/icon.png",
 	"engines": {

apps/extension/tsconfig.json

@@ -5,7 +5,6 @@
 		"outDir": "out",
 		"lib": ["ES2022", "DOM"],
 		"sourceMap": true,
-		"rootDir": "src",
 		"strict": true /* enable all strict type-checking options */,
 		"moduleResolution": "Node",
 		"esModuleInterop": true,
@@ -21,8 +20,10 @@
 			"@/*": ["./src/*"],
 			"@/components/*": ["./src/components/*"],
 			"@/lib/*": ["./src/lib/*"],
-			"@tm/core": ["../core/src"]
+			"@tm/core": ["../../packages/tm-core/src/index.ts"],
+			"@tm/core/*": ["../../packages/tm-core/src/*"]
 		}
 	},
+	"include": ["src/**/*"],
 	"exclude": ["node_modules", ".vscode-test", "out", "dist"]
 }

docs/claude-code-integration.md

@@ -0,0 +1,231 @@
+# TODO: Move to apps/docs inside our documentation website
+
+# Claude Code Integration Guide
+
+This guide covers how to use Task Master with Claude Code AI SDK integration for enhanced AI-powered development workflows.
+
+## Overview
+
+Claude Code integration allows Task Master to leverage the Claude Code CLI for AI operations without requiring direct API keys. The integration uses OAuth tokens managed by the Claude Code CLI itself.
+
+## Authentication Setup
+
+The Claude Code provider uses token authentication managed by the Claude Code CLI.
+
+### Prerequisites
+
+1. **Install Claude Code CLI** (if not already installed):
+
+   ```bash
+   # Installation method depends on your system
+   # Follow Claude Code documentation for installation
+   ```
+
+2. **Set up OAuth token** using Claude Code CLI:
+
+   ```bash
+   claude setup-token
+   ```
+
+   This command will:
+   - Guide you through OAuth authentication
+   - Store the token securely for CLI usage
+   - Enable Task Master to use Claude Code without manual API key configuration
+
+### Authentication Priority
+
+Task Master will attempt authentication in this order:
+
+1. **Environment Variable** (optional): `CLAUDE_CODE_OAUTH_TOKEN`
+   - Useful for CI/CD environments or when you want to override the default token
+   - Not required if you've set up the CLI token
+
+2. **Claude Code CLI Token** (recommended): Token managed by `claude setup-token`
+   - Automatically used when available
+   - Most convenient for local development
+
+3. **Fallback**: Error if neither is available
+
+## Configuration
+
+### Basic Configuration
+
+Add Claude Code to your Task Master configuration:
+
+```javascript
+// In your .taskmaster/config.json or via task-master models command
+{
+  "models": {
+    "main": "claude-code:sonnet",      // Use Claude Code with Sonnet
+    "research": "perplexity-llama-3.1-sonar-large-128k-online",
+    "fallback": "claude-code:opus"     // Use Claude Code with Opus as fallback
+  }
+}
+```
+
+### Supported Models
+
+- `claude-code:sonnet` - Claude 3.5 Sonnet via Claude Code CLI
+- `claude-code:opus` - Claude 3 Opus via Claude Code CLI
+
+### Environment Variables (Optional)
+
+While not required, you can optionally set:
+
+```bash
+export CLAUDE_CODE_OAUTH_TOKEN="your_oauth_token_here"
+```
+
+This is only needed in specific scenarios like:
+
+- CI/CD pipelines
+- Docker containers
+- When you want to use a different token than the CLI default
+
+## Usage Examples
+
+### Basic Task Operations
+
+```bash
+# Use Claude Code for task operations
+task-master add-task --prompt="Implement user authentication system" --research
+task-master expand --id=1 --research
+task-master update-task --id=1.1 --prompt="Add JWT token validation"
+```
+
+### Model Configuration Commands
+
+```bash
+# Set Claude Code as main model
+task-master models --set-main claude-code:sonnet
+
+# Use interactive setup
+task-master models --setup
+# Then select "claude-code" from the provider list
+```
+
+## Troubleshooting
+
+### Common Issues
+
+#### 1. "Claude Code CLI not available" Error
+
+**Problem**: Task Master cannot connect to Claude Code CLI.
+
+**Solutions**:
+
+- Ensure Claude Code CLI is installed and in your PATH
+- Run `claude setup-token` to configure authentication
+- Verify Claude Code CLI works: `claude --help`
+
+#### 2. Authentication Failures
+
+**Problem**: Token authentication is failing.
+
+**Solutions**:
+
+- Re-run `claude setup-token` to refresh your OAuth token
+- Check if your token has expired
+- Verify Claude Code CLI can authenticate: try a simple `claude` command
+
+#### 3. Model Not Available
+
+**Problem**: Specified Claude Code model is not supported.
+
+**Solutions**:
+
+- Use supported models: `sonnet` or `opus`
+- Check model availability: `task-master models --list`
+- Verify your Claude Code CLI has access to the requested model
+
+### Debug Steps
+
+1. **Test Claude Code CLI directly**:
+
+   ```bash
+   claude --help
+   # Should show help without errors
+   ```
+
+2. **Test authentication**:
+
+   ```bash
+   claude setup-token --verify
+   # Should confirm token is valid
+   ```
+
+3. **Test Task Master integration**:
+
+   ```bash
+   task-master models --test claude-code:sonnet
+   # Should successfully connect and test the model
+   ```
+
+4. **Check logs**:
+   - Task Master logs will show detailed error messages
+   - Use `--verbose` flag for more detailed output
+
+### Environment-Specific Configuration
+
+#### Docker/Containers
+
+When running in Docker, you'll need to:
+
+1. Install Claude Code CLI in your container
+2. Set up authentication via environment variable:
+
+   ```dockerfile
+   ENV CLAUDE_CODE_OAUTH_TOKEN="your_token_here"
+   ```
+
+#### CI/CD Pipelines
+
+For automated environments:
+
+1. Set up a service account token or use environment variables
+2. Ensure Claude Code CLI is available in the pipeline environment
+3. Configure authentication before running Task Master commands
+
+## Integration with AI SDK
+
+Task Master's Claude Code integration uses the official `ai-sdk-provider-claude-code` package, providing:
+
+- **Streaming Support**: Real-time token streaming for interactive experiences
+- **Full AI SDK Compatibility**: Works with generateText, streamText, and other AI SDK functions
+- **Automatic Error Handling**: Graceful degradation when Claude Code is unavailable
+- **Type Safety**: Full TypeScript support with proper type definitions
+
+### Example AI SDK Usage
+
+```javascript
+import { generateText } from 'ai';
+import { ClaudeCodeProvider } from './src/ai-providers/claude-code.js';
+
+const provider = new ClaudeCodeProvider();
+const client = provider.getClient();
+
+const result = await generateText({
+  model: client('sonnet'),
+  messages: [
+    { role: 'user', content: 'Hello Claude!' }
+  ]
+});
+
+console.log(result.text);
+```
+
+## Security Notes
+
+- OAuth tokens are managed securely by Claude Code CLI
+- No API keys need to be stored in your project files
+- Tokens are automatically refreshed by the Claude Code CLI
+- Environment variables should only be used in secure environments
+
+## Getting Help
+
+If you encounter issues:
+
+1. Check the Claude Code CLI documentation
+2. Verify your authentication setup with `claude setup-token --verify`
+3. Review Task Master logs for detailed error messages
+4. Open an issue with both Task Master and Claude Code version information

docs/configuration.md

@@ -235,6 +235,60 @@ node scripts/init.js
    - "MCP provider requires session context" → Ensure running in MCP environment
    - See the [MCP Provider Guide](./mcp-provider-guide.md) for detailed troubleshooting
 
+### MCP Timeout Configuration
+
+Long-running AI operations in taskmaster-ai can exceed the default 60-second MCP timeout. Operations like `parse_prd`, `expand_task`, `research`, and `analyze_project_complexity` may take 2-5 minutes to complete.
+
+#### Adding Timeout Configuration
+
+Add a `timeout` parameter to your MCP configuration to extend the timeout limit. The timeout configuration works identically across MCP clients including Cursor, Windsurf, and RooCode:
+
+```json
+{
+  "mcpServers": {
+    "task-master-ai": {
+      "command": "npx",
+      "args": ["-y", "--package=task-master-ai", "task-master-ai"],
+      "timeout": 300,
+      "env": {
+        "ANTHROPIC_API_KEY": "your-anthropic-api-key"
+      }
+    }
+  }
+}
+```
+
+**Configuration Details:**
+- **`timeout: 300`** - Sets timeout to 300 seconds (5 minutes)
+- **Value range**: 1-3600 seconds (1 second to 1 hour)
+- **Recommended**: 300 seconds provides sufficient time for most AI operations
+- **Format**: Integer value in seconds (not milliseconds)
+
+#### Automatic Setup
+
+When adding taskmaster rules for supported editors, the timeout configuration is automatically included:
+
+```bash
+# Automatically includes timeout configuration
+task-master rules add cursor
+task-master rules add roo
+task-master rules add windsurf
+task-master rules add vscode
+```
+
+#### Troubleshooting Timeouts
+
+If you're still experiencing timeout errors:
+
+1. **Verify configuration**: Check that `timeout: 300` is present in your MCP config
+2. **Restart editor**: Restart your editor after making configuration changes
+3. **Increase timeout**: For very complex operations, try `timeout: 600` (10 minutes)
+4. **Check API keys**: Ensure required API keys are properly configured
+
+**Expected behavior:**
+- **Before fix**: Operations fail after 60 seconds with `MCP request timed out after 60000ms`
+- **After fix**: Operations complete successfully within the configured timeout limit
+
 ### Google Vertex AI Configuration
 
 Google Vertex AI is Google Cloud's enterprise AI platform and requires specific configuration:

docs/models.md

@@ -1,4 +1,4 @@
-# Available Models as of September 19, 2025
+# Available Models as of September 23, 2025
 
 ## Main Models
 
@@ -119,7 +119,7 @@
 | groq        | deepseek-r1-distill-llama-70b                | 0.52      | 0.75       | 0.99        |
 | perplexity  | sonar-pro                                    | —         | 3          | 15          |
 | perplexity  | sonar                                        | —         | 1          | 1           |
-| perplexity  | deep-research                                | 0.211     | 2          | 8           |
+| perplexity  | sonar-deep-research                          | 0.211     | 2          | 8           |
 | perplexity  | sonar-reasoning-pro                          | 0.211     | 2          | 8           |
 | perplexity  | sonar-reasoning                              | 0.211     | 1          | 5           |
 | bedrock     | us.anthropic.claude-3-opus-20240229-v1:0     | 0.725     | 15         | 75          |

mcp-server/src/custom-sdk/schema-converter.js

@@ -75,13 +75,50 @@ function generateExampleFromSchema(schema) {
 			return result;
 
 		case 'ZodString':
-			return 'string';
+			// Check for min/max length constraints
+			if (def.checks) {
+				const minCheck = def.checks.find((c) => c.kind === 'min');
+				const maxCheck = def.checks.find((c) => c.kind === 'max');
+				if (minCheck && maxCheck) {
+					return (
+						'<string between ' +
+						minCheck.value +
+						'-' +
+						maxCheck.value +
+						' characters>'
+					);
+				} else if (minCheck) {
+					return '<string with at least ' + minCheck.value + ' characters>';
+				} else if (maxCheck) {
+					return '<string up to ' + maxCheck.value + ' characters>';
+				}
+			}
+			return '<string>';
 
 		case 'ZodNumber':
-			return 0;
+			// Check for int, positive, min/max constraints
+			if (def.checks) {
+				const intCheck = def.checks.find((c) => c.kind === 'int');
+				const minCheck = def.checks.find((c) => c.kind === 'min');
+				const maxCheck = def.checks.find((c) => c.kind === 'max');
+
+				if (intCheck && minCheck && minCheck.value > 0) {
+					return '<positive integer>';
+				} else if (intCheck) {
+					return '<integer>';
+				} else if (minCheck || maxCheck) {
+					return (
+						'<number' +
+						(minCheck ? ' >= ' + minCheck.value : '') +
+						(maxCheck ? ' <= ' + maxCheck.value : '') +
+						'>'
+					);
+				}
+			}
+			return '<number>';
 
 		case 'ZodBoolean':
-			return false;
+			return '<boolean>';
 
 		case 'ZodArray':
 			const elementExample = generateExampleFromSchema(def.type);

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "task-master-ai",
-	"version": "0.27.1",
+	"version": "0.27.3",
 	"description": "A task management system for ambitious AI-driven development that doesn't overwhelm and confuse Cursor.",
 	"main": "index.js",
 	"type": "module",
@@ -17,7 +17,7 @@
 		"turbo:build": "turbo build",
 		"turbo:typecheck": "turbo typecheck",
 		"build:build-config": "npm run build -w @tm/build-config",
-		"test": "node --experimental-vm-modules node_modules/.bin/jest",
+		"test": "cross-env NODE_ENV=test node --experimental-vm-modules node_modules/.bin/jest",
 		"test:unit": "node --experimental-vm-modules node_modules/.bin/jest --testPathPattern=unit",
 		"test:integration": "node --experimental-vm-modules node_modules/.bin/jest --testPathPattern=integration",
 		"test:fails": "node --experimental-vm-modules node_modules/.bin/jest --onlyFailures",
@@ -52,23 +52,26 @@
 	"author": "Eyal Toledano",
 	"license": "MIT WITH Commons-Clause",
 	"dependencies": {
-		"@ai-sdk/amazon-bedrock": "^2.2.9",
-		"@ai-sdk/anthropic": "^1.2.10",
-		"@ai-sdk/azure": "^1.3.17",
-		"@ai-sdk/google": "^1.2.13",
-		"@ai-sdk/google-vertex": "^2.2.23",
-		"@ai-sdk/groq": "^1.2.9",
-		"@ai-sdk/mistral": "^1.2.7",
-		"@ai-sdk/openai": "^1.3.20",
-		"@ai-sdk/perplexity": "^1.1.7",
-		"@ai-sdk/xai": "^1.2.15",
-		"@anthropic-ai/sdk": "^0.39.0",
-		"@aws-sdk/credential-providers": "^3.817.0",
+		"@ai-sdk/amazon-bedrock": "^3.0.23",
+		"@ai-sdk/anthropic": "^2.0.18",
+		"@ai-sdk/azure": "^2.0.34",
+		"@ai-sdk/google": "^2.0.16",
+		"@ai-sdk/google-vertex": "^3.0.29",
+		"@ai-sdk/groq": "^2.0.21",
+		"@ai-sdk/mistral": "^2.0.16",
+		"@ai-sdk/openai": "^2.0.34",
+		"@ai-sdk/perplexity": "^2.0.10",
+		"@ai-sdk/provider": "^2.0.0",
+		"@ai-sdk/provider-utils": "^3.0.10",
+		"@ai-sdk/xai": "^2.0.22",
+		"@aws-sdk/credential-providers": "^3.895.0",
 		"@inquirer/search": "^3.0.15",
-		"@openrouter/ai-sdk-provider": "^0.4.5",
+		"@openrouter/ai-sdk-provider": "^1.2.0",
 		"@streamparser/json": "^0.0.22",
 		"@supabase/supabase-js": "^2.57.4",
-		"ai": "^4.3.10",
+		"ai": "^5.0.51",
+		"ai-sdk-provider-claude-code": "^1.1.4",
+		"ai-sdk-provider-gemini-cli": "^1.1.1",
 		"ajv": "^8.17.1",
 		"ajv-formats": "^3.0.1",
 		"boxen": "^8.0.1",
@@ -78,7 +81,7 @@
 		"cli-table3": "^0.6.5",
 		"commander": "^12.1.0",
 		"cors": "^2.8.5",
-		"dotenv": "^16.3.1",
+		"dotenv": "^16.6.1",
 		"express": "^4.21.2",
 		"fastmcp": "^3.5.0",
 		"figlet": "^1.8.0",
@@ -93,17 +96,14 @@
 		"lru-cache": "^10.2.0",
 		"marked": "^15.0.12",
 		"marked-terminal": "^7.3.0",
-		"ollama-ai-provider": "^1.2.0",
-		"openai": "^4.89.0",
+		"ollama-ai-provider-v2": "^1.3.1",
 		"ora": "^8.2.0",
 		"uuid": "^11.1.0",
-		"zod": "^3.23.8",
-		"zod-to-json-schema": "^3.24.5"
+		"zod": "^4.1.11"
 	},
 	"optionalDependencies": {
 		"@anthropic-ai/claude-code": "^1.0.88",
-		"@biomejs/cli-linux-x64": "^1.9.4",
-		"ai-sdk-provider-gemini-cli": "^0.1.3"
+		"@biomejs/cli-linux-x64": "^1.9.4"
 	},
 	"engines": {
 		"node": ">=18.0.0"
@@ -127,12 +127,12 @@
 		"@changesets/changelog-github": "^0.5.1",
 		"@changesets/cli": "^2.28.1",
 		"@manypkg/cli": "^0.25.1",
+		"@tm/ai-sdk-provider-grok-cli": "*",
 		"@tm/cli": "*",
 		"@types/jest": "^29.5.14",
 		"@types/marked-terminal": "^6.1.1",
 		"concurrently": "^9.2.1",
 		"cross-env": "^10.0.0",
-		"dotenv-mono": "^1.5.1",
 		"execa": "^8.0.1",
 		"jest": "^29.7.0",
 		"jest-environment-node": "^29.7.0",
@@ -142,7 +142,7 @@
 		"ts-jest": "^29.4.2",
 		"tsdown": "^0.15.2",
 		"tsx": "^4.20.4",
-		"turbo": "^2.5.6",
-		"typescript": "^5.7.3"
+		"turbo": "2.5.6",
+		"typescript": "^5.9.2"
 	}
 }

packages/ai-sdk-provider-grok-cli/README.md

@@ -0,0 +1,165 @@
+# AI SDK Provider for Grok CLI
+
+A provider for the [AI SDK](https://sdk.vercel.ai) that integrates with [Grok CLI](https://docs.x.ai/api) for accessing xAI's Grok language models.
+
+## Features
+
+- ✅ **AI SDK v5 Compatible** - Full support for the latest AI SDK interfaces
+- ✅ **Streaming & Non-streaming** - Both generation modes supported
+- ✅ **Error Handling** - Comprehensive error handling with retry logic
+- ✅ **Type Safety** - Full TypeScript support with proper type definitions
+- ✅ **JSON Mode** - Automatic JSON extraction from responses
+- ✅ **Abort Signals** - Proper cancellation support
+
+## Installation
+
+```bash
+npm install @tm/ai-sdk-provider-grok-cli
+# or
+yarn add @tm/ai-sdk-provider-grok-cli
+```
+
+## Prerequisites
+
+1. Install the Grok CLI:
+
+   ```bash
+   npm install -g grok-cli
+   # or follow xAI's installation instructions
+   ```
+
+2. Set up authentication:
+
+   ```bash
+   export GROK_CLI_API_KEY="your-api-key"
+   # or configure via grok CLI: grok config set api-key your-key
+   ```
+
+## Usage
+
+### Basic Usage
+
+```typescript
+import { grokCli } from '@tm/ai-sdk-provider-grok-cli';
+import { generateText } from 'ai';
+
+const result = await generateText({
+  model: grokCli('grok-3-latest'),
+  prompt: 'Write a haiku about TypeScript'
+});
+
+console.log(result.text);
+```
+
+### Streaming
+
+```typescript
+import { grokCli } from '@tm/ai-sdk-provider-grok-cli';
+import { streamText } from 'ai';
+
+const { textStream } = await streamText({
+  model: grokCli('grok-4-latest'),
+  prompt: 'Explain quantum computing'
+});
+
+for await (const delta of textStream) {
+  process.stdout.write(delta);
+}
+```
+
+### JSON Mode
+
+```typescript
+import { grokCli } from '@tm/ai-sdk-provider-grok-cli';
+import { generateObject } from 'ai';
+import { z } from 'zod';
+
+const result = await generateObject({
+  model: grokCli('grok-3-latest'),
+  schema: z.object({
+    name: z.string(),
+    age: z.number(),
+    hobbies: z.array(z.string())
+  }),
+  prompt: 'Generate a person profile'
+});
+
+console.log(result.object);
+```
+
+## Supported Models
+
+- `grok-3-latest` - Grok 3 (latest version)
+- `grok-4-latest` - Grok 4 (latest version)
+- `grok-4` - Grok 4 (stable)
+- Custom model strings supported
+
+## Configuration
+
+### Provider Settings
+
+```typescript
+import { createGrokCli } from '@tm/ai-sdk-provider-grok-cli';
+
+const grok = createGrokCli({
+  apiKey: 'your-api-key', // Optional if set via env/CLI
+  timeout: 120000, // 2 minutes default
+  workingDirectory: '/path/to/project', // Optional
+  baseURL: 'https://api.x.ai' // Optional
+});
+```
+
+### Model Settings
+
+```typescript
+const model = grok('grok-4-latest', {
+  timeout: 300000, // 5 minutes for grok-4
+  // Other CLI-specific settings
+});
+```
+
+## Error Handling
+
+The provider includes comprehensive error handling:
+
+```typescript
+import {
+  isAuthenticationError,
+  isTimeoutError,
+  isInstallationError
+} from '@tm/ai-sdk-provider-grok-cli';
+
+try {
+  const result = await generateText({
+    model: grokCli('grok-4-latest'),
+    prompt: 'Hello!'
+  });
+} catch (error) {
+  if (isAuthenticationError(error)) {
+    console.error('Authentication failed:', error.message);
+  } else if (isTimeoutError(error)) {
+    console.error('Request timed out:', error.message);
+  } else if (isInstallationError(error)) {
+    console.error('Grok CLI not installed or not found in PATH');
+  }
+}
+```
+
+## Development
+
+```bash
+# Install dependencies
+npm install
+
+# Start development mode (keep running during development)
+npm run dev
+
+# Type check
+npm run typecheck
+
+# Run tests (requires build first)
+NODE_ENV=production npm run build
+npm test
+```
+
+**Important**: Always run `npm run dev` and keep it running during development. This ensures proper compilation and hot-reloading of TypeScript files.

packages/ai-sdk-provider-grok-cli/package.json

@@ -0,0 +1,35 @@
+{
+	"name": "@tm/ai-sdk-provider-grok-cli",
+	"private": true,
+	"description": "AI SDK provider for Grok CLI integration",
+	"type": "module",
+	"types": "./src/index.ts",
+	"main": "./dist/index.js",
+	"exports": {
+		".": "./src/index.ts"
+	},
+	"scripts": {
+		"test": "vitest run",
+		"test:watch": "vitest",
+		"test:ui": "vitest --ui",
+		"typecheck": "tsc --noEmit"
+	},
+	"dependencies": {
+		"@ai-sdk/provider": "^2.0.0",
+		"@ai-sdk/provider-utils": "^3.0.10",
+		"jsonc-parser": "^3.3.1"
+	},
+	"devDependencies": {
+		"@types/node": "^22.18.6",
+		"typescript": "^5.9.2",
+		"vitest": "^3.2.4"
+	},
+	"engines": {
+		"node": ">=18"
+	},
+	"keywords": ["ai", "grok", "x.ai", "cli", "language-model", "provider"],
+	"files": ["dist/**/*", "README.md"],
+	"publishConfig": {
+		"access": "public"
+	}
+}

packages/ai-sdk-provider-grok-cli/src/errors.test.ts

@@ -0,0 +1,188 @@
+/**
+ * Tests for error handling utilities
+ */
+
+import { APICallError, LoadAPIKeyError } from '@ai-sdk/provider';
+import { describe, expect, it } from 'vitest';
+import {
+	createAPICallError,
+	createAuthenticationError,
+	createInstallationError,
+	createTimeoutError,
+	getErrorMetadata,
+	isAuthenticationError,
+	isInstallationError,
+	isTimeoutError
+} from './errors.js';
+
+describe('createAPICallError', () => {
+	it('should create APICallError with metadata', () => {
+		const error = createAPICallError({
+			message: 'Test error',
+			code: 'TEST_ERROR',
+			exitCode: 1,
+			stderr: 'Error output',
+			stdout: 'Success output',
+			promptExcerpt: 'Test prompt',
+			isRetryable: true
+		});
+
+		expect(error).toBeInstanceOf(APICallError);
+		expect(error.message).toBe('Test error');
+		expect(error.isRetryable).toBe(true);
+		expect(error.url).toBe('grok-cli://command');
+		expect(error.data).toEqual({
+			code: 'TEST_ERROR',
+			exitCode: 1,
+			stderr: 'Error output',
+			stdout: 'Success output',
+			promptExcerpt: 'Test prompt'
+		});
+	});
+
+	it('should create APICallError with minimal parameters', () => {
+		const error = createAPICallError({
+			message: 'Simple error'
+		});
+
+		expect(error).toBeInstanceOf(APICallError);
+		expect(error.message).toBe('Simple error');
+		expect(error.isRetryable).toBe(false);
+	});
+});
+
+describe('createAuthenticationError', () => {
+	it('should create LoadAPIKeyError with custom message', () => {
+		const error = createAuthenticationError({
+			message: 'Custom auth error'
+		});
+
+		expect(error).toBeInstanceOf(LoadAPIKeyError);
+		expect(error.message).toBe('Custom auth error');
+	});
+
+	it('should create LoadAPIKeyError with default message', () => {
+		const error = createAuthenticationError({});
+
+		expect(error).toBeInstanceOf(LoadAPIKeyError);
+		expect(error.message).toContain('Authentication failed');
+	});
+});
+
+describe('createTimeoutError', () => {
+	it('should create APICallError for timeout', () => {
+		const error = createTimeoutError({
+			message: 'Operation timed out',
+			timeoutMs: 5000,
+			promptExcerpt: 'Test prompt'
+		});
+
+		expect(error).toBeInstanceOf(APICallError);
+		expect(error.message).toBe('Operation timed out');
+		expect(error.isRetryable).toBe(true);
+		expect(error.data).toEqual({
+			code: 'TIMEOUT',
+			promptExcerpt: 'Test prompt',
+			timeoutMs: 5000
+		});
+	});
+});
+
+describe('createInstallationError', () => {
+	it('should create APICallError for installation issues', () => {
+		const error = createInstallationError({
+			message: 'CLI not found'
+		});
+
+		expect(error).toBeInstanceOf(APICallError);
+		expect(error.message).toBe('CLI not found');
+		expect(error.isRetryable).toBe(false);
+		expect(error.url).toBe('grok-cli://installation');
+	});
+
+	it('should create APICallError with default message', () => {
+		const error = createInstallationError({});
+
+		expect(error).toBeInstanceOf(APICallError);
+		expect(error.message).toContain('Grok CLI is not installed');
+	});
+});
+
+describe('isAuthenticationError', () => {
+	it('should return true for LoadAPIKeyError', () => {
+		const error = new LoadAPIKeyError({ message: 'Auth failed' });
+		expect(isAuthenticationError(error)).toBe(true);
+	});
+
+	it('should return true for APICallError with 401 exit code', () => {
+		const error = new APICallError({
+			message: 'Unauthorized',
+			data: { exitCode: 401 }
+		});
+		expect(isAuthenticationError(error)).toBe(true);
+	});
+
+	it('should return false for other errors', () => {
+		const error = new Error('Generic error');
+		expect(isAuthenticationError(error)).toBe(false);
+	});
+});
+
+describe('isTimeoutError', () => {
+	it('should return true for timeout APICallError', () => {
+		const error = new APICallError({
+			message: 'Timeout',
+			data: { code: 'TIMEOUT' }
+		});
+		expect(isTimeoutError(error)).toBe(true);
+	});
+
+	it('should return false for other errors', () => {
+		const error = new APICallError({ message: 'Other error' });
+		expect(isTimeoutError(error)).toBe(false);
+	});
+});
+
+describe('isInstallationError', () => {
+	it('should return true for installation APICallError', () => {
+		const error = new APICallError({
+			message: 'Not installed',
+			url: 'grok-cli://installation'
+		});
+		expect(isInstallationError(error)).toBe(true);
+	});
+
+	it('should return false for other errors', () => {
+		const error = new APICallError({ message: 'Other error' });
+		expect(isInstallationError(error)).toBe(false);
+	});
+});
+
+describe('getErrorMetadata', () => {
+	it('should return metadata from APICallError', () => {
+		const metadata = {
+			code: 'TEST_ERROR',
+			exitCode: 1,
+			stderr: 'Error output'
+		};
+		const error = new APICallError({
+			message: 'Test error',
+			data: metadata
+		});
+
+		const result = getErrorMetadata(error);
+		expect(result).toEqual(metadata);
+	});
+
+	it('should return undefined for errors without metadata', () => {
+		const error = new Error('Generic error');
+		const result = getErrorMetadata(error);
+		expect(result).toBeUndefined();
+	});
+
+	it('should return undefined for APICallError without data', () => {
+		const error = new APICallError({ message: 'Test error' });
+		const result = getErrorMetadata(error);
+		expect(result).toBeUndefined();
+	});
+});

packages/ai-sdk-provider-grok-cli/src/errors.ts

@@ -0,0 +1,187 @@
+/**
+ * Error handling utilities for Grok CLI provider
+ */
+
+import { APICallError, LoadAPIKeyError } from '@ai-sdk/provider';
+import type { GrokCliErrorMetadata } from './types.js';
+
+/**
+ * Parameters for creating API call errors
+ */
+interface CreateAPICallErrorParams {
+	/** Error message */
+	message: string;
+	/** Error code */
+	code?: string;
+	/** Process exit code */
+	exitCode?: number;
+	/** Standard error output */
+	stderr?: string;
+	/** Standard output */
+	stdout?: string;
+	/** Excerpt of the prompt */
+	promptExcerpt?: string;
+	/** Whether the error is retryable */
+	isRetryable?: boolean;
+}
+
+/**
+ * Parameters for creating authentication errors
+ */
+interface CreateAuthenticationErrorParams {
+	/** Error message */
+	message?: string;
+}
+
+/**
+ * Parameters for creating timeout errors
+ */
+interface CreateTimeoutErrorParams {
+	/** Error message */
+	message: string;
+	/** Excerpt of the prompt */
+	promptExcerpt?: string;
+	/** Timeout in milliseconds */
+	timeoutMs: number;
+}
+
+/**
+ * Parameters for creating installation errors
+ */
+interface CreateInstallationErrorParams {
+	/** Error message */
+	message?: string;
+}
+
+/**
+ * Create an API call error with Grok CLI specific metadata
+ */
+export function createAPICallError({
+	message,
+	code,
+	exitCode,
+	stderr,
+	stdout,
+	promptExcerpt,
+	isRetryable = false
+}: CreateAPICallErrorParams): APICallError {
+	const metadata: GrokCliErrorMetadata = {
+		code,
+		exitCode,
+		stderr,
+		stdout,
+		promptExcerpt
+	};
+
+	return new APICallError({
+		message,
+		isRetryable,
+		url: 'grok-cli://command',
+		requestBodyValues: promptExcerpt ? { prompt: promptExcerpt } : undefined,
+		data: metadata
+	});
+}
+
+/**
+ * Create an authentication error
+ */
+export function createAuthenticationError({
+	message
+}: CreateAuthenticationErrorParams): LoadAPIKeyError {
+	return new LoadAPIKeyError({
+		message:
+			message ||
+			'Authentication failed. Please ensure Grok CLI is properly configured with API key.'
+	});
+}
+
+/**
+ * Create a timeout error
+ */
+export function createTimeoutError({
+	message,
+	promptExcerpt,
+	timeoutMs
+}: CreateTimeoutErrorParams): APICallError {
+	const metadata: GrokCliErrorMetadata & { timeoutMs: number } = {
+		code: 'TIMEOUT',
+		promptExcerpt,
+		timeoutMs
+	};
+
+	return new APICallError({
+		message,
+		isRetryable: true,
+		url: 'grok-cli://command',
+		requestBodyValues: promptExcerpt ? { prompt: promptExcerpt } : undefined,
+		data: metadata
+	});
+}
+
+/**
+ * Create a CLI installation error
+ */
+export function createInstallationError({
+	message
+}: CreateInstallationErrorParams): APICallError {
+	return new APICallError({
+		message:
+			message ||
+			'Grok CLI is not installed or not found in PATH. Please install with: npm install -g @vibe-kit/grok-cli',
+		isRetryable: false,
+		url: 'grok-cli://installation',
+		requestBodyValues: undefined
+	});
+}
+
+/**
+ * Check if an error is an authentication error
+ */
+export function isAuthenticationError(
+	error: unknown
+): error is LoadAPIKeyError {
+	if (error instanceof LoadAPIKeyError) return true;
+	if (error instanceof APICallError) {
+		const metadata = error.data as GrokCliErrorMetadata | undefined;
+		if (!metadata) return false;
+		return (
+			metadata.exitCode === 401 ||
+			metadata.code === 'AUTHENTICATION_ERROR' ||
+			metadata.code === 'UNAUTHORIZED'
+		);
+	}
+	return false;
+}
+
+/**
+ * Check if an error is a timeout error
+ */
+export function isTimeoutError(error: unknown): error is APICallError {
+	if (
+		error instanceof APICallError &&
+		(error.data as GrokCliErrorMetadata)?.code === 'TIMEOUT'
+	)
+		return true;
+	return false;
+}
+
+/**
+ * Check if an error is an installation error
+ */
+export function isInstallationError(error: unknown): error is APICallError {
+	if (error instanceof APICallError && error.url === 'grok-cli://installation')
+		return true;
+	return false;
+}
+
+/**
+ * Get error metadata from an error
+ */
+export function getErrorMetadata(
+	error: unknown
+): GrokCliErrorMetadata | undefined {
+	if (error instanceof APICallError && error.data) {
+		return error.data as GrokCliErrorMetadata;
+	}
+	return undefined;
+}

packages/ai-sdk-provider-grok-cli/src/grok-cli-language-model.ts

@@ -1,53 +1,51 @@
 /**
- * @fileoverview Grok CLI Language Model implementation
+ * Grok CLI Language Model implementation for AI SDK v5
  */
 
+import { spawn } from 'child_process';
+import { promises as fs } from 'fs';
+import { homedir } from 'os';
+import { join } from 'path';
+import type {
+	LanguageModelV2,
+	LanguageModelV2CallOptions,
+	LanguageModelV2CallWarning
+} from '@ai-sdk/provider';
 import { NoSuchModelError } from '@ai-sdk/provider';
 import { generateId } from '@ai-sdk/provider-utils';
-import {
-	createPromptFromMessages,
-	convertFromGrokCliResponse,
-	escapeShellArg
-} from './message-converter.js';
-import { extractJson } from './json-extractor.js';
+
 import {
 	createAPICallError,
 	createAuthenticationError,
 	createInstallationError,
 	createTimeoutError
 } from './errors.js';
-import { spawn } from 'child_process';
-import { promises as fs } from 'fs';
-import { join } from 'path';
-import { homedir } from 'os';
+import { extractJson } from './json-extractor.js';
+import {
+	convertFromGrokCliResponse,
+	createPromptFromMessages,
+	escapeShellArg
+} from './message-converter.js';
+import type {
+	GrokCliLanguageModelOptions,
+	GrokCliModelId,
+	GrokCliSettings
+} from './types.js';
 
 /**
- * @typedef {import('./types.js').GrokCliSettings} GrokCliSettings
- * @typedef {import('./types.js').GrokCliModelId} GrokCliModelId
+ * Grok CLI Language Model implementation for AI SDK v5
  */
+export class GrokCliLanguageModel implements LanguageModelV2 {
+	readonly specificationVersion = 'v2' as const;
+	readonly defaultObjectGenerationMode = 'json' as const;
+	readonly supportsImageUrls = false;
+	readonly supportsStructuredOutputs = false;
+	readonly supportedUrls: Record<string, RegExp[]> = {};
 
-/**
- * @typedef {Object} GrokCliLanguageModelOptions
- * @property {GrokCliModelId} id - Model ID
- * @property {GrokCliSettings} [settings] - Model settings
- */
+	readonly modelId: GrokCliModelId;
+	readonly settings: GrokCliSettings;
 
-export class GrokCliLanguageModel {
-	specificationVersion = 'v1';
-	defaultObjectGenerationMode = 'json';
-	supportsImageUrls = false;
-	supportsStructuredOutputs = false;
-
-	/** @type {GrokCliModelId} */
-	modelId;
-
-	/** @type {GrokCliSettings} */
-	settings;
-
-	/**
-	 * @param {GrokCliLanguageModelOptions} options
-	 */
-	constructor(options) {
+	constructor(options: GrokCliLanguageModelOptions) {
 		this.modelId = options.id;
 		this.settings = options.settings ?? {};
 
@@ -64,15 +62,14 @@ export class GrokCliLanguageModel {
 		}
 	}
 
-	get provider() {
+	get provider(): string {
 		return 'grok-cli';
 	}
 
 	/**
 	 * Check if Grok CLI is installed and available
-	 * @returns {Promise<boolean>}
 	 */
-	async checkGrokCliInstallation() {
+	private async checkGrokCliInstallation(): Promise<boolean> {
 		return new Promise((resolve) => {
 			const child = spawn('grok', ['--version'], {
 				stdio: 'pipe'
@@ -85,9 +82,8 @@ export class GrokCliLanguageModel {
 
 	/**
 	 * Get API key from settings or environment
-	 * @returns {Promise<string|null>}
 	 */
-	async getApiKey() {
+	private async getApiKey(): Promise<string | null> {
 		// Check settings first
 		if (this.settings.apiKey) {
 			return this.settings.apiKey;
@@ -111,22 +107,32 @@ export class GrokCliLanguageModel {
 
 	/**
 	 * Execute Grok CLI command
-	 * @param {Array<string>} args - Command line arguments
-	 * @param {Object} options - Execution options
-	 * @returns {Promise<{stdout: string, stderr: string, exitCode: number}>}
 	 */
-	async executeGrokCli(args, options = {}) {
-		const timeout = options.timeout || this.settings.timeout || 120000; // 2 minutes default
+	private async executeGrokCli(
+		args: string[],
+		options: { timeout?: number; apiKey?: string } = {}
+	): Promise<{ stdout: string; stderr: string; exitCode: number }> {
+		// Default timeout based on model type
+		let defaultTimeout = 120000; // 2 minutes default
+		if (this.modelId.includes('grok-4')) {
+			defaultTimeout = 600000; // 10 minutes for grok-4 models (they seem to hang during setup)
+		}
+
+		const timeout = options.timeout ?? this.settings.timeout ?? defaultTimeout;
 
 		return new Promise((resolve, reject) => {
 			const child = spawn('grok', args, {
 				stdio: 'pipe',
-				cwd: this.settings.workingDirectory || process.cwd()
+				cwd: this.settings.workingDirectory || process.cwd(),
+				env:
+					options.apiKey === undefined
+						? process.env
+						: { ...process.env, GROK_CLI_API_KEY: options.apiKey }
 			});
 
 			let stdout = '';
 			let stderr = '';
-			let timeoutId;
+			let timeoutId: NodeJS.Timeout | undefined;
 
 			// Set up timeout
 			if (timeout > 0) {
@@ -142,24 +148,26 @@ export class GrokCliLanguageModel {
 				}, timeout);
 			}
 
-			child.stdout.on('data', (data) => {
-				stdout += data.toString();
+			child.stdout?.on('data', (data) => {
+				const chunk = data.toString();
+				stdout += chunk;
 			});
 
-			child.stderr.on('data', (data) => {
-				stderr += data.toString();
+			child.stderr?.on('data', (data) => {
+				const chunk = data.toString();
+				stderr += chunk;
 			});
 
 			child.on('error', (error) => {
 				if (timeoutId) clearTimeout(timeoutId);
 
-				if (error.code === 'ENOENT') {
+				if ((error as any).code === 'ENOENT') {
 					reject(createInstallationError({}));
 				} else {
 					reject(
 						createAPICallError({
 							message: `Failed to execute Grok CLI: ${error.message}`,
-							code: error.code,
+							code: (error as any).code,
 							stderr: error.message,
 							isRetryable: false
 						})
@@ -180,15 +188,18 @@ export class GrokCliLanguageModel {
 	}
 
 	/**
-	 * Generate unsupported parameter warnings
-	 * @param {Object} options - Generation options
-	 * @returns {Array} Warnings array
+	 * Generate comprehensive warnings for unsupported parameters and validation issues
 	 */
-	generateUnsupportedWarnings(options) {
-		const warnings = [];
-		const unsupportedParams = [];
+	private generateAllWarnings(
+		options: LanguageModelV2CallOptions,
+		prompt: string
+	): LanguageModelV2CallWarning[] {
+		const warnings: LanguageModelV2CallWarning[] = [];
+		const unsupportedParams: string[] = [];
 
-		// Grok CLI supports some parameters but not all AI SDK parameters
+		// Check for unsupported parameters
+		if (options.temperature !== undefined)
+			unsupportedParams.push('temperature');
 		if (options.topP !== undefined) unsupportedParams.push('topP');
 		if (options.topK !== undefined) unsupportedParams.push('topK');
 		if (options.presencePenalty !== undefined)
@@ -200,24 +211,51 @@ export class GrokCliLanguageModel {
 		if (options.seed !== undefined) unsupportedParams.push('seed');
 
 		if (unsupportedParams.length > 0) {
+			// Add a warning for each unsupported parameter
 			for (const param of unsupportedParams) {
 				warnings.push({
 					type: 'unsupported-setting',
-					setting: param,
+					setting: param as
+						| 'temperature'
+						| 'topP'
+						| 'topK'
+						| 'presencePenalty'
+						| 'frequencyPenalty'
+						| 'stopSequences'
+						| 'seed',
 					details: `Grok CLI does not support the ${param} parameter. It will be ignored.`
 				});
 			}
 		}
 
+		// Add model validation warnings if needed
+		if (!this.modelId || this.modelId.trim() === '') {
+			warnings.push({
+				type: 'other',
+				message: 'Model ID is empty or invalid'
+			});
+		}
+
+		// Add prompt validation
+		if (!prompt || prompt.trim() === '') {
+			warnings.push({
+				type: 'other',
+				message: 'Prompt is empty'
+			});
+		}
+
 		return warnings;
 	}
 
 	/**
 	 * Generate text using Grok CLI
-	 * @param {Object} options - Generation options
-	 * @returns {Promise<Object>}
 	 */
-	async doGenerate(options) {
+	async doGenerate(options: LanguageModelV2CallOptions) {
+		// Handle abort signal early
+		if (options.abortSignal?.aborted) {
+			throw options.abortSignal.reason || new Error('Request aborted');
+		}
+
 		// Check CLI installation
 		const isInstalled = await this.checkGrokCliInstallation();
 		if (!isInstalled) {
@@ -234,7 +272,7 @@ export class GrokCliLanguageModel {
 		}
 
 		const prompt = createPromptFromMessages(options.prompt);
-		const warnings = this.generateUnsupportedWarnings(options);
+		const warnings = this.generateAllWarnings(options, prompt);
 
 		// Build command arguments
 		const args = ['--prompt', escapeShellArg(prompt)];
@@ -244,10 +282,11 @@ export class GrokCliLanguageModel {
 			args.push('--model', this.modelId);
 		}
 
-		// Add API key if available
-		if (apiKey) {
-			args.push('--api-key', apiKey);
-		}
+		// Skip API key parameter if it's likely already configured to avoid hanging
+		// The CLI seems to hang when trying to save API keys for grok-4 models
+		// if (apiKey) {
+		//	args.push('--api-key', apiKey);
+		// }
 
 		// Add base URL if provided in settings
 		if (this.settings.baseURL) {
@@ -260,9 +299,7 @@ export class GrokCliLanguageModel {
 		}
 
 		try {
-			const result = await this.executeGrokCli(args, {
-				timeout: this.settings.timeout
-			});
+			const result = await this.executeGrokCli(args, { apiKey });
 
 			if (result.exitCode !== 0) {
 				// Handle authentication errors
@@ -290,19 +327,37 @@ export class GrokCliLanguageModel {
 			let text = response.text || '';
 
 			// Extract JSON if in object-json mode
-			if (options.mode?.type === 'object-json' && text) {
+			const isObjectJson = (
+				o: unknown
+			): o is { mode: { type: 'object-json' } } =>
+				!!o &&
+				typeof o === 'object' &&
+				'mode' in o &&
+				(o as any).mode?.type === 'object-json';
+			if (isObjectJson(options) && text) {
 				text = extractJson(text);
 			}
 
 			return {
-				text: text || undefined,
-				usage: response.usage || { promptTokens: 0, completionTokens: 0 },
-				finishReason: 'stop',
+				content: [
+					{
+						type: 'text' as const,
+						text: text || ''
+					}
+				],
+				usage: response.usage
+					? {
+							inputTokens: response.usage.promptTokens,
+							outputTokens: response.usage.completionTokens,
+							totalTokens: response.usage.totalTokens
+						}
+					: { inputTokens: 0, outputTokens: 0, totalTokens: 0 },
+				finishReason: 'stop' as const,
 				rawCall: {
 					rawPrompt: prompt,
 					rawSettings: args
 				},
-				warnings: warnings.length > 0 ? warnings : undefined,
+				warnings: warnings,
 				response: {
 					id: generateId(),
 					timestamp: new Date(),
@@ -314,20 +369,23 @@ export class GrokCliLanguageModel {
 				providerMetadata: {
 					'grok-cli': {
 						exitCode: result.exitCode,
-						stderr: result.stderr || undefined
+						...(result.stderr && { stderr: result.stderr })
 					}
 				}
 			};
 		} catch (error) {
 			// Re-throw our custom errors
-			if (error.name === 'APICallError' || error.name === 'LoadAPIKeyError') {
+			if (
+				(error as any).name === 'APICallError' ||
+				(error as any).name === 'LoadAPIKeyError'
+			) {
 				throw error;
 			}
 
 			// Wrap other errors
 			throw createAPICallError({
-				message: `Grok CLI execution failed: ${error.message}`,
-				code: error.code,
+				message: `Grok CLI execution failed: ${(error as Error).message}`,
+				code: (error as any).code,
 				promptExcerpt: prompt.substring(0, 200),
 				isRetryable: false
 			});
@@ -338,15 +396,39 @@ export class GrokCliLanguageModel {
 	 * Stream text using Grok CLI
 	 * Note: Grok CLI doesn't natively support streaming, so this simulates streaming
 	 * by generating the full response and then streaming it in chunks
-	 * @param {Object} options - Stream options
-	 * @returns {Promise<Object>}
 	 */
-	async doStream(options) {
-		const warnings = this.generateUnsupportedWarnings(options);
+	async doStream(options: LanguageModelV2CallOptions) {
+		const prompt = createPromptFromMessages(options.prompt);
+		const warnings = this.generateAllWarnings(options, prompt);
 
 		const stream = new ReadableStream({
 			start: async (controller) => {
+				let abortListener: (() => void) | undefined;
+
 				try {
+					// Handle abort signal
+					if (options.abortSignal?.aborted) {
+						throw options.abortSignal.reason || new Error('Request aborted');
+					}
+
+					// Set up abort listener
+					if (options.abortSignal) {
+						abortListener = () => {
+							controller.enqueue({
+								type: 'error',
+								error:
+									options.abortSignal?.reason || new Error('Request aborted')
+							});
+							controller.close();
+						};
+						options.abortSignal.addEventListener('abort', abortListener, {
+							once: true
+						});
+					}
+
+					// Emit stream-start with warnings
+					controller.enqueue({ type: 'stream-start', warnings });
+
 					// Generate the full response first
 					const result = await this.doGenerate(options);
 
@@ -359,20 +441,48 @@ export class GrokCliLanguageModel {
 					});
 
 					// Simulate streaming by chunking the text
-					const text = result.text || '';
+					const content = result.content || [];
+					const text =
+						content.length > 0 && content[0].type === 'text'
+							? content[0].text
+							: '';
 					const chunkSize = 50; // Characters per chunk
+					let textPartId: string | undefined;
+
+					// Emit text-start if we have content
+					if (text.length > 0) {
+						textPartId = generateId();
+						controller.enqueue({
+							type: 'text-start',
+							id: textPartId
+						});
+					}
 
 					for (let i = 0; i < text.length; i += chunkSize) {
+						// Check for abort during streaming
+						if (options.abortSignal?.aborted) {
+							throw options.abortSignal.reason || new Error('Request aborted');
+						}
+
 						const chunk = text.slice(i, i + chunkSize);
 						controller.enqueue({
 							type: 'text-delta',
-							textDelta: chunk
+							id: textPartId!,
+							delta: chunk
 						});
 
 						// Add small delay to simulate streaming
 						await new Promise((resolve) => setTimeout(resolve, 20));
 					}
 
+					// Close text part if opened
+					if (textPartId) {
+						controller.enqueue({
+							type: 'text-end',
+							id: textPartId
+						});
+					}
+
 					// Emit finish event
 					controller.enqueue({
 						type: 'finish',
@@ -388,19 +498,22 @@ export class GrokCliLanguageModel {
 						error
 					});
 					controller.close();
+				} finally {
+					// Clean up abort listener
+					if (options.abortSignal && abortListener) {
+						options.abortSignal.removeEventListener('abort', abortListener);
+					}
 				}
+			},
+			cancel: () => {
+				// Clean up if stream is cancelled
 			}
 		});
 
 		return {
 			stream,
-			rawCall: {
-				rawPrompt: createPromptFromMessages(options.prompt),
-				rawSettings: {}
-			},
-			warnings: warnings.length > 0 ? warnings : undefined,
 			request: {
-				body: createPromptFromMessages(options.prompt)
+				body: prompt
 			}
 		};
 	}

packages/ai-sdk-provider-grok-cli/src/grok-cli-provider.test.ts

@@ -0,0 +1,121 @@
+/**
+ * Tests for Grok CLI provider
+ */
+
+import { NoSuchModelError } from '@ai-sdk/provider';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { GrokCliLanguageModel } from './grok-cli-language-model.js';
+import { createGrokCli, grokCli } from './grok-cli-provider.js';
+
+// Mock the GrokCliLanguageModel
+vi.mock('./grok-cli-language-model.js', () => ({
+	GrokCliLanguageModel: vi.fn().mockImplementation((options) => ({
+		modelId: options.id,
+		settings: options.settings,
+		provider: 'grok-cli'
+	}))
+}));
+
+describe('createGrokCli', () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should create a provider with default settings', () => {
+		const provider = createGrokCli();
+		expect(typeof provider).toBe('function');
+		expect(typeof provider.languageModel).toBe('function');
+		expect(typeof provider.chat).toBe('function');
+		expect(typeof provider.textEmbeddingModel).toBe('function');
+		expect(typeof provider.imageModel).toBe('function');
+	});
+
+	it('should create a provider with custom default settings', () => {
+		const defaultSettings = {
+			timeout: 5000,
+			workingDirectory: '/custom/path'
+		};
+		const provider = createGrokCli({ defaultSettings });
+
+		const model = provider('grok-2-mini');
+
+		expect(GrokCliLanguageModel).toHaveBeenCalledWith({
+			id: 'grok-2-mini',
+			settings: defaultSettings
+		});
+	});
+
+	it('should create language models with merged settings', () => {
+		const defaultSettings = { timeout: 5000 };
+		const provider = createGrokCli({ defaultSettings });
+
+		const modelSettings = { apiKey: 'test-key' };
+		const model = provider('grok-2', modelSettings);
+
+		expect(GrokCliLanguageModel).toHaveBeenCalledWith({
+			id: 'grok-2',
+			settings: { timeout: 5000, apiKey: 'test-key' }
+		});
+	});
+
+	it('should create models via languageModel method', () => {
+		const provider = createGrokCli();
+		const model = provider.languageModel('grok-2-mini', { timeout: 1000 });
+
+		expect(GrokCliLanguageModel).toHaveBeenCalledWith({
+			id: 'grok-2-mini',
+			settings: { timeout: 1000 }
+		});
+	});
+
+	it('should create models via chat method (alias)', () => {
+		const provider = createGrokCli();
+		const model = provider.chat('grok-2');
+
+		expect(GrokCliLanguageModel).toHaveBeenCalledWith({
+			id: 'grok-2',
+			settings: {}
+		});
+	});
+
+	it('should throw error when called with new keyword', () => {
+		const provider = createGrokCli();
+		expect(() => {
+			// @ts-expect-error - intentionally testing invalid usage
+			new provider('grok-2');
+		}).toThrow(
+			'The Grok CLI model function cannot be called with the new keyword.'
+		);
+	});
+
+	it('should throw NoSuchModelError for textEmbeddingModel', () => {
+		const provider = createGrokCli();
+		expect(() => {
+			provider.textEmbeddingModel('test-model');
+		}).toThrow(NoSuchModelError);
+	});
+
+	it('should throw NoSuchModelError for imageModel', () => {
+		const provider = createGrokCli();
+		expect(() => {
+			provider.imageModel('test-model');
+		}).toThrow(NoSuchModelError);
+	});
+});
+
+describe('default grokCli provider', () => {
+	it('should be a pre-configured provider instance', () => {
+		expect(typeof grokCli).toBe('function');
+		expect(typeof grokCli.languageModel).toBe('function');
+		expect(typeof grokCli.chat).toBe('function');
+	});
+
+	it('should create models with default configuration', () => {
+		const model = grokCli('grok-2-mini');
+
+		expect(GrokCliLanguageModel).toHaveBeenCalledWith({
+			id: 'grok-2-mini',
+			settings: {}
+		});
+	});
+});

packages/ai-sdk-provider-grok-cli/src/grok-cli-provider.ts

@@ -0,0 +1,108 @@
+/**
+ * Grok CLI provider implementation for AI SDK v5
+ */
+
+import type { LanguageModelV2, ProviderV2 } from '@ai-sdk/provider';
+import { NoSuchModelError } from '@ai-sdk/provider';
+import { GrokCliLanguageModel } from './grok-cli-language-model.js';
+import type { GrokCliModelId, GrokCliSettings } from './types.js';
+
+/**
+ * Grok CLI provider interface that extends the AI SDK's ProviderV2
+ */
+export interface GrokCliProvider extends ProviderV2 {
+	/**
+	 * Creates a language model instance for the specified model ID.
+	 * This is a shorthand for calling `languageModel()`.
+	 */
+	(modelId: GrokCliModelId, settings?: GrokCliSettings): LanguageModelV2;
+
+	/**
+	 * Creates a language model instance for text generation.
+	 */
+	languageModel(
+		modelId: GrokCliModelId,
+		settings?: GrokCliSettings
+	): LanguageModelV2;
+
+	/**
+	 * Alias for `languageModel()` to maintain compatibility with AI SDK patterns.
+	 */
+	chat(modelId: GrokCliModelId, settings?: GrokCliSettings): LanguageModelV2;
+
+	textEmbeddingModel(modelId: string): never;
+	imageModel(modelId: string): never;
+}
+
+/**
+ * Configuration options for creating a Grok CLI provider instance
+ */
+export interface GrokCliProviderSettings {
+	/**
+	 * Default settings to use for all models created by this provider.
+	 * Individual model settings will override these defaults.
+	 */
+	defaultSettings?: GrokCliSettings;
+}
+
+/**
+ * Creates a Grok CLI provider instance with the specified configuration.
+ * The provider can be used to create language models for interacting with Grok models.
+ */
+export function createGrokCli(
+	options: GrokCliProviderSettings = {}
+): GrokCliProvider {
+	const createModel = (
+		modelId: GrokCliModelId,
+		settings: GrokCliSettings = {}
+	): LanguageModelV2 => {
+		const mergedSettings = {
+			...options.defaultSettings,
+			...settings
+		};
+
+		return new GrokCliLanguageModel({
+			id: modelId,
+			settings: mergedSettings
+		});
+	};
+
+	const provider = function (
+		modelId: GrokCliModelId,
+		settings?: GrokCliSettings
+	) {
+		if (new.target) {
+			throw new Error(
+				'The Grok CLI model function cannot be called with the new keyword.'
+			);
+		}
+
+		return createModel(modelId, settings);
+	};
+
+	provider.languageModel = createModel;
+	provider.chat = createModel; // Alias for languageModel
+
+	// Add textEmbeddingModel method that throws NoSuchModelError
+	provider.textEmbeddingModel = (modelId: string) => {
+		throw new NoSuchModelError({
+			modelId,
+			modelType: 'textEmbeddingModel'
+		});
+	};
+
+	provider.imageModel = (modelId: string) => {
+		throw new NoSuchModelError({
+			modelId,
+			modelType: 'imageModel'
+		});
+	};
+
+	return provider as GrokCliProvider;
+}
+
+/**
+ * Default Grok CLI provider instance.
+ * Pre-configured provider for quick usage without custom settings.
+ */
+export const grokCli = createGrokCli();

packages/ai-sdk-provider-grok-cli/src/index.ts

@@ -0,0 +1,64 @@
+/**
+ * Provider exports for creating and configuring Grok CLI instances.
+ */
+
+/**
+ * Creates a new Grok CLI provider instance and the default provider instance.
+ */
+export { createGrokCli, grokCli } from './grok-cli-provider.js';
+
+/**
+ * Type definitions for the Grok CLI provider.
+ */
+export type {
+	GrokCliProvider,
+	GrokCliProviderSettings
+} from './grok-cli-provider.js';
+
+/**
+ * Language model implementation for Grok CLI.
+ * This class implements the AI SDK's LanguageModelV2 interface.
+ */
+export { GrokCliLanguageModel } from './grok-cli-language-model.js';
+
+/**
+ * Type definitions for Grok CLI language models.
+ */
+export type {
+	GrokCliModelId,
+	GrokCliLanguageModelOptions,
+	GrokCliSettings,
+	GrokCliMessage,
+	GrokCliResponse,
+	GrokCliErrorMetadata
+} from './types.js';
+
+/**
+ * Error handling utilities for Grok CLI.
+ * These functions help create and identify specific error types.
+ */
+export {
+	isAuthenticationError,
+	isTimeoutError,
+	isInstallationError,
+	getErrorMetadata,
+	createAPICallError,
+	createAuthenticationError,
+	createTimeoutError,
+	createInstallationError
+} from './errors.js';
+
+/**
+ * Message conversion utilities for Grok CLI communication.
+ */
+export {
+	convertToGrokCliMessages,
+	convertFromGrokCliResponse,
+	createPromptFromMessages,
+	escapeShellArg
+} from './message-converter.js';
+
+/**
+ * JSON extraction utilities for parsing Grok responses.
+ */
+export { extractJson } from './json-extractor.js';

packages/ai-sdk-provider-grok-cli/src/json-extractor.test.ts

@@ -0,0 +1,81 @@
+/**
+ * Tests for JSON extraction utilities
+ */
+
+import { describe, expect, it } from 'vitest';
+import { extractJson } from './json-extractor.js';
+
+describe('extractJson', () => {
+	it('should extract JSON from markdown code blocks', () => {
+		const text = '```json\n{"name": "test", "value": 42}\n```';
+		const result = extractJson(text);
+		expect(JSON.parse(result)).toEqual({ name: 'test', value: 42 });
+	});
+
+	it('should extract JSON from generic code blocks', () => {
+		const text = '```\n{"name": "test", "value": 42}\n```';
+		const result = extractJson(text);
+		expect(JSON.parse(result)).toEqual({ name: 'test', value: 42 });
+	});
+
+	it('should remove JavaScript variable declarations', () => {
+		const text = 'const result = {"name": "test", "value": 42};';
+		const result = extractJson(text);
+		expect(JSON.parse(result)).toEqual({ name: 'test', value: 42 });
+	});
+
+	it('should handle let variable declarations', () => {
+		const text = 'let data = {"name": "test", "value": 42};';
+		const result = extractJson(text);
+		expect(JSON.parse(result)).toEqual({ name: 'test', value: 42 });
+	});
+
+	it('should handle var variable declarations', () => {
+		const text = 'var config = {"name": "test", "value": 42};';
+		const result = extractJson(text);
+		expect(JSON.parse(result)).toEqual({ name: 'test', value: 42 });
+	});
+
+	it('should extract JSON arrays', () => {
+		const text = '[{"name": "test1"}, {"name": "test2"}]';
+		const result = extractJson(text);
+		expect(JSON.parse(result)).toEqual([{ name: 'test1' }, { name: 'test2' }]);
+	});
+
+	it('should convert JavaScript object literals to JSON', () => {
+		const text = "{name: 'test', value: 42}";
+		const result = extractJson(text);
+		expect(JSON.parse(result)).toEqual({ name: 'test', value: 42 });
+	});
+
+	it('should return valid JSON (canonical formatting)', () => {
+		const text = '{"name": "test", "value": 42}';
+		const result = extractJson(text);
+		expect(JSON.parse(result)).toEqual({ name: 'test', value: 42 });
+	});
+
+	it('should return original text when JSON parsing fails completely', () => {
+		const text = 'This is not JSON at all';
+		const result = extractJson(text);
+		expect(result).toBe('This is not JSON at all');
+	});
+
+	it('should handle complex nested objects', () => {
+		const text =
+			'```json\n{\n  "user": {\n    "name": "John",\n    "age": 30\n  },\n  "items": [1, 2, 3]\n}\n```';
+		const result = extractJson(text);
+		expect(JSON.parse(result)).toEqual({
+			user: {
+				name: 'John',
+				age: 30
+			},
+			items: [1, 2, 3]
+		});
+	});
+
+	it('should handle mixed quotes in object literals', () => {
+		const text = `{name: "test", value: 'mixed quotes'}`;
+		const result = extractJson(text);
+		expect(JSON.parse(result)).toEqual({ name: 'test', value: 'mixed quotes' });
+	});
+});

packages/ai-sdk-provider-grok-cli/src/json-extractor.ts

@@ -0,0 +1,132 @@
+/**
+ * Extract JSON from AI's response using a tolerant parser.
+ *
+ * The function removes common wrappers such as markdown fences or variable
+ * declarations and then attempts to parse the remaining text with
+ * `jsonc-parser`.  If valid JSON (or JSONC) can be parsed, it is returned as a
+ * string via `JSON.stringify`.  Otherwise the original text is returned.
+ *
+ * @param text - Raw text which may contain JSON
+ * @returns A valid JSON string if extraction succeeds, otherwise the original text
+ */
+import { parse, type ParseError } from 'jsonc-parser';
+
+export function extractJson(text: string): string {
+	let content = text.trim();
+
+	// Strip ```json or ``` fences
+	const fenceMatch = /```(?:json)?\s*([\s\S]*?)\s*```/i.exec(content);
+	if (fenceMatch) {
+		content = fenceMatch[1];
+	}
+
+	// Strip variable declarations like `const foo =` or `let foo =`
+	const varMatch = /^\s*(?:const|let|var)\s+\w+\s*=\s*([\s\S]*)/i.exec(content);
+	if (varMatch) {
+		content = varMatch[1];
+		// Remove trailing semicolon if present
+		if (content.trim().endsWith(';')) {
+			content = content.trim().slice(0, -1);
+		}
+	}
+
+	// Find the first opening bracket
+	const firstObj = content.indexOf('{');
+	const firstArr = content.indexOf('[');
+	if (firstObj === -1 && firstArr === -1) {
+		return text;
+	}
+	const start =
+		firstArr === -1
+			? firstObj
+			: firstObj === -1
+				? firstArr
+				: Math.min(firstObj, firstArr);
+	content = content.slice(start);
+
+	// Try to parse the entire string with jsonc-parser
+	const tryParse = (value: string): string | undefined => {
+		const errors: ParseError[] = [];
+		try {
+			const result = parse(value, errors, { allowTrailingComma: true });
+			if (errors.length === 0) {
+				return JSON.stringify(result, null, 2);
+			}
+		} catch {
+			// ignore
+		}
+		return undefined;
+	};
+
+	const parsed = tryParse(content);
+	if (parsed !== undefined) {
+		return parsed;
+	}
+
+	// If parsing the full string failed, use a more efficient approach
+	// to find valid JSON boundaries
+	const openChar = content[0];
+	const closeChar = openChar === '{' ? '}' : ']';
+
+	// Find all potential closing positions by tracking nesting depth
+	const closingPositions: number[] = [];
+	let depth = 0;
+	let inString = false;
+	let escapeNext = false;
+
+	for (let i = 0; i < content.length; i++) {
+		const char = content[i];
+
+		if (escapeNext) {
+			escapeNext = false;
+			continue;
+		}
+
+		if (char === '\\') {
+			escapeNext = true;
+			continue;
+		}
+
+		if (char === '"' && !inString) {
+			inString = true;
+			continue;
+		}
+
+		if (char === '"' && inString) {
+			inString = false;
+			continue;
+		}
+
+		// Skip content inside strings
+		if (inString) continue;
+
+		if (char === openChar) {
+			depth++;
+		} else if (char === closeChar) {
+			depth--;
+			if (depth === 0) {
+				closingPositions.push(i + 1);
+			}
+		}
+	}
+
+	// Try parsing at each valid closing position, starting from the end
+	for (let i = closingPositions.length - 1; i >= 0; i--) {
+		const attempt = tryParse(content.slice(0, closingPositions[i]));
+		if (attempt !== undefined) {
+			return attempt;
+		}
+	}
+
+	// As a final fallback, try the original character-by-character approach
+	// but only for the last 1000 characters to limit performance impact
+	const searchStart = Math.max(0, content.length - 1000);
+	for (let end = content.length - 1; end > searchStart; end--) {
+		const attempt = tryParse(content.slice(0, end));
+		if (attempt !== undefined) {
+			return attempt;
+		}
+	}
+
+	return text;
+}

packages/ai-sdk-provider-grok-cli/src/message-converter.test.ts

@@ -0,0 +1,163 @@
+/**
+ * Tests for message conversion utilities
+ */
+
+import { describe, expect, it } from 'vitest';
+import {
+	convertFromGrokCliResponse,
+	convertToGrokCliMessages,
+	createPromptFromMessages,
+	escapeShellArg
+} from './message-converter.js';
+
+describe('convertToGrokCliMessages', () => {
+	it('should convert string content messages', () => {
+		const messages = [
+			{ role: 'user', content: 'Hello, world!' },
+			{ role: 'assistant', content: 'Hi there!' }
+		];
+
+		const result = convertToGrokCliMessages(messages);
+
+		expect(result).toEqual([
+			{ role: 'user', content: 'Hello, world!' },
+			{ role: 'assistant', content: 'Hi there!' }
+		]);
+	});
+
+	it('should convert array content messages', () => {
+		const messages = [
+			{
+				role: 'user',
+				content: [
+					{ type: 'text', text: 'Hello' },
+					{ type: 'text', text: 'World' }
+				]
+			}
+		];
+
+		const result = convertToGrokCliMessages(messages);
+
+		expect(result).toEqual([{ role: 'user', content: 'Hello\nWorld' }]);
+	});
+
+	it('should convert object content messages', () => {
+		const messages = [
+			{
+				role: 'user',
+				content: { text: 'Hello from object' }
+			}
+		];
+
+		const result = convertToGrokCliMessages(messages);
+
+		expect(result).toEqual([{ role: 'user', content: 'Hello from object' }]);
+	});
+});
+
+describe('convertFromGrokCliResponse', () => {
+	it('should parse JSONL response format', () => {
+		const responseText = `{"role": "assistant", "content": "Hello there!", "usage": {"prompt_tokens": 10, "completion_tokens": 5, "total_tokens": 15}}`;
+
+		const result = convertFromGrokCliResponse(responseText);
+
+		expect(result).toEqual({
+			text: 'Hello there!',
+			usage: {
+				promptTokens: 10,
+				completionTokens: 5,
+				totalTokens: 15
+			}
+		});
+	});
+
+	it('should handle multiple lines in JSONL format', () => {
+		const responseText = `{"role": "user", "content": "Hello"}
+{"role": "assistant", "content": "Hi there!", "usage": {"prompt_tokens": 5, "completion_tokens": 3}}`;
+
+		const result = convertFromGrokCliResponse(responseText);
+
+		expect(result).toEqual({
+			text: 'Hi there!',
+			usage: {
+				promptTokens: 5,
+				completionTokens: 3,
+				totalTokens: 0
+			}
+		});
+	});
+
+	it('should fallback to raw text when parsing fails', () => {
+		const responseText = 'Invalid JSON response';
+
+		const result = convertFromGrokCliResponse(responseText);
+
+		expect(result).toEqual({
+			text: 'Invalid JSON response',
+			usage: undefined
+		});
+	});
+});
+
+describe('createPromptFromMessages', () => {
+	it('should create formatted prompt from messages', () => {
+		const messages = [
+			{ role: 'system', content: 'You are a helpful assistant.' },
+			{ role: 'user', content: 'What is 2+2?' },
+			{ role: 'assistant', content: '2+2 equals 4.' }
+		];
+
+		const result = createPromptFromMessages(messages);
+
+		expect(result).toBe(
+			'System: You are a helpful assistant.\n\nUser: What is 2+2?\n\nAssistant: 2+2 equals 4.'
+		);
+	});
+
+	it('should handle custom role names', () => {
+		const messages = [{ role: 'custom', content: 'Custom message' }];
+
+		const result = createPromptFromMessages(messages);
+
+		expect(result).toBe('custom: Custom message');
+	});
+
+	it('should trim whitespace from message content', () => {
+		const messages = [
+			{ role: 'user', content: '  Hello with spaces  ' },
+			{ role: 'assistant', content: '\n\nResponse with newlines\n\n' }
+		];
+
+		const result = createPromptFromMessages(messages);
+
+		expect(result).toBe(
+			'User: Hello with spaces\n\nAssistant: Response with newlines'
+		);
+	});
+});
+
+describe('escapeShellArg', () => {
+	it('should escape single quotes', () => {
+		const arg = "It's a test";
+		const result = escapeShellArg(arg);
+		expect(result).toBe("'It'\\''s a test'");
+	});
+
+	it('should handle strings without special characters', () => {
+		const arg = 'simple string';
+		const result = escapeShellArg(arg);
+		expect(result).toBe("'simple string'");
+	});
+
+	it('should convert non-string values to strings', () => {
+		const arg = 123;
+		const result = escapeShellArg(arg);
+		expect(result).toBe("'123'");
+	});
+
+	it('should handle empty strings', () => {
+		const arg = '';
+		const result = escapeShellArg(arg);
+		expect(result).toBe("''");
+	});
+});

packages/ai-sdk-provider-grok-cli/src/message-converter.ts

@@ -1,17 +1,28 @@
 /**
- * @fileoverview Message format conversion utilities for Grok CLI provider
+ * Message format conversion utilities for Grok CLI provider
  */
 
+import type { GrokCliMessage, GrokCliResponse } from './types.js';
+
 /**
- * @typedef {import('./types.js').GrokCliMessage} GrokCliMessage
+ * AI SDK message type (simplified interface)
  */
+interface AISDKMessage {
+	role: string;
+	content:
+		| string
+		| Array<{ type: string; text?: string }>
+		| { text?: string; [key: string]: unknown };
+}
 
 /**
  * Convert AI SDK messages to Grok CLI compatible format
- * @param {Array<Object>} messages - AI SDK message array
- * @returns {Array<GrokCliMessage>} Grok CLI compatible messages
+ * @param messages - AI SDK message array
+ * @returns Grok CLI compatible messages
  */
-export function convertToGrokCliMessages(messages) {
+export function convertToGrokCliMessages(
+	messages: AISDKMessage[]
+): GrokCliMessage[] {
 	return messages.map((message) => {
 		// Handle different message content types
 		let content = '';
@@ -22,7 +33,7 @@ export function convertToGrokCliMessages(messages) {
 			// Handle multi-part content (text and images)
 			content = message.content
 				.filter((part) => part.type === 'text')
-				.map((part) => part.text)
+				.map((part) => part.text || '')
 				.join('\n');
 		} else if (message.content && typeof message.content === 'object') {
 			// Handle object content
@@ -38,10 +49,17 @@ export function convertToGrokCliMessages(messages) {
 
 /**
  * Convert Grok CLI response to AI SDK format
- * @param {string} responseText - Raw response text from Grok CLI (JSONL format)
- * @returns {Object} AI SDK compatible response object
+ * @param responseText - Raw response text from Grok CLI (JSONL format)
+ * @returns AI SDK compatible response object
  */
-export function convertFromGrokCliResponse(responseText) {
+export function convertFromGrokCliResponse(responseText: string): {
+	text: string;
+	usage?: {
+		promptTokens: number;
+		completionTokens: number;
+		totalTokens: number;
+	};
+} {
 	try {
 		// Grok CLI outputs JSONL format - each line is a separate JSON message
 		const lines = responseText
@@ -50,10 +68,10 @@ export function convertFromGrokCliResponse(responseText) {
 			.filter((line) => line.trim());
 
 		// Parse each line as JSON and find assistant messages
-		const messages = [];
+		const messages: GrokCliResponse[] = [];
 		for (const line of lines) {
 			try {
-				const message = JSON.parse(line);
+				const message = JSON.parse(line) as GrokCliResponse;
 				messages.push(message);
 			} catch (parseError) {
 				// Skip invalid JSON lines
@@ -95,10 +113,10 @@ export function convertFromGrokCliResponse(responseText) {
 
 /**
  * Create a prompt string for Grok CLI from messages
- * @param {Array<Object>} messages - AI SDK message array
- * @returns {string} Formatted prompt string
+ * @param messages - AI SDK message array
+ * @returns Formatted prompt string
  */
-export function createPromptFromMessages(messages) {
+export function createPromptFromMessages(messages: AISDKMessage[]): string {
 	const grokMessages = convertToGrokCliMessages(messages);
 
 	// Create a conversation-style prompt
@@ -122,14 +140,14 @@ export function createPromptFromMessages(messages) {
 
 /**
  * Escape shell arguments for safe CLI execution
- * @param {string} arg - Argument to escape
- * @returns {string} Shell-escaped argument
+ * @param arg - Argument to escape
+ * @returns Shell-escaped argument
  */
-export function escapeShellArg(arg) {
+export function escapeShellArg(arg: string | unknown): string {
 	if (typeof arg !== 'string') {
 		arg = String(arg);
 	}
 
 	// Replace single quotes with '\''
-	return "'" + arg.replace(/'/g, "'\\''") + "'";
+	return "'" + (arg as string).replace(/'/g, "'\\''") + "'";
 }

packages/ai-sdk-provider-grok-cli/src/types.ts

@@ -0,0 +1,81 @@
+/**
+ * Type definitions for Grok CLI provider
+ */
+
+/**
+ * Settings for configuring Grok CLI behavior
+ */
+export interface GrokCliSettings {
+	/** API key for Grok CLI */
+	apiKey?: string;
+	/** Base URL for Grok API */
+	baseURL?: string;
+	/** Default model to use */
+	model?: string;
+	/** Timeout in milliseconds */
+	timeout?: number;
+	/** Working directory for CLI commands */
+	workingDirectory?: string;
+}
+
+/**
+ * Model identifiers supported by Grok CLI
+ */
+export type GrokCliModelId = string;
+
+/**
+ * Error metadata for Grok CLI operations
+ */
+export interface GrokCliErrorMetadata {
+	/** Error code */
+	code?: string;
+	/** Process exit code */
+	exitCode?: number;
+	/** Standard error output */
+	stderr?: string;
+	/** Standard output */
+	stdout?: string;
+	/** Excerpt of the prompt that caused the error */
+	promptExcerpt?: string;
+	/** Timeout value in milliseconds */
+	timeoutMs?: number;
+}
+
+/**
+ * Message format for Grok CLI communication
+ */
+export interface GrokCliMessage {
+	/** Message role (user, assistant, system) */
+	role: string;
+	/** Message content */
+	content: string;
+}
+
+/**
+ * Response format from Grok CLI
+ */
+export interface GrokCliResponse {
+	/** Message role */
+	role: string;
+	/** Response content */
+	content: string;
+	/** Token usage information */
+	usage?: {
+		/** Input tokens used */
+		prompt_tokens?: number;
+		/** Output tokens used */
+		completion_tokens?: number;
+		/** Total tokens used */
+		total_tokens?: number;
+	};
+}
+
+/**
+ * Configuration options for Grok CLI language model
+ */
+export interface GrokCliLanguageModelOptions {
+	/** Model identifier */
+	id: GrokCliModelId;
+	/** Model settings */
+	settings?: GrokCliSettings;
+}

packages/ai-sdk-provider-grok-cli/tsconfig.json

@@ -0,0 +1,36 @@
+{
+	"compilerOptions": {
+		"target": "ES2022",
+		"module": "ESNext",
+		"lib": ["ES2022"],
+		"declaration": true,
+		"declarationMap": true,
+		"sourceMap": true,
+		"outDir": "./dist",
+		"baseUrl": ".",
+		"rootDir": "./src",
+		"strict": true,
+		"noImplicitAny": true,
+		"strictNullChecks": true,
+		"strictFunctionTypes": true,
+		"strictBindCallApply": true,
+		"strictPropertyInitialization": true,
+		"noImplicitThis": true,
+		"alwaysStrict": true,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"noImplicitReturns": true,
+		"noFallthroughCasesInSwitch": true,
+		"esModuleInterop": true,
+		"skipLibCheck": true,
+		"forceConsistentCasingInFileNames": true,
+		"moduleResolution": "bundler",
+		"moduleDetection": "force",
+		"types": ["node"],
+		"resolveJsonModule": true,
+		"isolatedModules": true,
+		"allowImportingTsExtensions": false
+	},
+	"include": ["src/**/*"],
+	"exclude": ["node_modules", "dist", "tests", "**/*.test.ts", "**/*.spec.ts"]
+}

packages/build-config/package.json

@@ -20,8 +20,7 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"devDependencies": {
-		"dotenv-mono": "^1.5.1",
-		"typescript": "^5.7.3"
+		"typescript": "^5.9.2"
 	},
 	"dependencies": {
 		"tsup": "^8.5.0"

packages/build-config/src/tsdown.base.ts

@@ -43,9 +43,9 @@ export const baseConfig: Partial<UserConfig> = {
 export function mergeConfig(
 	base: Partial<UserConfig>,
 	overrides: Partial<UserConfig>
-): Partial<UserConfig> {
+): UserConfig {
 	return {
 		...base,
 		...overrides
-	};
+	} as UserConfig;
 }

packages/tm-core/package.json

@@ -31,21 +31,13 @@
 	},
 	"dependencies": {
 		"@supabase/supabase-js": "^2.57.4",
-		"zod": "^3.23.8"
+		"zod": "^4.1.11"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^1.9.4",
-		"@tm/build-config": "*",
 		"@types/node": "^22.10.5",
-		"@vitest/coverage-v8": "^2.0.5",
-		"dotenv-mono": "^1.5.1",
-		"ts-node": "^10.9.2",
-		"tsup": "^8.5.0",
-		"typescript": "^5.7.3",
-		"vitest": "^2.1.8"
-	},
-	"engines": {
-		"node": ">=18.0.0"
+		"@vitest/coverage-v8": "^3.2.4",
+		"typescript": "^5.9.2",
+		"vitest": "^3.2.4"
 	},
 	"files": ["src", "README.md", "CHANGELOG.md"],
 	"keywords": ["task-management", "typescript", "ai", "prd", "parser"],

packages/tm-core/src/entities/task.entity.ts

@@ -33,6 +33,9 @@ export class TaskEntity implements Task {
 	tags?: string[];
 	assignee?: string;
 	complexity?: Task['complexity'];
+	recommendedSubtasks?: number;
+	expansionPrompt?: string;
+	complexityReasoning?: string;
 
 	constructor(data: Task | (Omit<Task, 'id'> & { id: number | string })) {
 		this.validate(data);
@@ -62,6 +65,9 @@ export class TaskEntity implements Task {
 		this.tags = data.tags;
 		this.assignee = data.assignee;
 		this.complexity = data.complexity;
+		this.recommendedSubtasks = data.recommendedSubtasks;
+		this.expansionPrompt = data.expansionPrompt;
+		this.complexityReasoning = data.complexityReasoning;
 	}
 
 	/**
@@ -246,7 +252,10 @@ export class TaskEntity implements Task {
 			actualEffort: this.actualEffort,
 			tags: this.tags,
 			assignee: this.assignee,
-			complexity: this.complexity
+			complexity: this.complexity,
+			recommendedSubtasks: this.recommendedSubtasks,
+			expansionPrompt: this.expansionPrompt,
+			complexityReasoning: this.complexityReasoning
 		};
 	}
 

packages/tm-core/src/index.ts

@@ -61,3 +61,12 @@ export { getLogger, createLogger, setGlobalLogger } from './logger/index.js';
 
 // Re-export executors
 export * from './executors/index.js';
+
+// Re-export reports
+export {
+	ComplexityReportManager,
+	type ComplexityReport,
+	type ComplexityReportMetadata,
+	type ComplexityAnalysis,
+	type TaskComplexityData
+} from './reports/index.js';

packages/tm-core/src/interfaces/storage.interface.ts

@@ -3,7 +3,17 @@
  * This file defines the contract for all storage implementations
  */
 
-import type { Task, TaskMetadata } from '../types/index.js';
+import type { Task, TaskMetadata, TaskStatus } from '../types/index.js';
+
+/**
+ * Result type for updateTaskStatus operations
+ */
+export interface UpdateStatusResult {
+	success: boolean;
+	oldStatus: TaskStatus;
+	newStatus: TaskStatus;
+	taskId: string;
+}
 
 /**
  * Interface for storage operations on tasks
@@ -54,6 +64,19 @@ export interface IStorage {
 		tag?: string
 	): Promise<void>;
 
+	/**
+	 * Update task or subtask status by ID
+	 * @param taskId - ID of the task or subtask (e.g., "1" or "1.2")
+	 * @param newStatus - New status to set
+	 * @param tag - Optional tag context for the task
+	 * @returns Promise that resolves to update result with old and new status
+	 */
+	updateTaskStatus(
+		taskId: string,
+		newStatus: TaskStatus,
+		tag?: string
+	): Promise<UpdateStatusResult>;
+
 	/**
 	 * Delete a task by ID
 	 * @param taskId - ID of the task to delete
@@ -191,6 +214,11 @@ export abstract class BaseStorage implements IStorage {
 		updates: Partial<Task>,
 		tag?: string
 	): Promise<void>;
+	abstract updateTaskStatus(
+		taskId: string,
+		newStatus: TaskStatus,
+		tag?: string
+	): Promise<UpdateStatusResult>;
 	abstract deleteTask(taskId: string, tag?: string): Promise<void>;
 	abstract exists(tag?: string): Promise<boolean>;
 	abstract loadMetadata(tag?: string): Promise<TaskMetadata | null>;

packages/tm-core/src/reports/complexity-report-manager.ts

@@ -0,0 +1,185 @@
+/**
+ * @fileoverview ComplexityReportManager - Handles loading and managing complexity analysis reports
+ * Follows the same pattern as ConfigManager and AuthManager
+ */
+
+import { promises as fs } from 'fs';
+import path from 'path';
+import type {
+	ComplexityReport,
+	ComplexityAnalysis,
+	TaskComplexityData
+} from './types.js';
+import { getLogger } from '../logger/index.js';
+
+const logger = getLogger('ComplexityReportManager');
+
+/**
+ * Manages complexity analysis reports
+ * Handles loading, caching, and providing complexity data for tasks
+ */
+export class ComplexityReportManager {
+	private projectRoot: string;
+	private reportCache: Map<string, ComplexityReport> = new Map();
+
+	constructor(projectRoot: string) {
+		this.projectRoot = projectRoot;
+	}
+
+	/**
+	 * Get the path to the complexity report file for a given tag
+	 */
+	private getReportPath(tag?: string): string {
+		const reportsDir = path.join(this.projectRoot, '.taskmaster', 'reports');
+		const tagSuffix = tag && tag !== 'master' ? `_${tag}` : '';
+		return path.join(reportsDir, `task-complexity-report${tagSuffix}.json`);
+	}
+
+	/**
+	 * Load complexity report for a given tag
+	 * Results are cached to avoid repeated file reads
+	 */
+	async loadReport(tag?: string): Promise<ComplexityReport | null> {
+		const resolvedTag = tag || 'master';
+		const cacheKey = resolvedTag;
+
+		// Check cache first
+		if (this.reportCache.has(cacheKey)) {
+			return this.reportCache.get(cacheKey)!;
+		}
+
+		const reportPath = this.getReportPath(tag);
+
+		try {
+			// Check if file exists
+			await fs.access(reportPath);
+
+			// Read and parse the report
+			const content = await fs.readFile(reportPath, 'utf-8');
+			const report = JSON.parse(content) as ComplexityReport;
+
+			// Validate basic structure
+			if (!report.meta || !Array.isArray(report.complexityAnalysis)) {
+				logger.warn(
+					`Invalid complexity report structure at ${reportPath}, ignoring`
+				);
+				return null;
+			}
+
+			// Cache the report
+			this.reportCache.set(cacheKey, report);
+
+			logger.debug(
+				`Loaded complexity report for tag '${resolvedTag}' with ${report.complexityAnalysis.length} analyses`
+			);
+
+			return report;
+		} catch (error: any) {
+			if (error.code === 'ENOENT') {
+				// File doesn't exist - this is normal, not all projects have complexity reports
+				logger.debug(`No complexity report found for tag '${resolvedTag}'`);
+				return null;
+			}
+
+			// Other errors (parsing, permissions, etc.)
+			logger.warn(
+				`Failed to load complexity report for tag '${resolvedTag}': ${error.message}`
+			);
+			return null;
+		}
+	}
+
+	/**
+	 * Get complexity data for a specific task ID
+	 */
+	async getComplexityForTask(
+		taskId: string | number,
+		tag?: string
+	): Promise<TaskComplexityData | null> {
+		const report = await this.loadReport(tag);
+		if (!report) {
+			return null;
+		}
+
+		// Find the analysis for this task
+		const analysis = report.complexityAnalysis.find(
+			(a) => String(a.taskId) === String(taskId)
+		);
+
+		if (!analysis) {
+			return null;
+		}
+
+		// Convert to TaskComplexityData format
+		return {
+			complexityScore: analysis.complexityScore,
+			recommendedSubtasks: analysis.recommendedSubtasks,
+			expansionPrompt: analysis.expansionPrompt,
+			complexityReasoning: analysis.complexityReasoning
+		};
+	}
+
+	/**
+	 * Get complexity data for multiple tasks at once
+	 * More efficient than calling getComplexityForTask multiple times
+	 */
+	async getComplexityForTasks(
+		taskIds: (string | number)[],
+		tag?: string
+	): Promise<Map<string, TaskComplexityData>> {
+		const result = new Map<string, TaskComplexityData>();
+		const report = await this.loadReport(tag);
+
+		if (!report) {
+			return result;
+		}
+
+		// Create a map for fast lookups
+		const analysisMap = new Map<string, ComplexityAnalysis>();
+		report.complexityAnalysis.forEach((analysis) => {
+			analysisMap.set(String(analysis.taskId), analysis);
+		});
+
+		// Map each task ID to its complexity data
+		taskIds.forEach((taskId) => {
+			const analysis = analysisMap.get(String(taskId));
+			if (analysis) {
+				result.set(String(taskId), {
+					complexityScore: analysis.complexityScore,
+					recommendedSubtasks: analysis.recommendedSubtasks,
+					expansionPrompt: analysis.expansionPrompt,
+					complexityReasoning: analysis.complexityReasoning
+				});
+			}
+		});
+
+		return result;
+	}
+
+	/**
+	 * Clear the report cache
+	 * @param tag - Specific tag to clear, or undefined to clear all cached reports
+	 * Useful when reports are regenerated or modified externally
+	 */
+	clearCache(tag?: string): void {
+		if (tag) {
+			this.reportCache.delete(tag);
+		} else {
+			// Clear all cached reports
+			this.reportCache.clear();
+		}
+	}
+
+	/**
+	 * Check if a complexity report exists for a tag
+	 */
+	async hasReport(tag?: string): Promise<boolean> {
+		const reportPath = this.getReportPath(tag);
+		try {
+			await fs.access(reportPath);
+			return true;
+		} catch {
+			return false;
+		}
+	}
+}

packages/tm-core/src/reports/index.ts

@@ -0,0 +1,11 @@
+/**
+ * @fileoverview Reports module exports
+ */
+
+export { ComplexityReportManager } from './complexity-report-manager.js';
+export type {
+	ComplexityReport,
+	ComplexityReportMetadata,
+	ComplexityAnalysis,
+	TaskComplexityData
+} from './types.js';

packages/tm-core/src/reports/types.ts

@@ -0,0 +1,65 @@
+/**
+ * @fileoverview Type definitions for complexity analysis reports
+ */
+
+/**
+ * Analysis result for a single task
+ */
+export interface ComplexityAnalysis {
+	/** Task ID being analyzed */
+	taskId: string | number;
+	/** Task title */
+	taskTitle: string;
+	/** Complexity score (1-10 scale) */
+	complexityScore: number;
+	/** Recommended number of subtasks */
+	recommendedSubtasks: number;
+	/** AI-generated prompt for task expansion */
+	expansionPrompt: string;
+	/** Reasoning behind the complexity assessment */
+	complexityReasoning: string;
+}
+
+/**
+ * Metadata about the complexity report
+ */
+export interface ComplexityReportMetadata {
+	/** When the report was generated */
+	generatedAt: string;
+	/** Number of tasks analyzed in this run */
+	tasksAnalyzed: number;
+	/** Total number of tasks in the file */
+	totalTasks?: number;
+	/** Total analyses in the report (across all runs) */
+	analysisCount?: number;
+	/** Complexity threshold score used */
+	thresholdScore: number;
+	/** Project name */
+	projectName?: string;
+	/** Whether research mode was used */
+	usedResearch: boolean;
+}
+
+/**
+ * Complete complexity analysis report
+ */
+export interface ComplexityReport {
+	/** Report metadata */
+	meta: ComplexityReportMetadata;
+	/** Array of complexity analyses */
+	complexityAnalysis: ComplexityAnalysis[];
+}
+
+/**
+ * Complexity data to be attached to a Task
+ */
+export interface TaskComplexityData {
+	/** Complexity score (1-10 scale) */
+	complexityScore?: number;
+	/** Recommended number of subtasks */
+	recommendedSubtasks?: number;
+	/** AI-generated expansion prompt */
+	expansionPrompt?: string;
+	/** Reasoning behind the assessment */
+	complexityReasoning?: string;
+}

packages/tm-core/src/services/task-service.ts

@@ -135,15 +135,28 @@ export class TaskService {
 	}
 
 	/**
-	 * Get a single task by ID
+	 * Get a single task by ID - delegates to storage layer
 	 */
 	async getTask(taskId: string, tag?: string): Promise<Task | null> {
-		const result = await this.getTaskList({
-			tag,
-			includeSubtasks: true
-		});
+		// Use provided tag or get active tag
+		const activeTag = tag || this.getActiveTag();
 
-		return result.tasks.find((t) => t.id === taskId) || null;
+		try {
+			// Delegate to storage layer which handles the specific logic for tasks vs subtasks
+			return await this.storage.loadTask(String(taskId), activeTag);
+		} catch (error) {
+			throw new TaskMasterError(
+				`Failed to get task ${taskId}`,
+				ERROR_CODES.STORAGE_ERROR,
+				{
+					operation: 'getTask',
+					resource: 'task',
+					taskId: String(taskId),
+					tag: activeTag
+				},
+				error as Error
+			);
+		}
 	}
 
 	/**
@@ -384,16 +397,6 @@ export class TaskService {
 				}
 			}
 
-			// Complexity filter
-			if (filter.complexity) {
-				const complexities = Array.isArray(filter.complexity)
-					? filter.complexity
-					: [filter.complexity];
-				if (!task.complexity || !complexities.includes(task.complexity)) {
-					return false;
-				}
-			}
-
 			// Search filter
 			if (filter.search) {
 				const searchLower = filter.search.toLowerCase();
@@ -446,7 +449,7 @@ export class TaskService {
 	}
 
 	/**
-	 * Update task status
+	 * Update task status - delegates to storage layer which handles storage-specific logic
 	 */
 	async updateTaskStatus(
 		taskId: string | number,
@@ -468,49 +471,28 @@ export class TaskService {
 
 		// Use provided tag or get active tag
 		const activeTag = tag || this.getActiveTag();
-
 		const taskIdStr = String(taskId);
 
-		// TODO: For now, assume it's a regular task and just try to update directly
-		// In the future, we can add subtask support if needed
-		if (taskIdStr.includes('.')) {
-			throw new TaskMasterError(
-				'Subtask status updates not yet supported in API storage',
-				ERROR_CODES.NOT_IMPLEMENTED
-			);
-		}
-
-		// Get the current task to get old status (simple, direct approach)
-		let currentTask: Task | null;
 		try {
-			// Try to get the task directly
-			currentTask = await this.storage.loadTask(taskIdStr, activeTag);
+			// Delegate to storage layer which handles the specific logic for tasks vs subtasks
+			return await this.storage.updateTaskStatus(
+				taskIdStr,
+				newStatus,
+				activeTag
+			);
 		} catch (error) {
 			throw new TaskMasterError(
-				`Failed to load task ${taskIdStr}`,
-				ERROR_CODES.TASK_NOT_FOUND,
-				{ taskId: taskIdStr },
+				`Failed to update task status for ${taskIdStr}`,
+				ERROR_CODES.STORAGE_ERROR,
+				{
+					operation: 'updateTaskStatus',
+					resource: 'task',
+					taskId: taskIdStr,
+					newStatus,
+					tag: activeTag
+				},
 				error as Error
 			);
 		}
-
-		if (!currentTask) {
-			throw new TaskMasterError(
-				`Task ${taskIdStr} not found`,
-				ERROR_CODES.TASK_NOT_FOUND
-			);
-		}
-
-		const oldStatus = currentTask.status;
-
-		// Simple, direct update - just change the status
-		await this.storage.updateTask(taskIdStr, { status: newStatus }, activeTag);
-
-		return {
-			success: true,
-			oldStatus,
-			newStatus,
-			taskId: taskIdStr
-		};
 	}
 }

packages/tm-core/src/storage/api-storage.ts

@@ -5,9 +5,15 @@
 
 import type {
 	IStorage,
-	StorageStats
+	StorageStats,
+	UpdateStatusResult
 } from '../interfaces/storage.interface.js';
-import type { Task, TaskMetadata, TaskTag } from '../types/index.js';
+import type {
+	Task,
+	TaskMetadata,
+	TaskTag,
+	TaskStatus
+} from '../types/index.js';
 import { ERROR_CODES, TaskMasterError } from '../errors/task-master-error.js';
 import { TaskRepository } from '../repositories/task-repository.interface.js';
 import { SupabaseTaskRepository } from '../repositories/supabase-task-repository.js';
@@ -485,6 +491,62 @@ export class ApiStorage implements IStorage {
 		}
 	}
 
+	/**
+	 * Update task or subtask status by ID - for API storage
+	 */
+	async updateTaskStatus(
+		taskId: string,
+		newStatus: TaskStatus,
+		tag?: string
+	): Promise<UpdateStatusResult> {
+		await this.ensureInitialized();
+
+		try {
+			const existingTask = await this.retryOperation(() =>
+				this.repository.getTask(this.projectId, taskId)
+			);
+
+			if (!existingTask) {
+				throw new Error(`Task ${taskId} not found`);
+			}
+
+			const oldStatus = existingTask.status;
+			if (oldStatus === newStatus) {
+				return {
+					success: true,
+					oldStatus,
+					newStatus,
+					taskId
+				};
+			}
+
+			// Update the task/subtask status
+			await this.retryOperation(() =>
+				this.repository.updateTask(this.projectId, taskId, {
+					status: newStatus,
+					updatedAt: new Date().toISOString()
+				})
+			);
+
+			// Note: Parent status auto-adjustment is handled by the backend API service
+			// which has its own business logic for managing task relationships
+
+			return {
+				success: true,
+				oldStatus,
+				newStatus,
+				taskId
+			};
+		} catch (error) {
+			throw new TaskMasterError(
+				'Failed to update task status via API',
+				ERROR_CODES.STORAGE_ERROR,
+				{ operation: 'updateTaskStatus', taskId, newStatus, tag },
+				error as Error
+			);
+		}
+	}
+
 	/**
 	 * Get all available tags
 	 */

packages/tm-core/src/storage/file-storage/file-storage.ts

@@ -2,14 +2,16 @@
  * @fileoverview Refactored file-based storage implementation for Task Master
  */
 
-import type { Task, TaskMetadata } from '../../types/index.js';
+import type { Task, TaskMetadata, TaskStatus } from '../../types/index.js';
 import type {
 	IStorage,
-	StorageStats
+	StorageStats,
+	UpdateStatusResult
 } from '../../interfaces/storage.interface.js';
 import { FormatHandler } from './format-handler.js';
 import { FileOperations } from './file-operations.js';
 import { PathResolver } from './path-resolver.js';
+import { ComplexityReportManager } from '../../reports/complexity-report-manager.js';
 
 /**
  * File-based storage implementation using a single tasks.json file with separated concerns
@@ -18,11 +20,13 @@ export class FileStorage implements IStorage {
 	private formatHandler: FormatHandler;
 	private fileOps: FileOperations;
 	private pathResolver: PathResolver;
+	private complexityManager: ComplexityReportManager;
 
 	constructor(projectPath: string) {
 		this.formatHandler = new FormatHandler();
 		this.fileOps = new FileOperations();
 		this.pathResolver = new PathResolver(projectPath);
+		this.complexityManager = new ComplexityReportManager(projectPath);
 	}
 
 	/**
@@ -86,6 +90,7 @@ export class FileStorage implements IStorage {
 
 	/**
 	 * Load tasks from the single tasks.json file for a specific tag
+	 * Enriches tasks with complexity data from the complexity report
 	 */
 	async loadTasks(tag?: string): Promise<Task[]> {
 		const filePath = this.pathResolver.getTasksPath();
@@ -93,7 +98,10 @@ export class FileStorage implements IStorage {
 
 		try {
 			const rawData = await this.fileOps.readJson(filePath);
-			return this.formatHandler.extractTasks(rawData, resolvedTag);
+			const tasks = this.formatHandler.extractTasks(rawData, resolvedTag);
+
+			// Enrich tasks with complexity data
+			return await this.enrichTasksWithComplexity(tasks, resolvedTag);
 		} catch (error: any) {
 			if (error.code === 'ENOENT') {
 				return []; // File doesn't exist, return empty array
@@ -104,9 +112,65 @@ export class FileStorage implements IStorage {
 
 	/**
 	 * Load a single task by ID from the tasks.json file
+	 * Handles both regular tasks and subtasks (with dotted notation like "1.2")
 	 */
 	async loadTask(taskId: string, tag?: string): Promise<Task | null> {
 		const tasks = await this.loadTasks(tag);
+
+		// Check if this is a subtask (contains a dot)
+		if (taskId.includes('.')) {
+			const [parentId, subtaskId] = taskId.split('.');
+			const parentTask = tasks.find((t) => String(t.id) === parentId);
+
+			if (!parentTask || !parentTask.subtasks) {
+				return null;
+			}
+
+			const subtask = parentTask.subtasks.find(
+				(st) => String(st.id) === subtaskId
+			);
+			if (!subtask) {
+				return null;
+			}
+
+			const toFullSubId = (maybeDotId: string | number): string => {
+				const depId = String(maybeDotId);
+				return depId.includes('.') ? depId : `${parentTask.id}.${depId}`;
+			};
+			const resolvedDependencies =
+				subtask.dependencies?.map((dep) => toFullSubId(dep)) ?? [];
+
+			// Return a Task-like object for the subtask with the full dotted ID
+			// Following the same pattern as findTaskById in utils.js
+			const subtaskResult = {
+				...subtask,
+				id: taskId, // Use the full dotted ID
+				title: subtask.title || `Subtask ${subtaskId}`,
+				description: subtask.description || '',
+				status: subtask.status || 'pending',
+				priority: subtask.priority || parentTask.priority || 'medium',
+				dependencies: resolvedDependencies,
+				details: subtask.details || '',
+				testStrategy: subtask.testStrategy || '',
+				subtasks: [],
+				tags: parentTask.tags || [],
+				assignee: subtask.assignee || parentTask.assignee,
+				complexity: subtask.complexity || parentTask.complexity,
+				createdAt: subtask.createdAt || parentTask.createdAt,
+				updatedAt: subtask.updatedAt || parentTask.updatedAt,
+				// Add reference to parent task for context (like utils.js does)
+				parentTask: {
+					id: parentTask.id,
+					title: parentTask.title,
+					status: parentTask.status
+				},
+				isSubtask: true
+			};
+
+			return subtaskResult;
+		}
+
+		// Handle regular task lookup
 		return tasks.find((task) => String(task.id) === String(taskId)) || null;
 	}
 
@@ -281,6 +345,159 @@ export class FileStorage implements IStorage {
 		await this.saveTasks(tasks, tag);
 	}
 
+	/**
+	 * Update task or subtask status by ID - handles file storage logic with parent/subtask relationships
+	 */
+	async updateTaskStatus(
+		taskId: string,
+		newStatus: TaskStatus,
+		tag?: string
+	): Promise<UpdateStatusResult> {
+		const tasks = await this.loadTasks(tag);
+
+		// Check if this is a subtask (contains a dot)
+		if (taskId.includes('.')) {
+			return this.updateSubtaskStatusInFile(tasks, taskId, newStatus, tag);
+		}
+
+		// Handle regular task update
+		const taskIndex = tasks.findIndex((t) => String(t.id) === String(taskId));
+
+		if (taskIndex === -1) {
+			throw new Error(`Task ${taskId} not found`);
+		}
+
+		const oldStatus = tasks[taskIndex].status;
+		if (oldStatus === newStatus) {
+			return {
+				success: true,
+				oldStatus,
+				newStatus,
+				taskId: String(taskId)
+			};
+		}
+
+		tasks[taskIndex] = {
+			...tasks[taskIndex],
+			status: newStatus,
+			updatedAt: new Date().toISOString()
+		};
+
+		await this.saveTasks(tasks, tag);
+
+		return {
+			success: true,
+			oldStatus,
+			newStatus,
+			taskId: String(taskId)
+		};
+	}
+
+	/**
+	 * Update subtask status within file storage - handles parent status auto-adjustment
+	 */
+	private async updateSubtaskStatusInFile(
+		tasks: Task[],
+		subtaskId: string,
+		newStatus: TaskStatus,
+		tag?: string
+	): Promise<UpdateStatusResult> {
+		// Parse the subtask ID to get parent ID and subtask ID
+		const parts = subtaskId.split('.');
+		if (parts.length !== 2) {
+			throw new Error(
+				`Invalid subtask ID format: ${subtaskId}. Expected format: parentId.subtaskId`
+			);
+		}
+
+		const [parentId, subIdRaw] = parts;
+		const subId = subIdRaw.trim();
+		if (!/^\d+$/.test(subId)) {
+			throw new Error(
+				`Invalid subtask ID: ${subId}. Subtask ID must be a positive integer.`
+			);
+		}
+		const subtaskNumericId = Number(subId);
+
+		// Find the parent task
+		const parentTaskIndex = tasks.findIndex(
+			(t) => String(t.id) === String(parentId)
+		);
+
+		if (parentTaskIndex === -1) {
+			throw new Error(`Parent task ${parentId} not found`);
+		}
+
+		const parentTask = tasks[parentTaskIndex];
+
+		// Find the subtask within the parent task
+		const subtaskIndex = parentTask.subtasks.findIndex(
+			(st) => st.id === subtaskNumericId || String(st.id) === subId
+		);
+
+		if (subtaskIndex === -1) {
+			throw new Error(
+				`Subtask ${subtaskId} not found in parent task ${parentId}`
+			);
+		}
+
+		const oldStatus = parentTask.subtasks[subtaskIndex].status || 'pending';
+		if (oldStatus === newStatus) {
+			return {
+				success: true,
+				oldStatus,
+				newStatus,
+				taskId: subtaskId
+			};
+		}
+
+		const now = new Date().toISOString();
+
+		// Update the subtask status
+		parentTask.subtasks[subtaskIndex] = {
+			...parentTask.subtasks[subtaskIndex],
+			status: newStatus,
+			updatedAt: now
+		};
+
+		// Auto-adjust parent status based on subtask statuses
+		const subs = parentTask.subtasks;
+		let parentNewStatus = parentTask.status;
+		if (subs.length > 0) {
+			const norm = (s: any) => s.status || 'pending';
+			const isDoneLike = (s: any) => {
+				const st = norm(s);
+				return st === 'done' || st === 'completed';
+			};
+			const allDone = subs.every(isDoneLike);
+			const anyInProgress = subs.some((s) => norm(s) === 'in-progress');
+			const anyDone = subs.some(isDoneLike);
+			const allPending = subs.every((s) => norm(s) === 'pending');
+
+			if (allDone) parentNewStatus = 'done';
+			else if (anyInProgress || anyDone) parentNewStatus = 'in-progress';
+			else if (allPending) parentNewStatus = 'pending';
+		}
+
+		// Always bump updatedAt; update status only if changed
+		tasks[parentTaskIndex] = {
+			...parentTask,
+			...(parentNewStatus !== parentTask.status
+				? { status: parentNewStatus }
+				: {}),
+			updatedAt: now
+		};
+
+		await this.saveTasks(tasks, tag);
+
+		return {
+			success: true,
+			oldStatus,
+			newStatus,
+			taskId: subtaskId
+		};
+	}
+
 	/**
 	 * Delete a task
 	 */
@@ -386,6 +603,46 @@ export class FileStorage implements IStorage {
 
 		await this.saveTasks(tasks, targetTag);
 	}
+
+	/**
+	 * Enrich tasks with complexity data from the complexity report
+	 * Private helper method called by loadTasks()
+	 */
+	private async enrichTasksWithComplexity(
+		tasks: Task[],
+		tag: string
+	): Promise<Task[]> {
+		// Get all task IDs for bulk lookup
+		const taskIds = tasks.map((t) => t.id);
+
+		// Load complexity data for all tasks at once (more efficient)
+		const complexityMap = await this.complexityManager.getComplexityForTasks(
+			taskIds,
+			tag
+		);
+
+		// If no complexity data found, return tasks as-is
+		if (complexityMap.size === 0) {
+			return tasks;
+		}
+
+		// Enrich each task with its complexity data
+		return tasks.map((task) => {
+			const complexityData = complexityMap.get(String(task.id));
+			if (!complexityData) {
+				return task;
+			}
+
+			// Merge complexity data into the task
+			return {
+				...task,
+				complexity: complexityData.complexityScore,
+				recommendedSubtasks: complexityData.recommendedSubtasks,
+				expansionPrompt: complexityData.expansionPrompt,
+				complexityReasoning: complexityData.complexityReasoning
+			};
+		});
+	}
 }
 
 // Export as default for convenience

packages/tm-core/src/storage/storage-factory.ts

@@ -82,7 +82,7 @@ export class StorageFactory {
 							apiAccessToken: credentials.token,
 							apiEndpoint:
 								config.storage?.apiEndpoint ||
-								process.env.HAMSTER_API_URL ||
+								process.env.TM_PUBLIC_BASE_DOMAIN ||
 								'https://tryhamster.com/api'
 						};
 						config.storage = nextStorage;
@@ -112,7 +112,7 @@ export class StorageFactory {
 							apiAccessToken: credentials.token,
 							apiEndpoint:
 								config.storage?.apiEndpoint ||
-								process.env.HAMSTER_API_URL ||
+								process.env.TM_PUBLIC_BASE_DOMAIN ||
 								'https://tryhamster.com/api'
 						};
 						config.storage = nextStorage;

packages/tm-core/src/types/index.ts

@@ -72,7 +72,13 @@ export interface Task {
 	actualEffort?: number;
 	tags?: string[];
 	assignee?: string;
-	complexity?: TaskComplexity;
+
+	// Complexity analysis (from complexity report)
+	// Can be either enum ('simple' | 'moderate' | 'complex' | 'very-complex') or numeric score (1-10)
+	complexity?: TaskComplexity | number;
+	recommendedSubtasks?: number;
+	expansionPrompt?: string;
+	complexityReasoning?: string;
 }
 
 /**
@@ -145,7 +151,6 @@ export interface TaskFilter {
 	hasSubtasks?: boolean;
 	search?: string;
 	assignee?: string;
-	complexity?: TaskComplexity | TaskComplexity[];
 }
 
 /**

scripts/modules/ai-services-unified.js

@@ -93,31 +93,55 @@ function _getProvider(providerName) {
 
 // Helper function to get cost for a specific model
 function _getCostForModel(providerName, modelId) {
-	const DEFAULT_COST = { inputCost: 0, outputCost: 0, currency: 'USD' };
+	const DEFAULT_COST = {
+		inputCost: 0,
+		outputCost: 0,
+		currency: 'USD',
+		isUnknown: false
+	};
 
 	if (!MODEL_MAP || !MODEL_MAP[providerName]) {
 		log(
 			'warn',
 			`Provider "${providerName}" not found in MODEL_MAP. Cannot determine cost for model ${modelId}.`
 		);
-		return DEFAULT_COST;
+		return { ...DEFAULT_COST, isUnknown: true };
 	}
 
 	const modelData = MODEL_MAP[providerName].find((m) => m.id === modelId);
 
-	if (!modelData?.cost_per_1m_tokens) {
+	if (!modelData) {
 		log(
 			'debug',
-			`Cost data not found for model "${modelId}" under provider "${providerName}". Assuming zero cost.`
+			`Model "${modelId}" not found under provider "${providerName}". Assuming unknown cost.`
 		);
-		return DEFAULT_COST;
+		return { ...DEFAULT_COST, isUnknown: true };
+	}
+
+	// Check if cost_per_1m_tokens is explicitly null (unknown pricing)
+	if (modelData.cost_per_1m_tokens === null) {
+		log(
+			'debug',
+			`Cost data is null for model "${modelId}" under provider "${providerName}". Pricing unknown.`
+		);
+		return { ...DEFAULT_COST, isUnknown: true };
+	}
+
+	// Check if cost_per_1m_tokens is missing/undefined (also unknown)
+	if (modelData.cost_per_1m_tokens === undefined) {
+		log(
+			'debug',
+			`Cost data not found for model "${modelId}" under provider "${providerName}". Pricing unknown.`
+		);
+		return { ...DEFAULT_COST, isUnknown: true };
 	}
 
 	const costs = modelData.cost_per_1m_tokens;
 	return {
 		inputCost: costs.input || 0,
 		outputCost: costs.output || 0,
-		currency: costs.currency || 'USD'
+		currency: costs.currency || 'USD',
+		isUnknown: false
 	};
 }
 
@@ -867,8 +891,8 @@ async function logAiUsage({
 		const timestamp = new Date().toISOString();
 		const totalTokens = (inputTokens || 0) + (outputTokens || 0);
 
-		// Destructure currency along with costs
-		const { inputCost, outputCost, currency } = _getCostForModel(
+		// Destructure currency along with costs and unknown flag
+		const { inputCost, outputCost, currency, isUnknown } = _getCostForModel(
 			providerName,
 			modelId
 		);
@@ -890,7 +914,8 @@ async function logAiUsage({
 			outputTokens: outputTokens || 0,
 			totalTokens,
 			totalCost,
-			currency // Add currency to the telemetry data
+			currency, // Add currency to the telemetry data
+			isUnknownCost: isUnknown // Flag to indicate if pricing is unknown
 		};
 
 		if (getDebugFlag()) {

scripts/modules/commands.js

@@ -1847,7 +1847,7 @@ function registerCommands(programInstance) {
 		)
 		.option(
 			'-r, --research',
-			'Use Perplexity AI for research-backed complexity analysis'
+			'Use configured research model for research-backed complexity analysis'
 		)
 		.option(
 			'-i, --id <ids>',

scripts/modules/config-manager.js

@@ -310,6 +310,8 @@ function validateProviderModelCombination(providerName, modelId) {
 function validateClaudeCodeSettings(settings) {
 	// Define the base settings schema without commandSpecific first
 	const BaseSettingsSchema = z.object({
+		pathToClaudeCodeExecutable: z.string().optional(),
+		// Use number().int() for integer validation in Zod
 		maxTurns: z.number().int().positive().optional(),
 		customSystemPrompt: z.string().optional(),
 		appendSystemPrompt: z.string().optional(),
@@ -325,19 +327,22 @@ function validateClaudeCodeSettings(settings) {
 					type: z.enum(['stdio', 'sse']).optional(),
 					command: z.string(),
 					args: z.array(z.string()).optional(),
-					env: z.record(z.string()).optional(),
-					url: z.string().url().optional(),
-					headers: z.record(z.string()).optional()
+					env: z.record(z.string(), z.string()).optional(),
+					url: z.url().optional(),
+					headers: z.record(z.string(), z.string()).optional()
 				})
 			)
 			.optional()
 	});
 
-	// Define CommandSpecificSchema using the base schema
-	const CommandSpecificSchema = z.record(
-		z.enum(AI_COMMAND_NAMES),
-		BaseSettingsSchema
-	);
+	// Define CommandSpecificSchema using flexible keys, but restrict to known commands
+	const CommandSpecificSchema = z
+		.record(z.string(), BaseSettingsSchema)
+		.refine(
+			(obj) =>
+				Object.keys(obj || {}).every((k) => AI_COMMAND_NAMES.includes(k)),
+			{ message: 'Invalid command name in commandSpecific' }
+		);
 
 	// Define the full settings schema with commandSpecific
 	const SettingsSchema = BaseSettingsSchema.extend({

scripts/modules/supported-models.json

@@ -522,7 +522,7 @@
 			"supported": true
 		},
 		{
-			"id": "deep-research",
+			"id": "sonar-deep-research",
 			"swe_score": 0.211,
 			"cost_per_1m_tokens": {
 				"input": 2,

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

@@ -2,7 +2,6 @@ import path from 'path';
 import chalk from 'chalk';
 import boxen from 'boxen';
 import Table from 'cli-table3';
-import { z } from 'zod';
 import Fuse from 'fuse.js'; // Import Fuse.js for advanced fuzzy search
 
 import {
@@ -29,6 +28,7 @@ import { getDefaultPriority, hasCodebaseAnalysis } from '../config-manager.js';
 import { getPromptManager } from '../prompt-manager.js';
 import ContextGatherer from '../utils/contextGatherer.js';
 import generateTaskFiles from './generate-task-files.js';
+import { COMMAND_SCHEMAS } from '../../../src/schemas/registry.js';
 import {
 	TASK_PRIORITY_OPTIONS,
 	DEFAULT_TASK_PRIORITY,
@@ -36,26 +36,6 @@ import {
 	normalizeTaskPriority
 } from '../../../src/constants/task-priority.js';
 
-// Define Zod schema for the expected AI output object
-const AiTaskDataSchema = z.object({
-	title: z.string().describe('Clear, concise title for the task'),
-	description: z
-		.string()
-		.describe('A one or two sentence description of the task'),
-	details: z
-		.string()
-		.describe('In-depth implementation details, considerations, and guidance'),
-	testStrategy: z
-		.string()
-		.describe('Detailed approach for verifying task completion'),
-	dependencies: z
-		.array(z.number())
-		.nullable()
-		.describe(
-			'Array of task IDs that this task depends on (must be completed before this task can start)'
-		)
-});
-
 /**
  * Get all tasks from all tags
  * @param {Object} rawData - The raw tagged data object
@@ -451,7 +431,7 @@ async function addTask(
 					role: serviceRole,
 					session: session,
 					projectRoot: projectRoot,
-					schema: AiTaskDataSchema,
+					schema: COMMAND_SCHEMAS['add-task'],
 					objectName: 'newTaskData',
 					systemPrompt: systemPrompt,
 					prompt: userPrompt,

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

@@ -11,7 +11,8 @@ import {
 	displayAiUsageSummary
 } from '../ui.js';
 
-import { generateTextService } from '../ai-services-unified.js';
+import { generateObjectService } from '../ai-services-unified.js';
+import { COMMAND_SCHEMAS } from '../../../src/schemas/registry.js';
 
 import {
 	getDebugFlag,
@@ -29,46 +30,6 @@ import { ContextGatherer } from '../utils/contextGatherer.js';
 import { FuzzyTaskSearch } from '../utils/fuzzyTaskSearch.js';
 import { flattenTasksWithSubtasks } from '../utils.js';
 
-/**
- * Generates the prompt for complexity analysis.
- * (Moved from ai-services.js and simplified)
- * @param {Object} tasksData - The tasks data object.
- * @param {string} [gatheredContext] - The gathered context for the analysis.
- * @returns {string} The generated prompt.
- */
-function generateInternalComplexityAnalysisPrompt(
-	tasksData,
-	gatheredContext = ''
-) {
-	const tasksString = JSON.stringify(tasksData.tasks, null, 2);
-	let prompt = `Analyze the following tasks to determine their complexity (1-10 scale) and recommend the number of subtasks for expansion. Provide a brief reasoning and an initial expansion prompt for each.
-
-Tasks:
-${tasksString}`;
-
-	if (gatheredContext) {
-		prompt += `\n\n# Project Context\n\n${gatheredContext}`;
-	}
-
-	prompt += `
-
-Respond ONLY with a valid JSON array matching the schema:
-[
-  {
-    "taskId": <number>,
-    "taskTitle": "<string>",
-    "complexityScore": <number 1-10>,
-    "recommendedSubtasks": <number>,
-    "expansionPrompt": "<string>",
-    "reasoning": "<string>"
-  },
-  ...
-]
-
-Do not include any explanatory text, markdown formatting, or code block markers before or after the JSON array.`;
-	return prompt;
-}
-
 /**
  * Analyzes task complexity and generates expansion recommendations
  * @param {Object} options Command options
@@ -446,12 +407,14 @@ async function analyzeTaskComplexity(options, context = {}) {
 		try {
 			const role = useResearch ? 'research' : 'main';
 
-			aiServiceResponse = await generateTextService({
+			aiServiceResponse = await generateObjectService({
 				prompt,
 				systemPrompt,
 				role,
 				session,
 				projectRoot,
+				schema: COMMAND_SCHEMAS['analyze-complexity'],
+				objectName: 'complexityAnalysis',
 				commandName: 'analyze-complexity',
 				outputType: mcpLog ? 'mcp' : 'cli'
 			});
@@ -463,63 +426,15 @@ async function analyzeTaskComplexity(options, context = {}) {
 			if (outputFormat === 'text') {
 				readline.clearLine(process.stdout, 0);
 				readline.cursorTo(process.stdout, 0);
-				console.log(
-					chalk.green('AI service call complete. Parsing response...')
-				);
+				console.log(chalk.green('AI service call complete.'));
 			}
 
-			reportLog('Parsing complexity analysis from text response...', 'info');
-			try {
-				let cleanedResponse = aiServiceResponse.mainResult;
-				cleanedResponse = cleanedResponse.trim();
-
-				const codeBlockMatch = cleanedResponse.match(
-					/```(?:json)?\s*([\s\S]*?)\s*```/
-				);
-				if (codeBlockMatch) {
-					cleanedResponse = codeBlockMatch[1].trim();
-				} else {
-					const firstBracket = cleanedResponse.indexOf('[');
-					const lastBracket = cleanedResponse.lastIndexOf(']');
-					if (firstBracket !== -1 && lastBracket > firstBracket) {
-						cleanedResponse = cleanedResponse.substring(
-							firstBracket,
-							lastBracket + 1
-						);
-					} else {
-						reportLog(
-							'Warning: Response does not appear to be a JSON array.',
-							'warn'
-						);
-					}
-				}
-
-				if (outputFormat === 'text' && getDebugFlag(session)) {
-					console.log(chalk.gray('Attempting to parse cleaned JSON...'));
-					console.log(chalk.gray('Cleaned response (first 100 chars):'));
-					console.log(chalk.gray(cleanedResponse.substring(0, 100)));
-					console.log(chalk.gray('Last 100 chars:'));
-					console.log(
-						chalk.gray(cleanedResponse.substring(cleanedResponse.length - 100))
-					);
-				}
-
-				complexityAnalysis = JSON.parse(cleanedResponse);
-			} catch (parseError) {
-				if (loadingIndicator) stopLoadingIndicator(loadingIndicator);
-				reportLog(
-					`Error parsing complexity analysis JSON: ${parseError.message}`,
-					'error'
-				);
-				if (outputFormat === 'text') {
-					console.error(
-						chalk.red(
-							`Error parsing complexity analysis JSON: ${parseError.message}`
-						)
-					);
-				}
-				throw parseError;
-			}
+			// With generateObject, we get structured data directly
+			complexityAnalysis = aiServiceResponse.mainResult.complexityAnalysis;
+			reportLog(
+				`Received ${complexityAnalysis.length} complexity analyses from AI.`,
+				'info'
+			);
 
 			const taskIds = tasksData.tasks.map((t) => t.id);
 			const analysisTaskIds = complexityAnalysis.map((a) => a.taskId);

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

@@ -1,22 +1,22 @@
 import fs from 'fs';
 import path from 'path';
-import { z } from 'zod';
 
 import {
+	getTagAwareFilePath,
+	isSilentMode,
 	log,
 	readJSON,
-	writeJSON,
-	isSilentMode,
-	getTagAwareFilePath
+	writeJSON
 } from '../utils.js';
 
 import {
+	displayAiUsageSummary,
 	startLoadingIndicator,
-	stopLoadingIndicator,
-	displayAiUsageSummary
+	stopLoadingIndicator
 } from '../ui.js';
 
-import { generateTextService } from '../ai-services-unified.js';
+import { COMMAND_SCHEMAS } from '../../../src/schemas/registry.js';
+import { generateObjectService } from '../ai-services-unified.js';
 
 import {
 	getDefaultSubtasks,
@@ -24,265 +24,12 @@ import {
 	hasCodebaseAnalysis
 } from '../config-manager.js';
 import { getPromptManager } from '../prompt-manager.js';
-import generateTaskFiles from './generate-task-files.js';
-import { COMPLEXITY_REPORT_FILE } from '../../../src/constants/paths.js';
+import { findProjectRoot, flattenTasksWithSubtasks } from '../utils.js';
 import { ContextGatherer } from '../utils/contextGatherer.js';
 import { FuzzyTaskSearch } from '../utils/fuzzyTaskSearch.js';
-import { flattenTasksWithSubtasks, findProjectRoot } from '../utils.js';
-
-// --- Zod Schemas (Keep from previous step) ---
-const subtaskSchema = z
-	.object({
-		id: z
-			.number()
-			.int()
-			.positive()
-			.describe('Sequential subtask ID starting from 1'),
-		title: z.string().min(5).describe('Clear, specific title for the subtask'),
-		description: z
-			.string()
-			.min(10)
-			.describe('Detailed description of the subtask'),
-		dependencies: z
-			.array(z.string())
-			.describe(
-				'Array of subtask dependencies within the same parent task. Use format ["parentTaskId.1", "parentTaskId.2"]. Subtasks can only depend on siblings, not external tasks.'
-			),
-		details: z.string().min(20).describe('Implementation details and guidance'),
-		status: z
-			.string()
-			.describe(
-				'The current status of the subtask (should be pending initially)'
-			),
-		testStrategy: z
-			.string()
-			.nullable()
-			.describe('Approach for testing this subtask')
-			.default('')
-	})
-	.strict();
-const subtaskArraySchema = z.array(subtaskSchema);
-const subtaskWrapperSchema = z.object({
-	subtasks: subtaskArraySchema.describe('The array of generated subtasks.')
-});
-// --- End Zod Schemas ---
 
 /**
- * Parse subtasks from AI's text response. Includes basic cleanup.
- * @param {string} text - Response text from AI.
- * @param {number} startId - Starting subtask ID expected.
- * @param {number} expectedCount - Expected number of subtasks.
- * @param {number} parentTaskId - Parent task ID for context.
- * @param {Object} logger - Logging object (mcpLog or console log).
- * @returns {Array} Parsed and potentially corrected subtasks array.
- * @throws {Error} If parsing fails or JSON is invalid/malformed.
- */
-function parseSubtasksFromText(
-	text,
-	startId,
-	expectedCount,
-	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.');
-	}
-
-	if (!text || text.trim() === '') {
-		throw new Error('AI response text is empty after trimming.');
-	}
-
-	const originalTrimmedResponse = text.trim(); // Store the original trimmed response
-	let jsonToParse = originalTrimmedResponse; // Initialize jsonToParse with it
-
-	logger.debug(
-		`Original AI Response for parsing (full length: ${jsonToParse.length}): ${jsonToParse.substring(0, 1000)}...`
-	);
-
-	// --- 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.');
-		} 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) {
-			const openBraces = 0;
-			const firstBraceFound = false;
-			const 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}`
-			);
-		}
-	}
-
-	// --- Validation (applies to successfully parsedObject from either attempt) ---
-	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)}`
-		);
-		throw new Error(
-			'Parsed AI response is not a valid object containing a "subtasks" array after all attempts.'
-		);
-	}
-	const parsedSubtasks = parsedObject.subtasks;
-
-	if (expectedCount && parsedSubtasks.length !== expectedCount) {
-		logger.warn(
-			`Expected ${expectedCount} subtasks, but parsed ${parsedSubtasks.length}.`
-		);
-	}
-
-	let currentId = startId;
-	const validatedSubtasks = [];
-	const validationErrors = [];
-
-	for (const rawSubtask of parsedSubtasks) {
-		const correctedSubtask = {
-			...rawSubtask,
-			id: currentId,
-			dependencies: Array.isArray(rawSubtask.dependencies)
-				? rawSubtask.dependencies.filter(
-						(dep) =>
-							typeof dep === 'string' && dep.startsWith(`${parentTaskId}.`)
-					)
-				: [],
-			status: 'pending'
-		};
-
-		const result = subtaskSchema.safeParse(correctedSubtask);
-
-		if (result.success) {
-			validatedSubtasks.push(result.data);
-		} else {
-			logger.warn(
-				`Subtask validation failed for raw data: ${JSON.stringify(rawSubtask).substring(0, 100)}...`
-			);
-			result.error.errors.forEach((err) => {
-				const errorMessage = `  - Field '${err.path.join('.')}': ${err.message}`;
-				logger.warn(errorMessage);
-				validationErrors.push(`Subtask ${currentId}: ${errorMessage}`);
-			});
-		}
-		currentId++;
-	}
-
-	if (validationErrors.length > 0) {
-		logger.error(
-			`Found ${validationErrors.length} validation errors in the generated subtasks.`
-		);
-		logger.warn('Proceeding with only the successfully validated subtasks.');
-	}
-
-	if (validatedSubtasks.length === 0 && parsedSubtasks.length > 0) {
-		throw new Error(
-			'AI response contained potential subtasks, but none passed validation.'
-		);
-	}
-	return validatedSubtasks.slice(0, expectedCount || validatedSubtasks.length);
-}
-
-/**
- * Expand a task into subtasks using the unified AI service (generateTextService).
+ * Expand a task into subtasks using the unified AI service (generateObjectService).
  * Appends new subtasks by default. Replaces existing subtasks if force=true.
  * Integrates complexity report to determine subtask count and prompt if available,
  * unless numSubtasks is explicitly provided.
@@ -450,6 +197,10 @@ async function expandTask(
 		}
 
 		// Determine prompt content AND system prompt
+		// Calculate the next subtask ID to match current behavior:
+		// - Start from the number of existing subtasks + 1
+		// - This creates sequential IDs: 1, 2, 3, 4...
+		// - Display format shows as parentTaskId.subtaskId (e.g., "1.1", "1.2", "2.1")
 		const nextSubtaskId = (task.subtasks?.length || 0) + 1;
 
 		// Load prompts using PromptManager
@@ -510,7 +261,6 @@ async function expandTask(
 			hasCodebaseAnalysis: hasCodebaseAnalysisCapability,
 			projectRoot: projectRoot || ''
 		};
-
 		let variantKey = 'default';
 		if (expansionPromptText) {
 			variantKey = 'complexity-report';
@@ -540,7 +290,7 @@ async function expandTask(
 		);
 		// --- End Complexity Report / Prompt Logic ---
 
-		// --- AI Subtask Generation using generateTextService ---
+		// --- AI Subtask Generation using generateObjectService ---
 		let generatedSubtasks = [];
 		let loadingIndicator = null;
 		if (outputFormat === 'text') {
@@ -549,48 +299,36 @@ async function expandTask(
 			);
 		}
 
-		let responseText = '';
 		let aiServiceResponse = null;
-
 		try {
 			const role = useResearch ? 'research' : 'main';
 
-			// Call generateTextService with the determined prompts and telemetry params
-			aiServiceResponse = await generateTextService({
+			// Call generateObjectService with the determined prompts and telemetry params
+			aiServiceResponse = await generateObjectService({
 				prompt: promptContent,
 				systemPrompt: systemPrompt,
 				role,
 				session,
 				projectRoot,
+				schema: COMMAND_SCHEMAS['expand-task'],
+				objectName: 'subtasks',
 				commandName: 'expand-task',
 				outputType: outputFormat
 			});
-			responseText = aiServiceResponse.mainResult;
 
-			// Parse Subtasks
-			generatedSubtasks = parseSubtasksFromText(
-				responseText,
-				nextSubtaskId,
-				finalSubtaskCount,
-				task.id,
-				logger
-			);
-			logger.info(
-				`Successfully parsed ${generatedSubtasks.length} subtasks from AI response.`
-			);
+			// With generateObject, we expect structured data – verify it before use
+			const mainResult = aiServiceResponse?.mainResult;
+			if (!mainResult || !Array.isArray(mainResult.subtasks)) {
+				throw new Error('AI response did not include a valid subtasks array.');
+			}
+			generatedSubtasks = mainResult.subtasks;
+			logger.info(`Received ${generatedSubtasks.length} subtasks from AI.`);
 		} catch (error) {
 			if (loadingIndicator) stopLoadingIndicator(loadingIndicator);
 			logger.error(
 				`Error during AI call or parsing for task ${taskId}: ${error.message}`, // Added task ID context
 				'error'
 			);
-			// Log raw response in debug mode if parsing failed
-			if (
-				error.message.includes('Failed to parse valid subtasks') &&
-				getDebugFlag(session)
-			) {
-				logger.error(`Raw AI Response that failed parsing:\n${responseText}`);
-			}
 			throw error;
 		} finally {
 			if (loadingIndicator) stopLoadingIndicator(loadingIndicator);

scripts/modules/task-manager/scope-adjustment.js

@@ -355,7 +355,7 @@ Ensure the JSON is valid and properly formatted.`;
 		const subtaskSchema = z.object({
 			subtasks: z.array(
 				z.object({
-					id: z.number().int().positive(),
+					id: z.int().positive(),
 					title: z.string().min(5),
 					description: z.string().min(10),
 					dependencies: z.array(z.string()),
@@ -386,14 +386,44 @@ Ensure the JSON is valid and properly formatted.`;
 			testStrategy: subtask.testStrategy || ''
 		}));
 
+		// Ensure new subtasks have unique sequential IDs after the preserved ones
+		const maxPreservedId = preservedSubtasks.reduce(
+			(max, st) => Math.max(max, st.id || 0),
+			0
+		);
+		let nextId = maxPreservedId + 1;
+		const idMapping = new Map();
+		const normalizedGeneratedSubtasks = processedGeneratedSubtasks
+			.map((st) => {
+				const originalId = st.id;
+				const newId = nextId++;
+				idMapping.set(originalId, newId);
+				return {
+					...st,
+					id: newId
+				};
+			})
+			.map((st) => ({
+				...st,
+				dependencies: (st.dependencies || []).map((dep) => {
+					if (typeof dep !== 'string' || !dep.startsWith(`${task.id}.`)) {
+						return dep;
+					}
+					const [, siblingIdPart] = dep.split('.');
+					const originalSiblingId = Number.parseInt(siblingIdPart, 10);
+					const remappedSiblingId = idMapping.get(originalSiblingId);
+					return remappedSiblingId ? `${task.id}.${remappedSiblingId}` : dep;
+				})
+			}));
+
 		// Update task with preserved subtasks + newly generated ones
-		task.subtasks = [...preservedSubtasks, ...processedGeneratedSubtasks];
+		task.subtasks = [...preservedSubtasks, ...normalizedGeneratedSubtasks];
 
 		return {
 			updatedTask: task,
 			regenerated: true,
 			preserved: preservedSubtasks.length,
-			generated: processedGeneratedSubtasks.length
+			generated: normalizedGeneratedSubtasks.length
 		};
 	} catch (error) {
 		log(

scripts/modules/task-manager/tag-management.js

@@ -619,9 +619,29 @@ async function tags(
 				headers.push(chalk.cyan.bold('Description'));
 			}
 
+			// Calculate dynamic column widths based on terminal width
+			const terminalWidth = Math.max(process.stdout.columns || 120, 80);
+			const usableWidth = Math.floor(terminalWidth * 0.95);
+
+			let colWidths;
+			if (showMetadata) {
+				// With metadata: Tag Name, Tasks, Completed, Created, Description
+				const widths = [0.25, 0.1, 0.12, 0.15, 0.38];
+				colWidths = widths.map((w, i) =>
+					Math.max(Math.floor(usableWidth * w), i === 0 ? 15 : 8)
+				);
+			} else {
+				// Without metadata: Tag Name, Tasks, Completed
+				const widths = [0.7, 0.15, 0.15];
+				colWidths = widths.map((w, i) =>
+					Math.max(Math.floor(usableWidth * w), i === 0 ? 20 : 10)
+				);
+			}
+
 			const table = new Table({
 				head: headers,
-				colWidths: showMetadata ? [20, 10, 12, 15, 50] : [25, 10, 12]
+				colWidths: colWidths,
+				wordWrap: true
 			});
 
 			// Add rows

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

@@ -3,7 +3,6 @@ import path from 'path';
 import chalk from 'chalk';
 import boxen from 'boxen';
 import Table from 'cli-table3';
-import { z } from 'zod'; // Keep Zod for post-parse validation
 
 import {
 	log as consoleLog,
@@ -22,7 +21,11 @@ import {
 	displayAiUsageSummary
 } from '../ui.js';
 
-import { generateTextService } from '../ai-services-unified.js';
+import {
+	generateTextService,
+	generateObjectService
+} from '../ai-services-unified.js';
+import { COMMAND_SCHEMAS } from '../../../src/schemas/registry.js';
 import {
 	getDebugFlag,
 	isApiKeySet,
@@ -32,229 +35,6 @@ import { getPromptManager } from '../prompt-manager.js';
 import { ContextGatherer } from '../utils/contextGatherer.js';
 import { FuzzyTaskSearch } from '../utils/fuzzyTaskSearch.js';
 
-// Zod schema for post-parsing validation of the updated task object
-const updatedTaskSchema = z
-	.object({
-		id: z.number().int(),
-		title: z.string(), // Title should be preserved, but check it exists
-		description: z.string(),
-		status: z.string(),
-		dependencies: z.array(z.union([z.number().int(), z.string()])),
-		priority: z.string().nullable().default('medium'),
-		details: z.string().nullable().default(''),
-		testStrategy: z.string().nullable().default(''),
-		subtasks: z
-			.array(
-				z.object({
-					id: z
-						.number()
-						.int()
-						.positive()
-						.describe('Sequential subtask ID starting from 1'),
-					title: z.string(),
-					description: z.string(),
-					status: z.string(),
-					dependencies: z.array(z.number().int()).nullable().default([]),
-					details: z.string().nullable().default(''),
-					testStrategy: z.string().nullable().default('')
-				})
-			)
-			.nullable()
-			.default([])
-	})
-	.strip(); // Allows parsing even if AI adds extra fields, but validation focuses on schema
-
-/**
- * Parses a single updated task object from AI's text response.
- * @param {string} text - Response text from AI.
- * @param {number} expectedTaskId - The ID of the task expected.
- * @param {Function | Object} logFn - Logging function or MCP logger.
- * @param {boolean} isMCP - Flag indicating MCP context.
- * @returns {Object} Parsed and validated task object.
- * @throws {Error} If parsing or validation fails.
- */
-function parseUpdatedTaskFromText(text, expectedTaskId, logFn, isMCP) {
-	// Report helper consistent with the established pattern
-	const report = (level, ...args) => {
-		if (isMCP) {
-			if (typeof logFn[level] === 'function') logFn[level](...args);
-			else logFn.info(...args);
-		} else if (!isSilentMode()) {
-			logFn(level, ...args);
-		}
-	};
-
-	report(
-		'info',
-		'Attempting to parse updated task object from text response...'
-	);
-	if (!text || text.trim() === '')
-		throw new Error('AI response text is empty.');
-
-	let cleanedResponse = text.trim();
-	const originalResponseForDebug = cleanedResponse;
-	let parseMethodUsed = 'raw'; // Keep track of which method worked
-
-	// --- NEW Step 1: Try extracting between {} first ---
-	const firstBraceIndex = cleanedResponse.indexOf('{');
-	const lastBraceIndex = cleanedResponse.lastIndexOf('}');
-	let potentialJsonFromBraces = null;
-
-	if (firstBraceIndex !== -1 && lastBraceIndex > firstBraceIndex) {
-		potentialJsonFromBraces = cleanedResponse.substring(
-			firstBraceIndex,
-			lastBraceIndex + 1
-		);
-		if (potentialJsonFromBraces.length <= 2) {
-			potentialJsonFromBraces = null; // Ignore empty braces {}
-		}
-	}
-
-	// If {} extraction yielded something, try parsing it immediately
-	if (potentialJsonFromBraces) {
-		try {
-			const testParse = JSON.parse(potentialJsonFromBraces);
-			// It worked! Use this as the primary cleaned response.
-			cleanedResponse = potentialJsonFromBraces;
-			parseMethodUsed = 'braces';
-		} catch (e) {
-			report(
-				'info',
-				'Content between {} looked promising but failed initial parse. Proceeding to other methods.'
-			);
-			// Reset cleanedResponse to original if brace parsing failed
-			cleanedResponse = originalResponseForDebug;
-		}
-	}
-
-	// --- Step 2: If brace parsing didn't work or wasn't applicable, try code block extraction ---
-	if (parseMethodUsed === 'raw') {
-		const codeBlockMatch = cleanedResponse.match(
-			/```(?:json|javascript)?\s*([\s\S]*?)\s*```/i
-		);
-		if (codeBlockMatch) {
-			cleanedResponse = codeBlockMatch[1].trim();
-			parseMethodUsed = 'codeblock';
-			report('info', 'Extracted JSON content from Markdown code block.');
-		} else {
-			// --- Step 3: If code block failed, try stripping prefixes ---
-			const commonPrefixes = [
-				'json\n',
-				'javascript\n'
-				// ... other prefixes ...
-			];
-			let prefixFound = false;
-			for (const prefix of commonPrefixes) {
-				if (cleanedResponse.toLowerCase().startsWith(prefix)) {
-					cleanedResponse = cleanedResponse.substring(prefix.length).trim();
-					parseMethodUsed = 'prefix';
-					report('info', `Stripped prefix: "${prefix.trim()}"`);
-					prefixFound = true;
-					break;
-				}
-			}
-			if (!prefixFound) {
-				report(
-					'warn',
-					'Response does not appear to contain {}, code block, or known prefix. Attempting raw parse.'
-				);
-			}
-		}
-	}
-
-	// --- Step 4: Attempt final parse ---
-	let parsedTask;
-	try {
-		parsedTask = JSON.parse(cleanedResponse);
-	} catch (parseError) {
-		report('error', `Failed to parse JSON object: ${parseError.message}`);
-		report(
-			'error',
-			`Problematic JSON string (first 500 chars): ${cleanedResponse.substring(0, 500)}`
-		);
-		report(
-			'error',
-			`Original Raw Response (first 500 chars): ${originalResponseForDebug.substring(0, 500)}`
-		);
-		throw new Error(
-			`Failed to parse JSON response object: ${parseError.message}`
-		);
-	}
-
-	if (!parsedTask || typeof parsedTask !== 'object') {
-		report(
-			'error',
-			`Parsed content is not an object. Type: ${typeof parsedTask}`
-		);
-		report(
-			'error',
-			`Parsed content sample: ${JSON.stringify(parsedTask).substring(0, 200)}`
-		);
-		throw new Error('Parsed AI response is not a valid JSON object.');
-	}
-
-	// Preprocess the task to ensure subtasks have proper structure
-	const preprocessedTask = {
-		...parsedTask,
-		status: parsedTask.status || 'pending',
-		dependencies: Array.isArray(parsedTask.dependencies)
-			? parsedTask.dependencies
-			: [],
-		details:
-			typeof parsedTask.details === 'string'
-				? parsedTask.details
-				: String(parsedTask.details || ''),
-		testStrategy:
-			typeof parsedTask.testStrategy === 'string'
-				? parsedTask.testStrategy
-				: String(parsedTask.testStrategy || ''),
-		// Ensure subtasks is an array and each subtask has required fields
-		subtasks: Array.isArray(parsedTask.subtasks)
-			? parsedTask.subtasks.map((subtask) => ({
-					...subtask,
-					title: subtask.title || '',
-					description: subtask.description || '',
-					status: subtask.status || 'pending',
-					dependencies: Array.isArray(subtask.dependencies)
-						? subtask.dependencies
-						: [],
-					details:
-						typeof subtask.details === 'string'
-							? subtask.details
-							: String(subtask.details || ''),
-					testStrategy:
-						typeof subtask.testStrategy === 'string'
-							? subtask.testStrategy
-							: String(subtask.testStrategy || '')
-				}))
-			: []
-	};
-
-	// Validate the parsed task object using Zod
-	const validationResult = updatedTaskSchema.safeParse(preprocessedTask);
-	if (!validationResult.success) {
-		report('error', 'Parsed task object failed Zod validation.');
-		validationResult.error.errors.forEach((err) => {
-			report('error', `  - Field '${err.path.join('.')}': ${err.message}`);
-		});
-		throw new Error(
-			`AI response failed task structure validation: ${validationResult.error.message}`
-		);
-	}
-
-	// Final check: ensure ID matches expected ID (AI might hallucinate)
-	if (validationResult.data.id !== expectedTaskId) {
-		report(
-			'warn',
-			`AI returned task with ID ${validationResult.data.id}, but expected ${expectedTaskId}. Overwriting ID.`
-		);
-		validationResult.data.id = expectedTaskId; // Enforce correct ID
-	}
-
-	report('info', 'Successfully validated updated task structure.');
-	return validationResult.data; // Return the validated task data
-}
-
 /**
  * Update a task by ID with new information using the unified AI service.
  * @param {string} tasksPath - Path to the tasks.json file
@@ -522,15 +302,32 @@ async function updateTaskById(
 
 		try {
 			const serviceRole = useResearch ? 'research' : 'main';
-			aiServiceResponse = await generateTextService({
-				role: serviceRole,
-				session: session,
-				projectRoot: projectRoot,
-				systemPrompt: systemPrompt,
-				prompt: userPrompt,
-				commandName: 'update-task',
-				outputType: isMCP ? 'mcp' : 'cli'
-			});
+
+			if (appendMode) {
+				// Append mode still uses generateTextService since it returns plain text
+				aiServiceResponse = await generateTextService({
+					role: serviceRole,
+					session: session,
+					projectRoot: projectRoot,
+					systemPrompt: systemPrompt,
+					prompt: userPrompt,
+					commandName: 'update-task',
+					outputType: isMCP ? 'mcp' : 'cli'
+				});
+			} else {
+				// Full update mode uses generateObjectService for structured output
+				aiServiceResponse = await generateObjectService({
+					role: serviceRole,
+					session: session,
+					projectRoot: projectRoot,
+					systemPrompt: systemPrompt,
+					prompt: userPrompt,
+					schema: COMMAND_SCHEMAS['update-task-by-id'],
+					objectName: 'task',
+					commandName: 'update-task',
+					outputType: isMCP ? 'mcp' : 'cli'
+				});
+			}
 
 			if (loadingIndicator)
 				stopLoadingIndicator(loadingIndicator, 'AI update complete.');
@@ -600,13 +397,8 @@ async function updateTaskById(
 				};
 			}
 
-			// Full update mode: Use mainResult (text) for parsing
-			const updatedTask = parseUpdatedTaskFromText(
-				aiServiceResponse.mainResult,
-				taskId,
-				logFn,
-				isMCP
-			);
+			// Full update mode: Use structured data directly
+			const updatedTask = aiServiceResponse.mainResult.task;
 
 			// --- Task Validation/Correction (Keep existing logic) ---
 			if (!updatedTask || typeof updatedTask !== 'object')

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

@@ -2,7 +2,6 @@ import path from 'path';
 import chalk from 'chalk';
 import boxen from 'boxen';
 import Table from 'cli-table3';
-import { z } from 'zod'; // Keep Zod for post-parsing validation
 
 import {
 	log as consoleLog,
@@ -22,258 +21,13 @@ import {
 import { getDebugFlag, hasCodebaseAnalysis } from '../config-manager.js';
 import { getPromptManager } from '../prompt-manager.js';
 import generateTaskFiles from './generate-task-files.js';
-import { generateTextService } from '../ai-services-unified.js';
+import { generateObjectService } from '../ai-services-unified.js';
+import { COMMAND_SCHEMAS } from '../../../src/schemas/registry.js';
 import { getModelConfiguration } from './models.js';
 import { ContextGatherer } from '../utils/contextGatherer.js';
 import { FuzzyTaskSearch } from '../utils/fuzzyTaskSearch.js';
 import { flattenTasksWithSubtasks, findProjectRoot } from '../utils.js';
 
-// Zod schema for validating the structure of tasks AFTER parsing
-const updatedTaskSchema = z
-	.object({
-		id: z.number().int(),
-		title: z.string(),
-		description: z.string(),
-		status: z.string(),
-		dependencies: z.array(z.union([z.number().int(), z.string()])),
-		priority: z.string().nullable(),
-		details: z.string().nullable(),
-		testStrategy: z.string().nullable(),
-		subtasks: z.array(z.any()).nullable() // Keep subtasks flexible for now
-	})
-	.strip(); // Allow potential extra fields during parsing if needed, then validate structure
-
-// Preprocessing schema that adds defaults before validation
-const preprocessTaskSchema = z.preprocess((task) => {
-	// Ensure task is an object
-	if (typeof task !== 'object' || task === null) {
-		return {};
-	}
-
-	// Return task with defaults for missing fields
-	return {
-		...task,
-		// Add defaults for required fields if missing
-		id: task.id ?? 0,
-		title: task.title ?? 'Untitled Task',
-		description: task.description ?? '',
-		status: task.status ?? 'pending',
-		dependencies: Array.isArray(task.dependencies) ? task.dependencies : [],
-		// Optional fields - preserve undefined/null distinction
-		priority: task.hasOwnProperty('priority') ? task.priority : null,
-		details: task.hasOwnProperty('details') ? task.details : null,
-		testStrategy: task.hasOwnProperty('testStrategy')
-			? task.testStrategy
-			: null,
-		subtasks: Array.isArray(task.subtasks)
-			? task.subtasks
-			: task.subtasks === null
-				? null
-				: []
-	};
-}, updatedTaskSchema);
-
-const updatedTaskArraySchema = z.array(updatedTaskSchema);
-const preprocessedTaskArraySchema = z.array(preprocessTaskSchema);
-
-/**
- * Parses an array of task objects from AI's text response.
- * @param {string} text - Response text from AI.
- * @param {number} expectedCount - Expected number of tasks.
- * @param {Function | Object} logFn - The logging function or MCP log object.
- * @param {boolean} isMCP - Flag indicating if logFn is MCP logger.
- * @returns {Array} Parsed and validated tasks array.
- * @throws {Error} If parsing or validation fails.
- */
-function parseUpdatedTasksFromText(text, expectedCount, logFn, isMCP) {
-	const report = (level, ...args) => {
-		if (isMCP) {
-			if (typeof logFn[level] === 'function') logFn[level](...args);
-			else logFn.info(...args);
-		} else if (!isSilentMode()) {
-			// Check silent mode for consoleLog
-			consoleLog(level, ...args);
-		}
-	};
-
-	report(
-		'info',
-		'Attempting to parse updated tasks array from text response...'
-	);
-	if (!text || text.trim() === '')
-		throw new Error('AI response text is empty.');
-
-	let cleanedResponse = text.trim();
-	const originalResponseForDebug = cleanedResponse;
-	let parseMethodUsed = 'raw'; // Track which method worked
-
-	// --- NEW Step 1: Try extracting between [] first ---
-	const firstBracketIndex = cleanedResponse.indexOf('[');
-	const lastBracketIndex = cleanedResponse.lastIndexOf(']');
-	let potentialJsonFromArray = null;
-
-	if (firstBracketIndex !== -1 && lastBracketIndex > firstBracketIndex) {
-		potentialJsonFromArray = cleanedResponse.substring(
-			firstBracketIndex,
-			lastBracketIndex + 1
-		);
-		// Basic check to ensure it's not just "[]" or malformed
-		if (potentialJsonFromArray.length <= 2) {
-			potentialJsonFromArray = null; // Ignore empty array
-		}
-	}
-
-	// If [] extraction yielded something, try parsing it immediately
-	if (potentialJsonFromArray) {
-		try {
-			const testParse = JSON.parse(potentialJsonFromArray);
-			// It worked! Use this as the primary cleaned response.
-			cleanedResponse = potentialJsonFromArray;
-			parseMethodUsed = 'brackets';
-		} catch (e) {
-			report(
-				'info',
-				'Content between [] looked promising but failed initial parse. Proceeding to other methods.'
-			);
-			// Reset cleanedResponse to original if bracket parsing failed
-			cleanedResponse = originalResponseForDebug;
-		}
-	}
-
-	// --- Step 2: If bracket parsing didn't work or wasn't applicable, try code block extraction ---
-	if (parseMethodUsed === 'raw') {
-		// Only look for ```json blocks now
-		const codeBlockMatch = cleanedResponse.match(
-			/```json\s*([\s\S]*?)\s*```/i // Only match ```json
-		);
-		if (codeBlockMatch) {
-			cleanedResponse = codeBlockMatch[1].trim();
-			parseMethodUsed = 'codeblock';
-			report('info', 'Extracted JSON content from JSON Markdown code block.');
-		} else {
-			report('info', 'No JSON code block found.');
-			// --- Step 3: If code block failed, try stripping prefixes ---
-			const commonPrefixes = [
-				'json\n',
-				'javascript\n', // Keep checking common prefixes just in case
-				'python\n',
-				'here are the updated tasks:',
-				'here is the updated json:',
-				'updated tasks:',
-				'updated json:',
-				'response:',
-				'output:'
-			];
-			let prefixFound = false;
-			for (const prefix of commonPrefixes) {
-				if (cleanedResponse.toLowerCase().startsWith(prefix)) {
-					cleanedResponse = cleanedResponse.substring(prefix.length).trim();
-					parseMethodUsed = 'prefix';
-					report('info', `Stripped prefix: "${prefix.trim()}"`);
-					prefixFound = true;
-					break;
-				}
-			}
-			if (!prefixFound) {
-				report(
-					'warn',
-					'Response does not appear to contain [], JSON code block, or known prefix. Attempting raw parse.'
-				);
-			}
-		}
-	}
-
-	// --- Step 4: Attempt final parse ---
-	let parsedTasks;
-	try {
-		parsedTasks = JSON.parse(cleanedResponse);
-	} catch (parseError) {
-		report('error', `Failed to parse JSON array: ${parseError.message}`);
-		report(
-			'error',
-			`Extraction method used: ${parseMethodUsed}` // Log which method failed
-		);
-		report(
-			'error',
-			`Problematic JSON string (first 500 chars): ${cleanedResponse.substring(0, 500)}`
-		);
-		report(
-			'error',
-			`Original Raw Response (first 500 chars): ${originalResponseForDebug.substring(0, 500)}`
-		);
-		throw new Error(
-			`Failed to parse JSON response array: ${parseError.message}`
-		);
-	}
-
-	// --- Step 5 & 6: Validate Array structure and Zod schema ---
-	if (!Array.isArray(parsedTasks)) {
-		report(
-			'error',
-			`Parsed content is not an array. Type: ${typeof parsedTasks}`
-		);
-		report(
-			'error',
-			`Parsed content sample: ${JSON.stringify(parsedTasks).substring(0, 200)}`
-		);
-		throw new Error('Parsed AI response is not a valid JSON array.');
-	}
-
-	report('info', `Successfully parsed ${parsedTasks.length} potential tasks.`);
-	if (expectedCount && parsedTasks.length !== expectedCount) {
-		report(
-			'warn',
-			`Expected ${expectedCount} tasks, but parsed ${parsedTasks.length}.`
-		);
-	}
-
-	// Log missing fields for debugging before preprocessing
-	let hasWarnings = false;
-	parsedTasks.forEach((task, index) => {
-		const missingFields = [];
-		if (!task.hasOwnProperty('id')) missingFields.push('id');
-		if (!task.hasOwnProperty('status')) missingFields.push('status');
-		if (!task.hasOwnProperty('dependencies'))
-			missingFields.push('dependencies');
-
-		if (missingFields.length > 0) {
-			hasWarnings = true;
-			report(
-				'warn',
-				`Task ${index} is missing fields: ${missingFields.join(', ')} - will use defaults`
-			);
-		}
-	});
-
-	if (hasWarnings) {
-		report(
-			'warn',
-			'Some tasks were missing required fields. Applying defaults...'
-		);
-	}
-
-	// Use the preprocessing schema to add defaults and validate
-	const preprocessResult = preprocessedTaskArraySchema.safeParse(parsedTasks);
-
-	if (!preprocessResult.success) {
-		// This should rarely happen now since preprocessing adds defaults
-		report('error', 'Failed to validate task array even after preprocessing.');
-		preprocessResult.error.errors.forEach((err) => {
-			report('error', `  - Path '${err.path.join('.')}': ${err.message}`);
-		});
-
-		throw new Error(
-			`AI response failed validation: ${preprocessResult.error.message}`
-		);
-	}
-
-	report('info', 'Successfully validated and transformed task structure.');
-	return preprocessResult.data.slice(
-		0,
-		expectedCount || preprocessResult.data.length
-	);
-}
-
 /**
  * Update tasks based on new context using the unified AI service.
  * @param {string} tasksPath - Path to the tasks.json file
@@ -458,13 +212,15 @@ async function updateTasks(
 			// Determine role based on research flag
 			const serviceRole = useResearch ? 'research' : 'main';
 
-			// Call the unified AI service
-			aiServiceResponse = await generateTextService({
+			// Call the unified AI service with generateObject
+			aiServiceResponse = await generateObjectService({
 				role: serviceRole,
 				session: session,
 				projectRoot: projectRoot,
 				systemPrompt: systemPrompt,
 				prompt: userPrompt,
+				schema: COMMAND_SCHEMAS['update-tasks'],
+				objectName: 'tasks',
 				commandName: 'update-tasks',
 				outputType: isMCP ? 'mcp' : 'cli'
 			});
@@ -472,13 +228,8 @@ async function updateTasks(
 			if (loadingIndicator)
 				stopLoadingIndicator(loadingIndicator, 'AI update complete.');
 
-			// Use the mainResult (text) for parsing
-			const parsedUpdatedTasks = parseUpdatedTasksFromText(
-				aiServiceResponse.mainResult,
-				tasksToUpdate.length,
-				logFn,
-				isMCP
-			);
+			// With generateObject, we get structured data directly
+			const parsedUpdatedTasks = aiServiceResponse.mainResult.tasks;
 
 			// --- Update Tasks Data (Updated writeJSON call) ---
 			if (!Array.isArray(parsedUpdatedTasks)) {

scripts/modules/ui.js

@@ -2310,7 +2310,8 @@ function displayAiUsageSummary(telemetryData, outputType = 'cli') {
 		outputTokens,
 		totalTokens,
 		totalCost,
-		commandName
+		commandName,
+		isUnknownCost
 	} = telemetryData;
 
 	let summary = chalk.bold.blue('AI Usage Summary:') + '\n';
@@ -2320,7 +2321,10 @@ function displayAiUsageSummary(telemetryData, outputType = 'cli') {
 	summary += chalk.gray(
 		`  Tokens: ${totalTokens} (Input: ${inputTokens}, Output: ${outputTokens})\n`
 	);
-	summary += chalk.gray(`  Est. Cost: $${totalCost.toFixed(6)}`);
+
+	// Show "Unknown" if pricing data is not available, otherwise show the cost
+	const costDisplay = isUnknownCost ? 'Unknown' : `$${totalCost.toFixed(6)}`;
+	summary += chalk.gray(`  Est. Cost: ${costDisplay}`);
 
 	console.log(
 		boxen(summary, {

src/ai-providers/base-provider.js

@@ -21,6 +21,13 @@ export class BaseAIProvider {
 
 		// Each provider must set their name
 		this.name = this.constructor.name;
+
+		/**
+		 * Whether this provider needs explicit schema in JSON mode
+		 * Can be overridden by subclasses
+		 * @type {boolean}
+		 */
+		this.needsExplicitJsonSchema = false;
 	}
 
 	/**
@@ -126,16 +133,6 @@ export class BaseAIProvider {
 		throw new Error('getRequiredApiKeyName must be implemented by provider');
 	}
 
-	/**
-	 * Determines if a model requires max_completion_tokens instead of maxTokens
-	 * Can be overridden by providers to specify their model requirements
-	 * @param {string} modelId - The model ID to check
-	 * @returns {boolean} True if the model requires max_completion_tokens
-	 */
-	requiresMaxCompletionTokens(modelId) {
-		return false; // Default behavior - most models use maxTokens
-	}
-
 	/**
 	 * Prepares token limit parameter based on model requirements
 	 * @param {string} modelId - The model ID
@@ -150,11 +147,7 @@ export class BaseAIProvider {
 		// Ensure maxTokens is an integer
 		const tokenValue = Math.floor(Number(maxTokens));
 
-		if (this.requiresMaxCompletionTokens(modelId)) {
-			return { max_completion_tokens: tokenValue };
-		} else {
-			return { maxTokens: tokenValue };
-		}
+		return { maxOutputTokens: tokenValue };
 	}
 
 	/**
@@ -183,12 +176,19 @@ export class BaseAIProvider {
 				`${this.name} generateText completed successfully for model: ${params.modelId}`
 			);
 
+			const inputTokens =
+				result.usage?.inputTokens ?? result.usage?.promptTokens ?? 0;
+			const outputTokens =
+				result.usage?.outputTokens ?? result.usage?.completionTokens ?? 0;
+			const totalTokens =
+				result.usage?.totalTokens ?? inputTokens + outputTokens;
+
 			return {
 				text: result.text,
 				usage: {
-					inputTokens: result.usage?.promptTokens,
-					outputTokens: result.usage?.completionTokens,
-					totalTokens: result.usage?.totalTokens
+					inputTokens,
+					outputTokens,
+					totalTokens
 				}
 			};
 		} catch (error) {
@@ -248,7 +248,7 @@ export class BaseAIProvider {
 				messages: params.messages,
 				schema: zodSchema(params.schema),
 				mode: params.mode || 'auto',
-				maxTokens: params.maxTokens,
+				maxOutputTokens: params.maxTokens,
 				temperature: params.temperature
 			});
 
@@ -286,12 +286,15 @@ export class BaseAIProvider {
 			);
 
 			const client = await this.getClient(params);
+
 			const result = await generateObject({
 				model: client(params.modelId),
 				messages: params.messages,
-				schema: zodSchema(params.schema),
-				mode: params.mode || 'auto',
-				...this.prepareTokenParam(params.modelId, params.maxTokens),
+				schema: params.schema,
+				mode: this.needsExplicitJsonSchema ? 'json' : 'auto',
+				schemaName: params.objectName,
+				schemaDescription: `Generate a valid JSON object for ${params.objectName}`,
+				maxTokens: params.maxTokens,
 				temperature: params.temperature
 			});
 
@@ -300,19 +303,26 @@ export class BaseAIProvider {
 				`${this.name} generateObject completed successfully for model: ${params.modelId}`
 			);
 
+			const inputTokens =
+				result.usage?.inputTokens ?? result.usage?.promptTokens ?? 0;
+			const outputTokens =
+				result.usage?.outputTokens ?? result.usage?.completionTokens ?? 0;
+			const totalTokens =
+				result.usage?.totalTokens ?? inputTokens + outputTokens;
+
 			return {
 				object: result.object,
 				usage: {
-					inputTokens: result.usage?.promptTokens,
-					outputTokens: result.usage?.completionTokens,
-					totalTokens: result.usage?.totalTokens
+					inputTokens,
+					outputTokens,
+					totalTokens
 				}
 			};
 		} catch (error) {
 			// Check if this is a JSON parsing error that we can potentially fix
 			if (
 				NoObjectGeneratedError.isInstance(error) &&
-				JSONParseError.isInstance(error.cause) &&
+				error.cause instanceof JSONParseError &&
 				error.cause.text
 			) {
 				log(

src/ai-providers/claude-code.js

@@ -1,54 +1,127 @@
 /**
  * src/ai-providers/claude-code.js
  *
- * Implementation for interacting with Claude models via Claude Code CLI
- * using a custom AI SDK implementation.
+ * Claude Code provider implementation using the ai-sdk-provider-claude-code package.
+ * This provider uses the local Claude Code CLI with OAuth token authentication.
+ *
+ * Authentication:
+ * - Uses CLAUDE_CODE_OAUTH_TOKEN managed by Claude Code CLI
+ * - Token is set up via: claude setup-token
+ * - No manual API key configuration required
  */
 
-import { createClaudeCode } from './custom-sdk/claude-code/index.js';
+import { createClaudeCode } from 'ai-sdk-provider-claude-code';
 import { BaseAIProvider } from './base-provider.js';
 import { getClaudeCodeSettingsForCommand } from '../../scripts/modules/config-manager.js';
+import { execSync } from 'child_process';
+import { log } from '../../scripts/modules/utils.js';
 
+let _claudeCliChecked = false;
+let _claudeCliAvailable = null;
+
+/**
+ * Provider for Claude Code CLI integration via AI SDK
+ *
+ * Features:
+ * - No API key required (uses local Claude Code CLI)
+ * - Supports 'sonnet' and 'opus' models
+ * - Command-specific configuration support
+ */
 export class ClaudeCodeProvider extends BaseAIProvider {
 	constructor() {
 		super();
 		this.name = 'Claude Code';
+		this.supportedModels = ['sonnet', 'opus'];
+		// Claude Code requires explicit JSON schema mode
+		this.needsExplicitJsonSchema = true;
 	}
 
+	/**
+	 * @returns {string} The environment variable name for API key (not used)
+	 */
 	getRequiredApiKeyName() {
 		return 'CLAUDE_CODE_API_KEY';
 	}
 
+	/**
+	 * @returns {boolean} False - Claude Code doesn't require API keys
+	 */
 	isRequiredApiKey() {
 		return false;
 	}
 
 	/**
-	 * Override validateAuth to skip API key validation for Claude Code
-	 * @param {object} params - Parameters to validate
+	 * Optional CLI availability check for Claude Code
+	 * @param {object} params - Parameters (ignored)
 	 */
 	validateAuth(params) {
-		// Claude Code doesn't require an API key
-		// No validation needed
+		// Claude Code uses local CLI - perform lightweight availability check
+		// This is optional validation that fails fast with actionable guidance
+		if (
+			process.env.NODE_ENV !== 'test' &&
+			!_claudeCliChecked &&
+			!process.env.CLAUDE_CODE_OAUTH_TOKEN
+		) {
+			try {
+				execSync('claude --version', { stdio: 'pipe', timeout: 1000 });
+				_claudeCliAvailable = true;
+			} catch (error) {
+				_claudeCliAvailable = false;
+				log(
+					'warn',
+					'Claude Code CLI not detected. Install it with: npm install -g @anthropic-ai/claude-code'
+				);
+			} finally {
+				_claudeCliChecked = true;
+			}
+		}
 	}
 
 	/**
-	 * Creates and returns a Claude Code client instance.
-	 * @param {object} params - Parameters for client initialization
-	 * @param {string} [params.commandName] - Name of the command invoking the service
-	 * @param {string} [params.baseURL] - Optional custom API endpoint (not used by Claude Code)
-	 * @returns {Function} Claude Code client function
-	 * @throws {Error} If initialization fails
+	 * Creates a Claude Code client instance
+	 * @param {object} params - Client parameters
+	 * @param {string} [params.commandName] - Command name for settings lookup
+	 * @returns {Function} Claude Code provider function
+	 * @throws {Error} If Claude Code CLI is not available or client creation fails
 	 */
-	getClient(params) {
+	getClient(params = {}) {
 		try {
-			// Claude Code doesn't use API keys or base URLs
-			// Just return the provider factory
+			const settings =
+				getClaudeCodeSettingsForCommand(params.commandName) || {};
+
 			return createClaudeCode({
-				defaultSettings: getClaudeCodeSettingsForCommand(params?.commandName)
+				defaultSettings: settings
 			});
 		} catch (error) {
-			this.handleError('client initialization', error);
+			// Provide more helpful error message
+			const msg = String(error?.message || '');
+			const code = error?.code;
+			if (code === 'ENOENT' || /claude/i.test(msg)) {
+				const enhancedError = new Error(
+					`Claude Code CLI not available. Please install Claude Code CLI first. Original error: ${error.message}`
+				);
+				enhancedError.cause = error;
+				this.handleError('Claude Code CLI initialization', enhancedError);
+			} else {
+				this.handleError('client initialization', error);
+			}
 		}
 	}
+
+	/**
+	 * @returns {string[]} List of supported model IDs
+	 */
+	getSupportedModels() {
+		return this.supportedModels;
+	}
+
+	/**
+	 * Check if a model is supported
+	 * @param {string} modelId - Model ID to check
+	 * @returns {boolean} True if supported
+	 */
+	isModelSupported(modelId) {
+		if (!modelId) return false;
+		return this.supportedModels.includes(String(modelId).toLowerCase());
+	}
 }

src/ai-providers/custom-sdk/claude-code/errors.js

@@ -1,126 +0,0 @@
-/**
- * @fileoverview Error handling utilities for Claude Code provider
- */
-
-import { APICallError, LoadAPIKeyError } from '@ai-sdk/provider';
-
-/**
- * @typedef {import('./types.js').ClaudeCodeErrorMetadata} ClaudeCodeErrorMetadata
- */
-
-/**
- * Create an API call error with Claude Code specific metadata
- * @param {Object} params - Error parameters
- * @param {string} params.message - Error message
- * @param {string} [params.code] - Error code
- * @param {number} [params.exitCode] - Process exit code
- * @param {string} [params.stderr] - Standard error output
- * @param {string} [params.promptExcerpt] - Excerpt of the prompt
- * @param {boolean} [params.isRetryable=false] - Whether the error is retryable
- * @returns {APICallError}
- */
-export function createAPICallError({
-	message,
-	code,
-	exitCode,
-	stderr,
-	promptExcerpt,
-	isRetryable = false
-}) {
-	/** @type {ClaudeCodeErrorMetadata} */
-	const metadata = {
-		code,
-		exitCode,
-		stderr,
-		promptExcerpt
-	};
-
-	return new APICallError({
-		message,
-		isRetryable,
-		url: 'claude-code-cli://command',
-		requestBodyValues: promptExcerpt ? { prompt: promptExcerpt } : undefined,
-		data: metadata
-	});
-}
-
-/**
- * Create an authentication error
- * @param {Object} params - Error parameters
- * @param {string} params.message - Error message
- * @returns {LoadAPIKeyError}
- */
-export function createAuthenticationError({ message }) {
-	return new LoadAPIKeyError({
-		message:
-			message ||
-			'Authentication failed. Please ensure Claude Code CLI is properly authenticated.'
-	});
-}
-
-/**
- * Create a timeout error
- * @param {Object} params - Error parameters
- * @param {string} params.message - Error message
- * @param {string} [params.promptExcerpt] - Excerpt of the prompt
- * @param {number} params.timeoutMs - Timeout in milliseconds
- * @returns {APICallError}
- */
-export function createTimeoutError({ message, promptExcerpt, timeoutMs }) {
-	// Store timeoutMs in metadata for potential use by error handlers
-	/** @type {ClaudeCodeErrorMetadata & { timeoutMs: number }} */
-	const metadata = {
-		code: 'TIMEOUT',
-		promptExcerpt,
-		timeoutMs
-	};
-
-	return new APICallError({
-		message,
-		isRetryable: true,
-		url: 'claude-code-cli://command',
-		requestBodyValues: promptExcerpt ? { prompt: promptExcerpt } : undefined,
-		data: metadata
-	});
-}
-
-/**
- * Check if an error is an authentication error
- * @param {unknown} error - Error to check
- * @returns {boolean}
- */
-export function isAuthenticationError(error) {
-	if (error instanceof LoadAPIKeyError) return true;
-	if (
-		error instanceof APICallError &&
-		/** @type {ClaudeCodeErrorMetadata} */ (error.data)?.exitCode === 401
-	)
-		return true;
-	return false;
-}
-
-/**
- * Check if an error is a timeout error
- * @param {unknown} error - Error to check
- * @returns {boolean}
- */
-export function isTimeoutError(error) {
-	if (
-		error instanceof APICallError &&
-		/** @type {ClaudeCodeErrorMetadata} */ (error.data)?.code === 'TIMEOUT'
-	)
-		return true;
-	return false;
-}
-
-/**
- * Get error metadata from an error
- * @param {unknown} error - Error to extract metadata from
- * @returns {ClaudeCodeErrorMetadata|undefined}
- */
-export function getErrorMetadata(error) {
-	if (error instanceof APICallError && error.data) {
-		return /** @type {ClaudeCodeErrorMetadata} */ (error.data);
-	}
-	return undefined;
-}

src/ai-providers/custom-sdk/claude-code/index.js

@@ -1,83 +0,0 @@
-/**
- * @fileoverview Claude Code provider factory and exports
- */
-
-import { NoSuchModelError } from '@ai-sdk/provider';
-import { ClaudeCodeLanguageModel } from './language-model.js';
-
-/**
- * @typedef {import('./types.js').ClaudeCodeSettings} ClaudeCodeSettings
- * @typedef {import('./types.js').ClaudeCodeModelId} ClaudeCodeModelId
- * @typedef {import('./types.js').ClaudeCodeProvider} ClaudeCodeProvider
- * @typedef {import('./types.js').ClaudeCodeProviderSettings} ClaudeCodeProviderSettings
- */
-
-/**
- * Create a Claude Code provider using the official SDK
- * @param {ClaudeCodeProviderSettings} [options={}] - Provider configuration options
- * @returns {ClaudeCodeProvider} Claude Code provider instance
- */
-export function createClaudeCode(options = {}) {
-	/**
-	 * Create a language model instance
-	 * @param {ClaudeCodeModelId} modelId - Model ID
-	 * @param {ClaudeCodeSettings} [settings={}] - Model settings
-	 * @returns {ClaudeCodeLanguageModel}
-	 */
-	const createModel = (modelId, settings = {}) => {
-		return new ClaudeCodeLanguageModel({
-			id: modelId,
-			settings: {
-				...options.defaultSettings,
-				...settings
-			}
-		});
-	};
-
-	/**
-	 * Provider function
-	 * @param {ClaudeCodeModelId} modelId - Model ID
-	 * @param {ClaudeCodeSettings} [settings] - Model settings
-	 * @returns {ClaudeCodeLanguageModel}
-	 */
-	const provider = function (modelId, settings) {
-		if (new.target) {
-			throw new Error(
-				'The Claude Code model function cannot be called with the new keyword.'
-			);
-		}
-
-		return createModel(modelId, settings);
-	};
-
-	provider.languageModel = createModel;
-	provider.chat = createModel; // Alias for languageModel
-
-	// Add textEmbeddingModel method that throws NoSuchModelError
-	provider.textEmbeddingModel = (modelId) => {
-		throw new NoSuchModelError({
-			modelId,
-			modelType: 'textEmbeddingModel'
-		});
-	};
-
-	return /** @type {ClaudeCodeProvider} */ (provider);
-}
-
-/**
- * Default Claude Code provider instance
- */
-export const claudeCode = createClaudeCode();
-
-// Provider exports
-export { ClaudeCodeLanguageModel } from './language-model.js';
-
-// Error handling exports
-export {
-	isAuthenticationError,
-	isTimeoutError,
-	getErrorMetadata,
-	createAPICallError,
-	createAuthenticationError,
-	createTimeoutError
-} from './errors.js';

src/ai-providers/custom-sdk/claude-code/json-extractor.js

@@ -1,59 +0,0 @@
-/**
- * @fileoverview Extract JSON from Claude's response, handling markdown blocks and other formatting
- */
-
-/**
- * Extract JSON from Claude's response
- * @param {string} text - The text to extract JSON from
- * @returns {string} - The extracted JSON string
- */
-export function extractJson(text) {
-	// Remove markdown code blocks if present
-	let jsonText = text.trim();
-
-	// Remove ```json blocks
-	jsonText = jsonText.replace(/^```json\s*/gm, '');
-	jsonText = jsonText.replace(/^```\s*/gm, '');
-	jsonText = jsonText.replace(/```\s*$/gm, '');
-
-	// Remove common TypeScript/JavaScript patterns
-	jsonText = jsonText.replace(/^const\s+\w+\s*=\s*/, ''); // Remove "const varName = "
-	jsonText = jsonText.replace(/^let\s+\w+\s*=\s*/, ''); // Remove "let varName = "
-	jsonText = jsonText.replace(/^var\s+\w+\s*=\s*/, ''); // Remove "var varName = "
-	jsonText = jsonText.replace(/;?\s*$/, ''); // Remove trailing semicolons
-
-	// Try to extract JSON object or array
-	const objectMatch = jsonText.match(/{[\s\S]*}/);
-	const arrayMatch = jsonText.match(/\[[\s\S]*\]/);
-
-	if (objectMatch) {
-		jsonText = objectMatch[0];
-	} else if (arrayMatch) {
-		jsonText = arrayMatch[0];
-	}
-
-	// First try to parse as valid JSON
-	try {
-		JSON.parse(jsonText);
-		return jsonText;
-	} catch {
-		// If it's not valid JSON, it might be a JavaScript object literal
-		// Try to convert it to valid JSON
-		try {
-			// This is a simple conversion that handles basic cases
-			// Replace unquoted keys with quoted keys
-			const converted = jsonText
-				.replace(/([{,]\s*)([a-zA-Z_$][a-zA-Z0-9_$]*)\s*:/g, '$1"$2":')
-				// Replace single quotes with double quotes
-				.replace(/'/g, '"');
-
-			// Validate the converted JSON
-			JSON.parse(converted);
-			return converted;
-		} catch {
-			// If all else fails, return the original text
-			// The AI SDK will handle the error appropriately
-			return text;
-		}
-	}
-}

src/ai-providers/custom-sdk/claude-code/language-model.js

@@ -1,540 +0,0 @@
-/**
- * @fileoverview Claude Code Language Model implementation
- */
-
-import { NoSuchModelError } from '@ai-sdk/provider';
-import { generateId } from '@ai-sdk/provider-utils';
-import { convertToClaudeCodeMessages } from './message-converter.js';
-import { extractJson } from './json-extractor.js';
-import { createAPICallError, createAuthenticationError } from './errors.js';
-
-let query;
-let AbortError;
-
-async function loadClaudeCodeModule() {
-	if (!query || !AbortError) {
-		try {
-			const mod = await import('@anthropic-ai/claude-code');
-			query = mod.query;
-			AbortError = mod.AbortError;
-		} catch (err) {
-			throw new Error(
-				"Claude Code SDK is not installed. Please install '@anthropic-ai/claude-code' to use the claude-code provider."
-			);
-		}
-	}
-}
-
-/**
- * @typedef {import('./types.js').ClaudeCodeSettings} ClaudeCodeSettings
- * @typedef {import('./types.js').ClaudeCodeModelId} ClaudeCodeModelId
- * @typedef {import('./types.js').ClaudeCodeLanguageModelOptions} ClaudeCodeLanguageModelOptions
- */
-
-const modelMap = {
-	opus: 'opus',
-	sonnet: 'sonnet'
-};
-
-export class ClaudeCodeLanguageModel {
-	specificationVersion = 'v1';
-	defaultObjectGenerationMode = 'json';
-	supportsImageUrls = false;
-	supportsStructuredOutputs = false;
-
-	/** @type {ClaudeCodeModelId} */
-	modelId;
-
-	/** @type {ClaudeCodeSettings} */
-	settings;
-
-	/** @type {string|undefined} */
-	sessionId;
-
-	/**
-	 * @param {ClaudeCodeLanguageModelOptions} options
-	 */
-	constructor(options) {
-		this.modelId = options.id;
-		this.settings = options.settings ?? {};
-
-		// Validate model ID format
-		if (
-			!this.modelId ||
-			typeof this.modelId !== 'string' ||
-			this.modelId.trim() === ''
-		) {
-			throw new NoSuchModelError({
-				modelId: this.modelId,
-				modelType: 'languageModel'
-			});
-		}
-	}
-
-	get provider() {
-		return 'claude-code';
-	}
-
-	/**
-	 * Get the model name for Claude Code CLI
-	 * @returns {string}
-	 */
-	getModel() {
-		const mapped = modelMap[this.modelId];
-		return mapped ?? this.modelId;
-	}
-
-	/**
-	 * Generate unsupported parameter warnings
-	 * @param {Object} options - Generation options
-	 * @returns {Array} Warnings array
-	 */
-	generateUnsupportedWarnings(options) {
-		const warnings = [];
-		const unsupportedParams = [];
-
-		// Check for unsupported parameters
-		if (options.temperature !== undefined)
-			unsupportedParams.push('temperature');
-		if (options.maxTokens !== undefined) unsupportedParams.push('maxTokens');
-		if (options.topP !== undefined) unsupportedParams.push('topP');
-		if (options.topK !== undefined) unsupportedParams.push('topK');
-		if (options.presencePenalty !== undefined)
-			unsupportedParams.push('presencePenalty');
-		if (options.frequencyPenalty !== undefined)
-			unsupportedParams.push('frequencyPenalty');
-		if (options.stopSequences !== undefined && options.stopSequences.length > 0)
-			unsupportedParams.push('stopSequences');
-		if (options.seed !== undefined) unsupportedParams.push('seed');
-
-		if (unsupportedParams.length > 0) {
-			// Add a warning for each unsupported parameter
-			for (const param of unsupportedParams) {
-				warnings.push({
-					type: 'unsupported-setting',
-					setting: param,
-					details: `Claude Code CLI does not support the ${param} parameter. It will be ignored.`
-				});
-			}
-		}
-
-		return warnings;
-	}
-
-	/**
-	 * Generate text using Claude Code
-	 * @param {Object} options - Generation options
-	 * @returns {Promise<Object>}
-	 */
-	async doGenerate(options) {
-		await loadClaudeCodeModule();
-		const { messagesPrompt } = convertToClaudeCodeMessages(
-			options.prompt,
-			options.mode
-		);
-
-		const abortController = new AbortController();
-		if (options.abortSignal) {
-			options.abortSignal.addEventListener('abort', () =>
-				abortController.abort()
-			);
-		}
-
-		const queryOptions = {
-			model: this.getModel(),
-			abortController,
-			resume: this.sessionId,
-			pathToClaudeCodeExecutable: this.settings.pathToClaudeCodeExecutable,
-			customSystemPrompt: this.settings.customSystemPrompt,
-			appendSystemPrompt: this.settings.appendSystemPrompt,
-			maxTurns: this.settings.maxTurns,
-			maxThinkingTokens: this.settings.maxThinkingTokens,
-			cwd: this.settings.cwd,
-			executable: this.settings.executable,
-			executableArgs: this.settings.executableArgs,
-			permissionMode: this.settings.permissionMode,
-			permissionPromptToolName: this.settings.permissionPromptToolName,
-			continue: this.settings.continue,
-			allowedTools: this.settings.allowedTools,
-			disallowedTools: this.settings.disallowedTools,
-			mcpServers: this.settings.mcpServers
-		};
-
-		let text = '';
-		let usage = { promptTokens: 0, completionTokens: 0 };
-		let finishReason = 'stop';
-		let costUsd;
-		let durationMs;
-		let rawUsage;
-		const warnings = this.generateUnsupportedWarnings(options);
-
-		try {
-			if (!query) {
-				throw new Error(
-					"Claude Code SDK is not installed. Please install '@anthropic-ai/claude-code' to use the claude-code provider."
-				);
-			}
-			const response = query({
-				prompt: messagesPrompt,
-				options: queryOptions
-			});
-
-			for await (const message of response) {
-				if (message.type === 'assistant') {
-					text += message.message.content
-						.map((c) => (c.type === 'text' ? c.text : ''))
-						.join('');
-				} else if (message.type === 'result') {
-					this.sessionId = message.session_id;
-					costUsd = message.total_cost_usd;
-					durationMs = message.duration_ms;
-
-					if ('usage' in message) {
-						rawUsage = message.usage;
-						usage = {
-							promptTokens:
-								(message.usage.cache_creation_input_tokens ?? 0) +
-								(message.usage.cache_read_input_tokens ?? 0) +
-								(message.usage.input_tokens ?? 0),
-							completionTokens: message.usage.output_tokens ?? 0
-						};
-					}
-
-					if (message.subtype === 'error_max_turns') {
-						finishReason = 'length';
-					} else if (message.subtype === 'error_during_execution') {
-						finishReason = 'error';
-					}
-				} else if (message.type === 'system' && message.subtype === 'init') {
-					this.sessionId = message.session_id;
-				}
-			}
-		} catch (error) {
-			// -------------------------------------------------------------
-			// Work-around for Claude-Code CLI/SDK JSON truncation bug (#913)
-			// -------------------------------------------------------------
-			// If the SDK throws a JSON SyntaxError *but* we already hold some
-			// buffered text, assume the response was truncated by the CLI.
-			// We keep the accumulated text, mark the finish reason, push a
-			// provider-warning and *skip* the normal error handling so Task
-			// Master can continue processing.
-			const isJsonTruncation =
-				error instanceof SyntaxError &&
-				/JSON/i.test(error.message || '') &&
-				(error.message.includes('position') ||
-					error.message.includes('Unexpected end'));
-			if (isJsonTruncation && text && text.length > 0) {
-				warnings.push({
-					type: 'provider-warning',
-					details:
-						'Claude Code SDK emitted a JSON parse error but Task Master recovered buffered text (possible CLI truncation).'
-				});
-				finishReason = 'truncated';
-				// Skip re-throwing: fall through so the caller receives usable data
-			} else {
-				if (AbortError && error instanceof AbortError) {
-					throw options.abortSignal?.aborted
-						? options.abortSignal.reason
-						: error;
-				}
-
-				// Check for authentication errors
-				if (
-					error.message?.includes('not logged in') ||
-					error.message?.includes('authentication') ||
-					error.exitCode === 401
-				) {
-					throw createAuthenticationError({
-						message:
-							error.message ||
-							'Authentication failed. Please ensure Claude Code CLI is properly authenticated.'
-					});
-				}
-
-				// Wrap other errors with API call error
-				throw createAPICallError({
-					message: error.message || 'Claude Code CLI error',
-					code: error.code,
-					exitCode: error.exitCode,
-					stderr: error.stderr,
-					promptExcerpt: messagesPrompt.substring(0, 200),
-					isRetryable: error.code === 'ENOENT' || error.code === 'ECONNREFUSED'
-				});
-			}
-		}
-
-		// Extract JSON if in object-json mode
-		if (options.mode?.type === 'object-json' && text) {
-			text = extractJson(text);
-		}
-
-		return {
-			text: text || undefined,
-			usage,
-			finishReason,
-			rawCall: {
-				rawPrompt: messagesPrompt,
-				rawSettings: queryOptions
-			},
-			warnings: warnings.length > 0 ? warnings : undefined,
-			response: {
-				id: generateId(),
-				timestamp: new Date(),
-				modelId: this.modelId
-			},
-			request: {
-				body: messagesPrompt
-			},
-			providerMetadata: {
-				'claude-code': {
-					...(this.sessionId !== undefined && { sessionId: this.sessionId }),
-					...(costUsd !== undefined && { costUsd }),
-					...(durationMs !== undefined && { durationMs }),
-					...(rawUsage !== undefined && { rawUsage })
-				}
-			}
-		};
-	}
-
-	/**
-	 * Stream text using Claude Code
-	 * @param {Object} options - Stream options
-	 * @returns {Promise<Object>}
-	 */
-	async doStream(options) {
-		await loadClaudeCodeModule();
-		const { messagesPrompt } = convertToClaudeCodeMessages(
-			options.prompt,
-			options.mode
-		);
-
-		const abortController = new AbortController();
-		if (options.abortSignal) {
-			options.abortSignal.addEventListener('abort', () =>
-				abortController.abort()
-			);
-		}
-
-		const queryOptions = {
-			model: this.getModel(),
-			abortController,
-			resume: this.sessionId,
-			pathToClaudeCodeExecutable: this.settings.pathToClaudeCodeExecutable,
-			customSystemPrompt: this.settings.customSystemPrompt,
-			appendSystemPrompt: this.settings.appendSystemPrompt,
-			maxTurns: this.settings.maxTurns,
-			maxThinkingTokens: this.settings.maxThinkingTokens,
-			cwd: this.settings.cwd,
-			executable: this.settings.executable,
-			executableArgs: this.settings.executableArgs,
-			permissionMode: this.settings.permissionMode,
-			permissionPromptToolName: this.settings.permissionPromptToolName,
-			continue: this.settings.continue,
-			allowedTools: this.settings.allowedTools,
-			disallowedTools: this.settings.disallowedTools,
-			mcpServers: this.settings.mcpServers
-		};
-
-		const warnings = this.generateUnsupportedWarnings(options);
-
-		const stream = new ReadableStream({
-			start: async (controller) => {
-				try {
-					if (!query) {
-						throw new Error(
-							"Claude Code SDK is not installed. Please install '@anthropic-ai/claude-code' to use the claude-code provider."
-						);
-					}
-					const response = query({
-						prompt: messagesPrompt,
-						options: queryOptions
-					});
-
-					let usage = { promptTokens: 0, completionTokens: 0 };
-					let accumulatedText = '';
-
-					for await (const message of response) {
-						if (message.type === 'assistant') {
-							const text = message.message.content
-								.map((c) => (c.type === 'text' ? c.text : ''))
-								.join('');
-
-							if (text) {
-								accumulatedText += text;
-
-								// In object-json mode, we need to accumulate the full text
-								// and extract JSON at the end, so don't stream individual deltas
-								if (options.mode?.type !== 'object-json') {
-									controller.enqueue({
-										type: 'text-delta',
-										textDelta: text
-									});
-								}
-							}
-						} else if (message.type === 'result') {
-							let rawUsage;
-							if ('usage' in message) {
-								rawUsage = message.usage;
-								usage = {
-									promptTokens:
-										(message.usage.cache_creation_input_tokens ?? 0) +
-										(message.usage.cache_read_input_tokens ?? 0) +
-										(message.usage.input_tokens ?? 0),
-									completionTokens: message.usage.output_tokens ?? 0
-								};
-							}
-
-							let finishReason = 'stop';
-							if (message.subtype === 'error_max_turns') {
-								finishReason = 'length';
-							} else if (message.subtype === 'error_during_execution') {
-								finishReason = 'error';
-							}
-
-							// Store session ID in the model instance
-							this.sessionId = message.session_id;
-
-							// In object-json mode, extract JSON and send the full text at once
-							if (options.mode?.type === 'object-json' && accumulatedText) {
-								const extractedJson = extractJson(accumulatedText);
-								controller.enqueue({
-									type: 'text-delta',
-									textDelta: extractedJson
-								});
-							}
-
-							controller.enqueue({
-								type: 'finish',
-								finishReason,
-								usage,
-								providerMetadata: {
-									'claude-code': {
-										sessionId: message.session_id,
-										...(message.total_cost_usd !== undefined && {
-											costUsd: message.total_cost_usd
-										}),
-										...(message.duration_ms !== undefined && {
-											durationMs: message.duration_ms
-										}),
-										...(rawUsage !== undefined && { rawUsage })
-									}
-								}
-							});
-						} else if (
-							message.type === 'system' &&
-							message.subtype === 'init'
-						) {
-							// Store session ID for future use
-							this.sessionId = message.session_id;
-
-							// Emit response metadata when session is initialized
-							controller.enqueue({
-								type: 'response-metadata',
-								id: message.session_id,
-								timestamp: new Date(),
-								modelId: this.modelId
-							});
-						}
-					}
-
-					// -------------------------------------------------------------
-					// Work-around for Claude-Code CLI/SDK JSON truncation bug (#913)
-					// -------------------------------------------------------------
-					// If we hit the SDK JSON SyntaxError but have buffered text, finalize
-					// the stream gracefully instead of emitting an error.
-					const isJsonTruncation =
-						error instanceof SyntaxError &&
-						/JSON/i.test(error.message || '') &&
-						(error.message.includes('position') ||
-							error.message.includes('Unexpected end'));
-
-					if (
-						isJsonTruncation &&
-						accumulatedText &&
-						accumulatedText.length > 0
-					) {
-						// Prepare final text payload
-						const finalText =
-							options.mode?.type === 'object-json'
-								? extractJson(accumulatedText)
-								: accumulatedText;
-
-						// Emit any remaining text
-						controller.enqueue({
-							type: 'text-delta',
-							textDelta: finalText
-						});
-
-						// Emit finish with truncated reason and warning
-						controller.enqueue({
-							type: 'finish',
-							finishReason: 'truncated',
-							usage,
-							providerMetadata: { 'claude-code': { truncated: true } },
-							warnings: [
-								{
-									type: 'provider-warning',
-									details:
-										'Claude Code SDK JSON truncation detected; stream recovered.'
-								}
-							]
-						});
-
-						controller.close();
-						return; // Skip normal error path
-					}
-
-					controller.close();
-				} catch (error) {
-					let errorToEmit;
-
-					if (AbortError && error instanceof AbortError) {
-						errorToEmit = options.abortSignal?.aborted
-							? options.abortSignal.reason
-							: error;
-					} else if (
-						error.message?.includes('not logged in') ||
-						error.message?.includes('authentication') ||
-						error.exitCode === 401
-					) {
-						errorToEmit = createAuthenticationError({
-							message:
-								error.message ||
-								'Authentication failed. Please ensure Claude Code CLI is properly authenticated.'
-						});
-					} else {
-						errorToEmit = createAPICallError({
-							message: error.message || 'Claude Code CLI error',
-							code: error.code,
-							exitCode: error.exitCode,
-							stderr: error.stderr,
-							promptExcerpt: messagesPrompt.substring(0, 200),
-							isRetryable:
-								error.code === 'ENOENT' || error.code === 'ECONNREFUSED'
-						});
-					}
-
-					// Emit error as a stream part
-					controller.enqueue({
-						type: 'error',
-						error: errorToEmit
-					});
-
-					controller.close();
-				}
-			}
-		});
-
-		return {
-			stream,
-			rawCall: {
-				rawPrompt: messagesPrompt,
-				rawSettings: queryOptions
-			},
-			warnings: warnings.length > 0 ? warnings : undefined,
-			request: {
-				body: messagesPrompt
-			}
-		};
-	}
-}

src/ai-providers/custom-sdk/claude-code/message-converter.js

@@ -1,139 +0,0 @@
-/**
- * @fileoverview Converts AI SDK prompt format to Claude Code message format
- */
-
-/**
- * Convert AI SDK prompt to Claude Code messages format
- * @param {Array} prompt - AI SDK prompt array
- * @param {Object} [mode] - Generation mode
- * @param {string} mode.type - Mode type ('regular', 'object-json', 'object-tool')
- * @returns {{messagesPrompt: string, systemPrompt?: string}}
- */
-export function convertToClaudeCodeMessages(prompt, mode) {
-	const messages = [];
-	let systemPrompt;
-
-	for (const message of prompt) {
-		switch (message.role) {
-			case 'system':
-				systemPrompt = message.content;
-				break;
-
-			case 'user':
-				if (typeof message.content === 'string') {
-					messages.push(message.content);
-				} else {
-					// Handle multi-part content
-					const textParts = message.content
-						.filter((part) => part.type === 'text')
-						.map((part) => part.text)
-						.join('\n');
-
-					if (textParts) {
-						messages.push(textParts);
-					}
-
-					// Note: Image parts are not supported by Claude Code CLI
-					const imageParts = message.content.filter(
-						(part) => part.type === 'image'
-					);
-					if (imageParts.length > 0) {
-						console.warn(
-							'Claude Code CLI does not support image inputs. Images will be ignored.'
-						);
-					}
-				}
-				break;
-
-			case 'assistant':
-				if (typeof message.content === 'string') {
-					messages.push(`Assistant: ${message.content}`);
-				} else {
-					const textParts = message.content
-						.filter((part) => part.type === 'text')
-						.map((part) => part.text)
-						.join('\n');
-
-					if (textParts) {
-						messages.push(`Assistant: ${textParts}`);
-					}
-
-					// Handle tool calls if present
-					const toolCalls = message.content.filter(
-						(part) => part.type === 'tool-call'
-					);
-					if (toolCalls.length > 0) {
-						// For now, we'll just note that tool calls were made
-						messages.push(`Assistant: [Tool calls made]`);
-					}
-				}
-				break;
-
-			case 'tool':
-				// Tool results could be included in the conversation
-				messages.push(
-					`Tool Result (${message.content[0].toolName}): ${JSON.stringify(
-						message.content[0].result
-					)}`
-				);
-				break;
-		}
-	}
-
-	// For the SDK, we need to provide a single prompt string
-	// Format the conversation history properly
-
-	// Combine system prompt with messages
-	let finalPrompt = '';
-
-	// Add system prompt at the beginning if present
-	if (systemPrompt) {
-		finalPrompt = systemPrompt;
-	}
-
-	if (messages.length === 0) {
-		return { messagesPrompt: finalPrompt, systemPrompt };
-	}
-
-	// Format messages
-	const formattedMessages = [];
-	for (let i = 0; i < messages.length; i++) {
-		const msg = messages[i];
-		// Check if this is a user or assistant message based on content
-		if (msg.startsWith('Assistant:') || msg.startsWith('Tool Result')) {
-			formattedMessages.push(msg);
-		} else {
-			// User messages
-			formattedMessages.push(`Human: ${msg}`);
-		}
-	}
-
-	// Combine system prompt with messages
-	if (finalPrompt) {
-		finalPrompt = finalPrompt + '\n\n' + formattedMessages.join('\n\n');
-	} else {
-		finalPrompt = formattedMessages.join('\n\n');
-	}
-
-	// For JSON mode, add explicit instruction to ensure JSON output
-	if (mode?.type === 'object-json') {
-		// Make the JSON instruction even more explicit
-		finalPrompt = `${finalPrompt}
-
-CRITICAL INSTRUCTION: You MUST respond with ONLY valid JSON. Follow these rules EXACTLY:
-1. Start your response with an opening brace {
-2. End your response with a closing brace }
-3. Do NOT include any text before the opening brace
-4. Do NOT include any text after the closing brace
-5. Do NOT use markdown code blocks or backticks
-6. Do NOT include explanations or commentary
-7. The ENTIRE response must be valid JSON that can be parsed with JSON.parse()
-
-Begin your response with { and end with }`;
-	}
-
-	return {
-		messagesPrompt: finalPrompt,
-		systemPrompt
-	};
-}

src/ai-providers/custom-sdk/claude-code/types.js

@@ -1,73 +0,0 @@
-/**
- * @fileoverview Type definitions for Claude Code AI SDK provider
- * These JSDoc types mirror the TypeScript interfaces from the original provider
- */
-
-/**
- * Claude Code provider settings
- * @typedef {Object} ClaudeCodeSettings
- * @property {string} [pathToClaudeCodeExecutable='claude'] - Custom path to Claude Code CLI executable
- * @property {string} [customSystemPrompt] - Custom system prompt to use
- * @property {string} [appendSystemPrompt] - Append additional content to the system prompt
- * @property {number} [maxTurns] - Maximum number of turns for the conversation
- * @property {number} [maxThinkingTokens] - Maximum thinking tokens for the model
- * @property {string} [cwd] - Working directory for CLI operations
- * @property {'bun'|'deno'|'node'} [executable='node'] - JavaScript runtime to use
- * @property {string[]} [executableArgs] - Additional arguments for the JavaScript runtime
- * @property {'default'|'acceptEdits'|'bypassPermissions'|'plan'} [permissionMode='default'] - Permission mode for tool usage
- * @property {string} [permissionPromptToolName] - Custom tool name for permission prompts
- * @property {boolean} [continue] - Continue the most recent conversation
- * @property {string} [resume] - Resume a specific session by ID
- * @property {string[]} [allowedTools] - Tools to explicitly allow during execution (e.g., ['Read', 'LS', 'Bash(git log:*)'])
- * @property {string[]} [disallowedTools] - Tools to disallow during execution (e.g., ['Write', 'Edit', 'Bash(rm:*)'])
- * @property {Object.<string, MCPServerConfig>} [mcpServers] - MCP server configuration
- * @property {boolean} [verbose] - Enable verbose logging for debugging
- */
-
-/**
- * MCP Server configuration
- * @typedef {Object} MCPServerConfig
- * @property {'stdio'|'sse'} [type='stdio'] - Server type
- * @property {string} command - Command to execute (for stdio type)
- * @property {string[]} [args] - Arguments for the command
- * @property {Object.<string, string>} [env] - Environment variables
- * @property {string} url - URL for SSE type servers
- * @property {Object.<string, string>} [headers] - Headers for SSE type servers
- */
-
-/**
- * Model ID type - either 'opus', 'sonnet', or any string
- * @typedef {'opus'|'sonnet'|string} ClaudeCodeModelId
- */
-
-/**
- * Language model options
- * @typedef {Object} ClaudeCodeLanguageModelOptions
- * @property {ClaudeCodeModelId} id - The model ID
- * @property {ClaudeCodeSettings} [settings] - Optional settings
- */
-
-/**
- * Error metadata for Claude Code errors
- * @typedef {Object} ClaudeCodeErrorMetadata
- * @property {string} [code] - Error code
- * @property {number} [exitCode] - Process exit code
- * @property {string} [stderr] - Standard error output
- * @property {string} [promptExcerpt] - Excerpt of the prompt that caused the error
- */
-
-/**
- * Claude Code provider interface
- * @typedef {Object} ClaudeCodeProvider
- * @property {function(ClaudeCodeModelId, ClaudeCodeSettings=): Object} languageModel - Create a language model
- * @property {function(ClaudeCodeModelId, ClaudeCodeSettings=): Object} chat - Alias for languageModel
- * @property {function(string): never} textEmbeddingModel - Throws NoSuchModelError (not supported)
- */
-
-/**
- * Claude Code provider settings
- * @typedef {Object} ClaudeCodeProviderSettings
- * @property {ClaudeCodeSettings} [defaultSettings] - Default settings to use for all models
- */
-
-export {}; // This ensures the file is treated as a module

src/ai-providers/custom-sdk/grok-cli/errors.js

@@ -1,155 +0,0 @@
-/**
- * @fileoverview Error handling utilities for Grok CLI provider
- */
-
-import { APICallError, LoadAPIKeyError } from '@ai-sdk/provider';
-
-/**
- * @typedef {import('./types.js').GrokCliErrorMetadata} GrokCliErrorMetadata
- */
-
-/**
- * Create an API call error with Grok CLI specific metadata
- * @param {Object} params - Error parameters
- * @param {string} params.message - Error message
- * @param {string} [params.code] - Error code
- * @param {number} [params.exitCode] - Process exit code
- * @param {string} [params.stderr] - Standard error output
- * @param {string} [params.stdout] - Standard output
- * @param {string} [params.promptExcerpt] - Excerpt of the prompt
- * @param {boolean} [params.isRetryable=false] - Whether the error is retryable
- * @returns {APICallError}
- */
-export function createAPICallError({
-	message,
-	code,
-	exitCode,
-	stderr,
-	stdout,
-	promptExcerpt,
-	isRetryable = false
-}) {
-	/** @type {GrokCliErrorMetadata} */
-	const metadata = {
-		code,
-		exitCode,
-		stderr,
-		stdout,
-		promptExcerpt
-	};
-
-	return new APICallError({
-		message,
-		isRetryable,
-		url: 'grok-cli://command',
-		requestBodyValues: promptExcerpt ? { prompt: promptExcerpt } : undefined,
-		data: metadata
-	});
-}
-
-/**
- * Create an authentication error
- * @param {Object} params - Error parameters
- * @param {string} params.message - Error message
- * @returns {LoadAPIKeyError}
- */
-export function createAuthenticationError({ message }) {
-	return new LoadAPIKeyError({
-		message:
-			message ||
-			'Authentication failed. Please ensure Grok CLI is properly configured with API key.'
-	});
-}
-
-/**
- * Create a timeout error
- * @param {Object} params - Error parameters
- * @param {string} params.message - Error message
- * @param {string} [params.promptExcerpt] - Excerpt of the prompt
- * @param {number} params.timeoutMs - Timeout in milliseconds
- * @returns {APICallError}
- */
-export function createTimeoutError({ message, promptExcerpt, timeoutMs }) {
-	/** @type {GrokCliErrorMetadata & { timeoutMs: number }} */
-	const metadata = {
-		code: 'TIMEOUT',
-		promptExcerpt,
-		timeoutMs
-	};
-
-	return new APICallError({
-		message,
-		isRetryable: true,
-		url: 'grok-cli://command',
-		requestBodyValues: promptExcerpt ? { prompt: promptExcerpt } : undefined,
-		data: metadata
-	});
-}
-
-/**
- * Create a CLI installation error
- * @param {Object} params - Error parameters
- * @param {string} [params.message] - Error message
- * @returns {APICallError}
- */
-export function createInstallationError({ message }) {
-	return new APICallError({
-		message:
-			message ||
-			'Grok CLI is not installed or not found in PATH. Please install with: npm install -g @vibe-kit/grok-cli',
-		isRetryable: false,
-		url: 'grok-cli://installation'
-	});
-}
-
-/**
- * Check if an error is an authentication error
- * @param {unknown} error - Error to check
- * @returns {boolean}
- */
-export function isAuthenticationError(error) {
-	if (error instanceof LoadAPIKeyError) return true;
-	if (
-		error instanceof APICallError &&
-		/** @type {GrokCliErrorMetadata} */ (error.data)?.exitCode === 401
-	)
-		return true;
-	return false;
-}
-
-/**
- * Check if an error is a timeout error
- * @param {unknown} error - Error to check
- * @returns {boolean}
- */
-export function isTimeoutError(error) {
-	if (
-		error instanceof APICallError &&
-		/** @type {GrokCliErrorMetadata} */ (error.data)?.code === 'TIMEOUT'
-	)
-		return true;
-	return false;
-}
-
-/**
- * Check if an error is an installation error
- * @param {unknown} error - Error to check
- * @returns {boolean}
- */
-export function isInstallationError(error) {
-	if (error instanceof APICallError && error.url === 'grok-cli://installation')
-		return true;
-	return false;
-}
-
-/**
- * Get error metadata from an error
- * @param {unknown} error - Error to extract metadata from
- * @returns {GrokCliErrorMetadata|undefined}
- */
-export function getErrorMetadata(error) {
-	if (error instanceof APICallError && error.data) {
-		return /** @type {GrokCliErrorMetadata} */ (error.data);
-	}
-	return undefined;
-}

src/ai-providers/custom-sdk/grok-cli/index.js

@@ -1,85 +0,0 @@
-/**
- * @fileoverview Grok CLI provider factory and exports
- */
-
-import { NoSuchModelError } from '@ai-sdk/provider';
-import { GrokCliLanguageModel } from './language-model.js';
-
-/**
- * @typedef {import('./types.js').GrokCliSettings} GrokCliSettings
- * @typedef {import('./types.js').GrokCliModelId} GrokCliModelId
- * @typedef {import('./types.js').GrokCliProvider} GrokCliProvider
- * @typedef {import('./types.js').GrokCliProviderSettings} GrokCliProviderSettings
- */
-
-/**
- * Create a Grok CLI provider
- * @param {GrokCliProviderSettings} [options={}] - Provider configuration options
- * @returns {GrokCliProvider} Grok CLI provider instance
- */
-export function createGrokCli(options = {}) {
-	/**
-	 * Create a language model instance
-	 * @param {GrokCliModelId} modelId - Model ID
-	 * @param {GrokCliSettings} [settings={}] - Model settings
-	 * @returns {GrokCliLanguageModel}
-	 */
-	const createModel = (modelId, settings = {}) => {
-		return new GrokCliLanguageModel({
-			id: modelId,
-			settings: {
-				...options.defaultSettings,
-				...settings
-			}
-		});
-	};
-
-	/**
-	 * Provider function
-	 * @param {GrokCliModelId} modelId - Model ID
-	 * @param {GrokCliSettings} [settings] - Model settings
-	 * @returns {GrokCliLanguageModel}
-	 */
-	const provider = function (modelId, settings) {
-		if (new.target) {
-			throw new Error(
-				'The Grok CLI model function cannot be called with the new keyword.'
-			);
-		}
-
-		return createModel(modelId, settings);
-	};
-
-	provider.languageModel = createModel;
-	provider.chat = createModel; // Alias for languageModel
-
-	// Add textEmbeddingModel method that throws NoSuchModelError
-	provider.textEmbeddingModel = (modelId) => {
-		throw new NoSuchModelError({
-			modelId,
-			modelType: 'textEmbeddingModel'
-		});
-	};
-
-	return /** @type {GrokCliProvider} */ (provider);
-}
-
-/**
- * Default Grok CLI provider instance
- */
-export const grokCli = createGrokCli();
-
-// Provider exports
-export { GrokCliLanguageModel } from './language-model.js';
-
-// Error handling exports
-export {
-	isAuthenticationError,
-	isTimeoutError,
-	isInstallationError,
-	getErrorMetadata,
-	createAPICallError,
-	createAuthenticationError,
-	createTimeoutError,
-	createInstallationError
-} from './errors.js';

src/ai-providers/custom-sdk/grok-cli/json-extractor.js

@@ -1,59 +0,0 @@
-/**
- * @fileoverview Extract JSON from Grok's response, handling markdown blocks and other formatting
- */
-
-/**
- * Extract JSON from Grok's response
- * @param {string} text - The text to extract JSON from
- * @returns {string} - The extracted JSON string
- */
-export function extractJson(text) {
-	// Remove markdown code blocks if present
-	let jsonText = text.trim();
-
-	// Remove ```json blocks
-	jsonText = jsonText.replace(/^```json\s*/gm, '');
-	jsonText = jsonText.replace(/^```\s*/gm, '');
-	jsonText = jsonText.replace(/```\s*$/gm, '');
-
-	// Remove common TypeScript/JavaScript patterns
-	jsonText = jsonText.replace(/^const\s+\w+\s*=\s*/, ''); // Remove "const varName = "
-	jsonText = jsonText.replace(/^let\s+\w+\s*=\s*/, ''); // Remove "let varName = "
-	jsonText = jsonText.replace(/^var\s+\w+\s*=\s*/, ''); // Remove "var varName = "
-	jsonText = jsonText.replace(/;?\s*$/, ''); // Remove trailing semicolons
-
-	// Try to extract JSON object or array
-	const objectMatch = jsonText.match(/{[\s\S]*}/);
-	const arrayMatch = jsonText.match(/\[[\s\S]*\]/);
-
-	if (objectMatch) {
-		jsonText = objectMatch[0];
-	} else if (arrayMatch) {
-		jsonText = arrayMatch[0];
-	}
-
-	// First try to parse as valid JSON
-	try {
-		JSON.parse(jsonText);
-		return jsonText;
-	} catch {
-		// If it's not valid JSON, it might be a JavaScript object literal
-		// Try to convert it to valid JSON
-		try {
-			// This is a simple conversion that handles basic cases
-			// Replace unquoted keys with quoted keys
-			const converted = jsonText
-				.replace(/([{,]\s*)([a-zA-Z_$][a-zA-Z0-9_$]*)\s*:/g, '$1"$2":')
-				// Replace single quotes with double quotes
-				.replace(/'/g, '"');
-
-			// Validate the converted JSON
-			JSON.parse(converted);
-			return converted;
-		} catch {
-			// If all else fails, return the original text
-			// The AI SDK will handle the error appropriately
-			return text;
-		}
-	}
-}

src/ai-providers/custom-sdk/grok-cli/types.js

@@ -1,56 +0,0 @@
-/**
- * @fileoverview Type definitions for Grok CLI provider
- */
-
-/**
- * @typedef {Object} GrokCliSettings
- * @property {string} [apiKey] - API key for Grok CLI
- * @property {string} [baseURL] - Base URL for Grok API
- * @property {string} [model] - Default model to use
- * @property {number} [timeout] - Timeout in milliseconds
- * @property {string} [workingDirectory] - Working directory for CLI commands
- */
-
-/**
- * @typedef {string} GrokCliModelId
- * Model identifiers supported by Grok CLI
- */
-
-/**
- * @typedef {Object} GrokCliErrorMetadata
- * @property {string} [code] - Error code
- * @property {number} [exitCode] - Process exit code
- * @property {string} [stderr] - Standard error output
- * @property {string} [stdout] - Standard output
- * @property {string} [promptExcerpt] - Excerpt of the prompt that caused the error
- * @property {number} [timeoutMs] - Timeout value in milliseconds
- */
-
-/**
- * @typedef {Function} GrokCliProvider
- * @property {Function} languageModel - Create a language model
- * @property {Function} chat - Alias for languageModel
- * @property {Function} textEmbeddingModel - Text embedding model (throws error)
- */
-
-/**
- * @typedef {Object} GrokCliProviderSettings
- * @property {GrokCliSettings} [defaultSettings] - Default settings for all models
- */
-
-/**
- * @typedef {Object} GrokCliMessage
- * @property {string} role - Message role (user, assistant, system)
- * @property {string} content - Message content
- */
-
-/**
- * @typedef {Object} GrokCliResponse
- * @property {string} content - Response content
- * @property {Object} [usage] - Token usage information
- * @property {number} [usage.prompt_tokens] - Input tokens used
- * @property {number} [usage.completion_tokens] - Output tokens used
- * @property {number} [usage.total_tokens] - Total tokens used
- */
-
-export {};

src/ai-providers/gemini-cli.js

@@ -9,26 +9,14 @@ import { generateObject, generateText, streamText } from 'ai';
 import { parse } from 'jsonc-parser';
 import { BaseAIProvider } from './base-provider.js';
 import { log } from '../../scripts/modules/utils.js';
-
-let createGeminiProvider;
-
-async function loadGeminiCliModule() {
-	if (!createGeminiProvider) {
-		try {
-			const mod = await import('ai-sdk-provider-gemini-cli');
-			createGeminiProvider = mod.createGeminiProvider;
-		} catch (err) {
-			throw new Error(
-				"Gemini CLI SDK is not installed. Please install 'ai-sdk-provider-gemini-cli' to use the gemini-cli provider."
-			);
-		}
-	}
-}
+import { createGeminiProvider } from 'ai-sdk-provider-gemini-cli';
 
 export class GeminiCliProvider extends BaseAIProvider {
 	constructor() {
 		super();
 		this.name = 'Gemini CLI';
+		// Gemini CLI requires explicit JSON schema mode
+		this.needsExplicitJsonSchema = true;
 	}
 
 	/**
@@ -54,8 +42,6 @@ export class GeminiCliProvider extends BaseAIProvider {
 	 */
 	async getClient(params) {
 		try {
-			// Load the Gemini CLI module dynamically
-			await loadGeminiCliModule();
 			// Primary use case: Use existing gemini CLI authentication
 			// Secondary use case: Direct API key (for compatibility)
 			let authOptions = {};
@@ -441,7 +427,7 @@ Generate ${subtaskCount} subtasks based on the original task context. Return ONL
 				model: client(params.modelId),
 				system: systemPrompt,
 				messages: messages,
-				maxTokens: params.maxTokens,
+				maxOutputTokens: params.maxTokens,
 				temperature: params.temperature
 			});
 
@@ -545,7 +531,7 @@ Generate ${subtaskCount} subtasks based on the original task context. Return ONL
 				model: client(params.modelId),
 				system: systemPrompt,
 				messages: messages,
-				maxTokens: params.maxTokens,
+				maxOutputTokens: params.maxTokens,
 				temperature: params.temperature
 			});
 
@@ -603,8 +589,8 @@ Generate ${subtaskCount} subtasks based on the original task context. Return ONL
 						system: systemPrompt,
 						messages: messages,
 						schema: params.schema,
-						mode: 'json', // Use json mode instead of auto for Gemini
-						maxTokens: params.maxTokens,
+						mode: this.needsExplicitJsonSchema ? 'json' : 'auto',
+						maxOutputTokens: params.maxTokens,
 						temperature: params.temperature
 					});
 

src/ai-providers/grok-cli.js

@@ -3,7 +3,7 @@
  * AI provider implementation for Grok models using Grok CLI.
  */
 
-import { createGrokCli } from './custom-sdk/grok-cli/index.js';
+import { createGrokCli } from '@tm/ai-sdk-provider-grok-cli';
 import { BaseAIProvider } from './base-provider.js';
 import { getGrokCliSettingsForCommand } from '../../scripts/modules/config-manager.js';
 
@@ -11,6 +11,8 @@ export class GrokCliProvider extends BaseAIProvider {
 	constructor() {
 		super();
 		this.name = 'Grok CLI';
+		// Grok CLI requires explicit JSON schema mode
+		this.needsExplicitJsonSchema = true;
 	}
 
 	/**

src/ai-providers/ollama.js

@@ -1,9 +1,9 @@
 /**
  * ollama.js
- * AI provider implementation for Ollama models using the ollama-ai-provider package.
+ * AI provider implementation for Ollama models using the ollama-ai-provider-v2 package.
  */
 
-import { createOllama } from 'ollama-ai-provider';
+import { createOllama } from 'ollama-ai-provider-v2';
 import { BaseAIProvider } from './base-provider.js';
 
 export class OllamaAIProvider extends BaseAIProvider {

src/ai-providers/openai.js

@@ -20,16 +20,6 @@ export class OpenAIProvider extends BaseAIProvider {
 		return 'OPENAI_API_KEY';
 	}
 
-	/**
-	 * Determines if a model requires max_completion_tokens instead of maxTokens
-	 * GPT-5 models require max_completion_tokens parameter
-	 * @param {string} modelId - The model ID to check
-	 * @returns {boolean} True if the model requires max_completion_tokens
-	 */
-	requiresMaxCompletionTokens(modelId) {
-		return modelId && modelId.startsWith('gpt-5');
-	}
-
 	/**
 	 * Creates and returns an OpenAI client instance.
 	 * @param {object} params - Parameters for client initialization