diff --git a/.changeset/easy-deer-heal.md b/.changeset/easy-deer-heal.md
deleted file mode 100644
index d4b19cb0..00000000
--- a/.changeset/easy-deer-heal.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"task-master-ai": minor
----
-
-Testing one more pre-release iteration
diff --git a/.changeset/moody-oranges-slide.md b/.changeset/moody-oranges-slide.md
deleted file mode 100644
index cee26d11..00000000
--- a/.changeset/moody-oranges-slide.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"task-master-ai": minor
----
-
-Test out the RC
diff --git a/.changeset/odd-otters-tan.md b/.changeset/odd-otters-tan.md
deleted file mode 100644
index 10ddf5e5..00000000
--- a/.changeset/odd-otters-tan.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@tm/cli": minor
----
-
-testing this stuff out to see how the release candidate works with monorepo
diff --git a/.changeset/pretty-planes-cross.md b/.changeset/pretty-planes-cross.md
index 6c4daa43..13947504 100644
--- a/.changeset/pretty-planes-cross.md
+++ b/.changeset/pretty-planes-cross.md
@@ -2,7 +2,7 @@
 "task-master-ai": minor
 ---
 
-Add grok-cli as a provider. You can now use Grok models with Task Master by setting the `GROK_CLI_API_KEY` environment variable.
+Add grok-cli as a provider with full codebase context support. You can now use Grok models (grok-2, grok-3, grok-4, etc.) with Task Master for AI operations that have access to your entire codebase context, enabling more informed task generation and PRD parsing.
 
 ## Setup Instructions
 
@@ -20,11 +20,17 @@ Add grok-cli as a provider. You can now use Grok models with Task Master by sett
    task-master models --set-fallback grok-beta
    ```
 
-## Available Models
-- `grok-beta` - Latest Grok model
-- `grok-vision-beta` - Grok with vision capabilities
+## Key Features
+- **Full codebase context**: Grok models can analyze your entire project when generating tasks or parsing PRDs
+- **xAI model access**: Support for latest Grok models (grok-2, grok-3, grok-4, etc.)
+- **Code-aware task generation**: Create more accurate and contextual tasks based on your actual codebase
+- **Intelligent PRD parsing**: Parse requirements with understanding of your existing code structure
 
-The Grok CLI provider integrates with xAI's Grok models and can also use the local Grok CLI configuration file (`~/.grok/user-settings.json`) if available.
+## Available Models
+- `grok-beta` - Latest Grok model with codebase context
+- `grok-vision-beta` - Grok with vision capabilities and codebase context
+
+The Grok CLI provider integrates with xAI's Grok models via grok-cli and can also use the local Grok CLI configuration file (`~/.grok/user-settings.json`) if available.
 
 ## Credits
 Built using the [grok-cli](https://github.com/superagent-ai/grok-cli) by Superagent AI for seamless integration with xAI's Grok models.
diff --git a/.changeset/ready-plums-worry.md b/.changeset/ready-plums-worry.md
new file mode 100644
index 00000000..6eecde71
--- /dev/null
+++ b/.changeset/ready-plums-worry.md
@@ -0,0 +1,8 @@
+---
+"task-master-ai": minor
+---
+
+Improve taskmaster ai provider defaults
+
+- moving from main anthropic 3.7 to anthropic sonnet 4
+- moving from fallback anthropic 3.5 to anthropic 3.7
\ No newline at end of file
diff --git a/.taskmaster/config.json b/.taskmaster/config.json
index ec3ed3f0..c1c0f929 100644
--- a/.taskmaster/config.json
+++ b/.taskmaster/config.json
@@ -1,9 +1,9 @@
 {
 	"models": {
 		"main": {
-			"provider": "grok-cli",
-			"modelId": "grok-4-latest",
-			"maxTokens": 131072,
+			"provider": "anthropic",
+			"modelId": "claude-sonnet-4-20250514",
+			"maxTokens": 64000,
 			"temperature": 0.2
 		},
 		"research": {
@@ -14,8 +14,8 @@
 		},
 		"fallback": {
 			"provider": "anthropic",
-			"modelId": "claude-sonnet-4-20250514",
-			"maxTokens": 64000,
+			"modelId": "claude-3-7-sonnet-20250219",
+			"maxTokens": 120000,
 			"temperature": 0.2
 		}
 	},
diff --git a/packages/tm-core/src/config/config-manager.spec.ts b/packages/tm-core/src/config/config-manager.spec.ts
index 00a58683..a214357c 100644
--- a/packages/tm-core/src/config/config-manager.spec.ts
+++ b/packages/tm-core/src/config/config-manager.spec.ts
@@ -5,6 +5,7 @@
 
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import { ConfigManager } from './config-manager.js';
+import { DEFAULT_CONFIG_VALUES } from '../interfaces/configuration.interface.js';
 import { ConfigLoader } from './services/config-loader.service.js';
 import { ConfigMerger } from './services/config-merger.service.js';
 import { RuntimeStateManager } from './services/runtime-state-manager.service.js';
@@ -69,8 +70,8 @@ describe('ConfigManager', () => {
 				({
 					loadState: vi.fn().mockResolvedValue({ activeTag: 'master' }),
 					saveState: vi.fn().mockResolvedValue(undefined),
-					getActiveTag: vi.fn().mockReturnValue('master'),
-					setActiveTag: vi.fn().mockResolvedValue(undefined),
+					getCurrentTag: vi.fn().mockReturnValue('master'),
+					setCurrentTag: vi.fn().mockResolvedValue(undefined),
 					getState: vi.fn().mockReturnValue({ activeTag: 'master' }),
 					updateMetadata: vi.fn().mockResolvedValue(undefined),
 					clearState: vi.fn().mockResolvedValue(undefined)
@@ -227,8 +228,8 @@ describe('ConfigManager', () => {
 
 			const models = manager.getModelConfig();
 			expect(models).toEqual({
-				main: 'claude-3-5-sonnet-20241022',
-				fallback: 'gpt-4o-mini'
+				main: DEFAULT_CONFIG_VALUES.MODELS.MAIN,
+				fallback: DEFAULT_CONFIG_VALUES.MODELS.FALLBACK
 			});
 		});
 
@@ -281,7 +282,7 @@ describe('ConfigManager', () => {
 			await manager.setActiveTag('feature-branch');
 
 			const stateManager = (manager as any).stateManager;
-			expect(stateManager.setActiveTag).toHaveBeenCalledWith('feature-branch');
+			expect(stateManager.setCurrentTag).toHaveBeenCalledWith('feature-branch');
 		});
 	});
 
diff --git a/packages/tm-core/src/config/config-manager.ts b/packages/tm-core/src/config/config-manager.ts
index 64a47d21..805d8193 100644
--- a/packages/tm-core/src/config/config-manager.ts
+++ b/packages/tm-core/src/config/config-manager.ts
@@ -10,6 +10,7 @@ import type {
 	PartialConfiguration,
 	RuntimeStorageConfig
 } from '../interfaces/configuration.interface.js';
+import { DEFAULT_CONFIG_VALUES as DEFAULTS } from '../interfaces/configuration.interface.js';
 import { ConfigLoader } from './services/config-loader.service.js';
 import {
 	ConfigMerger,
@@ -167,8 +168,8 @@ export class ConfigManager {
 	getModelConfig() {
 		return (
 			this.config.models || {
-				main: 'claude-3-5-sonnet-20241022',
-				fallback: 'gpt-4o-mini'
+				main: DEFAULTS.MODELS.MAIN,
+				fallback: DEFAULTS.MODELS.FALLBACK
 			}
 		);
 	}
diff --git a/packages/tm-core/src/interfaces/configuration.interface.ts b/packages/tm-core/src/interfaces/configuration.interface.ts
index d70bbbf8..6eaf709f 100644
--- a/packages/tm-core/src/interfaces/configuration.interface.ts
+++ b/packages/tm-core/src/interfaces/configuration.interface.ts
@@ -399,8 +399,8 @@ export interface IConfigurationManager {
  */
 export const DEFAULT_CONFIG_VALUES = {
 	MODELS: {
-		MAIN: 'claude-3-5-sonnet-20241022',
-		FALLBACK: 'gpt-4o-mini'
+		MAIN: 'claude-sonnet-4-20250514',
+		FALLBACK: 'claude-3-7-sonnet-20250219'
 	},
 	TASKS: {
 		DEFAULT_PRIORITY: 'medium' as TaskPriority,
diff --git a/scripts/modules/config-manager.js b/scripts/modules/config-manager.js
index b75c7478..95a9f284 100644
--- a/scripts/modules/config-manager.js
+++ b/scripts/modules/config-manager.js
@@ -27,21 +27,21 @@ const DEFAULTS = {
 	models: {
 		main: {
 			provider: 'anthropic',
-			modelId: 'claude-3-7-sonnet-20250219',
+			modelId: 'claude-sonnet-4-20250514',
 			maxTokens: 64000,
 			temperature: 0.2
 		},
 		research: {
 			provider: 'perplexity',
-			modelId: 'sonar-pro',
+			modelId: 'sonar',
 			maxTokens: 8700,
 			temperature: 0.1
 		},
 		fallback: {
 			// No default fallback provider/model initially
 			provider: 'anthropic',
-			modelId: 'claude-3-5-sonnet',
-			maxTokens: 8192, // Default parameters if fallback IS configured
+			modelId: 'claude-3-7-sonnet-20250219',
+			maxTokens: 120000, // Default parameters if fallback IS configured
 			temperature: 0.2
 		}
 	},
diff --git a/tests/unit/config-manager.test.js b/tests/unit/config-manager.test.js
index f4d384cf..97ad4e61 100644
--- a/tests/unit/config-manager.test.js
+++ b/tests/unit/config-manager.test.js
@@ -119,20 +119,20 @@ const DEFAULT_CONFIG = {
 	models: {
 		main: {
 			provider: 'anthropic',
-			modelId: 'claude-3-7-sonnet-20250219',
+			modelId: 'claude-sonnet-4-20250514',
 			maxTokens: 64000,
 			temperature: 0.2
 		},
 		research: {
 			provider: 'perplexity',
-			modelId: 'sonar-pro',
+			modelId: 'sonar',
 			maxTokens: 8700,
 			temperature: 0.1
 		},
 		fallback: {
 			provider: 'anthropic',
-			modelId: 'claude-3-5-sonnet',
-			maxTokens: 8192,
+			modelId: 'claude-3-7-sonnet-20250219',
+			maxTokens: 120000,
 			temperature: 0.2
 		}
 	},