ros/claude-task-master
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' of github.com:eyaltoledano/claude-task-master into v017-adds

Browse Source
This commit is contained in:
Eyal Toledano
2025-05-28 10:08:14 -04:00
parent ac36e2497e 669b744ced
commit ca69e1294f
62 changed files with 23532 additions and 15326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/modules/task-manager/expand-task.js
View File

@@ -308,7 +308,8 @@ function parseSubtasksFromText(
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
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}`
);
}

14
scripts/modules/task-manager/models.js
View File

@@ -72,14 +72,14 @@ function fetchOpenRouterModels() {
/**
* Fetches the list of models from Ollama instance.
* @param {string} baseUrl - The base URL for the Ollama API (e.g., "http://localhost:11434/api")
* @param {string} baseURL - The base URL for the Ollama API (e.g., "http://localhost:11434/api")
* @returns {Promise<Array|null>} A promise that resolves with the list of model objects or null if fetch fails.
*/
function fetchOllamaModels(baseUrl = 'http://localhost:11434/api') {
function fetchOllamaModels(baseURL = 'http://localhost:11434/api') {
return new Promise((resolve) => {
try {
// Parse the base URL to extract hostname, port, and base path
const url = new URL(baseUrl);
const url = new URL(baseURL);
const isHttps = url.protocol === 'https:';
const port = url.port || (isHttps ? 443 : 80);
const basePath = url.pathname.endsWith('/')
@@ -484,13 +484,13 @@ async function setModel(role, modelId, options = {}) {
report('info', `Checking Ollama for ${modelId} (as hinted)...`);
// Get the Ollama base URL from config
const ollamaBaseUrl = getBaseUrlForRole(role, projectRoot);
const ollamaModels = await fetchOllamaModels(ollamaBaseUrl);
const ollamaBaseURL = getBaseUrlForRole(role, projectRoot);
const ollamaModels = await fetchOllamaModels(ollamaBaseURL);
if (ollamaModels === null) {
// Connection failed - server probably not running
throw new Error(
`Unable to connect to Ollama server at ${ollamaBaseUrl}. Please ensure Ollama is running and try again.`
`Unable to connect to Ollama server at ${ollamaBaseURL}. Please ensure Ollama is running and try again.`
);
} else if (ollamaModels.some((m) => m.model === modelId)) {
determinedProvider = 'ollama';
@@ -498,7 +498,7 @@ async function setModel(role, modelId, options = {}) {
report('warn', warningMessage);
} else {
// Server is running but model not found
const tagsUrl = `${ollamaBaseUrl}/tags`;
const tagsUrl = `${ollamaBaseURL}/tags`;
throw new Error(
`Model ID "${modelId}" not found in the Ollama instance. Please verify the model is pulled and available. You can check available models with: curl ${tagsUrl}`
);