Skip to content

Commit 9ec7934

Browse files
committed
Merge remote-tracking branch 'origin/dev'
2 parents bdfc0cc + 7679096 commit 9ec7934

17 files changed

Lines changed: 1989 additions & 503 deletions

File tree

.env.example

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@ ANTHROPIC_API_KEY="your_anthropic_api_key_here" # Required: Format: sk-ant
33
PERPLEXITY_API_KEY="your_perplexity_api_key_here" # Optional: Format: pplx-...
44
OPENAI_API_KEY="your_openai_api_key_here" # Optional, for OpenAI/OpenRouter models. Format: sk-proj-...
55
GOOGLE_API_KEY="your_google_api_key_here" # Optional, for Google Gemini models.
6-
GEMINI_API_KEY="your_gemini_api_key_here"
76
MISTRAL_API_KEY="your_mistral_key_here" # Optional, for Mistral AI models.
8-
XAI_API_KEY="YOUR_XAI_KEY_HERE" # Optional, for xAI AI models.
7+
GROQ_API_KEY="your_groq_api_key_here" # Optional, for Groq models. Format: gsk_...
8+
XAI_API_KEY="your_xai_key_here" # Optional, for xAI AI models.
99
AZURE_OPENAI_API_KEY="your_azure_key_here" # Optional, for Azure OpenAI models (requires endpoint in .taskmaster/config.json).
1010
OLLAMA_API_KEY="your_ollama_api_key_here" # Optional: For remote Ollama servers that require authentication.
1111
GITHUB_API_KEY="your_github_api_key_here" # Optional: For GitHub import/export features. Format: ghp_... or github_pat_...
12-
OPENROUTER_API_KEY="your_openrouter_api_key_here" # Optional: For OpenRouter models. Format: sk-proj-...
12+
OPENROUTER_API_KEY="your_openrouter_api_key_here" # Optional: For OpenRouter models. Format: sk-or-...
13+
14+
# MCP Tool Loading (optional - controls which tools are loaded by the MCP server)
15+
# Options: "all" (default, 36 tools), "standard" (15 tools), "core" (7 tools), or comma-separated list
16+
# TASK_MASTER_TOOLS="standard"

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,13 @@ typings
8989
# taskmaster ai
9090
dev-debug.log
9191
tasks
92+
tasks.json
9293

9394
# own
9495
backups
9596
docs
9697
examples
9798
tmp
9899
\n# TaskMaster CLI config\n.taskmaster/config.json\n.taskmaster/state.json
100+
OFFICIAL.md
101+
TODO.md

.taskmaster/config.json

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"models": {
33
"main": {
4-
"provider": "gemini-cli",
5-
"modelId": "gemini-2.5-flash",
6-
"maxTokens": 65536,
4+
"provider": "claude-code",
5+
"modelId": "haiku",
6+
"maxTokens": 200000,
77
"temperature": 0.2
88
},
99
"research": {
10-
"provider": "gemini-cli",
11-
"modelId": "gemini-2.5-flash",
12-
"maxTokens": 65536,
10+
"provider": "claude-code",
11+
"modelId": "haiku",
12+
"maxTokens": 200000,
1313
"temperature": 0.1
1414
},
1515
"fallback": {
16-
"provider": "gemini-cli",
17-
"modelId": "gemini-2.5-flash",
18-
"maxTokens": 65536,
16+
"provider": "claude-code",
17+
"modelId": "haiku",
18+
"maxTokens": 200000,
1919
"temperature": 0.2
2020
}
2121
},
@@ -25,13 +25,20 @@
2525
"defaultNumTasks": 10,
2626
"defaultSubtasks": 5,
2727
"defaultPriority": "medium",
28-
"projectName": "Taskmaster",
28+
"projectName": "Task Master",
2929
"ollamaBaseURL": "http://localhost:11434/api",
3030
"bedrockBaseURL": "https://bedrock.us-east-1.amazonaws.com",
31-
"responseLanguage": "English",
32-
"defaultTag": "master",
33-
"azureOpenaiBaseURL": "https://your-endpoint.openai.azure.com/",
31+
"responseLanguage": "French",
32+
"enableCodebaseAnalysis": true,
33+
"enableProxy": false,
34+
"anonymousTelemetry": true,
3435
"userId": "1234567890"
3536
},
36-
"claudeCode": {}
37+
"claudeCode": {},
38+
"codexCli": {},
39+
"grokCli": {
40+
"timeout": 120000,
41+
"workingDirectory": null,
42+
"defaultModel": "grok-4-latest"
43+
}
3744
}

.taskmaster/state.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"currentTag": "master",
3-
"lastSwitched": "2025-08-06T21:43:11.699Z",
3+
"lastSwitched": "2026-05-23T09:01:50.551Z",
44
"branchTagMapping": {},
55
"migrationNoticeShown": true
66
}

0 commit comments

Comments
 (0)