internaltool-mcp 1.6.1 → 1.6.2

package/index.js

@@ -896,11 +896,16 @@ Use this when a developer says "start task", "brief me on", or "what do I need t
         if (commitsRes?.success) recentCommits = commitsRes.data.commits || []
       } catch { /* GitHub may not be linked */ }
 
+      // If the task already has a branch linked, it's safe to move to in_progress now.
+      // If not, create_branch will do the move once the branch is created.
+      const alreadyHasBranch = !!task.github?.headBranch
       let moved = false
-      try {
-        const moveRes = await api.post(`/api/tasks/${taskId}/move`, { column: 'in_progress', toIndex: 0 })
-        moved = moveRes?.success ?? false
-      } catch { /* might already be in_progress */ }
+      if (alreadyHasBranch) {
+        try {
+          const moveRes = await api.post(`/api/tasks/${taskId}/move`, { column: 'in_progress', toIndex: 0 })
+          moved = moveRes?.success ?? false
+        } catch { /* might already be in_progress */ }
+      }
 
       return text({
         started: {
@@ -908,6 +913,7 @@ Use this when a developer says "start task", "brief me on", or "what do I need t
           title:    task.title,
           priority: task.priority,
           column:   moved ? 'in_progress' : task.column,
+          branch:   task.github?.headBranch || null,
           subtasks,
         },
         implementationPlan: hasReadme ? task.readmeMarkdown : null,
@@ -918,8 +924,10 @@ Use this when a developer says "start task", "brief me on", or "what do I need t
           date:    c.commit?.author?.date,
         })),
         movedToInProgress: moved,
-        suggestedBranch,
-        nextStep: `Use create_branch to create "${suggestedBranch}" on GitHub — it will automatically check your local git state before creating.`,
+        suggestedBranch: alreadyHasBranch ? null : suggestedBranch,
+        nextStep: alreadyHasBranch
+          ? `Branch "${task.github.headBranch}" already exists. Task is now In progress — start coding.`
+          : `Call create_branch to create "${suggestedBranch}" — it will check your local git state and move the task to In progress automatically.`,
       })
     }
   )
@@ -1530,6 +1538,17 @@ If you have uncommitted tracked changes, it will tell you exactly what to do bef
           await api.patch(`/api/tasks/${taskId}/github/branch`, { headBranch: branchName })
         } catch { /* non-fatal — branch was still created on GitHub */ }
 
+        // Move task to in_progress now that the branch exists (server guard now allows it)
+        let movedToInProgress = false
+        try {
+          const freshTask = await api.get(`/api/tasks/${taskId}`)
+          const col = freshTask?.data?.task?.column
+          if (col && ['todo', 'backlog'].includes(col)) {
+            const moveRes = await api.post(`/api/tasks/${taskId}/move`, { column: 'in_progress', toIndex: 0 })
+            movedToInProgress = moveRes?.success ?? false
+          }
+        } catch { /* non-fatal */ }
+
         const checkoutSteps = [
           'git fetch origin',
           `git checkout ${branchName}`,
@@ -1545,12 +1564,13 @@ If you have uncommitted tracked changes, it will tell you exactly what to do bef
 
         return text({
           branchName,
-          url:           res.data.url,
+          url:              res.data.url,
           localState,
-          message:       `Branch "${branchName}" created on GitHub.`,
-          gitSteps:      checkoutSteps,
+          movedToInProgress,
+          message:          `Branch "${branchName}" created on GitHub.${movedToInProgress ? ' Task moved to In progress.' : ''}`,
+          gitSteps:         checkoutSteps,
           localStateNote,
-          nextStep:      'Run the git steps above to switch locally, then start coding. When commits are pushed, use raise_pr.',
+          nextStep:         'Run the git steps above to switch locally, then start coding. When commits are pushed, use raise_pr.',
         })
       } catch (e) {
         return errorText(e.message)

package/package.json

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