refactor(mcp-server): Prioritize session roots for project path discovery
This commit refactors how the MCP server determines the project root directory, prioritizing the path provided by the client session (e.g., Cursor) for increased reliability and simplification. Previously, project root discovery relied on a complex chain of fallbacks (environment variables, CWD searching, package path checks) within `findTasksJsonPath`. This could be brittle and less accurate when running within an integrated environment like Cursor. Key changes: - **Prioritize Session Roots:** MCP tools (`add-task`, `add-dependency`, etc.) now first attempt to extract the project root URI directly from `session.roots[0].uri`. - **New Utility `getProjectRootFromSession`:** Added a utility function in `mcp-server/src/tools/utils.js` to encapsulate the logic for extracting and decoding the root URI from the session object. - **Refactor MCP Tools:** Updated tools (`add-task.js`, `add-dependency.js`) to use `getProjectRootFromSession`. - **Simplify `findTasksJsonPath`:** Prioritized `args.projectRoot`, removed checks for `TASK_MASTER_PROJECT_ROOT` env var and package directory fallback. Retained CWD search and cache check for CLI compatibility. - **Fix `reportProgress` Usage:** Corrected parameters in `add-dependency.js`. This change makes project root determination more robust for the MCP server while preserving discovery mechanisms for the standalone CLI.
This commit is contained in:
@@ -15,6 +15,270 @@ The MCP server acts as a bridge between external tools (like Cursor) and the cor
|
||||
- **Flow**: `External Tool (Cursor)` <-> `FastMCP Server` <-> `MCP Tools` (`mcp-server/src/tools/*.js`) <-> `Core Logic Wrappers` (`mcp-server/src/core/direct-functions/*.js`, exported via `task-master-core.js`) <-> `Core Modules` (`scripts/modules/*.js`)
|
||||
- **Goal**: Provide a performant and reliable way for external tools to interact with Task Master functionality without directly invoking the CLI for every operation.
|
||||
|
||||
## Tool Definition and Execution
|
||||
|
||||
### Tool Structure
|
||||
|
||||
MCP tools must follow a specific structure to properly interact with the FastMCP framework:
|
||||
|
||||
```javascript
|
||||
server.addTool({
|
||||
name: "tool_name", // Use snake_case for tool names
|
||||
description: "Description of what the tool does",
|
||||
parameters: z.object({
|
||||
// Define parameters using Zod
|
||||
param1: z.string().describe("Parameter description"),
|
||||
param2: z.number().optional().describe("Optional parameter description"),
|
||||
// IMPORTANT: For file operations, always include these optional parameters
|
||||
file: z.string().optional().describe("Path to the tasks file"),
|
||||
projectRoot: z.string().optional().describe("Root directory of the project")
|
||||
}),
|
||||
|
||||
// The execute function is the core of the tool implementation
|
||||
execute: async (args, context) => {
|
||||
// Implementation goes here
|
||||
// Return response in the appropriate format
|
||||
}
|
||||
});
|
||||
```
|
||||
|
||||
### Execute Function Signature
|
||||
|
||||
The `execute` function should follow this exact pattern:
|
||||
|
||||
```javascript
|
||||
execute: async (args, context) => {
|
||||
// Tool implementation
|
||||
}
|
||||
```
|
||||
|
||||
- **args**: The first parameter contains all the validated parameters defined in the tool's schema
|
||||
- You can destructure specific parameters: `const { param1, param2, file, projectRoot } = args;`
|
||||
- Always pass the full `args` object to direct functions: `await yourDirectFunction(args, context.log);`
|
||||
|
||||
- **context**: The second parameter is an object with specific properties provided by FastMCP
|
||||
- Contains `{ log, reportProgress, session }` - **always destructure these from the context object**
|
||||
- ✅ **DO**: `execute: async (args, { log, reportProgress, session }) => {}`
|
||||
- ❌ **DON'T**: `execute: async (args, log) => {}`
|
||||
|
||||
### Logging Convention
|
||||
|
||||
The `log` object provides standardized logging methods:
|
||||
|
||||
```javascript
|
||||
// Proper logging usage within a tool's execute method
|
||||
execute: async (args, { log, reportProgress, session }) => {
|
||||
try {
|
||||
// Log the start of execution with key parameters (but sanitize sensitive data)
|
||||
log.info(`Starting ${toolName} with parameters: ${JSON.stringify(args, null, 2)}`);
|
||||
|
||||
// For debugging information
|
||||
log.debug("Detailed operation information", { additionalContext: "value" });
|
||||
|
||||
// For warnings that don't prevent execution
|
||||
log.warn("Warning: potential issue detected", { details: "..." });
|
||||
|
||||
// Call the direct function and handle the result
|
||||
const result = await someDirectFunction(args, log);
|
||||
|
||||
// Log successful completion
|
||||
log.info(`Successfully completed ${toolName}`, {
|
||||
resultSummary: "brief summary without sensitive data"
|
||||
});
|
||||
|
||||
return handleApiResult(result, log);
|
||||
} catch (error) {
|
||||
// Log errors with full context
|
||||
log.error(`Error in ${toolName}: ${error.message}`, {
|
||||
errorDetails: error.stack
|
||||
});
|
||||
|
||||
return createErrorResponse(error.message, "ERROR_CODE");
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Progress Reporting Convention
|
||||
|
||||
Use `reportProgress` for long-running operations to provide feedback to the client:
|
||||
|
||||
```javascript
|
||||
execute: async (args, { log, reportProgress, session }) => {
|
||||
// Initialize progress at the start
|
||||
await reportProgress({ progress: 0, total: 100 });
|
||||
|
||||
// For known progress stages, update with specific percentages
|
||||
for (let i = 0; i < stages.length; i++) {
|
||||
// Do some work...
|
||||
|
||||
// Report intermediate progress
|
||||
await reportProgress({
|
||||
progress: Math.floor((i + 1) / stages.length * 100),
|
||||
total: 100
|
||||
});
|
||||
}
|
||||
|
||||
// For indeterminate progress (no known total)
|
||||
await reportProgress({ progress: 1 }); // Just increment without total
|
||||
|
||||
// When complete
|
||||
await reportProgress({ progress: 100, total: 100 });
|
||||
|
||||
// Return the result
|
||||
return result;
|
||||
}
|
||||
```
|
||||
|
||||
FYI reportProgress object is not arbitrary. It must be { progress: number, total: number }.
|
||||
|
||||
### Session Usage Convention
|
||||
|
||||
The `session` object contains authenticated session data and can be used for:
|
||||
|
||||
1. **Authentication information**: Access user-specific data that was set during authentication
|
||||
2. **Environment variables**: Access environment variables without direct process.env references (if implemented)
|
||||
3. **User context**: Check user permissions or preferences
|
||||
|
||||
```javascript
|
||||
execute: async (args, { log, reportProgress, session }) => {
|
||||
// Check if session exists (user is authenticated)
|
||||
if (!session) {
|
||||
log.warn("No session data available, operating in anonymous mode");
|
||||
} else {
|
||||
// Access authenticated user information
|
||||
log.info(`Operation requested by user: ${session.userId}`);
|
||||
|
||||
// Access environment variables or configuration via session
|
||||
const apiKey = session.env?.API_KEY;
|
||||
|
||||
// Check user-specific permissions
|
||||
if (session.permissions?.canUpdateTasks) {
|
||||
// Perform privileged operation
|
||||
}
|
||||
}
|
||||
|
||||
// Continue with implementation...
|
||||
}
|
||||
```
|
||||
|
||||
### Accessing Project Roots through Session
|
||||
|
||||
The `session` object in FastMCP provides access to filesystem roots via the `session.roots` array, which can be used to get the client's project root directory. This can help bypass some of the path resolution logic in `path-utils.js` when the client explicitly provides its project root.
|
||||
|
||||
#### What are Session Roots?
|
||||
|
||||
- The `roots` array contains filesystem root objects provided by the FastMCP client (e.g., Cursor).
|
||||
- Each root object typically represents a mounted filesystem or workspace that the client (IDE) has access to.
|
||||
- For tools like Cursor, the first root is usually the current project or workspace root.
|
||||
|
||||
#### Roots Structure
|
||||
|
||||
Based on the FastMCP core implementation, the roots structure looks like:
|
||||
|
||||
```javascript
|
||||
// Root type from FastMCP
|
||||
type Root = {
|
||||
uri: string; // URI of the root, e.g., "file:///Users/username/project"
|
||||
name: string; // Display name of the root
|
||||
capabilities?: { // Optional capabilities this root supports
|
||||
// Root-specific capabilities
|
||||
}
|
||||
};
|
||||
```
|
||||
|
||||
#### Accessing Project Root from Session
|
||||
|
||||
To properly access and use the project root from the session:
|
||||
|
||||
```javascript
|
||||
execute: async (args, { log, reportProgress, session }) => {
|
||||
try {
|
||||
// Try to get the project root from session
|
||||
let rootFolder = null;
|
||||
|
||||
if (session && session.roots && session.roots.length > 0) {
|
||||
// The first root is typically the main project workspace in clients like Cursor
|
||||
const firstRoot = session.roots[0];
|
||||
|
||||
if (firstRoot && firstRoot.uri) {
|
||||
// Convert the URI to a file path (strip the file:// prefix if present)
|
||||
const rootUri = firstRoot.uri;
|
||||
rootFolder = rootUri.startsWith('file://')
|
||||
? decodeURIComponent(rootUri.slice(7)) // Remove 'file://' and decode URI components
|
||||
: rootUri;
|
||||
|
||||
log.info(`Using project root from session: ${rootFolder}`);
|
||||
}
|
||||
}
|
||||
|
||||
// Use rootFolder if available, otherwise let path-utils.js handle the detection
|
||||
const result = await yourDirectFunction({
|
||||
projectRoot: rootFolder,
|
||||
...args
|
||||
}, log);
|
||||
|
||||
return handleApiResult(result, log);
|
||||
} catch (error) {
|
||||
log.error(`Error in tool: ${error.message}`);
|
||||
return createErrorResponse(error.message);
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### Integration with path-utils.js
|
||||
|
||||
The `rootFolder` extracted from the session should be passed to the direct function as the `projectRoot` parameter. This integrates with `findTasksJsonPath` in `path-utils.js`, which uses a precedence order for finding the project root:
|
||||
|
||||
1. **TASK_MASTER_PROJECT_ROOT** environment variable
|
||||
2. **Explicitly provided `projectRoot`** (from session.roots or args)
|
||||
3. Previously found/cached project root
|
||||
4. Search from current directory upwards
|
||||
5. Package directory fallback
|
||||
|
||||
By providing the rootFolder from session.roots as the projectRoot parameter, we're using the second option in this hierarchy, allowing the client to explicitly tell us where the project is located rather than having to search for it.
|
||||
|
||||
#### Example Implementation
|
||||
|
||||
Here's a complete example for a tool that properly uses session roots:
|
||||
|
||||
```javascript
|
||||
execute: async (args, { log, reportProgress, session }) => {
|
||||
try {
|
||||
log.info(`Starting tool with args: ${JSON.stringify(args)}`);
|
||||
|
||||
// Extract project root from session if available
|
||||
let rootFolder = null;
|
||||
if (session && session.roots && session.roots.length > 0) {
|
||||
const firstRoot = session.roots[0];
|
||||
if (firstRoot && firstRoot.uri) {
|
||||
rootFolder = firstRoot.uri.startsWith('file://')
|
||||
? decodeURIComponent(firstRoot.uri.slice(7))
|
||||
: firstRoot.uri;
|
||||
log.info(`Using project root from session: ${rootFolder}`);
|
||||
}
|
||||
}
|
||||
|
||||
// If we couldn't get a root from session but args has projectRoot, use that
|
||||
if (!rootFolder && args.projectRoot) {
|
||||
rootFolder = args.projectRoot;
|
||||
log.info(`Using project root from args: ${rootFolder}`);
|
||||
}
|
||||
|
||||
// Call the direct function with the rootFolder
|
||||
const result = await someDirectFunction({
|
||||
projectRoot: rootFolder,
|
||||
...args
|
||||
}, log);
|
||||
|
||||
log.info(`Completed tool successfully`);
|
||||
return handleApiResult(result, log);
|
||||
} catch (error) {
|
||||
log.error(`Error in tool: ${error.message}`);
|
||||
return createErrorResponse(error.message);
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## Key Principles
|
||||
|
||||
- **Prefer Direct Function Calls**: For optimal performance and error handling, MCP tools should utilize direct function wrappers (exported via [`task-master-core.js`](mdc:mcp-server/src/core/task-master-core.js), implemented in [`mcp-server/src/core/direct-functions/`](mdc:mcp-server/src/core/direct-functions/)). These wrappers call the underlying logic from the core modules (e.g., [`task-manager.js`](mdc:scripts/modules/task-manager.js)).
|
||||
@@ -208,7 +472,7 @@ Follow these steps to add MCP support for an existing Task Master command (see [
|
||||
|
||||
1. **Ensure Core Logic Exists**: Verify the core functionality is implemented and exported from the relevant module in `scripts/modules/`.
|
||||
|
||||
2. **Create Direct Function File in `mcp-server/src/core/direct-functions/`**:
|
||||
2. **Create Direct Function File in `mcp-server/src/core/direct-functions/`:
|
||||
- Create a new file (e.g., `your-command.js`) in the `direct-functions` directory using **kebab-case** for file naming.
|
||||
- Import necessary core functions from Task Master modules.
|
||||
- Import utilities: **`findTasksJsonPath` from `../utils/path-utils.js`** and `getCachedOrExecute` from `../../tools/utils.js` if needed.
|
||||
@@ -228,7 +492,7 @@ Follow these steps to add MCP support for an existing Task Master command (see [
|
||||
- Implement `registerYourCommandTool(server)`.
|
||||
- Define the tool `name` using **snake_case** (e.g., `your_command`).
|
||||
- Define the `parameters` using `zod`. **Crucially, if the tool needs project context, include `projectRoot: z.string().optional().describe(...)` and potentially `file: z.string().optional().describe(...)`**. Make `projectRoot` optional.
|
||||
- Implement the standard `async execute(args, log)` method: call `yourCommandDirect(args, log)` and pass the result to `handleApiResult(result, log, 'Error Message')`.
|
||||
- Implement the standard `async execute(args, { log, reportProgress, session })` method: call `yourCommandDirect(args, log)` and pass the result to `handleApiResult(result, log, 'Error Message')`.
|
||||
|
||||
5. **Register Tool**: Import and call `registerYourCommandTool` in `mcp-server/src/tools/index.js`.
|
||||
|
||||
@@ -318,9 +582,9 @@ Follow these steps to add MCP support for an existing Task Master command (see [
|
||||
- ❌ DON'T: Log entire large data structures or sensitive information
|
||||
|
||||
- The MCP server integrates with Task Master core functions through three layers:
|
||||
1. Tool Definitions (`mcp-server/src/tools/*.js`) - Define parameters and execute methods
|
||||
2. Direct Function Wrappers (`task-master-core.js`) - Handle validation, path resolution, and caching
|
||||
3. Core Logic Functions (various modules) - Implement actual functionality
|
||||
1. Tool Definitions (`mcp-server/src/tools/*.js`) - Define parameters and validation
|
||||
2. Direct Functions (`mcp-server/src/core/direct-functions/*.js`) - Handle core logic integration
|
||||
3. Core Functions (`scripts/modules/*.js`) - Implement the actual functionality
|
||||
|
||||
- This layered approach provides:
|
||||
- Clear separation of concerns
|
||||
|
||||
1179
docs/fastmcp-core.txt
Normal file
1179
docs/fastmcp-core.txt
Normal file
File diff suppressed because it is too large
Load Diff
@@ -13,7 +13,7 @@ import fs from 'fs';
|
||||
import { fileURLToPath } from 'url';
|
||||
import os from 'os';
|
||||
|
||||
// Store last found project root to improve performance on subsequent calls
|
||||
// Store last found project root to improve performance on subsequent calls (primarily for CLI)
|
||||
export let lastFoundProjectRoot = null;
|
||||
|
||||
// Project marker files that indicate a potential project root
|
||||
@@ -59,6 +59,7 @@ export const PROJECT_MARKERS = [
|
||||
|
||||
/**
|
||||
* Gets the path to the task-master package installation directory
|
||||
* NOTE: This might become unnecessary if CLI fallback in MCP utils is removed.
|
||||
* @returns {string} - Absolute path to the package installation directory
|
||||
*/
|
||||
export function getPackagePath() {
|
||||
@@ -81,67 +82,45 @@ export function getPackagePath() {
|
||||
* @throws {Error} - If tasks.json cannot be found.
|
||||
*/
|
||||
export function findTasksJsonPath(args, log) {
|
||||
// PRECEDENCE ORDER:
|
||||
// 1. Environment variable override
|
||||
// 2. Explicitly provided projectRoot in args
|
||||
// 3. Previously found/cached project root
|
||||
// 4. Current directory and parent traversal
|
||||
// 5. Package directory (for development scenarios)
|
||||
// PRECEDENCE ORDER for finding tasks.json:
|
||||
// 1. Explicitly provided `projectRoot` in args (Highest priority, expected in MCP context)
|
||||
// 2. Previously found/cached `lastFoundProjectRoot` (primarily for CLI performance)
|
||||
// 3. Search upwards from current working directory (`process.cwd()`) - CLI usage
|
||||
|
||||
// 1. Check for environment variable override
|
||||
if (process.env.TASK_MASTER_PROJECT_ROOT) {
|
||||
const envProjectRoot = process.env.TASK_MASTER_PROJECT_ROOT;
|
||||
log.info(`Using project root from TASK_MASTER_PROJECT_ROOT environment variable: ${envProjectRoot}`);
|
||||
return findTasksJsonInDirectory(envProjectRoot, args.file, log);
|
||||
}
|
||||
|
||||
// 2. If project root is explicitly provided, use it directly
|
||||
// 1. If project root is explicitly provided (e.g., from MCP session), use it directly
|
||||
if (args.projectRoot) {
|
||||
const projectRoot = args.projectRoot;
|
||||
log.info(`Using explicitly provided project root: ${projectRoot}`);
|
||||
return findTasksJsonInDirectory(projectRoot, args.file, log);
|
||||
// This will throw if tasks.json isn't found within this root
|
||||
return findTasksJsonInDirectory(projectRoot, args.file, log);
|
||||
}
|
||||
|
||||
// 3. If we have a last known project root that worked, try it first
|
||||
// --- Fallback logic primarily for CLI or when projectRoot isn't passed ---
|
||||
|
||||
// 2. If we have a last known project root that worked, try it first
|
||||
if (lastFoundProjectRoot) {
|
||||
log.info(`Trying last known project root: ${lastFoundProjectRoot}`);
|
||||
try {
|
||||
const tasksPath = findTasksJsonInDirectory(lastFoundProjectRoot, args.file, log);
|
||||
return tasksPath;
|
||||
// Use the cached root
|
||||
const tasksPath = findTasksJsonInDirectory(lastFoundProjectRoot, args.file, log);
|
||||
return tasksPath; // Return if found in cached root
|
||||
} catch (error) {
|
||||
log.info(`Task file not found in last known project root, continuing search.`);
|
||||
// Continue with search if not found
|
||||
// Continue with search if not found in cache
|
||||
}
|
||||
}
|
||||
|
||||
// 4. Start with current directory - this is likely the user's project directory
|
||||
// 3. Start search from current directory (most common CLI scenario)
|
||||
const startDir = process.cwd();
|
||||
log.info(`Searching for tasks.json starting from current directory: ${startDir}`);
|
||||
|
||||
// Try to find tasks.json by walking up the directory tree from cwd
|
||||
try {
|
||||
return findTasksJsonWithParentSearch(startDir, args.file, log);
|
||||
// This will throw if not found in the CWD tree
|
||||
return findTasksJsonWithParentSearch(startDir, args.file, log);
|
||||
} catch (error) {
|
||||
// 5. If not found in cwd or parents, package might be installed via npm
|
||||
// and the user could be in an unrelated directory
|
||||
|
||||
// As a last resort, check if there's a tasks.json in the package directory itself
|
||||
// (for development scenarios)
|
||||
const packagePath = getPackagePath();
|
||||
if (packagePath !== startDir) {
|
||||
log.info(`Tasks file not found in current directory tree. Checking package directory: ${packagePath}`);
|
||||
try {
|
||||
return findTasksJsonInDirectory(packagePath, args.file, log);
|
||||
} catch (packageError) {
|
||||
// Fall through to throw the original error
|
||||
}
|
||||
}
|
||||
|
||||
// If all attempts fail, throw the original error with guidance
|
||||
error.message = `${error.message}\n\nPossible solutions:
|
||||
1. Run the command from your project directory containing tasks.json
|
||||
2. Use --project-root=/path/to/project to specify the project location
|
||||
3. Set TASK_MASTER_PROJECT_ROOT environment variable to your project path`;
|
||||
// If all attempts fail, augment and throw the original error from CWD search
|
||||
error.message = `${error.message}\n\nPossible solutions:\n1. Run the command from your project directory containing tasks.json\n2. Use --project-root=/path/to/project to specify the project location (if using CLI)\n3. Ensure the project root is correctly passed from the client (if using MCP)`;
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
@@ -243,6 +222,8 @@ function findTasksJsonWithParentSearch(startDir, explicitFilePath, log) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
// Note: findTasksWithNpmConsideration is not used by findTasksJsonPath and might be legacy or used elsewhere.
|
||||
// If confirmed unused, it could potentially be removed in a separate cleanup.
|
||||
function findTasksWithNpmConsideration(startDir, log) {
|
||||
// First try our recursive parent search from cwd
|
||||
try {
|
||||
|
||||
@@ -6,7 +6,8 @@
|
||||
import { z } from "zod";
|
||||
import {
|
||||
handleApiResult,
|
||||
createErrorResponse
|
||||
createErrorResponse,
|
||||
getProjectRootFromSession
|
||||
} from "./utils.js";
|
||||
import { addDependencyDirect } from "../core/task-master-core.js";
|
||||
|
||||
@@ -24,12 +25,27 @@ export function registerAddDependencyTool(server) {
|
||||
file: z.string().optional().describe("Path to the tasks file (default: tasks/tasks.json)"),
|
||||
projectRoot: z.string().optional().describe("Root directory of the project (default: current working directory)")
|
||||
}),
|
||||
execute: async (args, { log }) => {
|
||||
execute: async (args, { log, session, reportProgress }) => {
|
||||
try {
|
||||
log.info(`Adding dependency for task ${args.id} to depend on ${args.dependsOn} with args: ${JSON.stringify(args)}`);
|
||||
log.info(`Adding dependency for task ${args.id} to depend on ${args.dependsOn}`);
|
||||
reportProgress({ progress: 0 });
|
||||
|
||||
// Call the direct function wrapper
|
||||
const result = await addDependencyDirect(args, log);
|
||||
// Get project root using the utility function
|
||||
let rootFolder = getProjectRootFromSession(session, log);
|
||||
|
||||
// Fallback to args.projectRoot if session didn't provide one
|
||||
if (!rootFolder && args.projectRoot) {
|
||||
rootFolder = args.projectRoot;
|
||||
log.info(`Using project root from args as fallback: ${rootFolder}`);
|
||||
}
|
||||
|
||||
// Call the direct function with the resolved rootFolder
|
||||
const result = await addDependencyDirect({
|
||||
projectRoot: rootFolder,
|
||||
...args
|
||||
}, log);
|
||||
|
||||
reportProgress({ progress: 100 });
|
||||
|
||||
// Log result
|
||||
if (result.success) {
|
||||
|
||||
@@ -6,7 +6,8 @@
|
||||
import { z } from "zod";
|
||||
import {
|
||||
handleApiResult,
|
||||
createErrorResponse
|
||||
createErrorResponse,
|
||||
getProjectRootFromSession
|
||||
} from "./utils.js";
|
||||
import { addTaskDirect } from "../core/task-master-core.js";
|
||||
|
||||
@@ -25,19 +26,26 @@ export function registerAddTaskTool(server) {
|
||||
file: z.string().optional().describe("Path to the tasks file"),
|
||||
projectRoot: z.string().optional().describe("Root directory of the project (default: current working directory)")
|
||||
}),
|
||||
execute: async ({ prompt, dependencies, priority, file, projectRoot }, log) => {
|
||||
execute: async (args, { log, reportProgress, session }) => {
|
||||
try {
|
||||
log.info(`MCP add_task called with prompt: "${prompt}"`);
|
||||
log.info(`MCP add_task called with prompt: "${args.prompt}"`);
|
||||
|
||||
// Get project root using the utility function
|
||||
let rootFolder = getProjectRootFromSession(session, log);
|
||||
|
||||
// Fallback to args.projectRoot if session didn't provide one
|
||||
if (!rootFolder && args.projectRoot) {
|
||||
rootFolder = args.projectRoot;
|
||||
log.info(`Using project root from args as fallback: ${rootFolder}`);
|
||||
}
|
||||
|
||||
// Call the direct function with the resolved rootFolder
|
||||
const result = await addTaskDirect({
|
||||
prompt,
|
||||
dependencies,
|
||||
priority,
|
||||
file,
|
||||
projectRoot
|
||||
projectRoot: rootFolder, // Pass the resolved root
|
||||
...args
|
||||
}, log);
|
||||
|
||||
return handleApiResult(result);
|
||||
return handleApiResult(result, log);
|
||||
} catch (error) {
|
||||
log.error(`Error in add_task MCP tool: ${error.message}`);
|
||||
return createErrorResponse(error.message, "ADD_TASK_ERROR");
|
||||
|
||||
@@ -7,6 +7,7 @@ import { spawnSync } from "child_process";
|
||||
import path from "path";
|
||||
import { contextManager } from '../core/context-manager.js'; // Import the singleton
|
||||
import fs from 'fs';
|
||||
import { decodeURIComponent } from 'querystring'; // Added for URI decoding
|
||||
|
||||
// Import path utilities to ensure consistent path resolution
|
||||
import { lastFoundProjectRoot, getPackagePath, PROJECT_MARKERS } from '../core/utils/path-utils.js';
|
||||
@@ -67,6 +68,36 @@ export function getProjectRoot(projectRootRaw, log) {
|
||||
return currentDir;
|
||||
}
|
||||
|
||||
/**
|
||||
* Extracts the project root path from the FastMCP session object.
|
||||
* @param {Object} session - The FastMCP session object.
|
||||
* @param {Object} log - Logger object.
|
||||
* @returns {string|null} - The absolute path to the project root, or null if not found.
|
||||
*/
|
||||
export function getProjectRootFromSession(session, log) {
|
||||
if (session && session.roots && session.roots.length > 0) {
|
||||
const firstRoot = session.roots[0];
|
||||
if (firstRoot && firstRoot.uri) {
|
||||
try {
|
||||
const rootUri = firstRoot.uri;
|
||||
const rootPath = rootUri.startsWith('file://')
|
||||
? decodeURIComponent(rootUri.slice(7)) // Remove 'file://' and decode
|
||||
: rootUri; // Assume it's a path if no scheme
|
||||
log.info(`Extracted project root from session: ${rootPath}`);
|
||||
return rootPath;
|
||||
} catch (e) {
|
||||
log.error(`Error decoding project root URI from session: ${firstRoot.uri}`, e);
|
||||
return null;
|
||||
}
|
||||
} else {
|
||||
log.info('Session exists, but first root or its URI is missing.');
|
||||
}
|
||||
} else {
|
||||
log.info('No session or session roots found to extract project root.');
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle API result with standardized error handling and response formatting
|
||||
* @param {Object} result - Result object from API call with success, data, and error properties
|
||||
@@ -317,3 +348,13 @@ export function createErrorResponse(errorMessage) {
|
||||
isError: true
|
||||
};
|
||||
}
|
||||
|
||||
// Ensure all functions are exported
|
||||
export {
|
||||
handleApiResult,
|
||||
executeTaskMasterCommand,
|
||||
getCachedOrExecute,
|
||||
processMCPResponseData,
|
||||
createContentResponse,
|
||||
createErrorResponse
|
||||
};
|
||||
|
||||
71
mcp-test.js
Normal file
71
mcp-test.js
Normal file
@@ -0,0 +1,71 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
import { Config } from 'fastmcp';
|
||||
import path from 'path';
|
||||
import fs from 'fs';
|
||||
|
||||
// Log the current directory
|
||||
console.error(`Current working directory: ${process.cwd()}`);
|
||||
|
||||
try {
|
||||
console.error('Attempting to load FastMCP Config...');
|
||||
|
||||
// Check if .cursor/mcp.json exists
|
||||
const mcpPath = path.join(process.cwd(), '.cursor', 'mcp.json');
|
||||
console.error(`Checking if mcp.json exists at: ${mcpPath}`);
|
||||
|
||||
if (fs.existsSync(mcpPath)) {
|
||||
console.error('mcp.json file found');
|
||||
console.error(`File content: ${JSON.stringify(JSON.parse(fs.readFileSync(mcpPath, 'utf8')), null, 2)}`);
|
||||
} else {
|
||||
console.error('mcp.json file not found');
|
||||
}
|
||||
|
||||
// Try to create Config
|
||||
const config = new Config();
|
||||
console.error('Config created successfully');
|
||||
|
||||
// Check if env property exists
|
||||
if (config.env) {
|
||||
console.error(`Config.env exists with keys: ${Object.keys(config.env).join(', ')}`);
|
||||
|
||||
// Print each env var value (careful with sensitive values)
|
||||
for (const [key, value] of Object.entries(config.env)) {
|
||||
if (key.includes('KEY')) {
|
||||
console.error(`${key}: [value hidden]`);
|
||||
} else {
|
||||
console.error(`${key}: ${value}`);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
console.error('Config.env does not exist');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`Error loading Config: ${error.message}`);
|
||||
console.error(`Stack trace: ${error.stack}`);
|
||||
}
|
||||
|
||||
// Log process.env to see if values from mcp.json were loaded automatically
|
||||
console.error('\nChecking if process.env already has values from mcp.json:');
|
||||
const envVars = [
|
||||
'ANTHROPIC_API_KEY',
|
||||
'PERPLEXITY_API_KEY',
|
||||
'MODEL',
|
||||
'PERPLEXITY_MODEL',
|
||||
'MAX_TOKENS',
|
||||
'TEMPERATURE',
|
||||
'DEFAULT_SUBTASKS',
|
||||
'DEFAULT_PRIORITY'
|
||||
];
|
||||
|
||||
for (const varName of envVars) {
|
||||
if (process.env[varName]) {
|
||||
if (varName.includes('KEY')) {
|
||||
console.error(`${varName}: [value hidden]`);
|
||||
} else {
|
||||
console.error(`${varName}: ${process.env[varName]}`);
|
||||
}
|
||||
} else {
|
||||
console.error(`${varName}: not set`);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user