Merge pull request #41 from chriscarrollsmith/39-enhance-opentaskdetails-and-getnexttask-tools

Return full task details on read_task and get_next_task tool calls

Author: chriscarrollsmith

index.ts

@@ -10,7 +10,7 @@ import { ListToolsRequestSchema, CallToolRequestSchema } from "@modelcontextprot
 const server = new Server(
   {
     name: "task-manager-server",
-    version: "1.3.1"
+    version: "1.3.2"
   },
   {
     capabilities: {

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "taskqueue-mcp",
-	"version": "1.3.1",
+	"version": "1.3.2",
 	"description": "Task Queue MCP Server",
 	"author": "Christopher C. Smith ([email protected])",
 	"main": "dist/index.js",

package.json

@@ -16,7 +16,7 @@ const program = new Command();
 program
   .name("taskqueue")
   .description("CLI for the Task Manager MCP Server")
-  .version("1.3.1")
+  .version("1.3.2")
   .option(
     '-f, --file-path <path>',
     'Specify the path to the tasks JSON file. Overrides TASK_MANAGER_FILE_PATH env var.'

src/client/cli.ts

@@ -280,7 +280,7 @@ export class TaskManager {
     }
   }
 
-  public async getNextTask(projectId: string): Promise<StandardResponse> {
+  public async getNextTask(projectId: string): Promise<StandardResponse<OpenTaskSuccessData | { message: string }>> {
     await this.ensureInitialized();
     // Reload from disk to ensure we have the latest data
     await this.reloadFromDisk();
@@ -316,15 +316,11 @@ export class TaskManager {
       );
     }
 
-    return {
-      status: "next_task",
-      data: {
-        id: nextTask.id,
-        title: nextTask.title,
-        description: nextTask.description,
-        message: `Next task is ready. Task approval will be required after completion.\n`
-      }
-    };
+    // Return the full task details similar to openTaskDetails
+    return createSuccessResponse<OpenTaskSuccessData>({
+      projectId: proj.projectId,
+      task: { ...nextTask },
+    });
   }
 
   public async approveTaskCompletion(projectId: string, taskId: string): Promise<StandardResponse<ApproveTaskSuccessData>> {
@@ -428,23 +424,14 @@ export class TaskManager {
     await this.ensureInitialized();
     // Reload from disk to ensure we have the latest data
     await this.reloadFromDisk();
-    
+
     for (const proj of this.data.projects) {
       const target = proj.tasks.find((t) => t.id === taskId);
       if (target) {
+        // Return only projectId and the full task object
         return createSuccessResponse({
           projectId: proj.projectId,
-          initialPrompt: proj.initialPrompt,
-          projectPlan: proj.projectPlan,
-          completed: proj.completed,
-          task: {
-            id: target.id,
-            title: target.title,
-            description: target.description,
-            status: target.status,
-            approved: target.approved,
-            completedDetails: target.completedDetails,
-          },
+          task: { ...target }, // Return all fields from the found task
         });
       }
     }

src/server/TaskManager.ts

@@ -237,16 +237,6 @@ const getNextTaskToolExecutor: ToolExecutor = {
   async execute(taskManager, args) {
     const projectId = validateProjectId(args.projectId);
     const result = await taskManager.getNextTask(projectId);
-
-    // Ensure backward compatibility with integration tests
-    if (result.status === "next_task" && result.data) {
-      return formatToolResponse({
-        status: "next_task",
-        task: result.data,
-        message: result.data.message,
-      });
-    }
-
     return formatToolResponse(result);
   },
 };

src/server/toolExecutors.ts

@@ -111,10 +111,7 @@ export interface ApproveProjectSuccessData {
 
 export interface OpenTaskSuccessData {
   projectId: string;
-  initialPrompt: string;
-  projectPlan: string;
-  completed: boolean;
-  task: Task; // Use the full Task type
+  task: Task;
 }
 
 export interface ListProjectsSuccessData {
@@ -147,7 +144,7 @@ export interface ReadProjectSuccessData {
   initialPrompt: string;
   projectPlan: string;
   completed: boolean;
-  tasks: Task[]; // Use the full Task type
+  tasks: Task[];
 }
 
 // --- End NEW Success Data Interfaces ---
@@ -169,17 +166,6 @@ export interface ErrorResponse {
   };
 }
 
-// Next task response
-export interface NextTaskResponse {
-  status: "next_task";
-  data: {
-    id: string;
-    title: string;
-    description: string;
-    message?: string;
-  };
-}
-
 // All tasks done response
 export interface AllTasksDoneResponse {
   status: "all_tasks_done";
@@ -192,5 +178,4 @@ export interface AllTasksDoneResponse {
 export type StandardResponse<T = unknown> = 
   | SuccessResponse<T>
   | ErrorResponse
-  | NextTaskResponse
   | AllTasksDoneResponse;

src/types/index.ts

@@ -100,9 +100,9 @@ describe('TaskManager Integration', () => {
 
       // 2. Get the next task (first task)
       const nextTaskResult = await server.getNextTask(projectId);
-      expect(nextTaskResult.status).toBe('next_task');
-      if (nextTaskResult.status === 'next_task' && nextTaskResult.data) {
-        expect(nextTaskResult.data.id).toBe(taskId1);
+      expect(nextTaskResult.status).toBe('success');
+      if (nextTaskResult.status === 'success' && 'task' in nextTaskResult.data) {
+        expect(nextTaskResult.data.task.id).toBe(taskId1);
       }
 
       // 3. Mark the first task as in progress
@@ -123,9 +123,9 @@ describe('TaskManager Integration', () => {
 
       // 6. Get the next task (second task)
       const nextTaskResult2 = await server.getNextTask(projectId);
-      expect(nextTaskResult2.status).toBe('next_task');
-      if (nextTaskResult2.status === 'next_task' && nextTaskResult2.data) {
-        expect(nextTaskResult2.data.id).toBe(taskId2);
+      expect(nextTaskResult2.status).toBe('success');
+      if (nextTaskResult2.status === 'success' && 'task' in nextTaskResult2.data) {
+        expect(nextTaskResult2.data.task.id).toBe(taskId2);
       }
 
       // 7. Mark the second task as in progress

tests/integration/TaskManager.integration.test.ts

@@ -159,9 +159,9 @@ describe('MCP Client Integration', () => {
     }) as ToolResponse;
     expect(nextTaskResult.isError).toBeFalsy();
     const nextTask = JSON.parse((nextTaskResult.content[0] as { text: string }).text);
-    expect(nextTask.status).toBe("next_task");
-    expect(nextTask.task).toBeDefined();
-    const taskId = nextTask.task.id;
+    expect(nextTask.status).toBe("success");
+    expect(nextTask.data).toHaveProperty('task');
+    const taskId = nextTask.data.task.id;
     console.log('Got next task with ID:', taskId);
 
     // Mark task as done
@@ -202,7 +202,6 @@ describe('MCP Client Integration', () => {
   it('should have accurate version', async () => {
     console.log('Testing server version...');
     const response = await client.getServerVersion();
-    expect(response).toBeDefined();
     expect(response).toHaveProperty('version');
     // Should match package.json version
     const packageJson = JSON.parse(
@@ -242,9 +241,9 @@ describe('MCP Client Integration', () => {
     }) as ToolResponse;
     expect(nextTaskResult.isError).toBeFalsy();
     const nextTask = JSON.parse((nextTaskResult.content[0] as { text: string }).text);
-    expect(nextTask.status).toBe("next_task");
-    expect(nextTask.task).toBeDefined();
-    const taskId = nextTask.task.id;
+    expect(nextTask.status).toBe("success");
+    expect(nextTask.data).toHaveProperty('task');
+    const taskId = nextTask.data.task.id;
 
     // Mark task as done - we need to mark it as done using the update_task tool
     const markDoneResult = await client.callTool({

tests/integration/e2e.integration.test.ts

@@ -370,9 +370,9 @@ describe('TaskManager', () => {
         // Get the next task
         const nextTaskResult = await taskManager.getNextTask(projectId);
 
-        expect(nextTaskResult.status).toBe('next_task');
-        if (nextTaskResult.status === 'next_task') {
-          expect(nextTaskResult.data.id).toBe(createResult.data.tasks[0].id);
+        expect(nextTaskResult.status).toBe('success');
+        if (nextTaskResult.status === 'success' && 'task' in nextTaskResult.data) {
+          expect(nextTaskResult.data.task.id).toBe(createResult.data.tasks[0].id);
         }
       }
     });