internaltool-mcp 1.6.2 → 1.6.3

package/index.js

@@ -1527,18 +1527,31 @@ If you have uncommitted tracked changes, it will tell you exactly what to do bef
         })
       }
 
-      // Step 3 — create branch on GitHub, then link it to the task
+      // Step 3 — create branch on GitHub (or confirm it already exists), then link + move
       const localState = gitState?.localState || 'unknown'
       try {
+        let branchUrl = null
+        let alreadyExisted = false
+
         const res = await api.post(`/api/projects/${projectId}/github/branches`, { branchName, fromRef })
-        if (!res?.success) return errorText(res?.message || 'Could not create branch')
+        if (!res?.success) {
+          // "Reference already exists" means the branch is already on GitHub — treat as success
+          const msg = (res?.message || '').toLowerCase()
+          if (msg.includes('already exists') || msg.includes('reference already exists')) {
+            alreadyExisted = true
+          } else {
+            return errorText(res?.message || 'Could not create branch')
+          }
+        } else {
+          branchUrl = res.data?.url || null
+        }
 
-        // Link the branch name back to the task so get_task_context / list_my_tasks reflect it immediately
+        // Link branch to task regardless of whether it was just created or already existed
         try {
           await api.patch(`/api/tasks/${taskId}/github/branch`, { headBranch: branchName })
-        } catch { /* non-fatal — branch was still created on GitHub */ }
+        } catch { /* non-fatal */ }
 
-        // Move task to in_progress now that the branch exists (server guard now allows it)
+        // Move task to in_progress now that branch is linked
         let movedToInProgress = false
         try {
           const freshTask = await api.get(`/api/tasks/${taskId}`)
@@ -1562,17 +1575,42 @@ If you have uncommitted tracked changes, it will tell you exactly what to do bef
           unknown:   null,
         }[localState] || null
 
+        const statusMsg = alreadyExisted
+          ? `Branch "${branchName}" already existed on GitHub — linked to task.${movedToInProgress ? ' Task moved to In progress.' : ''}`
+          : `Branch "${branchName}" created on GitHub.${movedToInProgress ? ' Task moved to In progress.' : ''}`
+
         return text({
           branchName,
-          url:              res.data.url,
+          url:              branchUrl,
+          alreadyExisted,
           localState,
           movedToInProgress,
-          message:          `Branch "${branchName}" created on GitHub.${movedToInProgress ? ' Task moved to In progress.' : ''}`,
+          message:          statusMsg,
           gitSteps:         checkoutSteps,
           localStateNote,
           nextStep:         'Run the git steps above to switch locally, then start coding. When commits are pushed, use raise_pr.',
         })
       } catch (e) {
+        // Last-resort catch: if error message indicates branch already exists, still link + move
+        const msg = (e.message || '').toLowerCase()
+        if (msg.includes('already exists') || msg.includes('reference already exists')) {
+          try { await api.patch(`/api/tasks/${taskId}/github/branch`, { headBranch: branchName }) } catch { /* ok */ }
+          try {
+            const freshTask = await api.get(`/api/tasks/${taskId}`)
+            const col = freshTask?.data?.task?.column
+            if (col && ['todo', 'backlog'].includes(col)) {
+              await api.post(`/api/tasks/${taskId}/move`, { column: 'in_progress', toIndex: 0 })
+            }
+          } catch { /* ok */ }
+          return text({
+            branchName,
+            alreadyExisted:   true,
+            movedToInProgress: true,
+            message:          `Branch "${branchName}" already existed on GitHub — linked to task and moved to In progress.`,
+            gitSteps:         ['git fetch origin', `git checkout ${branchName}`],
+            nextStep:         'Run the git steps above to switch locally, then start coding.',
+          })
+        }
         return errorText(e.message)
       }
     }

package/package.json

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