internaltool-mcp 1.5.5 → 1.5.7

package/index.js

@@ -962,18 +962,43 @@ Use this when returning to a task after a break, or when Claude needs the full p
 
       let coachingPrompt = null
       if (task.column === 'in_progress' && !task.github?.headBranch) {
-        const stateHint = localGitState?.state === 'modified'
-          ? ` Your working tree has ${localGitState.modifiedFiles.length} modified file(s) — stash or commit them first, then call create_branch.`
-          : ` Your working tree is ${localGitState?.state || 'unknown'} — ready to call create_branch.`
-        coachingPrompt = `No branch yet.${stateHint}`
+        let stateHint
+        if (localGitState?.state === 'modified') {
+          const files = localGitState.modifiedFiles.join(', ')
+          stateHint = [
+            `You have ${localGitState.modifiedFiles.length} modified file(s): ${files}`,
+            `Before creating the task branch, handle these changes — pick one:`,
+            `  Option A — Stash (recommended, keeps changes safe):`,
+            `    git stash push -m "wip: before starting ${task.key}"`,
+            `  Option B — Commit as WIP:`,
+            `    git add . && git commit -m "chore: wip before ${task.key}"`,
+            `Then call create_branch — it will detect the clean state automatically.`,
+          ].join('\n')
+        } else {
+          stateHint = `Your working tree is ${localGitState?.state || 'unknown'} — ready to call create_branch.`
+        }
+        coachingPrompt = `No branch yet.\n${stateHint}`
       } else if (task.column === 'in_progress' && task.github?.headBranch) {
         const onBranch = localGitState?.onTaskBranch
-        const branchHint = onBranch === true
-          ? ` (you are already on it)`
-          : onBranch === false
-            ? ` (you are on "${localGitState?.currentBranch}" — run: git checkout ${task.github.headBranch})`
-            : ''
-        coachingPrompt = `Branch: ${task.github.headBranch}${branchHint}. When commits are pushed, use raise_pr to open a PR.`
+        if (onBranch === false) {
+          const lines = [
+            `Branch exists: ${task.github.headBranch}`,
+            `You are currently on "${localGitState?.currentBranch}".`,
+          ]
+          if (localGitState?.state === 'modified') {
+            lines.push(`You have ${localGitState.modifiedFiles.length} modified file(s): ${localGitState.modifiedFiles.join(', ')}`)
+            lines.push(`Handle them before switching:`)
+            lines.push(`  git stash push -m "wip: switching to ${task.github.headBranch}"`)
+            lines.push(`  — or — git add . && git commit -m "chore: wip"`)
+            lines.push(`Then switch:  git fetch origin && git checkout ${task.github.headBranch}`)
+          } else {
+            lines.push(`Switch to the task branch:  git fetch origin && git checkout ${task.github.headBranch}`)
+          }
+          lines.push(`When commits are pushed, use raise_pr.`)
+          coachingPrompt = lines.join('\n')
+        } else {
+          coachingPrompt = `Branch: ${task.github.headBranch}${onBranch === true ? ' (you are already on it)' : ''}. When commits are pushed, use raise_pr to open a PR.`
+        }
       } else if (task.column === 'in_review') {
         coachingPrompt = `PR #${task.github?.prNumber} is open. Waiting for reviewer feedback.`
       } else if (task.parkNote?.parkedAt) {
@@ -1117,12 +1142,17 @@ If you have uncommitted tracked changes, it will tell you exactly what to do bef
         })
       }
 
-      // Step 3 — create branch on GitHub
+      // Step 3 — create branch on GitHub, then link it to the task
       const localState = gitState?.localState || 'unknown'
       try {
         const res = await api.post(`/api/projects/${projectId}/github/branches`, { branchName, fromRef })
         if (!res?.success) return errorText(res?.message || 'Could not create branch')
 
+        // Link the branch name back to the task so get_task_context / list_my_tasks reflect it immediately
+        try {
+          await api.patch(`/api/tasks/${taskId}/github/branch`, { headBranch: branchName })
+        } catch { /* non-fatal — branch was still created on GitHub */ }
+
         const checkoutSteps = [
           'git fetch origin',
           `git checkout ${branchName}`,

package/package.json

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