internaltool-mcp 1.6.17 → 1.6.19

package/index.js

@@ -346,25 +346,16 @@ Set confirmed=false first to preview, then confirmed=true to execute everything.
         } catch { /* remote branch may not exist */ }
       }
 
-      if (uncommitted) {
-        return text({
-          blocked: true,
-          reason:  'You have uncommitted local changes.',
-          fix:     'Commit your changes first, then call park_task again.',
-          commands: ['git add .', 'git commit -m "wip: parking task — <describe what you did>"'],
-          message: 'Cannot park until all changes are committed.',
-        })
-      }
-
       if (!confirmed) {
         return text({
           preview: {
             task:      task ? { key: task.key, title: task.title, branch: task.github?.headBranch || null } : null,
             parkNote:  { summary: summary || '(empty)', remaining: remaining || '(empty)', blockers: blockers || '(empty)' },
             willAutomate: [
-              unpushedCount > 0 ? `Push ${unpushedCount} unpushed commit(s) to remote` : 'Branch is already up to date on remote',
+              uncommitted ? `Auto-commit uncommitted changes with message: "wip(${task?.key?.toLowerCase()}): ${(summary || 'parking task').slice(0, 60)}"` : null,
+              unpushedCount > 0 || uncommitted ? `Push branch to remote` : 'Branch is already up to date on remote',
               'Save park note to task',
-              task?.cursorRules?.trim() ? 'Delete cursor rules file (.cursor/rules/' + task.key?.toLowerCase() + '.mdc)' : null,
+              task?.cursorRules?.trim() ? `Delete cursor rules file (.cursor/rules/${task.key?.toLowerCase()}.mdc)` : null,
               'Post handoff comment on the task',
               'Notify project members',
             ].filter(Boolean),
@@ -374,6 +365,18 @@ Set confirmed=false first to preview, then confirmed=true to execute everything.
         })
       }
 
+      // ── Auto-commit if there are uncommitted changes ───────────────────────
+      if (repoRoot && uncommitted) {
+        try {
+          const commitMsg = `wip(${task?.key?.toLowerCase() || 'task'}): ${(summary || 'parking task').slice(0, 60)}`
+          runGit('add -A', repoRoot)
+          runGit(`commit -m "${commitMsg}"`, repoRoot)
+          unpushedCount += 1   // just committed, so now there's something to push
+        } catch (e) {
+          return text({ blocked: true, reason: `Auto-commit failed: ${e.message.split('\n')[0]}. Commit manually then call park_task again.` })
+        }
+      }
+
       // ── Auto-push unpushed commits ─────────────────────────────────────────
       let pushed = false
       if (repoRoot && currentBranch && unpushedCount > 0) {
@@ -482,9 +485,25 @@ Set confirmed=false first to read everything, then confirmed=true to execute.`,
           runGit('fetch origin', repoRoot)
           runGit(`checkout ${branch}`, repoRoot)
           runGit(`pull origin ${branch}`, repoRoot)
-          gitResult = { switched: true, branch }
+
+          // Auto-rebase from main so Dev B starts on a clean, up-to-date branch
+          let rebaseResult = null
+          try {
+            const behind = parseInt(runGit(`rev-list HEAD..origin/main --count`, repoRoot).trim(), 10) || 0
+            if (behind > 0) {
+              runGit('rebase origin/main', repoRoot)
+              runGit(`push origin ${branch} --force-with-lease`, repoRoot)
+              rebaseResult = { rebased: true, commitsBehind: behind, message: `Auto-rebased ${behind} commit(s) from main — branch is now up to date` }
+            } else {
+              rebaseResult = { rebased: false, message: 'Branch is already up to date with main' }
+            }
+          } catch (rebaseErr) {
+            rebaseResult = { rebased: false, conflict: true, message: 'Auto-rebase failed — merge conflict detected. Run: git rebase origin/main and resolve conflicts manually.' }
+          }
+
+          gitResult = { switched: true, branch, rebase: rebaseResult }
         } catch (e) {
-          gitResult = { switched: false, error: e.message.split('\n')[0], manualSteps: [`git fetch origin`, `git checkout ${branch}`, `git pull origin ${branch}`] }
+          gitResult = { switched: false, error: e.message.split('\n')[0], manualSteps: [`git fetch origin`, `git checkout ${branch}`, `git pull origin ${branch}`, 'git rebase origin/main'] }
         }
       }
 
@@ -2453,6 +2472,32 @@ branchAction values (only needed when current branch ≠ task branch):
         ...unsafeUntracked.map(f => `⚠️ SKIP:   ${f}  ← do not commit this`),
       ]
 
+      // ── Block if task is parked — prevent Dev A pushing after handoff ────────
+      if (task) {
+        const isParked      = !!(task.parkNote?.parkedAt)
+        const currentOwner  = task.parkNote?.currentOwner
+        const parkedBy      = task.parkNote?.parkedBy
+        let meId = ''
+        try { const me = await api.get('/api/auth/me'); meId = me?.data?.user?._id || me?.data?._id || '' } catch { /* non-fatal */ }
+
+        if (isParked && parkedBy && parkedBy.toString() === meId) {
+          return text({
+            blocked: true,
+            reason:  `You parked "${task.title}". Another developer may have picked it up.`,
+            advice:  'Check the task on the board before pushing. If you still own it, call unpark_task first, then commit.',
+            message: 'Commit blocked — task is parked.',
+          })
+        }
+        if (currentOwner && currentOwner.toString() !== meId && meId) {
+          return text({
+            blocked: true,
+            reason:  `"${task.title}" is currently owned by another developer who unparked it.`,
+            advice:  'Do not push to this branch. Coordinate with the current owner first.',
+            message: 'Commit blocked — another developer owns this task.',
+          })
+        }
+      }
+
       // ── PREVIEW (confirmed=false) ─────────────────────────────────────────────
       if (!confirmed) {
         // Case 1: branch mismatch — must resolve before anything else

package/package.json

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