internaltool-mcp 1.5.3 → 1.5.4

package/index.js

@@ -908,8 +908,8 @@ can cause conflicts or silently carry changes onto the new branch.`,
       projectId:  z.string().describe("Project's MongoDB ObjectId"),
       fromRef:    z.string().optional().describe("Base ref to branch from (default: project's default branch)"),
       confirmed:  z.boolean().optional().default(false).describe('Set true only after running pre-flight commands and setting localState'),
-      localState: z.enum(['clean', 'stashed', 'committed']).optional()
-                   .describe('Your local git state AFTER running git status. Required when confirmed=true.'),
+      localState: z.enum(['clean', 'untracked', 'stashed', 'committed']).optional()
+                   .describe('Your local git state after running git status. Required when confirmed=true. Use "untracked" if git status shows only untracked files with no modified tracked files.'),
     },
     async ({ taskId, projectId, fromRef, confirmed = false, localState }) => {
       if (scopedProjectId && projectId !== scopedProjectId) {
@@ -946,11 +946,13 @@ can cause conflicts or silently carry changes onto the new branch.`,
           ],
           preflightInstructions: [
             'Run the three commands above in your terminal right now.',
-            'If "git status" shows modified/untracked files: run "git stash push -m \\"wip: switching to ' + branchName + '\\"" then set localState="stashed"',
-            'If working tree is already clean: set localState="clean"',
-            'If you prefer a WIP commit: run "git add . && git commit -m \\"chore: wip\\"" then set localState="committed"',
+            'Read your git status output and pick the matching localState:',
+            '  "clean"     — "nothing to commit, working tree clean"',
+            '  "untracked" — only untracked files listed, no modified tracked files. Safe to proceed — untracked files stay in place when you switch branches, they do NOT follow you.',
+            '  "stashed"   — you had modified tracked files; run: git stash push -m "wip: switching to ' + branchName + '" — then set this.',
+            '  "committed" — you had changes; run: git add . && git commit -m "chore: wip" — then set this.',
           ],
-          message: `Check your local git state first. Run the pre-flight commands above, handle any uncommitted changes, then call create_branch again with confirmed=true and localState=<clean|stashed|committed>.`,
+          message: `Run the pre-flight commands above, read the output, then call create_branch again with confirmed=true and localState set to one of: clean | untracked | stashed | committed.`,
         })
       }
 
@@ -974,10 +976,13 @@ can cause conflicts or silently carry changes onto the new branch.`,
           `git checkout ${branchName}`,
         ]
 
-        // If stashed, remind to check stash still makes sense on the new branch
-        const stashReminder = localState === 'stashed'
-          ? 'You stashed changes before switching. After checkout, decide: does your stash belong on this branch? If yes: git stash pop. If it belongs to a different branch, leave it and pop it there.'
-          : null
+        // State-specific notes
+        const localStateNote = {
+          clean:     null,
+          untracked: 'Your untracked files (.cursor/, docs, etc.) will stay in your working directory after checkout — they are not tracked by git so they do not follow branches. They will not appear in commits on the new branch unless you explicitly git add them.',
+          stashed:   'You stashed changes before switching. After checkout, decide: does your stash belong on this new branch? If yes: git stash pop. If it belongs to a different branch, leave it and pop it there later.',
+          committed: 'You made a WIP commit before switching. That commit stays on the branch you were on — it will not appear on the new branch.',
+        }[localState] || null
 
         return text({
           branchName,
@@ -985,7 +990,7 @@ can cause conflicts or silently carry changes onto the new branch.`,
           localState,
           message:       `Branch "${branchName}" created on GitHub.`,
           gitSteps:      checkoutSteps,
-          stashReminder,
+          localStateNote,
           nextStep:      'Run the git steps above to switch locally, then start coding. When commits are pushed, use raise_pr.',
         })
       } catch (e) {

package/package.json

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