internaltool-mcp 1.6.0 → 1.6.1

package/index.js

@@ -1851,25 +1851,42 @@ Set confirmed=false first to preview the full PR content, then confirmed=true to
   // ── commit_helper ─────────────────────────────────────────────────────────────
   server.tool(
     'commit_helper',
-    `Analyse local git changes and suggest a ready-to-run conventional commit command.
+    `Analyse local git changes and produce a ready-to-run conventional commit command.
 
-Reads git diff --stat and git status locally — no manual commands needed.
-Generates a commit message following: <type>(<scope>): <description>
-  type  = feat | fix | refactor | chore | docs | test | style
-  scope = task key (e.g. TASK-003) when taskId is provided
+Auto-detects local branch, changed files, and — when taskId is given — the task's linked branch.
+If the current branch does not match the task's branch, presents three options before doing anything:
+  A) Switch to the task branch first, bring changes with you, then commit
+  B) Stash changes now and commit on the task branch later
+  C) Commit on the current branch (warns if that is main/master/dev)
 
-Set confirmed=false to preview the suggested message, confirmed=true to get the final copy-paste command.
+Commit message format: <type>(<scope>): <description>
+  type  = feat | fix | refactor | chore | docs | test | style (auto-inferred)
+  scope = task key (e.g. task-003) when taskId is provided
 
-Use this when the developer asks "help me commit", "what should my commit message be", or "how do I commit this".`,
+Also flags unsafe patterns before generating any command:
+  - Untracked IDE/config dirs (.cursor/, .idea/, .vscode/, node_modules/)
+  - Committing directly to main / master / dev without a task branch
+
+TWO-STEP FLOW:
+  confirmed=false              → detect state, show branch mismatch options or commit preview
+  confirmed=true + branchAction → execute the chosen path
+
+branchAction values (only needed when current branch ≠ task branch):
+  "switch_then_commit"  — stash → checkout task branch → pop stash → commit + push
+  "stash_for_later"     — stash only; commit later when on the task branch
+  "commit_here"         — commit on current branch (use only when changes truly belong here)`,
     {
-      taskId:    z.string().optional().describe("Task's MongoDB ObjectId — used to set the commit scope to the task key"),
-      repoPath:  z.string().optional().describe('Absolute path to the local git repo (defaults to MCP process working directory)'),
-      confirmed: z.boolean().optional().default(false).describe('Set true to get the final runnable command'),
+      taskId:       z.string().optional().describe("Task's MongoDB ObjectId"),
+      repoPath:     z.string().optional().describe('Absolute path to the local git repo'),
+      confirmed:    z.boolean().optional().default(false),
+      branchAction: z.enum(['switch_then_commit', 'stash_for_later', 'commit_here'])
+                     .optional()
+                     .describe('Required when confirmed=true and current branch ≠ task branch'),
     },
-    async ({ taskId, repoPath, confirmed = false }) => {
+    async ({ taskId, repoPath, confirmed = false, branchAction }) => {
       const cwd = repoPath || process.cwd()
 
-      // Read local git state
+      // ── Read local git state ──────────────────────────────────────────────────
       let porcelain = '', diffStat = '', currentBranch = ''
       try {
         porcelain     = runGit('status --porcelain=v1', cwd)
@@ -1885,7 +1902,7 @@ Use this when the developer asks "help me commit", "what should my commit messag
         return text({ message: 'Nothing to commit — working tree is clean.', currentBranch })
       }
 
-      // Fetch task context for scope/type hints
+      // ── Fetch task ────────────────────────────────────────────────────────────
       let task = null
       if (taskId) {
         try {
@@ -1894,87 +1911,202 @@ Use this when the developer asks "help me commit", "what should my commit messag
         } catch { /* non-fatal */ }
       }
 
-      // Infer commit type from branch name + diff content
-      const branchLower = currentBranch.toLowerCase()
-      const diffLower   = diffStat.toLowerCase()
+      const taskBranch    = task?.github?.headBranch || null
+      const PROTECTED     = ['main', 'master', 'dev', 'develop', 'staging', 'production']
+      const onProtected   = PROTECTED.includes(currentBranch)
+      const branchMismatch = taskBranch && currentBranch !== taskBranch
+
+      // ── Detect unsafe untracked paths ─────────────────────────────────────────
+      const NOCOMMIT_PATTERNS = ['.cursor', '.idea', '.vscode', 'node_modules', '.env', 'dist', 'build', '.DS_Store']
+      const unsafeUntracked = untracked.filter(f =>
+        NOCOMMIT_PATTERNS.some(p => f === p || f.startsWith(p + '/'))
+      )
+      const safeUntracked = untracked.filter(f =>
+        !NOCOMMIT_PATTERNS.some(p => f === p || f.startsWith(p + '/'))
+      )
+
+      // ── Build commit message ──────────────────────────────────────────────────
+      // Use task branch name for type inference if available (more reliable than current branch)
+      const branchForType = taskBranch || currentBranch
+      const branchLower   = branchForType.toLowerCase()
+      const diffLower     = diffStat.toLowerCase()
       let commitType = 'chore'
-      if (branchLower.startsWith('feature/') || branchLower.startsWith('feat/'))      commitType = 'feat'
-      else if (branchLower.startsWith('fix/') || branchLower.startsWith('hotfix/'))   commitType = 'fix'
-      else if (branchLower.startsWith('refactor/'))                                   commitType = 'refactor'
-      else if (branchLower.startsWith('docs/'))                                       commitType = 'docs'
-      else if (branchLower.startsWith('test/'))                                       commitType = 'test'
-      else if (diffLower.includes('test') || diffLower.includes('spec'))              commitType = 'test'
-      else if (diffLower.includes('readme') || diffLower.includes('.md'))             commitType = 'docs'
+      if (branchLower.startsWith('feature/') || branchLower.startsWith('feat/'))    commitType = 'feat'
+      else if (branchLower.startsWith('fix/') || branchLower.startsWith('hotfix/')) commitType = 'fix'
+      else if (branchLower.startsWith('refactor/'))                                 commitType = 'refactor'
+      else if (branchLower.startsWith('docs/'))                                     commitType = 'docs'
+      else if (branchLower.startsWith('test/'))                                     commitType = 'test'
+      else if (diffLower.includes('test') || diffLower.includes('spec'))            commitType = 'test'
       else if (task) {
-        const titleLower = (task.title || '').toLowerCase()
-        if (/\b(fix|bug|hotfix|patch)\b/.test(titleLower)) commitType = 'fix'
-        else if (/\b(refactor|cleanup|clean up)\b/.test(titleLower)) commitType = 'refactor'
-        else commitType = 'feat'
+        const t = (task.title || '').toLowerCase()
+        if (/\b(fix|bug|hotfix|patch)\b/.test(t))      commitType = 'fix'
+        else if (/\b(refactor|cleanup)\b/.test(t))     commitType = 'refactor'
+        else                                            commitType = 'feat'
       }
 
-      // Build scope
       const scope = task?.key?.toLowerCase() || ''
-
-      // Build description from task title or changed files
-      let description = ''
-      if (task) {
-        description = task.title
-          .toLowerCase()
-          .replace(/[^a-z0-9 ]+/g, '')
-          .replace(/\s+/g, ' ')
-          .trim()
-          .slice(0, 60)
-      } else {
-        // Summarise from changed files
-        const allFiles = [...modified, ...untracked]
-        if (allFiles.length === 1) {
-          description = `update ${allFiles[0].split('/').pop()}`
-        } else {
-          description = `update ${allFiles.length} file(s)`
-        }
-      }
-
-      const commitMsg  = scope
-        ? `${commitType}(${scope}): ${description}`
-        : `${commitType}: ${description}`
-
-      // Staged vs not staged — build the right add command
-      const hasUnstaged  = unstaged.length > 0 || untracked.length > 0
-      const hasStaged    = staged.length > 0
-      const addCmd       = hasUnstaged ? 'git add .' : null
-      const commitCmd    = `git commit -m "${commitMsg}"`
-      const pushCmd      = `git push origin ${currentBranch}`
-
-      const changedFiles = [
-        ...staged.map(f => `  staged:    ${f.file}`),
-        ...unstaged.map(f => `  unstaged:  ${f.file}`),
-        ...untracked.map(f => `  untracked: ${f}`),
+      let description = task
+        ? task.title.toLowerCase().replace(/[^a-z0-9 ]+/g, '').replace(/\s+/g, ' ').trim().slice(0, 60)
+        : modified.length === 1
+          ? `update ${modified[0].split('/').pop()}`
+          : `update ${modified.length} file(s)`
+
+      const commitMsg = scope ? `${commitType}(${scope}): ${description}` : `${commitType}: ${description}`
+
+      // ── Build add command — exclude unsafe untracked ──────────────────────────
+      const trackedFiles = [...modified, ...safeUntracked]
+      const addCmd = unsafeUntracked.length > 0 && (unstaged.length > 0 || safeUntracked.length > 0)
+        ? trackedFiles.map(f => `git add "${f}"`).join('\n')   // explicit adds — skip unsafe
+        : unstaged.length > 0 || safeUntracked.length > 0
+          ? 'git add .'
+          : null  // everything already staged
+
+      const changedFilesList = [
+        ...staged.map(f => `staged:    ${f.file}`),
+        ...unstaged.map(f => `unstaged:  ${f.file}`),
+        ...safeUntracked.map(f => `untracked: ${f}`),
+        ...unsafeUntracked.map(f => `⚠️ SKIP:   ${f}  ← do not commit this`),
       ]
 
+      // ── PREVIEW (confirmed=false) ─────────────────────────────────────────────
       if (!confirmed) {
+        // Case 1: branch mismatch — must resolve before anything else
+        if (branchMismatch) {
+          const stashMsg = `wip: ${scope || currentBranch} — switching to ${taskBranch}`
+          return text({
+            situation: {
+              currentBranch,
+              taskBranch,
+              message: `You are on "${currentBranch}" but TASK-${task?.key} is linked to "${taskBranch}". Choose how to handle your local changes before committing.`,
+            },
+            changedFiles: changedFilesList,
+            unsafeUntrackedWarning: unsafeUntracked.length
+              ? `These paths should NOT be committed — add them to .gitignore: ${unsafeUntracked.join(', ')}`
+              : null,
+            options: {
+              A: {
+                branchAction: 'switch_then_commit',
+                description:  'Switch to the task branch now, bring your changes, then commit (recommended)',
+                commands: [
+                  `git stash push -m "${stashMsg}"`,
+                  `git fetch origin`,
+                  `git checkout ${taskBranch}`,
+                  `git stash pop`,
+                  addCmd,
+                  `git commit -m "${commitMsg}"`,
+                  `git push origin ${taskBranch}`,
+                ].filter(Boolean),
+              },
+              B: {
+                branchAction: 'stash_for_later',
+                description:  'Stash changes now and commit on the task branch later',
+                commands: [
+                  `git stash push -m "${stashMsg}"`,
+                  `# Later: git checkout ${taskBranch} && git stash pop`,
+                ],
+              },
+              C: {
+                branchAction: 'commit_here',
+                description:  `Commit on "${currentBranch}" as-is${onProtected ? ' ⚠️ THIS IS A PROTECTED BRANCH' : ''}`,
+                warning:      onProtected
+                  ? `"${currentBranch}" is a protected branch. Committing here directly bypasses the PR review process. Only do this for base repo changes (e.g. .gitignore, root README) that don't belong to any feature branch.`
+                  : null,
+                commands: [addCmd, `git commit -m "${commitMsg}"`, `git push origin ${currentBranch}`].filter(Boolean),
+              },
+            },
+            requiresConfirmation: true,
+            message: `Call commit_helper again with confirmed=true and branchAction set to "switch_then_commit", "stash_for_later", or "commit_here".`,
+          })
+        }
+
+        // Case 2: on correct branch — standard preview
+        const pushCmd = `git push origin ${currentBranch}`
         return text({
           preview: {
             suggestedMessage: commitMsg,
-            type:        commitType,
+            type:             commitType,
             scope,
-            description,
             currentBranch,
-            changedFiles,
-            diffSummary: diffStat || '(no tracked changes yet)',
+            taskBranch:       taskBranch || '(none linked)',
+            onCorrectBranch:  !branchMismatch,
+            changedFiles:     changedFilesList,
           },
-          commands: [addCmd, commitCmd, pushCmd].filter(Boolean),
+          unsafeUntrackedWarning: unsafeUntracked.length
+            ? `These paths should NOT be committed — add them to .gitignore first: ${unsafeUntracked.join(', ')}`
+            : null,
+          protectedBranchWarning: onProtected
+            ? `⚠️ You are on "${currentBranch}" — a protected branch. Consider committing on a feature branch instead.`
+            : null,
+          commands: [addCmd, `git commit -m "${commitMsg}"`, pushCmd].filter(Boolean),
           requiresConfirmation: true,
-          message: `Suggested commit message: "${commitMsg}". Call commit_helper again with confirmed=true to get the final runnable commands.`,
-          tip: 'You can edit the description before running — the type and scope are auto-detected but the description can be more specific.',
+          message: `Suggested: "${commitMsg}". Call commit_helper again with confirmed=true to get the final commands.`,
+        })
+      }
+
+      // ── CONFIRMED (confirmed=true) ────────────────────────────────────────────
+      if (branchMismatch && !branchAction) {
+        return text({
+          blocked: true,
+          message: `Branch mismatch detected. You must set branchAction to one of: "switch_then_commit", "stash_for_later", "commit_here". Call commit_helper with confirmed=false first to see the options.`,
+        })
+      }
+
+      const stashMsg = `wip: ${scope || currentBranch} — switching to ${taskBranch}`
+
+      if (branchAction === 'switch_then_commit') {
+        return text({
+          plan:    'switch_then_commit',
+          commands: [
+            `git stash push -m "${stashMsg}"`,
+            `git fetch origin`,
+            `git checkout ${taskBranch}`,
+            `git stash pop`,
+            addCmd,
+            `git commit -m "${commitMsg}"`,
+            `git push origin ${taskBranch}`,
+          ].filter(Boolean),
+          commitMessage: commitMsg,
+          message: `Run these commands in order. Your changes will land on "${taskBranch}" where they belong.`,
+          nextStep: `After pushing, call raise_pr to open the pull request for ${task?.key}.`,
+          unsafeUntrackedWarning: unsafeUntracked.length
+            ? `These will be in your working tree after stash pop — do NOT git add them: ${unsafeUntracked.join(', ')}`
+            : null,
+        })
+      }
+
+      if (branchAction === 'stash_for_later') {
+        return text({
+          plan:    'stash_for_later',
+          commands: [
+            `git stash push -m "${stashMsg}"`,
+          ],
+          message: `Your changes are stashed. When you're ready to commit:`,
+          resumeCommands: [
+            `git checkout ${taskBranch}`,
+            `git stash pop`,
+            addCmd,
+            `git commit -m "${commitMsg}"`,
+            `git push origin ${taskBranch}`,
+          ].filter(Boolean),
+          commitMessage: commitMsg,
         })
       }
 
+      // commit_here (or no mismatch)
+      const targetBranch = currentBranch
+      const pushCmd = `git push origin ${targetBranch}`
       return text({
         commitMessage: commitMsg,
-        commands:      [addCmd, commitCmd, pushCmd].filter(Boolean),
-        changedFiles,
-        message:       `Copy-paste these commands in order. Edit the commit message description if needed before running.`,
-        nextStep:      'After pushing, call raise_pr to open the pull request.',
+        commands:      [addCmd, `git commit -m "${commitMsg}"`, pushCmd].filter(Boolean),
+        changedFiles:  changedFilesList,
+        protectedBranchWarning: onProtected
+          ? `⚠️ Committing directly to "${targetBranch}". Only appropriate for base repo changes that don't belong to a feature branch.`
+          : null,
+        unsafeUntrackedWarning: unsafeUntracked.length
+          ? `These were excluded from git add — add them to .gitignore: ${unsafeUntracked.join(', ')}`
+          : null,
+        message:  `Copy-paste these commands in order.`,
+        nextStep: taskBranch && !branchMismatch ? `After pushing, call raise_pr to open the pull request.` : null,
       })
     }
   )

package/package.json

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