internaltool-mcp 1.6.3 → 1.6.5

package/index.js

@@ -851,7 +851,8 @@ Use this when a developer says "start task", "brief me on", or "what do I need t
         .replace(/[^a-z0-9]+/g, '-')
         .slice(0, 40)}`
 
-      const hasReadme   = typeof task.readmeMarkdown === 'string' && task.readmeMarkdown.trim().length > 0
+      const hasReadme     = typeof task.readmeMarkdown === 'string' && task.readmeMarkdown.trim().length > 0
+      const hasCursorRules = typeof task.cursorRules === 'string' && task.cursorRules.trim().length > 0
       const subtasks    = (task.subtasks || []).map(s => ({
         title: s.title,
         done:  s.done,
@@ -861,6 +862,39 @@ Use this when a developer says "start task", "brief me on", or "what do I need t
       const subtasksTotal = subtasks.length
 
       // ── Preview: show the full plan before touching anything ──
+      const approvalState = task.approval?.state || 'none'
+      const approvalBlocks = ['backlog', 'todo'].includes(task.column) && approvalState !== 'approved'
+
+      // Build the next-step roadmap so developer knows exactly what comes after reading the plan
+      let workflowRoadmap
+      if (!hasReadme) {
+        workflowRoadmap = [
+          `1. Write the implementation plan — click "Start writing" on the Plan tab`,
+          `2. Call submit_task_for_approval to send it for review`,
+          `3. After approval, call create_branch — the task moves to In progress automatically`,
+        ]
+      } else if (approvalState === 'none') {
+        workflowRoadmap = [
+          `1. ✅ Implementation plan is written — read it above`,
+          `2. Call submit_task_for_approval with taskId="${taskId}" to send it for review`,
+          `3. After approval, call create_branch — the task moves to In progress automatically`,
+        ]
+      } else if (approvalState === 'pending') {
+        workflowRoadmap = [
+          `1. ✅ Implementation plan written`,
+          `2. ⏳ Waiting for reviewer approval`,
+          `3. After approval, call create_branch — the task moves to In progress automatically`,
+        ]
+      } else {
+        // approved
+        workflowRoadmap = [
+          `1. ✅ Implementation plan written and approved`,
+          `2. Call create_branch with taskId="${taskId}" — moves task to In progress automatically`,
+          `3. Code → commit (use commit_helper) → push`,
+          `4. Call raise_pr — task moves to In review automatically`,
+        ]
+      }
+
       if (!confirmed) {
         return text({
           brief: {
@@ -868,24 +902,31 @@ Use this when a developer says "start task", "brief me on", or "what do I need t
             title:       task.title,
             priority:    task.priority,
             description: task.description || '(no description)',
-            // The implementation plan — Claude must read and present this to the developer
             implementationPlan: hasReadme
               ? task.readmeMarkdown
-              : '⚠️  No implementation plan (README) found for this task. The developer should write one before starting work.',
+              : '⚠️  No implementation plan found. Write one in the Plan tab before starting work.',
             subtasks: subtasksTotal > 0
               ? { items: subtasks, progress: `${subtasksDone}/${subtasksTotal} done` }
               : null,
-            approvalState: task.approval?.state || 'none',
+            approvalState,
           },
           meta: {
             currentColumn:  task.column,
-            willMoveTo:     'in_progress',
             suggestedBranch,
           },
+          workflowRoadmap,
+          approvalWarning: approvalBlocks
+            ? approvalState === 'pending'
+              ? `⏳ Plan is submitted and awaiting approval — you cannot create a branch until it is approved.`
+              : `⚠️  Plan is not yet submitted for approval. Submit it first, then create the branch.`
+            : null,
+          cursorRules: hasCursorRules
+            ? { active: true, rules: task.cursorRules, instruction: '⚠️  CURSOR RULES ACTIVE — You MUST follow every rule in the "rules" field above for the entire duration of this task. These rules override your defaults.' }
+            : { active: false, rules: null, instruction: 'No task-specific Cursor rules set for this task.' },
           requiresConfirmation: true,
-          message: hasReadme
-            ? `Read the implementation plan above carefully, then call kickoff_task again with confirmed=true to start the task.`
-            : `⚠️ This task has no implementation plan. Consider writing one first (use update_task with readmeMarkdown), then confirm to start anyway.`,
+          message: approvalBlocks
+            ? `Read the plan above, then follow workflowRoadmap — approval is required before you can branch and start coding.`
+            : `Read the implementation plan above carefully, then call kickoff_task again with confirmed=true.`,
         })
       }
 
@@ -917,6 +958,9 @@ Use this when a developer says "start task", "brief me on", or "what do I need t
           subtasks,
         },
         implementationPlan: hasReadme ? task.readmeMarkdown : null,
+        cursorRules: hasCursorRules
+          ? { active: true, rules: task.cursorRules, instruction: '⚠️  CURSOR RULES ACTIVE — You MUST follow every rule in the "rules" field for the entire duration of this task.' }
+          : { active: false },
         recentCommits: recentCommits.slice(0, 5).map(c => ({
           sha:     c.sha?.slice(0, 7),
           message: c.commit?.message?.split('\n')[0],
@@ -1443,6 +1487,34 @@ If you have uncommitted tracked changes, it will tell you exactly what to do bef
       if (!taskRes?.success) return errorText('Task not found')
       const task = taskRes.data.task
 
+      // ── Approval gate check ───────────────────────────────────────────────────
+      // The server blocks non-admins from moving todo → in_progress without approval.
+      // Detect this early and guide the developer instead of failing silently after branch creation.
+      const approvalState = task.approval?.state || 'none'
+      const PLANNING_COLS = ['backlog', 'todo']
+      const needsApproval = PLANNING_COLS.includes(task.column) && approvalState !== 'approved'
+      if (needsApproval && !confirmed) {
+        const isFix2 = /\b(fix|bug|hotfix|patch)\b/i.test(task.title + ' ' + (task.description || ''))
+        const slug2 = task.title.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '').slice(0, 35)
+        const previewBranch = `${isFix2 ? 'fix' : 'feature'}/${task.key.toLowerCase()}-${slug2}`
+        return text({
+          blocked: true,
+          reason: 'approval_required',
+          task:   { key: task.key, title: task.title, column: task.column, approvalState },
+          message: `The task's implementation plan (README) must be approved before creating a branch and moving to In progress.`,
+          approvalStatus: approvalState === 'pending'
+            ? `Plan is already submitted and waiting for reviewer approval. Once approved, call create_branch again.`
+            : `Plan has not been submitted for review yet.`,
+          nextSteps: approvalState === 'pending'
+            ? [`Wait for the reviewer to approve, then call create_branch with taskId="${taskId}"`]
+            : [
+                `1. Make sure the README / implementation plan is written on the task (use update_task with readmeMarkdown if needed)`,
+                `2. Call submit_task_for_approval with taskId="${taskId}" and the reviewerId of your project lead`,
+                `3. Once approved, call create_branch again — it will create "${previewBranch}" and move the task to In progress automatically`,
+              ],
+        })
+      }
+
       const isFix = /\b(fix|bug|hotfix|patch)\b/i.test(task.title + ' ' + (task.description || ''))
       const prefix = isFix ? 'fix' : 'feature'
       const slug = task.title

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "internaltool-mcp",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "MCP server for InternalTool — connect AI assistants (Claude Code, Cursor) to your project and task management platform",
   "type": "module",
   "main": "index.js",